diff options
461 files changed, 15108 insertions, 5513 deletions
diff --git a/.gitignore b/.gitignore index 9bb1cb6d825d..869e1a3b64b6 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -3,6 +3,10 @@ | |||
| 3 | # subdirectories here. Add them in the ".gitignore" file | 3 | # subdirectories here. Add them in the ".gitignore" file |
| 4 | # in that subdirectory instead. | 4 | # in that subdirectory instead. |
| 5 | # | 5 | # |
| 6 | # NOTE! Please use 'git-ls-files -i --exclude-standard' | ||
| 7 | # command after changing this file, to see if there are | ||
| 8 | # any tracked files which get ignored after the change. | ||
| 9 | # | ||
| 6 | # Normal rules | 10 | # Normal rules |
| 7 | # | 11 | # |
| 8 | .* | 12 | .* |
| @@ -18,19 +22,21 @@ | |||
| 18 | *.lst | 22 | *.lst |
| 19 | *.symtypes | 23 | *.symtypes |
| 20 | *.order | 24 | *.order |
| 25 | *.elf | ||
| 26 | *.bin | ||
| 27 | *.gz | ||
| 21 | 28 | ||
| 22 | # | 29 | # |
| 23 | # Top-level generic files | 30 | # Top-level generic files |
| 24 | # | 31 | # |
| 25 | tags | 32 | tags |
| 26 | TAGS | 33 | TAGS |
| 27 | vmlinux* | 34 | vmlinux |
| 28 | !vmlinux.lds.S | ||
| 29 | !vmlinux.lds.h | ||
| 30 | System.map | 35 | System.map |
| 31 | Module.markers | 36 | Module.markers |
| 32 | Module.symvers | 37 | Module.symvers |
| 33 | !.gitignore | 38 | !.gitignore |
| 39 | !.mailmap | ||
| 34 | 40 | ||
| 35 | # | 41 | # |
| 36 | # Generated include files | 42 | # Generated include files |
| @@ -2611,8 +2611,9 @@ S: Perth, Western Australia | |||
| 2611 | S: Australia | 2611 | S: Australia |
| 2612 | 2612 | ||
| 2613 | N: Miguel Ojeda Sandonis | 2613 | N: Miguel Ojeda Sandonis |
| 2614 | E: maxextreme@gmail.com | 2614 | E: miguel.ojeda.sandonis@gmail.com |
| 2615 | W: http://maxextreme.googlepages.com/ | 2615 | W: http://miguelojeda.es |
| 2616 | W: http://jair.lab.fi.uva.es/~migojed/ | ||
| 2616 | D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. | 2617 | D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. |
| 2617 | D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) | 2618 | D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) |
| 2618 | S: C/ Mieses 20, 9-B | 2619 | S: C/ Mieses 20, 9-B |
diff --git a/Documentation/accounting/taskstats-struct.txt b/Documentation/accounting/taskstats-struct.txt index 8aa7529f8258..cd784f46bf8a 100644 --- a/Documentation/accounting/taskstats-struct.txt +++ b/Documentation/accounting/taskstats-struct.txt | |||
| @@ -24,6 +24,8 @@ There are three different groups of fields in the struct taskstats: | |||
| 24 | 24 | ||
| 25 | 4) Per-task and per-thread context switch count statistics | 25 | 4) Per-task and per-thread context switch count statistics |
| 26 | 26 | ||
| 27 | 5) Time accounting for SMT machines | ||
| 28 | |||
| 27 | Future extension should add fields to the end of the taskstats struct, and | 29 | Future extension should add fields to the end of the taskstats struct, and |
| 28 | should not change the relative position of each field within the struct. | 30 | should not change the relative position of each field within the struct. |
| 29 | 31 | ||
| @@ -164,4 +166,8 @@ struct taskstats { | |||
| 164 | __u64 nvcsw; /* Context voluntary switch counter */ | 166 | __u64 nvcsw; /* Context voluntary switch counter */ |
| 165 | __u64 nivcsw; /* Context involuntary switch counter */ | 167 | __u64 nivcsw; /* Context involuntary switch counter */ |
| 166 | 168 | ||
| 169 | 5) Time accounting for SMT machines | ||
| 170 | __u64 ac_utimescaled; /* utime scaled on frequency etc */ | ||
| 171 | __u64 ac_stimescaled; /* stime scaled on frequency etc */ | ||
| 172 | __u64 cpu_scaled_run_real_total; /* scaled cpu_run_real_total */ | ||
| 167 | } | 173 | } |
diff --git a/Documentation/auxdisplay/cfag12864b b/Documentation/auxdisplay/cfag12864b index b714183d4125..eb7be393a510 100644 --- a/Documentation/auxdisplay/cfag12864b +++ b/Documentation/auxdisplay/cfag12864b | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | =================================== | 3 | =================================== |
| 4 | 4 | ||
| 5 | License: GPLv2 | 5 | License: GPLv2 |
| 6 | Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com> | 6 | Author & Maintainer: Miguel Ojeda Sandonis |
| 7 | Date: 2006-10-27 | 7 | Date: 2006-10-27 |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -22,7 +22,7 @@ Date: 2006-10-27 | |||
| 22 | 1. DRIVER INFORMATION | 22 | 1. DRIVER INFORMATION |
| 23 | --------------------- | 23 | --------------------- |
| 24 | 24 | ||
| 25 | This driver support one cfag12864b display at time. | 25 | This driver supports a cfag12864b LCD. |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | --------------------- | 28 | --------------------- |
diff --git a/Documentation/auxdisplay/cfag12864b-example.c b/Documentation/auxdisplay/cfag12864b-example.c index 7bfac354d4c9..2caeea5e4993 100644 --- a/Documentation/auxdisplay/cfag12864b-example.c +++ b/Documentation/auxdisplay/cfag12864b-example.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Description: cfag12864b LCD userspace example program | 4 | * Description: cfag12864b LCD userspace example program |
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * | 6 | * |
| 7 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 7 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 8 | * Date: 2006-10-31 | 8 | * Date: 2006-10-31 |
| 9 | * | 9 | * |
| 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 |
diff --git a/Documentation/auxdisplay/ks0108 b/Documentation/auxdisplay/ks0108 index 92b03b60c613..8ddda0c8ceef 100644 --- a/Documentation/auxdisplay/ks0108 +++ b/Documentation/auxdisplay/ks0108 | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | ========================================== | 3 | ========================================== |
| 4 | 4 | ||
| 5 | License: GPLv2 | 5 | License: GPLv2 |
| 6 | Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com> | 6 | Author & Maintainer: Miguel Ojeda Sandonis |
| 7 | Date: 2006-10-27 | 7 | Date: 2006-10-27 |
| 8 | 8 | ||
| 9 | 9 | ||
| @@ -21,7 +21,7 @@ Date: 2006-10-27 | |||
| 21 | 1. DRIVER INFORMATION | 21 | 1. DRIVER INFORMATION |
| 22 | --------------------- | 22 | --------------------- |
| 23 | 23 | ||
| 24 | This driver support the ks0108 LCD controller. | 24 | This driver supports the ks0108 LCD controller. |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | --------------------- | 27 | --------------------- |
diff --git a/Documentation/cgroups.txt b/Documentation/cgroups.txt index 824fc0274471..d9014aa0eb68 100644 --- a/Documentation/cgroups.txt +++ b/Documentation/cgroups.txt | |||
| @@ -390,6 +390,10 @@ If you have several tasks to attach, you have to do it one after another: | |||
| 390 | ... | 390 | ... |
| 391 | # /bin/echo PIDn > tasks | 391 | # /bin/echo PIDn > tasks |
| 392 | 392 | ||
| 393 | You can attach the current shell task by echoing 0: | ||
| 394 | |||
| 395 | # echo 0 > tasks | ||
| 396 | |||
| 393 | 3. Kernel API | 397 | 3. Kernel API |
| 394 | ============= | 398 | ============= |
| 395 | 399 | ||
diff --git a/Documentation/controllers/devices.txt b/Documentation/controllers/devices.txt index 4dcea42432c2..7cc6e6a60672 100644 --- a/Documentation/controllers/devices.txt +++ b/Documentation/controllers/devices.txt | |||
| @@ -13,7 +13,7 @@ either an integer or * for all. Access is a composition of r | |||
| 13 | The root device cgroup starts with rwm to 'all'. A child device | 13 | The root device cgroup starts with rwm to 'all'. A child device |
| 14 | cgroup gets a copy of the parent. Administrators can then remove | 14 | cgroup gets a copy of the parent. Administrators can then remove |
| 15 | devices from the whitelist or add new entries. A child cgroup can | 15 | devices from the whitelist or add new entries. A child cgroup can |
| 16 | never receive a device access which is denied its parent. However | 16 | never receive a device access which is denied by its parent. However |
| 17 | when a device access is removed from a parent it will not also be | 17 | when a device access is removed from a parent it will not also be |
| 18 | removed from the child(ren). | 18 | removed from the child(ren). |
| 19 | 19 | ||
| @@ -29,7 +29,11 @@ allows cgroup 1 to read and mknod the device usually known as | |||
| 29 | 29 | ||
| 30 | echo a > /cgroups/1/devices.deny | 30 | echo a > /cgroups/1/devices.deny |
| 31 | 31 | ||
| 32 | will remove the default 'a *:* mrw' entry. | 32 | will remove the default 'a *:* rwm' entry. Doing |
| 33 | |||
| 34 | echo a > /cgroups/1/devices.allow | ||
| 35 | |||
| 36 | will add the 'a *:* rwm' entry to the whitelist. | ||
| 33 | 37 | ||
| 34 | 3. Security | 38 | 3. Security |
| 35 | 39 | ||
diff --git a/Documentation/cpusets.txt b/Documentation/cpusets.txt index 353504de3084..1f5a924d1e56 100644 --- a/Documentation/cpusets.txt +++ b/Documentation/cpusets.txt | |||
| @@ -154,13 +154,15 @@ browsing and modifying the cpusets presently known to the kernel. No | |||
| 154 | new system calls are added for cpusets - all support for querying and | 154 | new system calls are added for cpusets - all support for querying and |
| 155 | modifying cpusets is via this cpuset file system. | 155 | modifying cpusets is via this cpuset file system. |
| 156 | 156 | ||
| 157 | The /proc/<pid>/status file for each task has two added lines, | 157 | The /proc/<pid>/status file for each task has four added lines, |
| 158 | displaying the tasks cpus_allowed (on which CPUs it may be scheduled) | 158 | displaying the tasks cpus_allowed (on which CPUs it may be scheduled) |
| 159 | and mems_allowed (on which Memory Nodes it may obtain memory), | 159 | and mems_allowed (on which Memory Nodes it may obtain memory), |
| 160 | in the format seen in the following example: | 160 | in the two formats seen in the following example: |
| 161 | 161 | ||
| 162 | Cpus_allowed: ffffffff,ffffffff,ffffffff,ffffffff | 162 | Cpus_allowed: ffffffff,ffffffff,ffffffff,ffffffff |
| 163 | Cpus_allowed_list: 0-127 | ||
| 163 | Mems_allowed: ffffffff,ffffffff | 164 | Mems_allowed: ffffffff,ffffffff |
| 165 | Mems_allowed_list: 0-63 | ||
| 164 | 166 | ||
| 165 | Each cpuset is represented by a directory in the cgroup file system | 167 | Each cpuset is represented by a directory in the cgroup file system |
| 166 | containing (on top of the standard cgroup files) the following | 168 | containing (on top of the standard cgroup files) the following |
| @@ -544,6 +546,9 @@ otherwise initial value -1 that indicates the cpuset has no request. | |||
| 544 | ( 4 : search nodes in a chunk of node [on NUMA system] ) | 546 | ( 4 : search nodes in a chunk of node [on NUMA system] ) |
| 545 | ( 5 : search system wide [on NUMA system] ) | 547 | ( 5 : search system wide [on NUMA system] ) |
| 546 | 548 | ||
| 549 | The system default is architecture dependent. The system default | ||
| 550 | can be changed using the relax_domain_level= boot parameter. | ||
| 551 | |||
| 547 | This file is per-cpuset and affect the sched domain where the cpuset | 552 | This file is per-cpuset and affect the sched domain where the cpuset |
| 548 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset | 553 | belongs to. Therefore if the flag 'sched_load_balance' of a cpuset |
| 549 | is disabled, then 'sched_relax_domain_level' have no effect since | 554 | is disabled, then 'sched_relax_domain_level' have no effect since |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 5b3f31faed56..46ece3fba6f9 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -312,3 +312,12 @@ When: 2.6.26 | |||
| 312 | Why: Implementation became generic; users should now include | 312 | Why: Implementation became generic; users should now include |
| 313 | linux/semaphore.h instead. | 313 | linux/semaphore.h instead. |
| 314 | Who: Matthew Wilcox <willy@linux.intel.com> | 314 | Who: Matthew Wilcox <willy@linux.intel.com> |
| 315 | |||
| 316 | --------------------------- | ||
| 317 | |||
| 318 | What: CONFIG_THERMAL_HWMON | ||
| 319 | When: January 2009 | ||
| 320 | Why: This option was introduced just to allow older lm-sensors userspace | ||
| 321 | to keep working over the upgrade to 2.6.26. At the scheduled time of | ||
| 322 | removal fixed lm-sensors (2.x or 3.x) should be readily available. | ||
| 323 | Who: Rene Herman <rene.herman@gmail.com> | ||
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients index ee75cbace28d..d4cd4126d1ad 100644 --- a/Documentation/i2c/writing-clients +++ b/Documentation/i2c/writing-clients | |||
| @@ -25,12 +25,23 @@ routines, and should be zero-initialized except for fields with data you | |||
| 25 | provide. A client structure holds device-specific information like the | 25 | provide. A client structure holds device-specific information like the |
| 26 | driver model device node, and its I2C address. | 26 | driver model device node, and its I2C address. |
| 27 | 27 | ||
| 28 | /* iff driver uses driver model ("new style") binding model: */ | ||
| 29 | |||
| 30 | static struct i2c_device_id foo_idtable[] = { | ||
| 31 | { "foo", my_id_for_foo }, | ||
| 32 | { "bar", my_id_for_bar }, | ||
| 33 | { } | ||
| 34 | }; | ||
| 35 | |||
| 36 | MODULE_DEVICE_TABLE(i2c, foo_idtable); | ||
| 37 | |||
| 28 | static struct i2c_driver foo_driver = { | 38 | static struct i2c_driver foo_driver = { |
| 29 | .driver = { | 39 | .driver = { |
| 30 | .name = "foo", | 40 | .name = "foo", |
| 31 | }, | 41 | }, |
| 32 | 42 | ||
| 33 | /* iff driver uses driver model ("new style") binding model: */ | 43 | /* iff driver uses driver model ("new style") binding model: */ |
| 44 | .id_table = foo_ids, | ||
| 34 | .probe = foo_probe, | 45 | .probe = foo_probe, |
| 35 | .remove = foo_remove, | 46 | .remove = foo_remove, |
| 36 | 47 | ||
| @@ -173,10 +184,9 @@ handle may be used during foo_probe(). If foo_probe() reports success | |||
| 173 | (zero not a negative status code) it may save the handle and use it until | 184 | (zero not a negative status code) it may save the handle and use it until |
| 174 | foo_remove() returns. That binding model is used by most Linux drivers. | 185 | foo_remove() returns. That binding model is used by most Linux drivers. |
| 175 | 186 | ||
| 176 | Drivers match devices when i2c_client.driver_name and the driver name are | 187 | The probe function is called when an entry in the id_table name field |
| 177 | the same; this approach is used in several other busses that don't have | 188 | matches the device's name. It is passed the entry that was matched so |
| 178 | device typing support in the hardware. The driver and module name should | 189 | the driver knows which one in the table matched. |
| 179 | match, so hotplug/coldplug mechanisms will modprobe the driver. | ||
| 180 | 190 | ||
| 181 | 191 | ||
| 182 | Device Creation (Standard driver model) | 192 | Device Creation (Standard driver model) |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e07c432c731f..b52f47d588b4 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -295,7 +295,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 295 | when initialising the APIC and IO-APIC components. | 295 | when initialising the APIC and IO-APIC components. |
| 296 | 296 | ||
| 297 | apm= [APM] Advanced Power Management | 297 | apm= [APM] Advanced Power Management |
| 298 | See header of arch/i386/kernel/apm.c. | 298 | See header of arch/x86/kernel/apm_32.c. |
| 299 | 299 | ||
| 300 | arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards | 300 | arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards |
| 301 | Format: <io>,<irq>,<nodeID> | 301 | Format: <io>,<irq>,<nodeID> |
| @@ -638,7 +638,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 638 | 638 | ||
| 639 | elanfreq= [X86-32] | 639 | elanfreq= [X86-32] |
| 640 | See comment before function elanfreq_setup() in | 640 | See comment before function elanfreq_setup() in |
| 641 | arch/i386/kernel/cpu/cpufreq/elanfreq.c. | 641 | arch/x86/kernel/cpu/cpufreq/elanfreq.c. |
| 642 | 642 | ||
| 643 | elevator= [IOSCHED] | 643 | elevator= [IOSCHED] |
| 644 | Format: {"anticipatory" | "cfq" | "deadline" | "noop"} | 644 | Format: {"anticipatory" | "cfq" | "deadline" | "noop"} |
| @@ -1679,6 +1679,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1679 | Format: <reboot_mode>[,<reboot_mode2>[,...]] | 1679 | Format: <reboot_mode>[,<reboot_mode2>[,...]] |
| 1680 | See arch/*/kernel/reboot.c or arch/*/kernel/process.c | 1680 | See arch/*/kernel/reboot.c or arch/*/kernel/process.c |
| 1681 | 1681 | ||
| 1682 | relax_domain_level= | ||
| 1683 | [KNL, SMP] Set scheduler's default relax_domain_level. | ||
| 1684 | See Documentation/cpusets.txt. | ||
| 1685 | |||
| 1682 | reserve= [KNL,BUGS] Force the kernel to ignore some iomem area | 1686 | reserve= [KNL,BUGS] Force the kernel to ignore some iomem area |
| 1683 | 1687 | ||
| 1684 | reservetop= [X86-32] | 1688 | reservetop= [X86-32] |
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 17a6e46fbd43..17f1f91af35c 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
| @@ -81,23 +81,23 @@ inet_peer_minttl - INTEGER | |||
| 81 | Minimum time-to-live of entries. Should be enough to cover fragment | 81 | Minimum time-to-live of entries. Should be enough to cover fragment |
| 82 | time-to-live on the reassembling side. This minimum time-to-live is | 82 | time-to-live on the reassembling side. This minimum time-to-live is |
| 83 | guaranteed if the pool size is less than inet_peer_threshold. | 83 | guaranteed if the pool size is less than inet_peer_threshold. |
| 84 | Measured in jiffies(1). | 84 | Measured in seconds. |
| 85 | 85 | ||
| 86 | inet_peer_maxttl - INTEGER | 86 | inet_peer_maxttl - INTEGER |
| 87 | Maximum time-to-live of entries. Unused entries will expire after | 87 | Maximum time-to-live of entries. Unused entries will expire after |
| 88 | this period of time if there is no memory pressure on the pool (i.e. | 88 | this period of time if there is no memory pressure on the pool (i.e. |
| 89 | when the number of entries in the pool is very small). | 89 | when the number of entries in the pool is very small). |
| 90 | Measured in jiffies(1). | 90 | Measured in seconds. |
| 91 | 91 | ||
| 92 | inet_peer_gc_mintime - INTEGER | 92 | inet_peer_gc_mintime - INTEGER |
| 93 | Minimum interval between garbage collection passes. This interval is | 93 | Minimum interval between garbage collection passes. This interval is |
| 94 | in effect under high memory pressure on the pool. | 94 | in effect under high memory pressure on the pool. |
| 95 | Measured in jiffies(1). | 95 | Measured in seconds. |
| 96 | 96 | ||
| 97 | inet_peer_gc_maxtime - INTEGER | 97 | inet_peer_gc_maxtime - INTEGER |
| 98 | Minimum interval between garbage collection passes. This interval is | 98 | Minimum interval between garbage collection passes. This interval is |
| 99 | in effect under low (or absent) memory pressure on the pool. | 99 | in effect under low (or absent) memory pressure on the pool. |
| 100 | Measured in jiffies(1). | 100 | Measured in seconds. |
| 101 | 101 | ||
| 102 | TCP variables: | 102 | TCP variables: |
| 103 | 103 | ||
| @@ -794,10 +794,6 @@ tag - INTEGER | |||
| 794 | Allows you to write a number, which can be used as required. | 794 | Allows you to write a number, which can be used as required. |
| 795 | Default value is 0. | 795 | Default value is 0. |
| 796 | 796 | ||
| 797 | (1) Jiffie: internal timeunit for the kernel. On the i386 1/100s, on the | ||
| 798 | Alpha 1/1024s. See the HZ define in /usr/include/asm/param.h for the exact | ||
| 799 | value on your system. | ||
| 800 | |||
| 801 | Alexey Kuznetsov. | 797 | Alexey Kuznetsov. |
| 802 | kuznet@ms2.inr.ac.ru | 798 | kuznet@ms2.inr.ac.ru |
| 803 | 799 | ||
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt index 4bde53e85f3f..1e28e2ddb90a 100644 --- a/Documentation/networking/s2io.txt +++ b/Documentation/networking/s2io.txt | |||
| @@ -83,9 +83,9 @@ Valid range: Limited by memory on system | |||
| 83 | Default: 30 | 83 | Default: 30 |
| 84 | 84 | ||
| 85 | e. intr_type | 85 | e. intr_type |
| 86 | Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X) | 86 | Specifies interrupt type. Possible values 0(INTA), 2(MSI-X) |
| 87 | Valid range: 1-3 | 87 | Valid values: 0, 2 |
| 88 | Default: 1 | 88 | Default: 2 |
| 89 | 89 | ||
| 90 | 5. Performance suggestions | 90 | 5. Performance suggestions |
| 91 | General: | 91 | General: |
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828 index aaae360312e4..86d1c8e7b18f 100644 --- a/Documentation/video4linux/CARDLIST.au0828 +++ b/Documentation/video4linux/CARDLIST.au0828 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 0 -> Unknown board (au0828) | 1 | 0 -> Unknown board (au0828) |
| 2 | 1 -> Hauppauge HVR950Q (au0828) [2040:7200] | 2 | 1 -> Hauppauge HVR950Q (au0828) [2040:7200,2040:7210,2040:7217,2040:721b,2040:721f,2040:7280,0fd9:0008] |
| 3 | 2 -> Hauppauge HVR850 (au0828) [2040:7240] | 3 | 2 -> Hauppauge HVR850 (au0828) [2040:7240] |
| 4 | 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] | 4 | 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] |
diff --git a/Documentation/vm/slabinfo.c b/Documentation/vm/slabinfo.c index e4230ed16ee7..df3227605d59 100644 --- a/Documentation/vm/slabinfo.c +++ b/Documentation/vm/slabinfo.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Slabinfo: Tool to get reports about slabs | 2 | * Slabinfo: Tool to get reports about slabs |
| 3 | * | 3 | * |
| 4 | * (C) 2007 sgi, Christoph Lameter <clameter@sgi.com> | 4 | * (C) 2007 sgi, Christoph Lameter |
| 5 | * | 5 | * |
| 6 | * Compile by: | 6 | * Compile by: |
| 7 | * | 7 | * |
| @@ -99,7 +99,7 @@ void fatal(const char *x, ...) | |||
| 99 | 99 | ||
| 100 | void usage(void) | 100 | void usage(void) |
| 101 | { | 101 | { |
| 102 | printf("slabinfo 5/7/2007. (c) 2007 sgi. clameter@sgi.com\n\n" | 102 | printf("slabinfo 5/7/2007. (c) 2007 sgi.\n\n" |
| 103 | "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n" | 103 | "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n" |
| 104 | "-a|--aliases Show aliases\n" | 104 | "-a|--aliases Show aliases\n" |
| 105 | "-A|--activity Most active slabs first\n" | 105 | "-A|--activity Most active slabs first\n" |
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 7c13f22a0c9e..bb1f5c6e28b3 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
| @@ -266,4 +266,4 @@ of other objects. | |||
| 266 | 266 | ||
| 267 | slub_debug=FZ,dentry | 267 | slub_debug=FZ,dentry |
| 268 | 268 | ||
| 269 | Christoph Lameter, <clameter@sgi.com>, May 30, 2007 | 269 | Christoph Lameter, May 30, 2007 |
diff --git a/Documentation/x86_64/mm.txt b/Documentation/x86_64/mm.txt index b89b6d2bebfa..efce75097369 100644 --- a/Documentation/x86_64/mm.txt +++ b/Documentation/x86_64/mm.txt | |||
| @@ -11,9 +11,8 @@ ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole | |||
| 11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space | 11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space |
| 12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) | 12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) |
| 13 | ... unused hole ... | 13 | ... unused hole ... |
| 14 | ffffffff80000000 - ffffffff82800000 (=40 MB) kernel text mapping, from phys 0 | 14 | ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 |
| 15 | ... unused hole ... | 15 | ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space |
| 16 | ffffffff88000000 - fffffffffff00000 (=1919 MB) module mapping space | ||
| 17 | 16 | ||
| 18 | The direct mapping covers all memory in the system up to the highest | 17 | The direct mapping covers all memory in the system up to the highest |
| 19 | memory address (this means in some cases it can also include PCI memory | 18 | memory address (this means in some cases it can also include PCI memory |
diff --git a/MAINTAINERS b/MAINTAINERS index 8f0ec46a7096..6476125363e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -763,9 +763,10 @@ S: Maintained | |||
| 763 | 763 | ||
| 764 | AUXILIARY DISPLAY DRIVERS | 764 | AUXILIARY DISPLAY DRIVERS |
| 765 | P: Miguel Ojeda Sandonis | 765 | P: Miguel Ojeda Sandonis |
| 766 | M: maxextreme@gmail.com | 766 | M: miguel.ojeda.sandonis@gmail.com |
| 767 | L: linux-kernel@vger.kernel.org | 767 | L: linux-kernel@vger.kernel.org |
| 768 | W: http://auxdisplay.googlepages.com/ | 768 | W: http://miguelojeda.es/auxdisplay.htm |
| 769 | W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm | ||
| 769 | S: Maintained | 770 | S: Maintained |
| 770 | 771 | ||
| 771 | AVR32 ARCHITECTURE | 772 | AVR32 ARCHITECTURE |
| @@ -1055,16 +1056,18 @@ S: Supported | |||
| 1055 | 1056 | ||
| 1056 | CFAG12864B LCD DRIVER | 1057 | CFAG12864B LCD DRIVER |
| 1057 | P: Miguel Ojeda Sandonis | 1058 | P: Miguel Ojeda Sandonis |
| 1058 | M: maxextreme@gmail.com | 1059 | M: miguel.ojeda.sandonis@gmail.com |
| 1059 | L: linux-kernel@vger.kernel.org | 1060 | L: linux-kernel@vger.kernel.org |
| 1060 | W: http://auxdisplay.googlepages.com/ | 1061 | W: http://miguelojeda.es/auxdisplay.htm |
| 1062 | W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm | ||
| 1061 | S: Maintained | 1063 | S: Maintained |
| 1062 | 1064 | ||
| 1063 | CFAG12864BFB LCD FRAMEBUFFER DRIVER | 1065 | CFAG12864BFB LCD FRAMEBUFFER DRIVER |
| 1064 | P: Miguel Ojeda Sandonis | 1066 | P: Miguel Ojeda Sandonis |
| 1065 | M: maxextreme@gmail.com | 1067 | M: miguel.ojeda.sandonis@gmail.com |
| 1066 | L: linux-kernel@vger.kernel.org | 1068 | L: linux-kernel@vger.kernel.org |
| 1067 | W: http://auxdisplay.googlepages.com/ | 1069 | W: http://miguelojeda.es/auxdisplay.htm |
| 1070 | W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm | ||
| 1068 | S: Maintained | 1071 | S: Maintained |
| 1069 | 1072 | ||
| 1070 | CFG80211 and NL80211 | 1073 | CFG80211 and NL80211 |
| @@ -1420,6 +1423,14 @@ M: kristen.c.accardi@intel.com | |||
| 1420 | L: linux-acpi@vger.kernel.org | 1423 | L: linux-acpi@vger.kernel.org |
| 1421 | S: Supported | 1424 | S: Supported |
| 1422 | 1425 | ||
| 1426 | DOCUMENTATION (/Documentation directory) | ||
| 1427 | P: Michael Kerrisk | ||
| 1428 | M: mtk.manpages@gmail.com | ||
| 1429 | P: Randy Dunlap | ||
| 1430 | M: rdunlap@xenotime.net | ||
| 1431 | L: linux-doc@vger.kernel.org | ||
| 1432 | S: Maintained | ||
| 1433 | |||
| 1423 | DOUBLETALK DRIVER | 1434 | DOUBLETALK DRIVER |
| 1424 | P: James R. Van Zandt | 1435 | P: James R. Van Zandt |
| 1425 | M: jrv@vanzandt.mv.com | 1436 | M: jrv@vanzandt.mv.com |
| @@ -1626,13 +1637,13 @@ S: Maintained | |||
| 1626 | 1637 | ||
| 1627 | EXT3 FILE SYSTEM | 1638 | EXT3 FILE SYSTEM |
| 1628 | P: Stephen Tweedie, Andrew Morton | 1639 | P: Stephen Tweedie, Andrew Morton |
| 1629 | M: sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com | 1640 | M: sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com |
| 1630 | L: linux-ext4@vger.kernel.org | 1641 | L: linux-ext4@vger.kernel.org |
| 1631 | S: Maintained | 1642 | S: Maintained |
| 1632 | 1643 | ||
| 1633 | EXT4 FILE SYSTEM | 1644 | EXT4 FILE SYSTEM |
| 1634 | P: Stephen Tweedie, Andrew Morton | 1645 | P: Stephen Tweedie, Andrew Morton |
| 1635 | M: sct@redhat.com, akpm@linux-foundation.org, adilger@clusterfs.com | 1646 | M: sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com |
| 1636 | L: linux-ext4@vger.kernel.org | 1647 | L: linux-ext4@vger.kernel.org |
| 1637 | S: Maintained | 1648 | S: Maintained |
| 1638 | 1649 | ||
| @@ -2428,9 +2439,10 @@ S: Maintained | |||
| 2428 | 2439 | ||
| 2429 | KS0108 LCD CONTROLLER DRIVER | 2440 | KS0108 LCD CONTROLLER DRIVER |
| 2430 | P: Miguel Ojeda Sandonis | 2441 | P: Miguel Ojeda Sandonis |
| 2431 | M: maxextreme@gmail.com | 2442 | M: miguel.ojeda.sandonis@gmail.com |
| 2432 | L: linux-kernel@vger.kernel.org | 2443 | L: linux-kernel@vger.kernel.org |
| 2433 | W: http://auxdisplay.googlepages.com/ | 2444 | W: http://miguelojeda.es/auxdisplay.htm |
| 2445 | W: http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm | ||
| 2434 | S: Maintained | 2446 | S: Maintained |
| 2435 | 2447 | ||
| 2436 | LAPB module | 2448 | LAPB module |
| @@ -2474,9 +2486,11 @@ M: James.Bottomley@HansenPartnership.com | |||
| 2474 | W: http://www.hansenpartnership.com/voyager | 2486 | W: http://www.hansenpartnership.com/voyager |
| 2475 | S: Maintained | 2487 | S: Maintained |
| 2476 | 2488 | ||
| 2477 | LINUX FOR POWERPC | 2489 | LINUX FOR POWERPC (32-BIT AND 64-BIT) |
| 2478 | P: Paul Mackerras | 2490 | P: Paul Mackerras |
| 2479 | M: paulus@samba.org | 2491 | M: paulus@samba.org |
| 2492 | P: Benjamin Herrenschmidt | ||
| 2493 | M: benh@kernel.crashing.org | ||
| 2480 | W: http://www.penguinppc.org/ | 2494 | W: http://www.penguinppc.org/ |
| 2481 | L: linuxppc-dev@ozlabs.org | 2495 | L: linuxppc-dev@ozlabs.org |
| 2482 | T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git | 2496 | T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git |
| @@ -2516,13 +2530,6 @@ W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex | |||
| 2516 | L: linuxppc-dev@ozlabs.org | 2530 | L: linuxppc-dev@ozlabs.org |
| 2517 | S: Maintained | 2531 | S: Maintained |
| 2518 | 2532 | ||
| 2519 | LINUX FOR POWERPC BOOT CODE | ||
| 2520 | P: Tom Rini | ||
| 2521 | M: trini@kernel.crashing.org | ||
| 2522 | W: http://www.penguinppc.org/ | ||
| 2523 | L: linuxppc-dev@ozlabs.org | ||
| 2524 | S: Maintained | ||
| 2525 | |||
| 2526 | LINUX FOR POWERPC EMBEDDED PPC8XX | 2533 | LINUX FOR POWERPC EMBEDDED PPC8XX |
| 2527 | P: Vitaly Bordug | 2534 | P: Vitaly Bordug |
| 2528 | M: vitb@kernel.crashing.org | 2535 | M: vitb@kernel.crashing.org |
| @@ -2551,17 +2558,6 @@ P: Arnaldo Carvalho de Melo | |||
| 2551 | M: acme@ghostprotocols.net | 2558 | M: acme@ghostprotocols.net |
| 2552 | S: Maintained | 2559 | S: Maintained |
| 2553 | 2560 | ||
| 2554 | LINUX FOR 64BIT POWERPC | ||
| 2555 | P: Paul Mackerras | ||
| 2556 | M: paulus@samba.org | ||
| 2557 | M: paulus@au.ibm.com | ||
| 2558 | P: Anton Blanchard | ||
| 2559 | M: anton@samba.org | ||
| 2560 | M: anton@au.ibm.com | ||
| 2561 | W: http://www.penguinppc.org/ppc64/ | ||
| 2562 | L: linuxppc-dev@ozlabs.org | ||
| 2563 | S: Supported | ||
| 2564 | |||
| 2565 | LINUX SECURITY MODULE (LSM) FRAMEWORK | 2561 | LINUX SECURITY MODULE (LSM) FRAMEWORK |
| 2566 | P: Chris Wright | 2562 | P: Chris Wright |
| 2567 | M: chrisw@sous-sol.org | 2563 | M: chrisw@sous-sol.org |
| @@ -2680,8 +2676,8 @@ S: Supported | |||
| 2680 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 | 2676 | MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 |
| 2681 | P: Michael Kerrisk | 2677 | P: Michael Kerrisk |
| 2682 | M: mtk.manpages@gmail.com | 2678 | M: mtk.manpages@gmail.com |
| 2683 | W: ftp://ftp.kernel.org/pub/linux/docs/manpages | 2679 | W: http://www.kernel.org/doc/man-pages |
| 2684 | S: Maintained | 2680 | S: Supported |
| 2685 | 2681 | ||
| 2686 | MARVELL LIBERTAS WIRELESS DRIVER | 2682 | MARVELL LIBERTAS WIRELESS DRIVER |
| 2687 | P: Dan Williams | 2683 | P: Dan Williams |
| @@ -2814,6 +2810,12 @@ W: https://tango.0pointer.de/mailman/listinfo/s270-linux | |||
| 2814 | W: http://0pointer.de/lennart/tchibo.html | 2810 | W: http://0pointer.de/lennart/tchibo.html |
| 2815 | S: Maintained | 2811 | S: Maintained |
| 2816 | 2812 | ||
| 2813 | MULTIFUNCTION DEVICES (MFD) | ||
| 2814 | P: Samuel Ortiz | ||
| 2815 | M: sameo@openedhand.com | ||
| 2816 | L: linux-kernel@vger.kernel.org | ||
| 2817 | S: Supported | ||
| 2818 | |||
| 2817 | MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM | 2819 | MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM |
| 2818 | P: Pierre Ossman | 2820 | P: Pierre Ossman |
| 2819 | M: drzeus-mmc@drzeus.cx | 2821 | M: drzeus-mmc@drzeus.cx |
| @@ -3195,8 +3197,8 @@ L: netdev@vger.kernel.org | |||
| 3195 | S: Maintained | 3197 | S: Maintained |
| 3196 | 3198 | ||
| 3197 | PER-TASK DELAY ACCOUNTING | 3199 | PER-TASK DELAY ACCOUNTING |
| 3198 | P: Shailabh Nagar | 3200 | P: Balbir Singh |
| 3199 | M: nagar@watson.ibm.com | 3201 | M: balbir@linux.vnet.ibm.com |
| 3200 | L: linux-kernel@vger.kernel.org | 3202 | L: linux-kernel@vger.kernel.org |
| 3201 | S: Maintained | 3203 | S: Maintained |
| 3202 | 3204 | ||
| @@ -3688,7 +3690,7 @@ S: Maintained | |||
| 3688 | 3690 | ||
| 3689 | SLAB ALLOCATOR | 3691 | SLAB ALLOCATOR |
| 3690 | P: Christoph Lameter | 3692 | P: Christoph Lameter |
| 3691 | M: clameter@sgi.com | 3693 | M: cl@linux-foundation.org |
| 3692 | P: Pekka Enberg | 3694 | P: Pekka Enberg |
| 3693 | M: penberg@cs.helsinki.fi | 3695 | M: penberg@cs.helsinki.fi |
| 3694 | P: Matt Mackall | 3696 | P: Matt Mackall |
| @@ -3898,8 +3900,8 @@ M: hch@infradead.org | |||
| 3898 | S: Maintained | 3900 | S: Maintained |
| 3899 | 3901 | ||
| 3900 | TASKSTATS STATISTICS INTERFACE | 3902 | TASKSTATS STATISTICS INTERFACE |
| 3901 | P: Shailabh Nagar | 3903 | P: Balbir Singh |
| 3902 | M: nagar@watson.ibm.com | 3904 | M: balbir@linux.vnet.ibm.com |
| 3903 | L: linux-kernel@vger.kernel.org | 3905 | L: linux-kernel@vger.kernel.org |
| 3904 | S: Maintained | 3906 | S: Maintained |
| 3905 | 3907 | ||
| @@ -3995,7 +3997,8 @@ W: http://www.buzzard.org.uk/toshiba/ | |||
| 3995 | S: Maintained | 3997 | S: Maintained |
| 3996 | 3998 | ||
| 3997 | TPM DEVICE DRIVER | 3999 | TPM DEVICE DRIVER |
| 3998 | P: Kylene Hall | 4000 | P: Debora Velarde |
| 4001 | P: Rajiv Andrade | ||
| 3999 | M: tpmdd-devel@lists.sourceforge.net | 4002 | M: tpmdd-devel@lists.sourceforge.net |
| 4000 | W: http://tpmdd.sourceforge.net | 4003 | W: http://tpmdd.sourceforge.net |
| 4001 | P: Marcel Selhorst | 4004 | P: Marcel Selhorst |
| @@ -4314,6 +4317,14 @@ L: netdev@vger.kernel.org | |||
| 4314 | W: http://www.linux-usb.org/usbnet | 4317 | W: http://www.linux-usb.org/usbnet |
| 4315 | S: Maintained | 4318 | S: Maintained |
| 4316 | 4319 | ||
| 4320 | USB VIDEO CLASS | ||
| 4321 | P: Laurent Pinchart | ||
| 4322 | M: laurent.pinchart@skynet.be | ||
| 4323 | L: linx-uvc-devel@berlios.de | ||
| 4324 | L: video4linux-list@redhat.com | ||
| 4325 | W: http://linux-uvc.berlios.de | ||
| 4326 | S: Maintained | ||
| 4327 | |||
| 4317 | USB W996[87]CF DRIVER | 4328 | USB W996[87]CF DRIVER |
| 4318 | P: Luca Risolia | 4329 | P: Luca Risolia |
| 4319 | M: luca.risolia@studio.unibo.it | 4330 | M: luca.risolia@studio.unibo.it |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 26 | 3 | SUBLEVEL = 26 |
| 4 | EXTRAVERSION = -rc8 | 4 | EXTRAVERSION = -rc9 |
| 5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index f13249be17c5..ef37fc1acaea 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
| @@ -25,6 +25,13 @@ SECTIONS | |||
| 25 | } :kernel | 25 | } :kernel |
| 26 | _etext = .; /* End of text section */ | 26 | _etext = .; /* End of text section */ |
| 27 | 27 | ||
| 28 | NOTES :kernel :note | ||
| 29 | .dummy : { | ||
| 30 | *(.dummy) | ||
| 31 | } :kernel | ||
| 32 | |||
| 33 | RODATA | ||
| 34 | |||
| 28 | /* Exception table */ | 35 | /* Exception table */ |
| 29 | . = ALIGN(16); | 36 | . = ALIGN(16); |
| 30 | __ex_table : { | 37 | __ex_table : { |
| @@ -33,13 +40,6 @@ SECTIONS | |||
| 33 | __stop___ex_table = .; | 40 | __stop___ex_table = .; |
| 34 | } | 41 | } |
| 35 | 42 | ||
| 36 | NOTES :kernel :note | ||
| 37 | .dummy : { | ||
| 38 | *(.dummy) | ||
| 39 | } :kernel | ||
| 40 | |||
| 41 | RODATA | ||
| 42 | |||
| 43 | /* Will be freed after init */ | 43 | /* Will be freed after init */ |
| 44 | . = ALIGN(PAGE_SIZE); | 44 | . = ALIGN(PAGE_SIZE); |
| 45 | /* Init code and data */ | 45 | /* Init code and data */ |
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 52fc6a883281..2744673314b4 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
| @@ -650,7 +650,8 @@ EXPORT_SYMBOL(dma_map_sg); | |||
| 650 | EXPORT_SYMBOL(dma_unmap_sg); | 650 | EXPORT_SYMBOL(dma_unmap_sg); |
| 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); | 651 | EXPORT_SYMBOL(dma_sync_single_for_cpu); |
| 652 | EXPORT_SYMBOL(dma_sync_single_for_device); | 652 | EXPORT_SYMBOL(dma_sync_single_for_device); |
| 653 | EXPORT_SYMBOL(dma_sync_sg); | 653 | EXPORT_SYMBOL(dma_sync_sg_for_cpu); |
| 654 | EXPORT_SYMBOL(dma_sync_sg_for_device); | ||
| 654 | EXPORT_SYMBOL(dmabounce_register_dev); | 655 | EXPORT_SYMBOL(dmabounce_register_dev); |
| 655 | EXPORT_SYMBOL(dmabounce_unregister_dev); | 656 | EXPORT_SYMBOL(dmabounce_unregister_dev); |
| 656 | 657 | ||
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 02cede295e89..dbf68dc50ae2 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #define GPMC_STATUS 0x54 | 42 | #define GPMC_STATUS 0x54 |
| 43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 | 43 | #define GPMC_PREFETCH_CONFIG1 0x1e0 |
| 44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 | 44 | #define GPMC_PREFETCH_CONFIG2 0x1e4 |
| 45 | #define GPMC_PREFETCH_CONTROL 0x1e8 | 45 | #define GPMC_PREFETCH_CONTROL 0x1ec |
| 46 | #define GPMC_PREFETCH_STATUS 0x1f0 | 46 | #define GPMC_PREFETCH_STATUS 0x1f0 |
| 47 | #define GPMC_ECC_CONFIG 0x1f4 | 47 | #define GPMC_ECC_CONFIG 0x1f4 |
| 48 | #define GPMC_ECC_CONTROL 0x1f8 | 48 | #define GPMC_ECC_CONTROL 0x1f8 |
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c index 3e57428affee..8e813ed57519 100644 --- a/arch/arm/mach-realview/platsmp.c +++ b/arch/arm/mach-realview/platsmp.c | |||
| @@ -74,6 +74,8 @@ static DEFINE_SPINLOCK(boot_lock); | |||
| 74 | 74 | ||
| 75 | void __cpuinit platform_secondary_init(unsigned int cpu) | 75 | void __cpuinit platform_secondary_init(unsigned int cpu) |
| 76 | { | 76 | { |
| 77 | trace_hardirqs_off(); | ||
| 78 | |||
| 77 | /* | 79 | /* |
| 78 | * the primary core may have used a "cross call" soft interrupt | 80 | * the primary core may have used a "cross call" soft interrupt |
| 79 | * to get this processor out of WFI in the BootMonitor - make | 81 | * to get this processor out of WFI in the BootMonitor - make |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c00eda588cd8..39c637b0ffea 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -501,8 +501,6 @@ static inline void omap_enable_channel_irq(int lch) | |||
| 501 | 501 | ||
| 502 | /* Enable some nice interrupts. */ | 502 | /* Enable some nice interrupts. */ |
| 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; | 503 | OMAP_DMA_CICR_REG(lch) = dma_chan[lch].enabled_irqs; |
| 504 | |||
| 505 | dma_chan[lch].flags |= OMAP_DMA_ACTIVE; | ||
| 506 | } | 504 | } |
| 507 | 505 | ||
| 508 | static void omap_disable_channel_irq(int lch) | 506 | static void omap_disable_channel_irq(int lch) |
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 917325bfbd84..6be0c50122e8 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
| @@ -254,7 +254,8 @@ close_cplbtab(struct cplb_tab *table) | |||
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | /* helper function */ | 256 | /* helper function */ |
| 257 | static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 257 | static void __init |
| 258 | __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
| 258 | { | 259 | { |
| 259 | if (cplb_data[i].psize) { | 260 | if (cplb_data[i].psize) { |
| 260 | fill_cplbtab(t, | 261 | fill_cplbtab(t, |
| @@ -291,7 +292,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en | |||
| 291 | } | 292 | } |
| 292 | } | 293 | } |
| 293 | 294 | ||
| 294 | static void __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | 295 | static void __init |
| 296 | __fill_data_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_end) | ||
| 295 | { | 297 | { |
| 296 | if (cplb_data[i].psize) { | 298 | if (cplb_data[i].psize) { |
| 297 | fill_cplbtab(t, | 299 | fill_cplbtab(t, |
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 73647c158774..07402f57c9de 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
| @@ -60,9 +60,14 @@ static struct irq_chip bad_chip = { | |||
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | static struct irq_desc bad_irq_desc = { | 62 | static struct irq_desc bad_irq_desc = { |
| 63 | .status = IRQ_DISABLED, | ||
| 63 | .chip = &bad_chip, | 64 | .chip = &bad_chip, |
| 64 | .handle_irq = handle_bad_irq, | 65 | .handle_irq = handle_bad_irq, |
| 65 | .depth = 1, | 66 | .depth = 1, |
| 67 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), | ||
| 68 | #ifdef CONFIG_SMP | ||
| 69 | .affinity = CPU_MASK_ALL | ||
| 70 | #endif | ||
| 66 | }; | 71 | }; |
| 67 | 72 | ||
| 68 | int show_interrupts(struct seq_file *p, void *v) | 73 | int show_interrupts(struct seq_file *p, void *v) |
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 4ae15c8c2488..632cda8f2e76 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
| @@ -547,7 +547,8 @@ setup_arch (char **cmdline_p) | |||
| 547 | # ifdef CONFIG_ACPI_NUMA | 547 | # ifdef CONFIG_ACPI_NUMA |
| 548 | acpi_numa_init(); | 548 | acpi_numa_init(); |
| 549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? | 549 | per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? |
| 550 | 32 : cpus_weight(early_cpu_possible_map)), additional_cpus); | 550 | 32 : cpus_weight(early_cpu_possible_map)), |
| 551 | additional_cpus > 0 ? additional_cpus : 0); | ||
| 551 | # endif | 552 | # endif |
| 552 | #else | 553 | #else |
| 553 | # ifdef CONFIG_SMP | 554 | # ifdef CONFIG_SMP |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 8c73643f2d66..aad1b7b1fff9 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -117,6 +117,7 @@ void account_system_vtime(struct task_struct *tsk) | |||
| 117 | 117 | ||
| 118 | local_irq_restore(flags); | 118 | local_irq_restore(flags); |
| 119 | } | 119 | } |
| 120 | EXPORT_SYMBOL_GPL(account_system_vtime); | ||
| 120 | 121 | ||
| 121 | /* | 122 | /* |
| 122 | * Called from the timer interrupt handler to charge accumulated user time | 123 | * Called from the timer interrupt handler to charge accumulated user time |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e5a7c5d96364..24c5dee91768 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -1006,7 +1006,7 @@ config BOOT_ELF32 | |||
| 1006 | config MIPS_L1_CACHE_SHIFT | 1006 | config MIPS_L1_CACHE_SHIFT |
| 1007 | int | 1007 | int |
| 1008 | default "4" if MACH_DECSTATION | 1008 | default "4" if MACH_DECSTATION |
| 1009 | default "7" if SGI_IP27 || SGI_IP28 || SNI_RM | 1009 | default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM |
| 1010 | default "4" if PMC_MSP4200_EVAL | 1010 | default "4" if PMC_MSP4200_EVAL |
| 1011 | default "5" | 1011 | default "5" |
| 1012 | 1012 | ||
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c index 795cb8fb0d74..b5fc4eb412d2 100644 --- a/arch/mips/kernel/cevt-txx9.c +++ b/arch/mips/kernel/cevt-txx9.c | |||
| @@ -161,6 +161,9 @@ void __init txx9_tmr_init(unsigned long baseaddr) | |||
| 161 | struct txx9_tmr_reg __iomem *tmrptr; | 161 | struct txx9_tmr_reg __iomem *tmrptr; |
| 162 | 162 | ||
| 163 | tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg)); | 163 | tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg)); |
| 164 | /* Start once to make CounterResetEnable effective */ | ||
| 165 | __raw_writel(TXx9_TMTCR_CRE | TXx9_TMTCR_TCE, &tmrptr->tcr); | ||
| 166 | /* Stop and reset the counter */ | ||
| 164 | __raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr); | 167 | __raw_writel(TXx9_TMTCR_CRE, &tmrptr->tcr); |
| 165 | __raw_writel(0, &tmrptr->tisr); | 168 | __raw_writel(0, &tmrptr->tisr); |
| 166 | __raw_writel(0xffffffff, &tmrptr->cpra); | 169 | __raw_writel(0xffffffff, &tmrptr->cpra); |
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index b0ea0e43ba48..0d6b6663d5f6 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
| @@ -425,6 +425,11 @@ static void ip32_irq0(void) | |||
| 425 | BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31); | 425 | BUILD_BUG_ON(MACEISA_SERIAL2_RDMAOR_IRQ - MACEISA_AUDIO_SW_IRQ != 31); |
| 426 | 426 | ||
| 427 | crime_int = crime->istat & crime_mask; | 427 | crime_int = crime->istat & crime_mask; |
| 428 | |||
| 429 | /* crime sometime delivers spurious interrupts, ignore them */ | ||
| 430 | if (unlikely(crime_int == 0)) | ||
| 431 | return; | ||
| 432 | |||
| 428 | irq = MACE_VID_IN1_IRQ + __ffs(crime_int); | 433 | irq = MACE_VID_IN1_IRQ + __ffs(crime_int); |
| 429 | 434 | ||
| 430 | if (crime_int & CRIME_MACEISA_INT_MASK) { | 435 | if (crime_int & CRIME_MACEISA_INT_MASK) { |
diff --git a/arch/mn10300/kernel/mn10300_ksyms.c b/arch/mn10300/kernel/mn10300_ksyms.c index 6d19628634e3..f9eb9753a404 100644 --- a/arch/mn10300/kernel/mn10300_ksyms.c +++ b/arch/mn10300/kernel/mn10300_ksyms.c | |||
| @@ -10,8 +10,11 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 13 | #include <asm/pgtable.h> | ||
| 13 | 14 | ||
| 14 | 15 | ||
| 16 | EXPORT_SYMBOL(empty_zero_page); | ||
| 17 | |||
| 15 | EXPORT_SYMBOL(change_bit); | 18 | EXPORT_SYMBOL(change_bit); |
| 16 | EXPORT_SYMBOL(test_and_change_bit); | 19 | EXPORT_SYMBOL(test_and_change_bit); |
| 17 | 20 | ||
| @@ -31,7 +34,9 @@ extern u64 __ashrdi3(u64, unsigned); | |||
| 31 | extern u64 __ashldi3(u64, unsigned); | 34 | extern u64 __ashldi3(u64, unsigned); |
| 32 | extern u64 __lshrdi3(u64, unsigned); | 35 | extern u64 __lshrdi3(u64, unsigned); |
| 33 | extern s64 __negdi2(s64); | 36 | extern s64 __negdi2(s64); |
| 37 | extern int __ucmpdi2(u64, u64); | ||
| 34 | EXPORT_SYMBOL(__ashrdi3); | 38 | EXPORT_SYMBOL(__ashrdi3); |
| 35 | EXPORT_SYMBOL(__ashldi3); | 39 | EXPORT_SYMBOL(__ashldi3); |
| 36 | EXPORT_SYMBOL(__lshrdi3); | 40 | EXPORT_SYMBOL(__lshrdi3); |
| 37 | EXPORT_SYMBOL(__negdi2); | 41 | EXPORT_SYMBOL(__negdi2); |
| 42 | EXPORT_SYMBOL(__ucmpdi2); | ||
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index 9c623c88387b..b28c9a60445b 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
| @@ -153,6 +153,7 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |||
| 153 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, | 153 | return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, ®s, 0, |
| 154 | NULL, NULL); | 154 | NULL, NULL); |
| 155 | } | 155 | } |
| 156 | EXPORT_SYMBOL(kernel_thread); | ||
| 156 | 157 | ||
| 157 | /* | 158 | /* |
| 158 | * free current thread data structures etc.. | 159 | * free current thread data structures etc.. |
diff --git a/arch/mn10300/lib/Makefile b/arch/mn10300/lib/Makefile index fdfa9ec5b5bb..0cd2346f4c13 100644 --- a/arch/mn10300/lib/Makefile +++ b/arch/mn10300/lib/Makefile | |||
| @@ -4,4 +4,4 @@ | |||
| 4 | 4 | ||
| 5 | lib-y = delay.o usercopy.o checksum.o bitops.o memcpy.o memmove.o memset.o | 5 | lib-y = delay.o usercopy.o checksum.o bitops.o memcpy.o memmove.o memset.o |
| 6 | lib-y += do_csum.o | 6 | lib-y += do_csum.o |
| 7 | lib-y += __ashldi3.o __ashrdi3.o __lshrdi3.o negdi2.o | 7 | lib-y += __ashldi3.o __ashrdi3.o __lshrdi3.o negdi2.o __ucmpdi2.o |
diff --git a/arch/mn10300/lib/__ucmpdi2.S b/arch/mn10300/lib/__ucmpdi2.S new file mode 100644 index 000000000000..60dcbdfe386c --- /dev/null +++ b/arch/mn10300/lib/__ucmpdi2.S | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | /* __ucmpdi2.S: 64-bit unsigned compare | ||
| 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 License | ||
| 8 | * as published by the Free Software Foundation; either version | ||
| 9 | * 2 of the License, or (at your option) any later version. | ||
| 10 | */ | ||
| 11 | |||
| 12 | |||
| 13 | .text | ||
| 14 | .p2align 4 | ||
| 15 | |||
| 16 | ############################################################################### | ||
| 17 | # | ||
| 18 | # int __ucmpdi2(unsigned long long a [D0:D1], | ||
| 19 | # unsigned long long b [(SP,12),(SP,16)]) | ||
| 20 | # | ||
| 21 | # - returns 0, 1, or 2 as a <, =, > b respectively. | ||
| 22 | # | ||
| 23 | ############################################################################### | ||
| 24 | .globl __ucmpdi2 | ||
| 25 | .type __ucmpdi2,@function | ||
| 26 | __ucmpdi2: | ||
| 27 | mov (12,sp),a0 # b.lsw | ||
| 28 | mov (16,sp),a1 # b.msw | ||
| 29 | |||
| 30 | sub a0,d0 | ||
| 31 | subc a1,d1 # may clear Z, never sets it | ||
| 32 | bne __ucmpdi2_differ # a.msw != b.msw | ||
| 33 | mov +1,d0 | ||
| 34 | rets | ||
| 35 | |||
| 36 | __ucmpdi2_differ: | ||
| 37 | # C flag is set if LE, clear if GE | ||
| 38 | subc d0,d0 # -1 if LE, 0 if GE | ||
| 39 | add +1,d0 # 0 if LE, 1 if GE | ||
| 40 | add d0,d0 # 0 if LE, 2 if GE | ||
| 41 | rets | ||
| 42 | |||
| 43 | .size __ucmpdi2, .-__ucmpdi2 | ||
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 1cee2f9fdf06..095e04db1c0e 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile | |||
| @@ -273,7 +273,8 @@ endif | |||
| 273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) | 273 | initrd- := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-)) |
| 274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ | 274 | initrd-y := $(patsubst zImage%, zImage.initrd%, \ |
| 275 | $(patsubst dtbImage%, dtbImage.initrd%, \ | 275 | $(patsubst dtbImage%, dtbImage.initrd%, \ |
| 276 | $(patsubst treeImage%, treeImage.initrd%, $(image-y)))) | 276 | $(patsubst simpleImage%, simpleImage.initrd%, \ |
| 277 | $(patsubst treeImage%, treeImage.initrd%, $(image-y))))) | ||
| 277 | initrd-y := $(filter-out $(image-y), $(initrd-y)) | 278 | initrd-y := $(filter-out $(image-y), $(initrd-y)) |
| 278 | targets += $(image-y) $(initrd-y) | 279 | targets += $(image-y) $(initrd-y) |
| 279 | 280 | ||
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 61dd17449ddc..cf37f5ca4b71 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c | |||
| @@ -136,6 +136,11 @@ static int __init add_legacy_soc_port(struct device_node *np, | |||
| 136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) | 136 | if (of_get_property(np, "clock-frequency", NULL) == NULL) |
| 137 | return -1; | 137 | return -1; |
| 138 | 138 | ||
| 139 | /* if reg-shift or offset, don't try to use it */ | ||
| 140 | if ((of_get_property(np, "reg-shift", NULL) != NULL) || | ||
| 141 | (of_get_property(np, "reg-offset", NULL) != NULL)) | ||
| 142 | return -1; | ||
| 143 | |||
| 139 | /* if rtas uses this device, don't try to use it as well */ | 144 | /* if rtas uses this device, don't try to use it as well */ |
| 140 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) | 145 | if (of_get_property(np, "used-by-rtas", NULL) != NULL) |
| 141 | return -1; | 146 | return -1; |
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c index 41c7fd91e99e..fe92e65103ed 100644 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c | |||
| @@ -14,6 +14,7 @@ static struct mpc52xx_sdma __iomem *bes; | |||
| 14 | static struct mpc52xx_xlb __iomem *xlb; | 14 | static struct mpc52xx_xlb __iomem *xlb; |
| 15 | static struct mpc52xx_gpio __iomem *gps; | 15 | static struct mpc52xx_gpio __iomem *gps; |
| 16 | static struct mpc52xx_gpio_wkup __iomem *gpw; | 16 | static struct mpc52xx_gpio_wkup __iomem *gpw; |
| 17 | static void __iomem *pci; | ||
| 17 | static void __iomem *sram; | 18 | static void __iomem *sram; |
| 18 | static const int sram_size = 0x4000; /* 16 kBytes */ | 19 | static const int sram_size = 0x4000; /* 16 kBytes */ |
| 19 | static void __iomem *mbar; | 20 | static void __iomem *mbar; |
| @@ -50,6 +51,8 @@ static int lite5200_pm_prepare(void) | |||
| 50 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ | 51 | { .type = "builtin", .compatible = "mpc5200", }, /* efika */ |
| 51 | {} | 52 | {} |
| 52 | }; | 53 | }; |
| 54 | u64 regaddr64 = 0; | ||
| 55 | const u32 *regaddr_p; | ||
| 53 | 56 | ||
| 54 | /* deep sleep? let mpc52xx code handle that */ | 57 | /* deep sleep? let mpc52xx code handle that */ |
| 55 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) | 58 | if (lite5200_pm_target_state == PM_SUSPEND_STANDBY) |
| @@ -60,8 +63,12 @@ static int lite5200_pm_prepare(void) | |||
| 60 | 63 | ||
| 61 | /* map registers */ | 64 | /* map registers */ |
| 62 | np = of_find_matching_node(NULL, immr_ids); | 65 | np = of_find_matching_node(NULL, immr_ids); |
| 63 | mbar = of_iomap(np, 0); | 66 | regaddr_p = of_get_address(np, 0, NULL, NULL); |
| 67 | if (regaddr_p) | ||
| 68 | regaddr64 = of_translate_address(np, regaddr_p); | ||
| 64 | of_node_put(np); | 69 | of_node_put(np); |
| 70 | |||
| 71 | mbar = ioremap((u32) regaddr64, 0xC000); | ||
| 65 | if (!mbar) { | 72 | if (!mbar) { |
| 66 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); | 73 | printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__); |
| 67 | return -ENOSYS; | 74 | return -ENOSYS; |
| @@ -71,6 +78,7 @@ static int lite5200_pm_prepare(void) | |||
| 71 | pic = mbar + 0x500; | 78 | pic = mbar + 0x500; |
| 72 | gps = mbar + 0xb00; | 79 | gps = mbar + 0xb00; |
| 73 | gpw = mbar + 0xc00; | 80 | gpw = mbar + 0xc00; |
| 81 | pci = mbar + 0xd00; | ||
| 74 | bes = mbar + 0x1200; | 82 | bes = mbar + 0x1200; |
| 75 | xlb = mbar + 0x1f00; | 83 | xlb = mbar + 0x1f00; |
| 76 | sram = mbar + 0x8000; | 84 | sram = mbar + 0x8000; |
| @@ -85,6 +93,7 @@ static struct mpc52xx_sdma sbes; | |||
| 85 | static struct mpc52xx_xlb sxlb; | 93 | static struct mpc52xx_xlb sxlb; |
| 86 | static struct mpc52xx_gpio sgps; | 94 | static struct mpc52xx_gpio sgps; |
| 87 | static struct mpc52xx_gpio_wkup sgpw; | 95 | static struct mpc52xx_gpio_wkup sgpw; |
| 96 | static char spci[0x200]; | ||
| 88 | 97 | ||
| 89 | static void lite5200_save_regs(void) | 98 | static void lite5200_save_regs(void) |
| 90 | { | 99 | { |
| @@ -94,6 +103,7 @@ static void lite5200_save_regs(void) | |||
| 94 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); | 103 | _memcpy_fromio(&sxlb, xlb, sizeof(*xlb)); |
| 95 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); | 104 | _memcpy_fromio(&sgps, gps, sizeof(*gps)); |
| 96 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); | 105 | _memcpy_fromio(&sgpw, gpw, sizeof(*gpw)); |
| 106 | _memcpy_fromio(spci, pci, 0x200); | ||
| 97 | 107 | ||
| 98 | _memcpy_fromio(saved_sram, sram, sram_size); | 108 | _memcpy_fromio(saved_sram, sram, sram_size); |
| 99 | } | 109 | } |
| @@ -103,6 +113,8 @@ static void lite5200_restore_regs(void) | |||
| 103 | int i; | 113 | int i; |
| 104 | _memcpy_toio(sram, saved_sram, sram_size); | 114 | _memcpy_toio(sram, saved_sram, sram_size); |
| 105 | 115 | ||
| 116 | /* PCI Configuration */ | ||
| 117 | _memcpy_toio(pci, spci, 0x200); | ||
| 106 | 118 | ||
| 107 | /* | 119 | /* |
| 108 | * GPIOs. Interrupt Master Enable has higher address then other | 120 | * GPIOs. Interrupt Master Enable has higher address then other |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e0edaaa6920a..5d2858119930 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -251,7 +251,7 @@ config X86_ELAN | |||
| 251 | 251 | ||
| 252 | config X86_VOYAGER | 252 | config X86_VOYAGER |
| 253 | bool "Voyager (NCR)" | 253 | bool "Voyager (NCR)" |
| 254 | depends on X86_32 && (SMP || BROKEN) | 254 | depends on X86_32 && (SMP || BROKEN) && !PCI |
| 255 | help | 255 | help |
| 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
| 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
| @@ -263,7 +263,7 @@ config X86_VOYAGER | |||
| 263 | 263 | ||
| 264 | config X86_NUMAQ | 264 | config X86_NUMAQ |
| 265 | bool "NUMAQ (IBM/Sequent)" | 265 | bool "NUMAQ (IBM/Sequent)" |
| 266 | depends on SMP && X86_32 | 266 | depends on SMP && X86_32 && PCI |
| 267 | select NUMA | 267 | select NUMA |
| 268 | help | 268 | help |
| 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA |
| @@ -293,7 +293,7 @@ config X86_BIGSMP | |||
| 293 | 293 | ||
| 294 | config X86_VISWS | 294 | config X86_VISWS |
| 295 | bool "SGI 320/540 (Visual Workstation)" | 295 | bool "SGI 320/540 (Visual Workstation)" |
| 296 | depends on X86_32 | 296 | depends on X86_32 && !PCI |
| 297 | help | 297 | help |
| 298 | The SGI Visual Workstation series is an IA32-based workstation | 298 | The SGI Visual Workstation series is an IA32-based workstation |
| 299 | based on SGI systems chips with some legacy PC hardware attached. | 299 | based on SGI systems chips with some legacy PC hardware attached. |
| @@ -337,7 +337,7 @@ config X86_RDC321X | |||
| 337 | config X86_VSMP | 337 | config X86_VSMP |
| 338 | bool "Support for ScaleMP vSMP" | 338 | bool "Support for ScaleMP vSMP" |
| 339 | select PARAVIRT | 339 | select PARAVIRT |
| 340 | depends on X86_64 | 340 | depends on X86_64 && !PCI |
| 341 | help | 341 | help |
| 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
| 343 | supposed to run on these EM64T-based machines. Only choose this option | 343 | supposed to run on these EM64T-based machines. Only choose this option |
| @@ -417,35 +417,19 @@ config PARAVIRT_CLOCK | |||
| 417 | 417 | ||
| 418 | endif | 418 | endif |
| 419 | 419 | ||
| 420 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST |
| 421 | bool "Memtest boot parameter" | 421 | bool "Memtest" |
| 422 | depends on X86_64 | 422 | depends on X86_64 |
| 423 | default y | 423 | default y |
| 424 | help | 424 | help |
| 425 | This option adds a kernel parameter 'memtest', which allows memtest | 425 | This option adds a kernel parameter 'memtest', which allows memtest |
| 426 | to be disabled at boot. If this option is selected, memtest | 426 | to be set. |
| 427 | functionality can be disabled with memtest=0 on the kernel | 427 | memtest=0, mean disabled; -- default |
| 428 | command line. The purpose of this option is to allow a single | 428 | memtest=1, mean do 1 test pattern; |
| 429 | kernel image to be distributed with memtest built in, but not | 429 | ... |
| 430 | necessarily enabled. | 430 | memtest=4, mean do 4 test patterns. |
| 431 | |||
| 432 | If you are unsure how to answer this question, answer Y. | 431 | If you are unsure how to answer this question, answer Y. |
| 433 | 432 | ||
| 434 | config MEMTEST_BOOTPARAM_VALUE | ||
| 435 | int "Memtest boot parameter default value (0-4)" | ||
| 436 | depends on MEMTEST_BOOTPARAM | ||
| 437 | range 0 4 | ||
| 438 | default 0 | ||
| 439 | help | ||
| 440 | This option sets the default value for the kernel parameter | ||
| 441 | 'memtest', which allows memtest to be disabled at boot. If this | ||
| 442 | option is set to 0 (zero), the memtest kernel parameter will | ||
| 443 | default to 0, disabling memtest at bootup. If this option is | ||
| 444 | set to 4, the memtest kernel parameter will default to 4, | ||
| 445 | enabling memtest at bootup, and use that as pattern number. | ||
| 446 | |||
| 447 | If you are unsure how to answer this question, answer 0. | ||
| 448 | |||
| 449 | config ACPI_SRAT | 433 | config ACPI_SRAT |
| 450 | def_bool y | 434 | def_bool y |
| 451 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 435 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
| @@ -563,18 +547,18 @@ config IOMMU_HELPER | |||
| 563 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) |
| 564 | 548 | ||
| 565 | config NR_CPUS | 549 | config NR_CPUS |
| 566 | int "Maximum number of CPUs (2-255)" | 550 | int "Maximum number of CPUs (2-4096)" |
| 567 | range 2 255 | 551 | range 2 4096 |
| 568 | depends on SMP | 552 | depends on SMP |
| 569 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
| 570 | default "8" | 554 | default "8" |
| 571 | help | 555 | help |
| 572 | This allows you to specify the maximum number of CPUs which this | 556 | This allows you to specify the maximum number of CPUs which this |
| 573 | kernel will support. The maximum supported value is 255 and the | 557 | kernel will support. The maximum supported value is 4096 and the |
| 574 | minimum value which makes sense is 2. | 558 | minimum value which makes sense is 2. |
| 575 | 559 | ||
| 576 | This is purely to save memory - each supported CPU adds | 560 | This is purely to save memory - each supported CPU adds |
| 577 | approximately eight kilobytes to the kernel image. | 561 | approximately one kilobyte to the kernel image. |
| 578 | 562 | ||
| 579 | config SCHED_SMT | 563 | config SCHED_SMT |
| 580 | bool "SMT (Hyperthreading) scheduler support" | 564 | bool "SMT (Hyperthreading) scheduler support" |
| @@ -966,8 +950,8 @@ config NUMA_EMU | |||
| 966 | number of nodes. This is only useful for debugging. | 950 | number of nodes. This is only useful for debugging. |
| 967 | 951 | ||
| 968 | config NODES_SHIFT | 952 | config NODES_SHIFT |
| 969 | int "Max num nodes shift(1-15)" | 953 | int "Max num nodes shift(1-9)" |
| 970 | range 1 15 if X86_64 | 954 | range 1 9 if X86_64 |
| 971 | default "6" if X86_64 | 955 | default "6" if X86_64 |
| 972 | default "4" if X86_NUMAQ | 956 | default "4" if X86_NUMAQ |
| 973 | default "3" | 957 | default "3" |
| @@ -1475,8 +1459,7 @@ endmenu | |||
| 1475 | menu "Bus options (PCI etc.)" | 1459 | menu "Bus options (PCI etc.)" |
| 1476 | 1460 | ||
| 1477 | config PCI | 1461 | config PCI |
| 1478 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1462 | bool "PCI support" |
| 1479 | depends on !X86_VOYAGER | ||
| 1480 | default y | 1463 | default y |
| 1481 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1464 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
| 1482 | help | 1465 | help |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2ad6301849a1..3d22bb8175b4 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -399,6 +399,10 @@ config X86_TSC | |||
| 399 | def_bool y | 399 | def_bool y |
| 400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 | 400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 |
| 401 | 401 | ||
| 402 | config X86_CMPXCHG64 | ||
| 403 | def_bool y | ||
| 404 | depends on X86_PAE || X86_64 | ||
| 405 | |||
| 402 | # this should be set for all -march=.. options where the compiler | 406 | # this should be set for all -march=.. options where the compiler |
| 403 | # generates cmov. | 407 | # generates cmov. |
| 404 | config X86_CMOV | 408 | config X86_CMOV |
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 3cff3c894cf3..5df0d1e330b1 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -210,12 +210,12 @@ all: bzImage | |||
| 210 | 210 | ||
| 211 | # KBUILD_IMAGE specify target image being built | 211 | # KBUILD_IMAGE specify target image being built |
| 212 | KBUILD_IMAGE := $(boot)/bzImage | 212 | KBUILD_IMAGE := $(boot)/bzImage |
| 213 | zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage | 213 | zImage zlilo zdisk: KBUILD_IMAGE := $(boot)/zImage |
| 214 | 214 | ||
| 215 | zImage bzImage: vmlinux | 215 | zImage bzImage: vmlinux |
| 216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) | 216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) |
| 217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot | 217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot |
| 218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/bzImage | 218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@ |
| 219 | 219 | ||
| 220 | compressed: zImage | 220 | compressed: zImage |
| 221 | 221 | ||
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index d8819efac81d..1d5dff4123e1 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <asm/page.h> | 30 | #include <asm/page.h> |
| 31 | #include <asm/boot.h> | 31 | #include <asm/boot.h> |
| 32 | #include <asm/msr.h> | 32 | #include <asm/msr.h> |
| 33 | #include <asm/processor-flags.h> | ||
| 33 | #include <asm/asm-offsets.h> | 34 | #include <asm/asm-offsets.h> |
| 34 | 35 | ||
| 35 | .section ".text.head" | 36 | .section ".text.head" |
| @@ -109,7 +110,7 @@ startup_32: | |||
| 109 | 110 | ||
| 110 | /* Enable PAE mode */ | 111 | /* Enable PAE mode */ |
| 111 | xorl %eax, %eax | 112 | xorl %eax, %eax |
| 112 | orl $(1 << 5), %eax | 113 | orl $(X86_CR4_PAE), %eax |
| 113 | movl %eax, %cr4 | 114 | movl %eax, %cr4 |
| 114 | 115 | ||
| 115 | /* | 116 | /* |
| @@ -170,7 +171,7 @@ startup_32: | |||
| 170 | pushl %eax | 171 | pushl %eax |
| 171 | 172 | ||
| 172 | /* Enter paged protected Mode, activating Long Mode */ | 173 | /* Enter paged protected Mode, activating Long Mode */ |
| 173 | movl $0x80000001, %eax /* Enable Paging and Protected mode */ | 174 | movl $(X86_CR0_PG | X86_CR0_PE), %eax /* Enable Paging and Protected mode */ |
| 174 | movl %eax, %cr0 | 175 | movl %eax, %cr0 |
| 175 | 176 | ||
| 176 | /* Jump from 32bit compatibility mode into 64bit mode. */ | 177 | /* Jump from 32bit compatibility mode into 64bit mode. */ |
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c index 40ecb8d7688c..b939cb476dec 100644 --- a/arch/x86/boot/video-vga.c +++ b/arch/x86/boot/video-vga.c | |||
| @@ -259,8 +259,7 @@ static int vga_probe(void) | |||
| 259 | return mode_count[adapter]; | 259 | return mode_count[adapter]; |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | __videocard video_vga = | 262 | __videocard video_vga = { |
| 263 | { | ||
| 264 | .card_name = "VGA", | 263 | .card_name = "VGA", |
| 265 | .probe = vga_probe, | 264 | .probe = vga_probe, |
| 266 | .set_mode = vga_set_mode, | 265 | .set_mode = vga_set_mode, |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index ad7ddaaff588..9bc34e2033ec 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
| @@ -1,54 +1,103 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:02 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | ||
| 6 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
| 8 | # CONFIG_X86_64 is not set | ||
| 9 | CONFIG_X86=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig" | ||
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
| 7 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 13 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 8 | CONFIG_CLOCKSOURCE_WATCHDOG=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
| 9 | CONFIG_GENERIC_CLOCKEVENTS=y | 15 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 10 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | 16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y |
| 11 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
| 12 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
| 13 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 14 | CONFIG_X86=y | 20 | CONFIG_FAST_CMPXCHG_LOCAL=y |
| 15 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
| 16 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
| 17 | CONFIG_QUICKLIST=y | ||
| 18 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
| 19 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
| 20 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
| 21 | CONFIG_GENERIC_HWEIGHT=y | 26 | CONFIG_GENERIC_HWEIGHT=y |
| 27 | # CONFIG_GENERIC_GPIO is not set | ||
| 22 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 23 | CONFIG_DMI=y | 29 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set |
| 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 30 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | ||
| 34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 35 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | ||
| 36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
| 37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
| 38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 39 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set | ||
| 40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 42 | # CONFIG_ZONE_DMA32 is not set | ||
| 43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 44 | # CONFIG_AUDIT_ARCH is not set | ||
| 45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
| 47 | CONFIG_GENERIC_HARDIRQS=y | ||
| 48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 50 | CONFIG_X86_SMP=y | ||
| 51 | CONFIG_X86_32_SMP=y | ||
| 52 | CONFIG_X86_HT=y | ||
| 53 | CONFIG_X86_BIOS_REBOOT=y | ||
| 54 | CONFIG_X86_TRAMPOLINE=y | ||
| 55 | CONFIG_KTIME_SCALAR=y | ||
| 25 | 56 | ||
| 26 | # | 57 | # |
| 27 | # Code maturity level options | 58 | # General setup |
| 28 | # | 59 | # |
| 29 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
| 30 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
| 31 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 32 | |||
| 33 | # | ||
| 34 | # General setup | ||
| 35 | # | ||
| 36 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
| 37 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
| 38 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
| 39 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
| 40 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
| 41 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
| 42 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
| 43 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 44 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
| 45 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
| 46 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
| 47 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
| 48 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
| 49 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
| 50 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
| 78 | # CONFIG_IKCONFIG is not set | ||
| 79 | CONFIG_LOG_BUF_SHIFT=17 | ||
| 80 | CONFIG_CGROUPS=y | ||
| 81 | # CONFIG_CGROUP_DEBUG is not set | ||
| 82 | CONFIG_CGROUP_NS=y | ||
| 83 | # CONFIG_CGROUP_DEVICE is not set | ||
| 84 | CONFIG_CPUSETS=y | ||
| 85 | CONFIG_GROUP_SCHED=y | ||
| 86 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 87 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 88 | # CONFIG_USER_SCHED is not set | ||
| 89 | CONFIG_CGROUP_SCHED=y | ||
| 90 | CONFIG_CGROUP_CPUACCT=y | ||
| 91 | CONFIG_RESOURCE_COUNTERS=y | ||
| 92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
| 93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 94 | CONFIG_PROC_PID_CPUSET=y | ||
| 51 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
| 96 | CONFIG_NAMESPACES=y | ||
| 97 | CONFIG_UTS_NS=y | ||
| 98 | CONFIG_IPC_NS=y | ||
| 99 | CONFIG_USER_NS=y | ||
| 100 | CONFIG_PID_NS=y | ||
| 52 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
| 53 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -56,13 +105,15 @@ CONFIG_SYSCTL=y | |||
| 56 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
| 57 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
| 58 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 59 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 60 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 62 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
| 63 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
| 64 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
| 65 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
| 116 | # CONFIG_COMPAT_BRK is not set | ||
| 66 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
| 67 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
| 68 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
| @@ -76,6 +127,17 @@ CONFIG_SLUB_DEBUG=y | |||
| 76 | # CONFIG_SLAB is not set | 127 | # CONFIG_SLAB is not set |
| 77 | CONFIG_SLUB=y | 128 | CONFIG_SLUB=y |
| 78 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
| 130 | CONFIG_PROFILING=y | ||
| 131 | CONFIG_MARKERS=y | ||
| 132 | # CONFIG_OPROFILE is not set | ||
| 133 | CONFIG_HAVE_OPROFILE=y | ||
| 134 | CONFIG_KPROBES=y | ||
| 135 | CONFIG_KRETPROBES=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | ||
| 137 | CONFIG_HAVE_KRETPROBES=y | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 140 | CONFIG_SLABINFO=y | ||
| 79 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 80 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 81 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| @@ -87,10 +149,10 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
| 87 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
| 88 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
| 89 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
| 90 | CONFIG_LBD=y | 152 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 153 | CONFIG_BLK_DEV_IO_TRACE=y |
| 92 | # CONFIG_LSF is not set | 154 | # CONFIG_LSF is not set |
| 93 | # CONFIG_BLK_DEV_BSG is not set | 155 | CONFIG_BLK_DEV_BSG=y |
| 94 | 156 | ||
| 95 | # | 157 | # |
| 96 | # IO Schedulers | 158 | # IO Schedulers |
| @@ -103,7 +165,8 @@ CONFIG_IOSCHED_CFQ=y | |||
| 103 | # CONFIG_DEFAULT_DEADLINE is not set | 165 | # CONFIG_DEFAULT_DEADLINE is not set |
| 104 | CONFIG_DEFAULT_CFQ=y | 166 | CONFIG_DEFAULT_CFQ=y |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 167 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 168 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 169 | CONFIG_CLASSIC_RCU=y | ||
| 107 | 170 | ||
| 108 | # | 171 | # |
| 109 | # Processor type and features | 172 | # Processor type and features |
| @@ -111,18 +174,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 111 | CONFIG_TICK_ONESHOT=y | 174 | CONFIG_TICK_ONESHOT=y |
| 112 | CONFIG_NO_HZ=y | 175 | CONFIG_NO_HZ=y |
| 113 | CONFIG_HIGH_RES_TIMERS=y | 176 | CONFIG_HIGH_RES_TIMERS=y |
| 177 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 114 | CONFIG_SMP=y | 178 | CONFIG_SMP=y |
| 115 | # CONFIG_X86_PC is not set | 179 | CONFIG_X86_PC=y |
| 116 | # CONFIG_X86_ELAN is not set | 180 | # CONFIG_X86_ELAN is not set |
| 117 | # CONFIG_X86_VOYAGER is not set | 181 | # CONFIG_X86_VOYAGER is not set |
| 118 | # CONFIG_X86_NUMAQ is not set | 182 | # CONFIG_X86_NUMAQ is not set |
| 119 | # CONFIG_X86_SUMMIT is not set | 183 | # CONFIG_X86_SUMMIT is not set |
| 120 | # CONFIG_X86_BIGSMP is not set | 184 | # CONFIG_X86_BIGSMP is not set |
| 121 | # CONFIG_X86_VISWS is not set | 185 | # CONFIG_X86_VISWS is not set |
| 122 | CONFIG_X86_GENERICARCH=y | 186 | # CONFIG_X86_GENERICARCH is not set |
| 123 | # CONFIG_X86_ES7000 is not set | 187 | # CONFIG_X86_ES7000 is not set |
| 124 | # CONFIG_PARAVIRT is not set | 188 | # CONFIG_X86_RDC321X is not set |
| 125 | CONFIG_X86_CYCLONE_TIMER=y | 189 | # CONFIG_X86_VSMP is not set |
| 190 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 191 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 126 | # CONFIG_M386 is not set | 192 | # CONFIG_M386 is not set |
| 127 | # CONFIG_M486 is not set | 193 | # CONFIG_M486 is not set |
| 128 | # CONFIG_M586 is not set | 194 | # CONFIG_M586 is not set |
| @@ -130,9 +196,8 @@ CONFIG_X86_CYCLONE_TIMER=y | |||
| 130 | # CONFIG_M586MMX is not set | 196 | # CONFIG_M586MMX is not set |
| 131 | # CONFIG_M686 is not set | 197 | # CONFIG_M686 is not set |
| 132 | # CONFIG_MPENTIUMII is not set | 198 | # CONFIG_MPENTIUMII is not set |
| 133 | CONFIG_MPENTIUMIII=y | 199 | # CONFIG_MPENTIUMIII is not set |
| 134 | # CONFIG_MPENTIUMM is not set | 200 | # CONFIG_MPENTIUMM is not set |
| 135 | # CONFIG_MCORE2 is not set | ||
| 136 | # CONFIG_MPENTIUM4 is not set | 201 | # CONFIG_MPENTIUM4 is not set |
| 137 | # CONFIG_MK6 is not set | 202 | # CONFIG_MK6 is not set |
| 138 | # CONFIG_MK7 is not set | 203 | # CONFIG_MK7 is not set |
| @@ -147,14 +212,14 @@ CONFIG_MPENTIUMIII=y | |||
| 147 | # CONFIG_MCYRIXIII is not set | 212 | # CONFIG_MCYRIXIII is not set |
| 148 | # CONFIG_MVIAC3_2 is not set | 213 | # CONFIG_MVIAC3_2 is not set |
| 149 | # CONFIG_MVIAC7 is not set | 214 | # CONFIG_MVIAC7 is not set |
| 150 | CONFIG_X86_GENERIC=y | 215 | # CONFIG_MPSC is not set |
| 216 | CONFIG_MCORE2=y | ||
| 217 | # CONFIG_GENERIC_CPU is not set | ||
| 218 | # CONFIG_X86_GENERIC is not set | ||
| 219 | CONFIG_X86_CPU=y | ||
| 151 | CONFIG_X86_CMPXCHG=y | 220 | CONFIG_X86_CMPXCHG=y |
| 152 | CONFIG_X86_L1_CACHE_SHIFT=7 | 221 | CONFIG_X86_L1_CACHE_SHIFT=6 |
| 153 | CONFIG_X86_XADD=y | 222 | CONFIG_X86_XADD=y |
| 154 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 155 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 156 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 157 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 158 | CONFIG_X86_WP_WORKS_OK=y | 223 | CONFIG_X86_WP_WORKS_OK=y |
| 159 | CONFIG_X86_INVLPG=y | 224 | CONFIG_X86_INVLPG=y |
| 160 | CONFIG_X86_BSWAP=y | 225 | CONFIG_X86_BSWAP=y |
| @@ -162,106 +227,120 @@ CONFIG_X86_POPAD_OK=y | |||
| 162 | CONFIG_X86_GOOD_APIC=y | 227 | CONFIG_X86_GOOD_APIC=y |
| 163 | CONFIG_X86_INTEL_USERCOPY=y | 228 | CONFIG_X86_INTEL_USERCOPY=y |
| 164 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 229 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 230 | CONFIG_X86_P6_NOP=y | ||
| 165 | CONFIG_X86_TSC=y | 231 | CONFIG_X86_TSC=y |
| 166 | CONFIG_X86_CMOV=y | 232 | CONFIG_X86_MINIMUM_CPU_FAMILY=6 |
| 167 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 | 233 | CONFIG_X86_DEBUGCTLMSR=y |
| 168 | CONFIG_HPET_TIMER=y | 234 | CONFIG_HPET_TIMER=y |
| 169 | CONFIG_HPET_EMULATE_RTC=y | 235 | CONFIG_HPET_EMULATE_RTC=y |
| 170 | CONFIG_NR_CPUS=32 | 236 | CONFIG_DMI=y |
| 171 | CONFIG_SCHED_SMT=y | 237 | # CONFIG_IOMMU_HELPER is not set |
| 238 | CONFIG_NR_CPUS=4 | ||
| 239 | # CONFIG_SCHED_SMT is not set | ||
| 172 | CONFIG_SCHED_MC=y | 240 | CONFIG_SCHED_MC=y |
| 173 | # CONFIG_PREEMPT_NONE is not set | 241 | # CONFIG_PREEMPT_NONE is not set |
| 174 | CONFIG_PREEMPT_VOLUNTARY=y | 242 | CONFIG_PREEMPT_VOLUNTARY=y |
| 175 | # CONFIG_PREEMPT is not set | 243 | # CONFIG_PREEMPT is not set |
| 176 | CONFIG_PREEMPT_BKL=y | ||
| 177 | CONFIG_X86_LOCAL_APIC=y | 244 | CONFIG_X86_LOCAL_APIC=y |
| 178 | CONFIG_X86_IO_APIC=y | 245 | CONFIG_X86_IO_APIC=y |
| 179 | CONFIG_X86_MCE=y | 246 | # CONFIG_X86_MCE is not set |
| 180 | CONFIG_X86_MCE_NONFATAL=y | ||
| 181 | CONFIG_X86_MCE_P4THERMAL=y | ||
| 182 | CONFIG_VM86=y | 247 | CONFIG_VM86=y |
| 183 | # CONFIG_TOSHIBA is not set | 248 | # CONFIG_TOSHIBA is not set |
| 184 | # CONFIG_I8K is not set | 249 | # CONFIG_I8K is not set |
| 185 | # CONFIG_X86_REBOOTFIXUPS is not set | 250 | # CONFIG_X86_REBOOTFIXUPS is not set |
| 186 | CONFIG_MICROCODE=y | 251 | # CONFIG_MICROCODE is not set |
| 187 | CONFIG_MICROCODE_OLD_INTERFACE=y | ||
| 188 | CONFIG_X86_MSR=y | 252 | CONFIG_X86_MSR=y |
| 189 | CONFIG_X86_CPUID=y | 253 | CONFIG_X86_CPUID=y |
| 190 | |||
| 191 | # | ||
| 192 | # Firmware Drivers | ||
| 193 | # | ||
| 194 | # CONFIG_EDD is not set | ||
| 195 | # CONFIG_DELL_RBU is not set | ||
| 196 | # CONFIG_DCDBAS is not set | ||
| 197 | CONFIG_DMIID=y | ||
| 198 | # CONFIG_NOHIGHMEM is not set | 254 | # CONFIG_NOHIGHMEM is not set |
| 199 | CONFIG_HIGHMEM4G=y | 255 | CONFIG_HIGHMEM4G=y |
| 200 | # CONFIG_HIGHMEM64G is not set | 256 | # CONFIG_HIGHMEM64G is not set |
| 201 | CONFIG_PAGE_OFFSET=0xC0000000 | 257 | CONFIG_PAGE_OFFSET=0xC0000000 |
| 202 | CONFIG_HIGHMEM=y | 258 | CONFIG_HIGHMEM=y |
| 203 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 259 | CONFIG_NEED_NODE_MEMMAP_SIZE=y |
| 260 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 261 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 262 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 204 | CONFIG_SELECT_MEMORY_MODEL=y | 263 | CONFIG_SELECT_MEMORY_MODEL=y |
| 205 | CONFIG_FLATMEM_MANUAL=y | 264 | # CONFIG_FLATMEM_MANUAL is not set |
| 206 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 265 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 207 | # CONFIG_SPARSEMEM_MANUAL is not set | 266 | CONFIG_SPARSEMEM_MANUAL=y |
| 208 | CONFIG_FLATMEM=y | 267 | CONFIG_SPARSEMEM=y |
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 268 | CONFIG_HAVE_MEMORY_PRESENT=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 269 | CONFIG_SPARSEMEM_STATIC=y |
| 270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 271 | |||
| 272 | # | ||
| 273 | # Memory hotplug is currently incompatible with Software Suspend | ||
| 274 | # | ||
| 275 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 276 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | CONFIG_RESOURCES_64BIT=y | 277 | CONFIG_RESOURCES_64BIT=y |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 278 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 279 | CONFIG_BOUNCE=y |
| 215 | CONFIG_NR_QUICK=1 | ||
| 216 | CONFIG_VIRT_TO_BUS=y | 280 | CONFIG_VIRT_TO_BUS=y |
| 217 | # CONFIG_HIGHPTE is not set | 281 | # CONFIG_HIGHPTE is not set |
| 218 | # CONFIG_MATH_EMULATION is not set | 282 | # CONFIG_MATH_EMULATION is not set |
| 219 | CONFIG_MTRR=y | 283 | CONFIG_MTRR=y |
| 220 | # CONFIG_EFI is not set | 284 | # CONFIG_X86_PAT is not set |
| 285 | CONFIG_EFI=y | ||
| 221 | # CONFIG_IRQBALANCE is not set | 286 | # CONFIG_IRQBALANCE is not set |
| 222 | CONFIG_SECCOMP=y | 287 | CONFIG_SECCOMP=y |
| 223 | # CONFIG_HZ_100 is not set | 288 | # CONFIG_HZ_100 is not set |
| 224 | CONFIG_HZ_250=y | 289 | # CONFIG_HZ_250 is not set |
| 225 | # CONFIG_HZ_300 is not set | 290 | # CONFIG_HZ_300 is not set |
| 226 | # CONFIG_HZ_1000 is not set | 291 | CONFIG_HZ_1000=y |
| 227 | CONFIG_HZ=250 | 292 | CONFIG_HZ=1000 |
| 228 | # CONFIG_KEXEC is not set | 293 | CONFIG_SCHED_HRTICK=y |
| 229 | # CONFIG_CRASH_DUMP is not set | 294 | CONFIG_KEXEC=y |
| 230 | CONFIG_PHYSICAL_START=0x100000 | 295 | CONFIG_CRASH_DUMP=y |
| 231 | # CONFIG_RELOCATABLE is not set | 296 | CONFIG_PHYSICAL_START=0x1000000 |
| 232 | CONFIG_PHYSICAL_ALIGN=0x100000 | 297 | CONFIG_RELOCATABLE=y |
| 233 | # CONFIG_HOTPLUG_CPU is not set | 298 | CONFIG_PHYSICAL_ALIGN=0x200000 |
| 234 | CONFIG_COMPAT_VDSO=y | 299 | CONFIG_HOTPLUG_CPU=y |
| 300 | # CONFIG_COMPAT_VDSO is not set | ||
| 235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 301 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 236 | 302 | ||
| 237 | # | 303 | # |
| 238 | # Power management options (ACPI, APM) | 304 | # Power management options |
| 239 | # | 305 | # |
| 240 | CONFIG_PM=y | 306 | CONFIG_PM=y |
| 241 | CONFIG_PM_LEGACY=y | 307 | CONFIG_PM_DEBUG=y |
| 242 | # CONFIG_PM_DEBUG is not set | 308 | # CONFIG_PM_VERBOSE is not set |
| 243 | 309 | CONFIG_CAN_PM_TRACE=y | |
| 244 | # | 310 | CONFIG_PM_TRACE=y |
| 245 | # ACPI (Advanced Configuration and Power Interface) Support | 311 | CONFIG_PM_TRACE_RTC=y |
| 246 | # | 312 | CONFIG_PM_SLEEP_SMP=y |
| 313 | CONFIG_PM_SLEEP=y | ||
| 314 | CONFIG_SUSPEND=y | ||
| 315 | CONFIG_SUSPEND_FREEZER=y | ||
| 316 | CONFIG_HIBERNATION=y | ||
| 317 | CONFIG_PM_STD_PARTITION="" | ||
| 247 | CONFIG_ACPI=y | 318 | CONFIG_ACPI=y |
| 319 | CONFIG_ACPI_SLEEP=y | ||
| 248 | CONFIG_ACPI_PROCFS=y | 320 | CONFIG_ACPI_PROCFS=y |
| 321 | CONFIG_ACPI_PROCFS_POWER=y | ||
| 322 | CONFIG_ACPI_SYSFS_POWER=y | ||
| 323 | CONFIG_ACPI_PROC_EVENT=y | ||
| 249 | CONFIG_ACPI_AC=y | 324 | CONFIG_ACPI_AC=y |
| 250 | CONFIG_ACPI_BATTERY=y | 325 | CONFIG_ACPI_BATTERY=y |
| 251 | CONFIG_ACPI_BUTTON=y | 326 | CONFIG_ACPI_BUTTON=y |
| 252 | CONFIG_ACPI_FAN=y | 327 | CONFIG_ACPI_FAN=y |
| 253 | # CONFIG_ACPI_DOCK is not set | 328 | CONFIG_ACPI_DOCK=y |
| 329 | # CONFIG_ACPI_BAY is not set | ||
| 254 | CONFIG_ACPI_PROCESSOR=y | 330 | CONFIG_ACPI_PROCESSOR=y |
| 331 | CONFIG_ACPI_HOTPLUG_CPU=y | ||
| 255 | CONFIG_ACPI_THERMAL=y | 332 | CONFIG_ACPI_THERMAL=y |
| 333 | # CONFIG_ACPI_WMI is not set | ||
| 256 | # CONFIG_ACPI_ASUS is not set | 334 | # CONFIG_ACPI_ASUS is not set |
| 257 | # CONFIG_ACPI_TOSHIBA is not set | 335 | # CONFIG_ACPI_TOSHIBA is not set |
| 258 | CONFIG_ACPI_BLACKLIST_YEAR=2001 | 336 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
| 259 | CONFIG_ACPI_DEBUG=y | 337 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 338 | # CONFIG_ACPI_DEBUG is not set | ||
| 260 | CONFIG_ACPI_EC=y | 339 | CONFIG_ACPI_EC=y |
| 261 | CONFIG_ACPI_POWER=y | 340 | CONFIG_ACPI_POWER=y |
| 262 | CONFIG_ACPI_SYSTEM=y | 341 | CONFIG_ACPI_SYSTEM=y |
| 263 | CONFIG_X86_PM_TIMER=y | 342 | CONFIG_X86_PM_TIMER=y |
| 264 | # CONFIG_ACPI_CONTAINER is not set | 343 | CONFIG_ACPI_CONTAINER=y |
| 265 | # CONFIG_ACPI_SBS is not set | 344 | # CONFIG_ACPI_SBS is not set |
| 266 | # CONFIG_APM is not set | 345 | # CONFIG_APM is not set |
| 267 | 346 | ||
| @@ -271,15 +350,17 @@ CONFIG_X86_PM_TIMER=y | |||
| 271 | CONFIG_CPU_FREQ=y | 350 | CONFIG_CPU_FREQ=y |
| 272 | CONFIG_CPU_FREQ_TABLE=y | 351 | CONFIG_CPU_FREQ_TABLE=y |
| 273 | CONFIG_CPU_FREQ_DEBUG=y | 352 | CONFIG_CPU_FREQ_DEBUG=y |
| 274 | CONFIG_CPU_FREQ_STAT=y | 353 | # CONFIG_CPU_FREQ_STAT is not set |
| 275 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 354 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 276 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
| 277 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 356 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
| 357 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 278 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 359 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 279 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 360 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| 280 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 361 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
| 281 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 362 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
| 282 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 363 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
| 283 | 364 | ||
| 284 | # | 365 | # |
| 285 | # CPUFreq processor drivers | 366 | # CPUFreq processor drivers |
| @@ -287,8 +368,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |||
| 287 | CONFIG_X86_ACPI_CPUFREQ=y | 368 | CONFIG_X86_ACPI_CPUFREQ=y |
| 288 | # CONFIG_X86_POWERNOW_K6 is not set | 369 | # CONFIG_X86_POWERNOW_K6 is not set |
| 289 | # CONFIG_X86_POWERNOW_K7 is not set | 370 | # CONFIG_X86_POWERNOW_K7 is not set |
| 290 | CONFIG_X86_POWERNOW_K8=y | 371 | # CONFIG_X86_POWERNOW_K8 is not set |
| 291 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
| 292 | # CONFIG_X86_GX_SUSPMOD is not set | 372 | # CONFIG_X86_GX_SUSPMOD is not set |
| 293 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | 373 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set |
| 294 | # CONFIG_X86_SPEEDSTEP_ICH is not set | 374 | # CONFIG_X86_SPEEDSTEP_ICH is not set |
| @@ -302,43 +382,72 @@ CONFIG_X86_POWERNOW_K8_ACPI=y | |||
| 302 | # | 382 | # |
| 303 | # shared options | 383 | # shared options |
| 304 | # | 384 | # |
| 305 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 385 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
| 306 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 386 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
| 387 | CONFIG_CPU_IDLE=y | ||
| 388 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
| 389 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
| 307 | 390 | ||
| 308 | # | 391 | # |
| 309 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 392 | # Bus options (PCI etc.) |
| 310 | # | 393 | # |
| 311 | CONFIG_PCI=y | 394 | CONFIG_PCI=y |
| 312 | # CONFIG_PCI_GOBIOS is not set | 395 | # CONFIG_PCI_GOBIOS is not set |
| 313 | # CONFIG_PCI_GOMMCONFIG is not set | 396 | # CONFIG_PCI_GOMMCONFIG is not set |
| 314 | # CONFIG_PCI_GODIRECT is not set | 397 | # CONFIG_PCI_GODIRECT is not set |
| 315 | CONFIG_PCI_GOANY=y | 398 | CONFIG_PCI_GOANY=y |
| 399 | # CONFIG_PCI_GOOLPC is not set | ||
| 316 | CONFIG_PCI_BIOS=y | 400 | CONFIG_PCI_BIOS=y |
| 317 | CONFIG_PCI_DIRECT=y | 401 | CONFIG_PCI_DIRECT=y |
| 318 | CONFIG_PCI_MMCONFIG=y | 402 | CONFIG_PCI_MMCONFIG=y |
| 319 | # CONFIG_PCIEPORTBUS is not set | 403 | CONFIG_PCI_DOMAINS=y |
| 404 | CONFIG_PCIEPORTBUS=y | ||
| 405 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
| 406 | CONFIG_PCIEAER=y | ||
| 407 | # CONFIG_PCIEASPM is not set | ||
| 320 | CONFIG_ARCH_SUPPORTS_MSI=y | 408 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 321 | CONFIG_PCI_MSI=y | 409 | CONFIG_PCI_MSI=y |
| 410 | # CONFIG_PCI_LEGACY is not set | ||
| 322 | # CONFIG_PCI_DEBUG is not set | 411 | # CONFIG_PCI_DEBUG is not set |
| 323 | # CONFIG_HT_IRQ is not set | 412 | CONFIG_HT_IRQ=y |
| 324 | CONFIG_ISA_DMA_API=y | 413 | CONFIG_ISA_DMA_API=y |
| 325 | # CONFIG_ISA is not set | 414 | # CONFIG_ISA is not set |
| 326 | # CONFIG_MCA is not set | 415 | # CONFIG_MCA is not set |
| 327 | # CONFIG_SCx200 is not set | 416 | # CONFIG_SCx200 is not set |
| 417 | # CONFIG_OLPC is not set | ||
| 328 | CONFIG_K8_NB=y | 418 | CONFIG_K8_NB=y |
| 329 | 419 | CONFIG_PCCARD=y | |
| 330 | # | 420 | # CONFIG_PCMCIA_DEBUG is not set |
| 331 | # PCCARD (PCMCIA/CardBus) support | 421 | CONFIG_PCMCIA=y |
| 332 | # | 422 | CONFIG_PCMCIA_LOAD_CIS=y |
| 333 | # CONFIG_PCCARD is not set | 423 | CONFIG_PCMCIA_IOCTL=y |
| 334 | # CONFIG_HOTPLUG_PCI is not set | 424 | CONFIG_CARDBUS=y |
| 335 | 425 | ||
| 336 | # | 426 | # |
| 337 | # Executable file formats | 427 | # PC-card bridges |
| 428 | # | ||
| 429 | CONFIG_YENTA=y | ||
| 430 | CONFIG_YENTA_O2=y | ||
| 431 | CONFIG_YENTA_RICOH=y | ||
| 432 | CONFIG_YENTA_TI=y | ||
| 433 | CONFIG_YENTA_ENE_TUNE=y | ||
| 434 | CONFIG_YENTA_TOSHIBA=y | ||
| 435 | # CONFIG_PD6729 is not set | ||
| 436 | # CONFIG_I82092 is not set | ||
| 437 | CONFIG_PCCARD_NONSTATIC=y | ||
| 438 | CONFIG_HOTPLUG_PCI=y | ||
| 439 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
| 440 | # CONFIG_HOTPLUG_PCI_IBM is not set | ||
| 441 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
| 442 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
| 443 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
| 444 | |||
| 445 | # | ||
| 446 | # Executable file formats / Emulations | ||
| 338 | # | 447 | # |
| 339 | CONFIG_BINFMT_ELF=y | 448 | CONFIG_BINFMT_ELF=y |
| 340 | # CONFIG_BINFMT_AOUT is not set | 449 | # CONFIG_BINFMT_AOUT is not set |
| 341 | # CONFIG_BINFMT_MISC is not set | 450 | CONFIG_BINFMT_MISC=y |
| 342 | 451 | ||
| 343 | # | 452 | # |
| 344 | # Networking | 453 | # Networking |
| @@ -349,59 +458,142 @@ CONFIG_NET=y | |||
| 349 | # Networking options | 458 | # Networking options |
| 350 | # | 459 | # |
| 351 | CONFIG_PACKET=y | 460 | CONFIG_PACKET=y |
| 352 | # CONFIG_PACKET_MMAP is not set | 461 | CONFIG_PACKET_MMAP=y |
| 353 | CONFIG_UNIX=y | 462 | CONFIG_UNIX=y |
| 354 | CONFIG_XFRM=y | 463 | CONFIG_XFRM=y |
| 355 | # CONFIG_XFRM_USER is not set | 464 | CONFIG_XFRM_USER=y |
| 356 | # CONFIG_XFRM_SUB_POLICY is not set | 465 | # CONFIG_XFRM_SUB_POLICY is not set |
| 357 | # CONFIG_XFRM_MIGRATE is not set | 466 | # CONFIG_XFRM_MIGRATE is not set |
| 467 | # CONFIG_XFRM_STATISTICS is not set | ||
| 358 | # CONFIG_NET_KEY is not set | 468 | # CONFIG_NET_KEY is not set |
| 359 | CONFIG_INET=y | 469 | CONFIG_INET=y |
| 360 | CONFIG_IP_MULTICAST=y | 470 | CONFIG_IP_MULTICAST=y |
| 361 | # CONFIG_IP_ADVANCED_ROUTER is not set | 471 | CONFIG_IP_ADVANCED_ROUTER=y |
| 472 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 473 | # CONFIG_IP_FIB_TRIE is not set | ||
| 362 | CONFIG_IP_FIB_HASH=y | 474 | CONFIG_IP_FIB_HASH=y |
| 363 | CONFIG_IP_PNP=y | 475 | CONFIG_IP_MULTIPLE_TABLES=y |
| 364 | CONFIG_IP_PNP_DHCP=y | 476 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 365 | # CONFIG_IP_PNP_BOOTP is not set | 477 | CONFIG_IP_ROUTE_VERBOSE=y |
| 366 | # CONFIG_IP_PNP_RARP is not set | 478 | # CONFIG_IP_PNP is not set |
| 367 | # CONFIG_NET_IPIP is not set | 479 | # CONFIG_NET_IPIP is not set |
| 368 | # CONFIG_NET_IPGRE is not set | 480 | # CONFIG_NET_IPGRE is not set |
| 369 | # CONFIG_IP_MROUTE is not set | 481 | CONFIG_IP_MROUTE=y |
| 482 | CONFIG_IP_PIMSM_V1=y | ||
| 483 | CONFIG_IP_PIMSM_V2=y | ||
| 370 | # CONFIG_ARPD is not set | 484 | # CONFIG_ARPD is not set |
| 371 | # CONFIG_SYN_COOKIES is not set | 485 | CONFIG_SYN_COOKIES=y |
| 372 | # CONFIG_INET_AH is not set | 486 | # CONFIG_INET_AH is not set |
| 373 | # CONFIG_INET_ESP is not set | 487 | # CONFIG_INET_ESP is not set |
| 374 | # CONFIG_INET_IPCOMP is not set | 488 | # CONFIG_INET_IPCOMP is not set |
| 375 | # CONFIG_INET_XFRM_TUNNEL is not set | 489 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 376 | CONFIG_INET_TUNNEL=y | 490 | CONFIG_INET_TUNNEL=y |
| 377 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 491 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 378 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 492 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 379 | # CONFIG_INET_XFRM_MODE_BEET is not set | 493 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 380 | CONFIG_INET_DIAG=y | 494 | CONFIG_INET_LRO=y |
| 381 | CONFIG_INET_TCP_DIAG=y | 495 | # CONFIG_INET_DIAG is not set |
| 382 | # CONFIG_TCP_CONG_ADVANCED is not set | 496 | CONFIG_TCP_CONG_ADVANCED=y |
| 497 | # CONFIG_TCP_CONG_BIC is not set | ||
| 383 | CONFIG_TCP_CONG_CUBIC=y | 498 | CONFIG_TCP_CONG_CUBIC=y |
| 499 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
| 500 | # CONFIG_TCP_CONG_HTCP is not set | ||
| 501 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 502 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 503 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 504 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 505 | # CONFIG_TCP_CONG_LP is not set | ||
| 506 | # CONFIG_TCP_CONG_VENO is not set | ||
| 507 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 508 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 509 | # CONFIG_DEFAULT_BIC is not set | ||
| 510 | CONFIG_DEFAULT_CUBIC=y | ||
| 511 | # CONFIG_DEFAULT_HTCP is not set | ||
| 512 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 513 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 514 | # CONFIG_DEFAULT_RENO is not set | ||
| 384 | CONFIG_DEFAULT_TCP_CONG="cubic" | 515 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 385 | # CONFIG_TCP_MD5SIG is not set | 516 | CONFIG_TCP_MD5SIG=y |
| 517 | # CONFIG_IP_VS is not set | ||
| 386 | CONFIG_IPV6=y | 518 | CONFIG_IPV6=y |
| 387 | # CONFIG_IPV6_PRIVACY is not set | 519 | # CONFIG_IPV6_PRIVACY is not set |
| 388 | # CONFIG_IPV6_ROUTER_PREF is not set | 520 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 389 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 521 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
| 390 | # CONFIG_INET6_AH is not set | 522 | CONFIG_INET6_AH=y |
| 391 | # CONFIG_INET6_ESP is not set | 523 | CONFIG_INET6_ESP=y |
| 392 | # CONFIG_INET6_IPCOMP is not set | 524 | # CONFIG_INET6_IPCOMP is not set |
| 393 | # CONFIG_IPV6_MIP6 is not set | 525 | # CONFIG_IPV6_MIP6 is not set |
| 394 | # CONFIG_INET6_XFRM_TUNNEL is not set | 526 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 395 | # CONFIG_INET6_TUNNEL is not set | 527 | # CONFIG_INET6_TUNNEL is not set |
| 396 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 528 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
| 397 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 529 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 398 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 530 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 399 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 531 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 400 | CONFIG_IPV6_SIT=y | 532 | CONFIG_IPV6_SIT=y |
| 533 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 401 | # CONFIG_IPV6_TUNNEL is not set | 534 | # CONFIG_IPV6_TUNNEL is not set |
| 402 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 535 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 403 | # CONFIG_NETWORK_SECMARK is not set | 536 | # CONFIG_IPV6_MROUTE is not set |
| 404 | # CONFIG_NETFILTER is not set | 537 | CONFIG_NETLABEL=y |
| 538 | CONFIG_NETWORK_SECMARK=y | ||
| 539 | CONFIG_NETFILTER=y | ||
| 540 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 541 | # CONFIG_NETFILTER_ADVANCED is not set | ||
| 542 | |||
| 543 | # | ||
| 544 | # Core Netfilter Configuration | ||
| 545 | # | ||
| 546 | CONFIG_NETFILTER_NETLINK=y | ||
| 547 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
| 548 | CONFIG_NF_CONNTRACK=y | ||
| 549 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
| 550 | CONFIG_NF_CONNTRACK_FTP=y | ||
| 551 | CONFIG_NF_CONNTRACK_IRC=y | ||
| 552 | CONFIG_NF_CONNTRACK_SIP=y | ||
| 553 | CONFIG_NF_CT_NETLINK=y | ||
| 554 | CONFIG_NETFILTER_XTABLES=y | ||
| 555 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
| 556 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
| 557 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
| 558 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
| 559 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
| 560 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
| 561 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
| 562 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
| 563 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
| 564 | |||
| 565 | # | ||
| 566 | # IP: Netfilter Configuration | ||
| 567 | # | ||
| 568 | CONFIG_NF_CONNTRACK_IPV4=y | ||
| 569 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
| 570 | CONFIG_IP_NF_IPTABLES=y | ||
| 571 | CONFIG_IP_NF_FILTER=y | ||
| 572 | CONFIG_IP_NF_TARGET_REJECT=y | ||
| 573 | CONFIG_IP_NF_TARGET_LOG=y | ||
| 574 | CONFIG_IP_NF_TARGET_ULOG=y | ||
| 575 | CONFIG_NF_NAT=y | ||
| 576 | CONFIG_NF_NAT_NEEDED=y | ||
| 577 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
| 578 | CONFIG_NF_NAT_FTP=y | ||
| 579 | CONFIG_NF_NAT_IRC=y | ||
| 580 | # CONFIG_NF_NAT_TFTP is not set | ||
| 581 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 582 | # CONFIG_NF_NAT_PPTP is not set | ||
| 583 | # CONFIG_NF_NAT_H323 is not set | ||
| 584 | CONFIG_NF_NAT_SIP=y | ||
| 585 | CONFIG_IP_NF_MANGLE=y | ||
| 586 | |||
| 587 | # | ||
| 588 | # IPv6: Netfilter Configuration | ||
| 589 | # | ||
| 590 | CONFIG_NF_CONNTRACK_IPV6=y | ||
| 591 | CONFIG_IP6_NF_IPTABLES=y | ||
| 592 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
| 593 | CONFIG_IP6_NF_FILTER=y | ||
| 594 | CONFIG_IP6_NF_TARGET_LOG=y | ||
| 595 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
| 596 | CONFIG_IP6_NF_MANGLE=y | ||
| 405 | # CONFIG_IP_DCCP is not set | 597 | # CONFIG_IP_DCCP is not set |
| 406 | # CONFIG_IP_SCTP is not set | 598 | # CONFIG_IP_SCTP is not set |
| 407 | # CONFIG_TIPC is not set | 599 | # CONFIG_TIPC is not set |
| @@ -409,6 +601,7 @@ CONFIG_IPV6_SIT=y | |||
| 409 | # CONFIG_BRIDGE is not set | 601 | # CONFIG_BRIDGE is not set |
| 410 | # CONFIG_VLAN_8021Q is not set | 602 | # CONFIG_VLAN_8021Q is not set |
| 411 | # CONFIG_DECNET is not set | 603 | # CONFIG_DECNET is not set |
| 604 | CONFIG_LLC=y | ||
| 412 | # CONFIG_LLC2 is not set | 605 | # CONFIG_LLC2 is not set |
| 413 | # CONFIG_IPX is not set | 606 | # CONFIG_IPX is not set |
| 414 | # CONFIG_ATALK is not set | 607 | # CONFIG_ATALK is not set |
| @@ -416,28 +609,99 @@ CONFIG_IPV6_SIT=y | |||
| 416 | # CONFIG_LAPB is not set | 609 | # CONFIG_LAPB is not set |
| 417 | # CONFIG_ECONET is not set | 610 | # CONFIG_ECONET is not set |
| 418 | # CONFIG_WAN_ROUTER is not set | 611 | # CONFIG_WAN_ROUTER is not set |
| 419 | 612 | CONFIG_NET_SCHED=y | |
| 420 | # | 613 | |
| 421 | # QoS and/or fair queueing | 614 | # |
| 422 | # | 615 | # Queueing/Scheduling |
| 423 | # CONFIG_NET_SCHED is not set | 616 | # |
| 617 | # CONFIG_NET_SCH_CBQ is not set | ||
| 618 | # CONFIG_NET_SCH_HTB is not set | ||
| 619 | # CONFIG_NET_SCH_HFSC is not set | ||
| 620 | # CONFIG_NET_SCH_PRIO is not set | ||
| 621 | # CONFIG_NET_SCH_RR is not set | ||
| 622 | # CONFIG_NET_SCH_RED is not set | ||
| 623 | # CONFIG_NET_SCH_SFQ is not set | ||
| 624 | # CONFIG_NET_SCH_TEQL is not set | ||
| 625 | # CONFIG_NET_SCH_TBF is not set | ||
| 626 | # CONFIG_NET_SCH_GRED is not set | ||
| 627 | # CONFIG_NET_SCH_DSMARK is not set | ||
| 628 | # CONFIG_NET_SCH_NETEM is not set | ||
| 629 | # CONFIG_NET_SCH_INGRESS is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Classification | ||
| 633 | # | ||
| 634 | CONFIG_NET_CLS=y | ||
| 635 | # CONFIG_NET_CLS_BASIC is not set | ||
| 636 | # CONFIG_NET_CLS_TCINDEX is not set | ||
| 637 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
| 638 | # CONFIG_NET_CLS_FW is not set | ||
| 639 | # CONFIG_NET_CLS_U32 is not set | ||
| 640 | # CONFIG_NET_CLS_RSVP is not set | ||
| 641 | # CONFIG_NET_CLS_RSVP6 is not set | ||
| 642 | # CONFIG_NET_CLS_FLOW is not set | ||
| 643 | CONFIG_NET_EMATCH=y | ||
| 644 | CONFIG_NET_EMATCH_STACK=32 | ||
| 645 | # CONFIG_NET_EMATCH_CMP is not set | ||
| 646 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
| 647 | # CONFIG_NET_EMATCH_U32 is not set | ||
| 648 | # CONFIG_NET_EMATCH_META is not set | ||
| 649 | # CONFIG_NET_EMATCH_TEXT is not set | ||
| 650 | CONFIG_NET_CLS_ACT=y | ||
| 651 | # CONFIG_NET_ACT_POLICE is not set | ||
| 652 | # CONFIG_NET_ACT_GACT is not set | ||
| 653 | # CONFIG_NET_ACT_MIRRED is not set | ||
| 654 | # CONFIG_NET_ACT_IPT is not set | ||
| 655 | # CONFIG_NET_ACT_NAT is not set | ||
| 656 | # CONFIG_NET_ACT_PEDIT is not set | ||
| 657 | # CONFIG_NET_ACT_SIMP is not set | ||
| 658 | CONFIG_NET_SCH_FIFO=y | ||
| 424 | 659 | ||
| 425 | # | 660 | # |
| 426 | # Network testing | 661 | # Network testing |
| 427 | # | 662 | # |
| 428 | # CONFIG_NET_PKTGEN is not set | 663 | # CONFIG_NET_PKTGEN is not set |
| 429 | # CONFIG_NET_TCPPROBE is not set | 664 | # CONFIG_NET_TCPPROBE is not set |
| 430 | # CONFIG_HAMRADIO is not set | 665 | CONFIG_HAMRADIO=y |
| 666 | |||
| 667 | # | ||
| 668 | # Packet Radio protocols | ||
| 669 | # | ||
| 670 | # CONFIG_AX25 is not set | ||
| 671 | # CONFIG_CAN is not set | ||
| 431 | # CONFIG_IRDA is not set | 672 | # CONFIG_IRDA is not set |
| 432 | # CONFIG_BT is not set | 673 | # CONFIG_BT is not set |
| 433 | # CONFIG_AF_RXRPC is not set | 674 | # CONFIG_AF_RXRPC is not set |
| 675 | CONFIG_FIB_RULES=y | ||
| 434 | 676 | ||
| 435 | # | 677 | # |
| 436 | # Wireless | 678 | # Wireless |
| 437 | # | 679 | # |
| 438 | # CONFIG_CFG80211 is not set | 680 | CONFIG_CFG80211=y |
| 439 | # CONFIG_WIRELESS_EXT is not set | 681 | CONFIG_NL80211=y |
| 440 | # CONFIG_MAC80211 is not set | 682 | CONFIG_WIRELESS_EXT=y |
| 683 | CONFIG_MAC80211=y | ||
| 684 | |||
| 685 | # | ||
| 686 | # Rate control algorithm selection | ||
| 687 | # | ||
| 688 | 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" | ||
| 699 | CONFIG_MAC80211_RC_PID=y | ||
| 700 | # CONFIG_MAC80211_MESH is not set | ||
| 701 | CONFIG_MAC80211_LEDS=y | ||
| 702 | # CONFIG_MAC80211_DEBUGFS is not set | ||
| 703 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 704 | # CONFIG_MAC80211_DEBUG is not set | ||
| 441 | # CONFIG_IEEE80211 is not set | 705 | # CONFIG_IEEE80211 is not set |
| 442 | # CONFIG_RFKILL is not set | 706 | # CONFIG_RFKILL is not set |
| 443 | # CONFIG_NET_9P is not set | 707 | # CONFIG_NET_9P is not set |
| @@ -449,13 +713,15 @@ CONFIG_IPV6_SIT=y | |||
| 449 | # | 713 | # |
| 450 | # Generic Driver Options | 714 | # Generic Driver Options |
| 451 | # | 715 | # |
| 716 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 452 | CONFIG_STANDALONE=y | 717 | CONFIG_STANDALONE=y |
| 453 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 718 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 454 | CONFIG_FW_LOADER=y | 719 | CONFIG_FW_LOADER=y |
| 455 | # CONFIG_DEBUG_DRIVER is not set | 720 | # CONFIG_DEBUG_DRIVER is not set |
| 456 | # CONFIG_DEBUG_DEVRES is not set | 721 | CONFIG_DEBUG_DEVRES=y |
| 457 | # CONFIG_SYS_HYPERVISOR is not set | 722 | # CONFIG_SYS_HYPERVISOR is not set |
| 458 | # CONFIG_CONNECTOR is not set | 723 | CONFIG_CONNECTOR=y |
| 724 | CONFIG_PROC_EVENTS=y | ||
| 459 | # CONFIG_MTD is not set | 725 | # CONFIG_MTD is not set |
| 460 | # CONFIG_PARPORT is not set | 726 | # CONFIG_PARPORT is not set |
| 461 | CONFIG_PNP=y | 727 | CONFIG_PNP=y |
| @@ -466,7 +732,7 @@ CONFIG_PNP=y | |||
| 466 | # | 732 | # |
| 467 | CONFIG_PNPACPI=y | 733 | CONFIG_PNPACPI=y |
| 468 | CONFIG_BLK_DEV=y | 734 | CONFIG_BLK_DEV=y |
| 469 | CONFIG_BLK_DEV_FD=y | 735 | # CONFIG_BLK_DEV_FD is not set |
| 470 | # CONFIG_BLK_CPQ_DA is not set | 736 | # CONFIG_BLK_CPQ_DA is not set |
| 471 | # CONFIG_BLK_CPQ_CISS_DA is not set | 737 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 472 | # CONFIG_BLK_DEV_DAC960 is not set | 738 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -479,8 +745,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 479 | # CONFIG_BLK_DEV_UB is not set | 745 | # CONFIG_BLK_DEV_UB is not set |
| 480 | CONFIG_BLK_DEV_RAM=y | 746 | CONFIG_BLK_DEV_RAM=y |
| 481 | CONFIG_BLK_DEV_RAM_COUNT=16 | 747 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 482 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 748 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
| 483 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 749 | # CONFIG_BLK_DEV_XIP is not set |
| 484 | # CONFIG_CDROM_PKTCDVD is not set | 750 | # CONFIG_CDROM_PKTCDVD is not set |
| 485 | # CONFIG_ATA_OVER_ETH is not set | 751 | # CONFIG_ATA_OVER_ETH is not set |
| 486 | CONFIG_MISC_DEVICES=y | 752 | CONFIG_MISC_DEVICES=y |
| @@ -489,73 +755,17 @@ CONFIG_MISC_DEVICES=y | |||
| 489 | # CONFIG_EEPROM_93CX6 is not set | 755 | # CONFIG_EEPROM_93CX6 is not set |
| 490 | # CONFIG_SGI_IOC4 is not set | 756 | # CONFIG_SGI_IOC4 is not set |
| 491 | # CONFIG_TIFM_CORE is not set | 757 | # CONFIG_TIFM_CORE is not set |
| 758 | # CONFIG_ACER_WMI is not set | ||
| 759 | # CONFIG_ASUS_LAPTOP is not set | ||
| 760 | # CONFIG_FUJITSU_LAPTOP is not set | ||
| 761 | # CONFIG_TC1100_WMI is not set | ||
| 762 | # CONFIG_MSI_LAPTOP is not set | ||
| 492 | # CONFIG_SONY_LAPTOP is not set | 763 | # CONFIG_SONY_LAPTOP is not set |
| 493 | # CONFIG_THINKPAD_ACPI is not set | 764 | # CONFIG_THINKPAD_ACPI is not set |
| 494 | CONFIG_IDE=y | 765 | # CONFIG_INTEL_MENLOW is not set |
| 495 | CONFIG_BLK_DEV_IDE=y | 766 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 496 | 767 | CONFIG_HAVE_IDE=y | |
| 497 | # | 768 | # CONFIG_IDE is not set |
| 498 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 499 | # | ||
| 500 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 501 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
| 502 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 503 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 504 | CONFIG_BLK_DEV_IDECD=y | ||
| 505 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 506 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 507 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 508 | CONFIG_BLK_DEV_IDEACPI=y | ||
| 509 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 510 | CONFIG_IDE_PROC_FS=y | ||
| 511 | |||
| 512 | # | ||
| 513 | # IDE chipset support/bugfixes | ||
| 514 | # | ||
| 515 | CONFIG_IDE_GENERIC=y | ||
| 516 | # CONFIG_BLK_DEV_CMD640 is not set | ||
| 517 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
| 518 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 519 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 520 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
| 521 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 522 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 523 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 524 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
| 525 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 526 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 527 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 528 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 529 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 530 | CONFIG_BLK_DEV_AMD74XX=y | ||
| 531 | # CONFIG_BLK_DEV_ATIIXP is not set | ||
| 532 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 533 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 534 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 535 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 536 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 537 | # CONFIG_BLK_DEV_CS5535 is not set | ||
| 538 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 539 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 540 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 541 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 542 | CONFIG_BLK_DEV_PIIX=y | ||
| 543 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 544 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 545 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 546 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 547 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 548 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 549 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 550 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
| 551 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 552 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 553 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 554 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 555 | # CONFIG_IDE_ARM is not set | ||
| 556 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 557 | # CONFIG_IDEDMA_IVB is not set | ||
| 558 | # CONFIG_BLK_DEV_HD is not set | ||
| 559 | 769 | ||
| 560 | # | 770 | # |
| 561 | # SCSI device support | 771 | # SCSI device support |
| @@ -564,8 +774,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 564 | CONFIG_SCSI=y | 774 | CONFIG_SCSI=y |
| 565 | CONFIG_SCSI_DMA=y | 775 | CONFIG_SCSI_DMA=y |
| 566 | # CONFIG_SCSI_TGT is not set | 776 | # CONFIG_SCSI_TGT is not set |
| 567 | CONFIG_SCSI_NETLINK=y | 777 | # CONFIG_SCSI_NETLINK is not set |
| 568 | # CONFIG_SCSI_PROC_FS is not set | 778 | CONFIG_SCSI_PROC_FS=y |
| 569 | 779 | ||
| 570 | # | 780 | # |
| 571 | # SCSI support type (disk, tape, CD-ROM) | 781 | # SCSI support type (disk, tape, CD-ROM) |
| @@ -574,7 +784,7 @@ CONFIG_BLK_DEV_SD=y | |||
| 574 | # CONFIG_CHR_DEV_ST is not set | 784 | # CONFIG_CHR_DEV_ST is not set |
| 575 | # CONFIG_CHR_DEV_OSST is not set | 785 | # CONFIG_CHR_DEV_OSST is not set |
| 576 | CONFIG_BLK_DEV_SR=y | 786 | CONFIG_BLK_DEV_SR=y |
| 577 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 787 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 578 | CONFIG_CHR_DEV_SG=y | 788 | CONFIG_CHR_DEV_SG=y |
| 579 | # CONFIG_CHR_DEV_SCH is not set | 789 | # CONFIG_CHR_DEV_SCH is not set |
| 580 | 790 | ||
| @@ -582,7 +792,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 582 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 792 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
| 583 | # | 793 | # |
| 584 | # CONFIG_SCSI_MULTI_LUN is not set | 794 | # CONFIG_SCSI_MULTI_LUN is not set |
| 585 | # CONFIG_SCSI_CONSTANTS is not set | 795 | CONFIG_SCSI_CONSTANTS=y |
| 586 | # CONFIG_SCSI_LOGGING is not set | 796 | # CONFIG_SCSI_LOGGING is not set |
| 587 | # CONFIG_SCSI_SCAN_ASYNC is not set | 797 | # CONFIG_SCSI_SCAN_ASYNC is not set |
| 588 | CONFIG_SCSI_WAIT_SCAN=m | 798 | CONFIG_SCSI_WAIT_SCAN=m |
| @@ -591,81 +801,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 591 | # SCSI Transports | 801 | # SCSI Transports |
| 592 | # | 802 | # |
| 593 | CONFIG_SCSI_SPI_ATTRS=y | 803 | CONFIG_SCSI_SPI_ATTRS=y |
| 594 | CONFIG_SCSI_FC_ATTRS=y | 804 | # CONFIG_SCSI_FC_ATTRS is not set |
| 595 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 805 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 596 | # CONFIG_SCSI_SAS_ATTRS is not set | 806 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 597 | # CONFIG_SCSI_SAS_LIBSAS is not set | 807 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 598 | 808 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 599 | # | 809 | # CONFIG_SCSI_LOWLEVEL is not set |
| 600 | # SCSI low-level drivers | 810 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 601 | # | ||
| 602 | # CONFIG_ISCSI_TCP is not set | ||
| 603 | CONFIG_BLK_DEV_3W_XXXX_RAID=y | ||
| 604 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 605 | # CONFIG_SCSI_ACARD is not set | ||
| 606 | # CONFIG_SCSI_AACRAID is not set | ||
| 607 | CONFIG_SCSI_AIC7XXX=y | ||
| 608 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 | ||
| 609 | CONFIG_AIC7XXX_RESET_DELAY_MS=5000 | ||
| 610 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | ||
| 611 | CONFIG_AIC7XXX_DEBUG_MASK=0 | ||
| 612 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | ||
| 613 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 614 | CONFIG_SCSI_AIC79XX=y | ||
| 615 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
| 616 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
| 617 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
| 618 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
| 619 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
| 620 | # CONFIG_SCSI_AIC94XX is not set | ||
| 621 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 622 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 623 | # CONFIG_SCSI_ARCMSR is not set | ||
| 624 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 625 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 626 | # CONFIG_MEGARAID_SAS is not set | ||
| 627 | # CONFIG_SCSI_HPTIOP is not set | ||
| 628 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 629 | # CONFIG_SCSI_DMX3191D is not set | ||
| 630 | # CONFIG_SCSI_EATA is not set | ||
| 631 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 632 | # CONFIG_SCSI_GDTH is not set | ||
| 633 | # CONFIG_SCSI_IPS is not set | ||
| 634 | # CONFIG_SCSI_INITIO is not set | ||
| 635 | # CONFIG_SCSI_INIA100 is not set | ||
| 636 | # CONFIG_SCSI_STEX is not set | ||
| 637 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 638 | # CONFIG_SCSI_IPR is not set | ||
| 639 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 640 | # CONFIG_SCSI_QLA_FC is not set | ||
| 641 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 642 | # CONFIG_SCSI_LPFC is not set | ||
| 643 | # CONFIG_SCSI_DC395x is not set | ||
| 644 | # CONFIG_SCSI_DC390T is not set | ||
| 645 | # CONFIG_SCSI_NSP32 is not set | ||
| 646 | # CONFIG_SCSI_DEBUG is not set | ||
| 647 | # CONFIG_SCSI_SRP is not set | ||
| 648 | CONFIG_ATA=y | 811 | CONFIG_ATA=y |
| 649 | # CONFIG_ATA_NONSTANDARD is not set | 812 | # CONFIG_ATA_NONSTANDARD is not set |
| 650 | CONFIG_ATA_ACPI=y | 813 | CONFIG_ATA_ACPI=y |
| 814 | CONFIG_SATA_PMP=y | ||
| 651 | CONFIG_SATA_AHCI=y | 815 | CONFIG_SATA_AHCI=y |
| 652 | CONFIG_SATA_SVW=y | 816 | # CONFIG_SATA_SIL24 is not set |
| 817 | CONFIG_ATA_SFF=y | ||
| 818 | # CONFIG_SATA_SVW is not set | ||
| 653 | CONFIG_ATA_PIIX=y | 819 | CONFIG_ATA_PIIX=y |
| 654 | # CONFIG_SATA_MV is not set | 820 | # CONFIG_SATA_MV is not set |
| 655 | CONFIG_SATA_NV=y | 821 | # CONFIG_SATA_NV is not set |
| 656 | # CONFIG_PDC_ADMA is not set | 822 | # CONFIG_PDC_ADMA is not set |
| 657 | # CONFIG_SATA_QSTOR is not set | 823 | # CONFIG_SATA_QSTOR is not set |
| 658 | # CONFIG_SATA_PROMISE is not set | 824 | # CONFIG_SATA_PROMISE is not set |
| 659 | # CONFIG_SATA_SX4 is not set | 825 | # CONFIG_SATA_SX4 is not set |
| 660 | CONFIG_SATA_SIL=y | 826 | # CONFIG_SATA_SIL is not set |
| 661 | # CONFIG_SATA_SIL24 is not set | ||
| 662 | # CONFIG_SATA_SIS is not set | 827 | # CONFIG_SATA_SIS is not set |
| 663 | # CONFIG_SATA_ULI is not set | 828 | # CONFIG_SATA_ULI is not set |
| 664 | CONFIG_SATA_VIA=y | 829 | # CONFIG_SATA_VIA is not set |
| 665 | # CONFIG_SATA_VITESSE is not set | 830 | # CONFIG_SATA_VITESSE is not set |
| 666 | # CONFIG_SATA_INIC162X is not set | 831 | # CONFIG_SATA_INIC162X is not set |
| 832 | # CONFIG_PATA_ACPI is not set | ||
| 667 | # CONFIG_PATA_ALI is not set | 833 | # CONFIG_PATA_ALI is not set |
| 668 | # CONFIG_PATA_AMD is not set | 834 | CONFIG_PATA_AMD=y |
| 669 | # CONFIG_PATA_ARTOP is not set | 835 | # CONFIG_PATA_ARTOP is not set |
| 670 | # CONFIG_PATA_ATIIXP is not set | 836 | # CONFIG_PATA_ATIIXP is not set |
| 671 | # CONFIG_PATA_CMD640_PCI is not set | 837 | # CONFIG_PATA_CMD640_PCI is not set |
| @@ -673,6 +839,7 @@ CONFIG_SATA_VIA=y | |||
| 673 | # CONFIG_PATA_CS5520 is not set | 839 | # CONFIG_PATA_CS5520 is not set |
| 674 | # CONFIG_PATA_CS5530 is not set | 840 | # CONFIG_PATA_CS5530 is not set |
| 675 | # CONFIG_PATA_CS5535 is not set | 841 | # CONFIG_PATA_CS5535 is not set |
| 842 | # CONFIG_PATA_CS5536 is not set | ||
| 676 | # CONFIG_PATA_CYPRESS is not set | 843 | # CONFIG_PATA_CYPRESS is not set |
| 677 | # CONFIG_PATA_EFAR is not set | 844 | # CONFIG_PATA_EFAR is not set |
| 678 | # CONFIG_ATA_GENERIC is not set | 845 | # CONFIG_ATA_GENERIC is not set |
| @@ -686,11 +853,14 @@ CONFIG_SATA_VIA=y | |||
| 686 | # CONFIG_PATA_TRIFLEX is not set | 853 | # CONFIG_PATA_TRIFLEX is not set |
| 687 | # CONFIG_PATA_MARVELL is not set | 854 | # CONFIG_PATA_MARVELL is not set |
| 688 | # CONFIG_PATA_MPIIX is not set | 855 | # CONFIG_PATA_MPIIX is not set |
| 689 | # CONFIG_PATA_OLDPIIX is not set | 856 | CONFIG_PATA_OLDPIIX=y |
| 690 | # CONFIG_PATA_NETCELL is not set | 857 | # CONFIG_PATA_NETCELL is not set |
| 858 | # CONFIG_PATA_NINJA32 is not set | ||
| 691 | # CONFIG_PATA_NS87410 is not set | 859 | # CONFIG_PATA_NS87410 is not set |
| 860 | # CONFIG_PATA_NS87415 is not set | ||
| 692 | # CONFIG_PATA_OPTI is not set | 861 | # CONFIG_PATA_OPTI is not set |
| 693 | # CONFIG_PATA_OPTIDMA is not set | 862 | # CONFIG_PATA_OPTIDMA is not set |
| 863 | # CONFIG_PATA_PCMCIA is not set | ||
| 694 | # CONFIG_PATA_PDC_OLD is not set | 864 | # CONFIG_PATA_PDC_OLD is not set |
| 695 | # CONFIG_PATA_RADISYS is not set | 865 | # CONFIG_PATA_RADISYS is not set |
| 696 | # CONFIG_PATA_RZ1000 is not set | 866 | # CONFIG_PATA_RZ1000 is not set |
| @@ -702,65 +872,42 @@ CONFIG_SATA_VIA=y | |||
| 702 | # CONFIG_PATA_VIA is not set | 872 | # CONFIG_PATA_VIA is not set |
| 703 | # CONFIG_PATA_WINBOND is not set | 873 | # CONFIG_PATA_WINBOND is not set |
| 704 | CONFIG_MD=y | 874 | CONFIG_MD=y |
| 705 | # CONFIG_BLK_DEV_MD is not set | 875 | CONFIG_BLK_DEV_MD=y |
| 876 | # CONFIG_MD_LINEAR is not set | ||
| 877 | # CONFIG_MD_RAID0 is not set | ||
| 878 | # CONFIG_MD_RAID1 is not set | ||
| 879 | # CONFIG_MD_RAID10 is not set | ||
| 880 | # CONFIG_MD_RAID456 is not set | ||
| 881 | # CONFIG_MD_MULTIPATH is not set | ||
| 882 | # CONFIG_MD_FAULTY is not set | ||
| 706 | CONFIG_BLK_DEV_DM=y | 883 | CONFIG_BLK_DEV_DM=y |
| 707 | # CONFIG_DM_DEBUG is not set | 884 | # CONFIG_DM_DEBUG is not set |
| 708 | # CONFIG_DM_CRYPT is not set | 885 | # CONFIG_DM_CRYPT is not set |
| 709 | # CONFIG_DM_SNAPSHOT is not set | 886 | # CONFIG_DM_SNAPSHOT is not set |
| 710 | # CONFIG_DM_MIRROR is not set | 887 | CONFIG_DM_MIRROR=y |
| 711 | # CONFIG_DM_ZERO is not set | 888 | CONFIG_DM_ZERO=y |
| 712 | # CONFIG_DM_MULTIPATH is not set | 889 | # CONFIG_DM_MULTIPATH is not set |
| 713 | # CONFIG_DM_DELAY is not set | 890 | # CONFIG_DM_DELAY is not set |
| 714 | 891 | # CONFIG_DM_UEVENT is not set | |
| 715 | # | 892 | # CONFIG_FUSION is not set |
| 716 | # Fusion MPT device support | ||
| 717 | # | ||
| 718 | CONFIG_FUSION=y | ||
| 719 | CONFIG_FUSION_SPI=y | ||
| 720 | # CONFIG_FUSION_FC is not set | ||
| 721 | # CONFIG_FUSION_SAS is not set | ||
| 722 | CONFIG_FUSION_MAX_SGE=128 | ||
| 723 | # CONFIG_FUSION_CTL is not set | ||
| 724 | 893 | ||
| 725 | # | 894 | # |
| 726 | # IEEE 1394 (FireWire) support | 895 | # IEEE 1394 (FireWire) support |
| 727 | # | 896 | # |
| 728 | # CONFIG_FIREWIRE is not set | 897 | # CONFIG_FIREWIRE is not set |
| 729 | CONFIG_IEEE1394=y | 898 | # CONFIG_IEEE1394 is not set |
| 730 | |||
| 731 | # | ||
| 732 | # Subsystem Options | ||
| 733 | # | ||
| 734 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # Controllers | ||
| 738 | # | ||
| 739 | |||
| 740 | # | ||
| 741 | # Texas Instruments PCILynx requires I2C | ||
| 742 | # | ||
| 743 | CONFIG_IEEE1394_OHCI1394=y | ||
| 744 | |||
| 745 | # | ||
| 746 | # Protocols | ||
| 747 | # | ||
| 748 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
| 749 | # CONFIG_IEEE1394_SBP2 is not set | ||
| 750 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
| 751 | # CONFIG_IEEE1394_ETH1394 is not set | ||
| 752 | # CONFIG_IEEE1394_DV1394 is not set | ||
| 753 | CONFIG_IEEE1394_RAWIO=y | ||
| 754 | # CONFIG_I2O is not set | 899 | # CONFIG_I2O is not set |
| 755 | CONFIG_MACINTOSH_DRIVERS=y | 900 | CONFIG_MACINTOSH_DRIVERS=y |
| 756 | # CONFIG_MAC_EMUMOUSEBTN is not set | 901 | CONFIG_MAC_EMUMOUSEBTN=y |
| 757 | CONFIG_NETDEVICES=y | 902 | CONFIG_NETDEVICES=y |
| 758 | CONFIG_NETDEVICES_MULTIQUEUE=y | 903 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| 904 | # CONFIG_IFB is not set | ||
| 759 | # CONFIG_DUMMY is not set | 905 | # CONFIG_DUMMY is not set |
| 760 | # CONFIG_BONDING is not set | 906 | # CONFIG_BONDING is not set |
| 761 | # CONFIG_MACVLAN is not set | 907 | # CONFIG_MACVLAN is not set |
| 762 | # CONFIG_EQUALIZER is not set | 908 | # CONFIG_EQUALIZER is not set |
| 763 | # CONFIG_TUN is not set | 909 | # CONFIG_TUN is not set |
| 910 | # CONFIG_VETH is not set | ||
| 764 | # CONFIG_NET_SB1000 is not set | 911 | # CONFIG_NET_SB1000 is not set |
| 765 | # CONFIG_ARCNET is not set | 912 | # CONFIG_ARCNET is not set |
| 766 | # CONFIG_PHYLIB is not set | 913 | # CONFIG_PHYLIB is not set |
| @@ -770,38 +917,40 @@ CONFIG_MII=y | |||
| 770 | # CONFIG_SUNGEM is not set | 917 | # CONFIG_SUNGEM is not set |
| 771 | # CONFIG_CASSINI is not set | 918 | # CONFIG_CASSINI is not set |
| 772 | CONFIG_NET_VENDOR_3COM=y | 919 | CONFIG_NET_VENDOR_3COM=y |
| 773 | CONFIG_VORTEX=y | 920 | # CONFIG_VORTEX is not set |
| 774 | # CONFIG_TYPHOON is not set | 921 | # CONFIG_TYPHOON is not set |
| 775 | CONFIG_NET_TULIP=y | 922 | CONFIG_NET_TULIP=y |
| 776 | # CONFIG_DE2104X is not set | 923 | # CONFIG_DE2104X is not set |
| 777 | CONFIG_TULIP=y | 924 | # CONFIG_TULIP is not set |
| 778 | # CONFIG_TULIP_MWI is not set | ||
| 779 | # CONFIG_TULIP_MMIO is not set | ||
| 780 | # CONFIG_TULIP_NAPI is not set | ||
| 781 | # CONFIG_DE4X5 is not set | 925 | # CONFIG_DE4X5 is not set |
| 782 | # CONFIG_WINBOND_840 is not set | 926 | # CONFIG_WINBOND_840 is not set |
| 783 | # CONFIG_DM9102 is not set | 927 | # CONFIG_DM9102 is not set |
| 784 | # CONFIG_ULI526X is not set | 928 | # CONFIG_ULI526X is not set |
| 929 | # CONFIG_PCMCIA_XIRCOM is not set | ||
| 785 | # CONFIG_HP100 is not set | 930 | # CONFIG_HP100 is not set |
| 931 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 932 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 933 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 934 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 786 | CONFIG_NET_PCI=y | 935 | CONFIG_NET_PCI=y |
| 787 | # CONFIG_PCNET32 is not set | 936 | # CONFIG_PCNET32 is not set |
| 788 | # CONFIG_AMD8111_ETH is not set | 937 | # CONFIG_AMD8111_ETH is not set |
| 789 | # CONFIG_ADAPTEC_STARFIRE is not set | 938 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 790 | CONFIG_B44=y | 939 | # CONFIG_B44 is not set |
| 791 | CONFIG_FORCEDETH=y | 940 | CONFIG_FORCEDETH=y |
| 792 | # CONFIG_FORCEDETH_NAPI is not set | 941 | # CONFIG_FORCEDETH_NAPI is not set |
| 793 | # CONFIG_DGRS is not set | ||
| 794 | # CONFIG_EEPRO100 is not set | 942 | # CONFIG_EEPRO100 is not set |
| 795 | CONFIG_E100=y | 943 | CONFIG_E100=y |
| 796 | # CONFIG_FEALNX is not set | 944 | # CONFIG_FEALNX is not set |
| 797 | # CONFIG_NATSEMI is not set | 945 | # CONFIG_NATSEMI is not set |
| 798 | # CONFIG_NE2K_PCI is not set | 946 | # CONFIG_NE2K_PCI is not set |
| 799 | CONFIG_8139CP=y | 947 | # CONFIG_8139CP is not set |
| 800 | CONFIG_8139TOO=y | 948 | CONFIG_8139TOO=y |
| 801 | # CONFIG_8139TOO_PIO is not set | 949 | CONFIG_8139TOO_PIO=y |
| 802 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 950 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 803 | # CONFIG_8139TOO_8129 is not set | 951 | # CONFIG_8139TOO_8129 is not set |
| 804 | # CONFIG_8139_OLD_RX_RESET is not set | 952 | # CONFIG_8139_OLD_RX_RESET is not set |
| 953 | # CONFIG_R6040 is not set | ||
| 805 | # CONFIG_SIS900 is not set | 954 | # CONFIG_SIS900 is not set |
| 806 | # CONFIG_EPIC100 is not set | 955 | # CONFIG_EPIC100 is not set |
| 807 | # CONFIG_SUNDANCE is not set | 956 | # CONFIG_SUNDANCE is not set |
| @@ -814,34 +963,75 @@ CONFIG_NETDEV_1000=y | |||
| 814 | CONFIG_E1000=y | 963 | CONFIG_E1000=y |
| 815 | # CONFIG_E1000_NAPI is not set | 964 | # CONFIG_E1000_NAPI is not set |
| 816 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 965 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 966 | # CONFIG_E1000E is not set | ||
| 967 | # CONFIG_E1000E_ENABLED is not set | ||
| 968 | # CONFIG_IP1000 is not set | ||
| 969 | # CONFIG_IGB is not set | ||
| 817 | # CONFIG_NS83820 is not set | 970 | # CONFIG_NS83820 is not set |
| 818 | # CONFIG_HAMACHI is not set | 971 | # CONFIG_HAMACHI is not set |
| 819 | # CONFIG_YELLOWFIN is not set | 972 | # CONFIG_YELLOWFIN is not set |
| 820 | CONFIG_R8169=y | 973 | # CONFIG_R8169 is not set |
| 821 | # CONFIG_R8169_NAPI is not set | ||
| 822 | # CONFIG_SIS190 is not set | 974 | # CONFIG_SIS190 is not set |
| 823 | # CONFIG_SKGE is not set | 975 | # CONFIG_SKGE is not set |
| 824 | CONFIG_SKY2=y | 976 | CONFIG_SKY2=y |
| 977 | # CONFIG_SKY2_DEBUG is not set | ||
| 825 | # CONFIG_VIA_VELOCITY is not set | 978 | # CONFIG_VIA_VELOCITY is not set |
| 826 | CONFIG_TIGON3=y | 979 | CONFIG_TIGON3=y |
| 827 | CONFIG_BNX2=y | 980 | # CONFIG_BNX2 is not set |
| 828 | # CONFIG_QLA3XXX is not set | 981 | # CONFIG_QLA3XXX is not set |
| 829 | # CONFIG_ATL1 is not set | 982 | # CONFIG_ATL1 is not set |
| 830 | CONFIG_NETDEV_10000=y | 983 | CONFIG_NETDEV_10000=y |
| 831 | # CONFIG_CHELSIO_T1 is not set | 984 | # CONFIG_CHELSIO_T1 is not set |
| 832 | # CONFIG_CHELSIO_T3 is not set | 985 | # CONFIG_CHELSIO_T3 is not set |
| 986 | # CONFIG_IXGBE is not set | ||
| 833 | # CONFIG_IXGB is not set | 987 | # CONFIG_IXGB is not set |
| 834 | # CONFIG_S2IO is not set | 988 | # CONFIG_S2IO is not set |
| 835 | # CONFIG_MYRI10GE is not set | 989 | # CONFIG_MYRI10GE is not set |
| 836 | # CONFIG_NETXEN_NIC is not set | 990 | # CONFIG_NETXEN_NIC is not set |
| 991 | # CONFIG_NIU is not set | ||
| 837 | # CONFIG_MLX4_CORE is not set | 992 | # CONFIG_MLX4_CORE is not set |
| 838 | # CONFIG_TR is not set | 993 | # CONFIG_TEHUTI is not set |
| 994 | # CONFIG_BNX2X is not set | ||
| 995 | # CONFIG_SFC is not set | ||
| 996 | CONFIG_TR=y | ||
| 997 | # CONFIG_IBMOL is not set | ||
| 998 | # CONFIG_IBMLS is not set | ||
| 999 | # CONFIG_3C359 is not set | ||
| 1000 | # CONFIG_TMS380TR is not set | ||
| 839 | 1001 | ||
| 840 | # | 1002 | # |
| 841 | # Wireless LAN | 1003 | # Wireless LAN |
| 842 | # | 1004 | # |
| 843 | # CONFIG_WLAN_PRE80211 is not set | 1005 | # CONFIG_WLAN_PRE80211 is not set |
| 844 | # CONFIG_WLAN_80211 is not set | 1006 | CONFIG_WLAN_80211=y |
| 1007 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 1008 | # CONFIG_IPW2100 is not set | ||
| 1009 | # CONFIG_IPW2200 is not set | ||
| 1010 | # CONFIG_LIBERTAS is not set | ||
| 1011 | # CONFIG_AIRO is not set | ||
| 1012 | # CONFIG_HERMES is not set | ||
| 1013 | # CONFIG_ATMEL is not set | ||
| 1014 | # CONFIG_AIRO_CS is not set | ||
| 1015 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 1016 | # CONFIG_PRISM54 is not set | ||
| 1017 | # CONFIG_USB_ZD1201 is not set | ||
| 1018 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 1019 | # CONFIG_RTL8180 is not set | ||
| 1020 | # CONFIG_RTL8187 is not set | ||
| 1021 | # CONFIG_ADM8211 is not set | ||
| 1022 | # CONFIG_P54_COMMON is not set | ||
| 1023 | CONFIG_ATH5K=y | ||
| 1024 | # CONFIG_ATH5K_DEBUG is not set | ||
| 1025 | # CONFIG_IWLWIFI is not set | ||
| 1026 | # CONFIG_IWLCORE is not set | ||
| 1027 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1028 | # CONFIG_IWL4965 is not set | ||
| 1029 | # CONFIG_IWL3945 is not set | ||
| 1030 | # CONFIG_HOSTAP is not set | ||
| 1031 | # CONFIG_B43 is not set | ||
| 1032 | # CONFIG_B43LEGACY is not set | ||
| 1033 | # CONFIG_ZD1211RW is not set | ||
| 1034 | # CONFIG_RT2X00 is not set | ||
| 845 | 1035 | ||
| 846 | # | 1036 | # |
| 847 | # USB Network Adapters | 1037 | # USB Network Adapters |
| @@ -850,16 +1040,27 @@ CONFIG_NETDEV_10000=y | |||
| 850 | # CONFIG_USB_KAWETH is not set | 1040 | # CONFIG_USB_KAWETH is not set |
| 851 | # CONFIG_USB_PEGASUS is not set | 1041 | # CONFIG_USB_PEGASUS is not set |
| 852 | # CONFIG_USB_RTL8150 is not set | 1042 | # CONFIG_USB_RTL8150 is not set |
| 853 | # CONFIG_USB_USBNET_MII is not set | ||
| 854 | # CONFIG_USB_USBNET is not set | 1043 | # CONFIG_USB_USBNET is not set |
| 1044 | CONFIG_NET_PCMCIA=y | ||
| 1045 | # CONFIG_PCMCIA_3C589 is not set | ||
| 1046 | # CONFIG_PCMCIA_3C574 is not set | ||
| 1047 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 1048 | # CONFIG_PCMCIA_PCNET is not set | ||
| 1049 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 1050 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 1051 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 1052 | # CONFIG_PCMCIA_AXNET is not set | ||
| 1053 | # CONFIG_PCMCIA_IBMTR is not set | ||
| 855 | # CONFIG_WAN is not set | 1054 | # CONFIG_WAN is not set |
| 856 | # CONFIG_FDDI is not set | 1055 | CONFIG_FDDI=y |
| 1056 | # CONFIG_DEFXX is not set | ||
| 1057 | # CONFIG_SKFP is not set | ||
| 857 | # CONFIG_HIPPI is not set | 1058 | # CONFIG_HIPPI is not set |
| 858 | # CONFIG_PPP is not set | 1059 | # CONFIG_PPP is not set |
| 859 | # CONFIG_SLIP is not set | 1060 | # CONFIG_SLIP is not set |
| 860 | # CONFIG_NET_FC is not set | 1061 | # CONFIG_NET_FC is not set |
| 861 | # CONFIG_SHAPER is not set | ||
| 862 | CONFIG_NETCONSOLE=y | 1062 | CONFIG_NETCONSOLE=y |
| 1063 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
| 863 | CONFIG_NETPOLL=y | 1064 | CONFIG_NETPOLL=y |
| 864 | # CONFIG_NETPOLL_TRAP is not set | 1065 | # CONFIG_NETPOLL_TRAP is not set |
| 865 | CONFIG_NET_POLL_CONTROLLER=y | 1066 | CONFIG_NET_POLL_CONTROLLER=y |
| @@ -870,18 +1071,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
| 870 | # Input device support | 1071 | # Input device support |
| 871 | # | 1072 | # |
| 872 | CONFIG_INPUT=y | 1073 | CONFIG_INPUT=y |
| 873 | # CONFIG_INPUT_FF_MEMLESS is not set | 1074 | CONFIG_INPUT_FF_MEMLESS=y |
| 874 | # CONFIG_INPUT_POLLDEV is not set | 1075 | CONFIG_INPUT_POLLDEV=y |
| 875 | 1076 | ||
| 876 | # | 1077 | # |
| 877 | # Userland interfaces | 1078 | # Userland interfaces |
| 878 | # | 1079 | # |
| 879 | CONFIG_INPUT_MOUSEDEV=y | 1080 | CONFIG_INPUT_MOUSEDEV=y |
| 880 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1081 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
| 881 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1082 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 882 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1083 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 883 | # CONFIG_INPUT_JOYDEV is not set | 1084 | # CONFIG_INPUT_JOYDEV is not set |
| 884 | # CONFIG_INPUT_TSDEV is not set | ||
| 885 | CONFIG_INPUT_EVDEV=y | 1085 | CONFIG_INPUT_EVDEV=y |
| 886 | # CONFIG_INPUT_EVBUG is not set | 1086 | # CONFIG_INPUT_EVBUG is not set |
| 887 | 1087 | ||
| @@ -906,17 +1106,63 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 906 | # CONFIG_MOUSE_SERIAL is not set | 1106 | # CONFIG_MOUSE_SERIAL is not set |
| 907 | # CONFIG_MOUSE_APPLETOUCH is not set | 1107 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 908 | # CONFIG_MOUSE_VSXXXAA is not set | 1108 | # CONFIG_MOUSE_VSXXXAA is not set |
| 909 | # CONFIG_INPUT_JOYSTICK is not set | 1109 | CONFIG_INPUT_JOYSTICK=y |
| 910 | # CONFIG_INPUT_TABLET is not set | 1110 | # CONFIG_JOYSTICK_ANALOG is not set |
| 911 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1111 | # CONFIG_JOYSTICK_A3D is not set |
| 912 | # CONFIG_INPUT_MISC is not set | 1112 | # CONFIG_JOYSTICK_ADI is not set |
| 1113 | # CONFIG_JOYSTICK_COBRA is not set | ||
| 1114 | # CONFIG_JOYSTICK_GF2K is not set | ||
| 1115 | # CONFIG_JOYSTICK_GRIP is not set | ||
| 1116 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
| 1117 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
| 1118 | # CONFIG_JOYSTICK_INTERACT is not set | ||
| 1119 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
| 1120 | # CONFIG_JOYSTICK_TMDC is not set | ||
| 1121 | # CONFIG_JOYSTICK_IFORCE is not set | ||
| 1122 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
| 1123 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
| 1124 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
| 1125 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
| 1126 | # CONFIG_JOYSTICK_STINGER is not set | ||
| 1127 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
| 1128 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
| 1129 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
| 1130 | # CONFIG_JOYSTICK_XPAD is not set | ||
| 1131 | CONFIG_INPUT_TABLET=y | ||
| 1132 | # CONFIG_TABLET_USB_ACECAD is not set | ||
| 1133 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
| 1134 | # CONFIG_TABLET_USB_GTCO is not set | ||
| 1135 | # CONFIG_TABLET_USB_KBTAB is not set | ||
| 1136 | # CONFIG_TABLET_USB_WACOM is not set | ||
| 1137 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 1138 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 1139 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 1140 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 1141 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 1142 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 1143 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 1144 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 1145 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 1146 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 1147 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 1148 | CONFIG_INPUT_MISC=y | ||
| 1149 | # CONFIG_INPUT_PCSPKR is not set | ||
| 1150 | # CONFIG_INPUT_APANEL is not set | ||
| 1151 | # CONFIG_INPUT_WISTRON_BTNS is not set | ||
| 1152 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
| 1153 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
| 1154 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
| 1155 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
| 1156 | # CONFIG_INPUT_POWERMATE is not set | ||
| 1157 | # CONFIG_INPUT_YEALINK is not set | ||
| 1158 | # CONFIG_INPUT_UINPUT is not set | ||
| 913 | 1159 | ||
| 914 | # | 1160 | # |
| 915 | # Hardware I/O ports | 1161 | # Hardware I/O ports |
| 916 | # | 1162 | # |
| 917 | CONFIG_SERIO=y | 1163 | CONFIG_SERIO=y |
| 918 | CONFIG_SERIO_I8042=y | 1164 | CONFIG_SERIO_I8042=y |
| 919 | # CONFIG_SERIO_SERPORT is not set | 1165 | CONFIG_SERIO_SERPORT=y |
| 920 | # CONFIG_SERIO_CT82C710 is not set | 1166 | # CONFIG_SERIO_CT82C710 is not set |
| 921 | # CONFIG_SERIO_PCIPS2 is not set | 1167 | # CONFIG_SERIO_PCIPS2 is not set |
| 922 | CONFIG_SERIO_LIBPS2=y | 1168 | CONFIG_SERIO_LIBPS2=y |
| @@ -929,8 +1175,26 @@ CONFIG_SERIO_LIBPS2=y | |||
| 929 | CONFIG_VT=y | 1175 | CONFIG_VT=y |
| 930 | CONFIG_VT_CONSOLE=y | 1176 | CONFIG_VT_CONSOLE=y |
| 931 | CONFIG_HW_CONSOLE=y | 1177 | CONFIG_HW_CONSOLE=y |
| 932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1178 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 933 | # CONFIG_SERIAL_NONSTANDARD is not set | 1179 | CONFIG_DEVKMEM=y |
| 1180 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 1181 | # CONFIG_COMPUTONE is not set | ||
| 1182 | # CONFIG_ROCKETPORT is not set | ||
| 1183 | # CONFIG_CYCLADES is not set | ||
| 1184 | # CONFIG_DIGIEPCA is not set | ||
| 1185 | # CONFIG_MOXA_INTELLIO is not set | ||
| 1186 | # CONFIG_MOXA_SMARTIO is not set | ||
| 1187 | # CONFIG_ISI is not set | ||
| 1188 | # CONFIG_SYNCLINK is not set | ||
| 1189 | # CONFIG_SYNCLINKMP is not set | ||
| 1190 | # CONFIG_SYNCLINK_GT is not set | ||
| 1191 | # CONFIG_N_HDLC is not set | ||
| 1192 | # CONFIG_RISCOM8 is not set | ||
| 1193 | # CONFIG_SPECIALIX is not set | ||
| 1194 | # CONFIG_SX is not set | ||
| 1195 | # CONFIG_RIO is not set | ||
| 1196 | # CONFIG_STALDRV is not set | ||
| 1197 | # CONFIG_NOZOMI is not set | ||
| 934 | 1198 | ||
| 935 | # | 1199 | # |
| 936 | # Serial drivers | 1200 | # Serial drivers |
| @@ -940,9 +1204,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
| 940 | CONFIG_FIX_EARLYCON_MEM=y | 1204 | CONFIG_FIX_EARLYCON_MEM=y |
| 941 | CONFIG_SERIAL_8250_PCI=y | 1205 | CONFIG_SERIAL_8250_PCI=y |
| 942 | CONFIG_SERIAL_8250_PNP=y | 1206 | CONFIG_SERIAL_8250_PNP=y |
| 943 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1207 | # CONFIG_SERIAL_8250_CS is not set |
| 1208 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 944 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1209 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 945 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1210 | CONFIG_SERIAL_8250_EXTENDED=y |
| 1211 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 1212 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 1213 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 1214 | CONFIG_SERIAL_8250_RSA=y | ||
| 946 | 1215 | ||
| 947 | # | 1216 | # |
| 948 | # Non-8250 serial port support | 1217 | # Non-8250 serial port support |
| @@ -951,89 +1220,275 @@ CONFIG_SERIAL_CORE=y | |||
| 951 | CONFIG_SERIAL_CORE_CONSOLE=y | 1220 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 952 | # CONFIG_SERIAL_JSM is not set | 1221 | # CONFIG_SERIAL_JSM is not set |
| 953 | CONFIG_UNIX98_PTYS=y | 1222 | CONFIG_UNIX98_PTYS=y |
| 954 | CONFIG_LEGACY_PTYS=y | 1223 | # CONFIG_LEGACY_PTYS is not set |
| 955 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 956 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
| 957 | # CONFIG_WATCHDOG is not set | ||
| 958 | CONFIG_HW_RANDOM=y | 1225 | CONFIG_HW_RANDOM=y |
| 959 | CONFIG_HW_RANDOM_INTEL=y | 1226 | # CONFIG_HW_RANDOM_INTEL is not set |
| 960 | CONFIG_HW_RANDOM_AMD=y | 1227 | # CONFIG_HW_RANDOM_AMD is not set |
| 961 | CONFIG_HW_RANDOM_GEODE=y | 1228 | CONFIG_HW_RANDOM_GEODE=y |
| 962 | CONFIG_HW_RANDOM_VIA=y | 1229 | CONFIG_HW_RANDOM_VIA=y |
| 963 | # CONFIG_NVRAM is not set | 1230 | CONFIG_NVRAM=y |
| 964 | CONFIG_RTC=y | ||
| 965 | # CONFIG_R3964 is not set | 1231 | # CONFIG_R3964 is not set |
| 966 | # CONFIG_APPLICOM is not set | 1232 | # CONFIG_APPLICOM is not set |
| 967 | # CONFIG_SONYPI is not set | 1233 | # CONFIG_SONYPI is not set |
| 968 | CONFIG_AGP=y | 1234 | |
| 969 | # CONFIG_AGP_ALI is not set | 1235 | # |
| 970 | # CONFIG_AGP_ATI is not set | 1236 | # PCMCIA character devices |
| 971 | # CONFIG_AGP_AMD is not set | 1237 | # |
| 972 | CONFIG_AGP_AMD64=y | 1238 | # CONFIG_SYNCLINK_CS is not set |
| 973 | CONFIG_AGP_INTEL=y | 1239 | # CONFIG_CARDMAN_4000 is not set |
| 974 | # CONFIG_AGP_NVIDIA is not set | 1240 | # CONFIG_CARDMAN_4040 is not set |
| 975 | # CONFIG_AGP_SIS is not set | 1241 | # CONFIG_IPWIRELESS is not set |
| 976 | # CONFIG_AGP_SWORKS is not set | ||
| 977 | # CONFIG_AGP_VIA is not set | ||
| 978 | # CONFIG_AGP_EFFICEON is not set | ||
| 979 | # CONFIG_DRM is not set | ||
| 980 | # CONFIG_MWAVE is not set | 1242 | # CONFIG_MWAVE is not set |
| 981 | # CONFIG_PC8736x_GPIO is not set | 1243 | # CONFIG_PC8736x_GPIO is not set |
| 982 | # CONFIG_NSC_GPIO is not set | 1244 | # CONFIG_NSC_GPIO is not set |
| 983 | # CONFIG_CS5535_GPIO is not set | 1245 | # CONFIG_CS5535_GPIO is not set |
| 984 | CONFIG_RAW_DRIVER=y | 1246 | # CONFIG_RAW_DRIVER is not set |
| 985 | CONFIG_MAX_RAW_DEVS=256 | ||
| 986 | CONFIG_HPET=y | 1247 | CONFIG_HPET=y |
| 987 | # CONFIG_HPET_RTC_IRQ is not set | 1248 | # CONFIG_HPET_RTC_IRQ is not set |
| 988 | CONFIG_HPET_MMAP=y | 1249 | # CONFIG_HPET_MMAP is not set |
| 989 | # CONFIG_HANGCHECK_TIMER is not set | 1250 | # CONFIG_HANGCHECK_TIMER is not set |
| 990 | # CONFIG_TCG_TPM is not set | 1251 | # CONFIG_TCG_TPM is not set |
| 991 | # CONFIG_TELCLOCK is not set | 1252 | # CONFIG_TELCLOCK is not set |
| 992 | CONFIG_DEVPORT=y | 1253 | CONFIG_DEVPORT=y |
| 993 | # CONFIG_I2C is not set | 1254 | CONFIG_I2C=y |
| 994 | 1255 | CONFIG_I2C_BOARDINFO=y | |
| 995 | # | 1256 | # CONFIG_I2C_CHARDEV is not set |
| 996 | # SPI support | 1257 | |
| 997 | # | 1258 | # |
| 1259 | # I2C Hardware Bus support | ||
| 1260 | # | ||
| 1261 | # CONFIG_I2C_ALI1535 is not set | ||
| 1262 | # CONFIG_I2C_ALI1563 is not set | ||
| 1263 | # CONFIG_I2C_ALI15X3 is not set | ||
| 1264 | # CONFIG_I2C_AMD756 is not set | ||
| 1265 | # CONFIG_I2C_AMD8111 is not set | ||
| 1266 | CONFIG_I2C_I801=y | ||
| 1267 | # CONFIG_I2C_I810 is not set | ||
| 1268 | # CONFIG_I2C_PIIX4 is not set | ||
| 1269 | # 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 | ||
| 1277 | # CONFIG_I2C_SIS630 is not set | ||
| 1278 | # 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 | ||
| 1283 | # CONFIG_I2C_VIAPRO is not set | ||
| 1284 | # CONFIG_I2C_VOODOO3 is not set | ||
| 1285 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1286 | |||
| 1287 | # | ||
| 1288 | # Miscellaneous I2C Chip support | ||
| 1289 | # | ||
| 1290 | # CONFIG_DS1682 is not set | ||
| 1291 | # CONFIG_SENSORS_EEPROM is not set | ||
| 1292 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 1293 | # CONFIG_PCF8575 is not set | ||
| 1294 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1295 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 1296 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1297 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 1298 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 1299 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 1300 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 998 | # CONFIG_SPI is not set | 1301 | # CONFIG_SPI is not set |
| 999 | # CONFIG_SPI_MASTER is not set | ||
| 1000 | # CONFIG_W1 is not set | 1302 | # CONFIG_W1 is not set |
| 1001 | # CONFIG_POWER_SUPPLY is not set | 1303 | CONFIG_POWER_SUPPLY=y |
| 1304 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 1305 | # CONFIG_PDA_POWER is not set | ||
| 1306 | # CONFIG_BATTERY_DS2760 is not set | ||
| 1002 | # CONFIG_HWMON is not set | 1307 | # CONFIG_HWMON is not set |
| 1308 | CONFIG_THERMAL=y | ||
| 1309 | CONFIG_WATCHDOG=y | ||
| 1310 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 1311 | |||
| 1312 | # | ||
| 1313 | # Watchdog Device Drivers | ||
| 1314 | # | ||
| 1315 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 1316 | # CONFIG_ACQUIRE_WDT is not set | ||
| 1317 | # CONFIG_ADVANTECH_WDT is not set | ||
| 1318 | # CONFIG_ALIM1535_WDT is not set | ||
| 1319 | # CONFIG_ALIM7101_WDT is not set | ||
| 1320 | # CONFIG_SC520_WDT is not set | ||
| 1321 | # CONFIG_EUROTECH_WDT is not set | ||
| 1322 | # CONFIG_IB700_WDT is not set | ||
| 1323 | # CONFIG_IBMASR is not set | ||
| 1324 | # CONFIG_WAFER_WDT is not set | ||
| 1325 | # CONFIG_I6300ESB_WDT is not set | ||
| 1326 | # CONFIG_ITCO_WDT is not set | ||
| 1327 | # CONFIG_IT8712F_WDT is not set | ||
| 1328 | # CONFIG_HP_WATCHDOG is not set | ||
| 1329 | # CONFIG_SC1200_WDT is not set | ||
| 1330 | # CONFIG_PC87413_WDT is not set | ||
| 1331 | # CONFIG_60XX_WDT is not set | ||
| 1332 | # CONFIG_SBC8360_WDT is not set | ||
| 1333 | # CONFIG_SBC7240_WDT is not set | ||
| 1334 | # CONFIG_CPU5_WDT is not set | ||
| 1335 | # CONFIG_SMSC37B787_WDT is not set | ||
| 1336 | # CONFIG_W83627HF_WDT is not set | ||
| 1337 | # CONFIG_W83697HF_WDT is not set | ||
| 1338 | # CONFIG_W83877F_WDT is not set | ||
| 1339 | # CONFIG_W83977F_WDT is not set | ||
| 1340 | # CONFIG_MACHZ_WDT is not set | ||
| 1341 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
| 1342 | |||
| 1343 | # | ||
| 1344 | # PCI-based Watchdog Cards | ||
| 1345 | # | ||
| 1346 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 1347 | # CONFIG_WDTPCI is not set | ||
| 1348 | |||
| 1349 | # | ||
| 1350 | # USB-based Watchdog Cards | ||
| 1351 | # | ||
| 1352 | # CONFIG_USBPCWATCHDOG is not set | ||
| 1353 | |||
| 1354 | # | ||
| 1355 | # Sonics Silicon Backplane | ||
| 1356 | # | ||
| 1357 | CONFIG_SSB_POSSIBLE=y | ||
| 1358 | # CONFIG_SSB is not set | ||
| 1003 | 1359 | ||
| 1004 | # | 1360 | # |
| 1005 | # Multifunction device drivers | 1361 | # Multifunction device drivers |
| 1006 | # | 1362 | # |
| 1007 | # CONFIG_MFD_SM501 is not set | 1363 | # CONFIG_MFD_SM501 is not set |
| 1364 | # CONFIG_HTC_PASIC3 is not set | ||
| 1008 | 1365 | ||
| 1009 | # | 1366 | # |
| 1010 | # Multimedia devices | 1367 | # Multimedia devices |
| 1011 | # | 1368 | # |
| 1369 | |||
| 1370 | # | ||
| 1371 | # Multimedia core support | ||
| 1372 | # | ||
| 1012 | # CONFIG_VIDEO_DEV is not set | 1373 | # CONFIG_VIDEO_DEV is not set |
| 1013 | # CONFIG_DVB_CORE is not set | 1374 | # CONFIG_DVB_CORE is not set |
| 1375 | |||
| 1376 | # | ||
| 1377 | # Multimedia drivers | ||
| 1378 | # | ||
| 1014 | CONFIG_DAB=y | 1379 | CONFIG_DAB=y |
| 1015 | # CONFIG_USB_DABUSB is not set | 1380 | # CONFIG_USB_DABUSB is not set |
| 1016 | 1381 | ||
| 1017 | # | 1382 | # |
| 1018 | # Graphics support | 1383 | # Graphics support |
| 1019 | # | 1384 | # |
| 1020 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1385 | CONFIG_AGP=y |
| 1386 | # CONFIG_AGP_ALI is not set | ||
| 1387 | # CONFIG_AGP_ATI is not set | ||
| 1388 | # CONFIG_AGP_AMD is not set | ||
| 1389 | CONFIG_AGP_AMD64=y | ||
| 1390 | CONFIG_AGP_INTEL=y | ||
| 1391 | # CONFIG_AGP_NVIDIA is not set | ||
| 1392 | # CONFIG_AGP_SIS is not set | ||
| 1393 | # CONFIG_AGP_SWORKS is not set | ||
| 1394 | # CONFIG_AGP_VIA is not set | ||
| 1395 | # CONFIG_AGP_EFFICEON is not set | ||
| 1396 | CONFIG_DRM=y | ||
| 1397 | # CONFIG_DRM_TDFX is not set | ||
| 1398 | # CONFIG_DRM_R128 is not set | ||
| 1399 | # CONFIG_DRM_RADEON is not set | ||
| 1400 | # CONFIG_DRM_I810 is not set | ||
| 1401 | # CONFIG_DRM_I830 is not set | ||
| 1402 | CONFIG_DRM_I915=y | ||
| 1403 | # CONFIG_DRM_MGA is not set | ||
| 1404 | # CONFIG_DRM_SIS is not set | ||
| 1405 | # CONFIG_DRM_VIA is not set | ||
| 1406 | # CONFIG_DRM_SAVAGE is not set | ||
| 1407 | # CONFIG_VGASTATE is not set | ||
| 1408 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1409 | CONFIG_FB=y | ||
| 1410 | # CONFIG_FIRMWARE_EDID is not set | ||
| 1411 | # CONFIG_FB_DDC is not set | ||
| 1412 | CONFIG_FB_CFB_FILLRECT=y | ||
| 1413 | CONFIG_FB_CFB_COPYAREA=y | ||
| 1414 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 1415 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1416 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1417 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1418 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1419 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1420 | # CONFIG_FB_SYS_FOPS is not set | ||
| 1421 | CONFIG_FB_DEFERRED_IO=y | ||
| 1422 | # CONFIG_FB_SVGALIB is not set | ||
| 1423 | # CONFIG_FB_MACMODES is not set | ||
| 1424 | # CONFIG_FB_BACKLIGHT is not set | ||
| 1425 | CONFIG_FB_MODE_HELPERS=y | ||
| 1426 | CONFIG_FB_TILEBLITTING=y | ||
| 1427 | |||
| 1428 | # | ||
| 1429 | # Frame buffer hardware drivers | ||
| 1430 | # | ||
| 1431 | # CONFIG_FB_CIRRUS is not set | ||
| 1432 | # CONFIG_FB_PM2 is not set | ||
| 1433 | # CONFIG_FB_CYBER2000 is not set | ||
| 1434 | # CONFIG_FB_ARC is not set | ||
| 1435 | # CONFIG_FB_ASILIANT is not set | ||
| 1436 | # CONFIG_FB_IMSTT is not set | ||
| 1437 | # CONFIG_FB_VGA16 is not set | ||
| 1438 | # CONFIG_FB_UVESA is not set | ||
| 1439 | # CONFIG_FB_VESA is not set | ||
| 1440 | CONFIG_FB_EFI=y | ||
| 1441 | # CONFIG_FB_IMAC is not set | ||
| 1442 | # CONFIG_FB_N411 is not set | ||
| 1443 | # CONFIG_FB_HGA is not set | ||
| 1444 | # CONFIG_FB_S1D13XXX is not set | ||
| 1445 | # CONFIG_FB_NVIDIA is not set | ||
| 1446 | # CONFIG_FB_RIVA is not set | ||
| 1447 | # CONFIG_FB_I810 is not set | ||
| 1448 | # CONFIG_FB_LE80578 is not set | ||
| 1449 | # CONFIG_FB_INTEL is not set | ||
| 1450 | # CONFIG_FB_MATROX is not set | ||
| 1451 | # CONFIG_FB_RADEON is not set | ||
| 1452 | # CONFIG_FB_ATY128 is not set | ||
| 1453 | # CONFIG_FB_ATY is not set | ||
| 1454 | # CONFIG_FB_S3 is not set | ||
| 1455 | # CONFIG_FB_SAVAGE is not set | ||
| 1456 | # CONFIG_FB_SIS is not set | ||
| 1457 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1458 | # CONFIG_FB_KYRO is not set | ||
| 1459 | # CONFIG_FB_3DFX is not set | ||
| 1460 | # CONFIG_FB_VOODOO1 is not set | ||
| 1461 | # CONFIG_FB_VT8623 is not set | ||
| 1462 | # CONFIG_FB_CYBLA is not set | ||
| 1463 | # CONFIG_FB_TRIDENT is not set | ||
| 1464 | # CONFIG_FB_ARK is not set | ||
| 1465 | # CONFIG_FB_PM3 is not set | ||
| 1466 | # CONFIG_FB_GEODE is not set | ||
| 1467 | # CONFIG_FB_VIRTUAL is not set | ||
| 1468 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1469 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
| 1470 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1471 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1472 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
| 1021 | 1473 | ||
| 1022 | # | 1474 | # |
| 1023 | # Display device support | 1475 | # Display device support |
| 1024 | # | 1476 | # |
| 1025 | # CONFIG_DISPLAY_SUPPORT is not set | 1477 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1026 | # CONFIG_VGASTATE is not set | ||
| 1027 | # CONFIG_FB is not set | ||
| 1028 | 1478 | ||
| 1029 | # | 1479 | # |
| 1030 | # Console display driver support | 1480 | # Console display driver support |
| 1031 | # | 1481 | # |
| 1032 | CONFIG_VGA_CONSOLE=y | 1482 | CONFIG_VGA_CONSOLE=y |
| 1033 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1483 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
| 1034 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128 | 1484 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
| 1035 | CONFIG_VIDEO_SELECT=y | 1485 | CONFIG_VIDEO_SELECT=y |
| 1036 | CONFIG_DUMMY_CONSOLE=y | 1486 | CONFIG_DUMMY_CONSOLE=y |
| 1487 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 1488 | CONFIG_LOGO=y | ||
| 1489 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 1490 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 1491 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 1037 | 1492 | ||
| 1038 | # | 1493 | # |
| 1039 | # Sound | 1494 | # Sound |
| @@ -1043,33 +1498,167 @@ CONFIG_SOUND=y | |||
| 1043 | # | 1498 | # |
| 1044 | # Advanced Linux Sound Architecture | 1499 | # Advanced Linux Sound Architecture |
| 1045 | # | 1500 | # |
| 1046 | # CONFIG_SND is not set | 1501 | CONFIG_SND=y |
| 1502 | CONFIG_SND_TIMER=y | ||
| 1503 | CONFIG_SND_PCM=y | ||
| 1504 | CONFIG_SND_HWDEP=y | ||
| 1505 | CONFIG_SND_SEQUENCER=y | ||
| 1506 | CONFIG_SND_SEQ_DUMMY=y | ||
| 1507 | CONFIG_SND_OSSEMUL=y | ||
| 1508 | CONFIG_SND_MIXER_OSS=y | ||
| 1509 | CONFIG_SND_PCM_OSS=y | ||
| 1510 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1511 | CONFIG_SND_SEQUENCER_OSS=y | ||
| 1512 | CONFIG_SND_DYNAMIC_MINORS=y | ||
| 1513 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1514 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1515 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1516 | # CONFIG_SND_DEBUG is not set | ||
| 1517 | CONFIG_SND_VMASTER=y | ||
| 1518 | |||
| 1519 | # | ||
| 1520 | # Generic devices | ||
| 1521 | # | ||
| 1522 | # CONFIG_SND_PCSP is not set | ||
| 1523 | # CONFIG_SND_DUMMY is not set | ||
| 1524 | # CONFIG_SND_VIRMIDI is not set | ||
| 1525 | # CONFIG_SND_MTPAV is not set | ||
| 1526 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1527 | # CONFIG_SND_MPU401 is not set | ||
| 1528 | |||
| 1529 | # | ||
| 1530 | # PCI devices | ||
| 1531 | # | ||
| 1532 | # CONFIG_SND_AD1889 is not set | ||
| 1533 | # CONFIG_SND_ALS300 is not set | ||
| 1534 | # CONFIG_SND_ALS4000 is not set | ||
| 1535 | # CONFIG_SND_ALI5451 is not set | ||
| 1536 | # CONFIG_SND_ATIIXP is not set | ||
| 1537 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1538 | # CONFIG_SND_AU8810 is not set | ||
| 1539 | # CONFIG_SND_AU8820 is not set | ||
| 1540 | # CONFIG_SND_AU8830 is not set | ||
| 1541 | # CONFIG_SND_AW2 is not set | ||
| 1542 | # CONFIG_SND_AZT3328 is not set | ||
| 1543 | # CONFIG_SND_BT87X is not set | ||
| 1544 | # CONFIG_SND_CA0106 is not set | ||
| 1545 | # CONFIG_SND_CMIPCI is not set | ||
| 1546 | # CONFIG_SND_OXYGEN is not set | ||
| 1547 | # CONFIG_SND_CS4281 is not set | ||
| 1548 | # CONFIG_SND_CS46XX is not set | ||
| 1549 | # CONFIG_SND_CS5530 is not set | ||
| 1550 | # CONFIG_SND_CS5535AUDIO is not set | ||
| 1551 | # CONFIG_SND_DARLA20 is not set | ||
| 1552 | # CONFIG_SND_GINA20 is not set | ||
| 1553 | # CONFIG_SND_LAYLA20 is not set | ||
| 1554 | # CONFIG_SND_DARLA24 is not set | ||
| 1555 | # CONFIG_SND_GINA24 is not set | ||
| 1556 | # CONFIG_SND_LAYLA24 is not set | ||
| 1557 | # CONFIG_SND_MONA is not set | ||
| 1558 | # CONFIG_SND_MIA is not set | ||
| 1559 | # CONFIG_SND_ECHO3G is not set | ||
| 1560 | # CONFIG_SND_INDIGO is not set | ||
| 1561 | # CONFIG_SND_INDIGOIO is not set | ||
| 1562 | # CONFIG_SND_INDIGODJ is not set | ||
| 1563 | # CONFIG_SND_EMU10K1 is not set | ||
| 1564 | # CONFIG_SND_EMU10K1X is not set | ||
| 1565 | # CONFIG_SND_ENS1370 is not set | ||
| 1566 | # CONFIG_SND_ENS1371 is not set | ||
| 1567 | # CONFIG_SND_ES1938 is not set | ||
| 1568 | # CONFIG_SND_ES1968 is not set | ||
| 1569 | # CONFIG_SND_FM801 is not set | ||
| 1570 | CONFIG_SND_HDA_INTEL=y | ||
| 1571 | CONFIG_SND_HDA_HWDEP=y | ||
| 1572 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
| 1573 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
| 1574 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
| 1575 | CONFIG_SND_HDA_CODEC_VIA=y | ||
| 1576 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
| 1577 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
| 1578 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
| 1579 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
| 1580 | CONFIG_SND_HDA_GENERIC=y | ||
| 1581 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
| 1582 | # CONFIG_SND_HDSP is not set | ||
| 1583 | # CONFIG_SND_HDSPM is not set | ||
| 1584 | # CONFIG_SND_HIFIER is not set | ||
| 1585 | # CONFIG_SND_ICE1712 is not set | ||
| 1586 | # CONFIG_SND_ICE1724 is not set | ||
| 1587 | # CONFIG_SND_INTEL8X0 is not set | ||
| 1588 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1589 | # CONFIG_SND_KORG1212 is not set | ||
| 1590 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1591 | # CONFIG_SND_MIXART is not set | ||
| 1592 | # CONFIG_SND_NM256 is not set | ||
| 1593 | # CONFIG_SND_PCXHR is not set | ||
| 1594 | # CONFIG_SND_RIPTIDE is not set | ||
| 1595 | # CONFIG_SND_RME32 is not set | ||
| 1596 | # CONFIG_SND_RME96 is not set | ||
| 1597 | # CONFIG_SND_RME9652 is not set | ||
| 1598 | # CONFIG_SND_SIS7019 is not set | ||
| 1599 | # CONFIG_SND_SONICVIBES is not set | ||
| 1600 | # CONFIG_SND_TRIDENT is not set | ||
| 1601 | # CONFIG_SND_VIA82XX is not set | ||
| 1602 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1603 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1604 | # CONFIG_SND_VX222 is not set | ||
| 1605 | # CONFIG_SND_YMFPCI is not set | ||
| 1606 | |||
| 1607 | # | ||
| 1608 | # USB devices | ||
| 1609 | # | ||
| 1610 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1611 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1612 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1613 | |||
| 1614 | # | ||
| 1615 | # PCMCIA devices | ||
| 1616 | # | ||
| 1617 | # CONFIG_SND_VXPOCKET is not set | ||
| 1618 | # CONFIG_SND_PDAUDIOCF is not set | ||
| 1619 | |||
| 1620 | # | ||
| 1621 | # System on Chip audio support | ||
| 1622 | # | ||
| 1623 | # 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 | # | ||
| 1047 | 1632 | ||
| 1048 | # | 1633 | # |
| 1049 | # Open Sound System | 1634 | # Open Sound System |
| 1050 | # | 1635 | # |
| 1051 | CONFIG_SOUND_PRIME=y | 1636 | # CONFIG_SOUND_PRIME is not set |
| 1052 | # CONFIG_SOUND_TRIDENT is not set | ||
| 1053 | # CONFIG_SOUND_MSNDCLAS is not set | ||
| 1054 | # CONFIG_SOUND_MSNDPIN is not set | ||
| 1055 | # CONFIG_SOUND_OSS is not set | ||
| 1056 | CONFIG_HID_SUPPORT=y | 1637 | CONFIG_HID_SUPPORT=y |
| 1057 | CONFIG_HID=y | 1638 | CONFIG_HID=y |
| 1058 | # CONFIG_HID_DEBUG is not set | 1639 | CONFIG_HID_DEBUG=y |
| 1640 | CONFIG_HIDRAW=y | ||
| 1059 | 1641 | ||
| 1060 | # | 1642 | # |
| 1061 | # USB Input Devices | 1643 | # USB Input Devices |
| 1062 | # | 1644 | # |
| 1063 | CONFIG_USB_HID=y | 1645 | CONFIG_USB_HID=y |
| 1064 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1646 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 1065 | # CONFIG_HID_FF is not set | 1647 | CONFIG_HID_FF=y |
| 1066 | # CONFIG_USB_HIDDEV is not set | 1648 | CONFIG_HID_PID=y |
| 1649 | CONFIG_LOGITECH_FF=y | ||
| 1650 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1651 | CONFIG_PANTHERLORD_FF=y | ||
| 1652 | CONFIG_THRUSTMASTER_FF=y | ||
| 1653 | CONFIG_ZEROPLUS_FF=y | ||
| 1654 | CONFIG_USB_HIDDEV=y | ||
| 1067 | CONFIG_USB_SUPPORT=y | 1655 | CONFIG_USB_SUPPORT=y |
| 1068 | CONFIG_USB_ARCH_HAS_HCD=y | 1656 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1069 | CONFIG_USB_ARCH_HAS_OHCI=y | 1657 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1070 | CONFIG_USB_ARCH_HAS_EHCI=y | 1658 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1071 | CONFIG_USB=y | 1659 | CONFIG_USB=y |
| 1072 | # CONFIG_USB_DEBUG is not set | 1660 | CONFIG_USB_DEBUG=y |
| 1661 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 1073 | 1662 | ||
| 1074 | # | 1663 | # |
| 1075 | # Miscellaneous USB options | 1664 | # Miscellaneous USB options |
| @@ -1077,18 +1666,18 @@ CONFIG_USB=y | |||
| 1077 | CONFIG_USB_DEVICEFS=y | 1666 | CONFIG_USB_DEVICEFS=y |
| 1078 | # CONFIG_USB_DEVICE_CLASS is not set | 1667 | # CONFIG_USB_DEVICE_CLASS is not set |
| 1079 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1668 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1080 | # CONFIG_USB_SUSPEND is not set | 1669 | CONFIG_USB_SUSPEND=y |
| 1081 | # CONFIG_USB_PERSIST is not set | ||
| 1082 | # CONFIG_USB_OTG is not set | 1670 | # CONFIG_USB_OTG is not set |
| 1083 | 1671 | ||
| 1084 | # | 1672 | # |
| 1085 | # USB Host Controller Drivers | 1673 | # USB Host Controller Drivers |
| 1086 | # | 1674 | # |
| 1675 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1087 | CONFIG_USB_EHCI_HCD=y | 1676 | CONFIG_USB_EHCI_HCD=y |
| 1088 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1089 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1090 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1091 | # CONFIG_USB_ISP116X_HCD is not set | 1679 | # CONFIG_USB_ISP116X_HCD is not set |
| 1680 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1092 | CONFIG_USB_OHCI_HCD=y | 1681 | CONFIG_USB_OHCI_HCD=y |
| 1093 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1094 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -1121,8 +1710,10 @@ CONFIG_USB_STORAGE=y | |||
| 1121 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1710 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1122 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1711 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1123 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1712 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1713 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1124 | # CONFIG_USB_STORAGE_KARMA is not set | 1714 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1125 | # CONFIG_USB_LIBUSUAL is not set | 1715 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1716 | CONFIG_USB_LIBUSUAL=y | ||
| 1126 | 1717 | ||
| 1127 | # | 1718 | # |
| 1128 | # USB Imaging devices | 1719 | # USB Imaging devices |
| @@ -1134,10 +1725,6 @@ CONFIG_USB_MON=y | |||
| 1134 | # | 1725 | # |
| 1135 | # USB port drivers | 1726 | # USB port drivers |
| 1136 | # | 1727 | # |
| 1137 | |||
| 1138 | # | ||
| 1139 | # USB Serial Converter support | ||
| 1140 | # | ||
| 1141 | # CONFIG_USB_SERIAL is not set | 1728 | # CONFIG_USB_SERIAL is not set |
| 1142 | 1729 | ||
| 1143 | # | 1730 | # |
| @@ -1163,90 +1750,125 @@ CONFIG_USB_MON=y | |||
| 1163 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1750 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1164 | # CONFIG_USB_IOWARRIOR is not set | 1751 | # CONFIG_USB_IOWARRIOR is not set |
| 1165 | # CONFIG_USB_TEST is not set | 1752 | # CONFIG_USB_TEST is not set |
| 1753 | # CONFIG_USB_GADGET is not set | ||
| 1754 | # CONFIG_MMC is not set | ||
| 1755 | # CONFIG_MEMSTICK is not set | ||
| 1756 | CONFIG_NEW_LEDS=y | ||
| 1757 | CONFIG_LEDS_CLASS=y | ||
| 1166 | 1758 | ||
| 1167 | # | 1759 | # |
| 1168 | # USB DSL modem support | 1760 | # LED drivers |
| 1169 | # | 1761 | # |
| 1762 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
| 1170 | 1763 | ||
| 1171 | # | 1764 | # |
| 1172 | # USB Gadget Support | 1765 | # LED Triggers |
| 1173 | # | 1766 | # |
| 1174 | # CONFIG_USB_GADGET is not set | 1767 | CONFIG_LEDS_TRIGGERS=y |
| 1175 | # CONFIG_MMC is not set | 1768 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1769 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 1770 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1771 | # CONFIG_ACCESSIBILITY is not set | ||
| 1772 | # CONFIG_INFINIBAND is not set | ||
| 1773 | CONFIG_EDAC=y | ||
| 1176 | 1774 | ||
| 1177 | # | 1775 | # |
| 1178 | # LED devices | 1776 | # Reporting subsystems |
| 1179 | # | 1777 | # |
| 1180 | # CONFIG_NEW_LEDS is not set | 1778 | # CONFIG_EDAC_DEBUG is not set |
| 1779 | # CONFIG_EDAC_MM_EDAC is not set | ||
| 1780 | CONFIG_RTC_LIB=y | ||
| 1781 | CONFIG_RTC_CLASS=y | ||
| 1782 | # CONFIG_RTC_HCTOSYS is not set | ||
| 1783 | # CONFIG_RTC_DEBUG is not set | ||
| 1181 | 1784 | ||
| 1182 | # | 1785 | # |
| 1183 | # LED drivers | 1786 | # RTC interfaces |
| 1184 | # | 1787 | # |
| 1788 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1789 | CONFIG_RTC_INTF_PROC=y | ||
| 1790 | CONFIG_RTC_INTF_DEV=y | ||
| 1791 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1792 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1185 | 1793 | ||
| 1186 | # | 1794 | # |
| 1187 | # LED Triggers | 1795 | # I2C RTC drivers |
| 1188 | # | 1796 | # |
| 1189 | # CONFIG_INFINIBAND is not set | 1797 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1190 | # CONFIG_EDAC is not set | 1798 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1799 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1800 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1801 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1802 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1803 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1804 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1805 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1806 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1807 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1191 | 1808 | ||
| 1192 | # | 1809 | # |
| 1193 | # Real Time Clock | 1810 | # SPI RTC drivers |
| 1194 | # | 1811 | # |
| 1195 | # CONFIG_RTC_CLASS is not set | ||
| 1196 | 1812 | ||
| 1197 | # | 1813 | # |
| 1198 | # DMA Engine support | 1814 | # Platform RTC drivers |
| 1199 | # | 1815 | # |
| 1200 | # CONFIG_DMA_ENGINE is not set | 1816 | CONFIG_RTC_DRV_CMOS=y |
| 1817 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1818 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1819 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1820 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1821 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1822 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1823 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1201 | 1824 | ||
| 1202 | # | 1825 | # |
| 1203 | # DMA Clients | 1826 | # on-CPU RTC drivers |
| 1204 | # | 1827 | # |
| 1828 | CONFIG_DMADEVICES=y | ||
| 1205 | 1829 | ||
| 1206 | # | 1830 | # |
| 1207 | # DMA Devices | 1831 | # DMA Devices |
| 1208 | # | 1832 | # |
| 1209 | CONFIG_VIRTUALIZATION=y | 1833 | # CONFIG_INTEL_IOATDMA is not set |
| 1210 | # CONFIG_KVM is not set | 1834 | # CONFIG_UIO is not set |
| 1211 | 1835 | ||
| 1212 | # | 1836 | # |
| 1213 | # Userspace I/O | 1837 | # Firmware Drivers |
| 1214 | # | 1838 | # |
| 1215 | # CONFIG_UIO is not set | 1839 | # CONFIG_EDD is not set |
| 1840 | CONFIG_EFI_VARS=y | ||
| 1841 | # CONFIG_DELL_RBU is not set | ||
| 1842 | # CONFIG_DCDBAS is not set | ||
| 1843 | CONFIG_DMIID=y | ||
| 1844 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
| 1216 | 1845 | ||
| 1217 | # | 1846 | # |
| 1218 | # File systems | 1847 | # File systems |
| 1219 | # | 1848 | # |
| 1220 | CONFIG_EXT2_FS=y | 1849 | # CONFIG_EXT2_FS is not set |
| 1221 | CONFIG_EXT2_FS_XATTR=y | ||
| 1222 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 1223 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 1224 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1225 | CONFIG_EXT3_FS=y | 1850 | CONFIG_EXT3_FS=y |
| 1226 | CONFIG_EXT3_FS_XATTR=y | 1851 | CONFIG_EXT3_FS_XATTR=y |
| 1227 | CONFIG_EXT3_FS_POSIX_ACL=y | 1852 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1228 | # CONFIG_EXT3_FS_SECURITY is not set | 1853 | CONFIG_EXT3_FS_SECURITY=y |
| 1229 | # CONFIG_EXT4DEV_FS is not set | 1854 | # CONFIG_EXT4DEV_FS is not set |
| 1230 | CONFIG_JBD=y | 1855 | CONFIG_JBD=y |
| 1231 | # CONFIG_JBD_DEBUG is not set | 1856 | # CONFIG_JBD_DEBUG is not set |
| 1232 | CONFIG_FS_MBCACHE=y | 1857 | CONFIG_FS_MBCACHE=y |
| 1233 | CONFIG_REISERFS_FS=y | 1858 | # CONFIG_REISERFS_FS is not set |
| 1234 | # CONFIG_REISERFS_CHECK is not set | ||
| 1235 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 1236 | CONFIG_REISERFS_FS_XATTR=y | ||
| 1237 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 1238 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
| 1239 | # CONFIG_JFS_FS is not set | 1859 | # CONFIG_JFS_FS is not set |
| 1240 | CONFIG_FS_POSIX_ACL=y | 1860 | CONFIG_FS_POSIX_ACL=y |
| 1241 | # CONFIG_XFS_FS is not set | 1861 | # CONFIG_XFS_FS is not set |
| 1242 | # CONFIG_GFS2_FS is not set | ||
| 1243 | # CONFIG_OCFS2_FS is not set | 1862 | # CONFIG_OCFS2_FS is not set |
| 1244 | # CONFIG_MINIX_FS is not set | 1863 | CONFIG_DNOTIFY=y |
| 1245 | # CONFIG_ROMFS_FS is not set | ||
| 1246 | CONFIG_INOTIFY=y | 1864 | CONFIG_INOTIFY=y |
| 1247 | CONFIG_INOTIFY_USER=y | 1865 | CONFIG_INOTIFY_USER=y |
| 1248 | # CONFIG_QUOTA is not set | 1866 | CONFIG_QUOTA=y |
| 1249 | CONFIG_DNOTIFY=y | 1867 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 1868 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 1869 | # CONFIG_QFMT_V1 is not set | ||
| 1870 | CONFIG_QFMT_V2=y | ||
| 1871 | CONFIG_QUOTACTL=y | ||
| 1250 | # CONFIG_AUTOFS_FS is not set | 1872 | # CONFIG_AUTOFS_FS is not set |
| 1251 | CONFIG_AUTOFS4_FS=y | 1873 | CONFIG_AUTOFS4_FS=y |
| 1252 | # CONFIG_FUSE_FS is not set | 1874 | # CONFIG_FUSE_FS is not set |
| @@ -1256,8 +1878,8 @@ CONFIG_GENERIC_ACL=y | |||
| 1256 | # CD-ROM/DVD Filesystems | 1878 | # CD-ROM/DVD Filesystems |
| 1257 | # | 1879 | # |
| 1258 | CONFIG_ISO9660_FS=y | 1880 | CONFIG_ISO9660_FS=y |
| 1259 | # CONFIG_JOLIET is not set | 1881 | CONFIG_JOLIET=y |
| 1260 | # CONFIG_ZISOFS is not set | 1882 | CONFIG_ZISOFS=y |
| 1261 | # CONFIG_UDF_FS is not set | 1883 | # CONFIG_UDF_FS is not set |
| 1262 | 1884 | ||
| 1263 | # | 1885 | # |
| @@ -1275,13 +1897,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1275 | # | 1897 | # |
| 1276 | CONFIG_PROC_FS=y | 1898 | CONFIG_PROC_FS=y |
| 1277 | CONFIG_PROC_KCORE=y | 1899 | CONFIG_PROC_KCORE=y |
| 1900 | CONFIG_PROC_VMCORE=y | ||
| 1278 | CONFIG_PROC_SYSCTL=y | 1901 | CONFIG_PROC_SYSCTL=y |
| 1279 | CONFIG_SYSFS=y | 1902 | CONFIG_SYSFS=y |
| 1280 | CONFIG_TMPFS=y | 1903 | CONFIG_TMPFS=y |
| 1281 | CONFIG_TMPFS_POSIX_ACL=y | 1904 | CONFIG_TMPFS_POSIX_ACL=y |
| 1282 | CONFIG_HUGETLBFS=y | 1905 | CONFIG_HUGETLBFS=y |
| 1283 | CONFIG_HUGETLB_PAGE=y | 1906 | CONFIG_HUGETLB_PAGE=y |
| 1284 | CONFIG_RAMFS=y | ||
| 1285 | # CONFIG_CONFIGFS_FS is not set | 1907 | # CONFIG_CONFIGFS_FS is not set |
| 1286 | 1908 | ||
| 1287 | # | 1909 | # |
| @@ -1289,6 +1911,7 @@ CONFIG_RAMFS=y | |||
| 1289 | # | 1911 | # |
| 1290 | # CONFIG_ADFS_FS is not set | 1912 | # CONFIG_ADFS_FS is not set |
| 1291 | # CONFIG_AFFS_FS is not set | 1913 | # CONFIG_AFFS_FS is not set |
| 1914 | # CONFIG_ECRYPT_FS is not set | ||
| 1292 | # CONFIG_HFS_FS is not set | 1915 | # CONFIG_HFS_FS is not set |
| 1293 | # CONFIG_HFSPLUS_FS is not set | 1916 | # CONFIG_HFSPLUS_FS is not set |
| 1294 | # CONFIG_BEFS_FS is not set | 1917 | # CONFIG_BEFS_FS is not set |
| @@ -1296,33 +1919,15 @@ CONFIG_RAMFS=y | |||
| 1296 | # CONFIG_EFS_FS is not set | 1919 | # CONFIG_EFS_FS is not set |
| 1297 | # CONFIG_CRAMFS is not set | 1920 | # CONFIG_CRAMFS is not set |
| 1298 | # CONFIG_VXFS_FS is not set | 1921 | # CONFIG_VXFS_FS is not set |
| 1922 | # CONFIG_MINIX_FS is not set | ||
| 1299 | # CONFIG_HPFS_FS is not set | 1923 | # CONFIG_HPFS_FS is not set |
| 1300 | # CONFIG_QNX4FS_FS is not set | 1924 | # CONFIG_QNX4FS_FS is not set |
| 1925 | # CONFIG_ROMFS_FS is not set | ||
| 1301 | # CONFIG_SYSV_FS is not set | 1926 | # CONFIG_SYSV_FS is not set |
| 1302 | # CONFIG_UFS_FS is not set | 1927 | # CONFIG_UFS_FS is not set |
| 1303 | 1928 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1304 | # | 1929 | # CONFIG_NFS_FS is not set |
| 1305 | # Network File Systems | 1930 | # CONFIG_NFSD is not set |
| 1306 | # | ||
| 1307 | CONFIG_NFS_FS=y | ||
| 1308 | CONFIG_NFS_V3=y | ||
| 1309 | # CONFIG_NFS_V3_ACL is not set | ||
| 1310 | # CONFIG_NFS_V4 is not set | ||
| 1311 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1312 | CONFIG_NFSD=y | ||
| 1313 | CONFIG_NFSD_V3=y | ||
| 1314 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1315 | # CONFIG_NFSD_V4 is not set | ||
| 1316 | CONFIG_NFSD_TCP=y | ||
| 1317 | CONFIG_ROOT_NFS=y | ||
| 1318 | CONFIG_LOCKD=y | ||
| 1319 | CONFIG_LOCKD_V4=y | ||
| 1320 | CONFIG_EXPORTFS=y | ||
| 1321 | CONFIG_NFS_COMMON=y | ||
| 1322 | CONFIG_SUNRPC=y | ||
| 1323 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1324 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1325 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1326 | # CONFIG_SMB_FS is not set | 1931 | # CONFIG_SMB_FS is not set |
| 1327 | # CONFIG_CIFS is not set | 1932 | # CONFIG_CIFS is not set |
| 1328 | # CONFIG_NCP_FS is not set | 1933 | # CONFIG_NCP_FS is not set |
| @@ -1332,14 +1937,26 @@ CONFIG_SUNRPC=y | |||
| 1332 | # | 1937 | # |
| 1333 | # Partition Types | 1938 | # Partition Types |
| 1334 | # | 1939 | # |
| 1335 | # CONFIG_PARTITION_ADVANCED is not set | 1940 | CONFIG_PARTITION_ADVANCED=y |
| 1941 | # CONFIG_ACORN_PARTITION is not set | ||
| 1942 | CONFIG_OSF_PARTITION=y | ||
| 1943 | CONFIG_AMIGA_PARTITION=y | ||
| 1944 | # CONFIG_ATARI_PARTITION is not set | ||
| 1945 | CONFIG_MAC_PARTITION=y | ||
| 1336 | CONFIG_MSDOS_PARTITION=y | 1946 | CONFIG_MSDOS_PARTITION=y |
| 1337 | 1947 | CONFIG_BSD_DISKLABEL=y | |
| 1338 | # | 1948 | CONFIG_MINIX_SUBPARTITION=y |
| 1339 | # Native Language Support | 1949 | CONFIG_SOLARIS_X86_PARTITION=y |
| 1340 | # | 1950 | CONFIG_UNIXWARE_DISKLABEL=y |
| 1951 | # CONFIG_LDM_PARTITION is not set | ||
| 1952 | CONFIG_SGI_PARTITION=y | ||
| 1953 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1954 | CONFIG_SUN_PARTITION=y | ||
| 1955 | CONFIG_KARMA_PARTITION=y | ||
| 1956 | CONFIG_EFI_PARTITION=y | ||
| 1957 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1341 | CONFIG_NLS=y | 1958 | CONFIG_NLS=y |
| 1342 | CONFIG_NLS_DEFAULT="iso8859-1" | 1959 | CONFIG_NLS_DEFAULT="utf8" |
| 1343 | CONFIG_NLS_CODEPAGE_437=y | 1960 | CONFIG_NLS_CODEPAGE_437=y |
| 1344 | # CONFIG_NLS_CODEPAGE_737 is not set | 1961 | # CONFIG_NLS_CODEPAGE_737 is not set |
| 1345 | # CONFIG_NLS_CODEPAGE_775 is not set | 1962 | # CONFIG_NLS_CODEPAGE_775 is not set |
| @@ -1374,37 +1991,33 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1374 | # CONFIG_NLS_ISO8859_9 is not set | 1991 | # CONFIG_NLS_ISO8859_9 is not set |
| 1375 | # CONFIG_NLS_ISO8859_13 is not set | 1992 | # CONFIG_NLS_ISO8859_13 is not set |
| 1376 | # CONFIG_NLS_ISO8859_14 is not set | 1993 | # CONFIG_NLS_ISO8859_14 is not set |
| 1377 | CONFIG_NLS_ISO8859_15=y | 1994 | # CONFIG_NLS_ISO8859_15 is not set |
| 1378 | # CONFIG_NLS_KOI8_R is not set | 1995 | # CONFIG_NLS_KOI8_R is not set |
| 1379 | # CONFIG_NLS_KOI8_U is not set | 1996 | # CONFIG_NLS_KOI8_U is not set |
| 1380 | CONFIG_NLS_UTF8=y | 1997 | CONFIG_NLS_UTF8=y |
| 1381 | |||
| 1382 | # | ||
| 1383 | # Distributed Lock Manager | ||
| 1384 | # | ||
| 1385 | # CONFIG_DLM is not set | 1998 | # CONFIG_DLM is not set |
| 1386 | CONFIG_INSTRUMENTATION=y | ||
| 1387 | CONFIG_PROFILING=y | ||
| 1388 | CONFIG_OPROFILE=y | ||
| 1389 | CONFIG_KPROBES=y | ||
| 1390 | 1999 | ||
| 1391 | # | 2000 | # |
| 1392 | # Kernel hacking | 2001 | # Kernel hacking |
| 1393 | # | 2002 | # |
| 1394 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2003 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1395 | # CONFIG_PRINTK_TIME is not set | 2004 | # CONFIG_PRINTK_TIME is not set |
| 2005 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1396 | # CONFIG_ENABLE_MUST_CHECK is not set | 2006 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 2007 | CONFIG_FRAME_WARN=2048 | ||
| 1397 | CONFIG_MAGIC_SYSRQ=y | 2008 | CONFIG_MAGIC_SYSRQ=y |
| 1398 | CONFIG_UNUSED_SYMBOLS=y | 2009 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1399 | # CONFIG_DEBUG_FS is not set | 2010 | CONFIG_DEBUG_FS=y |
| 1400 | # CONFIG_HEADERS_CHECK is not set | 2011 | # CONFIG_HEADERS_CHECK is not set |
| 1401 | CONFIG_DEBUG_KERNEL=y | 2012 | CONFIG_DEBUG_KERNEL=y |
| 1402 | # CONFIG_DEBUG_SHIRQ is not set | 2013 | # CONFIG_DEBUG_SHIRQ is not set |
| 1403 | CONFIG_DETECT_SOFTLOCKUP=y | 2014 | # CONFIG_DETECT_SOFTLOCKUP is not set |
| 1404 | # CONFIG_SCHED_DEBUG is not set | 2015 | # CONFIG_SCHED_DEBUG is not set |
| 1405 | # CONFIG_SCHEDSTATS is not set | 2016 | CONFIG_SCHEDSTATS=y |
| 1406 | CONFIG_TIMER_STATS=y | 2017 | CONFIG_TIMER_STATS=y |
| 2018 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1407 | # CONFIG_SLUB_DEBUG_ON is not set | 2019 | # CONFIG_SLUB_DEBUG_ON is not set |
| 2020 | # CONFIG_SLUB_STATS is not set | ||
| 1408 | # CONFIG_DEBUG_RT_MUTEXES is not set | 2021 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1409 | # CONFIG_RT_MUTEX_TESTER is not set | 2022 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1410 | # CONFIG_DEBUG_SPINLOCK is not set | 2023 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1419,48 +2032,174 @@ CONFIG_TIMER_STATS=y | |||
| 1419 | CONFIG_DEBUG_BUGVERBOSE=y | 2032 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1420 | # CONFIG_DEBUG_INFO is not set | 2033 | # CONFIG_DEBUG_INFO is not set |
| 1421 | # CONFIG_DEBUG_VM is not set | 2034 | # CONFIG_DEBUG_VM is not set |
| 2035 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1422 | # CONFIG_DEBUG_LIST is not set | 2036 | # CONFIG_DEBUG_LIST is not set |
| 1423 | # CONFIG_FRAME_POINTER is not set | 2037 | # CONFIG_DEBUG_SG is not set |
| 1424 | CONFIG_OPTIMIZE_INLINING=y | 2038 | CONFIG_FRAME_POINTER=y |
| 2039 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1425 | # CONFIG_RCU_TORTURE_TEST is not set | 2040 | # CONFIG_RCU_TORTURE_TEST is not set |
| 2041 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 2042 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1426 | # CONFIG_LKDTM is not set | 2043 | # CONFIG_LKDTM is not set |
| 1427 | # CONFIG_FAULT_INJECTION is not set | 2044 | # CONFIG_FAULT_INJECTION is not set |
| 2045 | # CONFIG_LATENCYTOP is not set | ||
| 2046 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | ||
| 2047 | # CONFIG_SAMPLES is not set | ||
| 2048 | # CONFIG_KGDB is not set | ||
| 2049 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 2050 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
| 1428 | CONFIG_EARLY_PRINTK=y | 2051 | CONFIG_EARLY_PRINTK=y |
| 1429 | CONFIG_DEBUG_STACKOVERFLOW=y | 2052 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1430 | # CONFIG_DEBUG_STACK_USAGE is not set | 2053 | CONFIG_DEBUG_STACK_USAGE=y |
| 1431 | # CONFIG_DEBUG_RODATA is not set | 2054 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 2055 | # CONFIG_X86_PTDUMP is not set | ||
| 2056 | CONFIG_DEBUG_RODATA=y | ||
| 2057 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
| 2058 | CONFIG_DEBUG_NX_TEST=m | ||
| 1432 | # CONFIG_4KSTACKS is not set | 2059 | # CONFIG_4KSTACKS is not set |
| 1433 | CONFIG_X86_FIND_SMP_CONFIG=y | 2060 | CONFIG_X86_FIND_SMP_CONFIG=y |
| 1434 | CONFIG_X86_MPPARSE=y | 2061 | CONFIG_X86_MPPARSE=y |
| 1435 | CONFIG_DOUBLEFAULT=y | 2062 | CONFIG_DOUBLEFAULT=y |
| 2063 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
| 2064 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
| 2065 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
| 2066 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
| 2067 | CONFIG_IO_DELAY_0X80=y | ||
| 2068 | # CONFIG_IO_DELAY_0XED is not set | ||
| 2069 | # CONFIG_IO_DELAY_UDELAY is not set | ||
| 2070 | # CONFIG_IO_DELAY_NONE is not set | ||
| 2071 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
| 2072 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
| 2073 | # CONFIG_CPA_DEBUG is not set | ||
| 1436 | 2074 | ||
| 1437 | # | 2075 | # |
| 1438 | # Security options | 2076 | # Security options |
| 1439 | # | 2077 | # |
| 1440 | # CONFIG_KEYS is not set | 2078 | CONFIG_KEYS=y |
| 1441 | # CONFIG_SECURITY is not set | 2079 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1442 | # CONFIG_CRYPTO is not set | 2080 | CONFIG_SECURITY=y |
| 2081 | CONFIG_SECURITY_NETWORK=y | ||
| 2082 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
| 2083 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2084 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 2085 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 2086 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
| 2087 | CONFIG_SECURITY_SELINUX=y | ||
| 2088 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
| 2089 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
| 2090 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
| 2091 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
| 2092 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
| 2093 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
| 2094 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
| 2095 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
| 2096 | # CONFIG_SECURITY_SMACK is not set | ||
| 2097 | CONFIG_CRYPTO=y | ||
| 2098 | |||
| 2099 | # | ||
| 2100 | # Crypto core or helper | ||
| 2101 | # | ||
| 2102 | CONFIG_CRYPTO_ALGAPI=y | ||
| 2103 | CONFIG_CRYPTO_AEAD=y | ||
| 2104 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 2105 | CONFIG_CRYPTO_HASH=y | ||
| 2106 | CONFIG_CRYPTO_MANAGER=y | ||
| 2107 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 2108 | # CONFIG_CRYPTO_NULL is not set | ||
| 2109 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 2110 | CONFIG_CRYPTO_AUTHENC=y | ||
| 2111 | # CONFIG_CRYPTO_TEST is not set | ||
| 2112 | |||
| 2113 | # | ||
| 2114 | # Authenticated Encryption with Associated Data | ||
| 2115 | # | ||
| 2116 | # CONFIG_CRYPTO_CCM is not set | ||
| 2117 | # CONFIG_CRYPTO_GCM is not set | ||
| 2118 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 2119 | |||
| 2120 | # | ||
| 2121 | # Block modes | ||
| 2122 | # | ||
| 2123 | CONFIG_CRYPTO_CBC=y | ||
| 2124 | # CONFIG_CRYPTO_CTR is not set | ||
| 2125 | # CONFIG_CRYPTO_CTS is not set | ||
| 2126 | CONFIG_CRYPTO_ECB=y | ||
| 2127 | # CONFIG_CRYPTO_LRW is not set | ||
| 2128 | # CONFIG_CRYPTO_PCBC is not set | ||
| 2129 | # CONFIG_CRYPTO_XTS is not set | ||
| 2130 | |||
| 2131 | # | ||
| 2132 | # Hash modes | ||
| 2133 | # | ||
| 2134 | CONFIG_CRYPTO_HMAC=y | ||
| 2135 | # CONFIG_CRYPTO_XCBC is not set | ||
| 2136 | |||
| 2137 | # | ||
| 2138 | # Digest | ||
| 2139 | # | ||
| 2140 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 2141 | # CONFIG_CRYPTO_MD4 is not set | ||
| 2142 | CONFIG_CRYPTO_MD5=y | ||
| 2143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 2144 | CONFIG_CRYPTO_SHA1=y | ||
| 2145 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 2146 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 2147 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 2148 | # CONFIG_CRYPTO_WP512 is not set | ||
| 2149 | |||
| 2150 | # | ||
| 2151 | # Ciphers | ||
| 2152 | # | ||
| 2153 | CONFIG_CRYPTO_AES=y | ||
| 2154 | # CONFIG_CRYPTO_AES_586 is not set | ||
| 2155 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 2156 | CONFIG_CRYPTO_ARC4=y | ||
| 2157 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 2158 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 2159 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 2160 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 2161 | CONFIG_CRYPTO_DES=y | ||
| 2162 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 2163 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 2164 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 2165 | # CONFIG_CRYPTO_SALSA20_586 is not set | ||
| 2166 | # CONFIG_CRYPTO_SEED is not set | ||
| 2167 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 2168 | # CONFIG_CRYPTO_TEA is not set | ||
| 2169 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 2170 | # CONFIG_CRYPTO_TWOFISH_586 is not set | ||
| 2171 | |||
| 2172 | # | ||
| 2173 | # Compression | ||
| 2174 | # | ||
| 2175 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 2176 | # CONFIG_CRYPTO_LZO is not set | ||
| 2177 | CONFIG_CRYPTO_HW=y | ||
| 2178 | # CONFIG_CRYPTO_DEV_PADLOCK is not set | ||
| 2179 | # CONFIG_CRYPTO_DEV_GEODE is not set | ||
| 2180 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 2181 | CONFIG_HAVE_KVM=y | ||
| 2182 | CONFIG_VIRTUALIZATION=y | ||
| 2183 | # CONFIG_KVM is not set | ||
| 2184 | # CONFIG_LGUEST is not set | ||
| 2185 | # CONFIG_VIRTIO_PCI is not set | ||
| 2186 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1443 | 2187 | ||
| 1444 | # | 2188 | # |
| 1445 | # Library routines | 2189 | # Library routines |
| 1446 | # | 2190 | # |
| 1447 | CONFIG_BITREVERSE=y | 2191 | CONFIG_BITREVERSE=y |
| 2192 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
| 2193 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 1448 | # CONFIG_CRC_CCITT is not set | 2194 | # CONFIG_CRC_CCITT is not set |
| 1449 | # CONFIG_CRC16 is not set | 2195 | # CONFIG_CRC16 is not set |
| 1450 | # CONFIG_CRC_ITU_T is not set | 2196 | # CONFIG_CRC_ITU_T is not set |
| 1451 | CONFIG_CRC32=y | 2197 | CONFIG_CRC32=y |
| 1452 | # CONFIG_CRC7 is not set | 2198 | # CONFIG_CRC7 is not set |
| 1453 | # CONFIG_LIBCRC32C is not set | 2199 | # CONFIG_LIBCRC32C is not set |
| 2200 | CONFIG_AUDIT_GENERIC=y | ||
| 1454 | CONFIG_ZLIB_INFLATE=y | 2201 | CONFIG_ZLIB_INFLATE=y |
| 1455 | CONFIG_PLIST=y | 2202 | CONFIG_PLIST=y |
| 1456 | CONFIG_HAS_IOMEM=y | 2203 | CONFIG_HAS_IOMEM=y |
| 1457 | CONFIG_HAS_IOPORT=y | 2204 | CONFIG_HAS_IOPORT=y |
| 1458 | CONFIG_HAS_DMA=y | 2205 | CONFIG_HAS_DMA=y |
| 1459 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1460 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1461 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1462 | CONFIG_X86_SMP=y | ||
| 1463 | CONFIG_X86_HT=y | ||
| 1464 | CONFIG_X86_BIOS_REBOOT=y | ||
| 1465 | CONFIG_X86_TRAMPOLINE=y | ||
| 1466 | CONFIG_KTIME_SCALAR=y | ||
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 2d6f5b2809d2..ae5124e064d4 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
| @@ -1,64 +1,103 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:57 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_X86_64=y | ||
| 7 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
| 7 | # CONFIG_X86_32 is not set | ||
| 8 | CONFIG_X86_64=y | ||
| 8 | CONFIG_X86=y | 9 | CONFIG_X86=y |
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig" | ||
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
| 9 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 10 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 11 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 12 | CONFIG_ZONE_DMA32=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
| 15 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | ||
| 13 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
| 14 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
| 15 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 20 | CONFIG_FAST_CMPXCHG_LOCAL=y | ||
| 16 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
| 17 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
| 18 | CONFIG_QUICKLIST=y | ||
| 19 | CONFIG_NR_QUICK=2 | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | CONFIG_GENERIC_HWEIGHT=y | ||
| 22 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 23 | CONFIG_X86_CMPXCHG=y | ||
| 24 | CONFIG_EARLY_PRINTK=y | ||
| 25 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
| 26 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
| 27 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 28 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 29 | CONFIG_DMI=y | ||
| 30 | CONFIG_AUDIT_ARCH=y | ||
| 31 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
| 26 | CONFIG_GENERIC_HWEIGHT=y | ||
| 27 | # CONFIG_GENERIC_GPIO is not set | ||
| 28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 29 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 30 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 32 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 33 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 34 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
| 34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 35 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
| 37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
| 38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 39 | CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y | ||
| 40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 42 | CONFIG_ZONE_DMA32=y | ||
| 43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 44 | CONFIG_AUDIT_ARCH=y | ||
| 45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
| 47 | CONFIG_GENERIC_HARDIRQS=y | ||
| 48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 50 | CONFIG_X86_SMP=y | ||
| 51 | CONFIG_X86_64_SMP=y | ||
| 52 | CONFIG_X86_HT=y | ||
| 53 | CONFIG_X86_BIOS_REBOOT=y | ||
| 54 | CONFIG_X86_TRAMPOLINE=y | ||
| 55 | # CONFIG_KTIME_SCALAR is not set | ||
| 35 | 56 | ||
| 36 | # | 57 | # |
| 37 | # Code maturity level options | 58 | # General setup |
| 38 | # | 59 | # |
| 39 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
| 40 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
| 41 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 42 | |||
| 43 | # | ||
| 44 | # General setup | ||
| 45 | # | ||
| 46 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
| 47 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
| 48 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
| 49 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
| 50 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
| 51 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
| 52 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
| 53 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 54 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
| 55 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
| 56 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
| 57 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
| 58 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
| 59 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
| 60 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
| 78 | # CONFIG_IKCONFIG is not set | ||
| 79 | CONFIG_LOG_BUF_SHIFT=17 | ||
| 80 | CONFIG_CGROUPS=y | ||
| 81 | # CONFIG_CGROUP_DEBUG is not set | ||
| 82 | CONFIG_CGROUP_NS=y | ||
| 83 | # CONFIG_CGROUP_DEVICE is not set | ||
| 84 | CONFIG_CPUSETS=y | ||
| 85 | CONFIG_GROUP_SCHED=y | ||
| 86 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 87 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 88 | # CONFIG_USER_SCHED is not set | ||
| 89 | CONFIG_CGROUP_SCHED=y | ||
| 90 | CONFIG_CGROUP_CPUACCT=y | ||
| 91 | CONFIG_RESOURCE_COUNTERS=y | ||
| 92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
| 93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 94 | CONFIG_PROC_PID_CPUSET=y | ||
| 61 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
| 96 | CONFIG_NAMESPACES=y | ||
| 97 | CONFIG_UTS_NS=y | ||
| 98 | CONFIG_IPC_NS=y | ||
| 99 | CONFIG_USER_NS=y | ||
| 100 | CONFIG_PID_NS=y | ||
| 62 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
| 63 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
| 64 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -66,13 +105,15 @@ CONFIG_SYSCTL=y | |||
| 66 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
| 67 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
| 68 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 69 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 70 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 71 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 72 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
| 73 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
| 74 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
| 75 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
| 116 | # CONFIG_COMPAT_BRK is not set | ||
| 76 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
| 77 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
| 78 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
| @@ -82,9 +123,21 @@ CONFIG_TIMERFD=y | |||
| 82 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
| 83 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
| 84 | CONFIG_VM_EVENT_COUNTERS=y | 125 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_SLAB=y | 126 | CONFIG_SLUB_DEBUG=y |
| 86 | # CONFIG_SLUB is not set | 127 | # CONFIG_SLAB is not set |
| 128 | CONFIG_SLUB=y | ||
| 87 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
| 130 | CONFIG_PROFILING=y | ||
| 131 | CONFIG_MARKERS=y | ||
| 132 | # CONFIG_OPROFILE is not set | ||
| 133 | CONFIG_HAVE_OPROFILE=y | ||
| 134 | CONFIG_KPROBES=y | ||
| 135 | CONFIG_KRETPROBES=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | ||
| 137 | CONFIG_HAVE_KRETPROBES=y | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 140 | CONFIG_SLABINFO=y | ||
| 88 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 89 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 90 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| @@ -96,14 +149,15 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
| 96 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
| 97 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
| 98 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
| 99 | # CONFIG_BLK_DEV_IO_TRACE is not set | 152 | CONFIG_BLK_DEV_IO_TRACE=y |
| 100 | # CONFIG_BLK_DEV_BSG is not set | 153 | CONFIG_BLK_DEV_BSG=y |
| 154 | CONFIG_BLOCK_COMPAT=y | ||
| 101 | 155 | ||
| 102 | # | 156 | # |
| 103 | # IO Schedulers | 157 | # IO Schedulers |
| 104 | # | 158 | # |
| 105 | CONFIG_IOSCHED_NOOP=y | 159 | CONFIG_IOSCHED_NOOP=y |
| 106 | # CONFIG_IOSCHED_AS is not set | 160 | CONFIG_IOSCHED_AS=y |
| 107 | CONFIG_IOSCHED_DEADLINE=y | 161 | CONFIG_IOSCHED_DEADLINE=y |
| 108 | CONFIG_IOSCHED_CFQ=y | 162 | CONFIG_IOSCHED_CFQ=y |
| 109 | # CONFIG_DEFAULT_AS is not set | 163 | # CONFIG_DEFAULT_AS is not set |
| @@ -111,107 +165,177 @@ CONFIG_IOSCHED_CFQ=y | |||
| 111 | CONFIG_DEFAULT_CFQ=y | 165 | CONFIG_DEFAULT_CFQ=y |
| 112 | # CONFIG_DEFAULT_NOOP is not set | 166 | # CONFIG_DEFAULT_NOOP is not set |
| 113 | CONFIG_DEFAULT_IOSCHED="cfq" | 167 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 168 | CONFIG_CLASSIC_RCU=y | ||
| 114 | 169 | ||
| 115 | # | 170 | # |
| 116 | # Processor type and features | 171 | # Processor type and features |
| 117 | # | 172 | # |
| 173 | CONFIG_TICK_ONESHOT=y | ||
| 174 | CONFIG_NO_HZ=y | ||
| 175 | CONFIG_HIGH_RES_TIMERS=y | ||
| 176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 177 | CONFIG_SMP=y | ||
| 118 | CONFIG_X86_PC=y | 178 | CONFIG_X86_PC=y |
| 179 | # CONFIG_X86_ELAN is not set | ||
| 180 | # 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 | ||
| 186 | # CONFIG_X86_ES7000 is not set | ||
| 187 | # CONFIG_X86_RDC321X is not set | ||
| 119 | # CONFIG_X86_VSMP is not set | 188 | # CONFIG_X86_VSMP is not set |
| 189 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 190 | CONFIG_MEMTEST_BOOTPARAM=y | ||
| 191 | CONFIG_MEMTEST_BOOTPARAM_VALUE=0 | ||
| 192 | # CONFIG_M386 is not set | ||
| 193 | # CONFIG_M486 is not set | ||
| 194 | # CONFIG_M586 is not set | ||
| 195 | # CONFIG_M586TSC is not set | ||
| 196 | # CONFIG_M586MMX is not set | ||
| 197 | # CONFIG_M686 is not set | ||
| 198 | # CONFIG_MPENTIUMII is not set | ||
| 199 | # CONFIG_MPENTIUMIII is not set | ||
| 200 | # CONFIG_MPENTIUMM is not set | ||
| 201 | # CONFIG_MPENTIUM4 is not set | ||
| 202 | # CONFIG_MK6 is not set | ||
| 203 | # CONFIG_MK7 is not set | ||
| 120 | # CONFIG_MK8 is not set | 204 | # CONFIG_MK8 is not set |
| 205 | # CONFIG_MCRUSOE is not set | ||
| 206 | # CONFIG_MEFFICEON is not set | ||
| 207 | # CONFIG_MWINCHIPC6 is not set | ||
| 208 | # CONFIG_MWINCHIP2 is not set | ||
| 209 | # CONFIG_MWINCHIP3D is not set | ||
| 210 | # CONFIG_MGEODEGX1 is not set | ||
| 211 | # CONFIG_MGEODE_LX is not set | ||
| 212 | # CONFIG_MCYRIXIII is not set | ||
| 213 | # CONFIG_MVIAC3_2 is not set | ||
| 214 | # CONFIG_MVIAC7 is not set | ||
| 121 | # CONFIG_MPSC is not set | 215 | # CONFIG_MPSC is not set |
| 122 | # CONFIG_MCORE2 is not set | 216 | CONFIG_MCORE2=y |
| 123 | CONFIG_GENERIC_CPU=y | 217 | # CONFIG_GENERIC_CPU is not set |
| 124 | CONFIG_X86_L1_CACHE_BYTES=128 | 218 | CONFIG_X86_CPU=y |
| 125 | CONFIG_X86_L1_CACHE_SHIFT=7 | 219 | CONFIG_X86_L1_CACHE_BYTES=64 |
| 126 | CONFIG_X86_INTERNODE_CACHE_BYTES=128 | 220 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 |
| 127 | CONFIG_X86_TSC=y | 221 | CONFIG_X86_CMPXCHG=y |
| 222 | CONFIG_X86_L1_CACHE_SHIFT=6 | ||
| 128 | CONFIG_X86_GOOD_APIC=y | 223 | CONFIG_X86_GOOD_APIC=y |
| 129 | # CONFIG_MICROCODE is not set | 224 | CONFIG_X86_INTEL_USERCOPY=y |
| 130 | CONFIG_X86_MSR=y | 225 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 131 | CONFIG_X86_CPUID=y | 226 | CONFIG_X86_P6_NOP=y |
| 132 | CONFIG_X86_HT=y | 227 | CONFIG_X86_TSC=y |
| 133 | CONFIG_X86_IO_APIC=y | 228 | CONFIG_X86_CMOV=y |
| 134 | CONFIG_X86_LOCAL_APIC=y | 229 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
| 135 | CONFIG_MTRR=y | 230 | CONFIG_X86_DEBUGCTLMSR=y |
| 136 | CONFIG_SMP=y | 231 | CONFIG_HPET_TIMER=y |
| 137 | CONFIG_SCHED_SMT=y | 232 | CONFIG_HPET_EMULATE_RTC=y |
| 233 | CONFIG_DMI=y | ||
| 234 | CONFIG_GART_IOMMU=y | ||
| 235 | CONFIG_CALGARY_IOMMU=y | ||
| 236 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | ||
| 237 | CONFIG_SWIOTLB=y | ||
| 238 | CONFIG_IOMMU_HELPER=y | ||
| 239 | CONFIG_NR_CPUS=4 | ||
| 240 | # CONFIG_SCHED_SMT is not set | ||
| 138 | CONFIG_SCHED_MC=y | 241 | CONFIG_SCHED_MC=y |
| 139 | # CONFIG_PREEMPT_NONE is not set | 242 | # CONFIG_PREEMPT_NONE is not set |
| 140 | CONFIG_PREEMPT_VOLUNTARY=y | 243 | CONFIG_PREEMPT_VOLUNTARY=y |
| 141 | # CONFIG_PREEMPT is not set | 244 | # CONFIG_PREEMPT is not set |
| 142 | CONFIG_PREEMPT_BKL=y | 245 | CONFIG_X86_LOCAL_APIC=y |
| 246 | CONFIG_X86_IO_APIC=y | ||
| 247 | # CONFIG_X86_MCE is not set | ||
| 248 | # CONFIG_I8K is not set | ||
| 249 | # CONFIG_MICROCODE is not set | ||
| 250 | CONFIG_X86_MSR=y | ||
| 251 | CONFIG_X86_CPUID=y | ||
| 143 | CONFIG_NUMA=y | 252 | CONFIG_NUMA=y |
| 144 | CONFIG_K8_NUMA=y | 253 | CONFIG_K8_NUMA=y |
| 145 | CONFIG_NODES_SHIFT=6 | ||
| 146 | CONFIG_X86_64_ACPI_NUMA=y | 254 | CONFIG_X86_64_ACPI_NUMA=y |
| 147 | CONFIG_NUMA_EMU=y | 255 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 256 | # CONFIG_NUMA_EMU is not set | ||
| 257 | CONFIG_NODES_SHIFT=6 | ||
| 258 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
| 259 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 260 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 261 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 262 | # CONFIG_FLATMEM_MANUAL is not set | ||
| 263 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 264 | CONFIG_SPARSEMEM_MANUAL=y | ||
| 265 | CONFIG_SPARSEMEM=y | ||
| 148 | CONFIG_NEED_MULTIPLE_NODES=y | 266 | CONFIG_NEED_MULTIPLE_NODES=y |
| 267 | CONFIG_HAVE_MEMORY_PRESENT=y | ||
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 268 | # CONFIG_SPARSEMEM_STATIC is not set |
| 269 | CONFIG_SPARSEMEM_EXTREME=y | ||
| 270 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | ||
| 271 | CONFIG_SPARSEMEM_VMEMMAP=y | ||
| 272 | |||
| 273 | # | ||
| 274 | # Memory hotplug is currently incompatible with Software Suspend | ||
| 275 | # | ||
| 276 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 277 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | CONFIG_MIGRATION=y | 278 | CONFIG_MIGRATION=y |
| 152 | CONFIG_RESOURCES_64BIT=y | 279 | CONFIG_RESOURCES_64BIT=y |
| 153 | CONFIG_ZONE_DMA_FLAG=1 | 280 | CONFIG_ZONE_DMA_FLAG=1 |
| 154 | CONFIG_BOUNCE=y | 281 | CONFIG_BOUNCE=y |
| 155 | CONFIG_VIRT_TO_BUS=y | 282 | CONFIG_VIRT_TO_BUS=y |
| 156 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 283 | CONFIG_MTRR=y |
| 157 | CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y | 284 | # CONFIG_X86_PAT is not set |
| 158 | CONFIG_NR_CPUS=32 | 285 | CONFIG_EFI=y |
| 159 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
| 160 | CONFIG_HOTPLUG_CPU=y | ||
| 161 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 162 | CONFIG_HPET_TIMER=y | ||
| 163 | CONFIG_HPET_EMULATE_RTC=y | ||
| 164 | CONFIG_GART_IOMMU=y | ||
| 165 | # CONFIG_CALGARY_IOMMU is not set | ||
| 166 | CONFIG_SWIOTLB=y | ||
| 167 | CONFIG_X86_MCE=y | ||
| 168 | CONFIG_X86_MCE_INTEL=y | ||
| 169 | CONFIG_X86_MCE_AMD=y | ||
| 170 | # CONFIG_KEXEC is not set | ||
| 171 | # CONFIG_CRASH_DUMP is not set | ||
| 172 | # CONFIG_RELOCATABLE is not set | ||
| 173 | CONFIG_PHYSICAL_START=0x200000 | ||
| 174 | CONFIG_SECCOMP=y | 286 | CONFIG_SECCOMP=y |
| 175 | # CONFIG_CC_STACKPROTECTOR is not set | ||
| 176 | # CONFIG_HZ_100 is not set | 287 | # CONFIG_HZ_100 is not set |
| 177 | CONFIG_HZ_250=y | 288 | # CONFIG_HZ_250 is not set |
| 178 | # CONFIG_HZ_300 is not set | 289 | # CONFIG_HZ_300 is not set |
| 179 | # CONFIG_HZ_1000 is not set | 290 | CONFIG_HZ_1000=y |
| 180 | CONFIG_HZ=250 | 291 | CONFIG_HZ=1000 |
| 181 | CONFIG_K8_NB=y | 292 | CONFIG_SCHED_HRTICK=y |
| 182 | CONFIG_GENERIC_HARDIRQS=y | 293 | CONFIG_KEXEC=y |
| 183 | CONFIG_GENERIC_IRQ_PROBE=y | 294 | CONFIG_CRASH_DUMP=y |
| 184 | CONFIG_ISA_DMA_API=y | 295 | CONFIG_PHYSICAL_START=0x1000000 |
| 185 | CONFIG_GENERIC_PENDING_IRQ=y | 296 | CONFIG_RELOCATABLE=y |
| 297 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
| 298 | CONFIG_HOTPLUG_CPU=y | ||
| 299 | # CONFIG_COMPAT_VDSO is not set | ||
| 300 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 301 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
| 186 | 302 | ||
| 187 | # | 303 | # |
| 188 | # Power management options | 304 | # Power management options |
| 189 | # | 305 | # |
| 306 | CONFIG_ARCH_HIBERNATION_HEADER=y | ||
| 190 | CONFIG_PM=y | 307 | CONFIG_PM=y |
| 191 | # CONFIG_PM_LEGACY is not set | 308 | CONFIG_PM_DEBUG=y |
| 192 | # CONFIG_PM_DEBUG is not set | 309 | # CONFIG_PM_VERBOSE is not set |
| 310 | CONFIG_CAN_PM_TRACE=y | ||
| 311 | CONFIG_PM_TRACE=y | ||
| 312 | CONFIG_PM_TRACE_RTC=y | ||
| 313 | CONFIG_PM_SLEEP_SMP=y | ||
| 314 | CONFIG_PM_SLEEP=y | ||
| 315 | CONFIG_SUSPEND=y | ||
| 316 | CONFIG_SUSPEND_FREEZER=y | ||
| 193 | CONFIG_HIBERNATION=y | 317 | CONFIG_HIBERNATION=y |
| 194 | CONFIG_PM_STD_PARTITION="" | 318 | CONFIG_PM_STD_PARTITION="" |
| 195 | |||
| 196 | # | ||
| 197 | # ACPI (Advanced Configuration and Power Interface) Support | ||
| 198 | # | ||
| 199 | CONFIG_ACPI=y | 319 | CONFIG_ACPI=y |
| 200 | CONFIG_ACPI_SLEEP=y | 320 | CONFIG_ACPI_SLEEP=y |
| 201 | CONFIG_ACPI_SLEEP_PROC_FS=y | ||
| 202 | CONFIG_ACPI_SLEEP_PROC_SLEEP=y | ||
| 203 | CONFIG_ACPI_PROCFS=y | 321 | CONFIG_ACPI_PROCFS=y |
| 322 | CONFIG_ACPI_PROCFS_POWER=y | ||
| 323 | CONFIG_ACPI_SYSFS_POWER=y | ||
| 324 | CONFIG_ACPI_PROC_EVENT=y | ||
| 204 | CONFIG_ACPI_AC=y | 325 | CONFIG_ACPI_AC=y |
| 205 | CONFIG_ACPI_BATTERY=y | 326 | CONFIG_ACPI_BATTERY=y |
| 206 | CONFIG_ACPI_BUTTON=y | 327 | CONFIG_ACPI_BUTTON=y |
| 207 | CONFIG_ACPI_FAN=y | 328 | CONFIG_ACPI_FAN=y |
| 208 | # CONFIG_ACPI_DOCK is not set | 329 | CONFIG_ACPI_DOCK=y |
| 330 | # CONFIG_ACPI_BAY is not set | ||
| 209 | CONFIG_ACPI_PROCESSOR=y | 331 | CONFIG_ACPI_PROCESSOR=y |
| 210 | CONFIG_ACPI_HOTPLUG_CPU=y | 332 | CONFIG_ACPI_HOTPLUG_CPU=y |
| 211 | CONFIG_ACPI_THERMAL=y | 333 | CONFIG_ACPI_THERMAL=y |
| 212 | CONFIG_ACPI_NUMA=y | 334 | CONFIG_ACPI_NUMA=y |
| 335 | # CONFIG_ACPI_WMI is not set | ||
| 213 | # CONFIG_ACPI_ASUS is not set | 336 | # CONFIG_ACPI_ASUS is not set |
| 214 | # CONFIG_ACPI_TOSHIBA is not set | 337 | # CONFIG_ACPI_TOSHIBA is not set |
| 338 | # CONFIG_ACPI_CUSTOM_DSDT is not set | ||
| 215 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 339 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 216 | # CONFIG_ACPI_DEBUG is not set | 340 | # CONFIG_ACPI_DEBUG is not set |
| 217 | CONFIG_ACPI_EC=y | 341 | CONFIG_ACPI_EC=y |
| @@ -227,29 +351,34 @@ CONFIG_ACPI_CONTAINER=y | |||
| 227 | CONFIG_CPU_FREQ=y | 351 | CONFIG_CPU_FREQ=y |
| 228 | CONFIG_CPU_FREQ_TABLE=y | 352 | CONFIG_CPU_FREQ_TABLE=y |
| 229 | CONFIG_CPU_FREQ_DEBUG=y | 353 | CONFIG_CPU_FREQ_DEBUG=y |
| 230 | CONFIG_CPU_FREQ_STAT=y | 354 | # CONFIG_CPU_FREQ_STAT is not set |
| 231 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 232 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 356 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
| 233 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 357 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
| 358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 359 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 234 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 360 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 235 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 361 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| 236 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 362 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
| 237 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 363 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
| 238 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 364 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
| 239 | 365 | ||
| 240 | # | 366 | # |
| 241 | # CPUFreq processor drivers | 367 | # CPUFreq processor drivers |
| 242 | # | 368 | # |
| 243 | CONFIG_X86_POWERNOW_K8=y | ||
| 244 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
| 245 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
| 246 | CONFIG_X86_ACPI_CPUFREQ=y | 369 | CONFIG_X86_ACPI_CPUFREQ=y |
| 370 | # CONFIG_X86_POWERNOW_K8 is not set | ||
| 371 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
| 372 | # CONFIG_X86_P4_CLOCKMOD is not set | ||
| 247 | 373 | ||
| 248 | # | 374 | # |
| 249 | # shared options | 375 | # shared options |
| 250 | # | 376 | # |
| 251 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 377 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
| 252 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 378 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
| 379 | CONFIG_CPU_IDLE=y | ||
| 380 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
| 381 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
| 253 | 382 | ||
| 254 | # | 383 | # |
| 255 | # Bus options (PCI etc.) | 384 | # Bus options (PCI etc.) |
| @@ -257,27 +386,56 @@ CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | |||
| 257 | CONFIG_PCI=y | 386 | CONFIG_PCI=y |
| 258 | CONFIG_PCI_DIRECT=y | 387 | CONFIG_PCI_DIRECT=y |
| 259 | CONFIG_PCI_MMCONFIG=y | 388 | CONFIG_PCI_MMCONFIG=y |
| 389 | CONFIG_PCI_DOMAINS=y | ||
| 390 | CONFIG_DMAR=y | ||
| 391 | CONFIG_DMAR_GFX_WA=y | ||
| 392 | CONFIG_DMAR_FLOPPY_WA=y | ||
| 260 | CONFIG_PCIEPORTBUS=y | 393 | CONFIG_PCIEPORTBUS=y |
| 394 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
| 261 | CONFIG_PCIEAER=y | 395 | CONFIG_PCIEAER=y |
| 396 | # CONFIG_PCIEASPM is not set | ||
| 262 | CONFIG_ARCH_SUPPORTS_MSI=y | 397 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 263 | CONFIG_PCI_MSI=y | 398 | CONFIG_PCI_MSI=y |
| 399 | # CONFIG_PCI_LEGACY is not set | ||
| 264 | # CONFIG_PCI_DEBUG is not set | 400 | # CONFIG_PCI_DEBUG is not set |
| 265 | # CONFIG_HT_IRQ is not set | 401 | CONFIG_HT_IRQ=y |
| 266 | 402 | CONFIG_ISA_DMA_API=y | |
| 267 | # | 403 | CONFIG_K8_NB=y |
| 268 | # PCCARD (PCMCIA/CardBus) support | 404 | CONFIG_PCCARD=y |
| 269 | # | 405 | # CONFIG_PCMCIA_DEBUG is not set |
| 270 | # CONFIG_PCCARD is not set | 406 | CONFIG_PCMCIA=y |
| 271 | # CONFIG_HOTPLUG_PCI is not set | 407 | CONFIG_PCMCIA_LOAD_CIS=y |
| 408 | CONFIG_PCMCIA_IOCTL=y | ||
| 409 | CONFIG_CARDBUS=y | ||
| 410 | |||
| 411 | # | ||
| 412 | # PC-card bridges | ||
| 413 | # | ||
| 414 | CONFIG_YENTA=y | ||
| 415 | CONFIG_YENTA_O2=y | ||
| 416 | CONFIG_YENTA_RICOH=y | ||
| 417 | CONFIG_YENTA_TI=y | ||
| 418 | CONFIG_YENTA_ENE_TUNE=y | ||
| 419 | CONFIG_YENTA_TOSHIBA=y | ||
| 420 | # CONFIG_PD6729 is not set | ||
| 421 | # CONFIG_I82092 is not set | ||
| 422 | CONFIG_PCCARD_NONSTATIC=y | ||
| 423 | CONFIG_HOTPLUG_PCI=y | ||
| 424 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
| 425 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
| 426 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
| 427 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
| 272 | 428 | ||
| 273 | # | 429 | # |
| 274 | # Executable file formats / Emulations | 430 | # Executable file formats / Emulations |
| 275 | # | 431 | # |
| 276 | CONFIG_BINFMT_ELF=y | 432 | CONFIG_BINFMT_ELF=y |
| 277 | # CONFIG_BINFMT_MISC is not set | 433 | CONFIG_COMPAT_BINFMT_ELF=y |
| 434 | CONFIG_BINFMT_MISC=y | ||
| 278 | CONFIG_IA32_EMULATION=y | 435 | CONFIG_IA32_EMULATION=y |
| 279 | CONFIG_IA32_AOUT=y | 436 | # CONFIG_IA32_AOUT is not set |
| 280 | CONFIG_COMPAT=y | 437 | CONFIG_COMPAT=y |
| 438 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | ||
| 281 | CONFIG_SYSVIPC_COMPAT=y | 439 | CONFIG_SYSVIPC_COMPAT=y |
| 282 | 440 | ||
| 283 | # | 441 | # |
| @@ -289,22 +447,31 @@ CONFIG_NET=y | |||
| 289 | # Networking options | 447 | # Networking options |
| 290 | # | 448 | # |
| 291 | CONFIG_PACKET=y | 449 | CONFIG_PACKET=y |
| 292 | # CONFIG_PACKET_MMAP is not set | 450 | CONFIG_PACKET_MMAP=y |
| 293 | CONFIG_UNIX=y | 451 | CONFIG_UNIX=y |
| 452 | CONFIG_XFRM=y | ||
| 453 | CONFIG_XFRM_USER=y | ||
| 454 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 455 | # CONFIG_XFRM_MIGRATE is not set | ||
| 456 | # CONFIG_XFRM_STATISTICS is not set | ||
| 294 | # CONFIG_NET_KEY is not set | 457 | # CONFIG_NET_KEY is not set |
| 295 | CONFIG_INET=y | 458 | CONFIG_INET=y |
| 296 | CONFIG_IP_MULTICAST=y | 459 | CONFIG_IP_MULTICAST=y |
| 297 | # CONFIG_IP_ADVANCED_ROUTER is not set | 460 | CONFIG_IP_ADVANCED_ROUTER=y |
| 461 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 462 | # CONFIG_IP_FIB_TRIE is not set | ||
| 298 | CONFIG_IP_FIB_HASH=y | 463 | CONFIG_IP_FIB_HASH=y |
| 299 | CONFIG_IP_PNP=y | 464 | CONFIG_IP_MULTIPLE_TABLES=y |
| 300 | CONFIG_IP_PNP_DHCP=y | 465 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 301 | # CONFIG_IP_PNP_BOOTP is not set | 466 | CONFIG_IP_ROUTE_VERBOSE=y |
| 302 | # CONFIG_IP_PNP_RARP is not set | 467 | # CONFIG_IP_PNP is not set |
| 303 | # CONFIG_NET_IPIP is not set | 468 | # CONFIG_NET_IPIP is not set |
| 304 | # CONFIG_NET_IPGRE is not set | 469 | # CONFIG_NET_IPGRE is not set |
| 305 | # CONFIG_IP_MROUTE is not set | 470 | CONFIG_IP_MROUTE=y |
| 471 | CONFIG_IP_PIMSM_V1=y | ||
| 472 | CONFIG_IP_PIMSM_V2=y | ||
| 306 | # CONFIG_ARPD is not set | 473 | # CONFIG_ARPD is not set |
| 307 | # CONFIG_SYN_COOKIES is not set | 474 | CONFIG_SYN_COOKIES=y |
| 308 | # CONFIG_INET_AH is not set | 475 | # CONFIG_INET_AH is not set |
| 309 | # CONFIG_INET_ESP is not set | 476 | # CONFIG_INET_ESP is not set |
| 310 | # CONFIG_INET_IPCOMP is not set | 477 | # CONFIG_INET_IPCOMP is not set |
| @@ -313,31 +480,109 @@ CONFIG_INET_TUNNEL=y | |||
| 313 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 480 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 314 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 481 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 315 | # CONFIG_INET_XFRM_MODE_BEET is not set | 482 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 316 | CONFIG_INET_DIAG=y | 483 | CONFIG_INET_LRO=y |
| 317 | CONFIG_INET_TCP_DIAG=y | 484 | # CONFIG_INET_DIAG is not set |
| 318 | # CONFIG_TCP_CONG_ADVANCED is not set | 485 | CONFIG_TCP_CONG_ADVANCED=y |
| 486 | # CONFIG_TCP_CONG_BIC is not set | ||
| 319 | CONFIG_TCP_CONG_CUBIC=y | 487 | CONFIG_TCP_CONG_CUBIC=y |
| 488 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
| 489 | # CONFIG_TCP_CONG_HTCP is not set | ||
| 490 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 491 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 492 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 493 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 494 | # CONFIG_TCP_CONG_LP is not set | ||
| 495 | # CONFIG_TCP_CONG_VENO is not set | ||
| 496 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 497 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 498 | # CONFIG_DEFAULT_BIC is not set | ||
| 499 | CONFIG_DEFAULT_CUBIC=y | ||
| 500 | # CONFIG_DEFAULT_HTCP is not set | ||
| 501 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 502 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 503 | # CONFIG_DEFAULT_RENO is not set | ||
| 320 | CONFIG_DEFAULT_TCP_CONG="cubic" | 504 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 321 | # CONFIG_TCP_MD5SIG is not set | 505 | CONFIG_TCP_MD5SIG=y |
| 506 | # CONFIG_IP_VS is not set | ||
| 322 | CONFIG_IPV6=y | 507 | CONFIG_IPV6=y |
| 323 | # CONFIG_IPV6_PRIVACY is not set | 508 | # CONFIG_IPV6_PRIVACY is not set |
| 324 | # CONFIG_IPV6_ROUTER_PREF is not set | 509 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 325 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 510 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
| 326 | # CONFIG_INET6_AH is not set | 511 | CONFIG_INET6_AH=y |
| 327 | # CONFIG_INET6_ESP is not set | 512 | CONFIG_INET6_ESP=y |
| 328 | # CONFIG_INET6_IPCOMP is not set | 513 | # CONFIG_INET6_IPCOMP is not set |
| 329 | # CONFIG_IPV6_MIP6 is not set | 514 | # CONFIG_IPV6_MIP6 is not set |
| 330 | # CONFIG_INET6_XFRM_TUNNEL is not set | 515 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 331 | # CONFIG_INET6_TUNNEL is not set | 516 | # CONFIG_INET6_TUNNEL is not set |
| 332 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set | 517 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
| 333 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | 518 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 334 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 519 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 520 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 336 | CONFIG_IPV6_SIT=y | 521 | CONFIG_IPV6_SIT=y |
| 522 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | # CONFIG_IPV6_TUNNEL is not set | 523 | # CONFIG_IPV6_TUNNEL is not set |
| 338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 524 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 339 | # CONFIG_NETWORK_SECMARK is not set | 525 | # CONFIG_IPV6_MROUTE is not set |
| 340 | # CONFIG_NETFILTER is not set | 526 | CONFIG_NETLABEL=y |
| 527 | CONFIG_NETWORK_SECMARK=y | ||
| 528 | CONFIG_NETFILTER=y | ||
| 529 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 530 | # CONFIG_NETFILTER_ADVANCED is not set | ||
| 531 | |||
| 532 | # | ||
| 533 | # Core Netfilter Configuration | ||
| 534 | # | ||
| 535 | CONFIG_NETFILTER_NETLINK=y | ||
| 536 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
| 537 | CONFIG_NF_CONNTRACK=y | ||
| 538 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
| 539 | CONFIG_NF_CONNTRACK_FTP=y | ||
| 540 | CONFIG_NF_CONNTRACK_IRC=y | ||
| 541 | CONFIG_NF_CONNTRACK_SIP=y | ||
| 542 | CONFIG_NF_CT_NETLINK=y | ||
| 543 | CONFIG_NETFILTER_XTABLES=y | ||
| 544 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
| 545 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
| 546 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
| 547 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
| 548 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
| 549 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
| 550 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
| 551 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
| 552 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
| 553 | |||
| 554 | # | ||
| 555 | # IP: Netfilter Configuration | ||
| 556 | # | ||
| 557 | CONFIG_NF_CONNTRACK_IPV4=y | ||
| 558 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
| 559 | CONFIG_IP_NF_IPTABLES=y | ||
| 560 | CONFIG_IP_NF_FILTER=y | ||
| 561 | CONFIG_IP_NF_TARGET_REJECT=y | ||
| 562 | CONFIG_IP_NF_TARGET_LOG=y | ||
| 563 | CONFIG_IP_NF_TARGET_ULOG=y | ||
| 564 | CONFIG_NF_NAT=y | ||
| 565 | CONFIG_NF_NAT_NEEDED=y | ||
| 566 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
| 567 | CONFIG_NF_NAT_FTP=y | ||
| 568 | CONFIG_NF_NAT_IRC=y | ||
| 569 | # CONFIG_NF_NAT_TFTP is not set | ||
| 570 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 571 | # CONFIG_NF_NAT_PPTP is not set | ||
| 572 | # CONFIG_NF_NAT_H323 is not set | ||
| 573 | CONFIG_NF_NAT_SIP=y | ||
| 574 | CONFIG_IP_NF_MANGLE=y | ||
| 575 | |||
| 576 | # | ||
| 577 | # IPv6: Netfilter Configuration | ||
| 578 | # | ||
| 579 | CONFIG_NF_CONNTRACK_IPV6=y | ||
| 580 | CONFIG_IP6_NF_IPTABLES=y | ||
| 581 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
| 582 | CONFIG_IP6_NF_FILTER=y | ||
| 583 | CONFIG_IP6_NF_TARGET_LOG=y | ||
| 584 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
| 585 | CONFIG_IP6_NF_MANGLE=y | ||
| 341 | # CONFIG_IP_DCCP is not set | 586 | # CONFIG_IP_DCCP is not set |
| 342 | # CONFIG_IP_SCTP is not set | 587 | # CONFIG_IP_SCTP is not set |
| 343 | # CONFIG_TIPC is not set | 588 | # CONFIG_TIPC is not set |
| @@ -345,6 +590,7 @@ CONFIG_IPV6_SIT=y | |||
| 345 | # CONFIG_BRIDGE is not set | 590 | # CONFIG_BRIDGE is not set |
| 346 | # CONFIG_VLAN_8021Q is not set | 591 | # CONFIG_VLAN_8021Q is not set |
| 347 | # CONFIG_DECNET is not set | 592 | # CONFIG_DECNET is not set |
| 593 | CONFIG_LLC=y | ||
| 348 | # CONFIG_LLC2 is not set | 594 | # CONFIG_LLC2 is not set |
| 349 | # CONFIG_IPX is not set | 595 | # CONFIG_IPX is not set |
| 350 | # CONFIG_ATALK is not set | 596 | # CONFIG_ATALK is not set |
| @@ -352,28 +598,99 @@ CONFIG_IPV6_SIT=y | |||
| 352 | # CONFIG_LAPB is not set | 598 | # CONFIG_LAPB is not set |
| 353 | # CONFIG_ECONET is not set | 599 | # CONFIG_ECONET is not set |
| 354 | # CONFIG_WAN_ROUTER is not set | 600 | # CONFIG_WAN_ROUTER is not set |
| 355 | 601 | CONFIG_NET_SCHED=y | |
| 356 | # | 602 | |
| 357 | # QoS and/or fair queueing | 603 | # |
| 358 | # | 604 | # Queueing/Scheduling |
| 359 | # CONFIG_NET_SCHED is not set | 605 | # |
| 606 | # CONFIG_NET_SCH_CBQ is not set | ||
| 607 | # CONFIG_NET_SCH_HTB is not set | ||
| 608 | # CONFIG_NET_SCH_HFSC is not set | ||
| 609 | # CONFIG_NET_SCH_PRIO is not set | ||
| 610 | # CONFIG_NET_SCH_RR is not set | ||
| 611 | # CONFIG_NET_SCH_RED is not set | ||
| 612 | # CONFIG_NET_SCH_SFQ is not set | ||
| 613 | # CONFIG_NET_SCH_TEQL is not set | ||
| 614 | # CONFIG_NET_SCH_TBF is not set | ||
| 615 | # CONFIG_NET_SCH_GRED is not set | ||
| 616 | # CONFIG_NET_SCH_DSMARK is not set | ||
| 617 | # CONFIG_NET_SCH_NETEM is not set | ||
| 618 | # CONFIG_NET_SCH_INGRESS is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Classification | ||
| 622 | # | ||
| 623 | CONFIG_NET_CLS=y | ||
| 624 | # CONFIG_NET_CLS_BASIC is not set | ||
| 625 | # CONFIG_NET_CLS_TCINDEX is not set | ||
| 626 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
| 627 | # CONFIG_NET_CLS_FW is not set | ||
| 628 | # CONFIG_NET_CLS_U32 is not set | ||
| 629 | # CONFIG_NET_CLS_RSVP is not set | ||
| 630 | # CONFIG_NET_CLS_RSVP6 is not set | ||
| 631 | # CONFIG_NET_CLS_FLOW is not set | ||
| 632 | CONFIG_NET_EMATCH=y | ||
| 633 | CONFIG_NET_EMATCH_STACK=32 | ||
| 634 | # CONFIG_NET_EMATCH_CMP is not set | ||
| 635 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
| 636 | # CONFIG_NET_EMATCH_U32 is not set | ||
| 637 | # CONFIG_NET_EMATCH_META is not set | ||
| 638 | # CONFIG_NET_EMATCH_TEXT is not set | ||
| 639 | CONFIG_NET_CLS_ACT=y | ||
| 640 | # CONFIG_NET_ACT_POLICE is not set | ||
| 641 | # CONFIG_NET_ACT_GACT is not set | ||
| 642 | # CONFIG_NET_ACT_MIRRED is not set | ||
| 643 | # CONFIG_NET_ACT_IPT is not set | ||
| 644 | # CONFIG_NET_ACT_NAT is not set | ||
| 645 | # CONFIG_NET_ACT_PEDIT is not set | ||
| 646 | # CONFIG_NET_ACT_SIMP is not set | ||
| 647 | CONFIG_NET_SCH_FIFO=y | ||
| 360 | 648 | ||
| 361 | # | 649 | # |
| 362 | # Network testing | 650 | # Network testing |
| 363 | # | 651 | # |
| 364 | # CONFIG_NET_PKTGEN is not set | 652 | # CONFIG_NET_PKTGEN is not set |
| 365 | # CONFIG_NET_TCPPROBE is not set | 653 | # CONFIG_NET_TCPPROBE is not set |
| 366 | # CONFIG_HAMRADIO is not set | 654 | CONFIG_HAMRADIO=y |
| 655 | |||
| 656 | # | ||
| 657 | # Packet Radio protocols | ||
| 658 | # | ||
| 659 | # CONFIG_AX25 is not set | ||
| 660 | # CONFIG_CAN is not set | ||
| 367 | # CONFIG_IRDA is not set | 661 | # CONFIG_IRDA is not set |
| 368 | # CONFIG_BT is not set | 662 | # CONFIG_BT is not set |
| 369 | # CONFIG_AF_RXRPC is not set | 663 | # CONFIG_AF_RXRPC is not set |
| 664 | CONFIG_FIB_RULES=y | ||
| 370 | 665 | ||
| 371 | # | 666 | # |
| 372 | # Wireless | 667 | # Wireless |
| 373 | # | 668 | # |
| 374 | # CONFIG_CFG80211 is not set | 669 | CONFIG_CFG80211=y |
| 375 | # CONFIG_WIRELESS_EXT is not set | 670 | CONFIG_NL80211=y |
| 376 | # CONFIG_MAC80211 is not set | 671 | CONFIG_WIRELESS_EXT=y |
| 672 | CONFIG_MAC80211=y | ||
| 673 | |||
| 674 | # | ||
| 675 | # Rate control algorithm selection | ||
| 676 | # | ||
| 677 | 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" | ||
| 688 | CONFIG_MAC80211_RC_PID=y | ||
| 689 | # CONFIG_MAC80211_MESH is not set | ||
| 690 | CONFIG_MAC80211_LEDS=y | ||
| 691 | # CONFIG_MAC80211_DEBUGFS is not set | ||
| 692 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 693 | # CONFIG_MAC80211_DEBUG is not set | ||
| 377 | # CONFIG_IEEE80211 is not set | 694 | # CONFIG_IEEE80211 is not set |
| 378 | # CONFIG_RFKILL is not set | 695 | # CONFIG_RFKILL is not set |
| 379 | # CONFIG_NET_9P is not set | 696 | # CONFIG_NET_9P is not set |
| @@ -385,13 +702,15 @@ CONFIG_IPV6_SIT=y | |||
| 385 | # | 702 | # |
| 386 | # Generic Driver Options | 703 | # Generic Driver Options |
| 387 | # | 704 | # |
| 705 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 388 | CONFIG_STANDALONE=y | 706 | CONFIG_STANDALONE=y |
| 389 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 390 | CONFIG_FW_LOADER=y | 708 | CONFIG_FW_LOADER=y |
| 391 | # CONFIG_DEBUG_DRIVER is not set | 709 | # CONFIG_DEBUG_DRIVER is not set |
| 392 | # CONFIG_DEBUG_DEVRES is not set | 710 | CONFIG_DEBUG_DEVRES=y |
| 393 | # CONFIG_SYS_HYPERVISOR is not set | 711 | # CONFIG_SYS_HYPERVISOR is not set |
| 394 | # CONFIG_CONNECTOR is not set | 712 | CONFIG_CONNECTOR=y |
| 713 | CONFIG_PROC_EVENTS=y | ||
| 395 | # CONFIG_MTD is not set | 714 | # CONFIG_MTD is not set |
| 396 | # CONFIG_PARPORT is not set | 715 | # CONFIG_PARPORT is not set |
| 397 | CONFIG_PNP=y | 716 | CONFIG_PNP=y |
| @@ -402,7 +721,7 @@ CONFIG_PNP=y | |||
| 402 | # | 721 | # |
| 403 | CONFIG_PNPACPI=y | 722 | CONFIG_PNPACPI=y |
| 404 | CONFIG_BLK_DEV=y | 723 | CONFIG_BLK_DEV=y |
| 405 | CONFIG_BLK_DEV_FD=y | 724 | # CONFIG_BLK_DEV_FD is not set |
| 406 | # CONFIG_BLK_CPQ_DA is not set | 725 | # CONFIG_BLK_CPQ_DA is not set |
| 407 | # CONFIG_BLK_CPQ_CISS_DA is not set | 726 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 408 | # CONFIG_BLK_DEV_DAC960 is not set | 727 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -415,8 +734,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 415 | # CONFIG_BLK_DEV_UB is not set | 734 | # CONFIG_BLK_DEV_UB is not set |
| 416 | CONFIG_BLK_DEV_RAM=y | 735 | CONFIG_BLK_DEV_RAM=y |
| 417 | CONFIG_BLK_DEV_RAM_COUNT=16 | 736 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 418 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 737 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
| 419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 738 | # CONFIG_BLK_DEV_XIP is not set |
| 420 | # CONFIG_CDROM_PKTCDVD is not set | 739 | # CONFIG_CDROM_PKTCDVD is not set |
| 421 | # CONFIG_ATA_OVER_ETH is not set | 740 | # CONFIG_ATA_OVER_ETH is not set |
| 422 | CONFIG_MISC_DEVICES=y | 741 | CONFIG_MISC_DEVICES=y |
| @@ -425,72 +744,16 @@ CONFIG_MISC_DEVICES=y | |||
| 425 | # CONFIG_EEPROM_93CX6 is not set | 744 | # CONFIG_EEPROM_93CX6 is not set |
| 426 | # CONFIG_SGI_IOC4 is not set | 745 | # CONFIG_SGI_IOC4 is not set |
| 427 | # CONFIG_TIFM_CORE is not set | 746 | # CONFIG_TIFM_CORE is not set |
| 747 | # CONFIG_ACER_WMI is not set | ||
| 748 | # CONFIG_ASUS_LAPTOP is not set | ||
| 749 | # CONFIG_FUJITSU_LAPTOP is not set | ||
| 750 | # CONFIG_MSI_LAPTOP is not set | ||
| 428 | # CONFIG_SONY_LAPTOP is not set | 751 | # CONFIG_SONY_LAPTOP is not set |
| 429 | # CONFIG_THINKPAD_ACPI is not set | 752 | # CONFIG_THINKPAD_ACPI is not set |
| 430 | CONFIG_IDE=y | 753 | # CONFIG_INTEL_MENLOW is not set |
| 431 | CONFIG_BLK_DEV_IDE=y | 754 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 432 | 755 | CONFIG_HAVE_IDE=y | |
| 433 | # | 756 | # CONFIG_IDE is not set |
| 434 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 435 | # | ||
| 436 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 437 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
| 438 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 439 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 440 | CONFIG_BLK_DEV_IDECD=y | ||
| 441 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 442 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 443 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 444 | CONFIG_BLK_DEV_IDEACPI=y | ||
| 445 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 446 | CONFIG_IDE_PROC_FS=y | ||
| 447 | |||
| 448 | # | ||
| 449 | # IDE chipset support/bugfixes | ||
| 450 | # | ||
| 451 | CONFIG_IDE_GENERIC=y | ||
| 452 | # CONFIG_BLK_DEV_CMD640 is not set | ||
| 453 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
| 454 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 455 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 456 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
| 457 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 458 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 459 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 460 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
| 461 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 462 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 463 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 464 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 465 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 466 | CONFIG_BLK_DEV_AMD74XX=y | ||
| 467 | CONFIG_BLK_DEV_ATIIXP=y | ||
| 468 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 469 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 470 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 471 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 472 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 473 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 474 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 475 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 476 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 477 | CONFIG_BLK_DEV_PIIX=y | ||
| 478 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 479 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 480 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 481 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 482 | CONFIG_BLK_DEV_PDC202XX_NEW=y | ||
| 483 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 484 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 485 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
| 486 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 487 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 488 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 489 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 490 | # CONFIG_IDE_ARM is not set | ||
| 491 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 492 | # CONFIG_IDEDMA_IVB is not set | ||
| 493 | # CONFIG_BLK_DEV_HD is not set | ||
| 494 | 757 | ||
| 495 | # | 758 | # |
| 496 | # SCSI device support | 759 | # SCSI device support |
| @@ -499,8 +762,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 499 | CONFIG_SCSI=y | 762 | CONFIG_SCSI=y |
| 500 | CONFIG_SCSI_DMA=y | 763 | CONFIG_SCSI_DMA=y |
| 501 | # CONFIG_SCSI_TGT is not set | 764 | # CONFIG_SCSI_TGT is not set |
| 502 | CONFIG_SCSI_NETLINK=y | 765 | # CONFIG_SCSI_NETLINK is not set |
| 503 | # CONFIG_SCSI_PROC_FS is not set | 766 | CONFIG_SCSI_PROC_FS=y |
| 504 | 767 | ||
| 505 | # | 768 | # |
| 506 | # SCSI support type (disk, tape, CD-ROM) | 769 | # SCSI support type (disk, tape, CD-ROM) |
| @@ -509,7 +772,7 @@ CONFIG_BLK_DEV_SD=y | |||
| 509 | # CONFIG_CHR_DEV_ST is not set | 772 | # CONFIG_CHR_DEV_ST is not set |
| 510 | # CONFIG_CHR_DEV_OSST is not set | 773 | # CONFIG_CHR_DEV_OSST is not set |
| 511 | CONFIG_BLK_DEV_SR=y | 774 | CONFIG_BLK_DEV_SR=y |
| 512 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 775 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 513 | CONFIG_CHR_DEV_SG=y | 776 | CONFIG_CHR_DEV_SG=y |
| 514 | # CONFIG_CHR_DEV_SCH is not set | 777 | # CONFIG_CHR_DEV_SCH is not set |
| 515 | 778 | ||
| @@ -526,73 +789,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 526 | # SCSI Transports | 789 | # SCSI Transports |
| 527 | # | 790 | # |
| 528 | CONFIG_SCSI_SPI_ATTRS=y | 791 | CONFIG_SCSI_SPI_ATTRS=y |
| 529 | CONFIG_SCSI_FC_ATTRS=y | 792 | # CONFIG_SCSI_FC_ATTRS is not set |
| 530 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 793 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 531 | CONFIG_SCSI_SAS_ATTRS=y | 794 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 532 | # CONFIG_SCSI_SAS_LIBSAS is not set | 795 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 533 | 796 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 534 | # | 797 | # CONFIG_SCSI_LOWLEVEL is not set |
| 535 | # SCSI low-level drivers | 798 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 536 | # | ||
| 537 | # CONFIG_ISCSI_TCP is not set | ||
| 538 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 539 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 540 | # CONFIG_SCSI_ACARD is not set | ||
| 541 | # CONFIG_SCSI_AACRAID is not set | ||
| 542 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 543 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 544 | CONFIG_SCSI_AIC79XX=y | ||
| 545 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
| 546 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
| 547 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
| 548 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
| 549 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
| 550 | # CONFIG_SCSI_AIC94XX is not set | ||
| 551 | # CONFIG_SCSI_ARCMSR is not set | ||
| 552 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 553 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 554 | # CONFIG_MEGARAID_SAS is not set | ||
| 555 | # CONFIG_SCSI_HPTIOP is not set | ||
| 556 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 557 | # CONFIG_SCSI_DMX3191D is not set | ||
| 558 | # CONFIG_SCSI_EATA is not set | ||
| 559 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 560 | # CONFIG_SCSI_GDTH is not set | ||
| 561 | # CONFIG_SCSI_IPS is not set | ||
| 562 | # CONFIG_SCSI_INITIO is not set | ||
| 563 | # CONFIG_SCSI_INIA100 is not set | ||
| 564 | # CONFIG_SCSI_STEX is not set | ||
| 565 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 566 | # CONFIG_SCSI_IPR is not set | ||
| 567 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 568 | # CONFIG_SCSI_QLA_FC is not set | ||
| 569 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 570 | # CONFIG_SCSI_LPFC is not set | ||
| 571 | # CONFIG_SCSI_DC395x is not set | ||
| 572 | # CONFIG_SCSI_DC390T is not set | ||
| 573 | # CONFIG_SCSI_DEBUG is not set | ||
| 574 | # CONFIG_SCSI_SRP is not set | ||
| 575 | CONFIG_ATA=y | 799 | CONFIG_ATA=y |
| 576 | # CONFIG_ATA_NONSTANDARD is not set | 800 | # CONFIG_ATA_NONSTANDARD is not set |
| 577 | CONFIG_ATA_ACPI=y | 801 | CONFIG_ATA_ACPI=y |
| 802 | CONFIG_SATA_PMP=y | ||
| 578 | CONFIG_SATA_AHCI=y | 803 | CONFIG_SATA_AHCI=y |
| 579 | CONFIG_SATA_SVW=y | 804 | # CONFIG_SATA_SIL24 is not set |
| 805 | CONFIG_ATA_SFF=y | ||
| 806 | # CONFIG_SATA_SVW is not set | ||
| 580 | CONFIG_ATA_PIIX=y | 807 | CONFIG_ATA_PIIX=y |
| 581 | # CONFIG_SATA_MV is not set | 808 | # CONFIG_SATA_MV is not set |
| 582 | CONFIG_SATA_NV=y | 809 | # CONFIG_SATA_NV is not set |
| 583 | # CONFIG_PDC_ADMA is not set | 810 | # CONFIG_PDC_ADMA is not set |
| 584 | # CONFIG_SATA_QSTOR is not set | 811 | # CONFIG_SATA_QSTOR is not set |
| 585 | # CONFIG_SATA_PROMISE is not set | 812 | # CONFIG_SATA_PROMISE is not set |
| 586 | # CONFIG_SATA_SX4 is not set | 813 | # CONFIG_SATA_SX4 is not set |
| 587 | CONFIG_SATA_SIL=y | 814 | # CONFIG_SATA_SIL is not set |
| 588 | # CONFIG_SATA_SIL24 is not set | ||
| 589 | # CONFIG_SATA_SIS is not set | 815 | # CONFIG_SATA_SIS is not set |
| 590 | # CONFIG_SATA_ULI is not set | 816 | # CONFIG_SATA_ULI is not set |
| 591 | CONFIG_SATA_VIA=y | 817 | # CONFIG_SATA_VIA is not set |
| 592 | # CONFIG_SATA_VITESSE is not set | 818 | # CONFIG_SATA_VITESSE is not set |
| 593 | # CONFIG_SATA_INIC162X is not set | 819 | # CONFIG_SATA_INIC162X is not set |
| 820 | # CONFIG_PATA_ACPI is not set | ||
| 594 | # CONFIG_PATA_ALI is not set | 821 | # CONFIG_PATA_ALI is not set |
| 595 | # CONFIG_PATA_AMD is not set | 822 | CONFIG_PATA_AMD=y |
| 596 | # CONFIG_PATA_ARTOP is not set | 823 | # CONFIG_PATA_ARTOP is not set |
| 597 | # CONFIG_PATA_ATIIXP is not set | 824 | # CONFIG_PATA_ATIIXP is not set |
| 598 | # CONFIG_PATA_CMD640_PCI is not set | 825 | # CONFIG_PATA_CMD640_PCI is not set |
| @@ -612,11 +839,14 @@ CONFIG_SATA_VIA=y | |||
| 612 | # CONFIG_PATA_TRIFLEX is not set | 839 | # CONFIG_PATA_TRIFLEX is not set |
| 613 | # CONFIG_PATA_MARVELL is not set | 840 | # CONFIG_PATA_MARVELL is not set |
| 614 | # CONFIG_PATA_MPIIX is not set | 841 | # CONFIG_PATA_MPIIX is not set |
| 615 | # CONFIG_PATA_OLDPIIX is not set | 842 | CONFIG_PATA_OLDPIIX=y |
| 616 | # CONFIG_PATA_NETCELL is not set | 843 | # CONFIG_PATA_NETCELL is not set |
| 844 | # CONFIG_PATA_NINJA32 is not set | ||
| 617 | # CONFIG_PATA_NS87410 is not set | 845 | # CONFIG_PATA_NS87410 is not set |
| 846 | # CONFIG_PATA_NS87415 is not set | ||
| 618 | # CONFIG_PATA_OPTI is not set | 847 | # CONFIG_PATA_OPTI is not set |
| 619 | # CONFIG_PATA_OPTIDMA is not set | 848 | # CONFIG_PATA_OPTIDMA is not set |
| 849 | # CONFIG_PATA_PCMCIA is not set | ||
| 620 | # CONFIG_PATA_PDC_OLD is not set | 850 | # CONFIG_PATA_PDC_OLD is not set |
| 621 | # CONFIG_PATA_RADISYS is not set | 851 | # CONFIG_PATA_RADISYS is not set |
| 622 | # CONFIG_PATA_RZ1000 is not set | 852 | # CONFIG_PATA_RZ1000 is not set |
| @@ -628,65 +858,42 @@ CONFIG_SATA_VIA=y | |||
| 628 | # CONFIG_PATA_VIA is not set | 858 | # CONFIG_PATA_VIA is not set |
| 629 | # CONFIG_PATA_WINBOND is not set | 859 | # CONFIG_PATA_WINBOND is not set |
| 630 | CONFIG_MD=y | 860 | CONFIG_MD=y |
| 631 | # CONFIG_BLK_DEV_MD is not set | 861 | CONFIG_BLK_DEV_MD=y |
| 862 | # CONFIG_MD_LINEAR is not set | ||
| 863 | # CONFIG_MD_RAID0 is not set | ||
| 864 | # CONFIG_MD_RAID1 is not set | ||
| 865 | # CONFIG_MD_RAID10 is not set | ||
| 866 | # CONFIG_MD_RAID456 is not set | ||
| 867 | # CONFIG_MD_MULTIPATH is not set | ||
| 868 | # CONFIG_MD_FAULTY is not set | ||
| 632 | CONFIG_BLK_DEV_DM=y | 869 | CONFIG_BLK_DEV_DM=y |
| 633 | # CONFIG_DM_DEBUG is not set | 870 | # CONFIG_DM_DEBUG is not set |
| 634 | # CONFIG_DM_CRYPT is not set | 871 | # CONFIG_DM_CRYPT is not set |
| 635 | # CONFIG_DM_SNAPSHOT is not set | 872 | # CONFIG_DM_SNAPSHOT is not set |
| 636 | # CONFIG_DM_MIRROR is not set | 873 | CONFIG_DM_MIRROR=y |
| 637 | # CONFIG_DM_ZERO is not set | 874 | CONFIG_DM_ZERO=y |
| 638 | # CONFIG_DM_MULTIPATH is not set | 875 | # CONFIG_DM_MULTIPATH is not set |
| 639 | # CONFIG_DM_DELAY is not set | 876 | # CONFIG_DM_DELAY is not set |
| 640 | 877 | # CONFIG_DM_UEVENT is not set | |
| 641 | # | 878 | # CONFIG_FUSION is not set |
| 642 | # Fusion MPT device support | ||
| 643 | # | ||
| 644 | CONFIG_FUSION=y | ||
| 645 | CONFIG_FUSION_SPI=y | ||
| 646 | # CONFIG_FUSION_FC is not set | ||
| 647 | # CONFIG_FUSION_SAS is not set | ||
| 648 | CONFIG_FUSION_MAX_SGE=128 | ||
| 649 | # CONFIG_FUSION_CTL is not set | ||
| 650 | 879 | ||
| 651 | # | 880 | # |
| 652 | # IEEE 1394 (FireWire) support | 881 | # IEEE 1394 (FireWire) support |
| 653 | # | 882 | # |
| 654 | # CONFIG_FIREWIRE is not set | 883 | # CONFIG_FIREWIRE is not set |
| 655 | CONFIG_IEEE1394=y | 884 | # CONFIG_IEEE1394 is not set |
| 656 | |||
| 657 | # | ||
| 658 | # Subsystem Options | ||
| 659 | # | ||
| 660 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # Controllers | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # Texas Instruments PCILynx requires I2C | ||
| 668 | # | ||
| 669 | CONFIG_IEEE1394_OHCI1394=y | ||
| 670 | |||
| 671 | # | ||
| 672 | # Protocols | ||
| 673 | # | ||
| 674 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
| 675 | # CONFIG_IEEE1394_SBP2 is not set | ||
| 676 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
| 677 | # CONFIG_IEEE1394_ETH1394 is not set | ||
| 678 | # CONFIG_IEEE1394_DV1394 is not set | ||
| 679 | CONFIG_IEEE1394_RAWIO=y | ||
| 680 | # CONFIG_I2O is not set | 885 | # CONFIG_I2O is not set |
| 681 | CONFIG_MACINTOSH_DRIVERS=y | 886 | CONFIG_MACINTOSH_DRIVERS=y |
| 682 | # CONFIG_MAC_EMUMOUSEBTN is not set | 887 | CONFIG_MAC_EMUMOUSEBTN=y |
| 683 | CONFIG_NETDEVICES=y | 888 | CONFIG_NETDEVICES=y |
| 684 | CONFIG_NETDEVICES_MULTIQUEUE=y | 889 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| 890 | # CONFIG_IFB is not set | ||
| 685 | # CONFIG_DUMMY is not set | 891 | # CONFIG_DUMMY is not set |
| 686 | # CONFIG_BONDING is not set | 892 | # CONFIG_BONDING is not set |
| 687 | # CONFIG_MACVLAN is not set | 893 | # CONFIG_MACVLAN is not set |
| 688 | # CONFIG_EQUALIZER is not set | 894 | # CONFIG_EQUALIZER is not set |
| 689 | CONFIG_TUN=y | 895 | # CONFIG_TUN is not set |
| 896 | # CONFIG_VETH is not set | ||
| 690 | # CONFIG_NET_SB1000 is not set | 897 | # CONFIG_NET_SB1000 is not set |
| 691 | # CONFIG_ARCNET is not set | 898 | # CONFIG_ARCNET is not set |
| 692 | # CONFIG_PHYLIB is not set | 899 | # CONFIG_PHYLIB is not set |
| @@ -696,39 +903,40 @@ CONFIG_MII=y | |||
| 696 | # CONFIG_SUNGEM is not set | 903 | # CONFIG_SUNGEM is not set |
| 697 | # CONFIG_CASSINI is not set | 904 | # CONFIG_CASSINI is not set |
| 698 | CONFIG_NET_VENDOR_3COM=y | 905 | CONFIG_NET_VENDOR_3COM=y |
| 699 | CONFIG_VORTEX=y | 906 | # CONFIG_VORTEX is not set |
| 700 | # CONFIG_TYPHOON is not set | 907 | # CONFIG_TYPHOON is not set |
| 701 | CONFIG_NET_TULIP=y | 908 | CONFIG_NET_TULIP=y |
| 702 | # CONFIG_DE2104X is not set | 909 | # CONFIG_DE2104X is not set |
| 703 | CONFIG_TULIP=y | 910 | # CONFIG_TULIP is not set |
| 704 | # CONFIG_TULIP_MWI is not set | ||
| 705 | # CONFIG_TULIP_MMIO is not set | ||
| 706 | # CONFIG_TULIP_NAPI is not set | ||
| 707 | # CONFIG_DE4X5 is not set | 911 | # CONFIG_DE4X5 is not set |
| 708 | # CONFIG_WINBOND_840 is not set | 912 | # CONFIG_WINBOND_840 is not set |
| 709 | # CONFIG_DM9102 is not set | 913 | # CONFIG_DM9102 is not set |
| 710 | # CONFIG_ULI526X is not set | 914 | # CONFIG_ULI526X is not set |
| 915 | # CONFIG_PCMCIA_XIRCOM is not set | ||
| 711 | # CONFIG_HP100 is not set | 916 | # CONFIG_HP100 is not set |
| 917 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 918 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 919 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 920 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 712 | CONFIG_NET_PCI=y | 921 | CONFIG_NET_PCI=y |
| 713 | # CONFIG_PCNET32 is not set | 922 | # CONFIG_PCNET32 is not set |
| 714 | CONFIG_AMD8111_ETH=y | 923 | # CONFIG_AMD8111_ETH is not set |
| 715 | # CONFIG_AMD8111E_NAPI is not set | ||
| 716 | # CONFIG_ADAPTEC_STARFIRE is not set | 924 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 717 | CONFIG_B44=y | 925 | # CONFIG_B44 is not set |
| 718 | CONFIG_FORCEDETH=y | 926 | CONFIG_FORCEDETH=y |
| 719 | # CONFIG_FORCEDETH_NAPI is not set | 927 | # CONFIG_FORCEDETH_NAPI is not set |
| 720 | # CONFIG_DGRS is not set | ||
| 721 | # CONFIG_EEPRO100 is not set | 928 | # CONFIG_EEPRO100 is not set |
| 722 | CONFIG_E100=y | 929 | CONFIG_E100=y |
| 723 | # CONFIG_FEALNX is not set | 930 | # CONFIG_FEALNX is not set |
| 724 | # CONFIG_NATSEMI is not set | 931 | # CONFIG_NATSEMI is not set |
| 725 | # CONFIG_NE2K_PCI is not set | 932 | # CONFIG_NE2K_PCI is not set |
| 726 | CONFIG_8139CP=y | 933 | # CONFIG_8139CP is not set |
| 727 | CONFIG_8139TOO=y | 934 | CONFIG_8139TOO=y |
| 728 | # CONFIG_8139TOO_PIO is not set | 935 | CONFIG_8139TOO_PIO=y |
| 729 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 936 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 730 | # CONFIG_8139TOO_8129 is not set | 937 | # CONFIG_8139TOO_8129 is not set |
| 731 | # CONFIG_8139_OLD_RX_RESET is not set | 938 | # CONFIG_8139_OLD_RX_RESET is not set |
| 939 | # CONFIG_R6040 is not set | ||
| 732 | # CONFIG_SIS900 is not set | 940 | # CONFIG_SIS900 is not set |
| 733 | # CONFIG_EPIC100 is not set | 941 | # CONFIG_EPIC100 is not set |
| 734 | # CONFIG_SUNDANCE is not set | 942 | # CONFIG_SUNDANCE is not set |
| @@ -740,34 +948,74 @@ CONFIG_NETDEV_1000=y | |||
| 740 | CONFIG_E1000=y | 948 | CONFIG_E1000=y |
| 741 | # CONFIG_E1000_NAPI is not set | 949 | # CONFIG_E1000_NAPI is not set |
| 742 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 950 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 951 | # CONFIG_E1000E is not set | ||
| 952 | # CONFIG_E1000E_ENABLED is not set | ||
| 953 | # CONFIG_IP1000 is not set | ||
| 954 | # CONFIG_IGB is not set | ||
| 743 | # CONFIG_NS83820 is not set | 955 | # CONFIG_NS83820 is not set |
| 744 | # CONFIG_HAMACHI is not set | 956 | # CONFIG_HAMACHI is not set |
| 745 | # CONFIG_YELLOWFIN is not set | 957 | # CONFIG_YELLOWFIN is not set |
| 746 | # CONFIG_R8169 is not set | 958 | # CONFIG_R8169 is not set |
| 747 | # CONFIG_SIS190 is not set | 959 | # CONFIG_SIS190 is not set |
| 748 | # CONFIG_SKGE is not set | 960 | # CONFIG_SKGE is not set |
| 749 | # CONFIG_SKY2 is not set | 961 | CONFIG_SKY2=y |
| 962 | # CONFIG_SKY2_DEBUG is not set | ||
| 750 | # CONFIG_VIA_VELOCITY is not set | 963 | # CONFIG_VIA_VELOCITY is not set |
| 751 | CONFIG_TIGON3=y | 964 | CONFIG_TIGON3=y |
| 752 | CONFIG_BNX2=y | 965 | # CONFIG_BNX2 is not set |
| 753 | # CONFIG_QLA3XXX is not set | 966 | # CONFIG_QLA3XXX is not set |
| 754 | # CONFIG_ATL1 is not set | 967 | # CONFIG_ATL1 is not set |
| 755 | CONFIG_NETDEV_10000=y | 968 | CONFIG_NETDEV_10000=y |
| 756 | # CONFIG_CHELSIO_T1 is not set | 969 | # CONFIG_CHELSIO_T1 is not set |
| 757 | # CONFIG_CHELSIO_T3 is not set | 970 | # CONFIG_CHELSIO_T3 is not set |
| 971 | # CONFIG_IXGBE is not set | ||
| 758 | # CONFIG_IXGB is not set | 972 | # CONFIG_IXGB is not set |
| 759 | CONFIG_S2IO=m | 973 | # CONFIG_S2IO is not set |
| 760 | # CONFIG_S2IO_NAPI is not set | ||
| 761 | # CONFIG_MYRI10GE is not set | 974 | # CONFIG_MYRI10GE is not set |
| 762 | # CONFIG_NETXEN_NIC is not set | 975 | # CONFIG_NETXEN_NIC is not set |
| 976 | # CONFIG_NIU is not set | ||
| 763 | # CONFIG_MLX4_CORE is not set | 977 | # CONFIG_MLX4_CORE is not set |
| 764 | # CONFIG_TR is not set | 978 | # CONFIG_TEHUTI is not set |
| 979 | # CONFIG_BNX2X is not set | ||
| 980 | # CONFIG_SFC is not set | ||
| 981 | CONFIG_TR=y | ||
| 982 | # CONFIG_IBMOL is not set | ||
| 983 | # CONFIG_3C359 is not set | ||
| 984 | # CONFIG_TMS380TR is not set | ||
| 765 | 985 | ||
| 766 | # | 986 | # |
| 767 | # Wireless LAN | 987 | # Wireless LAN |
| 768 | # | 988 | # |
| 769 | # CONFIG_WLAN_PRE80211 is not set | 989 | # CONFIG_WLAN_PRE80211 is not set |
| 770 | # CONFIG_WLAN_80211 is not set | 990 | CONFIG_WLAN_80211=y |
| 991 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 992 | # CONFIG_IPW2100 is not set | ||
| 993 | # CONFIG_IPW2200 is not set | ||
| 994 | # CONFIG_LIBERTAS is not set | ||
| 995 | # CONFIG_AIRO is not set | ||
| 996 | # CONFIG_HERMES is not set | ||
| 997 | # CONFIG_ATMEL is not set | ||
| 998 | # CONFIG_AIRO_CS is not set | ||
| 999 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 1000 | # CONFIG_PRISM54 is not set | ||
| 1001 | # CONFIG_USB_ZD1201 is not set | ||
| 1002 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 1003 | # CONFIG_RTL8180 is not set | ||
| 1004 | # CONFIG_RTL8187 is not set | ||
| 1005 | # CONFIG_ADM8211 is not set | ||
| 1006 | # CONFIG_P54_COMMON is not set | ||
| 1007 | CONFIG_ATH5K=y | ||
| 1008 | # CONFIG_ATH5K_DEBUG is not set | ||
| 1009 | # CONFIG_IWLWIFI is not set | ||
| 1010 | # CONFIG_IWLCORE is not set | ||
| 1011 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1012 | # CONFIG_IWL4965 is not set | ||
| 1013 | # CONFIG_IWL3945 is not set | ||
| 1014 | # CONFIG_HOSTAP is not set | ||
| 1015 | # CONFIG_B43 is not set | ||
| 1016 | # CONFIG_B43LEGACY is not set | ||
| 1017 | # CONFIG_ZD1211RW is not set | ||
| 1018 | # CONFIG_RT2X00 is not set | ||
| 771 | 1019 | ||
| 772 | # | 1020 | # |
| 773 | # USB Network Adapters | 1021 | # USB Network Adapters |
| @@ -776,16 +1024,26 @@ CONFIG_S2IO=m | |||
| 776 | # CONFIG_USB_KAWETH is not set | 1024 | # CONFIG_USB_KAWETH is not set |
| 777 | # CONFIG_USB_PEGASUS is not set | 1025 | # CONFIG_USB_PEGASUS is not set |
| 778 | # CONFIG_USB_RTL8150 is not set | 1026 | # CONFIG_USB_RTL8150 is not set |
| 779 | # CONFIG_USB_USBNET_MII is not set | ||
| 780 | # CONFIG_USB_USBNET is not set | 1027 | # CONFIG_USB_USBNET is not set |
| 1028 | CONFIG_NET_PCMCIA=y | ||
| 1029 | # CONFIG_PCMCIA_3C589 is not set | ||
| 1030 | # CONFIG_PCMCIA_3C574 is not set | ||
| 1031 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 1032 | # CONFIG_PCMCIA_PCNET is not set | ||
| 1033 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 1034 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 1035 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 1036 | # CONFIG_PCMCIA_AXNET is not set | ||
| 781 | # CONFIG_WAN is not set | 1037 | # CONFIG_WAN is not set |
| 782 | # CONFIG_FDDI is not set | 1038 | CONFIG_FDDI=y |
| 1039 | # CONFIG_DEFXX is not set | ||
| 1040 | # CONFIG_SKFP is not set | ||
| 783 | # CONFIG_HIPPI is not set | 1041 | # CONFIG_HIPPI is not set |
| 784 | # CONFIG_PPP is not set | 1042 | # CONFIG_PPP is not set |
| 785 | # CONFIG_SLIP is not set | 1043 | # CONFIG_SLIP is not set |
| 786 | # CONFIG_NET_FC is not set | 1044 | # CONFIG_NET_FC is not set |
| 787 | # CONFIG_SHAPER is not set | ||
| 788 | CONFIG_NETCONSOLE=y | 1045 | CONFIG_NETCONSOLE=y |
| 1046 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
| 789 | CONFIG_NETPOLL=y | 1047 | CONFIG_NETPOLL=y |
| 790 | # CONFIG_NETPOLL_TRAP is not set | 1048 | # CONFIG_NETPOLL_TRAP is not set |
| 791 | CONFIG_NET_POLL_CONTROLLER=y | 1049 | CONFIG_NET_POLL_CONTROLLER=y |
| @@ -796,18 +1054,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
| 796 | # Input device support | 1054 | # Input device support |
| 797 | # | 1055 | # |
| 798 | CONFIG_INPUT=y | 1056 | CONFIG_INPUT=y |
| 799 | # CONFIG_INPUT_FF_MEMLESS is not set | 1057 | CONFIG_INPUT_FF_MEMLESS=y |
| 800 | # CONFIG_INPUT_POLLDEV is not set | 1058 | CONFIG_INPUT_POLLDEV=y |
| 801 | 1059 | ||
| 802 | # | 1060 | # |
| 803 | # Userland interfaces | 1061 | # Userland interfaces |
| 804 | # | 1062 | # |
| 805 | CONFIG_INPUT_MOUSEDEV=y | 1063 | CONFIG_INPUT_MOUSEDEV=y |
| 806 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1064 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
| 807 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1065 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 808 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1066 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 809 | # CONFIG_INPUT_JOYDEV is not set | 1067 | # CONFIG_INPUT_JOYDEV is not set |
| 810 | # CONFIG_INPUT_TSDEV is not set | ||
| 811 | CONFIG_INPUT_EVDEV=y | 1068 | CONFIG_INPUT_EVDEV=y |
| 812 | # CONFIG_INPUT_EVBUG is not set | 1069 | # CONFIG_INPUT_EVBUG is not set |
| 813 | 1070 | ||
| @@ -832,17 +1089,62 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 832 | # CONFIG_MOUSE_SERIAL is not set | 1089 | # CONFIG_MOUSE_SERIAL is not set |
| 833 | # CONFIG_MOUSE_APPLETOUCH is not set | 1090 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 834 | # CONFIG_MOUSE_VSXXXAA is not set | 1091 | # CONFIG_MOUSE_VSXXXAA is not set |
| 835 | # CONFIG_INPUT_JOYSTICK is not set | 1092 | CONFIG_INPUT_JOYSTICK=y |
| 836 | # CONFIG_INPUT_TABLET is not set | 1093 | # CONFIG_JOYSTICK_ANALOG is not set |
| 837 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1094 | # CONFIG_JOYSTICK_A3D is not set |
| 838 | # CONFIG_INPUT_MISC is not set | 1095 | # CONFIG_JOYSTICK_ADI is not set |
| 1096 | # CONFIG_JOYSTICK_COBRA is not set | ||
| 1097 | # CONFIG_JOYSTICK_GF2K is not set | ||
| 1098 | # CONFIG_JOYSTICK_GRIP is not set | ||
| 1099 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
| 1100 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
| 1101 | # CONFIG_JOYSTICK_INTERACT is not set | ||
| 1102 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
| 1103 | # CONFIG_JOYSTICK_TMDC is not set | ||
| 1104 | # CONFIG_JOYSTICK_IFORCE is not set | ||
| 1105 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
| 1106 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
| 1107 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
| 1108 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
| 1109 | # CONFIG_JOYSTICK_STINGER is not set | ||
| 1110 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
| 1111 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
| 1112 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
| 1113 | # CONFIG_JOYSTICK_XPAD is not set | ||
| 1114 | CONFIG_INPUT_TABLET=y | ||
| 1115 | # CONFIG_TABLET_USB_ACECAD is not set | ||
| 1116 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
| 1117 | # CONFIG_TABLET_USB_GTCO is not set | ||
| 1118 | # CONFIG_TABLET_USB_KBTAB is not set | ||
| 1119 | # CONFIG_TABLET_USB_WACOM is not set | ||
| 1120 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 1121 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 1122 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 1123 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 1124 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 1125 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 1126 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 1127 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 1128 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 1129 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 1130 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 1131 | CONFIG_INPUT_MISC=y | ||
| 1132 | # CONFIG_INPUT_PCSPKR is not set | ||
| 1133 | # CONFIG_INPUT_APANEL is not set | ||
| 1134 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
| 1135 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
| 1136 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
| 1137 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
| 1138 | # CONFIG_INPUT_POWERMATE is not set | ||
| 1139 | # CONFIG_INPUT_YEALINK is not set | ||
| 1140 | # CONFIG_INPUT_UINPUT is not set | ||
| 839 | 1141 | ||
| 840 | # | 1142 | # |
| 841 | # Hardware I/O ports | 1143 | # Hardware I/O ports |
| 842 | # | 1144 | # |
| 843 | CONFIG_SERIO=y | 1145 | CONFIG_SERIO=y |
| 844 | CONFIG_SERIO_I8042=y | 1146 | CONFIG_SERIO_I8042=y |
| 845 | # CONFIG_SERIO_SERPORT is not set | 1147 | CONFIG_SERIO_SERPORT=y |
| 846 | # CONFIG_SERIO_CT82C710 is not set | 1148 | # CONFIG_SERIO_CT82C710 is not set |
| 847 | # CONFIG_SERIO_PCIPS2 is not set | 1149 | # CONFIG_SERIO_PCIPS2 is not set |
| 848 | CONFIG_SERIO_LIBPS2=y | 1150 | CONFIG_SERIO_LIBPS2=y |
| @@ -855,8 +1157,26 @@ CONFIG_SERIO_LIBPS2=y | |||
| 855 | CONFIG_VT=y | 1157 | CONFIG_VT=y |
| 856 | CONFIG_VT_CONSOLE=y | 1158 | CONFIG_VT_CONSOLE=y |
| 857 | CONFIG_HW_CONSOLE=y | 1159 | CONFIG_HW_CONSOLE=y |
| 858 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1160 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 859 | # CONFIG_SERIAL_NONSTANDARD is not set | 1161 | CONFIG_DEVKMEM=y |
| 1162 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 1163 | # CONFIG_COMPUTONE is not set | ||
| 1164 | # CONFIG_ROCKETPORT is not set | ||
| 1165 | # CONFIG_CYCLADES is not set | ||
| 1166 | # CONFIG_DIGIEPCA is not set | ||
| 1167 | # CONFIG_MOXA_INTELLIO is not set | ||
| 1168 | # CONFIG_MOXA_SMARTIO is not set | ||
| 1169 | # CONFIG_ISI is not set | ||
| 1170 | # CONFIG_SYNCLINK is not set | ||
| 1171 | # CONFIG_SYNCLINKMP is not set | ||
| 1172 | # CONFIG_SYNCLINK_GT is not set | ||
| 1173 | # CONFIG_N_HDLC is not set | ||
| 1174 | # CONFIG_RISCOM8 is not set | ||
| 1175 | # CONFIG_SPECIALIX is not set | ||
| 1176 | # CONFIG_SX is not set | ||
| 1177 | # CONFIG_RIO is not set | ||
| 1178 | # CONFIG_STALDRV is not set | ||
| 1179 | # CONFIG_NOZOMI is not set | ||
| 860 | 1180 | ||
| 861 | # | 1181 | # |
| 862 | # Serial drivers | 1182 | # Serial drivers |
| @@ -866,9 +1186,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
| 866 | CONFIG_FIX_EARLYCON_MEM=y | 1186 | CONFIG_FIX_EARLYCON_MEM=y |
| 867 | CONFIG_SERIAL_8250_PCI=y | 1187 | CONFIG_SERIAL_8250_PCI=y |
| 868 | CONFIG_SERIAL_8250_PNP=y | 1188 | CONFIG_SERIAL_8250_PNP=y |
| 869 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1189 | # CONFIG_SERIAL_8250_CS is not set |
| 1190 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 870 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1191 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 871 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1192 | CONFIG_SERIAL_8250_EXTENDED=y |
| 1193 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 1194 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 1195 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 1196 | CONFIG_SERIAL_8250_RSA=y | ||
| 872 | 1197 | ||
| 873 | # | 1198 | # |
| 874 | # Non-8250 serial port support | 1199 | # Non-8250 serial port support |
| @@ -877,78 +1202,260 @@ CONFIG_SERIAL_CORE=y | |||
| 877 | CONFIG_SERIAL_CORE_CONSOLE=y | 1202 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 878 | # CONFIG_SERIAL_JSM is not set | 1203 | # CONFIG_SERIAL_JSM is not set |
| 879 | CONFIG_UNIX98_PTYS=y | 1204 | CONFIG_UNIX98_PTYS=y |
| 880 | CONFIG_LEGACY_PTYS=y | 1205 | # CONFIG_LEGACY_PTYS is not set |
| 881 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 882 | # CONFIG_IPMI_HANDLER is not set | 1206 | # CONFIG_IPMI_HANDLER is not set |
| 883 | # CONFIG_WATCHDOG is not set | ||
| 884 | CONFIG_HW_RANDOM=y | 1207 | CONFIG_HW_RANDOM=y |
| 885 | CONFIG_HW_RANDOM_INTEL=y | 1208 | # CONFIG_HW_RANDOM_INTEL is not set |
| 886 | CONFIG_HW_RANDOM_AMD=y | 1209 | # CONFIG_HW_RANDOM_AMD is not set |
| 887 | # CONFIG_NVRAM is not set | 1210 | CONFIG_NVRAM=y |
| 888 | CONFIG_RTC=y | ||
| 889 | # CONFIG_R3964 is not set | 1211 | # CONFIG_R3964 is not set |
| 890 | # CONFIG_APPLICOM is not set | 1212 | # CONFIG_APPLICOM is not set |
| 891 | CONFIG_AGP=y | 1213 | |
| 892 | CONFIG_AGP_AMD64=y | 1214 | # |
| 893 | CONFIG_AGP_INTEL=y | 1215 | # PCMCIA character devices |
| 894 | # CONFIG_AGP_SIS is not set | 1216 | # |
| 895 | # CONFIG_AGP_VIA is not set | 1217 | # CONFIG_SYNCLINK_CS is not set |
| 896 | # CONFIG_DRM is not set | 1218 | # CONFIG_CARDMAN_4000 is not set |
| 1219 | # CONFIG_CARDMAN_4040 is not set | ||
| 1220 | # CONFIG_IPWIRELESS is not set | ||
| 897 | # CONFIG_MWAVE is not set | 1221 | # CONFIG_MWAVE is not set |
| 898 | # CONFIG_PC8736x_GPIO is not set | 1222 | # CONFIG_PC8736x_GPIO is not set |
| 899 | CONFIG_RAW_DRIVER=y | 1223 | # CONFIG_RAW_DRIVER is not set |
| 900 | CONFIG_MAX_RAW_DEVS=256 | ||
| 901 | CONFIG_HPET=y | 1224 | CONFIG_HPET=y |
| 902 | # CONFIG_HPET_RTC_IRQ is not set | 1225 | # CONFIG_HPET_RTC_IRQ is not set |
| 903 | CONFIG_HPET_MMAP=y | 1226 | # CONFIG_HPET_MMAP is not set |
| 904 | # CONFIG_HANGCHECK_TIMER is not set | 1227 | # CONFIG_HANGCHECK_TIMER is not set |
| 905 | # CONFIG_TCG_TPM is not set | 1228 | # CONFIG_TCG_TPM is not set |
| 906 | # CONFIG_TELCLOCK is not set | 1229 | # CONFIG_TELCLOCK is not set |
| 907 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
| 908 | # CONFIG_I2C is not set | 1231 | CONFIG_I2C=y |
| 909 | 1232 | CONFIG_I2C_BOARDINFO=y | |
| 910 | # | 1233 | # CONFIG_I2C_CHARDEV is not set |
| 911 | # SPI support | 1234 | |
| 912 | # | 1235 | # |
| 1236 | # I2C Hardware Bus support | ||
| 1237 | # | ||
| 1238 | # CONFIG_I2C_ALI1535 is not set | ||
| 1239 | # CONFIG_I2C_ALI1563 is not set | ||
| 1240 | # CONFIG_I2C_ALI15X3 is not set | ||
| 1241 | # CONFIG_I2C_AMD756 is not set | ||
| 1242 | # CONFIG_I2C_AMD8111 is not set | ||
| 1243 | CONFIG_I2C_I801=y | ||
| 1244 | # CONFIG_I2C_I810 is not set | ||
| 1245 | # CONFIG_I2C_PIIX4 is not set | ||
| 1246 | # 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 | ||
| 1253 | # CONFIG_I2C_SIS630 is not set | ||
| 1254 | # 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 | ||
| 1259 | # CONFIG_I2C_VIAPRO is not set | ||
| 1260 | # CONFIG_I2C_VOODOO3 is not set | ||
| 1261 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1262 | |||
| 1263 | # | ||
| 1264 | # Miscellaneous I2C Chip support | ||
| 1265 | # | ||
| 1266 | # CONFIG_DS1682 is not set | ||
| 1267 | # CONFIG_SENSORS_EEPROM is not set | ||
| 1268 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 1269 | # CONFIG_PCF8575 is not set | ||
| 1270 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1271 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 1272 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1273 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 1274 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 1275 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 1276 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 913 | # CONFIG_SPI is not set | 1277 | # CONFIG_SPI is not set |
| 914 | # CONFIG_SPI_MASTER is not set | ||
| 915 | # CONFIG_W1 is not set | 1278 | # CONFIG_W1 is not set |
| 916 | # CONFIG_POWER_SUPPLY is not set | 1279 | CONFIG_POWER_SUPPLY=y |
| 1280 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 1281 | # CONFIG_PDA_POWER is not set | ||
| 1282 | # CONFIG_BATTERY_DS2760 is not set | ||
| 917 | # CONFIG_HWMON is not set | 1283 | # CONFIG_HWMON is not set |
| 1284 | CONFIG_THERMAL=y | ||
| 1285 | CONFIG_WATCHDOG=y | ||
| 1286 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 1287 | |||
| 1288 | # | ||
| 1289 | # Watchdog Device Drivers | ||
| 1290 | # | ||
| 1291 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 1292 | # CONFIG_ACQUIRE_WDT is not set | ||
| 1293 | # CONFIG_ADVANTECH_WDT is not set | ||
| 1294 | # CONFIG_ALIM1535_WDT is not set | ||
| 1295 | # CONFIG_ALIM7101_WDT is not set | ||
| 1296 | # CONFIG_SC520_WDT is not set | ||
| 1297 | # CONFIG_EUROTECH_WDT is not set | ||
| 1298 | # CONFIG_IB700_WDT is not set | ||
| 1299 | # CONFIG_IBMASR is not set | ||
| 1300 | # CONFIG_WAFER_WDT is not set | ||
| 1301 | # CONFIG_I6300ESB_WDT is not set | ||
| 1302 | # CONFIG_ITCO_WDT is not set | ||
| 1303 | # CONFIG_IT8712F_WDT is not set | ||
| 1304 | # CONFIG_HP_WATCHDOG is not set | ||
| 1305 | # CONFIG_SC1200_WDT is not set | ||
| 1306 | # CONFIG_PC87413_WDT is not set | ||
| 1307 | # CONFIG_60XX_WDT is not set | ||
| 1308 | # CONFIG_SBC8360_WDT is not set | ||
| 1309 | # CONFIG_CPU5_WDT is not set | ||
| 1310 | # CONFIG_SMSC37B787_WDT is not set | ||
| 1311 | # CONFIG_W83627HF_WDT is not set | ||
| 1312 | # CONFIG_W83697HF_WDT is not set | ||
| 1313 | # CONFIG_W83877F_WDT is not set | ||
| 1314 | # CONFIG_W83977F_WDT is not set | ||
| 1315 | # CONFIG_MACHZ_WDT is not set | ||
| 1316 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
| 1317 | |||
| 1318 | # | ||
| 1319 | # PCI-based Watchdog Cards | ||
| 1320 | # | ||
| 1321 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 1322 | # CONFIG_WDTPCI is not set | ||
| 1323 | |||
| 1324 | # | ||
| 1325 | # USB-based Watchdog Cards | ||
| 1326 | # | ||
| 1327 | # CONFIG_USBPCWATCHDOG is not set | ||
| 1328 | |||
| 1329 | # | ||
| 1330 | # Sonics Silicon Backplane | ||
| 1331 | # | ||
| 1332 | CONFIG_SSB_POSSIBLE=y | ||
| 1333 | # CONFIG_SSB is not set | ||
| 918 | 1334 | ||
| 919 | # | 1335 | # |
| 920 | # Multifunction device drivers | 1336 | # Multifunction device drivers |
| 921 | # | 1337 | # |
| 922 | # CONFIG_MFD_SM501 is not set | 1338 | # CONFIG_MFD_SM501 is not set |
| 1339 | # CONFIG_HTC_PASIC3 is not set | ||
| 923 | 1340 | ||
| 924 | # | 1341 | # |
| 925 | # Multimedia devices | 1342 | # Multimedia devices |
| 926 | # | 1343 | # |
| 1344 | |||
| 1345 | # | ||
| 1346 | # Multimedia core support | ||
| 1347 | # | ||
| 927 | # CONFIG_VIDEO_DEV is not set | 1348 | # CONFIG_VIDEO_DEV is not set |
| 928 | # CONFIG_DVB_CORE is not set | 1349 | # CONFIG_DVB_CORE is not set |
| 1350 | |||
| 1351 | # | ||
| 1352 | # Multimedia drivers | ||
| 1353 | # | ||
| 929 | CONFIG_DAB=y | 1354 | CONFIG_DAB=y |
| 930 | # CONFIG_USB_DABUSB is not set | 1355 | # CONFIG_USB_DABUSB is not set |
| 931 | 1356 | ||
| 932 | # | 1357 | # |
| 933 | # Graphics support | 1358 | # Graphics support |
| 934 | # | 1359 | # |
| 935 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1360 | CONFIG_AGP=y |
| 1361 | CONFIG_AGP_AMD64=y | ||
| 1362 | CONFIG_AGP_INTEL=y | ||
| 1363 | # CONFIG_AGP_SIS is not set | ||
| 1364 | # CONFIG_AGP_VIA is not set | ||
| 1365 | CONFIG_DRM=y | ||
| 1366 | # CONFIG_DRM_TDFX is not set | ||
| 1367 | # CONFIG_DRM_R128 is not set | ||
| 1368 | # CONFIG_DRM_RADEON is not set | ||
| 1369 | # CONFIG_DRM_I810 is not set | ||
| 1370 | # CONFIG_DRM_I830 is not set | ||
| 1371 | CONFIG_DRM_I915=y | ||
| 1372 | # CONFIG_DRM_MGA is not set | ||
| 1373 | # CONFIG_DRM_SIS is not set | ||
| 1374 | # CONFIG_DRM_VIA is not set | ||
| 1375 | # CONFIG_DRM_SAVAGE is not set | ||
| 1376 | # CONFIG_VGASTATE is not set | ||
| 1377 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1378 | CONFIG_FB=y | ||
| 1379 | # CONFIG_FIRMWARE_EDID is not set | ||
| 1380 | # CONFIG_FB_DDC is not set | ||
| 1381 | CONFIG_FB_CFB_FILLRECT=y | ||
| 1382 | CONFIG_FB_CFB_COPYAREA=y | ||
| 1383 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 1384 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1385 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1386 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1387 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1388 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1389 | # CONFIG_FB_SYS_FOPS is not set | ||
| 1390 | CONFIG_FB_DEFERRED_IO=y | ||
| 1391 | # CONFIG_FB_SVGALIB is not set | ||
| 1392 | # CONFIG_FB_MACMODES is not set | ||
| 1393 | # CONFIG_FB_BACKLIGHT is not set | ||
| 1394 | CONFIG_FB_MODE_HELPERS=y | ||
| 1395 | CONFIG_FB_TILEBLITTING=y | ||
| 1396 | |||
| 1397 | # | ||
| 1398 | # Frame buffer hardware drivers | ||
| 1399 | # | ||
| 1400 | # CONFIG_FB_CIRRUS is not set | ||
| 1401 | # CONFIG_FB_PM2 is not set | ||
| 1402 | # CONFIG_FB_CYBER2000 is not set | ||
| 1403 | # CONFIG_FB_ARC is not set | ||
| 1404 | # CONFIG_FB_ASILIANT is not set | ||
| 1405 | # CONFIG_FB_IMSTT is not set | ||
| 1406 | # CONFIG_FB_VGA16 is not set | ||
| 1407 | # CONFIG_FB_UVESA is not set | ||
| 1408 | # CONFIG_FB_VESA is not set | ||
| 1409 | CONFIG_FB_EFI=y | ||
| 1410 | # CONFIG_FB_IMAC is not set | ||
| 1411 | # CONFIG_FB_N411 is not set | ||
| 1412 | # CONFIG_FB_HGA is not set | ||
| 1413 | # CONFIG_FB_S1D13XXX is not set | ||
| 1414 | # CONFIG_FB_NVIDIA is not set | ||
| 1415 | # CONFIG_FB_RIVA is not set | ||
| 1416 | # CONFIG_FB_LE80578 is not set | ||
| 1417 | # CONFIG_FB_INTEL is not set | ||
| 1418 | # CONFIG_FB_MATROX is not set | ||
| 1419 | # CONFIG_FB_RADEON is not set | ||
| 1420 | # CONFIG_FB_ATY128 is not set | ||
| 1421 | # CONFIG_FB_ATY is not set | ||
| 1422 | # CONFIG_FB_S3 is not set | ||
| 1423 | # CONFIG_FB_SAVAGE is not set | ||
| 1424 | # CONFIG_FB_SIS is not set | ||
| 1425 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1426 | # CONFIG_FB_KYRO is not set | ||
| 1427 | # CONFIG_FB_3DFX is not set | ||
| 1428 | # CONFIG_FB_VOODOO1 is not set | ||
| 1429 | # CONFIG_FB_VT8623 is not set | ||
| 1430 | # CONFIG_FB_TRIDENT is not set | ||
| 1431 | # CONFIG_FB_ARK is not set | ||
| 1432 | # CONFIG_FB_PM3 is not set | ||
| 1433 | # CONFIG_FB_GEODE is not set | ||
| 1434 | # CONFIG_FB_VIRTUAL is not set | ||
| 1435 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1436 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
| 1437 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1438 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1439 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
| 936 | 1440 | ||
| 937 | # | 1441 | # |
| 938 | # Display device support | 1442 | # Display device support |
| 939 | # | 1443 | # |
| 940 | # CONFIG_DISPLAY_SUPPORT is not set | 1444 | # CONFIG_DISPLAY_SUPPORT is not set |
| 941 | # CONFIG_VGASTATE is not set | ||
| 942 | # CONFIG_FB is not set | ||
| 943 | 1445 | ||
| 944 | # | 1446 | # |
| 945 | # Console display driver support | 1447 | # Console display driver support |
| 946 | # | 1448 | # |
| 947 | CONFIG_VGA_CONSOLE=y | 1449 | CONFIG_VGA_CONSOLE=y |
| 948 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1450 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
| 949 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 | 1451 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
| 950 | CONFIG_VIDEO_SELECT=y | 1452 | CONFIG_VIDEO_SELECT=y |
| 951 | CONFIG_DUMMY_CONSOLE=y | 1453 | CONFIG_DUMMY_CONSOLE=y |
| 1454 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 1455 | CONFIG_LOGO=y | ||
| 1456 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 1457 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 1458 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 952 | 1459 | ||
| 953 | # | 1460 | # |
| 954 | # Sound | 1461 | # Sound |
| @@ -958,33 +1465,165 @@ CONFIG_SOUND=y | |||
| 958 | # | 1465 | # |
| 959 | # Advanced Linux Sound Architecture | 1466 | # Advanced Linux Sound Architecture |
| 960 | # | 1467 | # |
| 961 | # CONFIG_SND is not set | 1468 | CONFIG_SND=y |
| 1469 | CONFIG_SND_TIMER=y | ||
| 1470 | CONFIG_SND_PCM=y | ||
| 1471 | CONFIG_SND_HWDEP=y | ||
| 1472 | CONFIG_SND_SEQUENCER=y | ||
| 1473 | CONFIG_SND_SEQ_DUMMY=y | ||
| 1474 | CONFIG_SND_OSSEMUL=y | ||
| 1475 | CONFIG_SND_MIXER_OSS=y | ||
| 1476 | CONFIG_SND_PCM_OSS=y | ||
| 1477 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1478 | CONFIG_SND_SEQUENCER_OSS=y | ||
| 1479 | CONFIG_SND_DYNAMIC_MINORS=y | ||
| 1480 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1481 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1482 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1483 | # CONFIG_SND_DEBUG is not set | ||
| 1484 | CONFIG_SND_VMASTER=y | ||
| 1485 | |||
| 1486 | # | ||
| 1487 | # Generic devices | ||
| 1488 | # | ||
| 1489 | # CONFIG_SND_PCSP is not set | ||
| 1490 | # CONFIG_SND_DUMMY is not set | ||
| 1491 | # CONFIG_SND_VIRMIDI is not set | ||
| 1492 | # CONFIG_SND_MTPAV is not set | ||
| 1493 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1494 | # CONFIG_SND_MPU401 is not set | ||
| 1495 | |||
| 1496 | # | ||
| 1497 | # PCI devices | ||
| 1498 | # | ||
| 1499 | # CONFIG_SND_AD1889 is not set | ||
| 1500 | # CONFIG_SND_ALS300 is not set | ||
| 1501 | # CONFIG_SND_ALS4000 is not set | ||
| 1502 | # CONFIG_SND_ALI5451 is not set | ||
| 1503 | # CONFIG_SND_ATIIXP is not set | ||
| 1504 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1505 | # CONFIG_SND_AU8810 is not set | ||
| 1506 | # CONFIG_SND_AU8820 is not set | ||
| 1507 | # CONFIG_SND_AU8830 is not set | ||
| 1508 | # CONFIG_SND_AW2 is not set | ||
| 1509 | # CONFIG_SND_AZT3328 is not set | ||
| 1510 | # CONFIG_SND_BT87X is not set | ||
| 1511 | # CONFIG_SND_CA0106 is not set | ||
| 1512 | # CONFIG_SND_CMIPCI is not set | ||
| 1513 | # CONFIG_SND_OXYGEN is not set | ||
| 1514 | # CONFIG_SND_CS4281 is not set | ||
| 1515 | # CONFIG_SND_CS46XX is not set | ||
| 1516 | # CONFIG_SND_CS5530 is not set | ||
| 1517 | # CONFIG_SND_DARLA20 is not set | ||
| 1518 | # CONFIG_SND_GINA20 is not set | ||
| 1519 | # CONFIG_SND_LAYLA20 is not set | ||
| 1520 | # CONFIG_SND_DARLA24 is not set | ||
| 1521 | # CONFIG_SND_GINA24 is not set | ||
| 1522 | # CONFIG_SND_LAYLA24 is not set | ||
| 1523 | # CONFIG_SND_MONA is not set | ||
| 1524 | # CONFIG_SND_MIA is not set | ||
| 1525 | # CONFIG_SND_ECHO3G is not set | ||
| 1526 | # CONFIG_SND_INDIGO is not set | ||
| 1527 | # CONFIG_SND_INDIGOIO is not set | ||
| 1528 | # CONFIG_SND_INDIGODJ is not set | ||
| 1529 | # CONFIG_SND_EMU10K1 is not set | ||
| 1530 | # CONFIG_SND_EMU10K1X is not set | ||
| 1531 | # CONFIG_SND_ENS1370 is not set | ||
| 1532 | # CONFIG_SND_ENS1371 is not set | ||
| 1533 | # CONFIG_SND_ES1938 is not set | ||
| 1534 | # CONFIG_SND_ES1968 is not set | ||
| 1535 | # CONFIG_SND_FM801 is not set | ||
| 1536 | CONFIG_SND_HDA_INTEL=y | ||
| 1537 | CONFIG_SND_HDA_HWDEP=y | ||
| 1538 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
| 1539 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
| 1540 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
| 1541 | CONFIG_SND_HDA_CODEC_VIA=y | ||
| 1542 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
| 1543 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
| 1544 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
| 1545 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
| 1546 | CONFIG_SND_HDA_GENERIC=y | ||
| 1547 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
| 1548 | # CONFIG_SND_HDSP is not set | ||
| 1549 | # CONFIG_SND_HDSPM is not set | ||
| 1550 | # CONFIG_SND_HIFIER is not set | ||
| 1551 | # CONFIG_SND_ICE1712 is not set | ||
| 1552 | # CONFIG_SND_ICE1724 is not set | ||
| 1553 | # CONFIG_SND_INTEL8X0 is not set | ||
| 1554 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1555 | # CONFIG_SND_KORG1212 is not set | ||
| 1556 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1557 | # CONFIG_SND_MIXART is not set | ||
| 1558 | # CONFIG_SND_NM256 is not set | ||
| 1559 | # CONFIG_SND_PCXHR is not set | ||
| 1560 | # CONFIG_SND_RIPTIDE is not set | ||
| 1561 | # CONFIG_SND_RME32 is not set | ||
| 1562 | # CONFIG_SND_RME96 is not set | ||
| 1563 | # CONFIG_SND_RME9652 is not set | ||
| 1564 | # CONFIG_SND_SONICVIBES is not set | ||
| 1565 | # CONFIG_SND_TRIDENT is not set | ||
| 1566 | # CONFIG_SND_VIA82XX is not set | ||
| 1567 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1568 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1569 | # CONFIG_SND_VX222 is not set | ||
| 1570 | # CONFIG_SND_YMFPCI is not set | ||
| 1571 | |||
| 1572 | # | ||
| 1573 | # USB devices | ||
| 1574 | # | ||
| 1575 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1576 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1577 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1578 | |||
| 1579 | # | ||
| 1580 | # PCMCIA devices | ||
| 1581 | # | ||
| 1582 | # CONFIG_SND_VXPOCKET is not set | ||
| 1583 | # CONFIG_SND_PDAUDIOCF is not set | ||
| 1584 | |||
| 1585 | # | ||
| 1586 | # System on Chip audio support | ||
| 1587 | # | ||
| 1588 | # 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 | # | ||
| 962 | 1597 | ||
| 963 | # | 1598 | # |
| 964 | # Open Sound System | 1599 | # Open Sound System |
| 965 | # | 1600 | # |
| 966 | CONFIG_SOUND_PRIME=y | 1601 | # CONFIG_SOUND_PRIME is not set |
| 967 | # CONFIG_SOUND_TRIDENT is not set | ||
| 968 | # CONFIG_SOUND_MSNDCLAS is not set | ||
| 969 | # CONFIG_SOUND_MSNDPIN is not set | ||
| 970 | # CONFIG_SOUND_OSS is not set | ||
| 971 | CONFIG_HID_SUPPORT=y | 1602 | CONFIG_HID_SUPPORT=y |
| 972 | CONFIG_HID=y | 1603 | CONFIG_HID=y |
| 973 | # CONFIG_HID_DEBUG is not set | 1604 | CONFIG_HID_DEBUG=y |
| 1605 | CONFIG_HIDRAW=y | ||
| 974 | 1606 | ||
| 975 | # | 1607 | # |
| 976 | # USB Input Devices | 1608 | # USB Input Devices |
| 977 | # | 1609 | # |
| 978 | CONFIG_USB_HID=y | 1610 | CONFIG_USB_HID=y |
| 979 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1611 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 980 | # CONFIG_HID_FF is not set | 1612 | CONFIG_HID_FF=y |
| 981 | # CONFIG_USB_HIDDEV is not set | 1613 | CONFIG_HID_PID=y |
| 1614 | CONFIG_LOGITECH_FF=y | ||
| 1615 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1616 | CONFIG_PANTHERLORD_FF=y | ||
| 1617 | CONFIG_THRUSTMASTER_FF=y | ||
| 1618 | CONFIG_ZEROPLUS_FF=y | ||
| 1619 | CONFIG_USB_HIDDEV=y | ||
| 982 | CONFIG_USB_SUPPORT=y | 1620 | CONFIG_USB_SUPPORT=y |
| 983 | CONFIG_USB_ARCH_HAS_HCD=y | 1621 | CONFIG_USB_ARCH_HAS_HCD=y |
| 984 | CONFIG_USB_ARCH_HAS_OHCI=y | 1622 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 985 | CONFIG_USB_ARCH_HAS_EHCI=y | 1623 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 986 | CONFIG_USB=y | 1624 | CONFIG_USB=y |
| 987 | # CONFIG_USB_DEBUG is not set | 1625 | CONFIG_USB_DEBUG=y |
| 1626 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 988 | 1627 | ||
| 989 | # | 1628 | # |
| 990 | # Miscellaneous USB options | 1629 | # Miscellaneous USB options |
| @@ -992,18 +1631,18 @@ CONFIG_USB=y | |||
| 992 | CONFIG_USB_DEVICEFS=y | 1631 | CONFIG_USB_DEVICEFS=y |
| 993 | # CONFIG_USB_DEVICE_CLASS is not set | 1632 | # CONFIG_USB_DEVICE_CLASS is not set |
| 994 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1633 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 995 | # CONFIG_USB_SUSPEND is not set | 1634 | CONFIG_USB_SUSPEND=y |
| 996 | # CONFIG_USB_PERSIST is not set | ||
| 997 | # CONFIG_USB_OTG is not set | 1635 | # CONFIG_USB_OTG is not set |
| 998 | 1636 | ||
| 999 | # | 1637 | # |
| 1000 | # USB Host Controller Drivers | 1638 | # USB Host Controller Drivers |
| 1001 | # | 1639 | # |
| 1640 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1002 | CONFIG_USB_EHCI_HCD=y | 1641 | CONFIG_USB_EHCI_HCD=y |
| 1003 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1004 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1642 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1005 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1643 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1006 | # CONFIG_USB_ISP116X_HCD is not set | 1644 | # CONFIG_USB_ISP116X_HCD is not set |
| 1645 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1007 | CONFIG_USB_OHCI_HCD=y | 1646 | CONFIG_USB_OHCI_HCD=y |
| 1008 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1647 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1009 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1648 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -1036,8 +1675,10 @@ CONFIG_USB_STORAGE=y | |||
| 1036 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1675 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1037 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1676 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1038 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1677 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1678 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1679 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1040 | # CONFIG_USB_LIBUSUAL is not set | 1680 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1681 | CONFIG_USB_LIBUSUAL=y | ||
| 1041 | 1682 | ||
| 1042 | # | 1683 | # |
| 1043 | # USB Imaging devices | 1684 | # USB Imaging devices |
| @@ -1049,10 +1690,6 @@ CONFIG_USB_MON=y | |||
| 1049 | # | 1690 | # |
| 1050 | # USB port drivers | 1691 | # USB port drivers |
| 1051 | # | 1692 | # |
| 1052 | |||
| 1053 | # | ||
| 1054 | # USB Serial Converter support | ||
| 1055 | # | ||
| 1056 | # CONFIG_USB_SERIAL is not set | 1693 | # CONFIG_USB_SERIAL is not set |
| 1057 | 1694 | ||
| 1058 | # | 1695 | # |
| @@ -1078,98 +1715,126 @@ CONFIG_USB_MON=y | |||
| 1078 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1715 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1079 | # CONFIG_USB_IOWARRIOR is not set | 1716 | # CONFIG_USB_IOWARRIOR is not set |
| 1080 | # CONFIG_USB_TEST is not set | 1717 | # CONFIG_USB_TEST is not set |
| 1718 | # CONFIG_USB_GADGET is not set | ||
| 1719 | # CONFIG_MMC is not set | ||
| 1720 | # CONFIG_MEMSTICK is not set | ||
| 1721 | CONFIG_NEW_LEDS=y | ||
| 1722 | CONFIG_LEDS_CLASS=y | ||
| 1081 | 1723 | ||
| 1082 | # | 1724 | # |
| 1083 | # USB DSL modem support | 1725 | # LED drivers |
| 1084 | # | 1726 | # |
| 1727 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
| 1085 | 1728 | ||
| 1086 | # | 1729 | # |
| 1087 | # USB Gadget Support | 1730 | # LED Triggers |
| 1088 | # | 1731 | # |
| 1089 | # CONFIG_USB_GADGET is not set | 1732 | CONFIG_LEDS_TRIGGERS=y |
| 1090 | # CONFIG_MMC is not set | 1733 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1734 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 1735 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1736 | # CONFIG_ACCESSIBILITY is not set | ||
| 1737 | # CONFIG_INFINIBAND is not set | ||
| 1738 | CONFIG_EDAC=y | ||
| 1091 | 1739 | ||
| 1092 | # | 1740 | # |
| 1093 | # LED devices | 1741 | # Reporting subsystems |
| 1094 | # | 1742 | # |
| 1095 | # CONFIG_NEW_LEDS is not set | 1743 | # CONFIG_EDAC_DEBUG is not set |
| 1744 | # CONFIG_EDAC_MM_EDAC is not set | ||
| 1745 | CONFIG_RTC_LIB=y | ||
| 1746 | CONFIG_RTC_CLASS=y | ||
| 1747 | # CONFIG_RTC_HCTOSYS is not set | ||
| 1748 | # CONFIG_RTC_DEBUG is not set | ||
| 1096 | 1749 | ||
| 1097 | # | 1750 | # |
| 1098 | # LED drivers | 1751 | # RTC interfaces |
| 1099 | # | 1752 | # |
| 1753 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1754 | CONFIG_RTC_INTF_PROC=y | ||
| 1755 | CONFIG_RTC_INTF_DEV=y | ||
| 1756 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1757 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1100 | 1758 | ||
| 1101 | # | 1759 | # |
| 1102 | # LED Triggers | 1760 | # I2C RTC drivers |
| 1103 | # | 1761 | # |
| 1104 | # CONFIG_INFINIBAND is not set | 1762 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1105 | # CONFIG_EDAC is not set | 1763 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1764 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1765 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1766 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1767 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1768 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1769 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1770 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1771 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1772 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1106 | 1773 | ||
| 1107 | # | 1774 | # |
| 1108 | # Real Time Clock | 1775 | # SPI RTC drivers |
| 1109 | # | 1776 | # |
| 1110 | # CONFIG_RTC_CLASS is not set | ||
| 1111 | 1777 | ||
| 1112 | # | 1778 | # |
| 1113 | # DMA Engine support | 1779 | # Platform RTC drivers |
| 1114 | # | 1780 | # |
| 1115 | # CONFIG_DMA_ENGINE is not set | 1781 | CONFIG_RTC_DRV_CMOS=y |
| 1782 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1783 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1784 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1785 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1786 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1787 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1788 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1116 | 1789 | ||
| 1117 | # | 1790 | # |
| 1118 | # DMA Clients | 1791 | # on-CPU RTC drivers |
| 1119 | # | 1792 | # |
| 1793 | CONFIG_DMADEVICES=y | ||
| 1120 | 1794 | ||
| 1121 | # | 1795 | # |
| 1122 | # DMA Devices | 1796 | # DMA Devices |
| 1123 | # | 1797 | # |
| 1124 | CONFIG_VIRTUALIZATION=y | 1798 | # CONFIG_INTEL_IOATDMA is not set |
| 1125 | # CONFIG_KVM is not set | ||
| 1126 | |||
| 1127 | # | ||
| 1128 | # Userspace I/O | ||
| 1129 | # | ||
| 1130 | # CONFIG_UIO is not set | 1799 | # CONFIG_UIO is not set |
| 1131 | 1800 | ||
| 1132 | # | 1801 | # |
| 1133 | # Firmware Drivers | 1802 | # Firmware Drivers |
| 1134 | # | 1803 | # |
| 1135 | # CONFIG_EDD is not set | 1804 | # CONFIG_EDD is not set |
| 1805 | CONFIG_EFI_VARS=y | ||
| 1136 | # CONFIG_DELL_RBU is not set | 1806 | # CONFIG_DELL_RBU is not set |
| 1137 | # CONFIG_DCDBAS is not set | 1807 | # CONFIG_DCDBAS is not set |
| 1138 | CONFIG_DMIID=y | 1808 | CONFIG_DMIID=y |
| 1809 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
| 1139 | 1810 | ||
| 1140 | # | 1811 | # |
| 1141 | # File systems | 1812 | # File systems |
| 1142 | # | 1813 | # |
| 1143 | CONFIG_EXT2_FS=y | 1814 | # CONFIG_EXT2_FS is not set |
| 1144 | CONFIG_EXT2_FS_XATTR=y | ||
| 1145 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 1146 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 1147 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1148 | CONFIG_EXT3_FS=y | 1815 | CONFIG_EXT3_FS=y |
| 1149 | CONFIG_EXT3_FS_XATTR=y | 1816 | CONFIG_EXT3_FS_XATTR=y |
| 1150 | CONFIG_EXT3_FS_POSIX_ACL=y | 1817 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1151 | # CONFIG_EXT3_FS_SECURITY is not set | 1818 | CONFIG_EXT3_FS_SECURITY=y |
| 1152 | # CONFIG_EXT4DEV_FS is not set | 1819 | # CONFIG_EXT4DEV_FS is not set |
| 1153 | CONFIG_JBD=y | 1820 | CONFIG_JBD=y |
| 1154 | # CONFIG_JBD_DEBUG is not set | 1821 | # CONFIG_JBD_DEBUG is not set |
| 1155 | CONFIG_FS_MBCACHE=y | 1822 | CONFIG_FS_MBCACHE=y |
| 1156 | CONFIG_REISERFS_FS=y | 1823 | # CONFIG_REISERFS_FS is not set |
| 1157 | # CONFIG_REISERFS_CHECK is not set | ||
| 1158 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 1159 | CONFIG_REISERFS_FS_XATTR=y | ||
| 1160 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 1161 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
| 1162 | # CONFIG_JFS_FS is not set | 1824 | # CONFIG_JFS_FS is not set |
| 1163 | CONFIG_FS_POSIX_ACL=y | 1825 | CONFIG_FS_POSIX_ACL=y |
| 1164 | # CONFIG_XFS_FS is not set | 1826 | # CONFIG_XFS_FS is not set |
| 1165 | # CONFIG_GFS2_FS is not set | 1827 | # CONFIG_GFS2_FS is not set |
| 1166 | # CONFIG_OCFS2_FS is not set | 1828 | # CONFIG_OCFS2_FS is not set |
| 1167 | # CONFIG_MINIX_FS is not set | 1829 | CONFIG_DNOTIFY=y |
| 1168 | # CONFIG_ROMFS_FS is not set | ||
| 1169 | CONFIG_INOTIFY=y | 1830 | CONFIG_INOTIFY=y |
| 1170 | CONFIG_INOTIFY_USER=y | 1831 | CONFIG_INOTIFY_USER=y |
| 1171 | # CONFIG_QUOTA is not set | 1832 | CONFIG_QUOTA=y |
| 1172 | CONFIG_DNOTIFY=y | 1833 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 1834 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 1835 | # CONFIG_QFMT_V1 is not set | ||
| 1836 | CONFIG_QFMT_V2=y | ||
| 1837 | CONFIG_QUOTACTL=y | ||
| 1173 | # CONFIG_AUTOFS_FS is not set | 1838 | # CONFIG_AUTOFS_FS is not set |
| 1174 | CONFIG_AUTOFS4_FS=y | 1839 | CONFIG_AUTOFS4_FS=y |
| 1175 | # CONFIG_FUSE_FS is not set | 1840 | # CONFIG_FUSE_FS is not set |
| @@ -1180,7 +1845,7 @@ CONFIG_GENERIC_ACL=y | |||
| 1180 | # | 1845 | # |
| 1181 | CONFIG_ISO9660_FS=y | 1846 | CONFIG_ISO9660_FS=y |
| 1182 | CONFIG_JOLIET=y | 1847 | CONFIG_JOLIET=y |
| 1183 | # CONFIG_ZISOFS is not set | 1848 | CONFIG_ZISOFS=y |
| 1184 | # CONFIG_UDF_FS is not set | 1849 | # CONFIG_UDF_FS is not set |
| 1185 | 1850 | ||
| 1186 | # | 1851 | # |
| @@ -1198,13 +1863,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1198 | # | 1863 | # |
| 1199 | CONFIG_PROC_FS=y | 1864 | CONFIG_PROC_FS=y |
| 1200 | CONFIG_PROC_KCORE=y | 1865 | CONFIG_PROC_KCORE=y |
| 1866 | CONFIG_PROC_VMCORE=y | ||
| 1201 | CONFIG_PROC_SYSCTL=y | 1867 | CONFIG_PROC_SYSCTL=y |
| 1202 | CONFIG_SYSFS=y | 1868 | CONFIG_SYSFS=y |
| 1203 | CONFIG_TMPFS=y | 1869 | CONFIG_TMPFS=y |
| 1204 | CONFIG_TMPFS_POSIX_ACL=y | 1870 | CONFIG_TMPFS_POSIX_ACL=y |
| 1205 | CONFIG_HUGETLBFS=y | 1871 | CONFIG_HUGETLBFS=y |
| 1206 | CONFIG_HUGETLB_PAGE=y | 1872 | CONFIG_HUGETLB_PAGE=y |
| 1207 | CONFIG_RAMFS=y | ||
| 1208 | # CONFIG_CONFIGFS_FS is not set | 1873 | # CONFIG_CONFIGFS_FS is not set |
| 1209 | 1874 | ||
| 1210 | # | 1875 | # |
| @@ -1212,6 +1877,7 @@ CONFIG_RAMFS=y | |||
| 1212 | # | 1877 | # |
| 1213 | # CONFIG_ADFS_FS is not set | 1878 | # CONFIG_ADFS_FS is not set |
| 1214 | # CONFIG_AFFS_FS is not set | 1879 | # CONFIG_AFFS_FS is not set |
| 1880 | # CONFIG_ECRYPT_FS is not set | ||
| 1215 | # CONFIG_HFS_FS is not set | 1881 | # CONFIG_HFS_FS is not set |
| 1216 | # CONFIG_HFSPLUS_FS is not set | 1882 | # CONFIG_HFSPLUS_FS is not set |
| 1217 | # CONFIG_BEFS_FS is not set | 1883 | # CONFIG_BEFS_FS is not set |
| @@ -1219,33 +1885,15 @@ CONFIG_RAMFS=y | |||
| 1219 | # CONFIG_EFS_FS is not set | 1885 | # CONFIG_EFS_FS is not set |
| 1220 | # CONFIG_CRAMFS is not set | 1886 | # CONFIG_CRAMFS is not set |
| 1221 | # CONFIG_VXFS_FS is not set | 1887 | # CONFIG_VXFS_FS is not set |
| 1888 | # CONFIG_MINIX_FS is not set | ||
| 1222 | # CONFIG_HPFS_FS is not set | 1889 | # CONFIG_HPFS_FS is not set |
| 1223 | # CONFIG_QNX4FS_FS is not set | 1890 | # CONFIG_QNX4FS_FS is not set |
| 1891 | # CONFIG_ROMFS_FS is not set | ||
| 1224 | # CONFIG_SYSV_FS is not set | 1892 | # CONFIG_SYSV_FS is not set |
| 1225 | # CONFIG_UFS_FS is not set | 1893 | # CONFIG_UFS_FS is not set |
| 1226 | 1894 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1227 | # | 1895 | # CONFIG_NFS_FS is not set |
| 1228 | # Network File Systems | 1896 | # CONFIG_NFSD is not set |
| 1229 | # | ||
| 1230 | CONFIG_NFS_FS=y | ||
| 1231 | CONFIG_NFS_V3=y | ||
| 1232 | # CONFIG_NFS_V3_ACL is not set | ||
| 1233 | # CONFIG_NFS_V4 is not set | ||
| 1234 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1235 | CONFIG_NFSD=y | ||
| 1236 | CONFIG_NFSD_V3=y | ||
| 1237 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1238 | # CONFIG_NFSD_V4 is not set | ||
| 1239 | CONFIG_NFSD_TCP=y | ||
| 1240 | CONFIG_ROOT_NFS=y | ||
| 1241 | CONFIG_LOCKD=y | ||
| 1242 | CONFIG_LOCKD_V4=y | ||
| 1243 | CONFIG_EXPORTFS=y | ||
| 1244 | CONFIG_NFS_COMMON=y | ||
| 1245 | CONFIG_SUNRPC=y | ||
| 1246 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1247 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1248 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1249 | # CONFIG_SMB_FS is not set | 1897 | # CONFIG_SMB_FS is not set |
| 1250 | # CONFIG_CIFS is not set | 1898 | # CONFIG_CIFS is not set |
| 1251 | # CONFIG_NCP_FS is not set | 1899 | # CONFIG_NCP_FS is not set |
| @@ -1255,14 +1903,26 @@ CONFIG_SUNRPC=y | |||
| 1255 | # | 1903 | # |
| 1256 | # Partition Types | 1904 | # Partition Types |
| 1257 | # | 1905 | # |
| 1258 | # CONFIG_PARTITION_ADVANCED is not set | 1906 | CONFIG_PARTITION_ADVANCED=y |
| 1907 | # CONFIG_ACORN_PARTITION is not set | ||
| 1908 | CONFIG_OSF_PARTITION=y | ||
| 1909 | CONFIG_AMIGA_PARTITION=y | ||
| 1910 | # CONFIG_ATARI_PARTITION is not set | ||
| 1911 | CONFIG_MAC_PARTITION=y | ||
| 1259 | CONFIG_MSDOS_PARTITION=y | 1912 | CONFIG_MSDOS_PARTITION=y |
| 1260 | 1913 | CONFIG_BSD_DISKLABEL=y | |
| 1261 | # | 1914 | CONFIG_MINIX_SUBPARTITION=y |
| 1262 | # Native Language Support | 1915 | CONFIG_SOLARIS_X86_PARTITION=y |
| 1263 | # | 1916 | CONFIG_UNIXWARE_DISKLABEL=y |
| 1917 | # CONFIG_LDM_PARTITION is not set | ||
| 1918 | CONFIG_SGI_PARTITION=y | ||
| 1919 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1920 | CONFIG_SUN_PARTITION=y | ||
| 1921 | CONFIG_KARMA_PARTITION=y | ||
| 1922 | CONFIG_EFI_PARTITION=y | ||
| 1923 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1264 | CONFIG_NLS=y | 1924 | CONFIG_NLS=y |
| 1265 | CONFIG_NLS_DEFAULT="iso8859-1" | 1925 | CONFIG_NLS_DEFAULT="utf8" |
| 1266 | CONFIG_NLS_CODEPAGE_437=y | 1926 | CONFIG_NLS_CODEPAGE_437=y |
| 1267 | # CONFIG_NLS_CODEPAGE_737 is not set | 1927 | # CONFIG_NLS_CODEPAGE_737 is not set |
| 1268 | # CONFIG_NLS_CODEPAGE_775 is not set | 1928 | # CONFIG_NLS_CODEPAGE_775 is not set |
| @@ -1297,40 +1957,33 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1297 | # CONFIG_NLS_ISO8859_9 is not set | 1957 | # CONFIG_NLS_ISO8859_9 is not set |
| 1298 | # CONFIG_NLS_ISO8859_13 is not set | 1958 | # CONFIG_NLS_ISO8859_13 is not set |
| 1299 | # CONFIG_NLS_ISO8859_14 is not set | 1959 | # CONFIG_NLS_ISO8859_14 is not set |
| 1300 | CONFIG_NLS_ISO8859_15=y | 1960 | # CONFIG_NLS_ISO8859_15 is not set |
| 1301 | # CONFIG_NLS_KOI8_R is not set | 1961 | # CONFIG_NLS_KOI8_R is not set |
| 1302 | # CONFIG_NLS_KOI8_U is not set | 1962 | # CONFIG_NLS_KOI8_U is not set |
| 1303 | CONFIG_NLS_UTF8=y | 1963 | CONFIG_NLS_UTF8=y |
| 1304 | |||
| 1305 | # | ||
| 1306 | # Distributed Lock Manager | ||
| 1307 | # | ||
| 1308 | # CONFIG_DLM is not set | 1964 | # CONFIG_DLM is not set |
| 1309 | 1965 | ||
| 1310 | # | 1966 | # |
| 1311 | # Instrumentation Support | ||
| 1312 | # | ||
| 1313 | CONFIG_PROFILING=y | ||
| 1314 | CONFIG_OPROFILE=y | ||
| 1315 | CONFIG_KPROBES=y | ||
| 1316 | |||
| 1317 | # | ||
| 1318 | # Kernel hacking | 1967 | # Kernel hacking |
| 1319 | # | 1968 | # |
| 1320 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1969 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1321 | # CONFIG_PRINTK_TIME is not set | 1970 | # CONFIG_PRINTK_TIME is not set |
| 1971 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1322 | # CONFIG_ENABLE_MUST_CHECK is not set | 1972 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1973 | CONFIG_FRAME_WARN=2048 | ||
| 1323 | CONFIG_MAGIC_SYSRQ=y | 1974 | CONFIG_MAGIC_SYSRQ=y |
| 1324 | CONFIG_UNUSED_SYMBOLS=y | 1975 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1325 | CONFIG_DEBUG_FS=y | 1976 | CONFIG_DEBUG_FS=y |
| 1326 | # CONFIG_HEADERS_CHECK is not set | 1977 | # CONFIG_HEADERS_CHECK is not set |
| 1327 | CONFIG_DEBUG_KERNEL=y | 1978 | CONFIG_DEBUG_KERNEL=y |
| 1328 | # CONFIG_DEBUG_SHIRQ is not set | 1979 | # CONFIG_DEBUG_SHIRQ is not set |
| 1329 | CONFIG_DETECT_SOFTLOCKUP=y | 1980 | # CONFIG_DETECT_SOFTLOCKUP is not set |
| 1330 | # CONFIG_SCHED_DEBUG is not set | 1981 | # CONFIG_SCHED_DEBUG is not set |
| 1331 | # CONFIG_SCHEDSTATS is not set | 1982 | CONFIG_SCHEDSTATS=y |
| 1332 | CONFIG_TIMER_STATS=y | 1983 | CONFIG_TIMER_STATS=y |
| 1333 | # CONFIG_DEBUG_SLAB is not set | 1984 | # CONFIG_DEBUG_OBJECTS is not set |
| 1985 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1986 | # CONFIG_SLUB_STATS is not set | ||
| 1334 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1987 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1335 | # CONFIG_RT_MUTEX_TESTER is not set | 1988 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1336 | # CONFIG_DEBUG_SPINLOCK is not set | 1989 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1344,28 +1997,162 @@ CONFIG_TIMER_STATS=y | |||
| 1344 | CONFIG_DEBUG_BUGVERBOSE=y | 1997 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1345 | # CONFIG_DEBUG_INFO is not set | 1998 | # CONFIG_DEBUG_INFO is not set |
| 1346 | # CONFIG_DEBUG_VM is not set | 1999 | # CONFIG_DEBUG_VM is not set |
| 2000 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1347 | # CONFIG_DEBUG_LIST is not set | 2001 | # CONFIG_DEBUG_LIST is not set |
| 1348 | # CONFIG_FRAME_POINTER is not set | 2002 | # CONFIG_DEBUG_SG is not set |
| 1349 | CONFIG_OPTIMIZE_INLINING=y | 2003 | CONFIG_FRAME_POINTER=y |
| 2004 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1350 | # CONFIG_RCU_TORTURE_TEST is not set | 2005 | # CONFIG_RCU_TORTURE_TEST is not set |
| 2006 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 2007 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1351 | # CONFIG_LKDTM is not set | 2008 | # CONFIG_LKDTM is not set |
| 1352 | # CONFIG_FAULT_INJECTION is not set | 2009 | # CONFIG_FAULT_INJECTION is not set |
| 1353 | # CONFIG_DEBUG_RODATA is not set | 2010 | # CONFIG_LATENCYTOP is not set |
| 1354 | # CONFIG_IOMMU_DEBUG is not set | 2011 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
| 2012 | # CONFIG_SAMPLES is not set | ||
| 2013 | # CONFIG_KGDB is not set | ||
| 2014 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 2015 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
| 2016 | CONFIG_EARLY_PRINTK=y | ||
| 1355 | CONFIG_DEBUG_STACKOVERFLOW=y | 2017 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1356 | # CONFIG_DEBUG_STACK_USAGE is not set | 2018 | CONFIG_DEBUG_STACK_USAGE=y |
| 2019 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 2020 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||
| 2021 | # CONFIG_X86_PTDUMP is not set | ||
| 2022 | CONFIG_DEBUG_RODATA=y | ||
| 2023 | # CONFIG_DIRECT_GBPAGES is not set | ||
| 2024 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
| 2025 | CONFIG_DEBUG_NX_TEST=m | ||
| 2026 | CONFIG_X86_MPPARSE=y | ||
| 2027 | # CONFIG_IOMMU_DEBUG is not set | ||
| 2028 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
| 2029 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
| 2030 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
| 2031 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
| 2032 | CONFIG_IO_DELAY_0X80=y | ||
| 2033 | # CONFIG_IO_DELAY_0XED is not set | ||
| 2034 | # CONFIG_IO_DELAY_UDELAY is not set | ||
| 2035 | # CONFIG_IO_DELAY_NONE is not set | ||
| 2036 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
| 2037 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
| 2038 | # CONFIG_CPA_DEBUG is not set | ||
| 1357 | 2039 | ||
| 1358 | # | 2040 | # |
| 1359 | # Security options | 2041 | # Security options |
| 1360 | # | 2042 | # |
| 1361 | # CONFIG_KEYS is not set | 2043 | CONFIG_KEYS=y |
| 1362 | # CONFIG_SECURITY is not set | 2044 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1363 | # CONFIG_CRYPTO is not set | 2045 | CONFIG_SECURITY=y |
| 2046 | CONFIG_SECURITY_NETWORK=y | ||
| 2047 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
| 2048 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2049 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 2050 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 2051 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
| 2052 | CONFIG_SECURITY_SELINUX=y | ||
| 2053 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
| 2054 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
| 2055 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
| 2056 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
| 2057 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
| 2058 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
| 2059 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
| 2060 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
| 2061 | # CONFIG_SECURITY_SMACK is not set | ||
| 2062 | CONFIG_CRYPTO=y | ||
| 2063 | |||
| 2064 | # | ||
| 2065 | # Crypto core or helper | ||
| 2066 | # | ||
| 2067 | CONFIG_CRYPTO_ALGAPI=y | ||
| 2068 | CONFIG_CRYPTO_AEAD=y | ||
| 2069 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 2070 | CONFIG_CRYPTO_HASH=y | ||
| 2071 | CONFIG_CRYPTO_MANAGER=y | ||
| 2072 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 2073 | # CONFIG_CRYPTO_NULL is not set | ||
| 2074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 2075 | CONFIG_CRYPTO_AUTHENC=y | ||
| 2076 | # CONFIG_CRYPTO_TEST is not set | ||
| 2077 | |||
| 2078 | # | ||
| 2079 | # Authenticated Encryption with Associated Data | ||
| 2080 | # | ||
| 2081 | # CONFIG_CRYPTO_CCM is not set | ||
| 2082 | # CONFIG_CRYPTO_GCM is not set | ||
| 2083 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 2084 | |||
| 2085 | # | ||
| 2086 | # Block modes | ||
| 2087 | # | ||
| 2088 | CONFIG_CRYPTO_CBC=y | ||
| 2089 | # CONFIG_CRYPTO_CTR is not set | ||
| 2090 | # CONFIG_CRYPTO_CTS is not set | ||
| 2091 | CONFIG_CRYPTO_ECB=y | ||
| 2092 | # CONFIG_CRYPTO_LRW is not set | ||
| 2093 | # CONFIG_CRYPTO_PCBC is not set | ||
| 2094 | # CONFIG_CRYPTO_XTS is not set | ||
| 2095 | |||
| 2096 | # | ||
| 2097 | # Hash modes | ||
| 2098 | # | ||
| 2099 | CONFIG_CRYPTO_HMAC=y | ||
| 2100 | # CONFIG_CRYPTO_XCBC is not set | ||
| 2101 | |||
| 2102 | # | ||
| 2103 | # Digest | ||
| 2104 | # | ||
| 2105 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 2106 | # CONFIG_CRYPTO_MD4 is not set | ||
| 2107 | CONFIG_CRYPTO_MD5=y | ||
| 2108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 2109 | CONFIG_CRYPTO_SHA1=y | ||
| 2110 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 2111 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 2112 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 2113 | # CONFIG_CRYPTO_WP512 is not set | ||
| 2114 | |||
| 2115 | # | ||
| 2116 | # Ciphers | ||
| 2117 | # | ||
| 2118 | CONFIG_CRYPTO_AES=y | ||
| 2119 | # CONFIG_CRYPTO_AES_X86_64 is not set | ||
| 2120 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 2121 | CONFIG_CRYPTO_ARC4=y | ||
| 2122 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 2123 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 2124 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 2125 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 2126 | CONFIG_CRYPTO_DES=y | ||
| 2127 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 2128 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 2129 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 2130 | # CONFIG_CRYPTO_SALSA20_X86_64 is not set | ||
| 2131 | # CONFIG_CRYPTO_SEED is not set | ||
| 2132 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 2133 | # CONFIG_CRYPTO_TEA is not set | ||
| 2134 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 2135 | # CONFIG_CRYPTO_TWOFISH_X86_64 is not set | ||
| 2136 | |||
| 2137 | # | ||
| 2138 | # Compression | ||
| 2139 | # | ||
| 2140 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 2141 | # CONFIG_CRYPTO_LZO is not set | ||
| 2142 | CONFIG_CRYPTO_HW=y | ||
| 2143 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 2144 | CONFIG_HAVE_KVM=y | ||
| 2145 | CONFIG_VIRTUALIZATION=y | ||
| 2146 | # CONFIG_KVM is not set | ||
| 2147 | # CONFIG_VIRTIO_PCI is not set | ||
| 2148 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1364 | 2149 | ||
| 1365 | # | 2150 | # |
| 1366 | # Library routines | 2151 | # Library routines |
| 1367 | # | 2152 | # |
| 1368 | CONFIG_BITREVERSE=y | 2153 | CONFIG_BITREVERSE=y |
| 2154 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
| 2155 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 1369 | # CONFIG_CRC_CCITT is not set | 2156 | # CONFIG_CRC_CCITT is not set |
| 1370 | # CONFIG_CRC16 is not set | 2157 | # CONFIG_CRC16 is not set |
| 1371 | # CONFIG_CRC_ITU_T is not set | 2158 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index b5e329da166c..3aefbce2de48 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -370,13 +370,11 @@ quiet_ni_syscall: | |||
| 370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi | 370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi |
| 371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi | 371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi |
| 372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx | 372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx |
| 373 | PTREGSCALL stub32_sigsuspend, sys32_sigsuspend, %rcx | ||
| 374 | PTREGSCALL stub32_execve, sys32_execve, %rcx | 373 | PTREGSCALL stub32_execve, sys32_execve, %rcx |
| 375 | PTREGSCALL stub32_fork, sys_fork, %rdi | 374 | PTREGSCALL stub32_fork, sys_fork, %rdi |
| 376 | PTREGSCALL stub32_clone, sys32_clone, %rdx | 375 | PTREGSCALL stub32_clone, sys32_clone, %rdx |
| 377 | PTREGSCALL stub32_vfork, sys_vfork, %rdi | 376 | PTREGSCALL stub32_vfork, sys_vfork, %rdi |
| 378 | PTREGSCALL stub32_iopl, sys_iopl, %rsi | 377 | PTREGSCALL stub32_iopl, sys_iopl, %rsi |
| 379 | PTREGSCALL stub32_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
| 380 | 378 | ||
| 381 | ENTRY(ia32_ptregs_common) | 379 | ENTRY(ia32_ptregs_common) |
| 382 | popq %r11 | 380 | popq %r11 |
| @@ -476,7 +474,7 @@ ia32_sys_call_table: | |||
| 476 | .quad sys_ssetmask | 474 | .quad sys_ssetmask |
| 477 | .quad sys_setreuid16 /* 70 */ | 475 | .quad sys_setreuid16 /* 70 */ |
| 478 | .quad sys_setregid16 | 476 | .quad sys_setregid16 |
| 479 | .quad stub32_sigsuspend | 477 | .quad sys32_sigsuspend |
| 480 | .quad compat_sys_sigpending | 478 | .quad compat_sys_sigpending |
| 481 | .quad sys_sethostname | 479 | .quad sys_sethostname |
| 482 | .quad compat_sys_setrlimit /* 75 */ | 480 | .quad compat_sys_setrlimit /* 75 */ |
| @@ -583,7 +581,7 @@ ia32_sys_call_table: | |||
| 583 | .quad sys32_rt_sigpending | 581 | .quad sys32_rt_sigpending |
| 584 | .quad compat_sys_rt_sigtimedwait | 582 | .quad compat_sys_rt_sigtimedwait |
| 585 | .quad sys32_rt_sigqueueinfo | 583 | .quad sys32_rt_sigqueueinfo |
| 586 | .quad stub32_rt_sigsuspend | 584 | .quad sys_rt_sigsuspend |
| 587 | .quad sys32_pread /* 180 */ | 585 | .quad sys32_pread /* 180 */ |
| 588 | .quad sys32_pwrite | 586 | .quad sys32_pwrite |
| 589 | .quad sys_chown16 | 587 | .quad sys_chown16 |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 77807d4769c9..8a42b797cd6b 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -18,14 +18,13 @@ CFLAGS_tsc_64.o := $(nostackp) | |||
| 18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o | 18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o |
| 19 | obj-y += traps_$(BITS).o irq_$(BITS).o | 19 | obj-y += traps_$(BITS).o irq_$(BITS).o |
| 20 | obj-y += time_$(BITS).o ioport.o ldt.o | 20 | obj-y += time_$(BITS).o ioport.o ldt.o |
| 21 | obj-y += setup_$(BITS).o i8259_$(BITS).o setup.o | 21 | obj-y += setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o |
| 22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o | 22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o |
| 23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o | 23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |
| 24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o | 24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o |
| 25 | obj-y += bootflag.o e820_$(BITS).o | 25 | obj-y += bootflag.o e820_$(BITS).o |
| 26 | obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o | 26 | obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o |
| 27 | obj-y += alternative.o i8253.o pci-nommu.o | 27 | obj-y += alternative.o i8253.o pci-nommu.o |
| 28 | obj-$(CONFIG_X86_64) += bugs_64.o | ||
| 29 | obj-y += tsc_$(BITS).o io_delay.o rtc.o | 28 | obj-y += tsc_$(BITS).o io_delay.o rtc.o |
| 30 | 29 | ||
| 31 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o | 30 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o |
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S index f9b77fb37e5b..3355973b12ac 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.S +++ b/arch/x86/kernel/acpi/realmode/wakeup.S | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <asm/msr-index.h> | 5 | #include <asm/msr-index.h> |
| 6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
| 7 | #include <asm/pgtable.h> | 7 | #include <asm/pgtable.h> |
| 8 | #include <asm/processor-flags.h> | ||
| 8 | 9 | ||
| 9 | .code16 | 10 | .code16 |
| 10 | .section ".header", "a" | 11 | .section ".header", "a" |
| @@ -24,6 +25,11 @@ pmode_gdt: .quad 0 | |||
| 24 | realmode_flags: .long 0 | 25 | realmode_flags: .long 0 |
| 25 | real_magic: .long 0 | 26 | real_magic: .long 0 |
| 26 | trampoline_segment: .word 0 | 27 | trampoline_segment: .word 0 |
| 28 | _pad1: .byte 0 | ||
| 29 | wakeup_jmp: .byte 0xea /* ljmpw */ | ||
| 30 | wakeup_jmp_off: .word 3f | ||
| 31 | wakeup_jmp_seg: .word 0 | ||
| 32 | wakeup_gdt: .quad 0, 0, 0 | ||
| 27 | signature: .long 0x51ee1111 | 33 | signature: .long 0x51ee1111 |
| 28 | 34 | ||
| 29 | .text | 35 | .text |
| @@ -34,11 +40,34 @@ _start: | |||
| 34 | cli | 40 | cli |
| 35 | cld | 41 | cld |
| 36 | 42 | ||
| 43 | /* Apparently some dimwit BIOS programmers don't know how to | ||
| 44 | program a PM to RM transition, and we might end up here with | ||
| 45 | junk in the data segment descriptor registers. The only way | ||
| 46 | to repair that is to go into PM and fix it ourselves... */ | ||
| 47 | movw $16, %cx | ||
| 48 | lgdtl %cs:wakeup_gdt | ||
| 49 | movl %cr0, %eax | ||
| 50 | orb $X86_CR0_PE, %al | ||
| 51 | movl %eax, %cr0 | ||
| 52 | jmp 1f | ||
| 53 | 1: ljmpw $8, $2f | ||
| 54 | 2: | ||
| 55 | movw %cx, %ds | ||
| 56 | movw %cx, %es | ||
| 57 | movw %cx, %ss | ||
| 58 | movw %cx, %fs | ||
| 59 | movw %cx, %gs | ||
| 60 | |||
| 61 | andb $~X86_CR0_PE, %al | ||
| 62 | movl %eax, %cr0 | ||
| 63 | jmp wakeup_jmp | ||
| 64 | 3: | ||
| 37 | /* Set up segments */ | 65 | /* Set up segments */ |
| 38 | movw %cs, %ax | 66 | movw %cs, %ax |
| 39 | movw %ax, %ds | 67 | movw %ax, %ds |
| 40 | movw %ax, %es | 68 | movw %ax, %es |
| 41 | movw %ax, %ss | 69 | movw %ax, %ss |
| 70 | lidtl wakeup_idt | ||
| 42 | 71 | ||
| 43 | movl $wakeup_stack_end, %esp | 72 | movl $wakeup_stack_end, %esp |
| 44 | 73 | ||
| @@ -98,7 +127,14 @@ bogus_real_magic: | |||
| 98 | jmp 1b | 127 | jmp 1b |
| 99 | 128 | ||
| 100 | .data | 129 | .data |
| 101 | .balign 4 | 130 | .balign 8 |
| 131 | |||
| 132 | /* This is the standard real-mode IDT */ | ||
| 133 | wakeup_idt: | ||
| 134 | .word 0xffff /* limit */ | ||
| 135 | .long 0 /* address */ | ||
| 136 | .word 0 | ||
| 137 | |||
| 102 | .globl HEAP, heap_end | 138 | .globl HEAP, heap_end |
| 103 | HEAP: | 139 | HEAP: |
| 104 | .long wakeup_heap | 140 | .long wakeup_heap |
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.h b/arch/x86/kernel/acpi/realmode/wakeup.h index ef8166fe8020..69d38d0b2b64 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.h +++ b/arch/x86/kernel/acpi/realmode/wakeup.h | |||
| @@ -24,6 +24,11 @@ struct wakeup_header { | |||
| 24 | u32 realmode_flags; | 24 | u32 realmode_flags; |
| 25 | u32 real_magic; | 25 | u32 real_magic; |
| 26 | u16 trampoline_segment; /* segment with trampoline code, 64-bit only */ | 26 | u16 trampoline_segment; /* segment with trampoline code, 64-bit only */ |
| 27 | u8 _pad1; | ||
| 28 | u8 wakeup_jmp; | ||
| 29 | u16 wakeup_jmp_off; | ||
| 30 | u16 wakeup_jmp_seg; | ||
| 31 | u64 wakeup_gdt[3]; | ||
| 27 | u32 signature; /* To check we have correct structure */ | 32 | u32 signature; /* To check we have correct structure */ |
| 28 | } __attribute__((__packed__)); | 33 | } __attribute__((__packed__)); |
| 29 | 34 | ||
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index afc25ee9964b..36af01f029ed 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c | |||
| @@ -50,6 +50,20 @@ int acpi_save_state_mem(void) | |||
| 50 | 50 | ||
| 51 | header->video_mode = saved_video_mode; | 51 | header->video_mode = saved_video_mode; |
| 52 | 52 | ||
| 53 | header->wakeup_jmp_seg = acpi_wakeup_address >> 4; | ||
| 54 | /* GDT[0]: GDT self-pointer */ | ||
| 55 | header->wakeup_gdt[0] = | ||
| 56 | (u64)(sizeof(header->wakeup_gdt) - 1) + | ||
| 57 | ((u64)(acpi_wakeup_address + | ||
| 58 | ((char *)&header->wakeup_gdt - (char *)acpi_realmode)) | ||
| 59 | << 16); | ||
| 60 | /* GDT[1]: real-mode-like code segment */ | ||
| 61 | header->wakeup_gdt[1] = (0x009bULL << 40) + | ||
| 62 | ((u64)acpi_wakeup_address << 16) + 0xffff; | ||
| 63 | /* GDT[2]: real-mode-like data segment */ | ||
| 64 | header->wakeup_gdt[2] = (0x0093ULL << 40) + | ||
| 65 | ((u64)acpi_wakeup_address << 16) + 0xffff; | ||
| 66 | |||
| 53 | #ifndef CONFIG_64BIT | 67 | #ifndef CONFIG_64BIT |
| 54 | store_gdt((struct desc_ptr *)&header->pmode_gdt); | 68 | store_gdt((struct desc_ptr *)&header->pmode_gdt); |
| 55 | 69 | ||
| @@ -111,7 +125,7 @@ void __init acpi_reserve_bootmem(void) | |||
| 111 | return; | 125 | return; |
| 112 | } | 126 | } |
| 113 | 127 | ||
| 114 | acpi_wakeup_address = acpi_realmode; | 128 | acpi_wakeup_address = virt_to_phys((void *)acpi_realmode); |
| 115 | } | 129 | } |
| 116 | 130 | ||
| 117 | 131 | ||
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 479926d9e004..e819362c7068 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c | |||
| @@ -35,6 +35,18 @@ int fallback_aper_force __initdata; | |||
| 35 | 35 | ||
| 36 | int fix_aperture __initdata = 1; | 36 | int fix_aperture __initdata = 1; |
| 37 | 37 | ||
| 38 | struct bus_dev_range { | ||
| 39 | int bus; | ||
| 40 | int dev_base; | ||
| 41 | int dev_limit; | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct bus_dev_range bus_dev_ranges[] __initdata = { | ||
| 45 | { 0x00, 0x18, 0x20}, | ||
| 46 | { 0xff, 0x00, 0x20}, | ||
| 47 | { 0xfe, 0x00, 0x20} | ||
| 48 | }; | ||
| 49 | |||
| 38 | static struct resource gart_resource = { | 50 | static struct resource gart_resource = { |
| 39 | .name = "GART", | 51 | .name = "GART", |
| 40 | .flags = IORESOURCE_MEM, | 52 | .flags = IORESOURCE_MEM, |
| @@ -55,8 +67,9 @@ static u32 __init allocate_aperture(void) | |||
| 55 | u32 aper_size; | 67 | u32 aper_size; |
| 56 | void *p; | 68 | void *p; |
| 57 | 69 | ||
| 58 | if (fallback_aper_order > 7) | 70 | /* aper_size should <= 1G */ |
| 59 | fallback_aper_order = 7; | 71 | if (fallback_aper_order > 5) |
| 72 | fallback_aper_order = 5; | ||
| 60 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; | 73 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; |
| 61 | 74 | ||
| 62 | /* | 75 | /* |
| @@ -65,7 +78,20 @@ static u32 __init allocate_aperture(void) | |||
| 65 | * memory. Unfortunately we cannot move it up because that would | 78 | * memory. Unfortunately we cannot move it up because that would |
| 66 | * make the IOMMU useless. | 79 | * make the IOMMU useless. |
| 67 | */ | 80 | */ |
| 68 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 0); | 81 | /* |
| 82 | * using 512M as goal, in case kexec will load kernel_big | ||
| 83 | * that will do the on position decompress, and could overlap with | ||
| 84 | * that positon with gart that is used. | ||
| 85 | * sequende: | ||
| 86 | * kernel_small | ||
| 87 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
| 88 | * ==> kernel_small(gart area become e820_reserved) | ||
| 89 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
| 90 | * ==> kerne_big (uncompressed size will be big than 64M or 128M) | ||
| 91 | * so don't use 512M below as gart iommu, leave the space for kernel | ||
| 92 | * code for safe | ||
| 93 | */ | ||
| 94 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20); | ||
| 69 | if (!p || __pa(p)+aper_size > 0xffffffff) { | 95 | if (!p || __pa(p)+aper_size > 0xffffffff) { |
| 70 | printk(KERN_ERR | 96 | printk(KERN_ERR |
| 71 | "Cannot allocate aperture memory hole (%p,%uK)\n", | 97 | "Cannot allocate aperture memory hole (%p,%uK)\n", |
| @@ -83,69 +109,53 @@ static u32 __init allocate_aperture(void) | |||
| 83 | return (u32)__pa(p); | 109 | return (u32)__pa(p); |
| 84 | } | 110 | } |
| 85 | 111 | ||
| 86 | static int __init aperture_valid(u64 aper_base, u32 aper_size) | ||
| 87 | { | ||
| 88 | if (!aper_base) | ||
| 89 | return 0; | ||
| 90 | |||
| 91 | if (aper_base + aper_size > 0x100000000UL) { | ||
| 92 | printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); | ||
| 93 | return 0; | ||
| 94 | } | ||
| 95 | if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { | ||
| 96 | printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); | ||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | if (aper_size < 64*1024*1024) { | ||
| 100 | printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20); | ||
| 101 | return 0; | ||
| 102 | } | ||
| 103 | |||
| 104 | return 1; | ||
| 105 | } | ||
| 106 | 112 | ||
| 107 | /* Find a PCI capability */ | 113 | /* Find a PCI capability */ |
| 108 | static __u32 __init find_cap(int num, int slot, int func, int cap) | 114 | static u32 __init find_cap(int bus, int slot, int func, int cap) |
| 109 | { | 115 | { |
| 110 | int bytes; | 116 | int bytes; |
| 111 | u8 pos; | 117 | u8 pos; |
| 112 | 118 | ||
| 113 | if (!(read_pci_config_16(num, slot, func, PCI_STATUS) & | 119 | if (!(read_pci_config_16(bus, slot, func, PCI_STATUS) & |
| 114 | PCI_STATUS_CAP_LIST)) | 120 | PCI_STATUS_CAP_LIST)) |
| 115 | return 0; | 121 | return 0; |
| 116 | 122 | ||
| 117 | pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST); | 123 | pos = read_pci_config_byte(bus, slot, func, PCI_CAPABILITY_LIST); |
| 118 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { | 124 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { |
| 119 | u8 id; | 125 | u8 id; |
| 120 | 126 | ||
| 121 | pos &= ~3; | 127 | pos &= ~3; |
| 122 | id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID); | 128 | id = read_pci_config_byte(bus, slot, func, pos+PCI_CAP_LIST_ID); |
| 123 | if (id == 0xff) | 129 | if (id == 0xff) |
| 124 | break; | 130 | break; |
| 125 | if (id == cap) | 131 | if (id == cap) |
| 126 | return pos; | 132 | return pos; |
| 127 | pos = read_pci_config_byte(num, slot, func, | 133 | pos = read_pci_config_byte(bus, slot, func, |
| 128 | pos+PCI_CAP_LIST_NEXT); | 134 | pos+PCI_CAP_LIST_NEXT); |
| 129 | } | 135 | } |
| 130 | return 0; | 136 | return 0; |
| 131 | } | 137 | } |
| 132 | 138 | ||
| 133 | /* Read a standard AGPv3 bridge header */ | 139 | /* Read a standard AGPv3 bridge header */ |
| 134 | static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | 140 | static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order) |
| 135 | { | 141 | { |
| 136 | u32 apsize; | 142 | u32 apsize; |
| 137 | u32 apsizereg; | 143 | u32 apsizereg; |
| 138 | int nbits; | 144 | int nbits; |
| 139 | u32 aper_low, aper_hi; | 145 | u32 aper_low, aper_hi; |
| 140 | u64 aper; | 146 | u64 aper; |
| 147 | u32 old_order; | ||
| 141 | 148 | ||
| 142 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", num, slot, func); | 149 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", bus, slot, func); |
| 143 | apsizereg = read_pci_config_16(num, slot, func, cap + 0x14); | 150 | apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14); |
| 144 | if (apsizereg == 0xffffffff) { | 151 | if (apsizereg == 0xffffffff) { |
| 145 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); | 152 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); |
| 146 | return 0; | 153 | return 0; |
| 147 | } | 154 | } |
| 148 | 155 | ||
| 156 | /* old_order could be the value from NB gart setting */ | ||
| 157 | old_order = *order; | ||
| 158 | |||
| 149 | apsize = apsizereg & 0xfff; | 159 | apsize = apsizereg & 0xfff; |
| 150 | /* Some BIOS use weird encodings not in the AGPv3 table. */ | 160 | /* Some BIOS use weird encodings not in the AGPv3 table. */ |
| 151 | if (apsize & 0xff) | 161 | if (apsize & 0xff) |
| @@ -155,14 +165,26 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
| 155 | if ((int)*order < 0) /* < 32MB */ | 165 | if ((int)*order < 0) /* < 32MB */ |
| 156 | *order = 0; | 166 | *order = 0; |
| 157 | 167 | ||
| 158 | aper_low = read_pci_config(num, slot, func, 0x10); | 168 | aper_low = read_pci_config(bus, slot, func, 0x10); |
| 159 | aper_hi = read_pci_config(num, slot, func, 0x14); | 169 | aper_hi = read_pci_config(bus, slot, func, 0x14); |
| 160 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | 170 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); |
| 161 | 171 | ||
| 172 | /* | ||
| 173 | * On some sick chips, APSIZE is 0. It means it wants 4G | ||
| 174 | * so let double check that order, and lets trust AMD NB settings: | ||
| 175 | */ | ||
| 176 | printk(KERN_INFO "Aperture from AGP @ %Lx old size %u MB\n", | ||
| 177 | aper, 32 << old_order); | ||
| 178 | if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) { | ||
| 179 | printk(KERN_INFO "Aperture size %u MB (APSIZE %x) is not right, using settings from NB\n", | ||
| 180 | 32 << *order, apsizereg); | ||
| 181 | *order = old_order; | ||
| 182 | } | ||
| 183 | |||
| 162 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", | 184 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", |
| 163 | aper, 32 << *order, apsizereg); | 185 | aper, 32 << *order, apsizereg); |
| 164 | 186 | ||
| 165 | if (!aperture_valid(aper, (32*1024*1024) << *order)) | 187 | if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20)) |
| 166 | return 0; | 188 | return 0; |
| 167 | return (u32)aper; | 189 | return (u32)aper; |
| 168 | } | 190 | } |
| @@ -180,17 +202,17 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
| 180 | * the AGP bridges should be always an own bus on the HT hierarchy, | 202 | * the AGP bridges should be always an own bus on the HT hierarchy, |
| 181 | * but do it here for future safety. | 203 | * but do it here for future safety. |
| 182 | */ | 204 | */ |
| 183 | static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | 205 | static u32 __init search_agp_bridge(u32 *order, int *valid_agp) |
| 184 | { | 206 | { |
| 185 | int num, slot, func; | 207 | int bus, slot, func; |
| 186 | 208 | ||
| 187 | /* Poor man's PCI discovery */ | 209 | /* Poor man's PCI discovery */ |
| 188 | for (num = 0; num < 256; num++) { | 210 | for (bus = 0; bus < 256; bus++) { |
| 189 | for (slot = 0; slot < 32; slot++) { | 211 | for (slot = 0; slot < 32; slot++) { |
| 190 | for (func = 0; func < 8; func++) { | 212 | for (func = 0; func < 8; func++) { |
| 191 | u32 class, cap; | 213 | u32 class, cap; |
| 192 | u8 type; | 214 | u8 type; |
| 193 | class = read_pci_config(num, slot, func, | 215 | class = read_pci_config(bus, slot, func, |
| 194 | PCI_CLASS_REVISION); | 216 | PCI_CLASS_REVISION); |
| 195 | if (class == 0xffffffff) | 217 | if (class == 0xffffffff) |
| 196 | break; | 218 | break; |
| @@ -199,17 +221,17 @@ static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | |||
| 199 | case PCI_CLASS_BRIDGE_HOST: | 221 | case PCI_CLASS_BRIDGE_HOST: |
| 200 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ | 222 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ |
| 201 | /* AGP bridge? */ | 223 | /* AGP bridge? */ |
| 202 | cap = find_cap(num, slot, func, | 224 | cap = find_cap(bus, slot, func, |
| 203 | PCI_CAP_ID_AGP); | 225 | PCI_CAP_ID_AGP); |
| 204 | if (!cap) | 226 | if (!cap) |
| 205 | break; | 227 | break; |
| 206 | *valid_agp = 1; | 228 | *valid_agp = 1; |
| 207 | return read_agp(num, slot, func, cap, | 229 | return read_agp(bus, slot, func, cap, |
| 208 | order); | 230 | order); |
| 209 | } | 231 | } |
| 210 | 232 | ||
| 211 | /* No multi-function device? */ | 233 | /* No multi-function device? */ |
| 212 | type = read_pci_config_byte(num, slot, func, | 234 | type = read_pci_config_byte(bus, slot, func, |
| 213 | PCI_HEADER_TYPE); | 235 | PCI_HEADER_TYPE); |
| 214 | if (!(type & 0x80)) | 236 | if (!(type & 0x80)) |
| 215 | break; | 237 | break; |
| @@ -249,36 +271,50 @@ void __init early_gart_iommu_check(void) | |||
| 249 | * or BIOS forget to put that in reserved. | 271 | * or BIOS forget to put that in reserved. |
| 250 | * try to update e820 to make that region as reserved. | 272 | * try to update e820 to make that region as reserved. |
| 251 | */ | 273 | */ |
| 252 | int fix, num; | 274 | int i, fix, slot; |
| 253 | u32 ctl; | 275 | u32 ctl; |
| 254 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; | 276 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; |
| 255 | u64 aper_base = 0, last_aper_base = 0; | 277 | u64 aper_base = 0, last_aper_base = 0; |
| 256 | int aper_enabled = 0, last_aper_enabled = 0; | 278 | int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0; |
| 257 | 279 | ||
| 258 | if (!early_pci_allowed()) | 280 | if (!early_pci_allowed()) |
| 259 | return; | 281 | return; |
| 260 | 282 | ||
| 283 | /* This is mostly duplicate of iommu_hole_init */ | ||
| 261 | fix = 0; | 284 | fix = 0; |
| 262 | for (num = 24; num < 32; num++) { | 285 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 263 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 286 | int bus; |
| 264 | continue; | 287 | int dev_base, dev_limit; |
| 265 | 288 | ||
| 266 | ctl = read_pci_config(0, num, 3, 0x90); | 289 | bus = bus_dev_ranges[i].bus; |
| 267 | aper_enabled = ctl & 1; | 290 | dev_base = bus_dev_ranges[i].dev_base; |
| 268 | aper_order = (ctl >> 1) & 7; | 291 | dev_limit = bus_dev_ranges[i].dev_limit; |
| 269 | aper_size = (32 * 1024 * 1024) << aper_order; | 292 | |
| 270 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 293 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 271 | aper_base <<= 25; | 294 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 272 | 295 | continue; | |
| 273 | if ((last_aper_order && aper_order != last_aper_order) || | 296 | |
| 274 | (last_aper_base && aper_base != last_aper_base) || | 297 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
| 275 | (last_aper_enabled && aper_enabled != last_aper_enabled)) { | 298 | aper_enabled = ctl & AMD64_GARTEN; |
| 276 | fix = 1; | 299 | aper_order = (ctl >> 1) & 7; |
| 277 | break; | 300 | aper_size = (32 * 1024 * 1024) << aper_order; |
| 301 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; | ||
| 302 | aper_base <<= 25; | ||
| 303 | |||
| 304 | if (last_valid) { | ||
| 305 | if ((aper_order != last_aper_order) || | ||
| 306 | (aper_base != last_aper_base) || | ||
| 307 | (aper_enabled != last_aper_enabled)) { | ||
| 308 | fix = 1; | ||
| 309 | break; | ||
| 310 | } | ||
| 311 | } | ||
| 312 | |||
| 313 | last_aper_order = aper_order; | ||
| 314 | last_aper_base = aper_base; | ||
| 315 | last_aper_enabled = aper_enabled; | ||
| 316 | last_valid = 1; | ||
| 278 | } | 317 | } |
| 279 | last_aper_order = aper_order; | ||
| 280 | last_aper_base = aper_base; | ||
| 281 | last_aper_enabled = aper_enabled; | ||
| 282 | } | 318 | } |
| 283 | 319 | ||
| 284 | if (!fix && !aper_enabled) | 320 | if (!fix && !aper_enabled) |
| @@ -290,32 +326,46 @@ void __init early_gart_iommu_check(void) | |||
| 290 | if (gart_fix_e820 && !fix && aper_enabled) { | 326 | if (gart_fix_e820 && !fix && aper_enabled) { |
| 291 | if (e820_any_mapped(aper_base, aper_base + aper_size, | 327 | if (e820_any_mapped(aper_base, aper_base + aper_size, |
| 292 | E820_RAM)) { | 328 | E820_RAM)) { |
| 293 | /* reserved it, so we can resuse it in second kernel */ | 329 | /* reserve it, so we can reuse it in second kernel */ |
| 294 | printk(KERN_INFO "update e820 for GART\n"); | 330 | printk(KERN_INFO "update e820 for GART\n"); |
| 295 | add_memory_region(aper_base, aper_size, E820_RESERVED); | 331 | add_memory_region(aper_base, aper_size, E820_RESERVED); |
| 296 | update_e820(); | 332 | update_e820(); |
| 297 | } | 333 | } |
| 298 | return; | ||
| 299 | } | 334 | } |
| 300 | 335 | ||
| 336 | if (!fix) | ||
| 337 | return; | ||
| 338 | |||
| 301 | /* different nodes have different setting, disable them all at first*/ | 339 | /* different nodes have different setting, disable them all at first*/ |
| 302 | for (num = 24; num < 32; num++) { | 340 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 303 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 341 | int bus; |
| 304 | continue; | 342 | int dev_base, dev_limit; |
| 343 | |||
| 344 | bus = bus_dev_ranges[i].bus; | ||
| 345 | dev_base = bus_dev_ranges[i].dev_base; | ||
| 346 | dev_limit = bus_dev_ranges[i].dev_limit; | ||
| 347 | |||
| 348 | for (slot = dev_base; slot < dev_limit; slot++) { | ||
| 349 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) | ||
| 350 | continue; | ||
| 305 | 351 | ||
| 306 | ctl = read_pci_config(0, num, 3, 0x90); | 352 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
| 307 | ctl &= ~1; | 353 | ctl &= ~AMD64_GARTEN; |
| 308 | write_pci_config(0, num, 3, 0x90, ctl); | 354 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl); |
| 355 | } | ||
| 309 | } | 356 | } |
| 310 | 357 | ||
| 311 | } | 358 | } |
| 312 | 359 | ||
| 360 | static int __initdata printed_gart_size_msg; | ||
| 361 | |||
| 313 | void __init gart_iommu_hole_init(void) | 362 | void __init gart_iommu_hole_init(void) |
| 314 | { | 363 | { |
| 364 | u32 agp_aper_base = 0, agp_aper_order = 0; | ||
| 315 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; | 365 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; |
| 316 | u64 aper_base, last_aper_base = 0; | 366 | u64 aper_base, last_aper_base = 0; |
| 317 | int fix, num, valid_agp = 0; | 367 | int fix, slot, valid_agp = 0; |
| 318 | int node; | 368 | int i, node; |
| 319 | 369 | ||
| 320 | if (gart_iommu_aperture_disabled || !fix_aperture || | 370 | if (gart_iommu_aperture_disabled || !fix_aperture || |
| 321 | !early_pci_allowed()) | 371 | !early_pci_allowed()) |
| @@ -323,38 +373,63 @@ void __init gart_iommu_hole_init(void) | |||
| 323 | 373 | ||
| 324 | printk(KERN_INFO "Checking aperture...\n"); | 374 | printk(KERN_INFO "Checking aperture...\n"); |
| 325 | 375 | ||
| 376 | if (!fallback_aper_force) | ||
| 377 | agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp); | ||
| 378 | |||
| 326 | fix = 0; | 379 | fix = 0; |
| 327 | node = 0; | 380 | node = 0; |
| 328 | for (num = 24; num < 32; num++) { | 381 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 329 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 382 | int bus; |
| 330 | continue; | 383 | int dev_base, dev_limit; |
| 331 | 384 | ||
| 332 | iommu_detected = 1; | 385 | bus = bus_dev_ranges[i].bus; |
| 333 | gart_iommu_aperture = 1; | 386 | dev_base = bus_dev_ranges[i].dev_base; |
| 334 | 387 | dev_limit = bus_dev_ranges[i].dev_limit; | |
| 335 | aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; | 388 | |
| 336 | aper_size = (32 * 1024 * 1024) << aper_order; | 389 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 337 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 390 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 338 | aper_base <<= 25; | 391 | continue; |
| 339 | 392 | ||
| 340 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | 393 | iommu_detected = 1; |
| 341 | node, aper_base, aper_size >> 20); | 394 | gart_iommu_aperture = 1; |
| 342 | node++; | 395 | |
| 343 | 396 | aper_order = (read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL) >> 1) & 7; | |
| 344 | if (!aperture_valid(aper_base, aper_size)) { | 397 | aper_size = (32 * 1024 * 1024) << aper_order; |
| 345 | fix = 1; | 398 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; |
| 346 | break; | 399 | aper_base <<= 25; |
| 347 | } | 400 | |
| 401 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | ||
| 402 | node, aper_base, aper_size >> 20); | ||
| 403 | node++; | ||
| 404 | |||
| 405 | if (!aperture_valid(aper_base, aper_size, 64<<20)) { | ||
| 406 | if (valid_agp && agp_aper_base && | ||
| 407 | agp_aper_base == aper_base && | ||
| 408 | agp_aper_order == aper_order) { | ||
| 409 | /* the same between two setting from NB and agp */ | ||
| 410 | if (!no_iommu && end_pfn > MAX_DMA32_PFN && !printed_gart_size_msg) { | ||
| 411 | printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n"); | ||
| 412 | printk(KERN_ERR "please increase GART size in your BIOS setup\n"); | ||
| 413 | printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n"); | ||
| 414 | printed_gart_size_msg = 1; | ||
| 415 | } | ||
| 416 | } else { | ||
| 417 | fix = 1; | ||
| 418 | goto out; | ||
| 419 | } | ||
| 420 | } | ||
| 348 | 421 | ||
| 349 | if ((last_aper_order && aper_order != last_aper_order) || | 422 | if ((last_aper_order && aper_order != last_aper_order) || |
| 350 | (last_aper_base && aper_base != last_aper_base)) { | 423 | (last_aper_base && aper_base != last_aper_base)) { |
| 351 | fix = 1; | 424 | fix = 1; |
| 352 | break; | 425 | goto out; |
| 426 | } | ||
| 427 | last_aper_order = aper_order; | ||
| 428 | last_aper_base = aper_base; | ||
| 353 | } | 429 | } |
| 354 | last_aper_order = aper_order; | ||
| 355 | last_aper_base = aper_base; | ||
| 356 | } | 430 | } |
| 357 | 431 | ||
| 432 | out: | ||
| 358 | if (!fix && !fallback_aper_force) { | 433 | if (!fix && !fallback_aper_force) { |
| 359 | if (last_aper_base) { | 434 | if (last_aper_base) { |
| 360 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; | 435 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; |
| @@ -364,8 +439,10 @@ void __init gart_iommu_hole_init(void) | |||
| 364 | return; | 439 | return; |
| 365 | } | 440 | } |
| 366 | 441 | ||
| 367 | if (!fallback_aper_force) | 442 | if (!fallback_aper_force) { |
| 368 | aper_alloc = search_agp_bridge(&aper_order, &valid_agp); | 443 | aper_alloc = agp_aper_base; |
| 444 | aper_order = agp_aper_order; | ||
| 445 | } | ||
| 369 | 446 | ||
| 370 | if (aper_alloc) { | 447 | if (aper_alloc) { |
| 371 | /* Got the aperture from the AGP bridge */ | 448 | /* Got the aperture from the AGP bridge */ |
| @@ -401,16 +478,24 @@ void __init gart_iommu_hole_init(void) | |||
| 401 | } | 478 | } |
| 402 | 479 | ||
| 403 | /* Fix up the north bridges */ | 480 | /* Fix up the north bridges */ |
| 404 | for (num = 24; num < 32; num++) { | 481 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 405 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 482 | int bus; |
| 406 | continue; | 483 | int dev_base, dev_limit; |
| 407 | 484 | ||
| 408 | /* | 485 | bus = bus_dev_ranges[i].bus; |
| 409 | * Don't enable translation yet. That is done later. | 486 | dev_base = bus_dev_ranges[i].dev_base; |
| 410 | * Assume this BIOS didn't initialise the GART so | 487 | dev_limit = bus_dev_ranges[i].dev_limit; |
| 411 | * just overwrite all previous bits | 488 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 412 | */ | 489 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 413 | write_pci_config(0, num, 3, 0x90, aper_order<<1); | 490 | continue; |
| 414 | write_pci_config(0, num, 3, 0x94, aper_alloc>>25); | 491 | |
| 492 | /* Don't enable translation yet. That is done later. | ||
| 493 | Assume this BIOS didn't initialise the GART so | ||
| 494 | just overwrite all previous bits */ | ||
| 495 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, aper_order << 1); | ||
| 496 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25); | ||
| 497 | } | ||
| 415 | } | 498 | } |
| 499 | |||
| 500 | set_up_gart_resume(aper_order, aper_alloc); | ||
| 416 | } | 501 | } |
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 4b99b1bdeb6c..45d8da405ad9 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
| @@ -64,9 +64,8 @@ static int enable_local_apic __initdata; | |||
| 64 | 64 | ||
| 65 | /* Local APIC timer verification ok */ | 65 | /* Local APIC timer verification ok */ |
| 66 | static int local_apic_timer_verify_ok; | 66 | static int local_apic_timer_verify_ok; |
| 67 | /* Disable local APIC timer from the kernel commandline or via dmi quirk | 67 | /* Disable local APIC timer from the kernel commandline or via dmi quirk */ |
| 68 | or using CPU MSR check */ | 68 | static int local_apic_timer_disabled; |
| 69 | int local_apic_timer_disabled; | ||
| 70 | /* Local APIC timer works in C2 */ | 69 | /* Local APIC timer works in C2 */ |
| 71 | int local_apic_timer_c2_ok; | 70 | int local_apic_timer_c2_ok; |
| 72 | EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); | 71 | EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok); |
| @@ -1154,9 +1153,6 @@ static int __init detect_init_APIC(void) | |||
| 1154 | if (l & MSR_IA32_APICBASE_ENABLE) | 1153 | if (l & MSR_IA32_APICBASE_ENABLE) |
| 1155 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; | 1154 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; |
| 1156 | 1155 | ||
| 1157 | if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) | ||
| 1158 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 1159 | |||
| 1160 | printk(KERN_INFO "Found and enabled local APIC!\n"); | 1156 | printk(KERN_INFO "Found and enabled local APIC!\n"); |
| 1161 | 1157 | ||
| 1162 | apic_pm_activate(); | 1158 | apic_pm_activate(); |
| @@ -1269,6 +1265,10 @@ int __init APIC_init_uniprocessor(void) | |||
| 1269 | 1265 | ||
| 1270 | setup_local_APIC(); | 1266 | setup_local_APIC(); |
| 1271 | 1267 | ||
| 1268 | #ifdef CONFIG_X86_IO_APIC | ||
| 1269 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
| 1270 | #endif | ||
| 1271 | localise_nmi_watchdog(); | ||
| 1272 | end_local_APIC_setup(); | 1272 | end_local_APIC_setup(); |
| 1273 | #ifdef CONFIG_X86_IO_APIC | 1273 | #ifdef CONFIG_X86_IO_APIC |
| 1274 | if (smp_found_config) | 1274 | if (smp_found_config) |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 0633cfd0dc29..3ef7752aa8e5 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <mach_ipi.h> | 43 | #include <mach_ipi.h> |
| 44 | #include <mach_apic.h> | 44 | #include <mach_apic.h> |
| 45 | 45 | ||
| 46 | int disable_apic_timer __cpuinitdata; | 46 | static int disable_apic_timer __cpuinitdata; |
| 47 | static int apic_calibrate_pmtmr __initdata; | 47 | static int apic_calibrate_pmtmr __initdata; |
| 48 | int disable_apic; | 48 | int disable_apic; |
| 49 | 49 | ||
| @@ -422,32 +422,8 @@ void __init setup_boot_APIC_clock(void) | |||
| 422 | setup_APIC_timer(); | 422 | setup_APIC_timer(); |
| 423 | } | 423 | } |
| 424 | 424 | ||
| 425 | /* | ||
| 426 | * AMD C1E enabled CPUs have a real nasty problem: Some BIOSes set the | ||
| 427 | * C1E flag only in the secondary CPU, so when we detect the wreckage | ||
| 428 | * we already have enabled the boot CPU local apic timer. Check, if | ||
| 429 | * disable_apic_timer is set and the DUMMY flag is cleared. If yes, | ||
| 430 | * set the DUMMY flag again and force the broadcast mode in the | ||
| 431 | * clockevents layer. | ||
| 432 | */ | ||
| 433 | static void __cpuinit check_boot_apic_timer_broadcast(void) | ||
| 434 | { | ||
| 435 | if (!disable_apic_timer || | ||
| 436 | (lapic_clockevent.features & CLOCK_EVT_FEAT_DUMMY)) | ||
| 437 | return; | ||
| 438 | |||
| 439 | printk(KERN_INFO "AMD C1E detected late. Force timer broadcast.\n"); | ||
| 440 | lapic_clockevent.features |= CLOCK_EVT_FEAT_DUMMY; | ||
| 441 | |||
| 442 | local_irq_enable(); | ||
| 443 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, | ||
| 444 | &boot_cpu_physical_apicid); | ||
| 445 | local_irq_disable(); | ||
| 446 | } | ||
| 447 | |||
| 448 | void __cpuinit setup_secondary_APIC_clock(void) | 425 | void __cpuinit setup_secondary_APIC_clock(void) |
| 449 | { | 426 | { |
| 450 | check_boot_apic_timer_broadcast(); | ||
| 451 | setup_APIC_timer(); | 427 | setup_APIC_timer(); |
| 452 | } | 428 | } |
| 453 | 429 | ||
| @@ -875,7 +851,7 @@ static int __init detect_init_APIC(void) | |||
| 875 | 851 | ||
| 876 | void __init early_init_lapic_mapping(void) | 852 | void __init early_init_lapic_mapping(void) |
| 877 | { | 853 | { |
| 878 | unsigned long apic_phys; | 854 | unsigned long phys_addr; |
| 879 | 855 | ||
| 880 | /* | 856 | /* |
| 881 | * If no local APIC can be found then go out | 857 | * If no local APIC can be found then go out |
| @@ -884,11 +860,11 @@ void __init early_init_lapic_mapping(void) | |||
| 884 | if (!smp_found_config) | 860 | if (!smp_found_config) |
| 885 | return; | 861 | return; |
| 886 | 862 | ||
| 887 | apic_phys = mp_lapic_addr; | 863 | phys_addr = mp_lapic_addr; |
| 888 | 864 | ||
| 889 | set_fixmap_nocache(FIX_APIC_BASE, apic_phys); | 865 | set_fixmap_nocache(FIX_APIC_BASE, phys_addr); |
| 890 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", | 866 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", |
| 891 | APIC_BASE, apic_phys); | 867 | APIC_BASE, phys_addr); |
| 892 | 868 | ||
| 893 | /* | 869 | /* |
| 894 | * Fetch the APIC ID of the BSP in case we have a | 870 | * Fetch the APIC ID of the BSP in case we have a |
| @@ -954,6 +930,8 @@ int __init APIC_init_uniprocessor(void) | |||
| 954 | if (!skip_ioapic_setup && nr_ioapics) | 930 | if (!skip_ioapic_setup && nr_ioapics) |
| 955 | enable_IO_APIC(); | 931 | enable_IO_APIC(); |
| 956 | 932 | ||
| 933 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
| 934 | localise_nmi_watchdog(); | ||
| 957 | end_local_APIC_setup(); | 935 | end_local_APIC_setup(); |
| 958 | 936 | ||
| 959 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) | 937 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index bf9290e29013..00e6d1370954 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -228,6 +228,7 @@ | |||
| 228 | #include <linux/suspend.h> | 228 | #include <linux/suspend.h> |
| 229 | #include <linux/kthread.h> | 229 | #include <linux/kthread.h> |
| 230 | #include <linux/jiffies.h> | 230 | #include <linux/jiffies.h> |
| 231 | #include <linux/smp_lock.h> | ||
| 231 | 232 | ||
| 232 | #include <asm/system.h> | 233 | #include <asm/system.h> |
| 233 | #include <asm/uaccess.h> | 234 | #include <asm/uaccess.h> |
| @@ -1149,7 +1150,7 @@ static void queue_event(apm_event_t event, struct apm_user *sender) | |||
| 1149 | as->event_tail = 0; | 1150 | as->event_tail = 0; |
| 1150 | } | 1151 | } |
| 1151 | as->events[as->event_head] = event; | 1152 | as->events[as->event_head] = event; |
| 1152 | if ((!as->suser) || (!as->writer)) | 1153 | if (!as->suser || !as->writer) |
| 1153 | continue; | 1154 | continue; |
| 1154 | switch (event) { | 1155 | switch (event) { |
| 1155 | case APM_SYS_SUSPEND: | 1156 | case APM_SYS_SUSPEND: |
| @@ -1396,7 +1397,7 @@ static void apm_mainloop(void) | |||
| 1396 | 1397 | ||
| 1397 | static int check_apm_user(struct apm_user *as, const char *func) | 1398 | static int check_apm_user(struct apm_user *as, const char *func) |
| 1398 | { | 1399 | { |
| 1399 | if ((as == NULL) || (as->magic != APM_BIOS_MAGIC)) { | 1400 | if (as == NULL || as->magic != APM_BIOS_MAGIC) { |
| 1400 | printk(KERN_ERR "apm: %s passed bad filp\n", func); | 1401 | printk(KERN_ERR "apm: %s passed bad filp\n", func); |
| 1401 | return 1; | 1402 | return 1; |
| 1402 | } | 1403 | } |
| @@ -1459,18 +1460,19 @@ static unsigned int do_poll(struct file *fp, poll_table *wait) | |||
| 1459 | return 0; | 1460 | return 0; |
| 1460 | } | 1461 | } |
| 1461 | 1462 | ||
| 1462 | static int do_ioctl(struct inode *inode, struct file *filp, | 1463 | static long do_ioctl(struct file *filp, u_int cmd, u_long arg) |
| 1463 | u_int cmd, u_long arg) | ||
| 1464 | { | 1464 | { |
| 1465 | struct apm_user *as; | 1465 | struct apm_user *as; |
| 1466 | int ret; | ||
| 1466 | 1467 | ||
| 1467 | as = filp->private_data; | 1468 | as = filp->private_data; |
| 1468 | if (check_apm_user(as, "ioctl")) | 1469 | if (check_apm_user(as, "ioctl")) |
| 1469 | return -EIO; | 1470 | return -EIO; |
| 1470 | if ((!as->suser) || (!as->writer)) | 1471 | if (!as->suser || !as->writer) |
| 1471 | return -EPERM; | 1472 | return -EPERM; |
| 1472 | switch (cmd) { | 1473 | switch (cmd) { |
| 1473 | case APM_IOC_STANDBY: | 1474 | case APM_IOC_STANDBY: |
| 1475 | lock_kernel(); | ||
| 1474 | if (as->standbys_read > 0) { | 1476 | if (as->standbys_read > 0) { |
| 1475 | as->standbys_read--; | 1477 | as->standbys_read--; |
| 1476 | as->standbys_pending--; | 1478 | as->standbys_pending--; |
| @@ -1479,8 +1481,10 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
| 1479 | queue_event(APM_USER_STANDBY, as); | 1481 | queue_event(APM_USER_STANDBY, as); |
| 1480 | if (standbys_pending <= 0) | 1482 | if (standbys_pending <= 0) |
| 1481 | standby(); | 1483 | standby(); |
| 1484 | unlock_kernel(); | ||
| 1482 | break; | 1485 | break; |
| 1483 | case APM_IOC_SUSPEND: | 1486 | case APM_IOC_SUSPEND: |
| 1487 | lock_kernel(); | ||
| 1484 | if (as->suspends_read > 0) { | 1488 | if (as->suspends_read > 0) { |
| 1485 | as->suspends_read--; | 1489 | as->suspends_read--; |
| 1486 | as->suspends_pending--; | 1490 | as->suspends_pending--; |
| @@ -1488,16 +1492,17 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
| 1488 | } else | 1492 | } else |
| 1489 | queue_event(APM_USER_SUSPEND, as); | 1493 | queue_event(APM_USER_SUSPEND, as); |
| 1490 | if (suspends_pending <= 0) { | 1494 | if (suspends_pending <= 0) { |
| 1491 | return suspend(1); | 1495 | ret = suspend(1); |
| 1492 | } else { | 1496 | } else { |
| 1493 | as->suspend_wait = 1; | 1497 | as->suspend_wait = 1; |
| 1494 | wait_event_interruptible(apm_suspend_waitqueue, | 1498 | wait_event_interruptible(apm_suspend_waitqueue, |
| 1495 | as->suspend_wait == 0); | 1499 | as->suspend_wait == 0); |
| 1496 | return as->suspend_result; | 1500 | ret = as->suspend_result; |
| 1497 | } | 1501 | } |
| 1498 | break; | 1502 | unlock_kernel(); |
| 1503 | return ret; | ||
| 1499 | default: | 1504 | default: |
| 1500 | return -EINVAL; | 1505 | return -ENOTTY; |
| 1501 | } | 1506 | } |
| 1502 | return 0; | 1507 | return 0; |
| 1503 | } | 1508 | } |
| @@ -1860,7 +1865,7 @@ static const struct file_operations apm_bios_fops = { | |||
| 1860 | .owner = THIS_MODULE, | 1865 | .owner = THIS_MODULE, |
| 1861 | .read = do_read, | 1866 | .read = do_read, |
| 1862 | .poll = do_poll, | 1867 | .poll = do_poll, |
| 1863 | .ioctl = do_ioctl, | 1868 | .unlocked_ioctl = do_ioctl, |
| 1864 | .open = do_open, | 1869 | .open = do_open, |
| 1865 | .release = do_release, | 1870 | .release = do_release, |
| 1866 | }; | 1871 | }; |
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index a0c6f8190887..65b1be5fe9ce 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
| @@ -6,11 +6,15 @@ obj-y := intel_cacheinfo.o addon_cpuid_features.o | |||
| 6 | obj-y += proc.o feature_names.o | 6 | obj-y += proc.o feature_names.o |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_X86_32) += common.o bugs.o | 8 | obj-$(CONFIG_X86_32) += common.o bugs.o |
| 9 | obj-$(CONFIG_X86_64) += bugs_64.o | ||
| 9 | obj-$(CONFIG_X86_32) += amd.o | 10 | obj-$(CONFIG_X86_32) += amd.o |
| 11 | obj-$(CONFIG_X86_64) += amd_64.o | ||
| 10 | obj-$(CONFIG_X86_32) += cyrix.o | 12 | obj-$(CONFIG_X86_32) += cyrix.o |
| 11 | obj-$(CONFIG_X86_32) += centaur.o | 13 | obj-$(CONFIG_X86_32) += centaur.o |
| 14 | obj-$(CONFIG_X86_64) += centaur_64.o | ||
| 12 | obj-$(CONFIG_X86_32) += transmeta.o | 15 | obj-$(CONFIG_X86_32) += transmeta.o |
| 13 | obj-$(CONFIG_X86_32) += intel.o | 16 | obj-$(CONFIG_X86_32) += intel.o |
| 17 | obj-$(CONFIG_X86_64) += intel_64.o | ||
| 14 | obj-$(CONFIG_X86_32) += umc.o | 18 | obj-$(CONFIG_X86_32) += umc.o |
| 15 | 19 | ||
| 16 | obj-$(CONFIG_X86_MCE) += mcheck/ | 20 | obj-$(CONFIG_X86_MCE) += mcheck/ |
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index c2e1ce33c7cb..84a8220a6072 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | |||
| 2 | /* | 1 | /* |
| 3 | * Routines to indentify additional cpu features that are scattered in | 2 | * Routines to indentify additional cpu features that are scattered in |
| 4 | * cpuid space. | 3 | * cpuid space. |
| 5 | */ | 4 | */ |
| 6 | |||
| 7 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
| 8 | 6 | ||
| 9 | #include <asm/pat.h> | 7 | #include <asm/pat.h> |
| @@ -53,19 +51,20 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) | |||
| 53 | #ifdef CONFIG_X86_PAT | 51 | #ifdef CONFIG_X86_PAT |
| 54 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) | 52 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) |
| 55 | { | 53 | { |
| 54 | if (!cpu_has_pat) | ||
| 55 | pat_disable("PAT not supported by CPU."); | ||
| 56 | |||
| 56 | switch (c->x86_vendor) { | 57 | switch (c->x86_vendor) { |
| 57 | case X86_VENDOR_AMD: | ||
| 58 | if (c->x86 >= 0xf && c->x86 <= 0x11) | ||
| 59 | return; | ||
| 60 | break; | ||
| 61 | case X86_VENDOR_INTEL: | 58 | case X86_VENDOR_INTEL: |
| 62 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) | 59 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) |
| 63 | return; | 60 | return; |
| 64 | break; | 61 | break; |
| 62 | case X86_VENDOR_AMD: | ||
| 63 | case X86_VENDOR_CENTAUR: | ||
| 64 | case X86_VENDOR_TRANSMETA: | ||
| 65 | return; | ||
| 65 | } | 66 | } |
| 66 | 67 | ||
| 67 | pat_disable(cpu_has_pat ? | 68 | pat_disable("PAT disabled. Not yet verified on this CPU type."); |
| 68 | "PAT disabled. Not yet verified on this CPU type." : | ||
| 69 | "PAT not supported by CPU."); | ||
| 70 | } | 69 | } |
| 71 | #endif | 70 | #endif |
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 245866828294..81a07ca65d44 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
| @@ -24,43 +24,6 @@ | |||
| 24 | extern void vide(void); | 24 | extern void vide(void); |
| 25 | __asm__(".align 4\nvide: ret"); | 25 | __asm__(".align 4\nvide: ret"); |
| 26 | 26 | ||
| 27 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 28 | #define ENABLE_C1E_MASK 0x18000000 | ||
| 29 | #define CPUID_PROCESSOR_SIGNATURE 1 | ||
| 30 | #define CPUID_XFAM 0x0ff00000 | ||
| 31 | #define CPUID_XFAM_K8 0x00000000 | ||
| 32 | #define CPUID_XFAM_10H 0x00100000 | ||
| 33 | #define CPUID_XFAM_11H 0x00200000 | ||
| 34 | #define CPUID_XMOD 0x000f0000 | ||
| 35 | #define CPUID_XMOD_REV_F 0x00040000 | ||
| 36 | |||
| 37 | /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ | ||
| 38 | static __cpuinit int amd_apic_timer_broken(void) | ||
| 39 | { | ||
| 40 | u32 lo, hi; | ||
| 41 | u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE); | ||
| 42 | switch (eax & CPUID_XFAM) { | ||
| 43 | case CPUID_XFAM_K8: | ||
| 44 | if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F) | ||
| 45 | break; | ||
| 46 | case CPUID_XFAM_10H: | ||
| 47 | case CPUID_XFAM_11H: | ||
| 48 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); | ||
| 49 | if (lo & ENABLE_C1E_MASK) { | ||
| 50 | if (smp_processor_id() != boot_cpu_physical_apicid) | ||
| 51 | printk(KERN_INFO "AMD C1E detected late. " | ||
| 52 | " Force timer broadcast.\n"); | ||
| 53 | return 1; | ||
| 54 | } | ||
| 55 | break; | ||
| 56 | default: | ||
| 57 | /* err on the side of caution */ | ||
| 58 | return 1; | ||
| 59 | } | ||
| 60 | return 0; | ||
| 61 | } | ||
| 62 | #endif | ||
| 63 | |||
| 64 | int force_mwait __cpuinitdata; | 27 | int force_mwait __cpuinitdata; |
| 65 | 28 | ||
| 66 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | 29 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) |
| @@ -297,11 +260,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
| 297 | num_cache_leaves = 3; | 260 | num_cache_leaves = 3; |
| 298 | } | 261 | } |
| 299 | 262 | ||
| 300 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 301 | if (amd_apic_timer_broken()) | ||
| 302 | local_apic_timer_disabled = 1; | ||
| 303 | #endif | ||
| 304 | |||
| 305 | /* K6s reports MCEs but don't actually have all the MSRs */ | 263 | /* K6s reports MCEs but don't actually have all the MSRs */ |
| 306 | if (c->x86 < 6) | 264 | if (c->x86 < 6) |
| 307 | clear_cpu_cap(c, X86_FEATURE_MCE); | 265 | clear_cpu_cap(c, X86_FEATURE_MCE); |
diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c new file mode 100644 index 000000000000..30b7557c9641 --- /dev/null +++ b/arch/x86/kernel/cpu/amd_64.c | |||
| @@ -0,0 +1,211 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/mm.h> | ||
| 3 | |||
| 4 | #include <asm/numa_64.h> | ||
| 5 | #include <asm/mmconfig.h> | ||
| 6 | #include <asm/cacheflush.h> | ||
| 7 | |||
| 8 | #include <mach_apic.h> | ||
| 9 | |||
| 10 | #include "cpu.h" | ||
| 11 | |||
| 12 | int force_mwait __cpuinitdata; | ||
| 13 | |||
| 14 | #ifdef CONFIG_NUMA | ||
| 15 | static int __cpuinit nearby_node(int apicid) | ||
| 16 | { | ||
| 17 | int i, node; | ||
| 18 | |||
| 19 | for (i = apicid - 1; i >= 0; i--) { | ||
| 20 | node = apicid_to_node[i]; | ||
| 21 | if (node != NUMA_NO_NODE && node_online(node)) | ||
| 22 | return node; | ||
| 23 | } | ||
| 24 | for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) { | ||
| 25 | node = apicid_to_node[i]; | ||
| 26 | if (node != NUMA_NO_NODE && node_online(node)) | ||
| 27 | return node; | ||
| 28 | } | ||
| 29 | return first_node(node_online_map); /* Shouldn't happen */ | ||
| 30 | } | ||
| 31 | #endif | ||
| 32 | |||
| 33 | /* | ||
| 34 | * On a AMD dual core setup the lower bits of the APIC id distingush the cores. | ||
| 35 | * Assumes number of cores is a power of two. | ||
| 36 | */ | ||
| 37 | static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) | ||
| 38 | { | ||
| 39 | #ifdef CONFIG_SMP | ||
| 40 | unsigned bits; | ||
| 41 | #ifdef CONFIG_NUMA | ||
| 42 | int cpu = smp_processor_id(); | ||
| 43 | int node = 0; | ||
| 44 | unsigned apicid = hard_smp_processor_id(); | ||
| 45 | #endif | ||
| 46 | bits = c->x86_coreid_bits; | ||
| 47 | |||
| 48 | /* Low order bits define the core id (index of core in socket) */ | ||
| 49 | c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); | ||
| 50 | /* Convert the initial APIC ID into the socket ID */ | ||
| 51 | c->phys_proc_id = c->initial_apicid >> bits; | ||
| 52 | |||
| 53 | #ifdef CONFIG_NUMA | ||
| 54 | node = c->phys_proc_id; | ||
| 55 | if (apicid_to_node[apicid] != NUMA_NO_NODE) | ||
| 56 | node = apicid_to_node[apicid]; | ||
| 57 | if (!node_online(node)) { | ||
| 58 | /* Two possibilities here: | ||
| 59 | - The CPU is missing memory and no node was created. | ||
| 60 | In that case try picking one from a nearby CPU | ||
| 61 | - The APIC IDs differ from the HyperTransport node IDs | ||
| 62 | which the K8 northbridge parsing fills in. | ||
| 63 | Assume they are all increased by a constant offset, | ||
| 64 | but in the same order as the HT nodeids. | ||
| 65 | If that doesn't result in a usable node fall back to the | ||
| 66 | path for the previous case. */ | ||
| 67 | |||
| 68 | int ht_nodeid = c->initial_apicid; | ||
| 69 | |||
| 70 | if (ht_nodeid >= 0 && | ||
| 71 | apicid_to_node[ht_nodeid] != NUMA_NO_NODE) | ||
| 72 | node = apicid_to_node[ht_nodeid]; | ||
| 73 | /* Pick a nearby node */ | ||
| 74 | if (!node_online(node)) | ||
| 75 | node = nearby_node(apicid); | ||
| 76 | } | ||
| 77 | numa_set_node(cpu, node); | ||
| 78 | |||
| 79 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
| 80 | #endif | ||
| 81 | #endif | ||
| 82 | } | ||
| 83 | |||
| 84 | static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) | ||
| 85 | { | ||
| 86 | #ifdef CONFIG_SMP | ||
| 87 | unsigned bits, ecx; | ||
| 88 | |||
| 89 | /* Multi core CPU? */ | ||
| 90 | if (c->extended_cpuid_level < 0x80000008) | ||
| 91 | return; | ||
| 92 | |||
| 93 | ecx = cpuid_ecx(0x80000008); | ||
| 94 | |||
| 95 | c->x86_max_cores = (ecx & 0xff) + 1; | ||
| 96 | |||
| 97 | /* CPU telling us the core id bits shift? */ | ||
| 98 | bits = (ecx >> 12) & 0xF; | ||
| 99 | |||
| 100 | /* Otherwise recompute */ | ||
| 101 | if (bits == 0) { | ||
| 102 | while ((1 << bits) < c->x86_max_cores) | ||
| 103 | bits++; | ||
| 104 | } | ||
| 105 | |||
| 106 | c->x86_coreid_bits = bits; | ||
| 107 | |||
| 108 | #endif | ||
| 109 | } | ||
| 110 | |||
| 111 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | ||
| 112 | { | ||
| 113 | early_init_amd_mc(c); | ||
| 114 | |||
| 115 | /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ | ||
| 116 | if (c->x86_power & (1<<8)) | ||
| 117 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 118 | } | ||
| 119 | |||
| 120 | static void __cpuinit init_amd(struct cpuinfo_x86 *c) | ||
| 121 | { | ||
| 122 | unsigned level; | ||
| 123 | |||
| 124 | #ifdef CONFIG_SMP | ||
| 125 | unsigned long value; | ||
| 126 | |||
| 127 | /* | ||
| 128 | * Disable TLB flush filter by setting HWCR.FFDIS on K8 | ||
| 129 | * bit 6 of msr C001_0015 | ||
| 130 | * | ||
| 131 | * Errata 63 for SH-B3 steppings | ||
| 132 | * Errata 122 for all steppings (F+ have it disabled by default) | ||
| 133 | */ | ||
| 134 | if (c->x86 == 15) { | ||
| 135 | rdmsrl(MSR_K8_HWCR, value); | ||
| 136 | value |= 1 << 6; | ||
| 137 | wrmsrl(MSR_K8_HWCR, value); | ||
| 138 | } | ||
| 139 | #endif | ||
| 140 | |||
| 141 | /* Bit 31 in normal CPUID used for nonstandard 3DNow ID; | ||
| 142 | 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ | ||
| 143 | clear_cpu_cap(c, 0*32+31); | ||
| 144 | |||
| 145 | /* On C+ stepping K8 rep microcode works well for copy/memset */ | ||
| 146 | level = cpuid_eax(1); | ||
| 147 | if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || | ||
| 148 | level >= 0x0f58)) | ||
| 149 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 150 | if (c->x86 == 0x10 || c->x86 == 0x11) | ||
| 151 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 152 | |||
| 153 | /* Enable workaround for FXSAVE leak */ | ||
| 154 | if (c->x86 >= 6) | ||
| 155 | set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK); | ||
| 156 | |||
| 157 | level = get_model_name(c); | ||
| 158 | if (!level) { | ||
| 159 | switch (c->x86) { | ||
| 160 | case 15: | ||
| 161 | /* Should distinguish Models here, but this is only | ||
| 162 | a fallback anyways. */ | ||
| 163 | strcpy(c->x86_model_id, "Hammer"); | ||
| 164 | break; | ||
| 165 | } | ||
| 166 | } | ||
| 167 | display_cacheinfo(c); | ||
| 168 | |||
| 169 | /* Multi core CPU? */ | ||
| 170 | if (c->extended_cpuid_level >= 0x80000008) | ||
| 171 | amd_detect_cmp(c); | ||
| 172 | |||
| 173 | if (c->extended_cpuid_level >= 0x80000006 && | ||
| 174 | (cpuid_edx(0x80000006) & 0xf000)) | ||
| 175 | num_cache_leaves = 4; | ||
| 176 | else | ||
| 177 | num_cache_leaves = 3; | ||
| 178 | |||
| 179 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) | ||
| 180 | set_cpu_cap(c, X86_FEATURE_K8); | ||
| 181 | |||
| 182 | /* MFENCE stops RDTSC speculation */ | ||
| 183 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | ||
| 184 | |||
| 185 | if (c->x86 == 0x10) | ||
| 186 | fam10h_check_enable_mmcfg(); | ||
| 187 | |||
| 188 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { | ||
| 189 | unsigned long long tseg; | ||
| 190 | |||
| 191 | /* | ||
| 192 | * Split up direct mapping around the TSEG SMM area. | ||
| 193 | * Don't do it for gbpages because there seems very little | ||
| 194 | * benefit in doing so. | ||
| 195 | */ | ||
| 196 | if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg) && | ||
| 197 | (tseg >> PMD_SHIFT) < | ||
| 198 | (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) | ||
| 199 | set_memory_4k((unsigned long)__va(tseg), 1); | ||
| 200 | } | ||
| 201 | } | ||
| 202 | |||
| 203 | static struct cpu_dev amd_cpu_dev __cpuinitdata = { | ||
| 204 | .c_vendor = "AMD", | ||
| 205 | .c_ident = { "AuthenticAMD" }, | ||
| 206 | .c_early_init = early_init_amd, | ||
| 207 | .c_init = init_amd, | ||
| 208 | }; | ||
| 209 | |||
| 210 | cpu_vendor_dev_register(X86_VENDOR_AMD, &amd_cpu_dev); | ||
| 211 | |||
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 170d2f5523b2..1b1c56bb338f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
| @@ -59,8 +59,12 @@ static void __init check_fpu(void) | |||
| 59 | return; | 59 | return; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* trap_init() enabled FXSR and company _before_ testing for FP problems here. */ | 62 | /* |
| 63 | /* Test for the divl bug.. */ | 63 | * trap_init() enabled FXSR and company _before_ testing for FP |
| 64 | * problems here. | ||
| 65 | * | ||
| 66 | * Test for the divl bug.. | ||
| 67 | */ | ||
| 64 | __asm__("fninit\n\t" | 68 | __asm__("fninit\n\t" |
| 65 | "fldl %1\n\t" | 69 | "fldl %1\n\t" |
| 66 | "fdivl %2\n\t" | 70 | "fdivl %2\n\t" |
| @@ -108,10 +112,15 @@ static void __init check_popad(void) | |||
| 108 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " | 112 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " |
| 109 | : "=&a" (res) | 113 | : "=&a" (res) |
| 110 | : "d" (inp) | 114 | : "d" (inp) |
| 111 | : "ecx", "edi" ); | 115 | : "ecx", "edi"); |
| 112 | /* If this fails, it means that any user program may lock the CPU hard. Too bad. */ | 116 | /* |
| 113 | if (res != 12345678) printk( "Buggy.\n" ); | 117 | * If this fails, it means that any user program may lock the |
| 114 | else printk( "OK.\n" ); | 118 | * CPU hard. Too bad. |
| 119 | */ | ||
| 120 | if (res != 12345678) | ||
| 121 | printk("Buggy.\n"); | ||
| 122 | else | ||
| 123 | printk("OK.\n"); | ||
| 115 | #endif | 124 | #endif |
| 116 | } | 125 | } |
| 117 | 126 | ||
| @@ -137,7 +146,8 @@ static void __init check_config(void) | |||
| 137 | * i486+ only features! (WP works in supervisor mode and the | 146 | * i486+ only features! (WP works in supervisor mode and the |
| 138 | * new "invlpg" and "bswap" instructions) | 147 | * new "invlpg" and "bswap" instructions) |
| 139 | */ | 148 | */ |
| 140 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_BSWAP) | 149 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || \ |
| 150 | defined(CONFIG_X86_BSWAP) | ||
| 141 | if (boot_cpu_data.x86 == 3) | 151 | if (boot_cpu_data.x86 == 3) |
| 142 | panic("Kernel requires i486+ for 'invlpg' and other features"); | 152 | panic("Kernel requires i486+ for 'invlpg' and other features"); |
| 143 | #endif | 153 | #endif |
| @@ -170,6 +180,7 @@ void __init check_bugs(void) | |||
| 170 | check_fpu(); | 180 | check_fpu(); |
| 171 | check_hlt(); | 181 | check_hlt(); |
| 172 | check_popad(); | 182 | check_popad(); |
| 173 | init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | 183 | init_utsname()->machine[1] = |
| 184 | '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | ||
| 174 | alternative_instructions(); | 185 | alternative_instructions(); |
| 175 | } | 186 | } |
diff --git a/arch/x86/kernel/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c index 9a3ed0649d4e..9a3ed0649d4e 100644 --- a/arch/x86/kernel/bugs_64.c +++ b/arch/x86/kernel/cpu/bugs_64.c | |||
diff --git a/arch/x86/kernel/cpu/centaur_64.c b/arch/x86/kernel/cpu/centaur_64.c new file mode 100644 index 000000000000..13526fd5cce1 --- /dev/null +++ b/arch/x86/kernel/cpu/centaur_64.c | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/smp.h> | ||
| 3 | |||
| 4 | #include <asm/cpufeature.h> | ||
| 5 | #include <asm/processor.h> | ||
| 6 | |||
| 7 | #include "cpu.h" | ||
| 8 | |||
| 9 | static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) | ||
| 10 | { | ||
| 11 | if (c->x86 == 0x6 && c->x86_model >= 0xf) | ||
| 12 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 13 | } | ||
| 14 | |||
| 15 | static void __cpuinit init_centaur(struct cpuinfo_x86 *c) | ||
| 16 | { | ||
| 17 | /* Cache sizes */ | ||
| 18 | unsigned n; | ||
| 19 | |||
| 20 | n = c->extended_cpuid_level; | ||
| 21 | if (n >= 0x80000008) { | ||
| 22 | unsigned eax = cpuid_eax(0x80000008); | ||
| 23 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
| 24 | c->x86_phys_bits = eax & 0xff; | ||
| 25 | } | ||
| 26 | |||
| 27 | if (c->x86 == 0x6 && c->x86_model >= 0xf) { | ||
| 28 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
| 29 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 30 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 31 | } | ||
| 32 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
| 33 | } | ||
| 34 | |||
| 35 | static struct cpu_dev centaur_cpu_dev __cpuinitdata = { | ||
| 36 | .c_vendor = "Centaur", | ||
| 37 | .c_ident = { "CentaurHauls" }, | ||
| 38 | .c_early_init = early_init_centaur, | ||
| 39 | .c_init = init_centaur, | ||
| 40 | }; | ||
| 41 | |||
| 42 | cpu_vendor_dev_register(X86_VENDOR_CENTAUR, ¢aur_cpu_dev); | ||
| 43 | |||
diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 783691b2a738..4d894e8565fe 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef ARCH_X86_CPU_H | ||
| 2 | |||
| 3 | #define ARCH_X86_CPU_H | ||
| 1 | 4 | ||
| 2 | struct cpu_model_info { | 5 | struct cpu_model_info { |
| 3 | int vendor; | 6 | int vendor; |
| @@ -36,3 +39,5 @@ extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; | |||
| 36 | 39 | ||
| 37 | extern int get_model_name(struct cpuinfo_x86 *c); | 40 | extern int get_model_name(struct cpuinfo_x86 *c); |
| 38 | extern void display_cacheinfo(struct cpuinfo_x86 *c); | 41 | extern void display_cacheinfo(struct cpuinfo_x86 *c); |
| 42 | |||
| 43 | #endif | ||
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c index f03e9153618e..965ea52767ac 100644 --- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c +++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | |||
| @@ -26,9 +26,10 @@ | |||
| 26 | #define NFORCE2_SAFE_DISTANCE 50 | 26 | #define NFORCE2_SAFE_DISTANCE 50 |
| 27 | 27 | ||
| 28 | /* Delay in ms between FSB changes */ | 28 | /* Delay in ms between FSB changes */ |
| 29 | //#define NFORCE2_DELAY 10 | 29 | /* #define NFORCE2_DELAY 10 */ |
| 30 | 30 | ||
| 31 | /* nforce2_chipset: | 31 | /* |
| 32 | * nforce2_chipset: | ||
| 32 | * FSB is changed using the chipset | 33 | * FSB is changed using the chipset |
| 33 | */ | 34 | */ |
| 34 | static struct pci_dev *nforce2_chipset_dev; | 35 | static struct pci_dev *nforce2_chipset_dev; |
| @@ -36,13 +37,13 @@ static struct pci_dev *nforce2_chipset_dev; | |||
| 36 | /* fid: | 37 | /* fid: |
| 37 | * multiplier * 10 | 38 | * multiplier * 10 |
| 38 | */ | 39 | */ |
| 39 | static int fid = 0; | 40 | static int fid; |
| 40 | 41 | ||
| 41 | /* min_fsb, max_fsb: | 42 | /* min_fsb, max_fsb: |
| 42 | * minimum and maximum FSB (= FSB at boot time) | 43 | * minimum and maximum FSB (= FSB at boot time) |
| 43 | */ | 44 | */ |
| 44 | static int min_fsb = 0; | 45 | static int min_fsb; |
| 45 | static int max_fsb = 0; | 46 | static int max_fsb; |
| 46 | 47 | ||
| 47 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); | 48 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); |
| 48 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); | 49 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); |
| @@ -53,7 +54,7 @@ module_param(min_fsb, int, 0444); | |||
| 53 | 54 | ||
| 54 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); | 55 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); |
| 55 | MODULE_PARM_DESC(min_fsb, | 56 | MODULE_PARM_DESC(min_fsb, |
| 56 | "Minimum FSB to use, if not defined: current FSB - 50"); | 57 | "Minimum FSB to use, if not defined: current FSB - 50"); |
| 57 | 58 | ||
| 58 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) | 59 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) |
| 59 | 60 | ||
| @@ -139,7 +140,7 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
| 139 | 140 | ||
| 140 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ | 141 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ |
| 141 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, | 142 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, |
| 142 | 0x01EF,PCI_ANY_ID,PCI_ANY_ID,NULL); | 143 | 0x01EF, PCI_ANY_ID, PCI_ANY_ID, NULL); |
| 143 | if (!nforce2_sub5) | 144 | if (!nforce2_sub5) |
| 144 | return 0; | 145 | return 0; |
| 145 | 146 | ||
| @@ -147,13 +148,13 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
| 147 | fsb /= 1000000; | 148 | fsb /= 1000000; |
| 148 | 149 | ||
| 149 | /* Check if PLL register is already set */ | 150 | /* Check if PLL register is already set */ |
| 150 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 151 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
| 151 | 152 | ||
| 152 | if(bootfsb || !temp) | 153 | if (bootfsb || !temp) |
| 153 | return fsb; | 154 | return fsb; |
| 154 | 155 | ||
| 155 | /* Use PLL register FSB value */ | 156 | /* Use PLL register FSB value */ |
| 156 | pci_read_config_dword(nforce2_chipset_dev,NFORCE2_PLLREG, &temp); | 157 | pci_read_config_dword(nforce2_chipset_dev, NFORCE2_PLLREG, &temp); |
| 157 | fsb = nforce2_calc_fsb(temp); | 158 | fsb = nforce2_calc_fsb(temp); |
| 158 | 159 | ||
| 159 | return fsb; | 160 | return fsb; |
| @@ -184,7 +185,7 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | /* First write? Then set actual value */ | 187 | /* First write? Then set actual value */ |
| 187 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 188 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
| 188 | if (!temp) { | 189 | if (!temp) { |
| 189 | pll = nforce2_calc_pll(tfsb); | 190 | pll = nforce2_calc_pll(tfsb); |
| 190 | 191 | ||
| @@ -210,7 +211,8 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
| 210 | tfsb--; | 211 | tfsb--; |
| 211 | 212 | ||
| 212 | /* Calculate the PLL reg. value */ | 213 | /* Calculate the PLL reg. value */ |
| 213 | if ((pll = nforce2_calc_pll(tfsb)) == -1) | 214 | pll = nforce2_calc_pll(tfsb); |
| 215 | if (pll == -1) | ||
| 214 | return -EINVAL; | 216 | return -EINVAL; |
| 215 | 217 | ||
| 216 | nforce2_write_pll(pll); | 218 | nforce2_write_pll(pll); |
| @@ -249,7 +251,7 @@ static unsigned int nforce2_get(unsigned int cpu) | |||
| 249 | static int nforce2_target(struct cpufreq_policy *policy, | 251 | static int nforce2_target(struct cpufreq_policy *policy, |
| 250 | unsigned int target_freq, unsigned int relation) | 252 | unsigned int target_freq, unsigned int relation) |
| 251 | { | 253 | { |
| 252 | // unsigned long flags; | 254 | /* unsigned long flags; */ |
| 253 | struct cpufreq_freqs freqs; | 255 | struct cpufreq_freqs freqs; |
| 254 | unsigned int target_fsb; | 256 | unsigned int target_fsb; |
| 255 | 257 | ||
| @@ -271,17 +273,17 @@ static int nforce2_target(struct cpufreq_policy *policy, | |||
| 271 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | 273 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); |
| 272 | 274 | ||
| 273 | /* Disable IRQs */ | 275 | /* Disable IRQs */ |
| 274 | //local_irq_save(flags); | 276 | /* local_irq_save(flags); */ |
| 275 | 277 | ||
| 276 | if (nforce2_set_fsb(target_fsb) < 0) | 278 | if (nforce2_set_fsb(target_fsb) < 0) |
| 277 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", | 279 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", |
| 278 | target_fsb); | 280 | target_fsb); |
| 279 | else | 281 | else |
| 280 | dprintk("Changed FSB successfully to %d\n", | 282 | dprintk("Changed FSB successfully to %d\n", |
| 281 | target_fsb); | 283 | target_fsb); |
| 282 | 284 | ||
| 283 | /* Enable IRQs */ | 285 | /* Enable IRQs */ |
| 284 | //local_irq_restore(flags); | 286 | /* local_irq_restore(flags); */ |
| 285 | 287 | ||
| 286 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | 288 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); |
| 287 | 289 | ||
| @@ -302,8 +304,8 @@ static int nforce2_verify(struct cpufreq_policy *policy) | |||
| 302 | policy->max = (fsb_pol_max + 1) * fid * 100; | 304 | policy->max = (fsb_pol_max + 1) * fid * 100; |
| 303 | 305 | ||
| 304 | cpufreq_verify_within_limits(policy, | 306 | cpufreq_verify_within_limits(policy, |
| 305 | policy->cpuinfo.min_freq, | 307 | policy->cpuinfo.min_freq, |
| 306 | policy->cpuinfo.max_freq); | 308 | policy->cpuinfo.max_freq); |
| 307 | return 0; | 309 | return 0; |
| 308 | } | 310 | } |
| 309 | 311 | ||
| @@ -347,7 +349,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) | |||
| 347 | /* Set maximum FSB to FSB at boot time */ | 349 | /* Set maximum FSB to FSB at boot time */ |
| 348 | max_fsb = nforce2_fsb_read(1); | 350 | max_fsb = nforce2_fsb_read(1); |
| 349 | 351 | ||
| 350 | if(!max_fsb) | 352 | if (!max_fsb) |
| 351 | return -EIO; | 353 | return -EIO; |
| 352 | 354 | ||
| 353 | if (!min_fsb) | 355 | if (!min_fsb) |
diff --git a/arch/x86/kernel/cpu/intel_64.c b/arch/x86/kernel/cpu/intel_64.c new file mode 100644 index 000000000000..fcb1cc9d75ca --- /dev/null +++ b/arch/x86/kernel/cpu/intel_64.c | |||
| @@ -0,0 +1,103 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/smp.h> | ||
| 3 | #include <asm/processor.h> | ||
| 4 | #include <asm/ptrace.h> | ||
| 5 | #include <asm/topology.h> | ||
| 6 | #include <asm/numa_64.h> | ||
| 7 | |||
| 8 | #include "cpu.h" | ||
| 9 | |||
| 10 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | ||
| 11 | { | ||
| 12 | if ((c->x86 == 0xf && c->x86_model >= 0x03) || | ||
| 13 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) | ||
| 14 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 15 | } | ||
| 16 | |||
| 17 | /* | ||
| 18 | * find out the number of processor cores on the die | ||
| 19 | */ | ||
| 20 | static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) | ||
| 21 | { | ||
| 22 | unsigned int eax, t; | ||
| 23 | |||
| 24 | if (c->cpuid_level < 4) | ||
| 25 | return 1; | ||
| 26 | |||
| 27 | cpuid_count(4, 0, &eax, &t, &t, &t); | ||
| 28 | |||
| 29 | if (eax & 0x1f) | ||
| 30 | return ((eax >> 26) + 1); | ||
| 31 | else | ||
| 32 | return 1; | ||
| 33 | } | ||
| 34 | |||
| 35 | static void __cpuinit srat_detect_node(void) | ||
| 36 | { | ||
| 37 | #ifdef CONFIG_NUMA | ||
| 38 | unsigned node; | ||
| 39 | int cpu = smp_processor_id(); | ||
| 40 | int apicid = hard_smp_processor_id(); | ||
| 41 | |||
| 42 | /* Don't do the funky fallback heuristics the AMD version employs | ||
| 43 | for now. */ | ||
| 44 | node = apicid_to_node[apicid]; | ||
| 45 | if (node == NUMA_NO_NODE || !node_online(node)) | ||
| 46 | node = first_node(node_online_map); | ||
| 47 | numa_set_node(cpu, node); | ||
| 48 | |||
| 49 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
| 50 | #endif | ||
| 51 | } | ||
| 52 | |||
| 53 | static void __cpuinit init_intel(struct cpuinfo_x86 *c) | ||
| 54 | { | ||
| 55 | /* Cache sizes */ | ||
| 56 | unsigned n; | ||
| 57 | |||
| 58 | init_intel_cacheinfo(c); | ||
| 59 | if (c->cpuid_level > 9) { | ||
| 60 | unsigned eax = cpuid_eax(10); | ||
| 61 | /* Check for version and the number of counters */ | ||
| 62 | if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) | ||
| 63 | set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON); | ||
| 64 | } | ||
| 65 | |||
| 66 | if (cpu_has_ds) { | ||
| 67 | unsigned int l1, l2; | ||
| 68 | rdmsr(MSR_IA32_MISC_ENABLE, l1, l2); | ||
| 69 | if (!(l1 & (1<<11))) | ||
| 70 | set_cpu_cap(c, X86_FEATURE_BTS); | ||
| 71 | if (!(l1 & (1<<12))) | ||
| 72 | set_cpu_cap(c, X86_FEATURE_PEBS); | ||
| 73 | } | ||
| 74 | |||
| 75 | |||
| 76 | if (cpu_has_bts) | ||
| 77 | ds_init_intel(c); | ||
| 78 | |||
| 79 | n = c->extended_cpuid_level; | ||
| 80 | if (n >= 0x80000008) { | ||
| 81 | unsigned eax = cpuid_eax(0x80000008); | ||
| 82 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
| 83 | c->x86_phys_bits = eax & 0xff; | ||
| 84 | } | ||
| 85 | |||
| 86 | if (c->x86 == 15) | ||
| 87 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
| 88 | if (c->x86 == 6) | ||
| 89 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 90 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
| 91 | c->x86_max_cores = intel_num_cpu_cores(c); | ||
| 92 | |||
| 93 | srat_detect_node(); | ||
| 94 | } | ||
| 95 | |||
| 96 | static struct cpu_dev intel_cpu_dev __cpuinitdata = { | ||
| 97 | .c_vendor = "Intel", | ||
| 98 | .c_ident = { "GenuineIntel" }, | ||
| 99 | .c_early_init = early_init_intel, | ||
| 100 | .c_init = init_intel, | ||
| 101 | }; | ||
| 102 | cpu_vendor_dev_register(X86_VENDOR_INTEL, &intel_cpu_dev); | ||
| 103 | |||
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 26d615dcb149..2c8afafa18e8 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
| @@ -62,6 +62,7 @@ static struct _cache_table cache_table[] __cpuinitdata = | |||
| 62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ | 62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ |
| 63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ | 63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ |
| 64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ | 64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ |
| 65 | { 0x4e, LVL_2, 6144 }, /* 24-way set assoc, 64 byte line size */ | ||
| 65 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ | 66 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ |
| 66 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 67 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
| 67 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 68 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
diff --git a/arch/x86/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c index e633c9c2b764..f390c9f66351 100644 --- a/arch/x86/kernel/cpu/mcheck/k7.c +++ b/arch/x86/kernel/cpu/mcheck/k7.c | |||
| @@ -9,23 +9,23 @@ | |||
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 11 | 11 | ||
| 12 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 14 | #include <asm/msr.h> | 14 | #include <asm/msr.h> |
| 15 | 15 | ||
| 16 | #include "mce.h" | 16 | #include "mce.h" |
| 17 | 17 | ||
| 18 | /* Machine Check Handler For AMD Athlon/Duron */ | 18 | /* Machine Check Handler For AMD Athlon/Duron */ |
| 19 | static void k7_machine_check(struct pt_regs * regs, long error_code) | 19 | static void k7_machine_check(struct pt_regs *regs, long error_code) |
| 20 | { | 20 | { |
| 21 | int recover=1; | 21 | int recover = 1; |
| 22 | u32 alow, ahigh, high, low; | 22 | u32 alow, ahigh, high, low; |
| 23 | u32 mcgstl, mcgsth; | 23 | u32 mcgstl, mcgsth; |
| 24 | int i; | 24 | int i; |
| 25 | 25 | ||
| 26 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 26 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 27 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 27 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
| 28 | recover=0; | 28 | recover = 0; |
| 29 | 29 | ||
| 30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
| 31 | smp_processor_id(), mcgsth, mcgstl); | 31 | smp_processor_id(), mcgsth, mcgstl); |
| @@ -60,12 +60,12 @@ static void k7_machine_check(struct pt_regs * regs, long error_code) | |||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | if (recover&2) | 62 | if (recover&2) |
| 63 | panic ("CPU context corrupt"); | 63 | panic("CPU context corrupt"); |
| 64 | if (recover&1) | 64 | if (recover&1) |
| 65 | panic ("Unable to continue"); | 65 | panic("Unable to continue"); |
| 66 | printk (KERN_EMERG "Attempting to continue.\n"); | 66 | printk(KERN_EMERG "Attempting to continue.\n"); |
| 67 | mcgstl &= ~(1<<2); | 67 | mcgstl &= ~(1<<2); |
| 68 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 68 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | 71 | ||
| @@ -81,25 +81,25 @@ void amd_mcheck_init(struct cpuinfo_x86 *c) | |||
| 81 | machine_check_vector = k7_machine_check; | 81 | machine_check_vector = k7_machine_check; |
| 82 | wmb(); | 82 | wmb(); |
| 83 | 83 | ||
| 84 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 84 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
| 85 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 85 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 86 | if (l & (1<<8)) /* Control register present ? */ | 86 | if (l & (1<<8)) /* Control register present ? */ |
| 87 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 87 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 88 | nr_mce_banks = l & 0xff; | 88 | nr_mce_banks = l & 0xff; |
| 89 | 89 | ||
| 90 | /* Clear status for MC index 0 separately, we don't touch CTL, | 90 | /* Clear status for MC index 0 separately, we don't touch CTL, |
| 91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ | 91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ |
| 92 | if (boot_cpu_data.x86 == 6) { | 92 | if (boot_cpu_data.x86 == 6) { |
| 93 | wrmsr (MSR_IA32_MC0_STATUS, 0x0, 0x0); | 93 | wrmsr(MSR_IA32_MC0_STATUS, 0x0, 0x0); |
| 94 | i = 1; | 94 | i = 1; |
| 95 | } else | 95 | } else |
| 96 | i = 0; | 96 | i = 0; |
| 97 | for (; i<nr_mce_banks; i++) { | 97 | for (; i < nr_mce_banks; i++) { |
| 98 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 98 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
| 99 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 99 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | set_in_cr4 (X86_CR4_MCE); | 102 | set_in_cr4(X86_CR4_MCE); |
| 103 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 103 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
| 104 | smp_processor_id()); | 104 | smp_processor_id()); |
| 105 | } | 105 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index e07e8c068ae0..501ca1cea27d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/idle.h> | 31 | #include <asm/idle.h> |
| 32 | 32 | ||
| 33 | #define MISC_MCELOG_MINOR 227 | 33 | #define MISC_MCELOG_MINOR 227 |
| 34 | #define NR_BANKS 6 | 34 | #define NR_SYSFS_BANKS 6 |
| 35 | 35 | ||
| 36 | atomic_t mce_entry; | 36 | atomic_t mce_entry; |
| 37 | 37 | ||
| @@ -46,7 +46,7 @@ static int mce_dont_init; | |||
| 46 | */ | 46 | */ |
| 47 | static int tolerant = 1; | 47 | static int tolerant = 1; |
| 48 | static int banks; | 48 | static int banks; |
| 49 | static unsigned long bank[NR_BANKS] = { [0 ... NR_BANKS-1] = ~0UL }; | 49 | static unsigned long bank[NR_SYSFS_BANKS] = { [0 ... NR_SYSFS_BANKS-1] = ~0UL }; |
| 50 | static unsigned long notify_user; | 50 | static unsigned long notify_user; |
| 51 | static int rip_msr; | 51 | static int rip_msr; |
| 52 | static int mce_bootlog = -1; | 52 | static int mce_bootlog = -1; |
| @@ -209,7 +209,7 @@ void do_machine_check(struct pt_regs * regs, long error_code) | |||
| 209 | barrier(); | 209 | barrier(); |
| 210 | 210 | ||
| 211 | for (i = 0; i < banks; i++) { | 211 | for (i = 0; i < banks; i++) { |
| 212 | if (!bank[i]) | 212 | if (i < NR_SYSFS_BANKS && !bank[i]) |
| 213 | continue; | 213 | continue; |
| 214 | 214 | ||
| 215 | m.misc = 0; | 215 | m.misc = 0; |
| @@ -444,9 +444,10 @@ static void mce_init(void *dummy) | |||
| 444 | 444 | ||
| 445 | rdmsrl(MSR_IA32_MCG_CAP, cap); | 445 | rdmsrl(MSR_IA32_MCG_CAP, cap); |
| 446 | banks = cap & 0xff; | 446 | banks = cap & 0xff; |
| 447 | if (banks > NR_BANKS) { | 447 | if (banks > MCE_EXTENDED_BANK) { |
| 448 | printk(KERN_INFO "MCE: warning: using only %d banks\n", banks); | 448 | banks = MCE_EXTENDED_BANK; |
| 449 | banks = NR_BANKS; | 449 | printk(KERN_INFO "MCE: warning: using only %d banks\n", |
| 450 | MCE_EXTENDED_BANK); | ||
| 450 | } | 451 | } |
| 451 | /* Use accurate RIP reporting if available. */ | 452 | /* Use accurate RIP reporting if available. */ |
| 452 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) | 453 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) |
| @@ -462,7 +463,11 @@ static void mce_init(void *dummy) | |||
| 462 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 463 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 463 | 464 | ||
| 464 | for (i = 0; i < banks; i++) { | 465 | for (i = 0; i < banks; i++) { |
| 465 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | 466 | if (i < NR_SYSFS_BANKS) |
| 467 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | ||
| 468 | else | ||
| 469 | wrmsrl(MSR_IA32_MC0_CTL+4*i, ~0UL); | ||
| 470 | |||
| 466 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); | 471 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); |
| 467 | } | 472 | } |
| 468 | } | 473 | } |
| @@ -766,7 +771,10 @@ DEFINE_PER_CPU(struct sys_device, device_mce); | |||
| 766 | } \ | 771 | } \ |
| 767 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); | 772 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); |
| 768 | 773 | ||
| 769 | /* TBD should generate these dynamically based on number of available banks */ | 774 | /* |
| 775 | * TBD should generate these dynamically based on number of available banks. | ||
| 776 | * Have only 6 contol banks in /sysfs until then. | ||
| 777 | */ | ||
| 770 | ACCESSOR(bank0ctl,bank[0],mce_restart()) | 778 | ACCESSOR(bank0ctl,bank[0],mce_restart()) |
| 771 | ACCESSOR(bank1ctl,bank[1],mce_restart()) | 779 | ACCESSOR(bank1ctl,bank[1],mce_restart()) |
| 772 | ACCESSOR(bank2ctl,bank[2],mce_restart()) | 780 | ACCESSOR(bank2ctl,bank[2],mce_restart()) |
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index cb03345554a5..eef001ad3bde 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
| 10 | 10 | ||
| 11 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 12 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 13 | #include <asm/msr.h> | 13 | #include <asm/msr.h> |
| 14 | #include <asm/apic.h> | 14 | #include <asm/apic.h> |
| @@ -32,12 +32,12 @@ struct intel_mce_extended_msrs { | |||
| 32 | /* u32 *reserved[]; */ | 32 | /* u32 *reserved[]; */ |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | static int mce_num_extended_msrs = 0; | 35 | static int mce_num_extended_msrs; |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | #ifdef CONFIG_X86_MCE_P4THERMAL | 38 | #ifdef CONFIG_X86_MCE_P4THERMAL |
| 39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) | 39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) |
| 40 | { | 40 | { |
| 41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", | 41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", |
| 42 | smp_processor_id()); | 42 | smp_processor_id()); |
| 43 | add_taint(TAINT_MACHINE_CHECK); | 43 | add_taint(TAINT_MACHINE_CHECK); |
| @@ -83,7 +83,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 83 | * be some SMM goo which handles it, so we can't even put a handler | 83 | * be some SMM goo which handles it, so we can't even put a handler |
| 84 | * since it might be delivered via SMI already -zwanem. | 84 | * since it might be delivered via SMI already -zwanem. |
| 85 | */ | 85 | */ |
| 86 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | 86 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
| 87 | h = apic_read(APIC_LVTTHMR); | 87 | h = apic_read(APIC_LVTTHMR); |
| 88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { | 88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { |
| 89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", | 89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", |
| @@ -91,7 +91,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 91 | return; /* -EBUSY */ | 91 | return; /* -EBUSY */ |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | /* check whether a vector already exists, temporarily masked? */ | 94 | /* check whether a vector already exists, temporarily masked? */ |
| 95 | if (h & APIC_VECTOR_MASK) { | 95 | if (h & APIC_VECTOR_MASK) { |
| 96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " | 96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " |
| 97 | "installed\n", | 97 | "installed\n", |
| @@ -104,18 +104,18 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ | 104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ |
| 105 | apic_write_around(APIC_LVTTHMR, h); | 105 | apic_write_around(APIC_LVTTHMR, h); |
| 106 | 106 | ||
| 107 | rdmsr (MSR_IA32_THERM_INTERRUPT, l, h); | 107 | rdmsr(MSR_IA32_THERM_INTERRUPT, l, h); |
| 108 | wrmsr (MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); | 108 | wrmsr(MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); |
| 109 | 109 | ||
| 110 | /* ok we're good to go... */ | 110 | /* ok we're good to go... */ |
| 111 | vendor_thermal_interrupt = intel_thermal_interrupt; | 111 | vendor_thermal_interrupt = intel_thermal_interrupt; |
| 112 | |||
| 113 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | ||
| 114 | wrmsr (MSR_IA32_MISC_ENABLE, l | (1<<3), h); | ||
| 115 | 112 | ||
| 116 | l = apic_read (APIC_LVTTHMR); | 113 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
| 117 | apic_write_around (APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | 114 | wrmsr(MSR_IA32_MISC_ENABLE, l | (1<<3), h); |
| 118 | printk (KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | 115 | |
| 116 | l = apic_read(APIC_LVTTHMR); | ||
| 117 | apic_write_around(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | ||
| 118 | printk(KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | ||
| 119 | 119 | ||
| 120 | /* enable thermal throttle processing */ | 120 | /* enable thermal throttle processing */ |
| 121 | atomic_set(&therm_throt_en, 1); | 121 | atomic_set(&therm_throt_en, 1); |
| @@ -129,28 +129,28 @@ static inline void intel_get_extended_msrs(struct intel_mce_extended_msrs *r) | |||
| 129 | { | 129 | { |
| 130 | u32 h; | 130 | u32 h; |
| 131 | 131 | ||
| 132 | rdmsr (MSR_IA32_MCG_EAX, r->eax, h); | 132 | rdmsr(MSR_IA32_MCG_EAX, r->eax, h); |
| 133 | rdmsr (MSR_IA32_MCG_EBX, r->ebx, h); | 133 | rdmsr(MSR_IA32_MCG_EBX, r->ebx, h); |
| 134 | rdmsr (MSR_IA32_MCG_ECX, r->ecx, h); | 134 | rdmsr(MSR_IA32_MCG_ECX, r->ecx, h); |
| 135 | rdmsr (MSR_IA32_MCG_EDX, r->edx, h); | 135 | rdmsr(MSR_IA32_MCG_EDX, r->edx, h); |
| 136 | rdmsr (MSR_IA32_MCG_ESI, r->esi, h); | 136 | rdmsr(MSR_IA32_MCG_ESI, r->esi, h); |
| 137 | rdmsr (MSR_IA32_MCG_EDI, r->edi, h); | 137 | rdmsr(MSR_IA32_MCG_EDI, r->edi, h); |
| 138 | rdmsr (MSR_IA32_MCG_EBP, r->ebp, h); | 138 | rdmsr(MSR_IA32_MCG_EBP, r->ebp, h); |
| 139 | rdmsr (MSR_IA32_MCG_ESP, r->esp, h); | 139 | rdmsr(MSR_IA32_MCG_ESP, r->esp, h); |
| 140 | rdmsr (MSR_IA32_MCG_EFLAGS, r->eflags, h); | 140 | rdmsr(MSR_IA32_MCG_EFLAGS, r->eflags, h); |
| 141 | rdmsr (MSR_IA32_MCG_EIP, r->eip, h); | 141 | rdmsr(MSR_IA32_MCG_EIP, r->eip, h); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static void intel_machine_check(struct pt_regs * regs, long error_code) | 144 | static void intel_machine_check(struct pt_regs *regs, long error_code) |
| 145 | { | 145 | { |
| 146 | int recover=1; | 146 | int recover = 1; |
| 147 | u32 alow, ahigh, high, low; | 147 | u32 alow, ahigh, high, low; |
| 148 | u32 mcgstl, mcgsth; | 148 | u32 mcgstl, mcgsth; |
| 149 | int i; | 149 | int i; |
| 150 | 150 | ||
| 151 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 151 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 152 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 152 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
| 153 | recover=0; | 153 | recover = 0; |
| 154 | 154 | ||
| 155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
| 156 | smp_processor_id(), mcgsth, mcgstl); | 156 | smp_processor_id(), mcgsth, mcgstl); |
| @@ -191,20 +191,20 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | if (recover & 2) | 193 | if (recover & 2) |
| 194 | panic ("CPU context corrupt"); | 194 | panic("CPU context corrupt"); |
| 195 | if (recover & 1) | 195 | if (recover & 1) |
| 196 | panic ("Unable to continue"); | 196 | panic("Unable to continue"); |
| 197 | 197 | ||
| 198 | printk(KERN_EMERG "Attempting to continue.\n"); | 198 | printk(KERN_EMERG "Attempting to continue.\n"); |
| 199 | /* | 199 | /* |
| 200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not | 200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not |
| 201 | * recoverable/continuable.This will allow BIOS to look at the MSRs | 201 | * recoverable/continuable.This will allow BIOS to look at the MSRs |
| 202 | * for errors if the OS could not log the error. | 202 | * for errors if the OS could not log the error. |
| 203 | */ | 203 | */ |
| 204 | for (i=0; i<nr_mce_banks; i++) { | 204 | for (i = 0; i < nr_mce_banks; i++) { |
| 205 | u32 msr; | 205 | u32 msr; |
| 206 | msr = MSR_IA32_MC0_STATUS+i*4; | 206 | msr = MSR_IA32_MC0_STATUS+i*4; |
| 207 | rdmsr (msr, low, high); | 207 | rdmsr(msr, low, high); |
| 208 | if (high&(1<<31)) { | 208 | if (high&(1<<31)) { |
| 209 | /* Clear it */ | 209 | /* Clear it */ |
| 210 | wrmsr(msr, 0UL, 0UL); | 210 | wrmsr(msr, 0UL, 0UL); |
| @@ -214,7 +214,7 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
| 214 | } | 214 | } |
| 215 | } | 215 | } |
| 216 | mcgstl &= ~(1<<2); | 216 | mcgstl &= ~(1<<2); |
| 217 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 217 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | 220 | ||
| @@ -222,30 +222,30 @@ void intel_p4_mcheck_init(struct cpuinfo_x86 *c) | |||
| 222 | { | 222 | { |
| 223 | u32 l, h; | 223 | u32 l, h; |
| 224 | int i; | 224 | int i; |
| 225 | 225 | ||
| 226 | machine_check_vector = intel_machine_check; | 226 | machine_check_vector = intel_machine_check; |
| 227 | wmb(); | 227 | wmb(); |
| 228 | 228 | ||
| 229 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 229 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
| 230 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 230 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 231 | if (l & (1<<8)) /* Control register present ? */ | 231 | if (l & (1<<8)) /* Control register present ? */ |
| 232 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 232 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 233 | nr_mce_banks = l & 0xff; | 233 | nr_mce_banks = l & 0xff; |
| 234 | 234 | ||
| 235 | for (i=0; i<nr_mce_banks; i++) { | 235 | for (i = 0; i < nr_mce_banks; i++) { |
| 236 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 236 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
| 237 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 237 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | set_in_cr4 (X86_CR4_MCE); | 240 | set_in_cr4(X86_CR4_MCE); |
| 241 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 241 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
| 242 | smp_processor_id()); | 242 | smp_processor_id()); |
| 243 | 243 | ||
| 244 | /* Check for P4/Xeon extended MCE MSRs */ | 244 | /* Check for P4/Xeon extended MCE MSRs */ |
| 245 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 245 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 246 | if (l & (1<<9)) {/* MCG_EXT_P */ | 246 | if (l & (1<<9)) {/* MCG_EXT_P */ |
| 247 | mce_num_extended_msrs = (l >> 16) & 0xff; | 247 | mce_num_extended_msrs = (l >> 16) & 0xff; |
| 248 | printk (KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" | 248 | printk(KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" |
| 249 | " available\n", | 249 | " available\n", |
| 250 | smp_processor_id(), mce_num_extended_msrs); | 250 | smp_processor_id(), mce_num_extended_msrs); |
| 251 | 251 | ||
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 9f51e1ea9e82..84fd9f2a28ff 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
| @@ -98,17 +98,6 @@ static void __init nvidia_bugs(int num, int slot, int func) | |||
| 98 | 98 | ||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static void __init ati_bugs(int num, int slot, int func) | ||
| 102 | { | ||
| 103 | #ifdef CONFIG_X86_IO_APIC | ||
| 104 | if (timer_over_8254 == 1) { | ||
| 105 | timer_over_8254 = 0; | ||
| 106 | printk(KERN_INFO | ||
| 107 | "ATI board detected. Disabling timer routing over 8254.\n"); | ||
| 108 | } | ||
| 109 | #endif | ||
| 110 | } | ||
| 111 | |||
| 112 | #define QFLAG_APPLY_ONCE 0x1 | 101 | #define QFLAG_APPLY_ONCE 0x1 |
| 113 | #define QFLAG_APPLIED 0x2 | 102 | #define QFLAG_APPLIED 0x2 |
| 114 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) | 103 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) |
| @@ -126,8 +115,6 @@ static struct chipset early_qrk[] __initdata = { | |||
| 126 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, | 115 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, |
| 127 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, | 116 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, |
| 128 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, | 117 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, |
| 129 | { PCI_VENDOR_ID_ATI, PCI_ANY_ID, | ||
| 130 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, ati_bugs }, | ||
| 131 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, | 118 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, |
| 132 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, | 119 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, |
| 133 | {} | 120 | {} |
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c index 5d23d85624d4..4b63c8e1f13b 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/kernel/efi_32.c | |||
| @@ -49,13 +49,13 @@ void efi_call_phys_prelog(void) | |||
| 49 | local_irq_save(efi_rt_eflags); | 49 | local_irq_save(efi_rt_eflags); |
| 50 | 50 | ||
| 51 | /* | 51 | /* |
| 52 | * If I don't have PSE, I should just duplicate two entries in page | 52 | * If I don't have PAE, I should just duplicate two entries in page |
| 53 | * directory. If I have PSE, 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(); |
| 57 | 57 | ||
| 58 | if (cr4 & X86_CR4_PSE) { | 58 | if (cr4 & X86_CR4_PAE) { |
| 59 | efi_bak_pg_dir_pointer[0].pgd = | 59 | efi_bak_pg_dir_pointer[0].pgd = |
| 60 | swapper_pg_dir[pgd_index(0)].pgd; | 60 | swapper_pg_dir[pgd_index(0)].pgd; |
| 61 | swapper_pg_dir[0].pgd = | 61 | swapper_pg_dir[0].pgd = |
| @@ -93,7 +93,7 @@ void efi_call_phys_epilog(void) | |||
| 93 | 93 | ||
| 94 | cr4 = read_cr4(); | 94 | cr4 = read_cr4(); |
| 95 | 95 | ||
| 96 | if (cr4 & X86_CR4_PSE) { | 96 | if (cr4 & X86_CR4_PAE) { |
| 97 | swapper_pg_dir[pgd_index(0)].pgd = | 97 | swapper_pg_dir[pgd_index(0)].pgd = |
| 98 | efi_bak_pg_dir_pointer[0].pgd; | 98 | efi_bak_pg_dir_pointer[0].pgd; |
| 99 | } else { | 99 | } else { |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 556a8df522a7..5cf0aa993f4f 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -420,7 +420,6 @@ END(\label) | |||
| 420 | PTREGSCALL stub_clone, sys_clone, %r8 | 420 | PTREGSCALL stub_clone, sys_clone, %r8 |
| 421 | PTREGSCALL stub_fork, sys_fork, %rdi | 421 | PTREGSCALL stub_fork, sys_fork, %rdi |
| 422 | PTREGSCALL stub_vfork, sys_vfork, %rdi | 422 | PTREGSCALL stub_vfork, sys_vfork, %rdi |
| 423 | PTREGSCALL stub_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
| 424 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx | 423 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx |
| 425 | PTREGSCALL stub_iopl, sys_iopl, %rsi | 424 | PTREGSCALL stub_iopl, sys_iopl, %rsi |
| 426 | 425 | ||
| @@ -1120,10 +1119,6 @@ ENTRY(coprocessor_segment_overrun) | |||
| 1120 | zeroentry do_coprocessor_segment_overrun | 1119 | zeroentry do_coprocessor_segment_overrun |
| 1121 | END(coprocessor_segment_overrun) | 1120 | END(coprocessor_segment_overrun) |
| 1122 | 1121 | ||
| 1123 | ENTRY(reserved) | ||
| 1124 | zeroentry do_reserved | ||
| 1125 | END(reserved) | ||
| 1126 | |||
| 1127 | /* runs on exception stack */ | 1122 | /* runs on exception stack */ |
| 1128 | ENTRY(double_fault) | 1123 | ENTRY(double_fault) |
| 1129 | XCPT_FRAME | 1124 | XCPT_FRAME |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 10a1955bb1d1..263b9d14753e 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
| 19 | #include <asm/msr.h> | 19 | #include <asm/msr.h> |
| 20 | #include <asm/cache.h> | 20 | #include <asm/cache.h> |
| 21 | #include <asm/processor-flags.h> | ||
| 21 | 22 | ||
| 22 | #ifdef CONFIG_PARAVIRT | 23 | #ifdef CONFIG_PARAVIRT |
| 23 | #include <asm/asm-offsets.h> | 24 | #include <asm/asm-offsets.h> |
| @@ -128,7 +129,7 @@ ident_complete: | |||
| 128 | /* Fixup phys_base */ | 129 | /* Fixup phys_base */ |
| 129 | addq %rbp, phys_base(%rip) | 130 | addq %rbp, phys_base(%rip) |
| 130 | 131 | ||
| 131 | #ifdef CONFIG_SMP | 132 | #ifdef CONFIG_X86_TRAMPOLINE |
| 132 | addq %rbp, trampoline_level4_pgt + 0(%rip) | 133 | addq %rbp, trampoline_level4_pgt + 0(%rip) |
| 133 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) | 134 | addq %rbp, trampoline_level4_pgt + (511*8)(%rip) |
| 134 | #endif | 135 | #endif |
| @@ -154,9 +155,7 @@ ENTRY(secondary_startup_64) | |||
| 154 | */ | 155 | */ |
| 155 | 156 | ||
| 156 | /* Enable PAE mode and PGE */ | 157 | /* Enable PAE mode and PGE */ |
| 157 | xorq %rax, %rax | 158 | movl $(X86_CR4_PAE | X86_CR4_PGE), %eax |
| 158 | btsq $5, %rax | ||
| 159 | btsq $7, %rax | ||
| 160 | movq %rax, %cr4 | 159 | movq %rax, %cr4 |
| 161 | 160 | ||
| 162 | /* Setup early boot stage 4 level pagetables. */ | 161 | /* Setup early boot stage 4 level pagetables. */ |
| @@ -184,14 +183,10 @@ ENTRY(secondary_startup_64) | |||
| 184 | 1: wrmsr /* Make changes effective */ | 183 | 1: wrmsr /* Make changes effective */ |
| 185 | 184 | ||
| 186 | /* Setup cr0 */ | 185 | /* Setup cr0 */ |
| 187 | #define CR0_PM 1 /* protected mode */ | 186 | #define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ |
| 188 | #define CR0_MP (1<<1) | 187 | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ |
| 189 | #define CR0_ET (1<<4) | 188 | X86_CR0_PG) |
| 190 | #define CR0_NE (1<<5) | 189 | movl $CR0_STATE, %eax |
| 191 | #define CR0_WP (1<<16) | ||
| 192 | #define CR0_AM (1<<18) | ||
| 193 | #define CR0_PAGING (1<<31) | ||
| 194 | movl $CR0_PM|CR0_MP|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PAGING,%eax | ||
| 195 | /* Make changes effective */ | 190 | /* Make changes effective */ |
| 196 | movq %rax, %cr0 | 191 | movq %rax, %cr0 |
| 197 | 192 | ||
| @@ -327,11 +322,11 @@ early_idt_ripmsg: | |||
| 327 | ENTRY(name) | 322 | ENTRY(name) |
| 328 | 323 | ||
| 329 | /* Automate the creation of 1 to 1 mapping pmd entries */ | 324 | /* Automate the creation of 1 to 1 mapping pmd entries */ |
| 330 | #define PMDS(START, PERM, COUNT) \ | 325 | #define PMDS(START, PERM, COUNT) \ |
| 331 | i = 0 ; \ | 326 | i = 0 ; \ |
| 332 | .rept (COUNT) ; \ | 327 | .rept (COUNT) ; \ |
| 333 | .quad (START) + (i << 21) + (PERM) ; \ | 328 | .quad (START) + (i << PMD_SHIFT) + (PERM) ; \ |
| 334 | i = i + 1 ; \ | 329 | i = i + 1 ; \ |
| 335 | .endr | 330 | .endr |
| 336 | 331 | ||
| 337 | /* | 332 | /* |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 9b5cfcdfc426..ea230ec69057 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | /* FSEC = 10^-15 | 18 | /* FSEC = 10^-15 |
| 19 | NSEC = 10^-9 */ | 19 | NSEC = 10^-9 */ |
| 20 | #define FSEC_PER_NSEC 1000000 | 20 | #define FSEC_PER_NSEC 1000000L |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| 23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists | 23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists |
| @@ -206,20 +206,19 @@ static void hpet_enable_legacy_int(void) | |||
| 206 | 206 | ||
| 207 | static void hpet_legacy_clockevent_register(void) | 207 | static void hpet_legacy_clockevent_register(void) |
| 208 | { | 208 | { |
| 209 | uint64_t hpet_freq; | ||
| 210 | |||
| 211 | /* Start HPET legacy interrupts */ | 209 | /* Start HPET legacy interrupts */ |
| 212 | hpet_enable_legacy_int(); | 210 | hpet_enable_legacy_int(); |
| 213 | 211 | ||
| 214 | /* | 212 | /* |
| 215 | * The period is a femto seconds value. We need to calculate the | 213 | * The mult factor is defined as (include/linux/clockchips.h) |
| 216 | * scaled math multiplication factor for nanosecond to hpet tick | 214 | * mult/2^shift = cyc/ns (in contrast to ns/cyc in clocksource.h) |
| 217 | * conversion. | 215 | * hpet_period is in units of femtoseconds (per cycle), so |
| 216 | * mult/2^shift = cyc/ns = 10^6/hpet_period | ||
| 217 | * mult = (10^6 * 2^shift)/hpet_period | ||
| 218 | * mult = (FSEC_PER_NSEC << hpet_clockevent.shift)/hpet_period | ||
| 218 | */ | 219 | */ |
| 219 | hpet_freq = 1000000000000000ULL; | 220 | hpet_clockevent.mult = div_sc((unsigned long) FSEC_PER_NSEC, |
| 220 | do_div(hpet_freq, hpet_period); | 221 | hpet_period, hpet_clockevent.shift); |
| 221 | hpet_clockevent.mult = div_sc((unsigned long) hpet_freq, | ||
| 222 | NSEC_PER_SEC, hpet_clockevent.shift); | ||
| 223 | /* Calculate the min / max delta */ | 222 | /* Calculate the min / max delta */ |
| 224 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, | 223 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, |
| 225 | &hpet_clockevent); | 224 | &hpet_clockevent); |
| @@ -324,7 +323,7 @@ static struct clocksource clocksource_hpet = { | |||
| 324 | 323 | ||
| 325 | static int hpet_clocksource_register(void) | 324 | static int hpet_clocksource_register(void) |
| 326 | { | 325 | { |
| 327 | u64 tmp, start, now; | 326 | u64 start, now; |
| 328 | cycle_t t1; | 327 | cycle_t t1; |
| 329 | 328 | ||
| 330 | /* Start the counter */ | 329 | /* Start the counter */ |
| @@ -351,21 +350,15 @@ static int hpet_clocksource_register(void) | |||
| 351 | return -ENODEV; | 350 | return -ENODEV; |
| 352 | } | 351 | } |
| 353 | 352 | ||
| 354 | /* Initialize and register HPET clocksource | 353 | /* |
| 355 | * | 354 | * The definition of mult is (include/linux/clocksource.h) |
| 356 | * hpet period is in femto seconds per cycle | 355 | * mult/2^shift = ns/cyc and hpet_period is in units of fsec/cyc |
| 357 | * so we need to convert this to ns/cyc units | 356 | * so we first need to convert hpet_period to ns/cyc units: |
| 358 | * approximated by mult/2^shift | 357 | * mult/2^shift = ns/cyc = hpet_period/10^6 |
| 359 | * | 358 | * mult = (hpet_period * 2^shift)/10^6 |
| 360 | * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift | 359 | * mult = (hpet_period << shift)/FSEC_PER_NSEC |
| 361 | * fsec/cyc * 1ns/1000000fsec * 2^shift = mult | ||
| 362 | * fsec/cyc * 2^shift * 1nsec/1000000fsec = mult | ||
| 363 | * (fsec/cyc << shift)/1000000 = mult | ||
| 364 | * (hpet_period << shift)/FSEC_PER_NSEC = mult | ||
| 365 | */ | 360 | */ |
| 366 | tmp = (u64)hpet_period << HPET_SHIFT; | 361 | clocksource_hpet.mult = div_sc(hpet_period, FSEC_PER_NSEC, HPET_SHIFT); |
| 367 | do_div(tmp, FSEC_PER_NSEC); | ||
| 368 | clocksource_hpet.mult = (u32)tmp; | ||
| 369 | 362 | ||
| 370 | clocksource_register(&clocksource_hpet); | 363 | clocksource_register(&clocksource_hpet); |
| 371 | 364 | ||
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c index eb9ddd8efb82..95e80e5033c3 100644 --- a/arch/x86/kernel/i387.c +++ b/arch/x86/kernel/i387.c | |||
| @@ -162,7 +162,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset, | |||
| 162 | int ret; | 162 | int ret; |
| 163 | 163 | ||
| 164 | if (!cpu_has_fxsr) | 164 | if (!cpu_has_fxsr) |
| 165 | return -ENODEV; | 165 | return -EIO; |
| 166 | 166 | ||
| 167 | ret = init_fpu(target); | 167 | ret = init_fpu(target); |
| 168 | if (ret) | 168 | if (ret) |
| @@ -179,7 +179,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset, | |||
| 179 | int ret; | 179 | int ret; |
| 180 | 180 | ||
| 181 | if (!cpu_has_fxsr) | 181 | if (!cpu_has_fxsr) |
| 182 | return -ENODEV; | 182 | return -EIO; |
| 183 | 183 | ||
| 184 | ret = init_fpu(target); | 184 | ret = init_fpu(target); |
| 185 | if (ret) | 185 | if (ret) |
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259.c index fe631967d625..7a0fda8f01b5 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259.c | |||
| @@ -1,8 +1,10 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 2 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
| 3 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
| 4 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 7 | #include <linux/timex.h> | ||
| 6 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
| 7 | #include <linux/random.h> | 9 | #include <linux/random.h> |
| 8 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| @@ -10,10 +12,12 @@ | |||
| 10 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
| 11 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
| 12 | 14 | ||
| 15 | #include <asm/acpi.h> | ||
| 13 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
| 14 | #include <asm/system.h> | 17 | #include <asm/system.h> |
| 15 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 16 | #include <asm/timer.h> | 19 | #include <asm/timer.h> |
| 20 | #include <asm/hw_irq.h> | ||
| 17 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
| 18 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
| 19 | #include <asm/desc.h> | 23 | #include <asm/desc.h> |
| @@ -32,7 +36,7 @@ static int i8259A_auto_eoi; | |||
| 32 | DEFINE_SPINLOCK(i8259A_lock); | 36 | DEFINE_SPINLOCK(i8259A_lock); |
| 33 | static void mask_and_ack_8259A(unsigned int); | 37 | static void mask_and_ack_8259A(unsigned int); |
| 34 | 38 | ||
| 35 | static struct irq_chip i8259A_chip = { | 39 | struct irq_chip i8259A_chip = { |
| 36 | .name = "XT-PIC", | 40 | .name = "XT-PIC", |
| 37 | .mask = disable_8259A_irq, | 41 | .mask = disable_8259A_irq, |
| 38 | .disable = disable_8259A_irq, | 42 | .disable = disable_8259A_irq, |
| @@ -125,14 +129,14 @@ static inline int i8259A_irq_real(unsigned int irq) | |||
| 125 | int irqmask = 1<<irq; | 129 | int irqmask = 1<<irq; |
| 126 | 130 | ||
| 127 | if (irq < 8) { | 131 | if (irq < 8) { |
| 128 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | 132 | outb(0x0B, PIC_MASTER_CMD); /* ISR register */ |
| 129 | value = inb(PIC_MASTER_CMD) & irqmask; | 133 | value = inb(PIC_MASTER_CMD) & irqmask; |
| 130 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | 134 | outb(0x0A, PIC_MASTER_CMD); /* back to the IRR register */ |
| 131 | return value; | 135 | return value; |
| 132 | } | 136 | } |
| 133 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | 137 | outb(0x0B, PIC_SLAVE_CMD); /* ISR register */ |
| 134 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | 138 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); |
| 135 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | 139 | outb(0x0A, PIC_SLAVE_CMD); /* back to the IRR register */ |
| 136 | return value; | 140 | return value; |
| 137 | } | 141 | } |
| 138 | 142 | ||
| @@ -171,12 +175,14 @@ handle_real_irq: | |||
| 171 | if (irq & 8) { | 175 | if (irq & 8) { |
| 172 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | 176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ |
| 173 | outb(cached_slave_mask, PIC_SLAVE_IMR); | 177 | outb(cached_slave_mask, PIC_SLAVE_IMR); |
| 174 | outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ | 178 | /* 'Specific EOI' to slave */ |
| 175 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ | 179 | outb(0x60+(irq&7), PIC_SLAVE_CMD); |
| 180 | /* 'Specific EOI' to master-IRQ2 */ | ||
| 181 | outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); | ||
| 176 | } else { | 182 | } else { |
| 177 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | 183 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ |
| 178 | outb(cached_master_mask, PIC_MASTER_IMR); | 184 | outb(cached_master_mask, PIC_MASTER_IMR); |
| 179 | outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ | 185 | outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ |
| 180 | } | 186 | } |
| 181 | spin_unlock_irqrestore(&i8259A_lock, flags); | 187 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 182 | return; | 188 | return; |
| @@ -199,7 +205,8 @@ spurious_8259A_irq: | |||
| 199 | * lets ACK and report it. [once per IRQ] | 205 | * lets ACK and report it. [once per IRQ] |
| 200 | */ | 206 | */ |
| 201 | if (!(spurious_irq_mask & irqmask)) { | 207 | if (!(spurious_irq_mask & irqmask)) { |
| 202 | printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq); | 208 | printk(KERN_DEBUG |
| 209 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
| 203 | spurious_irq_mask |= irqmask; | 210 | spurious_irq_mask |= irqmask; |
| 204 | } | 211 | } |
| 205 | atomic_inc(&irq_err_count); | 212 | atomic_inc(&irq_err_count); |
| @@ -290,17 +297,34 @@ void init_8259A(int auto_eoi) | |||
| 290 | * outb_pic - this has to work on a wide range of PC hardware. | 297 | * outb_pic - this has to work on a wide range of PC hardware. |
| 291 | */ | 298 | */ |
| 292 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | 299 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ |
| 300 | #ifndef CONFIG_X86_64 | ||
| 293 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ | 301 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ |
| 294 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ | 302 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ |
| 303 | #else /* CONFIG_X86_64 */ | ||
| 304 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
| 305 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
| 306 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
| 307 | outb_pic(0x04, PIC_MASTER_IMR); | ||
| 308 | #endif /* CONFIG_X86_64 */ | ||
| 295 | if (auto_eoi) /* master does Auto EOI */ | 309 | if (auto_eoi) /* master does Auto EOI */ |
| 296 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | 310 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); |
| 297 | else /* master expects normal EOI */ | 311 | else /* master expects normal EOI */ |
| 298 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | 312 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); |
| 299 | 313 | ||
| 300 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | 314 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ |
| 315 | #ifndef CONFIG_X86_64 | ||
| 301 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ | 316 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ |
| 302 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ | 317 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ |
| 303 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ | 318 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ |
| 319 | #else /* CONFIG_X86_64 */ | ||
| 320 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
| 321 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
| 322 | /* 8259A-2 is a slave on master's IR2 */ | ||
| 323 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
| 324 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
| 325 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
| 326 | |||
| 327 | #endif /* CONFIG_X86_64 */ | ||
| 304 | if (auto_eoi) | 328 | if (auto_eoi) |
| 305 | /* | 329 | /* |
| 306 | * In AEOI mode we just have to mask the interrupt | 330 | * In AEOI mode we just have to mask the interrupt |
| @@ -317,93 +341,3 @@ void init_8259A(int auto_eoi) | |||
| 317 | 341 | ||
| 318 | spin_unlock_irqrestore(&i8259A_lock, flags); | 342 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 319 | } | 343 | } |
| 320 | |||
| 321 | /* | ||
| 322 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
| 323 | * as the irq is unreliable, and exception 16 works correctly | ||
| 324 | * (ie as explained in the intel literature). On a 386, you | ||
| 325 | * can't use exception 16 due to bad IBM design, so we have to | ||
| 326 | * rely on the less exact irq13. | ||
| 327 | * | ||
| 328 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
| 329 | * leads to races. IBM designers who came up with it should | ||
| 330 | * be shot. | ||
| 331 | */ | ||
| 332 | |||
| 333 | |||
| 334 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
| 335 | { | ||
| 336 | extern void math_error(void __user *); | ||
| 337 | outb(0,0xF0); | ||
| 338 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
| 339 | return IRQ_NONE; | ||
| 340 | math_error((void __user *)get_irq_regs()->ip); | ||
| 341 | return IRQ_HANDLED; | ||
| 342 | } | ||
| 343 | |||
| 344 | /* | ||
| 345 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
| 346 | * so allow interrupt sharing. | ||
| 347 | */ | ||
| 348 | static struct irqaction fpu_irq = { | ||
| 349 | .handler = math_error_irq, | ||
| 350 | .mask = CPU_MASK_NONE, | ||
| 351 | .name = "fpu", | ||
| 352 | }; | ||
| 353 | |||
| 354 | void __init init_ISA_irqs (void) | ||
| 355 | { | ||
| 356 | int i; | ||
| 357 | |||
| 358 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 359 | init_bsp_APIC(); | ||
| 360 | #endif | ||
| 361 | init_8259A(0); | ||
| 362 | |||
| 363 | /* | ||
| 364 | * 16 old-style INTA-cycle interrupts: | ||
| 365 | */ | ||
| 366 | for (i = 0; i < 16; i++) { | ||
| 367 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 368 | handle_level_irq, "XT"); | ||
| 369 | } | ||
| 370 | } | ||
| 371 | |||
| 372 | /* Overridden in paravirt.c */ | ||
| 373 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 374 | |||
| 375 | void __init native_init_IRQ(void) | ||
| 376 | { | ||
| 377 | int i; | ||
| 378 | |||
| 379 | /* all the set up before the call gates are initialised */ | ||
| 380 | pre_intr_init_hook(); | ||
| 381 | |||
| 382 | /* | ||
| 383 | * Cover the whole vector space, no vector can escape | ||
| 384 | * us. (some of these will be overridden and become | ||
| 385 | * 'special' SMP interrupts) | ||
| 386 | */ | ||
| 387 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 388 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 389 | if (i >= NR_IRQS) | ||
| 390 | break; | ||
| 391 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
| 392 | if (!test_bit(vector, used_vectors)) | ||
| 393 | set_intr_gate(vector, interrupt[i]); | ||
| 394 | } | ||
| 395 | |||
| 396 | /* setup after call gates are initialised (usually add in | ||
| 397 | * the architecture specific gates) | ||
| 398 | */ | ||
| 399 | intr_init_hook(); | ||
| 400 | |||
| 401 | /* | ||
| 402 | * External FPU? Set up irq13 if so, for | ||
| 403 | * original braindamaged IBM FERR coupling. | ||
| 404 | */ | ||
| 405 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
| 406 | setup_irq(FPU_IRQ, &fpu_irq); | ||
| 407 | |||
| 408 | irq_ctx_init(smp_processor_id()); | ||
| 409 | } | ||
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c deleted file mode 100644 index fa57a1568508..000000000000 --- a/arch/x86/kernel/i8259_64.c +++ /dev/null | |||
| @@ -1,512 +0,0 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 2 | #include <linux/errno.h> | ||
| 3 | #include <linux/signal.h> | ||
| 4 | #include <linux/sched.h> | ||
| 5 | #include <linux/ioport.h> | ||
| 6 | #include <linux/interrupt.h> | ||
| 7 | #include <linux/timex.h> | ||
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/random.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/kernel_stat.h> | ||
| 12 | #include <linux/sysdev.h> | ||
| 13 | #include <linux/bitops.h> | ||
| 14 | |||
| 15 | #include <asm/acpi.h> | ||
| 16 | #include <asm/atomic.h> | ||
| 17 | #include <asm/system.h> | ||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/hw_irq.h> | ||
| 20 | #include <asm/pgtable.h> | ||
| 21 | #include <asm/delay.h> | ||
| 22 | #include <asm/desc.h> | ||
| 23 | #include <asm/apic.h> | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * Common place to define all x86 IRQ vectors | ||
| 28 | * | ||
| 29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
| 30 | * | ||
| 31 | * These macros create the low-level assembly IRQ routines that save | ||
| 32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
| 33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
| 34 | * interrupt-controller happy. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #define BI(x,y) \ | ||
| 38 | BUILD_IRQ(x##y) | ||
| 39 | |||
| 40 | #define BUILD_16_IRQS(x) \ | ||
| 41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
| 42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
| 43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
| 44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
| 45 | |||
| 46 | /* | ||
| 47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
| 48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* | ||
| 52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
| 53 | * are unused but an SMP system is supposed to have enough memory ... | ||
| 54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
| 55 | * across the spectrum, so we really want to be prepared to get all | ||
| 56 | * of these. Plus, more powerful systems might have more than 64 | ||
| 57 | * IO-APIC registers. | ||
| 58 | * | ||
| 59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
| 60 | */ | ||
| 61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
| 62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
| 63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
| 64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
| 65 | |||
| 66 | #undef BUILD_16_IRQS | ||
| 67 | #undef BI | ||
| 68 | |||
| 69 | |||
| 70 | #define IRQ(x,y) \ | ||
| 71 | IRQ##x##y##_interrupt | ||
| 72 | |||
| 73 | #define IRQLIST_16(x) \ | ||
| 74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
| 75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
| 76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
| 77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
| 78 | |||
| 79 | /* for the irq vectors */ | ||
| 80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
| 81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
| 82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
| 83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
| 84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
| 85 | }; | ||
| 86 | |||
| 87 | #undef IRQ | ||
| 88 | #undef IRQLIST_16 | ||
| 89 | |||
| 90 | /* | ||
| 91 | * This is the 'legacy' 8259A Programmable Interrupt Controller, | ||
| 92 | * present in the majority of PC/AT boxes. | ||
| 93 | * plus some generic x86 specific things if generic specifics makes | ||
| 94 | * any sense at all. | ||
| 95 | * this file should become arch/i386/kernel/irq.c when the old irq.c | ||
| 96 | * moves to arch independent land | ||
| 97 | */ | ||
| 98 | |||
| 99 | static int i8259A_auto_eoi; | ||
| 100 | DEFINE_SPINLOCK(i8259A_lock); | ||
| 101 | static void mask_and_ack_8259A(unsigned int); | ||
| 102 | |||
| 103 | static struct irq_chip i8259A_chip = { | ||
| 104 | .name = "XT-PIC", | ||
| 105 | .mask = disable_8259A_irq, | ||
| 106 | .disable = disable_8259A_irq, | ||
| 107 | .unmask = enable_8259A_irq, | ||
| 108 | .mask_ack = mask_and_ack_8259A, | ||
| 109 | }; | ||
| 110 | |||
| 111 | /* | ||
| 112 | * 8259A PIC functions to handle ISA devices: | ||
| 113 | */ | ||
| 114 | |||
| 115 | /* | ||
| 116 | * This contains the irq mask for both 8259A irq controllers, | ||
| 117 | */ | ||
| 118 | unsigned int cached_irq_mask = 0xffff; | ||
| 119 | |||
| 120 | /* | ||
| 121 | * Not all IRQs can be routed through the IO-APIC, eg. on certain (older) | ||
| 122 | * boards the timer interrupt is not really connected to any IO-APIC pin, | ||
| 123 | * it's fed to the master 8259A's IR0 line only. | ||
| 124 | * | ||
| 125 | * Any '1' bit in this mask means the IRQ is routed through the IO-APIC. | ||
| 126 | * this 'mixed mode' IRQ handling costs nothing because it's only used | ||
| 127 | * at IRQ setup time. | ||
| 128 | */ | ||
| 129 | unsigned long io_apic_irqs; | ||
| 130 | |||
| 131 | void disable_8259A_irq(unsigned int irq) | ||
| 132 | { | ||
| 133 | unsigned int mask = 1 << irq; | ||
| 134 | unsigned long flags; | ||
| 135 | |||
| 136 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 137 | cached_irq_mask |= mask; | ||
| 138 | if (irq & 8) | ||
| 139 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 140 | else | ||
| 141 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 142 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 143 | } | ||
| 144 | |||
| 145 | void enable_8259A_irq(unsigned int irq) | ||
| 146 | { | ||
| 147 | unsigned int mask = ~(1 << irq); | ||
| 148 | unsigned long flags; | ||
| 149 | |||
| 150 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 151 | cached_irq_mask &= mask; | ||
| 152 | if (irq & 8) | ||
| 153 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 154 | else | ||
| 155 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 156 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 157 | } | ||
| 158 | |||
| 159 | int i8259A_irq_pending(unsigned int irq) | ||
| 160 | { | ||
| 161 | unsigned int mask = 1<<irq; | ||
| 162 | unsigned long flags; | ||
| 163 | int ret; | ||
| 164 | |||
| 165 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 166 | if (irq < 8) | ||
| 167 | ret = inb(PIC_MASTER_CMD) & mask; | ||
| 168 | else | ||
| 169 | ret = inb(PIC_SLAVE_CMD) & (mask >> 8); | ||
| 170 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 171 | |||
| 172 | return ret; | ||
| 173 | } | ||
| 174 | |||
| 175 | void make_8259A_irq(unsigned int irq) | ||
| 176 | { | ||
| 177 | disable_irq_nosync(irq); | ||
| 178 | io_apic_irqs &= ~(1<<irq); | ||
| 179 | set_irq_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq, | ||
| 180 | "XT"); | ||
| 181 | enable_irq(irq); | ||
| 182 | } | ||
| 183 | |||
| 184 | /* | ||
| 185 | * This function assumes to be called rarely. Switching between | ||
| 186 | * 8259A registers is slow. | ||
| 187 | * This has to be protected by the irq controller spinlock | ||
| 188 | * before being called. | ||
| 189 | */ | ||
| 190 | static inline int i8259A_irq_real(unsigned int irq) | ||
| 191 | { | ||
| 192 | int value; | ||
| 193 | int irqmask = 1<<irq; | ||
| 194 | |||
| 195 | if (irq < 8) { | ||
| 196 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | ||
| 197 | value = inb(PIC_MASTER_CMD) & irqmask; | ||
| 198 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | ||
| 199 | return value; | ||
| 200 | } | ||
| 201 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | ||
| 202 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | ||
| 203 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | ||
| 204 | return value; | ||
| 205 | } | ||
| 206 | |||
| 207 | /* | ||
| 208 | * Careful! The 8259A is a fragile beast, it pretty | ||
| 209 | * much _has_ to be done exactly like this (mask it | ||
| 210 | * first, _then_ send the EOI, and the order of EOI | ||
| 211 | * to the two 8259s is important! | ||
| 212 | */ | ||
| 213 | static void mask_and_ack_8259A(unsigned int irq) | ||
| 214 | { | ||
| 215 | unsigned int irqmask = 1 << irq; | ||
| 216 | unsigned long flags; | ||
| 217 | |||
| 218 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 219 | /* | ||
| 220 | * Lightweight spurious IRQ detection. We do not want | ||
| 221 | * to overdo spurious IRQ handling - it's usually a sign | ||
| 222 | * of hardware problems, so we only do the checks we can | ||
| 223 | * do without slowing down good hardware unnecessarily. | ||
| 224 | * | ||
| 225 | * Note that IRQ7 and IRQ15 (the two spurious IRQs | ||
| 226 | * usually resulting from the 8259A-1|2 PICs) occur | ||
| 227 | * even if the IRQ is masked in the 8259A. Thus we | ||
| 228 | * can check spurious 8259A IRQs without doing the | ||
| 229 | * quite slow i8259A_irq_real() call for every IRQ. | ||
| 230 | * This does not cover 100% of spurious interrupts, | ||
| 231 | * but should be enough to warn the user that there | ||
| 232 | * is something bad going on ... | ||
| 233 | */ | ||
| 234 | if (cached_irq_mask & irqmask) | ||
| 235 | goto spurious_8259A_irq; | ||
| 236 | cached_irq_mask |= irqmask; | ||
| 237 | |||
| 238 | handle_real_irq: | ||
| 239 | if (irq & 8) { | ||
| 240 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | ||
| 241 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 242 | /* 'Specific EOI' to slave */ | ||
| 243 | outb(0x60+(irq&7),PIC_SLAVE_CMD); | ||
| 244 | /* 'Specific EOI' to master-IRQ2 */ | ||
| 245 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); | ||
| 246 | } else { | ||
| 247 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | ||
| 248 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 249 | /* 'Specific EOI' to master */ | ||
| 250 | outb(0x60+irq,PIC_MASTER_CMD); | ||
| 251 | } | ||
| 252 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 253 | return; | ||
| 254 | |||
| 255 | spurious_8259A_irq: | ||
| 256 | /* | ||
| 257 | * this is the slow path - should happen rarely. | ||
| 258 | */ | ||
| 259 | if (i8259A_irq_real(irq)) | ||
| 260 | /* | ||
| 261 | * oops, the IRQ _is_ in service according to the | ||
| 262 | * 8259A - not spurious, go handle it. | ||
| 263 | */ | ||
| 264 | goto handle_real_irq; | ||
| 265 | |||
| 266 | { | ||
| 267 | static int spurious_irq_mask; | ||
| 268 | /* | ||
| 269 | * At this point we can be sure the IRQ is spurious, | ||
| 270 | * lets ACK and report it. [once per IRQ] | ||
| 271 | */ | ||
| 272 | if (!(spurious_irq_mask & irqmask)) { | ||
| 273 | printk(KERN_DEBUG | ||
| 274 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
| 275 | spurious_irq_mask |= irqmask; | ||
| 276 | } | ||
| 277 | atomic_inc(&irq_err_count); | ||
| 278 | /* | ||
| 279 | * Theoretically we do not have to handle this IRQ, | ||
| 280 | * but in Linux this does not cause problems and is | ||
| 281 | * simpler for us. | ||
| 282 | */ | ||
| 283 | goto handle_real_irq; | ||
| 284 | } | ||
| 285 | } | ||
| 286 | |||
| 287 | static char irq_trigger[2]; | ||
| 288 | /** | ||
| 289 | * ELCR registers (0x4d0, 0x4d1) control edge/level of IRQ | ||
| 290 | */ | ||
| 291 | static void restore_ELCR(char *trigger) | ||
| 292 | { | ||
| 293 | outb(trigger[0], 0x4d0); | ||
| 294 | outb(trigger[1], 0x4d1); | ||
| 295 | } | ||
| 296 | |||
| 297 | static void save_ELCR(char *trigger) | ||
| 298 | { | ||
| 299 | /* IRQ 0,1,2,8,13 are marked as reserved */ | ||
| 300 | trigger[0] = inb(0x4d0) & 0xF8; | ||
| 301 | trigger[1] = inb(0x4d1) & 0xDE; | ||
| 302 | } | ||
| 303 | |||
| 304 | static int i8259A_resume(struct sys_device *dev) | ||
| 305 | { | ||
| 306 | init_8259A(i8259A_auto_eoi); | ||
| 307 | restore_ELCR(irq_trigger); | ||
| 308 | return 0; | ||
| 309 | } | ||
| 310 | |||
| 311 | static int i8259A_suspend(struct sys_device *dev, pm_message_t state) | ||
| 312 | { | ||
| 313 | save_ELCR(irq_trigger); | ||
| 314 | return 0; | ||
| 315 | } | ||
| 316 | |||
| 317 | static int i8259A_shutdown(struct sys_device *dev) | ||
| 318 | { | ||
| 319 | /* Put the i8259A into a quiescent state that | ||
| 320 | * the kernel initialization code can get it | ||
| 321 | * out of. | ||
| 322 | */ | ||
| 323 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
| 324 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */ | ||
| 325 | return 0; | ||
| 326 | } | ||
| 327 | |||
| 328 | static struct sysdev_class i8259_sysdev_class = { | ||
| 329 | .name = "i8259", | ||
| 330 | .suspend = i8259A_suspend, | ||
| 331 | .resume = i8259A_resume, | ||
| 332 | .shutdown = i8259A_shutdown, | ||
| 333 | }; | ||
| 334 | |||
| 335 | static struct sys_device device_i8259A = { | ||
| 336 | .id = 0, | ||
| 337 | .cls = &i8259_sysdev_class, | ||
| 338 | }; | ||
| 339 | |||
| 340 | static int __init i8259A_init_sysfs(void) | ||
| 341 | { | ||
| 342 | int error = sysdev_class_register(&i8259_sysdev_class); | ||
| 343 | if (!error) | ||
| 344 | error = sysdev_register(&device_i8259A); | ||
| 345 | return error; | ||
| 346 | } | ||
| 347 | |||
| 348 | device_initcall(i8259A_init_sysfs); | ||
| 349 | |||
| 350 | void init_8259A(int auto_eoi) | ||
| 351 | { | ||
| 352 | unsigned long flags; | ||
| 353 | |||
| 354 | i8259A_auto_eoi = auto_eoi; | ||
| 355 | |||
| 356 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 357 | |||
| 358 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
| 359 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ | ||
| 360 | |||
| 361 | /* | ||
| 362 | * outb_pic - this has to work on a wide range of PC hardware. | ||
| 363 | */ | ||
| 364 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | ||
| 365 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
| 366 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
| 367 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
| 368 | outb_pic(0x04, PIC_MASTER_IMR); | ||
| 369 | if (auto_eoi) /* master does Auto EOI */ | ||
| 370 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | ||
| 371 | else /* master expects normal EOI */ | ||
| 372 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | ||
| 373 | |||
| 374 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | ||
| 375 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
| 376 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
| 377 | /* 8259A-2 is a slave on master's IR2 */ | ||
| 378 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
| 379 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
| 380 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
| 381 | |||
| 382 | if (auto_eoi) | ||
| 383 | /* | ||
| 384 | * In AEOI mode we just have to mask the interrupt | ||
| 385 | * when acking. | ||
| 386 | */ | ||
| 387 | i8259A_chip.mask_ack = disable_8259A_irq; | ||
| 388 | else | ||
| 389 | i8259A_chip.mask_ack = mask_and_ack_8259A; | ||
| 390 | |||
| 391 | udelay(100); /* wait for 8259A to initialize */ | ||
| 392 | |||
| 393 | outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */ | ||
| 394 | outb(cached_slave_mask, PIC_SLAVE_IMR); /* restore slave IRQ mask */ | ||
| 395 | |||
| 396 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 397 | } | ||
| 398 | |||
| 399 | |||
| 400 | |||
| 401 | |||
| 402 | /* | ||
| 403 | * IRQ2 is cascade interrupt to second interrupt controller | ||
| 404 | */ | ||
| 405 | |||
| 406 | static struct irqaction irq2 = { | ||
| 407 | .handler = no_action, | ||
| 408 | .mask = CPU_MASK_NONE, | ||
| 409 | .name = "cascade", | ||
| 410 | }; | ||
| 411 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
| 412 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
| 413 | [IRQ0_VECTOR] = 0, | ||
| 414 | [IRQ1_VECTOR] = 1, | ||
| 415 | [IRQ2_VECTOR] = 2, | ||
| 416 | [IRQ3_VECTOR] = 3, | ||
| 417 | [IRQ4_VECTOR] = 4, | ||
| 418 | [IRQ5_VECTOR] = 5, | ||
| 419 | [IRQ6_VECTOR] = 6, | ||
| 420 | [IRQ7_VECTOR] = 7, | ||
| 421 | [IRQ8_VECTOR] = 8, | ||
| 422 | [IRQ9_VECTOR] = 9, | ||
| 423 | [IRQ10_VECTOR] = 10, | ||
| 424 | [IRQ11_VECTOR] = 11, | ||
| 425 | [IRQ12_VECTOR] = 12, | ||
| 426 | [IRQ13_VECTOR] = 13, | ||
| 427 | [IRQ14_VECTOR] = 14, | ||
| 428 | [IRQ15_VECTOR] = 15, | ||
| 429 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
| 430 | }; | ||
| 431 | |||
| 432 | void __init init_ISA_irqs (void) | ||
| 433 | { | ||
| 434 | int i; | ||
| 435 | |||
| 436 | init_bsp_APIC(); | ||
| 437 | init_8259A(0); | ||
| 438 | |||
| 439 | for (i = 0; i < NR_IRQS; i++) { | ||
| 440 | irq_desc[i].status = IRQ_DISABLED; | ||
| 441 | irq_desc[i].action = NULL; | ||
| 442 | irq_desc[i].depth = 1; | ||
| 443 | |||
| 444 | if (i < 16) { | ||
| 445 | /* | ||
| 446 | * 16 old-style INTA-cycle interrupts: | ||
| 447 | */ | ||
| 448 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 449 | handle_level_irq, "XT"); | ||
| 450 | } else { | ||
| 451 | /* | ||
| 452 | * 'high' PCI IRQs filled in on demand | ||
| 453 | */ | ||
| 454 | irq_desc[i].chip = &no_irq_chip; | ||
| 455 | } | ||
| 456 | } | ||
| 457 | } | ||
| 458 | |||
| 459 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 460 | |||
| 461 | void __init native_init_IRQ(void) | ||
| 462 | { | ||
| 463 | int i; | ||
| 464 | |||
| 465 | init_ISA_irqs(); | ||
| 466 | /* | ||
| 467 | * Cover the whole vector space, no vector can escape | ||
| 468 | * us. (some of these will be overridden and become | ||
| 469 | * 'special' SMP interrupts) | ||
| 470 | */ | ||
| 471 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 472 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 473 | if (vector != IA32_SYSCALL_VECTOR) | ||
| 474 | set_intr_gate(vector, interrupt[i]); | ||
| 475 | } | ||
| 476 | |||
| 477 | #ifdef CONFIG_SMP | ||
| 478 | /* | ||
| 479 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
| 480 | * IPI, driven by wakeup. | ||
| 481 | */ | ||
| 482 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
| 483 | |||
| 484 | /* IPIs for invalidation */ | ||
| 485 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
| 486 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
| 487 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
| 488 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
| 489 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
| 490 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
| 491 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
| 492 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
| 493 | |||
| 494 | /* IPI for generic function call */ | ||
| 495 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
| 496 | |||
| 497 | /* Low priority IPI to cleanup after moving an irq */ | ||
| 498 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
| 499 | #endif | ||
| 500 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
| 501 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
| 502 | |||
| 503 | /* self generated IPI for local APIC timer */ | ||
| 504 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
| 505 | |||
| 506 | /* IPI vectors for APIC spurious and error interrupts */ | ||
| 507 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
| 508 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
| 509 | |||
| 510 | if (!acpi_ioapic) | ||
| 511 | setup_irq(2, &irq2); | ||
| 512 | } | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 4dc8600d9d20..d4f9df2b022a 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -58,7 +58,7 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | |||
| 58 | static DEFINE_SPINLOCK(ioapic_lock); | 58 | static DEFINE_SPINLOCK(ioapic_lock); |
| 59 | static DEFINE_SPINLOCK(vector_lock); | 59 | static DEFINE_SPINLOCK(vector_lock); |
| 60 | 60 | ||
| 61 | int timer_over_8254 __initdata = 1; | 61 | int timer_through_8259 __initdata; |
| 62 | 62 | ||
| 63 | /* | 63 | /* |
| 64 | * Is the SiS APIC rmw bug present ? | 64 | * Is the SiS APIC rmw bug present ? |
| @@ -239,7 +239,7 @@ static void __init replace_pin_at_irq(unsigned int irq, | |||
| 239 | } | 239 | } |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsigned long disable) | 242 | static void __modify_IO_APIC_irq(unsigned int irq, unsigned long enable, unsigned long disable) |
| 243 | { | 243 | { |
| 244 | struct irq_pin_list *entry = irq_2_pin + irq; | 244 | struct irq_pin_list *entry = irq_2_pin + irq; |
| 245 | unsigned int pin, reg; | 245 | unsigned int pin, reg; |
| @@ -259,30 +259,32 @@ static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsign | |||
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | /* mask = 1 */ | 261 | /* mask = 1 */ |
| 262 | static void __mask_IO_APIC_irq (unsigned int irq) | 262 | static void __mask_IO_APIC_irq(unsigned int irq) |
| 263 | { | 263 | { |
| 264 | __modify_IO_APIC_irq(irq, 0x00010000, 0); | 264 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, 0); |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | /* mask = 0 */ | 267 | /* mask = 0 */ |
| 268 | static void __unmask_IO_APIC_irq (unsigned int irq) | 268 | static void __unmask_IO_APIC_irq(unsigned int irq) |
| 269 | { | 269 | { |
| 270 | __modify_IO_APIC_irq(irq, 0, 0x00010000); | 270 | __modify_IO_APIC_irq(irq, 0, IO_APIC_REDIR_MASKED); |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | /* mask = 1, trigger = 0 */ | 273 | /* mask = 1, trigger = 0 */ |
| 274 | static void __mask_and_edge_IO_APIC_irq (unsigned int irq) | 274 | static void __mask_and_edge_IO_APIC_irq(unsigned int irq) |
| 275 | { | 275 | { |
| 276 | __modify_IO_APIC_irq(irq, 0x00010000, 0x00008000); | 276 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, |
| 277 | IO_APIC_REDIR_LEVEL_TRIGGER); | ||
| 277 | } | 278 | } |
| 278 | 279 | ||
| 279 | /* mask = 0, trigger = 1 */ | 280 | /* mask = 0, trigger = 1 */ |
| 280 | static void __unmask_and_level_IO_APIC_irq (unsigned int irq) | 281 | static void __unmask_and_level_IO_APIC_irq(unsigned int irq) |
| 281 | { | 282 | { |
| 282 | __modify_IO_APIC_irq(irq, 0x00008000, 0x00010000); | 283 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_LEVEL_TRIGGER, |
| 284 | IO_APIC_REDIR_MASKED); | ||
| 283 | } | 285 | } |
| 284 | 286 | ||
| 285 | static void mask_IO_APIC_irq (unsigned int irq) | 287 | static void mask_IO_APIC_irq(unsigned int irq) |
| 286 | { | 288 | { |
| 287 | unsigned long flags; | 289 | unsigned long flags; |
| 288 | 290 | ||
| @@ -291,7 +293,7 @@ static void mask_IO_APIC_irq (unsigned int irq) | |||
| 291 | spin_unlock_irqrestore(&ioapic_lock, flags); | 293 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 292 | } | 294 | } |
| 293 | 295 | ||
| 294 | static void unmask_IO_APIC_irq (unsigned int irq) | 296 | static void unmask_IO_APIC_irq(unsigned int irq) |
| 295 | { | 297 | { |
| 296 | unsigned long flags; | 298 | unsigned long flags; |
| 297 | 299 | ||
| @@ -303,7 +305,7 @@ static void unmask_IO_APIC_irq (unsigned int irq) | |||
| 303 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | 305 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) |
| 304 | { | 306 | { |
| 305 | struct IO_APIC_route_entry entry; | 307 | struct IO_APIC_route_entry entry; |
| 306 | 308 | ||
| 307 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ | 309 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ |
| 308 | entry = ioapic_read_entry(apic, pin); | 310 | entry = ioapic_read_entry(apic, pin); |
| 309 | if (entry.delivery_mode == dest_SMI) | 311 | if (entry.delivery_mode == dest_SMI) |
| @@ -315,7 +317,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | |||
| 315 | ioapic_mask_entry(apic, pin); | 317 | ioapic_mask_entry(apic, pin); |
| 316 | } | 318 | } |
| 317 | 319 | ||
| 318 | static void clear_IO_APIC (void) | 320 | static void clear_IO_APIC(void) |
| 319 | { | 321 | { |
| 320 | int apic, pin; | 322 | int apic, pin; |
| 321 | 323 | ||
| @@ -332,7 +334,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
| 332 | struct irq_pin_list *entry = irq_2_pin + irq; | 334 | struct irq_pin_list *entry = irq_2_pin + irq; |
| 333 | unsigned int apicid_value; | 335 | unsigned int apicid_value; |
| 334 | cpumask_t tmp; | 336 | cpumask_t tmp; |
| 335 | 337 | ||
| 336 | cpus_and(tmp, cpumask, cpu_online_map); | 338 | cpus_and(tmp, cpumask, cpu_online_map); |
| 337 | if (cpus_empty(tmp)) | 339 | if (cpus_empty(tmp)) |
| 338 | tmp = TARGET_CPUS; | 340 | tmp = TARGET_CPUS; |
| @@ -361,7 +363,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
| 361 | # include <linux/kernel_stat.h> /* kstat */ | 363 | # include <linux/kernel_stat.h> /* kstat */ |
| 362 | # include <linux/slab.h> /* kmalloc() */ | 364 | # include <linux/slab.h> /* kmalloc() */ |
| 363 | # include <linux/timer.h> | 365 | # include <linux/timer.h> |
| 364 | 366 | ||
| 365 | #define IRQBALANCE_CHECK_ARCH -999 | 367 | #define IRQBALANCE_CHECK_ARCH -999 |
| 366 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) | 368 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) |
| 367 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) | 369 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) |
| @@ -373,14 +375,14 @@ static int physical_balance __read_mostly; | |||
| 373 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; | 375 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; |
| 374 | 376 | ||
| 375 | static struct irq_cpu_info { | 377 | static struct irq_cpu_info { |
| 376 | unsigned long * last_irq; | 378 | unsigned long *last_irq; |
| 377 | unsigned long * irq_delta; | 379 | unsigned long *irq_delta; |
| 378 | unsigned long irq; | 380 | unsigned long irq; |
| 379 | } irq_cpu_data[NR_CPUS]; | 381 | } irq_cpu_data[NR_CPUS]; |
| 380 | 382 | ||
| 381 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) | 383 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) |
| 382 | #define LAST_CPU_IRQ(cpu,irq) (irq_cpu_data[cpu].last_irq[irq]) | 384 | #define LAST_CPU_IRQ(cpu, irq) (irq_cpu_data[cpu].last_irq[irq]) |
| 383 | #define IRQ_DELTA(cpu,irq) (irq_cpu_data[cpu].irq_delta[irq]) | 385 | #define IRQ_DELTA(cpu, irq) (irq_cpu_data[cpu].irq_delta[irq]) |
| 384 | 386 | ||
| 385 | #define IDLE_ENOUGH(cpu,now) \ | 387 | #define IDLE_ENOUGH(cpu,now) \ |
| 386 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) | 388 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) |
| @@ -419,8 +421,8 @@ inside: | |||
| 419 | if (cpu == -1) | 421 | if (cpu == -1) |
| 420 | cpu = NR_CPUS-1; | 422 | cpu = NR_CPUS-1; |
| 421 | } | 423 | } |
| 422 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu,allowed_mask) || | 424 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu, allowed_mask) || |
| 423 | (search_idle && !IDLE_ENOUGH(cpu,now))); | 425 | (search_idle && !IDLE_ENOUGH(cpu, now))); |
| 424 | 426 | ||
| 425 | return cpu; | 427 | return cpu; |
| 426 | } | 428 | } |
| @@ -430,15 +432,14 @@ static inline void balance_irq(int cpu, int irq) | |||
| 430 | unsigned long now = jiffies; | 432 | unsigned long now = jiffies; |
| 431 | cpumask_t allowed_mask; | 433 | cpumask_t allowed_mask; |
| 432 | unsigned int new_cpu; | 434 | unsigned int new_cpu; |
| 433 | 435 | ||
| 434 | if (irqbalance_disabled) | 436 | if (irqbalance_disabled) |
| 435 | return; | 437 | return; |
| 436 | 438 | ||
| 437 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); | 439 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); |
| 438 | new_cpu = move(cpu, allowed_mask, now, 1); | 440 | new_cpu = move(cpu, allowed_mask, now, 1); |
| 439 | if (cpu != new_cpu) { | 441 | if (cpu != new_cpu) |
| 440 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); | 442 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); |
| 441 | } | ||
| 442 | } | 443 | } |
| 443 | 444 | ||
| 444 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | 445 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) |
| @@ -450,14 +451,14 @@ static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | |||
| 450 | if (!irq_desc[j].action) | 451 | if (!irq_desc[j].action) |
| 451 | continue; | 452 | continue; |
| 452 | /* Is it a significant load ? */ | 453 | /* Is it a significant load ? */ |
| 453 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i),j) < | 454 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i), j) < |
| 454 | useful_load_threshold) | 455 | useful_load_threshold) |
| 455 | continue; | 456 | continue; |
| 456 | balance_irq(i, j); | 457 | balance_irq(i, j); |
| 457 | } | 458 | } |
| 458 | } | 459 | } |
| 459 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 460 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
| 460 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 461 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
| 461 | return; | 462 | return; |
| 462 | } | 463 | } |
| 463 | 464 | ||
| @@ -486,22 +487,22 @@ static void do_irq_balance(void) | |||
| 486 | /* Is this an active IRQ or balancing disabled ? */ | 487 | /* Is this an active IRQ or balancing disabled ? */ |
| 487 | if (!irq_desc[j].action || irq_balancing_disabled(j)) | 488 | if (!irq_desc[j].action || irq_balancing_disabled(j)) |
| 488 | continue; | 489 | continue; |
| 489 | if ( package_index == i ) | 490 | if (package_index == i) |
| 490 | IRQ_DELTA(package_index,j) = 0; | 491 | IRQ_DELTA(package_index, j) = 0; |
| 491 | /* Determine the total count per processor per IRQ */ | 492 | /* Determine the total count per processor per IRQ */ |
| 492 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; | 493 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; |
| 493 | 494 | ||
| 494 | /* Determine the activity per processor per IRQ */ | 495 | /* Determine the activity per processor per IRQ */ |
| 495 | delta = value_now - LAST_CPU_IRQ(i,j); | 496 | delta = value_now - LAST_CPU_IRQ(i, j); |
| 496 | 497 | ||
| 497 | /* Update last_cpu_irq[][] for the next time */ | 498 | /* Update last_cpu_irq[][] for the next time */ |
| 498 | LAST_CPU_IRQ(i,j) = value_now; | 499 | LAST_CPU_IRQ(i, j) = value_now; |
| 499 | 500 | ||
| 500 | /* Ignore IRQs whose rate is less than the clock */ | 501 | /* Ignore IRQs whose rate is less than the clock */ |
| 501 | if (delta < useful_load_threshold) | 502 | if (delta < useful_load_threshold) |
| 502 | continue; | 503 | continue; |
| 503 | /* update the load for the processor or package total */ | 504 | /* update the load for the processor or package total */ |
| 504 | IRQ_DELTA(package_index,j) += delta; | 505 | IRQ_DELTA(package_index, j) += delta; |
| 505 | 506 | ||
| 506 | /* Keep track of the higher numbered sibling as well */ | 507 | /* Keep track of the higher numbered sibling as well */ |
| 507 | if (i != package_index) | 508 | if (i != package_index) |
| @@ -527,7 +528,8 @@ static void do_irq_balance(void) | |||
| 527 | max_cpu_irq = ULONG_MAX; | 528 | max_cpu_irq = ULONG_MAX; |
| 528 | 529 | ||
| 529 | tryanothercpu: | 530 | tryanothercpu: |
| 530 | /* Look for heaviest loaded processor. | 531 | /* |
| 532 | * Look for heaviest loaded processor. | ||
| 531 | * We may come back to get the next heaviest loaded processor. | 533 | * We may come back to get the next heaviest loaded processor. |
| 532 | * Skip processors with trivial loads. | 534 | * Skip processors with trivial loads. |
| 533 | */ | 535 | */ |
| @@ -536,7 +538,7 @@ tryanothercpu: | |||
| 536 | for_each_online_cpu(i) { | 538 | for_each_online_cpu(i) { |
| 537 | if (i != CPU_TO_PACKAGEINDEX(i)) | 539 | if (i != CPU_TO_PACKAGEINDEX(i)) |
| 538 | continue; | 540 | continue; |
| 539 | if (max_cpu_irq <= CPU_IRQ(i)) | 541 | if (max_cpu_irq <= CPU_IRQ(i)) |
| 540 | continue; | 542 | continue; |
| 541 | if (tmp_cpu_irq < CPU_IRQ(i)) { | 543 | if (tmp_cpu_irq < CPU_IRQ(i)) { |
| 542 | tmp_cpu_irq = CPU_IRQ(i); | 544 | tmp_cpu_irq = CPU_IRQ(i); |
| @@ -545,8 +547,9 @@ tryanothercpu: | |||
| 545 | } | 547 | } |
| 546 | 548 | ||
| 547 | if (tmp_loaded == -1) { | 549 | if (tmp_loaded == -1) { |
| 548 | /* In the case of small number of heavy interrupt sources, | 550 | /* |
| 549 | * loading some of the cpus too much. We use Ingo's original | 551 | * In the case of small number of heavy interrupt sources, |
| 552 | * loading some of the cpus too much. We use Ingo's original | ||
| 550 | * approach to rotate them around. | 553 | * approach to rotate them around. |
| 551 | */ | 554 | */ |
| 552 | if (!first_attempt && imbalance >= useful_load_threshold) { | 555 | if (!first_attempt && imbalance >= useful_load_threshold) { |
| @@ -555,13 +558,14 @@ tryanothercpu: | |||
| 555 | } | 558 | } |
| 556 | goto not_worth_the_effort; | 559 | goto not_worth_the_effort; |
| 557 | } | 560 | } |
| 558 | 561 | ||
| 559 | first_attempt = 0; /* heaviest search */ | 562 | first_attempt = 0; /* heaviest search */ |
| 560 | max_cpu_irq = tmp_cpu_irq; /* load */ | 563 | max_cpu_irq = tmp_cpu_irq; /* load */ |
| 561 | max_loaded = tmp_loaded; /* processor */ | 564 | max_loaded = tmp_loaded; /* processor */ |
| 562 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; | 565 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; |
| 563 | 566 | ||
| 564 | /* if imbalance is less than approx 10% of max load, then | 567 | /* |
| 568 | * if imbalance is less than approx 10% of max load, then | ||
| 565 | * observe diminishing returns action. - quit | 569 | * observe diminishing returns action. - quit |
| 566 | */ | 570 | */ |
| 567 | if (imbalance < (max_cpu_irq >> 3)) | 571 | if (imbalance < (max_cpu_irq >> 3)) |
| @@ -577,26 +581,25 @@ tryanotherirq: | |||
| 577 | /* Is this an active IRQ? */ | 581 | /* Is this an active IRQ? */ |
| 578 | if (!irq_desc[j].action) | 582 | if (!irq_desc[j].action) |
| 579 | continue; | 583 | continue; |
| 580 | if (imbalance <= IRQ_DELTA(max_loaded,j)) | 584 | if (imbalance <= IRQ_DELTA(max_loaded, j)) |
| 581 | continue; | 585 | continue; |
| 582 | /* Try to find the IRQ that is closest to the imbalance | 586 | /* Try to find the IRQ that is closest to the imbalance |
| 583 | * without going over. | 587 | * without going over. |
| 584 | */ | 588 | */ |
| 585 | if (move_this_load < IRQ_DELTA(max_loaded,j)) { | 589 | if (move_this_load < IRQ_DELTA(max_loaded, j)) { |
| 586 | move_this_load = IRQ_DELTA(max_loaded,j); | 590 | move_this_load = IRQ_DELTA(max_loaded, j); |
| 587 | selected_irq = j; | 591 | selected_irq = j; |
| 588 | } | 592 | } |
| 589 | } | 593 | } |
| 590 | if (selected_irq == -1) { | 594 | if (selected_irq == -1) |
| 591 | goto tryanothercpu; | 595 | goto tryanothercpu; |
| 592 | } | ||
| 593 | 596 | ||
| 594 | imbalance = move_this_load; | 597 | imbalance = move_this_load; |
| 595 | 598 | ||
| 596 | /* For physical_balance case, we accumulated both load | 599 | /* For physical_balance case, we accumulated both load |
| 597 | * values in the one of the siblings cpu_irq[], | 600 | * values in the one of the siblings cpu_irq[], |
| 598 | * to use the same code for physical and logical processors | 601 | * to use the same code for physical and logical processors |
| 599 | * as much as possible. | 602 | * as much as possible. |
| 600 | * | 603 | * |
| 601 | * NOTE: the cpu_irq[] array holds the sum of the load for | 604 | * NOTE: the cpu_irq[] array holds the sum of the load for |
| 602 | * sibling A and sibling B in the slot for the lowest numbered | 605 | * sibling A and sibling B in the slot for the lowest numbered |
| @@ -625,11 +628,11 @@ tryanotherirq: | |||
| 625 | /* mark for change destination */ | 628 | /* mark for change destination */ |
| 626 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); | 629 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); |
| 627 | 630 | ||
| 628 | /* Since we made a change, come back sooner to | 631 | /* Since we made a change, come back sooner to |
| 629 | * check for more variation. | 632 | * check for more variation. |
| 630 | */ | 633 | */ |
| 631 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 634 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
| 632 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 635 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
| 633 | return; | 636 | return; |
| 634 | } | 637 | } |
| 635 | goto tryanotherirq; | 638 | goto tryanotherirq; |
| @@ -640,7 +643,7 @@ not_worth_the_effort: | |||
| 640 | * upward | 643 | * upward |
| 641 | */ | 644 | */ |
| 642 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, | 645 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, |
| 643 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); | 646 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); |
| 644 | return; | 647 | return; |
| 645 | } | 648 | } |
| 646 | 649 | ||
| @@ -679,13 +682,13 @@ static int __init balanced_irq_init(void) | |||
| 679 | cpumask_t tmp; | 682 | cpumask_t tmp; |
| 680 | 683 | ||
| 681 | cpus_shift_right(tmp, cpu_online_map, 2); | 684 | cpus_shift_right(tmp, cpu_online_map, 2); |
| 682 | c = &boot_cpu_data; | 685 | c = &boot_cpu_data; |
| 683 | /* When not overwritten by the command line ask subarchitecture. */ | 686 | /* When not overwritten by the command line ask subarchitecture. */ |
| 684 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) | 687 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) |
| 685 | irqbalance_disabled = NO_BALANCE_IRQ; | 688 | irqbalance_disabled = NO_BALANCE_IRQ; |
| 686 | if (irqbalance_disabled) | 689 | if (irqbalance_disabled) |
| 687 | return 0; | 690 | return 0; |
| 688 | 691 | ||
| 689 | /* disable irqbalance completely if there is only one processor online */ | 692 | /* disable irqbalance completely if there is only one processor online */ |
| 690 | if (num_online_cpus() < 2) { | 693 | if (num_online_cpus() < 2) { |
| 691 | irqbalance_disabled = 1; | 694 | irqbalance_disabled = 1; |
| @@ -699,16 +702,14 @@ static int __init balanced_irq_init(void) | |||
| 699 | physical_balance = 1; | 702 | physical_balance = 1; |
| 700 | 703 | ||
| 701 | for_each_online_cpu(i) { | 704 | for_each_online_cpu(i) { |
| 702 | irq_cpu_data[i].irq_delta = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 705 | irq_cpu_data[i].irq_delta = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
| 703 | irq_cpu_data[i].last_irq = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 706 | irq_cpu_data[i].last_irq = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
| 704 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { | 707 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { |
| 705 | printk(KERN_ERR "balanced_irq_init: out of memory"); | 708 | printk(KERN_ERR "balanced_irq_init: out of memory"); |
| 706 | goto failed; | 709 | goto failed; |
| 707 | } | 710 | } |
| 708 | memset(irq_cpu_data[i].irq_delta,0,sizeof(unsigned long) * NR_IRQS); | ||
| 709 | memset(irq_cpu_data[i].last_irq,0,sizeof(unsigned long) * NR_IRQS); | ||
| 710 | } | 711 | } |
| 711 | 712 | ||
| 712 | printk(KERN_INFO "Starting balanced_irq\n"); | 713 | printk(KERN_INFO "Starting balanced_irq\n"); |
| 713 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) | 714 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) |
| 714 | return 0; | 715 | return 0; |
| @@ -843,7 +844,7 @@ static int __init find_isa_irq_apic(int irq, int type) | |||
| 843 | } | 844 | } |
| 844 | if (i < mp_irq_entries) { | 845 | if (i < mp_irq_entries) { |
| 845 | int apic; | 846 | int apic; |
| 846 | for(apic = 0; apic < nr_ioapics; apic++) { | 847 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 847 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) | 848 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) |
| 848 | return apic; | 849 | return apic; |
| 849 | } | 850 | } |
| @@ -880,7 +881,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
| 880 | !mp_irqs[i].mpc_irqtype && | 881 | !mp_irqs[i].mpc_irqtype && |
| 881 | (bus == lbus) && | 882 | (bus == lbus) && |
| 882 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { | 883 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { |
| 883 | int irq = pin_2_irq(i,apic,mp_irqs[i].mpc_dstirq); | 884 | int irq = pin_2_irq(i, apic, mp_irqs[i].mpc_dstirq); |
| 884 | 885 | ||
| 885 | if (!(apic || IO_APIC_IRQ(irq))) | 886 | if (!(apic || IO_APIC_IRQ(irq))) |
| 886 | continue; | 887 | continue; |
| @@ -900,7 +901,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
| 900 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); | 901 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); |
| 901 | 902 | ||
| 902 | /* | 903 | /* |
| 903 | * This function currently is only a helper for the i386 smp boot process where | 904 | * This function currently is only a helper for the i386 smp boot process where |
| 904 | * we need to reprogram the ioredtbls to cater for the cpus which have come online | 905 | * we need to reprogram the ioredtbls to cater for the cpus which have come online |
| 905 | * so mask in all cases should simply be TARGET_CPUS | 906 | * so mask in all cases should simply be TARGET_CPUS |
| 906 | */ | 907 | */ |
| @@ -975,37 +976,36 @@ static int MPBIOS_polarity(int idx) | |||
| 975 | /* | 976 | /* |
| 976 | * Determine IRQ line polarity (high active or low active): | 977 | * Determine IRQ line polarity (high active or low active): |
| 977 | */ | 978 | */ |
| 978 | switch (mp_irqs[idx].mpc_irqflag & 3) | 979 | switch (mp_irqs[idx].mpc_irqflag & 3) { |
| 980 | case 0: /* conforms, ie. bus-type dependent polarity */ | ||
| 979 | { | 981 | { |
| 980 | case 0: /* conforms, ie. bus-type dependent polarity */ | 982 | polarity = test_bit(bus, mp_bus_not_pci)? |
| 981 | { | 983 | default_ISA_polarity(idx): |
| 982 | polarity = test_bit(bus, mp_bus_not_pci)? | 984 | default_PCI_polarity(idx); |
| 983 | default_ISA_polarity(idx): | 985 | break; |
| 984 | default_PCI_polarity(idx); | 986 | } |
| 985 | break; | 987 | case 1: /* high active */ |
| 986 | } | 988 | { |
| 987 | case 1: /* high active */ | 989 | polarity = 0; |
| 988 | { | 990 | break; |
| 989 | polarity = 0; | 991 | } |
| 990 | break; | 992 | case 2: /* reserved */ |
| 991 | } | 993 | { |
| 992 | case 2: /* reserved */ | 994 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 993 | { | 995 | polarity = 1; |
| 994 | printk(KERN_WARNING "broken BIOS!!\n"); | 996 | break; |
| 995 | polarity = 1; | 997 | } |
| 996 | break; | 998 | case 3: /* low active */ |
| 997 | } | 999 | { |
| 998 | case 3: /* low active */ | 1000 | polarity = 1; |
| 999 | { | 1001 | break; |
| 1000 | polarity = 1; | 1002 | } |
| 1001 | break; | 1003 | default: /* invalid */ |
| 1002 | } | 1004 | { |
| 1003 | default: /* invalid */ | 1005 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 1004 | { | 1006 | polarity = 1; |
| 1005 | printk(KERN_WARNING "broken BIOS!!\n"); | 1007 | break; |
| 1006 | polarity = 1; | 1008 | } |
| 1007 | break; | ||
| 1008 | } | ||
| 1009 | } | 1009 | } |
| 1010 | return polarity; | 1010 | return polarity; |
| 1011 | } | 1011 | } |
| @@ -1018,69 +1018,67 @@ static int MPBIOS_trigger(int idx) | |||
| 1018 | /* | 1018 | /* |
| 1019 | * Determine IRQ trigger mode (edge or level sensitive): | 1019 | * Determine IRQ trigger mode (edge or level sensitive): |
| 1020 | */ | 1020 | */ |
| 1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) | 1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) { |
| 1022 | case 0: /* conforms, ie. bus-type dependent */ | ||
| 1022 | { | 1023 | { |
| 1023 | case 0: /* conforms, ie. bus-type dependent */ | 1024 | trigger = test_bit(bus, mp_bus_not_pci)? |
| 1024 | { | 1025 | default_ISA_trigger(idx): |
| 1025 | trigger = test_bit(bus, mp_bus_not_pci)? | 1026 | default_PCI_trigger(idx); |
| 1026 | default_ISA_trigger(idx): | ||
| 1027 | default_PCI_trigger(idx); | ||
| 1028 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) | 1027 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) |
| 1029 | switch (mp_bus_id_to_type[bus]) | 1028 | switch (mp_bus_id_to_type[bus]) { |
| 1030 | { | 1029 | case MP_BUS_ISA: /* ISA pin */ |
| 1031 | case MP_BUS_ISA: /* ISA pin */ | 1030 | { |
| 1032 | { | 1031 | /* set before the switch */ |
| 1033 | /* set before the switch */ | ||
| 1034 | break; | ||
| 1035 | } | ||
| 1036 | case MP_BUS_EISA: /* EISA pin */ | ||
| 1037 | { | ||
| 1038 | trigger = default_EISA_trigger(idx); | ||
| 1039 | break; | ||
| 1040 | } | ||
| 1041 | case MP_BUS_PCI: /* PCI pin */ | ||
| 1042 | { | ||
| 1043 | /* set before the switch */ | ||
| 1044 | break; | ||
| 1045 | } | ||
| 1046 | case MP_BUS_MCA: /* MCA pin */ | ||
| 1047 | { | ||
| 1048 | trigger = default_MCA_trigger(idx); | ||
| 1049 | break; | ||
| 1050 | } | ||
| 1051 | default: | ||
| 1052 | { | ||
| 1053 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1054 | trigger = 1; | ||
| 1055 | break; | ||
| 1056 | } | ||
| 1057 | } | ||
| 1058 | #endif | ||
| 1059 | break; | 1032 | break; |
| 1060 | } | 1033 | } |
| 1061 | case 1: /* edge */ | 1034 | case MP_BUS_EISA: /* EISA pin */ |
| 1062 | { | 1035 | { |
| 1063 | trigger = 0; | 1036 | trigger = default_EISA_trigger(idx); |
| 1064 | break; | 1037 | break; |
| 1065 | } | 1038 | } |
| 1066 | case 2: /* reserved */ | 1039 | case MP_BUS_PCI: /* PCI pin */ |
| 1067 | { | 1040 | { |
| 1068 | printk(KERN_WARNING "broken BIOS!!\n"); | 1041 | /* set before the switch */ |
| 1069 | trigger = 1; | ||
| 1070 | break; | 1042 | break; |
| 1071 | } | 1043 | } |
| 1072 | case 3: /* level */ | 1044 | case MP_BUS_MCA: /* MCA pin */ |
| 1073 | { | 1045 | { |
| 1074 | trigger = 1; | 1046 | trigger = default_MCA_trigger(idx); |
| 1075 | break; | 1047 | break; |
| 1076 | } | 1048 | } |
| 1077 | default: /* invalid */ | 1049 | default: |
| 1078 | { | 1050 | { |
| 1079 | printk(KERN_WARNING "broken BIOS!!\n"); | 1051 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 1080 | trigger = 0; | 1052 | trigger = 1; |
| 1081 | break; | 1053 | break; |
| 1082 | } | 1054 | } |
| 1083 | } | 1055 | } |
| 1056 | #endif | ||
| 1057 | break; | ||
| 1058 | } | ||
| 1059 | case 1: /* edge */ | ||
| 1060 | { | ||
| 1061 | trigger = 0; | ||
| 1062 | break; | ||
| 1063 | } | ||
| 1064 | case 2: /* reserved */ | ||
| 1065 | { | ||
| 1066 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1067 | trigger = 1; | ||
| 1068 | break; | ||
| 1069 | } | ||
| 1070 | case 3: /* level */ | ||
| 1071 | { | ||
| 1072 | trigger = 1; | ||
| 1073 | break; | ||
| 1074 | } | ||
| 1075 | default: /* invalid */ | ||
| 1076 | { | ||
| 1077 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1078 | trigger = 0; | ||
| 1079 | break; | ||
| 1080 | } | ||
| 1081 | } | ||
| 1084 | return trigger; | 1082 | return trigger; |
| 1085 | } | 1083 | } |
| 1086 | 1084 | ||
| @@ -1148,8 +1146,8 @@ static inline int IO_APIC_irq_trigger(int irq) | |||
| 1148 | 1146 | ||
| 1149 | for (apic = 0; apic < nr_ioapics; apic++) { | 1147 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 1150 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1148 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
| 1151 | idx = find_irq_entry(apic,pin,mp_INT); | 1149 | idx = find_irq_entry(apic, pin, mp_INT); |
| 1152 | if ((idx != -1) && (irq == pin_2_irq(idx,apic,pin))) | 1150 | if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin))) |
| 1153 | return irq_trigger(idx); | 1151 | return irq_trigger(idx); |
| 1154 | } | 1152 | } |
| 1155 | } | 1153 | } |
| @@ -1164,7 +1162,7 @@ static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 } | |||
| 1164 | 1162 | ||
| 1165 | static int __assign_irq_vector(int irq) | 1163 | static int __assign_irq_vector(int irq) |
| 1166 | { | 1164 | { |
| 1167 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; | 1165 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset; |
| 1168 | int vector, offset; | 1166 | int vector, offset; |
| 1169 | 1167 | ||
| 1170 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); | 1168 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); |
| @@ -1237,15 +1235,15 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1237 | /* | 1235 | /* |
| 1238 | * add it to the IO-APIC irq-routing table: | 1236 | * add it to the IO-APIC irq-routing table: |
| 1239 | */ | 1237 | */ |
| 1240 | memset(&entry,0,sizeof(entry)); | 1238 | memset(&entry, 0, sizeof(entry)); |
| 1241 | 1239 | ||
| 1242 | entry.delivery_mode = INT_DELIVERY_MODE; | 1240 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 1243 | entry.dest_mode = INT_DEST_MODE; | 1241 | entry.dest_mode = INT_DEST_MODE; |
| 1244 | entry.mask = 0; /* enable IRQ */ | 1242 | entry.mask = 0; /* enable IRQ */ |
| 1245 | entry.dest.logical.logical_dest = | 1243 | entry.dest.logical.logical_dest = |
| 1246 | cpu_mask_to_apicid(TARGET_CPUS); | 1244 | cpu_mask_to_apicid(TARGET_CPUS); |
| 1247 | 1245 | ||
| 1248 | idx = find_irq_entry(apic,pin,mp_INT); | 1246 | idx = find_irq_entry(apic, pin, mp_INT); |
| 1249 | if (idx == -1) { | 1247 | if (idx == -1) { |
| 1250 | if (first_notcon) { | 1248 | if (first_notcon) { |
| 1251 | apic_printk(APIC_VERBOSE, KERN_DEBUG | 1249 | apic_printk(APIC_VERBOSE, KERN_DEBUG |
| @@ -1289,7 +1287,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1289 | vector = assign_irq_vector(irq); | 1287 | vector = assign_irq_vector(irq); |
| 1290 | entry.vector = vector; | 1288 | entry.vector = vector; |
| 1291 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); | 1289 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); |
| 1292 | 1290 | ||
| 1293 | if (!apic && (irq < 16)) | 1291 | if (!apic && (irq < 16)) |
| 1294 | disable_8259A_irq(irq); | 1292 | disable_8259A_irq(irq); |
| 1295 | } | 1293 | } |
| @@ -1302,25 +1300,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1302 | } | 1300 | } |
| 1303 | 1301 | ||
| 1304 | /* | 1302 | /* |
| 1305 | * Set up the 8259A-master output pin: | 1303 | * Set up the timer pin, possibly with the 8259A-master behind. |
| 1306 | */ | 1304 | */ |
| 1307 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 1305 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
| 1306 | int vector) | ||
| 1308 | { | 1307 | { |
| 1309 | struct IO_APIC_route_entry entry; | 1308 | struct IO_APIC_route_entry entry; |
| 1310 | 1309 | ||
| 1311 | memset(&entry,0,sizeof(entry)); | 1310 | memset(&entry, 0, sizeof(entry)); |
| 1312 | |||
| 1313 | disable_8259A_irq(0); | ||
| 1314 | |||
| 1315 | /* mask LVT0 */ | ||
| 1316 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
| 1317 | 1311 | ||
| 1318 | /* | 1312 | /* |
| 1319 | * We use logical delivery to get the timer IRQ | 1313 | * We use logical delivery to get the timer IRQ |
| 1320 | * to the first CPU. | 1314 | * to the first CPU. |
| 1321 | */ | 1315 | */ |
| 1322 | entry.dest_mode = INT_DEST_MODE; | 1316 | entry.dest_mode = INT_DEST_MODE; |
| 1323 | entry.mask = 0; /* unmask IRQ now */ | 1317 | entry.mask = 1; /* mask IRQ now */ |
| 1324 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); | 1318 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); |
| 1325 | entry.delivery_mode = INT_DELIVERY_MODE; | 1319 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 1326 | entry.polarity = 0; | 1320 | entry.polarity = 0; |
| @@ -1329,17 +1323,14 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 1329 | 1323 | ||
| 1330 | /* | 1324 | /* |
| 1331 | * The timer IRQ doesn't have to know that behind the | 1325 | * The timer IRQ doesn't have to know that behind the |
| 1332 | * scene we have a 8259A-master in AEOI mode ... | 1326 | * scene we may have a 8259A-master in AEOI mode ... |
| 1333 | */ | 1327 | */ |
| 1334 | irq_desc[0].chip = &ioapic_chip; | 1328 | ioapic_register_intr(0, vector, IOAPIC_EDGE); |
| 1335 | set_irq_handler(0, handle_edge_irq); | ||
| 1336 | 1329 | ||
| 1337 | /* | 1330 | /* |
| 1338 | * Add it to the IO-APIC irq-routing table: | 1331 | * Add it to the IO-APIC irq-routing table: |
| 1339 | */ | 1332 | */ |
| 1340 | ioapic_write_entry(apic, pin, entry); | 1333 | ioapic_write_entry(apic, pin, entry); |
| 1341 | |||
| 1342 | enable_8259A_irq(0); | ||
| 1343 | } | 1334 | } |
| 1344 | 1335 | ||
| 1345 | void __init print_IO_APIC(void) | 1336 | void __init print_IO_APIC(void) |
| @@ -1354,7 +1345,7 @@ void __init print_IO_APIC(void) | |||
| 1354 | if (apic_verbosity == APIC_QUIET) | 1345 | if (apic_verbosity == APIC_QUIET) |
| 1355 | return; | 1346 | return; |
| 1356 | 1347 | ||
| 1357 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); | 1348 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); |
| 1358 | for (i = 0; i < nr_ioapics; i++) | 1349 | for (i = 0; i < nr_ioapics; i++) |
| 1359 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", | 1350 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", |
| 1360 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); | 1351 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); |
| @@ -1459,7 +1450,7 @@ void __init print_IO_APIC(void) | |||
| 1459 | 1450 | ||
| 1460 | #if 0 | 1451 | #if 0 |
| 1461 | 1452 | ||
| 1462 | static void print_APIC_bitfield (int base) | 1453 | static void print_APIC_bitfield(int base) |
| 1463 | { | 1454 | { |
| 1464 | unsigned int v; | 1455 | unsigned int v; |
| 1465 | int i, j; | 1456 | int i, j; |
| @@ -1480,7 +1471,7 @@ static void print_APIC_bitfield (int base) | |||
| 1480 | } | 1471 | } |
| 1481 | } | 1472 | } |
| 1482 | 1473 | ||
| 1483 | void /*__init*/ print_local_APIC(void * dummy) | 1474 | void /*__init*/ print_local_APIC(void *dummy) |
| 1484 | { | 1475 | { |
| 1485 | unsigned int v, ver, maxlvt; | 1476 | unsigned int v, ver, maxlvt; |
| 1486 | 1477 | ||
| @@ -1489,6 +1480,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
| 1489 | 1480 | ||
| 1490 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1481 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
| 1491 | smp_processor_id(), hard_smp_processor_id()); | 1482 | smp_processor_id(), hard_smp_processor_id()); |
| 1483 | v = apic_read(APIC_ID); | ||
| 1492 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, | 1484 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, |
| 1493 | GET_APIC_ID(read_apic_id())); | 1485 | GET_APIC_ID(read_apic_id())); |
| 1494 | v = apic_read(APIC_LVR); | 1486 | v = apic_read(APIC_LVR); |
| @@ -1563,7 +1555,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
| 1563 | printk("\n"); | 1555 | printk("\n"); |
| 1564 | } | 1556 | } |
| 1565 | 1557 | ||
| 1566 | void print_all_local_APICs (void) | 1558 | void print_all_local_APICs(void) |
| 1567 | { | 1559 | { |
| 1568 | on_each_cpu(print_local_APIC, NULL, 1, 1); | 1560 | on_each_cpu(print_local_APIC, NULL, 1, 1); |
| 1569 | } | 1561 | } |
| @@ -1586,11 +1578,11 @@ void /*__init*/ print_PIC(void) | |||
| 1586 | v = inb(0xa0) << 8 | inb(0x20); | 1578 | v = inb(0xa0) << 8 | inb(0x20); |
| 1587 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); | 1579 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); |
| 1588 | 1580 | ||
| 1589 | outb(0x0b,0xa0); | 1581 | outb(0x0b, 0xa0); |
| 1590 | outb(0x0b,0x20); | 1582 | outb(0x0b, 0x20); |
| 1591 | v = inb(0xa0) << 8 | inb(0x20); | 1583 | v = inb(0xa0) << 8 | inb(0x20); |
| 1592 | outb(0x0a,0xa0); | 1584 | outb(0x0a, 0xa0); |
| 1593 | outb(0x0a,0x20); | 1585 | outb(0x0a, 0x20); |
| 1594 | 1586 | ||
| 1595 | spin_unlock_irqrestore(&i8259A_lock, flags); | 1587 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 1596 | 1588 | ||
| @@ -1626,7 +1618,7 @@ static void __init enable_IO_APIC(void) | |||
| 1626 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1618 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 1627 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; | 1619 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; |
| 1628 | } | 1620 | } |
| 1629 | for(apic = 0; apic < nr_ioapics; apic++) { | 1621 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 1630 | int pin; | 1622 | int pin; |
| 1631 | /* See if any of the pins is in ExtINT mode */ | 1623 | /* See if any of the pins is in ExtINT mode */ |
| 1632 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1624 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
| @@ -1748,7 +1740,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
| 1748 | spin_lock_irqsave(&ioapic_lock, flags); | 1740 | spin_lock_irqsave(&ioapic_lock, flags); |
| 1749 | reg_00.raw = io_apic_read(apic, 0); | 1741 | reg_00.raw = io_apic_read(apic, 0); |
| 1750 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1742 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 1751 | 1743 | ||
| 1752 | old_id = mp_ioapics[apic].mpc_apicid; | 1744 | old_id = mp_ioapics[apic].mpc_apicid; |
| 1753 | 1745 | ||
| 1754 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { | 1746 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { |
| @@ -1800,7 +1792,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
| 1800 | /* | 1792 | /* |
| 1801 | * Read the right value from the MPC table and | 1793 | * Read the right value from the MPC table and |
| 1802 | * write it into the ID register. | 1794 | * write it into the ID register. |
| 1803 | */ | 1795 | */ |
| 1804 | apic_printk(APIC_VERBOSE, KERN_INFO | 1796 | apic_printk(APIC_VERBOSE, KERN_INFO |
| 1805 | "...changing IO-APIC physical APIC ID to %d ...", | 1797 | "...changing IO-APIC physical APIC ID to %d ...", |
| 1806 | mp_ioapics[apic].mpc_apicid); | 1798 | mp_ioapics[apic].mpc_apicid); |
| @@ -2020,7 +2012,7 @@ static void ack_apic(unsigned int irq) | |||
| 2020 | ack_APIC_irq(); | 2012 | ack_APIC_irq(); |
| 2021 | } | 2013 | } |
| 2022 | 2014 | ||
| 2023 | static void mask_lapic_irq (unsigned int irq) | 2015 | static void mask_lapic_irq(unsigned int irq) |
| 2024 | { | 2016 | { |
| 2025 | unsigned long v; | 2017 | unsigned long v; |
| 2026 | 2018 | ||
| @@ -2028,7 +2020,7 @@ static void mask_lapic_irq (unsigned int irq) | |||
| 2028 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); | 2020 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); |
| 2029 | } | 2021 | } |
| 2030 | 2022 | ||
| 2031 | static void unmask_lapic_irq (unsigned int irq) | 2023 | static void unmask_lapic_irq(unsigned int irq) |
| 2032 | { | 2024 | { |
| 2033 | unsigned long v; | 2025 | unsigned long v; |
| 2034 | 2026 | ||
| @@ -2037,7 +2029,7 @@ static void unmask_lapic_irq (unsigned int irq) | |||
| 2037 | } | 2029 | } |
| 2038 | 2030 | ||
| 2039 | static struct irq_chip lapic_chip __read_mostly = { | 2031 | static struct irq_chip lapic_chip __read_mostly = { |
| 2040 | .name = "local-APIC-edge", | 2032 | .name = "local-APIC", |
| 2041 | .mask = mask_lapic_irq, | 2033 | .mask = mask_lapic_irq, |
| 2042 | .unmask = unmask_lapic_irq, | 2034 | .unmask = unmask_lapic_irq, |
| 2043 | .eoi = ack_apic, | 2035 | .eoi = ack_apic, |
| @@ -2046,14 +2038,14 @@ static struct irq_chip lapic_chip __read_mostly = { | |||
| 2046 | static void __init setup_nmi(void) | 2038 | static void __init setup_nmi(void) |
| 2047 | { | 2039 | { |
| 2048 | /* | 2040 | /* |
| 2049 | * Dirty trick to enable the NMI watchdog ... | 2041 | * Dirty trick to enable the NMI watchdog ... |
| 2050 | * We put the 8259A master into AEOI mode and | 2042 | * We put the 8259A master into AEOI mode and |
| 2051 | * unmask on all local APICs LVT0 as NMI. | 2043 | * unmask on all local APICs LVT0 as NMI. |
| 2052 | * | 2044 | * |
| 2053 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') | 2045 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') |
| 2054 | * is from Maciej W. Rozycki - so we do not have to EOI from | 2046 | * is from Maciej W. Rozycki - so we do not have to EOI from |
| 2055 | * the NMI handler or the timer interrupt. | 2047 | * the NMI handler or the timer interrupt. |
| 2056 | */ | 2048 | */ |
| 2057 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); | 2049 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); |
| 2058 | 2050 | ||
| 2059 | enable_NMI_through_LVT0(); | 2051 | enable_NMI_through_LVT0(); |
| @@ -2129,11 +2121,16 @@ static inline void __init unlock_ExtINT_logic(void) | |||
| 2129 | static inline void __init check_timer(void) | 2121 | static inline void __init check_timer(void) |
| 2130 | { | 2122 | { |
| 2131 | int apic1, pin1, apic2, pin2; | 2123 | int apic1, pin1, apic2, pin2; |
| 2124 | int no_pin1 = 0; | ||
| 2132 | int vector; | 2125 | int vector; |
| 2126 | unsigned int ver; | ||
| 2133 | unsigned long flags; | 2127 | unsigned long flags; |
| 2134 | 2128 | ||
| 2135 | local_irq_save(flags); | 2129 | local_irq_save(flags); |
| 2136 | 2130 | ||
| 2131 | ver = apic_read(APIC_LVR); | ||
| 2132 | ver = GET_APIC_VERSION(ver); | ||
| 2133 | |||
| 2137 | /* | 2134 | /* |
| 2138 | * get/set the timer IRQ vector: | 2135 | * get/set the timer IRQ vector: |
| 2139 | */ | 2136 | */ |
| @@ -2142,17 +2139,17 @@ static inline void __init check_timer(void) | |||
| 2142 | set_intr_gate(vector, interrupt[0]); | 2139 | set_intr_gate(vector, interrupt[0]); |
| 2143 | 2140 | ||
| 2144 | /* | 2141 | /* |
| 2145 | * Subtle, code in do_timer_interrupt() expects an AEOI | 2142 | * As IRQ0 is to be enabled in the 8259A, the virtual |
| 2146 | * mode for the 8259A whenever interrupts are routed | 2143 | * wire has to be disabled in the local APIC. Also |
| 2147 | * through I/O APICs. Also IRQ0 has to be enabled in | 2144 | * timer interrupts need to be acknowledged manually in |
| 2148 | * the 8259A which implies the virtual wire has to be | 2145 | * the 8259A for the i82489DX when using the NMI |
| 2149 | * disabled in the local APIC. | 2146 | * watchdog as that APIC treats NMIs as level-triggered. |
| 2147 | * The AEOI mode will finish them in the 8259A | ||
| 2148 | * automatically. | ||
| 2150 | */ | 2149 | */ |
| 2151 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2150 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 2152 | init_8259A(1); | 2151 | init_8259A(1); |
| 2153 | timer_ack = 1; | 2152 | timer_ack = (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); |
| 2154 | if (timer_over_8254 > 0) | ||
| 2155 | enable_8259A_irq(0); | ||
| 2156 | 2153 | ||
| 2157 | pin1 = find_isa_irq_pin(0, mp_INT); | 2154 | pin1 = find_isa_irq_pin(0, mp_INT); |
| 2158 | apic1 = find_isa_irq_apic(0, mp_INT); | 2155 | apic1 = find_isa_irq_apic(0, mp_INT); |
| @@ -2162,14 +2159,33 @@ static inline void __init check_timer(void) | |||
| 2162 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 2159 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
| 2163 | vector, apic1, pin1, apic2, pin2); | 2160 | vector, apic1, pin1, apic2, pin2); |
| 2164 | 2161 | ||
| 2162 | /* | ||
| 2163 | * Some BIOS writers are clueless and report the ExtINTA | ||
| 2164 | * I/O APIC input from the cascaded 8259A as the timer | ||
| 2165 | * interrupt input. So just in case, if only one pin | ||
| 2166 | * was found above, try it both directly and through the | ||
| 2167 | * 8259A. | ||
| 2168 | */ | ||
| 2169 | if (pin1 == -1) { | ||
| 2170 | pin1 = pin2; | ||
| 2171 | apic1 = apic2; | ||
| 2172 | no_pin1 = 1; | ||
| 2173 | } else if (pin2 == -1) { | ||
| 2174 | pin2 = pin1; | ||
| 2175 | apic2 = apic1; | ||
| 2176 | } | ||
| 2177 | |||
| 2165 | if (pin1 != -1) { | 2178 | if (pin1 != -1) { |
| 2166 | /* | 2179 | /* |
| 2167 | * Ok, does IRQ0 through the IOAPIC work? | 2180 | * Ok, does IRQ0 through the IOAPIC work? |
| 2168 | */ | 2181 | */ |
| 2182 | if (no_pin1) { | ||
| 2183 | add_pin_to_irq(0, apic1, pin1); | ||
| 2184 | setup_timer_IRQ0_pin(apic1, pin1, vector); | ||
| 2185 | } | ||
| 2169 | unmask_IO_APIC_irq(0); | 2186 | unmask_IO_APIC_irq(0); |
| 2170 | if (timer_irq_works()) { | 2187 | if (timer_irq_works()) { |
| 2171 | if (nmi_watchdog == NMI_IO_APIC) { | 2188 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2172 | disable_8259A_irq(0); | ||
| 2173 | setup_nmi(); | 2189 | setup_nmi(); |
| 2174 | enable_8259A_irq(0); | 2190 | enable_8259A_irq(0); |
| 2175 | } | 2191 | } |
| @@ -2178,43 +2194,46 @@ static inline void __init check_timer(void) | |||
| 2178 | goto out; | 2194 | goto out; |
| 2179 | } | 2195 | } |
| 2180 | clear_IO_APIC_pin(apic1, pin1); | 2196 | clear_IO_APIC_pin(apic1, pin1); |
| 2181 | printk(KERN_ERR "..MP-BIOS bug: 8254 timer not connected to " | 2197 | if (!no_pin1) |
| 2182 | "IO-APIC\n"); | 2198 | printk(KERN_ERR "..MP-BIOS bug: " |
| 2183 | } | 2199 | "8254 timer not connected to IO-APIC\n"); |
| 2184 | 2200 | ||
| 2185 | printk(KERN_INFO "...trying to set up timer (IRQ0) through the 8259A ... "); | 2201 | printk(KERN_INFO "...trying to set up timer (IRQ0) " |
| 2186 | if (pin2 != -1) { | 2202 | "through the 8259A ... "); |
| 2187 | printk("\n..... (found pin %d) ...", pin2); | 2203 | printk("\n..... (found pin %d) ...", pin2); |
| 2188 | /* | 2204 | /* |
| 2189 | * legacy devices should be connected to IO APIC #0 | 2205 | * legacy devices should be connected to IO APIC #0 |
| 2190 | */ | 2206 | */ |
| 2191 | setup_ExtINT_IRQ0_pin(apic2, pin2, vector); | 2207 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
| 2208 | setup_timer_IRQ0_pin(apic2, pin2, vector); | ||
| 2209 | unmask_IO_APIC_irq(0); | ||
| 2210 | enable_8259A_irq(0); | ||
| 2192 | if (timer_irq_works()) { | 2211 | if (timer_irq_works()) { |
| 2193 | printk("works.\n"); | 2212 | printk("works.\n"); |
| 2194 | if (pin1 != -1) | 2213 | timer_through_8259 = 1; |
| 2195 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); | ||
| 2196 | else | ||
| 2197 | add_pin_to_irq(0, apic2, pin2); | ||
| 2198 | if (nmi_watchdog == NMI_IO_APIC) { | 2214 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2215 | disable_8259A_irq(0); | ||
| 2199 | setup_nmi(); | 2216 | setup_nmi(); |
| 2217 | enable_8259A_irq(0); | ||
| 2200 | } | 2218 | } |
| 2201 | goto out; | 2219 | goto out; |
| 2202 | } | 2220 | } |
| 2203 | /* | 2221 | /* |
| 2204 | * Cleanup, just in case ... | 2222 | * Cleanup, just in case ... |
| 2205 | */ | 2223 | */ |
| 2224 | disable_8259A_irq(0); | ||
| 2206 | clear_IO_APIC_pin(apic2, pin2); | 2225 | clear_IO_APIC_pin(apic2, pin2); |
| 2226 | printk(" failed.\n"); | ||
| 2207 | } | 2227 | } |
| 2208 | printk(" failed.\n"); | ||
| 2209 | 2228 | ||
| 2210 | if (nmi_watchdog == NMI_IO_APIC) { | 2229 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2211 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 2230 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
| 2212 | nmi_watchdog = 0; | 2231 | nmi_watchdog = NMI_NONE; |
| 2213 | } | 2232 | } |
| 2233 | timer_ack = 0; | ||
| 2214 | 2234 | ||
| 2215 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 2235 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
| 2216 | 2236 | ||
| 2217 | disable_8259A_irq(0); | ||
| 2218 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, | 2237 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, |
| 2219 | "fasteoi"); | 2238 | "fasteoi"); |
| 2220 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ | 2239 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ |
| @@ -2224,12 +2243,12 @@ static inline void __init check_timer(void) | |||
| 2224 | printk(" works.\n"); | 2243 | printk(" works.\n"); |
| 2225 | goto out; | 2244 | goto out; |
| 2226 | } | 2245 | } |
| 2246 | disable_8259A_irq(0); | ||
| 2227 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); | 2247 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); |
| 2228 | printk(" failed.\n"); | 2248 | printk(" failed.\n"); |
| 2229 | 2249 | ||
| 2230 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); | 2250 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); |
| 2231 | 2251 | ||
| 2232 | timer_ack = 0; | ||
| 2233 | init_8259A(0); | 2252 | init_8259A(0); |
| 2234 | make_8259A_irq(0); | 2253 | make_8259A_irq(0); |
| 2235 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); | 2254 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); |
| @@ -2286,28 +2305,14 @@ void __init setup_IO_APIC(void) | |||
| 2286 | print_IO_APIC(); | 2305 | print_IO_APIC(); |
| 2287 | } | 2306 | } |
| 2288 | 2307 | ||
| 2289 | static int __init setup_disable_8254_timer(char *s) | ||
| 2290 | { | ||
| 2291 | timer_over_8254 = -1; | ||
| 2292 | return 1; | ||
| 2293 | } | ||
| 2294 | static int __init setup_enable_8254_timer(char *s) | ||
| 2295 | { | ||
| 2296 | timer_over_8254 = 2; | ||
| 2297 | return 1; | ||
| 2298 | } | ||
| 2299 | |||
| 2300 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
| 2301 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
| 2302 | |||
| 2303 | /* | 2308 | /* |
| 2304 | * Called after all the initialization is done. If we didnt find any | 2309 | * Called after all the initialization is done. If we didnt find any |
| 2305 | * APIC bugs then we can allow the modify fast path | 2310 | * APIC bugs then we can allow the modify fast path |
| 2306 | */ | 2311 | */ |
| 2307 | 2312 | ||
| 2308 | static int __init io_apic_bug_finalize(void) | 2313 | static int __init io_apic_bug_finalize(void) |
| 2309 | { | 2314 | { |
| 2310 | if(sis_apic_bug == -1) | 2315 | if (sis_apic_bug == -1) |
| 2311 | sis_apic_bug = 0; | 2316 | sis_apic_bug = 0; |
| 2312 | return 0; | 2317 | return 0; |
| 2313 | } | 2318 | } |
| @@ -2318,17 +2323,17 @@ struct sysfs_ioapic_data { | |||
| 2318 | struct sys_device dev; | 2323 | struct sys_device dev; |
| 2319 | struct IO_APIC_route_entry entry[0]; | 2324 | struct IO_APIC_route_entry entry[0]; |
| 2320 | }; | 2325 | }; |
| 2321 | static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; | 2326 | static struct sysfs_ioapic_data *mp_ioapic_data[MAX_IO_APICS]; |
| 2322 | 2327 | ||
| 2323 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) | 2328 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) |
| 2324 | { | 2329 | { |
| 2325 | struct IO_APIC_route_entry *entry; | 2330 | struct IO_APIC_route_entry *entry; |
| 2326 | struct sysfs_ioapic_data *data; | 2331 | struct sysfs_ioapic_data *data; |
| 2327 | int i; | 2332 | int i; |
| 2328 | 2333 | ||
| 2329 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2334 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
| 2330 | entry = data->entry; | 2335 | entry = data->entry; |
| 2331 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2336 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
| 2332 | entry[i] = ioapic_read_entry(dev->id, i); | 2337 | entry[i] = ioapic_read_entry(dev->id, i); |
| 2333 | 2338 | ||
| 2334 | return 0; | 2339 | return 0; |
| @@ -2341,7 +2346,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
| 2341 | unsigned long flags; | 2346 | unsigned long flags; |
| 2342 | union IO_APIC_reg_00 reg_00; | 2347 | union IO_APIC_reg_00 reg_00; |
| 2343 | int i; | 2348 | int i; |
| 2344 | 2349 | ||
| 2345 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2350 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
| 2346 | entry = data->entry; | 2351 | entry = data->entry; |
| 2347 | 2352 | ||
| @@ -2352,7 +2357,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
| 2352 | io_apic_write(dev->id, 0, reg_00.raw); | 2357 | io_apic_write(dev->id, 0, reg_00.raw); |
| 2353 | } | 2358 | } |
| 2354 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2359 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 2355 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2360 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
| 2356 | ioapic_write_entry(dev->id, i, entry[i]); | 2361 | ioapic_write_entry(dev->id, i, entry[i]); |
| 2357 | 2362 | ||
| 2358 | return 0; | 2363 | return 0; |
| @@ -2366,24 +2371,23 @@ static struct sysdev_class ioapic_sysdev_class = { | |||
| 2366 | 2371 | ||
| 2367 | static int __init ioapic_init_sysfs(void) | 2372 | static int __init ioapic_init_sysfs(void) |
| 2368 | { | 2373 | { |
| 2369 | struct sys_device * dev; | 2374 | struct sys_device *dev; |
| 2370 | int i, size, error = 0; | 2375 | int i, size, error = 0; |
| 2371 | 2376 | ||
| 2372 | error = sysdev_class_register(&ioapic_sysdev_class); | 2377 | error = sysdev_class_register(&ioapic_sysdev_class); |
| 2373 | if (error) | 2378 | if (error) |
| 2374 | return error; | 2379 | return error; |
| 2375 | 2380 | ||
| 2376 | for (i = 0; i < nr_ioapics; i++ ) { | 2381 | for (i = 0; i < nr_ioapics; i++) { |
| 2377 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] | 2382 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] |
| 2378 | * sizeof(struct IO_APIC_route_entry); | 2383 | * sizeof(struct IO_APIC_route_entry); |
| 2379 | mp_ioapic_data[i] = kmalloc(size, GFP_KERNEL); | 2384 | mp_ioapic_data[i] = kzalloc(size, GFP_KERNEL); |
| 2380 | if (!mp_ioapic_data[i]) { | 2385 | if (!mp_ioapic_data[i]) { |
| 2381 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); | 2386 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); |
| 2382 | continue; | 2387 | continue; |
| 2383 | } | 2388 | } |
| 2384 | memset(mp_ioapic_data[i], 0, size); | ||
| 2385 | dev = &mp_ioapic_data[i]->dev; | 2389 | dev = &mp_ioapic_data[i]->dev; |
| 2386 | dev->id = i; | 2390 | dev->id = i; |
| 2387 | dev->cls = &ioapic_sysdev_class; | 2391 | dev->cls = &ioapic_sysdev_class; |
| 2388 | error = sysdev_register(dev); | 2392 | error = sysdev_register(dev); |
| 2389 | if (error) { | 2393 | if (error) { |
| @@ -2458,7 +2462,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
| 2458 | msg->address_lo = | 2462 | msg->address_lo = |
| 2459 | MSI_ADDR_BASE_LO | | 2463 | MSI_ADDR_BASE_LO | |
| 2460 | ((INT_DEST_MODE == 0) ? | 2464 | ((INT_DEST_MODE == 0) ? |
| 2461 | MSI_ADDR_DEST_MODE_PHYSICAL: | 2465 | MSI_ADDR_DEST_MODE_PHYSICAL: |
| 2462 | MSI_ADDR_DEST_MODE_LOGICAL) | | 2466 | MSI_ADDR_DEST_MODE_LOGICAL) | |
| 2463 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2467 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
| 2464 | MSI_ADDR_REDIRECTION_CPU: | 2468 | MSI_ADDR_REDIRECTION_CPU: |
| @@ -2469,7 +2473,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
| 2469 | MSI_DATA_TRIGGER_EDGE | | 2473 | MSI_DATA_TRIGGER_EDGE | |
| 2470 | MSI_DATA_LEVEL_ASSERT | | 2474 | MSI_DATA_LEVEL_ASSERT | |
| 2471 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2475 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
| 2472 | MSI_DATA_DELIVERY_FIXED: | 2476 | MSI_DATA_DELIVERY_FIXED: |
| 2473 | MSI_DATA_DELIVERY_LOWPRI) | | 2477 | MSI_DATA_DELIVERY_LOWPRI) | |
| 2474 | MSI_DATA_VECTOR(vector); | 2478 | MSI_DATA_VECTOR(vector); |
| 2475 | } | 2479 | } |
| @@ -2640,12 +2644,12 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
| 2640 | #endif /* CONFIG_HT_IRQ */ | 2644 | #endif /* CONFIG_HT_IRQ */ |
| 2641 | 2645 | ||
| 2642 | /* -------------------------------------------------------------------------- | 2646 | /* -------------------------------------------------------------------------- |
| 2643 | ACPI-based IOAPIC Configuration | 2647 | ACPI-based IOAPIC Configuration |
| 2644 | -------------------------------------------------------------------------- */ | 2648 | -------------------------------------------------------------------------- */ |
| 2645 | 2649 | ||
| 2646 | #ifdef CONFIG_ACPI | 2650 | #ifdef CONFIG_ACPI |
| 2647 | 2651 | ||
| 2648 | int __init io_apic_get_unique_id (int ioapic, int apic_id) | 2652 | int __init io_apic_get_unique_id(int ioapic, int apic_id) |
| 2649 | { | 2653 | { |
| 2650 | union IO_APIC_reg_00 reg_00; | 2654 | union IO_APIC_reg_00 reg_00; |
| 2651 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; | 2655 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; |
| @@ -2654,10 +2658,10 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2654 | int i = 0; | 2658 | int i = 0; |
| 2655 | 2659 | ||
| 2656 | /* | 2660 | /* |
| 2657 | * The P4 platform supports up to 256 APIC IDs on two separate APIC | 2661 | * The P4 platform supports up to 256 APIC IDs on two separate APIC |
| 2658 | * buses (one for LAPICs, one for IOAPICs), where predecessors only | 2662 | * buses (one for LAPICs, one for IOAPICs), where predecessors only |
| 2659 | * supports up to 16 on one shared APIC bus. | 2663 | * supports up to 16 on one shared APIC bus. |
| 2660 | * | 2664 | * |
| 2661 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full | 2665 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full |
| 2662 | * advantage of new APIC bus architecture. | 2666 | * advantage of new APIC bus architecture. |
| 2663 | */ | 2667 | */ |
| @@ -2676,7 +2680,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2676 | } | 2680 | } |
| 2677 | 2681 | ||
| 2678 | /* | 2682 | /* |
| 2679 | * Every APIC in a system must have a unique ID or we get lots of nice | 2683 | * Every APIC in a system must have a unique ID or we get lots of nice |
| 2680 | * 'stuck on smp_invalidate_needed IPI wait' messages. | 2684 | * 'stuck on smp_invalidate_needed IPI wait' messages. |
| 2681 | */ | 2685 | */ |
| 2682 | if (check_apicid_used(apic_id_map, apic_id)) { | 2686 | if (check_apicid_used(apic_id_map, apic_id)) { |
| @@ -2693,7 +2697,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2693 | "trying %d\n", ioapic, apic_id, i); | 2697 | "trying %d\n", ioapic, apic_id, i); |
| 2694 | 2698 | ||
| 2695 | apic_id = i; | 2699 | apic_id = i; |
| 2696 | } | 2700 | } |
| 2697 | 2701 | ||
| 2698 | tmp = apicid_to_cpu_present(apic_id); | 2702 | tmp = apicid_to_cpu_present(apic_id); |
| 2699 | physids_or(apic_id_map, apic_id_map, tmp); | 2703 | physids_or(apic_id_map, apic_id_map, tmp); |
| @@ -2720,7 +2724,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2720 | } | 2724 | } |
| 2721 | 2725 | ||
| 2722 | 2726 | ||
| 2723 | int __init io_apic_get_version (int ioapic) | 2727 | int __init io_apic_get_version(int ioapic) |
| 2724 | { | 2728 | { |
| 2725 | union IO_APIC_reg_01 reg_01; | 2729 | union IO_APIC_reg_01 reg_01; |
| 2726 | unsigned long flags; | 2730 | unsigned long flags; |
| @@ -2733,7 +2737,7 @@ int __init io_apic_get_version (int ioapic) | |||
| 2733 | } | 2737 | } |
| 2734 | 2738 | ||
| 2735 | 2739 | ||
| 2736 | int __init io_apic_get_redir_entries (int ioapic) | 2740 | int __init io_apic_get_redir_entries(int ioapic) |
| 2737 | { | 2741 | { |
| 2738 | union IO_APIC_reg_01 reg_01; | 2742 | union IO_APIC_reg_01 reg_01; |
| 2739 | unsigned long flags; | 2743 | unsigned long flags; |
| @@ -2746,7 +2750,7 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
| 2746 | } | 2750 | } |
| 2747 | 2751 | ||
| 2748 | 2752 | ||
| 2749 | int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low) | 2753 | int io_apic_set_pci_routing(int ioapic, int pin, int irq, int edge_level, int active_high_low) |
| 2750 | { | 2754 | { |
| 2751 | struct IO_APIC_route_entry entry; | 2755 | struct IO_APIC_route_entry entry; |
| 2752 | 2756 | ||
| @@ -2762,7 +2766,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a | |||
| 2762 | * corresponding device driver registers for this IRQ. | 2766 | * corresponding device driver registers for this IRQ. |
| 2763 | */ | 2767 | */ |
| 2764 | 2768 | ||
| 2765 | memset(&entry,0,sizeof(entry)); | 2769 | memset(&entry, 0, sizeof(entry)); |
| 2766 | 2770 | ||
| 2767 | entry.delivery_mode = INT_DELIVERY_MODE; | 2771 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 2768 | entry.dest_mode = INT_DEST_MODE; | 2772 | entry.dest_mode = INT_DEST_MODE; |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index ef1a8dfcc529..e5ef60303562 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
| @@ -61,7 +61,7 @@ struct irq_cfg { | |||
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ | 63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ |
| 64 | struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { | 64 | static struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { |
| 65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, | 65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, |
| 66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, | 66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, |
| 67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, | 67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, |
| @@ -90,7 +90,7 @@ static int no_timer_check; | |||
| 90 | 90 | ||
| 91 | static int disable_timer_pin_1 __initdata; | 91 | static int disable_timer_pin_1 __initdata; |
| 92 | 92 | ||
| 93 | int timer_over_8254 __initdata = 1; | 93 | int timer_through_8259 __initdata; |
| 94 | 94 | ||
| 95 | /* Where if anywhere is the i8259 connect in external int mode */ | 95 | /* Where if anywhere is the i8259 connect in external int mode */ |
| 96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| @@ -183,7 +183,7 @@ static bool io_apic_level_ack_pending(unsigned int irq) | |||
| 183 | break; | 183 | break; |
| 184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); | 184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); |
| 185 | /* Is the remote IRR bit set? */ | 185 | /* Is the remote IRR bit set? */ |
| 186 | if ((reg >> 14) & 1) { | 186 | if (reg & IO_APIC_REDIR_REMOTE_IRR) { |
| 187 | spin_unlock_irqrestore(&ioapic_lock, flags); | 187 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 188 | return true; | 188 | return true; |
| 189 | } | 189 | } |
| @@ -298,7 +298,7 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) | |||
| 298 | break; | 298 | break; |
| 299 | io_apic_write(apic, 0x11 + pin*2, dest); | 299 | io_apic_write(apic, 0x11 + pin*2, dest); |
| 300 | reg = io_apic_read(apic, 0x10 + pin*2); | 300 | reg = io_apic_read(apic, 0x10 + pin*2); |
| 301 | reg &= ~0x000000ff; | 301 | reg &= ~IO_APIC_REDIR_VECTOR_MASK; |
| 302 | reg |= vector; | 302 | reg |= vector; |
| 303 | io_apic_modify(apic, reg); | 303 | io_apic_modify(apic, reg); |
| 304 | if (!entry->next) | 304 | if (!entry->next) |
| @@ -360,16 +360,37 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin) | |||
| 360 | entry->pin = pin; | 360 | entry->pin = pin; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | /* | ||
| 364 | * Reroute an IRQ to a different pin. | ||
| 365 | */ | ||
| 366 | static void __init replace_pin_at_irq(unsigned int irq, | ||
| 367 | int oldapic, int oldpin, | ||
| 368 | int newapic, int newpin) | ||
| 369 | { | ||
| 370 | struct irq_pin_list *entry = irq_2_pin + irq; | ||
| 371 | |||
| 372 | while (1) { | ||
| 373 | if (entry->apic == oldapic && entry->pin == oldpin) { | ||
| 374 | entry->apic = newapic; | ||
| 375 | entry->pin = newpin; | ||
| 376 | } | ||
| 377 | if (!entry->next) | ||
| 378 | break; | ||
| 379 | entry = irq_2_pin + entry->next; | ||
| 380 | } | ||
| 381 | } | ||
| 382 | |||
| 363 | 383 | ||
| 364 | #define DO_ACTION(name,R,ACTION, FINAL) \ | 384 | #define DO_ACTION(name,R,ACTION, FINAL) \ |
| 365 | \ | 385 | \ |
| 366 | static void name##_IO_APIC_irq (unsigned int irq) \ | 386 | static void name##_IO_APIC_irq (unsigned int irq) \ |
| 367 | __DO_ACTION(R, ACTION, FINAL) | 387 | __DO_ACTION(R, ACTION, FINAL) |
| 368 | 388 | ||
| 369 | DO_ACTION( __mask, 0, |= 0x00010000, io_apic_sync(entry->apic) ) | 389 | /* mask = 1 */ |
| 370 | /* mask = 1 */ | 390 | DO_ACTION(__mask, 0, |= IO_APIC_REDIR_MASKED, io_apic_sync(entry->apic)) |
| 371 | DO_ACTION( __unmask, 0, &= 0xfffeffff, ) | 391 | |
| 372 | /* mask = 0 */ | 392 | /* mask = 0 */ |
| 393 | DO_ACTION(__unmask, 0, &= ~IO_APIC_REDIR_MASKED, ) | ||
| 373 | 394 | ||
| 374 | static void mask_IO_APIC_irq (unsigned int irq) | 395 | static void mask_IO_APIC_irq (unsigned int irq) |
| 375 | { | 396 | { |
| @@ -430,20 +451,6 @@ static int __init disable_timer_pin_setup(char *arg) | |||
| 430 | } | 451 | } |
| 431 | __setup("disable_timer_pin_1", disable_timer_pin_setup); | 452 | __setup("disable_timer_pin_1", disable_timer_pin_setup); |
| 432 | 453 | ||
| 433 | static int __init setup_disable_8254_timer(char *s) | ||
| 434 | { | ||
| 435 | timer_over_8254 = -1; | ||
| 436 | return 1; | ||
| 437 | } | ||
| 438 | static int __init setup_enable_8254_timer(char *s) | ||
| 439 | { | ||
| 440 | timer_over_8254 = 2; | ||
| 441 | return 1; | ||
| 442 | } | ||
| 443 | |||
| 444 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
| 445 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
| 446 | |||
| 447 | 454 | ||
| 448 | /* | 455 | /* |
| 449 | * Find the IRQ entry number of a certain pin. | 456 | * Find the IRQ entry number of a certain pin. |
| @@ -911,26 +918,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 911 | } | 918 | } |
| 912 | 919 | ||
| 913 | /* | 920 | /* |
| 914 | * Set up the 8259A-master output pin as broadcast to all | 921 | * Set up the timer pin, possibly with the 8259A-master behind. |
| 915 | * CPUs. | ||
| 916 | */ | 922 | */ |
| 917 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 923 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
| 924 | int vector) | ||
| 918 | { | 925 | { |
| 919 | struct IO_APIC_route_entry entry; | 926 | struct IO_APIC_route_entry entry; |
| 920 | 927 | ||
| 921 | memset(&entry, 0, sizeof(entry)); | 928 | memset(&entry, 0, sizeof(entry)); |
| 922 | 929 | ||
| 923 | disable_8259A_irq(0); | ||
| 924 | |||
| 925 | /* mask LVT0 */ | ||
| 926 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
| 927 | |||
| 928 | /* | 930 | /* |
| 929 | * We use logical delivery to get the timer IRQ | 931 | * We use logical delivery to get the timer IRQ |
| 930 | * to the first CPU. | 932 | * to the first CPU. |
| 931 | */ | 933 | */ |
| 932 | entry.dest_mode = INT_DEST_MODE; | 934 | entry.dest_mode = INT_DEST_MODE; |
| 933 | entry.mask = 0; /* unmask IRQ now */ | 935 | entry.mask = 1; /* mask IRQ now */ |
| 934 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); | 936 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); |
| 935 | entry.delivery_mode = INT_DELIVERY_MODE; | 937 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 936 | entry.polarity = 0; | 938 | entry.polarity = 0; |
| @@ -939,7 +941,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 939 | 941 | ||
| 940 | /* | 942 | /* |
| 941 | * The timer IRQ doesn't have to know that behind the | 943 | * The timer IRQ doesn't have to know that behind the |
| 942 | * scene we have a 8259A-master in AEOI mode ... | 944 | * scene we may have a 8259A-master in AEOI mode ... |
| 943 | */ | 945 | */ |
| 944 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); | 946 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); |
| 945 | 947 | ||
| @@ -947,8 +949,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 947 | * Add it to the IO-APIC irq-routing table: | 949 | * Add it to the IO-APIC irq-routing table: |
| 948 | */ | 950 | */ |
| 949 | ioapic_write_entry(apic, pin, entry); | 951 | ioapic_write_entry(apic, pin, entry); |
| 950 | |||
| 951 | enable_8259A_irq(0); | ||
| 952 | } | 952 | } |
| 953 | 953 | ||
| 954 | void __apicdebuginit print_IO_APIC(void) | 954 | void __apicdebuginit print_IO_APIC(void) |
| @@ -1077,6 +1077,7 @@ void __apicdebuginit print_local_APIC(void * dummy) | |||
| 1077 | 1077 | ||
| 1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
| 1079 | smp_processor_id(), hard_smp_processor_id()); | 1079 | smp_processor_id(), hard_smp_processor_id()); |
| 1080 | v = apic_read(APIC_ID); | ||
| 1080 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); | 1081 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); |
| 1081 | v = apic_read(APIC_LVR); | 1082 | v = apic_read(APIC_LVR); |
| 1082 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); | 1083 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); |
| @@ -1659,6 +1660,7 @@ static inline void __init check_timer(void) | |||
| 1659 | struct irq_cfg *cfg = irq_cfg + 0; | 1660 | struct irq_cfg *cfg = irq_cfg + 0; |
| 1660 | int apic1, pin1, apic2, pin2; | 1661 | int apic1, pin1, apic2, pin2; |
| 1661 | unsigned long flags; | 1662 | unsigned long flags; |
| 1663 | int no_pin1 = 0; | ||
| 1662 | 1664 | ||
| 1663 | local_irq_save(flags); | 1665 | local_irq_save(flags); |
| 1664 | 1666 | ||
| @@ -1669,16 +1671,11 @@ static inline void __init check_timer(void) | |||
| 1669 | assign_irq_vector(0, TARGET_CPUS); | 1671 | assign_irq_vector(0, TARGET_CPUS); |
| 1670 | 1672 | ||
| 1671 | /* | 1673 | /* |
| 1672 | * Subtle, code in do_timer_interrupt() expects an AEOI | 1674 | * As IRQ0 is to be enabled in the 8259A, the virtual |
| 1673 | * mode for the 8259A whenever interrupts are routed | 1675 | * wire has to be disabled in the local APIC. |
| 1674 | * through I/O APICs. Also IRQ0 has to be enabled in | ||
| 1675 | * the 8259A which implies the virtual wire has to be | ||
| 1676 | * disabled in the local APIC. | ||
| 1677 | */ | 1676 | */ |
| 1678 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 1677 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 1679 | init_8259A(1); | 1678 | init_8259A(1); |
| 1680 | if (timer_over_8254 > 0) | ||
| 1681 | enable_8259A_irq(0); | ||
| 1682 | 1679 | ||
| 1683 | pin1 = find_isa_irq_pin(0, mp_INT); | 1680 | pin1 = find_isa_irq_pin(0, mp_INT); |
| 1684 | apic1 = find_isa_irq_apic(0, mp_INT); | 1681 | apic1 = find_isa_irq_apic(0, mp_INT); |
| @@ -1688,15 +1685,39 @@ static inline void __init check_timer(void) | |||
| 1688 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 1685 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
| 1689 | cfg->vector, apic1, pin1, apic2, pin2); | 1686 | cfg->vector, apic1, pin1, apic2, pin2); |
| 1690 | 1687 | ||
| 1688 | /* | ||
| 1689 | * Some BIOS writers are clueless and report the ExtINTA | ||
| 1690 | * I/O APIC input from the cascaded 8259A as the timer | ||
| 1691 | * interrupt input. So just in case, if only one pin | ||
| 1692 | * was found above, try it both directly and through the | ||
| 1693 | * 8259A. | ||
| 1694 | */ | ||
| 1695 | if (pin1 == -1) { | ||
| 1696 | pin1 = pin2; | ||
| 1697 | apic1 = apic2; | ||
| 1698 | no_pin1 = 1; | ||
| 1699 | } else if (pin2 == -1) { | ||
| 1700 | pin2 = pin1; | ||
| 1701 | apic2 = apic1; | ||
| 1702 | } | ||
| 1703 | |||
| 1704 | replace_pin_at_irq(0, 0, 0, apic1, pin1); | ||
| 1705 | apic1 = 0; | ||
| 1706 | pin1 = 0; | ||
| 1707 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
| 1708 | |||
| 1691 | if (pin1 != -1) { | 1709 | if (pin1 != -1) { |
| 1692 | /* | 1710 | /* |
| 1693 | * Ok, does IRQ0 through the IOAPIC work? | 1711 | * Ok, does IRQ0 through the IOAPIC work? |
| 1694 | */ | 1712 | */ |
| 1713 | if (no_pin1) { | ||
| 1714 | add_pin_to_irq(0, apic1, pin1); | ||
| 1715 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
| 1716 | } | ||
| 1695 | unmask_IO_APIC_irq(0); | 1717 | unmask_IO_APIC_irq(0); |
| 1696 | if (!no_timer_check && timer_irq_works()) { | 1718 | if (!no_timer_check && timer_irq_works()) { |
| 1697 | nmi_watchdog_default(); | 1719 | nmi_watchdog_default(); |
| 1698 | if (nmi_watchdog == NMI_IO_APIC) { | 1720 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1699 | disable_8259A_irq(0); | ||
| 1700 | setup_nmi(); | 1721 | setup_nmi(); |
| 1701 | enable_8259A_irq(0); | 1722 | enable_8259A_irq(0); |
| 1702 | } | 1723 | } |
| @@ -1705,42 +1726,48 @@ static inline void __init check_timer(void) | |||
| 1705 | goto out; | 1726 | goto out; |
| 1706 | } | 1727 | } |
| 1707 | clear_IO_APIC_pin(apic1, pin1); | 1728 | clear_IO_APIC_pin(apic1, pin1); |
| 1708 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: 8254 timer not " | 1729 | if (!no_pin1) |
| 1709 | "connected to IO-APIC\n"); | 1730 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: " |
| 1710 | } | 1731 | "8254 timer not connected to IO-APIC\n"); |
| 1711 | 1732 | ||
| 1712 | apic_printk(APIC_VERBOSE,KERN_INFO "...trying to set up timer (IRQ0) " | 1733 | apic_printk(APIC_VERBOSE,KERN_INFO |
| 1713 | "through the 8259A ... "); | 1734 | "...trying to set up timer (IRQ0) " |
| 1714 | if (pin2 != -1) { | 1735 | "through the 8259A ... "); |
| 1715 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", | 1736 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", |
| 1716 | apic2, pin2); | 1737 | apic2, pin2); |
| 1717 | /* | 1738 | /* |
| 1718 | * legacy devices should be connected to IO APIC #0 | 1739 | * legacy devices should be connected to IO APIC #0 |
| 1719 | */ | 1740 | */ |
| 1720 | setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector); | 1741 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
| 1742 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); | ||
| 1743 | unmask_IO_APIC_irq(0); | ||
| 1744 | enable_8259A_irq(0); | ||
| 1721 | if (timer_irq_works()) { | 1745 | if (timer_irq_works()) { |
| 1722 | apic_printk(APIC_VERBOSE," works.\n"); | 1746 | apic_printk(APIC_VERBOSE," works.\n"); |
| 1747 | timer_through_8259 = 1; | ||
| 1723 | nmi_watchdog_default(); | 1748 | nmi_watchdog_default(); |
| 1724 | if (nmi_watchdog == NMI_IO_APIC) { | 1749 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1750 | disable_8259A_irq(0); | ||
| 1725 | setup_nmi(); | 1751 | setup_nmi(); |
| 1752 | enable_8259A_irq(0); | ||
| 1726 | } | 1753 | } |
| 1727 | goto out; | 1754 | goto out; |
| 1728 | } | 1755 | } |
| 1729 | /* | 1756 | /* |
| 1730 | * Cleanup, just in case ... | 1757 | * Cleanup, just in case ... |
| 1731 | */ | 1758 | */ |
| 1759 | disable_8259A_irq(0); | ||
| 1732 | clear_IO_APIC_pin(apic2, pin2); | 1760 | clear_IO_APIC_pin(apic2, pin2); |
| 1761 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
| 1733 | } | 1762 | } |
| 1734 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
| 1735 | 1763 | ||
| 1736 | if (nmi_watchdog == NMI_IO_APIC) { | 1764 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1737 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 1765 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
| 1738 | nmi_watchdog = 0; | 1766 | nmi_watchdog = NMI_NONE; |
| 1739 | } | 1767 | } |
| 1740 | 1768 | ||
| 1741 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 1769 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
| 1742 | 1770 | ||
| 1743 | disable_8259A_irq(0); | ||
| 1744 | irq_desc[0].chip = &lapic_irq_type; | 1771 | irq_desc[0].chip = &lapic_irq_type; |
| 1745 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ | 1772 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ |
| 1746 | enable_8259A_irq(0); | 1773 | enable_8259A_irq(0); |
| @@ -1749,6 +1776,7 @@ static inline void __init check_timer(void) | |||
| 1749 | apic_printk(APIC_VERBOSE," works.\n"); | 1776 | apic_printk(APIC_VERBOSE," works.\n"); |
| 1750 | goto out; | 1777 | goto out; |
| 1751 | } | 1778 | } |
| 1779 | disable_8259A_irq(0); | ||
| 1752 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); | 1780 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); |
| 1753 | apic_printk(APIC_VERBOSE," failed.\n"); | 1781 | apic_printk(APIC_VERBOSE," failed.\n"); |
| 1754 | 1782 | ||
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index c0df7b89ca23..9d98cda39ad9 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/kernel_stat.h> | 8 | #include <linux/kernel_stat.h> |
| 9 | #include <linux/mc146818rtc.h> | 9 | #include <linux/mc146818rtc.h> |
| 10 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
| 11 | #include <linux/interrupt.h> | ||
| 12 | #include <linux/cpu.h> | 11 | #include <linux/cpu.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | 13 | ||
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 147352df28b9..468acd04aa2e 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
| @@ -313,16 +313,20 @@ skip: | |||
| 313 | per_cpu(irq_stat,j).irq_tlb_count); | 313 | per_cpu(irq_stat,j).irq_tlb_count); |
| 314 | seq_printf(p, " TLB shootdowns\n"); | 314 | seq_printf(p, " TLB shootdowns\n"); |
| 315 | #endif | 315 | #endif |
| 316 | #ifdef CONFIG_X86_MCE | ||
| 316 | seq_printf(p, "TRM: "); | 317 | seq_printf(p, "TRM: "); |
| 317 | for_each_online_cpu(j) | 318 | for_each_online_cpu(j) |
| 318 | seq_printf(p, "%10u ", | 319 | seq_printf(p, "%10u ", |
| 319 | per_cpu(irq_stat,j).irq_thermal_count); | 320 | per_cpu(irq_stat,j).irq_thermal_count); |
| 320 | seq_printf(p, " Thermal event interrupts\n"); | 321 | seq_printf(p, " Thermal event interrupts\n"); |
| 322 | #endif | ||
| 323 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 321 | seq_printf(p, "SPU: "); | 324 | seq_printf(p, "SPU: "); |
| 322 | for_each_online_cpu(j) | 325 | for_each_online_cpu(j) |
| 323 | seq_printf(p, "%10u ", | 326 | seq_printf(p, "%10u ", |
| 324 | per_cpu(irq_stat,j).irq_spurious_count); | 327 | per_cpu(irq_stat,j).irq_spurious_count); |
| 325 | seq_printf(p, " Spurious interrupts\n"); | 328 | seq_printf(p, " Spurious interrupts\n"); |
| 329 | #endif | ||
| 326 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); | 330 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); |
| 327 | #if defined(CONFIG_X86_IO_APIC) | 331 | #if defined(CONFIG_X86_IO_APIC) |
| 328 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); | 332 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); |
| @@ -331,6 +335,40 @@ skip: | |||
| 331 | return 0; | 335 | return 0; |
| 332 | } | 336 | } |
| 333 | 337 | ||
| 338 | /* | ||
| 339 | * /proc/stat helpers | ||
| 340 | */ | ||
| 341 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
| 342 | { | ||
| 343 | u64 sum = nmi_count(cpu); | ||
| 344 | |||
| 345 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 346 | sum += per_cpu(irq_stat, cpu).apic_timer_irqs; | ||
| 347 | #endif | ||
| 348 | #ifdef CONFIG_SMP | ||
| 349 | sum += per_cpu(irq_stat, cpu).irq_resched_count; | ||
| 350 | sum += per_cpu(irq_stat, cpu).irq_call_count; | ||
| 351 | sum += per_cpu(irq_stat, cpu).irq_tlb_count; | ||
| 352 | #endif | ||
| 353 | #ifdef CONFIG_X86_MCE | ||
| 354 | sum += per_cpu(irq_stat, cpu).irq_thermal_count; | ||
| 355 | #endif | ||
| 356 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 357 | sum += per_cpu(irq_stat, cpu).irq_spurious_count; | ||
| 358 | #endif | ||
| 359 | return sum; | ||
| 360 | } | ||
| 361 | |||
| 362 | u64 arch_irq_stat(void) | ||
| 363 | { | ||
| 364 | u64 sum = atomic_read(&irq_err_count); | ||
| 365 | |||
| 366 | #ifdef CONFIG_X86_IO_APIC | ||
| 367 | sum += atomic_read(&irq_mis_count); | ||
| 368 | #endif | ||
| 369 | return sum; | ||
| 370 | } | ||
| 371 | |||
| 334 | #ifdef CONFIG_HOTPLUG_CPU | 372 | #ifdef CONFIG_HOTPLUG_CPU |
| 335 | #include <mach_apic.h> | 373 | #include <mach_apic.h> |
| 336 | 374 | ||
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 3aac15466a91..1f78b238d8d2 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
| @@ -135,6 +135,7 @@ skip: | |||
| 135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); | 135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); |
| 136 | seq_printf(p, " TLB shootdowns\n"); | 136 | seq_printf(p, " TLB shootdowns\n"); |
| 137 | #endif | 137 | #endif |
| 138 | #ifdef CONFIG_X86_MCE | ||
| 138 | seq_printf(p, "TRM: "); | 139 | seq_printf(p, "TRM: "); |
| 139 | for_each_online_cpu(j) | 140 | for_each_online_cpu(j) |
| 140 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); | 141 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); |
| @@ -143,6 +144,7 @@ skip: | |||
| 143 | for_each_online_cpu(j) | 144 | for_each_online_cpu(j) |
| 144 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); | 145 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); |
| 145 | seq_printf(p, " Threshold APIC interrupts\n"); | 146 | seq_printf(p, " Threshold APIC interrupts\n"); |
| 147 | #endif | ||
| 146 | seq_printf(p, "SPU: "); | 148 | seq_printf(p, "SPU: "); |
| 147 | for_each_online_cpu(j) | 149 | for_each_online_cpu(j) |
| 148 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); | 150 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); |
| @@ -153,6 +155,32 @@ skip: | |||
| 153 | } | 155 | } |
| 154 | 156 | ||
| 155 | /* | 157 | /* |
| 158 | * /proc/stat helpers | ||
| 159 | */ | ||
| 160 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
| 161 | { | ||
| 162 | u64 sum = cpu_pda(cpu)->__nmi_count; | ||
| 163 | |||
| 164 | sum += cpu_pda(cpu)->apic_timer_irqs; | ||
| 165 | #ifdef CONFIG_SMP | ||
| 166 | sum += cpu_pda(cpu)->irq_resched_count; | ||
| 167 | sum += cpu_pda(cpu)->irq_call_count; | ||
| 168 | sum += cpu_pda(cpu)->irq_tlb_count; | ||
| 169 | #endif | ||
| 170 | #ifdef CONFIG_X86_MCE | ||
| 171 | sum += cpu_pda(cpu)->irq_thermal_count; | ||
| 172 | sum += cpu_pda(cpu)->irq_threshold_count; | ||
| 173 | #endif | ||
| 174 | sum += cpu_pda(cpu)->irq_spurious_count; | ||
| 175 | return sum; | ||
| 176 | } | ||
| 177 | |||
| 178 | u64 arch_irq_stat(void) | ||
| 179 | { | ||
| 180 | return atomic_read(&irq_err_count); | ||
| 181 | } | ||
| 182 | |||
| 183 | /* | ||
| 156 | * do_IRQ handles all normal device IRQ's (the special | 184 | * do_IRQ handles all normal device IRQ's (the special |
| 157 | * SMP cross-CPU interrupts have their own specific | 185 | * SMP cross-CPU interrupts have their own specific |
| 158 | * handlers). | 186 | * handlers). |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c new file mode 100644 index 000000000000..d66914287ee1 --- /dev/null +++ b/arch/x86/kernel/irqinit_32.c | |||
| @@ -0,0 +1,114 @@ | |||
| 1 | #include <linux/errno.h> | ||
| 2 | #include <linux/signal.h> | ||
| 3 | #include <linux/sched.h> | ||
| 4 | #include <linux/ioport.h> | ||
| 5 | #include <linux/interrupt.h> | ||
| 6 | #include <linux/slab.h> | ||
| 7 | #include <linux/random.h> | ||
| 8 | #include <linux/init.h> | ||
| 9 | #include <linux/kernel_stat.h> | ||
| 10 | #include <linux/sysdev.h> | ||
| 11 | #include <linux/bitops.h> | ||
| 12 | |||
| 13 | #include <asm/atomic.h> | ||
| 14 | #include <asm/system.h> | ||
| 15 | #include <asm/io.h> | ||
| 16 | #include <asm/timer.h> | ||
| 17 | #include <asm/pgtable.h> | ||
| 18 | #include <asm/delay.h> | ||
| 19 | #include <asm/desc.h> | ||
| 20 | #include <asm/apic.h> | ||
| 21 | #include <asm/arch_hooks.h> | ||
| 22 | #include <asm/i8259.h> | ||
| 23 | |||
| 24 | |||
| 25 | |||
| 26 | /* | ||
| 27 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
| 28 | * as the irq is unreliable, and exception 16 works correctly | ||
| 29 | * (ie as explained in the intel literature). On a 386, you | ||
| 30 | * can't use exception 16 due to bad IBM design, so we have to | ||
| 31 | * rely on the less exact irq13. | ||
| 32 | * | ||
| 33 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
| 34 | * leads to races. IBM designers who came up with it should | ||
| 35 | * be shot. | ||
| 36 | */ | ||
| 37 | |||
| 38 | |||
| 39 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
| 40 | { | ||
| 41 | extern void math_error(void __user *); | ||
| 42 | outb(0,0xF0); | ||
| 43 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
| 44 | return IRQ_NONE; | ||
| 45 | math_error((void __user *)get_irq_regs()->ip); | ||
| 46 | return IRQ_HANDLED; | ||
| 47 | } | ||
| 48 | |||
| 49 | /* | ||
| 50 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
| 51 | * so allow interrupt sharing. | ||
| 52 | */ | ||
| 53 | static struct irqaction fpu_irq = { | ||
| 54 | .handler = math_error_irq, | ||
| 55 | .mask = CPU_MASK_NONE, | ||
| 56 | .name = "fpu", | ||
| 57 | }; | ||
| 58 | |||
| 59 | void __init init_ISA_irqs (void) | ||
| 60 | { | ||
| 61 | int i; | ||
| 62 | |||
| 63 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 64 | init_bsp_APIC(); | ||
| 65 | #endif | ||
| 66 | init_8259A(0); | ||
| 67 | |||
| 68 | /* | ||
| 69 | * 16 old-style INTA-cycle interrupts: | ||
| 70 | */ | ||
| 71 | for (i = 0; i < 16; i++) { | ||
| 72 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 73 | handle_level_irq, "XT"); | ||
| 74 | } | ||
| 75 | } | ||
| 76 | |||
| 77 | /* Overridden in paravirt.c */ | ||
| 78 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 79 | |||
| 80 | void __init native_init_IRQ(void) | ||
| 81 | { | ||
| 82 | int i; | ||
| 83 | |||
| 84 | /* all the set up before the call gates are initialised */ | ||
| 85 | pre_intr_init_hook(); | ||
| 86 | |||
| 87 | /* | ||
| 88 | * Cover the whole vector space, no vector can escape | ||
| 89 | * us. (some of these will be overridden and become | ||
| 90 | * 'special' SMP interrupts) | ||
| 91 | */ | ||
| 92 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 93 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 94 | if (i >= NR_IRQS) | ||
| 95 | break; | ||
| 96 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
| 97 | if (!test_bit(vector, used_vectors)) | ||
| 98 | set_intr_gate(vector, interrupt[i]); | ||
| 99 | } | ||
| 100 | |||
| 101 | /* setup after call gates are initialised (usually add in | ||
| 102 | * the architecture specific gates) | ||
| 103 | */ | ||
| 104 | intr_init_hook(); | ||
| 105 | |||
| 106 | /* | ||
| 107 | * External FPU? Set up irq13 if so, for | ||
| 108 | * original braindamaged IBM FERR coupling. | ||
| 109 | */ | ||
| 110 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
| 111 | setup_irq(FPU_IRQ, &fpu_irq); | ||
| 112 | |||
| 113 | irq_ctx_init(smp_processor_id()); | ||
| 114 | } | ||
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c new file mode 100644 index 000000000000..64bc0f14285f --- /dev/null +++ b/arch/x86/kernel/irqinit_64.c | |||
| @@ -0,0 +1,203 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 2 | #include <linux/errno.h> | ||
| 3 | #include <linux/signal.h> | ||
| 4 | #include <linux/sched.h> | ||
| 5 | #include <linux/ioport.h> | ||
| 6 | #include <linux/interrupt.h> | ||
| 7 | #include <linux/timex.h> | ||
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/random.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/kernel_stat.h> | ||
| 12 | #include <linux/sysdev.h> | ||
| 13 | #include <linux/bitops.h> | ||
| 14 | |||
| 15 | #include <asm/acpi.h> | ||
| 16 | #include <asm/atomic.h> | ||
| 17 | #include <asm/system.h> | ||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/hw_irq.h> | ||
| 20 | #include <asm/pgtable.h> | ||
| 21 | #include <asm/delay.h> | ||
| 22 | #include <asm/desc.h> | ||
| 23 | #include <asm/apic.h> | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * Common place to define all x86 IRQ vectors | ||
| 28 | * | ||
| 29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
| 30 | * | ||
| 31 | * These macros create the low-level assembly IRQ routines that save | ||
| 32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
| 33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
| 34 | * interrupt-controller happy. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #define BI(x,y) \ | ||
| 38 | BUILD_IRQ(x##y) | ||
| 39 | |||
| 40 | #define BUILD_16_IRQS(x) \ | ||
| 41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
| 42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
| 43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
| 44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
| 45 | |||
| 46 | /* | ||
| 47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
| 48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* | ||
| 52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
| 53 | * are unused but an SMP system is supposed to have enough memory ... | ||
| 54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
| 55 | * across the spectrum, so we really want to be prepared to get all | ||
| 56 | * of these. Plus, more powerful systems might have more than 64 | ||
| 57 | * IO-APIC registers. | ||
| 58 | * | ||
| 59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
| 60 | */ | ||
| 61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
| 62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
| 63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
| 64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
| 65 | |||
| 66 | #undef BUILD_16_IRQS | ||
| 67 | #undef BI | ||
| 68 | |||
| 69 | |||
| 70 | #define IRQ(x,y) \ | ||
| 71 | IRQ##x##y##_interrupt | ||
| 72 | |||
| 73 | #define IRQLIST_16(x) \ | ||
| 74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
| 75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
| 76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
| 77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
| 78 | |||
| 79 | /* for the irq vectors */ | ||
| 80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
| 81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
| 82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
| 83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
| 84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
| 85 | }; | ||
| 86 | |||
| 87 | #undef IRQ | ||
| 88 | #undef IRQLIST_16 | ||
| 89 | |||
| 90 | |||
| 91 | |||
| 92 | |||
| 93 | /* | ||
| 94 | * IRQ2 is cascade interrupt to second interrupt controller | ||
| 95 | */ | ||
| 96 | |||
| 97 | static struct irqaction irq2 = { | ||
| 98 | .handler = no_action, | ||
| 99 | .mask = CPU_MASK_NONE, | ||
| 100 | .name = "cascade", | ||
| 101 | }; | ||
| 102 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
| 103 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
| 104 | [IRQ0_VECTOR] = 0, | ||
| 105 | [IRQ1_VECTOR] = 1, | ||
| 106 | [IRQ2_VECTOR] = 2, | ||
| 107 | [IRQ3_VECTOR] = 3, | ||
| 108 | [IRQ4_VECTOR] = 4, | ||
| 109 | [IRQ5_VECTOR] = 5, | ||
| 110 | [IRQ6_VECTOR] = 6, | ||
| 111 | [IRQ7_VECTOR] = 7, | ||
| 112 | [IRQ8_VECTOR] = 8, | ||
| 113 | [IRQ9_VECTOR] = 9, | ||
| 114 | [IRQ10_VECTOR] = 10, | ||
| 115 | [IRQ11_VECTOR] = 11, | ||
| 116 | [IRQ12_VECTOR] = 12, | ||
| 117 | [IRQ13_VECTOR] = 13, | ||
| 118 | [IRQ14_VECTOR] = 14, | ||
| 119 | [IRQ15_VECTOR] = 15, | ||
| 120 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
| 121 | }; | ||
| 122 | |||
| 123 | static void __init init_ISA_irqs (void) | ||
| 124 | { | ||
| 125 | int i; | ||
| 126 | |||
| 127 | init_bsp_APIC(); | ||
| 128 | init_8259A(0); | ||
| 129 | |||
| 130 | for (i = 0; i < NR_IRQS; i++) { | ||
| 131 | irq_desc[i].status = IRQ_DISABLED; | ||
| 132 | irq_desc[i].action = NULL; | ||
| 133 | irq_desc[i].depth = 1; | ||
| 134 | |||
| 135 | if (i < 16) { | ||
| 136 | /* | ||
| 137 | * 16 old-style INTA-cycle interrupts: | ||
| 138 | */ | ||
| 139 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 140 | handle_level_irq, "XT"); | ||
| 141 | } else { | ||
| 142 | /* | ||
| 143 | * 'high' PCI IRQs filled in on demand | ||
| 144 | */ | ||
| 145 | irq_desc[i].chip = &no_irq_chip; | ||
| 146 | } | ||
| 147 | } | ||
| 148 | } | ||
| 149 | |||
| 150 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 151 | |||
| 152 | void __init native_init_IRQ(void) | ||
| 153 | { | ||
| 154 | int i; | ||
| 155 | |||
| 156 | init_ISA_irqs(); | ||
| 157 | /* | ||
| 158 | * Cover the whole vector space, no vector can escape | ||
| 159 | * us. (some of these will be overridden and become | ||
| 160 | * 'special' SMP interrupts) | ||
| 161 | */ | ||
| 162 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 163 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 164 | if (vector != IA32_SYSCALL_VECTOR) | ||
| 165 | set_intr_gate(vector, interrupt[i]); | ||
| 166 | } | ||
| 167 | |||
| 168 | #ifdef CONFIG_SMP | ||
| 169 | /* | ||
| 170 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
| 171 | * IPI, driven by wakeup. | ||
| 172 | */ | ||
| 173 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
| 174 | |||
| 175 | /* IPIs for invalidation */ | ||
| 176 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
| 177 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
| 178 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
| 179 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
| 180 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
| 181 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
| 182 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
| 183 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
| 184 | |||
| 185 | /* IPI for generic function call */ | ||
| 186 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
| 187 | |||
| 188 | /* Low priority IPI to cleanup after moving an irq */ | ||
| 189 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
| 190 | #endif | ||
| 191 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
| 192 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
| 193 | |||
| 194 | /* self generated IPI for local APIC timer */ | ||
| 195 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
| 196 | |||
| 197 | /* IPI vectors for APIC spurious and error interrupts */ | ||
| 198 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
| 199 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
| 200 | |||
| 201 | if (!acpi_ioapic) | ||
| 202 | setup_irq(2, &irq2); | ||
| 203 | } | ||
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 0224c3637c73..21f2bae98c15 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #include <asm/mmu_context.h> | 20 | #include <asm/mmu_context.h> |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
| 23 | static void flush_ldt(void *null) | 23 | static void flush_ldt(void *current_mm) |
| 24 | { | 24 | { |
| 25 | if (current->active_mm) | 25 | if (current->active_mm == current_mm) |
| 26 | load_LDT(¤t->active_mm->context); | 26 | load_LDT(¤t->active_mm->context); |
| 27 | } | 27 | } |
| 28 | #endif | 28 | #endif |
| @@ -68,7 +68,7 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload) | |||
| 68 | load_LDT(pc); | 68 | load_LDT(pc); |
| 69 | mask = cpumask_of_cpu(smp_processor_id()); | 69 | mask = cpumask_of_cpu(smp_processor_id()); |
| 70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) | 70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) |
| 71 | smp_call_function(flush_ldt, NULL, 1, 1); | 71 | smp_call_function(flush_ldt, current->mm, 1, 1); |
| 72 | preempt_enable(); | 72 | preempt_enable(); |
| 73 | #else | 73 | #else |
| 74 | load_LDT(pc); | 74 | load_LDT(pc); |
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index d0b234c9fc31..f4960171bc66 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
| @@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit) | |||
| 39 | curidt.address = (unsigned long)newidt; | 39 | curidt.address = (unsigned long)newidt; |
| 40 | 40 | ||
| 41 | load_idt(&curidt); | 41 | load_idt(&curidt); |
| 42 | }; | 42 | } |
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | static void set_gdt(void *newgdt, __u16 limit) | 45 | static void set_gdt(void *newgdt, __u16 limit) |
| @@ -51,7 +51,7 @@ static void set_gdt(void *newgdt, __u16 limit) | |||
| 51 | curgdt.address = (unsigned long)newgdt; | 51 | curgdt.address = (unsigned long)newgdt; |
| 52 | 52 | ||
| 53 | load_gdt(&curgdt); | 53 | load_gdt(&curgdt); |
| 54 | }; | 54 | } |
| 55 | 55 | ||
| 56 | static void load_segments(void) | 56 | static void load_segments(void) |
| 57 | { | 57 | { |
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index 69729e38b78a..9758fea87c5b 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c | |||
| @@ -5,13 +5,14 @@ | |||
| 5 | * 2006 Shaohua Li <shaohua.li@intel.com> | 5 | * 2006 Shaohua Li <shaohua.li@intel.com> |
| 6 | * | 6 | * |
| 7 | * This driver allows to upgrade microcode on Intel processors | 7 | * This driver allows to upgrade microcode on Intel processors |
| 8 | * belonging to IA-32 family - PentiumPro, Pentium II, | 8 | * belonging to IA-32 family - PentiumPro, Pentium II, |
| 9 | * Pentium III, Xeon, Pentium 4, etc. | 9 | * Pentium III, Xeon, Pentium 4, etc. |
| 10 | * | 10 | * |
| 11 | * Reference: Section 8.10 of Volume III, Intel Pentium 4 Manual, | 11 | * Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture |
| 12 | * Order Number 245472 or free download from: | 12 | * Software Developer's Manual |
| 13 | * | 13 | * Order Number 253668 or free download from: |
| 14 | * http://developer.intel.com/design/pentium4/manuals/245472.htm | 14 | * |
| 15 | * http://developer.intel.com/design/pentium4/manuals/253668.htm | ||
| 15 | * | 16 | * |
| 16 | * For more information, go to http://www.urbanmyth.org/microcode | 17 | * For more information, go to http://www.urbanmyth.org/microcode |
| 17 | * | 18 | * |
| @@ -58,12 +59,12 @@ | |||
| 58 | * nature of implementation. | 59 | * nature of implementation. |
| 59 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> | 60 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> |
| 60 | * Fix the panic when writing zero-length microcode chunk. | 61 | * Fix the panic when writing zero-length microcode chunk. |
| 61 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, | 62 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, |
| 62 | * Jun Nakajima <jun.nakajima@intel.com> | 63 | * Jun Nakajima <jun.nakajima@intel.com> |
| 63 | * Support for the microcode updates in the new format. | 64 | * Support for the microcode updates in the new format. |
| 64 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> | 65 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> |
| 65 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl | 66 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl |
| 66 | * because we no longer hold a copy of applied microcode | 67 | * because we no longer hold a copy of applied microcode |
| 67 | * in kernel memory. | 68 | * in kernel memory. |
| 68 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> | 69 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> |
| 69 | * Fix sigmatch() macro to handle old CPUs with pf == 0. | 70 | * Fix sigmatch() macro to handle old CPUs with pf == 0. |
| @@ -320,11 +321,11 @@ static void apply_microcode(int cpu) | |||
| 320 | return; | 321 | return; |
| 321 | 322 | ||
| 322 | /* serialize access to the physical write to MSR 0x79 */ | 323 | /* serialize access to the physical write to MSR 0x79 */ |
| 323 | spin_lock_irqsave(µcode_update_lock, flags); | 324 | spin_lock_irqsave(µcode_update_lock, flags); |
| 324 | 325 | ||
| 325 | /* write microcode via MSR 0x79 */ | 326 | /* write microcode via MSR 0x79 */ |
| 326 | wrmsr(MSR_IA32_UCODE_WRITE, | 327 | wrmsr(MSR_IA32_UCODE_WRITE, |
| 327 | (unsigned long) uci->mc->bits, | 328 | (unsigned long) uci->mc->bits, |
| 328 | (unsigned long) uci->mc->bits >> 16 >> 16); | 329 | (unsigned long) uci->mc->bits >> 16 >> 16); |
| 329 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 330 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
| 330 | 331 | ||
| @@ -341,7 +342,7 @@ static void apply_microcode(int cpu) | |||
| 341 | return; | 342 | return; |
| 342 | } | 343 | } |
| 343 | printk(KERN_INFO "microcode: CPU%d updated from revision " | 344 | printk(KERN_INFO "microcode: CPU%d updated from revision " |
| 344 | "0x%x to 0x%x, date = %08x \n", | 345 | "0x%x to 0x%x, date = %08x \n", |
| 345 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); | 346 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); |
| 346 | uci->rev = val[1]; | 347 | uci->rev = val[1]; |
| 347 | } | 348 | } |
| @@ -534,7 +535,7 @@ static int cpu_request_microcode(int cpu) | |||
| 534 | c->x86, c->x86_model, c->x86_mask); | 535 | c->x86, c->x86_model, c->x86_mask); |
| 535 | error = request_firmware(&firmware, name, µcode_pdev->dev); | 536 | error = request_firmware(&firmware, name, µcode_pdev->dev); |
| 536 | if (error) { | 537 | if (error) { |
| 537 | pr_debug("microcode: ucode data file %s load failed\n", name); | 538 | pr_debug("microcode: data file %s load failed\n", name); |
| 538 | return error; | 539 | return error; |
| 539 | } | 540 | } |
| 540 | buf = firmware->data; | 541 | buf = firmware->data; |
| @@ -805,6 +806,9 @@ static int __init microcode_init (void) | |||
| 805 | { | 806 | { |
| 806 | int error; | 807 | int error; |
| 807 | 808 | ||
| 809 | printk(KERN_INFO | ||
| 810 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
| 811 | |||
| 808 | error = microcode_dev_init(); | 812 | error = microcode_dev_init(); |
| 809 | if (error) | 813 | if (error) |
| 810 | return error; | 814 | return error; |
| @@ -825,9 +829,6 @@ static int __init microcode_init (void) | |||
| 825 | } | 829 | } |
| 826 | 830 | ||
| 827 | register_hotcpu_notifier(&mc_cpu_notifier); | 831 | register_hotcpu_notifier(&mc_cpu_notifier); |
| 828 | |||
| 829 | printk(KERN_INFO | ||
| 830 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
| 831 | return 0; | 832 | return 0; |
| 832 | } | 833 | } |
| 833 | 834 | ||
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c index edc5fbfe85c0..fdfdc550b366 100644 --- a/arch/x86/kernel/mmconf-fam10h_64.c +++ b/arch/x86/kernel/mmconf-fam10h_64.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 13 | #include <asm/msr.h> | 13 | #include <asm/msr.h> |
| 14 | #include <asm/acpi.h> | 14 | #include <asm/acpi.h> |
| 15 | #include <asm/mmconfig.h> | ||
| 15 | 16 | ||
| 16 | #include "../pci/pci.h" | 17 | #include "../pci/pci.h" |
| 17 | 18 | ||
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 84160f74eeb0..6580dae46277 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
| @@ -24,8 +24,11 @@ | |||
| 24 | #include <linux/kdebug.h> | 24 | #include <linux/kdebug.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | 26 | ||
| 27 | #include <asm/i8259.h> | ||
| 28 | #include <asm/io_apic.h> | ||
| 27 | #include <asm/smp.h> | 29 | #include <asm/smp.h> |
| 28 | #include <asm/nmi.h> | 30 | #include <asm/nmi.h> |
| 31 | #include <asm/timer.h> | ||
| 29 | 32 | ||
| 30 | #include "mach_traps.h" | 33 | #include "mach_traps.h" |
| 31 | 34 | ||
| @@ -81,7 +84,7 @@ int __init check_nmi_watchdog(void) | |||
| 81 | 84 | ||
| 82 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 85 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 83 | if (!prev_nmi_count) | 86 | if (!prev_nmi_count) |
| 84 | return -1; | 87 | goto error; |
| 85 | 88 | ||
| 86 | printk(KERN_INFO "Testing NMI watchdog ... "); | 89 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 87 | 90 | ||
| @@ -118,7 +121,7 @@ int __init check_nmi_watchdog(void) | |||
| 118 | if (!atomic_read(&nmi_active)) { | 121 | if (!atomic_read(&nmi_active)) { |
| 119 | kfree(prev_nmi_count); | 122 | kfree(prev_nmi_count); |
| 120 | atomic_set(&nmi_active, -1); | 123 | atomic_set(&nmi_active, -1); |
| 121 | return -1; | 124 | goto error; |
| 122 | } | 125 | } |
| 123 | printk("OK.\n"); | 126 | printk("OK.\n"); |
| 124 | 127 | ||
| @@ -129,6 +132,12 @@ int __init check_nmi_watchdog(void) | |||
| 129 | 132 | ||
| 130 | kfree(prev_nmi_count); | 133 | kfree(prev_nmi_count); |
| 131 | return 0; | 134 | return 0; |
| 135 | error: | ||
| 136 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) | ||
| 137 | disable_8259A_irq(0); | ||
| 138 | timer_ack = 0; | ||
| 139 | |||
| 140 | return -1; | ||
| 132 | } | 141 | } |
| 133 | 142 | ||
| 134 | static int __init setup_nmi_watchdog(char *str) | 143 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index 5a29ded994fa..0060e44e8989 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | #include <linux/cpumask.h> | 21 | #include <linux/cpumask.h> |
| 22 | #include <linux/kdebug.h> | 22 | #include <linux/kdebug.h> |
| 23 | 23 | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | #include <asm/io_apic.h> | ||
| 24 | #include <asm/smp.h> | 26 | #include <asm/smp.h> |
| 25 | #include <asm/nmi.h> | 27 | #include <asm/nmi.h> |
| 26 | #include <asm/proto.h> | 28 | #include <asm/proto.h> |
| @@ -90,7 +92,7 @@ int __init check_nmi_watchdog(void) | |||
| 90 | 92 | ||
| 91 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 93 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 92 | if (!prev_nmi_count) | 94 | if (!prev_nmi_count) |
| 93 | return -1; | 95 | goto error; |
| 94 | 96 | ||
| 95 | printk(KERN_INFO "Testing NMI watchdog ... "); | 97 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 96 | 98 | ||
| @@ -121,7 +123,7 @@ int __init check_nmi_watchdog(void) | |||
| 121 | if (!atomic_read(&nmi_active)) { | 123 | if (!atomic_read(&nmi_active)) { |
| 122 | kfree(prev_nmi_count); | 124 | kfree(prev_nmi_count); |
| 123 | atomic_set(&nmi_active, -1); | 125 | atomic_set(&nmi_active, -1); |
| 124 | return -1; | 126 | goto error; |
| 125 | } | 127 | } |
| 126 | printk("OK.\n"); | 128 | printk("OK.\n"); |
| 127 | 129 | ||
| @@ -132,6 +134,11 @@ int __init check_nmi_watchdog(void) | |||
| 132 | 134 | ||
| 133 | kfree(prev_nmi_count); | 135 | kfree(prev_nmi_count); |
| 134 | return 0; | 136 | return 0; |
| 137 | error: | ||
| 138 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) | ||
| 139 | disable_8259A_irq(0); | ||
| 140 | |||
| 141 | return -1; | ||
| 135 | } | 142 | } |
| 136 | 143 | ||
| 137 | static int __init setup_nmi_watchdog(char *str) | 144 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index dc00a1331ace..3c43109ba054 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -77,10 +77,14 @@ void __init dma32_reserve_bootmem(void) | |||
| 77 | if (end_pfn <= MAX_DMA32_PFN) | 77 | if (end_pfn <= MAX_DMA32_PFN) |
| 78 | return; | 78 | return; |
| 79 | 79 | ||
| 80 | /* | ||
| 81 | * check aperture_64.c allocate_aperture() for reason about | ||
| 82 | * using 512M as goal | ||
| 83 | */ | ||
| 80 | align = 64ULL<<20; | 84 | align = 64ULL<<20; |
| 81 | size = round_up(dma32_bootmem_size, align); | 85 | size = round_up(dma32_bootmem_size, align); |
| 82 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, | 86 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, |
| 83 | __pa(MAX_DMA_ADDRESS)); | 87 | 512ULL<<20); |
| 84 | if (dma32_bootmem_ptr) | 88 | if (dma32_bootmem_ptr) |
| 85 | dma32_bootmem_size = size; | 89 | dma32_bootmem_size = size; |
| 86 | else | 90 | else |
| @@ -88,7 +92,6 @@ void __init dma32_reserve_bootmem(void) | |||
| 88 | } | 92 | } |
| 89 | static void __init dma32_free_bootmem(void) | 93 | static void __init dma32_free_bootmem(void) |
| 90 | { | 94 | { |
| 91 | int node; | ||
| 92 | 95 | ||
| 93 | if (end_pfn <= MAX_DMA32_PFN) | 96 | if (end_pfn <= MAX_DMA32_PFN) |
| 94 | return; | 97 | return; |
| @@ -96,9 +99,7 @@ static void __init dma32_free_bootmem(void) | |||
| 96 | if (!dma32_bootmem_ptr) | 99 | if (!dma32_bootmem_ptr) |
| 97 | return; | 100 | return; |
| 98 | 101 | ||
| 99 | for_each_online_node(node) | 102 | free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size); |
| 100 | free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr), | ||
| 101 | dma32_bootmem_size); | ||
| 102 | 103 | ||
| 103 | dma32_bootmem_ptr = NULL; | 104 | dma32_bootmem_ptr = NULL; |
| 104 | dma32_bootmem_size = 0; | 105 | dma32_bootmem_size = 0; |
| @@ -357,7 +358,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
| 357 | EXPORT_SYMBOL(dma_supported); | 358 | EXPORT_SYMBOL(dma_supported); |
| 358 | 359 | ||
| 359 | /* Allocate DMA memory on node near device */ | 360 | /* Allocate DMA memory on node near device */ |
| 360 | noinline struct page * | 361 | static noinline struct page * |
| 361 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) | 362 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) |
| 362 | { | 363 | { |
| 363 | int node; | 364 | int node; |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index aa8ec928caa8..021f3c684a62 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -104,7 +104,6 @@ static unsigned long alloc_iommu(struct device *dev, int size) | |||
| 104 | size, base_index, boundary_size, 0); | 104 | size, base_index, boundary_size, 0); |
| 105 | } | 105 | } |
| 106 | if (offset != -1) { | 106 | if (offset != -1) { |
| 107 | set_bit_string(iommu_gart_bitmap, offset, size); | ||
| 108 | next_bit = offset+size; | 107 | next_bit = offset+size; |
| 109 | if (next_bit >= iommu_pages) { | 108 | if (next_bit >= iommu_pages) { |
| 110 | next_bit = 0; | 109 | next_bit = 0; |
| @@ -534,8 +533,8 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 534 | unsigned aper_size = 0, aper_base_32, aper_order; | 533 | unsigned aper_size = 0, aper_base_32, aper_order; |
| 535 | u64 aper_base; | 534 | u64 aper_base; |
| 536 | 535 | ||
| 537 | pci_read_config_dword(dev, 0x94, &aper_base_32); | 536 | pci_read_config_dword(dev, AMD64_GARTAPERTUREBASE, &aper_base_32); |
| 538 | pci_read_config_dword(dev, 0x90, &aper_order); | 537 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &aper_order); |
| 539 | aper_order = (aper_order >> 1) & 7; | 538 | aper_order = (aper_order >> 1) & 7; |
| 540 | 539 | ||
| 541 | aper_base = aper_base_32 & 0x7fff; | 540 | aper_base = aper_base_32 & 0x7fff; |
| @@ -549,14 +548,63 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 549 | return aper_base; | 548 | return aper_base; |
| 550 | } | 549 | } |
| 551 | 550 | ||
| 551 | static void enable_gart_translations(void) | ||
| 552 | { | ||
| 553 | int i; | ||
| 554 | |||
| 555 | for (i = 0; i < num_k8_northbridges; i++) { | ||
| 556 | struct pci_dev *dev = k8_northbridges[i]; | ||
| 557 | |||
| 558 | enable_gart_translation(dev, __pa(agp_gatt_table)); | ||
| 559 | } | ||
| 560 | } | ||
| 561 | |||
| 562 | /* | ||
| 563 | * If fix_up_north_bridges is set, the north bridges have to be fixed up on | ||
| 564 | * resume in the same way as they are handled in gart_iommu_hole_init(). | ||
| 565 | */ | ||
| 566 | static bool fix_up_north_bridges; | ||
| 567 | static u32 aperture_order; | ||
| 568 | static u32 aperture_alloc; | ||
| 569 | |||
| 570 | void set_up_gart_resume(u32 aper_order, u32 aper_alloc) | ||
| 571 | { | ||
| 572 | fix_up_north_bridges = true; | ||
| 573 | aperture_order = aper_order; | ||
| 574 | aperture_alloc = aper_alloc; | ||
| 575 | } | ||
| 576 | |||
| 552 | static int gart_resume(struct sys_device *dev) | 577 | static int gart_resume(struct sys_device *dev) |
| 553 | { | 578 | { |
| 579 | printk(KERN_INFO "PCI-DMA: Resuming GART IOMMU\n"); | ||
| 580 | |||
| 581 | if (fix_up_north_bridges) { | ||
| 582 | int i; | ||
| 583 | |||
| 584 | printk(KERN_INFO "PCI-DMA: Restoring GART aperture settings\n"); | ||
| 585 | |||
| 586 | for (i = 0; i < num_k8_northbridges; i++) { | ||
| 587 | struct pci_dev *dev = k8_northbridges[i]; | ||
| 588 | |||
| 589 | /* | ||
| 590 | * Don't enable translations just yet. That is the next | ||
| 591 | * step. Restore the pre-suspend aperture settings. | ||
| 592 | */ | ||
| 593 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, | ||
| 594 | aperture_order << 1); | ||
| 595 | pci_write_config_dword(dev, AMD64_GARTAPERTUREBASE, | ||
| 596 | aperture_alloc >> 25); | ||
| 597 | } | ||
| 598 | } | ||
| 599 | |||
| 600 | enable_gart_translations(); | ||
| 601 | |||
| 554 | return 0; | 602 | return 0; |
| 555 | } | 603 | } |
| 556 | 604 | ||
| 557 | static int gart_suspend(struct sys_device *dev, pm_message_t state) | 605 | static int gart_suspend(struct sys_device *dev, pm_message_t state) |
| 558 | { | 606 | { |
| 559 | return -EINVAL; | 607 | return 0; |
| 560 | } | 608 | } |
| 561 | 609 | ||
| 562 | static struct sysdev_class gart_sysdev_class = { | 610 | static struct sysdev_class gart_sysdev_class = { |
| @@ -614,27 +662,14 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 614 | memset(gatt, 0, gatt_size); | 662 | memset(gatt, 0, gatt_size); |
| 615 | agp_gatt_table = gatt; | 663 | agp_gatt_table = gatt; |
| 616 | 664 | ||
| 617 | for (i = 0; i < num_k8_northbridges; i++) { | 665 | enable_gart_translations(); |
| 618 | u32 gatt_reg; | ||
| 619 | u32 ctl; | ||
| 620 | |||
| 621 | dev = k8_northbridges[i]; | ||
| 622 | gatt_reg = __pa(gatt) >> 12; | ||
| 623 | gatt_reg <<= 4; | ||
| 624 | pci_write_config_dword(dev, 0x98, gatt_reg); | ||
| 625 | pci_read_config_dword(dev, 0x90, &ctl); | ||
| 626 | |||
| 627 | ctl |= 1; | ||
| 628 | ctl &= ~((1<<4) | (1<<5)); | ||
| 629 | |||
| 630 | pci_write_config_dword(dev, 0x90, ctl); | ||
| 631 | } | ||
| 632 | 666 | ||
| 633 | error = sysdev_class_register(&gart_sysdev_class); | 667 | error = sysdev_class_register(&gart_sysdev_class); |
| 634 | if (!error) | 668 | if (!error) |
| 635 | error = sysdev_register(&device_gart); | 669 | error = sysdev_register(&device_gart); |
| 636 | if (error) | 670 | if (error) |
| 637 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); | 671 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); |
| 672 | |||
| 638 | flush_gart(); | 673 | flush_gart(); |
| 639 | 674 | ||
| 640 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", | 675 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", |
| @@ -677,11 +712,11 @@ void gart_iommu_shutdown(void) | |||
| 677 | u32 ctl; | 712 | u32 ctl; |
| 678 | 713 | ||
| 679 | dev = k8_northbridges[i]; | 714 | dev = k8_northbridges[i]; |
| 680 | pci_read_config_dword(dev, 0x90, &ctl); | 715 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); |
| 681 | 716 | ||
| 682 | ctl &= ~1; | 717 | ctl &= ~GARTEN; |
| 683 | 718 | ||
| 684 | pci_write_config_dword(dev, 0x90, ctl); | 719 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); |
| 685 | } | 720 | } |
| 686 | } | 721 | } |
| 687 | 722 | ||
| @@ -788,10 +823,10 @@ void __init gart_iommu_init(void) | |||
| 788 | wbinvd(); | 823 | wbinvd(); |
| 789 | 824 | ||
| 790 | /* | 825 | /* |
| 791 | * Try to workaround a bug (thanks to BenH) | 826 | * Try to workaround a bug (thanks to BenH): |
| 792 | * Set unmapped entries to a scratch page instead of 0. | 827 | * Set unmapped entries to a scratch page instead of 0. |
| 793 | * Any prefetches that hit unmapped entries won't get an bus abort | 828 | * Any prefetches that hit unmapped entries won't get an bus abort |
| 794 | * then. | 829 | * then. (P2P bridge may be prefetching on DMA reads). |
| 795 | */ | 830 | */ |
| 796 | scratch = get_zeroed_page(GFP_KERNEL); | 831 | scratch = get_zeroed_page(GFP_KERNEL); |
| 797 | if (!scratch) | 832 | if (!scratch) |
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ba370dc8685b..4061d63aabe7 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/pm.h> | 8 | #include <linux/pm.h> |
| 9 | #include <linux/clockchips.h> | ||
| 9 | 10 | ||
| 10 | struct kmem_cache *task_xstate_cachep; | 11 | struct kmem_cache *task_xstate_cachep; |
| 11 | 12 | ||
| @@ -45,6 +46,76 @@ void arch_task_cache_init(void) | |||
| 45 | SLAB_PANIC, NULL); | 46 | SLAB_PANIC, NULL); |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 49 | /* | ||
| 50 | * Idle related variables and functions | ||
| 51 | */ | ||
| 52 | unsigned long boot_option_idle_override = 0; | ||
| 53 | EXPORT_SYMBOL(boot_option_idle_override); | ||
| 54 | |||
| 55 | /* | ||
| 56 | * Powermanagement idle function, if any.. | ||
| 57 | */ | ||
| 58 | void (*pm_idle)(void); | ||
| 59 | EXPORT_SYMBOL(pm_idle); | ||
| 60 | |||
| 61 | #ifdef CONFIG_X86_32 | ||
| 62 | /* | ||
| 63 | * This halt magic was a workaround for ancient floppy DMA | ||
| 64 | * wreckage. It should be safe to remove. | ||
| 65 | */ | ||
| 66 | static int hlt_counter; | ||
| 67 | void disable_hlt(void) | ||
| 68 | { | ||
| 69 | hlt_counter++; | ||
| 70 | } | ||
| 71 | EXPORT_SYMBOL(disable_hlt); | ||
| 72 | |||
| 73 | void enable_hlt(void) | ||
| 74 | { | ||
| 75 | hlt_counter--; | ||
| 76 | } | ||
| 77 | EXPORT_SYMBOL(enable_hlt); | ||
| 78 | |||
| 79 | static inline int hlt_use_halt(void) | ||
| 80 | { | ||
| 81 | return (!hlt_counter && boot_cpu_data.hlt_works_ok); | ||
| 82 | } | ||
| 83 | #else | ||
| 84 | static inline int hlt_use_halt(void) | ||
| 85 | { | ||
| 86 | return 1; | ||
| 87 | } | ||
| 88 | #endif | ||
| 89 | |||
| 90 | /* | ||
| 91 | * We use this if we don't have any better | ||
| 92 | * idle routine.. | ||
| 93 | */ | ||
| 94 | void default_idle(void) | ||
| 95 | { | ||
| 96 | if (hlt_use_halt()) { | ||
| 97 | current_thread_info()->status &= ~TS_POLLING; | ||
| 98 | /* | ||
| 99 | * TS_POLLING-cleared state must be visible before we | ||
| 100 | * test NEED_RESCHED: | ||
| 101 | */ | ||
| 102 | smp_mb(); | ||
| 103 | |||
| 104 | if (!need_resched()) | ||
| 105 | safe_halt(); /* enables interrupts racelessly */ | ||
| 106 | else | ||
| 107 | local_irq_enable(); | ||
| 108 | current_thread_info()->status |= TS_POLLING; | ||
| 109 | } else { | ||
| 110 | local_irq_enable(); | ||
| 111 | /* loop is done by the caller */ | ||
| 112 | cpu_relax(); | ||
| 113 | } | ||
| 114 | } | ||
| 115 | #ifdef CONFIG_APM_MODULE | ||
| 116 | EXPORT_SYMBOL(default_idle); | ||
| 117 | #endif | ||
| 118 | |||
| 48 | static void do_nothing(void *unused) | 119 | static void do_nothing(void *unused) |
| 49 | { | 120 | { |
| 50 | } | 121 | } |
| @@ -122,44 +193,129 @@ static void poll_idle(void) | |||
| 122 | * | 193 | * |
| 123 | * idle=mwait overrides this decision and forces the usage of mwait. | 194 | * idle=mwait overrides this decision and forces the usage of mwait. |
| 124 | */ | 195 | */ |
| 196 | |||
| 197 | #define MWAIT_INFO 0x05 | ||
| 198 | #define MWAIT_ECX_EXTENDED_INFO 0x01 | ||
| 199 | #define MWAIT_EDX_C1 0xf0 | ||
| 200 | |||
| 125 | static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) | 201 | static int __cpuinit mwait_usable(const struct cpuinfo_x86 *c) |
| 126 | { | 202 | { |
| 203 | u32 eax, ebx, ecx, edx; | ||
| 204 | |||
| 127 | if (force_mwait) | 205 | if (force_mwait) |
| 128 | return 1; | 206 | return 1; |
| 129 | 207 | ||
| 130 | if (c->x86_vendor == X86_VENDOR_AMD) { | 208 | if (c->cpuid_level < MWAIT_INFO) |
| 131 | switch(c->x86) { | 209 | return 0; |
| 132 | case 0x10: | 210 | |
| 133 | case 0x11: | 211 | cpuid(MWAIT_INFO, &eax, &ebx, &ecx, &edx); |
| 134 | return 0; | 212 | /* Check, whether EDX has extended info about MWAIT */ |
| 135 | } | 213 | if (!(ecx & MWAIT_ECX_EXTENDED_INFO)) |
| 136 | } | 214 | return 1; |
| 215 | |||
| 216 | /* | ||
| 217 | * edx enumeratios MONITOR/MWAIT extensions. Check, whether | ||
| 218 | * C1 supports MWAIT | ||
| 219 | */ | ||
| 220 | return (edx & MWAIT_EDX_C1); | ||
| 221 | } | ||
| 222 | |||
| 223 | /* | ||
| 224 | * Check for AMD CPUs, which have potentially C1E support | ||
| 225 | */ | ||
| 226 | static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c) | ||
| 227 | { | ||
| 228 | if (c->x86_vendor != X86_VENDOR_AMD) | ||
| 229 | return 0; | ||
| 230 | |||
| 231 | if (c->x86 < 0x0F) | ||
| 232 | return 0; | ||
| 233 | |||
| 234 | /* Family 0x0f models < rev F do not have C1E */ | ||
| 235 | if (c->x86 == 0x0f && c->x86_model < 0x40) | ||
| 236 | return 0; | ||
| 237 | |||
| 137 | return 1; | 238 | return 1; |
| 138 | } | 239 | } |
| 139 | 240 | ||
| 140 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | 241 | /* |
| 242 | * C1E aware idle routine. We check for C1E active in the interrupt | ||
| 243 | * pending message MSR. If we detect C1E, then we handle it the same | ||
| 244 | * way as C3 power states (local apic timer and TSC stop) | ||
| 245 | */ | ||
| 246 | static void c1e_idle(void) | ||
| 141 | { | 247 | { |
| 142 | static int selected; | 248 | static cpumask_t c1e_mask = CPU_MASK_NONE; |
| 249 | static int c1e_detected; | ||
| 143 | 250 | ||
| 144 | if (selected) | 251 | if (need_resched()) |
| 145 | return; | 252 | return; |
| 253 | |||
| 254 | if (!c1e_detected) { | ||
| 255 | u32 lo, hi; | ||
| 256 | |||
| 257 | rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); | ||
| 258 | if (lo & K8_INTP_C1E_ACTIVE_MASK) { | ||
| 259 | c1e_detected = 1; | ||
| 260 | mark_tsc_unstable("TSC halt in C1E"); | ||
| 261 | printk(KERN_INFO "System has C1E enabled\n"); | ||
| 262 | } | ||
| 263 | } | ||
| 264 | |||
| 265 | if (c1e_detected) { | ||
| 266 | int cpu = smp_processor_id(); | ||
| 267 | |||
| 268 | if (!cpu_isset(cpu, c1e_mask)) { | ||
| 269 | cpu_set(cpu, c1e_mask); | ||
| 270 | /* | ||
| 271 | * Force broadcast so ACPI can not interfere. Needs | ||
| 272 | * to run with interrupts enabled as it uses | ||
| 273 | * smp_function_call. | ||
| 274 | */ | ||
| 275 | local_irq_enable(); | ||
| 276 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_FORCE, | ||
| 277 | &cpu); | ||
| 278 | printk(KERN_INFO "Switch to broadcast mode on CPU%d\n", | ||
| 279 | cpu); | ||
| 280 | local_irq_disable(); | ||
| 281 | } | ||
| 282 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu); | ||
| 283 | |||
| 284 | default_idle(); | ||
| 285 | |||
| 286 | /* | ||
| 287 | * The switch back from broadcast mode needs to be | ||
| 288 | * called with interrupts disabled. | ||
| 289 | */ | ||
| 290 | local_irq_disable(); | ||
| 291 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu); | ||
| 292 | local_irq_enable(); | ||
| 293 | } else | ||
| 294 | default_idle(); | ||
| 295 | } | ||
| 296 | |||
| 297 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | ||
| 298 | { | ||
| 146 | #ifdef CONFIG_X86_SMP | 299 | #ifdef CONFIG_X86_SMP |
| 147 | if (pm_idle == poll_idle && smp_num_siblings > 1) { | 300 | if (pm_idle == poll_idle && smp_num_siblings > 1) { |
| 148 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," | 301 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," |
| 149 | " performance may degrade.\n"); | 302 | " performance may degrade.\n"); |
| 150 | } | 303 | } |
| 151 | #endif | 304 | #endif |
| 305 | if (pm_idle) | ||
| 306 | return; | ||
| 307 | |||
| 152 | if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { | 308 | if (cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)) { |
| 153 | /* | 309 | /* |
| 154 | * Skip, if setup has overridden idle. | ||
| 155 | * One CPU supports mwait => All CPUs supports mwait | 310 | * One CPU supports mwait => All CPUs supports mwait |
| 156 | */ | 311 | */ |
| 157 | if (!pm_idle) { | 312 | printk(KERN_INFO "using mwait in idle threads.\n"); |
| 158 | printk(KERN_INFO "using mwait in idle threads.\n"); | 313 | pm_idle = mwait_idle; |
| 159 | pm_idle = mwait_idle; | 314 | } else if (check_c1e_idle(c)) { |
| 160 | } | 315 | printk(KERN_INFO "using C1E aware idle routine\n"); |
| 161 | } | 316 | pm_idle = c1e_idle; |
| 162 | selected = 1; | 317 | } else |
| 318 | pm_idle = default_idle; | ||
| 163 | } | 319 | } |
| 164 | 320 | ||
| 165 | static int __init idle_setup(char *str) | 321 | static int __init idle_setup(char *str) |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index e2db9ac5c61c..c2a11d77b1b5 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
| @@ -58,11 +58,6 @@ | |||
| 58 | 58 | ||
| 59 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); | 59 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); |
| 60 | 60 | ||
| 61 | static int hlt_counter; | ||
| 62 | |||
| 63 | unsigned long boot_option_idle_override = 0; | ||
| 64 | EXPORT_SYMBOL(boot_option_idle_override); | ||
| 65 | |||
| 66 | DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; | 61 | DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; |
| 67 | EXPORT_PER_CPU_SYMBOL(current_task); | 62 | EXPORT_PER_CPU_SYMBOL(current_task); |
| 68 | 63 | ||
| @@ -77,55 +72,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
| 77 | return ((unsigned long *)tsk->thread.sp)[3]; | 72 | return ((unsigned long *)tsk->thread.sp)[3]; |
| 78 | } | 73 | } |
| 79 | 74 | ||
| 80 | /* | ||
| 81 | * Powermanagement idle function, if any.. | ||
| 82 | */ | ||
| 83 | void (*pm_idle)(void); | ||
| 84 | EXPORT_SYMBOL(pm_idle); | ||
| 85 | |||
| 86 | void disable_hlt(void) | ||
| 87 | { | ||
| 88 | hlt_counter++; | ||
| 89 | } | ||
| 90 | |||
| 91 | EXPORT_SYMBOL(disable_hlt); | ||
| 92 | |||
| 93 | void enable_hlt(void) | ||
| 94 | { | ||
| 95 | hlt_counter--; | ||
| 96 | } | ||
| 97 | |||
| 98 | EXPORT_SYMBOL(enable_hlt); | ||
| 99 | |||
| 100 | /* | ||
| 101 | * We use this if we don't have any better | ||
| 102 | * idle routine.. | ||
| 103 | */ | ||
| 104 | void default_idle(void) | ||
| 105 | { | ||
| 106 | if (!hlt_counter && boot_cpu_data.hlt_works_ok) { | ||
| 107 | current_thread_info()->status &= ~TS_POLLING; | ||
| 108 | /* | ||
| 109 | * TS_POLLING-cleared state must be visible before we | ||
| 110 | * test NEED_RESCHED: | ||
| 111 | */ | ||
| 112 | smp_mb(); | ||
| 113 | |||
| 114 | if (!need_resched()) | ||
| 115 | safe_halt(); /* enables interrupts racelessly */ | ||
| 116 | else | ||
| 117 | local_irq_enable(); | ||
| 118 | current_thread_info()->status |= TS_POLLING; | ||
| 119 | } else { | ||
| 120 | local_irq_enable(); | ||
| 121 | /* loop is done by the caller */ | ||
| 122 | cpu_relax(); | ||
| 123 | } | ||
| 124 | } | ||
| 125 | #ifdef CONFIG_APM_MODULE | ||
| 126 | EXPORT_SYMBOL(default_idle); | ||
| 127 | #endif | ||
| 128 | |||
| 129 | #ifdef CONFIG_HOTPLUG_CPU | 75 | #ifdef CONFIG_HOTPLUG_CPU |
| 130 | #include <asm/nmi.h> | 76 | #include <asm/nmi.h> |
| 131 | /* We don't actually take CPU down, just spin without interrupts. */ | 77 | /* We don't actually take CPU down, just spin without interrupts. */ |
| @@ -168,24 +114,19 @@ void cpu_idle(void) | |||
| 168 | while (1) { | 114 | while (1) { |
| 169 | tick_nohz_stop_sched_tick(); | 115 | tick_nohz_stop_sched_tick(); |
| 170 | while (!need_resched()) { | 116 | while (!need_resched()) { |
| 171 | void (*idle)(void); | ||
| 172 | 117 | ||
| 173 | check_pgt_cache(); | 118 | check_pgt_cache(); |
| 174 | rmb(); | 119 | rmb(); |
| 175 | idle = pm_idle; | ||
| 176 | 120 | ||
| 177 | if (rcu_pending(cpu)) | 121 | if (rcu_pending(cpu)) |
| 178 | rcu_check_callbacks(cpu, 0); | 122 | rcu_check_callbacks(cpu, 0); |
| 179 | 123 | ||
| 180 | if (!idle) | ||
| 181 | idle = default_idle; | ||
| 182 | |||
| 183 | if (cpu_is_offline(cpu)) | 124 | if (cpu_is_offline(cpu)) |
| 184 | play_dead(); | 125 | play_dead(); |
| 185 | 126 | ||
| 186 | local_irq_disable(); | 127 | local_irq_disable(); |
| 187 | __get_cpu_var(irq_stat).idle_timestamp = jiffies; | 128 | __get_cpu_var(irq_stat).idle_timestamp = jiffies; |
| 188 | idle(); | 129 | pm_idle(); |
| 189 | } | 130 | } |
| 190 | tick_nohz_restart_sched_tick(); | 131 | tick_nohz_restart_sched_tick(); |
| 191 | preempt_enable_no_resched(); | 132 | preempt_enable_no_resched(); |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index c6eb5c91e5f6..290183e9731a 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
| @@ -56,15 +56,6 @@ asmlinkage extern void ret_from_fork(void); | |||
| 56 | 56 | ||
| 57 | unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED; | 57 | unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED; |
| 58 | 58 | ||
| 59 | unsigned long boot_option_idle_override = 0; | ||
| 60 | EXPORT_SYMBOL(boot_option_idle_override); | ||
| 61 | |||
| 62 | /* | ||
| 63 | * Powermanagement idle function, if any.. | ||
| 64 | */ | ||
| 65 | void (*pm_idle)(void); | ||
| 66 | EXPORT_SYMBOL(pm_idle); | ||
| 67 | |||
| 68 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); | 59 | static ATOMIC_NOTIFIER_HEAD(idle_notifier); |
| 69 | 60 | ||
| 70 | void idle_notifier_register(struct notifier_block *n) | 61 | void idle_notifier_register(struct notifier_block *n) |
| @@ -94,25 +85,6 @@ void exit_idle(void) | |||
| 94 | __exit_idle(); | 85 | __exit_idle(); |
| 95 | } | 86 | } |
| 96 | 87 | ||
| 97 | /* | ||
| 98 | * We use this if we don't have any better | ||
| 99 | * idle routine.. | ||
| 100 | */ | ||
| 101 | void default_idle(void) | ||
| 102 | { | ||
| 103 | current_thread_info()->status &= ~TS_POLLING; | ||
| 104 | /* | ||
| 105 | * TS_POLLING-cleared state must be visible before we | ||
| 106 | * test NEED_RESCHED: | ||
| 107 | */ | ||
| 108 | smp_mb(); | ||
| 109 | if (!need_resched()) | ||
| 110 | safe_halt(); /* enables interrupts racelessly */ | ||
| 111 | else | ||
| 112 | local_irq_enable(); | ||
| 113 | current_thread_info()->status |= TS_POLLING; | ||
| 114 | } | ||
| 115 | |||
| 116 | #ifdef CONFIG_HOTPLUG_CPU | 88 | #ifdef CONFIG_HOTPLUG_CPU |
| 117 | DECLARE_PER_CPU(int, cpu_state); | 89 | DECLARE_PER_CPU(int, cpu_state); |
| 118 | 90 | ||
| @@ -150,12 +122,9 @@ void cpu_idle(void) | |||
| 150 | while (1) { | 122 | while (1) { |
| 151 | tick_nohz_stop_sched_tick(); | 123 | tick_nohz_stop_sched_tick(); |
| 152 | while (!need_resched()) { | 124 | while (!need_resched()) { |
| 153 | void (*idle)(void); | ||
| 154 | 125 | ||
| 155 | rmb(); | 126 | rmb(); |
| 156 | idle = pm_idle; | 127 | |
| 157 | if (!idle) | ||
| 158 | idle = default_idle; | ||
| 159 | if (cpu_is_offline(smp_processor_id())) | 128 | if (cpu_is_offline(smp_processor_id())) |
| 160 | play_dead(); | 129 | play_dead(); |
| 161 | /* | 130 | /* |
| @@ -165,7 +134,7 @@ void cpu_idle(void) | |||
| 165 | */ | 134 | */ |
| 166 | local_irq_disable(); | 135 | local_irq_disable(); |
| 167 | enter_idle(); | 136 | enter_idle(); |
| 168 | idle(); | 137 | pm_idle(); |
| 169 | /* In many cases the interrupt that ended idle | 138 | /* In many cases the interrupt that ended idle |
| 170 | has already called exit_idle. But some idle | 139 | has already called exit_idle. But some idle |
| 171 | loops can be woken up without interrupt. */ | 140 | loops can be woken up without interrupt. */ |
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index d89a648fe710..79bdcd11c66e 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -65,6 +65,7 @@ static enum { | |||
| 65 | ICH_FORCE_HPET_RESUME, | 65 | ICH_FORCE_HPET_RESUME, |
| 66 | VT8237_FORCE_HPET_RESUME, | 66 | VT8237_FORCE_HPET_RESUME, |
| 67 | NVIDIA_FORCE_HPET_RESUME, | 67 | NVIDIA_FORCE_HPET_RESUME, |
| 68 | ATI_FORCE_HPET_RESUME, | ||
| 68 | } force_hpet_resume_type; | 69 | } force_hpet_resume_type; |
| 69 | 70 | ||
| 70 | static void __iomem *rcba_base; | 71 | static void __iomem *rcba_base; |
| @@ -158,6 +159,8 @@ static void ich_force_enable_hpet(struct pci_dev *dev) | |||
| 158 | 159 | ||
| 159 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, | 160 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, |
| 160 | ich_force_enable_hpet); | 161 | ich_force_enable_hpet); |
| 162 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, | ||
| 163 | ich_force_enable_hpet); | ||
| 161 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, | 164 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, |
| 162 | ich_force_enable_hpet); | 165 | ich_force_enable_hpet); |
| 163 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, | 166 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, |
| @@ -174,6 +177,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, | |||
| 174 | 177 | ||
| 175 | static struct pci_dev *cached_dev; | 178 | static struct pci_dev *cached_dev; |
| 176 | 179 | ||
| 180 | static void hpet_print_force_info(void) | ||
| 181 | { | ||
| 182 | printk(KERN_INFO "HPET not enabled in BIOS. " | ||
| 183 | "You might try hpet=force boot option\n"); | ||
| 184 | } | ||
| 185 | |||
| 177 | static void old_ich_force_hpet_resume(void) | 186 | static void old_ich_force_hpet_resume(void) |
| 178 | { | 187 | { |
| 179 | u32 val; | 188 | u32 val; |
| @@ -253,6 +262,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev) | |||
| 253 | { | 262 | { |
| 254 | if (hpet_force_user) | 263 | if (hpet_force_user) |
| 255 | old_ich_force_enable_hpet(dev); | 264 | old_ich_force_enable_hpet(dev); |
| 265 | else | ||
| 266 | hpet_print_force_info(); | ||
| 256 | } | 267 | } |
| 257 | 268 | ||
| 258 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 269 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
| @@ -290,8 +301,13 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev) | |||
| 290 | { | 301 | { |
| 291 | u32 uninitialized_var(val); | 302 | u32 uninitialized_var(val); |
| 292 | 303 | ||
| 293 | if (!hpet_force_user || hpet_address || force_hpet_address) | 304 | if (hpet_address || force_hpet_address) |
| 305 | return; | ||
| 306 | |||
| 307 | if (!hpet_force_user) { | ||
| 308 | hpet_print_force_info(); | ||
| 294 | return; | 309 | return; |
| 310 | } | ||
| 295 | 311 | ||
| 296 | pci_read_config_dword(dev, 0x68, &val); | 312 | pci_read_config_dword(dev, 0x68, &val); |
| 297 | /* | 313 | /* |
| @@ -330,6 +346,36 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, | |||
| 330 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, | 346 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, |
| 331 | vt8237_force_enable_hpet); | 347 | vt8237_force_enable_hpet); |
| 332 | 348 | ||
| 349 | static void ati_force_hpet_resume(void) | ||
| 350 | { | ||
| 351 | pci_write_config_dword(cached_dev, 0x14, 0xfed00000); | ||
| 352 | printk(KERN_DEBUG "Force enabled HPET at resume\n"); | ||
| 353 | } | ||
| 354 | |||
| 355 | static void ati_force_enable_hpet(struct pci_dev *dev) | ||
| 356 | { | ||
| 357 | u32 uninitialized_var(val); | ||
| 358 | |||
| 359 | if (hpet_address || force_hpet_address) | ||
| 360 | return; | ||
| 361 | |||
| 362 | if (!hpet_force_user) { | ||
| 363 | hpet_print_force_info(); | ||
| 364 | return; | ||
| 365 | } | ||
| 366 | |||
| 367 | pci_write_config_dword(dev, 0x14, 0xfed00000); | ||
| 368 | pci_read_config_dword(dev, 0x14, &val); | ||
| 369 | force_hpet_address = val; | ||
| 370 | force_hpet_resume_type = ATI_FORCE_HPET_RESUME; | ||
| 371 | dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n", | ||
| 372 | force_hpet_address); | ||
| 373 | cached_dev = dev; | ||
| 374 | return; | ||
| 375 | } | ||
| 376 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS, | ||
| 377 | ati_force_enable_hpet); | ||
| 378 | |||
| 333 | /* | 379 | /* |
| 334 | * Undocumented chipset feature taken from LinuxBIOS. | 380 | * Undocumented chipset feature taken from LinuxBIOS. |
| 335 | */ | 381 | */ |
| @@ -343,8 +389,13 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev) | |||
| 343 | { | 389 | { |
| 344 | u32 uninitialized_var(val); | 390 | u32 uninitialized_var(val); |
| 345 | 391 | ||
| 346 | if (!hpet_force_user || hpet_address || force_hpet_address) | 392 | if (hpet_address || force_hpet_address) |
| 393 | return; | ||
| 394 | |||
| 395 | if (!hpet_force_user) { | ||
| 396 | hpet_print_force_info(); | ||
| 347 | return; | 397 | return; |
| 398 | } | ||
| 348 | 399 | ||
| 349 | pci_write_config_dword(dev, 0x44, 0xfed00001); | 400 | pci_write_config_dword(dev, 0x44, 0xfed00001); |
| 350 | pci_read_config_dword(dev, 0x44, &val); | 401 | pci_read_config_dword(dev, 0x44, &val); |
| @@ -397,6 +448,9 @@ void force_hpet_resume(void) | |||
| 397 | case NVIDIA_FORCE_HPET_RESUME: | 448 | case NVIDIA_FORCE_HPET_RESUME: |
| 398 | nvidia_force_hpet_resume(); | 449 | nvidia_force_hpet_resume(); |
| 399 | return; | 450 | return; |
| 451 | case ATI_FORCE_HPET_RESUME: | ||
| 452 | ati_force_hpet_resume(); | ||
| 453 | return; | ||
| 400 | default: | 454 | default: |
| 401 | break; | 455 | break; |
| 402 | } | 456 | } |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f6be7d5f82f8..f8a62160e151 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | void (*pm_power_off)(void); | 27 | void (*pm_power_off)(void); |
| 28 | EXPORT_SYMBOL(pm_power_off); | 28 | EXPORT_SYMBOL(pm_power_off); |
| 29 | 29 | ||
| 30 | static long no_idt[3]; | 30 | static const struct desc_ptr no_idt = {}; |
| 31 | static int reboot_mode; | 31 | static int reboot_mode; |
| 32 | enum reboot_type reboot_type = BOOT_KBD; | 32 | enum reboot_type reboot_type = BOOT_KBD; |
| 33 | int reboot_force; | 33 | int reboot_force; |
| @@ -201,15 +201,15 @@ core_initcall(reboot_init); | |||
| 201 | controller to pulse the CPU reset line, which is more thorough, but | 201 | controller to pulse the CPU reset line, which is more thorough, but |
| 202 | doesn't work with at least one type of 486 motherboard. It is easy | 202 | doesn't work with at least one type of 486 motherboard. It is easy |
| 203 | to stop this code working; hence the copious comments. */ | 203 | to stop this code working; hence the copious comments. */ |
| 204 | static unsigned long long | 204 | static const unsigned long long |
| 205 | real_mode_gdt_entries [3] = | 205 | real_mode_gdt_entries [3] = |
| 206 | { | 206 | { |
| 207 | 0x0000000000000000ULL, /* Null descriptor */ | 207 | 0x0000000000000000ULL, /* Null descriptor */ |
| 208 | 0x00009a000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ | 208 | 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ |
| 209 | 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ | 209 | 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | static struct desc_ptr | 212 | static const struct desc_ptr |
| 213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, | 213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, |
| 214 | real_mode_idt = { 0x3ff, 0 }; | 214 | real_mode_idt = { 0x3ff, 0 }; |
| 215 | 215 | ||
| @@ -231,7 +231,7 @@ real_mode_idt = { 0x3ff, 0 }; | |||
| 231 | 231 | ||
| 232 | More could be done here to set up the registers as if a CPU reset had | 232 | More could be done here to set up the registers as if a CPU reset had |
| 233 | occurred; hopefully real BIOSs don't assume much. */ | 233 | occurred; hopefully real BIOSs don't assume much. */ |
| 234 | static unsigned char real_mode_switch [] = | 234 | static const unsigned char real_mode_switch [] = |
| 235 | { | 235 | { |
| 236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ | 236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ |
| 237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ | 237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ |
| @@ -245,7 +245,7 @@ static unsigned char real_mode_switch [] = | |||
| 245 | 0x24, 0x10, /* f: andb $0x10,al */ | 245 | 0x24, 0x10, /* f: andb $0x10,al */ |
| 246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ | 246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ |
| 247 | }; | 247 | }; |
| 248 | static unsigned char jump_to_bios [] = | 248 | static const unsigned char jump_to_bios [] = |
| 249 | { | 249 | { |
| 250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ | 250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ |
| 251 | }; | 251 | }; |
| @@ -255,7 +255,7 @@ static unsigned char jump_to_bios [] = | |||
| 255 | * specified by the code and length parameters. | 255 | * specified by the code and length parameters. |
| 256 | * We assume that length will aways be less that 100! | 256 | * We assume that length will aways be less that 100! |
| 257 | */ | 257 | */ |
| 258 | void machine_real_restart(unsigned char *code, int length) | 258 | void machine_real_restart(const unsigned char *code, int length) |
| 259 | { | 259 | { |
| 260 | local_irq_disable(); | 260 | local_irq_disable(); |
| 261 | 261 | ||
| @@ -368,7 +368,7 @@ static void native_machine_emergency_restart(void) | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | case BOOT_TRIPLE: | 370 | case BOOT_TRIPLE: |
| 371 | load_idt((const struct desc_ptr *)&no_idt); | 371 | load_idt(&no_idt); |
| 372 | __asm__ __volatile__("int3"); | 372 | __asm__ __volatile__("int3"); |
| 373 | 373 | ||
| 374 | reboot_type = BOOT_KBD; | 374 | reboot_type = BOOT_KBD; |
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index dec0b5ec25c2..61a837743fe5 100644 --- a/arch/x86/kernel/reboot_fixups_32.c +++ b/arch/x86/kernel/reboot_fixups_32.c | |||
| @@ -49,7 +49,7 @@ struct device_fixup { | |||
| 49 | void (*reboot_fixup)(struct pci_dev *); | 49 | void (*reboot_fixup)(struct pci_dev *); |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | static struct device_fixup fixups_table[] = { | 52 | static const struct device_fixup fixups_table[] = { |
| 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, | 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, |
| 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, | 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, |
| 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, | 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, |
| @@ -64,7 +64,7 @@ static struct device_fixup fixups_table[] = { | |||
| 64 | */ | 64 | */ |
| 65 | void mach_reboot_fixups(void) | 65 | void mach_reboot_fixups(void) |
| 66 | { | 66 | { |
| 67 | struct device_fixup *cur; | 67 | const struct device_fixup *cur; |
| 68 | struct pci_dev *dev; | 68 | struct pci_dev *dev; |
| 69 | int i; | 69 | int i; |
| 70 | 70 | ||
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 6dff1286ad8a..545440e471b2 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #include <asm/topology.h> | 71 | #include <asm/topology.h> |
| 72 | #include <asm/trampoline.h> | 72 | #include <asm/trampoline.h> |
| 73 | #include <asm/pat.h> | 73 | #include <asm/pat.h> |
| 74 | #include <asm/mmconfig.h> | ||
| 74 | 75 | ||
| 75 | #include <mach_apic.h> | 76 | #include <mach_apic.h> |
| 76 | #ifdef CONFIG_PARAVIRT | 77 | #ifdef CONFIG_PARAVIRT |
| @@ -79,6 +80,8 @@ | |||
| 79 | #define ARCH_SETUP | 80 | #define ARCH_SETUP |
| 80 | #endif | 81 | #endif |
| 81 | 82 | ||
| 83 | #include "cpu/cpu.h" | ||
| 84 | |||
| 82 | /* | 85 | /* |
| 83 | * Machine setup.. | 86 | * Machine setup.. |
| 84 | */ | 87 | */ |
| @@ -95,8 +98,6 @@ int bootloader_type; | |||
| 95 | 98 | ||
| 96 | unsigned long saved_video_mode; | 99 | unsigned long saved_video_mode; |
| 97 | 100 | ||
| 98 | int force_mwait __cpuinitdata; | ||
| 99 | |||
| 100 | /* | 101 | /* |
| 101 | * Early DMI memory | 102 | * Early DMI memory |
| 102 | */ | 103 | */ |
| @@ -118,7 +119,7 @@ EXPORT_SYMBOL_GPL(edid_info); | |||
| 118 | 119 | ||
| 119 | extern int root_mountflags; | 120 | extern int root_mountflags; |
| 120 | 121 | ||
| 121 | char __initdata command_line[COMMAND_LINE_SIZE]; | 122 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
| 122 | 123 | ||
| 123 | static struct resource standard_io_resources[] = { | 124 | static struct resource standard_io_resources[] = { |
| 124 | { .name = "dma1", .start = 0x00, .end = 0x1f, | 125 | { .name = "dma1", .start = 0x00, .end = 0x1f, |
| @@ -164,6 +165,7 @@ static struct resource bss_resource = { | |||
| 164 | .flags = IORESOURCE_RAM, | 165 | .flags = IORESOURCE_RAM, |
| 165 | }; | 166 | }; |
| 166 | 167 | ||
| 168 | static void __init early_cpu_init(void); | ||
| 167 | static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c); | 169 | static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c); |
| 168 | 170 | ||
| 169 | #ifdef CONFIG_PROC_VMCORE | 171 | #ifdef CONFIG_PROC_VMCORE |
| @@ -293,18 +295,6 @@ static void __init parse_setup_data(void) | |||
| 293 | } | 295 | } |
| 294 | } | 296 | } |
| 295 | 297 | ||
| 296 | #ifdef CONFIG_PCI_MMCONFIG | ||
| 297 | extern void __cpuinit fam10h_check_enable_mmcfg(void); | ||
| 298 | extern void __init check_enable_amd_mmconf_dmi(void); | ||
| 299 | #else | ||
| 300 | void __cpuinit fam10h_check_enable_mmcfg(void) | ||
| 301 | { | ||
| 302 | } | ||
| 303 | void __init check_enable_amd_mmconf_dmi(void) | ||
| 304 | { | ||
| 305 | } | ||
| 306 | #endif | ||
| 307 | |||
| 308 | /* | 298 | /* |
| 309 | * setup_arch - architecture-specific boot-time initializations | 299 | * setup_arch - architecture-specific boot-time initializations |
| 310 | * | 300 | * |
| @@ -352,6 +342,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 352 | bss_resource.start = virt_to_phys(&__bss_start); | 342 | bss_resource.start = virt_to_phys(&__bss_start); |
| 353 | bss_resource.end = virt_to_phys(&__bss_stop)-1; | 343 | bss_resource.end = virt_to_phys(&__bss_stop)-1; |
| 354 | 344 | ||
| 345 | early_cpu_init(); | ||
| 355 | early_identify_cpu(&boot_cpu_data); | 346 | early_identify_cpu(&boot_cpu_data); |
| 356 | 347 | ||
| 357 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); | 348 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); |
| @@ -537,7 +528,20 @@ void __init setup_arch(char **cmdline_p) | |||
| 537 | check_enable_amd_mmconf_dmi(); | 528 | check_enable_amd_mmconf_dmi(); |
| 538 | } | 529 | } |
| 539 | 530 | ||
| 540 | static int __cpuinit get_model_name(struct cpuinfo_x86 *c) | 531 | struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; |
| 532 | |||
| 533 | static void __cpuinit default_init(struct cpuinfo_x86 *c) | ||
| 534 | { | ||
| 535 | display_cacheinfo(c); | ||
| 536 | } | ||
| 537 | |||
| 538 | static struct cpu_dev __cpuinitdata default_cpu = { | ||
| 539 | .c_init = default_init, | ||
| 540 | .c_vendor = "Unknown", | ||
| 541 | }; | ||
| 542 | static struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; | ||
| 543 | |||
| 544 | int __cpuinit get_model_name(struct cpuinfo_x86 *c) | ||
| 541 | { | 545 | { |
| 542 | unsigned int *v; | 546 | unsigned int *v; |
| 543 | 547 | ||
| @@ -553,7 +557,7 @@ static int __cpuinit get_model_name(struct cpuinfo_x86 *c) | |||
| 553 | } | 557 | } |
| 554 | 558 | ||
| 555 | 559 | ||
| 556 | static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | 560 | void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) |
| 557 | { | 561 | { |
| 558 | unsigned int n, dummy, eax, ebx, ecx, edx; | 562 | unsigned int n, dummy, eax, ebx, ecx, edx; |
| 559 | 563 | ||
| @@ -585,228 +589,6 @@ static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) | |||
| 585 | } | 589 | } |
| 586 | } | 590 | } |
| 587 | 591 | ||
| 588 | #ifdef CONFIG_NUMA | ||
| 589 | static int __cpuinit nearby_node(int apicid) | ||
| 590 | { | ||
| 591 | int i, node; | ||
| 592 | |||
| 593 | for (i = apicid - 1; i >= 0; i--) { | ||
| 594 | node = apicid_to_node[i]; | ||
| 595 | if (node != NUMA_NO_NODE && node_online(node)) | ||
| 596 | return node; | ||
| 597 | } | ||
| 598 | for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) { | ||
| 599 | node = apicid_to_node[i]; | ||
| 600 | if (node != NUMA_NO_NODE && node_online(node)) | ||
| 601 | return node; | ||
| 602 | } | ||
| 603 | return first_node(node_online_map); /* Shouldn't happen */ | ||
| 604 | } | ||
| 605 | #endif | ||
| 606 | |||
| 607 | /* | ||
| 608 | * On a AMD dual core setup the lower bits of the APIC id distingush the cores. | ||
| 609 | * Assumes number of cores is a power of two. | ||
| 610 | */ | ||
| 611 | static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) | ||
| 612 | { | ||
| 613 | #ifdef CONFIG_SMP | ||
| 614 | unsigned bits; | ||
| 615 | #ifdef CONFIG_NUMA | ||
| 616 | int cpu = smp_processor_id(); | ||
| 617 | int node = 0; | ||
| 618 | unsigned apicid = hard_smp_processor_id(); | ||
| 619 | #endif | ||
| 620 | bits = c->x86_coreid_bits; | ||
| 621 | |||
| 622 | /* Low order bits define the core id (index of core in socket) */ | ||
| 623 | c->cpu_core_id = c->initial_apicid & ((1 << bits)-1); | ||
| 624 | /* Convert the initial APIC ID into the socket ID */ | ||
| 625 | c->phys_proc_id = c->initial_apicid >> bits; | ||
| 626 | |||
| 627 | #ifdef CONFIG_NUMA | ||
| 628 | node = c->phys_proc_id; | ||
| 629 | if (apicid_to_node[apicid] != NUMA_NO_NODE) | ||
| 630 | node = apicid_to_node[apicid]; | ||
| 631 | if (!node_online(node)) { | ||
| 632 | /* Two possibilities here: | ||
| 633 | - The CPU is missing memory and no node was created. | ||
| 634 | In that case try picking one from a nearby CPU | ||
| 635 | - The APIC IDs differ from the HyperTransport node IDs | ||
| 636 | which the K8 northbridge parsing fills in. | ||
| 637 | Assume they are all increased by a constant offset, | ||
| 638 | but in the same order as the HT nodeids. | ||
| 639 | If that doesn't result in a usable node fall back to the | ||
| 640 | path for the previous case. */ | ||
| 641 | |||
| 642 | int ht_nodeid = c->initial_apicid; | ||
| 643 | |||
| 644 | if (ht_nodeid >= 0 && | ||
| 645 | apicid_to_node[ht_nodeid] != NUMA_NO_NODE) | ||
| 646 | node = apicid_to_node[ht_nodeid]; | ||
| 647 | /* Pick a nearby node */ | ||
| 648 | if (!node_online(node)) | ||
| 649 | node = nearby_node(apicid); | ||
| 650 | } | ||
| 651 | numa_set_node(cpu, node); | ||
| 652 | |||
| 653 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
| 654 | #endif | ||
| 655 | #endif | ||
| 656 | } | ||
| 657 | |||
| 658 | static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) | ||
| 659 | { | ||
| 660 | #ifdef CONFIG_SMP | ||
| 661 | unsigned bits, ecx; | ||
| 662 | |||
| 663 | /* Multi core CPU? */ | ||
| 664 | if (c->extended_cpuid_level < 0x80000008) | ||
| 665 | return; | ||
| 666 | |||
| 667 | ecx = cpuid_ecx(0x80000008); | ||
| 668 | |||
| 669 | c->x86_max_cores = (ecx & 0xff) + 1; | ||
| 670 | |||
| 671 | /* CPU telling us the core id bits shift? */ | ||
| 672 | bits = (ecx >> 12) & 0xF; | ||
| 673 | |||
| 674 | /* Otherwise recompute */ | ||
| 675 | if (bits == 0) { | ||
| 676 | while ((1 << bits) < c->x86_max_cores) | ||
| 677 | bits++; | ||
| 678 | } | ||
| 679 | |||
| 680 | c->x86_coreid_bits = bits; | ||
| 681 | |||
| 682 | #endif | ||
| 683 | } | ||
| 684 | |||
| 685 | #define ENABLE_C1E_MASK 0x18000000 | ||
| 686 | #define CPUID_PROCESSOR_SIGNATURE 1 | ||
| 687 | #define CPUID_XFAM 0x0ff00000 | ||
| 688 | #define CPUID_XFAM_K8 0x00000000 | ||
| 689 | #define CPUID_XFAM_10H 0x00100000 | ||
| 690 | #define CPUID_XFAM_11H 0x00200000 | ||
| 691 | #define CPUID_XMOD 0x000f0000 | ||
| 692 | #define CPUID_XMOD_REV_F 0x00040000 | ||
| 693 | |||
| 694 | /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ | ||
| 695 | static __cpuinit int amd_apic_timer_broken(void) | ||
| 696 | { | ||
| 697 | u32 lo, hi, eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE); | ||
| 698 | |||
| 699 | switch (eax & CPUID_XFAM) { | ||
| 700 | case CPUID_XFAM_K8: | ||
| 701 | if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F) | ||
| 702 | break; | ||
| 703 | case CPUID_XFAM_10H: | ||
| 704 | case CPUID_XFAM_11H: | ||
| 705 | rdmsr(MSR_K8_ENABLE_C1E, lo, hi); | ||
| 706 | if (lo & ENABLE_C1E_MASK) | ||
| 707 | return 1; | ||
| 708 | break; | ||
| 709 | default: | ||
| 710 | /* err on the side of caution */ | ||
| 711 | return 1; | ||
| 712 | } | ||
| 713 | return 0; | ||
| 714 | } | ||
| 715 | |||
| 716 | static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) | ||
| 717 | { | ||
| 718 | early_init_amd_mc(c); | ||
| 719 | |||
| 720 | /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ | ||
| 721 | if (c->x86_power & (1<<8)) | ||
| 722 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 723 | } | ||
| 724 | |||
| 725 | static void __cpuinit init_amd(struct cpuinfo_x86 *c) | ||
| 726 | { | ||
| 727 | unsigned level; | ||
| 728 | |||
| 729 | #ifdef CONFIG_SMP | ||
| 730 | unsigned long value; | ||
| 731 | |||
| 732 | /* | ||
| 733 | * Disable TLB flush filter by setting HWCR.FFDIS on K8 | ||
| 734 | * bit 6 of msr C001_0015 | ||
| 735 | * | ||
| 736 | * Errata 63 for SH-B3 steppings | ||
| 737 | * Errata 122 for all steppings (F+ have it disabled by default) | ||
| 738 | */ | ||
| 739 | if (c->x86 == 15) { | ||
| 740 | rdmsrl(MSR_K8_HWCR, value); | ||
| 741 | value |= 1 << 6; | ||
| 742 | wrmsrl(MSR_K8_HWCR, value); | ||
| 743 | } | ||
| 744 | #endif | ||
| 745 | |||
| 746 | /* Bit 31 in normal CPUID used for nonstandard 3DNow ID; | ||
| 747 | 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ | ||
| 748 | clear_cpu_cap(c, 0*32+31); | ||
| 749 | |||
| 750 | /* On C+ stepping K8 rep microcode works well for copy/memset */ | ||
| 751 | level = cpuid_eax(1); | ||
| 752 | if (c->x86 == 15 && ((level >= 0x0f48 && level < 0x0f50) || | ||
| 753 | level >= 0x0f58)) | ||
| 754 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 755 | if (c->x86 == 0x10 || c->x86 == 0x11) | ||
| 756 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 757 | |||
| 758 | /* Enable workaround for FXSAVE leak */ | ||
| 759 | if (c->x86 >= 6) | ||
| 760 | set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK); | ||
| 761 | |||
| 762 | level = get_model_name(c); | ||
| 763 | if (!level) { | ||
| 764 | switch (c->x86) { | ||
| 765 | case 15: | ||
| 766 | /* Should distinguish Models here, but this is only | ||
| 767 | a fallback anyways. */ | ||
| 768 | strcpy(c->x86_model_id, "Hammer"); | ||
| 769 | break; | ||
| 770 | } | ||
| 771 | } | ||
| 772 | display_cacheinfo(c); | ||
| 773 | |||
| 774 | /* Multi core CPU? */ | ||
| 775 | if (c->extended_cpuid_level >= 0x80000008) | ||
| 776 | amd_detect_cmp(c); | ||
| 777 | |||
| 778 | if (c->extended_cpuid_level >= 0x80000006 && | ||
| 779 | (cpuid_edx(0x80000006) & 0xf000)) | ||
| 780 | num_cache_leaves = 4; | ||
| 781 | else | ||
| 782 | num_cache_leaves = 3; | ||
| 783 | |||
| 784 | if (c->x86 == 0xf || c->x86 == 0x10 || c->x86 == 0x11) | ||
| 785 | set_cpu_cap(c, X86_FEATURE_K8); | ||
| 786 | |||
| 787 | /* MFENCE stops RDTSC speculation */ | ||
| 788 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | ||
| 789 | |||
| 790 | if (c->x86 == 0x10) | ||
| 791 | fam10h_check_enable_mmcfg(); | ||
| 792 | |||
| 793 | if (amd_apic_timer_broken()) | ||
| 794 | disable_apic_timer = 1; | ||
| 795 | |||
| 796 | if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { | ||
| 797 | unsigned long long tseg; | ||
| 798 | |||
| 799 | /* | ||
| 800 | * Split up direct mapping around the TSEG SMM area. | ||
| 801 | * Don't do it for gbpages because there seems very little | ||
| 802 | * benefit in doing so. | ||
| 803 | */ | ||
| 804 | if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg) && | ||
| 805 | (tseg >> PMD_SHIFT) < (max_pfn_mapped >> (PMD_SHIFT-PAGE_SHIFT))) | ||
| 806 | set_memory_4k((unsigned long)__va(tseg), 1); | ||
| 807 | } | ||
| 808 | } | ||
| 809 | |||
| 810 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) | 592 | void __cpuinit detect_ht(struct cpuinfo_x86 *c) |
| 811 | { | 593 | { |
| 812 | #ifdef CONFIG_SMP | 594 | #ifdef CONFIG_SMP |
| @@ -857,135 +639,59 @@ out: | |||
| 857 | #endif | 639 | #endif |
| 858 | } | 640 | } |
| 859 | 641 | ||
| 860 | /* | 642 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) |
| 861 | * find out the number of processor cores on the die | ||
| 862 | */ | ||
| 863 | static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c) | ||
| 864 | { | ||
| 865 | unsigned int eax, t; | ||
| 866 | |||
| 867 | if (c->cpuid_level < 4) | ||
| 868 | return 1; | ||
| 869 | |||
| 870 | cpuid_count(4, 0, &eax, &t, &t, &t); | ||
| 871 | |||
| 872 | if (eax & 0x1f) | ||
| 873 | return ((eax >> 26) + 1); | ||
| 874 | else | ||
| 875 | return 1; | ||
| 876 | } | ||
| 877 | |||
| 878 | static void __cpuinit srat_detect_node(void) | ||
| 879 | { | ||
| 880 | #ifdef CONFIG_NUMA | ||
| 881 | unsigned node; | ||
| 882 | int cpu = smp_processor_id(); | ||
| 883 | int apicid = hard_smp_processor_id(); | ||
| 884 | |||
| 885 | /* Don't do the funky fallback heuristics the AMD version employs | ||
| 886 | for now. */ | ||
| 887 | node = apicid_to_node[apicid]; | ||
| 888 | if (node == NUMA_NO_NODE || !node_online(node)) | ||
| 889 | node = first_node(node_online_map); | ||
| 890 | numa_set_node(cpu, node); | ||
| 891 | |||
| 892 | printk(KERN_INFO "CPU %d/%x -> Node %d\n", cpu, apicid, node); | ||
| 893 | #endif | ||
| 894 | } | ||
| 895 | |||
| 896 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | ||
| 897 | { | ||
| 898 | if ((c->x86 == 0xf && c->x86_model >= 0x03) || | ||
| 899 | (c->x86 == 0x6 && c->x86_model >= 0x0e)) | ||
| 900 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 901 | } | ||
| 902 | |||
| 903 | static void __cpuinit init_intel(struct cpuinfo_x86 *c) | ||
| 904 | { | 643 | { |
| 905 | /* Cache sizes */ | 644 | char *v = c->x86_vendor_id; |
| 906 | unsigned n; | 645 | int i; |
| 907 | 646 | static int printed; | |
| 908 | init_intel_cacheinfo(c); | 647 | |
| 909 | if (c->cpuid_level > 9) { | 648 | for (i = 0; i < X86_VENDOR_NUM; i++) { |
| 910 | unsigned eax = cpuid_eax(10); | 649 | if (cpu_devs[i]) { |
| 911 | /* Check for version and the number of counters */ | 650 | if (!strcmp(v, cpu_devs[i]->c_ident[0]) || |
| 912 | if ((eax & 0xff) && (((eax>>8) & 0xff) > 1)) | 651 | (cpu_devs[i]->c_ident[1] && |
| 913 | set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON); | 652 | !strcmp(v, cpu_devs[i]->c_ident[1]))) { |
| 653 | c->x86_vendor = i; | ||
| 654 | this_cpu = cpu_devs[i]; | ||
| 655 | return; | ||
| 656 | } | ||
| 657 | } | ||
| 914 | } | 658 | } |
| 915 | 659 | if (!printed) { | |
| 916 | if (cpu_has_ds) { | 660 | printed++; |
| 917 | unsigned int l1, l2; | 661 | printk(KERN_ERR "CPU: Vendor unknown, using generic init.\n"); |
| 918 | rdmsr(MSR_IA32_MISC_ENABLE, l1, l2); | 662 | printk(KERN_ERR "CPU: Your system may be unstable.\n"); |
| 919 | if (!(l1 & (1<<11))) | ||
| 920 | set_cpu_cap(c, X86_FEATURE_BTS); | ||
| 921 | if (!(l1 & (1<<12))) | ||
| 922 | set_cpu_cap(c, X86_FEATURE_PEBS); | ||
| 923 | } | 663 | } |
| 924 | 664 | c->x86_vendor = X86_VENDOR_UNKNOWN; | |
| 925 | |||
| 926 | if (cpu_has_bts) | ||
| 927 | ds_init_intel(c); | ||
| 928 | |||
| 929 | n = c->extended_cpuid_level; | ||
| 930 | if (n >= 0x80000008) { | ||
| 931 | unsigned eax = cpuid_eax(0x80000008); | ||
| 932 | c->x86_virt_bits = (eax >> 8) & 0xff; | ||
| 933 | c->x86_phys_bits = eax & 0xff; | ||
| 934 | /* CPUID workaround for Intel 0F34 CPU */ | ||
| 935 | if (c->x86_vendor == X86_VENDOR_INTEL && | ||
| 936 | c->x86 == 0xF && c->x86_model == 0x3 && | ||
| 937 | c->x86_mask == 0x4) | ||
| 938 | c->x86_phys_bits = 36; | ||
| 939 | } | ||
| 940 | |||
| 941 | if (c->x86 == 15) | ||
| 942 | c->x86_cache_alignment = c->x86_clflush_size * 2; | ||
| 943 | if (c->x86 == 6) | ||
| 944 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | ||
| 945 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
| 946 | c->x86_max_cores = intel_num_cpu_cores(c); | ||
| 947 | |||
| 948 | srat_detect_node(); | ||
| 949 | } | ||
| 950 | |||
| 951 | static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) | ||
| 952 | { | ||
| 953 | if (c->x86 == 0x6 && c->x86_model >= 0xf) | ||
| 954 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | ||
| 955 | } | 665 | } |
| 956 | 666 | ||
| 957 | static void __cpuinit init_centaur(struct cpuinfo_x86 *c) | 667 | static void __init early_cpu_support_print(void) |
| 958 | { | 668 | { |
| 959 | /* Cache sizes */ | 669 | int i,j; |
| 960 | unsigned n; | 670 | struct cpu_dev *cpu_devx; |
| 961 | 671 | ||
| 962 | n = c->extended_cpuid_level; | 672 | printk("KERNEL supported cpus:\n"); |
| 963 | if (n >= 0x80000008) { | 673 | for (i = 0; i < X86_VENDOR_NUM; i++) { |
| 964 | unsigned eax = cpuid_eax(0x80000008); | 674 | cpu_devx = cpu_devs[i]; |
| 965 | c->x86_virt_bits = (eax >> 8) & 0xff; | 675 | if (!cpu_devx) |
| 966 | c->x86_phys_bits = eax & 0xff; | 676 | continue; |
| 967 | } | 677 | for (j = 0; j < 2; j++) { |
| 968 | 678 | if (!cpu_devx->c_ident[j]) | |
| 969 | if (c->x86 == 0x6 && c->x86_model >= 0xf) { | 679 | continue; |
| 970 | c->x86_cache_alignment = c->x86_clflush_size * 2; | 680 | printk(" %s %s\n", cpu_devx->c_vendor, |
| 971 | set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); | 681 | cpu_devx->c_ident[j]); |
| 972 | set_cpu_cap(c, X86_FEATURE_REP_GOOD); | 682 | } |
| 973 | } | 683 | } |
| 974 | set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC); | ||
| 975 | } | 684 | } |
| 976 | 685 | ||
| 977 | static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c) | 686 | static void __init early_cpu_init(void) |
| 978 | { | 687 | { |
| 979 | char *v = c->x86_vendor_id; | 688 | struct cpu_vendor_dev *cvdev; |
| 980 | 689 | ||
| 981 | if (!strcmp(v, "AuthenticAMD")) | 690 | for (cvdev = __x86cpuvendor_start ; |
| 982 | c->x86_vendor = X86_VENDOR_AMD; | 691 | cvdev < __x86cpuvendor_end ; |
| 983 | else if (!strcmp(v, "GenuineIntel")) | 692 | cvdev++) |
| 984 | c->x86_vendor = X86_VENDOR_INTEL; | 693 | cpu_devs[cvdev->vendor] = cvdev->cpu_dev; |
| 985 | else if (!strcmp(v, "CentaurHauls")) | 694 | early_cpu_support_print(); |
| 986 | c->x86_vendor = X86_VENDOR_CENTAUR; | ||
| 987 | else | ||
| 988 | c->x86_vendor = X86_VENDOR_UNKNOWN; | ||
| 989 | } | 695 | } |
| 990 | 696 | ||
| 991 | /* Do some early cpuid on the boot CPU to get some parameter that are | 697 | /* Do some early cpuid on the boot CPU to get some parameter that are |
| @@ -1066,17 +772,9 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c) | |||
| 1066 | if (c->extended_cpuid_level >= 0x80000007) | 772 | if (c->extended_cpuid_level >= 0x80000007) |
| 1067 | c->x86_power = cpuid_edx(0x80000007); | 773 | c->x86_power = cpuid_edx(0x80000007); |
| 1068 | 774 | ||
| 1069 | switch (c->x86_vendor) { | 775 | if (c->x86_vendor != X86_VENDOR_UNKNOWN && |
| 1070 | case X86_VENDOR_AMD: | 776 | cpu_devs[c->x86_vendor]->c_early_init) |
| 1071 | early_init_amd(c); | 777 | cpu_devs[c->x86_vendor]->c_early_init(c); |
| 1072 | break; | ||
| 1073 | case X86_VENDOR_INTEL: | ||
| 1074 | early_init_intel(c); | ||
| 1075 | break; | ||
| 1076 | case X86_VENDOR_CENTAUR: | ||
| 1077 | early_init_centaur(c); | ||
| 1078 | break; | ||
| 1079 | } | ||
| 1080 | 778 | ||
| 1081 | validate_pat_support(c); | 779 | validate_pat_support(c); |
| 1082 | } | 780 | } |
| @@ -1104,24 +802,8 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
| 1104 | * At the end of this section, c->x86_capability better | 802 | * At the end of this section, c->x86_capability better |
| 1105 | * indicate the features this CPU genuinely supports! | 803 | * indicate the features this CPU genuinely supports! |
| 1106 | */ | 804 | */ |
| 1107 | switch (c->x86_vendor) { | 805 | if (this_cpu->c_init) |
| 1108 | case X86_VENDOR_AMD: | 806 | this_cpu->c_init(c); |
| 1109 | init_amd(c); | ||
| 1110 | break; | ||
| 1111 | |||
| 1112 | case X86_VENDOR_INTEL: | ||
| 1113 | init_intel(c); | ||
| 1114 | break; | ||
| 1115 | |||
| 1116 | case X86_VENDOR_CENTAUR: | ||
| 1117 | init_centaur(c); | ||
| 1118 | break; | ||
| 1119 | |||
| 1120 | case X86_VENDOR_UNKNOWN: | ||
| 1121 | default: | ||
| 1122 | display_cacheinfo(c); | ||
| 1123 | break; | ||
| 1124 | } | ||
| 1125 | 807 | ||
| 1126 | detect_ht(c); | 808 | detect_ht(c); |
| 1127 | 809 | ||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 56078d61c793..f2b666756299 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | #include <asm/pgtable.h> | 59 | #include <asm/pgtable.h> |
| 60 | #include <asm/tlbflush.h> | 60 | #include <asm/tlbflush.h> |
| 61 | #include <asm/mtrr.h> | 61 | #include <asm/mtrr.h> |
| 62 | #include <asm/nmi.h> | ||
| 63 | #include <asm/vmi.h> | 62 | #include <asm/vmi.h> |
| 64 | #include <asm/genapic.h> | 63 | #include <asm/genapic.h> |
| 65 | #include <linux/mc146818rtc.h> | 64 | #include <linux/mc146818rtc.h> |
| @@ -996,7 +995,6 @@ do_rest: | |||
| 996 | #endif | 995 | #endif |
| 997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ | 996 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ |
| 998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ | 997 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ |
| 999 | cpu_clear(cpu, cpu_possible_map); | ||
| 1000 | cpu_clear(cpu, cpu_present_map); | 998 | cpu_clear(cpu, cpu_present_map); |
| 1001 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; | 999 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; |
| 1002 | } | 1000 | } |
| @@ -1158,9 +1156,11 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
| 1158 | * If SMP should be disabled, then really disable it! | 1156 | * If SMP should be disabled, then really disable it! |
| 1159 | */ | 1157 | */ |
| 1160 | if (!max_cpus) { | 1158 | if (!max_cpus) { |
| 1161 | printk(KERN_INFO "SMP mode deactivated," | 1159 | printk(KERN_INFO "SMP mode deactivated.\n"); |
| 1162 | "forcing use of dummy APIC emulation.\n"); | ||
| 1163 | smpboot_clear_io_apic(); | 1160 | smpboot_clear_io_apic(); |
| 1161 | |||
| 1162 | localise_nmi_watchdog(); | ||
| 1163 | |||
| 1164 | #ifdef CONFIG_X86_32 | 1164 | #ifdef CONFIG_X86_32 |
| 1165 | connect_bsp_APIC(); | 1165 | connect_bsp_APIC(); |
| 1166 | #endif | 1166 | #endif |
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c index d2ab52cc1d6b..7066cb855a60 100644 --- a/arch/x86/kernel/sys_i386_32.c +++ b/arch/x86/kernel/sys_i386_32.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/utsname.h> | 19 | #include <linux/utsname.h> |
| 20 | #include <linux/ipc.h> | 20 | #include <linux/ipc.h> |
| 21 | 21 | ||
| 22 | #include <asm/uaccess.h> | 22 | #include <linux/uaccess.h> |
| 23 | #include <asm/unistd.h> | 23 | #include <linux/unistd.h> |
| 24 | 24 | ||
| 25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | 25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, |
| 26 | unsigned long prot, unsigned long flags, | 26 | unsigned long prot, unsigned long flags, |
| @@ -103,7 +103,7 @@ asmlinkage int old_select(struct sel_arg_struct __user *arg) | |||
| 103 | * | 103 | * |
| 104 | * This is really horribly ugly. | 104 | * This is really horribly ugly. |
| 105 | */ | 105 | */ |
| 106 | asmlinkage int sys_ipc (uint call, int first, int second, | 106 | asmlinkage int sys_ipc(uint call, int first, int second, |
| 107 | int third, void __user *ptr, long fifth) | 107 | int third, void __user *ptr, long fifth) |
| 108 | { | 108 | { |
| 109 | int version, ret; | 109 | int version, ret; |
| @@ -113,24 +113,24 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 113 | 113 | ||
| 114 | switch (call) { | 114 | switch (call) { |
| 115 | case SEMOP: | 115 | case SEMOP: |
| 116 | return sys_semtimedop (first, (struct sembuf __user *)ptr, second, NULL); | 116 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL); |
| 117 | case SEMTIMEDOP: | 117 | case SEMTIMEDOP: |
| 118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, | 118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, |
| 119 | (const struct timespec __user *)fifth); | 119 | (const struct timespec __user *)fifth); |
| 120 | 120 | ||
| 121 | case SEMGET: | 121 | case SEMGET: |
| 122 | return sys_semget (first, second, third); | 122 | return sys_semget(first, second, third); |
| 123 | case SEMCTL: { | 123 | case SEMCTL: { |
| 124 | union semun fourth; | 124 | union semun fourth; |
| 125 | if (!ptr) | 125 | if (!ptr) |
| 126 | return -EINVAL; | 126 | return -EINVAL; |
| 127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) | 127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) |
| 128 | return -EFAULT; | 128 | return -EFAULT; |
| 129 | return sys_semctl (first, second, third, fourth); | 129 | return sys_semctl(first, second, third, fourth); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | case MSGSND: | 132 | case MSGSND: |
| 133 | return sys_msgsnd (first, (struct msgbuf __user *) ptr, | 133 | return sys_msgsnd(first, (struct msgbuf __user *) ptr, |
| 134 | second, third); | 134 | second, third); |
| 135 | case MSGRCV: | 135 | case MSGRCV: |
| 136 | switch (version) { | 136 | switch (version) { |
| @@ -138,45 +138,45 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 138 | struct ipc_kludge tmp; | 138 | struct ipc_kludge tmp; |
| 139 | if (!ptr) | 139 | if (!ptr) |
| 140 | return -EINVAL; | 140 | return -EINVAL; |
| 141 | 141 | ||
| 142 | if (copy_from_user(&tmp, | 142 | if (copy_from_user(&tmp, |
| 143 | (struct ipc_kludge __user *) ptr, | 143 | (struct ipc_kludge __user *) ptr, |
| 144 | sizeof (tmp))) | 144 | sizeof(tmp))) |
| 145 | return -EFAULT; | 145 | return -EFAULT; |
| 146 | return sys_msgrcv (first, tmp.msgp, second, | 146 | return sys_msgrcv(first, tmp.msgp, second, |
| 147 | tmp.msgtyp, third); | 147 | tmp.msgtyp, third); |
| 148 | } | 148 | } |
| 149 | default: | 149 | default: |
| 150 | return sys_msgrcv (first, | 150 | return sys_msgrcv(first, |
| 151 | (struct msgbuf __user *) ptr, | 151 | (struct msgbuf __user *) ptr, |
| 152 | second, fifth, third); | 152 | second, fifth, third); |
| 153 | } | 153 | } |
| 154 | case MSGGET: | 154 | case MSGGET: |
| 155 | return sys_msgget ((key_t) first, second); | 155 | return sys_msgget((key_t) first, second); |
| 156 | case MSGCTL: | 156 | case MSGCTL: |
| 157 | return sys_msgctl (first, second, (struct msqid_ds __user *) ptr); | 157 | return sys_msgctl(first, second, (struct msqid_ds __user *) ptr); |
| 158 | 158 | ||
| 159 | case SHMAT: | 159 | case SHMAT: |
| 160 | switch (version) { | 160 | switch (version) { |
| 161 | default: { | 161 | default: { |
| 162 | ulong raddr; | 162 | ulong raddr; |
| 163 | ret = do_shmat (first, (char __user *) ptr, second, &raddr); | 163 | ret = do_shmat(first, (char __user *) ptr, second, &raddr); |
| 164 | if (ret) | 164 | if (ret) |
| 165 | return ret; | 165 | return ret; |
| 166 | return put_user (raddr, (ulong __user *) third); | 166 | return put_user(raddr, (ulong __user *) third); |
| 167 | } | 167 | } |
| 168 | case 1: /* iBCS2 emulator entry point */ | 168 | case 1: /* iBCS2 emulator entry point */ |
| 169 | if (!segment_eq(get_fs(), get_ds())) | 169 | if (!segment_eq(get_fs(), get_ds())) |
| 170 | return -EINVAL; | 170 | return -EINVAL; |
| 171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ | 171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ |
| 172 | return do_shmat (first, (char __user *) ptr, second, (ulong *) third); | 172 | return do_shmat(first, (char __user *) ptr, second, (ulong *) third); |
| 173 | } | 173 | } |
| 174 | case SHMDT: | 174 | case SHMDT: |
| 175 | return sys_shmdt ((char __user *)ptr); | 175 | return sys_shmdt((char __user *)ptr); |
| 176 | case SHMGET: | 176 | case SHMGET: |
| 177 | return sys_shmget (first, second, third); | 177 | return sys_shmget(first, second, third); |
| 178 | case SHMCTL: | 178 | case SHMCTL: |
| 179 | return sys_shmctl (first, second, | 179 | return sys_shmctl(first, second, |
| 180 | (struct shmid_ds __user *) ptr); | 180 | (struct shmid_ds __user *) ptr); |
| 181 | default: | 181 | default: |
| 182 | return -ENOSYS; | 182 | return -ENOSYS; |
| @@ -186,28 +186,28 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 186 | /* | 186 | /* |
| 187 | * Old cruft | 187 | * Old cruft |
| 188 | */ | 188 | */ |
| 189 | asmlinkage int sys_uname(struct old_utsname __user * name) | 189 | asmlinkage int sys_uname(struct old_utsname __user *name) |
| 190 | { | 190 | { |
| 191 | int err; | 191 | int err; |
| 192 | if (!name) | 192 | if (!name) |
| 193 | return -EFAULT; | 193 | return -EFAULT; |
| 194 | down_read(&uts_sem); | 194 | down_read(&uts_sem); |
| 195 | err = copy_to_user(name, utsname(), sizeof (*name)); | 195 | err = copy_to_user(name, utsname(), sizeof(*name)); |
| 196 | up_read(&uts_sem); | 196 | up_read(&uts_sem); |
| 197 | return err?-EFAULT:0; | 197 | return err? -EFAULT:0; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | asmlinkage int sys_olduname(struct oldold_utsname __user * name) | 200 | asmlinkage int sys_olduname(struct oldold_utsname __user *name) |
| 201 | { | 201 | { |
| 202 | int error; | 202 | int error; |
| 203 | 203 | ||
| 204 | if (!name) | 204 | if (!name) |
| 205 | return -EFAULT; | 205 | return -EFAULT; |
| 206 | if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) | 206 | if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname))) |
| 207 | return -EFAULT; | 207 | return -EFAULT; |
| 208 | 208 | ||
| 209 | down_read(&uts_sem); | 209 | down_read(&uts_sem); |
| 210 | 210 | ||
| 211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, | 211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, |
| 212 | __OLD_UTS_LEN); | 212 | __OLD_UTS_LEN); |
| 213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); | 213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); |
| @@ -223,9 +223,9 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) | |||
| 223 | error |= __copy_to_user(&name->machine, &utsname()->machine, | 223 | error |= __copy_to_user(&name->machine, &utsname()->machine, |
| 224 | __OLD_UTS_LEN); | 224 | __OLD_UTS_LEN); |
| 225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); | 225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); |
| 226 | 226 | ||
| 227 | up_read(&uts_sem); | 227 | up_read(&uts_sem); |
| 228 | 228 | ||
| 229 | error = error ? -EFAULT : 0; | 229 | error = error ? -EFAULT : 0; |
| 230 | 230 | ||
| 231 | return error; | 231 | return error; |
| @@ -241,6 +241,6 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]) | |||
| 241 | long __res; | 241 | long __res; |
| 242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" | 242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" |
| 243 | : "=a" (__res) | 243 | : "=a" (__res) |
| 244 | : "0" (__NR_execve),"ri" (filename),"c" (argv), "d" (envp) : "memory"); | 244 | : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory"); |
| 245 | return __res; | 245 | return __res; |
| 246 | } | 246 | } |
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 2ff21f398934..5f29f12da50c 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
| @@ -84,8 +84,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
| 84 | if (timer_ack) { | 84 | if (timer_ack) { |
| 85 | /* | 85 | /* |
| 86 | * Subtle, when I/O APICs are used we have to ack timer IRQ | 86 | * Subtle, when I/O APICs are used we have to ack timer IRQ |
| 87 | * manually to reset the IRR bit for do_slow_gettimeoffset(). | 87 | * manually to deassert NMI lines for the watchdog if run |
| 88 | * This will also deassert NMI lines for the watchdog if run | ||
| 89 | * on an 82489DX-based system. | 88 | * on an 82489DX-based system. |
| 90 | */ | 89 | */ |
| 91 | spin_lock(&i8259A_lock); | 90 | spin_lock(&i8259A_lock); |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index adff76ea97c4..ec6d3b2130c4 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
| @@ -71,7 +71,6 @@ asmlinkage void general_protection(void); | |||
| 71 | asmlinkage void page_fault(void); | 71 | asmlinkage void page_fault(void); |
| 72 | asmlinkage void coprocessor_error(void); | 72 | asmlinkage void coprocessor_error(void); |
| 73 | asmlinkage void simd_coprocessor_error(void); | 73 | asmlinkage void simd_coprocessor_error(void); |
| 74 | asmlinkage void reserved(void); | ||
| 75 | asmlinkage void alignment_check(void); | 74 | asmlinkage void alignment_check(void); |
| 76 | asmlinkage void machine_check(void); | 75 | asmlinkage void machine_check(void); |
| 77 | asmlinkage void spurious_interrupt_bug(void); | 76 | asmlinkage void spurious_interrupt_bug(void); |
| @@ -702,12 +701,10 @@ DO_ERROR_INFO( 0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip) | |||
| 702 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) | 701 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) |
| 703 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) | 702 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) |
| 704 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) | 703 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) |
| 705 | DO_ERROR( 7, SIGSEGV, "device not available", device_not_available) | ||
| 706 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) | 704 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) |
| 707 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) | 705 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) |
| 708 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) | 706 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) |
| 709 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) | 707 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) |
| 710 | DO_ERROR(18, SIGSEGV, "reserved", reserved) | ||
| 711 | 708 | ||
| 712 | /* Runs on IST stack */ | 709 | /* Runs on IST stack */ |
| 713 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) | 710 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index 65b70637ad97..774a5a83c296 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -286,7 +286,6 @@ core_initcall(cpufreq_tsc); | |||
| 286 | 286 | ||
| 287 | /* clock source code */ | 287 | /* clock source code */ |
| 288 | 288 | ||
| 289 | static unsigned long current_tsc_khz; | ||
| 290 | static struct clocksource clocksource_tsc; | 289 | static struct clocksource clocksource_tsc; |
| 291 | 290 | ||
| 292 | /* | 291 | /* |
| @@ -439,9 +438,8 @@ void __init tsc_init(void) | |||
| 439 | 438 | ||
| 440 | unsynchronized_tsc(); | 439 | unsynchronized_tsc(); |
| 441 | check_geode_tsc_reliable(); | 440 | check_geode_tsc_reliable(); |
| 442 | current_tsc_khz = tsc_khz; | 441 | clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, |
| 443 | clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, | 442 | clocksource_tsc.shift); |
| 444 | clocksource_tsc.shift); | ||
| 445 | /* lower the rating if we already know its unstable: */ | 443 | /* lower the rating if we already know its unstable: */ |
| 446 | if (check_tsc_unstable()) { | 444 | if (check_tsc_unstable()) { |
| 447 | clocksource_tsc.rating = 0; | 445 | clocksource_tsc.rating = 0; |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index 1784b8077a12..9898fb01edfd 100644 --- a/arch/x86/kernel/tsc_64.c +++ b/arch/x86/kernel/tsc_64.c | |||
| @@ -242,7 +242,7 @@ void __init tsc_calibrate(void) | |||
| 242 | if (hpet) { | 242 | if (hpet) { |
| 243 | printk(KERN_INFO "TSC calibrated against HPET\n"); | 243 | printk(KERN_INFO "TSC calibrated against HPET\n"); |
| 244 | if (hpet2 < hpet1) | 244 | if (hpet2 < hpet1) |
| 245 | hpet2 += 0x100000000; | 245 | hpet2 += 0x100000000UL; |
| 246 | hpet2 -= hpet1; | 246 | hpet2 -= hpet1; |
| 247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; | 247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; |
| 248 | } else { | 248 | } else { |
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index ce5ed083a1e9..2674f5796275 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -60,13 +60,6 @@ SECTIONS | |||
| 60 | 60 | ||
| 61 | BUG_TABLE :text | 61 | BUG_TABLE :text |
| 62 | 62 | ||
| 63 | . = ALIGN(4); | ||
| 64 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
| 65 | __tracedata_start = .; | ||
| 66 | *(.tracedata) | ||
| 67 | __tracedata_end = .; | ||
| 68 | } | ||
| 69 | |||
| 70 | RODATA | 63 | RODATA |
| 71 | 64 | ||
| 72 | /* writeable */ | 65 | /* writeable */ |
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index fad3674b06a5..fd246e22fe6b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S | |||
| @@ -53,13 +53,6 @@ SECTIONS | |||
| 53 | 53 | ||
| 54 | RODATA | 54 | RODATA |
| 55 | 55 | ||
| 56 | . = ALIGN(4); | ||
| 57 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
| 58 | __tracedata_start = .; | ||
| 59 | *(.tracedata) | ||
| 60 | __tracedata_end = .; | ||
| 61 | } | ||
| 62 | |||
| 63 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | 56 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ |
| 64 | /* Data */ | 57 | /* Data */ |
| 65 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 58 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
| @@ -177,6 +170,7 @@ SECTIONS | |||
| 177 | *(.con_initcall.init) | 170 | *(.con_initcall.init) |
| 178 | } | 171 | } |
| 179 | __con_initcall_end = .; | 172 | __con_initcall_end = .; |
| 173 | . = ALIGN(16); | ||
| 180 | __x86cpuvendor_start = .; | 174 | __x86cpuvendor_start = .; |
| 181 | .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { | 175 | .x86cpuvendor.init : AT(ADDR(.x86cpuvendor.init) - LOAD_OFFSET) { |
| 182 | *(.x86cpuvendor.init) | 176 | *(.x86cpuvendor.init) |
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index ba8c0b75ab0a..0c029e8959c7 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
| @@ -15,9 +15,12 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/pci_ids.h> | 16 | #include <linux/pci_ids.h> |
| 17 | #include <linux/pci_regs.h> | 17 | #include <linux/pci_regs.h> |
| 18 | |||
| 19 | #include <asm/apic.h> | ||
| 18 | #include <asm/pci-direct.h> | 20 | #include <asm/pci-direct.h> |
| 19 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 20 | #include <asm/paravirt.h> | 22 | #include <asm/paravirt.h> |
| 23 | #include <asm/setup.h> | ||
| 21 | 24 | ||
| 22 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT | 25 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT |
| 23 | /* | 26 | /* |
diff --git a/arch/x86/math-emu/reg_constant.c b/arch/x86/math-emu/reg_constant.c index 04869e64b18e..00548354912f 100644 --- a/arch/x86/math-emu/reg_constant.c +++ b/arch/x86/math-emu/reg_constant.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include "reg_constant.h" | 16 | #include "reg_constant.h" |
| 17 | #include "control_w.h" | 17 | #include "control_w.h" |
| 18 | 18 | ||
| 19 | #define MAKE_REG(s,e,l,h) { l, h, \ | 19 | #define MAKE_REG(s, e, l, h) { l, h, \ |
| 20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } | 20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } |
| 21 | 21 | ||
| 22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); | 22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); |
| 23 | #if 0 | 23 | #if 0 |
| @@ -40,7 +40,7 @@ FPU_REG const CONST_PI2extra = MAKE_REG(NEG, -66, | |||
| 40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); | 40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); |
| 41 | 41 | ||
| 42 | /* Only the sign and significand (and tag) are used in internal NaNs */ | 42 | /* Only the sign and significand (and tag) are used in internal NaNs */ |
| 43 | /* The 80486 never generates one of these | 43 | /* The 80486 never generates one of these |
| 44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); | 44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); |
| 45 | */ | 45 | */ |
| 46 | /* This is the real indefinite QNaN */ | 46 | /* This is the real indefinite QNaN */ |
| @@ -49,7 +49,7 @@ FPU_REG const CONST_QNaN = MAKE_REG(NEG, EXP_OVER, 0x00000000, 0xC0000000); | |||
| 49 | /* Only the sign (and tag) is used in internal infinities */ | 49 | /* Only the sign (and tag) is used in internal infinities */ |
| 50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); | 50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); |
| 51 | 51 | ||
| 52 | static void fld_const(FPU_REG const *c, int adj, u_char tag) | 52 | static void fld_const(FPU_REG const * c, int adj, u_char tag) |
| 53 | { | 53 | { |
| 54 | FPU_REG *st_new_ptr; | 54 | FPU_REG *st_new_ptr; |
| 55 | 55 | ||
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 914ccf983687..8b4eac0ca07d 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
| @@ -156,7 +156,7 @@ static void __init propagate_e820_map_node(int nid) | |||
| 156 | */ | 156 | */ |
| 157 | static void __init allocate_pgdat(int nid) | 157 | static void __init allocate_pgdat(int nid) |
| 158 | { | 158 | { |
| 159 | if (nid && node_has_online_mem(nid)) | 159 | if (nid && node_has_online_mem(nid) && node_remap_start_vaddr[nid]) |
| 160 | NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; | 160 | NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; |
| 161 | else { | 161 | else { |
| 162 | NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); | 162 | NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); |
| @@ -164,16 +164,13 @@ static void __init allocate_pgdat(int nid) | |||
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | #ifdef CONFIG_DISCONTIGMEM | ||
| 168 | /* | 167 | /* |
| 169 | * In the discontig memory model, a portion of the kernel virtual area (KVA) | 168 | * In the DISCONTIGMEM and SPARSEMEM memory model, a portion of the kernel |
| 170 | * is reserved and portions of nodes are mapped using it. This is to allow | 169 | * virtual address space (KVA) is reserved and portions of nodes are mapped |
| 171 | * node-local memory to be allocated for structures that would normally require | 170 | * using it. This is to allow node-local memory to be allocated for |
| 172 | * ZONE_NORMAL. The memory is allocated with alloc_remap() and callers | 171 | * structures that would normally require ZONE_NORMAL. The memory is |
| 173 | * should be prepared to allocate from the bootmem allocator instead. This KVA | 172 | * allocated with alloc_remap() and callers should be prepared to allocate |
| 174 | * mechanism is incompatible with SPARSEMEM as it makes assumptions about the | 173 | * from the bootmem allocator instead. |
| 175 | * layout of memory that are broken if alloc_remap() succeeds for some of the | ||
| 176 | * map and fails for others | ||
| 177 | */ | 174 | */ |
| 178 | static unsigned long node_remap_start_pfn[MAX_NUMNODES]; | 175 | static unsigned long node_remap_start_pfn[MAX_NUMNODES]; |
| 179 | static void *node_remap_end_vaddr[MAX_NUMNODES]; | 176 | static void *node_remap_end_vaddr[MAX_NUMNODES]; |
| @@ -290,25 +287,6 @@ static void init_remap_allocator(int nid) | |||
| 290 | (ulong) pfn_to_kaddr(highstart_pfn | 287 | (ulong) pfn_to_kaddr(highstart_pfn |
| 291 | + node_remap_offset[nid] + node_remap_size[nid])); | 288 | + node_remap_offset[nid] + node_remap_size[nid])); |
| 292 | } | 289 | } |
| 293 | #else | ||
| 294 | void *alloc_remap(int nid, unsigned long size) | ||
| 295 | { | ||
| 296 | return NULL; | ||
| 297 | } | ||
| 298 | |||
| 299 | static unsigned long calculate_numa_remap_pages(void) | ||
| 300 | { | ||
| 301 | return 0; | ||
| 302 | } | ||
| 303 | |||
| 304 | static void init_remap_allocator(int nid) | ||
| 305 | { | ||
| 306 | } | ||
| 307 | |||
| 308 | void __init remap_numa_kva(void) | ||
| 309 | { | ||
| 310 | } | ||
| 311 | #endif /* CONFIG_DISCONTIGMEM */ | ||
| 312 | 290 | ||
| 313 | extern void setup_bootmem_allocator(void); | 291 | extern void setup_bootmem_allocator(void); |
| 314 | unsigned long __init setup_memory(void) | 292 | unsigned long __init setup_memory(void) |
| @@ -476,3 +454,21 @@ int memory_add_physaddr_to_nid(u64 addr) | |||
| 476 | 454 | ||
| 477 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 455 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
| 478 | #endif | 456 | #endif |
| 457 | |||
| 458 | #if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT) | ||
| 459 | /* | ||
| 460 | * Dummy on 32-bit, for now: | ||
| 461 | */ | ||
| 462 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | ||
| 463 | { | ||
| 464 | } | ||
| 465 | |||
| 466 | void __init | ||
| 467 | acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) | ||
| 468 | { | ||
| 469 | } | ||
| 470 | |||
| 471 | void __init acpi_numa_arch_fixup(void) | ||
| 472 | { | ||
| 473 | } | ||
| 474 | #endif | ||
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 2c24bea92c66..0bb0caed8971 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c | |||
| @@ -42,7 +42,7 @@ static struct addr_marker address_markers[] = { | |||
| 42 | { 0, "User Space" }, | 42 | { 0, "User Space" }, |
| 43 | #ifdef CONFIG_X86_64 | 43 | #ifdef CONFIG_X86_64 |
| 44 | { 0x8000000000000000UL, "Kernel Space" }, | 44 | { 0x8000000000000000UL, "Kernel Space" }, |
| 45 | { 0xffff810000000000UL, "Low Kernel Mapping" }, | 45 | { PAGE_OFFSET, "Low Kernel Mapping" }, |
| 46 | { VMALLOC_START, "vmalloc() Area" }, | 46 | { VMALLOC_START, "vmalloc() Area" }, |
| 47 | { VMEMMAP_START, "Vmemmap" }, | 47 | { VMEMMAP_START, "Vmemmap" }, |
| 48 | { __START_KERNEL_map, "High Kernel Mapping" }, | 48 | { __START_KERNEL_map, "High Kernel Mapping" }, |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 8bcb6f40ccb6..1e64795714c8 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -55,11 +55,7 @@ static inline int notify_page_fault(struct pt_regs *regs) | |||
| 55 | int ret = 0; | 55 | int ret = 0; |
| 56 | 56 | ||
| 57 | /* kprobe_running() needs smp_processor_id() */ | 57 | /* kprobe_running() needs smp_processor_id() */ |
| 58 | #ifdef CONFIG_X86_32 | ||
| 59 | if (!user_mode_vm(regs)) { | 58 | if (!user_mode_vm(regs)) { |
| 60 | #else | ||
| 61 | if (!user_mode(regs)) { | ||
| 62 | #endif | ||
| 63 | preempt_disable(); | 59 | preempt_disable(); |
| 64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) | 60 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) |
| 65 | ret = 1; | 61 | ret = 1; |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index ec30d10154b6..d71be0eb0130 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
| @@ -162,6 +162,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 162 | pgd_t *pgd; | 162 | pgd_t *pgd; |
| 163 | pmd_t *pmd; | 163 | pmd_t *pmd; |
| 164 | pte_t *pte; | 164 | pte_t *pte; |
| 165 | unsigned pages_2m = 0, pages_4k = 0; | ||
| 165 | 166 | ||
| 166 | pgd_idx = pgd_index(PAGE_OFFSET); | 167 | pgd_idx = pgd_index(PAGE_OFFSET); |
| 167 | pgd = pgd_base + pgd_idx; | 168 | pgd = pgd_base + pgd_idx; |
| @@ -197,6 +198,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 197 | is_kernel_text(addr2)) | 198 | is_kernel_text(addr2)) |
| 198 | prot = PAGE_KERNEL_LARGE_EXEC; | 199 | prot = PAGE_KERNEL_LARGE_EXEC; |
| 199 | 200 | ||
| 201 | pages_2m++; | ||
| 200 | set_pmd(pmd, pfn_pmd(pfn, prot)); | 202 | set_pmd(pmd, pfn_pmd(pfn, prot)); |
| 201 | 203 | ||
| 202 | pfn += PTRS_PER_PTE; | 204 | pfn += PTRS_PER_PTE; |
| @@ -213,11 +215,14 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 213 | if (is_kernel_text(addr)) | 215 | if (is_kernel_text(addr)) |
| 214 | prot = PAGE_KERNEL_EXEC; | 216 | prot = PAGE_KERNEL_EXEC; |
| 215 | 217 | ||
| 218 | pages_4k++; | ||
| 216 | set_pte(pte, pfn_pte(pfn, prot)); | 219 | set_pte(pte, pfn_pte(pfn, prot)); |
| 217 | } | 220 | } |
| 218 | max_pfn_mapped = pfn; | 221 | max_pfn_mapped = pfn; |
| 219 | } | 222 | } |
| 220 | } | 223 | } |
| 224 | update_page_count(PG_LEVEL_2M, pages_2m); | ||
| 225 | update_page_count(PG_LEVEL_4K, pages_4k); | ||
| 221 | } | 226 | } |
| 222 | 227 | ||
| 223 | static inline int page_kills_ppro(unsigned long pagenr) | 228 | static inline int page_kills_ppro(unsigned long pagenr) |
| @@ -571,17 +576,6 @@ void __init mem_init(void) | |||
| 571 | #endif | 576 | #endif |
| 572 | bad_ppro = ppro_with_ram_bug(); | 577 | bad_ppro = ppro_with_ram_bug(); |
| 573 | 578 | ||
| 574 | #ifdef CONFIG_HIGHMEM | ||
| 575 | /* check that fixmap and pkmap do not overlap */ | ||
| 576 | if (PKMAP_BASE + LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) { | ||
| 577 | printk(KERN_ERR | ||
| 578 | "fixmap and kmap areas overlap - this will crash\n"); | ||
| 579 | printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n", | ||
| 580 | PKMAP_BASE, PKMAP_BASE + LAST_PKMAP*PAGE_SIZE, | ||
| 581 | FIXADDR_START); | ||
| 582 | BUG(); | ||
| 583 | } | ||
| 584 | #endif | ||
| 585 | /* this will put all low memory onto the freelists */ | 579 | /* this will put all low memory onto the freelists */ |
| 586 | totalram_pages += free_all_bootmem(); | 580 | totalram_pages += free_all_bootmem(); |
| 587 | 581 | ||
| @@ -614,7 +608,6 @@ void __init mem_init(void) | |||
| 614 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) | 608 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) |
| 615 | ); | 609 | ); |
| 616 | 610 | ||
| 617 | #if 1 /* double-sanity-check paranoia */ | ||
| 618 | printk(KERN_INFO "virtual kernel memory layout:\n" | 611 | printk(KERN_INFO "virtual kernel memory layout:\n" |
| 619 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" | 612 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" |
| 620 | #ifdef CONFIG_HIGHMEM | 613 | #ifdef CONFIG_HIGHMEM |
| @@ -655,7 +648,6 @@ void __init mem_init(void) | |||
| 655 | #endif | 648 | #endif |
| 656 | BUG_ON(VMALLOC_START > VMALLOC_END); | 649 | BUG_ON(VMALLOC_START > VMALLOC_END); |
| 657 | BUG_ON((unsigned long)high_memory > VMALLOC_START); | 650 | BUG_ON((unsigned long)high_memory > VMALLOC_START); |
| 658 | #endif /* double-sanity-check paranoia */ | ||
| 659 | 651 | ||
| 660 | if (boot_cpu_data.wp_works_ok < 0) | 652 | if (boot_cpu_data.wp_works_ok < 0) |
| 661 | test_wp_bit(); | 653 | test_wp_bit(); |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 156e6d7b0e32..48623ae628fb 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/swap.h> | 18 | #include <linux/swap.h> |
| 19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/initrd.h> | ||
| 21 | #include <linux/pagemap.h> | 22 | #include <linux/pagemap.h> |
| 22 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
| 23 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
| @@ -135,7 +136,7 @@ static __init void *spp_getpage(void) | |||
| 135 | return ptr; | 136 | return ptr; |
| 136 | } | 137 | } |
| 137 | 138 | ||
| 138 | static void | 139 | static __init void |
| 139 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) | 140 | set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot) |
| 140 | { | 141 | { |
| 141 | pgd_t *pgd; | 142 | pgd_t *pgd; |
| @@ -214,7 +215,7 @@ void __init cleanup_highmap(void) | |||
| 214 | } | 215 | } |
| 215 | 216 | ||
| 216 | /* NOTE: this is meant to be run only at boot */ | 217 | /* NOTE: this is meant to be run only at boot */ |
| 217 | void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) | 218 | void __init __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) |
| 218 | { | 219 | { |
| 219 | unsigned long address = __fix_to_virt(idx); | 220 | unsigned long address = __fix_to_virt(idx); |
| 220 | 221 | ||
| @@ -312,6 +313,8 @@ __meminit void early_iounmap(void *addr, unsigned long size) | |||
| 312 | static unsigned long __meminit | 313 | static unsigned long __meminit |
| 313 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | 314 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) |
| 314 | { | 315 | { |
| 316 | unsigned long pages = 0; | ||
| 317 | |||
| 315 | int i = pmd_index(address); | 318 | int i = pmd_index(address); |
| 316 | 319 | ||
| 317 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { | 320 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { |
| @@ -328,9 +331,11 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | |||
| 328 | if (pmd_val(*pmd)) | 331 | if (pmd_val(*pmd)) |
| 329 | continue; | 332 | continue; |
| 330 | 333 | ||
| 334 | pages++; | ||
| 331 | set_pte((pte_t *)pmd, | 335 | set_pte((pte_t *)pmd, |
| 332 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 336 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 333 | } | 337 | } |
| 338 | update_page_count(PG_LEVEL_2M, pages); | ||
| 334 | return address; | 339 | return address; |
| 335 | } | 340 | } |
| 336 | 341 | ||
| @@ -350,6 +355,7 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end) | |||
| 350 | static unsigned long __meminit | 355 | static unsigned long __meminit |
| 351 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | 356 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) |
| 352 | { | 357 | { |
| 358 | unsigned long pages = 0; | ||
| 353 | unsigned long last_map_addr = end; | 359 | unsigned long last_map_addr = end; |
| 354 | int i = pud_index(addr); | 360 | int i = pud_index(addr); |
| 355 | 361 | ||
| @@ -374,6 +380,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
| 374 | } | 380 | } |
| 375 | 381 | ||
| 376 | if (direct_gbpages) { | 382 | if (direct_gbpages) { |
| 383 | pages++; | ||
| 377 | set_pte((pte_t *)pud, | 384 | set_pte((pte_t *)pud, |
| 378 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 385 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 379 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; | 386 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; |
| @@ -390,6 +397,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
| 390 | unmap_low_page(pmd); | 397 | unmap_low_page(pmd); |
| 391 | } | 398 | } |
| 392 | __flush_tlb_all(); | 399 | __flush_tlb_all(); |
| 400 | update_page_count(PG_LEVEL_1G, pages); | ||
| 393 | 401 | ||
| 394 | return last_map_addr >> PAGE_SHIFT; | 402 | return last_map_addr >> PAGE_SHIFT; |
| 395 | } | 403 | } |
| @@ -431,7 +439,7 @@ static void __init init_gbpages(void) | |||
| 431 | direct_gbpages = 0; | 439 | direct_gbpages = 0; |
| 432 | } | 440 | } |
| 433 | 441 | ||
| 434 | #ifdef CONFIG_MEMTEST_BOOTPARAM | 442 | #ifdef CONFIG_MEMTEST |
| 435 | 443 | ||
| 436 | static void __init memtest(unsigned long start_phys, unsigned long size, | 444 | static void __init memtest(unsigned long start_phys, unsigned long size, |
| 437 | unsigned pattern) | 445 | unsigned pattern) |
| @@ -493,7 +501,8 @@ static void __init memtest(unsigned long start_phys, unsigned long size, | |||
| 493 | 501 | ||
| 494 | } | 502 | } |
| 495 | 503 | ||
| 496 | static int memtest_pattern __initdata = CONFIG_MEMTEST_BOOTPARAM_VALUE; | 504 | /* default is disabled */ |
| 505 | static int memtest_pattern __initdata; | ||
| 497 | 506 | ||
| 498 | static int __init parse_memtest(char *arg) | 507 | static int __init parse_memtest(char *arg) |
| 499 | { | 508 | { |
| @@ -526,7 +535,8 @@ static void __init early_memtest(unsigned long start, unsigned long end) | |||
| 526 | t_size = end - t_start; | 535 | t_size = end - t_start; |
| 527 | 536 | ||
| 528 | printk(KERN_CONT "\n %016llx - %016llx pattern %d", | 537 | printk(KERN_CONT "\n %016llx - %016llx pattern %d", |
| 529 | t_start, t_start + t_size, pattern); | 538 | (unsigned long long)t_start, |
| 539 | (unsigned long long)t_start + t_size, pattern); | ||
| 530 | 540 | ||
| 531 | memtest(t_start, t_size, pattern); | 541 | memtest(t_start, t_size, pattern); |
| 532 | 542 | ||
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 2b2bb3f9b683..416ea415f5c2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -142,7 +142,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, | |||
| 142 | /* | 142 | /* |
| 143 | * Don't remap the low PCI/ISA area, it's always mapped.. | 143 | * Don't remap the low PCI/ISA area, it's always mapped.. |
| 144 | */ | 144 | */ |
| 145 | if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) | 145 | if (is_ISA_range(phys_addr, last_addr)) |
| 146 | return (__force void __iomem *)phys_to_virt(phys_addr); | 146 | return (__force void __iomem *)phys_to_virt(phys_addr); |
| 147 | 147 | ||
| 148 | /* | 148 | /* |
| @@ -261,7 +261,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size) | |||
| 261 | { | 261 | { |
| 262 | /* | 262 | /* |
| 263 | * Ideally, this should be: | 263 | * Ideally, this should be: |
| 264 | * pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; | 264 | * pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; |
| 265 | * | 265 | * |
| 266 | * Till we fix all X drivers to use ioremap_wc(), we will use | 266 | * Till we fix all X drivers to use ioremap_wc(), we will use |
| 267 | * UC MINUS. | 267 | * UC MINUS. |
| @@ -285,7 +285,7 @@ EXPORT_SYMBOL(ioremap_nocache); | |||
| 285 | */ | 285 | */ |
| 286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) | 286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) |
| 287 | { | 287 | { |
| 288 | if (pat_wc_enabled) | 288 | if (pat_enabled) |
| 289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, | 289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, |
| 290 | __builtin_return_address(0)); | 290 | __builtin_return_address(0)); |
| 291 | else | 291 | else |
| @@ -318,8 +318,8 @@ void iounmap(volatile void __iomem *addr) | |||
| 318 | * vm_area and by simply returning an address into the kernel mapping | 318 | * vm_area and by simply returning an address into the kernel mapping |
| 319 | * of ISA space. So handle that here. | 319 | * of ISA space. So handle that here. |
| 320 | */ | 320 | */ |
| 321 | if (addr >= phys_to_virt(ISA_START_ADDRESS) && | 321 | if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) && |
| 322 | addr < phys_to_virt(ISA_END_ADDRESS)) | 322 | (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) |
| 323 | return; | 323 | return; |
| 324 | 324 | ||
| 325 | addr = (volatile void __iomem *) | 325 | addr = (volatile void __iomem *) |
| @@ -332,7 +332,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 332 | cpa takes care of the direct mappings. */ | 332 | cpa takes care of the direct mappings. */ |
| 333 | read_lock(&vmlist_lock); | 333 | read_lock(&vmlist_lock); |
| 334 | for (p = vmlist; p; p = p->next) { | 334 | for (p = vmlist; p; p = p->next) { |
| 335 | if (p->addr == addr) | 335 | if (p->addr == (void __force *)addr) |
| 336 | break; | 336 | break; |
| 337 | } | 337 | } |
| 338 | read_unlock(&vmlist_lock); | 338 | read_unlock(&vmlist_lock); |
| @@ -346,7 +346,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); | 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); |
| 347 | 347 | ||
| 348 | /* Finally remove it */ | 348 | /* Finally remove it */ |
| 349 | o = remove_vm_area((void *)addr); | 349 | o = remove_vm_area((void __force *)addr); |
| 350 | BUG_ON(p != o || o == NULL); | 350 | BUG_ON(p != o || o == NULL); |
| 351 | kfree(p); | 351 | kfree(p); |
| 352 | } | 352 | } |
| @@ -365,7 +365,7 @@ void *xlate_dev_mem_ptr(unsigned long phys) | |||
| 365 | if (page_is_ram(start >> PAGE_SHIFT)) | 365 | if (page_is_ram(start >> PAGE_SHIFT)) |
| 366 | return __va(phys); | 366 | return __va(phys); |
| 367 | 367 | ||
| 368 | addr = (void *)ioremap(start, PAGE_SIZE); | 368 | addr = (void __force *)ioremap(start, PAGE_SIZE); |
| 369 | if (addr) | 369 | if (addr) |
| 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); | 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); |
| 371 | 371 | ||
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c index 1f476e477844..0ea66b532c35 100644 --- a/arch/x86/mm/k8topology_64.c +++ b/arch/x86/mm/k8topology_64.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <asm/numa.h> | 22 | #include <asm/numa.h> |
| 23 | #include <asm/mpspec.h> | 23 | #include <asm/mpspec.h> |
| 24 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
| 25 | #include <asm/k8.h> | ||
| 25 | 26 | ||
| 26 | static __init int find_northbridge(void) | 27 | static __init int find_northbridge(void) |
| 27 | { | 28 | { |
| @@ -73,17 +74,12 @@ static __init void early_get_boot_cpu_id(void) | |||
| 73 | 74 | ||
| 74 | int __init k8_scan_nodes(unsigned long start, unsigned long end) | 75 | int __init k8_scan_nodes(unsigned long start, unsigned long end) |
| 75 | { | 76 | { |
| 77 | unsigned numnodes, cores, bits, apicid_base; | ||
| 76 | unsigned long prevbase; | 78 | unsigned long prevbase; |
| 77 | struct bootnode nodes[8]; | 79 | struct bootnode nodes[8]; |
| 78 | int nodeid, i, nb; | ||
| 79 | unsigned char nodeids[8]; | 80 | unsigned char nodeids[8]; |
| 80 | int found = 0; | 81 | int i, j, nb, found = 0; |
| 81 | u32 reg; | 82 | u32 nodeid, reg; |
| 82 | unsigned numnodes; | ||
| 83 | unsigned cores; | ||
| 84 | unsigned bits; | ||
| 85 | int j; | ||
| 86 | unsigned apicid_base; | ||
| 87 | 83 | ||
| 88 | if (!early_pci_allowed()) | 84 | if (!early_pci_allowed()) |
| 89 | return -1; | 85 | return -1; |
| @@ -105,7 +101,6 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) | |||
| 105 | prevbase = 0; | 101 | prevbase = 0; |
| 106 | for (i = 0; i < 8; i++) { | 102 | for (i = 0; i < 8; i++) { |
| 107 | unsigned long base, limit; | 103 | unsigned long base, limit; |
| 108 | u32 nodeid; | ||
| 109 | 104 | ||
| 110 | base = read_pci_config(0, nb, 1, 0x40 + i*8); | 105 | base = read_pci_config(0, nb, 1, 0x40 + i*8); |
| 111 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); | 106 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 60bcb5b6a37e..afd40054d157 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -34,6 +34,41 @@ struct cpa_data { | |||
| 34 | unsigned force_split : 1; | 34 | unsigned force_split : 1; |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_PROC_FS | ||
| 38 | static unsigned long direct_pages_count[PG_LEVEL_NUM]; | ||
| 39 | |||
| 40 | void update_page_count(int level, unsigned long pages) | ||
| 41 | { | ||
| 42 | unsigned long flags; | ||
| 43 | |||
| 44 | /* Protect against CPA */ | ||
| 45 | spin_lock_irqsave(&pgd_lock, flags); | ||
| 46 | direct_pages_count[level] += pages; | ||
| 47 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
| 48 | } | ||
| 49 | |||
| 50 | static void split_page_count(int level) | ||
| 51 | { | ||
| 52 | direct_pages_count[level]--; | ||
| 53 | direct_pages_count[level - 1] += PTRS_PER_PTE; | ||
| 54 | } | ||
| 55 | |||
| 56 | int arch_report_meminfo(char *page) | ||
| 57 | { | ||
| 58 | int n = sprintf(page, "DirectMap4k: %8lu\n" | ||
| 59 | "DirectMap2M: %8lu\n", | ||
| 60 | direct_pages_count[PG_LEVEL_4K], | ||
| 61 | direct_pages_count[PG_LEVEL_2M]); | ||
| 62 | #ifdef CONFIG_X86_64 | ||
| 63 | n += sprintf(page + n, "DirectMap1G: %8lu\n", | ||
| 64 | direct_pages_count[PG_LEVEL_1G]); | ||
| 65 | #endif | ||
| 66 | return n; | ||
| 67 | } | ||
| 68 | #else | ||
| 69 | static inline void split_page_count(int level) { } | ||
| 70 | #endif | ||
| 71 | |||
| 37 | #ifdef CONFIG_X86_64 | 72 | #ifdef CONFIG_X86_64 |
| 38 | 73 | ||
| 39 | static inline unsigned long highmap_start_pfn(void) | 74 | static inline unsigned long highmap_start_pfn(void) |
| @@ -500,6 +535,10 @@ static int split_large_page(pte_t *kpte, unsigned long address) | |||
| 500 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) | 535 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) |
| 501 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); | 536 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); |
| 502 | 537 | ||
| 538 | if (address >= (unsigned long)__va(0) && | ||
| 539 | address < (unsigned long)__va(max_pfn_mapped << PAGE_SHIFT)) | ||
| 540 | split_page_count(level); | ||
| 541 | |||
| 503 | /* | 542 | /* |
| 504 | * Install the new, split up pagetable. Important details here: | 543 | * Install the new, split up pagetable. Important details here: |
| 505 | * | 544 | * |
| @@ -805,7 +844,7 @@ int _set_memory_wc(unsigned long addr, int numpages) | |||
| 805 | 844 | ||
| 806 | int set_memory_wc(unsigned long addr, int numpages) | 845 | int set_memory_wc(unsigned long addr, int numpages) |
| 807 | { | 846 | { |
| 808 | if (!pat_wc_enabled) | 847 | if (!pat_enabled) |
| 809 | return set_memory_uc(addr, numpages); | 848 | return set_memory_uc(addr, numpages); |
| 810 | 849 | ||
| 811 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, | 850 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 06b7a1c90fb8..a885a1019b8a 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -26,11 +26,11 @@ | |||
| 26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 27 | 27 | ||
| 28 | #ifdef CONFIG_X86_PAT | 28 | #ifdef CONFIG_X86_PAT |
| 29 | int __read_mostly pat_wc_enabled = 1; | 29 | int __read_mostly pat_enabled = 1; |
| 30 | 30 | ||
| 31 | void __cpuinit pat_disable(char *reason) | 31 | void __cpuinit pat_disable(char *reason) |
| 32 | { | 32 | { |
| 33 | pat_wc_enabled = 0; | 33 | pat_enabled = 0; |
| 34 | printk(KERN_INFO "%s\n", reason); | 34 | printk(KERN_INFO "%s\n", reason); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| @@ -42,6 +42,19 @@ static int __init nopat(char *str) | |||
| 42 | early_param("nopat", nopat); | 42 | early_param("nopat", nopat); |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | |||
| 46 | static int debug_enable; | ||
| 47 | static int __init pat_debug_setup(char *str) | ||
| 48 | { | ||
| 49 | debug_enable = 1; | ||
| 50 | return 0; | ||
| 51 | } | ||
| 52 | __setup("debugpat", pat_debug_setup); | ||
| 53 | |||
| 54 | #define dprintk(fmt, arg...) \ | ||
| 55 | do { if (debug_enable) printk(KERN_INFO fmt, ##arg); } while (0) | ||
| 56 | |||
| 57 | |||
| 45 | static u64 __read_mostly boot_pat_state; | 58 | static u64 __read_mostly boot_pat_state; |
| 46 | 59 | ||
| 47 | enum { | 60 | enum { |
| @@ -53,24 +66,25 @@ enum { | |||
| 53 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ | 66 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ |
| 54 | }; | 67 | }; |
| 55 | 68 | ||
| 56 | #define PAT(x,y) ((u64)PAT_ ## y << ((x)*8)) | 69 | #define PAT(x, y) ((u64)PAT_ ## y << ((x)*8)) |
| 57 | 70 | ||
| 58 | void pat_init(void) | 71 | void pat_init(void) |
| 59 | { | 72 | { |
| 60 | u64 pat; | 73 | u64 pat; |
| 61 | 74 | ||
| 62 | if (!pat_wc_enabled) | 75 | if (!pat_enabled) |
| 63 | return; | 76 | return; |
| 64 | 77 | ||
| 65 | /* Paranoia check. */ | 78 | /* Paranoia check. */ |
| 66 | if (!cpu_has_pat) { | 79 | if (!cpu_has_pat && boot_pat_state) { |
| 67 | printk(KERN_ERR "PAT enabled, but CPU feature cleared\n"); | ||
| 68 | /* | 80 | /* |
| 69 | * Panic if this happens on the secondary CPU, and we | 81 | * If this happens we are on a secondary CPU, but |
| 70 | * switched to PAT on the boot CPU. We have no way to | 82 | * switched to PAT on the boot CPU. We have no way to |
| 71 | * undo PAT. | 83 | * undo PAT. |
| 72 | */ | 84 | */ |
| 73 | BUG_ON(boot_pat_state); | 85 | printk(KERN_ERR "PAT enabled, " |
| 86 | "but not supported by secondary CPU\n"); | ||
| 87 | BUG(); | ||
| 74 | } | 88 | } |
| 75 | 89 | ||
| 76 | /* Set PWT to Write-Combining. All other bits stay the same */ | 90 | /* Set PWT to Write-Combining. All other bits stay the same */ |
| @@ -86,8 +100,8 @@ void pat_init(void) | |||
| 86 | * 011 UC _PAGE_CACHE_UC | 100 | * 011 UC _PAGE_CACHE_UC |
| 87 | * PAT bit unused | 101 | * PAT bit unused |
| 88 | */ | 102 | */ |
| 89 | pat = PAT(0,WB) | PAT(1,WC) | PAT(2,UC_MINUS) | PAT(3,UC) | | 103 | pat = PAT(0, WB) | PAT(1, WC) | PAT(2, UC_MINUS) | PAT(3, UC) | |
| 90 | PAT(4,WB) | PAT(5,WC) | PAT(6,UC_MINUS) | PAT(7,UC); | 104 | PAT(4, WB) | PAT(5, WC) | PAT(6, UC_MINUS) | PAT(7, UC); |
| 91 | 105 | ||
| 92 | /* Boot CPU check */ | 106 | /* Boot CPU check */ |
| 93 | if (!boot_pat_state) | 107 | if (!boot_pat_state) |
| @@ -103,11 +117,11 @@ void pat_init(void) | |||
| 103 | static char *cattr_name(unsigned long flags) | 117 | static char *cattr_name(unsigned long flags) |
| 104 | { | 118 | { |
| 105 | switch (flags & _PAGE_CACHE_MASK) { | 119 | switch (flags & _PAGE_CACHE_MASK) { |
| 106 | case _PAGE_CACHE_UC: return "uncached"; | 120 | case _PAGE_CACHE_UC: return "uncached"; |
| 107 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; | 121 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; |
| 108 | case _PAGE_CACHE_WB: return "write-back"; | 122 | case _PAGE_CACHE_WB: return "write-back"; |
| 109 | case _PAGE_CACHE_WC: return "write-combining"; | 123 | case _PAGE_CACHE_WC: return "write-combining"; |
| 110 | default: return "broken"; | 124 | default: return "broken"; |
| 111 | } | 125 | } |
| 112 | } | 126 | } |
| 113 | 127 | ||
| @@ -145,47 +159,50 @@ static DEFINE_SPINLOCK(memtype_lock); /* protects memtype list */ | |||
| 145 | * The intersection is based on "Effective Memory Type" tables in IA-32 | 159 | * The intersection is based on "Effective Memory Type" tables in IA-32 |
| 146 | * SDM vol 3a | 160 | * SDM vol 3a |
| 147 | */ | 161 | */ |
| 148 | static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | 162 | static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type) |
| 149 | unsigned long *ret_prot) | ||
| 150 | { | 163 | { |
| 151 | unsigned long pat_type; | ||
| 152 | u8 mtrr_type; | ||
| 153 | |||
| 154 | pat_type = prot & _PAGE_CACHE_MASK; | ||
| 155 | prot &= (~_PAGE_CACHE_MASK); | ||
| 156 | |||
| 157 | /* | ||
| 158 | * We return the PAT request directly for types where PAT takes | ||
| 159 | * precedence with respect to MTRR and for UC_MINUS. | ||
| 160 | * Consistency checks with other PAT requests is done later | ||
| 161 | * while going through memtype list. | ||
| 162 | */ | ||
| 163 | if (pat_type == _PAGE_CACHE_WC) { | ||
| 164 | *ret_prot = prot | _PAGE_CACHE_WC; | ||
| 165 | return 0; | ||
| 166 | } else if (pat_type == _PAGE_CACHE_UC_MINUS) { | ||
| 167 | *ret_prot = prot | _PAGE_CACHE_UC_MINUS; | ||
| 168 | return 0; | ||
| 169 | } else if (pat_type == _PAGE_CACHE_UC) { | ||
| 170 | *ret_prot = prot | _PAGE_CACHE_UC; | ||
| 171 | return 0; | ||
| 172 | } | ||
| 173 | |||
| 174 | /* | 164 | /* |
| 175 | * Look for MTRR hint to get the effective type in case where PAT | 165 | * Look for MTRR hint to get the effective type in case where PAT |
| 176 | * request is for WB. | 166 | * request is for WB. |
| 177 | */ | 167 | */ |
| 178 | mtrr_type = mtrr_type_lookup(start, end); | 168 | if (req_type == _PAGE_CACHE_WB) { |
| 169 | u8 mtrr_type; | ||
| 170 | |||
| 171 | mtrr_type = mtrr_type_lookup(start, end); | ||
| 172 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) | ||
| 173 | return _PAGE_CACHE_UC; | ||
| 174 | if (mtrr_type == MTRR_TYPE_WRCOMB) | ||
| 175 | return _PAGE_CACHE_WC; | ||
| 176 | } | ||
| 179 | 177 | ||
| 180 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) { | 178 | return req_type; |
| 181 | *ret_prot = prot | _PAGE_CACHE_UC; | 179 | } |
| 182 | } else if (mtrr_type == MTRR_TYPE_WRCOMB) { | 180 | |
| 183 | *ret_prot = prot | _PAGE_CACHE_WC; | 181 | static int chk_conflict(struct memtype *new, struct memtype *entry, |
| 184 | } else { | 182 | unsigned long *type) |
| 185 | *ret_prot = prot | _PAGE_CACHE_WB; | 183 | { |
| 184 | if (new->type != entry->type) { | ||
| 185 | if (type) { | ||
| 186 | new->type = entry->type; | ||
| 187 | *type = entry->type; | ||
| 188 | } else | ||
| 189 | goto conflict; | ||
| 186 | } | 190 | } |
| 187 | 191 | ||
| 192 | /* check overlaps with more than one entry in the list */ | ||
| 193 | list_for_each_entry_continue(entry, &memtype_list, nd) { | ||
| 194 | if (new->end <= entry->start) | ||
| 195 | break; | ||
| 196 | else if (new->type != entry->type) | ||
| 197 | goto conflict; | ||
| 198 | } | ||
| 188 | return 0; | 199 | return 0; |
| 200 | |||
| 201 | conflict: | ||
| 202 | printk(KERN_INFO "%s:%d conflicting memory types " | ||
| 203 | "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start, | ||
| 204 | new->end, cattr_name(new->type), cattr_name(entry->type)); | ||
| 205 | return -EBUSY; | ||
| 189 | } | 206 | } |
| 190 | 207 | ||
| 191 | /* | 208 | /* |
| @@ -198,37 +215,36 @@ static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | |||
| 198 | * req_type will have a special case value '-1', when requester want to inherit | 215 | * req_type will have a special case value '-1', when requester want to inherit |
| 199 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. | 216 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. |
| 200 | * | 217 | * |
| 201 | * If ret_type is NULL, function will return an error if it cannot reserve the | 218 | * If new_type is NULL, function will return an error if it cannot reserve the |
| 202 | * region with req_type. If ret_type is non-null, function will return | 219 | * region with req_type. If new_type is non-NULL, function will return |
| 203 | * available type in ret_type in case of no error. In case of any error | 220 | * available type in new_type in case of no error. In case of any error |
| 204 | * it will return a negative return value. | 221 | * it will return a negative return value. |
| 205 | */ | 222 | */ |
| 206 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, | 223 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, |
| 207 | unsigned long *ret_type) | 224 | unsigned long *new_type) |
| 208 | { | 225 | { |
| 209 | struct memtype *new_entry = NULL; | 226 | struct memtype *new, *entry; |
| 210 | struct memtype *parse; | ||
| 211 | unsigned long actual_type; | 227 | unsigned long actual_type; |
| 228 | struct list_head *where; | ||
| 212 | int err = 0; | 229 | int err = 0; |
| 213 | 230 | ||
| 214 | /* Only track when pat_wc_enabled */ | 231 | BUG_ON(start >= end); /* end is exclusive */ |
| 215 | if (!pat_wc_enabled) { | 232 | |
| 233 | if (!pat_enabled) { | ||
| 216 | /* This is identical to page table setting without PAT */ | 234 | /* This is identical to page table setting without PAT */ |
| 217 | if (ret_type) { | 235 | if (new_type) { |
| 218 | if (req_type == -1) { | 236 | if (req_type == -1) |
| 219 | *ret_type = _PAGE_CACHE_WB; | 237 | *new_type = _PAGE_CACHE_WB; |
| 220 | } else { | 238 | else |
| 221 | *ret_type = req_type; | 239 | *new_type = req_type & _PAGE_CACHE_MASK; |
| 222 | } | ||
| 223 | } | 240 | } |
| 224 | return 0; | 241 | return 0; |
| 225 | } | 242 | } |
| 226 | 243 | ||
| 227 | /* Low ISA region is always mapped WB in page table. No need to track */ | 244 | /* Low ISA region is always mapped WB in page table. No need to track */ |
| 228 | if (start >= ISA_START_ADDRESS && (end - 1) <= ISA_END_ADDRESS) { | 245 | if (is_ISA_range(start, end - 1)) { |
| 229 | if (ret_type) | 246 | if (new_type) |
| 230 | *ret_type = _PAGE_CACHE_WB; | 247 | *new_type = _PAGE_CACHE_WB; |
| 231 | |||
| 232 | return 0; | 248 | return 0; |
| 233 | } | 249 | } |
| 234 | 250 | ||
| @@ -241,206 +257,92 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 241 | */ | 257 | */ |
| 242 | u8 mtrr_type = mtrr_type_lookup(start, end); | 258 | u8 mtrr_type = mtrr_type_lookup(start, end); |
| 243 | 259 | ||
| 244 | if (mtrr_type == MTRR_TYPE_WRBACK) { | 260 | if (mtrr_type == MTRR_TYPE_WRBACK) |
| 245 | req_type = _PAGE_CACHE_WB; | ||
| 246 | actual_type = _PAGE_CACHE_WB; | 261 | actual_type = _PAGE_CACHE_WB; |
| 247 | } else { | 262 | else |
| 248 | req_type = _PAGE_CACHE_UC_MINUS; | ||
| 249 | actual_type = _PAGE_CACHE_UC_MINUS; | 263 | actual_type = _PAGE_CACHE_UC_MINUS; |
| 250 | } | 264 | } else |
| 251 | } else { | 265 | actual_type = pat_x_mtrr_type(start, end, |
| 252 | req_type &= _PAGE_CACHE_MASK; | 266 | req_type & _PAGE_CACHE_MASK); |
| 253 | err = pat_x_mtrr_type(start, end, req_type, &actual_type); | ||
| 254 | } | ||
| 255 | |||
| 256 | if (err) { | ||
| 257 | if (ret_type) | ||
| 258 | *ret_type = actual_type; | ||
| 259 | |||
| 260 | return -EINVAL; | ||
| 261 | } | ||
| 262 | 267 | ||
| 263 | new_entry = kmalloc(sizeof(struct memtype), GFP_KERNEL); | 268 | new = kmalloc(sizeof(struct memtype), GFP_KERNEL); |
| 264 | if (!new_entry) | 269 | if (!new) |
| 265 | return -ENOMEM; | 270 | return -ENOMEM; |
| 266 | 271 | ||
| 267 | new_entry->start = start; | 272 | new->start = start; |
| 268 | new_entry->end = end; | 273 | new->end = end; |
| 269 | new_entry->type = actual_type; | 274 | new->type = actual_type; |
| 270 | 275 | ||
| 271 | if (ret_type) | 276 | if (new_type) |
| 272 | *ret_type = actual_type; | 277 | *new_type = actual_type; |
| 273 | 278 | ||
| 274 | spin_lock(&memtype_lock); | 279 | spin_lock(&memtype_lock); |
| 275 | 280 | ||
| 276 | /* Search for existing mapping that overlaps the current range */ | 281 | /* Search for existing mapping that overlaps the current range */ |
| 277 | list_for_each_entry(parse, &memtype_list, nd) { | 282 | where = NULL; |
| 278 | struct memtype *saved_ptr; | 283 | list_for_each_entry(entry, &memtype_list, nd) { |
| 279 | 284 | if (end <= entry->start) { | |
| 280 | if (parse->start >= end) { | 285 | where = entry->nd.prev; |
| 281 | pr_debug("New Entry\n"); | ||
| 282 | list_add(&new_entry->nd, parse->nd.prev); | ||
| 283 | new_entry = NULL; | ||
| 284 | break; | 286 | break; |
| 285 | } | 287 | } else if (start <= entry->start) { /* end > entry->start */ |
| 286 | 288 | err = chk_conflict(new, entry, new_type); | |
| 287 | if (start <= parse->start && end >= parse->start) { | 289 | if (!err) { |
| 288 | if (actual_type != parse->type && ret_type) { | 290 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 289 | actual_type = parse->type; | 291 | entry->start, entry->end); |
| 290 | *ret_type = actual_type; | 292 | where = entry->nd.prev; |
| 291 | new_entry->type = actual_type; | ||
| 292 | } | ||
| 293 | |||
| 294 | if (actual_type != parse->type) { | ||
| 295 | printk( | ||
| 296 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 297 | current->comm, current->pid, | ||
| 298 | start, end, | ||
| 299 | cattr_name(actual_type), | ||
| 300 | cattr_name(parse->type)); | ||
| 301 | err = -EBUSY; | ||
| 302 | break; | ||
| 303 | } | 293 | } |
| 304 | |||
| 305 | saved_ptr = parse; | ||
| 306 | /* | ||
| 307 | * Check to see whether the request overlaps more | ||
| 308 | * than one entry in the list | ||
| 309 | */ | ||
| 310 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
| 311 | if (end <= parse->start) { | ||
| 312 | break; | ||
| 313 | } | ||
| 314 | |||
| 315 | if (actual_type != parse->type) { | ||
| 316 | printk( | ||
| 317 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 318 | current->comm, current->pid, | ||
| 319 | start, end, | ||
| 320 | cattr_name(actual_type), | ||
| 321 | cattr_name(parse->type)); | ||
| 322 | err = -EBUSY; | ||
| 323 | break; | ||
| 324 | } | ||
| 325 | } | ||
| 326 | |||
| 327 | if (err) { | ||
| 328 | break; | ||
| 329 | } | ||
| 330 | |||
| 331 | pr_debug("Overlap at 0x%Lx-0x%Lx\n", | ||
| 332 | saved_ptr->start, saved_ptr->end); | ||
| 333 | /* No conflict. Go ahead and add this new entry */ | ||
| 334 | list_add(&new_entry->nd, saved_ptr->nd.prev); | ||
| 335 | new_entry = NULL; | ||
| 336 | break; | 294 | break; |
| 337 | } | 295 | } else if (start < entry->end) { /* start > entry->start */ |
| 338 | 296 | err = chk_conflict(new, entry, new_type); | |
| 339 | if (start < parse->end) { | 297 | if (!err) { |
| 340 | if (actual_type != parse->type && ret_type) { | 298 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 341 | actual_type = parse->type; | 299 | entry->start, entry->end); |
| 342 | *ret_type = actual_type; | 300 | where = &entry->nd; |
| 343 | new_entry->type = actual_type; | ||
| 344 | } | ||
| 345 | |||
| 346 | if (actual_type != parse->type) { | ||
| 347 | printk( | ||
| 348 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 349 | current->comm, current->pid, | ||
| 350 | start, end, | ||
| 351 | cattr_name(actual_type), | ||
| 352 | cattr_name(parse->type)); | ||
| 353 | err = -EBUSY; | ||
| 354 | break; | ||
| 355 | } | ||
| 356 | |||
| 357 | saved_ptr = parse; | ||
| 358 | /* | ||
| 359 | * Check to see whether the request overlaps more | ||
| 360 | * than one entry in the list | ||
| 361 | */ | ||
| 362 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
| 363 | if (end <= parse->start) { | ||
| 364 | break; | ||
| 365 | } | ||
| 366 | |||
| 367 | if (actual_type != parse->type) { | ||
| 368 | printk( | ||
| 369 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 370 | current->comm, current->pid, | ||
| 371 | start, end, | ||
| 372 | cattr_name(actual_type), | ||
| 373 | cattr_name(parse->type)); | ||
| 374 | err = -EBUSY; | ||
| 375 | break; | ||
| 376 | } | ||
| 377 | } | ||
| 378 | |||
| 379 | if (err) { | ||
| 380 | break; | ||
| 381 | } | 301 | } |
| 382 | |||
| 383 | pr_debug(KERN_INFO "Overlap at 0x%Lx-0x%Lx\n", | ||
| 384 | saved_ptr->start, saved_ptr->end); | ||
| 385 | /* No conflict. Go ahead and add this new entry */ | ||
| 386 | list_add(&new_entry->nd, &saved_ptr->nd); | ||
| 387 | new_entry = NULL; | ||
| 388 | break; | 302 | break; |
| 389 | } | 303 | } |
| 390 | } | 304 | } |
| 391 | 305 | ||
| 392 | if (err) { | 306 | if (err) { |
| 393 | printk(KERN_INFO | 307 | printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, " |
| 394 | "reserve_memtype failed 0x%Lx-0x%Lx, track %s, req %s\n", | 308 | "track %s, req %s\n", |
| 395 | start, end, cattr_name(new_entry->type), | 309 | start, end, cattr_name(new->type), cattr_name(req_type)); |
| 396 | cattr_name(req_type)); | 310 | kfree(new); |
| 397 | kfree(new_entry); | ||
| 398 | spin_unlock(&memtype_lock); | 311 | spin_unlock(&memtype_lock); |
| 399 | return err; | 312 | return err; |
| 400 | } | 313 | } |
| 401 | 314 | ||
| 402 | if (new_entry) { | 315 | if (where) |
| 403 | /* No conflict. Not yet added to the list. Add to the tail */ | 316 | list_add(&new->nd, where); |
| 404 | list_add_tail(&new_entry->nd, &memtype_list); | 317 | else |
| 405 | pr_debug("New Entry\n"); | 318 | list_add_tail(&new->nd, &memtype_list); |
| 406 | } | ||
| 407 | |||
| 408 | if (ret_type) { | ||
| 409 | pr_debug( | ||
| 410 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
| 411 | start, end, cattr_name(actual_type), | ||
| 412 | cattr_name(req_type), cattr_name(*ret_type)); | ||
| 413 | } else { | ||
| 414 | pr_debug( | ||
| 415 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s\n", | ||
| 416 | start, end, cattr_name(actual_type), | ||
| 417 | cattr_name(req_type)); | ||
| 418 | } | ||
| 419 | 319 | ||
| 420 | spin_unlock(&memtype_lock); | 320 | spin_unlock(&memtype_lock); |
| 321 | |||
| 322 | dprintk("reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
| 323 | start, end, cattr_name(new->type), cattr_name(req_type), | ||
| 324 | new_type ? cattr_name(*new_type) : "-"); | ||
| 325 | |||
| 421 | return err; | 326 | return err; |
| 422 | } | 327 | } |
| 423 | 328 | ||
| 424 | int free_memtype(u64 start, u64 end) | 329 | int free_memtype(u64 start, u64 end) |
| 425 | { | 330 | { |
| 426 | struct memtype *ml; | 331 | struct memtype *entry; |
| 427 | int err = -EINVAL; | 332 | int err = -EINVAL; |
| 428 | 333 | ||
| 429 | /* Only track when pat_wc_enabled */ | 334 | if (!pat_enabled) |
| 430 | if (!pat_wc_enabled) { | ||
| 431 | return 0; | 335 | return 0; |
| 432 | } | ||
| 433 | 336 | ||
| 434 | /* Low ISA region is always mapped WB. No need to track */ | 337 | /* Low ISA region is always mapped WB. No need to track */ |
| 435 | if (start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS) { | 338 | if (is_ISA_range(start, end - 1)) |
| 436 | return 0; | 339 | return 0; |
| 437 | } | ||
| 438 | 340 | ||
| 439 | spin_lock(&memtype_lock); | 341 | spin_lock(&memtype_lock); |
| 440 | list_for_each_entry(ml, &memtype_list, nd) { | 342 | list_for_each_entry(entry, &memtype_list, nd) { |
| 441 | if (ml->start == start && ml->end == end) { | 343 | if (entry->start == start && entry->end == end) { |
| 442 | list_del(&ml->nd); | 344 | list_del(&entry->nd); |
| 443 | kfree(ml); | 345 | kfree(entry); |
| 444 | err = 0; | 346 | err = 0; |
| 445 | break; | 347 | break; |
| 446 | } | 348 | } |
| @@ -452,7 +354,7 @@ int free_memtype(u64 start, u64 end) | |||
| 452 | current->comm, current->pid, start, end); | 354 | current->comm, current->pid, start, end); |
| 453 | } | 355 | } |
| 454 | 356 | ||
| 455 | pr_debug("free_memtype request 0x%Lx-0x%Lx\n", start, end); | 357 | dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); |
| 456 | return err; | 358 | return err; |
| 457 | } | 359 | } |
| 458 | 360 | ||
| @@ -521,12 +423,12 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 521 | * caching for the high addresses through the KEN pin, but | 423 | * caching for the high addresses through the KEN pin, but |
| 522 | * we maintain the tradition of paranoia in this code. | 424 | * we maintain the tradition of paranoia in this code. |
| 523 | */ | 425 | */ |
| 524 | if (!pat_wc_enabled && | 426 | if (!pat_enabled && |
| 525 | ! ( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) || | 427 | !(boot_cpu_has(X86_FEATURE_MTRR) || |
| 526 | test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) || | 428 | boot_cpu_has(X86_FEATURE_K6_MTRR) || |
| 527 | test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) || | 429 | boot_cpu_has(X86_FEATURE_CYRIX_ARR) || |
| 528 | test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability)) && | 430 | boot_cpu_has(X86_FEATURE_CENTAUR_MCR)) && |
| 529 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { | 431 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { |
| 530 | flags = _PAGE_CACHE_UC; | 432 | flags = _PAGE_CACHE_UC; |
| 531 | } | 433 | } |
| 532 | #endif | 434 | #endif |
| @@ -548,7 +450,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 548 | return 0; | 450 | return 0; |
| 549 | 451 | ||
| 550 | if (pfn <= max_pfn_mapped && | 452 | if (pfn <= max_pfn_mapped && |
| 551 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { | 453 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { |
| 552 | free_memtype(offset, offset + size); | 454 | free_memtype(offset, offset + size); |
| 553 | printk(KERN_INFO | 455 | printk(KERN_INFO |
| 554 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", | 456 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", |
| @@ -586,4 +488,3 @@ void unmap_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot) | |||
| 586 | 488 | ||
| 587 | free_memtype(addr, addr + size); | 489 | free_memtype(addr, addr + size); |
| 588 | } | 490 | } |
| 589 | |||
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 50159764f694..ee1d6d39edd4 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
| @@ -255,7 +255,7 @@ int ptep_test_and_clear_young(struct vm_area_struct *vma, | |||
| 255 | 255 | ||
| 256 | if (pte_young(*ptep)) | 256 | if (pte_young(*ptep)) |
| 257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, | 257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, |
| 258 | &ptep->pte); | 258 | (unsigned long *) &ptep->pte); |
| 259 | 259 | ||
| 260 | if (ret) | 260 | if (ret) |
| 261 | pte_update(vma->vm_mm, addr, ptep); | 261 | pte_update(vma->vm_mm, addr, ptep); |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 99649dccad28..391d51035871 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
| @@ -495,6 +495,7 @@ int __node_distance(int a, int b) | |||
| 495 | 495 | ||
| 496 | EXPORT_SYMBOL(__node_distance); | 496 | EXPORT_SYMBOL(__node_distance); |
| 497 | 497 | ||
| 498 | #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) | ||
| 498 | int memory_add_physaddr_to_nid(u64 start) | 499 | int memory_add_physaddr_to_nid(u64 start) |
| 499 | { | 500 | { |
| 500 | int i, ret = 0; | 501 | int i, ret = 0; |
| @@ -506,4 +507,4 @@ int memory_add_physaddr_to_nid(u64 start) | |||
| 506 | return ret; | 507 | return ret; |
| 507 | } | 508 | } |
| 508 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 509 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
| 509 | 510 | #endif | |
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 index 89ec35d00efd..f647e7e56da4 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile_32 | |||
| @@ -22,3 +22,4 @@ pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o | |||
| 22 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o | 22 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o |
| 23 | 23 | ||
| 24 | obj-y += $(pci-y) common.o early.o | 24 | obj-y += $(pci-y) common.o early.o |
| 25 | obj-y += amd_bus.o | ||
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64 index 8fbd19832cf6..fd47068c95de 100644 --- a/arch/x86/pci/Makefile_64 +++ b/arch/x86/pci/Makefile_64 | |||
| @@ -13,5 +13,5 @@ obj-y += legacy.o irq.o common.o early.o | |||
| 13 | # mmconfig has a 64bit special | 13 | # mmconfig has a 64bit special |
| 14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | 14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o |
| 15 | 15 | ||
| 16 | obj-y += k8-bus_64.o | 16 | obj-y += amd_bus.o |
| 17 | 17 | ||
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index d95de2f199cd..464279da49c4 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -218,7 +218,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
| 218 | return bus; | 218 | return bus; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | extern int pci_routeirq; | ||
| 222 | static int __init pci_acpi_init(void) | 221 | static int __init pci_acpi_init(void) |
| 223 | { | 222 | { |
| 224 | struct pci_dev *dev = NULL; | 223 | struct pci_dev *dev = NULL; |
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/amd_bus.c index 5c2799c20e47..15f505d3a78e 100644 --- a/arch/x86/pci/k8-bus_64.c +++ b/arch/x86/pci/amd_bus.c | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
| 2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 3 | #include "pci.h" | ||
| 4 | |||
| 5 | #ifdef CONFIG_X86_64 | ||
| 6 | |||
| 3 | #include <asm/pci-direct.h> | 7 | #include <asm/pci-direct.h> |
| 4 | #include <asm/mpspec.h> | 8 | #include <asm/mpspec.h> |
| 5 | #include <linux/cpumask.h> | 9 | #include <linux/cpumask.h> |
| @@ -526,3 +530,31 @@ static int __init early_fill_mp_bus_info(void) | |||
| 526 | } | 530 | } |
| 527 | 531 | ||
| 528 | postcore_initcall(early_fill_mp_bus_info); | 532 | postcore_initcall(early_fill_mp_bus_info); |
| 533 | |||
| 534 | #endif | ||
| 535 | |||
| 536 | /* common 32/64 bit code */ | ||
| 537 | |||
| 538 | #define ENABLE_CF8_EXT_CFG (1ULL << 46) | ||
| 539 | |||
| 540 | static void enable_pci_io_ecs_per_cpu(void *unused) | ||
| 541 | { | ||
| 542 | u64 reg; | ||
| 543 | rdmsrl(MSR_AMD64_NB_CFG, reg); | ||
| 544 | if (!(reg & ENABLE_CF8_EXT_CFG)) { | ||
| 545 | reg |= ENABLE_CF8_EXT_CFG; | ||
| 546 | wrmsrl(MSR_AMD64_NB_CFG, reg); | ||
| 547 | } | ||
| 548 | } | ||
| 549 | |||
| 550 | static int __init enable_pci_io_ecs(void) | ||
| 551 | { | ||
| 552 | /* assume all cpus from fam10h have IO ECS */ | ||
| 553 | if (boot_cpu_data.x86 < 0x10) | ||
| 554 | return 0; | ||
| 555 | on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1, 1); | ||
| 556 | pci_probe |= PCI_HAS_IO_ECS; | ||
| 557 | return 0; | ||
| 558 | } | ||
| 559 | |||
| 560 | postcore_initcall(enable_pci_io_ecs); | ||
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c index 21d1e0e0d535..9915293500fb 100644 --- a/arch/x86/pci/direct.c +++ b/arch/x86/pci/direct.c | |||
| @@ -8,18 +8,21 @@ | |||
| 8 | #include "pci.h" | 8 | #include "pci.h" |
| 9 | 9 | ||
| 10 | /* | 10 | /* |
| 11 | * Functions for accessing PCI configuration space with type 1 accesses | 11 | * Functions for accessing PCI base (first 256 bytes) and extended |
| 12 | * (4096 bytes per PCI function) configuration space with type 1 | ||
| 13 | * accesses. | ||
| 12 | */ | 14 | */ |
| 13 | 15 | ||
| 14 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ | 16 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ |
| 15 | (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) | 17 | (0x80000000 | ((reg & 0xF00) << 16) | (bus << 16) \ |
| 18 | | (devfn << 8) | (reg & 0xFC)) | ||
| 16 | 19 | ||
| 17 | static int pci_conf1_read(unsigned int seg, unsigned int bus, | 20 | static int pci_conf1_read(unsigned int seg, unsigned int bus, |
| 18 | unsigned int devfn, int reg, int len, u32 *value) | 21 | unsigned int devfn, int reg, int len, u32 *value) |
| 19 | { | 22 | { |
| 20 | unsigned long flags; | 23 | unsigned long flags; |
| 21 | 24 | ||
| 22 | if ((bus > 255) || (devfn > 255) || (reg > 255)) { | 25 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) { |
| 23 | *value = -1; | 26 | *value = -1; |
| 24 | return -EINVAL; | 27 | return -EINVAL; |
| 25 | } | 28 | } |
| @@ -50,7 +53,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus, | |||
| 50 | { | 53 | { |
| 51 | unsigned long flags; | 54 | unsigned long flags; |
| 52 | 55 | ||
| 53 | if ((bus > 255) || (devfn > 255) || (reg > 255)) | 56 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) |
| 54 | return -EINVAL; | 57 | return -EINVAL; |
| 55 | 58 | ||
| 56 | spin_lock_irqsave(&pci_config_lock, flags); | 59 | spin_lock_irqsave(&pci_config_lock, flags); |
| @@ -260,10 +263,18 @@ void __init pci_direct_init(int type) | |||
| 260 | return; | 263 | return; |
| 261 | printk(KERN_INFO "PCI: Using configuration type %d for base access\n", | 264 | printk(KERN_INFO "PCI: Using configuration type %d for base access\n", |
| 262 | type); | 265 | type); |
| 263 | if (type == 1) | 266 | if (type == 1) { |
| 264 | raw_pci_ops = &pci_direct_conf1; | 267 | raw_pci_ops = &pci_direct_conf1; |
| 265 | else | 268 | if (raw_pci_ext_ops) |
| 266 | raw_pci_ops = &pci_direct_conf2; | 269 | return; |
| 270 | if (!(pci_probe & PCI_HAS_IO_ECS)) | ||
| 271 | return; | ||
| 272 | printk(KERN_INFO "PCI: Using configuration type 1 " | ||
| 273 | "for extended access\n"); | ||
| 274 | raw_pci_ext_ops = &pci_direct_conf1; | ||
| 275 | return; | ||
| 276 | } | ||
| 277 | raw_pci_ops = &pci_direct_conf2; | ||
| 267 | } | 278 | } |
| 268 | 279 | ||
| 269 | int __init pci_direct_probe(void) | 280 | int __init pci_direct_probe(void) |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 10fb308fded8..6ccd7a108cd4 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
| @@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
| 299 | return -EINVAL; | 299 | return -EINVAL; |
| 300 | 300 | ||
| 301 | prot = pgprot_val(vma->vm_page_prot); | 301 | prot = pgprot_val(vma->vm_page_prot); |
| 302 | if (pat_wc_enabled && write_combine) | 302 | if (pat_enabled && write_combine) |
| 303 | prot |= _PAGE_CACHE_WC; | 303 | prot |= _PAGE_CACHE_WC; |
| 304 | else if (pat_wc_enabled || boot_cpu_data.x86 > 3) | 304 | else if (pat_enabled || boot_cpu_data.x86 > 3) |
| 305 | /* | 305 | /* |
| 306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. | 306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. |
| 307 | * To avoid attribute conflicts, request UC MINUS here | 307 | * To avoid attribute conflicts, request UC MINUS here |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index ca8df9c260bc..f0859de23e20 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/dmi.h> | 13 | #include <linux/dmi.h> |
| 14 | #include <asm/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <asm/smp.h> | 15 | #include <linux/smp.h> |
| 16 | #include <asm/io_apic.h> | 16 | #include <asm/io_apic.h> |
| 17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
| @@ -61,7 +61,7 @@ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL; | |||
| 61 | * and perform checksum verification. | 61 | * and perform checksum verification. |
| 62 | */ | 62 | */ |
| 63 | 63 | ||
| 64 | static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | 64 | static inline struct irq_routing_table *pirq_check_routing_table(u8 *addr) |
| 65 | { | 65 | { |
| 66 | struct irq_routing_table *rt; | 66 | struct irq_routing_table *rt; |
| 67 | int i; | 67 | int i; |
| @@ -74,7 +74,7 @@ static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | |||
| 74 | rt->size < sizeof(struct irq_routing_table)) | 74 | rt->size < sizeof(struct irq_routing_table)) |
| 75 | return NULL; | 75 | return NULL; |
| 76 | sum = 0; | 76 | sum = 0; |
| 77 | for (i=0; i < rt->size; i++) | 77 | for (i = 0; i < rt->size; i++) |
| 78 | sum += addr[i]; | 78 | sum += addr[i]; |
| 79 | if (!sum) { | 79 | if (!sum) { |
| 80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); | 80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); |
| @@ -100,7 +100,7 @@ static struct irq_routing_table * __init pirq_find_routing_table(void) | |||
| 100 | return rt; | 100 | return rt; |
| 101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); | 101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); |
| 102 | } | 102 | } |
| 103 | for(addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { | 103 | for (addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { |
| 104 | rt = pirq_check_routing_table(addr); | 104 | rt = pirq_check_routing_table(addr); |
| 105 | if (rt) | 105 | if (rt) |
| 106 | return rt; | 106 | return rt; |
| @@ -122,20 +122,20 @@ static void __init pirq_peer_trick(void) | |||
| 122 | struct irq_info *e; | 122 | struct irq_info *e; |
| 123 | 123 | ||
| 124 | memset(busmap, 0, sizeof(busmap)); | 124 | memset(busmap, 0, sizeof(busmap)); |
| 125 | for(i=0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { | 125 | for (i = 0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { |
| 126 | e = &rt->slots[i]; | 126 | e = &rt->slots[i]; |
| 127 | #ifdef DEBUG | 127 | #ifdef DEBUG |
| 128 | { | 128 | { |
| 129 | int j; | 129 | int j; |
| 130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); | 130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); |
| 131 | for(j=0; j<4; j++) | 131 | for (j = 0; j < 4; j++) |
| 132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); | 132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); |
| 133 | DBG("\n"); | 133 | DBG("\n"); |
| 134 | } | 134 | } |
| 135 | #endif | 135 | #endif |
| 136 | busmap[e->bus] = 1; | 136 | busmap[e->bus] = 1; |
| 137 | } | 137 | } |
| 138 | for(i = 1; i < 256; i++) { | 138 | for (i = 1; i < 256; i++) { |
| 139 | int node; | 139 | int node; |
| 140 | if (!busmap[i] || pci_find_bus(0, i)) | 140 | if (!busmap[i] || pci_find_bus(0, i)) |
| 141 | continue; | 141 | continue; |
| @@ -285,7 +285,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | |||
| 285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; | 285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; |
| 286 | 286 | ||
| 287 | WARN_ON_ONCE(pirq > 4); | 287 | WARN_ON_ONCE(pirq > 4); |
| 288 | return read_config_nybble(router,0x43, pirqmap[pirq-1]); | 288 | return read_config_nybble(router, 0x43, pirqmap[pirq-1]); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
| @@ -314,7 +314,7 @@ static int pirq_opti_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 314 | 314 | ||
| 315 | /* | 315 | /* |
| 316 | * Cyrix: nibble offset 0x5C | 316 | * Cyrix: nibble offset 0x5C |
| 317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA | 317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA |
| 318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC | 318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC |
| 319 | */ | 319 | */ |
| 320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | 320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) |
| @@ -350,7 +350,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 350 | * Apparently there are systems implementing PCI routing table using | 350 | * Apparently there are systems implementing PCI routing table using |
| 351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. | 351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. |
| 352 | * We try our best to handle both link mappings. | 352 | * We try our best to handle both link mappings. |
| 353 | * | 353 | * |
| 354 | * Currently (2003-05-21) it appears most SiS chipsets follow the | 354 | * Currently (2003-05-21) it appears most SiS chipsets follow the |
| 355 | * definition of routing registers from the SiS-5595 southbridge. | 355 | * definition of routing registers from the SiS-5595 southbridge. |
| 356 | * According to the SiS 5595 datasheets the revision id's of the | 356 | * According to the SiS 5595 datasheets the revision id's of the |
| @@ -370,7 +370,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 370 | * | 370 | * |
| 371 | * 0x62: USBIRQ: | 371 | * 0x62: USBIRQ: |
| 372 | * bit 6 OHCI function disabled (0), enabled (1) | 372 | * bit 6 OHCI function disabled (0), enabled (1) |
| 373 | * | 373 | * |
| 374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved | 374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved |
| 375 | * | 375 | * |
| 376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved | 376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved |
| @@ -487,9 +487,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
| 487 | u8 irq; | 487 | u8 irq; |
| 488 | irq = 0; | 488 | irq = 0; |
| 489 | if (pirq <= 4) | 489 | if (pirq <= 4) |
| 490 | { | ||
| 491 | irq = read_config_nybble(router, 0x56, pirq - 1); | 490 | irq = read_config_nybble(router, 0x56, pirq - 1); |
| 492 | } | ||
| 493 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", | 491 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", |
| 494 | dev->vendor, dev->device, pirq, irq); | 492 | dev->vendor, dev->device, pirq, irq); |
| 495 | return irq; | 493 | return irq; |
| @@ -497,12 +495,10 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
| 497 | 495 | ||
| 498 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 496 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
| 499 | { | 497 | { |
| 500 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", | 498 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", |
| 501 | dev->vendor, dev->device, pirq, irq); | 499 | dev->vendor, dev->device, pirq, irq); |
| 502 | if (pirq <= 4) | 500 | if (pirq <= 4) |
| 503 | { | ||
| 504 | write_config_nybble(router, 0x56, pirq - 1, irq); | 501 | write_config_nybble(router, 0x56, pirq - 1, irq); |
| 505 | } | ||
| 506 | return 1; | 502 | return 1; |
| 507 | } | 503 | } |
| 508 | 504 | ||
| @@ -549,50 +545,49 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 549 | if (pci_dev_present(pirq_440gx)) | 545 | if (pci_dev_present(pirq_440gx)) |
| 550 | return 0; | 546 | return 0; |
| 551 | 547 | ||
| 552 | switch(device) | 548 | switch (device) { |
| 553 | { | 549 | case PCI_DEVICE_ID_INTEL_82371FB_0: |
| 554 | case PCI_DEVICE_ID_INTEL_82371FB_0: | 550 | case PCI_DEVICE_ID_INTEL_82371SB_0: |
| 555 | case PCI_DEVICE_ID_INTEL_82371SB_0: | 551 | case PCI_DEVICE_ID_INTEL_82371AB_0: |
| 556 | case PCI_DEVICE_ID_INTEL_82371AB_0: | 552 | case PCI_DEVICE_ID_INTEL_82371MX: |
| 557 | case PCI_DEVICE_ID_INTEL_82371MX: | 553 | case PCI_DEVICE_ID_INTEL_82443MX_0: |
| 558 | case PCI_DEVICE_ID_INTEL_82443MX_0: | 554 | case PCI_DEVICE_ID_INTEL_82801AA_0: |
| 559 | case PCI_DEVICE_ID_INTEL_82801AA_0: | 555 | case PCI_DEVICE_ID_INTEL_82801AB_0: |
| 560 | case PCI_DEVICE_ID_INTEL_82801AB_0: | 556 | case PCI_DEVICE_ID_INTEL_82801BA_0: |
| 561 | case PCI_DEVICE_ID_INTEL_82801BA_0: | 557 | case PCI_DEVICE_ID_INTEL_82801BA_10: |
| 562 | case PCI_DEVICE_ID_INTEL_82801BA_10: | 558 | case PCI_DEVICE_ID_INTEL_82801CA_0: |
| 563 | case PCI_DEVICE_ID_INTEL_82801CA_0: | 559 | case PCI_DEVICE_ID_INTEL_82801CA_12: |
| 564 | case PCI_DEVICE_ID_INTEL_82801CA_12: | 560 | case PCI_DEVICE_ID_INTEL_82801DB_0: |
| 565 | case PCI_DEVICE_ID_INTEL_82801DB_0: | 561 | case PCI_DEVICE_ID_INTEL_82801E_0: |
| 566 | case PCI_DEVICE_ID_INTEL_82801E_0: | 562 | case PCI_DEVICE_ID_INTEL_82801EB_0: |
| 567 | case PCI_DEVICE_ID_INTEL_82801EB_0: | 563 | case PCI_DEVICE_ID_INTEL_ESB_1: |
| 568 | case PCI_DEVICE_ID_INTEL_ESB_1: | 564 | case PCI_DEVICE_ID_INTEL_ICH6_0: |
| 569 | case PCI_DEVICE_ID_INTEL_ICH6_0: | 565 | case PCI_DEVICE_ID_INTEL_ICH6_1: |
| 570 | case PCI_DEVICE_ID_INTEL_ICH6_1: | 566 | case PCI_DEVICE_ID_INTEL_ICH7_0: |
| 571 | case PCI_DEVICE_ID_INTEL_ICH7_0: | 567 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
| 572 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 568 | case PCI_DEVICE_ID_INTEL_ICH7_30: |
| 573 | case PCI_DEVICE_ID_INTEL_ICH7_30: | 569 | case PCI_DEVICE_ID_INTEL_ICH7_31: |
| 574 | case PCI_DEVICE_ID_INTEL_ICH7_31: | 570 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
| 575 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 571 | case PCI_DEVICE_ID_INTEL_ICH8_0: |
| 576 | case PCI_DEVICE_ID_INTEL_ICH8_0: | 572 | case PCI_DEVICE_ID_INTEL_ICH8_1: |
| 577 | case PCI_DEVICE_ID_INTEL_ICH8_1: | 573 | case PCI_DEVICE_ID_INTEL_ICH8_2: |
| 578 | case PCI_DEVICE_ID_INTEL_ICH8_2: | 574 | case PCI_DEVICE_ID_INTEL_ICH8_3: |
| 579 | case PCI_DEVICE_ID_INTEL_ICH8_3: | 575 | case PCI_DEVICE_ID_INTEL_ICH8_4: |
| 580 | case PCI_DEVICE_ID_INTEL_ICH8_4: | 576 | case PCI_DEVICE_ID_INTEL_ICH9_0: |
| 581 | case PCI_DEVICE_ID_INTEL_ICH9_0: | 577 | case PCI_DEVICE_ID_INTEL_ICH9_1: |
| 582 | case PCI_DEVICE_ID_INTEL_ICH9_1: | 578 | case PCI_DEVICE_ID_INTEL_ICH9_2: |
| 583 | case PCI_DEVICE_ID_INTEL_ICH9_2: | 579 | case PCI_DEVICE_ID_INTEL_ICH9_3: |
| 584 | case PCI_DEVICE_ID_INTEL_ICH9_3: | 580 | case PCI_DEVICE_ID_INTEL_ICH9_4: |
| 585 | case PCI_DEVICE_ID_INTEL_ICH9_4: | 581 | case PCI_DEVICE_ID_INTEL_ICH9_5: |
| 586 | case PCI_DEVICE_ID_INTEL_ICH9_5: | 582 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: |
| 587 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: | 583 | case PCI_DEVICE_ID_INTEL_ICH10_0: |
| 588 | case PCI_DEVICE_ID_INTEL_ICH10_0: | 584 | case PCI_DEVICE_ID_INTEL_ICH10_1: |
| 589 | case PCI_DEVICE_ID_INTEL_ICH10_1: | 585 | case PCI_DEVICE_ID_INTEL_ICH10_2: |
| 590 | case PCI_DEVICE_ID_INTEL_ICH10_2: | 586 | case PCI_DEVICE_ID_INTEL_ICH10_3: |
| 591 | case PCI_DEVICE_ID_INTEL_ICH10_3: | 587 | r->name = "PIIX/ICH"; |
| 592 | r->name = "PIIX/ICH"; | 588 | r->get = pirq_piix_get; |
| 593 | r->get = pirq_piix_get; | 589 | r->set = pirq_piix_set; |
| 594 | r->set = pirq_piix_set; | 590 | return 1; |
| 595 | return 1; | ||
| 596 | } | 591 | } |
| 597 | return 0; | 592 | return 0; |
| 598 | } | 593 | } |
| @@ -606,7 +601,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 606 | * workarounds for some buggy BIOSes | 601 | * workarounds for some buggy BIOSes |
| 607 | */ | 602 | */ |
| 608 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { | 603 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { |
| 609 | switch(router->device) { | 604 | switch (router->device) { |
| 610 | case PCI_DEVICE_ID_VIA_82C686: | 605 | case PCI_DEVICE_ID_VIA_82C686: |
| 611 | /* | 606 | /* |
| 612 | * Asus k7m bios wrongly reports 82C686A | 607 | * Asus k7m bios wrongly reports 82C686A |
| @@ -631,7 +626,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 631 | } | 626 | } |
| 632 | } | 627 | } |
| 633 | 628 | ||
| 634 | switch(device) { | 629 | switch (device) { |
| 635 | case PCI_DEVICE_ID_VIA_82C586_0: | 630 | case PCI_DEVICE_ID_VIA_82C586_0: |
| 636 | r->name = "VIA"; | 631 | r->name = "VIA"; |
| 637 | r->get = pirq_via586_get; | 632 | r->get = pirq_via586_get; |
| @@ -654,13 +649,12 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 654 | 649 | ||
| 655 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 650 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 656 | { | 651 | { |
| 657 | switch(device) | 652 | switch (device) { |
| 658 | { | 653 | case PCI_DEVICE_ID_VLSI_82C534: |
| 659 | case PCI_DEVICE_ID_VLSI_82C534: | 654 | r->name = "VLSI 82C534"; |
| 660 | r->name = "VLSI 82C534"; | 655 | r->get = pirq_vlsi_get; |
| 661 | r->get = pirq_vlsi_get; | 656 | r->set = pirq_vlsi_set; |
| 662 | r->set = pirq_vlsi_set; | 657 | return 1; |
| 663 | return 1; | ||
| 664 | } | 658 | } |
| 665 | return 0; | 659 | return 0; |
| 666 | } | 660 | } |
| @@ -668,14 +662,13 @@ static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router | |||
| 668 | 662 | ||
| 669 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 663 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 670 | { | 664 | { |
| 671 | switch(device) | 665 | switch (device) { |
| 672 | { | 666 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: |
| 673 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: | 667 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: |
| 674 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: | 668 | r->name = "ServerWorks"; |
| 675 | r->name = "ServerWorks"; | 669 | r->get = pirq_serverworks_get; |
| 676 | r->get = pirq_serverworks_get; | 670 | r->set = pirq_serverworks_set; |
| 677 | r->set = pirq_serverworks_set; | 671 | return 1; |
| 678 | return 1; | ||
| 679 | } | 672 | } |
| 680 | return 0; | 673 | return 0; |
| 681 | } | 674 | } |
| @@ -684,7 +677,7 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 684 | { | 677 | { |
| 685 | if (device != PCI_DEVICE_ID_SI_503) | 678 | if (device != PCI_DEVICE_ID_SI_503) |
| 686 | return 0; | 679 | return 0; |
| 687 | 680 | ||
| 688 | r->name = "SIS"; | 681 | r->name = "SIS"; |
| 689 | r->get = pirq_sis_get; | 682 | r->get = pirq_sis_get; |
| 690 | r->set = pirq_sis_set; | 683 | r->set = pirq_sis_set; |
| @@ -693,47 +686,43 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 693 | 686 | ||
| 694 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 687 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 695 | { | 688 | { |
| 696 | switch(device) | 689 | switch (device) { |
| 697 | { | 690 | case PCI_DEVICE_ID_CYRIX_5520: |
| 698 | case PCI_DEVICE_ID_CYRIX_5520: | 691 | r->name = "NatSemi"; |
| 699 | r->name = "NatSemi"; | 692 | r->get = pirq_cyrix_get; |
| 700 | r->get = pirq_cyrix_get; | 693 | r->set = pirq_cyrix_set; |
| 701 | r->set = pirq_cyrix_set; | 694 | return 1; |
| 702 | return 1; | ||
| 703 | } | 695 | } |
| 704 | return 0; | 696 | return 0; |
| 705 | } | 697 | } |
| 706 | 698 | ||
| 707 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 699 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 708 | { | 700 | { |
| 709 | switch(device) | 701 | switch (device) { |
| 710 | { | 702 | case PCI_DEVICE_ID_OPTI_82C700: |
| 711 | case PCI_DEVICE_ID_OPTI_82C700: | 703 | r->name = "OPTI"; |
| 712 | r->name = "OPTI"; | 704 | r->get = pirq_opti_get; |
| 713 | r->get = pirq_opti_get; | 705 | r->set = pirq_opti_set; |
| 714 | r->set = pirq_opti_set; | 706 | return 1; |
| 715 | return 1; | ||
| 716 | } | 707 | } |
| 717 | return 0; | 708 | return 0; |
| 718 | } | 709 | } |
| 719 | 710 | ||
| 720 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 711 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 721 | { | 712 | { |
| 722 | switch(device) | 713 | switch (device) { |
| 723 | { | 714 | case PCI_DEVICE_ID_ITE_IT8330G_0: |
| 724 | case PCI_DEVICE_ID_ITE_IT8330G_0: | 715 | r->name = "ITE"; |
| 725 | r->name = "ITE"; | 716 | r->get = pirq_ite_get; |
| 726 | r->get = pirq_ite_get; | 717 | r->set = pirq_ite_set; |
| 727 | r->set = pirq_ite_set; | 718 | return 1; |
| 728 | return 1; | ||
| 729 | } | 719 | } |
| 730 | return 0; | 720 | return 0; |
| 731 | } | 721 | } |
| 732 | 722 | ||
| 733 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 723 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 734 | { | 724 | { |
| 735 | switch(device) | 725 | switch (device) { |
| 736 | { | ||
| 737 | case PCI_DEVICE_ID_AL_M1533: | 726 | case PCI_DEVICE_ID_AL_M1533: |
| 738 | case PCI_DEVICE_ID_AL_M1563: | 727 | case PCI_DEVICE_ID_AL_M1563: |
| 739 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); | 728 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); |
| @@ -747,25 +736,24 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 747 | 736 | ||
| 748 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 737 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 749 | { | 738 | { |
| 750 | switch(device) | 739 | switch (device) { |
| 751 | { | 740 | case PCI_DEVICE_ID_AMD_VIPER_740B: |
| 752 | case PCI_DEVICE_ID_AMD_VIPER_740B: | 741 | r->name = "AMD756"; |
| 753 | r->name = "AMD756"; | 742 | break; |
| 754 | break; | 743 | case PCI_DEVICE_ID_AMD_VIPER_7413: |
| 755 | case PCI_DEVICE_ID_AMD_VIPER_7413: | 744 | r->name = "AMD766"; |
| 756 | r->name = "AMD766"; | 745 | break; |
| 757 | break; | 746 | case PCI_DEVICE_ID_AMD_VIPER_7443: |
| 758 | case PCI_DEVICE_ID_AMD_VIPER_7443: | 747 | r->name = "AMD768"; |
| 759 | r->name = "AMD768"; | 748 | break; |
| 760 | break; | 749 | default: |
| 761 | default: | 750 | return 0; |
| 762 | return 0; | ||
| 763 | } | 751 | } |
| 764 | r->get = pirq_amd756_get; | 752 | r->get = pirq_amd756_get; |
| 765 | r->set = pirq_amd756_set; | 753 | r->set = pirq_amd756_set; |
| 766 | return 1; | 754 | return 1; |
| 767 | } | 755 | } |
| 768 | 756 | ||
| 769 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 757 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 770 | { | 758 | { |
| 771 | switch (device) { | 759 | switch (device) { |
| @@ -807,7 +795,7 @@ static struct pci_dev *pirq_router_dev; | |||
| 807 | * FIXME: should we have an option to say "generic for | 795 | * FIXME: should we have an option to say "generic for |
| 808 | * chipset" ? | 796 | * chipset" ? |
| 809 | */ | 797 | */ |
| 810 | 798 | ||
| 811 | static void __init pirq_find_router(struct irq_router *r) | 799 | static void __init pirq_find_router(struct irq_router *r) |
| 812 | { | 800 | { |
| 813 | struct irq_routing_table *rt = pirq_table; | 801 | struct irq_routing_table *rt = pirq_table; |
| @@ -826,7 +814,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
| 826 | r->name = "default"; | 814 | r->name = "default"; |
| 827 | r->get = NULL; | 815 | r->get = NULL; |
| 828 | r->set = NULL; | 816 | r->set = NULL; |
| 829 | 817 | ||
| 830 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", | 818 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", |
| 831 | rt->rtr_vendor, rt->rtr_device); | 819 | rt->rtr_vendor, rt->rtr_device); |
| 832 | 820 | ||
| @@ -837,7 +825,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
| 837 | return; | 825 | return; |
| 838 | } | 826 | } |
| 839 | 827 | ||
| 840 | for( h = pirq_routers; h->vendor; h++) { | 828 | for (h = pirq_routers; h->vendor; h++) { |
| 841 | /* First look for a router match */ | 829 | /* First look for a router match */ |
| 842 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) | 830 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) |
| 843 | break; | 831 | break; |
| @@ -889,7 +877,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 889 | 877 | ||
| 890 | if (!pirq_table) | 878 | if (!pirq_table) |
| 891 | return 0; | 879 | return 0; |
| 892 | 880 | ||
| 893 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); | 881 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); |
| 894 | info = pirq_get_info(dev); | 882 | info = pirq_get_info(dev); |
| 895 | if (!info) { | 883 | if (!info) { |
| @@ -928,8 +916,10 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 928 | */ | 916 | */ |
| 929 | newirq = dev->irq; | 917 | newirq = dev->irq; |
| 930 | if (newirq && !((1 << newirq) & mask)) { | 918 | if (newirq && !((1 << newirq) & mask)) { |
| 931 | if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; | 919 | if (pci_probe & PCI_USE_PIRQ_MASK) |
| 932 | else printk("\n" KERN_WARNING | 920 | newirq = 0; |
| 921 | else | ||
| 922 | printk("\n" KERN_WARNING | ||
| 933 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " | 923 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " |
| 934 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, | 924 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, |
| 935 | pci_name(dev)); | 925 | pci_name(dev)); |
| @@ -949,8 +939,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 949 | irq = pirq & 0xf; | 939 | irq = pirq & 0xf; |
| 950 | DBG(" -> hardcoded IRQ %d\n", irq); | 940 | DBG(" -> hardcoded IRQ %d\n", irq); |
| 951 | msg = "Hardcoded"; | 941 | msg = "Hardcoded"; |
| 952 | } else if ( r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ | 942 | } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ |
| 953 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask)) ) { | 943 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) { |
| 954 | DBG(" -> got IRQ %d\n", irq); | 944 | DBG(" -> got IRQ %d\n", irq); |
| 955 | msg = "Found"; | 945 | msg = "Found"; |
| 956 | eisa_set_level_irq(irq); | 946 | eisa_set_level_irq(irq); |
| @@ -985,15 +975,15 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 985 | continue; | 975 | continue; |
| 986 | if (info->irq[pin].link == pirq) { | 976 | if (info->irq[pin].link == pirq) { |
| 987 | /* We refuse to override the dev->irq information. Give a warning! */ | 977 | /* We refuse to override the dev->irq information. Give a warning! */ |
| 988 | if ( dev2->irq && dev2->irq != irq && \ | 978 | if (dev2->irq && dev2->irq != irq && \ |
| 989 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ | 979 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ |
| 990 | ((1 << dev2->irq) & mask)) ) { | 980 | ((1 << dev2->irq) & mask))) { |
| 991 | #ifndef CONFIG_PCI_MSI | 981 | #ifndef CONFIG_PCI_MSI |
| 992 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", | 982 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", |
| 993 | pci_name(dev2), dev2->irq, irq); | 983 | pci_name(dev2), dev2->irq, irq); |
| 994 | #endif | 984 | #endif |
| 995 | continue; | 985 | continue; |
| 996 | } | 986 | } |
| 997 | dev2->irq = irq; | 987 | dev2->irq = irq; |
| 998 | pirq_penalty[irq]++; | 988 | pirq_penalty[irq]++; |
| 999 | if (dev != dev2) | 989 | if (dev != dev2) |
| @@ -1031,8 +1021,7 @@ static void __init pcibios_fixup_irqs(void) | |||
| 1031 | /* | 1021 | /* |
| 1032 | * Recalculate IRQ numbers if we use the I/O APIC. | 1022 | * Recalculate IRQ numbers if we use the I/O APIC. |
| 1033 | */ | 1023 | */ |
| 1034 | if (io_apic_assign_pci_irqs) | 1024 | if (io_apic_assign_pci_irqs) { |
| 1035 | { | ||
| 1036 | int irq; | 1025 | int irq; |
| 1037 | 1026 | ||
| 1038 | if (pin) { | 1027 | if (pin) { |
| @@ -1045,10 +1034,10 @@ static void __init pcibios_fixup_irqs(void) | |||
| 1045 | * busses itself so we should get into this branch reliably. | 1034 | * busses itself so we should get into this branch reliably. |
| 1046 | */ | 1035 | */ |
| 1047 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1036 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
| 1048 | struct pci_dev * bridge = dev->bus->self; | 1037 | struct pci_dev *bridge = dev->bus->self; |
| 1049 | 1038 | ||
| 1050 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1039 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
| 1051 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1040 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
| 1052 | PCI_SLOT(bridge->devfn), pin); | 1041 | PCI_SLOT(bridge->devfn), pin); |
| 1053 | if (irq >= 0) | 1042 | if (irq >= 0) |
| 1054 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1043 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
| @@ -1138,7 +1127,7 @@ static int __init pcibios_irq_init(void) | |||
| 1138 | pirq_find_router(&pirq_router); | 1127 | pirq_find_router(&pirq_router); |
| 1139 | if (pirq_table->exclusive_irqs) { | 1128 | if (pirq_table->exclusive_irqs) { |
| 1140 | int i; | 1129 | int i; |
| 1141 | for (i=0; i<16; i++) | 1130 | for (i = 0; i < 16; i++) |
| 1142 | if (!(pirq_table->exclusive_irqs & (1 << i))) | 1131 | if (!(pirq_table->exclusive_irqs & (1 << i))) |
| 1143 | pirq_penalty[i] += 100; | 1132 | pirq_penalty[i] += 100; |
| 1144 | } | 1133 | } |
| @@ -1203,10 +1192,10 @@ static int pirq_enable_irq(struct pci_dev *dev) | |||
| 1203 | */ | 1192 | */ |
| 1204 | temp_dev = dev; | 1193 | temp_dev = dev; |
| 1205 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1194 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
| 1206 | struct pci_dev * bridge = dev->bus->self; | 1195 | struct pci_dev *bridge = dev->bus->self; |
| 1207 | 1196 | ||
| 1208 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1197 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
| 1209 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1198 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
| 1210 | PCI_SLOT(bridge->devfn), pin); | 1199 | PCI_SLOT(bridge->devfn), pin); |
| 1211 | if (irq >= 0) | 1200 | if (irq >= 0) |
| 1212 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1201 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 0cfebecf2a8f..23faaa890ffc 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -374,7 +374,7 @@ reject: | |||
| 374 | 374 | ||
| 375 | static int __initdata known_bridge; | 375 | static int __initdata known_bridge; |
| 376 | 376 | ||
| 377 | void __init __pci_mmcfg_init(int early) | 377 | static void __init __pci_mmcfg_init(int early) |
| 378 | { | 378 | { |
| 379 | /* MMCONFIG disabled */ | 379 | /* MMCONFIG disabled */ |
| 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) | 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index 720c4c554534..ba263e626a68 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 | 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 |
| 28 | #define PCI_USE__CRS 0x10000 | 28 | #define PCI_USE__CRS 0x10000 |
| 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 | 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 |
| 30 | #define PCI_HAS_IO_ECS 0x40000 | ||
| 30 | 31 | ||
| 31 | extern unsigned int pci_probe; | 32 | extern unsigned int pci_probe; |
| 32 | extern unsigned long pirq_table_addr; | 33 | extern unsigned long pirq_table_addr; |
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index 3fdd51497a83..19a6cfaf5db9 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include "vextern.h" /* Just for VMAGIC. */ | 16 | #include "vextern.h" /* Just for VMAGIC. */ |
| 17 | #undef VEXTERN | 17 | #undef VEXTERN |
| 18 | 18 | ||
| 19 | int vdso_enabled = 1; | 19 | unsigned int __read_mostly vdso_enabled = 1; |
| 20 | 20 | ||
| 21 | extern char vdso_start[], vdso_end[]; | 21 | extern char vdso_start[], vdso_end[]; |
| 22 | extern unsigned short vdso_sync_cpuid; | 22 | extern unsigned short vdso_sync_cpuid; |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f6b8225c2a0b..42b3b9ed641d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -366,7 +366,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val) | |||
| 366 | if (val & _PAGE_PRESENT) { | 366 | if (val & _PAGE_PRESENT) { |
| 367 | unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT; | 367 | unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT; |
| 368 | pteval_t flags = val & ~PTE_MASK; | 368 | pteval_t flags = val & ~PTE_MASK; |
| 369 | val = (mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; | 369 | val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags; |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | return val; | 372 | return val; |
| @@ -377,7 +377,7 @@ static pteval_t pte_pfn_to_mfn(pteval_t val) | |||
| 377 | if (val & _PAGE_PRESENT) { | 377 | if (val & _PAGE_PRESENT) { |
| 378 | unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT; | 378 | unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT; |
| 379 | pteval_t flags = val & ~PTE_MASK; | 379 | pteval_t flags = val & ~PTE_MASK; |
| 380 | val = (pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; | 380 | val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags; |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | return val; | 383 | return val; |
diff --git a/block/as-iosched.c b/block/as-iosched.c index 8c3946787dbb..743f33a01a07 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c | |||
| @@ -831,6 +831,8 @@ static void as_completed_request(struct request_queue *q, struct request *rq) | |||
| 831 | } | 831 | } |
| 832 | 832 | ||
| 833 | if (ad->changed_batch && ad->nr_dispatched == 1) { | 833 | if (ad->changed_batch && ad->nr_dispatched == 1) { |
| 834 | ad->current_batch_expires = jiffies + | ||
| 835 | ad->batch_expire[ad->batch_data_dir]; | ||
| 834 | kblockd_schedule_work(&ad->antic_work); | 836 | kblockd_schedule_work(&ad->antic_work); |
| 835 | ad->changed_batch = 0; | 837 | ad->changed_batch = 0; |
| 836 | 838 | ||
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 26038c2a2a71..61b6c5beb2d3 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
| @@ -377,6 +377,9 @@ static int __init bay_init(void) | |||
| 377 | 377 | ||
| 378 | INIT_LIST_HEAD(&drive_bays); | 378 | INIT_LIST_HEAD(&drive_bays); |
| 379 | 379 | ||
| 380 | if (acpi_disabled) | ||
| 381 | return -ENODEV; | ||
| 382 | |||
| 380 | /* look for dockable drive bays */ | 383 | /* look for dockable drive bays */ |
| 381 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 384 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
| 382 | ACPI_UINT32_MAX, find_bay, &bays, NULL); | 385 | ACPI_UINT32_MAX, find_bay, &bays, NULL); |
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 96c542f7fded..bb7c51f712bd 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -917,6 +917,9 @@ static int __init dock_init(void) | |||
| 917 | 917 | ||
| 918 | dock_station = NULL; | 918 | dock_station = NULL; |
| 919 | 919 | ||
| 920 | if (acpi_disabled) | ||
| 921 | return 0; | ||
| 922 | |||
| 920 | /* look for a dock station */ | 923 | /* look for a dock station */ |
| 921 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 924 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |
| 922 | ACPI_UINT32_MAX, find_dock, &num, NULL); | 925 | ACPI_UINT32_MAX, find_dock, &num, NULL); |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 2808dc60fd67..9b227d4dc9c9 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -333,6 +333,9 @@ static int __init acpi_rtc_init(void) | |||
| 333 | { | 333 | { |
| 334 | struct device *dev = get_rtc_dev(); | 334 | struct device *dev = get_rtc_dev(); |
| 335 | 335 | ||
| 336 | if (acpi_disabled) | ||
| 337 | return 0; | ||
| 338 | |||
| 336 | if (dev) { | 339 | if (dev) { |
| 337 | rtc_wake_setup(); | 340 | rtc_wake_setup(); |
| 338 | rtc_info.wake_on = rtc_wake_on; | 341 | rtc_info.wake_on = rtc_wake_on; |
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index c3b0cd88d09f..495c63a3e0af 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
| @@ -36,9 +36,8 @@ static int acpi_sleep_prepare(u32 acpi_state) | |||
| 36 | if (!acpi_wakeup_address) { | 36 | if (!acpi_wakeup_address) { |
| 37 | return -EFAULT; | 37 | return -EFAULT; |
| 38 | } | 38 | } |
| 39 | acpi_set_firmware_waking_vector((acpi_physical_address) | 39 | acpi_set_firmware_waking_vector( |
| 40 | virt_to_phys((void *) | 40 | (acpi_physical_address)acpi_wakeup_address); |
| 41 | acpi_wakeup_address)); | ||
| 42 | 41 | ||
| 43 | } | 42 | } |
| 44 | ACPI_FLUSH_CPU_CACHE(); | 43 | ACPI_FLUSH_CPU_CACHE(); |
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 224c57c03381..4ebbba2b6b19 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
| @@ -315,8 +315,11 @@ acpi_system_write_alarm(struct file *file, | |||
| 315 | cmos_bcd_write(day, acpi_gbl_FADT.day_alarm, rtc_control); | 315 | cmos_bcd_write(day, acpi_gbl_FADT.day_alarm, rtc_control); |
| 316 | if (acpi_gbl_FADT.month_alarm) | 316 | if (acpi_gbl_FADT.month_alarm) |
| 317 | cmos_bcd_write(mo, acpi_gbl_FADT.month_alarm, rtc_control); | 317 | cmos_bcd_write(mo, acpi_gbl_FADT.month_alarm, rtc_control); |
| 318 | if (acpi_gbl_FADT.century) | 318 | if (acpi_gbl_FADT.century) { |
| 319 | if (adjust) | ||
| 320 | yr += cmos_bcd_read(acpi_gbl_FADT.century, rtc_control) * 100; | ||
| 319 | cmos_bcd_write(yr / 100, acpi_gbl_FADT.century, rtc_control); | 321 | cmos_bcd_write(yr / 100, acpi_gbl_FADT.century, rtc_control); |
| 322 | } | ||
| 320 | /* enable the rtc alarm interrupt */ | 323 | /* enable the rtc alarm interrupt */ |
| 321 | rtc_control |= RTC_AIE; | 324 | rtc_control |= RTC_AIE; |
| 322 | CMOS_WRITE(rtc_control, RTC_CONTROL); | 325 | CMOS_WRITE(rtc_control, RTC_CONTROL); |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 6a4a2a25d97a..5e6468a7ca4b 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -1777,7 +1777,7 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) | |||
| 1777 | struct ahci_host_priv *hpriv; | 1777 | struct ahci_host_priv *hpriv; |
| 1778 | unsigned int i, handled = 0; | 1778 | unsigned int i, handled = 0; |
| 1779 | void __iomem *mmio; | 1779 | void __iomem *mmio; |
| 1780 | u32 irq_stat, irq_ack = 0; | 1780 | u32 irq_stat, irq_masked; |
| 1781 | 1781 | ||
| 1782 | VPRINTK("ENTER\n"); | 1782 | VPRINTK("ENTER\n"); |
| 1783 | 1783 | ||
| @@ -1786,16 +1786,17 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) | |||
| 1786 | 1786 | ||
| 1787 | /* sigh. 0xffffffff is a valid return from h/w */ | 1787 | /* sigh. 0xffffffff is a valid return from h/w */ |
| 1788 | irq_stat = readl(mmio + HOST_IRQ_STAT); | 1788 | irq_stat = readl(mmio + HOST_IRQ_STAT); |
| 1789 | irq_stat &= hpriv->port_map; | ||
| 1790 | if (!irq_stat) | 1789 | if (!irq_stat) |
| 1791 | return IRQ_NONE; | 1790 | return IRQ_NONE; |
| 1792 | 1791 | ||
| 1792 | irq_masked = irq_stat & hpriv->port_map; | ||
| 1793 | |||
| 1793 | spin_lock(&host->lock); | 1794 | spin_lock(&host->lock); |
| 1794 | 1795 | ||
| 1795 | for (i = 0; i < host->n_ports; i++) { | 1796 | for (i = 0; i < host->n_ports; i++) { |
| 1796 | struct ata_port *ap; | 1797 | struct ata_port *ap; |
| 1797 | 1798 | ||
| 1798 | if (!(irq_stat & (1 << i))) | 1799 | if (!(irq_masked & (1 << i))) |
| 1799 | continue; | 1800 | continue; |
| 1800 | 1801 | ||
| 1801 | ap = host->ports[i]; | 1802 | ap = host->ports[i]; |
| @@ -1809,14 +1810,20 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance) | |||
| 1809 | "interrupt on disabled port %u\n", i); | 1810 | "interrupt on disabled port %u\n", i); |
| 1810 | } | 1811 | } |
| 1811 | 1812 | ||
| 1812 | irq_ack |= (1 << i); | ||
| 1813 | } | ||
| 1814 | |||
| 1815 | if (irq_ack) { | ||
| 1816 | writel(irq_ack, mmio + HOST_IRQ_STAT); | ||
| 1817 | handled = 1; | 1813 | handled = 1; |
| 1818 | } | 1814 | } |
| 1819 | 1815 | ||
| 1816 | /* HOST_IRQ_STAT behaves as level triggered latch meaning that | ||
| 1817 | * it should be cleared after all the port events are cleared; | ||
| 1818 | * otherwise, it will raise a spurious interrupt after each | ||
| 1819 | * valid one. Please read section 10.6.2 of ahci 1.1 for more | ||
| 1820 | * information. | ||
| 1821 | * | ||
| 1822 | * Also, use the unmasked value to clear interrupt as spurious | ||
| 1823 | * pending event on a dummy port might cause screaming IRQ. | ||
| 1824 | */ | ||
| 1825 | writel(irq_stat, mmio + HOST_IRQ_STAT); | ||
| 1826 | |||
| 1820 | spin_unlock(&host->lock); | 1827 | spin_unlock(&host->lock); |
| 1821 | 1828 | ||
| 1822 | VPRINTK("EXIT\n"); | 1829 | VPRINTK("EXIT\n"); |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 215d18672a5a..c0908c225483 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
| @@ -1094,6 +1094,7 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq) | |||
| 1094 | int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, | 1094 | int ata_sff_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, |
| 1095 | u8 status, int in_wq) | 1095 | u8 status, int in_wq) |
| 1096 | { | 1096 | { |
| 1097 | struct ata_eh_info *ehi = &ap->link.eh_info; | ||
| 1097 | unsigned long flags = 0; | 1098 | unsigned long flags = 0; |
| 1098 | int poll_next; | 1099 | int poll_next; |
| 1099 | 1100 | ||
| @@ -1125,9 +1126,12 @@ fsm_start: | |||
| 1125 | if (likely(status & (ATA_ERR | ATA_DF))) | 1126 | if (likely(status & (ATA_ERR | ATA_DF))) |
| 1126 | /* device stops HSM for abort/error */ | 1127 | /* device stops HSM for abort/error */ |
| 1127 | qc->err_mask |= AC_ERR_DEV; | 1128 | qc->err_mask |= AC_ERR_DEV; |
| 1128 | else | 1129 | else { |
| 1129 | /* HSM violation. Let EH handle this */ | 1130 | /* HSM violation. Let EH handle this */ |
| 1131 | ata_ehi_push_desc(ehi, | ||
| 1132 | "ST_FIRST: !(DRQ|ERR|DF)"); | ||
| 1130 | qc->err_mask |= AC_ERR_HSM; | 1133 | qc->err_mask |= AC_ERR_HSM; |
| 1134 | } | ||
| 1131 | 1135 | ||
| 1132 | ap->hsm_task_state = HSM_ST_ERR; | 1136 | ap->hsm_task_state = HSM_ST_ERR; |
| 1133 | goto fsm_start; | 1137 | goto fsm_start; |
| @@ -1146,9 +1150,9 @@ fsm_start: | |||
| 1146 | * the CDB. | 1150 | * the CDB. |
| 1147 | */ | 1151 | */ |
| 1148 | if (!(qc->dev->horkage & ATA_HORKAGE_STUCK_ERR)) { | 1152 | if (!(qc->dev->horkage & ATA_HORKAGE_STUCK_ERR)) { |
| 1149 | ata_port_printk(ap, KERN_WARNING, | 1153 | ata_ehi_push_desc(ehi, "ST_FIRST: " |
| 1150 | "DRQ=1 with device error, " | 1154 | "DRQ=1 with device error, " |
| 1151 | "dev_stat 0x%X\n", status); | 1155 | "dev_stat 0x%X", status); |
| 1152 | qc->err_mask |= AC_ERR_HSM; | 1156 | qc->err_mask |= AC_ERR_HSM; |
| 1153 | ap->hsm_task_state = HSM_ST_ERR; | 1157 | ap->hsm_task_state = HSM_ST_ERR; |
| 1154 | goto fsm_start; | 1158 | goto fsm_start; |
| @@ -1205,9 +1209,9 @@ fsm_start: | |||
| 1205 | * let the EH abort the command or reset the device. | 1209 | * let the EH abort the command or reset the device. |
| 1206 | */ | 1210 | */ |
| 1207 | if (unlikely(status & (ATA_ERR | ATA_DF))) { | 1211 | if (unlikely(status & (ATA_ERR | ATA_DF))) { |
| 1208 | ata_port_printk(ap, KERN_WARNING, "DRQ=1 with " | 1212 | ata_ehi_push_desc(ehi, "ST-ATAPI: " |
| 1209 | "device error, dev_stat 0x%X\n", | 1213 | "DRQ=1 with device error, " |
| 1210 | status); | 1214 | "dev_stat 0x%X", status); |
| 1211 | qc->err_mask |= AC_ERR_HSM; | 1215 | qc->err_mask |= AC_ERR_HSM; |
| 1212 | ap->hsm_task_state = HSM_ST_ERR; | 1216 | ap->hsm_task_state = HSM_ST_ERR; |
| 1213 | goto fsm_start; | 1217 | goto fsm_start; |
| @@ -1226,13 +1230,17 @@ fsm_start: | |||
| 1226 | if (likely(status & (ATA_ERR | ATA_DF))) | 1230 | if (likely(status & (ATA_ERR | ATA_DF))) |
| 1227 | /* device stops HSM for abort/error */ | 1231 | /* device stops HSM for abort/error */ |
| 1228 | qc->err_mask |= AC_ERR_DEV; | 1232 | qc->err_mask |= AC_ERR_DEV; |
| 1229 | else | 1233 | else { |
| 1230 | /* HSM violation. Let EH handle this. | 1234 | /* HSM violation. Let EH handle this. |
| 1231 | * Phantom devices also trigger this | 1235 | * Phantom devices also trigger this |
| 1232 | * condition. Mark hint. | 1236 | * condition. Mark hint. |
| 1233 | */ | 1237 | */ |
| 1238 | ata_ehi_push_desc(ehi, "ST-ATA: " | ||
| 1239 | "DRQ=1 with device error, " | ||
| 1240 | "dev_stat 0x%X", status); | ||
| 1234 | qc->err_mask |= AC_ERR_HSM | | 1241 | qc->err_mask |= AC_ERR_HSM | |
| 1235 | AC_ERR_NODEV_HINT; | 1242 | AC_ERR_NODEV_HINT; |
| 1243 | } | ||
| 1236 | 1244 | ||
| 1237 | ap->hsm_task_state = HSM_ST_ERR; | 1245 | ap->hsm_task_state = HSM_ST_ERR; |
| 1238 | goto fsm_start; | 1246 | goto fsm_start; |
| @@ -1257,8 +1265,12 @@ fsm_start: | |||
| 1257 | status = ata_wait_idle(ap); | 1265 | status = ata_wait_idle(ap); |
| 1258 | } | 1266 | } |
| 1259 | 1267 | ||
| 1260 | if (status & (ATA_BUSY | ATA_DRQ)) | 1268 | if (status & (ATA_BUSY | ATA_DRQ)) { |
| 1269 | ata_ehi_push_desc(ehi, "ST-ATA: " | ||
| 1270 | "BUSY|DRQ persists on ERR|DF, " | ||
| 1271 | "dev_stat 0x%X", status); | ||
| 1261 | qc->err_mask |= AC_ERR_HSM; | 1272 | qc->err_mask |= AC_ERR_HSM; |
| 1273 | } | ||
| 1262 | 1274 | ||
| 1263 | /* ata_pio_sectors() might change the | 1275 | /* ata_pio_sectors() might change the |
| 1264 | * state to HSM_ST_LAST. so, the state | 1276 | * state to HSM_ST_LAST. so, the state |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 28092bc50146..ad169ffbc4cb 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -1607,7 +1607,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc) | |||
| 1607 | * Much of the time, this could just work regardless. | 1607 | * Much of the time, this could just work regardless. |
| 1608 | * So for now, just log the incident, and allow the attempt. | 1608 | * So for now, just log the incident, and allow the attempt. |
| 1609 | */ | 1609 | */ |
| 1610 | if (limit_warnings && (qc->nbytes / qc->sect_size) > 1) { | 1610 | if (limit_warnings > 0 && (qc->nbytes / qc->sect_size) > 1) { |
| 1611 | --limit_warnings; | 1611 | --limit_warnings; |
| 1612 | ata_link_printk(qc->dev->link, KERN_WARNING, DRV_NAME | 1612 | ata_link_printk(qc->dev->link, KERN_WARNING, DRV_NAME |
| 1613 | ": attempting PIO w/multiple DRQ: " | 1613 | ": attempting PIO w/multiple DRQ: " |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 8ee6b5b4ede7..84ffcc26a74b 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
| @@ -370,6 +370,7 @@ static const struct pci_device_id sil24_pci_tbl[] = { | |||
| 370 | { PCI_VDEVICE(INTEL, 0x3124), BID_SIL3124 }, | 370 | { PCI_VDEVICE(INTEL, 0x3124), BID_SIL3124 }, |
| 371 | { PCI_VDEVICE(CMD, 0x3132), BID_SIL3132 }, | 371 | { PCI_VDEVICE(CMD, 0x3132), BID_SIL3132 }, |
| 372 | { PCI_VDEVICE(CMD, 0x0242), BID_SIL3132 }, | 372 | { PCI_VDEVICE(CMD, 0x0242), BID_SIL3132 }, |
| 373 | { PCI_VDEVICE(CMD, 0x0244), BID_SIL3132 }, | ||
| 373 | { PCI_VDEVICE(CMD, 0x3131), BID_SIL3131 }, | 374 | { PCI_VDEVICE(CMD, 0x3131), BID_SIL3131 }, |
| 374 | { PCI_VDEVICE(CMD, 0x3531), BID_SIL3131 }, | 375 | { PCI_VDEVICE(CMD, 0x3531), BID_SIL3131 }, |
| 375 | 376 | ||
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index f277cea904ce..db529b849948 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
| @@ -83,6 +83,7 @@ static struct ata_port_operations uli_ops = { | |||
| 83 | .inherits = &ata_bmdma_port_ops, | 83 | .inherits = &ata_bmdma_port_ops, |
| 84 | .scr_read = uli_scr_read, | 84 | .scr_read = uli_scr_read, |
| 85 | .scr_write = uli_scr_write, | 85 | .scr_write = uli_scr_write, |
| 86 | .hardreset = ATA_OP_NULL, | ||
| 86 | }; | 87 | }; |
| 87 | 88 | ||
| 88 | static const struct ata_port_info uli_port_info = { | 89 | static const struct ata_port_info uli_port_info = { |
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index 043353bd0600..14b9d5f4c203 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig | |||
| @@ -64,7 +64,7 @@ config KS0108_DELAY | |||
| 64 | Amount of time the ks0108 should wait between each control write | 64 | Amount of time the ks0108 should wait between each control write |
| 65 | to the parallel port. | 65 | to the parallel port. |
| 66 | 66 | ||
| 67 | If your driver seems to miss random writings, increment this. | 67 | If your LCD seems to miss random writings, increment this. |
| 68 | 68 | ||
| 69 | If you don't know what I'm talking about, ignore it. | 69 | If you don't know what I'm talking about, ignore it. |
| 70 | 70 | ||
diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c index 80bb06105387..683509f013ab 100644 --- a/drivers/auxdisplay/cfag12864b.c +++ b/drivers/auxdisplay/cfag12864b.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * Depends: ks0108 | 6 | * Depends: ks0108 |
| 7 | * | 7 | * |
| 8 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 8 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 9 | * Date: 2006-10-31 | 9 | * Date: 2006-10-31 |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| @@ -398,5 +398,5 @@ module_init(cfag12864b_init); | |||
| 398 | module_exit(cfag12864b_exit); | 398 | module_exit(cfag12864b_exit); |
| 399 | 399 | ||
| 400 | MODULE_LICENSE("GPL v2"); | 400 | MODULE_LICENSE("GPL v2"); |
| 401 | MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>"); | 401 | MODULE_AUTHOR("Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>"); |
| 402 | MODULE_DESCRIPTION("cfag12864b LCD driver"); | 402 | MODULE_DESCRIPTION("cfag12864b LCD driver"); |
diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c index 307c190699e0..fe3a865be4e5 100644 --- a/drivers/auxdisplay/cfag12864bfb.c +++ b/drivers/auxdisplay/cfag12864bfb.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * Depends: cfag12864b | 6 | * Depends: cfag12864b |
| 7 | * | 7 | * |
| 8 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 8 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 9 | * Date: 2006-10-31 | 9 | * Date: 2006-10-31 |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| @@ -186,5 +186,5 @@ module_init(cfag12864bfb_init); | |||
| 186 | module_exit(cfag12864bfb_exit); | 186 | module_exit(cfag12864bfb_exit); |
| 187 | 187 | ||
| 188 | MODULE_LICENSE("GPL v2"); | 188 | MODULE_LICENSE("GPL v2"); |
| 189 | MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>"); | 189 | MODULE_AUTHOR("Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>"); |
| 190 | MODULE_DESCRIPTION("cfag12864b LCD framebuffer driver"); | 190 | MODULE_DESCRIPTION("cfag12864b LCD framebuffer driver"); |
diff --git a/drivers/auxdisplay/ks0108.c b/drivers/auxdisplay/ks0108.c index e6c3646ef18c..5b93852392b8 100644 --- a/drivers/auxdisplay/ks0108.c +++ b/drivers/auxdisplay/ks0108.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * Depends: parport | 6 | * Depends: parport |
| 7 | * | 7 | * |
| 8 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 8 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 9 | * Date: 2006-10-31 | 9 | * Date: 2006-10-31 |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify | 11 | * This program is free software; you can redistribute it and/or modify |
| @@ -173,6 +173,6 @@ module_init(ks0108_init); | |||
| 173 | module_exit(ks0108_exit); | 173 | module_exit(ks0108_exit); |
| 174 | 174 | ||
| 175 | MODULE_LICENSE("GPL v2"); | 175 | MODULE_LICENSE("GPL v2"); |
| 176 | MODULE_AUTHOR("Miguel Ojeda Sandonis <maxextreme@gmail.com>"); | 176 | MODULE_AUTHOR("Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>"); |
| 177 | MODULE_DESCRIPTION("ks0108 LCD Controller driver"); | 177 | MODULE_DESCRIPTION("ks0108 LCD Controller driver"); |
| 178 | 178 | ||
diff --git a/drivers/base/node.c b/drivers/base/node.c index 39f3d1b3a213..0f867a083338 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -84,8 +84,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) | |||
| 84 | nid, K(i.totalram), | 84 | nid, K(i.totalram), |
| 85 | nid, K(i.freeram), | 85 | nid, K(i.freeram), |
| 86 | nid, K(i.totalram - i.freeram), | 86 | nid, K(i.totalram - i.freeram), |
| 87 | nid, node_page_state(nid, NR_ACTIVE), | 87 | nid, K(node_page_state(nid, NR_ACTIVE)), |
| 88 | nid, node_page_state(nid, NR_INACTIVE), | 88 | nid, K(node_page_state(nid, NR_INACTIVE)), |
| 89 | #ifdef CONFIG_HIGHMEM | 89 | #ifdef CONFIG_HIGHMEM |
| 90 | nid, K(i.totalhigh), | 90 | nid, K(i.totalhigh), |
| 91 | nid, K(i.freehigh), | 91 | nid, K(i.freehigh), |
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c index 2b4b392dcbc1..87a7f1d02578 100644 --- a/drivers/base/power/trace.c +++ b/drivers/base/power/trace.c | |||
| @@ -153,7 +153,7 @@ EXPORT_SYMBOL(set_trace_device); | |||
| 153 | * it's not any guarantee, but it's a high _likelihood_ that | 153 | * it's not any guarantee, but it's a high _likelihood_ that |
| 154 | * the match is valid). | 154 | * the match is valid). |
| 155 | */ | 155 | */ |
| 156 | void generate_resume_trace(void *tracedata, unsigned int user) | 156 | void generate_resume_trace(const void *tracedata, unsigned int user) |
| 157 | { | 157 | { |
| 158 | unsigned short lineno = *(unsigned short *)tracedata; | 158 | unsigned short lineno = *(unsigned short *)tracedata; |
| 159 | const char *file = *(const char **)(tracedata + 2); | 159 | const char *file = *(const char **)(tracedata + 2); |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 5f1e1cc6165a..d81632cd7d06 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -106,35 +106,34 @@ MODULE_DEVICE_TABLE(pci, cciss_pci_device_id); | |||
| 106 | /* board_id = Subsystem Device ID & Vendor ID | 106 | /* board_id = Subsystem Device ID & Vendor ID |
| 107 | * product = Marketing Name for the board | 107 | * product = Marketing Name for the board |
| 108 | * access = Address of the struct of function pointers | 108 | * access = Address of the struct of function pointers |
| 109 | * nr_cmds = Number of commands supported by controller | ||
| 110 | */ | 109 | */ |
| 111 | static struct board_type products[] = { | 110 | static struct board_type products[] = { |
| 112 | {0x40700E11, "Smart Array 5300", &SA5_access, 512}, | 111 | {0x40700E11, "Smart Array 5300", &SA5_access}, |
| 113 | {0x40800E11, "Smart Array 5i", &SA5B_access, 512}, | 112 | {0x40800E11, "Smart Array 5i", &SA5B_access}, |
| 114 | {0x40820E11, "Smart Array 532", &SA5B_access, 512}, | 113 | {0x40820E11, "Smart Array 532", &SA5B_access}, |
| 115 | {0x40830E11, "Smart Array 5312", &SA5B_access, 512}, | 114 | {0x40830E11, "Smart Array 5312", &SA5B_access}, |
| 116 | {0x409A0E11, "Smart Array 641", &SA5_access, 512}, | 115 | {0x409A0E11, "Smart Array 641", &SA5_access}, |
| 117 | {0x409B0E11, "Smart Array 642", &SA5_access, 512}, | 116 | {0x409B0E11, "Smart Array 642", &SA5_access}, |
| 118 | {0x409C0E11, "Smart Array 6400", &SA5_access, 512}, | 117 | {0x409C0E11, "Smart Array 6400", &SA5_access}, |
| 119 | {0x409D0E11, "Smart Array 6400 EM", &SA5_access, 512}, | 118 | {0x409D0E11, "Smart Array 6400 EM", &SA5_access}, |
| 120 | {0x40910E11, "Smart Array 6i", &SA5_access, 512}, | 119 | {0x40910E11, "Smart Array 6i", &SA5_access}, |
| 121 | {0x3225103C, "Smart Array P600", &SA5_access, 512}, | 120 | {0x3225103C, "Smart Array P600", &SA5_access}, |
| 122 | {0x3223103C, "Smart Array P800", &SA5_access, 512}, | 121 | {0x3223103C, "Smart Array P800", &SA5_access}, |
| 123 | {0x3234103C, "Smart Array P400", &SA5_access, 512}, | 122 | {0x3234103C, "Smart Array P400", &SA5_access}, |
| 124 | {0x3235103C, "Smart Array P400i", &SA5_access, 512}, | 123 | {0x3235103C, "Smart Array P400i", &SA5_access}, |
| 125 | {0x3211103C, "Smart Array E200i", &SA5_access, 120}, | 124 | {0x3211103C, "Smart Array E200i", &SA5_access}, |
| 126 | {0x3212103C, "Smart Array E200", &SA5_access, 120}, | 125 | {0x3212103C, "Smart Array E200", &SA5_access}, |
| 127 | {0x3213103C, "Smart Array E200i", &SA5_access, 120}, | 126 | {0x3213103C, "Smart Array E200i", &SA5_access}, |
| 128 | {0x3214103C, "Smart Array E200i", &SA5_access, 120}, | 127 | {0x3214103C, "Smart Array E200i", &SA5_access}, |
| 129 | {0x3215103C, "Smart Array E200i", &SA5_access, 120}, | 128 | {0x3215103C, "Smart Array E200i", &SA5_access}, |
| 130 | {0x3237103C, "Smart Array E500", &SA5_access, 512}, | 129 | {0x3237103C, "Smart Array E500", &SA5_access}, |
| 131 | {0x323D103C, "Smart Array P700m", &SA5_access, 512}, | 130 | {0x323D103C, "Smart Array P700m", &SA5_access}, |
| 132 | {0x3241103C, "Smart Array P212", &SA5_access, 384}, | 131 | {0x3241103C, "Smart Array P212", &SA5_access}, |
| 133 | {0x3243103C, "Smart Array P410", &SA5_access, 384}, | 132 | {0x3243103C, "Smart Array P410", &SA5_access}, |
| 134 | {0x3245103C, "Smart Array P410i", &SA5_access, 384}, | 133 | {0x3245103C, "Smart Array P410i", &SA5_access}, |
| 135 | {0x3247103C, "Smart Array P411", &SA5_access, 384}, | 134 | {0x3247103C, "Smart Array P411", &SA5_access}, |
| 136 | {0x3249103C, "Smart Array P812", &SA5_access, 384}, | 135 | {0x3249103C, "Smart Array P812", &SA5_access}, |
| 137 | {0xFFFF103C, "Unknown Smart Array", &SA5_access, 120}, | 136 | {0xFFFF103C, "Unknown Smart Array", &SA5_access}, |
| 138 | }; | 137 | }; |
| 139 | 138 | ||
| 140 | /* How long to wait (in milliseconds) for board to go into simple mode */ | 139 | /* How long to wait (in milliseconds) for board to go into simple mode */ |
| @@ -3086,11 +3085,20 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
| 3086 | print_cfg_table(c->cfgtable); | 3085 | print_cfg_table(c->cfgtable); |
| 3087 | #endif /* CCISS_DEBUG */ | 3086 | #endif /* CCISS_DEBUG */ |
| 3088 | 3087 | ||
| 3088 | /* Some controllers support Zero Memory Raid (ZMR). | ||
| 3089 | * When configured in ZMR mode the number of supported | ||
| 3090 | * commands drops to 64. So instead of just setting an | ||
| 3091 | * arbitrary value we make the driver a little smarter. | ||
| 3092 | * We read the config table to tell us how many commands | ||
| 3093 | * are supported on the controller then subtract 4 to | ||
| 3094 | * leave a little room for ioctl calls. | ||
| 3095 | */ | ||
| 3096 | c->max_commands = readl(&(c->cfgtable->CmdsOutMax)); | ||
| 3089 | for (i = 0; i < ARRAY_SIZE(products); i++) { | 3097 | for (i = 0; i < ARRAY_SIZE(products); i++) { |
| 3090 | if (board_id == products[i].board_id) { | 3098 | if (board_id == products[i].board_id) { |
| 3091 | c->product_name = products[i].product_name; | 3099 | c->product_name = products[i].product_name; |
| 3092 | c->access = *(products[i].access); | 3100 | c->access = *(products[i].access); |
| 3093 | c->nr_cmds = products[i].nr_cmds; | 3101 | c->nr_cmds = c->max_commands - 4; |
| 3094 | break; | 3102 | break; |
| 3095 | } | 3103 | } |
| 3096 | } | 3104 | } |
| @@ -3110,7 +3118,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) | |||
| 3110 | if (subsystem_vendor_id == PCI_VENDOR_ID_HP) { | 3118 | if (subsystem_vendor_id == PCI_VENDOR_ID_HP) { |
| 3111 | c->product_name = products[i-1].product_name; | 3119 | c->product_name = products[i-1].product_name; |
| 3112 | c->access = *(products[i-1].access); | 3120 | c->access = *(products[i-1].access); |
| 3113 | c->nr_cmds = products[i-1].nr_cmds; | 3121 | c->nr_cmds = c->max_commands - 4; |
| 3114 | printk(KERN_WARNING "cciss: This is an unknown " | 3122 | printk(KERN_WARNING "cciss: This is an unknown " |
| 3115 | "Smart Array controller.\n" | 3123 | "Smart Array controller.\n" |
| 3116 | "cciss: Please update to the latest driver " | 3124 | "cciss: Please update to the latest driver " |
| @@ -3546,6 +3554,10 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
| 3546 | for (j = 0; j <= hba[i]->highest_lun; j++) | 3554 | for (j = 0; j <= hba[i]->highest_lun; j++) |
| 3547 | add_disk(hba[i]->gendisk[j]); | 3555 | add_disk(hba[i]->gendisk[j]); |
| 3548 | 3556 | ||
| 3557 | /* we must register the controller even if no disks exist */ | ||
| 3558 | if (hba[i]->highest_lun == -1) | ||
| 3559 | add_disk(hba[i]->gendisk[0]); | ||
| 3560 | |||
| 3549 | return 1; | 3561 | return 1; |
| 3550 | 3562 | ||
| 3551 | clean4: | 3563 | clean4: |
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 13665db363d6..481ffe87c716 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -16,28 +16,9 @@ | |||
| 16 | #include <asm/page.h> /* PAGE_SIZE */ | 16 | #include <asm/page.h> /* PAGE_SIZE */ |
| 17 | #include <asm/e820.h> | 17 | #include <asm/e820.h> |
| 18 | #include <asm/k8.h> | 18 | #include <asm/k8.h> |
| 19 | #include <asm/gart.h> | ||
| 19 | #include "agp.h" | 20 | #include "agp.h" |
| 20 | 21 | ||
| 21 | /* PTE bits. */ | ||
| 22 | #define GPTE_VALID 1 | ||
| 23 | #define GPTE_COHERENT 2 | ||
| 24 | |||
| 25 | /* Aperture control register bits. */ | ||
| 26 | #define GARTEN (1<<0) | ||
| 27 | #define DISGARTCPU (1<<4) | ||
| 28 | #define DISGARTIO (1<<5) | ||
| 29 | |||
| 30 | /* GART cache control register bits. */ | ||
| 31 | #define INVGART (1<<0) | ||
| 32 | #define GARTPTEERR (1<<1) | ||
| 33 | |||
| 34 | /* K8 On-cpu GART registers */ | ||
| 35 | #define AMD64_GARTAPERTURECTL 0x90 | ||
| 36 | #define AMD64_GARTAPERTUREBASE 0x94 | ||
| 37 | #define AMD64_GARTTABLEBASE 0x98 | ||
| 38 | #define AMD64_GARTCACHECTL 0x9c | ||
| 39 | #define AMD64_GARTEN (1<<0) | ||
| 40 | |||
| 41 | /* NVIDIA K8 registers */ | 22 | /* NVIDIA K8 registers */ |
| 42 | #define NVIDIA_X86_64_0_APBASE 0x10 | 23 | #define NVIDIA_X86_64_0_APBASE 0x10 |
| 43 | #define NVIDIA_X86_64_1_APBASE1 0x50 | 24 | #define NVIDIA_X86_64_1_APBASE1 0x50 |
| @@ -165,29 +146,18 @@ static int amd64_fetch_size(void) | |||
| 165 | * In a multiprocessor x86-64 system, this function gets | 146 | * In a multiprocessor x86-64 system, this function gets |
| 166 | * called once for each CPU. | 147 | * called once for each CPU. |
| 167 | */ | 148 | */ |
| 168 | static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table) | 149 | static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table) |
| 169 | { | 150 | { |
| 170 | u64 aperturebase; | 151 | u64 aperturebase; |
| 171 | u32 tmp; | 152 | u32 tmp; |
| 172 | u64 addr, aper_base; | 153 | u64 aper_base; |
| 173 | 154 | ||
| 174 | /* Address to map to */ | 155 | /* Address to map to */ |
| 175 | pci_read_config_dword (hammer, AMD64_GARTAPERTUREBASE, &tmp); | 156 | pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp); |
| 176 | aperturebase = tmp << 25; | 157 | aperturebase = tmp << 25; |
| 177 | aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK); | 158 | aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK); |
| 178 | 159 | ||
| 179 | /* address of the mappings table */ | 160 | enable_gart_translation(hammer, gatt_table); |
| 180 | addr = (u64) gatt_table; | ||
| 181 | addr >>= 12; | ||
| 182 | tmp = (u32) addr<<4; | ||
| 183 | tmp &= ~0xf; | ||
| 184 | pci_write_config_dword (hammer, AMD64_GARTTABLEBASE, tmp); | ||
| 185 | |||
| 186 | /* Enable GART translation for this hammer. */ | ||
| 187 | pci_read_config_dword(hammer, AMD64_GARTAPERTURECTL, &tmp); | ||
| 188 | tmp |= GARTEN; | ||
| 189 | tmp &= ~(DISGARTCPU | DISGARTIO); | ||
| 190 | pci_write_config_dword(hammer, AMD64_GARTAPERTURECTL, tmp); | ||
| 191 | 161 | ||
| 192 | return aper_base; | 162 | return aper_base; |
| 193 | } | 163 | } |
| @@ -226,9 +196,9 @@ static void amd64_cleanup(void) | |||
| 226 | for (i = 0; i < num_k8_northbridges; i++) { | 196 | for (i = 0; i < num_k8_northbridges; i++) { |
| 227 | struct pci_dev *dev = k8_northbridges[i]; | 197 | struct pci_dev *dev = k8_northbridges[i]; |
| 228 | /* disable gart translation */ | 198 | /* disable gart translation */ |
| 229 | pci_read_config_dword (dev, AMD64_GARTAPERTURECTL, &tmp); | 199 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &tmp); |
| 230 | tmp &= ~AMD64_GARTEN; | 200 | tmp &= ~AMD64_GARTEN; |
| 231 | pci_write_config_dword (dev, AMD64_GARTAPERTURECTL, tmp); | 201 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp); |
| 232 | } | 202 | } |
| 233 | } | 203 | } |
| 234 | 204 | ||
| @@ -258,24 +228,10 @@ static const struct agp_bridge_driver amd_8151_driver = { | |||
| 258 | }; | 228 | }; |
| 259 | 229 | ||
| 260 | /* Some basic sanity checks for the aperture. */ | 230 | /* Some basic sanity checks for the aperture. */ |
| 261 | static int __devinit aperture_valid(u64 aper, u32 size) | 231 | static int __devinit agp_aperture_valid(u64 aper, u32 size) |
| 262 | { | 232 | { |
| 263 | if (aper == 0) { | 233 | if (!aperture_valid(aper, size, 32*1024*1024)) |
| 264 | printk(KERN_ERR PFX "No aperture\n"); | ||
| 265 | return 0; | ||
| 266 | } | ||
| 267 | if (size < 32*1024*1024) { | ||
| 268 | printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); | ||
| 269 | return 0; | ||
| 270 | } | ||
| 271 | if ((u64)aper + size > 0x100000000ULL) { | ||
| 272 | printk(KERN_ERR PFX "Aperture out of bounds\n"); | ||
| 273 | return 0; | 234 | return 0; |
| 274 | } | ||
| 275 | if (e820_any_mapped(aper, aper + size, E820_RAM)) { | ||
| 276 | printk(KERN_ERR PFX "Aperture pointing to RAM\n"); | ||
| 277 | return 0; | ||
| 278 | } | ||
| 279 | 235 | ||
| 280 | /* Request the Aperture. This catches cases when someone else | 236 | /* Request the Aperture. This catches cases when someone else |
| 281 | already put a mapping in there - happens with some very broken BIOS | 237 | already put a mapping in there - happens with some very broken BIOS |
| @@ -308,11 +264,11 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, | |||
| 308 | u32 nb_order, nb_base; | 264 | u32 nb_order, nb_base; |
| 309 | u16 apsize; | 265 | u16 apsize; |
| 310 | 266 | ||
| 311 | pci_read_config_dword(nb, 0x90, &nb_order); | 267 | pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order); |
| 312 | nb_order = (nb_order >> 1) & 7; | 268 | nb_order = (nb_order >> 1) & 7; |
| 313 | pci_read_config_dword(nb, 0x94, &nb_base); | 269 | pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base); |
| 314 | nb_aper = nb_base << 25; | 270 | nb_aper = nb_base << 25; |
| 315 | if (aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) { | 271 | if (agp_aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) { |
| 316 | return 0; | 272 | return 0; |
| 317 | } | 273 | } |
| 318 | 274 | ||
| @@ -331,12 +287,23 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, | |||
| 331 | pci_read_config_dword(agp, 0x10, &aper_low); | 287 | pci_read_config_dword(agp, 0x10, &aper_low); |
| 332 | pci_read_config_dword(agp, 0x14, &aper_hi); | 288 | pci_read_config_dword(agp, 0x14, &aper_hi); |
| 333 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | 289 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); |
| 290 | |||
| 291 | /* | ||
| 292 | * On some sick chips APSIZE is 0. This means it wants 4G | ||
| 293 | * so let double check that order, and lets trust the AMD NB settings | ||
| 294 | */ | ||
| 295 | 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 | 32 << order); | ||
| 298 | order = nb_order; | ||
| 299 | } | ||
| 300 | |||
| 334 | printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); | 301 | printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); |
| 335 | if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order)) | 302 | if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order)) |
| 336 | return -1; | 303 | return -1; |
| 337 | 304 | ||
| 338 | pci_write_config_dword(nb, 0x90, order << 1); | 305 | pci_write_config_dword(nb, AMD64_GARTAPERTURECTL, order << 1); |
| 339 | pci_write_config_dword(nb, 0x94, aper >> 25); | 306 | pci_write_config_dword(nb, AMD64_GARTAPERTUREBASE, aper >> 25); |
| 340 | 307 | ||
| 341 | return 0; | 308 | return 0; |
| 342 | } | 309 | } |
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index f7f16e7a8bf3..df036118b8b1 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c | |||
| @@ -62,11 +62,11 @@ static void i915_vblank_tasklet(struct drm_device *dev) | |||
| 62 | u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24); | 62 | u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24); |
| 63 | RING_LOCALS; | 63 | RING_LOCALS; |
| 64 | 64 | ||
| 65 | if (sarea_priv->front_tiled) { | 65 | if (IS_I965G(dev) && sarea_priv->front_tiled) { |
| 66 | cmd |= XY_SRC_COPY_BLT_DST_TILED; | 66 | cmd |= XY_SRC_COPY_BLT_DST_TILED; |
| 67 | dst_pitch >>= 2; | 67 | dst_pitch >>= 2; |
| 68 | } | 68 | } |
| 69 | if (sarea_priv->back_tiled) { | 69 | if (IS_I965G(dev) && sarea_priv->back_tiled) { |
| 70 | cmd |= XY_SRC_COPY_BLT_SRC_TILED; | 70 | cmd |= XY_SRC_COPY_BLT_SRC_TILED; |
| 71 | src_pitch >>= 2; | 71 | src_pitch >>= 2; |
| 72 | } | 72 | } |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index e94bee032314..750131010af0 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -3322,7 +3322,7 @@ static int send_break(struct tty_struct *tty, unsigned int duration) | |||
| 3322 | msleep_interruptible(duration); | 3322 | msleep_interruptible(duration); |
| 3323 | tty->ops->break_ctl(tty, 0); | 3323 | tty->ops->break_ctl(tty, 0); |
| 3324 | tty_write_unlock(tty); | 3324 | tty_write_unlock(tty); |
| 3325 | if (!signal_pending(current)) | 3325 | if (signal_pending(current)) |
| 3326 | return -EINTR; | 3326 | return -EINTR; |
| 3327 | return 0; | 3327 | return 0; |
| 3328 | } | 3328 | } |
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 85e2ba7fcfba..bf4830082a13 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/connector.h> | 28 | #include <linux/connector.h> |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/proc_fs.h> | ||
| 31 | #include <linux/spinlock.h> | ||
| 30 | 32 | ||
| 31 | #include <net/sock.h> | 33 | #include <net/sock.h> |
| 32 | 34 | ||
| @@ -403,6 +405,40 @@ static void cn_callback(void *data) | |||
| 403 | mutex_unlock(¬ify_lock); | 405 | mutex_unlock(¬ify_lock); |
| 404 | } | 406 | } |
| 405 | 407 | ||
| 408 | static int cn_proc_show(struct seq_file *m, void *v) | ||
| 409 | { | ||
| 410 | struct cn_queue_dev *dev = cdev.cbdev; | ||
| 411 | struct cn_callback_entry *cbq; | ||
| 412 | |||
| 413 | seq_printf(m, "Name ID\n"); | ||
| 414 | |||
| 415 | spin_lock_bh(&dev->queue_lock); | ||
| 416 | |||
| 417 | list_for_each_entry(cbq, &dev->queue_list, callback_entry) { | ||
| 418 | seq_printf(m, "%-15s %u:%u\n", | ||
| 419 | cbq->id.name, | ||
| 420 | cbq->id.id.idx, | ||
| 421 | cbq->id.id.val); | ||
| 422 | } | ||
| 423 | |||
| 424 | spin_unlock_bh(&dev->queue_lock); | ||
| 425 | |||
| 426 | return 0; | ||
| 427 | } | ||
| 428 | |||
| 429 | static int cn_proc_open(struct inode *inode, struct file *file) | ||
| 430 | { | ||
| 431 | return single_open(file, cn_proc_show, NULL); | ||
| 432 | } | ||
| 433 | |||
| 434 | static const struct file_operations cn_file_ops = { | ||
| 435 | .owner = THIS_MODULE, | ||
| 436 | .open = cn_proc_open, | ||
| 437 | .read = seq_read, | ||
| 438 | .llseek = seq_lseek, | ||
| 439 | .release = single_release | ||
| 440 | }; | ||
| 441 | |||
| 406 | static int __devinit cn_init(void) | 442 | static int __devinit cn_init(void) |
| 407 | { | 443 | { |
| 408 | struct cn_dev *dev = &cdev; | 444 | struct cn_dev *dev = &cdev; |
| @@ -434,6 +470,8 @@ static int __devinit cn_init(void) | |||
| 434 | return -EINVAL; | 470 | return -EINVAL; |
| 435 | } | 471 | } |
| 436 | 472 | ||
| 473 | proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops); | ||
| 474 | |||
| 437 | return 0; | 475 | return 0; |
| 438 | } | 476 | } |
| 439 | 477 | ||
| @@ -443,6 +481,8 @@ static void __devexit cn_fini(void) | |||
| 443 | 481 | ||
| 444 | cn_already_initialized = 0; | 482 | cn_already_initialized = 0; |
| 445 | 483 | ||
| 484 | proc_net_remove(&init_net, "connector"); | ||
| 485 | |||
| 446 | cn_del_callback(&dev->id); | 486 | cn_del_callback(&dev->id); |
| 447 | cn_queue_free_dev(dev->cbdev); | 487 | cn_queue_free_dev(dev->cbdev); |
| 448 | netlink_kernel_release(dev->nls); | 488 | netlink_kernel_release(dev->nls); |
diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index b2458bb8e9ca..227d2e036cd8 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c | |||
| @@ -1051,7 +1051,8 @@ static int sbp2_scan_unit_dir(struct sbp2_target *tgt, u32 *directory, | |||
| 1051 | break; | 1051 | break; |
| 1052 | 1052 | ||
| 1053 | case SBP2_CSR_LOGICAL_UNIT_DIRECTORY: | 1053 | case SBP2_CSR_LOGICAL_UNIT_DIRECTORY: |
| 1054 | if (sbp2_scan_logical_unit_dir(tgt, ci.p + value) < 0) | 1054 | /* Adjust for the increment in the iterator */ |
| 1055 | if (sbp2_scan_logical_unit_dir(tgt, ci.p - 1 + value) < 0) | ||
| 1055 | return -ENOMEM; | 1056 | return -ENOMEM; |
| 1056 | break; | 1057 | break; |
| 1057 | } | 1058 | } |
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index bbd28342e771..008c38ba774f 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
| @@ -28,12 +28,18 @@ config DEBUG_GPIO | |||
| 28 | comment "I2C GPIO expanders:" | 28 | comment "I2C GPIO expanders:" |
| 29 | 29 | ||
| 30 | config GPIO_PCA953X | 30 | config GPIO_PCA953X |
| 31 | tristate "PCA953x I/O ports" | 31 | tristate "PCA953x, PCA955x, and MAX7310 I/O ports" |
| 32 | depends on I2C | 32 | depends on I2C |
| 33 | help | 33 | help |
| 34 | Say yes here to support the PCA9534 (8-bit), PCA9535 (16-bit), | 34 | Say yes here to provide access to several register-oriented |
| 35 | PCA9536 (4-bit), PCA9537 (4-bit), PCA9538 (8-bit), and PCA9539 | 35 | SMBus I/O expanders, made mostly by NXP or TI. Compatible |
| 36 | (16-bit) I/O ports. These parts are made by NXP and TI. | 36 | models include: |
| 37 | |||
| 38 | 4 bits: pca9536, pca9537 | ||
| 39 | |||
| 40 | 8 bits: max7310, pca9534, pca9538, pca9554, pca9557 | ||
| 41 | |||
| 42 | 16 bits: pca9535, pca9539, pca9555 | ||
| 37 | 43 | ||
| 38 | This driver can also be built as a module. If so, the module | 44 | This driver can also be built as a module. If so, the module |
| 39 | will be called pca953x. | 45 | will be called pca953x. |
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 7e40e8a55edf..a380730b61ab 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
| @@ -33,7 +33,7 @@ static const struct i2c_device_id pca953x_id[] = { | |||
| 33 | { "pca9554", 8, }, | 33 | { "pca9554", 8, }, |
| 34 | { "pca9555", 16, }, | 34 | { "pca9555", 16, }, |
| 35 | { "pca9557", 8, }, | 35 | { "pca9557", 8, }, |
| 36 | /* REVISIT several pca955x parts should work here too */ | 36 | { "max7310", 8, }, |
| 37 | { } | 37 | { } |
| 38 | }; | 38 | }; |
| 39 | MODULE_DEVICE_TABLE(i2c, pca953x_id); | 39 | MODULE_DEVICE_TABLE(i2c, pca953x_id); |
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 26df06f840eb..50f22690d611 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c | |||
| @@ -516,17 +516,23 @@ static struct dmi_system_id __initdata hdaps_whitelist[] = { | |||
| 516 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"), | 516 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"), |
| 517 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"), | 517 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R52"), |
| 518 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"), | 518 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61i"), |
| 519 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad R61"), | ||
| 519 | HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"), | 520 | HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T41p"), |
| 520 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"), | 521 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T41"), |
| 521 | HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"), | 522 | HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad T42p"), |
| 522 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"), | 523 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T42"), |
| 523 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"), | 524 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad T43"), |
| 524 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"), | 525 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T60"), |
| 526 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61p"), | ||
| 525 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"), | 527 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T61"), |
| 526 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"), | 528 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X40"), |
| 527 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"), | 529 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad X41"), |
| 528 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"), | 530 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X60"), |
| 531 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61s"), | ||
| 532 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61"), | ||
| 529 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"), | 533 | HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad Z60m"), |
| 534 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61m"), | ||
| 535 | HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad Z61p"), | ||
| 530 | { .ident = NULL } | 536 | { .ident = NULL } |
| 531 | }; | 537 | }; |
| 532 | 538 | ||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 1305ef190fc1..9e8c875437be 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -290,12 +290,12 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
| 290 | * bus, or started a new i2c message | 290 | * bus, or started a new i2c message |
| 291 | */ | 291 | */ |
| 292 | 292 | ||
| 293 | if (iicstat & S3C2410_IICSTAT_LASTBIT && | 293 | if (iicstat & S3C2410_IICSTAT_LASTBIT && |
| 294 | !(i2c->msg->flags & I2C_M_IGNORE_NAK)) { | 294 | !(i2c->msg->flags & I2C_M_IGNORE_NAK)) { |
| 295 | /* ack was not received... */ | 295 | /* ack was not received... */ |
| 296 | 296 | ||
| 297 | dev_dbg(i2c->dev, "ack was not received\n"); | 297 | dev_dbg(i2c->dev, "ack was not received\n"); |
| 298 | s3c24xx_i2c_stop(i2c, -EREMOTEIO); | 298 | s3c24xx_i2c_stop(i2c, -ENXIO); |
| 299 | goto out_ack; | 299 | goto out_ack; |
| 300 | } | 300 | } |
| 301 | 301 | ||
| @@ -305,7 +305,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
| 305 | i2c->state = STATE_WRITE; | 305 | i2c->state = STATE_WRITE; |
| 306 | 306 | ||
| 307 | /* terminate the transfer if there is nothing to do | 307 | /* terminate the transfer if there is nothing to do |
| 308 | * (used by the i2c probe to find devices */ | 308 | * as this is used by the i2c probe to find devices. */ |
| 309 | 309 | ||
| 310 | if (is_lastmsg(i2c) && i2c->msg->len == 0) { | 310 | if (is_lastmsg(i2c) && i2c->msg->len == 0) { |
| 311 | s3c24xx_i2c_stop(i2c, 0); | 311 | s3c24xx_i2c_stop(i2c, 0); |
| @@ -323,7 +323,17 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
| 323 | * end of the message, and if so, work out what to do | 323 | * end of the message, and if so, work out what to do |
| 324 | */ | 324 | */ |
| 325 | 325 | ||
| 326 | if (!(i2c->msg->flags & I2C_M_IGNORE_NAK)) { | ||
| 327 | if (iicstat & S3C2410_IICSTAT_LASTBIT) { | ||
| 328 | dev_dbg(i2c->dev, "WRITE: No Ack\n"); | ||
| 329 | |||
| 330 | s3c24xx_i2c_stop(i2c, -ECONNREFUSED); | ||
| 331 | goto out_ack; | ||
| 332 | } | ||
| 333 | } | ||
| 334 | |||
| 326 | retry_write: | 335 | retry_write: |
| 336 | |||
| 327 | if (!is_msgend(i2c)) { | 337 | if (!is_msgend(i2c)) { |
| 328 | byte = i2c->msg->buf[i2c->msg_ptr++]; | 338 | byte = i2c->msg->buf[i2c->msg_ptr++]; |
| 329 | writeb(byte, i2c->regs + S3C2410_IICDS); | 339 | writeb(byte, i2c->regs + S3C2410_IICDS); |
| @@ -377,17 +387,6 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat) | |||
| 377 | * going to do any more read/write | 387 | * going to do any more read/write |
| 378 | */ | 388 | */ |
| 379 | 389 | ||
| 380 | if (!(i2c->msg->flags & I2C_M_IGNORE_NAK) && | ||
| 381 | !(is_msglast(i2c) && is_lastmsg(i2c))) { | ||
| 382 | |||
| 383 | if (iicstat & S3C2410_IICSTAT_LASTBIT) { | ||
| 384 | dev_dbg(i2c->dev, "READ: No Ack\n"); | ||
| 385 | |||
| 386 | s3c24xx_i2c_stop(i2c, -ECONNREFUSED); | ||
| 387 | goto out_ack; | ||
| 388 | } | ||
| 389 | } | ||
| 390 | |||
| 391 | byte = readb(i2c->regs + S3C2410_IICDS); | 390 | byte = readb(i2c->regs + S3C2410_IICDS); |
| 392 | i2c->msg->buf[i2c->msg_ptr++] = byte; | 391 | i2c->msg->buf[i2c->msg_ptr++] = byte; |
| 393 | 392 | ||
| @@ -949,3 +948,4 @@ MODULE_DESCRIPTION("S3C24XX I2C Bus driver"); | |||
| 949 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); | 948 | MODULE_AUTHOR("Ben Dooks, <ben@simtec.co.uk>"); |
| 950 | MODULE_LICENSE("GPL"); | 949 | MODULE_LICENSE("GPL"); |
| 951 | MODULE_ALIAS("platform:s3c2410-i2c"); | 950 | MODULE_ALIAS("platform:s3c2410-i2c"); |
| 951 | MODULE_ALIAS("platform:s3c2440-i2c"); | ||
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 8e07de23d220..1607536ff5fb 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
| @@ -823,6 +823,13 @@ config BLK_DEV_IDE_RAPIDE | |||
| 823 | Say Y here if you want to support the Yellowstone RapIDE controller | 823 | Say Y here if you want to support the Yellowstone RapIDE controller |
| 824 | manufactured for use with Acorn computers. | 824 | manufactured for use with Acorn computers. |
| 825 | 825 | ||
| 826 | config BLK_DEV_IDE_BAST | ||
| 827 | tristate "Simtec BAST / Thorcom VR1000 IDE support" | ||
| 828 | depends on ARM && (ARCH_BAST || MACH_VR1000) | ||
| 829 | help | ||
| 830 | Say Y here if you want to support the onboard IDE channels on the | ||
| 831 | Simtec BAST or the Thorcom VR1000 | ||
| 832 | |||
| 826 | config IDE_H8300 | 833 | config IDE_H8300 |
| 827 | tristate "H8300 IDE support" | 834 | tristate "H8300 IDE support" |
| 828 | depends on H8300 | 835 | depends on H8300 |
diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile index 5bc26053afa6..936e7b0237f5 100644 --- a/drivers/ide/arm/Makefile +++ b/drivers/ide/arm/Makefile | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o | 2 | obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o |
| 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o | 3 | obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o |
| 4 | obj-$(CONFIG_BLK_DEV_IDE_BAST) += bast-ide.o | ||
| 4 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o | 5 | obj-$(CONFIG_BLK_DEV_PALMCHIP_BK3710) += palm_bk3710.o |
| 5 | 6 | ||
| 6 | ifeq ($(CONFIG_IDE_ARM), m) | 7 | ifeq ($(CONFIG_IDE_ARM), m) |
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c new file mode 100644 index 000000000000..8e8c28104b45 --- /dev/null +++ b/drivers/ide/arm/bast-ide.c | |||
| @@ -0,0 +1,90 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2003-2004 Simtec Electronics | ||
| 3 | * Ben Dooks <ben@simtec.co.uk> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/module.h> | ||
| 12 | #include <linux/errno.h> | ||
| 13 | #include <linux/ide.h> | ||
| 14 | #include <linux/init.h> | ||
| 15 | |||
| 16 | #include <asm/mach-types.h> | ||
| 17 | |||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/irq.h> | ||
| 20 | #include <asm/arch/map.h> | ||
| 21 | #include <asm/arch/bast-map.h> | ||
| 22 | #include <asm/arch/bast-irq.h> | ||
| 23 | |||
| 24 | #define DRV_NAME "bast-ide" | ||
| 25 | |||
| 26 | static int __init bastide_register(unsigned int base, unsigned int aux, int irq) | ||
| 27 | { | ||
| 28 | ide_hwif_t *hwif; | ||
| 29 | hw_regs_t hw; | ||
| 30 | int i; | ||
| 31 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | ||
| 32 | |||
| 33 | memset(&hw, 0, sizeof(hw)); | ||
| 34 | |||
| 35 | base += BAST_IDE_CS; | ||
| 36 | aux += BAST_IDE_CS; | ||
| 37 | |||
| 38 | for (i = 0; i <= 7; i++) { | ||
| 39 | hw.io_ports_array[i] = (unsigned long)base; | ||
| 40 | base += 0x20; | ||
| 41 | } | ||
| 42 | |||
| 43 | hw.io_ports.ctl_addr = aux + (6 * 0x20); | ||
| 44 | hw.irq = irq; | ||
| 45 | hw.chipset = ide_generic; | ||
| 46 | |||
| 47 | hwif = ide_find_port(); | ||
| 48 | if (hwif == NULL) | ||
| 49 | goto out; | ||
| 50 | |||
| 51 | i = hwif->index; | ||
| 52 | |||
| 53 | ide_init_port_data(hwif, i); | ||
| 54 | ide_init_port_hw(hwif, &hw); | ||
| 55 | hwif->port_ops = NULL; | ||
| 56 | |||
| 57 | idx[0] = i; | ||
| 58 | |||
| 59 | ide_device_add(idx, NULL); | ||
| 60 | out: | ||
| 61 | return 0; | ||
| 62 | } | ||
| 63 | |||
| 64 | static int __init bastide_init(void) | ||
| 65 | { | ||
| 66 | unsigned long base = BAST_VA_IDEPRI + BAST_IDE_CS; | ||
| 67 | |||
| 68 | /* we can treat the VR1000 and the BAST the same */ | ||
| 69 | |||
| 70 | if (!(machine_is_bast() || machine_is_vr1000())) | ||
| 71 | return 0; | ||
| 72 | |||
| 73 | printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n"); | ||
| 74 | |||
| 75 | if (!request_mem_region(base, 0x400000, DRV_NAME)) { | ||
| 76 | printk(KERN_ERR "%s: resources busy\n", DRV_NAME); | ||
| 77 | return -EBUSY; | ||
| 78 | } | ||
| 79 | |||
| 80 | bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0); | ||
| 81 | bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1); | ||
| 82 | |||
| 83 | return 0; | ||
| 84 | } | ||
| 85 | |||
| 86 | module_init(bastide_init); | ||
| 87 | |||
| 88 | MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>"); | ||
| 89 | MODULE_LICENSE("GPL"); | ||
| 90 | MODULE_DESCRIPTION("Simtec BAST / Thorcom VR1000 IDE driver"); | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 380fa0c8cc84..d27061b39324 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -646,8 +646,6 @@ static int ide_register_port(ide_hwif_t *hwif) | |||
| 646 | goto out; | 646 | goto out; |
| 647 | } | 647 | } |
| 648 | 648 | ||
| 649 | get_device(&hwif->gendev); | ||
| 650 | |||
| 651 | hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, | 649 | hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev, |
| 652 | MKDEV(0, 0), hwif, hwif->name); | 650 | MKDEV(0, 0), hwif, hwif->name); |
| 653 | if (IS_ERR(hwif->portdev)) { | 651 | if (IS_ERR(hwif->portdev)) { |
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 55ec7f798772..8af88bf0969b 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
| @@ -76,7 +76,7 @@ static int proc_ide_read_mate | |||
| 76 | ide_hwif_t *hwif = (ide_hwif_t *) data; | 76 | ide_hwif_t *hwif = (ide_hwif_t *) data; |
| 77 | int len; | 77 | int len; |
| 78 | 78 | ||
| 79 | if (hwif && hwif->mate && hwif->mate->present) | 79 | if (hwif && hwif->mate) |
| 80 | len = sprintf(page, "%s\n", hwif->mate->name); | 80 | len = sprintf(page, "%s\n", hwif->mate->name); |
| 81 | else | 81 | else |
| 82 | len = sprintf(page, "(none)\n"); | 82 | len = sprintf(page, "(none)\n"); |
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index c758dcb13b14..300431d080a9 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -315,13 +315,14 @@ void ide_unregister(ide_hwif_t *hwif) | |||
| 315 | 315 | ||
| 316 | BUG_ON(in_interrupt()); | 316 | BUG_ON(in_interrupt()); |
| 317 | BUG_ON(irqs_disabled()); | 317 | BUG_ON(irqs_disabled()); |
| 318 | |||
| 318 | mutex_lock(&ide_cfg_mtx); | 319 | mutex_lock(&ide_cfg_mtx); |
| 319 | spin_lock_irq(&ide_lock); | ||
| 320 | if (!hwif->present) | ||
| 321 | goto abort; | ||
| 322 | __ide_port_unregister_devices(hwif); | ||
| 323 | hwif->present = 0; | ||
| 324 | 320 | ||
| 321 | spin_lock_irq(&ide_lock); | ||
| 322 | if (hwif->present) { | ||
| 323 | __ide_port_unregister_devices(hwif); | ||
| 324 | hwif->present = 0; | ||
| 325 | } | ||
| 325 | spin_unlock_irq(&ide_lock); | 326 | spin_unlock_irq(&ide_lock); |
| 326 | 327 | ||
| 327 | ide_proc_unregister_port(hwif); | 328 | ide_proc_unregister_port(hwif); |
| @@ -351,16 +352,15 @@ void ide_unregister(ide_hwif_t *hwif) | |||
| 351 | blk_unregister_region(MKDEV(hwif->major, 0), MAX_DRIVES<<PARTN_BITS); | 352 | blk_unregister_region(MKDEV(hwif->major, 0), MAX_DRIVES<<PARTN_BITS); |
| 352 | kfree(hwif->sg_table); | 353 | kfree(hwif->sg_table); |
| 353 | unregister_blkdev(hwif->major, hwif->name); | 354 | unregister_blkdev(hwif->major, hwif->name); |
| 354 | spin_lock_irq(&ide_lock); | ||
| 355 | 355 | ||
| 356 | if (hwif->dma_base) | 356 | if (hwif->dma_base) |
| 357 | ide_release_dma_engine(hwif); | 357 | ide_release_dma_engine(hwif); |
| 358 | 358 | ||
| 359 | spin_lock_irq(&ide_lock); | ||
| 359 | /* restore hwif data to pristine status */ | 360 | /* restore hwif data to pristine status */ |
| 360 | ide_init_port_data(hwif, hwif->index); | 361 | ide_init_port_data(hwif, hwif->index); |
| 361 | |||
| 362 | abort: | ||
| 363 | spin_unlock_irq(&ide_lock); | 362 | spin_unlock_irq(&ide_lock); |
| 363 | |||
| 364 | mutex_unlock(&ide_cfg_mtx); | 364 | mutex_unlock(&ide_cfg_mtx); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| @@ -1094,13 +1094,6 @@ struct bus_type ide_bus_type = { | |||
| 1094 | 1094 | ||
| 1095 | EXPORT_SYMBOL_GPL(ide_bus_type); | 1095 | EXPORT_SYMBOL_GPL(ide_bus_type); |
| 1096 | 1096 | ||
| 1097 | static void ide_port_class_release(struct device *portdev) | ||
| 1098 | { | ||
| 1099 | ide_hwif_t *hwif = dev_get_drvdata(portdev); | ||
| 1100 | |||
| 1101 | put_device(&hwif->gendev); | ||
| 1102 | } | ||
| 1103 | |||
| 1104 | int ide_vlb_clk; | 1097 | int ide_vlb_clk; |
| 1105 | EXPORT_SYMBOL_GPL(ide_vlb_clk); | 1098 | EXPORT_SYMBOL_GPL(ide_vlb_clk); |
| 1106 | 1099 | ||
| @@ -1305,7 +1298,6 @@ static int __init ide_init(void) | |||
| 1305 | ret = PTR_ERR(ide_port_class); | 1298 | ret = PTR_ERR(ide_port_class); |
| 1306 | goto out_port_class; | 1299 | goto out_port_class; |
| 1307 | } | 1300 | } |
| 1308 | ide_port_class->dev_release = ide_port_class_release; | ||
| 1309 | 1301 | ||
| 1310 | init_ide_data(); | 1302 | init_ide_data(); |
| 1311 | 1303 | ||
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c index eebc72465fc9..72c63e5dd630 100644 --- a/drivers/input/ff-core.c +++ b/drivers/input/ff-core.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/sched.h> | ||
| 31 | 32 | ||
| 32 | /* | 33 | /* |
| 33 | * Check that the effect_id is a valid effect and whether the user | 34 | * Check that the effect_id is a valid effect and whether the user |
| @@ -166,8 +167,10 @@ int input_ff_upload(struct input_dev *dev, struct ff_effect *effect, | |||
| 166 | if (ret) | 167 | if (ret) |
| 167 | goto out; | 168 | goto out; |
| 168 | 169 | ||
| 170 | spin_lock_irq(&dev->event_lock); | ||
| 169 | ff->effects[id] = *effect; | 171 | ff->effects[id] = *effect; |
| 170 | ff->effect_owners[id] = file; | 172 | ff->effect_owners[id] = file; |
| 173 | spin_unlock_irq(&dev->event_lock); | ||
| 171 | 174 | ||
| 172 | out: | 175 | out: |
| 173 | mutex_unlock(&ff->mutex); | 176 | mutex_unlock(&ff->mutex); |
| @@ -189,16 +192,22 @@ static int erase_effect(struct input_dev *dev, int effect_id, | |||
| 189 | if (error) | 192 | if (error) |
| 190 | return error; | 193 | return error; |
| 191 | 194 | ||
| 195 | spin_lock_irq(&dev->event_lock); | ||
| 192 | ff->playback(dev, effect_id, 0); | 196 | ff->playback(dev, effect_id, 0); |
| 197 | ff->effect_owners[effect_id] = NULL; | ||
| 198 | spin_unlock_irq(&dev->event_lock); | ||
| 193 | 199 | ||
| 194 | if (ff->erase) { | 200 | if (ff->erase) { |
| 195 | error = ff->erase(dev, effect_id); | 201 | error = ff->erase(dev, effect_id); |
| 196 | if (error) | 202 | if (error) { |
| 203 | spin_lock_irq(&dev->event_lock); | ||
| 204 | ff->effect_owners[effect_id] = file; | ||
| 205 | spin_unlock_irq(&dev->event_lock); | ||
| 206 | |||
| 197 | return error; | 207 | return error; |
| 208 | } | ||
| 198 | } | 209 | } |
| 199 | 210 | ||
| 200 | ff->effect_owners[effect_id] = NULL; | ||
| 201 | |||
| 202 | return 0; | 211 | return 0; |
| 203 | } | 212 | } |
| 204 | 213 | ||
| @@ -263,8 +272,6 @@ int input_ff_event(struct input_dev *dev, unsigned int type, | |||
| 263 | if (type != EV_FF) | 272 | if (type != EV_FF) |
| 264 | return 0; | 273 | return 0; |
| 265 | 274 | ||
| 266 | mutex_lock(&ff->mutex); | ||
| 267 | |||
| 268 | switch (code) { | 275 | switch (code) { |
| 269 | case FF_GAIN: | 276 | case FF_GAIN: |
| 270 | if (!test_bit(FF_GAIN, dev->ffbit) || value > 0xffff) | 277 | if (!test_bit(FF_GAIN, dev->ffbit) || value > 0xffff) |
| @@ -286,7 +293,6 @@ int input_ff_event(struct input_dev *dev, unsigned int type, | |||
| 286 | break; | 293 | break; |
| 287 | } | 294 | } |
| 288 | 295 | ||
| 289 | mutex_unlock(&ff->mutex); | ||
| 290 | return 0; | 296 | return 0; |
| 291 | } | 297 | } |
| 292 | EXPORT_SYMBOL_GPL(input_ff_event); | 298 | EXPORT_SYMBOL_GPL(input_ff_event); |
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 835def11419d..ab6a61db63ce 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
| @@ -432,6 +432,7 @@ static int crypt_convert(struct crypt_config *cc, | |||
| 432 | case 0: | 432 | case 0: |
| 433 | atomic_dec(&ctx->pending); | 433 | atomic_dec(&ctx->pending); |
| 434 | ctx->sector++; | 434 | ctx->sector++; |
| 435 | cond_resched(); | ||
| 435 | continue; | 436 | continue; |
| 436 | 437 | ||
| 437 | /* error */ | 438 | /* error */ |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 7cf512a34ccf..2580ac1b9b0f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -3897,8 +3897,10 @@ static void autorun_devices(int part) | |||
| 3897 | 3897 | ||
| 3898 | md_probe(dev, NULL, NULL); | 3898 | md_probe(dev, NULL, NULL); |
| 3899 | mddev = mddev_find(dev); | 3899 | mddev = mddev_find(dev); |
| 3900 | if (!mddev) { | 3900 | if (!mddev || !mddev->gendisk) { |
| 3901 | printk(KERN_ERR | 3901 | if (mddev) |
| 3902 | mddev_put(mddev); | ||
| 3903 | printk(KERN_ERR | ||
| 3902 | "md: cannot allocate memory for md drive.\n"); | 3904 | "md: cannot allocate memory for md drive.\n"); |
| 3903 | break; | 3905 | break; |
| 3904 | } | 3906 | } |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 1de17da34a95..a71277b640ab 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -2137,6 +2137,8 @@ static int run(mddev_t *mddev) | |||
| 2137 | !test_bit(In_sync, &disk->rdev->flags)) { | 2137 | !test_bit(In_sync, &disk->rdev->flags)) { |
| 2138 | disk->head_position = 0; | 2138 | disk->head_position = 0; |
| 2139 | mddev->degraded++; | 2139 | mddev->degraded++; |
| 2140 | if (disk->rdev) | ||
| 2141 | conf->fullsync = 1; | ||
| 2140 | } | 2142 | } |
| 2141 | } | 2143 | } |
| 2142 | 2144 | ||
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index c37e256b1176..54c8ee28fcc4 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -2898,6 +2898,8 @@ static void handle_stripe5(struct stripe_head *sh) | |||
| 2898 | 2898 | ||
| 2899 | for (i = conf->raid_disks; i--; ) { | 2899 | for (i = conf->raid_disks; i--; ) { |
| 2900 | set_bit(R5_Wantwrite, &sh->dev[i].flags); | 2900 | set_bit(R5_Wantwrite, &sh->dev[i].flags); |
| 2901 | set_bit(R5_LOCKED, &dev->flags); | ||
| 2902 | s.locked++; | ||
| 2901 | if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending)) | 2903 | if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending)) |
| 2902 | sh->ops.count++; | 2904 | sh->ops.count++; |
| 2903 | } | 2905 | } |
| @@ -2911,6 +2913,7 @@ static void handle_stripe5(struct stripe_head *sh) | |||
| 2911 | conf->raid_disks); | 2913 | conf->raid_disks); |
| 2912 | s.locked += handle_write_operations5(sh, 1, 1); | 2914 | s.locked += handle_write_operations5(sh, 1, 1); |
| 2913 | } else if (s.expanded && | 2915 | } else if (s.expanded && |
| 2916 | s.locked == 0 && | ||
| 2914 | !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) { | 2917 | !test_bit(STRIPE_OP_POSTXOR, &sh->ops.pending)) { |
| 2915 | clear_bit(STRIPE_EXPAND_READY, &sh->state); | 2918 | clear_bit(STRIPE_EXPAND_READY, &sh->state); |
| 2916 | atomic_dec(&conf->reshape_stripes); | 2919 | atomic_dec(&conf->reshape_stripes); |
| @@ -4305,7 +4308,9 @@ static int run(mddev_t *mddev) | |||
| 4305 | " disk %d\n", bdevname(rdev->bdev,b), | 4308 | " disk %d\n", bdevname(rdev->bdev,b), |
| 4306 | raid_disk); | 4309 | raid_disk); |
| 4307 | working_disks++; | 4310 | working_disks++; |
| 4308 | } | 4311 | } else |
| 4312 | /* Cannot rely on bitmap to complete recovery */ | ||
| 4313 | conf->fullsync = 1; | ||
| 4309 | } | 4314 | } |
| 4310 | 4315 | ||
| 4311 | /* | 4316 | /* |
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c index a3485817e46c..8fa91f846d59 100644 --- a/drivers/media/common/ir-keymaps.c +++ b/drivers/media/common/ir-keymaps.c | |||
| @@ -2201,3 +2201,41 @@ IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE] = { | |||
| 2201 | [0x25] = KEY_POWER, /* power */ | 2201 | [0x25] = KEY_POWER, /* power */ |
| 2202 | }; | 2202 | }; |
| 2203 | EXPORT_SYMBOL_GPL(ir_codes_powercolor_real_angel); | 2203 | EXPORT_SYMBOL_GPL(ir_codes_powercolor_real_angel); |
| 2204 | |||
| 2205 | IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = { | ||
| 2206 | [0x20] = KEY_LIST, | ||
| 2207 | [0x00] = KEY_POWER, | ||
| 2208 | [0x28] = KEY_1, | ||
| 2209 | [0x18] = KEY_2, | ||
| 2210 | [0x38] = KEY_3, | ||
| 2211 | [0x24] = KEY_4, | ||
| 2212 | [0x14] = KEY_5, | ||
| 2213 | [0x34] = KEY_6, | ||
| 2214 | [0x2c] = KEY_7, | ||
| 2215 | [0x1c] = KEY_8, | ||
| 2216 | [0x3c] = KEY_9, | ||
| 2217 | [0x12] = KEY_SUBTITLE, | ||
| 2218 | [0x22] = KEY_0, | ||
| 2219 | [0x32] = KEY_REWIND, | ||
| 2220 | [0x3a] = KEY_SHUFFLE, | ||
| 2221 | [0x02] = KEY_PRINT, | ||
| 2222 | [0x11] = KEY_CHANNELDOWN, | ||
| 2223 | [0x31] = KEY_CHANNELUP, | ||
| 2224 | [0x0c] = KEY_ZOOM, | ||
| 2225 | [0x1e] = KEY_VOLUMEDOWN, | ||
| 2226 | [0x3e] = KEY_VOLUMEUP, | ||
| 2227 | [0x0a] = KEY_MUTE, | ||
| 2228 | [0x04] = KEY_AUDIO, | ||
| 2229 | [0x26] = KEY_RECORD, | ||
| 2230 | [0x06] = KEY_PLAY, | ||
| 2231 | [0x36] = KEY_STOP, | ||
| 2232 | [0x16] = KEY_PAUSE, | ||
| 2233 | [0x2e] = KEY_REWIND, | ||
| 2234 | [0x0e] = KEY_FASTFORWARD, | ||
| 2235 | [0x30] = KEY_TEXT, | ||
| 2236 | [0x21] = KEY_GREEN, | ||
| 2237 | [0x01] = KEY_BLUE, | ||
| 2238 | [0x08] = KEY_EPG, | ||
| 2239 | [0x2a] = KEY_MENU, | ||
| 2240 | }; | ||
| 2241 | EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d); | ||
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c index f1894fec32b9..6fb5b4586569 100644 --- a/drivers/media/common/tuners/tda18271-common.c +++ b/drivers/media/common/tuners/tda18271-common.c | |||
| @@ -649,9 +649,17 @@ int tda18271_calc_rf_cal(struct dvb_frontend *fe, u32 *freq) | |||
| 649 | u8 val; | 649 | u8 val; |
| 650 | 650 | ||
| 651 | int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val); | 651 | int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val); |
| 652 | /* The TDA18271HD/C1 rf_cal map lookup is expected to go out of range | ||
| 653 | * for frequencies above 61.1 MHz. In these cases, the internal RF | ||
| 654 | * tracking filters calibration mechanism is used. | ||
| 655 | * | ||
| 656 | * There is no need to warn the user about this. | ||
| 657 | */ | ||
| 658 | if (ret < 0) | ||
| 659 | goto fail; | ||
| 652 | 660 | ||
| 653 | regs[R_EB14] = val; | 661 | regs[R_EB14] = val; |
| 654 | 662 | fail: | |
| 655 | return ret; | 663 | return ret; |
| 656 | } | 664 | } |
| 657 | 665 | ||
diff --git a/drivers/media/common/tuners/tda18271-fe.c b/drivers/media/common/tuners/tda18271-fe.c index 89c01fb1f859..93063c6fbbf6 100644 --- a/drivers/media/common/tuners/tda18271-fe.c +++ b/drivers/media/common/tuners/tda18271-fe.c | |||
| @@ -45,6 +45,21 @@ static inline int charge_pump_source(struct dvb_frontend *fe, int force) | |||
| 45 | TDA18271_MAIN_PLL, force); | 45 | TDA18271_MAIN_PLL, force); |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | static inline void tda18271_set_if_notch(struct dvb_frontend *fe) | ||
| 49 | { | ||
| 50 | struct tda18271_priv *priv = fe->tuner_priv; | ||
| 51 | unsigned char *regs = priv->tda18271_regs; | ||
| 52 | |||
| 53 | switch (priv->mode) { | ||
| 54 | case TDA18271_ANALOG: | ||
| 55 | regs[R_MPD] &= ~0x80; /* IF notch = 0 */ | ||
| 56 | break; | ||
| 57 | case TDA18271_DIGITAL: | ||
| 58 | regs[R_MPD] |= 0x80; /* IF notch = 1 */ | ||
| 59 | break; | ||
| 60 | } | ||
| 61 | } | ||
| 62 | |||
| 48 | static int tda18271_channel_configuration(struct dvb_frontend *fe, | 63 | static int tda18271_channel_configuration(struct dvb_frontend *fe, |
| 49 | struct tda18271_std_map_item *map, | 64 | struct tda18271_std_map_item *map, |
| 50 | u32 freq, u32 bw) | 65 | u32 freq, u32 bw) |
| @@ -60,25 +75,18 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, | |||
| 60 | regs[R_EP3] &= ~0x1f; /* clear std bits */ | 75 | regs[R_EP3] &= ~0x1f; /* clear std bits */ |
| 61 | regs[R_EP3] |= (map->agc_mode << 3) | map->std; | 76 | regs[R_EP3] |= (map->agc_mode << 3) | map->std; |
| 62 | 77 | ||
| 63 | /* set rfagc to high speed mode */ | 78 | if (priv->id == TDA18271HDC2) { |
| 64 | regs[R_EP3] &= ~0x04; | 79 | /* set rfagc to high speed mode */ |
| 80 | regs[R_EP3] &= ~0x04; | ||
| 81 | } | ||
| 65 | 82 | ||
| 66 | /* set cal mode to normal */ | 83 | /* set cal mode to normal */ |
| 67 | regs[R_EP4] &= ~0x03; | 84 | regs[R_EP4] &= ~0x03; |
| 68 | 85 | ||
| 69 | /* update IF output level & IF notch frequency */ | 86 | /* update IF output level */ |
| 70 | regs[R_EP4] &= ~0x1c; /* clear if level bits */ | 87 | regs[R_EP4] &= ~0x1c; /* clear if level bits */ |
| 71 | regs[R_EP4] |= (map->if_lvl << 2); | 88 | regs[R_EP4] |= (map->if_lvl << 2); |
| 72 | 89 | ||
| 73 | switch (priv->mode) { | ||
| 74 | case TDA18271_ANALOG: | ||
| 75 | regs[R_MPD] &= ~0x80; /* IF notch = 0 */ | ||
| 76 | break; | ||
| 77 | case TDA18271_DIGITAL: | ||
| 78 | regs[R_MPD] |= 0x80; /* IF notch = 1 */ | ||
| 79 | break; | ||
| 80 | } | ||
| 81 | |||
| 82 | /* update FM_RFn */ | 90 | /* update FM_RFn */ |
| 83 | regs[R_EP4] &= ~0x80; | 91 | regs[R_EP4] &= ~0x80; |
| 84 | regs[R_EP4] |= map->fm_rfn << 7; | 92 | regs[R_EP4] |= map->fm_rfn << 7; |
| @@ -95,6 +103,9 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, | |||
| 95 | /* disable Power Level Indicator */ | 103 | /* disable Power Level Indicator */ |
| 96 | regs[R_EP1] |= 0x40; | 104 | regs[R_EP1] |= 0x40; |
| 97 | 105 | ||
| 106 | /* make sure thermometer is off */ | ||
| 107 | regs[R_TM] &= ~0x10; | ||
| 108 | |||
| 98 | /* frequency dependent parameters */ | 109 | /* frequency dependent parameters */ |
| 99 | 110 | ||
| 100 | tda18271_calc_ir_measure(fe, &freq); | 111 | tda18271_calc_ir_measure(fe, &freq); |
| @@ -135,6 +146,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, | |||
| 135 | switch (priv->role) { | 146 | switch (priv->role) { |
| 136 | case TDA18271_MASTER: | 147 | case TDA18271_MASTER: |
| 137 | tda18271_calc_main_pll(fe, N); | 148 | tda18271_calc_main_pll(fe, N); |
| 149 | tda18271_set_if_notch(fe); | ||
| 138 | tda18271_write_regs(fe, R_MPD, 4); | 150 | tda18271_write_regs(fe, R_MPD, 4); |
| 139 | break; | 151 | break; |
| 140 | case TDA18271_SLAVE: | 152 | case TDA18271_SLAVE: |
| @@ -142,6 +154,7 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, | |||
| 142 | tda18271_write_regs(fe, R_CPD, 4); | 154 | tda18271_write_regs(fe, R_CPD, 4); |
| 143 | 155 | ||
| 144 | regs[R_MPD] = regs[R_CPD] & 0x7f; | 156 | regs[R_MPD] = regs[R_CPD] & 0x7f; |
| 157 | tda18271_set_if_notch(fe); | ||
| 145 | tda18271_write_regs(fe, R_MPD, 1); | 158 | tda18271_write_regs(fe, R_MPD, 1); |
| 146 | break; | 159 | break; |
| 147 | } | 160 | } |
| @@ -160,12 +173,14 @@ static int tda18271_channel_configuration(struct dvb_frontend *fe, | |||
| 160 | 173 | ||
| 161 | msleep(20); | 174 | msleep(20); |
| 162 | 175 | ||
| 163 | /* set rfagc to normal speed mode */ | 176 | if (priv->id == TDA18271HDC2) { |
| 164 | if (map->fm_rfn) | 177 | /* set rfagc to normal speed mode */ |
| 165 | regs[R_EP3] &= ~0x04; | 178 | if (map->fm_rfn) |
| 166 | else | 179 | regs[R_EP3] &= ~0x04; |
| 167 | regs[R_EP3] |= 0x04; | 180 | else |
| 168 | ret = tda18271_write_regs(fe, R_EP3, 1); | 181 | regs[R_EP3] |= 0x04; |
| 182 | ret = tda18271_write_regs(fe, R_EP3, 1); | ||
| 183 | } | ||
| 169 | fail: | 184 | fail: |
| 170 | return ret; | 185 | return ret; |
| 171 | } | 186 | } |
| @@ -507,7 +522,7 @@ static int tda18271_powerscan_init(struct dvb_frontend *fe) | |||
| 507 | /* set cal mode to normal */ | 522 | /* set cal mode to normal */ |
| 508 | regs[R_EP4] &= ~0x03; | 523 | regs[R_EP4] &= ~0x03; |
| 509 | 524 | ||
| 510 | /* update IF output level & IF notch frequency */ | 525 | /* update IF output level */ |
| 511 | regs[R_EP4] &= ~0x1c; /* clear if level bits */ | 526 | regs[R_EP4] &= ~0x1c; /* clear if level bits */ |
| 512 | 527 | ||
| 513 | ret = tda18271_write_regs(fe, R_EP3, 2); | 528 | ret = tda18271_write_regs(fe, R_EP3, 2); |
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index ceae6db901ec..7cf4f5bdb2ec 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
| @@ -177,6 +177,7 @@ static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = { | |||
| 177 | {"FM Radio-INPUT1", 0x0208, 0x9002} | 177 | {"FM Radio-INPUT1", 0x0208, 0x9002} |
| 178 | }; | 178 | }; |
| 179 | 179 | ||
| 180 | static int xc5000_is_firmware_loaded(struct dvb_frontend *fe); | ||
| 180 | static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len); | 181 | static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len); |
| 181 | static int xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len); | 182 | static int xc5000_readregs(struct xc5000_priv *priv, u8 *buf, u8 len); |
| 182 | static void xc5000_TunerReset(struct dvb_frontend *fe); | 183 | static void xc5000_TunerReset(struct dvb_frontend *fe); |
| @@ -352,7 +353,7 @@ static int xc_SetTVStandard(struct xc5000_priv *priv, | |||
| 352 | 353 | ||
| 353 | static int xc_shutdown(struct xc5000_priv *priv) | 354 | static int xc_shutdown(struct xc5000_priv *priv) |
| 354 | { | 355 | { |
| 355 | return 0; | 356 | return XC_RESULT_SUCCESS; |
| 356 | /* Fixme: cannot bring tuner back alive once shutdown | 357 | /* Fixme: cannot bring tuner back alive once shutdown |
| 357 | * without reloading the driver modules. | 358 | * without reloading the driver modules. |
| 358 | * return xc_write_reg(priv, XREG_POWER_DOWN, 0); | 359 | * return xc_write_reg(priv, XREG_POWER_DOWN, 0); |
| @@ -685,6 +686,25 @@ static int xc5000_set_params(struct dvb_frontend *fe, | |||
| 685 | return 0; | 686 | return 0; |
| 686 | } | 687 | } |
| 687 | 688 | ||
| 689 | static int xc5000_is_firmware_loaded(struct dvb_frontend *fe) | ||
| 690 | { | ||
| 691 | struct xc5000_priv *priv = fe->tuner_priv; | ||
| 692 | int ret; | ||
| 693 | u16 id; | ||
| 694 | |||
| 695 | ret = xc5000_readreg(priv, XREG_PRODUCT_ID, &id); | ||
| 696 | if (ret == XC_RESULT_SUCCESS) { | ||
| 697 | if (id == XC_PRODUCT_ID_FW_NOT_LOADED) | ||
| 698 | ret = XC_RESULT_RESET_FAILURE; | ||
| 699 | else | ||
| 700 | ret = XC_RESULT_SUCCESS; | ||
| 701 | } | ||
| 702 | |||
| 703 | dprintk(1, "%s() returns %s id = 0x%x\n", __func__, | ||
| 704 | ret == XC_RESULT_SUCCESS ? "True" : "False", id); | ||
| 705 | return ret; | ||
| 706 | } | ||
| 707 | |||
| 688 | static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe); | 708 | static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe); |
| 689 | 709 | ||
| 690 | static int xc5000_set_analog_params(struct dvb_frontend *fe, | 710 | static int xc5000_set_analog_params(struct dvb_frontend *fe, |
| @@ -693,7 +713,7 @@ static int xc5000_set_analog_params(struct dvb_frontend *fe, | |||
| 693 | struct xc5000_priv *priv = fe->tuner_priv; | 713 | struct xc5000_priv *priv = fe->tuner_priv; |
| 694 | int ret; | 714 | int ret; |
| 695 | 715 | ||
| 696 | if(priv->fwloaded == 0) | 716 | if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) |
| 697 | xc_load_fw_and_init_tuner(fe); | 717 | xc_load_fw_and_init_tuner(fe); |
| 698 | 718 | ||
| 699 | dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", | 719 | dprintk(1, "%s() frequency=%d (in units of 62.5khz)\n", |
| @@ -808,11 +828,10 @@ static int xc_load_fw_and_init_tuner(struct dvb_frontend *fe) | |||
| 808 | struct xc5000_priv *priv = fe->tuner_priv; | 828 | struct xc5000_priv *priv = fe->tuner_priv; |
| 809 | int ret = 0; | 829 | int ret = 0; |
| 810 | 830 | ||
| 811 | if (priv->fwloaded == 0) { | 831 | if (xc5000_is_firmware_loaded(fe) != XC_RESULT_SUCCESS) { |
| 812 | ret = xc5000_fwupload(fe); | 832 | ret = xc5000_fwupload(fe); |
| 813 | if (ret != XC_RESULT_SUCCESS) | 833 | if (ret != XC_RESULT_SUCCESS) |
| 814 | return ret; | 834 | return ret; |
| 815 | priv->fwloaded = 1; | ||
| 816 | } | 835 | } |
| 817 | 836 | ||
| 818 | /* Start the tuner self-calibration process */ | 837 | /* Start the tuner self-calibration process */ |
| @@ -852,7 +871,6 @@ static int xc5000_sleep(struct dvb_frontend *fe) | |||
| 852 | return -EREMOTEIO; | 871 | return -EREMOTEIO; |
| 853 | } | 872 | } |
| 854 | else { | 873 | else { |
| 855 | /* priv->fwloaded = 0; */ | ||
| 856 | return XC_RESULT_SUCCESS; | 874 | return XC_RESULT_SUCCESS; |
| 857 | } | 875 | } |
| 858 | } | 876 | } |
| @@ -933,7 +951,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, | |||
| 933 | cfg->i2c_address); | 951 | cfg->i2c_address); |
| 934 | printk(KERN_INFO | 952 | printk(KERN_INFO |
| 935 | "xc5000: Firmware has been loaded previously\n"); | 953 | "xc5000: Firmware has been loaded previously\n"); |
| 936 | priv->fwloaded = 1; | ||
| 937 | break; | 954 | break; |
| 938 | case XC_PRODUCT_ID_FW_NOT_LOADED: | 955 | case XC_PRODUCT_ID_FW_NOT_LOADED: |
| 939 | printk(KERN_INFO | 956 | printk(KERN_INFO |
| @@ -941,7 +958,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, | |||
| 941 | cfg->i2c_address); | 958 | cfg->i2c_address); |
| 942 | printk(KERN_INFO | 959 | printk(KERN_INFO |
| 943 | "xc5000: Firmware has not been loaded previously\n"); | 960 | "xc5000: Firmware has not been loaded previously\n"); |
| 944 | priv->fwloaded = 0; | ||
| 945 | break; | 961 | break; |
| 946 | default: | 962 | default: |
| 947 | printk(KERN_ERR | 963 | printk(KERN_ERR |
diff --git a/drivers/media/common/tuners/xc5000_priv.h b/drivers/media/common/tuners/xc5000_priv.h index ecebfe4745ad..a72a9887fe7f 100644 --- a/drivers/media/common/tuners/xc5000_priv.h +++ b/drivers/media/common/tuners/xc5000_priv.h | |||
| @@ -30,7 +30,6 @@ struct xc5000_priv { | |||
| 30 | u32 bandwidth; | 30 | u32 bandwidth; |
| 31 | u8 video_standard; | 31 | u8 video_standard; |
| 32 | u8 rf_mode; | 32 | u8 rf_mode; |
| 33 | u8 fwloaded; | ||
| 34 | 33 | ||
| 35 | void *devptr; | 34 | void *devptr; |
| 36 | }; | 35 | }; |
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c index 0a8ac64a4e33..037f7ffb47b2 100644 --- a/drivers/media/dvb/dvb-usb/gl861.c +++ b/drivers/media/dvb/dvb-usb/gl861.c | |||
| @@ -47,6 +47,8 @@ static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr, | |||
| 47 | return -EINVAL; | 47 | return -EINVAL; |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | msleep(1); /* avoid I2C errors */ | ||
| 51 | |||
| 50 | return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), req, type, | 52 | return usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), req, type, |
| 51 | value, index, rbuf, rlen, 2000); | 53 | value, index, rbuf, rlen, 2000); |
| 52 | } | 54 | } |
| @@ -92,16 +94,6 @@ static struct i2c_algorithm gl861_i2c_algo = { | |||
| 92 | }; | 94 | }; |
| 93 | 95 | ||
| 94 | /* Callbacks for DVB USB */ | 96 | /* Callbacks for DVB USB */ |
| 95 | static int gl861_identify_state(struct usb_device *udev, | ||
| 96 | struct dvb_usb_device_properties *props, | ||
| 97 | struct dvb_usb_device_description **desc, | ||
| 98 | int *cold) | ||
| 99 | { | ||
| 100 | *cold = 0; | ||
| 101 | |||
| 102 | return 0; | ||
| 103 | } | ||
| 104 | |||
| 105 | static struct zl10353_config gl861_zl10353_config = { | 97 | static struct zl10353_config gl861_zl10353_config = { |
| 106 | .demod_address = 0x0f, | 98 | .demod_address = 0x0f, |
| 107 | .no_tuner = 1, | 99 | .no_tuner = 1, |
| @@ -172,7 +164,6 @@ static struct dvb_usb_device_properties gl861_properties = { | |||
| 172 | 164 | ||
| 173 | .size_of_priv = 0, | 165 | .size_of_priv = 0, |
| 174 | 166 | ||
| 175 | .identify_state = gl861_identify_state, | ||
| 176 | .num_adapters = 1, | 167 | .num_adapters = 1, |
| 177 | .adapter = {{ | 168 | .adapter = {{ |
| 178 | 169 | ||
| @@ -194,13 +185,15 @@ static struct dvb_usb_device_properties gl861_properties = { | |||
| 194 | 185 | ||
| 195 | .num_device_descs = 2, | 186 | .num_device_descs = 2, |
| 196 | .devices = { | 187 | .devices = { |
| 197 | { "MSI Mega Sky 55801 DVB-T USB2.0", | 188 | { |
| 198 | { &gl861_table[0], NULL }, | 189 | .name = "MSI Mega Sky 55801 DVB-T USB2.0", |
| 199 | { NULL }, | 190 | .cold_ids = { NULL }, |
| 191 | .warm_ids = { &gl861_table[0], NULL }, | ||
| 200 | }, | 192 | }, |
| 201 | { "A-LINK DTU DVB-T USB2.0", | 193 | { |
| 202 | { &gl861_table[1], NULL }, | 194 | .name = "A-LINK DTU DVB-T USB2.0", |
| 203 | { NULL }, | 195 | .cold_ids = { NULL }, |
| 196 | .warm_ids = { &gl861_table[1], NULL }, | ||
| 204 | }, | 197 | }, |
| 205 | } | 198 | } |
| 206 | }; | 199 | }; |
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c index 9e7653bb3b66..118aab1a3e54 100644 --- a/drivers/media/dvb/dvb-usb/umt-010.c +++ b/drivers/media/dvb/dvb-usb/umt-010.c | |||
| @@ -107,7 +107,7 @@ static struct dvb_usb_device_properties umt_properties = { | |||
| 107 | /* parameter for the MPEG2-data transfer */ | 107 | /* parameter for the MPEG2-data transfer */ |
| 108 | .stream = { | 108 | .stream = { |
| 109 | .type = USB_BULK, | 109 | .type = USB_BULK, |
| 110 | .count = 20, | 110 | .count = MAX_NO_URBS_FOR_DATA_STREAM, |
| 111 | .endpoint = 0x06, | 111 | .endpoint = 0x06, |
| 112 | .u = { | 112 | .u = { |
| 113 | .bulk = { | 113 | .bulk = { |
diff --git a/drivers/media/dvb/frontends/au8522.c b/drivers/media/dvb/frontends/au8522.c index 084a280c2d7f..03900d241a76 100644 --- a/drivers/media/dvb/frontends/au8522.c +++ b/drivers/media/dvb/frontends/au8522.c | |||
| @@ -463,10 +463,13 @@ static int au8522_set_frontend(struct dvb_frontend *fe, | |||
| 463 | struct dvb_frontend_parameters *p) | 463 | struct dvb_frontend_parameters *p) |
| 464 | { | 464 | { |
| 465 | struct au8522_state *state = fe->demodulator_priv; | 465 | struct au8522_state *state = fe->demodulator_priv; |
| 466 | int ret = -EINVAL; | ||
| 466 | 467 | ||
| 467 | dprintk("%s(frequency=%d)\n", __func__, p->frequency); | 468 | dprintk("%s(frequency=%d)\n", __func__, p->frequency); |
| 468 | 469 | ||
| 469 | state->current_frequency = p->frequency; | 470 | if ((state->current_frequency == p->frequency) && |
| 471 | (state->current_modulation == p->u.vsb.modulation)) | ||
| 472 | return 0; | ||
| 470 | 473 | ||
| 471 | au8522_enable_modulation(fe, p->u.vsb.modulation); | 474 | au8522_enable_modulation(fe, p->u.vsb.modulation); |
| 472 | 475 | ||
| @@ -476,11 +479,16 @@ static int au8522_set_frontend(struct dvb_frontend *fe, | |||
| 476 | if (fe->ops.tuner_ops.set_params) { | 479 | if (fe->ops.tuner_ops.set_params) { |
| 477 | if (fe->ops.i2c_gate_ctrl) | 480 | if (fe->ops.i2c_gate_ctrl) |
| 478 | fe->ops.i2c_gate_ctrl(fe, 1); | 481 | fe->ops.i2c_gate_ctrl(fe, 1); |
| 479 | fe->ops.tuner_ops.set_params(fe, p); | 482 | ret = fe->ops.tuner_ops.set_params(fe, p); |
| 480 | if (fe->ops.i2c_gate_ctrl) | 483 | if (fe->ops.i2c_gate_ctrl) |
| 481 | fe->ops.i2c_gate_ctrl(fe, 0); | 484 | fe->ops.i2c_gate_ctrl(fe, 0); |
| 482 | } | 485 | } |
| 483 | 486 | ||
| 487 | if (ret < 0) | ||
| 488 | return ret; | ||
| 489 | |||
| 490 | state->current_frequency = p->frequency; | ||
| 491 | |||
| 484 | return 0; | 492 | return 0; |
| 485 | } | 493 | } |
| 486 | 494 | ||
| @@ -498,6 +506,16 @@ static int au8522_init(struct dvb_frontend *fe) | |||
| 498 | return 0; | 506 | return 0; |
| 499 | } | 507 | } |
| 500 | 508 | ||
| 509 | static int au8522_sleep(struct dvb_frontend *fe) | ||
| 510 | { | ||
| 511 | struct au8522_state *state = fe->demodulator_priv; | ||
| 512 | dprintk("%s()\n", __func__); | ||
| 513 | |||
| 514 | state->current_frequency = 0; | ||
| 515 | |||
| 516 | return 0; | ||
| 517 | } | ||
| 518 | |||
| 501 | static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status) | 519 | static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status) |
| 502 | { | 520 | { |
| 503 | struct au8522_state *state = fe->demodulator_priv; | 521 | struct au8522_state *state = fe->demodulator_priv; |
| @@ -509,10 +527,8 @@ static int au8522_read_status(struct dvb_frontend *fe, fe_status_t *status) | |||
| 509 | if (state->current_modulation == VSB_8) { | 527 | if (state->current_modulation == VSB_8) { |
| 510 | dprintk("%s() Checking VSB_8\n", __func__); | 528 | dprintk("%s() Checking VSB_8\n", __func__); |
| 511 | reg = au8522_readreg(state, 0x4088); | 529 | reg = au8522_readreg(state, 0x4088); |
| 512 | if (reg & 0x01) | 530 | if ((reg & 0x03) == 0x03) |
| 513 | *status |= FE_HAS_VITERBI; | 531 | *status |= FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI; |
| 514 | if (reg & 0x02) | ||
| 515 | *status |= FE_HAS_LOCK | FE_HAS_SYNC; | ||
| 516 | } else { | 532 | } else { |
| 517 | dprintk("%s() Checking QAM\n", __func__); | 533 | dprintk("%s() Checking QAM\n", __func__); |
| 518 | reg = au8522_readreg(state, 0x4541); | 534 | reg = au8522_readreg(state, 0x4541); |
| @@ -672,6 +688,7 @@ static struct dvb_frontend_ops au8522_ops = { | |||
| 672 | }, | 688 | }, |
| 673 | 689 | ||
| 674 | .init = au8522_init, | 690 | .init = au8522_init, |
| 691 | .sleep = au8522_sleep, | ||
| 675 | .i2c_gate_ctrl = au8522_i2c_gate_ctrl, | 692 | .i2c_gate_ctrl = au8522_i2c_gate_ctrl, |
| 676 | .set_frontend = au8522_set_frontend, | 693 | .set_frontend = au8522_set_frontend, |
| 677 | .get_frontend = au8522_get_frontend, | 694 | .get_frontend = au8522_get_frontend, |
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 17556183e871..35435bef8e79 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
| @@ -63,6 +63,7 @@ struct stv0299_state { | |||
| 63 | u32 symbol_rate; | 63 | u32 symbol_rate; |
| 64 | fe_code_rate_t fec_inner; | 64 | fe_code_rate_t fec_inner; |
| 65 | int errmode; | 65 | int errmode; |
| 66 | u32 ucblocks; | ||
| 66 | }; | 67 | }; |
| 67 | 68 | ||
| 68 | #define STATUS_BER 0 | 69 | #define STATUS_BER 0 |
| @@ -501,8 +502,10 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber) | |||
| 501 | { | 502 | { |
| 502 | struct stv0299_state* state = fe->demodulator_priv; | 503 | struct stv0299_state* state = fe->demodulator_priv; |
| 503 | 504 | ||
| 504 | if (state->errmode != STATUS_BER) return 0; | 505 | if (state->errmode != STATUS_BER) |
| 505 | *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); | 506 | return -ENOSYS; |
| 507 | |||
| 508 | *ber = stv0299_readreg(state, 0x1e) | (stv0299_readreg(state, 0x1d) << 8); | ||
| 506 | 509 | ||
| 507 | return 0; | 510 | return 0; |
| 508 | } | 511 | } |
| @@ -540,8 +543,12 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
| 540 | { | 543 | { |
| 541 | struct stv0299_state* state = fe->demodulator_priv; | 544 | struct stv0299_state* state = fe->demodulator_priv; |
| 542 | 545 | ||
| 543 | if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0; | 546 | if (state->errmode != STATUS_UCBLOCKS) |
| 544 | else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); | 547 | return -ENOSYS; |
| 548 | |||
| 549 | state->ucblocks += stv0299_readreg(state, 0x1e); | ||
| 550 | state->ucblocks += (stv0299_readreg(state, 0x1d) << 8); | ||
| 551 | *ucblocks = state->ucblocks; | ||
| 545 | 552 | ||
| 546 | return 0; | 553 | return 0; |
| 547 | } | 554 | } |
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c index 0727b80bc4d2..c6ff5b82ff80 100644 --- a/drivers/media/dvb/frontends/tda10023.c +++ b/drivers/media/dvb/frontends/tda10023.c | |||
| @@ -116,9 +116,12 @@ static u8 tda10023_readreg (struct tda10023_state* state, u8 reg) | |||
| 116 | int ret; | 116 | int ret; |
| 117 | 117 | ||
| 118 | ret = i2c_transfer (state->i2c, msg, 2); | 118 | ret = i2c_transfer (state->i2c, msg, 2); |
| 119 | if (ret != 2) | 119 | if (ret != 2) { |
| 120 | printk("DVB: TDA10023: %s: readreg error (ret == %i)\n", | 120 | int num = state->frontend.dvb ? state->frontend.dvb->num : -1; |
| 121 | __func__, ret); | 121 | printk(KERN_ERR "DVB: TDA10023(%d): %s: readreg error " |
| 122 | "(reg == 0x%02x, ret == %i)\n", | ||
| 123 | num, __func__, reg, ret); | ||
| 124 | } | ||
| 122 | return b1[0]; | 125 | return b1[0]; |
| 123 | } | 126 | } |
| 124 | 127 | ||
| @@ -129,11 +132,12 @@ static int tda10023_writereg (struct tda10023_state* state, u8 reg, u8 data) | |||
| 129 | int ret; | 132 | int ret; |
| 130 | 133 | ||
| 131 | ret = i2c_transfer (state->i2c, &msg, 1); | 134 | ret = i2c_transfer (state->i2c, &msg, 1); |
| 132 | if (ret != 1) | 135 | if (ret != 1) { |
| 133 | printk("DVB: TDA10023(%d): %s, writereg error " | 136 | int num = state->frontend.dvb ? state->frontend.dvb->num : -1; |
| 137 | printk(KERN_ERR "DVB: TDA10023(%d): %s, writereg error " | ||
| 134 | "(reg == 0x%02x, val == 0x%02x, ret == %i)\n", | 138 | "(reg == 0x%02x, val == 0x%02x, ret == %i)\n", |
| 135 | state->frontend.dvb->num, __func__, reg, data, ret); | 139 | num, __func__, reg, data, ret); |
| 136 | 140 | } | |
| 137 | return (ret != 1) ? -EREMOTEIO : 0; | 141 | return (ret != 1) ? -EREMOTEIO : 0; |
| 138 | } | 142 | } |
| 139 | 143 | ||
| @@ -464,7 +468,7 @@ struct dvb_frontend* tda10023_attach(const struct tda1002x_config* config, | |||
| 464 | int i; | 468 | int i; |
| 465 | 469 | ||
| 466 | /* allocate memory for the internal state */ | 470 | /* allocate memory for the internal state */ |
| 467 | state = kmalloc(sizeof(struct tda10023_state), GFP_KERNEL); | 471 | state = kzalloc(sizeof(struct tda10023_state), GFP_KERNEL); |
| 468 | if (state == NULL) goto error; | 472 | if (state == NULL) goto error; |
| 469 | 473 | ||
| 470 | /* setup the state */ | 474 | /* setup the state */ |
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index 49973846373e..a0d638653567 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c | |||
| @@ -1248,11 +1248,14 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, | |||
| 1248 | struct i2c_adapter* i2c) | 1248 | struct i2c_adapter* i2c) |
| 1249 | { | 1249 | { |
| 1250 | struct tda1004x_state *state; | 1250 | struct tda1004x_state *state; |
| 1251 | int id; | ||
| 1251 | 1252 | ||
| 1252 | /* allocate memory for the internal state */ | 1253 | /* allocate memory for the internal state */ |
| 1253 | state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); | 1254 | state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); |
| 1254 | if (!state) | 1255 | if (!state) { |
| 1256 | printk(KERN_ERR "Can't alocate memory for tda10045 state\n"); | ||
| 1255 | return NULL; | 1257 | return NULL; |
| 1258 | } | ||
| 1256 | 1259 | ||
| 1257 | /* setup the state */ | 1260 | /* setup the state */ |
| 1258 | state->config = config; | 1261 | state->config = config; |
| @@ -1260,7 +1263,15 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, | |||
| 1260 | state->demod_type = TDA1004X_DEMOD_TDA10045; | 1263 | state->demod_type = TDA1004X_DEMOD_TDA10045; |
| 1261 | 1264 | ||
| 1262 | /* check if the demod is there */ | 1265 | /* check if the demod is there */ |
| 1263 | if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x25) { | 1266 | id = tda1004x_read_byte(state, TDA1004X_CHIPID); |
| 1267 | if (id < 0) { | ||
| 1268 | printk(KERN_ERR "tda10045: chip is not answering. Giving up.\n"); | ||
| 1269 | kfree(state); | ||
| 1270 | return NULL; | ||
| 1271 | } | ||
| 1272 | |||
| 1273 | if (id != 0x25) { | ||
| 1274 | printk(KERN_ERR "Invalid tda1004x ID = 0x%02x. Can't proceed\n", id); | ||
| 1264 | kfree(state); | 1275 | kfree(state); |
| 1265 | return NULL; | 1276 | return NULL; |
| 1266 | } | 1277 | } |
| @@ -1307,11 +1318,14 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config, | |||
| 1307 | struct i2c_adapter* i2c) | 1318 | struct i2c_adapter* i2c) |
| 1308 | { | 1319 | { |
| 1309 | struct tda1004x_state *state; | 1320 | struct tda1004x_state *state; |
| 1321 | int id; | ||
| 1310 | 1322 | ||
| 1311 | /* allocate memory for the internal state */ | 1323 | /* allocate memory for the internal state */ |
| 1312 | state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); | 1324 | state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); |
| 1313 | if (!state) | 1325 | if (!state) { |
| 1326 | printk(KERN_ERR "Can't alocate memory for tda10046 state\n"); | ||
| 1314 | return NULL; | 1327 | return NULL; |
| 1328 | } | ||
| 1315 | 1329 | ||
| 1316 | /* setup the state */ | 1330 | /* setup the state */ |
| 1317 | state->config = config; | 1331 | state->config = config; |
| @@ -1319,7 +1333,14 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config, | |||
| 1319 | state->demod_type = TDA1004X_DEMOD_TDA10046; | 1333 | state->demod_type = TDA1004X_DEMOD_TDA10046; |
| 1320 | 1334 | ||
| 1321 | /* check if the demod is there */ | 1335 | /* check if the demod is there */ |
| 1322 | if (tda1004x_read_byte(state, TDA1004X_CHIPID) != 0x46) { | 1336 | id = tda1004x_read_byte(state, TDA1004X_CHIPID); |
| 1337 | if (id < 0) { | ||
| 1338 | printk(KERN_ERR "tda10046: chip is not answering. Giving up.\n"); | ||
| 1339 | kfree(state); | ||
| 1340 | return NULL; | ||
| 1341 | } | ||
| 1342 | if (id != 0x46) { | ||
| 1343 | printk(KERN_ERR "Invalid tda1004x ID = 0x%02x. Can't proceed\n", id); | ||
| 1323 | kfree(state); | 1344 | kfree(state); |
| 1324 | return NULL; | 1345 | return NULL; |
| 1325 | } | 1346 | } |
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig index d4339b1b3b68..07643e010093 100644 --- a/drivers/media/dvb/ttpci/Kconfig +++ b/drivers/media/dvb/ttpci/Kconfig | |||
| @@ -101,6 +101,7 @@ config DVB_BUDGET | |||
| 101 | config DVB_BUDGET_CI | 101 | config DVB_BUDGET_CI |
| 102 | tristate "Budget cards with onboard CI connector" | 102 | tristate "Budget cards with onboard CI connector" |
| 103 | depends on DVB_BUDGET_CORE && I2C | 103 | depends on DVB_BUDGET_CORE && I2C |
| 104 | depends on INPUT # due to IR | ||
| 104 | select DVB_STV0297 if !DVB_FE_CUSTOMISE | 105 | select DVB_STV0297 if !DVB_FE_CUSTOMISE |
| 105 | select DVB_STV0299 if !DVB_FE_CUSTOMISE | 106 | select DVB_STV0299 if !DVB_FE_CUSTOMISE |
| 106 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE | 107 | select DVB_TDA1004X if !DVB_FE_CUSTOMISE |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index 9d81074b31df..3a3f5279e927 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
| @@ -427,6 +427,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) | |||
| 427 | if (err) { | 427 | if (err) { |
| 428 | printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n", | 428 | printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n", |
| 429 | __func__, type); | 429 | __func__, type); |
| 430 | av7110->arm_errors++; | ||
| 430 | return -ETIMEDOUT; | 431 | return -ETIMEDOUT; |
| 431 | } | 432 | } |
| 432 | msleep(1); | 433 | msleep(1); |
| @@ -853,10 +854,8 @@ static osd_raw_window_t bpp2bit[8] = { | |||
| 853 | 854 | ||
| 854 | static inline int WaitUntilBmpLoaded(struct av7110 *av7110) | 855 | static inline int WaitUntilBmpLoaded(struct av7110 *av7110) |
| 855 | { | 856 | { |
| 856 | int ret = wait_event_interruptible_timeout(av7110->bmpq, | 857 | int ret = wait_event_timeout(av7110->bmpq, |
| 857 | av7110->bmp_state != BMP_LOADING, 10*HZ); | 858 | av7110->bmp_state != BMP_LOADING, 10*HZ); |
| 858 | if (ret == -ERESTARTSYS) | ||
| 859 | return ret; | ||
| 860 | if (ret == 0) { | 859 | if (ret == 0) { |
| 861 | printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n", | 860 | printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n", |
| 862 | ret, av7110->bmp_state); | 861 | ret, av7110->bmp_state); |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 3b26fbd3e558..5ccb0aeca8cc 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -793,6 +793,14 @@ menuconfig V4L_USB_DRIVERS | |||
| 793 | 793 | ||
| 794 | if V4L_USB_DRIVERS && USB | 794 | if V4L_USB_DRIVERS && USB |
| 795 | 795 | ||
| 796 | config USB_VIDEO_CLASS | ||
| 797 | tristate "USB Video Class (UVC)" | ||
| 798 | ---help--- | ||
| 799 | Support for the USB Video Class (UVC). Currently only video | ||
| 800 | input devices, such as webcams, are supported. | ||
| 801 | |||
| 802 | For more information see: <http://linux-uvc.berlios.de/> | ||
| 803 | |||
| 796 | source "drivers/media/video/pvrusb2/Kconfig" | 804 | source "drivers/media/video/pvrusb2/Kconfig" |
| 797 | 805 | ||
| 798 | source "drivers/media/video/em28xx/Kconfig" | 806 | source "drivers/media/video/em28xx/Kconfig" |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index dff0d6abe917..ecbbfaab24d5 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
| @@ -136,6 +136,8 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o | |||
| 136 | 136 | ||
| 137 | obj-$(CONFIG_VIDEO_AU0828) += au0828/ | 137 | obj-$(CONFIG_VIDEO_AU0828) += au0828/ |
| 138 | 138 | ||
| 139 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ | ||
| 140 | |||
| 139 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 141 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
| 140 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 142 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |
| 141 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 143 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |
diff --git a/drivers/media/video/au0828/au0828-cards.c b/drivers/media/video/au0828/au0828-cards.c index a2a6983444fa..898e12395e7c 100644 --- a/drivers/media/video/au0828/au0828-cards.c +++ b/drivers/media/video/au0828/au0828-cards.c | |||
| @@ -77,8 +77,14 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data) | |||
| 77 | 77 | ||
| 78 | /* Make sure we support the board model */ | 78 | /* Make sure we support the board model */ |
| 79 | switch (tv.model) { | 79 | switch (tv.model) { |
| 80 | case 72000: /* WinTV-HVR950q (Retail, IR, ATSC/QAM */ | ||
| 80 | case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */ | 81 | case 72001: /* WinTV-HVR950q (Retail, IR, ATSC/QAM and basic analog video */ |
| 82 | case 72211: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */ | ||
| 83 | case 72221: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */ | ||
| 84 | case 72231: /* WinTV-HVR950q (OEM, IR, ATSC/QAM and basic analog video */ | ||
| 85 | case 72241: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM and basic analog video */ | ||
| 81 | case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and basic analog video */ | 86 | case 72301: /* WinTV-HVR850 (Retail, IR, ATSC and basic analog video */ |
| 87 | case 72500: /* WinTV-HVR950q (OEM, No IR, ATSC/QAM */ | ||
| 82 | break; | 88 | break; |
| 83 | default: | 89 | default: |
| 84 | printk(KERN_WARNING "%s: warning: " | 90 | printk(KERN_WARNING "%s: warning: " |
| @@ -175,6 +181,18 @@ struct usb_device_id au0828_usb_id_table [] = { | |||
| 175 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR850 }, | 181 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR850 }, |
| 176 | { USB_DEVICE(0x0fe9, 0xd620), | 182 | { USB_DEVICE(0x0fe9, 0xd620), |
| 177 | .driver_info = AU0828_BOARD_DVICO_FUSIONHDTV7 }, | 183 | .driver_info = AU0828_BOARD_DVICO_FUSIONHDTV7 }, |
| 184 | { USB_DEVICE(0x2040, 0x7210), | ||
| 185 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 186 | { USB_DEVICE(0x2040, 0x7217), | ||
| 187 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 188 | { USB_DEVICE(0x2040, 0x721b), | ||
| 189 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 190 | { USB_DEVICE(0x2040, 0x721f), | ||
| 191 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 192 | { USB_DEVICE(0x2040, 0x7280), | ||
| 193 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 194 | { USB_DEVICE(0x0fd9, 0x0008), | ||
| 195 | .driver_info = AU0828_BOARD_HAUPPAUGE_HVR950Q }, | ||
| 178 | { }, | 196 | { }, |
| 179 | }; | 197 | }; |
| 180 | 198 | ||
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index 5f942690570c..9aefdc5ea79a 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
| @@ -10,8 +10,8 @@ config VIDEO_CX18 | |||
| 10 | select VIDEO_TVEEPROM | 10 | select VIDEO_TVEEPROM |
| 11 | select VIDEO_CX2341X | 11 | select VIDEO_CX2341X |
| 12 | select VIDEO_CS5345 | 12 | select VIDEO_CS5345 |
| 13 | select DVB_S5H1409 | 13 | select DVB_S5H1409 if !DVB_FE_CUSTOMISE |
| 14 | select MEDIA_TUNER_MXL5005S | 14 | select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE |
| 15 | ---help--- | 15 | ---help--- |
| 16 | This is a video4linux driver for Conexant cx23418 based | 16 | This is a video4linux driver for Conexant cx23418 based |
| 17 | PCI combo video recorder devices. | 17 | PCI combo video recorder devices. |
diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c index 9a26751615c6..faca43eb940f 100644 --- a/drivers/media/video/cx18/cx18-av-core.c +++ b/drivers/media/video/cx18/cx18-av-core.c | |||
| @@ -69,6 +69,58 @@ int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 and_mask, | |||
| 69 | or_value); | 69 | or_value); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | int cx18_av_write_no_acfg(struct cx18 *cx, u16 addr, u8 value, int no_acfg_mask) | ||
| 73 | { | ||
| 74 | int retval; | ||
| 75 | u32 saved_reg[8] = {0}; | ||
| 76 | |||
| 77 | if (no_acfg_mask & CXADEC_NO_ACFG_AFE) { | ||
| 78 | saved_reg[0] = cx18_av_read4(cx, CXADEC_CHIP_CTRL); | ||
| 79 | saved_reg[1] = cx18_av_read4(cx, CXADEC_AFE_CTRL); | ||
| 80 | } | ||
| 81 | |||
| 82 | if (no_acfg_mask & CXADEC_NO_ACFG_PLL) { | ||
| 83 | saved_reg[2] = cx18_av_read4(cx, CXADEC_PLL_CTRL1); | ||
| 84 | saved_reg[3] = cx18_av_read4(cx, CXADEC_VID_PLL_FRAC); | ||
| 85 | } | ||
| 86 | |||
| 87 | if (no_acfg_mask & CXADEC_NO_ACFG_VID) { | ||
| 88 | saved_reg[4] = cx18_av_read4(cx, CXADEC_HORIZ_TIM_CTRL); | ||
| 89 | saved_reg[5] = cx18_av_read4(cx, CXADEC_VERT_TIM_CTRL); | ||
| 90 | saved_reg[6] = cx18_av_read4(cx, CXADEC_SRC_COMB_CFG); | ||
| 91 | saved_reg[7] = cx18_av_read4(cx, CXADEC_CHROMA_VBIOFF_CFG); | ||
| 92 | } | ||
| 93 | |||
| 94 | retval = cx18_av_write(cx, addr, value); | ||
| 95 | |||
| 96 | if (no_acfg_mask & CXADEC_NO_ACFG_AFE) { | ||
| 97 | cx18_av_write4(cx, CXADEC_CHIP_CTRL, saved_reg[0]); | ||
| 98 | cx18_av_write4(cx, CXADEC_AFE_CTRL, saved_reg[1]); | ||
| 99 | } | ||
| 100 | |||
| 101 | if (no_acfg_mask & CXADEC_NO_ACFG_PLL) { | ||
| 102 | cx18_av_write4(cx, CXADEC_PLL_CTRL1, saved_reg[2]); | ||
| 103 | cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, saved_reg[3]); | ||
| 104 | } | ||
| 105 | |||
| 106 | if (no_acfg_mask & CXADEC_NO_ACFG_VID) { | ||
| 107 | cx18_av_write4(cx, CXADEC_HORIZ_TIM_CTRL, saved_reg[4]); | ||
| 108 | cx18_av_write4(cx, CXADEC_VERT_TIM_CTRL, saved_reg[5]); | ||
| 109 | cx18_av_write4(cx, CXADEC_SRC_COMB_CFG, saved_reg[6]); | ||
| 110 | cx18_av_write4(cx, CXADEC_CHROMA_VBIOFF_CFG, saved_reg[7]); | ||
| 111 | } | ||
| 112 | |||
| 113 | return retval; | ||
| 114 | } | ||
| 115 | |||
| 116 | int cx18_av_and_or_no_acfg(struct cx18 *cx, u16 addr, unsigned and_mask, | ||
| 117 | u8 or_value, int no_acfg_mask) | ||
| 118 | { | ||
| 119 | return cx18_av_write_no_acfg(cx, addr, | ||
| 120 | (cx18_av_read(cx, addr) & and_mask) | | ||
| 121 | or_value, no_acfg_mask); | ||
| 122 | } | ||
| 123 | |||
| 72 | /* ----------------------------------------------------------------------- */ | 124 | /* ----------------------------------------------------------------------- */ |
| 73 | 125 | ||
| 74 | static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input, | 126 | static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input, |
| @@ -170,13 +222,15 @@ static void input_change(struct cx18 *cx) | |||
| 170 | 222 | ||
| 171 | /* Follow step 8c and 8d of section 3.16 in the cx18_av datasheet */ | 223 | /* Follow step 8c and 8d of section 3.16 in the cx18_av datasheet */ |
| 172 | if (std & V4L2_STD_SECAM) | 224 | if (std & V4L2_STD_SECAM) |
| 173 | cx18_av_write(cx, 0x402, 0); | 225 | cx18_av_write_no_acfg(cx, 0x402, 0, CXADEC_NO_ACFG_ALL); |
| 174 | else { | 226 | else { |
| 175 | cx18_av_write(cx, 0x402, 0x04); | 227 | cx18_av_write_no_acfg(cx, 0x402, 0x04, CXADEC_NO_ACFG_ALL); |
| 176 | cx18_av_write(cx, 0x49f, (std & V4L2_STD_NTSC) ? 0x14 : 0x11); | 228 | cx18_av_write(cx, 0x49f, (std & V4L2_STD_NTSC) ? 0x14 : 0x11); |
| 177 | } | 229 | } |
| 178 | cx18_av_and_or(cx, 0x401, ~0x60, 0); | 230 | cx18_av_and_or_no_acfg(cx, 0x401, ~0x60, 0, |
| 179 | cx18_av_and_or(cx, 0x401, ~0x60, 0x60); | 231 | CXADEC_NO_ACFG_PLL | CXADEC_NO_ACFG_VID); |
| 232 | cx18_av_and_or_no_acfg(cx, 0x401, ~0x60, 0x60, | ||
| 233 | CXADEC_NO_ACFG_PLL | CXADEC_NO_ACFG_VID); | ||
| 180 | 234 | ||
| 181 | if (std & V4L2_STD_525_60) { | 235 | if (std & V4L2_STD_525_60) { |
| 182 | if (std == V4L2_STD_NTSC_M_JP) { | 236 | if (std == V4L2_STD_NTSC_M_JP) { |
| @@ -228,7 +282,7 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input, | |||
| 228 | 282 | ||
| 229 | if ((vid_input & ~0xff0) || | 283 | if ((vid_input & ~0xff0) || |
| 230 | luma < CX18_AV_SVIDEO_LUMA1 || | 284 | luma < CX18_AV_SVIDEO_LUMA1 || |
| 231 | luma > CX18_AV_SVIDEO_LUMA4 || | 285 | luma > CX18_AV_SVIDEO_LUMA8 || |
| 232 | chroma < CX18_AV_SVIDEO_CHROMA4 || | 286 | chroma < CX18_AV_SVIDEO_CHROMA4 || |
| 233 | chroma > CX18_AV_SVIDEO_CHROMA8) { | 287 | chroma > CX18_AV_SVIDEO_CHROMA8) { |
| 234 | CX18_ERR("0x%04x is not a valid video input!\n", | 288 | CX18_ERR("0x%04x is not a valid video input!\n", |
| @@ -262,7 +316,8 @@ static int set_input(struct cx18 *cx, enum cx18_av_video_input vid_input, | |||
| 262 | 316 | ||
| 263 | cx18_av_write(cx, 0x103, reg); | 317 | cx18_av_write(cx, 0x103, reg); |
| 264 | /* Set INPUT_MODE to Composite (0) or S-Video (1) */ | 318 | /* Set INPUT_MODE to Composite (0) or S-Video (1) */ |
| 265 | cx18_av_and_or(cx, 0x401, ~0x6, is_composite ? 0 : 0x02); | 319 | cx18_av_and_or_no_acfg(cx, 0x401, ~0x6, is_composite ? 0 : 0x02, |
| 320 | CXADEC_NO_ACFG_PLL | CXADEC_NO_ACFG_VID); | ||
| 266 | /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */ | 321 | /* Set CH_SEL_ADC2 to 1 if input comes from CH3 */ |
| 267 | cx18_av_and_or(cx, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0); | 322 | cx18_av_and_or(cx, 0x102, ~0x2, (reg & 0x80) == 0 ? 2 : 0); |
| 268 | /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2 and CH3 */ | 323 | /* Set DUAL_MODE_ADC2 to 1 if input comes from both CH2 and CH3 */ |
| @@ -318,12 +373,12 @@ static int set_v4lstd(struct cx18 *cx) | |||
| 318 | This happens for example with the Yuan MPC622. */ | 373 | This happens for example with the Yuan MPC622. */ |
| 319 | if (fmt >= 4 && fmt < 8) { | 374 | if (fmt >= 4 && fmt < 8) { |
| 320 | /* Set format to NTSC-M */ | 375 | /* Set format to NTSC-M */ |
| 321 | cx18_av_and_or(cx, 0x400, ~0xf, 1); | 376 | cx18_av_and_or_no_acfg(cx, 0x400, ~0xf, 1, CXADEC_NO_ACFG_AFE); |
| 322 | /* Turn off LCOMB */ | 377 | /* Turn off LCOMB */ |
| 323 | cx18_av_and_or(cx, 0x47b, ~6, 0); | 378 | cx18_av_and_or(cx, 0x47b, ~6, 0); |
| 324 | } | 379 | } |
| 325 | cx18_av_and_or(cx, 0x400, ~0xf, fmt); | 380 | cx18_av_and_or_no_acfg(cx, 0x400, ~0xf, fmt, CXADEC_NO_ACFG_AFE); |
| 326 | cx18_av_and_or(cx, 0x403, ~0x3, pal_m); | 381 | cx18_av_and_or_no_acfg(cx, 0x403, ~0x3, pal_m, CXADEC_NO_ACFG_ALL); |
| 327 | cx18_av_vbi_setup(cx); | 382 | cx18_av_vbi_setup(cx); |
| 328 | input_change(cx); | 383 | input_change(cx); |
| 329 | return 0; | 384 | return 0; |
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h index 786901d72e9a..c172823ce1d8 100644 --- a/drivers/media/video/cx18/cx18-av-core.h +++ b/drivers/media/video/cx18/cx18-av-core.h | |||
| @@ -37,12 +37,16 @@ enum cx18_av_video_input { | |||
| 37 | CX18_AV_COMPOSITE7, | 37 | CX18_AV_COMPOSITE7, |
| 38 | CX18_AV_COMPOSITE8, | 38 | CX18_AV_COMPOSITE8, |
| 39 | 39 | ||
| 40 | /* S-Video inputs consist of one luma input (In1-In4) ORed with one | 40 | /* S-Video inputs consist of one luma input (In1-In8) ORed with one |
| 41 | chroma input (In5-In8) */ | 41 | chroma input (In5-In8) */ |
| 42 | CX18_AV_SVIDEO_LUMA1 = 0x10, | 42 | CX18_AV_SVIDEO_LUMA1 = 0x10, |
| 43 | CX18_AV_SVIDEO_LUMA2 = 0x20, | 43 | CX18_AV_SVIDEO_LUMA2 = 0x20, |
| 44 | CX18_AV_SVIDEO_LUMA3 = 0x30, | 44 | CX18_AV_SVIDEO_LUMA3 = 0x30, |
| 45 | CX18_AV_SVIDEO_LUMA4 = 0x40, | 45 | CX18_AV_SVIDEO_LUMA4 = 0x40, |
| 46 | CX18_AV_SVIDEO_LUMA5 = 0x50, | ||
| 47 | CX18_AV_SVIDEO_LUMA6 = 0x60, | ||
| 48 | CX18_AV_SVIDEO_LUMA7 = 0x70, | ||
| 49 | CX18_AV_SVIDEO_LUMA8 = 0x80, | ||
| 46 | CX18_AV_SVIDEO_CHROMA4 = 0x400, | 50 | CX18_AV_SVIDEO_CHROMA4 = 0x400, |
| 47 | CX18_AV_SVIDEO_CHROMA5 = 0x500, | 51 | CX18_AV_SVIDEO_CHROMA5 = 0x500, |
| 48 | CX18_AV_SVIDEO_CHROMA6 = 0x600, | 52 | CX18_AV_SVIDEO_CHROMA6 = 0x600, |
| @@ -291,14 +295,24 @@ struct cx18_av_state { | |||
| 291 | #define CXADEC_SELECT_AUDIO_STANDARD_FM 0xF9 /* FM radio */ | 295 | #define CXADEC_SELECT_AUDIO_STANDARD_FM 0xF9 /* FM radio */ |
| 292 | #define CXADEC_SELECT_AUDIO_STANDARD_AUTO 0xFF /* Auto detect */ | 296 | #define CXADEC_SELECT_AUDIO_STANDARD_AUTO 0xFF /* Auto detect */ |
| 293 | 297 | ||
| 298 | /* Flags on what to preserve on write to 0x400-0x403 with cx18_av_.*_no_acfg()*/ | ||
| 299 | #define CXADEC_NO_ACFG_AFE 0x01 /* Preserve 0x100-0x107 */ | ||
| 300 | #define CXADEC_NO_ACFG_PLL 0x02 /* Preserve 0x108-0x10f */ | ||
| 301 | #define CXADEC_NO_ACFG_VID 0x04 /* Preserve 0x470-0x47f */ | ||
| 302 | #define CXADEC_NO_ACFG_ALL 0x07 | ||
| 303 | |||
| 294 | /* ----------------------------------------------------------------------- */ | 304 | /* ----------------------------------------------------------------------- */ |
| 295 | /* cx18_av-core.c */ | 305 | /* cx18_av-core.c */ |
| 296 | int cx18_av_write(struct cx18 *cx, u16 addr, u8 value); | 306 | int cx18_av_write(struct cx18 *cx, u16 addr, u8 value); |
| 297 | int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value); | 307 | int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value); |
| 308 | int cx18_av_write_no_acfg(struct cx18 *cx, u16 addr, u8 value, | ||
| 309 | int no_acfg_mask); | ||
| 298 | u8 cx18_av_read(struct cx18 *cx, u16 addr); | 310 | u8 cx18_av_read(struct cx18 *cx, u16 addr); |
| 299 | u32 cx18_av_read4(struct cx18 *cx, u16 addr); | 311 | u32 cx18_av_read4(struct cx18 *cx, u16 addr); |
| 300 | int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned mask, u8 value); | 312 | int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned mask, u8 value); |
| 301 | int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value); | 313 | int cx18_av_and_or4(struct cx18 *cx, u16 addr, u32 mask, u32 value); |
| 314 | int cx18_av_and_or_no_acfg(struct cx18 *cx, u16 addr, unsigned mask, u8 value, | ||
| 315 | int no_acfg_mask); | ||
| 302 | int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg); | 316 | int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg); |
| 303 | 317 | ||
| 304 | /* ----------------------------------------------------------------------- */ | 318 | /* ----------------------------------------------------------------------- */ |
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index baccd079243d..c26e0ef5b075 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include "cx18-driver.h" | 24 | #include "cx18-driver.h" |
| 25 | #include "cx18-cards.h" | 25 | #include "cx18-cards.h" |
| 26 | #include "cx18-av-core.h" | ||
| 26 | #include "cx18-i2c.h" | 27 | #include "cx18-i2c.h" |
| 27 | #include <media/cs5345.h> | 28 | #include <media/cs5345.h> |
| 28 | 29 | ||
| @@ -54,22 +55,22 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { | |||
| 54 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | | 55 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | |
| 55 | CX18_HW_CS5345 | CX18_HW_DVB, | 56 | CX18_HW_CS5345 | CX18_HW_DVB, |
| 56 | .video_inputs = { | 57 | .video_inputs = { |
| 57 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 }, | 58 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, |
| 58 | { CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 }, | 59 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, |
| 59 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 }, | 60 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 }, |
| 60 | { CX18_CARD_INPUT_SVIDEO2, 2, CX23418_SVIDEO2 }, | 61 | { CX18_CARD_INPUT_SVIDEO2, 2, CX18_AV_SVIDEO2 }, |
| 61 | { CX18_CARD_INPUT_COMPOSITE2, 2, CX23418_COMPOSITE4 }, | 62 | { CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE4 }, |
| 62 | }, | 63 | }, |
| 63 | .audio_inputs = { | 64 | .audio_inputs = { |
| 64 | { CX18_CARD_INPUT_AUD_TUNER, | 65 | { CX18_CARD_INPUT_AUD_TUNER, |
| 65 | CX23418_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 }, | 66 | CX18_AV_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 }, |
| 66 | { CX18_CARD_INPUT_LINE_IN1, | 67 | { CX18_CARD_INPUT_LINE_IN1, |
| 67 | CX23418_AUDIO_SERIAL, CS5345_IN_2 }, | 68 | CX18_AV_AUDIO_SERIAL, CS5345_IN_2 }, |
| 68 | { CX18_CARD_INPUT_LINE_IN2, | 69 | { CX18_CARD_INPUT_LINE_IN2, |
| 69 | CX23418_AUDIO_SERIAL, CS5345_IN_2 }, | 70 | CX18_AV_AUDIO_SERIAL, CS5345_IN_3 }, |
| 70 | }, | 71 | }, |
| 71 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, | 72 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, |
| 72 | CX23418_AUDIO_SERIAL, 0 }, | 73 | CX18_AV_AUDIO_SERIAL, CS5345_IN_4 }, |
| 73 | .ddr = { | 74 | .ddr = { |
| 74 | /* ESMT M13S128324A-5B memory */ | 75 | /* ESMT M13S128324A-5B memory */ |
| 75 | .chip_config = 0x003, | 76 | .chip_config = 0x003, |
| @@ -81,6 +82,11 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { | |||
| 81 | }, | 82 | }, |
| 82 | .gpio_init.initial_value = 0x3001, | 83 | .gpio_init.initial_value = 0x3001, |
| 83 | .gpio_init.direction = 0x3001, | 84 | .gpio_init.direction = 0x3001, |
| 85 | .gpio_i2c_slave_reset = { | ||
| 86 | .active_lo_mask = 0x3001, | ||
| 87 | .msecs_asserted = 10, | ||
| 88 | .msecs_recovery = 40, | ||
| 89 | }, | ||
| 84 | .i2c = &cx18_i2c_std, | 90 | .i2c = &cx18_i2c_std, |
| 85 | }; | 91 | }; |
| 86 | 92 | ||
| @@ -94,22 +100,22 @@ static const struct cx18_card cx18_card_hvr1600_samsung = { | |||
| 94 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | | 100 | .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | |
| 95 | CX18_HW_CS5345 | CX18_HW_DVB, | 101 | CX18_HW_CS5345 | CX18_HW_DVB, |
| 96 | .video_inputs = { | 102 | .video_inputs = { |
| 97 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 }, | 103 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE7 }, |
| 98 | { CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 }, | 104 | { CX18_CARD_INPUT_SVIDEO1, 1, CX18_AV_SVIDEO1 }, |
| 99 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 }, | 105 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE3 }, |
| 100 | { CX18_CARD_INPUT_SVIDEO2, 2, CX23418_SVIDEO2 }, | 106 | { CX18_CARD_INPUT_SVIDEO2, 2, CX18_AV_SVIDEO2 }, |
| 101 | { CX18_CARD_INPUT_COMPOSITE2, 2, CX23418_COMPOSITE4 }, | 107 | { CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE4 }, |
| 102 | }, | 108 | }, |
| 103 | .audio_inputs = { | 109 | .audio_inputs = { |
| 104 | { CX18_CARD_INPUT_AUD_TUNER, | 110 | { CX18_CARD_INPUT_AUD_TUNER, |
| 105 | CX23418_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 }, | 111 | CX18_AV_AUDIO8, CS5345_IN_1 | CS5345_MCLK_1_5 }, |
| 106 | { CX18_CARD_INPUT_LINE_IN1, | 112 | { CX18_CARD_INPUT_LINE_IN1, |
| 107 | CX23418_AUDIO_SERIAL, CS5345_IN_2 }, | 113 | CX18_AV_AUDIO_SERIAL, CS5345_IN_2 }, |
| 108 | { CX18_CARD_INPUT_LINE_IN2, | 114 | { CX18_CARD_INPUT_LINE_IN2, |
| 109 | CX23418_AUDIO_SERIAL, CS5345_IN_2 }, | 115 | CX18_AV_AUDIO_SERIAL, CS5345_IN_3 }, |
| 110 | }, | 116 | }, |
| 111 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, | 117 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, |
| 112 | CX23418_AUDIO_SERIAL, 0 }, | 118 | CX18_AV_AUDIO_SERIAL, CS5345_IN_4 }, |
| 113 | .ddr = { | 119 | .ddr = { |
| 114 | /* Samsung K4D263238G-VC33 memory */ | 120 | /* Samsung K4D263238G-VC33 memory */ |
| 115 | .chip_config = 0x003, | 121 | .chip_config = 0x003, |
| @@ -121,6 +127,11 @@ static const struct cx18_card cx18_card_hvr1600_samsung = { | |||
| 121 | }, | 127 | }, |
| 122 | .gpio_init.initial_value = 0x3001, | 128 | .gpio_init.initial_value = 0x3001, |
| 123 | .gpio_init.direction = 0x3001, | 129 | .gpio_init.direction = 0x3001, |
| 130 | .gpio_i2c_slave_reset = { | ||
| 131 | .active_lo_mask = 0x3001, | ||
| 132 | .msecs_asserted = 10, | ||
| 133 | .msecs_recovery = 40, | ||
| 134 | }, | ||
| 124 | .i2c = &cx18_i2c_std, | 135 | .i2c = &cx18_i2c_std, |
| 125 | }; | 136 | }; |
| 126 | 137 | ||
| @@ -141,19 +152,19 @@ static const struct cx18_card cx18_card_h900 = { | |||
| 141 | .hw_audio_ctrl = CX18_HW_CX23418, | 152 | .hw_audio_ctrl = CX18_HW_CX23418, |
| 142 | .hw_all = CX18_HW_TUNER, | 153 | .hw_all = CX18_HW_TUNER, |
| 143 | .video_inputs = { | 154 | .video_inputs = { |
| 144 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE2 }, | 155 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
| 145 | { CX18_CARD_INPUT_SVIDEO1, 1, | 156 | { CX18_CARD_INPUT_SVIDEO1, 1, |
| 146 | CX23418_SVIDEO_LUMA3 | CX23418_SVIDEO_CHROMA4 }, | 157 | CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 }, |
| 147 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE1 }, | 158 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 }, |
| 148 | }, | 159 | }, |
| 149 | .audio_inputs = { | 160 | .audio_inputs = { |
| 150 | { CX18_CARD_INPUT_AUD_TUNER, | 161 | { CX18_CARD_INPUT_AUD_TUNER, |
| 151 | CX23418_AUDIO8, 0 }, | 162 | CX18_AV_AUDIO8, 0 }, |
| 152 | { CX18_CARD_INPUT_LINE_IN1, | 163 | { CX18_CARD_INPUT_LINE_IN1, |
| 153 | CX23418_AUDIO_SERIAL, 0 }, | 164 | CX18_AV_AUDIO_SERIAL, 0 }, |
| 154 | }, | 165 | }, |
| 155 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, | 166 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, |
| 156 | CX23418_AUDIO_SERIAL, 0 }, | 167 | CX18_AV_AUDIO_SERIAL, 0 }, |
| 157 | .tuners = { | 168 | .tuners = { |
| 158 | { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, | 169 | { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, |
| 159 | }, | 170 | }, |
| @@ -183,23 +194,26 @@ static const struct cx18_card_pci_info cx18_pci_mpc718[] = { | |||
| 183 | static const struct cx18_card cx18_card_mpc718 = { | 194 | static const struct cx18_card cx18_card_mpc718 = { |
| 184 | .type = CX18_CARD_YUAN_MPC718, | 195 | .type = CX18_CARD_YUAN_MPC718, |
| 185 | .name = "Yuan MPC718", | 196 | .name = "Yuan MPC718", |
| 186 | .comment = "Not yet supported!\n", | 197 | .comment = "Some Composite and S-Video inputs are currently working.\n", |
| 187 | .v4l2_capabilities = 0, | 198 | .v4l2_capabilities = CX18_CAP_ENCODER, |
| 188 | .hw_audio_ctrl = CX18_HW_CX23418, | 199 | .hw_audio_ctrl = CX18_HW_CX23418, |
| 189 | .hw_all = CX18_HW_TUNER, | 200 | .hw_all = CX18_HW_TUNER, |
| 190 | .video_inputs = { | 201 | .video_inputs = { |
| 191 | { CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 }, | 202 | { CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 }, |
| 192 | { CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 }, | 203 | { CX18_CARD_INPUT_SVIDEO1, 1, |
| 193 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX23418_COMPOSITE3 }, | 204 | CX18_AV_SVIDEO_LUMA3 | CX18_AV_SVIDEO_CHROMA4 }, |
| 205 | { CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE1 }, | ||
| 206 | { CX18_CARD_INPUT_SVIDEO2, 2, | ||
| 207 | CX18_AV_SVIDEO_LUMA7 | CX18_AV_SVIDEO_CHROMA8 }, | ||
| 208 | { CX18_CARD_INPUT_COMPOSITE2, 2, CX18_AV_COMPOSITE6 }, | ||
| 209 | { CX18_CARD_INPUT_COMPOSITE3, 2, CX18_AV_COMPOSITE3 }, | ||
| 194 | }, | 210 | }, |
| 195 | .audio_inputs = { | 211 | .audio_inputs = { |
| 196 | { CX18_CARD_INPUT_AUD_TUNER, | 212 | { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 }, |
| 197 | CX23418_AUDIO8, 0 }, | 213 | { CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL, 0 }, |
| 198 | { CX18_CARD_INPUT_LINE_IN1, | 214 | { CX18_CARD_INPUT_LINE_IN2, CX18_AV_AUDIO_SERIAL, 0 }, |
| 199 | CX23418_AUDIO_SERIAL, 0 }, | ||
| 200 | }, | 215 | }, |
| 201 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, | 216 | .radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO_SERIAL, 0 }, |
| 202 | CX23418_AUDIO_SERIAL, 0 }, | ||
| 203 | .tuners = { | 217 | .tuners = { |
| 204 | /* XC3028 tuner */ | 218 | /* XC3028 tuner */ |
| 205 | { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, | 219 | { .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 }, |
diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h index bccb67f0db16..dc2dd945d4c3 100644 --- a/drivers/media/video/cx18/cx18-cards.h +++ b/drivers/media/video/cx18/cx18-cards.h | |||
| @@ -36,36 +36,6 @@ | |||
| 36 | #define CX18_CARD_INPUT_COMPOSITE2 5 | 36 | #define CX18_CARD_INPUT_COMPOSITE2 5 |
| 37 | #define CX18_CARD_INPUT_COMPOSITE3 6 | 37 | #define CX18_CARD_INPUT_COMPOSITE3 6 |
| 38 | 38 | ||
| 39 | enum cx34180_video_input { | ||
| 40 | /* Composite video inputs In1-In8 */ | ||
| 41 | CX23418_COMPOSITE1 = 1, | ||
| 42 | CX23418_COMPOSITE2, | ||
| 43 | CX23418_COMPOSITE3, | ||
| 44 | CX23418_COMPOSITE4, | ||
| 45 | CX23418_COMPOSITE5, | ||
| 46 | CX23418_COMPOSITE6, | ||
| 47 | CX23418_COMPOSITE7, | ||
| 48 | CX23418_COMPOSITE8, | ||
| 49 | |||
| 50 | /* S-Video inputs consist of one luma input (In1-In4) ORed with one | ||
| 51 | chroma input (In5-In8) */ | ||
| 52 | CX23418_SVIDEO_LUMA1 = 0x10, | ||
| 53 | CX23418_SVIDEO_LUMA2 = 0x20, | ||
| 54 | CX23418_SVIDEO_LUMA3 = 0x30, | ||
| 55 | CX23418_SVIDEO_LUMA4 = 0x40, | ||
| 56 | CX23418_SVIDEO_CHROMA4 = 0x400, | ||
| 57 | CX23418_SVIDEO_CHROMA5 = 0x500, | ||
| 58 | CX23418_SVIDEO_CHROMA6 = 0x600, | ||
| 59 | CX23418_SVIDEO_CHROMA7 = 0x700, | ||
| 60 | CX23418_SVIDEO_CHROMA8 = 0x800, | ||
| 61 | |||
| 62 | /* S-Video aliases for common luma/chroma combinations */ | ||
| 63 | CX23418_SVIDEO1 = 0x510, | ||
| 64 | CX23418_SVIDEO2 = 0x620, | ||
| 65 | CX23418_SVIDEO3 = 0x730, | ||
| 66 | CX23418_SVIDEO4 = 0x840, | ||
| 67 | }; | ||
| 68 | |||
| 69 | /* audio inputs */ | 39 | /* audio inputs */ |
| 70 | #define CX18_CARD_INPUT_AUD_TUNER 1 | 40 | #define CX18_CARD_INPUT_AUD_TUNER 1 |
| 71 | #define CX18_CARD_INPUT_LINE_IN1 2 | 41 | #define CX18_CARD_INPUT_LINE_IN1 2 |
| @@ -75,16 +45,6 @@ enum cx34180_video_input { | |||
| 75 | #define CX18_CARD_MAX_AUDIO_INPUTS 3 | 45 | #define CX18_CARD_MAX_AUDIO_INPUTS 3 |
| 76 | #define CX18_CARD_MAX_TUNERS 2 | 46 | #define CX18_CARD_MAX_TUNERS 2 |
| 77 | 47 | ||
| 78 | enum cx23418_audio_input { | ||
| 79 | /* Audio inputs: serial or In4-In8 */ | ||
| 80 | CX23418_AUDIO_SERIAL, | ||
| 81 | CX23418_AUDIO4 = 4, | ||
| 82 | CX23418_AUDIO5, | ||
| 83 | CX23418_AUDIO6, | ||
| 84 | CX23418_AUDIO7, | ||
| 85 | CX23418_AUDIO8, | ||
| 86 | }; | ||
| 87 | |||
| 88 | /* V4L2 capability aliases */ | 48 | /* V4L2 capability aliases */ |
| 89 | #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \ | 49 | #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \ |
| 90 | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE) | 50 | V4L2_CAP_AUDIO | V4L2_CAP_READWRITE) |
| @@ -118,6 +78,13 @@ struct cx18_gpio_init { /* set initial GPIO DIR and OUT values */ | |||
| 118 | u32 initial_value; | 78 | u32 initial_value; |
| 119 | }; | 79 | }; |
| 120 | 80 | ||
| 81 | struct cx18_gpio_i2c_slave_reset { | ||
| 82 | u32 active_lo_mask; /* GPIO outputs that reset i2c chips when low */ | ||
| 83 | u32 active_hi_mask; /* GPIO outputs that reset i2c chips when high */ | ||
| 84 | int msecs_asserted; /* time period reset must remain asserted */ | ||
| 85 | int msecs_recovery; /* time after deassert for chips to be ready */ | ||
| 86 | }; | ||
| 87 | |||
| 121 | struct cx18_card_tuner { | 88 | struct cx18_card_tuner { |
| 122 | v4l2_std_id std; /* standard for which the tuner is suitable */ | 89 | v4l2_std_id std; /* standard for which the tuner is suitable */ |
| 123 | int tuner; /* tuner ID (from tuner.h) */ | 90 | int tuner; /* tuner ID (from tuner.h) */ |
| @@ -154,7 +121,8 @@ struct cx18_card { | |||
| 154 | 121 | ||
| 155 | /* GPIO card-specific settings */ | 122 | /* GPIO card-specific settings */ |
| 156 | u8 xceive_pin; /* XCeive tuner GPIO reset pin */ | 123 | u8 xceive_pin; /* XCeive tuner GPIO reset pin */ |
| 157 | struct cx18_gpio_init gpio_init; | 124 | struct cx18_gpio_init gpio_init; |
| 125 | struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset; | ||
| 158 | 126 | ||
| 159 | struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS]; | 127 | struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS]; |
| 160 | struct cx18_card_tuner_i2c *i2c; | 128 | struct cx18_card_tuner_i2c *i2c; |
diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c index c9744173f969..cae38985b131 100644 --- a/drivers/media/video/cx18/cx18-dvb.c +++ b/drivers/media/video/cx18/cx18-dvb.c | |||
| @@ -69,11 +69,21 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed) | |||
| 69 | struct dvb_demux *demux = feed->demux; | 69 | struct dvb_demux *demux = feed->demux; |
| 70 | struct cx18_stream *stream = (struct cx18_stream *) demux->priv; | 70 | struct cx18_stream *stream = (struct cx18_stream *) demux->priv; |
| 71 | struct cx18 *cx = stream->cx; | 71 | struct cx18 *cx = stream->cx; |
| 72 | int ret = -EINVAL; | 72 | int ret; |
| 73 | u32 v; | 73 | u32 v; |
| 74 | 74 | ||
| 75 | CX18_DEBUG_INFO("Start feed: pid = 0x%x index = %d\n", | 75 | CX18_DEBUG_INFO("Start feed: pid = 0x%x index = %d\n", |
| 76 | feed->pid, feed->index); | 76 | feed->pid, feed->index); |
| 77 | |||
| 78 | mutex_lock(&cx->serialize_lock); | ||
| 79 | ret = cx18_init_on_first_open(cx); | ||
| 80 | mutex_unlock(&cx->serialize_lock); | ||
| 81 | if (ret) { | ||
| 82 | CX18_ERR("Failed to initialize firmware starting DVB feed\n"); | ||
| 83 | return ret; | ||
| 84 | } | ||
| 85 | ret = -EINVAL; | ||
| 86 | |||
| 77 | switch (cx->card->type) { | 87 | switch (cx->card->type) { |
| 78 | case CX18_CARD_HVR_1600_ESMT: | 88 | case CX18_CARD_HVR_1600_ESMT: |
| 79 | case CX18_CARD_HVR_1600_SAMSUNG: | 89 | case CX18_CARD_HVR_1600_SAMSUNG: |
| @@ -101,6 +111,11 @@ static int cx18_dvb_start_feed(struct dvb_demux_feed *feed) | |||
| 101 | if (stream->dvb.feeding++ == 0) { | 111 | if (stream->dvb.feeding++ == 0) { |
| 102 | CX18_DEBUG_INFO("Starting Transport DMA\n"); | 112 | CX18_DEBUG_INFO("Starting Transport DMA\n"); |
| 103 | ret = cx18_start_v4l2_encode_stream(stream); | 113 | ret = cx18_start_v4l2_encode_stream(stream); |
| 114 | if (ret < 0) { | ||
| 115 | CX18_DEBUG_INFO( | ||
| 116 | "Failed to start Transport DMA\n"); | ||
| 117 | stream->dvb.feeding--; | ||
| 118 | } | ||
| 104 | } else | 119 | } else |
| 105 | ret = 0; | 120 | ret = 0; |
| 106 | mutex_unlock(&stream->dvb.feedlock); | 121 | mutex_unlock(&stream->dvb.feedlock); |
diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c index ceb63653c926..b302833f6f9d 100644 --- a/drivers/media/video/cx18/cx18-gpio.c +++ b/drivers/media/video/cx18/cx18-gpio.c | |||
| @@ -53,10 +53,34 @@ static void gpio_write(struct cx18 *cx) | |||
| 53 | write_reg(((dir & 0xffff) << 16) | (val & 0xffff), | 53 | write_reg(((dir & 0xffff) << 16) | (val & 0xffff), |
| 54 | CX18_REG_GPIO_OUT1); | 54 | CX18_REG_GPIO_OUT1); |
| 55 | write_reg(dir & 0xffff0000, CX18_REG_GPIO_DIR2); | 55 | write_reg(dir & 0xffff0000, CX18_REG_GPIO_DIR2); |
| 56 | write_reg((dir & 0xffff0000) | ((val & 0xffff0000) >> 16), | 56 | write_reg_sync((dir & 0xffff0000) | ((val & 0xffff0000) >> 16), |
| 57 | CX18_REG_GPIO_OUT2); | 57 | CX18_REG_GPIO_OUT2); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | void cx18_reset_i2c_slaves_gpio(struct cx18 *cx) | ||
| 61 | { | ||
| 62 | const struct cx18_gpio_i2c_slave_reset *p; | ||
| 63 | |||
| 64 | p = &cx->card->gpio_i2c_slave_reset; | ||
| 65 | |||
| 66 | if ((p->active_lo_mask | p->active_hi_mask) == 0) | ||
| 67 | return; | ||
| 68 | |||
| 69 | /* Assuming that the masks are a subset of the bits in gpio_dir */ | ||
| 70 | |||
| 71 | /* Assert */ | ||
| 72 | cx->gpio_val = | ||
| 73 | (cx->gpio_val | p->active_hi_mask) & ~(p->active_lo_mask); | ||
| 74 | gpio_write(cx); | ||
| 75 | schedule_timeout_uninterruptible(msecs_to_jiffies(p->msecs_asserted)); | ||
| 76 | |||
| 77 | /* Deassert */ | ||
| 78 | cx->gpio_val = | ||
| 79 | (cx->gpio_val | p->active_lo_mask) & ~(p->active_hi_mask); | ||
| 80 | gpio_write(cx); | ||
| 81 | schedule_timeout_uninterruptible(msecs_to_jiffies(p->msecs_recovery)); | ||
| 82 | } | ||
| 83 | |||
| 60 | void cx18_gpio_init(struct cx18 *cx) | 84 | void cx18_gpio_init(struct cx18 *cx) |
| 61 | { | 85 | { |
| 62 | cx->gpio_dir = cx->card->gpio_init.direction; | 86 | cx->gpio_dir = cx->card->gpio_init.direction; |
diff --git a/drivers/media/video/cx18/cx18-gpio.h b/drivers/media/video/cx18/cx18-gpio.h index 41bac8856b50..525c328f748a 100644 --- a/drivers/media/video/cx18/cx18-gpio.h +++ b/drivers/media/video/cx18/cx18-gpio.h | |||
| @@ -21,4 +21,5 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | void cx18_gpio_init(struct cx18 *cx); | 23 | void cx18_gpio_init(struct cx18 *cx); |
| 24 | void cx18_reset_i2c_slaves_gpio(struct cx18 *cx); | ||
| 24 | int cx18_reset_tuner_gpio(void *dev, int cmd, int value); | 25 | int cx18_reset_tuner_gpio(void *dev, int cmd, int value); |
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c index 1d6c51a75313..680bc4e35b79 100644 --- a/drivers/media/video/cx18/cx18-i2c.c +++ b/drivers/media/video/cx18/cx18-i2c.c | |||
| @@ -405,6 +405,8 @@ int init_cx18_i2c(struct cx18 *cx) | |||
| 405 | cx18_setscl(&cx->i2c_algo_cb_data[1], 1); | 405 | cx18_setscl(&cx->i2c_algo_cb_data[1], 1); |
| 406 | cx18_setsda(&cx->i2c_algo_cb_data[1], 1); | 406 | cx18_setsda(&cx->i2c_algo_cb_data[1], 1); |
| 407 | 407 | ||
| 408 | cx18_reset_i2c_slaves_gpio(cx); | ||
| 409 | |||
| 408 | return i2c_bit_add_bus(&cx->i2c_adap[0]) || | 410 | return i2c_bit_add_bus(&cx->i2c_adap[0]) || |
| 409 | i2c_bit_add_bus(&cx->i2c_adap[1]); | 411 | i2c_bit_add_bus(&cx->i2c_adap[1]); |
| 410 | } | 412 | } |
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 607efdcd22f8..1da6f134888d 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c | |||
| @@ -433,7 +433,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp | |||
| 433 | int chroma = vid_input & 0xf00; | 433 | int chroma = vid_input & 0xf00; |
| 434 | 434 | ||
| 435 | if ((vid_input & ~0xff0) || | 435 | if ((vid_input & ~0xff0) || |
| 436 | luma < CX25840_SVIDEO_LUMA1 || luma > CX25840_SVIDEO_LUMA4 || | 436 | luma < CX25840_SVIDEO_LUMA1 || luma > CX25840_SVIDEO_LUMA8 || |
| 437 | chroma < CX25840_SVIDEO_CHROMA4 || chroma > CX25840_SVIDEO_CHROMA8) { | 437 | chroma < CX25840_SVIDEO_CHROMA4 || chroma > CX25840_SVIDEO_CHROMA8) { |
| 438 | v4l_err(client, "0x%04x is not a valid video input!\n", | 438 | v4l_err(client, "0x%04x is not a valid video input!\n", |
| 439 | vid_input); | 439 | vid_input); |
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index e976fc6bef7c..80c8883e54b5 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
| @@ -332,6 +332,12 @@ static int snd_cx88_pcm_open(struct snd_pcm_substream *substream) | |||
| 332 | struct snd_pcm_runtime *runtime = substream->runtime; | 332 | struct snd_pcm_runtime *runtime = substream->runtime; |
| 333 | int err; | 333 | int err; |
| 334 | 334 | ||
| 335 | if (!chip) { | ||
| 336 | printk(KERN_ERR "BUG: cx88 can't find device struct." | ||
| 337 | " Can't proceed with open\n"); | ||
| 338 | return -ENODEV; | ||
| 339 | } | ||
| 340 | |||
| 335 | err = snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS); | 341 | err = snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS); |
| 336 | if (err < 0) | 342 | if (err < 0) |
| 337 | goto _error; | 343 | goto _error; |
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index 92b2a6db4fdc..3c006103c1eb 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c | |||
| @@ -268,6 +268,12 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream) | |||
| 268 | 268 | ||
| 269 | dprintk("opening device and trying to acquire exclusive lock\n"); | 269 | dprintk("opening device and trying to acquire exclusive lock\n"); |
| 270 | 270 | ||
| 271 | if (!dev) { | ||
| 272 | printk(KERN_ERR "BUG: em28xx can't find device struct." | ||
| 273 | " Can't proceed with open\n"); | ||
| 274 | return -ENODEV; | ||
| 275 | } | ||
| 276 | |||
| 271 | /* Sets volume, mute, etc */ | 277 | /* Sets volume, mute, etc */ |
| 272 | 278 | ||
| 273 | dev->mute = 0; | 279 | dev->mute = 0; |
| @@ -415,6 +421,12 @@ static int em28xx_audio_init(struct em28xx *dev) | |||
| 415 | static int devnr; | 421 | static int devnr; |
| 416 | int ret, err; | 422 | int ret, err; |
| 417 | 423 | ||
| 424 | if (dev->has_audio_class) { | ||
| 425 | /* This device does not support the extension (in this case | ||
| 426 | the device is expecting the snd-usb-audio module */ | ||
| 427 | return 0; | ||
| 428 | } | ||
| 429 | |||
| 418 | printk(KERN_INFO "em28xx-audio.c: probing for em28x1 " | 430 | printk(KERN_INFO "em28xx-audio.c: probing for em28x1 " |
| 419 | "non standard usbaudio\n"); | 431 | "non standard usbaudio\n"); |
| 420 | printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus " | 432 | printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus " |
| @@ -458,6 +470,12 @@ static int em28xx_audio_fini(struct em28xx *dev) | |||
| 458 | if (dev == NULL) | 470 | if (dev == NULL) |
| 459 | return 0; | 471 | return 0; |
| 460 | 472 | ||
| 473 | if (dev->has_audio_class) { | ||
| 474 | /* This device does not support the extension (in this case | ||
| 475 | the device is expecting the snd-usb-audio module */ | ||
| 476 | return 0; | ||
| 477 | } | ||
| 478 | |||
| 461 | if (dev->adev) { | 479 | if (dev->adev) { |
| 462 | snd_card_free(dev->adev->sndcard); | 480 | snd_card_free(dev->adev->sndcard); |
| 463 | kfree(dev->adev); | 481 | kfree(dev->adev); |
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 3e4f3c7e92e7..8cbda43727c3 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
| @@ -157,6 +157,7 @@ struct em28xx_board em28xx_boards[] = { | |||
| 157 | .tda9887_conf = TDA9887_PRESENT, | 157 | .tda9887_conf = TDA9887_PRESENT, |
| 158 | .tuner_type = TUNER_XC2028, | 158 | .tuner_type = TUNER_XC2028, |
| 159 | .mts_firmware = 1, | 159 | .mts_firmware = 1, |
| 160 | .has_dvb = 1, | ||
| 160 | .decoder = EM28XX_TVP5150, | 161 | .decoder = EM28XX_TVP5150, |
| 161 | .input = { { | 162 | .input = { { |
| 162 | .type = EM28XX_VMUX_TELEVISION, | 163 | .type = EM28XX_VMUX_TELEVISION, |
| @@ -524,6 +525,9 @@ void em28xx_pre_card_setup(struct em28xx *dev) | |||
| 524 | rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID); | 525 | rc = em28xx_read_reg(dev, EM28XX_R0A_CHIPID); |
| 525 | if (rc > 0) { | 526 | if (rc > 0) { |
| 526 | switch (rc) { | 527 | switch (rc) { |
| 528 | case CHIP_ID_EM2860: | ||
| 529 | em28xx_info("chip ID is em2860\n"); | ||
| 530 | break; | ||
| 527 | case CHIP_ID_EM2883: | 531 | case CHIP_ID_EM2883: |
| 528 | em28xx_info("chip ID is em2882/em2883\n"); | 532 | em28xx_info("chip ID is em2882/em2883\n"); |
| 529 | dev->wait_after_write = 0; | 533 | dev->wait_after_write = 0; |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 8cf4983f0039..0b2333ee07f8 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
| @@ -382,6 +382,11 @@ static int dvb_init(struct em28xx *dev) | |||
| 382 | int result = 0; | 382 | int result = 0; |
| 383 | struct em28xx_dvb *dvb; | 383 | struct em28xx_dvb *dvb; |
| 384 | 384 | ||
| 385 | if (!dev->has_dvb) { | ||
| 386 | /* This device does not support the extension */ | ||
| 387 | return 0; | ||
| 388 | } | ||
| 389 | |||
| 385 | dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); | 390 | dvb = kzalloc(sizeof(struct em28xx_dvb), GFP_KERNEL); |
| 386 | 391 | ||
| 387 | if (dvb == NULL) { | 392 | if (dvb == NULL) { |
| @@ -444,6 +449,11 @@ out_free: | |||
| 444 | 449 | ||
| 445 | static int dvb_fini(struct em28xx *dev) | 450 | static int dvb_fini(struct em28xx *dev) |
| 446 | { | 451 | { |
| 452 | if (!dev->has_dvb) { | ||
| 453 | /* This device does not support the extension */ | ||
| 454 | return 0; | ||
| 455 | } | ||
| 456 | |||
| 447 | if (dev->dvb) { | 457 | if (dev->dvb) { |
| 448 | unregister_dvb(dev->dvb); | 458 | unregister_dvb(dev->dvb); |
| 449 | dev->dvb = NULL; | 459 | dev->dvb = NULL; |
diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h index 9058bed07953..fac1ab23f621 100644 --- a/drivers/media/video/em28xx/em28xx-reg.h +++ b/drivers/media/video/em28xx/em28xx-reg.h | |||
| @@ -84,5 +84,6 @@ | |||
| 84 | 84 | ||
| 85 | /* FIXME: Need to be populated with the other chip ID's */ | 85 | /* FIXME: Need to be populated with the other chip ID's */ |
| 86 | enum em28xx_chip_id { | 86 | enum em28xx_chip_id { |
| 87 | CHIP_ID_EM2860 = 34, | ||
| 87 | CHIP_ID_EM2883 = 36, | 88 | CHIP_ID_EM2883 = 36, |
| 88 | }; | 89 | }; |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index fb163ecd9216..285bc62bbe46 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -1848,32 +1848,28 @@ static DEFINE_MUTEX(em28xx_extension_devlist_lock); | |||
| 1848 | 1848 | ||
| 1849 | int em28xx_register_extension(struct em28xx_ops *ops) | 1849 | int em28xx_register_extension(struct em28xx_ops *ops) |
| 1850 | { | 1850 | { |
| 1851 | struct em28xx *h, *dev = NULL; | 1851 | struct em28xx *dev = NULL; |
| 1852 | |||
| 1853 | list_for_each_entry(h, &em28xx_devlist, devlist) | ||
| 1854 | dev = h; | ||
| 1855 | 1852 | ||
| 1856 | mutex_lock(&em28xx_extension_devlist_lock); | 1853 | mutex_lock(&em28xx_extension_devlist_lock); |
| 1857 | list_add_tail(&ops->next, &em28xx_extension_devlist); | 1854 | list_add_tail(&ops->next, &em28xx_extension_devlist); |
| 1858 | if (dev) | 1855 | list_for_each_entry(dev, &em28xx_devlist, devlist) { |
| 1859 | ops->init(dev); | 1856 | if (dev) |
| 1860 | 1857 | ops->init(dev); | |
| 1858 | } | ||
| 1861 | printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name); | 1859 | printk(KERN_INFO "Em28xx: Initialized (%s) extension\n", ops->name); |
| 1862 | mutex_unlock(&em28xx_extension_devlist_lock); | 1860 | mutex_unlock(&em28xx_extension_devlist_lock); |
| 1863 | |||
| 1864 | return 0; | 1861 | return 0; |
| 1865 | } | 1862 | } |
| 1866 | EXPORT_SYMBOL(em28xx_register_extension); | 1863 | EXPORT_SYMBOL(em28xx_register_extension); |
| 1867 | 1864 | ||
| 1868 | void em28xx_unregister_extension(struct em28xx_ops *ops) | 1865 | void em28xx_unregister_extension(struct em28xx_ops *ops) |
| 1869 | { | 1866 | { |
| 1870 | struct em28xx *h, *dev = NULL; | 1867 | struct em28xx *dev = NULL; |
| 1871 | |||
| 1872 | list_for_each_entry(h, &em28xx_devlist, devlist) | ||
| 1873 | dev = h; | ||
| 1874 | 1868 | ||
| 1875 | if (dev) | 1869 | list_for_each_entry(dev, &em28xx_devlist, devlist) { |
| 1876 | ops->fini(dev); | 1870 | if (dev) |
| 1871 | ops->fini(dev); | ||
| 1872 | } | ||
| 1877 | 1873 | ||
| 1878 | mutex_lock(&em28xx_extension_devlist_lock); | 1874 | mutex_lock(&em28xx_extension_devlist_lock); |
| 1879 | printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name); | 1875 | printk(KERN_INFO "Em28xx: Removed (%s) extension\n", ops->name); |
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 7cc8e9b19fb7..5ec5bb9a94d2 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -1019,12 +1019,12 @@ static int pxa_camera_probe(struct platform_device *pdev) | |||
| 1019 | struct pxa_camera_dev *pcdev; | 1019 | struct pxa_camera_dev *pcdev; |
| 1020 | struct resource *res; | 1020 | struct resource *res; |
| 1021 | void __iomem *base; | 1021 | void __iomem *base; |
| 1022 | unsigned int irq; | 1022 | int irq; |
| 1023 | int err = 0; | 1023 | int err = 0; |
| 1024 | 1024 | ||
| 1025 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1025 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 1026 | irq = platform_get_irq(pdev, 0); | 1026 | irq = platform_get_irq(pdev, 0); |
| 1027 | if (!res || !irq) { | 1027 | if (!res || irq < 0) { |
| 1028 | err = -ENODEV; | 1028 | err = -ENODEV; |
| 1029 | goto exit; | 1029 | goto exit; |
| 1030 | } | 1030 | } |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index ba3082422a01..f118de6e3672 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
| @@ -613,9 +613,15 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream) | |||
| 613 | struct snd_pcm_runtime *runtime = substream->runtime; | 613 | struct snd_pcm_runtime *runtime = substream->runtime; |
| 614 | snd_card_saa7134_pcm_t *pcm; | 614 | snd_card_saa7134_pcm_t *pcm; |
| 615 | snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); | 615 | snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); |
| 616 | struct saa7134_dev *dev = saa7134->dev; | 616 | struct saa7134_dev *dev; |
| 617 | int amux, err; | 617 | int amux, err; |
| 618 | 618 | ||
| 619 | if (!saa7134) { | ||
| 620 | printk(KERN_ERR "BUG: saa7134 can't find device struct." | ||
| 621 | " Can't proceed with open\n"); | ||
| 622 | return -ENODEV; | ||
| 623 | } | ||
| 624 | dev = saa7134->dev; | ||
| 619 | mutex_lock(&dev->dmasound.lock); | 625 | mutex_lock(&dev->dmasound.lock); |
| 620 | 626 | ||
| 621 | dev->dmasound.read_count = 0; | 627 | dev->dmasound.read_count = 0; |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index b111903aa322..2618cfa592e7 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
| @@ -4114,11 +4114,7 @@ struct saa7134_board saa7134_boards[] = { | |||
| 4114 | .radio_type = UNSET, | 4114 | .radio_type = UNSET, |
| 4115 | .tuner_addr = ADDR_UNSET, | 4115 | .tuner_addr = ADDR_UNSET, |
| 4116 | .radio_addr = ADDR_UNSET, | 4116 | .radio_addr = ADDR_UNSET, |
| 4117 | /* | ||
| 4118 | TODO: | ||
| 4119 | .mpeg = SAA7134_MPEG_DVB, | 4117 | .mpeg = SAA7134_MPEG_DVB, |
| 4120 | */ | ||
| 4121 | |||
| 4122 | .inputs = {{ | 4118 | .inputs = {{ |
| 4123 | .name = name_tv, | 4119 | .name = name_tv, |
| 4124 | .vmux = 1, | 4120 | .vmux = 1, |
| @@ -4157,7 +4153,7 @@ struct saa7134_board saa7134_boards[] = { | |||
| 4157 | } }, | 4153 | } }, |
| 4158 | .radio = { | 4154 | .radio = { |
| 4159 | .name = name_radio, | 4155 | .name = name_radio, |
| 4160 | .amux = LINE1, | 4156 | .amux = TV, |
| 4161 | }, | 4157 | }, |
| 4162 | }, | 4158 | }, |
| 4163 | [SAA7134_BOARD_AVERMEDIA_M115] = { | 4159 | [SAA7134_BOARD_AVERMEDIA_M115] = { |
| @@ -4167,6 +4163,7 @@ struct saa7134_board saa7134_boards[] = { | |||
| 4167 | .radio_type = UNSET, | 4163 | .radio_type = UNSET, |
| 4168 | .tuner_addr = ADDR_UNSET, | 4164 | .tuner_addr = ADDR_UNSET, |
| 4169 | .radio_addr = ADDR_UNSET, | 4165 | .radio_addr = ADDR_UNSET, |
| 4166 | .mpeg = SAA7134_MPEG_DVB, | ||
| 4170 | .inputs = {{ | 4167 | .inputs = {{ |
| 4171 | .name = name_tv, | 4168 | .name = name_tv, |
| 4172 | .vmux = 1, | 4169 | .vmux = 1, |
| @@ -5351,22 +5348,21 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev, | |||
| 5351 | { | 5348 | { |
| 5352 | switch (command) { | 5349 | switch (command) { |
| 5353 | case XC2028_TUNER_RESET: | 5350 | case XC2028_TUNER_RESET: |
| 5354 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x06e20000, 0x06e20000); | 5351 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00000000); |
| 5355 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x06a20000, 0x06a20000); | 5352 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x00008000, 0x00008000); |
| 5356 | mdelay(250); | 5353 | switch (dev->board) { |
| 5357 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x06e20000, 0); | 5354 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: |
| 5358 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x06a20000, 0); | 5355 | saa7134_set_gpio(dev, 23, 0); |
| 5359 | mdelay(250); | 5356 | msleep(10); |
| 5360 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x06e20000, 0x06e20000); | 5357 | saa7134_set_gpio(dev, 23, 1); |
| 5361 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x06a20000, 0x06a20000); | 5358 | break; |
| 5362 | mdelay(250); | 5359 | case SAA7134_BOARD_AVERMEDIA_A16D: |
| 5363 | saa_andorl(SAA7133_ANALOG_IO_SELECT >> 2, 0x02, 0x02); | 5360 | saa7134_set_gpio(dev, 21, 0); |
| 5364 | saa_andorl(SAA7134_ANALOG_IN_CTRL1 >> 2, 0x81, 0x81); | 5361 | msleep(10); |
| 5365 | saa_andorl(SAA7134_AUDIO_CLOCK0 >> 2, 0x03187de7, 0x03187de7); | 5362 | saa7134_set_gpio(dev, 21, 1); |
| 5366 | saa_andorl(SAA7134_AUDIO_PLL_CTRL >> 2, 0x03, 0x03); | 5363 | break; |
| 5367 | saa_andorl(SAA7134_AUDIO_CLOCKS_PER_FIELD0 >> 2, | 5364 | } |
| 5368 | 0x0001e000, 0x0001e000); | 5365 | return 0; |
| 5369 | return 0; | ||
| 5370 | } | 5366 | } |
| 5371 | return -EINVAL; | 5367 | return -EINVAL; |
| 5372 | } | 5368 | } |
| @@ -5553,9 +5549,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 5553 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x08000000, 0x00000000); | 5549 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x08000000, 0x00000000); |
| 5554 | break; | 5550 | break; |
| 5555 | case SAA7134_BOARD_AVERMEDIA_CARDBUS: | 5551 | case SAA7134_BOARD_AVERMEDIA_CARDBUS: |
| 5556 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | ||
| 5557 | case SAA7134_BOARD_AVERMEDIA_M115: | 5552 | case SAA7134_BOARD_AVERMEDIA_M115: |
| 5558 | case SAA7134_BOARD_AVERMEDIA_A16D: | ||
| 5559 | /* power-down tuner chip */ | 5553 | /* power-down tuner chip */ |
| 5560 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0xffffffff, 0); | 5554 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0xffffffff, 0); |
| 5561 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0); | 5555 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0); |
| @@ -5565,6 +5559,18 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 5565 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff); | 5559 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff); |
| 5566 | msleep(10); | 5560 | msleep(10); |
| 5567 | break; | 5561 | break; |
| 5562 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | ||
| 5563 | saa7134_set_gpio(dev, 23, 0); | ||
| 5564 | msleep(10); | ||
| 5565 | saa7134_set_gpio(dev, 23, 1); | ||
| 5566 | break; | ||
| 5567 | case SAA7134_BOARD_AVERMEDIA_A16D: | ||
| 5568 | saa7134_set_gpio(dev, 21, 0); | ||
| 5569 | msleep(10); | ||
| 5570 | saa7134_set_gpio(dev, 21, 1); | ||
| 5571 | msleep(1); | ||
| 5572 | dev->has_remote = SAA7134_REMOTE_GPIO; | ||
| 5573 | break; | ||
| 5568 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: | 5574 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: |
| 5569 | /* power-down tuner chip */ | 5575 | /* power-down tuner chip */ |
| 5570 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x000A8004, 0x000A8004); | 5576 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x000A8004, 0x000A8004); |
| @@ -5615,7 +5621,8 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
| 5615 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x80040100, 0x80040100); | 5621 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x80040100, 0x80040100); |
| 5616 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x80040100, 0x00040100); | 5622 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x80040100, 0x00040100); |
| 5617 | printk("%s: %s: hybrid analog/dvb card\n" | 5623 | printk("%s: %s: hybrid analog/dvb card\n" |
| 5618 | "%s: Sorry, only the analog inputs are supported for now.\n", | 5624 | "%s: Sorry, only analog s-video and composite input " |
| 5625 | "are supported for now.\n", | ||
| 5619 | dev->name, card(dev).name, dev->name); | 5626 | dev->name, card(dev).name, dev->name); |
| 5620 | break; | 5627 | break; |
| 5621 | } | 5628 | } |
| @@ -5675,6 +5682,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev) | |||
| 5675 | 5682 | ||
| 5676 | switch (dev->board) { | 5683 | switch (dev->board) { |
| 5677 | case SAA7134_BOARD_AVERMEDIA_A16D: | 5684 | case SAA7134_BOARD_AVERMEDIA_A16D: |
| 5685 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | ||
| 5678 | ctl.demod = XC3028_FE_ZARLINK456; | 5686 | ctl.demod = XC3028_FE_ZARLINK456; |
| 5679 | break; | 5687 | break; |
| 5680 | default: | 5688 | default: |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 469f93aac008..341b101b0357 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
| @@ -153,12 +153,12 @@ static int mt352_aver777_init(struct dvb_frontend* fe) | |||
| 153 | return 0; | 153 | return 0; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | static int mt352_aver_a16d_init(struct dvb_frontend *fe) | 156 | static int mt352_avermedia_xc3028_init(struct dvb_frontend *fe) |
| 157 | { | 157 | { |
| 158 | static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x2d }; | 158 | static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x2d }; |
| 159 | static u8 reset [] = { RESET, 0x80 }; | 159 | static u8 reset [] = { RESET, 0x80 }; |
| 160 | static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 }; | 160 | static u8 adc_ctl_1_cfg [] = { ADC_CTL_1, 0x40 }; |
| 161 | static u8 agc_cfg [] = { AGC_TARGET, 0x28, 0xa0 }; | 161 | static u8 agc_cfg [] = { AGC_TARGET, 0xe }; |
| 162 | static u8 capt_range_cfg[] = { CAPT_RANGE, 0x33 }; | 162 | static u8 capt_range_cfg[] = { CAPT_RANGE, 0x33 }; |
| 163 | 163 | ||
| 164 | mt352_write(fe, clock_config, sizeof(clock_config)); | 164 | mt352_write(fe, clock_config, sizeof(clock_config)); |
| @@ -167,12 +167,9 @@ static int mt352_aver_a16d_init(struct dvb_frontend *fe) | |||
| 167 | mt352_write(fe, adc_ctl_1_cfg, sizeof(adc_ctl_1_cfg)); | 167 | mt352_write(fe, adc_ctl_1_cfg, sizeof(adc_ctl_1_cfg)); |
| 168 | mt352_write(fe, agc_cfg, sizeof(agc_cfg)); | 168 | mt352_write(fe, agc_cfg, sizeof(agc_cfg)); |
| 169 | mt352_write(fe, capt_range_cfg, sizeof(capt_range_cfg)); | 169 | mt352_write(fe, capt_range_cfg, sizeof(capt_range_cfg)); |
| 170 | |||
| 171 | return 0; | 170 | return 0; |
| 172 | } | 171 | } |
| 173 | 172 | ||
| 174 | |||
| 175 | |||
| 176 | static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe, | 173 | static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe, |
| 177 | struct dvb_frontend_parameters* params) | 174 | struct dvb_frontend_parameters* params) |
| 178 | { | 175 | { |
| @@ -215,14 +212,10 @@ static struct mt352_config avermedia_777 = { | |||
| 215 | .demod_init = mt352_aver777_init, | 212 | .demod_init = mt352_aver777_init, |
| 216 | }; | 213 | }; |
| 217 | 214 | ||
| 218 | static struct mt352_config avermedia_16d = { | 215 | static struct mt352_config avermedia_xc3028_mt352_dev = { |
| 219 | .demod_address = 0xf, | ||
| 220 | .demod_init = mt352_aver_a16d_init, | ||
| 221 | }; | ||
| 222 | |||
| 223 | static struct mt352_config avermedia_e506r_mt352_dev = { | ||
| 224 | .demod_address = (0x1e >> 1), | 216 | .demod_address = (0x1e >> 1), |
| 225 | .no_tuner = 1, | 217 | .no_tuner = 1, |
| 218 | .demod_init = mt352_avermedia_xc3028_init, | ||
| 226 | }; | 219 | }; |
| 227 | 220 | ||
| 228 | /* ================================================================== | 221 | /* ================================================================== |
| @@ -975,9 +968,10 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 975 | } | 968 | } |
| 976 | break; | 969 | break; |
| 977 | case SAA7134_BOARD_AVERMEDIA_A16D: | 970 | case SAA7134_BOARD_AVERMEDIA_A16D: |
| 978 | dprintk("avertv A16D dvb setup\n"); | 971 | dprintk("AverMedia A16D dvb setup\n"); |
| 979 | dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_16d, | 972 | dev->dvb.frontend = dvb_attach(mt352_attach, |
| 980 | &dev->i2c_adap); | 973 | &avermedia_xc3028_mt352_dev, |
| 974 | &dev->i2c_adap); | ||
| 981 | attach_xc3028 = 1; | 975 | attach_xc3028 = 1; |
| 982 | break; | 976 | break; |
| 983 | case SAA7134_BOARD_MD7134: | 977 | case SAA7134_BOARD_MD7134: |
| @@ -1091,7 +1085,8 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 1091 | ads_tech_duo_config.tuner_address); | 1085 | ads_tech_duo_config.tuner_address); |
| 1092 | goto dettach_frontend; | 1086 | goto dettach_frontend; |
| 1093 | } | 1087 | } |
| 1094 | } | 1088 | } else |
| 1089 | wprintk("failed to attach tda10046\n"); | ||
| 1095 | break; | 1090 | break; |
| 1096 | case SAA7134_BOARD_TEVION_DVBT_220RF: | 1091 | case SAA7134_BOARD_TEVION_DVBT_220RF: |
| 1097 | if (configure_tda827x_fe(dev, &tevion_dvbt220rf_config, | 1092 | if (configure_tda827x_fe(dev, &tevion_dvbt220rf_config, |
| @@ -1260,11 +1255,14 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 1260 | goto dettach_frontend; | 1255 | goto dettach_frontend; |
| 1261 | break; | 1256 | break; |
| 1262 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | 1257 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: |
| 1258 | dprintk("AverMedia E506R dvb setup\n"); | ||
| 1259 | saa7134_set_gpio(dev, 25, 0); | ||
| 1260 | msleep(10); | ||
| 1261 | saa7134_set_gpio(dev, 25, 1); | ||
| 1263 | dev->dvb.frontend = dvb_attach(mt352_attach, | 1262 | dev->dvb.frontend = dvb_attach(mt352_attach, |
| 1264 | &avermedia_e506r_mt352_dev, | 1263 | &avermedia_xc3028_mt352_dev, |
| 1265 | &dev->i2c_adap); | 1264 | &dev->i2c_adap); |
| 1266 | attach_xc3028 = 1; | 1265 | attach_xc3028 = 1; |
| 1267 | break; | ||
| 1268 | case SAA7134_BOARD_MD7134_BRIDGE_2: | 1266 | case SAA7134_BOARD_MD7134_BRIDGE_2: |
| 1269 | dev->dvb.frontend = dvb_attach(tda10086_attach, | 1267 | dev->dvb.frontend = dvb_attach(tda10086_attach, |
| 1270 | &sd1878_4m, &dev->i2c_adap); | 1268 | &sd1878_4m, &dev->i2c_adap); |
| @@ -1338,7 +1336,8 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 1338 | return ret; | 1336 | return ret; |
| 1339 | 1337 | ||
| 1340 | dettach_frontend: | 1338 | dettach_frontend: |
| 1341 | dvb_frontend_detach(dev->dvb.frontend); | 1339 | if (dev->dvb.frontend) |
| 1340 | dvb_frontend_detach(dev->dvb.frontend); | ||
| 1342 | dev->dvb.frontend = NULL; | 1341 | dev->dvb.frontend = NULL; |
| 1343 | 1342 | ||
| 1344 | return -1; | 1343 | return -1; |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 81431ee41842..3ae71a340822 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
| @@ -110,9 +110,10 @@ static int ts_release(struct inode *inode, struct file *file) | |||
| 110 | { | 110 | { |
| 111 | struct saa7134_dev *dev = file->private_data; | 111 | struct saa7134_dev *dev = file->private_data; |
| 112 | 112 | ||
| 113 | mutex_lock(&dev->empress_tsq.vb_lock); | ||
| 114 | |||
| 113 | videobuf_stop(&dev->empress_tsq); | 115 | videobuf_stop(&dev->empress_tsq); |
| 114 | videobuf_mmap_free(&dev->empress_tsq); | 116 | videobuf_mmap_free(&dev->empress_tsq); |
| 115 | dev->empress_users--; | ||
| 116 | 117 | ||
| 117 | /* stop the encoder */ | 118 | /* stop the encoder */ |
| 118 | ts_reset_encoder(dev); | 119 | ts_reset_encoder(dev); |
| @@ -121,6 +122,10 @@ static int ts_release(struct inode *inode, struct file *file) | |||
| 121 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | 122 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, |
| 122 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); | 123 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); |
| 123 | 124 | ||
| 125 | dev->empress_users--; | ||
| 126 | |||
| 127 | mutex_unlock(&dev->empress_tsq.vb_lock); | ||
| 128 | |||
| 124 | return 0; | 129 | return 0; |
| 125 | } | 130 | } |
| 126 | 131 | ||
| @@ -218,8 +223,7 @@ static int empress_enum_fmt_cap(struct file *file, void *priv, | |||
| 218 | static int empress_g_fmt_cap(struct file *file, void *priv, | 223 | static int empress_g_fmt_cap(struct file *file, void *priv, |
| 219 | struct v4l2_format *f) | 224 | struct v4l2_format *f) |
| 220 | { | 225 | { |
| 221 | struct saa7134_fh *fh = priv; | 226 | struct saa7134_dev *dev = file->private_data; |
| 222 | struct saa7134_dev *dev = fh->dev; | ||
| 223 | 227 | ||
| 224 | saa7134_i2c_call_clients(dev, VIDIOC_G_FMT, f); | 228 | saa7134_i2c_call_clients(dev, VIDIOC_G_FMT, f); |
| 225 | 229 | ||
| @@ -232,8 +236,7 @@ static int empress_g_fmt_cap(struct file *file, void *priv, | |||
| 232 | static int empress_s_fmt_cap(struct file *file, void *priv, | 236 | static int empress_s_fmt_cap(struct file *file, void *priv, |
| 233 | struct v4l2_format *f) | 237 | struct v4l2_format *f) |
| 234 | { | 238 | { |
| 235 | struct saa7134_fh *fh = priv; | 239 | struct saa7134_dev *dev = file->private_data; |
| 236 | struct saa7134_dev *dev = fh->dev; | ||
| 237 | 240 | ||
| 238 | saa7134_i2c_call_clients(dev, VIDIOC_S_FMT, f); | 241 | saa7134_i2c_call_clients(dev, VIDIOC_S_FMT, f); |
| 239 | 242 | ||
| @@ -247,8 +250,7 @@ static int empress_s_fmt_cap(struct file *file, void *priv, | |||
| 247 | static int empress_reqbufs(struct file *file, void *priv, | 250 | static int empress_reqbufs(struct file *file, void *priv, |
| 248 | struct v4l2_requestbuffers *p) | 251 | struct v4l2_requestbuffers *p) |
| 249 | { | 252 | { |
| 250 | struct saa7134_fh *fh = priv; | 253 | struct saa7134_dev *dev = file->private_data; |
| 251 | struct saa7134_dev *dev = fh->dev; | ||
| 252 | 254 | ||
| 253 | return videobuf_reqbufs(&dev->empress_tsq, p); | 255 | return videobuf_reqbufs(&dev->empress_tsq, p); |
| 254 | } | 256 | } |
| @@ -256,24 +258,21 @@ static int empress_reqbufs(struct file *file, void *priv, | |||
| 256 | static int empress_querybuf(struct file *file, void *priv, | 258 | static int empress_querybuf(struct file *file, void *priv, |
| 257 | struct v4l2_buffer *b) | 259 | struct v4l2_buffer *b) |
| 258 | { | 260 | { |
| 259 | struct saa7134_fh *fh = priv; | 261 | struct saa7134_dev *dev = file->private_data; |
| 260 | struct saa7134_dev *dev = fh->dev; | ||
| 261 | 262 | ||
| 262 | return videobuf_querybuf(&dev->empress_tsq, b); | 263 | return videobuf_querybuf(&dev->empress_tsq, b); |
| 263 | } | 264 | } |
| 264 | 265 | ||
| 265 | static int empress_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) | 266 | static int empress_qbuf(struct file *file, void *priv, struct v4l2_buffer *b) |
| 266 | { | 267 | { |
| 267 | struct saa7134_fh *fh = priv; | 268 | struct saa7134_dev *dev = file->private_data; |
| 268 | struct saa7134_dev *dev = fh->dev; | ||
| 269 | 269 | ||
| 270 | return videobuf_qbuf(&dev->empress_tsq, b); | 270 | return videobuf_qbuf(&dev->empress_tsq, b); |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | static int empress_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) | 273 | static int empress_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) |
| 274 | { | 274 | { |
| 275 | struct saa7134_fh *fh = priv; | 275 | struct saa7134_dev *dev = file->private_data; |
| 276 | struct saa7134_dev *dev = fh->dev; | ||
| 277 | 276 | ||
| 278 | return videobuf_dqbuf(&dev->empress_tsq, b, | 277 | return videobuf_dqbuf(&dev->empress_tsq, b, |
| 279 | file->f_flags & O_NONBLOCK); | 278 | file->f_flags & O_NONBLOCK); |
| @@ -282,8 +281,7 @@ static int empress_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) | |||
| 282 | static int empress_streamon(struct file *file, void *priv, | 281 | static int empress_streamon(struct file *file, void *priv, |
| 283 | enum v4l2_buf_type type) | 282 | enum v4l2_buf_type type) |
| 284 | { | 283 | { |
| 285 | struct saa7134_fh *fh = priv; | 284 | struct saa7134_dev *dev = file->private_data; |
| 286 | struct saa7134_dev *dev = fh->dev; | ||
| 287 | 285 | ||
| 288 | return videobuf_streamon(&dev->empress_tsq); | 286 | return videobuf_streamon(&dev->empress_tsq); |
| 289 | } | 287 | } |
| @@ -291,8 +289,7 @@ static int empress_streamon(struct file *file, void *priv, | |||
| 291 | static int empress_streamoff(struct file *file, void *priv, | 289 | static int empress_streamoff(struct file *file, void *priv, |
| 292 | enum v4l2_buf_type type) | 290 | enum v4l2_buf_type type) |
| 293 | { | 291 | { |
| 294 | struct saa7134_fh *fh = priv; | 292 | struct saa7134_dev *dev = file->private_data; |
| 295 | struct saa7134_dev *dev = fh->dev; | ||
| 296 | 293 | ||
| 297 | return videobuf_streamoff(&dev->empress_tsq); | 294 | return videobuf_streamoff(&dev->empress_tsq); |
| 298 | } | 295 | } |
| @@ -300,8 +297,7 @@ static int empress_streamoff(struct file *file, void *priv, | |||
| 300 | static int empress_s_ext_ctrls(struct file *file, void *priv, | 297 | static int empress_s_ext_ctrls(struct file *file, void *priv, |
| 301 | struct v4l2_ext_controls *ctrls) | 298 | struct v4l2_ext_controls *ctrls) |
| 302 | { | 299 | { |
| 303 | struct saa7134_fh *fh = priv; | 300 | struct saa7134_dev *dev = file->private_data; |
| 304 | struct saa7134_dev *dev = fh->dev; | ||
| 305 | 301 | ||
| 306 | /* count == 0 is abused in saa6752hs.c, so that special | 302 | /* count == 0 is abused in saa6752hs.c, so that special |
| 307 | case is handled here explicitly. */ | 303 | case is handled here explicitly. */ |
| @@ -320,8 +316,7 @@ static int empress_s_ext_ctrls(struct file *file, void *priv, | |||
| 320 | static int empress_g_ext_ctrls(struct file *file, void *priv, | 316 | static int empress_g_ext_ctrls(struct file *file, void *priv, |
| 321 | struct v4l2_ext_controls *ctrls) | 317 | struct v4l2_ext_controls *ctrls) |
| 322 | { | 318 | { |
| 323 | struct saa7134_fh *fh = priv; | 319 | struct saa7134_dev *dev = file->private_data; |
| 324 | struct saa7134_dev *dev = fh->dev; | ||
| 325 | 320 | ||
| 326 | if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG) | 321 | if (ctrls->ctrl_class != V4L2_CTRL_CLASS_MPEG) |
| 327 | return -EINVAL; | 322 | return -EINVAL; |
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 919632b10aae..76e6501d238d 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
| @@ -323,6 +323,15 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
| 323 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); | 323 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); |
| 324 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | 324 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); |
| 325 | break; | 325 | break; |
| 326 | case SAA7134_BOARD_AVERMEDIA_A16D: | ||
| 327 | ir_codes = ir_codes_avermedia_a16d; | ||
| 328 | mask_keycode = 0x02F200; | ||
| 329 | mask_keydown = 0x000400; | ||
| 330 | polling = 50; /* ms */ | ||
| 331 | /* Without this we won't receive key up events */ | ||
| 332 | saa_setb(SAA7134_GPIO_GPMODE1, 0x1); | ||
| 333 | saa_setb(SAA7134_GPIO_GPSTATUS1, 0x1); | ||
| 334 | break; | ||
| 326 | case SAA7134_BOARD_KWORLD_TERMINATOR: | 335 | case SAA7134_BOARD_KWORLD_TERMINATOR: |
| 327 | ir_codes = ir_codes_pixelview; | 336 | ir_codes = ir_codes_pixelview; |
| 328 | mask_keycode = 0x00001f; | 337 | mask_keycode = 0x00001f; |
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index a1b92446c8b4..d015bfe00950 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
| @@ -763,15 +763,6 @@ static struct device_driver ic_drv = { | |||
| 763 | .owner = THIS_MODULE, | 763 | .owner = THIS_MODULE, |
| 764 | }; | 764 | }; |
| 765 | 765 | ||
| 766 | /* | ||
| 767 | * Image capture host - this is a host device, not a bus device, so, | ||
| 768 | * no bus reference, no probing. | ||
| 769 | */ | ||
| 770 | static struct class soc_camera_host_class = { | ||
| 771 | .owner = THIS_MODULE, | ||
| 772 | .name = "camera_host", | ||
| 773 | }; | ||
| 774 | |||
| 775 | static void dummy_release(struct device *dev) | 766 | static void dummy_release(struct device *dev) |
| 776 | { | 767 | { |
| 777 | } | 768 | } |
| @@ -801,7 +792,6 @@ int soc_camera_host_register(struct soc_camera_host *ici) | |||
| 801 | 792 | ||
| 802 | /* Number might be equal to the platform device ID */ | 793 | /* Number might be equal to the platform device ID */ |
| 803 | sprintf(ici->dev.bus_id, "camera_host%d", ici->nr); | 794 | sprintf(ici->dev.bus_id, "camera_host%d", ici->nr); |
| 804 | ici->dev.class = &soc_camera_host_class; | ||
| 805 | 795 | ||
| 806 | mutex_lock(&list_lock); | 796 | mutex_lock(&list_lock); |
| 807 | list_for_each_entry(ix, &hosts, list) { | 797 | list_for_each_entry(ix, &hosts, list) { |
| @@ -1003,14 +993,9 @@ static int __init soc_camera_init(void) | |||
| 1003 | ret = driver_register(&ic_drv); | 993 | ret = driver_register(&ic_drv); |
| 1004 | if (ret) | 994 | if (ret) |
| 1005 | goto edrvr; | 995 | goto edrvr; |
| 1006 | ret = class_register(&soc_camera_host_class); | ||
| 1007 | if (ret) | ||
| 1008 | goto eclr; | ||
| 1009 | 996 | ||
| 1010 | return 0; | 997 | return 0; |
| 1011 | 998 | ||
| 1012 | eclr: | ||
| 1013 | driver_unregister(&ic_drv); | ||
| 1014 | edrvr: | 999 | edrvr: |
| 1015 | bus_unregister(&soc_camera_bus_type); | 1000 | bus_unregister(&soc_camera_bus_type); |
| 1016 | return ret; | 1001 | return ret; |
| @@ -1018,7 +1003,6 @@ edrvr: | |||
| 1018 | 1003 | ||
| 1019 | static void __exit soc_camera_exit(void) | 1004 | static void __exit soc_camera_exit(void) |
| 1020 | { | 1005 | { |
| 1021 | class_unregister(&soc_camera_host_class); | ||
| 1022 | driver_unregister(&ic_drv); | 1006 | driver_unregister(&ic_drv); |
| 1023 | bus_unregister(&soc_camera_bus_type); | 1007 | bus_unregister(&soc_camera_bus_type); |
| 1024 | } | 1008 | } |
diff --git a/drivers/media/video/uvc/Makefile b/drivers/media/video/uvc/Makefile new file mode 100644 index 000000000000..968c1994eda0 --- /dev/null +++ b/drivers/media/video/uvc/Makefile | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ | ||
| 2 | uvc_status.o uvc_isight.o | ||
| 3 | obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o | ||
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c new file mode 100644 index 000000000000..f0ee46d15540 --- /dev/null +++ b/drivers/media/video/uvc/uvc_ctrl.c | |||
| @@ -0,0 +1,1256 @@ | |||
| 1 | /* | ||
| 2 | * uvc_ctrl.c -- USB Video Class driver - Controls | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/uaccess.h> | ||
| 19 | #include <linux/usb.h> | ||
| 20 | #include <linux/videodev2.h> | ||
| 21 | #include <linux/vmalloc.h> | ||
| 22 | #include <linux/wait.h> | ||
| 23 | #include <asm/atomic.h> | ||
| 24 | |||
| 25 | #include "uvcvideo.h" | ||
| 26 | |||
| 27 | #define UVC_CTRL_NDATA 2 | ||
| 28 | #define UVC_CTRL_DATA_CURRENT 0 | ||
| 29 | #define UVC_CTRL_DATA_BACKUP 1 | ||
| 30 | |||
| 31 | /* ------------------------------------------------------------------------ | ||
| 32 | * Control, formats, ... | ||
| 33 | */ | ||
| 34 | |||
| 35 | static struct uvc_control_info uvc_ctrls[] = { | ||
| 36 | { | ||
| 37 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 38 | .selector = PU_BRIGHTNESS_CONTROL, | ||
| 39 | .index = 0, | ||
| 40 | .size = 2, | ||
| 41 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 42 | | UVC_CONTROL_RESTORE, | ||
| 43 | }, | ||
| 44 | { | ||
| 45 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 46 | .selector = PU_CONTRAST_CONTROL, | ||
| 47 | .index = 1, | ||
| 48 | .size = 2, | ||
| 49 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 50 | | UVC_CONTROL_RESTORE, | ||
| 51 | }, | ||
| 52 | { | ||
| 53 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 54 | .selector = PU_HUE_CONTROL, | ||
| 55 | .index = 2, | ||
| 56 | .size = 2, | ||
| 57 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 58 | | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE, | ||
| 59 | }, | ||
| 60 | { | ||
| 61 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 62 | .selector = PU_SATURATION_CONTROL, | ||
| 63 | .index = 3, | ||
| 64 | .size = 2, | ||
| 65 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 66 | | UVC_CONTROL_RESTORE, | ||
| 67 | }, | ||
| 68 | { | ||
| 69 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 70 | .selector = PU_SHARPNESS_CONTROL, | ||
| 71 | .index = 4, | ||
| 72 | .size = 2, | ||
| 73 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 74 | | UVC_CONTROL_RESTORE, | ||
| 75 | }, | ||
| 76 | { | ||
| 77 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 78 | .selector = PU_GAMMA_CONTROL, | ||
| 79 | .index = 5, | ||
| 80 | .size = 2, | ||
| 81 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 82 | | UVC_CONTROL_RESTORE, | ||
| 83 | }, | ||
| 84 | { | ||
| 85 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 86 | .selector = PU_BACKLIGHT_COMPENSATION_CONTROL, | ||
| 87 | .index = 8, | ||
| 88 | .size = 2, | ||
| 89 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 90 | | UVC_CONTROL_RESTORE, | ||
| 91 | }, | ||
| 92 | { | ||
| 93 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 94 | .selector = PU_GAIN_CONTROL, | ||
| 95 | .index = 9, | ||
| 96 | .size = 2, | ||
| 97 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 98 | | UVC_CONTROL_RESTORE, | ||
| 99 | }, | ||
| 100 | { | ||
| 101 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 102 | .selector = PU_POWER_LINE_FREQUENCY_CONTROL, | ||
| 103 | .index = 10, | ||
| 104 | .size = 1, | ||
| 105 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 106 | | UVC_CONTROL_RESTORE, | ||
| 107 | }, | ||
| 108 | { | ||
| 109 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 110 | .selector = PU_HUE_AUTO_CONTROL, | ||
| 111 | .index = 11, | ||
| 112 | .size = 1, | ||
| 113 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 114 | | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE, | ||
| 115 | }, | ||
| 116 | { | ||
| 117 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 118 | .selector = CT_AE_MODE_CONTROL, | ||
| 119 | .index = 1, | ||
| 120 | .size = 1, | ||
| 121 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 122 | | UVC_CONTROL_GET_DEF | UVC_CONTROL_GET_RES | ||
| 123 | | UVC_CONTROL_RESTORE, | ||
| 124 | }, | ||
| 125 | { | ||
| 126 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 127 | .selector = CT_AE_PRIORITY_CONTROL, | ||
| 128 | .index = 2, | ||
| 129 | .size = 1, | ||
| 130 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 131 | | UVC_CONTROL_RESTORE, | ||
| 132 | }, | ||
| 133 | { | ||
| 134 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 135 | .selector = CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, | ||
| 136 | .index = 3, | ||
| 137 | .size = 4, | ||
| 138 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 139 | | UVC_CONTROL_RESTORE, | ||
| 140 | }, | ||
| 141 | { | ||
| 142 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 143 | .selector = CT_FOCUS_ABSOLUTE_CONTROL, | ||
| 144 | .index = 5, | ||
| 145 | .size = 2, | ||
| 146 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 147 | | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE, | ||
| 148 | }, | ||
| 149 | { | ||
| 150 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 151 | .selector = CT_FOCUS_AUTO_CONTROL, | ||
| 152 | .index = 17, | ||
| 153 | .size = 1, | ||
| 154 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 155 | | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE, | ||
| 156 | }, | ||
| 157 | { | ||
| 158 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 159 | .selector = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL, | ||
| 160 | .index = 12, | ||
| 161 | .size = 1, | ||
| 162 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 163 | | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE, | ||
| 164 | }, | ||
| 165 | { | ||
| 166 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 167 | .selector = PU_WHITE_BALANCE_TEMPERATURE_CONTROL, | ||
| 168 | .index = 6, | ||
| 169 | .size = 2, | ||
| 170 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 171 | | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE, | ||
| 172 | }, | ||
| 173 | { | ||
| 174 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 175 | .selector = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL, | ||
| 176 | .index = 13, | ||
| 177 | .size = 1, | ||
| 178 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR | ||
| 179 | | UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE, | ||
| 180 | }, | ||
| 181 | { | ||
| 182 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 183 | .selector = PU_WHITE_BALANCE_COMPONENT_CONTROL, | ||
| 184 | .index = 7, | ||
| 185 | .size = 4, | ||
| 186 | .flags = UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE | ||
| 187 | | UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE, | ||
| 188 | }, | ||
| 189 | }; | ||
| 190 | |||
| 191 | static struct uvc_menu_info power_line_frequency_controls[] = { | ||
| 192 | { 0, "Disabled" }, | ||
| 193 | { 1, "50 Hz" }, | ||
| 194 | { 2, "60 Hz" }, | ||
| 195 | }; | ||
| 196 | |||
| 197 | static struct uvc_menu_info exposure_auto_controls[] = { | ||
| 198 | { 1, "Manual Mode" }, | ||
| 199 | { 2, "Auto Mode" }, | ||
| 200 | { 4, "Shutter Priority Mode" }, | ||
| 201 | { 8, "Aperture Priority Mode" }, | ||
| 202 | }; | ||
| 203 | |||
| 204 | static struct uvc_control_mapping uvc_ctrl_mappings[] = { | ||
| 205 | { | ||
| 206 | .id = V4L2_CID_BRIGHTNESS, | ||
| 207 | .name = "Brightness", | ||
| 208 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 209 | .selector = PU_BRIGHTNESS_CONTROL, | ||
| 210 | .size = 16, | ||
| 211 | .offset = 0, | ||
| 212 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 213 | .data_type = UVC_CTRL_DATA_TYPE_SIGNED, | ||
| 214 | }, | ||
| 215 | { | ||
| 216 | .id = V4L2_CID_CONTRAST, | ||
| 217 | .name = "Contrast", | ||
| 218 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 219 | .selector = PU_CONTRAST_CONTROL, | ||
| 220 | .size = 16, | ||
| 221 | .offset = 0, | ||
| 222 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 223 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 224 | }, | ||
| 225 | { | ||
| 226 | .id = V4L2_CID_HUE, | ||
| 227 | .name = "Hue", | ||
| 228 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 229 | .selector = PU_HUE_CONTROL, | ||
| 230 | .size = 16, | ||
| 231 | .offset = 0, | ||
| 232 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 233 | .data_type = UVC_CTRL_DATA_TYPE_SIGNED, | ||
| 234 | }, | ||
| 235 | { | ||
| 236 | .id = V4L2_CID_SATURATION, | ||
| 237 | .name = "Saturation", | ||
| 238 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 239 | .selector = PU_SATURATION_CONTROL, | ||
| 240 | .size = 16, | ||
| 241 | .offset = 0, | ||
| 242 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 243 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 244 | }, | ||
| 245 | { | ||
| 246 | .id = V4L2_CID_SHARPNESS, | ||
| 247 | .name = "Sharpness", | ||
| 248 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 249 | .selector = PU_SHARPNESS_CONTROL, | ||
| 250 | .size = 16, | ||
| 251 | .offset = 0, | ||
| 252 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 253 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 254 | }, | ||
| 255 | { | ||
| 256 | .id = V4L2_CID_GAMMA, | ||
| 257 | .name = "Gamma", | ||
| 258 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 259 | .selector = PU_GAMMA_CONTROL, | ||
| 260 | .size = 16, | ||
| 261 | .offset = 0, | ||
| 262 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 263 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 264 | }, | ||
| 265 | { | ||
| 266 | .id = V4L2_CID_BACKLIGHT_COMPENSATION, | ||
| 267 | .name = "Backlight Compensation", | ||
| 268 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 269 | .selector = PU_BACKLIGHT_COMPENSATION_CONTROL, | ||
| 270 | .size = 16, | ||
| 271 | .offset = 0, | ||
| 272 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 273 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 274 | }, | ||
| 275 | { | ||
| 276 | .id = V4L2_CID_GAIN, | ||
| 277 | .name = "Gain", | ||
| 278 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 279 | .selector = PU_GAIN_CONTROL, | ||
| 280 | .size = 16, | ||
| 281 | .offset = 0, | ||
| 282 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 283 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 284 | }, | ||
| 285 | { | ||
| 286 | .id = V4L2_CID_POWER_LINE_FREQUENCY, | ||
| 287 | .name = "Power Line Frequency", | ||
| 288 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 289 | .selector = PU_POWER_LINE_FREQUENCY_CONTROL, | ||
| 290 | .size = 2, | ||
| 291 | .offset = 0, | ||
| 292 | .v4l2_type = V4L2_CTRL_TYPE_MENU, | ||
| 293 | .data_type = UVC_CTRL_DATA_TYPE_ENUM, | ||
| 294 | .menu_info = power_line_frequency_controls, | ||
| 295 | .menu_count = ARRAY_SIZE(power_line_frequency_controls), | ||
| 296 | }, | ||
| 297 | { | ||
| 298 | .id = V4L2_CID_HUE_AUTO, | ||
| 299 | .name = "Hue, Auto", | ||
| 300 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 301 | .selector = PU_HUE_AUTO_CONTROL, | ||
| 302 | .size = 1, | ||
| 303 | .offset = 0, | ||
| 304 | .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, | ||
| 305 | .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, | ||
| 306 | }, | ||
| 307 | { | ||
| 308 | .id = V4L2_CID_EXPOSURE_AUTO, | ||
| 309 | .name = "Exposure, Auto", | ||
| 310 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 311 | .selector = CT_AE_MODE_CONTROL, | ||
| 312 | .size = 4, | ||
| 313 | .offset = 0, | ||
| 314 | .v4l2_type = V4L2_CTRL_TYPE_MENU, | ||
| 315 | .data_type = UVC_CTRL_DATA_TYPE_BITMASK, | ||
| 316 | .menu_info = exposure_auto_controls, | ||
| 317 | .menu_count = ARRAY_SIZE(exposure_auto_controls), | ||
| 318 | }, | ||
| 319 | { | ||
| 320 | .id = V4L2_CID_EXPOSURE_AUTO_PRIORITY, | ||
| 321 | .name = "Exposure, Auto Priority", | ||
| 322 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 323 | .selector = CT_AE_PRIORITY_CONTROL, | ||
| 324 | .size = 1, | ||
| 325 | .offset = 0, | ||
| 326 | .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, | ||
| 327 | .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, | ||
| 328 | }, | ||
| 329 | { | ||
| 330 | .id = V4L2_CID_EXPOSURE_ABSOLUTE, | ||
| 331 | .name = "Exposure (Absolute)", | ||
| 332 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 333 | .selector = CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, | ||
| 334 | .size = 32, | ||
| 335 | .offset = 0, | ||
| 336 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 337 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 338 | }, | ||
| 339 | { | ||
| 340 | .id = V4L2_CID_AUTO_WHITE_BALANCE, | ||
| 341 | .name = "White Balance Temperature, Auto", | ||
| 342 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 343 | .selector = PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL, | ||
| 344 | .size = 1, | ||
| 345 | .offset = 0, | ||
| 346 | .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, | ||
| 347 | .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, | ||
| 348 | }, | ||
| 349 | { | ||
| 350 | .id = V4L2_CID_WHITE_BALANCE_TEMPERATURE, | ||
| 351 | .name = "White Balance Temperature", | ||
| 352 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 353 | .selector = PU_WHITE_BALANCE_TEMPERATURE_CONTROL, | ||
| 354 | .size = 16, | ||
| 355 | .offset = 0, | ||
| 356 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 357 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 358 | }, | ||
| 359 | { | ||
| 360 | .id = V4L2_CID_AUTO_WHITE_BALANCE, | ||
| 361 | .name = "White Balance Component, Auto", | ||
| 362 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 363 | .selector = PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL, | ||
| 364 | .size = 1, | ||
| 365 | .offset = 0, | ||
| 366 | .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, | ||
| 367 | .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, | ||
| 368 | }, | ||
| 369 | { | ||
| 370 | .id = V4L2_CID_BLUE_BALANCE, | ||
| 371 | .name = "White Balance Blue Component", | ||
| 372 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 373 | .selector = PU_WHITE_BALANCE_COMPONENT_CONTROL, | ||
| 374 | .size = 16, | ||
| 375 | .offset = 0, | ||
| 376 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 377 | .data_type = UVC_CTRL_DATA_TYPE_SIGNED, | ||
| 378 | }, | ||
| 379 | { | ||
| 380 | .id = V4L2_CID_RED_BALANCE, | ||
| 381 | .name = "White Balance Red Component", | ||
| 382 | .entity = UVC_GUID_UVC_PROCESSING, | ||
| 383 | .selector = PU_WHITE_BALANCE_COMPONENT_CONTROL, | ||
| 384 | .size = 16, | ||
| 385 | .offset = 16, | ||
| 386 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 387 | .data_type = UVC_CTRL_DATA_TYPE_SIGNED, | ||
| 388 | }, | ||
| 389 | { | ||
| 390 | .id = V4L2_CID_FOCUS_ABSOLUTE, | ||
| 391 | .name = "Focus (absolute)", | ||
| 392 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 393 | .selector = CT_FOCUS_ABSOLUTE_CONTROL, | ||
| 394 | .size = 16, | ||
| 395 | .offset = 0, | ||
| 396 | .v4l2_type = V4L2_CTRL_TYPE_INTEGER, | ||
| 397 | .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED, | ||
| 398 | }, | ||
| 399 | { | ||
| 400 | .id = V4L2_CID_FOCUS_AUTO, | ||
| 401 | .name = "Focus, Auto", | ||
| 402 | .entity = UVC_GUID_UVC_CAMERA, | ||
| 403 | .selector = CT_FOCUS_AUTO_CONTROL, | ||
| 404 | .size = 1, | ||
| 405 | .offset = 0, | ||
| 406 | .v4l2_type = V4L2_CTRL_TYPE_BOOLEAN, | ||
| 407 | .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, | ||
| 408 | }, | ||
| 409 | }; | ||
| 410 | |||
| 411 | /* ------------------------------------------------------------------------ | ||
| 412 | * Utility functions | ||
| 413 | */ | ||
| 414 | |||
| 415 | static inline __u8 *uvc_ctrl_data(struct uvc_control *ctrl, int id) | ||
| 416 | { | ||
| 417 | return ctrl->data + id * ctrl->info->size; | ||
| 418 | } | ||
| 419 | |||
| 420 | static inline int uvc_get_bit(const __u8 *data, int bit) | ||
| 421 | { | ||
| 422 | return (data[bit >> 3] >> (bit & 7)) & 1; | ||
| 423 | } | ||
| 424 | |||
| 425 | /* Extract the bit string specified by mapping->offset and mapping->size | ||
| 426 | * from the little-endian data stored at 'data' and return the result as | ||
| 427 | * a signed 32bit integer. Sign extension will be performed if the mapping | ||
| 428 | * references a signed data type. | ||
| 429 | */ | ||
| 430 | static __s32 uvc_get_le_value(const __u8 *data, | ||
| 431 | struct uvc_control_mapping *mapping) | ||
| 432 | { | ||
| 433 | int bits = mapping->size; | ||
| 434 | int offset = mapping->offset; | ||
| 435 | __s32 value = 0; | ||
| 436 | __u8 mask; | ||
| 437 | |||
| 438 | data += offset / 8; | ||
| 439 | offset &= 7; | ||
| 440 | mask = ((1LL << bits) - 1) << offset; | ||
| 441 | |||
| 442 | for (; bits > 0; data++) { | ||
| 443 | __u8 byte = *data & mask; | ||
| 444 | value |= offset > 0 ? (byte >> offset) : (byte << (-offset)); | ||
| 445 | bits -= 8 - (offset > 0 ? offset : 0); | ||
| 446 | offset -= 8; | ||
| 447 | mask = (1 << bits) - 1; | ||
| 448 | } | ||
| 449 | |||
| 450 | /* Sign-extend the value if needed */ | ||
| 451 | if (mapping->data_type == UVC_CTRL_DATA_TYPE_SIGNED) | ||
| 452 | value |= -(value & (1 << (mapping->size - 1))); | ||
| 453 | |||
| 454 | return value; | ||
| 455 | } | ||
| 456 | |||
| 457 | /* Set the bit string specified by mapping->offset and mapping->size | ||
| 458 | * in the little-endian data stored at 'data' to the value 'value'. | ||
| 459 | */ | ||
| 460 | static void uvc_set_le_value(__s32 value, __u8 *data, | ||
| 461 | struct uvc_control_mapping *mapping) | ||
| 462 | { | ||
| 463 | int bits = mapping->size; | ||
| 464 | int offset = mapping->offset; | ||
| 465 | __u8 mask; | ||
| 466 | |||
| 467 | data += offset / 8; | ||
| 468 | offset &= 7; | ||
| 469 | |||
| 470 | for (; bits > 0; data++) { | ||
| 471 | mask = ((1LL << bits) - 1) << offset; | ||
| 472 | *data = (*data & ~mask) | ((value << offset) & mask); | ||
| 473 | value >>= offset ? offset : 8; | ||
| 474 | bits -= 8 - offset; | ||
| 475 | offset = 0; | ||
| 476 | } | ||
| 477 | } | ||
| 478 | |||
| 479 | /* ------------------------------------------------------------------------ | ||
| 480 | * Terminal and unit management | ||
| 481 | */ | ||
| 482 | |||
| 483 | static const __u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING; | ||
| 484 | static const __u8 uvc_camera_guid[16] = UVC_GUID_UVC_CAMERA; | ||
| 485 | static const __u8 uvc_media_transport_input_guid[16] = | ||
| 486 | UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; | ||
| 487 | |||
| 488 | static int uvc_entity_match_guid(struct uvc_entity *entity, __u8 guid[16]) | ||
| 489 | { | ||
| 490 | switch (UVC_ENTITY_TYPE(entity)) { | ||
| 491 | case ITT_CAMERA: | ||
| 492 | return memcmp(uvc_camera_guid, guid, 16) == 0; | ||
| 493 | |||
| 494 | case ITT_MEDIA_TRANSPORT_INPUT: | ||
| 495 | return memcmp(uvc_media_transport_input_guid, guid, 16) == 0; | ||
| 496 | |||
| 497 | case VC_PROCESSING_UNIT: | ||
| 498 | return memcmp(uvc_processing_guid, guid, 16) == 0; | ||
| 499 | |||
| 500 | case VC_EXTENSION_UNIT: | ||
| 501 | return memcmp(entity->extension.guidExtensionCode, | ||
| 502 | guid, 16) == 0; | ||
| 503 | |||
| 504 | default: | ||
| 505 | return 0; | ||
| 506 | } | ||
| 507 | } | ||
| 508 | |||
| 509 | /* ------------------------------------------------------------------------ | ||
| 510 | * UVC Controls | ||
| 511 | */ | ||
| 512 | |||
| 513 | static void __uvc_find_control(struct uvc_entity *entity, __u32 v4l2_id, | ||
| 514 | struct uvc_control_mapping **mapping, struct uvc_control **control, | ||
| 515 | int next) | ||
| 516 | { | ||
| 517 | struct uvc_control *ctrl; | ||
| 518 | struct uvc_control_mapping *map; | ||
| 519 | unsigned int i; | ||
| 520 | |||
| 521 | if (entity == NULL) | ||
| 522 | return; | ||
| 523 | |||
| 524 | for (i = 0; i < entity->ncontrols; ++i) { | ||
| 525 | ctrl = &entity->controls[i]; | ||
| 526 | if (ctrl->info == NULL) | ||
| 527 | continue; | ||
| 528 | |||
| 529 | list_for_each_entry(map, &ctrl->info->mappings, list) { | ||
| 530 | if ((map->id == v4l2_id) && !next) { | ||
| 531 | *control = ctrl; | ||
| 532 | *mapping = map; | ||
| 533 | return; | ||
| 534 | } | ||
| 535 | |||
| 536 | if ((*mapping == NULL || (*mapping)->id > map->id) && | ||
| 537 | (map->id > v4l2_id) && next) { | ||
| 538 | *control = ctrl; | ||
| 539 | *mapping = map; | ||
| 540 | } | ||
| 541 | } | ||
| 542 | } | ||
| 543 | } | ||
| 544 | |||
| 545 | struct uvc_control *uvc_find_control(struct uvc_video_device *video, | ||
| 546 | __u32 v4l2_id, struct uvc_control_mapping **mapping) | ||
| 547 | { | ||
| 548 | struct uvc_control *ctrl = NULL; | ||
| 549 | struct uvc_entity *entity; | ||
| 550 | int next = v4l2_id & V4L2_CTRL_FLAG_NEXT_CTRL; | ||
| 551 | |||
| 552 | *mapping = NULL; | ||
| 553 | |||
| 554 | /* Mask the query flags. */ | ||
| 555 | v4l2_id &= V4L2_CTRL_ID_MASK; | ||
| 556 | |||
| 557 | /* Find the control. */ | ||
| 558 | __uvc_find_control(video->processing, v4l2_id, mapping, &ctrl, next); | ||
| 559 | if (ctrl && !next) | ||
| 560 | return ctrl; | ||
| 561 | |||
| 562 | list_for_each_entry(entity, &video->iterms, chain) { | ||
| 563 | __uvc_find_control(entity, v4l2_id, mapping, &ctrl, next); | ||
| 564 | if (ctrl && !next) | ||
| 565 | return ctrl; | ||
| 566 | } | ||
| 567 | |||
| 568 | list_for_each_entry(entity, &video->extensions, chain) { | ||
| 569 | __uvc_find_control(entity, v4l2_id, mapping, &ctrl, next); | ||
| 570 | if (ctrl && !next) | ||
| 571 | return ctrl; | ||
| 572 | } | ||
| 573 | |||
| 574 | if (ctrl == NULL && !next) | ||
| 575 | uvc_trace(UVC_TRACE_CONTROL, "Control 0x%08x not found.\n", | ||
| 576 | v4l2_id); | ||
| 577 | |||
| 578 | return ctrl; | ||
| 579 | } | ||
| 580 | |||
| 581 | int uvc_query_v4l2_ctrl(struct uvc_video_device *video, | ||
| 582 | struct v4l2_queryctrl *v4l2_ctrl) | ||
| 583 | { | ||
| 584 | struct uvc_control *ctrl; | ||
| 585 | struct uvc_control_mapping *mapping; | ||
| 586 | struct uvc_menu_info *menu; | ||
| 587 | unsigned int i; | ||
| 588 | __u8 data[8]; | ||
| 589 | int ret; | ||
| 590 | |||
| 591 | ctrl = uvc_find_control(video, v4l2_ctrl->id, &mapping); | ||
| 592 | if (ctrl == NULL) | ||
| 593 | return -EINVAL; | ||
| 594 | |||
| 595 | v4l2_ctrl->id = mapping->id; | ||
| 596 | v4l2_ctrl->type = mapping->v4l2_type; | ||
| 597 | strncpy(v4l2_ctrl->name, mapping->name, sizeof v4l2_ctrl->name); | ||
| 598 | v4l2_ctrl->flags = 0; | ||
| 599 | |||
| 600 | if (!(ctrl->info->flags & UVC_CONTROL_SET_CUR)) | ||
| 601 | v4l2_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; | ||
| 602 | |||
| 603 | if (ctrl->info->flags & UVC_CONTROL_GET_DEF) { | ||
| 604 | if ((ret = uvc_query_ctrl(video->dev, GET_DEF, ctrl->entity->id, | ||
| 605 | video->dev->intfnum, ctrl->info->selector, | ||
| 606 | &data, ctrl->info->size)) < 0) | ||
| 607 | return ret; | ||
| 608 | v4l2_ctrl->default_value = uvc_get_le_value(data, mapping); | ||
| 609 | } | ||
| 610 | |||
| 611 | if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) { | ||
| 612 | v4l2_ctrl->minimum = 0; | ||
| 613 | v4l2_ctrl->maximum = mapping->menu_count - 1; | ||
| 614 | v4l2_ctrl->step = 1; | ||
| 615 | |||
| 616 | menu = mapping->menu_info; | ||
| 617 | for (i = 0; i < mapping->menu_count; ++i, ++menu) { | ||
| 618 | if (menu->value == v4l2_ctrl->default_value) { | ||
| 619 | v4l2_ctrl->default_value = i; | ||
| 620 | break; | ||
| 621 | } | ||
| 622 | } | ||
| 623 | |||
| 624 | return 0; | ||
| 625 | } | ||
| 626 | |||
| 627 | if (ctrl->info->flags & UVC_CONTROL_GET_MIN) { | ||
| 628 | if ((ret = uvc_query_ctrl(video->dev, GET_MIN, ctrl->entity->id, | ||
| 629 | video->dev->intfnum, ctrl->info->selector, | ||
| 630 | &data, ctrl->info->size)) < 0) | ||
| 631 | return ret; | ||
| 632 | v4l2_ctrl->minimum = uvc_get_le_value(data, mapping); | ||
| 633 | } | ||
| 634 | if (ctrl->info->flags & UVC_CONTROL_GET_MAX) { | ||
| 635 | if ((ret = uvc_query_ctrl(video->dev, GET_MAX, ctrl->entity->id, | ||
| 636 | video->dev->intfnum, ctrl->info->selector, | ||
| 637 | &data, ctrl->info->size)) < 0) | ||
| 638 | return ret; | ||
| 639 | v4l2_ctrl->maximum = uvc_get_le_value(data, mapping); | ||
| 640 | } | ||
| 641 | if (ctrl->info->flags & UVC_CONTROL_GET_RES) { | ||
| 642 | if ((ret = uvc_query_ctrl(video->dev, GET_RES, ctrl->entity->id, | ||
| 643 | video->dev->intfnum, ctrl->info->selector, | ||
| 644 | &data, ctrl->info->size)) < 0) | ||
| 645 | return ret; | ||
| 646 | v4l2_ctrl->step = uvc_get_le_value(data, mapping); | ||
| 647 | } | ||
| 648 | |||
| 649 | return 0; | ||
| 650 | } | ||
| 651 | |||
| 652 | |||
| 653 | /* -------------------------------------------------------------------------- | ||
| 654 | * Control transactions | ||
| 655 | * | ||
| 656 | * To make extended set operations as atomic as the hardware allows, controls | ||
| 657 | * are handled using begin/commit/rollback operations. | ||
| 658 | * | ||
| 659 | * At the beginning of a set request, uvc_ctrl_begin should be called to | ||
| 660 | * initialize the request. This function acquires the control lock. | ||
| 661 | * | ||
| 662 | * When setting a control, the new value is stored in the control data field | ||
| 663 | * at position UVC_CTRL_DATA_CURRENT. The control is then marked as dirty for | ||
| 664 | * later processing. If the UVC and V4L2 control sizes differ, the current | ||
| 665 | * value is loaded from the hardware before storing the new value in the data | ||
| 666 | * field. | ||
| 667 | * | ||
| 668 | * After processing all controls in the transaction, uvc_ctrl_commit or | ||
| 669 | * uvc_ctrl_rollback must be called to apply the pending changes to the | ||
| 670 | * hardware or revert them. When applying changes, all controls marked as | ||
| 671 | * dirty will be modified in the UVC device, and the dirty flag will be | ||
| 672 | * cleared. When reverting controls, the control data field | ||
| 673 | * UVC_CTRL_DATA_CURRENT is reverted to its previous value | ||
| 674 | * (UVC_CTRL_DATA_BACKUP) for all dirty controls. Both functions release the | ||
| 675 | * control lock. | ||
| 676 | */ | ||
| 677 | int uvc_ctrl_begin(struct uvc_video_device *video) | ||
| 678 | { | ||
| 679 | return mutex_lock_interruptible(&video->ctrl_mutex) ? -ERESTARTSYS : 0; | ||
| 680 | } | ||
| 681 | |||
| 682 | static int uvc_ctrl_commit_entity(struct uvc_device *dev, | ||
| 683 | struct uvc_entity *entity, int rollback) | ||
| 684 | { | ||
| 685 | struct uvc_control *ctrl; | ||
| 686 | unsigned int i; | ||
| 687 | int ret; | ||
| 688 | |||
| 689 | if (entity == NULL) | ||
| 690 | return 0; | ||
| 691 | |||
| 692 | for (i = 0; i < entity->ncontrols; ++i) { | ||
| 693 | ctrl = &entity->controls[i]; | ||
| 694 | if (ctrl->info == NULL || !ctrl->dirty) | ||
| 695 | continue; | ||
| 696 | |||
| 697 | if (!rollback) | ||
| 698 | ret = uvc_query_ctrl(dev, SET_CUR, ctrl->entity->id, | ||
| 699 | dev->intfnum, ctrl->info->selector, | ||
| 700 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 701 | ctrl->info->size); | ||
| 702 | else | ||
| 703 | ret = 0; | ||
| 704 | |||
| 705 | if (rollback || ret < 0) | ||
| 706 | memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 707 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), | ||
| 708 | ctrl->info->size); | ||
| 709 | |||
| 710 | if ((ctrl->info->flags & UVC_CONTROL_GET_CUR) == 0) | ||
| 711 | ctrl->loaded = 0; | ||
| 712 | |||
| 713 | ctrl->dirty = 0; | ||
| 714 | |||
| 715 | if (ret < 0) | ||
| 716 | return ret; | ||
| 717 | } | ||
| 718 | |||
| 719 | return 0; | ||
| 720 | } | ||
| 721 | |||
| 722 | int __uvc_ctrl_commit(struct uvc_video_device *video, int rollback) | ||
| 723 | { | ||
| 724 | struct uvc_entity *entity; | ||
| 725 | int ret = 0; | ||
| 726 | |||
| 727 | /* Find the control. */ | ||
| 728 | ret = uvc_ctrl_commit_entity(video->dev, video->processing, rollback); | ||
| 729 | if (ret < 0) | ||
| 730 | goto done; | ||
| 731 | |||
| 732 | list_for_each_entry(entity, &video->iterms, chain) { | ||
| 733 | ret = uvc_ctrl_commit_entity(video->dev, entity, rollback); | ||
| 734 | if (ret < 0) | ||
| 735 | goto done; | ||
| 736 | } | ||
| 737 | |||
| 738 | list_for_each_entry(entity, &video->extensions, chain) { | ||
| 739 | ret = uvc_ctrl_commit_entity(video->dev, entity, rollback); | ||
| 740 | if (ret < 0) | ||
| 741 | goto done; | ||
| 742 | } | ||
| 743 | |||
| 744 | done: | ||
| 745 | mutex_unlock(&video->ctrl_mutex); | ||
| 746 | return ret; | ||
| 747 | } | ||
| 748 | |||
| 749 | int uvc_ctrl_get(struct uvc_video_device *video, | ||
| 750 | struct v4l2_ext_control *xctrl) | ||
| 751 | { | ||
| 752 | struct uvc_control *ctrl; | ||
| 753 | struct uvc_control_mapping *mapping; | ||
| 754 | struct uvc_menu_info *menu; | ||
| 755 | unsigned int i; | ||
| 756 | int ret; | ||
| 757 | |||
| 758 | ctrl = uvc_find_control(video, xctrl->id, &mapping); | ||
| 759 | if (ctrl == NULL || (ctrl->info->flags & UVC_CONTROL_GET_CUR) == 0) | ||
| 760 | return -EINVAL; | ||
| 761 | |||
| 762 | if (!ctrl->loaded) { | ||
| 763 | ret = uvc_query_ctrl(video->dev, GET_CUR, ctrl->entity->id, | ||
| 764 | video->dev->intfnum, ctrl->info->selector, | ||
| 765 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 766 | ctrl->info->size); | ||
| 767 | if (ret < 0) | ||
| 768 | return ret; | ||
| 769 | |||
| 770 | if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0) | ||
| 771 | ctrl->loaded = 1; | ||
| 772 | } | ||
| 773 | |||
| 774 | xctrl->value = uvc_get_le_value( | ||
| 775 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), mapping); | ||
| 776 | |||
| 777 | if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) { | ||
| 778 | menu = mapping->menu_info; | ||
| 779 | for (i = 0; i < mapping->menu_count; ++i, ++menu) { | ||
| 780 | if (menu->value == xctrl->value) { | ||
| 781 | xctrl->value = i; | ||
| 782 | break; | ||
| 783 | } | ||
| 784 | } | ||
| 785 | } | ||
| 786 | |||
| 787 | return 0; | ||
| 788 | } | ||
| 789 | |||
| 790 | int uvc_ctrl_set(struct uvc_video_device *video, | ||
| 791 | struct v4l2_ext_control *xctrl) | ||
| 792 | { | ||
| 793 | struct uvc_control *ctrl; | ||
| 794 | struct uvc_control_mapping *mapping; | ||
| 795 | s32 value = xctrl->value; | ||
| 796 | int ret; | ||
| 797 | |||
| 798 | ctrl = uvc_find_control(video, xctrl->id, &mapping); | ||
| 799 | if (ctrl == NULL || (ctrl->info->flags & UVC_CONTROL_SET_CUR) == 0) | ||
| 800 | return -EINVAL; | ||
| 801 | |||
| 802 | if (mapping->v4l2_type == V4L2_CTRL_TYPE_MENU) { | ||
| 803 | if (value < 0 || value >= mapping->menu_count) | ||
| 804 | return -EINVAL; | ||
| 805 | value = mapping->menu_info[value].value; | ||
| 806 | } | ||
| 807 | |||
| 808 | if (!ctrl->loaded && (ctrl->info->size * 8) != mapping->size) { | ||
| 809 | if ((ctrl->info->flags & UVC_CONTROL_GET_CUR) == 0) { | ||
| 810 | memset(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 811 | 0, ctrl->info->size); | ||
| 812 | } else { | ||
| 813 | ret = uvc_query_ctrl(video->dev, GET_CUR, | ||
| 814 | ctrl->entity->id, video->dev->intfnum, | ||
| 815 | ctrl->info->selector, | ||
| 816 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 817 | ctrl->info->size); | ||
| 818 | if (ret < 0) | ||
| 819 | return ret; | ||
| 820 | } | ||
| 821 | |||
| 822 | if ((ctrl->info->flags & UVC_CONTROL_AUTO_UPDATE) == 0) | ||
| 823 | ctrl->loaded = 1; | ||
| 824 | } | ||
| 825 | |||
| 826 | if (!ctrl->dirty) { | ||
| 827 | memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), | ||
| 828 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 829 | ctrl->info->size); | ||
| 830 | } | ||
| 831 | |||
| 832 | uvc_set_le_value(value, | ||
| 833 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), mapping); | ||
| 834 | |||
| 835 | ctrl->dirty = 1; | ||
| 836 | ctrl->modified = 1; | ||
| 837 | return 0; | ||
| 838 | } | ||
| 839 | |||
| 840 | /* -------------------------------------------------------------------------- | ||
| 841 | * Dynamic controls | ||
| 842 | */ | ||
| 843 | |||
| 844 | int uvc_xu_ctrl_query(struct uvc_video_device *video, | ||
| 845 | struct uvc_xu_control *xctrl, int set) | ||
| 846 | { | ||
| 847 | struct uvc_entity *entity; | ||
| 848 | struct uvc_control *ctrl = NULL; | ||
| 849 | unsigned int i, found = 0; | ||
| 850 | __u8 *data; | ||
| 851 | int ret; | ||
| 852 | |||
| 853 | /* Find the extension unit. */ | ||
| 854 | list_for_each_entry(entity, &video->extensions, chain) { | ||
| 855 | if (entity->id == xctrl->unit) | ||
| 856 | break; | ||
| 857 | } | ||
| 858 | |||
| 859 | if (entity->id != xctrl->unit) { | ||
| 860 | uvc_trace(UVC_TRACE_CONTROL, "Extension unit %u not found.\n", | ||
| 861 | xctrl->unit); | ||
| 862 | return -EINVAL; | ||
| 863 | } | ||
| 864 | |||
| 865 | /* Find the control. */ | ||
| 866 | for (i = 0; i < entity->ncontrols; ++i) { | ||
| 867 | ctrl = &entity->controls[i]; | ||
| 868 | if (ctrl->info == NULL) | ||
| 869 | continue; | ||
| 870 | |||
| 871 | if (ctrl->info->selector == xctrl->selector) { | ||
| 872 | found = 1; | ||
| 873 | break; | ||
| 874 | } | ||
| 875 | } | ||
| 876 | |||
| 877 | if (!found) { | ||
| 878 | uvc_trace(UVC_TRACE_CONTROL, | ||
| 879 | "Control " UVC_GUID_FORMAT "/%u not found.\n", | ||
| 880 | UVC_GUID_ARGS(entity->extension.guidExtensionCode), | ||
| 881 | xctrl->selector); | ||
| 882 | return -EINVAL; | ||
| 883 | } | ||
| 884 | |||
| 885 | /* Validate control data size. */ | ||
| 886 | if (ctrl->info->size != xctrl->size) | ||
| 887 | return -EINVAL; | ||
| 888 | |||
| 889 | if ((set && !(ctrl->info->flags & UVC_CONTROL_SET_CUR)) || | ||
| 890 | (!set && !(ctrl->info->flags & UVC_CONTROL_GET_CUR))) | ||
| 891 | return -EINVAL; | ||
| 892 | |||
| 893 | if (mutex_lock_interruptible(&video->ctrl_mutex)) | ||
| 894 | return -ERESTARTSYS; | ||
| 895 | |||
| 896 | memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), | ||
| 897 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 898 | xctrl->size); | ||
| 899 | data = uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT); | ||
| 900 | |||
| 901 | if (set && copy_from_user(data, xctrl->data, xctrl->size)) { | ||
| 902 | ret = -EFAULT; | ||
| 903 | goto out; | ||
| 904 | } | ||
| 905 | |||
| 906 | ret = uvc_query_ctrl(video->dev, set ? SET_CUR : GET_CUR, xctrl->unit, | ||
| 907 | video->dev->intfnum, xctrl->selector, data, | ||
| 908 | xctrl->size); | ||
| 909 | if (ret < 0) | ||
| 910 | goto out; | ||
| 911 | |||
| 912 | if (!set && copy_to_user(xctrl->data, data, xctrl->size)) { | ||
| 913 | ret = -EFAULT; | ||
| 914 | goto out; | ||
| 915 | } | ||
| 916 | |||
| 917 | out: | ||
| 918 | if (ret) | ||
| 919 | memcpy(uvc_ctrl_data(ctrl, UVC_CTRL_DATA_CURRENT), | ||
| 920 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_BACKUP), | ||
| 921 | xctrl->size); | ||
| 922 | |||
| 923 | mutex_unlock(&video->ctrl_mutex); | ||
| 924 | return ret; | ||
| 925 | } | ||
| 926 | |||
| 927 | /* -------------------------------------------------------------------------- | ||
| 928 | * Suspend/resume | ||
| 929 | */ | ||
| 930 | |||
| 931 | /* | ||
| 932 | * Restore control values after resume, skipping controls that haven't been | ||
| 933 | * changed. | ||
| 934 | * | ||
| 935 | * TODO | ||
| 936 | * - Don't restore modified controls that are back to their default value. | ||
| 937 | * - Handle restore order (Auto-Exposure Mode should be restored before | ||
| 938 | * Exposure Time). | ||
| 939 | */ | ||
| 940 | int uvc_ctrl_resume_device(struct uvc_device *dev) | ||
| 941 | { | ||
| 942 | struct uvc_control *ctrl; | ||
| 943 | struct uvc_entity *entity; | ||
| 944 | unsigned int i; | ||
| 945 | int ret; | ||
| 946 | |||
| 947 | /* Walk the entities list and restore controls when possible. */ | ||
| 948 | list_for_each_entry(entity, &dev->entities, list) { | ||
| 949 | |||
| 950 | for (i = 0; i < entity->ncontrols; ++i) { | ||
| 951 | ctrl = &entity->controls[i]; | ||
| 952 | |||
| 953 | if (ctrl->info == NULL || !ctrl->modified || | ||
| 954 | (ctrl->info->flags & UVC_CONTROL_RESTORE) == 0) | ||
| 955 | continue; | ||
| 956 | |||
| 957 | printk(KERN_INFO "restoring control " UVC_GUID_FORMAT | ||
| 958 | "/%u/%u\n", UVC_GUID_ARGS(ctrl->info->entity), | ||
| 959 | ctrl->info->index, ctrl->info->selector); | ||
| 960 | ctrl->dirty = 1; | ||
| 961 | } | ||
| 962 | |||
| 963 | ret = uvc_ctrl_commit_entity(dev, entity, 0); | ||
| 964 | if (ret < 0) | ||
| 965 | return ret; | ||
| 966 | } | ||
| 967 | |||
| 968 | return 0; | ||
| 969 | } | ||
| 970 | |||
| 971 | /* -------------------------------------------------------------------------- | ||
| 972 | * Control and mapping handling | ||
| 973 | */ | ||
| 974 | |||
| 975 | static void uvc_ctrl_add_ctrl(struct uvc_device *dev, | ||
| 976 | struct uvc_control_info *info) | ||
| 977 | { | ||
| 978 | struct uvc_entity *entity; | ||
| 979 | struct uvc_control *ctrl = NULL; | ||
| 980 | int ret, found = 0; | ||
| 981 | unsigned int i; | ||
| 982 | |||
| 983 | list_for_each_entry(entity, &dev->entities, list) { | ||
| 984 | if (!uvc_entity_match_guid(entity, info->entity)) | ||
| 985 | continue; | ||
| 986 | |||
| 987 | for (i = 0; i < entity->ncontrols; ++i) { | ||
| 988 | ctrl = &entity->controls[i]; | ||
| 989 | if (ctrl->index == info->index) { | ||
| 990 | found = 1; | ||
| 991 | break; | ||
| 992 | } | ||
| 993 | } | ||
| 994 | |||
| 995 | if (found) | ||
| 996 | break; | ||
| 997 | } | ||
| 998 | |||
| 999 | if (!found) | ||
| 1000 | return; | ||
| 1001 | |||
| 1002 | if (UVC_ENTITY_TYPE(entity) == VC_EXTENSION_UNIT) { | ||
| 1003 | /* Check if the device control information and length match | ||
| 1004 | * the user supplied information. | ||
| 1005 | */ | ||
| 1006 | __u32 flags; | ||
| 1007 | __le16 size; | ||
| 1008 | __u8 inf; | ||
| 1009 | |||
| 1010 | if ((ret = uvc_query_ctrl(dev, GET_LEN, ctrl->entity->id, | ||
| 1011 | dev->intfnum, info->selector, (__u8 *)&size, 2)) < 0) { | ||
| 1012 | uvc_trace(UVC_TRACE_CONTROL, "GET_LEN failed on " | ||
| 1013 | "control " UVC_GUID_FORMAT "/%u (%d).\n", | ||
| 1014 | UVC_GUID_ARGS(info->entity), info->selector, | ||
| 1015 | ret); | ||
| 1016 | return; | ||
| 1017 | } | ||
| 1018 | |||
| 1019 | if (info->size != le16_to_cpu(size)) { | ||
| 1020 | uvc_trace(UVC_TRACE_CONTROL, "Control " UVC_GUID_FORMAT | ||
| 1021 | "/%u size doesn't match user supplied " | ||
| 1022 | "value.\n", UVC_GUID_ARGS(info->entity), | ||
| 1023 | info->selector); | ||
| 1024 | return; | ||
| 1025 | } | ||
| 1026 | |||
| 1027 | if ((ret = uvc_query_ctrl(dev, GET_INFO, ctrl->entity->id, | ||
| 1028 | dev->intfnum, info->selector, &inf, 1)) < 0) { | ||
| 1029 | uvc_trace(UVC_TRACE_CONTROL, "GET_INFO failed on " | ||
| 1030 | "control " UVC_GUID_FORMAT "/%u (%d).\n", | ||
| 1031 | UVC_GUID_ARGS(info->entity), info->selector, | ||
| 1032 | ret); | ||
| 1033 | return; | ||
| 1034 | } | ||
| 1035 | |||
| 1036 | flags = info->flags; | ||
| 1037 | if (((flags & UVC_CONTROL_GET_CUR) && !(inf & (1 << 0))) || | ||
| 1038 | ((flags & UVC_CONTROL_SET_CUR) && !(inf & (1 << 1)))) { | ||
| 1039 | uvc_trace(UVC_TRACE_CONTROL, "Control " | ||
| 1040 | UVC_GUID_FORMAT "/%u flags don't match " | ||
| 1041 | "supported operations.\n", | ||
| 1042 | UVC_GUID_ARGS(info->entity), info->selector); | ||
| 1043 | return; | ||
| 1044 | } | ||
| 1045 | } | ||
| 1046 | |||
| 1047 | ctrl->info = info; | ||
| 1048 | ctrl->data = kmalloc(ctrl->info->size * UVC_CTRL_NDATA, GFP_KERNEL); | ||
| 1049 | uvc_trace(UVC_TRACE_CONTROL, "Added control " UVC_GUID_FORMAT "/%u " | ||
| 1050 | "to device %s entity %u\n", UVC_GUID_ARGS(ctrl->info->entity), | ||
| 1051 | ctrl->info->selector, dev->udev->devpath, entity->id); | ||
| 1052 | } | ||
| 1053 | |||
| 1054 | /* | ||
| 1055 | * Add an item to the UVC control information list, and instantiate a control | ||
| 1056 | * structure for each device that supports the control. | ||
| 1057 | */ | ||
| 1058 | int uvc_ctrl_add_info(struct uvc_control_info *info) | ||
| 1059 | { | ||
| 1060 | struct uvc_control_info *ctrl; | ||
| 1061 | struct uvc_device *dev; | ||
| 1062 | int ret = 0; | ||
| 1063 | |||
| 1064 | /* Find matching controls by walking the devices, entities and | ||
| 1065 | * controls list. | ||
| 1066 | */ | ||
| 1067 | mutex_lock(&uvc_driver.ctrl_mutex); | ||
| 1068 | |||
| 1069 | /* First check if the list contains a control matching the new one. | ||
| 1070 | * Bail out if it does. | ||
| 1071 | */ | ||
| 1072 | list_for_each_entry(ctrl, &uvc_driver.controls, list) { | ||
| 1073 | if (memcmp(ctrl->entity, info->entity, 16)) | ||
| 1074 | continue; | ||
| 1075 | |||
| 1076 | if (ctrl->selector == info->selector) { | ||
| 1077 | uvc_trace(UVC_TRACE_CONTROL, "Control " | ||
| 1078 | UVC_GUID_FORMAT "/%u is already defined.\n", | ||
| 1079 | UVC_GUID_ARGS(info->entity), info->selector); | ||
| 1080 | ret = -EEXIST; | ||
| 1081 | goto end; | ||
| 1082 | } | ||
| 1083 | if (ctrl->index == info->index) { | ||
| 1084 | uvc_trace(UVC_TRACE_CONTROL, "Control " | ||
| 1085 | UVC_GUID_FORMAT "/%u would overwrite index " | ||
| 1086 | "%d.\n", UVC_GUID_ARGS(info->entity), | ||
| 1087 | info->selector, info->index); | ||
| 1088 | ret = -EEXIST; | ||
| 1089 | goto end; | ||
| 1090 | } | ||
| 1091 | } | ||
| 1092 | |||
| 1093 | list_for_each_entry(dev, &uvc_driver.devices, list) | ||
| 1094 | uvc_ctrl_add_ctrl(dev, info); | ||
| 1095 | |||
| 1096 | INIT_LIST_HEAD(&info->mappings); | ||
| 1097 | list_add_tail(&info->list, &uvc_driver.controls); | ||
| 1098 | end: | ||
| 1099 | mutex_unlock(&uvc_driver.ctrl_mutex); | ||
| 1100 | return ret; | ||
| 1101 | } | ||
| 1102 | |||
| 1103 | int uvc_ctrl_add_mapping(struct uvc_control_mapping *mapping) | ||
| 1104 | { | ||
| 1105 | struct uvc_control_info *info; | ||
| 1106 | struct uvc_control_mapping *map; | ||
| 1107 | int ret = -EINVAL; | ||
| 1108 | |||
| 1109 | if (mapping->id & ~V4L2_CTRL_ID_MASK) { | ||
| 1110 | uvc_trace(UVC_TRACE_CONTROL, "Can't add mapping '%s' with " | ||
| 1111 | "invalid control id 0x%08x\n", mapping->name, | ||
| 1112 | mapping->id); | ||
| 1113 | return -EINVAL; | ||
| 1114 | } | ||
| 1115 | |||
| 1116 | mutex_lock(&uvc_driver.ctrl_mutex); | ||
| 1117 | list_for_each_entry(info, &uvc_driver.controls, list) { | ||
| 1118 | if (memcmp(info->entity, mapping->entity, 16) || | ||
| 1119 | info->selector != mapping->selector) | ||
| 1120 | continue; | ||
| 1121 | |||
| 1122 | if (info->size * 8 < mapping->size + mapping->offset) { | ||
| 1123 | uvc_trace(UVC_TRACE_CONTROL, "Mapping '%s' would " | ||
| 1124 | "overflow control " UVC_GUID_FORMAT "/%u\n", | ||
| 1125 | mapping->name, UVC_GUID_ARGS(info->entity), | ||
| 1126 | info->selector); | ||
| 1127 | ret = -EOVERFLOW; | ||
| 1128 | goto end; | ||
| 1129 | } | ||
| 1130 | |||
| 1131 | /* Check if the list contains a mapping matching the new one. | ||
| 1132 | * Bail out if it does. | ||
| 1133 | */ | ||
| 1134 | list_for_each_entry(map, &info->mappings, list) { | ||
| 1135 | if (map->id == mapping->id) { | ||
| 1136 | uvc_trace(UVC_TRACE_CONTROL, "Mapping '%s' is " | ||
| 1137 | "already defined.\n", mapping->name); | ||
| 1138 | ret = -EEXIST; | ||
| 1139 | goto end; | ||
| 1140 | } | ||
| 1141 | } | ||
| 1142 | |||
| 1143 | mapping->ctrl = info; | ||
| 1144 | list_add_tail(&mapping->list, &info->mappings); | ||
| 1145 | uvc_trace(UVC_TRACE_CONTROL, "Adding mapping %s to control " | ||
| 1146 | UVC_GUID_FORMAT "/%u.\n", mapping->name, | ||
| 1147 | UVC_GUID_ARGS(info->entity), info->selector); | ||
| 1148 | |||
| 1149 | ret = 0; | ||
| 1150 | break; | ||
| 1151 | } | ||
| 1152 | end: | ||
| 1153 | mutex_unlock(&uvc_driver.ctrl_mutex); | ||
| 1154 | return ret; | ||
| 1155 | } | ||
| 1156 | |||
| 1157 | /* | ||
| 1158 | * Initialize device controls. | ||
| 1159 | */ | ||
| 1160 | int uvc_ctrl_init_device(struct uvc_device *dev) | ||
| 1161 | { | ||
| 1162 | struct uvc_control_info *info; | ||
| 1163 | struct uvc_control *ctrl; | ||
| 1164 | struct uvc_entity *entity; | ||
| 1165 | unsigned int i; | ||
| 1166 | |||
| 1167 | /* Walk the entities list and instantiate controls */ | ||
| 1168 | list_for_each_entry(entity, &dev->entities, list) { | ||
| 1169 | unsigned int bControlSize = 0, ncontrols = 0; | ||
| 1170 | __u8 *bmControls = NULL; | ||
| 1171 | |||
| 1172 | if (UVC_ENTITY_TYPE(entity) == VC_EXTENSION_UNIT) { | ||
| 1173 | bmControls = entity->extension.bmControls; | ||
| 1174 | bControlSize = entity->extension.bControlSize; | ||
| 1175 | } else if (UVC_ENTITY_TYPE(entity) == VC_PROCESSING_UNIT) { | ||
| 1176 | bmControls = entity->processing.bmControls; | ||
| 1177 | bControlSize = entity->processing.bControlSize; | ||
| 1178 | } else if (UVC_ENTITY_TYPE(entity) == ITT_CAMERA) { | ||
| 1179 | bmControls = entity->camera.bmControls; | ||
| 1180 | bControlSize = entity->camera.bControlSize; | ||
| 1181 | } | ||
| 1182 | |||
| 1183 | for (i = 0; i < bControlSize; ++i) | ||
| 1184 | ncontrols += hweight8(bmControls[i]); | ||
| 1185 | |||
| 1186 | if (ncontrols == 0) | ||
| 1187 | continue; | ||
| 1188 | |||
| 1189 | entity->controls = kzalloc(ncontrols*sizeof *ctrl, GFP_KERNEL); | ||
| 1190 | if (entity->controls == NULL) | ||
| 1191 | return -ENOMEM; | ||
| 1192 | |||
| 1193 | entity->ncontrols = ncontrols; | ||
| 1194 | |||
| 1195 | ctrl = entity->controls; | ||
| 1196 | for (i = 0; i < bControlSize * 8; ++i) { | ||
| 1197 | if (uvc_get_bit(bmControls, i) == 0) | ||
| 1198 | continue; | ||
| 1199 | |||
| 1200 | ctrl->entity = entity; | ||
| 1201 | ctrl->index = i; | ||
| 1202 | ctrl++; | ||
| 1203 | } | ||
| 1204 | } | ||
| 1205 | |||
| 1206 | /* Walk the controls info list and associate them with the device | ||
| 1207 | * controls, then add the device to the global device list. This has | ||
| 1208 | * to be done while holding the controls lock, to make sure | ||
| 1209 | * uvc_ctrl_add_info() will not get called in-between. | ||
| 1210 | */ | ||
| 1211 | mutex_lock(&uvc_driver.ctrl_mutex); | ||
| 1212 | list_for_each_entry(info, &uvc_driver.controls, list) | ||
| 1213 | uvc_ctrl_add_ctrl(dev, info); | ||
| 1214 | |||
| 1215 | list_add_tail(&dev->list, &uvc_driver.devices); | ||
| 1216 | mutex_unlock(&uvc_driver.ctrl_mutex); | ||
| 1217 | |||
| 1218 | return 0; | ||
| 1219 | } | ||
| 1220 | |||
| 1221 | /* | ||
| 1222 | * Cleanup device controls. | ||
| 1223 | */ | ||
| 1224 | void uvc_ctrl_cleanup_device(struct uvc_device *dev) | ||
| 1225 | { | ||
| 1226 | struct uvc_entity *entity; | ||
| 1227 | unsigned int i; | ||
| 1228 | |||
| 1229 | /* Remove the device from the global devices list */ | ||
| 1230 | mutex_lock(&uvc_driver.ctrl_mutex); | ||
| 1231 | if (dev->list.next != NULL) | ||
| 1232 | list_del(&dev->list); | ||
| 1233 | mutex_unlock(&uvc_driver.ctrl_mutex); | ||
| 1234 | |||
| 1235 | list_for_each_entry(entity, &dev->entities, list) { | ||
| 1236 | for (i = 0; i < entity->ncontrols; ++i) | ||
| 1237 | kfree(entity->controls[i].data); | ||
| 1238 | |||
| 1239 | kfree(entity->controls); | ||
| 1240 | } | ||
| 1241 | } | ||
| 1242 | |||
| 1243 | void uvc_ctrl_init(void) | ||
| 1244 | { | ||
| 1245 | struct uvc_control_info *ctrl = uvc_ctrls; | ||
| 1246 | struct uvc_control_info *cend = ctrl + ARRAY_SIZE(uvc_ctrls); | ||
| 1247 | struct uvc_control_mapping *mapping = uvc_ctrl_mappings; | ||
| 1248 | struct uvc_control_mapping *mend = | ||
| 1249 | mapping + ARRAY_SIZE(uvc_ctrl_mappings); | ||
| 1250 | |||
| 1251 | for (; ctrl < cend; ++ctrl) | ||
| 1252 | uvc_ctrl_add_info(ctrl); | ||
| 1253 | |||
| 1254 | for (; mapping < mend; ++mapping) | ||
| 1255 | uvc_ctrl_add_mapping(mapping); | ||
| 1256 | } | ||
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c new file mode 100644 index 000000000000..60ced589f898 --- /dev/null +++ b/drivers/media/video/uvc/uvc_driver.c | |||
| @@ -0,0 +1,1955 @@ | |||
| 1 | /* | ||
| 2 | * uvc_driver.c -- USB Video Class driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | /* | ||
| 15 | * This driver aims to support video input devices compliant with the 'USB | ||
| 16 | * Video Class' specification. | ||
| 17 | * | ||
| 18 | * The driver doesn't support the deprecated v4l1 interface. It implements the | ||
| 19 | * mmap capture method only, and doesn't do any image format conversion in | ||
| 20 | * software. If your user-space application doesn't support YUYV or MJPEG, fix | ||
| 21 | * it :-). Please note that the MJPEG data have been stripped from their | ||
| 22 | * Huffman tables (DHT marker), you will need to add it back if your JPEG | ||
| 23 | * codec can't handle MJPEG data. | ||
| 24 | */ | ||
| 25 | |||
| 26 | #include <linux/kernel.h> | ||
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/list.h> | ||
| 29 | #include <linux/module.h> | ||
| 30 | #include <linux/usb.h> | ||
| 31 | #include <linux/videodev2.h> | ||
| 32 | #include <linux/vmalloc.h> | ||
| 33 | #include <linux/wait.h> | ||
| 34 | #include <asm/atomic.h> | ||
| 35 | |||
| 36 | #include <media/v4l2-common.h> | ||
| 37 | |||
| 38 | #include "uvcvideo.h" | ||
| 39 | |||
| 40 | #define DRIVER_AUTHOR "Laurent Pinchart <laurent.pinchart@skynet.be>" | ||
| 41 | #define DRIVER_DESC "USB Video Class driver" | ||
| 42 | #ifndef DRIVER_VERSION | ||
| 43 | #define DRIVER_VERSION "v0.1.0" | ||
| 44 | #endif | ||
| 45 | |||
| 46 | static unsigned int uvc_quirks_param; | ||
| 47 | unsigned int uvc_trace_param; | ||
| 48 | |||
| 49 | /* ------------------------------------------------------------------------ | ||
| 50 | * Control, formats, ... | ||
| 51 | */ | ||
| 52 | |||
| 53 | static struct uvc_format_desc uvc_fmts[] = { | ||
| 54 | { | ||
| 55 | .name = "YUV 4:2:2 (YUYV)", | ||
| 56 | .guid = UVC_GUID_FORMAT_YUY2, | ||
| 57 | .fcc = V4L2_PIX_FMT_YUYV, | ||
| 58 | }, | ||
| 59 | { | ||
| 60 | .name = "YUV 4:2:0 (NV12)", | ||
| 61 | .guid = UVC_GUID_FORMAT_NV12, | ||
| 62 | .fcc = V4L2_PIX_FMT_NV12, | ||
| 63 | }, | ||
| 64 | { | ||
| 65 | .name = "MJPEG", | ||
| 66 | .guid = UVC_GUID_FORMAT_MJPEG, | ||
| 67 | .fcc = V4L2_PIX_FMT_MJPEG, | ||
| 68 | }, | ||
| 69 | { | ||
| 70 | .name = "YVU 4:2:0 (YV12)", | ||
| 71 | .guid = UVC_GUID_FORMAT_YV12, | ||
| 72 | .fcc = V4L2_PIX_FMT_YVU420, | ||
| 73 | }, | ||
| 74 | { | ||
| 75 | .name = "YUV 4:2:0 (I420)", | ||
| 76 | .guid = UVC_GUID_FORMAT_I420, | ||
| 77 | .fcc = V4L2_PIX_FMT_YUV420, | ||
| 78 | }, | ||
| 79 | { | ||
| 80 | .name = "YUV 4:2:2 (UYVY)", | ||
| 81 | .guid = UVC_GUID_FORMAT_UYVY, | ||
| 82 | .fcc = V4L2_PIX_FMT_UYVY, | ||
| 83 | }, | ||
| 84 | { | ||
| 85 | .name = "Greyscale", | ||
| 86 | .guid = UVC_GUID_FORMAT_Y800, | ||
| 87 | .fcc = V4L2_PIX_FMT_GREY, | ||
| 88 | }, | ||
| 89 | { | ||
| 90 | .name = "RGB Bayer", | ||
| 91 | .guid = UVC_GUID_FORMAT_BY8, | ||
| 92 | .fcc = V4L2_PIX_FMT_SBGGR8, | ||
| 93 | }, | ||
| 94 | }; | ||
| 95 | |||
| 96 | /* ------------------------------------------------------------------------ | ||
| 97 | * Utility functions | ||
| 98 | */ | ||
| 99 | |||
| 100 | struct usb_host_endpoint *uvc_find_endpoint(struct usb_host_interface *alts, | ||
| 101 | __u8 epaddr) | ||
| 102 | { | ||
| 103 | struct usb_host_endpoint *ep; | ||
| 104 | unsigned int i; | ||
| 105 | |||
| 106 | for (i = 0; i < alts->desc.bNumEndpoints; ++i) { | ||
| 107 | ep = &alts->endpoint[i]; | ||
| 108 | if (ep->desc.bEndpointAddress == epaddr) | ||
| 109 | return ep; | ||
| 110 | } | ||
| 111 | |||
| 112 | return NULL; | ||
| 113 | } | ||
| 114 | |||
| 115 | static struct uvc_format_desc *uvc_format_by_guid(const __u8 guid[16]) | ||
| 116 | { | ||
| 117 | unsigned int len = ARRAY_SIZE(uvc_fmts); | ||
| 118 | unsigned int i; | ||
| 119 | |||
| 120 | for (i = 0; i < len; ++i) { | ||
| 121 | if (memcmp(guid, uvc_fmts[i].guid, 16) == 0) | ||
| 122 | return &uvc_fmts[i]; | ||
| 123 | } | ||
| 124 | |||
| 125 | return NULL; | ||
| 126 | } | ||
| 127 | |||
| 128 | static __u32 uvc_colorspace(const __u8 primaries) | ||
| 129 | { | ||
| 130 | static const __u8 colorprimaries[] = { | ||
| 131 | 0, | ||
| 132 | V4L2_COLORSPACE_SRGB, | ||
| 133 | V4L2_COLORSPACE_470_SYSTEM_M, | ||
| 134 | V4L2_COLORSPACE_470_SYSTEM_BG, | ||
| 135 | V4L2_COLORSPACE_SMPTE170M, | ||
| 136 | V4L2_COLORSPACE_SMPTE240M, | ||
| 137 | }; | ||
| 138 | |||
| 139 | if (primaries < ARRAY_SIZE(colorprimaries)) | ||
| 140 | return colorprimaries[primaries]; | ||
| 141 | |||
| 142 | return 0; | ||
| 143 | } | ||
| 144 | |||
| 145 | /* Simplify a fraction using a simple continued fraction decomposition. The | ||
| 146 | * idea here is to convert fractions such as 333333/10000000 to 1/30 using | ||
| 147 | * 32 bit arithmetic only. The algorithm is not perfect and relies upon two | ||
| 148 | * arbitrary parameters to remove non-significative terms from the simple | ||
| 149 | * continued fraction decomposition. Using 8 and 333 for n_terms and threshold | ||
| 150 | * respectively seems to give nice results. | ||
| 151 | */ | ||
| 152 | void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator, | ||
| 153 | unsigned int n_terms, unsigned int threshold) | ||
| 154 | { | ||
| 155 | uint32_t *an; | ||
| 156 | uint32_t x, y, r; | ||
| 157 | unsigned int i, n; | ||
| 158 | |||
| 159 | an = kmalloc(n_terms * sizeof *an, GFP_KERNEL); | ||
| 160 | if (an == NULL) | ||
| 161 | return; | ||
| 162 | |||
| 163 | /* Convert the fraction to a simple continued fraction. See | ||
| 164 | * http://mathforum.org/dr.math/faq/faq.fractions.html | ||
| 165 | * Stop if the current term is bigger than or equal to the given | ||
| 166 | * threshold. | ||
| 167 | */ | ||
| 168 | x = *numerator; | ||
| 169 | y = *denominator; | ||
| 170 | |||
| 171 | for (n = 0; n < n_terms && y != 0; ++n) { | ||
| 172 | an[n] = x / y; | ||
| 173 | if (an[n] >= threshold) { | ||
| 174 | if (n < 2) | ||
| 175 | n++; | ||
| 176 | break; | ||
| 177 | } | ||
| 178 | |||
| 179 | r = x - an[n] * y; | ||
| 180 | x = y; | ||
| 181 | y = r; | ||
| 182 | } | ||
| 183 | |||
| 184 | /* Expand the simple continued fraction back to an integer fraction. */ | ||
| 185 | x = 0; | ||
| 186 | y = 1; | ||
| 187 | |||
| 188 | for (i = n; i > 0; --i) { | ||
| 189 | r = y; | ||
| 190 | y = an[i-1] * y + x; | ||
| 191 | x = r; | ||
| 192 | } | ||
| 193 | |||
| 194 | *numerator = y; | ||
| 195 | *denominator = x; | ||
| 196 | kfree(an); | ||
| 197 | } | ||
| 198 | |||
| 199 | /* Convert a fraction to a frame interval in 100ns multiples. The idea here is | ||
| 200 | * to compute numerator / denominator * 10000000 using 32 bit fixed point | ||
| 201 | * arithmetic only. | ||
| 202 | */ | ||
| 203 | uint32_t uvc_fraction_to_interval(uint32_t numerator, uint32_t denominator) | ||
| 204 | { | ||
| 205 | uint32_t multiplier; | ||
| 206 | |||
| 207 | /* Saturate the result if the operation would overflow. */ | ||
| 208 | if (denominator == 0 || | ||
| 209 | numerator/denominator >= ((uint32_t)-1)/10000000) | ||
| 210 | return (uint32_t)-1; | ||
| 211 | |||
| 212 | /* Divide both the denominator and the multiplier by two until | ||
| 213 | * numerator * multiplier doesn't overflow. If anyone knows a better | ||
| 214 | * algorithm please let me know. | ||
| 215 | */ | ||
| 216 | multiplier = 10000000; | ||
| 217 | while (numerator > ((uint32_t)-1)/multiplier) { | ||
| 218 | multiplier /= 2; | ||
| 219 | denominator /= 2; | ||
| 220 | } | ||
| 221 | |||
| 222 | return denominator ? numerator * multiplier / denominator : 0; | ||
| 223 | } | ||
| 224 | |||
| 225 | /* ------------------------------------------------------------------------ | ||
| 226 | * Terminal and unit management | ||
| 227 | */ | ||
| 228 | |||
| 229 | static struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id) | ||
| 230 | { | ||
| 231 | struct uvc_entity *entity; | ||
| 232 | |||
| 233 | list_for_each_entry(entity, &dev->entities, list) { | ||
| 234 | if (entity->id == id) | ||
| 235 | return entity; | ||
| 236 | } | ||
| 237 | |||
| 238 | return NULL; | ||
| 239 | } | ||
| 240 | |||
| 241 | static struct uvc_entity *uvc_entity_by_reference(struct uvc_device *dev, | ||
| 242 | int id, struct uvc_entity *entity) | ||
| 243 | { | ||
| 244 | unsigned int i; | ||
| 245 | |||
| 246 | if (entity == NULL) | ||
| 247 | entity = list_entry(&dev->entities, struct uvc_entity, list); | ||
| 248 | |||
| 249 | list_for_each_entry_continue(entity, &dev->entities, list) { | ||
| 250 | switch (UVC_ENTITY_TYPE(entity)) { | ||
| 251 | case TT_STREAMING: | ||
| 252 | if (entity->output.bSourceID == id) | ||
| 253 | return entity; | ||
| 254 | break; | ||
| 255 | |||
| 256 | case VC_PROCESSING_UNIT: | ||
| 257 | if (entity->processing.bSourceID == id) | ||
| 258 | return entity; | ||
| 259 | break; | ||
| 260 | |||
| 261 | case VC_SELECTOR_UNIT: | ||
| 262 | for (i = 0; i < entity->selector.bNrInPins; ++i) | ||
| 263 | if (entity->selector.baSourceID[i] == id) | ||
| 264 | return entity; | ||
| 265 | break; | ||
| 266 | |||
| 267 | case VC_EXTENSION_UNIT: | ||
| 268 | for (i = 0; i < entity->extension.bNrInPins; ++i) | ||
| 269 | if (entity->extension.baSourceID[i] == id) | ||
| 270 | return entity; | ||
| 271 | break; | ||
| 272 | } | ||
| 273 | } | ||
| 274 | |||
| 275 | return NULL; | ||
| 276 | } | ||
| 277 | |||
| 278 | /* ------------------------------------------------------------------------ | ||
| 279 | * Descriptors handling | ||
| 280 | */ | ||
| 281 | |||
| 282 | static int uvc_parse_format(struct uvc_device *dev, | ||
| 283 | struct uvc_streaming *streaming, struct uvc_format *format, | ||
| 284 | __u32 **intervals, unsigned char *buffer, int buflen) | ||
| 285 | { | ||
| 286 | struct usb_interface *intf = streaming->intf; | ||
| 287 | struct usb_host_interface *alts = intf->cur_altsetting; | ||
| 288 | struct uvc_format_desc *fmtdesc; | ||
| 289 | struct uvc_frame *frame; | ||
| 290 | const unsigned char *start = buffer; | ||
| 291 | unsigned int interval; | ||
| 292 | unsigned int i, n; | ||
| 293 | __u8 ftype; | ||
| 294 | |||
| 295 | format->type = buffer[2]; | ||
| 296 | format->index = buffer[3]; | ||
| 297 | |||
| 298 | switch (buffer[2]) { | ||
| 299 | case VS_FORMAT_UNCOMPRESSED: | ||
| 300 | case VS_FORMAT_FRAME_BASED: | ||
| 301 | if (buflen < 27) { | ||
| 302 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 303 | "interface %d FORMAT error\n", | ||
| 304 | dev->udev->devnum, | ||
| 305 | alts->desc.bInterfaceNumber); | ||
| 306 | return -EINVAL; | ||
| 307 | } | ||
| 308 | |||
| 309 | /* Find the format descriptor from its GUID. */ | ||
| 310 | fmtdesc = uvc_format_by_guid(&buffer[5]); | ||
| 311 | |||
| 312 | if (fmtdesc != NULL) { | ||
| 313 | strncpy(format->name, fmtdesc->name, | ||
| 314 | sizeof format->name); | ||
| 315 | format->fcc = fmtdesc->fcc; | ||
| 316 | } else { | ||
| 317 | uvc_printk(KERN_INFO, "Unknown video format " | ||
| 318 | UVC_GUID_FORMAT "\n", | ||
| 319 | UVC_GUID_ARGS(&buffer[5])); | ||
| 320 | snprintf(format->name, sizeof format->name, | ||
| 321 | UVC_GUID_FORMAT, UVC_GUID_ARGS(&buffer[5])); | ||
| 322 | format->fcc = 0; | ||
| 323 | } | ||
| 324 | |||
| 325 | format->bpp = buffer[21]; | ||
| 326 | if (buffer[2] == VS_FORMAT_UNCOMPRESSED) { | ||
| 327 | ftype = VS_FRAME_UNCOMPRESSED; | ||
| 328 | } else { | ||
| 329 | ftype = VS_FRAME_FRAME_BASED; | ||
| 330 | if (buffer[27]) | ||
| 331 | format->flags = UVC_FMT_FLAG_COMPRESSED; | ||
| 332 | } | ||
| 333 | break; | ||
| 334 | |||
| 335 | case VS_FORMAT_MJPEG: | ||
| 336 | if (buflen < 11) { | ||
| 337 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 338 | "interface %d FORMAT error\n", | ||
| 339 | dev->udev->devnum, | ||
| 340 | alts->desc.bInterfaceNumber); | ||
| 341 | return -EINVAL; | ||
| 342 | } | ||
| 343 | |||
| 344 | strncpy(format->name, "MJPEG", sizeof format->name); | ||
| 345 | format->fcc = V4L2_PIX_FMT_MJPEG; | ||
| 346 | format->flags = UVC_FMT_FLAG_COMPRESSED; | ||
| 347 | format->bpp = 0; | ||
| 348 | ftype = VS_FRAME_MJPEG; | ||
| 349 | break; | ||
| 350 | |||
| 351 | case VS_FORMAT_DV: | ||
| 352 | if (buflen < 9) { | ||
| 353 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 354 | "interface %d FORMAT error\n", | ||
| 355 | dev->udev->devnum, | ||
| 356 | alts->desc.bInterfaceNumber); | ||
| 357 | return -EINVAL; | ||
| 358 | } | ||
| 359 | |||
| 360 | switch (buffer[8] & 0x7f) { | ||
| 361 | case 0: | ||
| 362 | strncpy(format->name, "SD-DV", sizeof format->name); | ||
| 363 | break; | ||
| 364 | case 1: | ||
| 365 | strncpy(format->name, "SDL-DV", sizeof format->name); | ||
| 366 | break; | ||
| 367 | case 2: | ||
| 368 | strncpy(format->name, "HD-DV", sizeof format->name); | ||
| 369 | break; | ||
| 370 | default: | ||
| 371 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 372 | "interface %d: unknown DV format %u\n", | ||
| 373 | dev->udev->devnum, | ||
| 374 | alts->desc.bInterfaceNumber, buffer[8]); | ||
| 375 | return -EINVAL; | ||
| 376 | } | ||
| 377 | |||
| 378 | strncat(format->name, buffer[8] & (1 << 7) ? " 60Hz" : " 50Hz", | ||
| 379 | sizeof format->name); | ||
| 380 | |||
| 381 | format->fcc = V4L2_PIX_FMT_DV; | ||
| 382 | format->flags = UVC_FMT_FLAG_COMPRESSED | UVC_FMT_FLAG_STREAM; | ||
| 383 | format->bpp = 0; | ||
| 384 | ftype = 0; | ||
| 385 | |||
| 386 | /* Create a dummy frame descriptor. */ | ||
| 387 | frame = &format->frame[0]; | ||
| 388 | memset(&format->frame[0], 0, sizeof format->frame[0]); | ||
| 389 | frame->bFrameIntervalType = 1; | ||
| 390 | frame->dwDefaultFrameInterval = 1; | ||
| 391 | frame->dwFrameInterval = *intervals; | ||
| 392 | *(*intervals)++ = 1; | ||
| 393 | format->nframes = 1; | ||
| 394 | break; | ||
| 395 | |||
| 396 | case VS_FORMAT_MPEG2TS: | ||
| 397 | case VS_FORMAT_STREAM_BASED: | ||
| 398 | /* Not supported yet. */ | ||
| 399 | default: | ||
| 400 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 401 | "interface %d unsupported format %u\n", | ||
| 402 | dev->udev->devnum, alts->desc.bInterfaceNumber, | ||
| 403 | buffer[2]); | ||
| 404 | return -EINVAL; | ||
| 405 | } | ||
| 406 | |||
| 407 | uvc_trace(UVC_TRACE_DESCR, "Found format %s.\n", format->name); | ||
| 408 | |||
| 409 | buflen -= buffer[0]; | ||
| 410 | buffer += buffer[0]; | ||
| 411 | |||
| 412 | /* Parse the frame descriptors. Only uncompressed, MJPEG and frame | ||
| 413 | * based formats have frame descriptors. | ||
| 414 | */ | ||
| 415 | while (buflen > 2 && buffer[2] == ftype) { | ||
| 416 | frame = &format->frame[format->nframes]; | ||
| 417 | |||
| 418 | if (ftype != VS_FRAME_FRAME_BASED) | ||
| 419 | n = buflen > 25 ? buffer[25] : 0; | ||
| 420 | else | ||
| 421 | n = buflen > 21 ? buffer[21] : 0; | ||
| 422 | |||
| 423 | n = n ? n : 3; | ||
| 424 | |||
| 425 | if (buflen < 26 + 4*n) { | ||
| 426 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 427 | "interface %d FRAME error\n", dev->udev->devnum, | ||
| 428 | alts->desc.bInterfaceNumber); | ||
| 429 | return -EINVAL; | ||
| 430 | } | ||
| 431 | |||
| 432 | frame->bFrameIndex = buffer[3]; | ||
| 433 | frame->bmCapabilities = buffer[4]; | ||
| 434 | frame->wWidth = le16_to_cpup((__le16 *)&buffer[5]); | ||
| 435 | frame->wHeight = le16_to_cpup((__le16 *)&buffer[7]); | ||
| 436 | frame->dwMinBitRate = le32_to_cpup((__le32 *)&buffer[9]); | ||
| 437 | frame->dwMaxBitRate = le32_to_cpup((__le32 *)&buffer[13]); | ||
| 438 | if (ftype != VS_FRAME_FRAME_BASED) { | ||
| 439 | frame->dwMaxVideoFrameBufferSize = | ||
| 440 | le32_to_cpup((__le32 *)&buffer[17]); | ||
| 441 | frame->dwDefaultFrameInterval = | ||
| 442 | le32_to_cpup((__le32 *)&buffer[21]); | ||
| 443 | frame->bFrameIntervalType = buffer[25]; | ||
| 444 | } else { | ||
| 445 | frame->dwMaxVideoFrameBufferSize = 0; | ||
| 446 | frame->dwDefaultFrameInterval = | ||
| 447 | le32_to_cpup((__le32 *)&buffer[17]); | ||
| 448 | frame->bFrameIntervalType = buffer[21]; | ||
| 449 | } | ||
| 450 | frame->dwFrameInterval = *intervals; | ||
| 451 | |||
| 452 | /* Several UVC chipsets screw up dwMaxVideoFrameBufferSize | ||
| 453 | * completely. Observed behaviours range from setting the | ||
| 454 | * value to 1.1x the actual frame size of hardwiring the | ||
| 455 | * 16 low bits to 0. This results in a higher than necessary | ||
| 456 | * memory usage as well as a wrong image size information. For | ||
| 457 | * uncompressed formats this can be fixed by computing the | ||
| 458 | * value from the frame size. | ||
| 459 | */ | ||
| 460 | if (!(format->flags & UVC_FMT_FLAG_COMPRESSED)) | ||
| 461 | frame->dwMaxVideoFrameBufferSize = format->bpp | ||
| 462 | * frame->wWidth * frame->wHeight / 8; | ||
| 463 | |||
| 464 | /* Some bogus devices report dwMinFrameInterval equal to | ||
| 465 | * dwMaxFrameInterval and have dwFrameIntervalStep set to | ||
| 466 | * zero. Setting all null intervals to 1 fixes the problem and | ||
| 467 | * some other divisions by zero which could happen. | ||
| 468 | */ | ||
| 469 | for (i = 0; i < n; ++i) { | ||
| 470 | interval = le32_to_cpup((__le32 *)&buffer[26+4*i]); | ||
| 471 | *(*intervals)++ = interval ? interval : 1; | ||
| 472 | } | ||
| 473 | |||
| 474 | /* Make sure that the default frame interval stays between | ||
| 475 | * the boundaries. | ||
| 476 | */ | ||
| 477 | n -= frame->bFrameIntervalType ? 1 : 2; | ||
| 478 | frame->dwDefaultFrameInterval = | ||
| 479 | min(frame->dwFrameInterval[n], | ||
| 480 | max(frame->dwFrameInterval[0], | ||
| 481 | frame->dwDefaultFrameInterval)); | ||
| 482 | |||
| 483 | uvc_trace(UVC_TRACE_DESCR, "- %ux%u (%u.%u fps)\n", | ||
| 484 | frame->wWidth, frame->wHeight, | ||
| 485 | 10000000/frame->dwDefaultFrameInterval, | ||
| 486 | (100000000/frame->dwDefaultFrameInterval)%10); | ||
| 487 | |||
| 488 | format->nframes++; | ||
| 489 | buflen -= buffer[0]; | ||
| 490 | buffer += buffer[0]; | ||
| 491 | } | ||
| 492 | |||
| 493 | if (buflen > 2 && buffer[2] == VS_STILL_IMAGE_FRAME) { | ||
| 494 | buflen -= buffer[0]; | ||
| 495 | buffer += buffer[0]; | ||
| 496 | } | ||
| 497 | |||
| 498 | if (buflen > 2 && buffer[2] == VS_COLORFORMAT) { | ||
| 499 | if (buflen < 6) { | ||
| 500 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming" | ||
| 501 | "interface %d COLORFORMAT error\n", | ||
| 502 | dev->udev->devnum, | ||
| 503 | alts->desc.bInterfaceNumber); | ||
| 504 | return -EINVAL; | ||
| 505 | } | ||
| 506 | |||
| 507 | format->colorspace = uvc_colorspace(buffer[3]); | ||
| 508 | |||
| 509 | buflen -= buffer[0]; | ||
| 510 | buffer += buffer[0]; | ||
| 511 | } | ||
| 512 | |||
| 513 | return buffer - start; | ||
| 514 | } | ||
| 515 | |||
| 516 | static int uvc_parse_streaming(struct uvc_device *dev, | ||
| 517 | struct usb_interface *intf) | ||
| 518 | { | ||
| 519 | struct uvc_streaming *streaming = NULL; | ||
| 520 | struct uvc_format *format; | ||
| 521 | struct uvc_frame *frame; | ||
| 522 | struct usb_host_interface *alts = &intf->altsetting[0]; | ||
| 523 | unsigned char *_buffer, *buffer = alts->extra; | ||
| 524 | int _buflen, buflen = alts->extralen; | ||
| 525 | unsigned int nformats = 0, nframes = 0, nintervals = 0; | ||
| 526 | unsigned int size, i, n, p; | ||
| 527 | __u32 *interval; | ||
| 528 | __u16 psize; | ||
| 529 | int ret = -EINVAL; | ||
| 530 | |||
| 531 | if (intf->cur_altsetting->desc.bInterfaceSubClass | ||
| 532 | != SC_VIDEOSTREAMING) { | ||
| 533 | uvc_trace(UVC_TRACE_DESCR, "device %d interface %d isn't a " | ||
| 534 | "video streaming interface\n", dev->udev->devnum, | ||
| 535 | intf->altsetting[0].desc.bInterfaceNumber); | ||
| 536 | return -EINVAL; | ||
| 537 | } | ||
| 538 | |||
| 539 | if (usb_driver_claim_interface(&uvc_driver.driver, intf, dev)) { | ||
| 540 | uvc_trace(UVC_TRACE_DESCR, "device %d interface %d is already " | ||
| 541 | "claimed\n", dev->udev->devnum, | ||
| 542 | intf->altsetting[0].desc.bInterfaceNumber); | ||
| 543 | return -EINVAL; | ||
| 544 | } | ||
| 545 | |||
| 546 | streaming = kzalloc(sizeof *streaming, GFP_KERNEL); | ||
| 547 | if (streaming == NULL) { | ||
| 548 | usb_driver_release_interface(&uvc_driver.driver, intf); | ||
| 549 | return -EINVAL; | ||
| 550 | } | ||
| 551 | |||
| 552 | mutex_init(&streaming->mutex); | ||
| 553 | streaming->intf = usb_get_intf(intf); | ||
| 554 | streaming->intfnum = intf->cur_altsetting->desc.bInterfaceNumber; | ||
| 555 | |||
| 556 | /* The Pico iMage webcam has its class-specific interface descriptors | ||
| 557 | * after the endpoint descriptors. | ||
| 558 | */ | ||
| 559 | if (buflen == 0) { | ||
| 560 | for (i = 0; i < alts->desc.bNumEndpoints; ++i) { | ||
| 561 | struct usb_host_endpoint *ep = &alts->endpoint[i]; | ||
| 562 | |||
| 563 | if (ep->extralen == 0) | ||
| 564 | continue; | ||
| 565 | |||
| 566 | if (ep->extralen > 2 && | ||
| 567 | ep->extra[1] == USB_DT_CS_INTERFACE) { | ||
| 568 | uvc_trace(UVC_TRACE_DESCR, "trying extra data " | ||
| 569 | "from endpoint %u.\n", i); | ||
| 570 | buffer = alts->endpoint[i].extra; | ||
| 571 | buflen = alts->endpoint[i].extralen; | ||
| 572 | break; | ||
| 573 | } | ||
| 574 | } | ||
| 575 | } | ||
| 576 | |||
| 577 | /* Skip the standard interface descriptors. */ | ||
| 578 | while (buflen > 2 && buffer[1] != USB_DT_CS_INTERFACE) { | ||
| 579 | buflen -= buffer[0]; | ||
| 580 | buffer += buffer[0]; | ||
| 581 | } | ||
| 582 | |||
| 583 | if (buflen <= 2) { | ||
| 584 | uvc_trace(UVC_TRACE_DESCR, "no class-specific streaming " | ||
| 585 | "interface descriptors found.\n"); | ||
| 586 | goto error; | ||
| 587 | } | ||
| 588 | |||
| 589 | /* Parse the header descriptor. */ | ||
| 590 | if (buffer[2] == VS_OUTPUT_HEADER) { | ||
| 591 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface " | ||
| 592 | "%d OUTPUT HEADER descriptor is not supported.\n", | ||
| 593 | dev->udev->devnum, alts->desc.bInterfaceNumber); | ||
| 594 | goto error; | ||
| 595 | } else if (buffer[2] == VS_INPUT_HEADER) { | ||
| 596 | p = buflen >= 5 ? buffer[3] : 0; | ||
| 597 | n = buflen >= 12 ? buffer[12] : 0; | ||
| 598 | |||
| 599 | if (buflen < 13 + p*n || buffer[2] != VS_INPUT_HEADER) { | ||
| 600 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " | ||
| 601 | "interface %d INPUT HEADER descriptor is " | ||
| 602 | "invalid.\n", dev->udev->devnum, | ||
| 603 | alts->desc.bInterfaceNumber); | ||
| 604 | goto error; | ||
| 605 | } | ||
| 606 | |||
| 607 | streaming->header.bNumFormats = p; | ||
| 608 | streaming->header.bEndpointAddress = buffer[6]; | ||
| 609 | streaming->header.bmInfo = buffer[7]; | ||
| 610 | streaming->header.bTerminalLink = buffer[8]; | ||
| 611 | streaming->header.bStillCaptureMethod = buffer[9]; | ||
| 612 | streaming->header.bTriggerSupport = buffer[10]; | ||
| 613 | streaming->header.bTriggerUsage = buffer[11]; | ||
| 614 | streaming->header.bControlSize = n; | ||
| 615 | |||
| 616 | streaming->header.bmaControls = kmalloc(p*n, GFP_KERNEL); | ||
| 617 | if (streaming->header.bmaControls == NULL) { | ||
| 618 | ret = -ENOMEM; | ||
| 619 | goto error; | ||
| 620 | } | ||
| 621 | |||
| 622 | memcpy(streaming->header.bmaControls, &buffer[13], p*n); | ||
| 623 | } else { | ||
| 624 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface " | ||
| 625 | "%d HEADER descriptor not found.\n", dev->udev->devnum, | ||
| 626 | alts->desc.bInterfaceNumber); | ||
| 627 | goto error; | ||
| 628 | } | ||
| 629 | |||
| 630 | buflen -= buffer[0]; | ||
| 631 | buffer += buffer[0]; | ||
| 632 | |||
| 633 | _buffer = buffer; | ||
| 634 | _buflen = buflen; | ||
| 635 | |||
| 636 | /* Count the format and frame descriptors. */ | ||
| 637 | while (_buflen > 2) { | ||
| 638 | switch (_buffer[2]) { | ||
| 639 | case VS_FORMAT_UNCOMPRESSED: | ||
| 640 | case VS_FORMAT_MJPEG: | ||
| 641 | case VS_FORMAT_FRAME_BASED: | ||
| 642 | nformats++; | ||
| 643 | break; | ||
| 644 | |||
| 645 | case VS_FORMAT_DV: | ||
| 646 | /* DV format has no frame descriptor. We will create a | ||
| 647 | * dummy frame descriptor with a dummy frame interval. | ||
| 648 | */ | ||
| 649 | nformats++; | ||
| 650 | nframes++; | ||
| 651 | nintervals++; | ||
| 652 | break; | ||
| 653 | |||
| 654 | case VS_FORMAT_MPEG2TS: | ||
| 655 | case VS_FORMAT_STREAM_BASED: | ||
| 656 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming " | ||
| 657 | "interface %d FORMAT %u is not supported.\n", | ||
| 658 | dev->udev->devnum, | ||
| 659 | alts->desc.bInterfaceNumber, _buffer[2]); | ||
| 660 | break; | ||
| 661 | |||
| 662 | case VS_FRAME_UNCOMPRESSED: | ||
| 663 | case VS_FRAME_MJPEG: | ||
| 664 | nframes++; | ||
| 665 | if (_buflen > 25) | ||
| 666 | nintervals += _buffer[25] ? _buffer[25] : 3; | ||
| 667 | break; | ||
| 668 | |||
| 669 | case VS_FRAME_FRAME_BASED: | ||
| 670 | nframes++; | ||
| 671 | if (_buflen > 21) | ||
| 672 | nintervals += _buffer[21] ? _buffer[21] : 3; | ||
| 673 | break; | ||
| 674 | } | ||
| 675 | |||
| 676 | _buflen -= _buffer[0]; | ||
| 677 | _buffer += _buffer[0]; | ||
| 678 | } | ||
| 679 | |||
| 680 | if (nformats == 0) { | ||
| 681 | uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming interface " | ||
| 682 | "%d has no supported formats defined.\n", | ||
| 683 | dev->udev->devnum, alts->desc.bInterfaceNumber); | ||
| 684 | goto error; | ||
| 685 | } | ||
| 686 | |||
| 687 | size = nformats * sizeof *format + nframes * sizeof *frame | ||
| 688 | + nintervals * sizeof *interval; | ||
| 689 | format = kzalloc(size, GFP_KERNEL); | ||
| 690 | if (format == NULL) { | ||
| 691 | ret = -ENOMEM; | ||
| 692 | goto error; | ||
| 693 | } | ||
| 694 | |||
| 695 | frame = (struct uvc_frame *)&format[nformats]; | ||
| 696 | interval = (__u32 *)&frame[nframes]; | ||
| 697 | |||
| 698 | streaming->format = format; | ||
| 699 | streaming->nformats = nformats; | ||
| 700 | |||
| 701 | /* Parse the format descriptors. */ | ||
| 702 | while (buflen > 2) { | ||
| 703 | switch (buffer[2]) { | ||
| 704 | case VS_FORMAT_UNCOMPRESSED: | ||
| 705 | case VS_FORMAT_MJPEG: | ||
| 706 | case VS_FORMAT_DV: | ||
| 707 | case VS_FORMAT_FRAME_BASED: | ||
| 708 | format->frame = frame; | ||
| 709 | ret = uvc_parse_format(dev, streaming, format, | ||
| 710 | &interval, buffer, buflen); | ||
| 711 | if (ret < 0) | ||
| 712 | goto error; | ||
| 713 | |||
| 714 | frame += format->nframes; | ||
| 715 | format++; | ||
| 716 | |||
| 717 | buflen -= ret; | ||
| 718 | buffer += ret; | ||
| 719 | continue; | ||
| 720 | |||
| 721 | default: | ||
| 722 | break; | ||
| 723 | } | ||
| 724 | |||
| 725 | buflen -= buffer[0]; | ||
| 726 | buffer += buffer[0]; | ||
| 727 | } | ||
| 728 | |||
| 729 | /* Parse the alternate settings to find the maximum bandwidth. */ | ||
| 730 | for (i = 0; i < intf->num_altsetting; ++i) { | ||
| 731 | struct usb_host_endpoint *ep; | ||
| 732 | alts = &intf->altsetting[i]; | ||
| 733 | ep = uvc_find_endpoint(alts, | ||
| 734 | streaming->header.bEndpointAddress); | ||
| 735 | if (ep == NULL) | ||
| 736 | continue; | ||
| 737 | |||
| 738 | psize = le16_to_cpu(ep->desc.wMaxPacketSize); | ||
| 739 | psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); | ||
| 740 | if (psize > streaming->maxpsize) | ||
| 741 | streaming->maxpsize = psize; | ||
| 742 | } | ||
| 743 | |||
| 744 | list_add_tail(&streaming->list, &dev->streaming); | ||
| 745 | return 0; | ||
| 746 | |||
| 747 | error: | ||
| 748 | usb_driver_release_interface(&uvc_driver.driver, intf); | ||
| 749 | usb_put_intf(intf); | ||
| 750 | kfree(streaming->format); | ||
| 751 | kfree(streaming->header.bmaControls); | ||
| 752 | kfree(streaming); | ||
| 753 | return ret; | ||
| 754 | } | ||
| 755 | |||
| 756 | /* Parse vendor-specific extensions. */ | ||
| 757 | static int uvc_parse_vendor_control(struct uvc_device *dev, | ||
| 758 | const unsigned char *buffer, int buflen) | ||
| 759 | { | ||
| 760 | struct usb_device *udev = dev->udev; | ||
| 761 | struct usb_host_interface *alts = dev->intf->cur_altsetting; | ||
| 762 | struct uvc_entity *unit; | ||
| 763 | unsigned int n, p; | ||
| 764 | int handled = 0; | ||
| 765 | |||
| 766 | switch (le16_to_cpu(dev->udev->descriptor.idVendor)) { | ||
| 767 | case 0x046d: /* Logitech */ | ||
| 768 | if (buffer[1] != 0x41 || buffer[2] != 0x01) | ||
| 769 | break; | ||
| 770 | |||
| 771 | /* Logitech implements several vendor specific functions | ||
| 772 | * through vendor specific extension units (LXU). | ||
| 773 | * | ||
| 774 | * The LXU descriptors are similar to XU descriptors | ||
| 775 | * (see "USB Device Video Class for Video Devices", section | ||
| 776 | * 3.7.2.6 "Extension Unit Descriptor") with the following | ||
| 777 | * differences: | ||
| 778 | * | ||
| 779 | * ---------------------------------------------------------- | ||
| 780 | * 0 bLength 1 Number | ||
| 781 | * Size of this descriptor, in bytes: 24+p+n*2 | ||
| 782 | * ---------------------------------------------------------- | ||
| 783 | * 23+p+n bmControlsType N Bitmap | ||
| 784 | * Individual bits in the set are defined: | ||
| 785 | * 0: Absolute | ||
| 786 | * 1: Relative | ||
| 787 | * | ||
| 788 | * This bitset is mapped exactly the same as bmControls. | ||
| 789 | * ---------------------------------------------------------- | ||
| 790 | * 23+p+n*2 bReserved 1 Boolean | ||
| 791 | * ---------------------------------------------------------- | ||
| 792 | * 24+p+n*2 iExtension 1 Index | ||
| 793 | * Index of a string descriptor that describes this | ||
| 794 | * extension unit. | ||
| 795 | * ---------------------------------------------------------- | ||
| 796 | */ | ||
| 797 | p = buflen >= 22 ? buffer[21] : 0; | ||
| 798 | n = buflen >= 25 + p ? buffer[22+p] : 0; | ||
| 799 | |||
| 800 | if (buflen < 25 + p + 2*n) { | ||
| 801 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 802 | "interface %d EXTENSION_UNIT error\n", | ||
| 803 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 804 | break; | ||
| 805 | } | ||
| 806 | |||
| 807 | unit = kzalloc(sizeof *unit + p + 2*n, GFP_KERNEL); | ||
| 808 | if (unit == NULL) | ||
| 809 | return -ENOMEM; | ||
| 810 | |||
| 811 | unit->id = buffer[3]; | ||
| 812 | unit->type = VC_EXTENSION_UNIT; | ||
| 813 | memcpy(unit->extension.guidExtensionCode, &buffer[4], 16); | ||
| 814 | unit->extension.bNumControls = buffer[20]; | ||
| 815 | unit->extension.bNrInPins = | ||
| 816 | le16_to_cpup((__le16 *)&buffer[21]); | ||
| 817 | unit->extension.baSourceID = (__u8 *)unit + sizeof *unit; | ||
| 818 | memcpy(unit->extension.baSourceID, &buffer[22], p); | ||
| 819 | unit->extension.bControlSize = buffer[22+p]; | ||
| 820 | unit->extension.bmControls = (__u8 *)unit + sizeof *unit + p; | ||
| 821 | unit->extension.bmControlsType = (__u8 *)unit + sizeof *unit | ||
| 822 | + p + n; | ||
| 823 | memcpy(unit->extension.bmControls, &buffer[23+p], 2*n); | ||
| 824 | |||
| 825 | if (buffer[24+p+2*n] != 0) | ||
| 826 | usb_string(udev, buffer[24+p+2*n], unit->name, | ||
| 827 | sizeof unit->name); | ||
| 828 | else | ||
| 829 | sprintf(unit->name, "Extension %u", buffer[3]); | ||
| 830 | |||
| 831 | list_add_tail(&unit->list, &dev->entities); | ||
| 832 | handled = 1; | ||
| 833 | break; | ||
| 834 | } | ||
| 835 | |||
| 836 | return handled; | ||
| 837 | } | ||
| 838 | |||
| 839 | static int uvc_parse_standard_control(struct uvc_device *dev, | ||
| 840 | const unsigned char *buffer, int buflen) | ||
| 841 | { | ||
| 842 | struct usb_device *udev = dev->udev; | ||
| 843 | struct uvc_entity *unit, *term; | ||
| 844 | struct usb_interface *intf; | ||
| 845 | struct usb_host_interface *alts = dev->intf->cur_altsetting; | ||
| 846 | unsigned int i, n, p, len; | ||
| 847 | __u16 type; | ||
| 848 | |||
| 849 | switch (buffer[2]) { | ||
| 850 | case VC_HEADER: | ||
| 851 | n = buflen >= 12 ? buffer[11] : 0; | ||
| 852 | |||
| 853 | if (buflen < 12 || buflen < 12 + n) { | ||
| 854 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 855 | "interface %d HEADER error\n", udev->devnum, | ||
| 856 | alts->desc.bInterfaceNumber); | ||
| 857 | return -EINVAL; | ||
| 858 | } | ||
| 859 | |||
| 860 | dev->uvc_version = le16_to_cpup((__le16 *)&buffer[3]); | ||
| 861 | dev->clock_frequency = le32_to_cpup((__le32 *)&buffer[7]); | ||
| 862 | |||
| 863 | /* Parse all USB Video Streaming interfaces. */ | ||
| 864 | for (i = 0; i < n; ++i) { | ||
| 865 | intf = usb_ifnum_to_if(udev, buffer[12+i]); | ||
| 866 | if (intf == NULL) { | ||
| 867 | uvc_trace(UVC_TRACE_DESCR, "device %d " | ||
| 868 | "interface %d doesn't exists\n", | ||
| 869 | udev->devnum, i); | ||
| 870 | continue; | ||
| 871 | } | ||
| 872 | |||
| 873 | uvc_parse_streaming(dev, intf); | ||
| 874 | } | ||
| 875 | break; | ||
| 876 | |||
| 877 | case VC_INPUT_TERMINAL: | ||
| 878 | if (buflen < 8) { | ||
| 879 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 880 | "interface %d INPUT_TERMINAL error\n", | ||
| 881 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 882 | return -EINVAL; | ||
| 883 | } | ||
| 884 | |||
| 885 | /* Make sure the terminal type MSB is not null, otherwise it | ||
| 886 | * could be confused with a unit. | ||
| 887 | */ | ||
| 888 | type = le16_to_cpup((__le16 *)&buffer[4]); | ||
| 889 | if ((type & 0xff00) == 0) { | ||
| 890 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 891 | "interface %d INPUT_TERMINAL %d has invalid " | ||
| 892 | "type 0x%04x, skipping\n", udev->devnum, | ||
| 893 | alts->desc.bInterfaceNumber, | ||
| 894 | buffer[3], type); | ||
| 895 | return 0; | ||
| 896 | } | ||
| 897 | |||
| 898 | n = 0; | ||
| 899 | p = 0; | ||
| 900 | len = 8; | ||
| 901 | |||
| 902 | if (type == ITT_CAMERA) { | ||
| 903 | n = buflen >= 15 ? buffer[14] : 0; | ||
| 904 | len = 15; | ||
| 905 | |||
| 906 | } else if (type == ITT_MEDIA_TRANSPORT_INPUT) { | ||
| 907 | n = buflen >= 9 ? buffer[8] : 0; | ||
| 908 | p = buflen >= 10 + n ? buffer[9+n] : 0; | ||
| 909 | len = 10; | ||
| 910 | } | ||
| 911 | |||
| 912 | if (buflen < len + n + p) { | ||
| 913 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 914 | "interface %d INPUT_TERMINAL error\n", | ||
| 915 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 916 | return -EINVAL; | ||
| 917 | } | ||
| 918 | |||
| 919 | term = kzalloc(sizeof *term + n + p, GFP_KERNEL); | ||
| 920 | if (term == NULL) | ||
| 921 | return -ENOMEM; | ||
| 922 | |||
| 923 | term->id = buffer[3]; | ||
| 924 | term->type = type | UVC_TERM_INPUT; | ||
| 925 | |||
| 926 | if (UVC_ENTITY_TYPE(term) == ITT_CAMERA) { | ||
| 927 | term->camera.bControlSize = n; | ||
| 928 | term->camera.bmControls = (__u8 *)term + sizeof *term; | ||
| 929 | term->camera.wObjectiveFocalLengthMin = | ||
| 930 | le16_to_cpup((__le16 *)&buffer[8]); | ||
| 931 | term->camera.wObjectiveFocalLengthMax = | ||
| 932 | le16_to_cpup((__le16 *)&buffer[10]); | ||
| 933 | term->camera.wOcularFocalLength = | ||
| 934 | le16_to_cpup((__le16 *)&buffer[12]); | ||
| 935 | memcpy(term->camera.bmControls, &buffer[15], n); | ||
| 936 | } else if (UVC_ENTITY_TYPE(term) == ITT_MEDIA_TRANSPORT_INPUT) { | ||
| 937 | term->media.bControlSize = n; | ||
| 938 | term->media.bmControls = (__u8 *)term + sizeof *term; | ||
| 939 | term->media.bTransportModeSize = p; | ||
| 940 | term->media.bmTransportModes = (__u8 *)term | ||
| 941 | + sizeof *term + n; | ||
| 942 | memcpy(term->media.bmControls, &buffer[9], n); | ||
| 943 | memcpy(term->media.bmTransportModes, &buffer[10+n], p); | ||
| 944 | } | ||
| 945 | |||
| 946 | if (buffer[7] != 0) | ||
| 947 | usb_string(udev, buffer[7], term->name, | ||
| 948 | sizeof term->name); | ||
| 949 | else if (UVC_ENTITY_TYPE(term) == ITT_CAMERA) | ||
| 950 | sprintf(term->name, "Camera %u", buffer[3]); | ||
| 951 | else if (UVC_ENTITY_TYPE(term) == ITT_MEDIA_TRANSPORT_INPUT) | ||
| 952 | sprintf(term->name, "Media %u", buffer[3]); | ||
| 953 | else | ||
| 954 | sprintf(term->name, "Input %u", buffer[3]); | ||
| 955 | |||
| 956 | list_add_tail(&term->list, &dev->entities); | ||
| 957 | break; | ||
| 958 | |||
| 959 | case VC_OUTPUT_TERMINAL: | ||
| 960 | if (buflen < 9) { | ||
| 961 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 962 | "interface %d OUTPUT_TERMINAL error\n", | ||
| 963 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 964 | return -EINVAL; | ||
| 965 | } | ||
| 966 | |||
| 967 | /* Make sure the terminal type MSB is not null, otherwise it | ||
| 968 | * could be confused with a unit. | ||
| 969 | */ | ||
| 970 | type = le16_to_cpup((__le16 *)&buffer[4]); | ||
| 971 | if ((type & 0xff00) == 0) { | ||
| 972 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 973 | "interface %d OUTPUT_TERMINAL %d has invalid " | ||
| 974 | "type 0x%04x, skipping\n", udev->devnum, | ||
| 975 | alts->desc.bInterfaceNumber, buffer[3], type); | ||
| 976 | return 0; | ||
| 977 | } | ||
| 978 | |||
| 979 | term = kzalloc(sizeof *term, GFP_KERNEL); | ||
| 980 | if (term == NULL) | ||
| 981 | return -ENOMEM; | ||
| 982 | |||
| 983 | term->id = buffer[3]; | ||
| 984 | term->type = type | UVC_TERM_OUTPUT; | ||
| 985 | term->output.bSourceID = buffer[7]; | ||
| 986 | |||
| 987 | if (buffer[8] != 0) | ||
| 988 | usb_string(udev, buffer[8], term->name, | ||
| 989 | sizeof term->name); | ||
| 990 | else | ||
| 991 | sprintf(term->name, "Output %u", buffer[3]); | ||
| 992 | |||
| 993 | list_add_tail(&term->list, &dev->entities); | ||
| 994 | break; | ||
| 995 | |||
| 996 | case VC_SELECTOR_UNIT: | ||
| 997 | p = buflen >= 5 ? buffer[4] : 0; | ||
| 998 | |||
| 999 | if (buflen < 5 || buflen < 6 + p) { | ||
| 1000 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 1001 | "interface %d SELECTOR_UNIT error\n", | ||
| 1002 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 1003 | return -EINVAL; | ||
| 1004 | } | ||
| 1005 | |||
| 1006 | unit = kzalloc(sizeof *unit + p, GFP_KERNEL); | ||
| 1007 | if (unit == NULL) | ||
| 1008 | return -ENOMEM; | ||
| 1009 | |||
| 1010 | unit->id = buffer[3]; | ||
| 1011 | unit->type = buffer[2]; | ||
| 1012 | unit->selector.bNrInPins = buffer[4]; | ||
| 1013 | unit->selector.baSourceID = (__u8 *)unit + sizeof *unit; | ||
| 1014 | memcpy(unit->selector.baSourceID, &buffer[5], p); | ||
| 1015 | |||
| 1016 | if (buffer[5+p] != 0) | ||
| 1017 | usb_string(udev, buffer[5+p], unit->name, | ||
| 1018 | sizeof unit->name); | ||
| 1019 | else | ||
| 1020 | sprintf(unit->name, "Selector %u", buffer[3]); | ||
| 1021 | |||
| 1022 | list_add_tail(&unit->list, &dev->entities); | ||
| 1023 | break; | ||
| 1024 | |||
| 1025 | case VC_PROCESSING_UNIT: | ||
| 1026 | n = buflen >= 8 ? buffer[7] : 0; | ||
| 1027 | p = dev->uvc_version >= 0x0110 ? 10 : 9; | ||
| 1028 | |||
| 1029 | if (buflen < p + n) { | ||
| 1030 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 1031 | "interface %d PROCESSING_UNIT error\n", | ||
| 1032 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 1033 | return -EINVAL; | ||
| 1034 | } | ||
| 1035 | |||
| 1036 | unit = kzalloc(sizeof *unit + n, GFP_KERNEL); | ||
| 1037 | if (unit == NULL) | ||
| 1038 | return -ENOMEM; | ||
| 1039 | |||
| 1040 | unit->id = buffer[3]; | ||
| 1041 | unit->type = buffer[2]; | ||
| 1042 | unit->processing.bSourceID = buffer[4]; | ||
| 1043 | unit->processing.wMaxMultiplier = | ||
| 1044 | le16_to_cpup((__le16 *)&buffer[5]); | ||
| 1045 | unit->processing.bControlSize = buffer[7]; | ||
| 1046 | unit->processing.bmControls = (__u8 *)unit + sizeof *unit; | ||
| 1047 | memcpy(unit->processing.bmControls, &buffer[8], n); | ||
| 1048 | if (dev->uvc_version >= 0x0110) | ||
| 1049 | unit->processing.bmVideoStandards = buffer[9+n]; | ||
| 1050 | |||
| 1051 | if (buffer[8+n] != 0) | ||
| 1052 | usb_string(udev, buffer[8+n], unit->name, | ||
| 1053 | sizeof unit->name); | ||
| 1054 | else | ||
| 1055 | sprintf(unit->name, "Processing %u", buffer[3]); | ||
| 1056 | |||
| 1057 | list_add_tail(&unit->list, &dev->entities); | ||
| 1058 | break; | ||
| 1059 | |||
| 1060 | case VC_EXTENSION_UNIT: | ||
| 1061 | p = buflen >= 22 ? buffer[21] : 0; | ||
| 1062 | n = buflen >= 24 + p ? buffer[22+p] : 0; | ||
| 1063 | |||
| 1064 | if (buflen < 24 + p + n) { | ||
| 1065 | uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol " | ||
| 1066 | "interface %d EXTENSION_UNIT error\n", | ||
| 1067 | udev->devnum, alts->desc.bInterfaceNumber); | ||
| 1068 | return -EINVAL; | ||
| 1069 | } | ||
| 1070 | |||
| 1071 | unit = kzalloc(sizeof *unit + p + n, GFP_KERNEL); | ||
| 1072 | if (unit == NULL) | ||
| 1073 | return -ENOMEM; | ||
| 1074 | |||
| 1075 | unit->id = buffer[3]; | ||
| 1076 | unit->type = buffer[2]; | ||
| 1077 | memcpy(unit->extension.guidExtensionCode, &buffer[4], 16); | ||
| 1078 | unit->extension.bNumControls = buffer[20]; | ||
| 1079 | unit->extension.bNrInPins = | ||
| 1080 | le16_to_cpup((__le16 *)&buffer[21]); | ||
| 1081 | unit->extension.baSourceID = (__u8 *)unit + sizeof *unit; | ||
| 1082 | memcpy(unit->extension.baSourceID, &buffer[22], p); | ||
| 1083 | unit->extension.bControlSize = buffer[22+p]; | ||
| 1084 | unit->extension.bmControls = (__u8 *)unit + sizeof *unit + p; | ||
| 1085 | memcpy(unit->extension.bmControls, &buffer[23+p], n); | ||
| 1086 | |||
| 1087 | if (buffer[23+p+n] != 0) | ||
| 1088 | usb_string(udev, buffer[23+p+n], unit->name, | ||
| 1089 | sizeof unit->name); | ||
| 1090 | else | ||
| 1091 | sprintf(unit->name, "Extension %u", buffer[3]); | ||
| 1092 | |||
| 1093 | list_add_tail(&unit->list, &dev->entities); | ||
| 1094 | break; | ||
| 1095 | |||
| 1096 | default: | ||
| 1097 | uvc_trace(UVC_TRACE_DESCR, "Found an unknown CS_INTERFACE " | ||
| 1098 | "descriptor (%u)\n", buffer[2]); | ||
| 1099 | break; | ||
| 1100 | } | ||
| 1101 | |||
| 1102 | return 0; | ||
| 1103 | } | ||
| 1104 | |||
| 1105 | static int uvc_parse_control(struct uvc_device *dev) | ||
| 1106 | { | ||
| 1107 | struct usb_host_interface *alts = dev->intf->cur_altsetting; | ||
| 1108 | unsigned char *buffer = alts->extra; | ||
| 1109 | int buflen = alts->extralen; | ||
| 1110 | int ret; | ||
| 1111 | |||
| 1112 | /* Parse the default alternate setting only, as the UVC specification | ||
| 1113 | * defines a single alternate setting, the default alternate setting | ||
| 1114 | * zero. | ||
| 1115 | */ | ||
| 1116 | |||
| 1117 | while (buflen > 2) { | ||
| 1118 | if (uvc_parse_vendor_control(dev, buffer, buflen) || | ||
| 1119 | buffer[1] != USB_DT_CS_INTERFACE) | ||
| 1120 | goto next_descriptor; | ||
| 1121 | |||
| 1122 | if ((ret = uvc_parse_standard_control(dev, buffer, buflen)) < 0) | ||
| 1123 | return ret; | ||
| 1124 | |||
| 1125 | next_descriptor: | ||
| 1126 | buflen -= buffer[0]; | ||
| 1127 | buffer += buffer[0]; | ||
| 1128 | } | ||
| 1129 | |||
| 1130 | /* Check if the optional status endpoint is present. */ | ||
| 1131 | if (alts->desc.bNumEndpoints == 1) { | ||
| 1132 | struct usb_host_endpoint *ep = &alts->endpoint[0]; | ||
| 1133 | struct usb_endpoint_descriptor *desc = &ep->desc; | ||
| 1134 | |||
| 1135 | if (usb_endpoint_is_int_in(desc) && | ||
| 1136 | le16_to_cpu(desc->wMaxPacketSize) >= 8 && | ||
| 1137 | desc->bInterval != 0) { | ||
| 1138 | uvc_trace(UVC_TRACE_DESCR, "Found a Status endpoint " | ||
| 1139 | "(addr %02x).\n", desc->bEndpointAddress); | ||
| 1140 | dev->int_ep = ep; | ||
| 1141 | } | ||
| 1142 | } | ||
| 1143 | |||
| 1144 | return 0; | ||
| 1145 | } | ||
| 1146 | |||
| 1147 | /* ------------------------------------------------------------------------ | ||
| 1148 | * USB probe and disconnect | ||
| 1149 | */ | ||
| 1150 | |||
| 1151 | /* | ||
| 1152 | * Unregister the video devices. | ||
| 1153 | */ | ||
| 1154 | static void uvc_unregister_video(struct uvc_device *dev) | ||
| 1155 | { | ||
| 1156 | if (dev->video.vdev) { | ||
| 1157 | if (dev->video.vdev->minor == -1) | ||
| 1158 | video_device_release(dev->video.vdev); | ||
| 1159 | else | ||
| 1160 | video_unregister_device(dev->video.vdev); | ||
| 1161 | dev->video.vdev = NULL; | ||
| 1162 | } | ||
| 1163 | } | ||
| 1164 | |||
| 1165 | /* | ||
| 1166 | * Scan the UVC descriptors to locate a chain starting at an Output Terminal | ||
| 1167 | * and containing the following units: | ||
| 1168 | * | ||
| 1169 | * - a USB Streaming Output Terminal | ||
| 1170 | * - zero or one Processing Unit | ||
| 1171 | * - zero, one or mode single-input Selector Units | ||
| 1172 | * - zero or one multiple-input Selector Units, provided all inputs are | ||
| 1173 | * connected to input terminals | ||
| 1174 | * - zero, one or mode single-input Extension Units | ||
| 1175 | * - one Camera Input Terminal, or one or more External terminals. | ||
| 1176 | * | ||
| 1177 | * A side forward scan is made on each detected entity to check for additional | ||
| 1178 | * extension units. | ||
| 1179 | */ | ||
| 1180 | static int uvc_scan_chain_entity(struct uvc_video_device *video, | ||
| 1181 | struct uvc_entity *entity) | ||
| 1182 | { | ||
| 1183 | switch (UVC_ENTITY_TYPE(entity)) { | ||
| 1184 | case VC_EXTENSION_UNIT: | ||
| 1185 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1186 | printk(" <- XU %d", entity->id); | ||
| 1187 | |||
| 1188 | if (entity->extension.bNrInPins != 1) { | ||
| 1189 | uvc_trace(UVC_TRACE_DESCR, "Extension unit %d has more " | ||
| 1190 | "than 1 input pin.\n", entity->id); | ||
| 1191 | return -1; | ||
| 1192 | } | ||
| 1193 | |||
| 1194 | list_add_tail(&entity->chain, &video->extensions); | ||
| 1195 | break; | ||
| 1196 | |||
| 1197 | case VC_PROCESSING_UNIT: | ||
| 1198 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1199 | printk(" <- PU %d", entity->id); | ||
| 1200 | |||
| 1201 | if (video->processing != NULL) { | ||
| 1202 | uvc_trace(UVC_TRACE_DESCR, "Found multiple " | ||
| 1203 | "Processing Units in chain.\n"); | ||
| 1204 | return -1; | ||
| 1205 | } | ||
| 1206 | |||
| 1207 | video->processing = entity; | ||
| 1208 | break; | ||
| 1209 | |||
| 1210 | case VC_SELECTOR_UNIT: | ||
| 1211 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1212 | printk(" <- SU %d", entity->id); | ||
| 1213 | |||
| 1214 | /* Single-input selector units are ignored. */ | ||
| 1215 | if (entity->selector.bNrInPins == 1) | ||
| 1216 | break; | ||
| 1217 | |||
| 1218 | if (video->selector != NULL) { | ||
| 1219 | uvc_trace(UVC_TRACE_DESCR, "Found multiple Selector " | ||
| 1220 | "Units in chain.\n"); | ||
| 1221 | return -1; | ||
| 1222 | } | ||
| 1223 | |||
| 1224 | video->selector = entity; | ||
| 1225 | break; | ||
| 1226 | |||
| 1227 | case ITT_VENDOR_SPECIFIC: | ||
| 1228 | case ITT_CAMERA: | ||
| 1229 | case ITT_MEDIA_TRANSPORT_INPUT: | ||
| 1230 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1231 | printk(" <- IT %d\n", entity->id); | ||
| 1232 | |||
| 1233 | list_add_tail(&entity->chain, &video->iterms); | ||
| 1234 | break; | ||
| 1235 | |||
| 1236 | default: | ||
| 1237 | uvc_trace(UVC_TRACE_DESCR, "Unsupported entity type " | ||
| 1238 | "0x%04x found in chain.\n", UVC_ENTITY_TYPE(entity)); | ||
| 1239 | return -1; | ||
| 1240 | } | ||
| 1241 | |||
| 1242 | return 0; | ||
| 1243 | } | ||
| 1244 | |||
| 1245 | static int uvc_scan_chain_forward(struct uvc_video_device *video, | ||
| 1246 | struct uvc_entity *entity, struct uvc_entity *prev) | ||
| 1247 | { | ||
| 1248 | struct uvc_entity *forward; | ||
| 1249 | int found; | ||
| 1250 | |||
| 1251 | /* Forward scan */ | ||
| 1252 | forward = NULL; | ||
| 1253 | found = 0; | ||
| 1254 | |||
| 1255 | while (1) { | ||
| 1256 | forward = uvc_entity_by_reference(video->dev, entity->id, | ||
| 1257 | forward); | ||
| 1258 | if (forward == NULL) | ||
| 1259 | break; | ||
| 1260 | |||
| 1261 | if (UVC_ENTITY_TYPE(forward) != VC_EXTENSION_UNIT || | ||
| 1262 | forward == prev) | ||
| 1263 | continue; | ||
| 1264 | |||
| 1265 | if (forward->extension.bNrInPins != 1) { | ||
| 1266 | uvc_trace(UVC_TRACE_DESCR, "Extension unit %d has" | ||
| 1267 | "more than 1 input pin.\n", entity->id); | ||
| 1268 | return -1; | ||
| 1269 | } | ||
| 1270 | |||
| 1271 | list_add_tail(&forward->chain, &video->extensions); | ||
| 1272 | if (uvc_trace_param & UVC_TRACE_PROBE) { | ||
| 1273 | if (!found) | ||
| 1274 | printk(" (-> XU"); | ||
| 1275 | |||
| 1276 | printk(" %d", forward->id); | ||
| 1277 | found = 1; | ||
| 1278 | } | ||
| 1279 | } | ||
| 1280 | if (found) | ||
| 1281 | printk(")"); | ||
| 1282 | |||
| 1283 | return 0; | ||
| 1284 | } | ||
| 1285 | |||
| 1286 | static int uvc_scan_chain_backward(struct uvc_video_device *video, | ||
| 1287 | struct uvc_entity *entity) | ||
| 1288 | { | ||
| 1289 | struct uvc_entity *term; | ||
| 1290 | int id = -1, i; | ||
| 1291 | |||
| 1292 | switch (UVC_ENTITY_TYPE(entity)) { | ||
| 1293 | case VC_EXTENSION_UNIT: | ||
| 1294 | id = entity->extension.baSourceID[0]; | ||
| 1295 | break; | ||
| 1296 | |||
| 1297 | case VC_PROCESSING_UNIT: | ||
| 1298 | id = entity->processing.bSourceID; | ||
| 1299 | break; | ||
| 1300 | |||
| 1301 | case VC_SELECTOR_UNIT: | ||
| 1302 | /* Single-input selector units are ignored. */ | ||
| 1303 | if (entity->selector.bNrInPins == 1) { | ||
| 1304 | id = entity->selector.baSourceID[0]; | ||
| 1305 | break; | ||
| 1306 | } | ||
| 1307 | |||
| 1308 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1309 | printk(" <- IT"); | ||
| 1310 | |||
| 1311 | video->selector = entity; | ||
| 1312 | for (i = 0; i < entity->selector.bNrInPins; ++i) { | ||
| 1313 | id = entity->selector.baSourceID[i]; | ||
| 1314 | term = uvc_entity_by_id(video->dev, id); | ||
| 1315 | if (term == NULL || !UVC_ENTITY_IS_ITERM(term)) { | ||
| 1316 | uvc_trace(UVC_TRACE_DESCR, "Selector unit %d " | ||
| 1317 | "input %d isn't connected to an " | ||
| 1318 | "input terminal\n", entity->id, i); | ||
| 1319 | return -1; | ||
| 1320 | } | ||
| 1321 | |||
| 1322 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1323 | printk(" %d", term->id); | ||
| 1324 | |||
| 1325 | list_add_tail(&term->chain, &video->iterms); | ||
| 1326 | uvc_scan_chain_forward(video, term, entity); | ||
| 1327 | } | ||
| 1328 | |||
| 1329 | if (uvc_trace_param & UVC_TRACE_PROBE) | ||
| 1330 | printk("\n"); | ||
| 1331 | |||
| 1332 | id = 0; | ||
| 1333 | break; | ||
| 1334 | } | ||
| 1335 | |||
| 1336 | return id; | ||
| 1337 | } | ||
| 1338 | |||
| 1339 | static int uvc_scan_chain(struct uvc_video_device *video) | ||
| 1340 | { | ||
| 1341 | struct uvc_entity *entity, *prev; | ||
| 1342 | int id; | ||
| 1343 | |||
| 1344 | entity = video->oterm; | ||
| 1345 | uvc_trace(UVC_TRACE_PROBE, "Scanning UVC chain: OT %d", entity->id); | ||
| 1346 | id = entity->output.bSourceID; | ||
| 1347 | while (id != 0) { | ||
| 1348 | prev = entity; | ||
| 1349 | entity = uvc_entity_by_id(video->dev, id); | ||
| 1350 | if (entity == NULL) { | ||
| 1351 | uvc_trace(UVC_TRACE_DESCR, "Found reference to " | ||
| 1352 | "unknown entity %d.\n", id); | ||
| 1353 | return -1; | ||
| 1354 | } | ||
| 1355 | |||
| 1356 | /* Process entity */ | ||
| 1357 | if (uvc_scan_chain_entity(video, entity) < 0) | ||
| 1358 | return -1; | ||
| 1359 | |||
| 1360 | /* Forward scan */ | ||
| 1361 | if (uvc_scan_chain_forward(video, entity, prev) < 0) | ||
| 1362 | return -1; | ||
| 1363 | |||
| 1364 | /* Stop when a terminal is found. */ | ||
| 1365 | if (!UVC_ENTITY_IS_UNIT(entity)) | ||
| 1366 | break; | ||
| 1367 | |||
| 1368 | /* Backward scan */ | ||
| 1369 | id = uvc_scan_chain_backward(video, entity); | ||
| 1370 | if (id < 0) | ||
| 1371 | return id; | ||
| 1372 | } | ||
| 1373 | |||
| 1374 | /* Initialize the video buffers queue. */ | ||
| 1375 | uvc_queue_init(&video->queue); | ||
| 1376 | |||
| 1377 | return 0; | ||
| 1378 | } | ||
| 1379 | |||
| 1380 | /* | ||
| 1381 | * Register the video devices. | ||
| 1382 | * | ||
| 1383 | * The driver currently supports a single video device per control interface | ||
| 1384 | * only. The terminal and units must match the following structure: | ||
| 1385 | * | ||
| 1386 | * ITT_CAMERA -> VC_PROCESSING_UNIT -> VC_EXTENSION_UNIT{0,n} -> TT_STREAMING | ||
| 1387 | * | ||
| 1388 | * The Extension Units, if present, must have a single input pin. The | ||
| 1389 | * Processing Unit and Extension Units can be in any order. Additional | ||
| 1390 | * Extension Units connected to the main chain as single-unit branches are | ||
| 1391 | * also supported. | ||
| 1392 | */ | ||
| 1393 | static int uvc_register_video(struct uvc_device *dev) | ||
| 1394 | { | ||
| 1395 | struct video_device *vdev; | ||
| 1396 | struct uvc_entity *term; | ||
| 1397 | int found = 0, ret; | ||
| 1398 | |||
| 1399 | /* Check if the control interface matches the structure we expect. */ | ||
| 1400 | list_for_each_entry(term, &dev->entities, list) { | ||
| 1401 | struct uvc_streaming *streaming; | ||
| 1402 | |||
| 1403 | if (UVC_ENTITY_TYPE(term) != TT_STREAMING) | ||
| 1404 | continue; | ||
| 1405 | |||
| 1406 | memset(&dev->video, 0, sizeof dev->video); | ||
| 1407 | mutex_init(&dev->video.ctrl_mutex); | ||
| 1408 | INIT_LIST_HEAD(&dev->video.iterms); | ||
| 1409 | INIT_LIST_HEAD(&dev->video.extensions); | ||
| 1410 | dev->video.oterm = term; | ||
| 1411 | dev->video.dev = dev; | ||
| 1412 | if (uvc_scan_chain(&dev->video) < 0) | ||
| 1413 | continue; | ||
| 1414 | |||
| 1415 | list_for_each_entry(streaming, &dev->streaming, list) { | ||
| 1416 | if (streaming->header.bTerminalLink == term->id) { | ||
| 1417 | dev->video.streaming = streaming; | ||
| 1418 | found = 1; | ||
| 1419 | break; | ||
| 1420 | } | ||
| 1421 | } | ||
| 1422 | |||
| 1423 | if (found) | ||
| 1424 | break; | ||
| 1425 | } | ||
| 1426 | |||
| 1427 | if (!found) { | ||
| 1428 | uvc_printk(KERN_INFO, "No valid video chain found.\n"); | ||
| 1429 | return -1; | ||
| 1430 | } | ||
| 1431 | |||
| 1432 | if (uvc_trace_param & UVC_TRACE_PROBE) { | ||
| 1433 | uvc_printk(KERN_INFO, "Found a valid video chain ("); | ||
| 1434 | list_for_each_entry(term, &dev->video.iterms, chain) { | ||
| 1435 | printk("%d", term->id); | ||
| 1436 | if (term->chain.next != &dev->video.iterms) | ||
| 1437 | printk(","); | ||
| 1438 | } | ||
| 1439 | printk(" -> %d).\n", dev->video.oterm->id); | ||
| 1440 | } | ||
| 1441 | |||
| 1442 | /* Initialize the streaming interface with default streaming | ||
| 1443 | * parameters. | ||
| 1444 | */ | ||
| 1445 | if ((ret = uvc_video_init(&dev->video)) < 0) { | ||
| 1446 | uvc_printk(KERN_ERR, "Failed to initialize the device " | ||
| 1447 | "(%d).\n", ret); | ||
| 1448 | return ret; | ||
| 1449 | } | ||
| 1450 | |||
| 1451 | /* Register the device with V4L. */ | ||
| 1452 | vdev = video_device_alloc(); | ||
| 1453 | if (vdev == NULL) | ||
| 1454 | return -1; | ||
| 1455 | |||
| 1456 | /* We already hold a reference to dev->udev. The video device will be | ||
| 1457 | * unregistered before the reference is released, so we don't need to | ||
| 1458 | * get another one. | ||
| 1459 | */ | ||
| 1460 | vdev->dev = &dev->intf->dev; | ||
| 1461 | vdev->type = 0; | ||
| 1462 | vdev->type2 = 0; | ||
| 1463 | vdev->minor = -1; | ||
| 1464 | vdev->fops = &uvc_fops; | ||
| 1465 | vdev->release = video_device_release; | ||
| 1466 | strncpy(vdev->name, dev->name, sizeof vdev->name); | ||
| 1467 | |||
| 1468 | /* Set the driver data before calling video_register_device, otherwise | ||
| 1469 | * uvc_v4l2_open might race us. | ||
| 1470 | * | ||
| 1471 | * FIXME: usb_set_intfdata hasn't been called so far. Is that a | ||
| 1472 | * problem ? Does any function which could be called here get | ||
| 1473 | * a pointer to the usb_interface ? | ||
| 1474 | */ | ||
| 1475 | dev->video.vdev = vdev; | ||
| 1476 | video_set_drvdata(vdev, &dev->video); | ||
| 1477 | |||
| 1478 | if (video_register_device(vdev, VFL_TYPE_GRABBER, -1) < 0) { | ||
| 1479 | dev->video.vdev = NULL; | ||
| 1480 | video_device_release(vdev); | ||
| 1481 | return -1; | ||
| 1482 | } | ||
| 1483 | |||
| 1484 | return 0; | ||
| 1485 | } | ||
| 1486 | |||
| 1487 | /* | ||
| 1488 | * Delete the UVC device. | ||
| 1489 | * | ||
| 1490 | * Called by the kernel when the last reference to the uvc_device structure | ||
| 1491 | * is released. | ||
| 1492 | * | ||
| 1493 | * Unregistering the video devices is done here because every opened instance | ||
| 1494 | * must be closed before the device can be unregistered. An alternative would | ||
| 1495 | * have been to use another reference count for uvc_v4l2_open/uvc_release, and | ||
| 1496 | * unregister the video devices on disconnect when that reference count drops | ||
| 1497 | * to zero. | ||
| 1498 | * | ||
| 1499 | * As this function is called after or during disconnect(), all URBs have | ||
| 1500 | * already been canceled by the USB core. There is no need to kill the | ||
| 1501 | * interrupt URB manually. | ||
| 1502 | */ | ||
| 1503 | void uvc_delete(struct kref *kref) | ||
| 1504 | { | ||
| 1505 | struct uvc_device *dev = container_of(kref, struct uvc_device, kref); | ||
| 1506 | struct list_head *p, *n; | ||
| 1507 | |||
| 1508 | /* Unregister the video device */ | ||
| 1509 | uvc_unregister_video(dev); | ||
| 1510 | usb_put_intf(dev->intf); | ||
| 1511 | usb_put_dev(dev->udev); | ||
| 1512 | |||
| 1513 | uvc_status_cleanup(dev); | ||
| 1514 | uvc_ctrl_cleanup_device(dev); | ||
| 1515 | |||
| 1516 | list_for_each_safe(p, n, &dev->entities) { | ||
| 1517 | struct uvc_entity *entity; | ||
| 1518 | entity = list_entry(p, struct uvc_entity, list); | ||
| 1519 | kfree(entity); | ||
| 1520 | } | ||
| 1521 | |||
| 1522 | list_for_each_safe(p, n, &dev->streaming) { | ||
| 1523 | struct uvc_streaming *streaming; | ||
| 1524 | streaming = list_entry(p, struct uvc_streaming, list); | ||
| 1525 | usb_driver_release_interface(&uvc_driver.driver, | ||
| 1526 | streaming->intf); | ||
| 1527 | usb_put_intf(streaming->intf); | ||
| 1528 | kfree(streaming->format); | ||
| 1529 | kfree(streaming->header.bmaControls); | ||
| 1530 | kfree(streaming); | ||
| 1531 | } | ||
| 1532 | |||
| 1533 | kfree(dev); | ||
| 1534 | } | ||
| 1535 | |||
| 1536 | static int uvc_probe(struct usb_interface *intf, | ||
| 1537 | const struct usb_device_id *id) | ||
| 1538 | { | ||
| 1539 | struct usb_device *udev = interface_to_usbdev(intf); | ||
| 1540 | struct uvc_device *dev; | ||
| 1541 | int ret; | ||
| 1542 | |||
| 1543 | if (id->idVendor && id->idProduct) | ||
| 1544 | uvc_trace(UVC_TRACE_PROBE, "Probing known UVC device %s " | ||
| 1545 | "(%04x:%04x)\n", udev->devpath, id->idVendor, | ||
| 1546 | id->idProduct); | ||
| 1547 | else | ||
| 1548 | uvc_trace(UVC_TRACE_PROBE, "Probing generic UVC device %s\n", | ||
| 1549 | udev->devpath); | ||
| 1550 | |||
| 1551 | /* Allocate memory for the device and initialize it */ | ||
| 1552 | if ((dev = kzalloc(sizeof *dev, GFP_KERNEL)) == NULL) | ||
| 1553 | return -ENOMEM; | ||
| 1554 | |||
| 1555 | INIT_LIST_HEAD(&dev->entities); | ||
| 1556 | INIT_LIST_HEAD(&dev->streaming); | ||
| 1557 | kref_init(&dev->kref); | ||
| 1558 | |||
| 1559 | dev->udev = usb_get_dev(udev); | ||
| 1560 | dev->intf = usb_get_intf(intf); | ||
| 1561 | dev->intfnum = intf->cur_altsetting->desc.bInterfaceNumber; | ||
| 1562 | dev->quirks = id->driver_info | uvc_quirks_param; | ||
| 1563 | |||
| 1564 | if (udev->product != NULL) | ||
| 1565 | strncpy(dev->name, udev->product, sizeof dev->name); | ||
| 1566 | else | ||
| 1567 | snprintf(dev->name, sizeof dev->name, | ||
| 1568 | "UVC Camera (%04x:%04x)", | ||
| 1569 | le16_to_cpu(udev->descriptor.idVendor), | ||
| 1570 | le16_to_cpu(udev->descriptor.idProduct)); | ||
| 1571 | |||
| 1572 | /* Parse the Video Class control descriptor */ | ||
| 1573 | if (uvc_parse_control(dev) < 0) { | ||
| 1574 | uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC " | ||
| 1575 | "descriptors.\n"); | ||
| 1576 | goto error; | ||
| 1577 | } | ||
| 1578 | |||
| 1579 | uvc_printk(KERN_INFO, "Found UVC %u.%02u device %s (%04x:%04x)\n", | ||
| 1580 | dev->uvc_version >> 8, dev->uvc_version & 0xff, | ||
| 1581 | udev->product ? udev->product : "<unnamed>", | ||
| 1582 | le16_to_cpu(udev->descriptor.idVendor), | ||
| 1583 | le16_to_cpu(udev->descriptor.idProduct)); | ||
| 1584 | |||
| 1585 | if (uvc_quirks_param != 0) { | ||
| 1586 | uvc_printk(KERN_INFO, "Forcing device quirks 0x%x by module " | ||
| 1587 | "parameter for testing purpose.\n", uvc_quirks_param); | ||
| 1588 | uvc_printk(KERN_INFO, "Please report required quirks to the " | ||
| 1589 | "linux-uvc-devel mailing list.\n"); | ||
| 1590 | } | ||
| 1591 | |||
| 1592 | /* Initialize controls */ | ||
| 1593 | if (uvc_ctrl_init_device(dev) < 0) | ||
| 1594 | goto error; | ||
| 1595 | |||
| 1596 | /* Register the video devices */ | ||
| 1597 | if (uvc_register_video(dev) < 0) | ||
| 1598 | goto error; | ||
| 1599 | |||
| 1600 | /* Save our data pointer in the interface data */ | ||
| 1601 | usb_set_intfdata(intf, dev); | ||
| 1602 | |||
| 1603 | /* Initialize the interrupt URB */ | ||
| 1604 | if ((ret = uvc_status_init(dev)) < 0) { | ||
| 1605 | uvc_printk(KERN_INFO, "Unable to initialize the status " | ||
| 1606 | "endpoint (%d), status interrupt will not be " | ||
| 1607 | "supported.\n", ret); | ||
| 1608 | } | ||
| 1609 | |||
| 1610 | uvc_trace(UVC_TRACE_PROBE, "UVC device initialized.\n"); | ||
| 1611 | return 0; | ||
| 1612 | |||
| 1613 | error: | ||
| 1614 | kref_put(&dev->kref, uvc_delete); | ||
| 1615 | return -ENODEV; | ||
| 1616 | } | ||
| 1617 | |||
| 1618 | static void uvc_disconnect(struct usb_interface *intf) | ||
| 1619 | { | ||
| 1620 | struct uvc_device *dev = usb_get_intfdata(intf); | ||
| 1621 | |||
| 1622 | /* Set the USB interface data to NULL. This can be done outside the | ||
| 1623 | * lock, as there's no other reader. | ||
| 1624 | */ | ||
| 1625 | usb_set_intfdata(intf, NULL); | ||
| 1626 | |||
| 1627 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOSTREAMING) | ||
| 1628 | return; | ||
| 1629 | |||
| 1630 | /* uvc_v4l2_open() might race uvc_disconnect(). A static driver-wide | ||
| 1631 | * lock is needed to prevent uvc_disconnect from releasing its | ||
| 1632 | * reference to the uvc_device instance after uvc_v4l2_open() received | ||
| 1633 | * the pointer to the device (video_devdata) but before it got the | ||
| 1634 | * chance to increase the reference count (kref_get). | ||
| 1635 | */ | ||
| 1636 | mutex_lock(&uvc_driver.open_mutex); | ||
| 1637 | |||
| 1638 | dev->state |= UVC_DEV_DISCONNECTED; | ||
| 1639 | kref_put(&dev->kref, uvc_delete); | ||
| 1640 | |||
| 1641 | mutex_unlock(&uvc_driver.open_mutex); | ||
| 1642 | } | ||
| 1643 | |||
| 1644 | static int uvc_suspend(struct usb_interface *intf, pm_message_t message) | ||
| 1645 | { | ||
| 1646 | struct uvc_device *dev = usb_get_intfdata(intf); | ||
| 1647 | |||
| 1648 | uvc_trace(UVC_TRACE_SUSPEND, "Suspending interface %u\n", | ||
| 1649 | intf->cur_altsetting->desc.bInterfaceNumber); | ||
| 1650 | |||
| 1651 | /* Controls are cached on the fly so they don't need to be saved. */ | ||
| 1652 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) | ||
| 1653 | return uvc_status_suspend(dev); | ||
| 1654 | |||
| 1655 | if (dev->video.streaming->intf != intf) { | ||
| 1656 | uvc_trace(UVC_TRACE_SUSPEND, "Suspend: video streaming USB " | ||
| 1657 | "interface mismatch.\n"); | ||
| 1658 | return -EINVAL; | ||
| 1659 | } | ||
| 1660 | |||
| 1661 | return uvc_video_suspend(&dev->video); | ||
| 1662 | } | ||
| 1663 | |||
| 1664 | static int uvc_resume(struct usb_interface *intf) | ||
| 1665 | { | ||
| 1666 | struct uvc_device *dev = usb_get_intfdata(intf); | ||
| 1667 | int ret; | ||
| 1668 | |||
| 1669 | uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n", | ||
| 1670 | intf->cur_altsetting->desc.bInterfaceNumber); | ||
| 1671 | |||
| 1672 | if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) { | ||
| 1673 | if ((ret = uvc_ctrl_resume_device(dev)) < 0) | ||
| 1674 | return ret; | ||
| 1675 | |||
| 1676 | return uvc_status_resume(dev); | ||
| 1677 | } | ||
| 1678 | |||
| 1679 | if (dev->video.streaming->intf != intf) { | ||
| 1680 | uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB " | ||
| 1681 | "interface mismatch.\n"); | ||
| 1682 | return -EINVAL; | ||
| 1683 | } | ||
| 1684 | |||
| 1685 | return uvc_video_resume(&dev->video); | ||
| 1686 | } | ||
| 1687 | |||
| 1688 | /* ------------------------------------------------------------------------ | ||
| 1689 | * Driver initialization and cleanup | ||
| 1690 | */ | ||
| 1691 | |||
| 1692 | /* | ||
| 1693 | * The Logitech cameras listed below have their interface class set to | ||
| 1694 | * VENDOR_SPEC because they don't announce themselves as UVC devices, even | ||
| 1695 | * though they are compliant. | ||
| 1696 | */ | ||
| 1697 | static struct usb_device_id uvc_ids[] = { | ||
| 1698 | /* ALi M5606 (Clevo M540SR) */ | ||
| 1699 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1700 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1701 | .idVendor = 0x0402, | ||
| 1702 | .idProduct = 0x5606, | ||
| 1703 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1704 | .bInterfaceSubClass = 1, | ||
| 1705 | .bInterfaceProtocol = 0, | ||
| 1706 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1707 | /* Creative Live! Optia */ | ||
| 1708 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1709 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1710 | .idVendor = 0x041e, | ||
| 1711 | .idProduct = 0x4057, | ||
| 1712 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1713 | .bInterfaceSubClass = 1, | ||
| 1714 | .bInterfaceProtocol = 0, | ||
| 1715 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1716 | /* Microsoft Lifecam NX-6000 */ | ||
| 1717 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1718 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1719 | .idVendor = 0x045e, | ||
| 1720 | .idProduct = 0x00f8, | ||
| 1721 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1722 | .bInterfaceSubClass = 1, | ||
| 1723 | .bInterfaceProtocol = 0, | ||
| 1724 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1725 | /* Microsoft Lifecam VX-7000 */ | ||
| 1726 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1727 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1728 | .idVendor = 0x045e, | ||
| 1729 | .idProduct = 0x0723, | ||
| 1730 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1731 | .bInterfaceSubClass = 1, | ||
| 1732 | .bInterfaceProtocol = 0, | ||
| 1733 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1734 | /* Logitech Quickcam Fusion */ | ||
| 1735 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1736 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1737 | .idVendor = 0x046d, | ||
| 1738 | .idProduct = 0x08c1, | ||
| 1739 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1740 | .bInterfaceSubClass = 1, | ||
| 1741 | .bInterfaceProtocol = 0 }, | ||
| 1742 | /* Logitech Quickcam Orbit MP */ | ||
| 1743 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1744 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1745 | .idVendor = 0x046d, | ||
| 1746 | .idProduct = 0x08c2, | ||
| 1747 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1748 | .bInterfaceSubClass = 1, | ||
| 1749 | .bInterfaceProtocol = 0 }, | ||
| 1750 | /* Logitech Quickcam Pro for Notebook */ | ||
| 1751 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1752 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1753 | .idVendor = 0x046d, | ||
| 1754 | .idProduct = 0x08c3, | ||
| 1755 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1756 | .bInterfaceSubClass = 1, | ||
| 1757 | .bInterfaceProtocol = 0 }, | ||
| 1758 | /* Logitech Quickcam Pro 5000 */ | ||
| 1759 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1760 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1761 | .idVendor = 0x046d, | ||
| 1762 | .idProduct = 0x08c5, | ||
| 1763 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1764 | .bInterfaceSubClass = 1, | ||
| 1765 | .bInterfaceProtocol = 0 }, | ||
| 1766 | /* Logitech Quickcam OEM Dell Notebook */ | ||
| 1767 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1768 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1769 | .idVendor = 0x046d, | ||
| 1770 | .idProduct = 0x08c6, | ||
| 1771 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1772 | .bInterfaceSubClass = 1, | ||
| 1773 | .bInterfaceProtocol = 0 }, | ||
| 1774 | /* Logitech Quickcam OEM Cisco VT Camera II */ | ||
| 1775 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1776 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1777 | .idVendor = 0x046d, | ||
| 1778 | .idProduct = 0x08c7, | ||
| 1779 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC, | ||
| 1780 | .bInterfaceSubClass = 1, | ||
| 1781 | .bInterfaceProtocol = 0 }, | ||
| 1782 | /* Apple Built-In iSight */ | ||
| 1783 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1784 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1785 | .idVendor = 0x05ac, | ||
| 1786 | .idProduct = 0x8501, | ||
| 1787 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1788 | .bInterfaceSubClass = 1, | ||
| 1789 | .bInterfaceProtocol = 0, | ||
| 1790 | .driver_info = UVC_QUIRK_PROBE_MINMAX | ||
| 1791 | | UVC_QUIRK_BUILTIN_ISIGHT }, | ||
| 1792 | /* Genesys Logic USB 2.0 PC Camera */ | ||
| 1793 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1794 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1795 | .idVendor = 0x05e3, | ||
| 1796 | .idProduct = 0x0505, | ||
| 1797 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1798 | .bInterfaceSubClass = 1, | ||
| 1799 | .bInterfaceProtocol = 0, | ||
| 1800 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, | ||
| 1801 | /* Silicon Motion SM371 */ | ||
| 1802 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1803 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1804 | .idVendor = 0x090c, | ||
| 1805 | .idProduct = 0xb371, | ||
| 1806 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1807 | .bInterfaceSubClass = 1, | ||
| 1808 | .bInterfaceProtocol = 0, | ||
| 1809 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1810 | /* MT6227 */ | ||
| 1811 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1812 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1813 | .idVendor = 0x0e8d, | ||
| 1814 | .idProduct = 0x0004, | ||
| 1815 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1816 | .bInterfaceSubClass = 1, | ||
| 1817 | .bInterfaceProtocol = 0, | ||
| 1818 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1819 | /* Syntek (HP Spartan) */ | ||
| 1820 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1821 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1822 | .idVendor = 0x174f, | ||
| 1823 | .idProduct = 0x5212, | ||
| 1824 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1825 | .bInterfaceSubClass = 1, | ||
| 1826 | .bInterfaceProtocol = 0, | ||
| 1827 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, | ||
| 1828 | /* Syntek (Asus U3S) */ | ||
| 1829 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1830 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1831 | .idVendor = 0x174f, | ||
| 1832 | .idProduct = 0x8a33, | ||
| 1833 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1834 | .bInterfaceSubClass = 1, | ||
| 1835 | .bInterfaceProtocol = 0, | ||
| 1836 | .driver_info = UVC_QUIRK_STREAM_NO_FID }, | ||
| 1837 | /* Ecamm Pico iMage */ | ||
| 1838 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1839 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1840 | .idVendor = 0x18cd, | ||
| 1841 | .idProduct = 0xcafe, | ||
| 1842 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1843 | .bInterfaceSubClass = 1, | ||
| 1844 | .bInterfaceProtocol = 0, | ||
| 1845 | .driver_info = UVC_QUIRK_PROBE_EXTRAFIELDS }, | ||
| 1846 | /* Bodelin ProScopeHR */ | ||
| 1847 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1848 | | USB_DEVICE_ID_MATCH_DEV_HI | ||
| 1849 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1850 | .idVendor = 0x19ab, | ||
| 1851 | .idProduct = 0x1000, | ||
| 1852 | .bcdDevice_hi = 0x0126, | ||
| 1853 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1854 | .bInterfaceSubClass = 1, | ||
| 1855 | .bInterfaceProtocol = 0, | ||
| 1856 | .driver_info = UVC_QUIRK_STATUS_INTERVAL }, | ||
| 1857 | /* SiGma Micro USB Web Camera */ | ||
| 1858 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1859 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1860 | .idVendor = 0x1c4f, | ||
| 1861 | .idProduct = 0x3000, | ||
| 1862 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1863 | .bInterfaceSubClass = 1, | ||
| 1864 | .bInterfaceProtocol = 0, | ||
| 1865 | .driver_info = UVC_QUIRK_PROBE_MINMAX | ||
| 1866 | | UVC_QUIRK_IGNORE_SELECTOR_UNIT}, | ||
| 1867 | /* Acer OEM Webcam - Unknown vendor */ | ||
| 1868 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1869 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1870 | .idVendor = 0x5986, | ||
| 1871 | .idProduct = 0x0100, | ||
| 1872 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1873 | .bInterfaceSubClass = 1, | ||
| 1874 | .bInterfaceProtocol = 0, | ||
| 1875 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1876 | /* Packard Bell OEM Webcam */ | ||
| 1877 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1878 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1879 | .idVendor = 0x5986, | ||
| 1880 | .idProduct = 0x0101, | ||
| 1881 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1882 | .bInterfaceSubClass = 1, | ||
| 1883 | .bInterfaceProtocol = 0, | ||
| 1884 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1885 | /* Acer Crystal Eye webcam */ | ||
| 1886 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1887 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1888 | .idVendor = 0x5986, | ||
| 1889 | .idProduct = 0x0102, | ||
| 1890 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1891 | .bInterfaceSubClass = 1, | ||
| 1892 | .bInterfaceProtocol = 0, | ||
| 1893 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1894 | /* Acer OrbiCam - Unknown vendor */ | ||
| 1895 | { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | ||
| 1896 | | USB_DEVICE_ID_MATCH_INT_INFO, | ||
| 1897 | .idVendor = 0x5986, | ||
| 1898 | .idProduct = 0x0200, | ||
| 1899 | .bInterfaceClass = USB_CLASS_VIDEO, | ||
| 1900 | .bInterfaceSubClass = 1, | ||
| 1901 | .bInterfaceProtocol = 0, | ||
| 1902 | .driver_info = UVC_QUIRK_PROBE_MINMAX }, | ||
| 1903 | /* Generic USB Video Class */ | ||
| 1904 | { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) }, | ||
| 1905 | {} | ||
| 1906 | }; | ||
| 1907 | |||
| 1908 | MODULE_DEVICE_TABLE(usb, uvc_ids); | ||
| 1909 | |||
| 1910 | struct uvc_driver uvc_driver = { | ||
| 1911 | .driver = { | ||
| 1912 | .name = "uvcvideo", | ||
| 1913 | .probe = uvc_probe, | ||
| 1914 | .disconnect = uvc_disconnect, | ||
| 1915 | .suspend = uvc_suspend, | ||
| 1916 | .resume = uvc_resume, | ||
| 1917 | .id_table = uvc_ids, | ||
| 1918 | .supports_autosuspend = 1, | ||
| 1919 | }, | ||
| 1920 | }; | ||
| 1921 | |||
| 1922 | static int __init uvc_init(void) | ||
| 1923 | { | ||
| 1924 | int result; | ||
| 1925 | |||
| 1926 | INIT_LIST_HEAD(&uvc_driver.devices); | ||
| 1927 | INIT_LIST_HEAD(&uvc_driver.controls); | ||
| 1928 | mutex_init(&uvc_driver.open_mutex); | ||
| 1929 | mutex_init(&uvc_driver.ctrl_mutex); | ||
| 1930 | |||
| 1931 | uvc_ctrl_init(); | ||
| 1932 | |||
| 1933 | result = usb_register(&uvc_driver.driver); | ||
| 1934 | if (result == 0) | ||
| 1935 | printk(KERN_INFO DRIVER_DESC " (" DRIVER_VERSION ")\n"); | ||
| 1936 | return result; | ||
| 1937 | } | ||
| 1938 | |||
| 1939 | static void __exit uvc_cleanup(void) | ||
| 1940 | { | ||
| 1941 | usb_deregister(&uvc_driver.driver); | ||
| 1942 | } | ||
| 1943 | |||
| 1944 | module_init(uvc_init); | ||
| 1945 | module_exit(uvc_cleanup); | ||
| 1946 | |||
| 1947 | module_param_named(quirks, uvc_quirks_param, uint, S_IRUGO|S_IWUSR); | ||
| 1948 | MODULE_PARM_DESC(quirks, "Forced device quirks"); | ||
| 1949 | module_param_named(trace, uvc_trace_param, uint, S_IRUGO|S_IWUSR); | ||
| 1950 | MODULE_PARM_DESC(trace, "Trace level bitmask"); | ||
| 1951 | |||
| 1952 | MODULE_AUTHOR(DRIVER_AUTHOR); | ||
| 1953 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
| 1954 | MODULE_LICENSE("GPL"); | ||
| 1955 | MODULE_VERSION(DRIVER_VERSION); | ||
diff --git a/drivers/media/video/uvc/uvc_isight.c b/drivers/media/video/uvc/uvc_isight.c new file mode 100644 index 000000000000..37bdefdbead5 --- /dev/null +++ b/drivers/media/video/uvc/uvc_isight.c | |||
| @@ -0,0 +1,134 @@ | |||
| 1 | /* | ||
| 2 | * uvc_isight.c -- USB Video Class driver - iSight support | ||
| 3 | * | ||
| 4 | * Copyright (C) 2006-2007 | ||
| 5 | * Ivan N. Zlatev <contact@i-nz.net> | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/usb.h> | ||
| 15 | #include <linux/kernel.h> | ||
| 16 | #include <linux/mm.h> | ||
| 17 | |||
| 18 | #include "uvcvideo.h" | ||
| 19 | |||
| 20 | /* Built-in iSight webcams implements most of UVC 1.0 except a | ||
| 21 | * different packet format. Instead of sending a header at the | ||
| 22 | * beginning of each isochronous transfer payload, the webcam sends a | ||
| 23 | * single header per image (on its own in a packet), followed by | ||
| 24 | * packets containing data only. | ||
| 25 | * | ||
| 26 | * Offset Size (bytes) Description | ||
| 27 | * ------------------------------------------------------------------ | ||
| 28 | * 0x00 1 Header length | ||
| 29 | * 0x01 1 Flags (UVC-compliant) | ||
| 30 | * 0x02 4 Always equal to '11223344' | ||
| 31 | * 0x06 8 Always equal to 'deadbeefdeadface' | ||
| 32 | * 0x0e 16 Unknown | ||
| 33 | * | ||
| 34 | * The header can be prefixed by an optional, unknown-purpose byte. | ||
| 35 | */ | ||
| 36 | |||
| 37 | static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, | ||
| 38 | const __u8 *data, unsigned int len) | ||
| 39 | { | ||
| 40 | static const __u8 hdr[] = { | ||
| 41 | 0x11, 0x22, 0x33, 0x44, | ||
| 42 | 0xde, 0xad, 0xbe, 0xef, | ||
| 43 | 0xde, 0xad, 0xfa, 0xce | ||
| 44 | }; | ||
| 45 | |||
| 46 | unsigned int maxlen, nbytes; | ||
| 47 | __u8 *mem; | ||
| 48 | int is_header = 0; | ||
| 49 | |||
| 50 | if (buf == NULL) | ||
| 51 | return 0; | ||
| 52 | |||
| 53 | if ((len >= 14 && memcmp(&data[2], hdr, 12) == 0) || | ||
| 54 | (len >= 15 && memcmp(&data[3], hdr, 12) == 0)) { | ||
| 55 | uvc_trace(UVC_TRACE_FRAME, "iSight header found\n"); | ||
| 56 | is_header = 1; | ||
| 57 | } | ||
| 58 | |||
| 59 | /* Synchronize to the input stream by waiting for a header packet. */ | ||
| 60 | if (buf->state != UVC_BUF_STATE_ACTIVE) { | ||
| 61 | if (!is_header) { | ||
| 62 | uvc_trace(UVC_TRACE_FRAME, "Dropping packet (out of " | ||
| 63 | "sync).\n"); | ||
| 64 | return 0; | ||
| 65 | } | ||
| 66 | |||
| 67 | buf->state = UVC_BUF_STATE_ACTIVE; | ||
| 68 | } | ||
| 69 | |||
| 70 | /* Mark the buffer as done if we're at the beginning of a new frame. | ||
| 71 | * | ||
| 72 | * Empty buffers (bytesused == 0) don't trigger end of frame detection | ||
| 73 | * as it doesn't make sense to return an empty buffer. | ||
| 74 | */ | ||
| 75 | if (is_header && buf->buf.bytesused != 0) { | ||
| 76 | buf->state = UVC_BUF_STATE_DONE; | ||
| 77 | return -EAGAIN; | ||
| 78 | } | ||
| 79 | |||
| 80 | /* Copy the video data to the buffer. Skip header packets, as they | ||
| 81 | * contain no data. | ||
| 82 | */ | ||
| 83 | if (!is_header) { | ||
| 84 | maxlen = buf->buf.length - buf->buf.bytesused; | ||
| 85 | mem = queue->mem + buf->buf.m.offset + buf->buf.bytesused; | ||
| 86 | nbytes = min(len, maxlen); | ||
| 87 | memcpy(mem, data, nbytes); | ||
| 88 | buf->buf.bytesused += nbytes; | ||
| 89 | |||
| 90 | if (len > maxlen || buf->buf.bytesused == buf->buf.length) { | ||
| 91 | uvc_trace(UVC_TRACE_FRAME, "Frame complete " | ||
| 92 | "(overflow).\n"); | ||
| 93 | buf->state = UVC_BUF_STATE_DONE; | ||
| 94 | } | ||
| 95 | } | ||
| 96 | |||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | |||
| 100 | void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, | ||
| 101 | struct uvc_buffer *buf) | ||
| 102 | { | ||
| 103 | int ret, i; | ||
| 104 | |||
| 105 | for (i = 0; i < urb->number_of_packets; ++i) { | ||
| 106 | if (urb->iso_frame_desc[i].status < 0) { | ||
| 107 | uvc_trace(UVC_TRACE_FRAME, "USB isochronous frame " | ||
| 108 | "lost (%d).\n", | ||
| 109 | urb->iso_frame_desc[i].status); | ||
| 110 | } | ||
| 111 | |||
| 112 | /* Decode the payload packet. | ||
| 113 | * uvc_video_decode is entered twice when a frame transition | ||
| 114 | * has been detected because the end of frame can only be | ||
| 115 | * reliably detected when the first packet of the new frame | ||
| 116 | * is processed. The first pass detects the transition and | ||
| 117 | * closes the previous frame's buffer, the second pass | ||
| 118 | * processes the data of the first payload of the new frame. | ||
| 119 | */ | ||
| 120 | do { | ||
| 121 | ret = isight_decode(&video->queue, buf, | ||
| 122 | urb->transfer_buffer + | ||
| 123 | urb->iso_frame_desc[i].offset, | ||
| 124 | urb->iso_frame_desc[i].actual_length); | ||
| 125 | |||
| 126 | if (buf == NULL) | ||
| 127 | break; | ||
| 128 | |||
| 129 | if (buf->state == UVC_BUF_STATE_DONE || | ||
| 130 | buf->state == UVC_BUF_STATE_ERROR) | ||
| 131 | buf = uvc_queue_next_buffer(&video->queue, buf); | ||
| 132 | } while (ret == -EAGAIN); | ||
| 133 | } | ||
| 134 | } | ||
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c new file mode 100644 index 000000000000..0923f0e3b3d4 --- /dev/null +++ b/drivers/media/video/uvc/uvc_queue.c | |||
| @@ -0,0 +1,477 @@ | |||
| 1 | /* | ||
| 2 | * uvc_queue.c -- USB Video Class driver - Buffers management | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/usb.h> | ||
| 19 | #include <linux/videodev2.h> | ||
| 20 | #include <linux/vmalloc.h> | ||
| 21 | #include <linux/wait.h> | ||
| 22 | #include <asm/atomic.h> | ||
| 23 | |||
| 24 | #include "uvcvideo.h" | ||
| 25 | |||
| 26 | /* ------------------------------------------------------------------------ | ||
| 27 | * Video buffers queue management. | ||
| 28 | * | ||
| 29 | * Video queues is initialized by uvc_queue_init(). The function performs | ||
| 30 | * basic initialization of the uvc_video_queue struct and never fails. | ||
| 31 | * | ||
| 32 | * Video buffer allocation and freeing are performed by uvc_alloc_buffers and | ||
| 33 | * uvc_free_buffers respectively. The former acquires the video queue lock, | ||
| 34 | * while the later must be called with the lock held (so that allocation can | ||
| 35 | * free previously allocated buffers). Trying to free buffers that are mapped | ||
| 36 | * to user space will return -EBUSY. | ||
| 37 | * | ||
| 38 | * Video buffers are managed using two queues. However, unlike most USB video | ||
| 39 | * drivers which use an in queue and an out queue, we use a main queue which | ||
| 40 | * holds all queued buffers (both 'empty' and 'done' buffers), and an irq | ||
| 41 | * queue which holds empty buffers. This design (copied from video-buf) | ||
| 42 | * minimizes locking in interrupt, as only one queue is shared between | ||
| 43 | * interrupt and user contexts. | ||
| 44 | * | ||
| 45 | * Use cases | ||
| 46 | * --------- | ||
| 47 | * | ||
| 48 | * Unless stated otherwise, all operations which modify the irq buffers queue | ||
| 49 | * are protected by the irq spinlock. | ||
| 50 | * | ||
| 51 | * 1. The user queues the buffers, starts streaming and dequeues a buffer. | ||
| 52 | * | ||
| 53 | * The buffers are added to the main and irq queues. Both operations are | ||
| 54 | * protected by the queue lock, and the latert is protected by the irq | ||
| 55 | * spinlock as well. | ||
| 56 | * | ||
| 57 | * The completion handler fetches a buffer from the irq queue and fills it | ||
| 58 | * with video data. If no buffer is available (irq queue empty), the handler | ||
| 59 | * returns immediately. | ||
| 60 | * | ||
| 61 | * When the buffer is full, the completion handler removes it from the irq | ||
| 62 | * queue, marks it as ready (UVC_BUF_STATE_DONE) and wake its wait queue. | ||
| 63 | * At that point, any process waiting on the buffer will be woken up. If a | ||
| 64 | * process tries to dequeue a buffer after it has been marked ready, the | ||
| 65 | * dequeing will succeed immediately. | ||
| 66 | * | ||
| 67 | * 2. Buffers are queued, user is waiting on a buffer and the device gets | ||
| 68 | * disconnected. | ||
| 69 | * | ||
| 70 | * When the device is disconnected, the kernel calls the completion handler | ||
| 71 | * with an appropriate status code. The handler marks all buffers in the | ||
| 72 | * irq queue as being erroneous (UVC_BUF_STATE_ERROR) and wakes them up so | ||
| 73 | * that any process waiting on a buffer gets woken up. | ||
| 74 | * | ||
| 75 | * Waking up up the first buffer on the irq list is not enough, as the | ||
| 76 | * process waiting on the buffer might restart the dequeue operation | ||
| 77 | * immediately. | ||
| 78 | * | ||
| 79 | */ | ||
| 80 | |||
| 81 | void uvc_queue_init(struct uvc_video_queue *queue) | ||
| 82 | { | ||
| 83 | mutex_init(&queue->mutex); | ||
| 84 | spin_lock_init(&queue->irqlock); | ||
| 85 | INIT_LIST_HEAD(&queue->mainqueue); | ||
| 86 | INIT_LIST_HEAD(&queue->irqqueue); | ||
| 87 | } | ||
| 88 | |||
| 89 | /* | ||
| 90 | * Allocate the video buffers. | ||
| 91 | * | ||
| 92 | * Pages are reserved to make sure they will not be swaped, as they will be | ||
| 93 | * filled in URB completion handler. | ||
| 94 | * | ||
| 95 | * Buffers will be individually mapped, so they must all be page aligned. | ||
| 96 | */ | ||
| 97 | int uvc_alloc_buffers(struct uvc_video_queue *queue, unsigned int nbuffers, | ||
| 98 | unsigned int buflength) | ||
| 99 | { | ||
| 100 | unsigned int bufsize = PAGE_ALIGN(buflength); | ||
| 101 | unsigned int i; | ||
| 102 | void *mem = NULL; | ||
| 103 | int ret; | ||
| 104 | |||
| 105 | if (nbuffers > UVC_MAX_VIDEO_BUFFERS) | ||
| 106 | nbuffers = UVC_MAX_VIDEO_BUFFERS; | ||
| 107 | |||
| 108 | mutex_lock(&queue->mutex); | ||
| 109 | |||
| 110 | if ((ret = uvc_free_buffers(queue)) < 0) | ||
| 111 | goto done; | ||
| 112 | |||
| 113 | /* Bail out if no buffers should be allocated. */ | ||
| 114 | if (nbuffers == 0) | ||
| 115 | goto done; | ||
| 116 | |||
| 117 | /* Decrement the number of buffers until allocation succeeds. */ | ||
| 118 | for (; nbuffers > 0; --nbuffers) { | ||
| 119 | mem = vmalloc_32(nbuffers * bufsize); | ||
| 120 | if (mem != NULL) | ||
| 121 | break; | ||
| 122 | } | ||
| 123 | |||
| 124 | if (mem == NULL) { | ||
| 125 | ret = -ENOMEM; | ||
| 126 | goto done; | ||
| 127 | } | ||
| 128 | |||
| 129 | for (i = 0; i < nbuffers; ++i) { | ||
| 130 | memset(&queue->buffer[i], 0, sizeof queue->buffer[i]); | ||
| 131 | queue->buffer[i].buf.index = i; | ||
| 132 | queue->buffer[i].buf.m.offset = i * bufsize; | ||
| 133 | queue->buffer[i].buf.length = buflength; | ||
| 134 | queue->buffer[i].buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | ||
| 135 | queue->buffer[i].buf.sequence = 0; | ||
| 136 | queue->buffer[i].buf.field = V4L2_FIELD_NONE; | ||
| 137 | queue->buffer[i].buf.memory = V4L2_MEMORY_MMAP; | ||
| 138 | queue->buffer[i].buf.flags = 0; | ||
| 139 | init_waitqueue_head(&queue->buffer[i].wait); | ||
| 140 | } | ||
| 141 | |||
| 142 | queue->mem = mem; | ||
| 143 | queue->count = nbuffers; | ||
| 144 | queue->buf_size = bufsize; | ||
| 145 | ret = nbuffers; | ||
| 146 | |||
| 147 | done: | ||
| 148 | mutex_unlock(&queue->mutex); | ||
| 149 | return ret; | ||
| 150 | } | ||
| 151 | |||
| 152 | /* | ||
| 153 | * Free the video buffers. | ||
| 154 | * | ||
| 155 | * This function must be called with the queue lock held. | ||
| 156 | */ | ||
| 157 | int uvc_free_buffers(struct uvc_video_queue *queue) | ||
| 158 | { | ||
| 159 | unsigned int i; | ||
| 160 | |||
| 161 | for (i = 0; i < queue->count; ++i) { | ||
| 162 | if (queue->buffer[i].vma_use_count != 0) | ||
| 163 | return -EBUSY; | ||
| 164 | } | ||
| 165 | |||
| 166 | if (queue->count) { | ||
| 167 | vfree(queue->mem); | ||
| 168 | queue->count = 0; | ||
| 169 | } | ||
| 170 | |||
| 171 | return 0; | ||
| 172 | } | ||
| 173 | |||
| 174 | static void __uvc_query_buffer(struct uvc_buffer *buf, | ||
| 175 | struct v4l2_buffer *v4l2_buf) | ||
| 176 | { | ||
| 177 | memcpy(v4l2_buf, &buf->buf, sizeof *v4l2_buf); | ||
| 178 | |||
| 179 | if (buf->vma_use_count) | ||
| 180 | v4l2_buf->flags |= V4L2_BUF_FLAG_MAPPED; | ||
| 181 | |||
| 182 | switch (buf->state) { | ||
| 183 | case UVC_BUF_STATE_ERROR: | ||
| 184 | case UVC_BUF_STATE_DONE: | ||
| 185 | v4l2_buf->flags |= V4L2_BUF_FLAG_DONE; | ||
| 186 | break; | ||
| 187 | case UVC_BUF_STATE_QUEUED: | ||
| 188 | case UVC_BUF_STATE_ACTIVE: | ||
| 189 | v4l2_buf->flags |= V4L2_BUF_FLAG_QUEUED; | ||
| 190 | break; | ||
| 191 | case UVC_BUF_STATE_IDLE: | ||
| 192 | default: | ||
| 193 | break; | ||
| 194 | } | ||
| 195 | } | ||
| 196 | |||
| 197 | int uvc_query_buffer(struct uvc_video_queue *queue, | ||
| 198 | struct v4l2_buffer *v4l2_buf) | ||
| 199 | { | ||
| 200 | int ret = 0; | ||
| 201 | |||
| 202 | mutex_lock(&queue->mutex); | ||
| 203 | if (v4l2_buf->index >= queue->count) { | ||
| 204 | ret = -EINVAL; | ||
| 205 | goto done; | ||
| 206 | } | ||
| 207 | |||
| 208 | __uvc_query_buffer(&queue->buffer[v4l2_buf->index], v4l2_buf); | ||
| 209 | |||
| 210 | done: | ||
| 211 | mutex_unlock(&queue->mutex); | ||
| 212 | return ret; | ||
| 213 | } | ||
| 214 | |||
| 215 | /* | ||
| 216 | * Queue a video buffer. Attempting to queue a buffer that has already been | ||
| 217 | * queued will return -EINVAL. | ||
| 218 | */ | ||
| 219 | int uvc_queue_buffer(struct uvc_video_queue *queue, | ||
| 220 | struct v4l2_buffer *v4l2_buf) | ||
| 221 | { | ||
| 222 | struct uvc_buffer *buf; | ||
| 223 | unsigned long flags; | ||
| 224 | int ret = 0; | ||
| 225 | |||
| 226 | uvc_trace(UVC_TRACE_CAPTURE, "Queuing buffer %u.\n", v4l2_buf->index); | ||
| 227 | |||
| 228 | if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || | ||
| 229 | v4l2_buf->memory != V4L2_MEMORY_MMAP) { | ||
| 230 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer type (%u) " | ||
| 231 | "and/or memory (%u).\n", v4l2_buf->type, | ||
| 232 | v4l2_buf->memory); | ||
| 233 | return -EINVAL; | ||
| 234 | } | ||
| 235 | |||
| 236 | mutex_lock(&queue->mutex); | ||
| 237 | if (v4l2_buf->index >= queue->count) { | ||
| 238 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Out of range index.\n"); | ||
| 239 | ret = -EINVAL; | ||
| 240 | goto done; | ||
| 241 | } | ||
| 242 | |||
| 243 | buf = &queue->buffer[v4l2_buf->index]; | ||
| 244 | if (buf->state != UVC_BUF_STATE_IDLE) { | ||
| 245 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer state " | ||
| 246 | "(%u).\n", buf->state); | ||
| 247 | ret = -EINVAL; | ||
| 248 | goto done; | ||
| 249 | } | ||
| 250 | |||
| 251 | spin_lock_irqsave(&queue->irqlock, flags); | ||
| 252 | if (queue->flags & UVC_QUEUE_DISCONNECTED) { | ||
| 253 | spin_unlock_irqrestore(&queue->irqlock, flags); | ||
| 254 | ret = -ENODEV; | ||
| 255 | goto done; | ||
| 256 | } | ||
| 257 | buf->state = UVC_BUF_STATE_QUEUED; | ||
| 258 | buf->buf.bytesused = 0; | ||
| 259 | list_add_tail(&buf->stream, &queue->mainqueue); | ||
| 260 | list_add_tail(&buf->queue, &queue->irqqueue); | ||
| 261 | spin_unlock_irqrestore(&queue->irqlock, flags); | ||
| 262 | |||
| 263 | done: | ||
| 264 | mutex_unlock(&queue->mutex); | ||
| 265 | return ret; | ||
| 266 | } | ||
| 267 | |||
| 268 | static int uvc_queue_waiton(struct uvc_buffer *buf, int nonblocking) | ||
| 269 | { | ||
| 270 | if (nonblocking) { | ||
| 271 | return (buf->state != UVC_BUF_STATE_QUEUED && | ||
| 272 | buf->state != UVC_BUF_STATE_ACTIVE) | ||
| 273 | ? 0 : -EAGAIN; | ||
| 274 | } | ||
| 275 | |||
| 276 | return wait_event_interruptible(buf->wait, | ||
| 277 | buf->state != UVC_BUF_STATE_QUEUED && | ||
| 278 | buf->state != UVC_BUF_STATE_ACTIVE); | ||
| 279 | } | ||
| 280 | |||
| 281 | /* | ||
| 282 | * Dequeue a video buffer. If nonblocking is false, block until a buffer is | ||
| 283 | * available. | ||
| 284 | */ | ||
| 285 | int uvc_dequeue_buffer(struct uvc_video_queue *queue, | ||
| 286 | struct v4l2_buffer *v4l2_buf, int nonblocking) | ||
| 287 | { | ||
| 288 | struct uvc_buffer *buf; | ||
| 289 | int ret = 0; | ||
| 290 | |||
| 291 | if (v4l2_buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || | ||
| 292 | v4l2_buf->memory != V4L2_MEMORY_MMAP) { | ||
| 293 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer type (%u) " | ||
| 294 | "and/or memory (%u).\n", v4l2_buf->type, | ||
| 295 | v4l2_buf->memory); | ||
| 296 | return -EINVAL; | ||
| 297 | } | ||
| 298 | |||
| 299 | mutex_lock(&queue->mutex); | ||
| 300 | if (list_empty(&queue->mainqueue)) { | ||
| 301 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Empty buffer queue.\n"); | ||
| 302 | ret = -EINVAL; | ||
| 303 | goto done; | ||
| 304 | } | ||
| 305 | |||
| 306 | buf = list_first_entry(&queue->mainqueue, struct uvc_buffer, stream); | ||
| 307 | if ((ret = uvc_queue_waiton(buf, nonblocking)) < 0) | ||
| 308 | goto done; | ||
| 309 | |||
| 310 | uvc_trace(UVC_TRACE_CAPTURE, "Dequeuing buffer %u (%u, %u bytes).\n", | ||
| 311 | buf->buf.index, buf->state, buf->buf.bytesused); | ||
| 312 | |||
| 313 | switch (buf->state) { | ||
| 314 | case UVC_BUF_STATE_ERROR: | ||
| 315 | uvc_trace(UVC_TRACE_CAPTURE, "[W] Corrupted data " | ||
| 316 | "(transmission error).\n"); | ||
| 317 | ret = -EIO; | ||
| 318 | case UVC_BUF_STATE_DONE: | ||
| 319 | buf->state = UVC_BUF_STATE_IDLE; | ||
| 320 | break; | ||
| 321 | |||
| 322 | case UVC_BUF_STATE_IDLE: | ||
| 323 | case UVC_BUF_STATE_QUEUED: | ||
| 324 | case UVC_BUF_STATE_ACTIVE: | ||
| 325 | default: | ||
| 326 | uvc_trace(UVC_TRACE_CAPTURE, "[E] Invalid buffer state %u " | ||
| 327 | "(driver bug?).\n", buf->state); | ||
| 328 | ret = -EINVAL; | ||
| 329 | goto done; | ||
| 330 | } | ||
| 331 | |||
| 332 | list_del(&buf->stream); | ||
| 333 | __uvc_query_buffer(buf, v4l2_buf); | ||
| 334 | |||
| 335 | done: | ||
| 336 | mutex_unlock(&queue->mutex); | ||
| 337 | return ret; | ||
| 338 | } | ||
| 339 | |||
| 340 | /* | ||
| 341 | * Poll the video queue. | ||
| 342 | * | ||
| 343 | * This function implements video queue polling and is intended to be used by | ||
| 344 | * the device poll handler. | ||
| 345 | */ | ||
| 346 | unsigned int uvc_queue_poll(struct uvc_video_queue *queue, struct file *file, | ||
| 347 | poll_table *wait) | ||
| 348 | { | ||
| 349 | struct uvc_buffer *buf; | ||
| 350 | unsigned int mask = 0; | ||
| 351 | |||
| 352 | mutex_lock(&queue->mutex); | ||
| 353 | if (list_empty(&queue->mainqueue)) { | ||
| 354 | mask |= POLLERR; | ||
| 355 | goto done; | ||
| 356 | } | ||
| 357 | buf = list_first_entry(&queue->mainqueue, struct uvc_buffer, stream); | ||
| 358 | |||
| 359 | poll_wait(file, &buf->wait, wait); | ||
| 360 | if (buf->state == UVC_BUF_STATE_DONE || | ||
| 361 | buf->state == UVC_BUF_STATE_ERROR) | ||
| 362 | mask |= POLLIN | POLLRDNORM; | ||
| 363 | |||
| 364 | done: | ||
| 365 | mutex_unlock(&queue->mutex); | ||
| 366 | return mask; | ||
| 367 | } | ||
| 368 | |||
| 369 | /* | ||
| 370 | * Enable or disable the video buffers queue. | ||
| 371 | * | ||
| 372 | * The queue must be enabled before starting video acquisition and must be | ||
| 373 | * disabled after stopping it. This ensures that the video buffers queue | ||
| 374 | * state can be properly initialized before buffers are accessed from the | ||
| 375 | * interrupt handler. | ||
| 376 | * | ||
| 377 | * Enabling the video queue initializes parameters (such as sequence number, | ||
| 378 | * sync pattern, ...). If the queue is already enabled, return -EBUSY. | ||
| 379 | * | ||
| 380 | * Disabling the video queue cancels the queue and removes all buffers from | ||
| 381 | * the main queue. | ||
| 382 | * | ||
| 383 | * This function can't be called from interrupt context. Use | ||
| 384 | * uvc_queue_cancel() instead. | ||
| 385 | */ | ||
| 386 | int uvc_queue_enable(struct uvc_video_queue *queue, int enable) | ||
| 387 | { | ||
| 388 | unsigned int i; | ||
| 389 | int ret = 0; | ||
| 390 | |||
| 391 | mutex_lock(&queue->mutex); | ||
| 392 | if (enable) { | ||
| 393 | if (uvc_queue_streaming(queue)) { | ||
| 394 | ret = -EBUSY; | ||
| 395 | goto done; | ||
| 396 | } | ||
| 397 | queue->sequence = 0; | ||
| 398 | queue->flags |= UVC_QUEUE_STREAMING; | ||
| 399 | } else { | ||
| 400 | uvc_queue_cancel(queue, 0); | ||
| 401 | INIT_LIST_HEAD(&queue->mainqueue); | ||
| 402 | |||
| 403 | for (i = 0; i < queue->count; ++i) | ||
| 404 | queue->buffer[i].state = UVC_BUF_STATE_IDLE; | ||
| 405 | |||
| 406 | queue->flags &= ~UVC_QUEUE_STREAMING; | ||
| 407 | } | ||
| 408 | |||
| 409 | done: | ||
| 410 | mutex_unlock(&queue->mutex); | ||
| 411 | return ret; | ||
| 412 | } | ||
| 413 | |||
| 414 | /* | ||
| 415 | * Cancel the video buffers queue. | ||
| 416 | * | ||
| 417 | * Cancelling the queue marks all buffers on the irq queue as erroneous, | ||
| 418 | * wakes them up and remove them from the queue. | ||
| 419 | * | ||
| 420 | * If the disconnect parameter is set, further calls to uvc_queue_buffer will | ||
| 421 | * fail with -ENODEV. | ||
| 422 | * | ||
| 423 | * This function acquires the irq spinlock and can be called from interrupt | ||
| 424 | * context. | ||
| 425 | */ | ||
| 426 | void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect) | ||
| 427 | { | ||
| 428 | struct uvc_buffer *buf; | ||
| 429 | unsigned long flags; | ||
| 430 | |||
| 431 | spin_lock_irqsave(&queue->irqlock, flags); | ||
| 432 | while (!list_empty(&queue->irqqueue)) { | ||
| 433 | buf = list_first_entry(&queue->irqqueue, struct uvc_buffer, | ||
| 434 | queue); | ||
| 435 | list_del(&buf->queue); | ||
| 436 | buf->state = UVC_BUF_STATE_ERROR; | ||
| 437 | wake_up(&buf->wait); | ||
| 438 | } | ||
| 439 | /* This must be protected by the irqlock spinlock to avoid race | ||
| 440 | * conditions between uvc_queue_buffer and the disconnection event that | ||
| 441 | * could result in an interruptible wait in uvc_dequeue_buffer. Do not | ||
| 442 | * blindly replace this logic by checking for the UVC_DEV_DISCONNECTED | ||
| 443 | * state outside the queue code. | ||
| 444 | */ | ||
| 445 | if (disconnect) | ||
| 446 | queue->flags |= UVC_QUEUE_DISCONNECTED; | ||
| 447 | spin_unlock_irqrestore(&queue->irqlock, flags); | ||
| 448 | } | ||
| 449 | |||
| 450 | struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, | ||
| 451 | struct uvc_buffer *buf) | ||
| 452 | { | ||
| 453 | struct uvc_buffer *nextbuf; | ||
| 454 | unsigned long flags; | ||
| 455 | |||
| 456 | if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) && | ||
| 457 | buf->buf.length != buf->buf.bytesused) { | ||
| 458 | buf->state = UVC_BUF_STATE_QUEUED; | ||
| 459 | buf->buf.bytesused = 0; | ||
| 460 | return buf; | ||
| 461 | } | ||
| 462 | |||
| 463 | spin_lock_irqsave(&queue->irqlock, flags); | ||
| 464 | list_del(&buf->queue); | ||
| 465 | if (!list_empty(&queue->irqqueue)) | ||
| 466 | nextbuf = list_first_entry(&queue->irqqueue, struct uvc_buffer, | ||
| 467 | queue); | ||
| 468 | else | ||
| 469 | nextbuf = NULL; | ||
| 470 | spin_unlock_irqrestore(&queue->irqlock, flags); | ||
| 471 | |||
| 472 | buf->buf.sequence = queue->sequence++; | ||
| 473 | do_gettimeofday(&buf->buf.timestamp); | ||
| 474 | |||
| 475 | wake_up(&buf->wait); | ||
| 476 | return nextbuf; | ||
| 477 | } | ||
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c new file mode 100644 index 000000000000..be9084e5eace --- /dev/null +++ b/drivers/media/video/uvc/uvc_status.c | |||
| @@ -0,0 +1,207 @@ | |||
| 1 | /* | ||
| 2 | * uvc_status.c -- USB Video Class driver - Status endpoint | ||
| 3 | * | ||
| 4 | * Copyright (C) 2007-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/input.h> | ||
| 17 | #include <linux/usb.h> | ||
| 18 | #include <linux/usb/input.h> | ||
| 19 | |||
| 20 | #include "uvcvideo.h" | ||
| 21 | |||
| 22 | /* -------------------------------------------------------------------------- | ||
| 23 | * Input device | ||
| 24 | */ | ||
| 25 | static int uvc_input_init(struct uvc_device *dev) | ||
| 26 | { | ||
| 27 | struct usb_device *udev = dev->udev; | ||
| 28 | struct input_dev *input; | ||
| 29 | char *phys = NULL; | ||
| 30 | int ret; | ||
| 31 | |||
| 32 | input = input_allocate_device(); | ||
| 33 | if (input == NULL) | ||
| 34 | return -ENOMEM; | ||
| 35 | |||
| 36 | phys = kmalloc(6 + strlen(udev->bus->bus_name) + strlen(udev->devpath), | ||
| 37 | GFP_KERNEL); | ||
| 38 | if (phys == NULL) { | ||
| 39 | ret = -ENOMEM; | ||
| 40 | goto error; | ||
| 41 | } | ||
| 42 | sprintf(phys, "usb-%s-%s", udev->bus->bus_name, udev->devpath); | ||
| 43 | |||
| 44 | input->name = dev->name; | ||
| 45 | input->phys = phys; | ||
| 46 | usb_to_input_id(udev, &input->id); | ||
| 47 | input->dev.parent = &dev->intf->dev; | ||
| 48 | |||
| 49 | set_bit(EV_KEY, input->evbit); | ||
| 50 | set_bit(BTN_0, input->keybit); | ||
| 51 | |||
| 52 | if ((ret = input_register_device(input)) < 0) | ||
| 53 | goto error; | ||
| 54 | |||
| 55 | dev->input = input; | ||
| 56 | return 0; | ||
| 57 | |||
| 58 | error: | ||
| 59 | input_free_device(input); | ||
| 60 | kfree(phys); | ||
| 61 | return ret; | ||
| 62 | } | ||
| 63 | |||
| 64 | static void uvc_input_cleanup(struct uvc_device *dev) | ||
| 65 | { | ||
| 66 | if (dev->input) | ||
| 67 | input_unregister_device(dev->input); | ||
| 68 | } | ||
| 69 | |||
| 70 | /* -------------------------------------------------------------------------- | ||
| 71 | * Status interrupt endpoint | ||
| 72 | */ | ||
| 73 | static void uvc_event_streaming(struct uvc_device *dev, __u8 *data, int len) | ||
| 74 | { | ||
| 75 | if (len < 3) { | ||
| 76 | uvc_trace(UVC_TRACE_STATUS, "Invalid streaming status event " | ||
| 77 | "received.\n"); | ||
| 78 | return; | ||
| 79 | } | ||
| 80 | |||
| 81 | if (data[2] == 0) { | ||
| 82 | if (len < 4) | ||
| 83 | return; | ||
| 84 | uvc_trace(UVC_TRACE_STATUS, "Button (intf %u) %s len %d\n", | ||
| 85 | data[1], data[3] ? "pressed" : "released", len); | ||
| 86 | if (dev->input) | ||
| 87 | input_report_key(dev->input, BTN_0, data[3]); | ||
| 88 | } else { | ||
| 89 | uvc_trace(UVC_TRACE_STATUS, "Stream %u error event %02x %02x " | ||
| 90 | "len %d.\n", data[1], data[2], data[3], len); | ||
| 91 | } | ||
| 92 | } | ||
| 93 | |||
| 94 | static void uvc_event_control(struct uvc_device *dev, __u8 *data, int len) | ||
| 95 | { | ||
| 96 | char *attrs[3] = { "value", "info", "failure" }; | ||
| 97 | |||
| 98 | if (len < 6 || data[2] != 0 || data[4] > 2) { | ||
| 99 | uvc_trace(UVC_TRACE_STATUS, "Invalid control status event " | ||
| 100 | "received.\n"); | ||
| 101 | return; | ||
| 102 | } | ||
| 103 | |||
| 104 | uvc_trace(UVC_TRACE_STATUS, "Control %u/%u %s change len %d.\n", | ||
| 105 | data[1], data[3], attrs[data[4]], len); | ||
| 106 | } | ||
| 107 | |||
| 108 | static void uvc_status_complete(struct urb *urb) | ||
| 109 | { | ||
| 110 | struct uvc_device *dev = urb->context; | ||
| 111 | int len, ret; | ||
| 112 | |||
| 113 | switch (urb->status) { | ||
| 114 | case 0: | ||
| 115 | break; | ||
| 116 | |||
| 117 | case -ENOENT: /* usb_kill_urb() called. */ | ||
| 118 | case -ECONNRESET: /* usb_unlink_urb() called. */ | ||
| 119 | case -ESHUTDOWN: /* The endpoint is being disabled. */ | ||
| 120 | case -EPROTO: /* Device is disconnected (reported by some | ||
| 121 | * host controller). */ | ||
| 122 | return; | ||
| 123 | |||
| 124 | default: | ||
| 125 | uvc_printk(KERN_WARNING, "Non-zero status (%d) in status " | ||
| 126 | "completion handler.\n", urb->status); | ||
| 127 | return; | ||
| 128 | } | ||
| 129 | |||
| 130 | len = urb->actual_length; | ||
| 131 | if (len > 0) { | ||
| 132 | switch (dev->status[0] & 0x0f) { | ||
| 133 | case UVC_STATUS_TYPE_CONTROL: | ||
| 134 | uvc_event_control(dev, dev->status, len); | ||
| 135 | break; | ||
| 136 | |||
| 137 | case UVC_STATUS_TYPE_STREAMING: | ||
| 138 | uvc_event_streaming(dev, dev->status, len); | ||
| 139 | break; | ||
| 140 | |||
| 141 | default: | ||
| 142 | uvc_printk(KERN_INFO, "unknown event type %u.\n", | ||
| 143 | dev->status[0]); | ||
| 144 | break; | ||
| 145 | } | ||
| 146 | } | ||
| 147 | |||
| 148 | /* Resubmit the URB. */ | ||
| 149 | urb->interval = dev->int_ep->desc.bInterval; | ||
| 150 | if ((ret = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { | ||
| 151 | uvc_printk(KERN_ERR, "Failed to resubmit status URB (%d).\n", | ||
| 152 | ret); | ||
| 153 | } | ||
| 154 | } | ||
| 155 | |||
| 156 | int uvc_status_init(struct uvc_device *dev) | ||
| 157 | { | ||
| 158 | struct usb_host_endpoint *ep = dev->int_ep; | ||
| 159 | unsigned int pipe; | ||
| 160 | int interval; | ||
| 161 | |||
| 162 | if (ep == NULL) | ||
| 163 | return 0; | ||
| 164 | |||
| 165 | uvc_input_init(dev); | ||
| 166 | |||
| 167 | dev->int_urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 168 | if (dev->int_urb == NULL) | ||
| 169 | return -ENOMEM; | ||
| 170 | |||
| 171 | pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress); | ||
| 172 | |||
| 173 | /* For high-speed interrupt endpoints, the bInterval value is used as | ||
| 174 | * an exponent of two. Some developers forgot about it. | ||
| 175 | */ | ||
| 176 | interval = ep->desc.bInterval; | ||
| 177 | if (interval > 16 && dev->udev->speed == USB_SPEED_HIGH && | ||
| 178 | (dev->quirks & UVC_QUIRK_STATUS_INTERVAL)) | ||
| 179 | interval = fls(interval) - 1; | ||
| 180 | |||
| 181 | usb_fill_int_urb(dev->int_urb, dev->udev, pipe, | ||
| 182 | dev->status, sizeof dev->status, uvc_status_complete, | ||
| 183 | dev, interval); | ||
| 184 | |||
| 185 | return usb_submit_urb(dev->int_urb, GFP_KERNEL); | ||
| 186 | } | ||
| 187 | |||
| 188 | void uvc_status_cleanup(struct uvc_device *dev) | ||
| 189 | { | ||
| 190 | usb_kill_urb(dev->int_urb); | ||
| 191 | usb_free_urb(dev->int_urb); | ||
| 192 | uvc_input_cleanup(dev); | ||
| 193 | } | ||
| 194 | |||
| 195 | int uvc_status_suspend(struct uvc_device *dev) | ||
| 196 | { | ||
| 197 | usb_kill_urb(dev->int_urb); | ||
| 198 | return 0; | ||
| 199 | } | ||
| 200 | |||
| 201 | int uvc_status_resume(struct uvc_device *dev) | ||
| 202 | { | ||
| 203 | if (dev->int_urb == NULL) | ||
| 204 | return 0; | ||
| 205 | |||
| 206 | return usb_submit_urb(dev->int_urb, GFP_KERNEL); | ||
| 207 | } | ||
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c new file mode 100644 index 000000000000..2e0a66575bb4 --- /dev/null +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
| @@ -0,0 +1,1105 @@ | |||
| 1 | /* | ||
| 2 | * uvc_v4l2.c -- USB Video Class driver - V4L2 API | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/usb.h> | ||
| 19 | #include <linux/videodev2.h> | ||
| 20 | #include <linux/vmalloc.h> | ||
| 21 | #include <linux/mm.h> | ||
| 22 | #include <linux/wait.h> | ||
| 23 | #include <asm/atomic.h> | ||
| 24 | |||
| 25 | #include <media/v4l2-common.h> | ||
| 26 | |||
| 27 | #include "uvcvideo.h" | ||
| 28 | |||
| 29 | /* ------------------------------------------------------------------------ | ||
| 30 | * V4L2 interface | ||
| 31 | */ | ||
| 32 | |||
| 33 | /* | ||
| 34 | * Mapping V4L2 controls to UVC controls can be straighforward if done well. | ||
| 35 | * Most of the UVC controls exist in V4L2, and can be mapped directly. Some | ||
| 36 | * must be grouped (for instance the Red Balance, Blue Balance and Do White | ||
| 37 | * Balance V4L2 controls use the White Balance Component UVC control) or | ||
| 38 | * otherwise translated. The approach we take here is to use a translation | ||
| 39 | * table for the controls which can be mapped directly, and handle the others | ||
| 40 | * manually. | ||
| 41 | */ | ||
| 42 | static int uvc_v4l2_query_menu(struct uvc_video_device *video, | ||
| 43 | struct v4l2_querymenu *query_menu) | ||
| 44 | { | ||
| 45 | struct uvc_menu_info *menu_info; | ||
| 46 | struct uvc_control_mapping *mapping; | ||
| 47 | struct uvc_control *ctrl; | ||
| 48 | |||
| 49 | ctrl = uvc_find_control(video, query_menu->id, &mapping); | ||
| 50 | if (ctrl == NULL || mapping->v4l2_type != V4L2_CTRL_TYPE_MENU) | ||
| 51 | return -EINVAL; | ||
| 52 | |||
| 53 | if (query_menu->index >= mapping->menu_count) | ||
| 54 | return -EINVAL; | ||
| 55 | |||
| 56 | menu_info = &mapping->menu_info[query_menu->index]; | ||
| 57 | strncpy(query_menu->name, menu_info->name, 32); | ||
| 58 | return 0; | ||
| 59 | } | ||
| 60 | |||
| 61 | /* | ||
| 62 | * Find the frame interval closest to the requested frame interval for the | ||
| 63 | * given frame format and size. This should be done by the device as part of | ||
| 64 | * the Video Probe and Commit negotiation, but some hardware don't implement | ||
| 65 | * that feature. | ||
| 66 | */ | ||
| 67 | static __u32 uvc_try_frame_interval(struct uvc_frame *frame, __u32 interval) | ||
| 68 | { | ||
| 69 | unsigned int i; | ||
| 70 | |||
| 71 | if (frame->bFrameIntervalType) { | ||
| 72 | __u32 best = -1, dist; | ||
| 73 | |||
| 74 | for (i = 0; i < frame->bFrameIntervalType; ++i) { | ||
| 75 | dist = interval > frame->dwFrameInterval[i] | ||
| 76 | ? interval - frame->dwFrameInterval[i] | ||
| 77 | : frame->dwFrameInterval[i] - interval; | ||
| 78 | |||
| 79 | if (dist > best) | ||
| 80 | break; | ||
| 81 | |||
| 82 | best = dist; | ||
| 83 | } | ||
| 84 | |||
| 85 | interval = frame->dwFrameInterval[i-1]; | ||
| 86 | } else { | ||
| 87 | const __u32 min = frame->dwFrameInterval[0]; | ||
| 88 | const __u32 max = frame->dwFrameInterval[1]; | ||
| 89 | const __u32 step = frame->dwFrameInterval[2]; | ||
| 90 | |||
| 91 | interval = min + (interval - min + step/2) / step * step; | ||
| 92 | if (interval > max) | ||
| 93 | interval = max; | ||
| 94 | } | ||
| 95 | |||
| 96 | return interval; | ||
| 97 | } | ||
| 98 | |||
| 99 | static int uvc_v4l2_try_format(struct uvc_video_device *video, | ||
| 100 | struct v4l2_format *fmt, struct uvc_streaming_control *probe, | ||
| 101 | struct uvc_format **uvc_format, struct uvc_frame **uvc_frame) | ||
| 102 | { | ||
| 103 | struct uvc_format *format = NULL; | ||
| 104 | struct uvc_frame *frame = NULL; | ||
| 105 | __u16 rw, rh; | ||
| 106 | unsigned int d, maxd; | ||
| 107 | unsigned int i; | ||
| 108 | __u32 interval; | ||
| 109 | int ret = 0; | ||
| 110 | __u8 *fcc; | ||
| 111 | |||
| 112 | if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 113 | return -EINVAL; | ||
| 114 | |||
| 115 | fcc = (__u8 *)&fmt->fmt.pix.pixelformat; | ||
| 116 | uvc_trace(UVC_TRACE_FORMAT, "Trying format 0x%08x (%c%c%c%c): %ux%u.\n", | ||
| 117 | fmt->fmt.pix.pixelformat, | ||
| 118 | fcc[0], fcc[1], fcc[2], fcc[3], | ||
| 119 | fmt->fmt.pix.width, fmt->fmt.pix.height); | ||
| 120 | |||
| 121 | /* Check if the hardware supports the requested format. */ | ||
| 122 | for (i = 0; i < video->streaming->nformats; ++i) { | ||
| 123 | format = &video->streaming->format[i]; | ||
| 124 | if (format->fcc == fmt->fmt.pix.pixelformat) | ||
| 125 | break; | ||
| 126 | } | ||
| 127 | |||
| 128 | if (format == NULL || format->fcc != fmt->fmt.pix.pixelformat) { | ||
| 129 | uvc_trace(UVC_TRACE_FORMAT, "Unsupported format 0x%08x.\n", | ||
| 130 | fmt->fmt.pix.pixelformat); | ||
| 131 | return -EINVAL; | ||
| 132 | } | ||
| 133 | |||
| 134 | /* Find the closest image size. The distance between image sizes is | ||
| 135 | * the size in pixels of the non-overlapping regions between the | ||
| 136 | * requested size and the frame-specified size. | ||
| 137 | */ | ||
| 138 | rw = fmt->fmt.pix.width; | ||
| 139 | rh = fmt->fmt.pix.height; | ||
| 140 | maxd = (unsigned int)-1; | ||
| 141 | |||
| 142 | for (i = 0; i < format->nframes; ++i) { | ||
| 143 | __u16 w = format->frame[i].wWidth; | ||
| 144 | __u16 h = format->frame[i].wHeight; | ||
| 145 | |||
| 146 | d = min(w, rw) * min(h, rh); | ||
| 147 | d = w*h + rw*rh - 2*d; | ||
| 148 | if (d < maxd) { | ||
| 149 | maxd = d; | ||
| 150 | frame = &format->frame[i]; | ||
| 151 | } | ||
| 152 | |||
| 153 | if (maxd == 0) | ||
| 154 | break; | ||
| 155 | } | ||
| 156 | |||
| 157 | if (frame == NULL) { | ||
| 158 | uvc_trace(UVC_TRACE_FORMAT, "Unsupported size %ux%u.\n", | ||
| 159 | fmt->fmt.pix.width, fmt->fmt.pix.height); | ||
| 160 | return -EINVAL; | ||
| 161 | } | ||
| 162 | |||
| 163 | /* Use the default frame interval. */ | ||
| 164 | interval = frame->dwDefaultFrameInterval; | ||
| 165 | uvc_trace(UVC_TRACE_FORMAT, "Using default frame interval %u.%u us " | ||
| 166 | "(%u.%u fps).\n", interval/10, interval%10, 10000000/interval, | ||
| 167 | (100000000/interval)%10); | ||
| 168 | |||
| 169 | /* Set the format index, frame index and frame interval. */ | ||
| 170 | memset(probe, 0, sizeof *probe); | ||
| 171 | probe->bmHint = 1; /* dwFrameInterval */ | ||
| 172 | probe->bFormatIndex = format->index; | ||
| 173 | probe->bFrameIndex = frame->bFrameIndex; | ||
| 174 | probe->dwFrameInterval = uvc_try_frame_interval(frame, interval); | ||
| 175 | /* Some webcams stall the probe control set request when the | ||
| 176 | * dwMaxVideoFrameSize field is set to zero. The UVC specification | ||
| 177 | * clearly states that the field is read-only from the host, so this | ||
| 178 | * is a webcam bug. Set dwMaxVideoFrameSize to the value reported by | ||
| 179 | * the webcam to work around the problem. | ||
| 180 | * | ||
| 181 | * The workaround could probably be enabled for all webcams, so the | ||
| 182 | * quirk can be removed if needed. It's currently useful to detect | ||
| 183 | * webcam bugs and fix them before they hit the market (providing | ||
| 184 | * developers test their webcams with the Linux driver as well as with | ||
| 185 | * the Windows driver). | ||
| 186 | */ | ||
| 187 | if (video->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) | ||
| 188 | probe->dwMaxVideoFrameSize = | ||
| 189 | video->streaming->ctrl.dwMaxVideoFrameSize; | ||
| 190 | |||
| 191 | /* Probe the device */ | ||
| 192 | if ((ret = uvc_probe_video(video, probe)) < 0) | ||
| 193 | goto done; | ||
| 194 | |||
| 195 | fmt->fmt.pix.width = frame->wWidth; | ||
| 196 | fmt->fmt.pix.height = frame->wHeight; | ||
| 197 | fmt->fmt.pix.field = V4L2_FIELD_NONE; | ||
| 198 | fmt->fmt.pix.bytesperline = format->bpp * frame->wWidth / 8; | ||
| 199 | fmt->fmt.pix.sizeimage = probe->dwMaxVideoFrameSize; | ||
| 200 | fmt->fmt.pix.colorspace = format->colorspace; | ||
| 201 | fmt->fmt.pix.priv = 0; | ||
| 202 | |||
| 203 | if (uvc_format != NULL) | ||
| 204 | *uvc_format = format; | ||
| 205 | if (uvc_frame != NULL) | ||
| 206 | *uvc_frame = frame; | ||
| 207 | |||
| 208 | done: | ||
| 209 | return ret; | ||
| 210 | } | ||
| 211 | |||
| 212 | static int uvc_v4l2_get_format(struct uvc_video_device *video, | ||
| 213 | struct v4l2_format *fmt) | ||
| 214 | { | ||
| 215 | struct uvc_format *format = video->streaming->cur_format; | ||
| 216 | struct uvc_frame *frame = video->streaming->cur_frame; | ||
| 217 | |||
| 218 | if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 219 | return -EINVAL; | ||
| 220 | |||
| 221 | if (format == NULL || frame == NULL) | ||
| 222 | return -EINVAL; | ||
| 223 | |||
| 224 | fmt->fmt.pix.pixelformat = format->fcc; | ||
| 225 | fmt->fmt.pix.width = frame->wWidth; | ||
| 226 | fmt->fmt.pix.height = frame->wHeight; | ||
| 227 | fmt->fmt.pix.field = V4L2_FIELD_NONE; | ||
| 228 | fmt->fmt.pix.bytesperline = format->bpp * frame->wWidth / 8; | ||
| 229 | fmt->fmt.pix.sizeimage = video->streaming->ctrl.dwMaxVideoFrameSize; | ||
| 230 | fmt->fmt.pix.colorspace = format->colorspace; | ||
| 231 | fmt->fmt.pix.priv = 0; | ||
| 232 | |||
| 233 | return 0; | ||
| 234 | } | ||
| 235 | |||
| 236 | static int uvc_v4l2_set_format(struct uvc_video_device *video, | ||
| 237 | struct v4l2_format *fmt) | ||
| 238 | { | ||
| 239 | struct uvc_streaming_control probe; | ||
| 240 | struct uvc_format *format; | ||
| 241 | struct uvc_frame *frame; | ||
| 242 | int ret; | ||
| 243 | |||
| 244 | if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 245 | return -EINVAL; | ||
| 246 | |||
| 247 | if (uvc_queue_streaming(&video->queue)) | ||
| 248 | return -EBUSY; | ||
| 249 | |||
| 250 | ret = uvc_v4l2_try_format(video, fmt, &probe, &format, &frame); | ||
| 251 | if (ret < 0) | ||
| 252 | return ret; | ||
| 253 | |||
| 254 | if ((ret = uvc_set_video_ctrl(video, &probe, 0)) < 0) | ||
| 255 | return ret; | ||
| 256 | |||
| 257 | memcpy(&video->streaming->ctrl, &probe, sizeof probe); | ||
| 258 | video->streaming->cur_format = format; | ||
| 259 | video->streaming->cur_frame = frame; | ||
| 260 | |||
| 261 | return 0; | ||
| 262 | } | ||
| 263 | |||
| 264 | static int uvc_v4l2_get_streamparm(struct uvc_video_device *video, | ||
| 265 | struct v4l2_streamparm *parm) | ||
| 266 | { | ||
| 267 | uint32_t numerator, denominator; | ||
| 268 | |||
| 269 | if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 270 | return -EINVAL; | ||
| 271 | |||
| 272 | numerator = video->streaming->ctrl.dwFrameInterval; | ||
| 273 | denominator = 10000000; | ||
| 274 | uvc_simplify_fraction(&numerator, &denominator, 8, 333); | ||
| 275 | |||
| 276 | memset(parm, 0, sizeof *parm); | ||
| 277 | parm->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | ||
| 278 | parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; | ||
| 279 | parm->parm.capture.capturemode = 0; | ||
| 280 | parm->parm.capture.timeperframe.numerator = numerator; | ||
| 281 | parm->parm.capture.timeperframe.denominator = denominator; | ||
| 282 | parm->parm.capture.extendedmode = 0; | ||
| 283 | parm->parm.capture.readbuffers = 0; | ||
| 284 | |||
| 285 | return 0; | ||
| 286 | } | ||
| 287 | |||
| 288 | static int uvc_v4l2_set_streamparm(struct uvc_video_device *video, | ||
| 289 | struct v4l2_streamparm *parm) | ||
| 290 | { | ||
| 291 | struct uvc_frame *frame = video->streaming->cur_frame; | ||
| 292 | struct uvc_streaming_control probe; | ||
| 293 | uint32_t interval; | ||
| 294 | int ret; | ||
| 295 | |||
| 296 | if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 297 | return -EINVAL; | ||
| 298 | |||
| 299 | if (uvc_queue_streaming(&video->queue)) | ||
| 300 | return -EBUSY; | ||
| 301 | |||
| 302 | memcpy(&probe, &video->streaming->ctrl, sizeof probe); | ||
| 303 | interval = uvc_fraction_to_interval( | ||
| 304 | parm->parm.capture.timeperframe.numerator, | ||
| 305 | parm->parm.capture.timeperframe.denominator); | ||
| 306 | |||
| 307 | uvc_trace(UVC_TRACE_FORMAT, "Setting frame interval to %u/%u (%u).\n", | ||
| 308 | parm->parm.capture.timeperframe.numerator, | ||
| 309 | parm->parm.capture.timeperframe.denominator, | ||
| 310 | interval); | ||
| 311 | probe.dwFrameInterval = uvc_try_frame_interval(frame, interval); | ||
| 312 | |||
| 313 | /* Probe the device with the new settings. */ | ||
| 314 | if ((ret = uvc_probe_video(video, &probe)) < 0) | ||
| 315 | return ret; | ||
| 316 | |||
| 317 | /* Commit the new settings. */ | ||
| 318 | if ((ret = uvc_set_video_ctrl(video, &probe, 0)) < 0) | ||
| 319 | return ret; | ||
| 320 | |||
| 321 | memcpy(&video->streaming->ctrl, &probe, sizeof probe); | ||
| 322 | |||
| 323 | /* Return the actual frame period. */ | ||
| 324 | parm->parm.capture.timeperframe.numerator = probe.dwFrameInterval; | ||
| 325 | parm->parm.capture.timeperframe.denominator = 10000000; | ||
| 326 | uvc_simplify_fraction(&parm->parm.capture.timeperframe.numerator, | ||
| 327 | &parm->parm.capture.timeperframe.denominator, | ||
| 328 | 8, 333); | ||
| 329 | |||
| 330 | return 0; | ||
| 331 | } | ||
| 332 | |||
| 333 | /* ------------------------------------------------------------------------ | ||
| 334 | * Privilege management | ||
| 335 | */ | ||
| 336 | |||
| 337 | /* | ||
| 338 | * Privilege management is the multiple-open implementation basis. The current | ||
| 339 | * implementation is completely transparent for the end-user and doesn't | ||
| 340 | * require explicit use of the VIDIOC_G_PRIORITY and VIDIOC_S_PRIORITY ioctls. | ||
| 341 | * Those ioctls enable finer control on the device (by making possible for a | ||
| 342 | * user to request exclusive access to a device), but are not mature yet. | ||
| 343 | * Switching to the V4L2 priority mechanism might be considered in the future | ||
| 344 | * if this situation changes. | ||
| 345 | * | ||
| 346 | * Each open instance of a UVC device can either be in a privileged or | ||
| 347 | * unprivileged state. Only a single instance can be in a privileged state at | ||
| 348 | * a given time. Trying to perform an operation which requires privileges will | ||
| 349 | * automatically acquire the required privileges if possible, or return -EBUSY | ||
| 350 | * otherwise. Privileges are dismissed when closing the instance. | ||
| 351 | * | ||
| 352 | * Operations which require privileges are: | ||
| 353 | * | ||
| 354 | * - VIDIOC_S_INPUT | ||
| 355 | * - VIDIOC_S_PARM | ||
| 356 | * - VIDIOC_S_FMT | ||
| 357 | * - VIDIOC_TRY_FMT | ||
| 358 | * - VIDIOC_REQBUFS | ||
| 359 | */ | ||
| 360 | static int uvc_acquire_privileges(struct uvc_fh *handle) | ||
| 361 | { | ||
| 362 | int ret = 0; | ||
| 363 | |||
| 364 | /* Always succeed if the handle is already privileged. */ | ||
| 365 | if (handle->state == UVC_HANDLE_ACTIVE) | ||
| 366 | return 0; | ||
| 367 | |||
| 368 | /* Check if the device already has a privileged handle. */ | ||
| 369 | mutex_lock(&uvc_driver.open_mutex); | ||
| 370 | if (atomic_inc_return(&handle->device->active) != 1) { | ||
| 371 | atomic_dec(&handle->device->active); | ||
| 372 | ret = -EBUSY; | ||
| 373 | goto done; | ||
| 374 | } | ||
| 375 | |||
| 376 | handle->state = UVC_HANDLE_ACTIVE; | ||
| 377 | |||
| 378 | done: | ||
| 379 | mutex_unlock(&uvc_driver.open_mutex); | ||
| 380 | return ret; | ||
| 381 | } | ||
| 382 | |||
| 383 | static void uvc_dismiss_privileges(struct uvc_fh *handle) | ||
| 384 | { | ||
| 385 | if (handle->state == UVC_HANDLE_ACTIVE) | ||
| 386 | atomic_dec(&handle->device->active); | ||
| 387 | |||
| 388 | handle->state = UVC_HANDLE_PASSIVE; | ||
| 389 | } | ||
| 390 | |||
| 391 | static int uvc_has_privileges(struct uvc_fh *handle) | ||
| 392 | { | ||
| 393 | return handle->state == UVC_HANDLE_ACTIVE; | ||
| 394 | } | ||
| 395 | |||
| 396 | /* ------------------------------------------------------------------------ | ||
| 397 | * V4L2 file operations | ||
| 398 | */ | ||
| 399 | |||
| 400 | static int uvc_v4l2_open(struct inode *inode, struct file *file) | ||
| 401 | { | ||
| 402 | struct video_device *vdev; | ||
| 403 | struct uvc_video_device *video; | ||
| 404 | struct uvc_fh *handle; | ||
| 405 | int ret = 0; | ||
| 406 | |||
| 407 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_open\n"); | ||
| 408 | mutex_lock(&uvc_driver.open_mutex); | ||
| 409 | vdev = video_devdata(file); | ||
| 410 | video = video_get_drvdata(vdev); | ||
| 411 | |||
| 412 | if (video->dev->state & UVC_DEV_DISCONNECTED) { | ||
| 413 | ret = -ENODEV; | ||
| 414 | goto done; | ||
| 415 | } | ||
| 416 | |||
| 417 | ret = usb_autopm_get_interface(video->dev->intf); | ||
| 418 | if (ret < 0) | ||
| 419 | goto done; | ||
| 420 | |||
| 421 | /* Create the device handle. */ | ||
| 422 | handle = kzalloc(sizeof *handle, GFP_KERNEL); | ||
| 423 | if (handle == NULL) { | ||
| 424 | usb_autopm_put_interface(video->dev->intf); | ||
| 425 | ret = -ENOMEM; | ||
| 426 | goto done; | ||
| 427 | } | ||
| 428 | |||
| 429 | handle->device = video; | ||
| 430 | handle->state = UVC_HANDLE_PASSIVE; | ||
| 431 | file->private_data = handle; | ||
| 432 | |||
| 433 | kref_get(&video->dev->kref); | ||
| 434 | |||
| 435 | done: | ||
| 436 | mutex_unlock(&uvc_driver.open_mutex); | ||
| 437 | return ret; | ||
| 438 | } | ||
| 439 | |||
| 440 | static int uvc_v4l2_release(struct inode *inode, struct file *file) | ||
| 441 | { | ||
| 442 | struct video_device *vdev = video_devdata(file); | ||
| 443 | struct uvc_video_device *video = video_get_drvdata(vdev); | ||
| 444 | struct uvc_fh *handle = (struct uvc_fh *)file->private_data; | ||
| 445 | |||
| 446 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n"); | ||
| 447 | |||
| 448 | /* Only free resources if this is a privileged handle. */ | ||
| 449 | if (uvc_has_privileges(handle)) { | ||
| 450 | uvc_video_enable(video, 0); | ||
| 451 | |||
| 452 | mutex_lock(&video->queue.mutex); | ||
| 453 | if (uvc_free_buffers(&video->queue) < 0) | ||
| 454 | uvc_printk(KERN_ERR, "uvc_v4l2_release: Unable to " | ||
| 455 | "free buffers.\n"); | ||
| 456 | mutex_unlock(&video->queue.mutex); | ||
| 457 | } | ||
| 458 | |||
| 459 | /* Release the file handle. */ | ||
| 460 | uvc_dismiss_privileges(handle); | ||
| 461 | kfree(handle); | ||
| 462 | file->private_data = NULL; | ||
| 463 | |||
| 464 | usb_autopm_put_interface(video->dev->intf); | ||
| 465 | kref_put(&video->dev->kref, uvc_delete); | ||
| 466 | return 0; | ||
| 467 | } | ||
| 468 | |||
| 469 | static int uvc_v4l2_do_ioctl(struct inode *inode, struct file *file, | ||
| 470 | unsigned int cmd, void *arg) | ||
| 471 | { | ||
| 472 | struct video_device *vdev = video_devdata(file); | ||
| 473 | struct uvc_video_device *video = video_get_drvdata(vdev); | ||
| 474 | struct uvc_fh *handle = (struct uvc_fh *)file->private_data; | ||
| 475 | int ret = 0; | ||
| 476 | |||
| 477 | if (uvc_trace_param & UVC_TRACE_IOCTL) | ||
| 478 | v4l_printk_ioctl(cmd); | ||
| 479 | |||
| 480 | switch (cmd) { | ||
| 481 | /* Query capabilities */ | ||
| 482 | case VIDIOC_QUERYCAP: | ||
| 483 | { | ||
| 484 | struct v4l2_capability *cap = arg; | ||
| 485 | |||
| 486 | memset(cap, 0, sizeof *cap); | ||
| 487 | strncpy(cap->driver, "uvcvideo", sizeof cap->driver); | ||
| 488 | strncpy(cap->card, vdev->name, 32); | ||
| 489 | strncpy(cap->bus_info, video->dev->udev->bus->bus_name, | ||
| 490 | sizeof cap->bus_info); | ||
| 491 | cap->version = DRIVER_VERSION_NUMBER; | ||
| 492 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | ||
| 493 | | V4L2_CAP_STREAMING; | ||
| 494 | break; | ||
| 495 | } | ||
| 496 | |||
| 497 | /* Get, Set & Query control */ | ||
| 498 | case VIDIOC_QUERYCTRL: | ||
| 499 | return uvc_query_v4l2_ctrl(video, arg); | ||
| 500 | |||
| 501 | case VIDIOC_G_CTRL: | ||
| 502 | { | ||
| 503 | struct v4l2_control *ctrl = arg; | ||
| 504 | struct v4l2_ext_control xctrl; | ||
| 505 | |||
| 506 | memset(&xctrl, 0, sizeof xctrl); | ||
| 507 | xctrl.id = ctrl->id; | ||
| 508 | |||
| 509 | uvc_ctrl_begin(video); | ||
| 510 | ret = uvc_ctrl_get(video, &xctrl); | ||
| 511 | uvc_ctrl_rollback(video); | ||
| 512 | if (ret >= 0) | ||
| 513 | ctrl->value = xctrl.value; | ||
| 514 | break; | ||
| 515 | } | ||
| 516 | |||
| 517 | case VIDIOC_S_CTRL: | ||
| 518 | { | ||
| 519 | struct v4l2_control *ctrl = arg; | ||
| 520 | struct v4l2_ext_control xctrl; | ||
| 521 | |||
| 522 | memset(&xctrl, 0, sizeof xctrl); | ||
| 523 | xctrl.id = ctrl->id; | ||
| 524 | xctrl.value = ctrl->value; | ||
| 525 | |||
| 526 | uvc_ctrl_begin(video); | ||
| 527 | ret = uvc_ctrl_set(video, &xctrl); | ||
| 528 | if (ret < 0) { | ||
| 529 | uvc_ctrl_rollback(video); | ||
| 530 | return ret; | ||
| 531 | } | ||
| 532 | ret = uvc_ctrl_commit(video); | ||
| 533 | break; | ||
| 534 | } | ||
| 535 | |||
| 536 | case VIDIOC_QUERYMENU: | ||
| 537 | return uvc_v4l2_query_menu(video, arg); | ||
| 538 | |||
| 539 | case VIDIOC_G_EXT_CTRLS: | ||
| 540 | { | ||
| 541 | struct v4l2_ext_controls *ctrls = arg; | ||
| 542 | struct v4l2_ext_control *ctrl = ctrls->controls; | ||
| 543 | unsigned int i; | ||
| 544 | |||
| 545 | uvc_ctrl_begin(video); | ||
| 546 | for (i = 0; i < ctrls->count; ++ctrl, ++i) { | ||
| 547 | ret = uvc_ctrl_get(video, ctrl); | ||
| 548 | if (ret < 0) { | ||
| 549 | uvc_ctrl_rollback(video); | ||
| 550 | ctrls->error_idx = i; | ||
| 551 | return ret; | ||
| 552 | } | ||
| 553 | } | ||
| 554 | ctrls->error_idx = 0; | ||
| 555 | ret = uvc_ctrl_rollback(video); | ||
| 556 | break; | ||
| 557 | } | ||
| 558 | |||
| 559 | case VIDIOC_S_EXT_CTRLS: | ||
| 560 | case VIDIOC_TRY_EXT_CTRLS: | ||
| 561 | { | ||
| 562 | struct v4l2_ext_controls *ctrls = arg; | ||
| 563 | struct v4l2_ext_control *ctrl = ctrls->controls; | ||
| 564 | unsigned int i; | ||
| 565 | |||
| 566 | ret = uvc_ctrl_begin(video); | ||
| 567 | if (ret < 0) | ||
| 568 | return ret; | ||
| 569 | |||
| 570 | for (i = 0; i < ctrls->count; ++ctrl, ++i) { | ||
| 571 | ret = uvc_ctrl_set(video, ctrl); | ||
| 572 | if (ret < 0) { | ||
| 573 | uvc_ctrl_rollback(video); | ||
| 574 | ctrls->error_idx = i; | ||
| 575 | return ret; | ||
| 576 | } | ||
| 577 | } | ||
| 578 | |||
| 579 | ctrls->error_idx = 0; | ||
| 580 | |||
| 581 | if (cmd == VIDIOC_S_EXT_CTRLS) | ||
| 582 | ret = uvc_ctrl_commit(video); | ||
| 583 | else | ||
| 584 | ret = uvc_ctrl_rollback(video); | ||
| 585 | break; | ||
| 586 | } | ||
| 587 | |||
| 588 | /* Get, Set & Enum input */ | ||
| 589 | case VIDIOC_ENUMINPUT: | ||
| 590 | { | ||
| 591 | const struct uvc_entity *selector = video->selector; | ||
| 592 | struct v4l2_input *input = arg; | ||
| 593 | struct uvc_entity *iterm = NULL; | ||
| 594 | u32 index = input->index; | ||
| 595 | int pin = 0; | ||
| 596 | |||
| 597 | if (selector == NULL || | ||
| 598 | (video->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) { | ||
| 599 | if (index != 0) | ||
| 600 | return -EINVAL; | ||
| 601 | iterm = list_first_entry(&video->iterms, | ||
| 602 | struct uvc_entity, chain); | ||
| 603 | pin = iterm->id; | ||
| 604 | } else if (pin < selector->selector.bNrInPins) { | ||
| 605 | pin = selector->selector.baSourceID[index]; | ||
| 606 | list_for_each_entry(iterm, video->iterms.next, chain) { | ||
| 607 | if (iterm->id == pin) | ||
| 608 | break; | ||
| 609 | } | ||
| 610 | } | ||
| 611 | |||
| 612 | if (iterm == NULL || iterm->id != pin) | ||
| 613 | return -EINVAL; | ||
| 614 | |||
| 615 | memset(input, 0, sizeof *input); | ||
| 616 | input->index = index; | ||
| 617 | strncpy(input->name, iterm->name, sizeof input->name); | ||
| 618 | if (UVC_ENTITY_TYPE(iterm) == ITT_CAMERA) | ||
| 619 | input->type = V4L2_INPUT_TYPE_CAMERA; | ||
| 620 | break; | ||
| 621 | } | ||
| 622 | |||
| 623 | case VIDIOC_G_INPUT: | ||
| 624 | { | ||
| 625 | u8 input; | ||
| 626 | |||
| 627 | if (video->selector == NULL || | ||
| 628 | (video->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) { | ||
| 629 | *(int *)arg = 0; | ||
| 630 | break; | ||
| 631 | } | ||
| 632 | |||
| 633 | ret = uvc_query_ctrl(video->dev, GET_CUR, video->selector->id, | ||
| 634 | video->dev->intfnum, SU_INPUT_SELECT_CONTROL, | ||
| 635 | &input, 1); | ||
| 636 | if (ret < 0) | ||
| 637 | return ret; | ||
| 638 | |||
| 639 | *(int *)arg = input - 1; | ||
| 640 | break; | ||
| 641 | } | ||
| 642 | |||
| 643 | case VIDIOC_S_INPUT: | ||
| 644 | { | ||
| 645 | u8 input = *(u32 *)arg + 1; | ||
| 646 | |||
| 647 | if ((ret = uvc_acquire_privileges(handle)) < 0) | ||
| 648 | return ret; | ||
| 649 | |||
| 650 | if (video->selector == NULL || | ||
| 651 | (video->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) { | ||
| 652 | if (input != 1) | ||
| 653 | return -EINVAL; | ||
| 654 | break; | ||
| 655 | } | ||
| 656 | |||
| 657 | if (input > video->selector->selector.bNrInPins) | ||
| 658 | return -EINVAL; | ||
| 659 | |||
| 660 | return uvc_query_ctrl(video->dev, SET_CUR, video->selector->id, | ||
| 661 | video->dev->intfnum, SU_INPUT_SELECT_CONTROL, | ||
| 662 | &input, 1); | ||
| 663 | } | ||
| 664 | |||
| 665 | /* Try, Get, Set & Enum format */ | ||
| 666 | case VIDIOC_ENUM_FMT: | ||
| 667 | { | ||
| 668 | struct v4l2_fmtdesc *fmt = arg; | ||
| 669 | struct uvc_format *format; | ||
| 670 | |||
| 671 | if (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || | ||
| 672 | fmt->index >= video->streaming->nformats) | ||
| 673 | return -EINVAL; | ||
| 674 | |||
| 675 | format = &video->streaming->format[fmt->index]; | ||
| 676 | fmt->flags = 0; | ||
| 677 | if (format->flags & UVC_FMT_FLAG_COMPRESSED) | ||
| 678 | fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; | ||
| 679 | strncpy(fmt->description, format->name, | ||
| 680 | sizeof fmt->description); | ||
| 681 | fmt->description[sizeof fmt->description - 1] = 0; | ||
| 682 | fmt->pixelformat = format->fcc; | ||
| 683 | break; | ||
| 684 | } | ||
| 685 | |||
| 686 | case VIDIOC_TRY_FMT: | ||
| 687 | { | ||
| 688 | struct uvc_streaming_control probe; | ||
| 689 | |||
| 690 | if ((ret = uvc_acquire_privileges(handle)) < 0) | ||
| 691 | return ret; | ||
| 692 | |||
| 693 | return uvc_v4l2_try_format(video, arg, &probe, NULL, NULL); | ||
| 694 | } | ||
| 695 | |||
| 696 | case VIDIOC_S_FMT: | ||
| 697 | if ((ret = uvc_acquire_privileges(handle)) < 0) | ||
| 698 | return ret; | ||
| 699 | |||
| 700 | return uvc_v4l2_set_format(video, arg); | ||
| 701 | |||
| 702 | case VIDIOC_G_FMT: | ||
| 703 | return uvc_v4l2_get_format(video, arg); | ||
| 704 | |||
| 705 | /* Frame size enumeration */ | ||
| 706 | case VIDIOC_ENUM_FRAMESIZES: | ||
| 707 | { | ||
| 708 | struct v4l2_frmsizeenum *fsize = arg; | ||
| 709 | struct uvc_format *format = NULL; | ||
| 710 | struct uvc_frame *frame; | ||
| 711 | int i; | ||
| 712 | |||
| 713 | /* Look for the given pixel format */ | ||
| 714 | for (i = 0; i < video->streaming->nformats; i++) { | ||
| 715 | if (video->streaming->format[i].fcc == | ||
| 716 | fsize->pixel_format) { | ||
| 717 | format = &video->streaming->format[i]; | ||
| 718 | break; | ||
| 719 | } | ||
| 720 | } | ||
| 721 | if (format == NULL) | ||
| 722 | return -EINVAL; | ||
| 723 | |||
| 724 | if (fsize->index >= format->nframes) | ||
| 725 | return -EINVAL; | ||
| 726 | |||
| 727 | frame = &format->frame[fsize->index]; | ||
| 728 | fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE; | ||
| 729 | fsize->discrete.width = frame->wWidth; | ||
| 730 | fsize->discrete.height = frame->wHeight; | ||
| 731 | break; | ||
| 732 | } | ||
| 733 | |||
| 734 | /* Frame interval enumeration */ | ||
| 735 | case VIDIOC_ENUM_FRAMEINTERVALS: | ||
| 736 | { | ||
| 737 | struct v4l2_frmivalenum *fival = arg; | ||
| 738 | struct uvc_format *format = NULL; | ||
| 739 | struct uvc_frame *frame = NULL; | ||
| 740 | int i; | ||
| 741 | |||
| 742 | /* Look for the given pixel format and frame size */ | ||
| 743 | for (i = 0; i < video->streaming->nformats; i++) { | ||
| 744 | if (video->streaming->format[i].fcc == | ||
| 745 | fival->pixel_format) { | ||
| 746 | format = &video->streaming->format[i]; | ||
| 747 | break; | ||
| 748 | } | ||
| 749 | } | ||
| 750 | if (format == NULL) | ||
| 751 | return -EINVAL; | ||
| 752 | |||
| 753 | for (i = 0; i < format->nframes; i++) { | ||
| 754 | if (format->frame[i].wWidth == fival->width && | ||
| 755 | format->frame[i].wHeight == fival->height) { | ||
| 756 | frame = &format->frame[i]; | ||
| 757 | break; | ||
| 758 | } | ||
| 759 | } | ||
| 760 | if (frame == NULL) | ||
| 761 | return -EINVAL; | ||
| 762 | |||
| 763 | if (frame->bFrameIntervalType) { | ||
| 764 | if (fival->index >= frame->bFrameIntervalType) | ||
| 765 | return -EINVAL; | ||
| 766 | |||
| 767 | fival->type = V4L2_FRMIVAL_TYPE_DISCRETE; | ||
| 768 | fival->discrete.numerator = | ||
| 769 | frame->dwFrameInterval[fival->index]; | ||
| 770 | fival->discrete.denominator = 10000000; | ||
| 771 | uvc_simplify_fraction(&fival->discrete.numerator, | ||
| 772 | &fival->discrete.denominator, 8, 333); | ||
| 773 | } else { | ||
| 774 | fival->type = V4L2_FRMIVAL_TYPE_STEPWISE; | ||
| 775 | fival->stepwise.min.numerator = | ||
| 776 | frame->dwFrameInterval[0]; | ||
| 777 | fival->stepwise.min.denominator = 10000000; | ||
| 778 | fival->stepwise.max.numerator = | ||
| 779 | frame->dwFrameInterval[1]; | ||
| 780 | fival->stepwise.max.denominator = 10000000; | ||
| 781 | fival->stepwise.step.numerator = | ||
| 782 | frame->dwFrameInterval[2]; | ||
| 783 | fival->stepwise.step.denominator = 10000000; | ||
| 784 | uvc_simplify_fraction(&fival->stepwise.min.numerator, | ||
| 785 | &fival->stepwise.min.denominator, 8, 333); | ||
| 786 | uvc_simplify_fraction(&fival->stepwise.max.numerator, | ||
| 787 | &fival->stepwise.max.denominator, 8, 333); | ||
| 788 | uvc_simplify_fraction(&fival->stepwise.step.numerator, | ||
| 789 | &fival->stepwise.step.denominator, 8, 333); | ||
| 790 | } | ||
| 791 | break; | ||
| 792 | } | ||
| 793 | |||
| 794 | /* Get & Set streaming parameters */ | ||
| 795 | case VIDIOC_G_PARM: | ||
| 796 | return uvc_v4l2_get_streamparm(video, arg); | ||
| 797 | |||
| 798 | case VIDIOC_S_PARM: | ||
| 799 | if ((ret = uvc_acquire_privileges(handle)) < 0) | ||
| 800 | return ret; | ||
| 801 | |||
| 802 | return uvc_v4l2_set_streamparm(video, arg); | ||
| 803 | |||
| 804 | /* Cropping and scaling */ | ||
| 805 | case VIDIOC_CROPCAP: | ||
| 806 | { | ||
| 807 | struct v4l2_cropcap *ccap = arg; | ||
| 808 | struct uvc_frame *frame = video->streaming->cur_frame; | ||
| 809 | |||
| 810 | if (ccap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 811 | return -EINVAL; | ||
| 812 | |||
| 813 | ccap->bounds.left = 0; | ||
| 814 | ccap->bounds.top = 0; | ||
| 815 | ccap->bounds.width = frame->wWidth; | ||
| 816 | ccap->bounds.height = frame->wHeight; | ||
| 817 | |||
| 818 | ccap->defrect = ccap->bounds; | ||
| 819 | |||
| 820 | ccap->pixelaspect.numerator = 1; | ||
| 821 | ccap->pixelaspect.denominator = 1; | ||
| 822 | break; | ||
| 823 | } | ||
| 824 | |||
| 825 | case VIDIOC_G_CROP: | ||
| 826 | case VIDIOC_S_CROP: | ||
| 827 | return -EINVAL; | ||
| 828 | |||
| 829 | /* Buffers & streaming */ | ||
| 830 | case VIDIOC_REQBUFS: | ||
| 831 | { | ||
| 832 | struct v4l2_requestbuffers *rb = arg; | ||
| 833 | unsigned int bufsize = | ||
| 834 | video->streaming->ctrl.dwMaxVideoFrameSize; | ||
| 835 | |||
| 836 | if (rb->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || | ||
| 837 | rb->memory != V4L2_MEMORY_MMAP) | ||
| 838 | return -EINVAL; | ||
| 839 | |||
| 840 | if ((ret = uvc_acquire_privileges(handle)) < 0) | ||
| 841 | return ret; | ||
| 842 | |||
| 843 | ret = uvc_alloc_buffers(&video->queue, rb->count, bufsize); | ||
| 844 | if (ret < 0) | ||
| 845 | return ret; | ||
| 846 | |||
| 847 | if (!(video->streaming->cur_format->flags & | ||
| 848 | UVC_FMT_FLAG_COMPRESSED)) | ||
| 849 | video->queue.flags |= UVC_QUEUE_DROP_INCOMPLETE; | ||
| 850 | |||
| 851 | rb->count = ret; | ||
| 852 | ret = 0; | ||
| 853 | break; | ||
| 854 | } | ||
| 855 | |||
| 856 | case VIDIOC_QUERYBUF: | ||
| 857 | { | ||
| 858 | struct v4l2_buffer *buf = arg; | ||
| 859 | |||
| 860 | if (buf->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 861 | return -EINVAL; | ||
| 862 | |||
| 863 | if (!uvc_has_privileges(handle)) | ||
| 864 | return -EBUSY; | ||
| 865 | |||
| 866 | return uvc_query_buffer(&video->queue, buf); | ||
| 867 | } | ||
| 868 | |||
| 869 | case VIDIOC_QBUF: | ||
| 870 | if (!uvc_has_privileges(handle)) | ||
| 871 | return -EBUSY; | ||
| 872 | |||
| 873 | return uvc_queue_buffer(&video->queue, arg); | ||
| 874 | |||
| 875 | case VIDIOC_DQBUF: | ||
| 876 | if (!uvc_has_privileges(handle)) | ||
| 877 | return -EBUSY; | ||
| 878 | |||
| 879 | return uvc_dequeue_buffer(&video->queue, arg, | ||
| 880 | file->f_flags & O_NONBLOCK); | ||
| 881 | |||
| 882 | case VIDIOC_STREAMON: | ||
| 883 | { | ||
| 884 | int *type = arg; | ||
| 885 | |||
| 886 | if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 887 | return -EINVAL; | ||
| 888 | |||
| 889 | if (!uvc_has_privileges(handle)) | ||
| 890 | return -EBUSY; | ||
| 891 | |||
| 892 | if ((ret = uvc_video_enable(video, 1)) < 0) | ||
| 893 | return ret; | ||
| 894 | break; | ||
| 895 | } | ||
| 896 | |||
| 897 | case VIDIOC_STREAMOFF: | ||
| 898 | { | ||
| 899 | int *type = arg; | ||
| 900 | |||
| 901 | if (*type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | ||
| 902 | return -EINVAL; | ||
| 903 | |||
| 904 | if (!uvc_has_privileges(handle)) | ||
| 905 | return -EBUSY; | ||
| 906 | |||
| 907 | return uvc_video_enable(video, 0); | ||
| 908 | } | ||
| 909 | |||
| 910 | /* Analog video standards make no sense for digital cameras. */ | ||
| 911 | case VIDIOC_ENUMSTD: | ||
| 912 | case VIDIOC_QUERYSTD: | ||
| 913 | case VIDIOC_G_STD: | ||
| 914 | case VIDIOC_S_STD: | ||
| 915 | |||
| 916 | case VIDIOC_OVERLAY: | ||
| 917 | |||
| 918 | case VIDIOC_ENUMAUDIO: | ||
| 919 | case VIDIOC_ENUMAUDOUT: | ||
| 920 | |||
| 921 | case VIDIOC_ENUMOUTPUT: | ||
| 922 | uvc_trace(UVC_TRACE_IOCTL, "Unsupported ioctl 0x%08x\n", cmd); | ||
| 923 | return -EINVAL; | ||
| 924 | |||
| 925 | /* Dynamic controls. */ | ||
| 926 | case UVCIOC_CTRL_ADD: | ||
| 927 | { | ||
| 928 | struct uvc_xu_control_info *xinfo = arg; | ||
| 929 | struct uvc_control_info *info; | ||
| 930 | |||
| 931 | if (!capable(CAP_SYS_ADMIN)) | ||
| 932 | return -EPERM; | ||
| 933 | |||
| 934 | info = kmalloc(sizeof *info, GFP_KERNEL); | ||
| 935 | if (info == NULL) | ||
| 936 | return -ENOMEM; | ||
| 937 | |||
| 938 | memcpy(info->entity, xinfo->entity, sizeof info->entity); | ||
| 939 | info->index = xinfo->index; | ||
| 940 | info->selector = xinfo->selector; | ||
| 941 | info->size = xinfo->size; | ||
| 942 | info->flags = xinfo->flags; | ||
| 943 | |||
| 944 | info->flags |= UVC_CONTROL_GET_MIN | UVC_CONTROL_GET_MAX | | ||
| 945 | UVC_CONTROL_GET_RES | UVC_CONTROL_GET_DEF; | ||
| 946 | |||
| 947 | ret = uvc_ctrl_add_info(info); | ||
| 948 | if (ret < 0) | ||
| 949 | kfree(info); | ||
| 950 | break; | ||
| 951 | } | ||
| 952 | |||
| 953 | case UVCIOC_CTRL_MAP: | ||
| 954 | { | ||
| 955 | struct uvc_xu_control_mapping *xmap = arg; | ||
| 956 | struct uvc_control_mapping *map; | ||
| 957 | |||
| 958 | if (!capable(CAP_SYS_ADMIN)) | ||
| 959 | return -EPERM; | ||
| 960 | |||
| 961 | map = kmalloc(sizeof *map, GFP_KERNEL); | ||
| 962 | if (map == NULL) | ||
| 963 | return -ENOMEM; | ||
| 964 | |||
| 965 | map->id = xmap->id; | ||
| 966 | memcpy(map->name, xmap->name, sizeof map->name); | ||
| 967 | memcpy(map->entity, xmap->entity, sizeof map->entity); | ||
| 968 | map->selector = xmap->selector; | ||
| 969 | map->size = xmap->size; | ||
| 970 | map->offset = xmap->offset; | ||
| 971 | map->v4l2_type = xmap->v4l2_type; | ||
| 972 | map->data_type = xmap->data_type; | ||
| 973 | |||
| 974 | ret = uvc_ctrl_add_mapping(map); | ||
| 975 | if (ret < 0) | ||
| 976 | kfree(map); | ||
| 977 | break; | ||
| 978 | } | ||
| 979 | |||
| 980 | case UVCIOC_CTRL_GET: | ||
| 981 | return uvc_xu_ctrl_query(video, arg, 0); | ||
| 982 | |||
| 983 | case UVCIOC_CTRL_SET: | ||
| 984 | return uvc_xu_ctrl_query(video, arg, 1); | ||
| 985 | |||
| 986 | default: | ||
| 987 | if ((ret = v4l_compat_translate_ioctl(inode, file, cmd, arg, | ||
| 988 | uvc_v4l2_do_ioctl)) == -ENOIOCTLCMD) | ||
| 989 | uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n", | ||
| 990 | cmd); | ||
| 991 | return ret; | ||
| 992 | } | ||
| 993 | |||
| 994 | return ret; | ||
| 995 | } | ||
| 996 | |||
| 997 | static int uvc_v4l2_ioctl(struct inode *inode, struct file *file, | ||
| 998 | unsigned int cmd, unsigned long arg) | ||
| 999 | { | ||
| 1000 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_ioctl\n"); | ||
| 1001 | return video_usercopy(inode, file, cmd, arg, uvc_v4l2_do_ioctl); | ||
| 1002 | } | ||
| 1003 | |||
| 1004 | static ssize_t uvc_v4l2_read(struct file *file, char __user *data, | ||
| 1005 | size_t count, loff_t *ppos) | ||
| 1006 | { | ||
| 1007 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_read: not implemented.\n"); | ||
| 1008 | return -ENODEV; | ||
| 1009 | } | ||
| 1010 | |||
| 1011 | /* | ||
| 1012 | * VMA operations. | ||
| 1013 | */ | ||
| 1014 | static void uvc_vm_open(struct vm_area_struct *vma) | ||
| 1015 | { | ||
| 1016 | struct uvc_buffer *buffer = vma->vm_private_data; | ||
| 1017 | buffer->vma_use_count++; | ||
| 1018 | } | ||
| 1019 | |||
| 1020 | static void uvc_vm_close(struct vm_area_struct *vma) | ||
| 1021 | { | ||
| 1022 | struct uvc_buffer *buffer = vma->vm_private_data; | ||
| 1023 | buffer->vma_use_count--; | ||
| 1024 | } | ||
| 1025 | |||
| 1026 | static struct vm_operations_struct uvc_vm_ops = { | ||
| 1027 | .open = uvc_vm_open, | ||
| 1028 | .close = uvc_vm_close, | ||
| 1029 | }; | ||
| 1030 | |||
| 1031 | static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma) | ||
| 1032 | { | ||
| 1033 | struct video_device *vdev = video_devdata(file); | ||
| 1034 | struct uvc_video_device *video = video_get_drvdata(vdev); | ||
| 1035 | struct uvc_buffer *buffer; | ||
| 1036 | struct page *page; | ||
| 1037 | unsigned long addr, start, size; | ||
| 1038 | unsigned int i; | ||
| 1039 | int ret = 0; | ||
| 1040 | |||
| 1041 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_mmap\n"); | ||
| 1042 | |||
| 1043 | start = vma->vm_start; | ||
| 1044 | size = vma->vm_end - vma->vm_start; | ||
| 1045 | |||
| 1046 | mutex_lock(&video->queue.mutex); | ||
| 1047 | |||
| 1048 | for (i = 0; i < video->queue.count; ++i) { | ||
| 1049 | buffer = &video->queue.buffer[i]; | ||
| 1050 | if ((buffer->buf.m.offset >> PAGE_SHIFT) == vma->vm_pgoff) | ||
| 1051 | break; | ||
| 1052 | } | ||
| 1053 | |||
| 1054 | if (i == video->queue.count || size != video->queue.buf_size) { | ||
| 1055 | ret = -EINVAL; | ||
| 1056 | goto done; | ||
| 1057 | } | ||
| 1058 | |||
| 1059 | /* | ||
| 1060 | * VM_IO marks the area as being an mmaped region for I/O to a | ||
| 1061 | * device. It also prevents the region from being core dumped. | ||
| 1062 | */ | ||
| 1063 | vma->vm_flags |= VM_IO; | ||
| 1064 | |||
| 1065 | addr = (unsigned long)video->queue.mem + buffer->buf.m.offset; | ||
| 1066 | while (size > 0) { | ||
| 1067 | page = vmalloc_to_page((void *)addr); | ||
| 1068 | if ((ret = vm_insert_page(vma, start, page)) < 0) | ||
| 1069 | goto done; | ||
| 1070 | |||
| 1071 | start += PAGE_SIZE; | ||
| 1072 | addr += PAGE_SIZE; | ||
| 1073 | size -= PAGE_SIZE; | ||
| 1074 | } | ||
| 1075 | |||
| 1076 | vma->vm_ops = &uvc_vm_ops; | ||
| 1077 | vma->vm_private_data = buffer; | ||
| 1078 | uvc_vm_open(vma); | ||
| 1079 | |||
| 1080 | done: | ||
| 1081 | mutex_unlock(&video->queue.mutex); | ||
| 1082 | return ret; | ||
| 1083 | } | ||
| 1084 | |||
| 1085 | static unsigned int uvc_v4l2_poll(struct file *file, poll_table *wait) | ||
| 1086 | { | ||
| 1087 | struct video_device *vdev = video_devdata(file); | ||
| 1088 | struct uvc_video_device *video = video_get_drvdata(vdev); | ||
| 1089 | |||
| 1090 | uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n"); | ||
| 1091 | |||
| 1092 | return uvc_queue_poll(&video->queue, file, wait); | ||
| 1093 | } | ||
| 1094 | |||
| 1095 | struct file_operations uvc_fops = { | ||
| 1096 | .owner = THIS_MODULE, | ||
| 1097 | .open = uvc_v4l2_open, | ||
| 1098 | .release = uvc_v4l2_release, | ||
| 1099 | .ioctl = uvc_v4l2_ioctl, | ||
| 1100 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 1101 | .llseek = no_llseek, | ||
| 1102 | .read = uvc_v4l2_read, | ||
| 1103 | .mmap = uvc_v4l2_mmap, | ||
| 1104 | .poll = uvc_v4l2_poll, | ||
| 1105 | }; | ||
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c new file mode 100644 index 000000000000..6faf1fb21614 --- /dev/null +++ b/drivers/media/video/uvc/uvc_video.c | |||
| @@ -0,0 +1,934 @@ | |||
| 1 | /* | ||
| 2 | * uvc_video.c -- USB Video Class driver - Video handling | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005-2008 | ||
| 5 | * Laurent Pinchart (laurent.pinchart@skynet.be) | ||
| 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 as published by | ||
| 9 | * the Free Software Foundation; either version 2 of the License, or | ||
| 10 | * (at your option) any later version. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/version.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/usb.h> | ||
| 19 | #include <linux/videodev2.h> | ||
| 20 | #include <linux/vmalloc.h> | ||
| 21 | #include <linux/wait.h> | ||
| 22 | #include <asm/atomic.h> | ||
| 23 | #include <asm/unaligned.h> | ||
| 24 | |||
| 25 | #include <media/v4l2-common.h> | ||
| 26 | |||
| 27 | #include "uvcvideo.h" | ||
| 28 | |||
| 29 | /* ------------------------------------------------------------------------ | ||
| 30 | * UVC Controls | ||
| 31 | */ | ||
| 32 | |||
| 33 | static int __uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, | ||
| 34 | __u8 intfnum, __u8 cs, void *data, __u16 size, | ||
| 35 | int timeout) | ||
| 36 | { | ||
| 37 | __u8 type = USB_TYPE_CLASS | USB_RECIP_INTERFACE; | ||
| 38 | unsigned int pipe; | ||
| 39 | int ret; | ||
| 40 | |||
| 41 | pipe = (query & 0x80) ? usb_rcvctrlpipe(dev->udev, 0) | ||
| 42 | : usb_sndctrlpipe(dev->udev, 0); | ||
| 43 | type |= (query & 0x80) ? USB_DIR_IN : USB_DIR_OUT; | ||
| 44 | |||
| 45 | ret = usb_control_msg(dev->udev, pipe, query, type, cs << 8, | ||
| 46 | unit << 8 | intfnum, data, size, timeout); | ||
| 47 | |||
| 48 | if (ret != size) { | ||
| 49 | uvc_printk(KERN_ERR, "Failed to query (%u) UVC control %u " | ||
| 50 | "(unit %u) : %d (exp. %u).\n", query, cs, unit, ret, | ||
| 51 | size); | ||
| 52 | return -EIO; | ||
| 53 | } | ||
| 54 | |||
| 55 | return 0; | ||
| 56 | } | ||
| 57 | |||
| 58 | int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, | ||
| 59 | __u8 intfnum, __u8 cs, void *data, __u16 size) | ||
| 60 | { | ||
| 61 | return __uvc_query_ctrl(dev, query, unit, intfnum, cs, data, size, | ||
| 62 | UVC_CTRL_CONTROL_TIMEOUT); | ||
| 63 | } | ||
| 64 | |||
| 65 | static void uvc_fixup_buffer_size(struct uvc_video_device *video, | ||
| 66 | struct uvc_streaming_control *ctrl) | ||
| 67 | { | ||
| 68 | struct uvc_format *format; | ||
| 69 | struct uvc_frame *frame; | ||
| 70 | |||
| 71 | if (ctrl->bFormatIndex <= 0 || | ||
| 72 | ctrl->bFormatIndex > video->streaming->nformats) | ||
| 73 | return; | ||
| 74 | |||
| 75 | format = &video->streaming->format[ctrl->bFormatIndex - 1]; | ||
| 76 | |||
| 77 | if (ctrl->bFrameIndex <= 0 || | ||
| 78 | ctrl->bFrameIndex > format->nframes) | ||
| 79 | return; | ||
| 80 | |||
| 81 | frame = &format->frame[ctrl->bFrameIndex - 1]; | ||
| 82 | |||
| 83 | if (!(format->flags & UVC_FMT_FLAG_COMPRESSED) || | ||
| 84 | (ctrl->dwMaxVideoFrameSize == 0 && | ||
| 85 | video->dev->uvc_version < 0x0110)) | ||
| 86 | ctrl->dwMaxVideoFrameSize = | ||
| 87 | frame->dwMaxVideoFrameBufferSize; | ||
| 88 | } | ||
| 89 | |||
| 90 | static int uvc_get_video_ctrl(struct uvc_video_device *video, | ||
| 91 | struct uvc_streaming_control *ctrl, int probe, __u8 query) | ||
| 92 | { | ||
| 93 | __u8 data[34]; | ||
| 94 | __u8 size; | ||
| 95 | int ret; | ||
| 96 | |||
| 97 | size = video->dev->uvc_version >= 0x0110 ? 34 : 26; | ||
| 98 | ret = __uvc_query_ctrl(video->dev, query, 0, video->streaming->intfnum, | ||
| 99 | probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, &data, size, | ||
| 100 | UVC_CTRL_STREAMING_TIMEOUT); | ||
| 101 | |||
| 102 | if (ret < 0) | ||
| 103 | return ret; | ||
| 104 | |||
| 105 | ctrl->bmHint = le16_to_cpup((__le16 *)&data[0]); | ||
| 106 | ctrl->bFormatIndex = data[2]; | ||
| 107 | ctrl->bFrameIndex = data[3]; | ||
| 108 | ctrl->dwFrameInterval = le32_to_cpup((__le32 *)&data[4]); | ||
| 109 | ctrl->wKeyFrameRate = le16_to_cpup((__le16 *)&data[8]); | ||
| 110 | ctrl->wPFrameRate = le16_to_cpup((__le16 *)&data[10]); | ||
| 111 | ctrl->wCompQuality = le16_to_cpup((__le16 *)&data[12]); | ||
| 112 | ctrl->wCompWindowSize = le16_to_cpup((__le16 *)&data[14]); | ||
| 113 | ctrl->wDelay = le16_to_cpup((__le16 *)&data[16]); | ||
| 114 | ctrl->dwMaxVideoFrameSize = | ||
| 115 | le32_to_cpu(get_unaligned((__le32 *)&data[18])); | ||
| 116 | ctrl->dwMaxPayloadTransferSize = | ||
| 117 | le32_to_cpu(get_unaligned((__le32 *)&data[22])); | ||
| 118 | |||
| 119 | if (size == 34) { | ||
| 120 | ctrl->dwClockFrequency = | ||
| 121 | le32_to_cpu(get_unaligned((__le32 *)&data[26])); | ||
| 122 | ctrl->bmFramingInfo = data[30]; | ||
| 123 | ctrl->bPreferedVersion = data[31]; | ||
| 124 | ctrl->bMinVersion = data[32]; | ||
| 125 | ctrl->bMaxVersion = data[33]; | ||
| 126 | } else { | ||
| 127 | ctrl->dwClockFrequency = video->dev->clock_frequency; | ||
| 128 | ctrl->bmFramingInfo = 0; | ||
| 129 | ctrl->bPreferedVersion = 0; | ||
| 130 | ctrl->bMinVersion = 0; | ||
| 131 | ctrl->bMaxVersion = 0; | ||
| 132 | } | ||
| 133 | |||
| 134 | /* Some broken devices return a null or wrong dwMaxVideoFrameSize. | ||
| 135 | * Try to get the value from the format and frame descriptor. | ||
| 136 | */ | ||
| 137 | uvc_fixup_buffer_size(video, ctrl); | ||
| 138 | |||
| 139 | return 0; | ||
| 140 | } | ||
| 141 | |||
| 142 | int uvc_set_video_ctrl(struct uvc_video_device *video, | ||
| 143 | struct uvc_streaming_control *ctrl, int probe) | ||
| 144 | { | ||
| 145 | __u8 data[34]; | ||
| 146 | __u8 size; | ||
| 147 | |||
| 148 | size = video->dev->uvc_version >= 0x0110 ? 34 : 26; | ||
| 149 | memset(data, 0, sizeof data); | ||
| 150 | |||
| 151 | *(__le16 *)&data[0] = cpu_to_le16(ctrl->bmHint); | ||
| 152 | data[2] = ctrl->bFormatIndex; | ||
| 153 | data[3] = ctrl->bFrameIndex; | ||
| 154 | *(__le32 *)&data[4] = cpu_to_le32(ctrl->dwFrameInterval); | ||
| 155 | *(__le16 *)&data[8] = cpu_to_le16(ctrl->wKeyFrameRate); | ||
| 156 | *(__le16 *)&data[10] = cpu_to_le16(ctrl->wPFrameRate); | ||
| 157 | *(__le16 *)&data[12] = cpu_to_le16(ctrl->wCompQuality); | ||
| 158 | *(__le16 *)&data[14] = cpu_to_le16(ctrl->wCompWindowSize); | ||
| 159 | *(__le16 *)&data[16] = cpu_to_le16(ctrl->wDelay); | ||
| 160 | /* Note: Some of the fields below are not required for IN devices (see | ||
| 161 | * UVC spec, 4.3.1.1), but we still copy them in case support for OUT | ||
| 162 | * devices is added in the future. */ | ||
| 163 | put_unaligned(cpu_to_le32(ctrl->dwMaxVideoFrameSize), | ||
| 164 | (__le32 *)&data[18]); | ||
| 165 | put_unaligned(cpu_to_le32(ctrl->dwMaxPayloadTransferSize), | ||
| 166 | (__le32 *)&data[22]); | ||
| 167 | |||
| 168 | if (size == 34) { | ||
| 169 | put_unaligned(cpu_to_le32(ctrl->dwClockFrequency), | ||
| 170 | (__le32 *)&data[26]); | ||
| 171 | data[30] = ctrl->bmFramingInfo; | ||
| 172 | data[31] = ctrl->bPreferedVersion; | ||
| 173 | data[32] = ctrl->bMinVersion; | ||
| 174 | data[33] = ctrl->bMaxVersion; | ||
| 175 | } | ||
| 176 | |||
| 177 | return __uvc_query_ctrl(video->dev, SET_CUR, 0, | ||
| 178 | video->streaming->intfnum, | ||
| 179 | probe ? VS_PROBE_CONTROL : VS_COMMIT_CONTROL, &data, size, | ||
| 180 | UVC_CTRL_STREAMING_TIMEOUT); | ||
| 181 | } | ||
| 182 | |||
| 183 | int uvc_probe_video(struct uvc_video_device *video, | ||
| 184 | struct uvc_streaming_control *probe) | ||
| 185 | { | ||
| 186 | struct uvc_streaming_control probe_min, probe_max; | ||
| 187 | __u16 bandwidth; | ||
| 188 | unsigned int i; | ||
| 189 | int ret; | ||
| 190 | |||
| 191 | mutex_lock(&video->streaming->mutex); | ||
| 192 | |||
| 193 | /* Perform probing. The device should adjust the requested values | ||
| 194 | * according to its capabilities. However, some devices, namely the | ||
| 195 | * first generation UVC Logitech webcams, don't implement the Video | ||
| 196 | * Probe control properly, and just return the needed bandwidth. For | ||
| 197 | * that reason, if the needed bandwidth exceeds the maximum available | ||
| 198 | * bandwidth, try to lower the quality. | ||
| 199 | */ | ||
| 200 | if ((ret = uvc_set_video_ctrl(video, probe, 1)) < 0) | ||
| 201 | goto done; | ||
| 202 | |||
| 203 | /* Get the minimum and maximum values for compression settings. */ | ||
| 204 | if (!(video->dev->quirks & UVC_QUIRK_PROBE_MINMAX)) { | ||
| 205 | ret = uvc_get_video_ctrl(video, &probe_min, 1, GET_MIN); | ||
| 206 | if (ret < 0) | ||
| 207 | goto done; | ||
| 208 | ret = uvc_get_video_ctrl(video, &probe_max, 1, GET_MAX); | ||
| 209 | if (ret < 0) | ||
| 210 | goto done; | ||
| 211 | |||
| 212 | probe->wCompQuality = probe_max.wCompQuality; | ||
| 213 | } | ||
| 214 | |||
| 215 | for (i = 0; i < 2; ++i) { | ||
| 216 | if ((ret = uvc_set_video_ctrl(video, probe, 1)) < 0 || | ||
| 217 | (ret = uvc_get_video_ctrl(video, probe, 1, GET_CUR)) < 0) | ||
| 218 | goto done; | ||
| 219 | |||
| 220 | if (video->streaming->intf->num_altsetting == 1) | ||
| 221 | break; | ||
| 222 | |||
| 223 | bandwidth = probe->dwMaxPayloadTransferSize; | ||
| 224 | if (bandwidth <= video->streaming->maxpsize) | ||
| 225 | break; | ||
| 226 | |||
| 227 | if (video->dev->quirks & UVC_QUIRK_PROBE_MINMAX) { | ||
| 228 | ret = -ENOSPC; | ||
| 229 | goto done; | ||
| 230 | } | ||
| 231 | |||
| 232 | /* TODO: negotiate compression parameters */ | ||
| 233 | probe->wKeyFrameRate = probe_min.wKeyFrameRate; | ||
| 234 | probe->wPFrameRate = probe_min.wPFrameRate; | ||
| 235 | probe->wCompQuality = probe_max.wCompQuality; | ||
| 236 | probe->wCompWindowSize = probe_min.wCompWindowSize; | ||
| 237 | } | ||
| 238 | |||
| 239 | done: | ||
| 240 | mutex_unlock(&video->streaming->mutex); | ||
| 241 | return ret; | ||
| 242 | } | ||
| 243 | |||
| 244 | /* ------------------------------------------------------------------------ | ||
| 245 | * Video codecs | ||
| 246 | */ | ||
| 247 | |||
| 248 | /* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */ | ||
| 249 | #define UVC_STREAM_EOH (1 << 7) | ||
| 250 | #define UVC_STREAM_ERR (1 << 6) | ||
| 251 | #define UVC_STREAM_STI (1 << 5) | ||
| 252 | #define UVC_STREAM_RES (1 << 4) | ||
| 253 | #define UVC_STREAM_SCR (1 << 3) | ||
| 254 | #define UVC_STREAM_PTS (1 << 2) | ||
| 255 | #define UVC_STREAM_EOF (1 << 1) | ||
| 256 | #define UVC_STREAM_FID (1 << 0) | ||
| 257 | |||
| 258 | /* Video payload decoding is handled by uvc_video_decode_start(), | ||
| 259 | * uvc_video_decode_data() and uvc_video_decode_end(). | ||
| 260 | * | ||
| 261 | * uvc_video_decode_start is called with URB data at the start of a bulk or | ||
| 262 | * isochronous payload. It processes header data and returns the header size | ||
| 263 | * in bytes if successful. If an error occurs, it returns a negative error | ||
| 264 | * code. The following error codes have special meanings. | ||
| 265 | * | ||
| 266 | * - EAGAIN informs the caller that the current video buffer should be marked | ||
| 267 | * as done, and that the function should be called again with the same data | ||
| 268 | * and a new video buffer. This is used when end of frame conditions can be | ||
| 269 | * reliably detected at the beginning of the next frame only. | ||
| 270 | * | ||
| 271 | * If an error other than -EAGAIN is returned, the caller will drop the current | ||
| 272 | * payload. No call to uvc_video_decode_data and uvc_video_decode_end will be | ||
| 273 | * made until the next payload. -ENODATA can be used to drop the current | ||
| 274 | * payload if no other error code is appropriate. | ||
| 275 | * | ||
| 276 | * uvc_video_decode_data is called for every URB with URB data. It copies the | ||
| 277 | * data to the video buffer. | ||
| 278 | * | ||
| 279 | * uvc_video_decode_end is called with header data at the end of a bulk or | ||
| 280 | * isochronous payload. It performs any additional header data processing and | ||
| 281 | * returns 0 or a negative error code if an error occured. As header data have | ||
| 282 | * already been processed by uvc_video_decode_start, this functions isn't | ||
| 283 | * required to perform sanity checks a second time. | ||
| 284 | * | ||
| 285 | * For isochronous transfers where a payload is always transfered in a single | ||
| 286 | * URB, the three functions will be called in a row. | ||
| 287 | * | ||
| 288 | * To let the decoder process header data and update its internal state even | ||
| 289 | * when no video buffer is available, uvc_video_decode_start must be prepared | ||
| 290 | * to be called with a NULL buf parameter. uvc_video_decode_data and | ||
| 291 | * uvc_video_decode_end will never be called with a NULL buffer. | ||
| 292 | */ | ||
| 293 | static int uvc_video_decode_start(struct uvc_video_device *video, | ||
| 294 | struct uvc_buffer *buf, const __u8 *data, int len) | ||
| 295 | { | ||
| 296 | __u8 fid; | ||
| 297 | |||
| 298 | /* Sanity checks: | ||
| 299 | * - packet must be at least 2 bytes long | ||
| 300 | * - bHeaderLength value must be at least 2 bytes (see above) | ||
| 301 | * - bHeaderLength value can't be larger than the packet size. | ||
| 302 | */ | ||
| 303 | if (len < 2 || data[0] < 2 || data[0] > len) | ||
| 304 | return -EINVAL; | ||
| 305 | |||
| 306 | /* Skip payloads marked with the error bit ("error frames"). */ | ||
| 307 | if (data[1] & UVC_STREAM_ERR) { | ||
| 308 | uvc_trace(UVC_TRACE_FRAME, "Dropping payload (error bit " | ||
| 309 | "set).\n"); | ||
| 310 | return -ENODATA; | ||
| 311 | } | ||
| 312 | |||
| 313 | fid = data[1] & UVC_STREAM_FID; | ||
| 314 | |||
| 315 | /* Store the payload FID bit and return immediately when the buffer is | ||
| 316 | * NULL. | ||
| 317 | */ | ||
| 318 | if (buf == NULL) { | ||
| 319 | video->last_fid = fid; | ||
| 320 | return -ENODATA; | ||
| 321 | } | ||
| 322 | |||
| 323 | /* Synchronize to the input stream by waiting for the FID bit to be | ||
| 324 | * toggled when the the buffer state is not UVC_BUF_STATE_ACTIVE. | ||
| 325 | * queue->last_fid is initialized to -1, so the first isochronous | ||
| 326 | * frame will always be in sync. | ||
| 327 | * | ||
| 328 | * If the device doesn't toggle the FID bit, invert video->last_fid | ||
| 329 | * when the EOF bit is set to force synchronisation on the next packet. | ||
| 330 | */ | ||
| 331 | if (buf->state != UVC_BUF_STATE_ACTIVE) { | ||
| 332 | if (fid == video->last_fid) { | ||
| 333 | uvc_trace(UVC_TRACE_FRAME, "Dropping payload (out of " | ||
| 334 | "sync).\n"); | ||
| 335 | if ((video->dev->quirks & UVC_QUIRK_STREAM_NO_FID) && | ||
| 336 | (data[1] & UVC_STREAM_EOF)) | ||
| 337 | video->last_fid ^= UVC_STREAM_FID; | ||
| 338 | return -ENODATA; | ||
| 339 | } | ||
| 340 | |||
| 341 | /* TODO: Handle PTS and SCR. */ | ||
| 342 | buf->state = UVC_BUF_STATE_ACTIVE; | ||
| 343 | } | ||
| 344 | |||
| 345 | /* Mark the buffer as done if we're at the beginning of a new frame. | ||
| 346 | * End of frame detection is better implemented by checking the EOF | ||
| 347 | * bit (FID bit toggling is delayed by one frame compared to the EOF | ||
| 348 | * bit), but some devices don't set the bit at end of frame (and the | ||
| 349 | * last payload can be lost anyway). We thus must check if the FID has | ||
| 350 | * been toggled. | ||
| 351 | * | ||
| 352 | * queue->last_fid is initialized to -1, so the first isochronous | ||
| 353 | * frame will never trigger an end of frame detection. | ||
| 354 | * | ||
| 355 | * Empty buffers (bytesused == 0) don't trigger end of frame detection | ||
| 356 | * as it doesn't make sense to return an empty buffer. This also | ||
| 357 | * avoids detecting and of frame conditions at FID toggling if the | ||
| 358 | * previous payload had the EOF bit set. | ||
| 359 | */ | ||
| 360 | if (fid != video->last_fid && buf->buf.bytesused != 0) { | ||
| 361 | uvc_trace(UVC_TRACE_FRAME, "Frame complete (FID bit " | ||
| 362 | "toggled).\n"); | ||
| 363 | buf->state = UVC_BUF_STATE_DONE; | ||
| 364 | return -EAGAIN; | ||
| 365 | } | ||
| 366 | |||
| 367 | video->last_fid = fid; | ||
| 368 | |||
| 369 | return data[0]; | ||
| 370 | } | ||
| 371 | |||
| 372 | static void uvc_video_decode_data(struct uvc_video_device *video, | ||
| 373 | struct uvc_buffer *buf, const __u8 *data, int len) | ||
| 374 | { | ||
| 375 | struct uvc_video_queue *queue = &video->queue; | ||
| 376 | unsigned int maxlen, nbytes; | ||
| 377 | void *mem; | ||
| 378 | |||
| 379 | if (len <= 0) | ||
| 380 | return; | ||
| 381 | |||
| 382 | /* Copy the video data to the buffer. */ | ||
| 383 | maxlen = buf->buf.length - buf->buf.bytesused; | ||
| 384 | mem = queue->mem + buf->buf.m.offset + buf->buf.bytesused; | ||
| 385 | nbytes = min((unsigned int)len, maxlen); | ||
| 386 | memcpy(mem, data, nbytes); | ||
| 387 | buf->buf.bytesused += nbytes; | ||
| 388 | |||
| 389 | /* Complete the current frame if the buffer size was exceeded. */ | ||
| 390 | if (len > maxlen) { | ||
| 391 | uvc_trace(UVC_TRACE_FRAME, "Frame complete (overflow).\n"); | ||
| 392 | buf->state = UVC_BUF_STATE_DONE; | ||
| 393 | } | ||
| 394 | } | ||
| 395 | |||
| 396 | static void uvc_video_decode_end(struct uvc_video_device *video, | ||
| 397 | struct uvc_buffer *buf, const __u8 *data, int len) | ||
| 398 | { | ||
| 399 | /* Mark the buffer as done if the EOF marker is set. */ | ||
| 400 | if (data[1] & UVC_STREAM_EOF && buf->buf.bytesused != 0) { | ||
| 401 | uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); | ||
| 402 | if (data[0] == len) | ||
| 403 | uvc_trace(UVC_TRACE_FRAME, "EOF in empty payload.\n"); | ||
| 404 | buf->state = UVC_BUF_STATE_DONE; | ||
| 405 | if (video->dev->quirks & UVC_QUIRK_STREAM_NO_FID) | ||
| 406 | video->last_fid ^= UVC_STREAM_FID; | ||
| 407 | } | ||
| 408 | } | ||
| 409 | |||
| 410 | /* ------------------------------------------------------------------------ | ||
| 411 | * URB handling | ||
| 412 | */ | ||
| 413 | |||
| 414 | /* | ||
| 415 | * Completion handler for video URBs. | ||
| 416 | */ | ||
| 417 | static void uvc_video_decode_isoc(struct urb *urb, | ||
| 418 | struct uvc_video_device *video, struct uvc_buffer *buf) | ||
| 419 | { | ||
| 420 | u8 *mem; | ||
| 421 | int ret, i; | ||
| 422 | |||
| 423 | for (i = 0; i < urb->number_of_packets; ++i) { | ||
| 424 | if (urb->iso_frame_desc[i].status < 0) { | ||
| 425 | uvc_trace(UVC_TRACE_FRAME, "USB isochronous frame " | ||
| 426 | "lost (%d).\n", urb->iso_frame_desc[i].status); | ||
| 427 | continue; | ||
| 428 | } | ||
| 429 | |||
| 430 | /* Decode the payload header. */ | ||
| 431 | mem = urb->transfer_buffer + urb->iso_frame_desc[i].offset; | ||
| 432 | do { | ||
| 433 | ret = uvc_video_decode_start(video, buf, mem, | ||
| 434 | urb->iso_frame_desc[i].actual_length); | ||
| 435 | if (ret == -EAGAIN) | ||
| 436 | buf = uvc_queue_next_buffer(&video->queue, buf); | ||
| 437 | } while (ret == -EAGAIN); | ||
| 438 | |||
| 439 | if (ret < 0) | ||
| 440 | continue; | ||
| 441 | |||
| 442 | /* Decode the payload data. */ | ||
| 443 | uvc_video_decode_data(video, buf, mem + ret, | ||
| 444 | urb->iso_frame_desc[i].actual_length - ret); | ||
| 445 | |||
| 446 | /* Process the header again. */ | ||
| 447 | uvc_video_decode_end(video, buf, mem, ret); | ||
| 448 | |||
| 449 | if (buf->state == UVC_BUF_STATE_DONE || | ||
| 450 | buf->state == UVC_BUF_STATE_ERROR) | ||
| 451 | buf = uvc_queue_next_buffer(&video->queue, buf); | ||
| 452 | } | ||
| 453 | } | ||
| 454 | |||
| 455 | static void uvc_video_decode_bulk(struct urb *urb, | ||
| 456 | struct uvc_video_device *video, struct uvc_buffer *buf) | ||
| 457 | { | ||
| 458 | u8 *mem; | ||
| 459 | int len, ret; | ||
| 460 | |||
| 461 | mem = urb->transfer_buffer; | ||
| 462 | len = urb->actual_length; | ||
| 463 | video->bulk.payload_size += len; | ||
| 464 | |||
| 465 | /* If the URB is the first of its payload, decode and save the | ||
| 466 | * header. | ||
| 467 | */ | ||
| 468 | if (video->bulk.header_size == 0) { | ||
| 469 | do { | ||
| 470 | ret = uvc_video_decode_start(video, buf, mem, len); | ||
| 471 | if (ret == -EAGAIN) | ||
| 472 | buf = uvc_queue_next_buffer(&video->queue, buf); | ||
| 473 | } while (ret == -EAGAIN); | ||
| 474 | |||
| 475 | /* If an error occured skip the rest of the payload. */ | ||
| 476 | if (ret < 0 || buf == NULL) { | ||
| 477 | video->bulk.skip_payload = 1; | ||
| 478 | return; | ||
| 479 | } | ||
| 480 | |||
| 481 | video->bulk.header_size = ret; | ||
| 482 | memcpy(video->bulk.header, mem, video->bulk.header_size); | ||
| 483 | |||
| 484 | mem += ret; | ||
| 485 | len -= ret; | ||
| 486 | } | ||
| 487 | |||
| 488 | /* The buffer queue might have been cancelled while a bulk transfer | ||
| 489 | * was in progress, so we can reach here with buf equal to NULL. Make | ||
| 490 | * sure buf is never dereferenced if NULL. | ||
| 491 | */ | ||
| 492 | |||
| 493 | /* Process video data. */ | ||
| 494 | if (!video->bulk.skip_payload && buf != NULL) | ||
| 495 | uvc_video_decode_data(video, buf, mem, len); | ||
| 496 | |||
| 497 | /* Detect the payload end by a URB smaller than the maximum size (or | ||
| 498 | * a payload size equal to the maximum) and process the header again. | ||
| 499 | */ | ||
| 500 | if (urb->actual_length < urb->transfer_buffer_length || | ||
| 501 | video->bulk.payload_size >= video->bulk.max_payload_size) { | ||
| 502 | if (!video->bulk.skip_payload && buf != NULL) { | ||
| 503 | uvc_video_decode_end(video, buf, video->bulk.header, | ||
| 504 | video->bulk.header_size); | ||
| 505 | if (buf->state == UVC_BUF_STATE_DONE || | ||
| 506 | buf->state == UVC_BUF_STATE_ERROR) | ||
| 507 | buf = uvc_queue_next_buffer(&video->queue, buf); | ||
| 508 | } | ||
| 509 | |||
| 510 | video->bulk.header_size = 0; | ||
| 511 | video->bulk.skip_payload = 0; | ||
| 512 | video->bulk.payload_size = 0; | ||
| 513 | } | ||
| 514 | } | ||
| 515 | |||
| 516 | static void uvc_video_complete(struct urb *urb) | ||
| 517 | { | ||
| 518 | struct uvc_video_device *video = urb->context; | ||
| 519 | struct uvc_video_queue *queue = &video->queue; | ||
| 520 | struct uvc_buffer *buf = NULL; | ||
| 521 | unsigned long flags; | ||
| 522 | int ret; | ||
| 523 | |||
| 524 | switch (urb->status) { | ||
| 525 | case 0: | ||
| 526 | break; | ||
| 527 | |||
| 528 | default: | ||
| 529 | uvc_printk(KERN_WARNING, "Non-zero status (%d) in video " | ||
| 530 | "completion handler.\n", urb->status); | ||
| 531 | |||
| 532 | case -ENOENT: /* usb_kill_urb() called. */ | ||
| 533 | if (video->frozen) | ||
| 534 | return; | ||
| 535 | |||
| 536 | case -ECONNRESET: /* usb_unlink_urb() called. */ | ||
| 537 | case -ESHUTDOWN: /* The endpoint is being disabled. */ | ||
| 538 | uvc_queue_cancel(queue, urb->status == -ESHUTDOWN); | ||
| 539 | return; | ||
| 540 | } | ||
| 541 | |||
| 542 | spin_lock_irqsave(&queue->irqlock, flags); | ||
| 543 | if (!list_empty(&queue->irqqueue)) | ||
| 544 | buf = list_first_entry(&queue->irqqueue, struct uvc_buffer, | ||
| 545 | queue); | ||
| 546 | spin_unlock_irqrestore(&queue->irqlock, flags); | ||
| 547 | |||
| 548 | video->decode(urb, video, buf); | ||
| 549 | |||
| 550 | if ((ret = usb_submit_urb(urb, GFP_ATOMIC)) < 0) { | ||
| 551 | uvc_printk(KERN_ERR, "Failed to resubmit video URB (%d).\n", | ||
| 552 | ret); | ||
| 553 | } | ||
| 554 | } | ||
| 555 | |||
| 556 | /* | ||
| 557 | * Uninitialize isochronous/bulk URBs and free transfer buffers. | ||
| 558 | */ | ||
| 559 | static void uvc_uninit_video(struct uvc_video_device *video) | ||
| 560 | { | ||
| 561 | struct urb *urb; | ||
| 562 | unsigned int i; | ||
| 563 | |||
| 564 | for (i = 0; i < UVC_URBS; ++i) { | ||
| 565 | if ((urb = video->urb[i]) == NULL) | ||
| 566 | continue; | ||
| 567 | |||
| 568 | usb_kill_urb(urb); | ||
| 569 | /* urb->transfer_buffer_length is not touched by USB core, so | ||
| 570 | * we can use it here as the buffer length. | ||
| 571 | */ | ||
| 572 | if (video->urb_buffer[i]) { | ||
| 573 | usb_buffer_free(video->dev->udev, | ||
| 574 | urb->transfer_buffer_length, | ||
| 575 | video->urb_buffer[i], urb->transfer_dma); | ||
| 576 | video->urb_buffer[i] = NULL; | ||
| 577 | } | ||
| 578 | |||
| 579 | usb_free_urb(urb); | ||
| 580 | video->urb[i] = NULL; | ||
| 581 | } | ||
| 582 | } | ||
| 583 | |||
| 584 | /* | ||
| 585 | * Initialize isochronous URBs and allocate transfer buffers. The packet size | ||
| 586 | * is given by the endpoint. | ||
| 587 | */ | ||
| 588 | static int uvc_init_video_isoc(struct uvc_video_device *video, | ||
| 589 | struct usb_host_endpoint *ep) | ||
| 590 | { | ||
| 591 | struct urb *urb; | ||
| 592 | unsigned int npackets, i, j; | ||
| 593 | __u16 psize; | ||
| 594 | __u32 size; | ||
| 595 | |||
| 596 | /* Compute the number of isochronous packets to allocate by dividing | ||
| 597 | * the maximum video frame size by the packet size. Limit the result | ||
| 598 | * to UVC_MAX_ISO_PACKETS. | ||
| 599 | */ | ||
| 600 | psize = le16_to_cpu(ep->desc.wMaxPacketSize); | ||
| 601 | psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); | ||
| 602 | |||
| 603 | size = video->streaming->ctrl.dwMaxVideoFrameSize; | ||
| 604 | if (size > UVC_MAX_FRAME_SIZE) | ||
| 605 | return -EINVAL; | ||
| 606 | |||
| 607 | npackets = (size + psize - 1) / psize; | ||
| 608 | if (npackets > UVC_MAX_ISO_PACKETS) | ||
| 609 | npackets = UVC_MAX_ISO_PACKETS; | ||
| 610 | |||
| 611 | size = npackets * psize; | ||
| 612 | |||
| 613 | for (i = 0; i < UVC_URBS; ++i) { | ||
| 614 | urb = usb_alloc_urb(npackets, GFP_KERNEL); | ||
| 615 | if (urb == NULL) { | ||
| 616 | uvc_uninit_video(video); | ||
| 617 | return -ENOMEM; | ||
| 618 | } | ||
| 619 | |||
| 620 | video->urb_buffer[i] = usb_buffer_alloc(video->dev->udev, | ||
| 621 | size, GFP_KERNEL, &urb->transfer_dma); | ||
| 622 | if (video->urb_buffer[i] == NULL) { | ||
| 623 | usb_free_urb(urb); | ||
| 624 | uvc_uninit_video(video); | ||
| 625 | return -ENOMEM; | ||
| 626 | } | ||
| 627 | |||
| 628 | urb->dev = video->dev->udev; | ||
| 629 | urb->context = video; | ||
| 630 | urb->pipe = usb_rcvisocpipe(video->dev->udev, | ||
| 631 | ep->desc.bEndpointAddress); | ||
| 632 | urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; | ||
| 633 | urb->interval = ep->desc.bInterval; | ||
| 634 | urb->transfer_buffer = video->urb_buffer[i]; | ||
| 635 | urb->complete = uvc_video_complete; | ||
| 636 | urb->number_of_packets = npackets; | ||
| 637 | urb->transfer_buffer_length = size; | ||
| 638 | |||
| 639 | for (j = 0; j < npackets; ++j) { | ||
| 640 | urb->iso_frame_desc[j].offset = j * psize; | ||
| 641 | urb->iso_frame_desc[j].length = psize; | ||
| 642 | } | ||
| 643 | |||
| 644 | video->urb[i] = urb; | ||
| 645 | } | ||
| 646 | |||
| 647 | return 0; | ||
| 648 | } | ||
| 649 | |||
| 650 | /* | ||
| 651 | * Initialize bulk URBs and allocate transfer buffers. The packet size is | ||
| 652 | * given by the endpoint. | ||
| 653 | */ | ||
| 654 | static int uvc_init_video_bulk(struct uvc_video_device *video, | ||
| 655 | struct usb_host_endpoint *ep) | ||
| 656 | { | ||
| 657 | struct urb *urb; | ||
| 658 | unsigned int pipe, i; | ||
| 659 | __u16 psize; | ||
| 660 | __u32 size; | ||
| 661 | |||
| 662 | /* Compute the bulk URB size. Some devices set the maximum payload | ||
| 663 | * size to a value too high for memory-constrained devices. We must | ||
| 664 | * then transfer the payload accross multiple URBs. To be consistant | ||
| 665 | * with isochronous mode, allocate maximum UVC_MAX_ISO_PACKETS per bulk | ||
| 666 | * URB. | ||
| 667 | */ | ||
| 668 | psize = le16_to_cpu(ep->desc.wMaxPacketSize) & 0x07ff; | ||
| 669 | size = video->streaming->ctrl.dwMaxPayloadTransferSize; | ||
| 670 | video->bulk.max_payload_size = size; | ||
| 671 | if (size > psize * UVC_MAX_ISO_PACKETS) | ||
| 672 | size = psize * UVC_MAX_ISO_PACKETS; | ||
| 673 | |||
| 674 | pipe = usb_rcvbulkpipe(video->dev->udev, ep->desc.bEndpointAddress); | ||
| 675 | |||
| 676 | for (i = 0; i < UVC_URBS; ++i) { | ||
| 677 | urb = usb_alloc_urb(0, GFP_KERNEL); | ||
| 678 | if (urb == NULL) { | ||
| 679 | uvc_uninit_video(video); | ||
| 680 | return -ENOMEM; | ||
| 681 | } | ||
| 682 | |||
| 683 | video->urb_buffer[i] = usb_buffer_alloc(video->dev->udev, | ||
| 684 | size, GFP_KERNEL, &urb->transfer_dma); | ||
| 685 | if (video->urb_buffer[i] == NULL) { | ||
| 686 | usb_free_urb(urb); | ||
| 687 | uvc_uninit_video(video); | ||
| 688 | return -ENOMEM; | ||
| 689 | } | ||
| 690 | |||
| 691 | usb_fill_bulk_urb(urb, video->dev->udev, pipe, | ||
| 692 | video->urb_buffer[i], size, uvc_video_complete, | ||
| 693 | video); | ||
| 694 | urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; | ||
| 695 | |||
| 696 | video->urb[i] = urb; | ||
| 697 | } | ||
| 698 | |||
| 699 | return 0; | ||
| 700 | } | ||
| 701 | |||
| 702 | /* | ||
| 703 | * Initialize isochronous/bulk URBs and allocate transfer buffers. | ||
| 704 | */ | ||
| 705 | static int uvc_init_video(struct uvc_video_device *video) | ||
| 706 | { | ||
| 707 | struct usb_interface *intf = video->streaming->intf; | ||
| 708 | struct usb_host_interface *alts; | ||
| 709 | struct usb_host_endpoint *ep = NULL; | ||
| 710 | int intfnum = video->streaming->intfnum; | ||
| 711 | unsigned int bandwidth, psize, i; | ||
| 712 | int ret; | ||
| 713 | |||
| 714 | video->last_fid = -1; | ||
| 715 | video->bulk.header_size = 0; | ||
| 716 | video->bulk.skip_payload = 0; | ||
| 717 | video->bulk.payload_size = 0; | ||
| 718 | |||
| 719 | if (intf->num_altsetting > 1) { | ||
| 720 | /* Isochronous endpoint, select the alternate setting. */ | ||
| 721 | bandwidth = video->streaming->ctrl.dwMaxPayloadTransferSize; | ||
| 722 | |||
| 723 | if (bandwidth == 0) { | ||
| 724 | uvc_printk(KERN_WARNING, "device %s requested null " | ||
| 725 | "bandwidth, defaulting to lowest.\n", | ||
| 726 | video->vdev->name); | ||
| 727 | bandwidth = 1; | ||
| 728 | } | ||
| 729 | |||
| 730 | for (i = 0; i < intf->num_altsetting; ++i) { | ||
| 731 | alts = &intf->altsetting[i]; | ||
| 732 | ep = uvc_find_endpoint(alts, | ||
| 733 | video->streaming->header.bEndpointAddress); | ||
| 734 | if (ep == NULL) | ||
| 735 | continue; | ||
| 736 | |||
| 737 | /* Check if the bandwidth is high enough. */ | ||
| 738 | psize = le16_to_cpu(ep->desc.wMaxPacketSize); | ||
| 739 | psize = (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); | ||
| 740 | if (psize >= bandwidth) | ||
| 741 | break; | ||
| 742 | } | ||
| 743 | |||
| 744 | if (i >= intf->num_altsetting) | ||
| 745 | return -EIO; | ||
| 746 | |||
| 747 | if ((ret = usb_set_interface(video->dev->udev, intfnum, i)) < 0) | ||
| 748 | return ret; | ||
| 749 | |||
| 750 | ret = uvc_init_video_isoc(video, ep); | ||
| 751 | } else { | ||
| 752 | /* Bulk endpoint, proceed to URB initialization. */ | ||
| 753 | ep = uvc_find_endpoint(&intf->altsetting[0], | ||
| 754 | video->streaming->header.bEndpointAddress); | ||
| 755 | if (ep == NULL) | ||
| 756 | return -EIO; | ||
| 757 | |||
| 758 | ret = uvc_init_video_bulk(video, ep); | ||
| 759 | } | ||
| 760 | |||
| 761 | if (ret < 0) | ||
| 762 | return ret; | ||
| 763 | |||
| 764 | /* Submit the URBs. */ | ||
| 765 | for (i = 0; i < UVC_URBS; ++i) { | ||
| 766 | if ((ret = usb_submit_urb(video->urb[i], GFP_KERNEL)) < 0) { | ||
| 767 | uvc_printk(KERN_ERR, "Failed to submit URB %u " | ||
| 768 | "(%d).\n", i, ret); | ||
| 769 | uvc_uninit_video(video); | ||
| 770 | return ret; | ||
| 771 | } | ||
| 772 | } | ||
| 773 | |||
| 774 | return 0; | ||
| 775 | } | ||
| 776 | |||
| 777 | /* -------------------------------------------------------------------------- | ||
| 778 | * Suspend/resume | ||
| 779 | */ | ||
| 780 | |||
| 781 | /* | ||
| 782 | * Stop streaming without disabling the video queue. | ||
| 783 | * | ||
| 784 | * To let userspace applications resume without trouble, we must not touch the | ||
| 785 | * video buffers in any way. We mark the device as frozen to make sure the URB | ||
| 786 | * completion handler won't try to cancel the queue when we kill the URBs. | ||
| 787 | */ | ||
| 788 | int uvc_video_suspend(struct uvc_video_device *video) | ||
| 789 | { | ||
| 790 | if (!uvc_queue_streaming(&video->queue)) | ||
| 791 | return 0; | ||
| 792 | |||
| 793 | video->frozen = 1; | ||
| 794 | uvc_uninit_video(video); | ||
| 795 | usb_set_interface(video->dev->udev, video->streaming->intfnum, 0); | ||
| 796 | return 0; | ||
| 797 | } | ||
| 798 | |||
| 799 | /* | ||
| 800 | * Reconfigure the video interface and restart streaming if it was enable | ||
| 801 | * before suspend. | ||
| 802 | * | ||
| 803 | * If an error occurs, disable the video queue. This will wake all pending | ||
| 804 | * buffers, making sure userspace applications are notified of the problem | ||
| 805 | * instead of waiting forever. | ||
| 806 | */ | ||
| 807 | int uvc_video_resume(struct uvc_video_device *video) | ||
| 808 | { | ||
| 809 | int ret; | ||
| 810 | |||
| 811 | video->frozen = 0; | ||
| 812 | |||
| 813 | if ((ret = uvc_set_video_ctrl(video, &video->streaming->ctrl, 0)) < 0) { | ||
| 814 | uvc_queue_enable(&video->queue, 0); | ||
| 815 | return ret; | ||
| 816 | } | ||
| 817 | |||
| 818 | if (!uvc_queue_streaming(&video->queue)) | ||
| 819 | return 0; | ||
| 820 | |||
| 821 | if ((ret = uvc_init_video(video)) < 0) | ||
| 822 | uvc_queue_enable(&video->queue, 0); | ||
| 823 | |||
| 824 | return ret; | ||
| 825 | } | ||
| 826 | |||
| 827 | /* ------------------------------------------------------------------------ | ||
| 828 | * Video device | ||
| 829 | */ | ||
| 830 | |||
| 831 | /* | ||
| 832 | * Initialize the UVC video device by retrieving the default format and | ||
| 833 | * committing it. | ||
| 834 | * | ||
| 835 | * Some cameras (namely the Fuji Finepix) set the format and frame | ||
| 836 | * indexes to zero. The UVC standard doesn't clearly make this a spec | ||
| 837 | * violation, so try to silently fix the values if possible. | ||
| 838 | * | ||
| 839 | * This function is called before registering the device with V4L. | ||
| 840 | */ | ||
| 841 | int uvc_video_init(struct uvc_video_device *video) | ||
| 842 | { | ||
| 843 | struct uvc_streaming_control *probe = &video->streaming->ctrl; | ||
| 844 | struct uvc_format *format = NULL; | ||
| 845 | struct uvc_frame *frame = NULL; | ||
| 846 | unsigned int i; | ||
| 847 | int ret; | ||
| 848 | |||
| 849 | if (video->streaming->nformats == 0) { | ||
| 850 | uvc_printk(KERN_INFO, "No supported video formats found.\n"); | ||
| 851 | return -EINVAL; | ||
| 852 | } | ||
| 853 | |||
| 854 | /* Alternate setting 0 should be the default, yet the XBox Live Vision | ||
| 855 | * Cam (and possibly other devices) crash or otherwise misbehave if | ||
| 856 | * they don't receive a SET_INTERFACE request before any other video | ||
| 857 | * control request. | ||
| 858 | */ | ||
| 859 | usb_set_interface(video->dev->udev, video->streaming->intfnum, 0); | ||
| 860 | |||
| 861 | /* Some webcams don't suport GET_DEF request on the probe control. We | ||
| 862 | * fall back to GET_CUR if GET_DEF fails. | ||
| 863 | */ | ||
| 864 | if ((ret = uvc_get_video_ctrl(video, probe, 1, GET_DEF)) < 0 && | ||
| 865 | (ret = uvc_get_video_ctrl(video, probe, 1, GET_CUR)) < 0) | ||
| 866 | return ret; | ||
| 867 | |||
| 868 | /* Check if the default format descriptor exists. Use the first | ||
| 869 | * available format otherwise. | ||
| 870 | */ | ||
| 871 | for (i = video->streaming->nformats; i > 0; --i) { | ||
| 872 | format = &video->streaming->format[i-1]; | ||
| 873 | if (format->index == probe->bFormatIndex) | ||
| 874 | break; | ||
| 875 | } | ||
| 876 | |||
| 877 | if (format->nframes == 0) { | ||
| 878 | uvc_printk(KERN_INFO, "No frame descriptor found for the " | ||
| 879 | "default format.\n"); | ||
| 880 | return -EINVAL; | ||
| 881 | } | ||
| 882 | |||
| 883 | /* Zero bFrameIndex might be correct. Stream-based formats (including | ||
| 884 | * MPEG-2 TS and DV) do not support frames but have a dummy frame | ||
| 885 | * descriptor with bFrameIndex set to zero. If the default frame | ||
| 886 | * descriptor is not found, use the first avalable frame. | ||
| 887 | */ | ||
| 888 | for (i = format->nframes; i > 0; --i) { | ||
| 889 | frame = &format->frame[i-1]; | ||
| 890 | if (frame->bFrameIndex == probe->bFrameIndex) | ||
| 891 | break; | ||
| 892 | } | ||
| 893 | |||
| 894 | /* Commit the default settings. */ | ||
| 895 | probe->bFormatIndex = format->index; | ||
| 896 | probe->bFrameIndex = frame->bFrameIndex; | ||
| 897 | if ((ret = uvc_set_video_ctrl(video, probe, 0)) < 0) | ||
| 898 | return ret; | ||
| 899 | |||
| 900 | video->streaming->cur_format = format; | ||
| 901 | video->streaming->cur_frame = frame; | ||
| 902 | atomic_set(&video->active, 0); | ||
| 903 | |||
| 904 | /* Select the video decoding function */ | ||
| 905 | if (video->dev->quirks & UVC_QUIRK_BUILTIN_ISIGHT) | ||
| 906 | video->decode = uvc_video_decode_isight; | ||
| 907 | else if (video->streaming->intf->num_altsetting > 1) | ||
| 908 | video->decode = uvc_video_decode_isoc; | ||
| 909 | else | ||
| 910 | video->decode = uvc_video_decode_bulk; | ||
| 911 | |||
| 912 | return 0; | ||
| 913 | } | ||
| 914 | |||
| 915 | /* | ||
| 916 | * Enable or disable the video stream. | ||
| 917 | */ | ||
| 918 | int uvc_video_enable(struct uvc_video_device *video, int enable) | ||
| 919 | { | ||
| 920 | int ret; | ||
| 921 | |||
| 922 | if (!enable) { | ||
| 923 | uvc_uninit_video(video); | ||
| 924 | usb_set_interface(video->dev->udev, | ||
| 925 | video->streaming->intfnum, 0); | ||
| 926 | uvc_queue_enable(&video->queue, 0); | ||
| 927 | return 0; | ||
| 928 | } | ||
| 929 | |||
| 930 | if ((ret = uvc_queue_enable(&video->queue, 1)) < 0) | ||
| 931 | return ret; | ||
| 932 | |||
| 933 | return uvc_init_video(video); | ||
| 934 | } | ||
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h new file mode 100644 index 000000000000..a995a780db1c --- /dev/null +++ b/drivers/media/video/uvc/uvcvideo.h | |||
| @@ -0,0 +1,796 @@ | |||
| 1 | #ifndef _USB_VIDEO_H_ | ||
| 2 | #define _USB_VIDEO_H_ | ||
| 3 | |||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/videodev2.h> | ||
| 6 | |||
| 7 | |||
| 8 | /* | ||
| 9 | * Dynamic controls | ||
| 10 | */ | ||
| 11 | |||
| 12 | /* Data types for UVC control data */ | ||
| 13 | #define UVC_CTRL_DATA_TYPE_RAW 0 | ||
| 14 | #define UVC_CTRL_DATA_TYPE_SIGNED 1 | ||
| 15 | #define UVC_CTRL_DATA_TYPE_UNSIGNED 2 | ||
| 16 | #define UVC_CTRL_DATA_TYPE_BOOLEAN 3 | ||
| 17 | #define UVC_CTRL_DATA_TYPE_ENUM 4 | ||
| 18 | #define UVC_CTRL_DATA_TYPE_BITMASK 5 | ||
| 19 | |||
| 20 | /* Control flags */ | ||
| 21 | #define UVC_CONTROL_SET_CUR (1 << 0) | ||
| 22 | #define UVC_CONTROL_GET_CUR (1 << 1) | ||
| 23 | #define UVC_CONTROL_GET_MIN (1 << 2) | ||
| 24 | #define UVC_CONTROL_GET_MAX (1 << 3) | ||
| 25 | #define UVC_CONTROL_GET_RES (1 << 4) | ||
| 26 | #define UVC_CONTROL_GET_DEF (1 << 5) | ||
| 27 | /* Control should be saved at suspend and restored at resume. */ | ||
| 28 | #define UVC_CONTROL_RESTORE (1 << 6) | ||
| 29 | /* Control can be updated by the camera. */ | ||
| 30 | #define UVC_CONTROL_AUTO_UPDATE (1 << 7) | ||
| 31 | |||
| 32 | #define UVC_CONTROL_GET_RANGE (UVC_CONTROL_GET_CUR | UVC_CONTROL_GET_MIN | \ | ||
| 33 | UVC_CONTROL_GET_MAX | UVC_CONTROL_GET_RES | \ | ||
| 34 | UVC_CONTROL_GET_DEF) | ||
| 35 | |||
| 36 | struct uvc_xu_control_info { | ||
| 37 | __u8 entity[16]; | ||
| 38 | __u8 index; | ||
| 39 | __u8 selector; | ||
| 40 | __u16 size; | ||
| 41 | __u32 flags; | ||
| 42 | }; | ||
| 43 | |||
| 44 | struct uvc_xu_control_mapping { | ||
| 45 | __u32 id; | ||
| 46 | __u8 name[32]; | ||
| 47 | __u8 entity[16]; | ||
| 48 | __u8 selector; | ||
| 49 | |||
| 50 | __u8 size; | ||
| 51 | __u8 offset; | ||
| 52 | enum v4l2_ctrl_type v4l2_type; | ||
| 53 | __u32 data_type; | ||
| 54 | }; | ||
| 55 | |||
| 56 | struct uvc_xu_control { | ||
| 57 | __u8 unit; | ||
| 58 | __u8 selector; | ||
| 59 | __u16 size; | ||
| 60 | __u8 __user *data; | ||
| 61 | }; | ||
| 62 | |||
| 63 | #define UVCIOC_CTRL_ADD _IOW('U', 1, struct uvc_xu_control_info) | ||
| 64 | #define UVCIOC_CTRL_MAP _IOWR('U', 2, struct uvc_xu_control_mapping) | ||
| 65 | #define UVCIOC_CTRL_GET _IOWR('U', 3, struct uvc_xu_control) | ||
| 66 | #define UVCIOC_CTRL_SET _IOW('U', 4, struct uvc_xu_control) | ||
| 67 | |||
| 68 | #ifdef __KERNEL__ | ||
| 69 | |||
| 70 | #include <linux/poll.h> | ||
| 71 | |||
| 72 | /* -------------------------------------------------------------------------- | ||
| 73 | * UVC constants | ||
| 74 | */ | ||
| 75 | |||
| 76 | #define SC_UNDEFINED 0x00 | ||
| 77 | #define SC_VIDEOCONTROL 0x01 | ||
| 78 | #define SC_VIDEOSTREAMING 0x02 | ||
| 79 | #define SC_VIDEO_INTERFACE_COLLECTION 0x03 | ||
| 80 | |||
| 81 | #define PC_PROTOCOL_UNDEFINED 0x00 | ||
| 82 | |||
| 83 | #define CS_UNDEFINED 0x20 | ||
| 84 | #define CS_DEVICE 0x21 | ||
| 85 | #define CS_CONFIGURATION 0x22 | ||
| 86 | #define CS_STRING 0x23 | ||
| 87 | #define CS_INTERFACE 0x24 | ||
| 88 | #define CS_ENDPOINT 0x25 | ||
| 89 | |||
| 90 | /* VideoControl class specific interface descriptor */ | ||
| 91 | #define VC_DESCRIPTOR_UNDEFINED 0x00 | ||
| 92 | #define VC_HEADER 0x01 | ||
| 93 | #define VC_INPUT_TERMINAL 0x02 | ||
| 94 | #define VC_OUTPUT_TERMINAL 0x03 | ||
| 95 | #define VC_SELECTOR_UNIT 0x04 | ||
| 96 | #define VC_PROCESSING_UNIT 0x05 | ||
| 97 | #define VC_EXTENSION_UNIT 0x06 | ||
| 98 | |||
| 99 | /* VideoStreaming class specific interface descriptor */ | ||
| 100 | #define VS_UNDEFINED 0x00 | ||
| 101 | #define VS_INPUT_HEADER 0x01 | ||
| 102 | #define VS_OUTPUT_HEADER 0x02 | ||
| 103 | #define VS_STILL_IMAGE_FRAME 0x03 | ||
| 104 | #define VS_FORMAT_UNCOMPRESSED 0x04 | ||
| 105 | #define VS_FRAME_UNCOMPRESSED 0x05 | ||
| 106 | #define VS_FORMAT_MJPEG 0x06 | ||
| 107 | #define VS_FRAME_MJPEG 0x07 | ||
| 108 | #define VS_FORMAT_MPEG2TS 0x0a | ||
| 109 | #define VS_FORMAT_DV 0x0c | ||
| 110 | #define VS_COLORFORMAT 0x0d | ||
| 111 | #define VS_FORMAT_FRAME_BASED 0x10 | ||
| 112 | #define VS_FRAME_FRAME_BASED 0x11 | ||
| 113 | #define VS_FORMAT_STREAM_BASED 0x12 | ||
| 114 | |||
| 115 | /* Endpoint type */ | ||
| 116 | #define EP_UNDEFINED 0x00 | ||
| 117 | #define EP_GENERAL 0x01 | ||
| 118 | #define EP_ENDPOINT 0x02 | ||
| 119 | #define EP_INTERRUPT 0x03 | ||
| 120 | |||
| 121 | /* Request codes */ | ||
| 122 | #define RC_UNDEFINED 0x00 | ||
| 123 | #define SET_CUR 0x01 | ||
| 124 | #define GET_CUR 0x81 | ||
| 125 | #define GET_MIN 0x82 | ||
| 126 | #define GET_MAX 0x83 | ||
| 127 | #define GET_RES 0x84 | ||
| 128 | #define GET_LEN 0x85 | ||
| 129 | #define GET_INFO 0x86 | ||
| 130 | #define GET_DEF 0x87 | ||
| 131 | |||
| 132 | /* VideoControl interface controls */ | ||
| 133 | #define VC_CONTROL_UNDEFINED 0x00 | ||
| 134 | #define VC_VIDEO_POWER_MODE_CONTROL 0x01 | ||
| 135 | #define VC_REQUEST_ERROR_CODE_CONTROL 0x02 | ||
| 136 | |||
| 137 | /* Terminal controls */ | ||
| 138 | #define TE_CONTROL_UNDEFINED 0x00 | ||
| 139 | |||
| 140 | /* Selector Unit controls */ | ||
| 141 | #define SU_CONTROL_UNDEFINED 0x00 | ||
| 142 | #define SU_INPUT_SELECT_CONTROL 0x01 | ||
| 143 | |||
| 144 | /* Camera Terminal controls */ | ||
| 145 | #define CT_CONTROL_UNDEFINED 0x00 | ||
| 146 | #define CT_SCANNING_MODE_CONTROL 0x01 | ||
| 147 | #define CT_AE_MODE_CONTROL 0x02 | ||
| 148 | #define CT_AE_PRIORITY_CONTROL 0x03 | ||
| 149 | #define CT_EXPOSURE_TIME_ABSOLUTE_CONTROL 0x04 | ||
| 150 | #define CT_EXPOSURE_TIME_RELATIVE_CONTROL 0x05 | ||
| 151 | #define CT_FOCUS_ABSOLUTE_CONTROL 0x06 | ||
| 152 | #define CT_FOCUS_RELATIVE_CONTROL 0x07 | ||
| 153 | #define CT_FOCUS_AUTO_CONTROL 0x08 | ||
| 154 | #define CT_IRIS_ABSOLUTE_CONTROL 0x09 | ||
| 155 | #define CT_IRIS_RELATIVE_CONTROL 0x0a | ||
| 156 | #define CT_ZOOM_ABSOLUTE_CONTROL 0x0b | ||
| 157 | #define CT_ZOOM_RELATIVE_CONTROL 0x0c | ||
| 158 | #define CT_PANTILT_ABSOLUTE_CONTROL 0x0d | ||
| 159 | #define CT_PANTILT_RELATIVE_CONTROL 0x0e | ||
| 160 | #define CT_ROLL_ABSOLUTE_CONTROL 0x0f | ||
| 161 | #define CT_ROLL_RELATIVE_CONTROL 0x10 | ||
| 162 | #define CT_PRIVACY_CONTROL 0x11 | ||
| 163 | |||
| 164 | /* Processing Unit controls */ | ||
| 165 | #define PU_CONTROL_UNDEFINED 0x00 | ||
| 166 | #define PU_BACKLIGHT_COMPENSATION_CONTROL 0x01 | ||
| 167 | #define PU_BRIGHTNESS_CONTROL 0x02 | ||
| 168 | #define PU_CONTRAST_CONTROL 0x03 | ||
| 169 | #define PU_GAIN_CONTROL 0x04 | ||
| 170 | #define PU_POWER_LINE_FREQUENCY_CONTROL 0x05 | ||
| 171 | #define PU_HUE_CONTROL 0x06 | ||
| 172 | #define PU_SATURATION_CONTROL 0x07 | ||
| 173 | #define PU_SHARPNESS_CONTROL 0x08 | ||
| 174 | #define PU_GAMMA_CONTROL 0x09 | ||
| 175 | #define PU_WHITE_BALANCE_TEMPERATURE_CONTROL 0x0a | ||
| 176 | #define PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL 0x0b | ||
| 177 | #define PU_WHITE_BALANCE_COMPONENT_CONTROL 0x0c | ||
| 178 | #define PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL 0x0d | ||
| 179 | #define PU_DIGITAL_MULTIPLIER_CONTROL 0x0e | ||
| 180 | #define PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL 0x0f | ||
| 181 | #define PU_HUE_AUTO_CONTROL 0x10 | ||
| 182 | #define PU_ANALOG_VIDEO_STANDARD_CONTROL 0x11 | ||
| 183 | #define PU_ANALOG_LOCK_STATUS_CONTROL 0x12 | ||
| 184 | |||
| 185 | #define LXU_MOTOR_PANTILT_RELATIVE_CONTROL 0x01 | ||
| 186 | #define LXU_MOTOR_PANTILT_RESET_CONTROL 0x02 | ||
| 187 | #define LXU_MOTOR_FOCUS_MOTOR_CONTROL 0x03 | ||
| 188 | |||
| 189 | /* VideoStreaming interface controls */ | ||
| 190 | #define VS_CONTROL_UNDEFINED 0x00 | ||
| 191 | #define VS_PROBE_CONTROL 0x01 | ||
| 192 | #define VS_COMMIT_CONTROL 0x02 | ||
| 193 | #define VS_STILL_PROBE_CONTROL 0x03 | ||
| 194 | #define VS_STILL_COMMIT_CONTROL 0x04 | ||
| 195 | #define VS_STILL_IMAGE_TRIGGER_CONTROL 0x05 | ||
| 196 | #define VS_STREAM_ERROR_CODE_CONTROL 0x06 | ||
| 197 | #define VS_GENERATE_KEY_FRAME_CONTROL 0x07 | ||
| 198 | #define VS_UPDATE_FRAME_SEGMENT_CONTROL 0x08 | ||
| 199 | #define VS_SYNC_DELAY_CONTROL 0x09 | ||
| 200 | |||
| 201 | #define TT_VENDOR_SPECIFIC 0x0100 | ||
| 202 | #define TT_STREAMING 0x0101 | ||
| 203 | |||
| 204 | /* Input Terminal types */ | ||
| 205 | #define ITT_VENDOR_SPECIFIC 0x0200 | ||
| 206 | #define ITT_CAMERA 0x0201 | ||
| 207 | #define ITT_MEDIA_TRANSPORT_INPUT 0x0202 | ||
| 208 | |||
| 209 | /* Output Terminal types */ | ||
| 210 | #define OTT_VENDOR_SPECIFIC 0x0300 | ||
| 211 | #define OTT_DISPLAY 0x0301 | ||
| 212 | #define OTT_MEDIA_TRANSPORT_OUTPUT 0x0302 | ||
| 213 | |||
| 214 | /* External Terminal types */ | ||
| 215 | #define EXTERNAL_VENDOR_SPECIFIC 0x0400 | ||
| 216 | #define COMPOSITE_CONNECTOR 0x0401 | ||
| 217 | #define SVIDEO_CONNECTOR 0x0402 | ||
| 218 | #define COMPONENT_CONNECTOR 0x0403 | ||
| 219 | |||
| 220 | #define UVC_TERM_INPUT 0x0000 | ||
| 221 | #define UVC_TERM_OUTPUT 0x8000 | ||
| 222 | |||
| 223 | #define UVC_ENTITY_TYPE(entity) ((entity)->type & 0x7fff) | ||
| 224 | #define UVC_ENTITY_IS_UNIT(entity) (((entity)->type & 0xff00) == 0) | ||
| 225 | #define UVC_ENTITY_IS_TERM(entity) (((entity)->type & 0xff00) != 0) | ||
| 226 | #define UVC_ENTITY_IS_ITERM(entity) \ | ||
| 227 | (((entity)->type & 0x8000) == UVC_TERM_INPUT) | ||
| 228 | #define UVC_ENTITY_IS_OTERM(entity) \ | ||
| 229 | (((entity)->type & 0x8000) == UVC_TERM_OUTPUT) | ||
| 230 | |||
| 231 | #define UVC_STATUS_TYPE_CONTROL 1 | ||
| 232 | #define UVC_STATUS_TYPE_STREAMING 2 | ||
| 233 | |||
| 234 | /* ------------------------------------------------------------------------ | ||
| 235 | * GUIDs | ||
| 236 | */ | ||
| 237 | #define UVC_GUID_UVC_CAMERA \ | ||
| 238 | {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ | ||
| 239 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01} | ||
| 240 | #define UVC_GUID_UVC_OUTPUT \ | ||
| 241 | {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ | ||
| 242 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02} | ||
| 243 | #define UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT \ | ||
| 244 | {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ | ||
| 245 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03} | ||
| 246 | #define UVC_GUID_UVC_PROCESSING \ | ||
| 247 | {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ | ||
| 248 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01} | ||
| 249 | #define UVC_GUID_UVC_SELECTOR \ | ||
| 250 | {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ | ||
| 251 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02} | ||
| 252 | |||
| 253 | #define UVC_GUID_LOGITECH_DEV_INFO \ | ||
| 254 | {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \ | ||
| 255 | 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x1e} | ||
| 256 | #define UVC_GUID_LOGITECH_USER_HW \ | ||
| 257 | {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \ | ||
| 258 | 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x1f} | ||
| 259 | #define UVC_GUID_LOGITECH_VIDEO \ | ||
| 260 | {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \ | ||
| 261 | 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x50} | ||
| 262 | #define UVC_GUID_LOGITECH_MOTOR \ | ||
| 263 | {0x82, 0x06, 0x61, 0x63, 0x70, 0x50, 0xab, 0x49, \ | ||
| 264 | 0xb8, 0xcc, 0xb3, 0x85, 0x5e, 0x8d, 0x22, 0x56} | ||
| 265 | |||
| 266 | #define UVC_GUID_FORMAT_MJPEG \ | ||
| 267 | { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ | ||
| 268 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 269 | #define UVC_GUID_FORMAT_YUY2 \ | ||
| 270 | { 'Y', 'U', 'Y', '2', 0x00, 0x00, 0x10, 0x00, \ | ||
| 271 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 272 | #define UVC_GUID_FORMAT_NV12 \ | ||
| 273 | { 'N', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ | ||
| 274 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 275 | #define UVC_GUID_FORMAT_YV12 \ | ||
| 276 | { 'Y', 'V', '1', '2', 0x00, 0x00, 0x10, 0x00, \ | ||
| 277 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 278 | #define UVC_GUID_FORMAT_I420 \ | ||
| 279 | { 'I', '4', '2', '0', 0x00, 0x00, 0x10, 0x00, \ | ||
| 280 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 281 | #define UVC_GUID_FORMAT_UYVY \ | ||
| 282 | { 'U', 'Y', 'V', 'Y', 0x00, 0x00, 0x10, 0x00, \ | ||
| 283 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 284 | #define UVC_GUID_FORMAT_Y800 \ | ||
| 285 | { 'Y', '8', '0', '0', 0x00, 0x00, 0x10, 0x00, \ | ||
| 286 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 287 | #define UVC_GUID_FORMAT_BY8 \ | ||
| 288 | { 'B', 'Y', '8', ' ', 0x00, 0x00, 0x10, 0x00, \ | ||
| 289 | 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} | ||
| 290 | |||
| 291 | |||
| 292 | /* ------------------------------------------------------------------------ | ||
| 293 | * Driver specific constants. | ||
| 294 | */ | ||
| 295 | |||
| 296 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0) | ||
| 297 | |||
| 298 | /* Number of isochronous URBs. */ | ||
| 299 | #define UVC_URBS 5 | ||
| 300 | /* Maximum number of packets per isochronous URB. */ | ||
| 301 | #define UVC_MAX_ISO_PACKETS 40 | ||
| 302 | /* Maximum frame size in bytes, for sanity checking. */ | ||
| 303 | #define UVC_MAX_FRAME_SIZE (16*1024*1024) | ||
| 304 | /* Maximum number of video buffers. */ | ||
| 305 | #define UVC_MAX_VIDEO_BUFFERS 32 | ||
| 306 | |||
| 307 | #define UVC_CTRL_CONTROL_TIMEOUT 300 | ||
| 308 | #define UVC_CTRL_STREAMING_TIMEOUT 1000 | ||
| 309 | |||
| 310 | /* Devices quirks */ | ||
| 311 | #define UVC_QUIRK_STATUS_INTERVAL 0x00000001 | ||
| 312 | #define UVC_QUIRK_PROBE_MINMAX 0x00000002 | ||
| 313 | #define UVC_QUIRK_PROBE_EXTRAFIELDS 0x00000004 | ||
| 314 | #define UVC_QUIRK_BUILTIN_ISIGHT 0x00000008 | ||
| 315 | #define UVC_QUIRK_STREAM_NO_FID 0x00000010 | ||
| 316 | #define UVC_QUIRK_IGNORE_SELECTOR_UNIT 0x00000020 | ||
| 317 | |||
| 318 | /* Format flags */ | ||
| 319 | #define UVC_FMT_FLAG_COMPRESSED 0x00000001 | ||
| 320 | #define UVC_FMT_FLAG_STREAM 0x00000002 | ||
| 321 | |||
| 322 | /* ------------------------------------------------------------------------ | ||
| 323 | * Structures. | ||
| 324 | */ | ||
| 325 | |||
| 326 | struct uvc_device; | ||
| 327 | |||
| 328 | /* TODO: Put the most frequently accessed fields at the beginning of | ||
| 329 | * structures to maximize cache efficiency. | ||
| 330 | */ | ||
| 331 | struct uvc_streaming_control { | ||
| 332 | __u16 bmHint; | ||
| 333 | __u8 bFormatIndex; | ||
| 334 | __u8 bFrameIndex; | ||
| 335 | __u32 dwFrameInterval; | ||
| 336 | __u16 wKeyFrameRate; | ||
| 337 | __u16 wPFrameRate; | ||
| 338 | __u16 wCompQuality; | ||
| 339 | __u16 wCompWindowSize; | ||
| 340 | __u16 wDelay; | ||
| 341 | __u32 dwMaxVideoFrameSize; | ||
| 342 | __u32 dwMaxPayloadTransferSize; | ||
| 343 | __u32 dwClockFrequency; | ||
| 344 | __u8 bmFramingInfo; | ||
| 345 | __u8 bPreferedVersion; | ||
| 346 | __u8 bMinVersion; | ||
| 347 | __u8 bMaxVersion; | ||
| 348 | }; | ||
| 349 | |||
| 350 | struct uvc_menu_info { | ||
| 351 | __u32 value; | ||
| 352 | __u8 name[32]; | ||
| 353 | }; | ||
| 354 | |||
| 355 | struct uvc_control_info { | ||
| 356 | struct list_head list; | ||
| 357 | struct list_head mappings; | ||
| 358 | |||
| 359 | __u8 entity[16]; | ||
| 360 | __u8 index; | ||
| 361 | __u8 selector; | ||
| 362 | |||
| 363 | __u16 size; | ||
| 364 | __u32 flags; | ||
| 365 | }; | ||
| 366 | |||
| 367 | struct uvc_control_mapping { | ||
| 368 | struct list_head list; | ||
| 369 | |||
| 370 | struct uvc_control_info *ctrl; | ||
| 371 | |||
| 372 | __u32 id; | ||
| 373 | __u8 name[32]; | ||
| 374 | __u8 entity[16]; | ||
| 375 | __u8 selector; | ||
| 376 | |||
| 377 | __u8 size; | ||
| 378 | __u8 offset; | ||
| 379 | enum v4l2_ctrl_type v4l2_type; | ||
| 380 | __u32 data_type; | ||
| 381 | |||
| 382 | struct uvc_menu_info *menu_info; | ||
| 383 | __u32 menu_count; | ||
| 384 | }; | ||
| 385 | |||
| 386 | struct uvc_control { | ||
| 387 | struct uvc_entity *entity; | ||
| 388 | struct uvc_control_info *info; | ||
| 389 | |||
| 390 | __u8 index; /* Used to match the uvc_control entry with a | ||
| 391 | uvc_control_info. */ | ||
| 392 | __u8 dirty : 1, | ||
| 393 | loaded : 1, | ||
| 394 | modified : 1; | ||
| 395 | |||
| 396 | __u8 *data; | ||
| 397 | }; | ||
| 398 | |||
| 399 | struct uvc_format_desc { | ||
| 400 | char *name; | ||
| 401 | __u8 guid[16]; | ||
| 402 | __u32 fcc; | ||
| 403 | }; | ||
| 404 | |||
| 405 | /* The term 'entity' refers to both UVC units and UVC terminals. | ||
| 406 | * | ||
| 407 | * The type field is either the terminal type (wTerminalType in the terminal | ||
| 408 | * descriptor), or the unit type (bDescriptorSubtype in the unit descriptor). | ||
| 409 | * As the bDescriptorSubtype field is one byte long, the type value will | ||
| 410 | * always have a null MSB for units. All terminal types defined by the UVC | ||
| 411 | * specification have a non-null MSB, so it is safe to use the MSB to | ||
| 412 | * differentiate between units and terminals as long as the descriptor parsing | ||
| 413 | * code makes sure terminal types have a non-null MSB. | ||
| 414 | * | ||
| 415 | * For terminals, the type's most significant bit stores the terminal | ||
| 416 | * direction (either UVC_TERM_INPUT or UVC_TERM_OUTPUT). The type field should | ||
| 417 | * always be accessed with the UVC_ENTITY_* macros and never directly. | ||
| 418 | */ | ||
| 419 | |||
| 420 | struct uvc_entity { | ||
| 421 | struct list_head list; /* Entity as part of a UVC device. */ | ||
| 422 | struct list_head chain; /* Entity as part of a video device | ||
| 423 | * chain. */ | ||
| 424 | __u8 id; | ||
| 425 | __u16 type; | ||
| 426 | char name[64]; | ||
| 427 | |||
| 428 | union { | ||
| 429 | struct { | ||
| 430 | __u16 wObjectiveFocalLengthMin; | ||
| 431 | __u16 wObjectiveFocalLengthMax; | ||
| 432 | __u16 wOcularFocalLength; | ||
| 433 | __u8 bControlSize; | ||
| 434 | __u8 *bmControls; | ||
| 435 | } camera; | ||
| 436 | |||
| 437 | struct { | ||
| 438 | __u8 bControlSize; | ||
| 439 | __u8 *bmControls; | ||
| 440 | __u8 bTransportModeSize; | ||
| 441 | __u8 *bmTransportModes; | ||
| 442 | } media; | ||
| 443 | |||
| 444 | struct { | ||
| 445 | __u8 bSourceID; | ||
| 446 | } output; | ||
| 447 | |||
| 448 | struct { | ||
| 449 | __u8 bSourceID; | ||
| 450 | __u16 wMaxMultiplier; | ||
| 451 | __u8 bControlSize; | ||
| 452 | __u8 *bmControls; | ||
| 453 | __u8 bmVideoStandards; | ||
| 454 | } processing; | ||
| 455 | |||
| 456 | struct { | ||
| 457 | __u8 bNrInPins; | ||
| 458 | __u8 *baSourceID; | ||
| 459 | } selector; | ||
| 460 | |||
| 461 | struct { | ||
| 462 | __u8 guidExtensionCode[16]; | ||
| 463 | __u8 bNumControls; | ||
| 464 | __u8 bNrInPins; | ||
| 465 | __u8 *baSourceID; | ||
| 466 | __u8 bControlSize; | ||
| 467 | __u8 *bmControls; | ||
| 468 | __u8 *bmControlsType; | ||
| 469 | } extension; | ||
| 470 | }; | ||
| 471 | |||
| 472 | unsigned int ncontrols; | ||
| 473 | struct uvc_control *controls; | ||
| 474 | }; | ||
| 475 | |||
| 476 | struct uvc_frame { | ||
| 477 | __u8 bFrameIndex; | ||
| 478 | __u8 bmCapabilities; | ||
| 479 | __u16 wWidth; | ||
| 480 | __u16 wHeight; | ||
| 481 | __u32 dwMinBitRate; | ||
| 482 | __u32 dwMaxBitRate; | ||
| 483 | __u32 dwMaxVideoFrameBufferSize; | ||
| 484 | __u8 bFrameIntervalType; | ||
| 485 | __u32 dwDefaultFrameInterval; | ||
| 486 | __u32 *dwFrameInterval; | ||
| 487 | }; | ||
| 488 | |||
| 489 | struct uvc_format { | ||
| 490 | __u8 type; | ||
| 491 | __u8 index; | ||
| 492 | __u8 bpp; | ||
| 493 | __u8 colorspace; | ||
| 494 | __u32 fcc; | ||
| 495 | __u32 flags; | ||
| 496 | |||
| 497 | char name[32]; | ||
| 498 | |||
| 499 | unsigned int nframes; | ||
| 500 | struct uvc_frame *frame; | ||
| 501 | }; | ||
| 502 | |||
| 503 | struct uvc_streaming_header { | ||
| 504 | __u8 bNumFormats; | ||
| 505 | __u8 bEndpointAddress; | ||
| 506 | __u8 bTerminalLink; | ||
| 507 | __u8 bControlSize; | ||
| 508 | __u8 *bmaControls; | ||
| 509 | /* The following fields are used by input headers only. */ | ||
| 510 | __u8 bmInfo; | ||
| 511 | __u8 bStillCaptureMethod; | ||
| 512 | __u8 bTriggerSupport; | ||
| 513 | __u8 bTriggerUsage; | ||
| 514 | }; | ||
| 515 | |||
| 516 | struct uvc_streaming { | ||
| 517 | struct list_head list; | ||
| 518 | |||
| 519 | struct usb_interface *intf; | ||
| 520 | int intfnum; | ||
| 521 | __u16 maxpsize; | ||
| 522 | |||
| 523 | struct uvc_streaming_header header; | ||
| 524 | |||
| 525 | unsigned int nformats; | ||
| 526 | struct uvc_format *format; | ||
| 527 | |||
| 528 | struct uvc_streaming_control ctrl; | ||
| 529 | struct uvc_format *cur_format; | ||
| 530 | struct uvc_frame *cur_frame; | ||
| 531 | |||
| 532 | struct mutex mutex; | ||
| 533 | }; | ||
| 534 | |||
| 535 | enum uvc_buffer_state { | ||
| 536 | UVC_BUF_STATE_IDLE = 0, | ||
| 537 | UVC_BUF_STATE_QUEUED = 1, | ||
| 538 | UVC_BUF_STATE_ACTIVE = 2, | ||
| 539 | UVC_BUF_STATE_DONE = 3, | ||
| 540 | UVC_BUF_STATE_ERROR = 4, | ||
| 541 | }; | ||
| 542 | |||
| 543 | struct uvc_buffer { | ||
| 544 | unsigned long vma_use_count; | ||
| 545 | struct list_head stream; | ||
| 546 | |||
| 547 | /* Touched by interrupt handler. */ | ||
| 548 | struct v4l2_buffer buf; | ||
| 549 | struct list_head queue; | ||
| 550 | wait_queue_head_t wait; | ||
| 551 | enum uvc_buffer_state state; | ||
| 552 | }; | ||
| 553 | |||
| 554 | #define UVC_QUEUE_STREAMING (1 << 0) | ||
| 555 | #define UVC_QUEUE_DISCONNECTED (1 << 1) | ||
| 556 | #define UVC_QUEUE_DROP_INCOMPLETE (1 << 2) | ||
| 557 | |||
| 558 | struct uvc_video_queue { | ||
| 559 | void *mem; | ||
| 560 | unsigned int flags; | ||
| 561 | __u32 sequence; | ||
| 562 | |||
| 563 | unsigned int count; | ||
| 564 | unsigned int buf_size; | ||
| 565 | struct uvc_buffer buffer[UVC_MAX_VIDEO_BUFFERS]; | ||
| 566 | struct mutex mutex; /* protects buffers and mainqueue */ | ||
| 567 | spinlock_t irqlock; /* protects irqqueue */ | ||
| 568 | |||
| 569 | struct list_head mainqueue; | ||
| 570 | struct list_head irqqueue; | ||
| 571 | }; | ||
| 572 | |||
| 573 | struct uvc_video_device { | ||
| 574 | struct uvc_device *dev; | ||
| 575 | struct video_device *vdev; | ||
| 576 | atomic_t active; | ||
| 577 | unsigned int frozen : 1; | ||
| 578 | |||
| 579 | struct list_head iterms; | ||
| 580 | struct uvc_entity *oterm; | ||
| 581 | struct uvc_entity *processing; | ||
| 582 | struct uvc_entity *selector; | ||
| 583 | struct list_head extensions; | ||
| 584 | struct mutex ctrl_mutex; | ||
| 585 | |||
| 586 | struct uvc_video_queue queue; | ||
| 587 | |||
| 588 | /* Video streaming object, must always be non-NULL. */ | ||
| 589 | struct uvc_streaming *streaming; | ||
| 590 | |||
| 591 | void (*decode) (struct urb *urb, struct uvc_video_device *video, | ||
| 592 | struct uvc_buffer *buf); | ||
| 593 | |||
| 594 | /* Context data used by the bulk completion handler. */ | ||
| 595 | struct { | ||
| 596 | __u8 header[256]; | ||
| 597 | unsigned int header_size; | ||
| 598 | int skip_payload; | ||
| 599 | __u32 payload_size; | ||
| 600 | __u32 max_payload_size; | ||
| 601 | } bulk; | ||
| 602 | |||
| 603 | struct urb *urb[UVC_URBS]; | ||
| 604 | char *urb_buffer[UVC_URBS]; | ||
| 605 | |||
| 606 | __u8 last_fid; | ||
| 607 | }; | ||
| 608 | |||
| 609 | enum uvc_device_state { | ||
| 610 | UVC_DEV_DISCONNECTED = 1, | ||
| 611 | }; | ||
| 612 | |||
| 613 | struct uvc_device { | ||
| 614 | struct usb_device *udev; | ||
| 615 | struct usb_interface *intf; | ||
| 616 | __u32 quirks; | ||
| 617 | int intfnum; | ||
| 618 | char name[32]; | ||
| 619 | |||
| 620 | enum uvc_device_state state; | ||
| 621 | struct kref kref; | ||
| 622 | struct list_head list; | ||
| 623 | |||
| 624 | /* Video control interface */ | ||
| 625 | __u16 uvc_version; | ||
| 626 | __u32 clock_frequency; | ||
| 627 | |||
| 628 | struct list_head entities; | ||
| 629 | |||
| 630 | struct uvc_video_device video; | ||
| 631 | |||
| 632 | /* Status Interrupt Endpoint */ | ||
| 633 | struct usb_host_endpoint *int_ep; | ||
| 634 | struct urb *int_urb; | ||
| 635 | __u8 status[16]; | ||
| 636 | struct input_dev *input; | ||
| 637 | |||
| 638 | /* Video Streaming interfaces */ | ||
| 639 | struct list_head streaming; | ||
| 640 | }; | ||
| 641 | |||
| 642 | enum uvc_handle_state { | ||
| 643 | UVC_HANDLE_PASSIVE = 0, | ||
| 644 | UVC_HANDLE_ACTIVE = 1, | ||
| 645 | }; | ||
| 646 | |||
| 647 | struct uvc_fh { | ||
| 648 | struct uvc_video_device *device; | ||
| 649 | enum uvc_handle_state state; | ||
| 650 | }; | ||
| 651 | |||
| 652 | struct uvc_driver { | ||
| 653 | struct usb_driver driver; | ||
| 654 | |||
| 655 | struct mutex open_mutex; /* protects from open/disconnect race */ | ||
| 656 | |||
| 657 | struct list_head devices; /* struct uvc_device list */ | ||
| 658 | struct list_head controls; /* struct uvc_control_info list */ | ||
| 659 | struct mutex ctrl_mutex; /* protects controls and devices | ||
| 660 | lists */ | ||
| 661 | }; | ||
| 662 | |||
| 663 | /* ------------------------------------------------------------------------ | ||
| 664 | * Debugging, printing and logging | ||
| 665 | */ | ||
| 666 | |||
| 667 | #define UVC_TRACE_PROBE (1 << 0) | ||
| 668 | #define UVC_TRACE_DESCR (1 << 1) | ||
| 669 | #define UVC_TRACE_CONTROL (1 << 2) | ||
| 670 | #define UVC_TRACE_FORMAT (1 << 3) | ||
| 671 | #define UVC_TRACE_CAPTURE (1 << 4) | ||
| 672 | #define UVC_TRACE_CALLS (1 << 5) | ||
| 673 | #define UVC_TRACE_IOCTL (1 << 6) | ||
| 674 | #define UVC_TRACE_FRAME (1 << 7) | ||
| 675 | #define UVC_TRACE_SUSPEND (1 << 8) | ||
| 676 | #define UVC_TRACE_STATUS (1 << 9) | ||
| 677 | |||
| 678 | extern unsigned int uvc_trace_param; | ||
| 679 | |||
| 680 | #define uvc_trace(flag, msg...) \ | ||
| 681 | do { \ | ||
| 682 | if (uvc_trace_param & flag) \ | ||
| 683 | printk(KERN_DEBUG "uvcvideo: " msg); \ | ||
| 684 | } while (0) | ||
| 685 | |||
| 686 | #define uvc_printk(level, msg...) \ | ||
| 687 | printk(level "uvcvideo: " msg) | ||
| 688 | |||
| 689 | #define UVC_GUID_FORMAT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-" \ | ||
| 690 | "%02x%02x%02x%02x%02x%02x" | ||
| 691 | #define UVC_GUID_ARGS(guid) \ | ||
| 692 | (guid)[3], (guid)[2], (guid)[1], (guid)[0], \ | ||
| 693 | (guid)[5], (guid)[4], \ | ||
| 694 | (guid)[7], (guid)[6], \ | ||
| 695 | (guid)[8], (guid)[9], \ | ||
| 696 | (guid)[10], (guid)[11], (guid)[12], \ | ||
| 697 | (guid)[13], (guid)[14], (guid)[15] | ||
| 698 | |||
| 699 | /* -------------------------------------------------------------------------- | ||
| 700 | * Internal functions. | ||
| 701 | */ | ||
| 702 | |||
| 703 | /* Core driver */ | ||
| 704 | extern struct uvc_driver uvc_driver; | ||
| 705 | extern void uvc_delete(struct kref *kref); | ||
| 706 | |||
| 707 | /* Video buffers queue management. */ | ||
| 708 | extern void uvc_queue_init(struct uvc_video_queue *queue); | ||
| 709 | extern int uvc_alloc_buffers(struct uvc_video_queue *queue, | ||
| 710 | unsigned int nbuffers, unsigned int buflength); | ||
| 711 | extern int uvc_free_buffers(struct uvc_video_queue *queue); | ||
| 712 | extern int uvc_query_buffer(struct uvc_video_queue *queue, | ||
| 713 | struct v4l2_buffer *v4l2_buf); | ||
| 714 | extern int uvc_queue_buffer(struct uvc_video_queue *queue, | ||
| 715 | struct v4l2_buffer *v4l2_buf); | ||
| 716 | extern int uvc_dequeue_buffer(struct uvc_video_queue *queue, | ||
| 717 | struct v4l2_buffer *v4l2_buf, int nonblocking); | ||
| 718 | extern int uvc_queue_enable(struct uvc_video_queue *queue, int enable); | ||
| 719 | extern void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect); | ||
| 720 | extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, | ||
| 721 | struct uvc_buffer *buf); | ||
| 722 | extern unsigned int uvc_queue_poll(struct uvc_video_queue *queue, | ||
| 723 | struct file *file, poll_table *wait); | ||
| 724 | static inline int uvc_queue_streaming(struct uvc_video_queue *queue) | ||
| 725 | { | ||
| 726 | return queue->flags & UVC_QUEUE_STREAMING; | ||
| 727 | } | ||
| 728 | |||
| 729 | /* V4L2 interface */ | ||
| 730 | extern struct file_operations uvc_fops; | ||
| 731 | |||
| 732 | /* Video */ | ||
| 733 | extern int uvc_video_init(struct uvc_video_device *video); | ||
| 734 | extern int uvc_video_suspend(struct uvc_video_device *video); | ||
| 735 | extern int uvc_video_resume(struct uvc_video_device *video); | ||
| 736 | extern int uvc_video_enable(struct uvc_video_device *video, int enable); | ||
| 737 | extern int uvc_probe_video(struct uvc_video_device *video, | ||
| 738 | struct uvc_streaming_control *probe); | ||
| 739 | extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, | ||
| 740 | __u8 intfnum, __u8 cs, void *data, __u16 size); | ||
| 741 | extern int uvc_set_video_ctrl(struct uvc_video_device *video, | ||
| 742 | struct uvc_streaming_control *ctrl, int probe); | ||
| 743 | |||
| 744 | /* Status */ | ||
| 745 | extern int uvc_status_init(struct uvc_device *dev); | ||
| 746 | extern void uvc_status_cleanup(struct uvc_device *dev); | ||
| 747 | extern int uvc_status_suspend(struct uvc_device *dev); | ||
| 748 | extern int uvc_status_resume(struct uvc_device *dev); | ||
| 749 | |||
| 750 | /* Controls */ | ||
| 751 | extern struct uvc_control *uvc_find_control(struct uvc_video_device *video, | ||
| 752 | __u32 v4l2_id, struct uvc_control_mapping **mapping); | ||
| 753 | extern int uvc_query_v4l2_ctrl(struct uvc_video_device *video, | ||
| 754 | struct v4l2_queryctrl *v4l2_ctrl); | ||
| 755 | |||
| 756 | extern int uvc_ctrl_add_info(struct uvc_control_info *info); | ||
| 757 | extern int uvc_ctrl_add_mapping(struct uvc_control_mapping *mapping); | ||
| 758 | extern int uvc_ctrl_init_device(struct uvc_device *dev); | ||
| 759 | extern void uvc_ctrl_cleanup_device(struct uvc_device *dev); | ||
| 760 | extern int uvc_ctrl_resume_device(struct uvc_device *dev); | ||
| 761 | extern void uvc_ctrl_init(void); | ||
| 762 | |||
| 763 | extern int uvc_ctrl_begin(struct uvc_video_device *video); | ||
| 764 | extern int __uvc_ctrl_commit(struct uvc_video_device *video, int rollback); | ||
| 765 | static inline int uvc_ctrl_commit(struct uvc_video_device *video) | ||
| 766 | { | ||
| 767 | return __uvc_ctrl_commit(video, 0); | ||
| 768 | } | ||
| 769 | static inline int uvc_ctrl_rollback(struct uvc_video_device *video) | ||
| 770 | { | ||
| 771 | return __uvc_ctrl_commit(video, 1); | ||
| 772 | } | ||
| 773 | |||
| 774 | extern int uvc_ctrl_get(struct uvc_video_device *video, | ||
| 775 | struct v4l2_ext_control *xctrl); | ||
| 776 | extern int uvc_ctrl_set(struct uvc_video_device *video, | ||
| 777 | struct v4l2_ext_control *xctrl); | ||
| 778 | |||
| 779 | extern int uvc_xu_ctrl_query(struct uvc_video_device *video, | ||
| 780 | struct uvc_xu_control *ctrl, int set); | ||
| 781 | |||
| 782 | /* Utility functions */ | ||
| 783 | extern void uvc_simplify_fraction(uint32_t *numerator, uint32_t *denominator, | ||
| 784 | unsigned int n_terms, unsigned int threshold); | ||
| 785 | extern uint32_t uvc_fraction_to_interval(uint32_t numerator, | ||
| 786 | uint32_t denominator); | ||
| 787 | extern struct usb_host_endpoint *uvc_find_endpoint( | ||
| 788 | struct usb_host_interface *alts, __u8 epaddr); | ||
| 789 | |||
| 790 | /* Quirks support */ | ||
| 791 | void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, | ||
| 792 | struct uvc_buffer *buf); | ||
| 793 | |||
| 794 | #endif /* __KERNEL__ */ | ||
| 795 | |||
| 796 | #endif | ||
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 31e8af0ba278..67a661cf5219 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
| @@ -51,12 +51,51 @@ | |||
| 51 | #define VIDEO_NUM_DEVICES 256 | 51 | #define VIDEO_NUM_DEVICES 256 |
| 52 | #define VIDEO_NAME "video4linux" | 52 | #define VIDEO_NAME "video4linux" |
| 53 | 53 | ||
| 54 | struct std_descr { | ||
| 55 | v4l2_std_id std; | ||
| 56 | const char *descr; | ||
| 57 | }; | ||
| 58 | |||
| 59 | static const struct std_descr standards[] = { | ||
| 60 | { V4L2_STD_NTSC, "NTSC" }, | ||
| 61 | { V4L2_STD_NTSC_M, "NTSC-M" }, | ||
| 62 | { V4L2_STD_NTSC_M_JP, "NTSC-M-JP" }, | ||
| 63 | { V4L2_STD_NTSC_M_KR, "NTSC-M-KR" }, | ||
| 64 | { V4L2_STD_NTSC_443, "NTSC-443" }, | ||
| 65 | { V4L2_STD_PAL, "PAL" }, | ||
| 66 | { V4L2_STD_PAL_BG, "PAL-BG" }, | ||
| 67 | { V4L2_STD_PAL_B, "PAL-B" }, | ||
| 68 | { V4L2_STD_PAL_B1, "PAL-B1" }, | ||
| 69 | { V4L2_STD_PAL_G, "PAL-G" }, | ||
| 70 | { V4L2_STD_PAL_H, "PAL-H" }, | ||
| 71 | { V4L2_STD_PAL_I, "PAL-I" }, | ||
| 72 | { V4L2_STD_PAL_DK, "PAL-DK" }, | ||
| 73 | { V4L2_STD_PAL_D, "PAL-D" }, | ||
| 74 | { V4L2_STD_PAL_D1, "PAL-D1" }, | ||
| 75 | { V4L2_STD_PAL_K, "PAL-K" }, | ||
| 76 | { V4L2_STD_PAL_M, "PAL-M" }, | ||
| 77 | { V4L2_STD_PAL_N, "PAL-N" }, | ||
| 78 | { V4L2_STD_PAL_Nc, "PAL-Nc" }, | ||
| 79 | { V4L2_STD_PAL_60, "PAL-60" }, | ||
| 80 | { V4L2_STD_SECAM, "SECAM" }, | ||
| 81 | { V4L2_STD_SECAM_B, "SECAM-B" }, | ||
| 82 | { V4L2_STD_SECAM_G, "SECAM-G" }, | ||
| 83 | { V4L2_STD_SECAM_H, "SECAM-H" }, | ||
| 84 | { V4L2_STD_SECAM_DK, "SECAM-DK" }, | ||
| 85 | { V4L2_STD_SECAM_D, "SECAM-D" }, | ||
| 86 | { V4L2_STD_SECAM_K, "SECAM-K" }, | ||
| 87 | { V4L2_STD_SECAM_K1, "SECAM-K1" }, | ||
| 88 | { V4L2_STD_SECAM_L, "SECAM-L" }, | ||
| 89 | { V4L2_STD_SECAM_LC, "SECAM-Lc" }, | ||
| 90 | { 0, "Unknown" } | ||
| 91 | }; | ||
| 92 | |||
| 54 | /* video4linux standard ID conversion to standard name | 93 | /* video4linux standard ID conversion to standard name |
| 55 | */ | 94 | */ |
| 56 | char *v4l2_norm_to_name(v4l2_std_id id) | 95 | const char *v4l2_norm_to_name(v4l2_std_id id) |
| 57 | { | 96 | { |
| 58 | char *name; | ||
| 59 | u32 myid = id; | 97 | u32 myid = id; |
| 98 | int i; | ||
| 60 | 99 | ||
| 61 | /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle | 100 | /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle |
| 62 | 64 bit comparations. So, on that architecture, with some gcc | 101 | 64 bit comparations. So, on that architecture, with some gcc |
| @@ -64,110 +103,17 @@ char *v4l2_norm_to_name(v4l2_std_id id) | |||
| 64 | */ | 103 | */ |
| 65 | BUG_ON(myid != id); | 104 | BUG_ON(myid != id); |
| 66 | 105 | ||
| 67 | switch (myid) { | 106 | for (i = 0; standards[i].std; i++) |
| 68 | case V4L2_STD_PAL: | 107 | if (myid == standards[i].std) |
| 69 | name = "PAL"; | 108 | break; |
| 70 | break; | 109 | return standards[i].descr; |
| 71 | case V4L2_STD_PAL_BG: | ||
| 72 | name = "PAL-BG"; | ||
| 73 | break; | ||
| 74 | case V4L2_STD_PAL_DK: | ||
| 75 | name = "PAL-DK"; | ||
| 76 | break; | ||
| 77 | case V4L2_STD_PAL_B: | ||
| 78 | name = "PAL-B"; | ||
| 79 | break; | ||
| 80 | case V4L2_STD_PAL_B1: | ||
| 81 | name = "PAL-B1"; | ||
| 82 | break; | ||
| 83 | case V4L2_STD_PAL_G: | ||
| 84 | name = "PAL-G"; | ||
| 85 | break; | ||
| 86 | case V4L2_STD_PAL_H: | ||
| 87 | name = "PAL-H"; | ||
| 88 | break; | ||
| 89 | case V4L2_STD_PAL_I: | ||
| 90 | name = "PAL-I"; | ||
| 91 | break; | ||
| 92 | case V4L2_STD_PAL_D: | ||
| 93 | name = "PAL-D"; | ||
| 94 | break; | ||
| 95 | case V4L2_STD_PAL_D1: | ||
| 96 | name = "PAL-D1"; | ||
| 97 | break; | ||
| 98 | case V4L2_STD_PAL_K: | ||
| 99 | name = "PAL-K"; | ||
| 100 | break; | ||
| 101 | case V4L2_STD_PAL_M: | ||
| 102 | name = "PAL-M"; | ||
| 103 | break; | ||
| 104 | case V4L2_STD_PAL_N: | ||
| 105 | name = "PAL-N"; | ||
| 106 | break; | ||
| 107 | case V4L2_STD_PAL_Nc: | ||
| 108 | name = "PAL-Nc"; | ||
| 109 | break; | ||
| 110 | case V4L2_STD_PAL_60: | ||
| 111 | name = "PAL-60"; | ||
| 112 | break; | ||
| 113 | case V4L2_STD_NTSC: | ||
| 114 | name = "NTSC"; | ||
| 115 | break; | ||
| 116 | case V4L2_STD_NTSC_M: | ||
| 117 | name = "NTSC-M"; | ||
| 118 | break; | ||
| 119 | case V4L2_STD_NTSC_M_JP: | ||
| 120 | name = "NTSC-M-JP"; | ||
| 121 | break; | ||
| 122 | case V4L2_STD_NTSC_443: | ||
| 123 | name = "NTSC-443"; | ||
| 124 | break; | ||
| 125 | case V4L2_STD_NTSC_M_KR: | ||
| 126 | name = "NTSC-M-KR"; | ||
| 127 | break; | ||
| 128 | case V4L2_STD_SECAM: | ||
| 129 | name = "SECAM"; | ||
| 130 | break; | ||
| 131 | case V4L2_STD_SECAM_DK: | ||
| 132 | name = "SECAM-DK"; | ||
| 133 | break; | ||
| 134 | case V4L2_STD_SECAM_B: | ||
| 135 | name = "SECAM-B"; | ||
| 136 | break; | ||
| 137 | case V4L2_STD_SECAM_D: | ||
| 138 | name = "SECAM-D"; | ||
| 139 | break; | ||
| 140 | case V4L2_STD_SECAM_G: | ||
| 141 | name = "SECAM-G"; | ||
| 142 | break; | ||
| 143 | case V4L2_STD_SECAM_H: | ||
| 144 | name = "SECAM-H"; | ||
| 145 | break; | ||
| 146 | case V4L2_STD_SECAM_K: | ||
| 147 | name = "SECAM-K"; | ||
| 148 | break; | ||
| 149 | case V4L2_STD_SECAM_K1: | ||
| 150 | name = "SECAM-K1"; | ||
| 151 | break; | ||
| 152 | case V4L2_STD_SECAM_L: | ||
| 153 | name = "SECAM-L"; | ||
| 154 | break; | ||
| 155 | case V4L2_STD_SECAM_LC: | ||
| 156 | name = "SECAM-LC"; | ||
| 157 | break; | ||
| 158 | default: | ||
| 159 | name = "Unknown"; | ||
| 160 | break; | ||
| 161 | } | ||
| 162 | |||
| 163 | return name; | ||
| 164 | } | 110 | } |
| 165 | EXPORT_SYMBOL(v4l2_norm_to_name); | 111 | EXPORT_SYMBOL(v4l2_norm_to_name); |
| 166 | 112 | ||
| 167 | /* Fill in the fields of a v4l2_standard structure according to the | 113 | /* Fill in the fields of a v4l2_standard structure according to the |
| 168 | 'id' and 'transmission' parameters. Returns negative on error. */ | 114 | 'id' and 'transmission' parameters. Returns negative on error. */ |
| 169 | int v4l2_video_std_construct(struct v4l2_standard *vs, | 115 | int v4l2_video_std_construct(struct v4l2_standard *vs, |
| 170 | int id, char *name) | 116 | int id, const char *name) |
| 171 | { | 117 | { |
| 172 | u32 index = vs->index; | 118 | u32 index = vs->index; |
| 173 | 119 | ||
| @@ -1218,95 +1164,40 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
| 1218 | case VIDIOC_ENUMSTD: | 1164 | case VIDIOC_ENUMSTD: |
| 1219 | { | 1165 | { |
| 1220 | struct v4l2_standard *p = arg; | 1166 | struct v4l2_standard *p = arg; |
| 1221 | v4l2_std_id id = vfd->tvnorms,curr_id=0; | 1167 | v4l2_std_id id = vfd->tvnorms, curr_id = 0; |
| 1222 | unsigned int index = p->index,i; | 1168 | unsigned int index = p->index, i, j = 0; |
| 1223 | 1169 | const char *descr = ""; | |
| 1224 | if (index<0) { | 1170 | |
| 1225 | ret=-EINVAL; | 1171 | /* Return norm array in a canonical way */ |
| 1226 | break; | 1172 | for (i = 0; i <= index && id; i++) { |
| 1227 | } | 1173 | /* last std value in the standards array is 0, so this |
| 1228 | 1174 | while always ends there since (id & 0) == 0. */ | |
| 1229 | /* Return norm array on a canonical way */ | 1175 | while ((id & standards[j].std) != standards[j].std) |
| 1230 | for (i=0;i<= index && id; i++) { | 1176 | j++; |
| 1231 | if ( (id & V4L2_STD_PAL) == V4L2_STD_PAL) { | 1177 | curr_id = standards[j].std; |
| 1232 | curr_id = V4L2_STD_PAL; | 1178 | descr = standards[j].descr; |
| 1233 | } else if ( (id & V4L2_STD_PAL_BG) == V4L2_STD_PAL_BG) { | 1179 | j++; |
| 1234 | curr_id = V4L2_STD_PAL_BG; | 1180 | if (curr_id == 0) |
| 1235 | } else if ( (id & V4L2_STD_PAL_DK) == V4L2_STD_PAL_DK) { | ||
| 1236 | curr_id = V4L2_STD_PAL_DK; | ||
| 1237 | } else if ( (id & V4L2_STD_PAL_B) == V4L2_STD_PAL_B) { | ||
| 1238 | curr_id = V4L2_STD_PAL_B; | ||
| 1239 | } else if ( (id & V4L2_STD_PAL_B1) == V4L2_STD_PAL_B1) { | ||
| 1240 | curr_id = V4L2_STD_PAL_B1; | ||
| 1241 | } else if ( (id & V4L2_STD_PAL_G) == V4L2_STD_PAL_G) { | ||
| 1242 | curr_id = V4L2_STD_PAL_G; | ||
| 1243 | } else if ( (id & V4L2_STD_PAL_H) == V4L2_STD_PAL_H) { | ||
| 1244 | curr_id = V4L2_STD_PAL_H; | ||
| 1245 | } else if ( (id & V4L2_STD_PAL_I) == V4L2_STD_PAL_I) { | ||
| 1246 | curr_id = V4L2_STD_PAL_I; | ||
| 1247 | } else if ( (id & V4L2_STD_PAL_D) == V4L2_STD_PAL_D) { | ||
| 1248 | curr_id = V4L2_STD_PAL_D; | ||
| 1249 | } else if ( (id & V4L2_STD_PAL_D1) == V4L2_STD_PAL_D1) { | ||
| 1250 | curr_id = V4L2_STD_PAL_D1; | ||
| 1251 | } else if ( (id & V4L2_STD_PAL_K) == V4L2_STD_PAL_K) { | ||
| 1252 | curr_id = V4L2_STD_PAL_K; | ||
| 1253 | } else if ( (id & V4L2_STD_PAL_M) == V4L2_STD_PAL_M) { | ||
| 1254 | curr_id = V4L2_STD_PAL_M; | ||
| 1255 | } else if ( (id & V4L2_STD_PAL_N) == V4L2_STD_PAL_N) { | ||
| 1256 | curr_id = V4L2_STD_PAL_N; | ||
| 1257 | } else if ( (id & V4L2_STD_PAL_Nc) == V4L2_STD_PAL_Nc) { | ||
| 1258 | curr_id = V4L2_STD_PAL_Nc; | ||
| 1259 | } else if ( (id & V4L2_STD_PAL_60) == V4L2_STD_PAL_60) { | ||
| 1260 | curr_id = V4L2_STD_PAL_60; | ||
| 1261 | } else if ( (id & V4L2_STD_NTSC) == V4L2_STD_NTSC) { | ||
| 1262 | curr_id = V4L2_STD_NTSC; | ||
| 1263 | } else if ( (id & V4L2_STD_NTSC_M) == V4L2_STD_NTSC_M) { | ||
| 1264 | curr_id = V4L2_STD_NTSC_M; | ||
| 1265 | } else if ( (id & V4L2_STD_NTSC_M_JP) == V4L2_STD_NTSC_M_JP) { | ||
| 1266 | curr_id = V4L2_STD_NTSC_M_JP; | ||
| 1267 | } else if ( (id & V4L2_STD_NTSC_443) == V4L2_STD_NTSC_443) { | ||
| 1268 | curr_id = V4L2_STD_NTSC_443; | ||
| 1269 | } else if ( (id & V4L2_STD_NTSC_M_KR) == V4L2_STD_NTSC_M_KR) { | ||
| 1270 | curr_id = V4L2_STD_NTSC_M_KR; | ||
| 1271 | } else if ( (id & V4L2_STD_SECAM) == V4L2_STD_SECAM) { | ||
| 1272 | curr_id = V4L2_STD_SECAM; | ||
| 1273 | } else if ( (id & V4L2_STD_SECAM_DK) == V4L2_STD_SECAM_DK) { | ||
| 1274 | curr_id = V4L2_STD_SECAM_DK; | ||
| 1275 | } else if ( (id & V4L2_STD_SECAM_B) == V4L2_STD_SECAM_B) { | ||
| 1276 | curr_id = V4L2_STD_SECAM_B; | ||
| 1277 | } else if ( (id & V4L2_STD_SECAM_D) == V4L2_STD_SECAM_D) { | ||
| 1278 | curr_id = V4L2_STD_SECAM_D; | ||
| 1279 | } else if ( (id & V4L2_STD_SECAM_G) == V4L2_STD_SECAM_G) { | ||
| 1280 | curr_id = V4L2_STD_SECAM_G; | ||
| 1281 | } else if ( (id & V4L2_STD_SECAM_H) == V4L2_STD_SECAM_H) { | ||
| 1282 | curr_id = V4L2_STD_SECAM_H; | ||
| 1283 | } else if ( (id & V4L2_STD_SECAM_K) == V4L2_STD_SECAM_K) { | ||
| 1284 | curr_id = V4L2_STD_SECAM_K; | ||
| 1285 | } else if ( (id & V4L2_STD_SECAM_K1) == V4L2_STD_SECAM_K1) { | ||
| 1286 | curr_id = V4L2_STD_SECAM_K1; | ||
| 1287 | } else if ( (id & V4L2_STD_SECAM_L) == V4L2_STD_SECAM_L) { | ||
| 1288 | curr_id = V4L2_STD_SECAM_L; | ||
| 1289 | } else if ( (id & V4L2_STD_SECAM_LC) == V4L2_STD_SECAM_LC) { | ||
| 1290 | curr_id = V4L2_STD_SECAM_LC; | ||
| 1291 | } else { | ||
| 1292 | break; | 1181 | break; |
| 1293 | } | 1182 | if (curr_id != V4L2_STD_PAL && |
| 1294 | id &= ~curr_id; | 1183 | curr_id != V4L2_STD_SECAM && |
| 1184 | curr_id != V4L2_STD_NTSC) | ||
| 1185 | id &= ~curr_id; | ||
| 1295 | } | 1186 | } |
| 1296 | if (i<=index) | 1187 | if (i <= index) |
| 1297 | return -EINVAL; | 1188 | return -EINVAL; |
| 1298 | 1189 | ||
| 1299 | v4l2_video_std_construct(p, curr_id,v4l2_norm_to_name(curr_id)); | 1190 | v4l2_video_std_construct(p, curr_id, descr); |
| 1300 | p->index = index; | 1191 | p->index = index; |
| 1301 | 1192 | ||
| 1302 | dbgarg (cmd, "index=%d, id=%Ld, name=%s, fps=%d/%d, " | 1193 | dbgarg(cmd, "index=%d, id=%Ld, name=%s, fps=%d/%d, " |
| 1303 | "framelines=%d\n", p->index, | 1194 | "framelines=%d\n", p->index, |
| 1304 | (unsigned long long)p->id, p->name, | 1195 | (unsigned long long)p->id, p->name, |
| 1305 | p->frameperiod.numerator, | 1196 | p->frameperiod.numerator, |
| 1306 | p->frameperiod.denominator, | 1197 | p->frameperiod.denominator, |
| 1307 | p->framelines); | 1198 | p->framelines); |
| 1308 | 1199 | ||
| 1309 | ret=0; | 1200 | ret = 0; |
| 1310 | break; | 1201 | break; |
| 1311 | } | 1202 | } |
| 1312 | case VIDIOC_G_STD: | 1203 | case VIDIOC_G_STD: |
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 845be1864f68..5ff9a58b6135 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
| @@ -327,13 +327,14 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf) | |||
| 327 | int hmax = buf->vb.height; | 327 | int hmax = buf->vb.height; |
| 328 | int wmax = buf->vb.width; | 328 | int wmax = buf->vb.width; |
| 329 | struct timeval ts; | 329 | struct timeval ts; |
| 330 | char *tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC); | 330 | char *tmpbuf; |
| 331 | void *vbuf = videobuf_to_vmalloc(&buf->vb); | 331 | void *vbuf = videobuf_to_vmalloc(&buf->vb); |
| 332 | 332 | ||
| 333 | if (!tmpbuf) | 333 | if (!vbuf) |
| 334 | return; | 334 | return; |
| 335 | 335 | ||
| 336 | if (!vbuf) | 336 | tmpbuf = kmalloc(wmax * 2, GFP_ATOMIC); |
| 337 | if (!tmpbuf) | ||
| 337 | return; | 338 | return; |
| 338 | 339 | ||
| 339 | for (h = 0; h < hmax; h++) { | 340 | for (h = 0; h < hmax; h++) { |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 65210fca37ed..d89475d36988 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -114,6 +114,7 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 114 | unsigned int nob = data->blocks; | 114 | unsigned int nob = data->blocks; |
| 115 | unsigned long long clks; | 115 | unsigned long long clks; |
| 116 | unsigned int timeout; | 116 | unsigned int timeout; |
| 117 | bool dalgn = 0; | ||
| 117 | u32 dcmd; | 118 | u32 dcmd; |
| 118 | int i; | 119 | int i; |
| 119 | 120 | ||
| @@ -152,6 +153,9 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 152 | host->sg_cpu[i].dcmd = dcmd | length; | 153 | host->sg_cpu[i].dcmd = dcmd | length; |
| 153 | if (length & 31 && !(data->flags & MMC_DATA_READ)) | 154 | if (length & 31 && !(data->flags & MMC_DATA_READ)) |
| 154 | host->sg_cpu[i].dcmd |= DCMD_ENDIRQEN; | 155 | host->sg_cpu[i].dcmd |= DCMD_ENDIRQEN; |
| 156 | /* Not aligned to 8-byte boundary? */ | ||
| 157 | if (sg_dma_address(&data->sg[i]) & 0x7) | ||
| 158 | dalgn = 1; | ||
| 155 | if (data->flags & MMC_DATA_READ) { | 159 | if (data->flags & MMC_DATA_READ) { |
| 156 | host->sg_cpu[i].dsadr = host->res->start + MMC_RXFIFO; | 160 | host->sg_cpu[i].dsadr = host->res->start + MMC_RXFIFO; |
| 157 | host->sg_cpu[i].dtadr = sg_dma_address(&data->sg[i]); | 161 | host->sg_cpu[i].dtadr = sg_dma_address(&data->sg[i]); |
| @@ -165,6 +169,15 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 165 | host->sg_cpu[host->dma_len - 1].ddadr = DDADR_STOP; | 169 | host->sg_cpu[host->dma_len - 1].ddadr = DDADR_STOP; |
| 166 | wmb(); | 170 | wmb(); |
| 167 | 171 | ||
| 172 | /* | ||
| 173 | * The PXA27x DMA controller encounters overhead when working with | ||
| 174 | * unaligned (to 8-byte boundaries) data, so switch on byte alignment | ||
| 175 | * mode only if we have unaligned data. | ||
| 176 | */ | ||
| 177 | if (dalgn) | ||
| 178 | DALGN |= (1 << host->dma); | ||
| 179 | else | ||
| 180 | DALGN &= (1 << host->dma); | ||
| 168 | DDADR(host->dma) = host->sg_dma; | 181 | DDADR(host->dma) = host->sg_dma; |
| 169 | DCSR(host->dma) = DCSR_RUN; | 182 | DCSR(host->dma) = DCSR_RUN; |
| 170 | } | 183 | } |
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 07c2048b230b..b413aa6c246b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -55,6 +55,10 @@ static unsigned int debug_quirks = 0; | |||
| 55 | #define SDHCI_QUIRK_32BIT_DMA_SIZE (1<<7) | 55 | #define SDHCI_QUIRK_32BIT_DMA_SIZE (1<<7) |
| 56 | /* Controller needs to be reset after each request to stay stable */ | 56 | /* Controller needs to be reset after each request to stay stable */ |
| 57 | #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) | 57 | #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) |
| 58 | /* Controller needs voltage and power writes to happen separately */ | ||
| 59 | #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9) | ||
| 60 | /* Controller has an off-by-one issue with timeout value */ | ||
| 61 | #define SDHCI_QUIRK_INCR_TIMEOUT_CONTROL (1<<10) | ||
| 58 | 62 | ||
| 59 | static const struct pci_device_id pci_ids[] __devinitdata = { | 63 | static const struct pci_device_id pci_ids[] __devinitdata = { |
| 60 | { | 64 | { |
| @@ -115,7 +119,8 @@ static const struct pci_device_id pci_ids[] __devinitdata = { | |||
| 115 | .subvendor = PCI_ANY_ID, | 119 | .subvendor = PCI_ANY_ID, |
| 116 | .subdevice = PCI_ANY_ID, | 120 | .subdevice = PCI_ANY_ID, |
| 117 | .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE | | 121 | .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE | |
| 118 | SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS, | 122 | SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS | |
| 123 | SDHCI_QUIRK_BROKEN_DMA, | ||
| 119 | }, | 124 | }, |
| 120 | 125 | ||
| 121 | { | 126 | { |
| @@ -124,7 +129,17 @@ static const struct pci_device_id pci_ids[] __devinitdata = { | |||
| 124 | .subvendor = PCI_ANY_ID, | 129 | .subvendor = PCI_ANY_ID, |
| 125 | .subdevice = PCI_ANY_ID, | 130 | .subdevice = PCI_ANY_ID, |
| 126 | .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE | | 131 | .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE | |
| 127 | SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS, | 132 | SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS | |
| 133 | SDHCI_QUIRK_BROKEN_DMA, | ||
| 134 | }, | ||
| 135 | |||
| 136 | { | ||
| 137 | .vendor = PCI_VENDOR_ID_MARVELL, | ||
| 138 | .device = PCI_DEVICE_ID_MARVELL_CAFE_SD, | ||
| 139 | .subvendor = PCI_ANY_ID, | ||
| 140 | .subdevice = PCI_ANY_ID, | ||
| 141 | .driver_data = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | | ||
| 142 | SDHCI_QUIRK_INCR_TIMEOUT_CONTROL, | ||
| 128 | }, | 143 | }, |
| 129 | 144 | ||
| 130 | { | 145 | { |
| @@ -469,6 +484,13 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) | |||
| 469 | break; | 484 | break; |
| 470 | } | 485 | } |
| 471 | 486 | ||
| 487 | /* | ||
| 488 | * Compensate for an off-by-one error in the CaFe hardware; otherwise, | ||
| 489 | * a too-small count gives us interrupt timeouts. | ||
| 490 | */ | ||
| 491 | if ((host->chip->quirks & SDHCI_QUIRK_INCR_TIMEOUT_CONTROL)) | ||
| 492 | count++; | ||
| 493 | |||
| 472 | if (count >= 0xF) { | 494 | if (count >= 0xF) { |
| 473 | printk(KERN_WARNING "%s: Too large timeout requested!\n", | 495 | printk(KERN_WARNING "%s: Too large timeout requested!\n", |
| 474 | mmc_hostname(host->mmc)); | 496 | mmc_hostname(host->mmc)); |
| @@ -774,6 +796,14 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) | |||
| 774 | BUG(); | 796 | BUG(); |
| 775 | } | 797 | } |
| 776 | 798 | ||
| 799 | /* | ||
| 800 | * At least the CaFe chip gets confused if we set the voltage | ||
| 801 | * and set turn on power at the same time, so set the voltage first. | ||
| 802 | */ | ||
| 803 | if ((host->chip->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)) | ||
| 804 | writeb(pwr & ~SDHCI_POWER_ON, | ||
| 805 | host->ioaddr + SDHCI_POWER_CONTROL); | ||
| 806 | |||
| 777 | writeb(pwr, host->ioaddr + SDHCI_POWER_CONTROL); | 807 | writeb(pwr, host->ioaddr + SDHCI_POWER_CONTROL); |
| 778 | 808 | ||
| 779 | out: | 809 | out: |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 2edda8cc7f99..aabad8ce7458 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -1768,9 +1768,10 @@ vortex_timer(unsigned long data) | |||
| 1768 | case XCVR_MII: case XCVR_NWAY: | 1768 | case XCVR_MII: case XCVR_NWAY: |
| 1769 | { | 1769 | { |
| 1770 | ok = 1; | 1770 | ok = 1; |
| 1771 | spin_lock_bh(&vp->lock); | 1771 | /* Interrupts are already disabled */ |
| 1772 | spin_lock(&vp->lock); | ||
| 1772 | vortex_check_media(dev, 0); | 1773 | vortex_check_media(dev, 0); |
| 1773 | spin_unlock_bh(&vp->lock); | 1774 | spin_unlock(&vp->lock); |
| 1774 | } | 1775 | } |
| 1775 | break; | 1776 | break; |
| 1776 | default: /* Other media types handled by Tx timeouts. */ | 1777 | default: /* Other media types handled by Tx timeouts. */ |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index f3cba5e24ec5..1037b1332312 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -1803,6 +1803,8 @@ static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx) | |||
| 1803 | if (rx->prev->skb) { | 1803 | if (rx->prev->skb) { |
| 1804 | struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data; | 1804 | struct rfd *prev_rfd = (struct rfd *)rx->prev->skb->data; |
| 1805 | put_unaligned_le32(rx->dma_addr, &prev_rfd->link); | 1805 | put_unaligned_le32(rx->dma_addr, &prev_rfd->link); |
| 1806 | pci_dma_sync_single_for_device(nic->pdev, rx->prev->dma_addr, | ||
| 1807 | sizeof(struct rfd), PCI_DMA_TODEVICE); | ||
| 1806 | } | 1808 | } |
| 1807 | 1809 | ||
| 1808 | return 0; | 1810 | return 0; |
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 701531e72e7b..a3f6a9c72ec8 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
| @@ -347,7 +347,7 @@ e1000_set_tso(struct net_device *netdev, u32 data) | |||
| 347 | else | 347 | else |
| 348 | netdev->features &= ~NETIF_F_TSO; | 348 | netdev->features &= ~NETIF_F_TSO; |
| 349 | 349 | ||
| 350 | if (data) | 350 | if (data && (adapter->hw.mac_type > e1000_82547_rev_2)) |
| 351 | netdev->features |= NETIF_F_TSO6; | 351 | netdev->features |= NETIF_F_TSO6; |
| 352 | else | 352 | else |
| 353 | netdev->features &= ~NETIF_F_TSO6; | 353 | netdev->features &= ~NETIF_F_TSO6; |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index cab1835173cd..648a87bbf467 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter) | |||
| 2535 | adapter->link_speed = 0; | 2535 | adapter->link_speed = 0; |
| 2536 | adapter->link_duplex = 0; | 2536 | adapter->link_duplex = 0; |
| 2537 | 2537 | ||
| 2538 | e1000e_reset(adapter); | 2538 | if (!pci_channel_offline(adapter->pdev)) |
| 2539 | e1000e_reset(adapter); | ||
| 2539 | e1000_clean_tx_ring(adapter); | 2540 | e1000_clean_tx_ring(adapter); |
| 2540 | e1000_clean_rx_ring(adapter); | 2541 | e1000_clean_rx_ring(adapter); |
| 2541 | 2542 | ||
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index 0b94833e23f7..e8cfadefa4b6 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
| @@ -1077,8 +1077,6 @@ static inline void rx_off(struct scc_priv *priv) | |||
| 1077 | 1077 | ||
| 1078 | static void start_timer(struct scc_priv *priv, int t, int r15) | 1078 | static void start_timer(struct scc_priv *priv, int t, int r15) |
| 1079 | { | 1079 | { |
| 1080 | unsigned long flags; | ||
| 1081 | |||
| 1082 | outb(priv->tmr_mode, priv->tmr_ctrl); | 1080 | outb(priv->tmr_mode, priv->tmr_ctrl); |
| 1083 | if (t == 0) { | 1081 | if (t == 0) { |
| 1084 | tm_isr(priv); | 1082 | tm_isr(priv); |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ae398f04c7b4..e79a26a886c8 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -718,7 +718,8 @@ void igb_down(struct igb_adapter *adapter) | |||
| 718 | adapter->link_speed = 0; | 718 | adapter->link_speed = 0; |
| 719 | adapter->link_duplex = 0; | 719 | adapter->link_duplex = 0; |
| 720 | 720 | ||
| 721 | igb_reset(adapter); | 721 | if (!pci_channel_offline(adapter->pdev)) |
| 722 | igb_reset(adapter); | ||
| 722 | igb_clean_all_tx_rings(adapter); | 723 | igb_clean_all_tx_rings(adapter); |
| 723 | igb_clean_all_rx_rings(adapter); | 724 | igb_clean_all_rx_rings(adapter); |
| 724 | } | 725 | } |
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 679a0826780e..2c03f4e2ccc4 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
| @@ -1271,7 +1271,7 @@ static void ipg_nic_rx_with_end(struct net_device *dev, | |||
| 1271 | 1271 | ||
| 1272 | framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN; | 1272 | framelen = le64_to_cpu(rxfd->rfs) & IPG_RFS_RXFRAMELEN; |
| 1273 | 1273 | ||
| 1274 | endframeLen = framelen - jumbo->current_size; | 1274 | endframelen = framelen - jumbo->current_size; |
| 1275 | /* | 1275 | /* |
| 1276 | if (framelen > IPG_RXFRAG_SIZE) | 1276 | if (framelen > IPG_RXFRAG_SIZE) |
| 1277 | framelen=IPG_RXFRAG_SIZE; | 1277 | framelen=IPG_RXFRAG_SIZE; |
| @@ -1279,8 +1279,8 @@ static void ipg_nic_rx_with_end(struct net_device *dev, | |||
| 1279 | if (framelen > IPG_RXSUPPORT_SIZE) | 1279 | if (framelen > IPG_RXSUPPORT_SIZE) |
| 1280 | dev_kfree_skb_irq(jumbo->skb); | 1280 | dev_kfree_skb_irq(jumbo->skb); |
| 1281 | else { | 1281 | else { |
| 1282 | memcpy(skb_put(jumbo->skb, endframeLen), | 1282 | memcpy(skb_put(jumbo->skb, endframelen), |
| 1283 | skb->data, endframeLen); | 1283 | skb->data, endframelen); |
| 1284 | 1284 | ||
| 1285 | jumbo->skb->protocol = | 1285 | jumbo->skb->protocol = |
| 1286 | eth_type_trans(jumbo->skb, dev); | 1286 | eth_type_trans(jumbo->skb, dev); |
| @@ -1352,16 +1352,16 @@ static int ipg_nic_rx(struct net_device *dev) | |||
| 1352 | 1352 | ||
| 1353 | switch (ipg_nic_rx_check_frame_type(dev)) { | 1353 | switch (ipg_nic_rx_check_frame_type(dev)) { |
| 1354 | case FRAME_WITH_START_WITH_END: | 1354 | case FRAME_WITH_START_WITH_END: |
| 1355 | ipg_nic_rx_with_start_and_end(dev, tp, rxfd, entry); | 1355 | ipg_nic_rx_with_start_and_end(dev, sp, rxfd, entry); |
| 1356 | break; | 1356 | break; |
| 1357 | case FRAME_WITH_START: | 1357 | case FRAME_WITH_START: |
| 1358 | ipg_nic_rx_with_start(dev, tp, rxfd, entry); | 1358 | ipg_nic_rx_with_start(dev, sp, rxfd, entry); |
| 1359 | break; | 1359 | break; |
| 1360 | case FRAME_WITH_END: | 1360 | case FRAME_WITH_END: |
| 1361 | ipg_nic_rx_with_end(dev, tp, rxfd, entry); | 1361 | ipg_nic_rx_with_end(dev, sp, rxfd, entry); |
| 1362 | break; | 1362 | break; |
| 1363 | case FRAME_NO_START_NO_END: | 1363 | case FRAME_NO_START_NO_END: |
| 1364 | ipg_nic_rx_no_start_no_end(dev, tp, rxfd, entry); | 1364 | ipg_nic_rx_no_start_no_end(dev, sp, rxfd, entry); |
| 1365 | break; | 1365 | break; |
| 1366 | } | 1366 | } |
| 1367 | } | 1367 | } |
| @@ -1808,7 +1808,7 @@ static int ipg_nic_open(struct net_device *dev) | |||
| 1808 | /* initialize JUMBO Frame control variable */ | 1808 | /* initialize JUMBO Frame control variable */ |
| 1809 | sp->jumbo.found_start = 0; | 1809 | sp->jumbo.found_start = 0; |
| 1810 | sp->jumbo.current_size = 0; | 1810 | sp->jumbo.current_size = 0; |
| 1811 | sp->jumbo.skb = 0; | 1811 | sp->jumbo.skb = NULL; |
| 1812 | dev->mtu = IPG_TXFRAG_SIZE; | 1812 | dev->mtu = IPG_TXFRAG_SIZE; |
| 1813 | #endif | 1813 | #endif |
| 1814 | 1814 | ||
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7b859220c255..8f0460901153 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -1969,7 +1969,8 @@ void ixgbe_down(struct ixgbe_adapter *adapter) | |||
| 1969 | netif_carrier_off(netdev); | 1969 | netif_carrier_off(netdev); |
| 1970 | netif_stop_queue(netdev); | 1970 | netif_stop_queue(netdev); |
| 1971 | 1971 | ||
| 1972 | ixgbe_reset(adapter); | 1972 | if (!pci_channel_offline(adapter->pdev)) |
| 1973 | ixgbe_reset(adapter); | ||
| 1973 | ixgbe_clean_all_tx_rings(adapter); | 1974 | ixgbe_clean_all_tx_rings(adapter); |
| 1974 | ixgbe_clean_all_rx_rings(adapter); | 1975 | ixgbe_clean_all_rx_rings(adapter); |
| 1975 | 1976 | ||
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 6797ed069f1f..63cd67b931e7 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -71,14 +71,18 @@ static irqreturn_t netxen_intr(int irq, void *data); | |||
| 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); | 71 | static irqreturn_t netxen_msi_intr(int irq, void *data); |
| 72 | 72 | ||
| 73 | /* PCI Device ID Table */ | 73 | /* PCI Device ID Table */ |
| 74 | #define ENTRY(device) \ | ||
| 75 | {PCI_DEVICE(0x4040, (device)), \ | ||
| 76 | .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0} | ||
| 77 | |||
| 74 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { | 78 | static struct pci_device_id netxen_pci_tbl[] __devinitdata = { |
| 75 | {PCI_DEVICE(0x4040, 0x0001), PCI_DEVICE_CLASS(0x020000, ~0)}, | 79 | ENTRY(0x0001), |
| 76 | {PCI_DEVICE(0x4040, 0x0002), PCI_DEVICE_CLASS(0x020000, ~0)}, | 80 | ENTRY(0x0002), |
| 77 | {PCI_DEVICE(0x4040, 0x0003), PCI_DEVICE_CLASS(0x020000, ~0)}, | 81 | ENTRY(0x0003), |
| 78 | {PCI_DEVICE(0x4040, 0x0004), PCI_DEVICE_CLASS(0x020000, ~0)}, | 82 | ENTRY(0x0004), |
| 79 | {PCI_DEVICE(0x4040, 0x0005), PCI_DEVICE_CLASS(0x020000, ~0)}, | 83 | ENTRY(0x0005), |
| 80 | {PCI_DEVICE(0x4040, 0x0024), PCI_DEVICE_CLASS(0x020000, ~0)}, | 84 | ENTRY(0x0024), |
| 81 | {PCI_DEVICE(0x4040, 0x0025), PCI_DEVICE_CLASS(0x020000, ~0)}, | 85 | ENTRY(0x0025), |
| 82 | {0,} | 86 | {0,} |
| 83 | }; | 87 | }; |
| 84 | 88 | ||
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index ce95c5d168fe..70d012e90dcf 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
| @@ -525,12 +525,14 @@ static int axnet_open(struct net_device *dev) | |||
| 525 | int ret; | 525 | int ret; |
| 526 | axnet_dev_t *info = PRIV(dev); | 526 | axnet_dev_t *info = PRIV(dev); |
| 527 | struct pcmcia_device *link = info->p_dev; | 527 | struct pcmcia_device *link = info->p_dev; |
| 528 | unsigned int nic_base = dev->base_addr; | ||
| 528 | 529 | ||
| 529 | DEBUG(2, "axnet_open('%s')\n", dev->name); | 530 | DEBUG(2, "axnet_open('%s')\n", dev->name); |
| 530 | 531 | ||
| 531 | if (!pcmcia_dev_present(link)) | 532 | if (!pcmcia_dev_present(link)) |
| 532 | return -ENODEV; | 533 | return -ENODEV; |
| 533 | 534 | ||
| 535 | outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */ | ||
| 534 | ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev); | 536 | ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, "axnet_cs", dev); |
| 535 | if (ret) | 537 | if (ret) |
| 536 | return ret; | 538 | return ret; |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index fd8158a86f64..2d4c4ad89b8d 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -969,6 +969,7 @@ static int pcnet_open(struct net_device *dev) | |||
| 969 | int ret; | 969 | int ret; |
| 970 | pcnet_dev_t *info = PRIV(dev); | 970 | pcnet_dev_t *info = PRIV(dev); |
| 971 | struct pcmcia_device *link = info->p_dev; | 971 | struct pcmcia_device *link = info->p_dev; |
| 972 | unsigned int nic_base = dev->base_addr; | ||
| 972 | 973 | ||
| 973 | DEBUG(2, "pcnet_open('%s')\n", dev->name); | 974 | DEBUG(2, "pcnet_open('%s')\n", dev->name); |
| 974 | 975 | ||
| @@ -976,6 +977,8 @@ static int pcnet_open(struct net_device *dev) | |||
| 976 | return -ENODEV; | 977 | return -ENODEV; |
| 977 | 978 | ||
| 978 | set_misc_reg(dev); | 979 | set_misc_reg(dev); |
| 980 | |||
| 981 | outb_p(0xFF, nic_base + EN0_ISR); /* Clear bogus intr. */ | ||
| 979 | ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev); | 982 | ret = request_irq(dev->irq, ei_irq_wrapper, IRQF_SHARED, dev_info, dev); |
| 980 | if (ret) | 983 | if (ret) |
| 981 | return ret; | 984 | return ret; |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index b7f7b2227d56..bccee68bd48a 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
| @@ -3701,7 +3701,9 @@ static int ql_cycle_adapter(struct ql3_adapter *qdev, int reset) | |||
| 3701 | printk(KERN_ERR PFX | 3701 | printk(KERN_ERR PFX |
| 3702 | "%s: Driver up/down cycle failed, " | 3702 | "%s: Driver up/down cycle failed, " |
| 3703 | "closing device\n",qdev->ndev->name); | 3703 | "closing device\n",qdev->ndev->name); |
| 3704 | rtnl_lock(); | ||
| 3704 | dev_close(qdev->ndev); | 3705 | dev_close(qdev->ndev); |
| 3706 | rtnl_unlock(); | ||
| 3705 | return -1; | 3707 | return -1; |
| 3706 | } | 3708 | } |
| 3707 | return 0; | 3709 | return 0; |
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 858b191517b3..504a48ff73c8 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -273,7 +273,7 @@ static void r6040_init_ring_desc(struct r6040_descriptor *desc_ring, | |||
| 273 | dma_addr_t mapping = desc_dma; | 273 | dma_addr_t mapping = desc_dma; |
| 274 | 274 | ||
| 275 | while (size-- > 0) { | 275 | while (size-- > 0) { |
| 276 | mapping += sizeof(sizeof(*desc)); | 276 | mapping += sizeof(*desc); |
| 277 | desc->ndesc = cpu_to_le32(mapping); | 277 | desc->ndesc = cpu_to_le32(mapping); |
| 278 | desc->vndescp = desc + 1; | 278 | desc->vndescp = desc + 1; |
| 279 | desc++; | 279 | desc++; |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index b5c1e663417d..ae7b697456b4 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -2625,9 +2625,7 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
| 2625 | rxdp1->Buffer0_ptr = pci_map_single | 2625 | rxdp1->Buffer0_ptr = pci_map_single |
| 2626 | (ring->pdev, skb->data, size - NET_IP_ALIGN, | 2626 | (ring->pdev, skb->data, size - NET_IP_ALIGN, |
| 2627 | PCI_DMA_FROMDEVICE); | 2627 | PCI_DMA_FROMDEVICE); |
| 2628 | if( (rxdp1->Buffer0_ptr == 0) || | 2628 | if(pci_dma_mapping_error(rxdp1->Buffer0_ptr)) |
| 2629 | (rxdp1->Buffer0_ptr == | ||
| 2630 | DMA_ERROR_CODE)) | ||
| 2631 | goto pci_map_failed; | 2629 | goto pci_map_failed; |
| 2632 | 2630 | ||
| 2633 | rxdp->Control_2 = | 2631 | rxdp->Control_2 = |
| @@ -2657,6 +2655,7 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
| 2657 | skb->data = (void *) (unsigned long)tmp; | 2655 | skb->data = (void *) (unsigned long)tmp; |
| 2658 | skb_reset_tail_pointer(skb); | 2656 | skb_reset_tail_pointer(skb); |
| 2659 | 2657 | ||
| 2658 | /* AK: check is wrong. 0 can be valid dma address */ | ||
| 2660 | if (!(rxdp3->Buffer0_ptr)) | 2659 | if (!(rxdp3->Buffer0_ptr)) |
| 2661 | rxdp3->Buffer0_ptr = | 2660 | rxdp3->Buffer0_ptr = |
| 2662 | pci_map_single(ring->pdev, ba->ba_0, | 2661 | pci_map_single(ring->pdev, ba->ba_0, |
| @@ -2665,8 +2664,7 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
| 2665 | pci_dma_sync_single_for_device(ring->pdev, | 2664 | pci_dma_sync_single_for_device(ring->pdev, |
| 2666 | (dma_addr_t) rxdp3->Buffer0_ptr, | 2665 | (dma_addr_t) rxdp3->Buffer0_ptr, |
| 2667 | BUF0_LEN, PCI_DMA_FROMDEVICE); | 2666 | BUF0_LEN, PCI_DMA_FROMDEVICE); |
| 2668 | if( (rxdp3->Buffer0_ptr == 0) || | 2667 | if (pci_dma_mapping_error(rxdp3->Buffer0_ptr)) |
| 2669 | (rxdp3->Buffer0_ptr == DMA_ERROR_CODE)) | ||
| 2670 | goto pci_map_failed; | 2668 | goto pci_map_failed; |
| 2671 | 2669 | ||
| 2672 | rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN); | 2670 | rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN); |
| @@ -2681,18 +2679,17 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
| 2681 | (ring->pdev, skb->data, ring->mtu + 4, | 2679 | (ring->pdev, skb->data, ring->mtu + 4, |
| 2682 | PCI_DMA_FROMDEVICE); | 2680 | PCI_DMA_FROMDEVICE); |
| 2683 | 2681 | ||
| 2684 | if( (rxdp3->Buffer2_ptr == 0) || | 2682 | if (pci_dma_mapping_error(rxdp3->Buffer2_ptr)) |
| 2685 | (rxdp3->Buffer2_ptr == DMA_ERROR_CODE)) | ||
| 2686 | goto pci_map_failed; | 2683 | goto pci_map_failed; |
| 2687 | 2684 | ||
| 2685 | /* AK: check is wrong */ | ||
| 2688 | if (!rxdp3->Buffer1_ptr) | 2686 | if (!rxdp3->Buffer1_ptr) |
| 2689 | rxdp3->Buffer1_ptr = | 2687 | rxdp3->Buffer1_ptr = |
| 2690 | pci_map_single(ring->pdev, | 2688 | pci_map_single(ring->pdev, |
| 2691 | ba->ba_1, BUF1_LEN, | 2689 | ba->ba_1, BUF1_LEN, |
| 2692 | PCI_DMA_FROMDEVICE); | 2690 | PCI_DMA_FROMDEVICE); |
| 2693 | 2691 | ||
| 2694 | if( (rxdp3->Buffer1_ptr == 0) || | 2692 | if (pci_dma_mapping_error(rxdp3->Buffer1_ptr)) { |
| 2695 | (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) { | ||
| 2696 | pci_unmap_single | 2693 | pci_unmap_single |
| 2697 | (ring->pdev, | 2694 | (ring->pdev, |
| 2698 | (dma_addr_t)(unsigned long) | 2695 | (dma_addr_t)(unsigned long) |
| @@ -4264,16 +4261,14 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 4264 | txdp->Buffer_Pointer = pci_map_single(sp->pdev, | 4261 | txdp->Buffer_Pointer = pci_map_single(sp->pdev, |
| 4265 | fifo->ufo_in_band_v, | 4262 | fifo->ufo_in_band_v, |
| 4266 | sizeof(u64), PCI_DMA_TODEVICE); | 4263 | sizeof(u64), PCI_DMA_TODEVICE); |
| 4267 | if((txdp->Buffer_Pointer == 0) || | 4264 | if (pci_dma_mapping_error(txdp->Buffer_Pointer)) |
| 4268 | (txdp->Buffer_Pointer == DMA_ERROR_CODE)) | ||
| 4269 | goto pci_map_failed; | 4265 | goto pci_map_failed; |
| 4270 | txdp++; | 4266 | txdp++; |
| 4271 | } | 4267 | } |
| 4272 | 4268 | ||
| 4273 | txdp->Buffer_Pointer = pci_map_single | 4269 | txdp->Buffer_Pointer = pci_map_single |
| 4274 | (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE); | 4270 | (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE); |
| 4275 | if((txdp->Buffer_Pointer == 0) || | 4271 | if (pci_dma_mapping_error(txdp->Buffer_Pointer)) |
| 4276 | (txdp->Buffer_Pointer == DMA_ERROR_CODE)) | ||
| 4277 | goto pci_map_failed; | 4272 | goto pci_map_failed; |
| 4278 | 4273 | ||
| 4279 | txdp->Host_Control = (unsigned long) skb; | 4274 | txdp->Host_Control = (unsigned long) skb; |
| @@ -6884,10 +6879,8 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, | |||
| 6884 | pci_map_single( sp->pdev, (*skb)->data, | 6879 | pci_map_single( sp->pdev, (*skb)->data, |
| 6885 | size - NET_IP_ALIGN, | 6880 | size - NET_IP_ALIGN, |
| 6886 | PCI_DMA_FROMDEVICE); | 6881 | PCI_DMA_FROMDEVICE); |
| 6887 | if( (rxdp1->Buffer0_ptr == 0) || | 6882 | if (pci_dma_mapping_error(rxdp1->Buffer0_ptr)) |
| 6888 | (rxdp1->Buffer0_ptr == DMA_ERROR_CODE)) { | ||
| 6889 | goto memalloc_failed; | 6883 | goto memalloc_failed; |
| 6890 | } | ||
| 6891 | rxdp->Host_Control = (unsigned long) (*skb); | 6884 | rxdp->Host_Control = (unsigned long) (*skb); |
| 6892 | } | 6885 | } |
| 6893 | } else if ((sp->rxd_mode == RXD_MODE_3B) && (rxdp->Host_Control == 0)) { | 6886 | } else if ((sp->rxd_mode == RXD_MODE_3B) && (rxdp->Host_Control == 0)) { |
| @@ -6913,15 +6906,12 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, | |||
| 6913 | pci_map_single(sp->pdev, (*skb)->data, | 6906 | pci_map_single(sp->pdev, (*skb)->data, |
| 6914 | dev->mtu + 4, | 6907 | dev->mtu + 4, |
| 6915 | PCI_DMA_FROMDEVICE); | 6908 | PCI_DMA_FROMDEVICE); |
| 6916 | if( (rxdp3->Buffer2_ptr == 0) || | 6909 | if (pci_dma_mapping_error(rxdp3->Buffer2_ptr)) |
| 6917 | (rxdp3->Buffer2_ptr == DMA_ERROR_CODE)) { | ||
| 6918 | goto memalloc_failed; | 6910 | goto memalloc_failed; |
| 6919 | } | ||
| 6920 | rxdp3->Buffer0_ptr = *temp0 = | 6911 | rxdp3->Buffer0_ptr = *temp0 = |
| 6921 | pci_map_single( sp->pdev, ba->ba_0, BUF0_LEN, | 6912 | pci_map_single( sp->pdev, ba->ba_0, BUF0_LEN, |
| 6922 | PCI_DMA_FROMDEVICE); | 6913 | PCI_DMA_FROMDEVICE); |
| 6923 | if( (rxdp3->Buffer0_ptr == 0) || | 6914 | if (pci_dma_mapping_error(rxdp3->Buffer0_ptr)) { |
| 6924 | (rxdp3->Buffer0_ptr == DMA_ERROR_CODE)) { | ||
| 6925 | pci_unmap_single (sp->pdev, | 6915 | pci_unmap_single (sp->pdev, |
| 6926 | (dma_addr_t)rxdp3->Buffer2_ptr, | 6916 | (dma_addr_t)rxdp3->Buffer2_ptr, |
| 6927 | dev->mtu + 4, PCI_DMA_FROMDEVICE); | 6917 | dev->mtu + 4, PCI_DMA_FROMDEVICE); |
| @@ -6933,8 +6923,7 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp, | |||
| 6933 | rxdp3->Buffer1_ptr = *temp1 = | 6923 | rxdp3->Buffer1_ptr = *temp1 = |
| 6934 | pci_map_single(sp->pdev, ba->ba_1, BUF1_LEN, | 6924 | pci_map_single(sp->pdev, ba->ba_1, BUF1_LEN, |
| 6935 | PCI_DMA_FROMDEVICE); | 6925 | PCI_DMA_FROMDEVICE); |
| 6936 | if( (rxdp3->Buffer1_ptr == 0) || | 6926 | if (pci_dma_mapping_error(rxdp3->Buffer1_ptr)) { |
| 6937 | (rxdp3->Buffer1_ptr == DMA_ERROR_CODE)) { | ||
| 6938 | pci_unmap_single (sp->pdev, | 6927 | pci_unmap_single (sp->pdev, |
| 6939 | (dma_addr_t)rxdp3->Buffer0_ptr, | 6928 | (dma_addr_t)rxdp3->Buffer0_ptr, |
| 6940 | BUF0_LEN, PCI_DMA_FROMDEVICE); | 6929 | BUF0_LEN, PCI_DMA_FROMDEVICE); |
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 4706f7f9acb6..1827b6686c98 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
| @@ -75,10 +75,6 @@ static int debug_level = ERR_DBG; | |||
| 75 | /* DEBUG message print. */ | 75 | /* DEBUG message print. */ |
| 76 | #define DBG_PRINT(dbg_level, args...) if(!(debug_level<dbg_level)) printk(args) | 76 | #define DBG_PRINT(dbg_level, args...) if(!(debug_level<dbg_level)) printk(args) |
| 77 | 77 | ||
| 78 | #ifndef DMA_ERROR_CODE | ||
| 79 | #define DMA_ERROR_CODE (~(dma_addr_t)0x0) | ||
| 80 | #endif | ||
| 81 | |||
| 82 | /* Protocol assist features of the NIC */ | 78 | /* Protocol assist features of the NIC */ |
| 83 | #define L3_CKSUM_OK 0xFFFF | 79 | #define L3_CKSUM_OK 0xFFFF |
| 84 | #define L4_CKSUM_OK 0xFFFF | 80 | #define L4_CKSUM_OK 0xFFFF |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 10e4e85da3fc..b07b8cbadeaf 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
| @@ -1394,6 +1394,7 @@ tc35815_open(struct net_device *dev) | |||
| 1394 | tc35815_chip_init(dev); | 1394 | tc35815_chip_init(dev); |
| 1395 | spin_unlock_irq(&lp->lock); | 1395 | spin_unlock_irq(&lp->lock); |
| 1396 | 1396 | ||
| 1397 | netif_carrier_off(dev); | ||
| 1397 | /* schedule a link state check */ | 1398 | /* schedule a link state check */ |
| 1398 | phy_start(lp->phy_dev); | 1399 | phy_start(lp->phy_dev); |
| 1399 | 1400 | ||
| @@ -1735,7 +1736,6 @@ tc35815_rx(struct net_device *dev) | |||
| 1735 | skb = lp->rx_skbs[cur_bd].skb; | 1736 | skb = lp->rx_skbs[cur_bd].skb; |
| 1736 | prefetch(skb->data); | 1737 | prefetch(skb->data); |
| 1737 | lp->rx_skbs[cur_bd].skb = NULL; | 1738 | lp->rx_skbs[cur_bd].skb = NULL; |
| 1738 | lp->fbl_count--; | ||
| 1739 | pci_unmap_single(lp->pci_dev, | 1739 | pci_unmap_single(lp->pci_dev, |
| 1740 | lp->rx_skbs[cur_bd].skb_dma, | 1740 | lp->rx_skbs[cur_bd].skb_dma, |
| 1741 | RX_BUF_SIZE, PCI_DMA_FROMDEVICE); | 1741 | RX_BUF_SIZE, PCI_DMA_FROMDEVICE); |
| @@ -1791,6 +1791,7 @@ tc35815_rx(struct net_device *dev) | |||
| 1791 | #ifdef TC35815_USE_PACKEDBUFFER | 1791 | #ifdef TC35815_USE_PACKEDBUFFER |
| 1792 | while (lp->fbl_curid != id) | 1792 | while (lp->fbl_curid != id) |
| 1793 | #else | 1793 | #else |
| 1794 | lp->fbl_count--; | ||
| 1794 | while (lp->fbl_count < RX_BUF_NUM) | 1795 | while (lp->fbl_count < RX_BUF_NUM) |
| 1795 | #endif | 1796 | #endif |
| 1796 | { | 1797 | { |
| @@ -2453,6 +2454,7 @@ static int tc35815_resume(struct pci_dev *pdev) | |||
| 2453 | return 0; | 2454 | return 0; |
| 2454 | pci_set_power_state(pdev, PCI_D0); | 2455 | pci_set_power_state(pdev, PCI_D0); |
| 2455 | tc35815_restart(dev); | 2456 | tc35815_restart(dev); |
| 2457 | netif_carrier_off(dev); | ||
| 2456 | if (lp->phy_dev) | 2458 | if (lp->phy_dev) |
| 2457 | phy_start(lp->phy_dev); | 2459 | phy_start(lp->phy_dev); |
| 2458 | netif_device_attach(dev); | 2460 | netif_device_attach(dev); |
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 249e18053d5f..069f8bb0a99f 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/x25.h> | 32 | #include <linux/x25.h> |
| 33 | #include <linux/lapb.h> | 33 | #include <linux/lapb.h> |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/rtnetlink.h> | ||
| 35 | #include "x25_asy.h" | 36 | #include "x25_asy.h" |
| 36 | 37 | ||
| 37 | #include <net/x25device.h> | 38 | #include <net/x25device.h> |
| @@ -601,8 +602,10 @@ static void x25_asy_close_tty(struct tty_struct *tty) | |||
| 601 | if (!sl || sl->magic != X25_ASY_MAGIC) | 602 | if (!sl || sl->magic != X25_ASY_MAGIC) |
| 602 | return; | 603 | return; |
| 603 | 604 | ||
| 605 | rtnl_lock(); | ||
| 604 | if (sl->dev->flags & IFF_UP) | 606 | if (sl->dev->flags & IFF_UP) |
| 605 | dev_close(sl->dev); | 607 | dev_close(sl->dev); |
| 608 | rtnl_unlock(); | ||
| 606 | 609 | ||
| 607 | tty->disc_data = NULL; | 610 | tty->disc_data = NULL; |
| 608 | sl->tty = NULL; | 611 | sl->tty = NULL; |
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c index 36a9c42df835..76f4c7bad8b8 100644 --- a/drivers/net/wireless/b43/leds.c +++ b/drivers/net/wireless/b43/leds.c | |||
| @@ -72,6 +72,9 @@ static void b43_led_brightness_set(struct led_classdev *led_dev, | |||
| 72 | struct b43_wldev *dev = led->dev; | 72 | struct b43_wldev *dev = led->dev; |
| 73 | bool radio_enabled; | 73 | bool radio_enabled; |
| 74 | 74 | ||
| 75 | if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) | ||
| 76 | return; | ||
| 77 | |||
| 75 | /* Checking the radio-enabled status here is slightly racy, | 78 | /* Checking the radio-enabled status here is slightly racy, |
| 76 | * but we want to avoid the locking overhead and we don't care | 79 | * but we want to avoid the locking overhead and we don't care |
| 77 | * whether the LED has the wrong state for a second. */ | 80 | * whether the LED has the wrong state for a second. */ |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index fa4b0d8b74a2..a70827793086 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -2883,12 +2883,11 @@ static int b43_op_tx(struct ieee80211_hw *hw, | |||
| 2883 | 2883 | ||
| 2884 | if (unlikely(skb->len < 2 + 2 + 6)) { | 2884 | if (unlikely(skb->len < 2 + 2 + 6)) { |
| 2885 | /* Too short, this can't be a valid frame. */ | 2885 | /* Too short, this can't be a valid frame. */ |
| 2886 | dev_kfree_skb_any(skb); | 2886 | goto drop_packet; |
| 2887 | return NETDEV_TX_OK; | ||
| 2888 | } | 2887 | } |
| 2889 | B43_WARN_ON(skb_shinfo(skb)->nr_frags); | 2888 | B43_WARN_ON(skb_shinfo(skb)->nr_frags); |
| 2890 | if (unlikely(!dev)) | 2889 | if (unlikely(!dev)) |
| 2891 | return NETDEV_TX_BUSY; | 2890 | goto drop_packet; |
| 2892 | 2891 | ||
| 2893 | /* Transmissions on seperate queues can run concurrently. */ | 2892 | /* Transmissions on seperate queues can run concurrently. */ |
| 2894 | read_lock_irqsave(&wl->tx_lock, flags); | 2893 | read_lock_irqsave(&wl->tx_lock, flags); |
| @@ -2904,7 +2903,12 @@ static int b43_op_tx(struct ieee80211_hw *hw, | |||
| 2904 | read_unlock_irqrestore(&wl->tx_lock, flags); | 2903 | read_unlock_irqrestore(&wl->tx_lock, flags); |
| 2905 | 2904 | ||
| 2906 | if (unlikely(err)) | 2905 | if (unlikely(err)) |
| 2907 | return NETDEV_TX_BUSY; | 2906 | goto drop_packet; |
| 2907 | return NETDEV_TX_OK; | ||
| 2908 | |||
| 2909 | drop_packet: | ||
| 2910 | /* We can not transmit this packet. Drop it. */ | ||
| 2911 | dev_kfree_skb_any(skb); | ||
| 2908 | return NETDEV_TX_OK; | 2912 | return NETDEV_TX_OK; |
| 2909 | } | 2913 | } |
| 2910 | 2914 | ||
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index c990f87b107a..93ddc1cbcc8b 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
| @@ -876,6 +876,7 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, | |||
| 876 | if (!ring) | 876 | if (!ring) |
| 877 | goto out; | 877 | goto out; |
| 878 | ring->type = type; | 878 | ring->type = type; |
| 879 | ring->dev = dev; | ||
| 879 | 880 | ||
| 880 | nr_slots = B43legacy_RXRING_SLOTS; | 881 | nr_slots = B43legacy_RXRING_SLOTS; |
| 881 | if (for_tx) | 882 | if (for_tx) |
| @@ -922,7 +923,6 @@ struct b43legacy_dmaring *b43legacy_setup_dmaring(struct b43legacy_wldev *dev, | |||
| 922 | DMA_TO_DEVICE); | 923 | DMA_TO_DEVICE); |
| 923 | } | 924 | } |
| 924 | 925 | ||
| 925 | ring->dev = dev; | ||
| 926 | ring->nr_slots = nr_slots; | 926 | ring->nr_slots = nr_slots; |
| 927 | ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); | 927 | ring->mmio_base = b43legacy_dmacontroller_base(type, controller_index); |
| 928 | ring->index = controller_index; | 928 | ring->index = controller_index; |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 204077c13870..3e612d0a13e8 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -2378,8 +2378,10 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw, | |||
| 2378 | } else | 2378 | } else |
| 2379 | err = b43legacy_dma_tx(dev, skb, ctl); | 2379 | err = b43legacy_dma_tx(dev, skb, ctl); |
| 2380 | out: | 2380 | out: |
| 2381 | if (unlikely(err)) | 2381 | if (unlikely(err)) { |
| 2382 | return NETDEV_TX_BUSY; | 2382 | /* Drop the packet. */ |
| 2383 | dev_kfree_skb_any(skb); | ||
| 2384 | } | ||
| 2383 | return NETDEV_TX_OK; | 2385 | return NETDEV_TX_OK; |
| 2384 | } | 2386 | } |
| 2385 | 2387 | ||
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index 4fd73809602e..020f450e9dba 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
| @@ -64,7 +64,7 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb, | |||
| 64 | int hdrlen, phdrlen, head_need, tail_need; | 64 | int hdrlen, phdrlen, head_need, tail_need; |
| 65 | u16 fc; | 65 | u16 fc; |
| 66 | int prism_header, ret; | 66 | int prism_header, ret; |
| 67 | struct ieee80211_hdr_4addr *hdr; | 67 | struct ieee80211_hdr_4addr *fhdr; |
| 68 | 68 | ||
| 69 | iface = netdev_priv(dev); | 69 | iface = netdev_priv(dev); |
| 70 | local = iface->local; | 70 | local = iface->local; |
| @@ -83,8 +83,8 @@ int prism2_rx_80211(struct net_device *dev, struct sk_buff *skb, | |||
| 83 | phdrlen = 0; | 83 | phdrlen = 0; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | hdr = (struct ieee80211_hdr_4addr *) skb->data; | 86 | fhdr = (struct ieee80211_hdr_4addr *) skb->data; |
| 87 | fc = le16_to_cpu(hdr->frame_ctl); | 87 | fc = le16_to_cpu(fhdr->frame_ctl); |
| 88 | 88 | ||
| 89 | if (type == PRISM2_RX_MGMT && (fc & IEEE80211_FCTL_VERS)) { | 89 | if (type == PRISM2_RX_MGMT && (fc & IEEE80211_FCTL_VERS)) { |
| 90 | printk(KERN_DEBUG "%s: dropped management frame with header " | 90 | printk(KERN_DEBUG "%s: dropped management frame with header " |
| @@ -551,7 +551,7 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr, | |||
| 551 | hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff || | 551 | hdr->addr1[2] != 0xff || hdr->addr1[3] != 0xff || |
| 552 | hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) { | 552 | hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) { |
| 553 | /* RA (or BSSID) is not ours - drop */ | 553 | /* RA (or BSSID) is not ours - drop */ |
| 554 | PDEBUG(DEBUG_EXTRA, "%s: received WDS frame with " | 554 | PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with " |
| 555 | "not own or broadcast %s=%s\n", | 555 | "not own or broadcast %s=%s\n", |
| 556 | local->dev->name, | 556 | local->dev->name, |
| 557 | fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID", | 557 | fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID", |
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index 0acd9589c48c..ab981afd481d 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
| @@ -1930,7 +1930,7 @@ static void handle_pspoll(local_info_t *local, | |||
| 1930 | PDEBUG(DEBUG_PS, " PSPOLL and AID[15:14] not set\n"); | 1930 | PDEBUG(DEBUG_PS, " PSPOLL and AID[15:14] not set\n"); |
| 1931 | return; | 1931 | return; |
| 1932 | } | 1932 | } |
| 1933 | aid &= ~BIT(15) & ~BIT(14); | 1933 | aid &= ~(BIT(15) | BIT(14)); |
| 1934 | if (aid == 0 || aid > MAX_AID_TABLE_SIZE) { | 1934 | if (aid == 0 || aid > MAX_AID_TABLE_SIZE) { |
| 1935 | PDEBUG(DEBUG_PS, " invalid aid=%d\n", aid); | 1935 | PDEBUG(DEBUG_PS, " invalid aid=%d\n", aid); |
| 1936 | return; | 1936 | return; |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index ed4317a17cbb..80039a0ae027 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -533,10 +533,10 @@ static void prism2_detach(struct pcmcia_device *link) | |||
| 533 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | 533 | do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) |
| 534 | 534 | ||
| 535 | #define CFG_CHECK2(fn, retf) \ | 535 | #define CFG_CHECK2(fn, retf) \ |
| 536 | do { int ret = (retf); \ | 536 | do { int _ret = (retf); \ |
| 537 | if (ret != 0) { \ | 537 | if (_ret != 0) { \ |
| 538 | PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", ret); \ | 538 | PDEBUG(DEBUG_EXTRA, "CardServices(" #fn ") returned %d\n", _ret); \ |
| 539 | cs_error(link, fn, ret); \ | 539 | cs_error(link, fn, _ret); \ |
| 540 | goto next_entry; \ | 540 | goto next_entry; \ |
| 541 | } \ | 541 | } \ |
| 542 | } while (0) | 542 | } while (0) |
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index cdf90c40f11b..936f52e3d95c 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -2835,7 +2835,7 @@ static void hostap_passive_scan(unsigned long data) | |||
| 2835 | { | 2835 | { |
| 2836 | local_info_t *local = (local_info_t *) data; | 2836 | local_info_t *local = (local_info_t *) data; |
| 2837 | struct net_device *dev = local->dev; | 2837 | struct net_device *dev = local->dev; |
| 2838 | u16 channel; | 2838 | u16 chan; |
| 2839 | 2839 | ||
| 2840 | if (local->passive_scan_interval <= 0) | 2840 | if (local->passive_scan_interval <= 0) |
| 2841 | return; | 2841 | return; |
| @@ -2872,11 +2872,11 @@ static void hostap_passive_scan(unsigned long data) | |||
| 2872 | 2872 | ||
| 2873 | printk(KERN_DEBUG "%s: passive scan channel %d\n", | 2873 | printk(KERN_DEBUG "%s: passive scan channel %d\n", |
| 2874 | dev->name, local->passive_scan_channel); | 2874 | dev->name, local->passive_scan_channel); |
| 2875 | channel = local->passive_scan_channel; | 2875 | chan = local->passive_scan_channel; |
| 2876 | local->passive_scan_state = PASSIVE_SCAN_WAIT; | 2876 | local->passive_scan_state = PASSIVE_SCAN_WAIT; |
| 2877 | local->passive_scan_timer.expires = jiffies + HZ / 10; | 2877 | local->passive_scan_timer.expires = jiffies + HZ / 10; |
| 2878 | } else { | 2878 | } else { |
| 2879 | channel = local->channel; | 2879 | chan = local->channel; |
| 2880 | local->passive_scan_state = PASSIVE_SCAN_LISTEN; | 2880 | local->passive_scan_state = PASSIVE_SCAN_LISTEN; |
| 2881 | local->passive_scan_timer.expires = jiffies + | 2881 | local->passive_scan_timer.expires = jiffies + |
| 2882 | local->passive_scan_interval * HZ; | 2882 | local->passive_scan_interval * HZ; |
| @@ -2884,9 +2884,9 @@ static void hostap_passive_scan(unsigned long data) | |||
| 2884 | 2884 | ||
| 2885 | if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST | | 2885 | if (hfa384x_cmd_callback(dev, HFA384X_CMDCODE_TEST | |
| 2886 | (HFA384X_TEST_CHANGE_CHANNEL << 8), | 2886 | (HFA384X_TEST_CHANGE_CHANNEL << 8), |
| 2887 | channel, NULL, 0)) | 2887 | chan, NULL, 0)) |
| 2888 | printk(KERN_ERR "%s: passive scan channel set %d " | 2888 | printk(KERN_ERR "%s: passive scan channel set %d " |
| 2889 | "failed\n", dev->name, channel); | 2889 | "failed\n", dev->name, chan); |
| 2890 | 2890 | ||
| 2891 | add_timer(&local->passive_scan_timer); | 2891 | add_timer(&local->passive_scan_timer); |
| 2892 | } | 2892 | } |
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index f7aec9309d04..a38e85f334df 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
| @@ -594,7 +594,8 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx) | |||
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | 596 | ||
| 597 | int hostap_80211_header_parse(const struct sk_buff *skb, unsigned char *haddr) | 597 | static int hostap_80211_header_parse(const struct sk_buff *skb, |
| 598 | unsigned char *haddr) | ||
| 598 | { | 599 | { |
| 599 | struct hostap_interface *iface = netdev_priv(skb->dev); | 600 | struct hostap_interface *iface = netdev_priv(skb->dev); |
| 600 | local_info_t *local = iface->local; | 601 | local_info_t *local = iface->local; |
| @@ -857,7 +858,6 @@ const struct header_ops hostap_80211_ops = { | |||
| 857 | .rebuild = eth_rebuild_header, | 858 | .rebuild = eth_rebuild_header, |
| 858 | .cache = eth_header_cache, | 859 | .cache = eth_header_cache, |
| 859 | .cache_update = eth_header_cache_update, | 860 | .cache_update = eth_header_cache_update, |
| 860 | |||
| 861 | .parse = hostap_80211_header_parse, | 861 | .parse = hostap_80211_header_parse, |
| 862 | }; | 862 | }; |
| 863 | EXPORT_SYMBOL(hostap_80211_ops); | 863 | EXPORT_SYMBOL(hostap_80211_ops); |
| @@ -1150,7 +1150,6 @@ EXPORT_SYMBOL(hostap_set_roaming); | |||
| 1150 | EXPORT_SYMBOL(hostap_set_auth_algs); | 1150 | EXPORT_SYMBOL(hostap_set_auth_algs); |
| 1151 | EXPORT_SYMBOL(hostap_dump_rx_header); | 1151 | EXPORT_SYMBOL(hostap_dump_rx_header); |
| 1152 | EXPORT_SYMBOL(hostap_dump_tx_header); | 1152 | EXPORT_SYMBOL(hostap_dump_tx_header); |
| 1153 | EXPORT_SYMBOL(hostap_80211_header_parse); | ||
| 1154 | EXPORT_SYMBOL(hostap_80211_get_hdrlen); | 1153 | EXPORT_SYMBOL(hostap_80211_get_hdrlen); |
| 1155 | EXPORT_SYMBOL(hostap_get_stats); | 1154 | EXPORT_SYMBOL(hostap_get_stats); |
| 1156 | EXPORT_SYMBOL(hostap_setup_dev); | 1155 | EXPORT_SYMBOL(hostap_setup_dev); |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 13925b627e3b..b1b3c523185d 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -2227,7 +2227,10 @@ static int iwl3945_scan_initiate(struct iwl3945_priv *priv) | |||
| 2227 | } | 2227 | } |
| 2228 | 2228 | ||
| 2229 | IWL_DEBUG_INFO("Starting scan...\n"); | 2229 | IWL_DEBUG_INFO("Starting scan...\n"); |
| 2230 | priv->scan_bands = 2; | 2230 | if (priv->cfg->sku & IWL_SKU_G) |
| 2231 | priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ); | ||
| 2232 | if (priv->cfg->sku & IWL_SKU_A) | ||
| 2233 | priv->scan_bands |= BIT(IEEE80211_BAND_5GHZ); | ||
| 2231 | set_bit(STATUS_SCANNING, &priv->status); | 2234 | set_bit(STATUS_SCANNING, &priv->status); |
| 2232 | priv->scan_start = jiffies; | 2235 | priv->scan_start = jiffies; |
| 2233 | priv->scan_pass_start = priv->scan_start; | 2236 | priv->scan_pass_start = priv->scan_start; |
| @@ -3352,13 +3355,18 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv, | |||
| 3352 | cancel_delayed_work(&priv->scan_check); | 3355 | cancel_delayed_work(&priv->scan_check); |
| 3353 | 3356 | ||
| 3354 | IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", | 3357 | IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", |
| 3355 | (priv->scan_bands == 2) ? "2.4" : "5.2", | 3358 | (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? |
| 3359 | "2.4" : "5.2", | ||
| 3356 | jiffies_to_msecs(elapsed_jiffies | 3360 | jiffies_to_msecs(elapsed_jiffies |
| 3357 | (priv->scan_pass_start, jiffies))); | 3361 | (priv->scan_pass_start, jiffies))); |
| 3358 | 3362 | ||
| 3359 | /* Remove this scanned band from the list | 3363 | /* Remove this scanned band from the list of pending |
| 3360 | * of pending bands to scan */ | 3364 | * bands to scan, band G precedes A in order of scanning |
| 3361 | priv->scan_bands--; | 3365 | * as seen in iwl3945_bg_request_scan */ |
| 3366 | if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) | ||
| 3367 | priv->scan_bands &= ~BIT(IEEE80211_BAND_2GHZ); | ||
| 3368 | else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) | ||
| 3369 | priv->scan_bands &= ~BIT(IEEE80211_BAND_5GHZ); | ||
| 3362 | 3370 | ||
| 3363 | /* If a request to abort was given, or the scan did not succeed | 3371 | /* If a request to abort was given, or the scan did not succeed |
| 3364 | * then we reset the scan state machine and terminate, | 3372 | * then we reset the scan state machine and terminate, |
| @@ -4972,7 +4980,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, | |||
| 4972 | 4980 | ||
| 4973 | ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel); | 4981 | ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel); |
| 4974 | if (!is_channel_valid(ch_info)) { | 4982 | if (!is_channel_valid(ch_info)) { |
| 4975 | IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n", | 4983 | IWL_DEBUG_SCAN("Channel %d is INVALID for this band.\n", |
| 4976 | scan_ch->channel); | 4984 | scan_ch->channel); |
| 4977 | continue; | 4985 | continue; |
| 4978 | } | 4986 | } |
| @@ -6315,21 +6323,16 @@ static void iwl3945_bg_request_scan(struct work_struct *data) | |||
| 6315 | 6323 | ||
| 6316 | /* flags + rate selection */ | 6324 | /* flags + rate selection */ |
| 6317 | 6325 | ||
| 6318 | switch (priv->scan_bands) { | 6326 | if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) { |
| 6319 | case 2: | ||
| 6320 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; | 6327 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; |
| 6321 | scan->tx_cmd.rate = IWL_RATE_1M_PLCP; | 6328 | scan->tx_cmd.rate = IWL_RATE_1M_PLCP; |
| 6322 | scan->good_CRC_th = 0; | 6329 | scan->good_CRC_th = 0; |
| 6323 | band = IEEE80211_BAND_2GHZ; | 6330 | band = IEEE80211_BAND_2GHZ; |
| 6324 | break; | 6331 | } else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) { |
| 6325 | |||
| 6326 | case 1: | ||
| 6327 | scan->tx_cmd.rate = IWL_RATE_6M_PLCP; | 6332 | scan->tx_cmd.rate = IWL_RATE_6M_PLCP; |
| 6328 | scan->good_CRC_th = IWL_GOOD_CRC_TH; | 6333 | scan->good_CRC_th = IWL_GOOD_CRC_TH; |
| 6329 | band = IEEE80211_BAND_5GHZ; | 6334 | band = IEEE80211_BAND_5GHZ; |
| 6330 | break; | 6335 | } else { |
| 6331 | |||
| 6332 | default: | ||
| 6333 | IWL_WARNING("Invalid scan band count\n"); | 6336 | IWL_WARNING("Invalid scan band count\n"); |
| 6334 | goto done; | 6337 | goto done; |
| 6335 | } | 6338 | } |
| @@ -6770,7 +6773,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co | |||
| 6770 | ch_info = iwl3945_get_channel_info(priv, conf->channel->band, | 6773 | ch_info = iwl3945_get_channel_info(priv, conf->channel->band, |
| 6771 | conf->channel->hw_value); | 6774 | conf->channel->hw_value); |
| 6772 | if (!is_channel_valid(ch_info)) { | 6775 | if (!is_channel_valid(ch_info)) { |
| 6773 | IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this SKU.\n", | 6776 | IWL_DEBUG_SCAN("Channel %d [%d] is INVALID for this band.\n", |
| 6774 | conf->channel->hw_value, conf->channel->band); | 6777 | conf->channel->hw_value, conf->channel->band); |
| 6775 | IWL_DEBUG_MAC80211("leave - invalid channel\n"); | 6778 | IWL_DEBUG_MAC80211("leave - invalid channel\n"); |
| 6776 | spin_unlock_irqrestore(&priv->lock, flags); | 6779 | spin_unlock_irqrestore(&priv->lock, flags); |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 883b42f7e998..5ed16ce78468 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
| @@ -1774,7 +1774,10 @@ static int iwl4965_scan_initiate(struct iwl_priv *priv) | |||
| 1774 | } | 1774 | } |
| 1775 | 1775 | ||
| 1776 | IWL_DEBUG_INFO("Starting scan...\n"); | 1776 | IWL_DEBUG_INFO("Starting scan...\n"); |
| 1777 | priv->scan_bands = 2; | 1777 | if (priv->cfg->sku & IWL_SKU_G) |
| 1778 | priv->scan_bands |= BIT(IEEE80211_BAND_2GHZ); | ||
| 1779 | if (priv->cfg->sku & IWL_SKU_A) | ||
| 1780 | priv->scan_bands |= BIT(IEEE80211_BAND_5GHZ); | ||
| 1778 | set_bit(STATUS_SCANNING, &priv->status); | 1781 | set_bit(STATUS_SCANNING, &priv->status); |
| 1779 | priv->scan_start = jiffies; | 1782 | priv->scan_start = jiffies; |
| 1780 | priv->scan_pass_start = priv->scan_start; | 1783 | priv->scan_pass_start = priv->scan_start; |
| @@ -3023,8 +3026,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
| 3023 | 3026 | ||
| 3024 | IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index); | 3027 | IWL_DEBUG_TX_REPLY("Tx queue reclaim %d\n", index); |
| 3025 | if (index != -1) { | 3028 | if (index != -1) { |
| 3026 | int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); | ||
| 3027 | #ifdef CONFIG_IWL4965_HT | 3029 | #ifdef CONFIG_IWL4965_HT |
| 3030 | int freed = iwl4965_tx_queue_reclaim(priv, txq_id, index); | ||
| 3031 | |||
| 3028 | if (tid != MAX_TID_COUNT) | 3032 | if (tid != MAX_TID_COUNT) |
| 3029 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; | 3033 | priv->stations[sta_id].tid[tid].tfds_in_queue -= freed; |
| 3030 | if (iwl4965_queue_space(&txq->q) > txq->q.low_mark && | 3034 | if (iwl4965_queue_space(&txq->q) > txq->q.low_mark && |
| @@ -3276,13 +3280,18 @@ static void iwl4965_rx_scan_complete_notif(struct iwl_priv *priv, | |||
| 3276 | cancel_delayed_work(&priv->scan_check); | 3280 | cancel_delayed_work(&priv->scan_check); |
| 3277 | 3281 | ||
| 3278 | IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", | 3282 | IWL_DEBUG_INFO("Scan pass on %sGHz took %dms\n", |
| 3279 | (priv->scan_bands == 2) ? "2.4" : "5.2", | 3283 | (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? |
| 3284 | "2.4" : "5.2", | ||
| 3280 | jiffies_to_msecs(elapsed_jiffies | 3285 | jiffies_to_msecs(elapsed_jiffies |
| 3281 | (priv->scan_pass_start, jiffies))); | 3286 | (priv->scan_pass_start, jiffies))); |
| 3282 | 3287 | ||
| 3283 | /* Remove this scanned band from the list | 3288 | /* Remove this scanned band from the list of pending |
| 3284 | * of pending bands to scan */ | 3289 | * bands to scan, band G precedes A in order of scanning |
| 3285 | priv->scan_bands--; | 3290 | * as seen in iwl_bg_request_scan */ |
| 3291 | if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) | ||
| 3292 | priv->scan_bands &= ~BIT(IEEE80211_BAND_2GHZ); | ||
| 3293 | else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) | ||
| 3294 | priv->scan_bands &= ~BIT(IEEE80211_BAND_5GHZ); | ||
| 3286 | 3295 | ||
| 3287 | /* If a request to abort was given, or the scan did not succeed | 3296 | /* If a request to abort was given, or the scan did not succeed |
| 3288 | * then we reset the scan state machine and terminate, | 3297 | * then we reset the scan state machine and terminate, |
| @@ -3292,7 +3301,7 @@ static void iwl4965_rx_scan_complete_notif(struct iwl_priv *priv, | |||
| 3292 | clear_bit(STATUS_SCAN_ABORTING, &priv->status); | 3301 | clear_bit(STATUS_SCAN_ABORTING, &priv->status); |
| 3293 | } else { | 3302 | } else { |
| 3294 | /* If there are more bands on this scan pass reschedule */ | 3303 | /* If there are more bands on this scan pass reschedule */ |
| 3295 | if (priv->scan_bands > 0) | 3304 | if (priv->scan_bands) |
| 3296 | goto reschedule; | 3305 | goto reschedule; |
| 3297 | } | 3306 | } |
| 3298 | 3307 | ||
| @@ -4635,10 +4644,9 @@ static int iwl4965_get_channels_for_scan(struct iwl_priv *priv, | |||
| 4635 | 4644 | ||
| 4636 | scan_ch->channel = ieee80211_frequency_to_channel(channels[i].center_freq); | 4645 | scan_ch->channel = ieee80211_frequency_to_channel(channels[i].center_freq); |
| 4637 | 4646 | ||
| 4638 | ch_info = iwl_get_channel_info(priv, band, | 4647 | ch_info = iwl_get_channel_info(priv, band, scan_ch->channel); |
| 4639 | scan_ch->channel); | ||
| 4640 | if (!is_channel_valid(ch_info)) { | 4648 | if (!is_channel_valid(ch_info)) { |
| 4641 | IWL_DEBUG_SCAN("Channel %d is INVALID for this SKU.\n", | 4649 | IWL_DEBUG_SCAN("Channel %d is INVALID for this band.\n", |
| 4642 | scan_ch->channel); | 4650 | scan_ch->channel); |
| 4643 | continue; | 4651 | continue; |
| 4644 | } | 4652 | } |
| @@ -5830,8 +5838,7 @@ static void iwl4965_bg_request_scan(struct work_struct *data) | |||
| 5830 | scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; | 5838 | scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; |
| 5831 | 5839 | ||
| 5832 | 5840 | ||
| 5833 | switch (priv->scan_bands) { | 5841 | if (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) { |
| 5834 | case 2: | ||
| 5835 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; | 5842 | scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK; |
| 5836 | scan->tx_cmd.rate_n_flags = | 5843 | scan->tx_cmd.rate_n_flags = |
| 5837 | iwl4965_hw_set_rate_n_flags(IWL_RATE_1M_PLCP, | 5844 | iwl4965_hw_set_rate_n_flags(IWL_RATE_1M_PLCP, |
| @@ -5839,17 +5846,13 @@ static void iwl4965_bg_request_scan(struct work_struct *data) | |||
| 5839 | 5846 | ||
| 5840 | scan->good_CRC_th = 0; | 5847 | scan->good_CRC_th = 0; |
| 5841 | band = IEEE80211_BAND_2GHZ; | 5848 | band = IEEE80211_BAND_2GHZ; |
| 5842 | break; | 5849 | } else if (priv->scan_bands & BIT(IEEE80211_BAND_5GHZ)) { |
| 5843 | |||
| 5844 | case 1: | ||
| 5845 | scan->tx_cmd.rate_n_flags = | 5850 | scan->tx_cmd.rate_n_flags = |
| 5846 | iwl4965_hw_set_rate_n_flags(IWL_RATE_6M_PLCP, | 5851 | iwl4965_hw_set_rate_n_flags(IWL_RATE_6M_PLCP, |
| 5847 | RATE_MCS_ANT_B_MSK); | 5852 | RATE_MCS_ANT_B_MSK); |
| 5848 | scan->good_CRC_th = IWL_GOOD_CRC_TH; | 5853 | scan->good_CRC_th = IWL_GOOD_CRC_TH; |
| 5849 | band = IEEE80211_BAND_5GHZ; | 5854 | band = IEEE80211_BAND_5GHZ; |
| 5850 | break; | 5855 | } else { |
| 5851 | |||
| 5852 | default: | ||
| 5853 | IWL_WARNING("Invalid scan band count\n"); | 5856 | IWL_WARNING("Invalid scan band count\n"); |
| 5854 | goto done; | 5857 | goto done; |
| 5855 | } | 5858 | } |
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 762e85bef55d..e43bae97ed8f 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
| @@ -290,7 +290,7 @@ islpci_monitor_rx(islpci_private *priv, struct sk_buff **skb) | |||
| 290 | 290 | ||
| 291 | avs->version = cpu_to_be32(P80211CAPTURE_VERSION); | 291 | avs->version = cpu_to_be32(P80211CAPTURE_VERSION); |
| 292 | avs->length = cpu_to_be32(sizeof (struct avs_80211_1_header)); | 292 | avs->length = cpu_to_be32(sizeof (struct avs_80211_1_header)); |
| 293 | avs->mactime = cpu_to_be64(le64_to_cpu(clock)); | 293 | avs->mactime = cpu_to_be64(clock); |
| 294 | avs->hosttime = cpu_to_be64(jiffies); | 294 | avs->hosttime = cpu_to_be64(jiffies); |
| 295 | avs->phytype = cpu_to_be32(6); /*OFDM: 6 for (g), 8 for (a) */ | 295 | avs->phytype = cpu_to_be32(6); /*OFDM: 6 for (g), 8 for (a) */ |
| 296 | avs->channel = cpu_to_be32(channel_of_freq(freq)); | 296 | avs->channel = cpu_to_be32(channel_of_freq(freq)); |
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index fdbd0ef2be4b..61e59c17a60a 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
| @@ -138,11 +138,8 @@ static void rt2500usb_bbp_write(struct rt2x00_dev *rt2x00dev, | |||
| 138 | * Wait until the BBP becomes ready. | 138 | * Wait until the BBP becomes ready. |
| 139 | */ | 139 | */ |
| 140 | reg = rt2500usb_bbp_check(rt2x00dev); | 140 | reg = rt2500usb_bbp_check(rt2x00dev); |
| 141 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { | 141 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) |
| 142 | ERROR(rt2x00dev, "PHY_CSR8 register busy. Write failed.\n"); | 142 | goto exit_fail; |
| 143 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 144 | return; | ||
| 145 | } | ||
| 146 | 143 | ||
| 147 | /* | 144 | /* |
| 148 | * Write the data into the BBP. | 145 | * Write the data into the BBP. |
| @@ -155,6 +152,13 @@ static void rt2500usb_bbp_write(struct rt2x00_dev *rt2x00dev, | |||
| 155 | rt2500usb_register_write_lock(rt2x00dev, PHY_CSR7, reg); | 152 | rt2500usb_register_write_lock(rt2x00dev, PHY_CSR7, reg); |
| 156 | 153 | ||
| 157 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | 154 | mutex_unlock(&rt2x00dev->usb_cache_mutex); |
| 155 | |||
| 156 | return; | ||
| 157 | |||
| 158 | exit_fail: | ||
| 159 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 160 | |||
| 161 | ERROR(rt2x00dev, "PHY_CSR8 register busy. Write failed.\n"); | ||
| 158 | } | 162 | } |
| 159 | 163 | ||
| 160 | static void rt2500usb_bbp_read(struct rt2x00_dev *rt2x00dev, | 164 | static void rt2500usb_bbp_read(struct rt2x00_dev *rt2x00dev, |
| @@ -168,10 +172,8 @@ static void rt2500usb_bbp_read(struct rt2x00_dev *rt2x00dev, | |||
| 168 | * Wait until the BBP becomes ready. | 172 | * Wait until the BBP becomes ready. |
| 169 | */ | 173 | */ |
| 170 | reg = rt2500usb_bbp_check(rt2x00dev); | 174 | reg = rt2500usb_bbp_check(rt2x00dev); |
| 171 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { | 175 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) |
| 172 | ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); | 176 | goto exit_fail; |
| 173 | return; | ||
| 174 | } | ||
| 175 | 177 | ||
| 176 | /* | 178 | /* |
| 177 | * Write the request into the BBP. | 179 | * Write the request into the BBP. |
| @@ -186,17 +188,21 @@ static void rt2500usb_bbp_read(struct rt2x00_dev *rt2x00dev, | |||
| 186 | * Wait until the BBP becomes ready. | 188 | * Wait until the BBP becomes ready. |
| 187 | */ | 189 | */ |
| 188 | reg = rt2500usb_bbp_check(rt2x00dev); | 190 | reg = rt2500usb_bbp_check(rt2x00dev); |
| 189 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) { | 191 | if (rt2x00_get_field16(reg, PHY_CSR8_BUSY)) |
| 190 | ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); | 192 | goto exit_fail; |
| 191 | *value = 0xff; | ||
| 192 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 193 | return; | ||
| 194 | } | ||
| 195 | 193 | ||
| 196 | rt2500usb_register_read_lock(rt2x00dev, PHY_CSR7, ®); | 194 | rt2500usb_register_read_lock(rt2x00dev, PHY_CSR7, ®); |
| 197 | *value = rt2x00_get_field16(reg, PHY_CSR7_DATA); | 195 | *value = rt2x00_get_field16(reg, PHY_CSR7_DATA); |
| 198 | 196 | ||
| 199 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | 197 | mutex_unlock(&rt2x00dev->usb_cache_mutex); |
| 198 | |||
| 199 | return; | ||
| 200 | |||
| 201 | exit_fail: | ||
| 202 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 203 | |||
| 204 | ERROR(rt2x00dev, "PHY_CSR8 register busy. Read failed.\n"); | ||
| 205 | *value = 0xff; | ||
| 200 | } | 206 | } |
| 201 | 207 | ||
| 202 | static void rt2500usb_rf_write(struct rt2x00_dev *rt2x00dev, | 208 | static void rt2500usb_rf_write(struct rt2x00_dev *rt2x00dev, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 611d98320593..b4bf1e09cf9a 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -821,6 +821,7 @@ struct rt2x00_dev { | |||
| 821 | /* | 821 | /* |
| 822 | * Scheduled work. | 822 | * Scheduled work. |
| 823 | */ | 823 | */ |
| 824 | struct workqueue_struct *workqueue; | ||
| 824 | struct work_struct intf_work; | 825 | struct work_struct intf_work; |
| 825 | struct work_struct filter_work; | 826 | struct work_struct filter_work; |
| 826 | 827 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 2673d568bcac..c997d4f28ab3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -75,7 +75,7 @@ static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev) | |||
| 75 | 75 | ||
| 76 | rt2x00lib_reset_link_tuner(rt2x00dev); | 76 | rt2x00lib_reset_link_tuner(rt2x00dev); |
| 77 | 77 | ||
| 78 | queue_delayed_work(rt2x00dev->hw->workqueue, | 78 | queue_delayed_work(rt2x00dev->workqueue, |
| 79 | &rt2x00dev->link.work, LINK_TUNE_INTERVAL); | 79 | &rt2x00dev->link.work, LINK_TUNE_INTERVAL); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| @@ -137,14 +137,6 @@ void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
| 137 | return; | 137 | return; |
| 138 | 138 | ||
| 139 | /* | 139 | /* |
| 140 | * Stop all scheduled work. | ||
| 141 | */ | ||
| 142 | if (work_pending(&rt2x00dev->intf_work)) | ||
| 143 | cancel_work_sync(&rt2x00dev->intf_work); | ||
| 144 | if (work_pending(&rt2x00dev->filter_work)) | ||
| 145 | cancel_work_sync(&rt2x00dev->filter_work); | ||
| 146 | |||
| 147 | /* | ||
| 148 | * Stop the TX queues. | 140 | * Stop the TX queues. |
| 149 | */ | 141 | */ |
| 150 | ieee80211_stop_queues(rt2x00dev->hw); | 142 | ieee80211_stop_queues(rt2x00dev->hw); |
| @@ -398,8 +390,8 @@ static void rt2x00lib_link_tuner(struct work_struct *work) | |||
| 398 | * Increase tuner counter, and reschedule the next link tuner run. | 390 | * Increase tuner counter, and reschedule the next link tuner run. |
| 399 | */ | 391 | */ |
| 400 | rt2x00dev->link.count++; | 392 | rt2x00dev->link.count++; |
| 401 | queue_delayed_work(rt2x00dev->hw->workqueue, &rt2x00dev->link.work, | 393 | queue_delayed_work(rt2x00dev->workqueue, |
| 402 | LINK_TUNE_INTERVAL); | 394 | &rt2x00dev->link.work, LINK_TUNE_INTERVAL); |
| 403 | } | 395 | } |
| 404 | 396 | ||
| 405 | static void rt2x00lib_packetfilter_scheduled(struct work_struct *work) | 397 | static void rt2x00lib_packetfilter_scheduled(struct work_struct *work) |
| @@ -433,6 +425,15 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, | |||
| 433 | 425 | ||
| 434 | spin_unlock(&intf->lock); | 426 | spin_unlock(&intf->lock); |
| 435 | 427 | ||
| 428 | /* | ||
| 429 | * It is possible the radio was disabled while the work had been | ||
| 430 | * scheduled. If that happens we should return here immediately, | ||
| 431 | * note that in the spinlock protected area above the delayed_flags | ||
| 432 | * have been cleared correctly. | ||
| 433 | */ | ||
| 434 | if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) | ||
| 435 | return; | ||
| 436 | |||
| 436 | if (delayed_flags & DELAYED_UPDATE_BEACON) { | 437 | if (delayed_flags & DELAYED_UPDATE_BEACON) { |
| 437 | skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control); | 438 | skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control); |
| 438 | if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, | 439 | if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, |
| @@ -441,7 +442,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, | |||
| 441 | } | 442 | } |
| 442 | 443 | ||
| 443 | if (delayed_flags & DELAYED_CONFIG_ERP) | 444 | if (delayed_flags & DELAYED_CONFIG_ERP) |
| 444 | rt2x00lib_config_erp(rt2x00dev, intf, &intf->conf); | 445 | rt2x00lib_config_erp(rt2x00dev, intf, &conf); |
| 445 | 446 | ||
| 446 | if (delayed_flags & DELAYED_LED_ASSOC) | 447 | if (delayed_flags & DELAYED_LED_ASSOC) |
| 447 | rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated); | 448 | rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated); |
| @@ -487,7 +488,7 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev) | |||
| 487 | rt2x00lib_beacondone_iter, | 488 | rt2x00lib_beacondone_iter, |
| 488 | rt2x00dev); | 489 | rt2x00dev); |
| 489 | 490 | ||
| 490 | queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); | 491 | queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work); |
| 491 | } | 492 | } |
| 492 | EXPORT_SYMBOL_GPL(rt2x00lib_beacondone); | 493 | EXPORT_SYMBOL_GPL(rt2x00lib_beacondone); |
| 493 | 494 | ||
| @@ -1130,6 +1131,10 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) | |||
| 1130 | /* | 1131 | /* |
| 1131 | * Initialize configuration work. | 1132 | * Initialize configuration work. |
| 1132 | */ | 1133 | */ |
| 1134 | rt2x00dev->workqueue = create_singlethread_workqueue("rt2x00lib"); | ||
| 1135 | if (!rt2x00dev->workqueue) | ||
| 1136 | goto exit; | ||
| 1137 | |||
| 1133 | INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); | 1138 | INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled); |
| 1134 | INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled); | 1139 | INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled); |
| 1135 | INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner); | 1140 | INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner); |
| @@ -1190,6 +1195,13 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) | |||
| 1190 | rt2x00leds_unregister(rt2x00dev); | 1195 | rt2x00leds_unregister(rt2x00dev); |
| 1191 | 1196 | ||
| 1192 | /* | 1197 | /* |
| 1198 | * Stop all queued work. Note that most tasks will already be halted | ||
| 1199 | * during rt2x00lib_disable_radio() and rt2x00lib_uninitialize(). | ||
| 1200 | */ | ||
| 1201 | flush_workqueue(rt2x00dev->workqueue); | ||
| 1202 | destroy_workqueue(rt2x00dev->workqueue); | ||
| 1203 | |||
| 1204 | /* | ||
| 1193 | * Free ieee80211_hw memory. | 1205 | * Free ieee80211_hw memory. |
| 1194 | */ | 1206 | */ |
| 1195 | rt2x00lib_remove_hw(rt2x00dev); | 1207 | rt2x00lib_remove_hw(rt2x00dev); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 87e280a21971..9cb023edd2e9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
| @@ -428,7 +428,7 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, | |||
| 428 | if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) | 428 | if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags)) |
| 429 | rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags); | 429 | rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags); |
| 430 | else | 430 | else |
| 431 | queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work); | 431 | queue_work(rt2x00dev->workqueue, &rt2x00dev->filter_work); |
| 432 | } | 432 | } |
| 433 | EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter); | 433 | EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter); |
| 434 | 434 | ||
| @@ -509,7 +509,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | |||
| 509 | memcpy(&intf->conf, bss_conf, sizeof(*bss_conf)); | 509 | memcpy(&intf->conf, bss_conf, sizeof(*bss_conf)); |
| 510 | if (delayed) { | 510 | if (delayed) { |
| 511 | intf->delayed_flags |= delayed; | 511 | intf->delayed_flags |= delayed; |
| 512 | queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work); | 512 | queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work); |
| 513 | } | 513 | } |
| 514 | spin_unlock(&intf->lock); | 514 | spin_unlock(&intf->lock); |
| 515 | } | 515 | } |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index fff8386e816b..83cc0147f698 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -134,11 +134,8 @@ static void rt73usb_bbp_write(struct rt2x00_dev *rt2x00dev, | |||
| 134 | * Wait until the BBP becomes ready. | 134 | * Wait until the BBP becomes ready. |
| 135 | */ | 135 | */ |
| 136 | reg = rt73usb_bbp_check(rt2x00dev); | 136 | reg = rt73usb_bbp_check(rt2x00dev); |
| 137 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { | 137 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) |
| 138 | ERROR(rt2x00dev, "PHY_CSR3 register busy. Write failed.\n"); | 138 | goto exit_fail; |
| 139 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 140 | return; | ||
| 141 | } | ||
| 142 | 139 | ||
| 143 | /* | 140 | /* |
| 144 | * Write the data into the BBP. | 141 | * Write the data into the BBP. |
| @@ -151,6 +148,13 @@ static void rt73usb_bbp_write(struct rt2x00_dev *rt2x00dev, | |||
| 151 | 148 | ||
| 152 | rt73usb_register_write_lock(rt2x00dev, PHY_CSR3, reg); | 149 | rt73usb_register_write_lock(rt2x00dev, PHY_CSR3, reg); |
| 153 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | 150 | mutex_unlock(&rt2x00dev->usb_cache_mutex); |
| 151 | |||
| 152 | return; | ||
| 153 | |||
| 154 | exit_fail: | ||
| 155 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 156 | |||
| 157 | ERROR(rt2x00dev, "PHY_CSR3 register busy. Write failed.\n"); | ||
| 154 | } | 158 | } |
| 155 | 159 | ||
| 156 | static void rt73usb_bbp_read(struct rt2x00_dev *rt2x00dev, | 160 | static void rt73usb_bbp_read(struct rt2x00_dev *rt2x00dev, |
| @@ -164,11 +168,8 @@ static void rt73usb_bbp_read(struct rt2x00_dev *rt2x00dev, | |||
| 164 | * Wait until the BBP becomes ready. | 168 | * Wait until the BBP becomes ready. |
| 165 | */ | 169 | */ |
| 166 | reg = rt73usb_bbp_check(rt2x00dev); | 170 | reg = rt73usb_bbp_check(rt2x00dev); |
| 167 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { | 171 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) |
| 168 | ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); | 172 | goto exit_fail; |
| 169 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 170 | return; | ||
| 171 | } | ||
| 172 | 173 | ||
| 173 | /* | 174 | /* |
| 174 | * Write the request into the BBP. | 175 | * Write the request into the BBP. |
| @@ -184,14 +185,19 @@ static void rt73usb_bbp_read(struct rt2x00_dev *rt2x00dev, | |||
| 184 | * Wait until the BBP becomes ready. | 185 | * Wait until the BBP becomes ready. |
| 185 | */ | 186 | */ |
| 186 | reg = rt73usb_bbp_check(rt2x00dev); | 187 | reg = rt73usb_bbp_check(rt2x00dev); |
| 187 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) { | 188 | if (rt2x00_get_field32(reg, PHY_CSR3_BUSY)) |
| 188 | ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); | 189 | goto exit_fail; |
| 189 | *value = 0xff; | ||
| 190 | return; | ||
| 191 | } | ||
| 192 | 190 | ||
| 193 | *value = rt2x00_get_field32(reg, PHY_CSR3_VALUE); | 191 | *value = rt2x00_get_field32(reg, PHY_CSR3_VALUE); |
| 194 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | 192 | mutex_unlock(&rt2x00dev->usb_cache_mutex); |
| 193 | |||
| 194 | return; | ||
| 195 | |||
| 196 | exit_fail: | ||
| 197 | mutex_unlock(&rt2x00dev->usb_cache_mutex); | ||
| 198 | |||
| 199 | ERROR(rt2x00dev, "PHY_CSR3 register busy. Read failed.\n"); | ||
| 200 | *value = 0xff; | ||
| 195 | } | 201 | } |
| 196 | 202 | ||
| 197 | static void rt73usb_rf_write(struct rt2x00_dev *rt2x00dev, | 203 | static void rt73usb_rf_write(struct rt2x00_dev *rt2x00dev, |
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index ec8f7002b09d..39bb96b413ef 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c | |||
| @@ -178,8 +178,7 @@ static int pci_vpd_pci22_read(struct pci_dev *dev, int pos, int size, | |||
| 178 | int ret; | 178 | int ret; |
| 179 | int begin, end, i; | 179 | int begin, end, i; |
| 180 | 180 | ||
| 181 | if (pos < 0 || pos > PCI_VPD_PCI22_SIZE || | 181 | if (pos < 0 || pos > vpd->base.len || size > vpd->base.len - pos) |
| 182 | size > PCI_VPD_PCI22_SIZE - pos) | ||
| 183 | return -EINVAL; | 182 | return -EINVAL; |
| 184 | if (size == 0) | 183 | if (size == 0) |
| 185 | return 0; | 184 | return 0; |
| @@ -223,8 +222,8 @@ static int pci_vpd_pci22_write(struct pci_dev *dev, int pos, int size, | |||
| 223 | u32 val; | 222 | u32 val; |
| 224 | int ret; | 223 | int ret; |
| 225 | 224 | ||
| 226 | if (pos < 0 || pos > PCI_VPD_PCI22_SIZE || pos & 3 || | 225 | if (pos < 0 || pos > vpd->base.len || pos & 3 || |
| 227 | size > PCI_VPD_PCI22_SIZE - pos || size < 4) | 226 | size > vpd->base.len - pos || size < 4) |
| 228 | return -EINVAL; | 227 | return -EINVAL; |
| 229 | 228 | ||
| 230 | val = (u8) *buf++; | 229 | val = (u8) *buf++; |
| @@ -255,11 +254,6 @@ out: | |||
| 255 | return 4; | 254 | return 4; |
| 256 | } | 255 | } |
| 257 | 256 | ||
| 258 | static int pci_vpd_pci22_get_size(struct pci_dev *dev) | ||
| 259 | { | ||
| 260 | return PCI_VPD_PCI22_SIZE; | ||
| 261 | } | ||
| 262 | |||
| 263 | static void pci_vpd_pci22_release(struct pci_dev *dev) | 257 | static void pci_vpd_pci22_release(struct pci_dev *dev) |
| 264 | { | 258 | { |
| 265 | kfree(container_of(dev->vpd, struct pci_vpd_pci22, base)); | 259 | kfree(container_of(dev->vpd, struct pci_vpd_pci22, base)); |
| @@ -268,7 +262,6 @@ static void pci_vpd_pci22_release(struct pci_dev *dev) | |||
| 268 | static struct pci_vpd_ops pci_vpd_pci22_ops = { | 262 | static struct pci_vpd_ops pci_vpd_pci22_ops = { |
| 269 | .read = pci_vpd_pci22_read, | 263 | .read = pci_vpd_pci22_read, |
| 270 | .write = pci_vpd_pci22_write, | 264 | .write = pci_vpd_pci22_write, |
| 271 | .get_size = pci_vpd_pci22_get_size, | ||
| 272 | .release = pci_vpd_pci22_release, | 265 | .release = pci_vpd_pci22_release, |
| 273 | }; | 266 | }; |
| 274 | 267 | ||
| @@ -284,6 +277,7 @@ int pci_vpd_pci22_init(struct pci_dev *dev) | |||
| 284 | if (!vpd) | 277 | if (!vpd) |
| 285 | return -ENOMEM; | 278 | return -ENOMEM; |
| 286 | 279 | ||
| 280 | vpd->base.len = PCI_VPD_PCI22_SIZE; | ||
| 287 | vpd->base.ops = &pci_vpd_pci22_ops; | 281 | vpd->base.ops = &pci_vpd_pci22_ops; |
| 288 | spin_lock_init(&vpd->lock); | 282 | spin_lock_init(&vpd->lock); |
| 289 | vpd->cap = cap; | 283 | vpd->cap = cap; |
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 648596d469f6..91156f85a926 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -700,9 +700,10 @@ cleanup_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) | |||
| 700 | acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1, | 700 | acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1, |
| 701 | cleanup_p2p_bridge, NULL, NULL); | 701 | cleanup_p2p_bridge, NULL, NULL); |
| 702 | 702 | ||
| 703 | if (!(bridge = acpiphp_handle_to_bridge(handle))) | 703 | bridge = acpiphp_handle_to_bridge(handle); |
| 704 | return AE_OK; | 704 | if (bridge) |
| 705 | cleanup_bridge(bridge); | 705 | cleanup_bridge(bridge); |
| 706 | |||
| 706 | return AE_OK; | 707 | return AE_OK; |
| 707 | } | 708 | } |
| 708 | 709 | ||
| @@ -715,9 +716,19 @@ static void remove_bridge(acpi_handle handle) | |||
| 715 | acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, | 716 | acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, |
| 716 | (u32)1, cleanup_p2p_bridge, NULL, NULL); | 717 | (u32)1, cleanup_p2p_bridge, NULL, NULL); |
| 717 | 718 | ||
| 719 | /* | ||
| 720 | * On root bridges with hotplug slots directly underneath (ie, | ||
| 721 | * no p2p bridge inbetween), we call cleanup_bridge(). | ||
| 722 | * | ||
| 723 | * The else clause cleans up root bridges that either had no | ||
| 724 | * hotplug slots at all, or had a p2p bridge underneath. | ||
| 725 | */ | ||
| 718 | bridge = acpiphp_handle_to_bridge(handle); | 726 | bridge = acpiphp_handle_to_bridge(handle); |
| 719 | if (bridge) | 727 | if (bridge) |
| 720 | cleanup_bridge(bridge); | 728 | cleanup_bridge(bridge); |
| 729 | else | ||
| 730 | acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY, | ||
| 731 | handle_hotplug_event_bridge); | ||
| 721 | } | 732 | } |
| 722 | 733 | ||
| 723 | static struct pci_dev * get_apic_pci_info(acpi_handle handle) | 734 | static struct pci_dev * get_apic_pci_info(acpi_handle handle) |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 6f3c7446c329..9c718583a237 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -736,9 +736,9 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) | |||
| 736 | attr = kzalloc(sizeof(*attr), GFP_ATOMIC); | 736 | attr = kzalloc(sizeof(*attr), GFP_ATOMIC); |
| 737 | if (attr) { | 737 | if (attr) { |
| 738 | pdev->vpd->attr = attr; | 738 | pdev->vpd->attr = attr; |
| 739 | attr->size = pdev->vpd->ops->get_size(pdev); | 739 | attr->size = pdev->vpd->len; |
| 740 | attr->attr.name = "vpd"; | 740 | attr->attr.name = "vpd"; |
| 741 | attr->attr.mode = S_IRUGO | S_IWUSR; | 741 | attr->attr.mode = S_IRUSR | S_IWUSR; |
| 742 | attr->read = pci_read_vpd; | 742 | attr->read = pci_read_vpd; |
| 743 | attr->write = pci_write_vpd; | 743 | attr->write = pci_write_vpd; |
| 744 | retval = sysfs_create_bin_file(&pdev->dev.kobj, attr); | 744 | retval = sysfs_create_bin_file(&pdev->dev.kobj, attr); |
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 0a497c1b4227..00408c97e5fc 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -21,11 +21,11 @@ extern int pci_user_write_config_dword(struct pci_dev *dev, int where, u32 val); | |||
| 21 | struct pci_vpd_ops { | 21 | struct pci_vpd_ops { |
| 22 | int (*read)(struct pci_dev *dev, int pos, int size, char *buf); | 22 | int (*read)(struct pci_dev *dev, int pos, int size, char *buf); |
| 23 | int (*write)(struct pci_dev *dev, int pos, int size, const char *buf); | 23 | int (*write)(struct pci_dev *dev, int pos, int size, const char *buf); |
| 24 | int (*get_size)(struct pci_dev *dev); | ||
| 25 | void (*release)(struct pci_dev *dev); | 24 | void (*release)(struct pci_dev *dev); |
| 26 | }; | 25 | }; |
| 27 | 26 | ||
| 28 | struct pci_vpd { | 27 | struct pci_vpd { |
| 28 | unsigned int len; | ||
| 29 | struct pci_vpd_ops *ops; | 29 | struct pci_vpd_ops *ops; |
| 30 | struct bin_attribute *attr; /* descriptor for sysfs VPD entry */ | 30 | struct bin_attribute *attr; /* descriptor for sysfs VPD entry */ |
| 31 | }; | 31 | }; |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index dabb563f51d9..338a3f94b4d4 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -1670,6 +1670,48 @@ static void __devinit quirk_via_cx700_pci_parking_caching(struct pci_dev *dev) | |||
| 1670 | } | 1670 | } |
| 1671 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, 0x324e, quirk_via_cx700_pci_parking_caching); | 1671 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, 0x324e, quirk_via_cx700_pci_parking_caching); |
| 1672 | 1672 | ||
| 1673 | /* | ||
| 1674 | * For Broadcom 5706, 5708, 5709 rev. A nics, any read beyond the | ||
| 1675 | * VPD end tag will hang the device. This problem was initially | ||
| 1676 | * observed when a vpd entry was created in sysfs | ||
| 1677 | * ('/sys/bus/pci/devices/<id>/vpd'). A read to this sysfs entry | ||
| 1678 | * will dump 32k of data. Reading a full 32k will cause an access | ||
| 1679 | * beyond the VPD end tag causing the device to hang. Once the device | ||
| 1680 | * is hung, the bnx2 driver will not be able to reset the device. | ||
| 1681 | * We believe that it is legal to read beyond the end tag and | ||
| 1682 | * therefore the solution is to limit the read/write length. | ||
| 1683 | */ | ||
| 1684 | static void __devinit quirk_brcm_570x_limit_vpd(struct pci_dev *dev) | ||
| 1685 | { | ||
| 1686 | /* Only disable the VPD capability for 5706, 5708, and 5709 rev. A */ | ||
| 1687 | if ((dev->device == PCI_DEVICE_ID_NX2_5706) || | ||
| 1688 | (dev->device == PCI_DEVICE_ID_NX2_5708) || | ||
| 1689 | ((dev->device == PCI_DEVICE_ID_NX2_5709) && | ||
| 1690 | (dev->revision & 0xf0) == 0x0)) { | ||
| 1691 | if (dev->vpd) | ||
| 1692 | dev->vpd->len = 0x80; | ||
| 1693 | } | ||
| 1694 | } | ||
| 1695 | |||
| 1696 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1697 | PCI_DEVICE_ID_NX2_5706, | ||
| 1698 | quirk_brcm_570x_limit_vpd); | ||
| 1699 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1700 | PCI_DEVICE_ID_NX2_5706S, | ||
| 1701 | quirk_brcm_570x_limit_vpd); | ||
| 1702 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1703 | PCI_DEVICE_ID_NX2_5708, | ||
| 1704 | quirk_brcm_570x_limit_vpd); | ||
| 1705 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1706 | PCI_DEVICE_ID_NX2_5708S, | ||
| 1707 | quirk_brcm_570x_limit_vpd); | ||
| 1708 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1709 | PCI_DEVICE_ID_NX2_5709, | ||
| 1710 | quirk_brcm_570x_limit_vpd); | ||
| 1711 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, | ||
| 1712 | PCI_DEVICE_ID_NX2_5709S, | ||
| 1713 | quirk_brcm_570x_limit_vpd); | ||
| 1714 | |||
| 1673 | #ifdef CONFIG_PCI_MSI | 1715 | #ifdef CONFIG_PCI_MSI |
| 1674 | /* Some chipsets do not support MSI. We cannot easily rely on setting | 1716 | /* Some chipsets do not support MSI. We cannot easily rely on setting |
| 1675 | * PCI_BUS_FLAGS_NO_MSI in its bus flags because there are actually | 1717 | * PCI_BUS_FLAGS_NO_MSI in its bus flags because there are actually |
| @@ -1685,6 +1727,7 @@ static void __init quirk_disable_all_msi(struct pci_dev *dev) | |||
| 1685 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi); | 1727 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_GCNB_LE, quirk_disable_all_msi); |
| 1686 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi); | 1728 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi); |
| 1687 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi); | 1729 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi); |
| 1730 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3336, quirk_disable_all_msi); | ||
| 1688 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi); | 1731 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi); |
| 1689 | 1732 | ||
| 1690 | /* Disable MSI on chipsets that are known to not support it */ | 1733 | /* Disable MSI on chipsets that are known to not support it */ |
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 7e3ad4f3b343..58b7336640ff 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
| @@ -126,12 +126,25 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | |||
| 126 | int err; | 126 | int err; |
| 127 | struct rtc_time before, now; | 127 | struct rtc_time before, now; |
| 128 | int first_time = 1; | 128 | int first_time = 1; |
| 129 | unsigned long t_now, t_alm; | ||
| 130 | enum { none, day, month, year } missing = none; | ||
| 131 | unsigned days; | ||
| 129 | 132 | ||
| 130 | /* The lower level RTC driver may not be capable of filling | 133 | /* The lower level RTC driver may return -1 in some fields, |
| 131 | * in all fields of the rtc_time struct (eg. rtc-cmos), | 134 | * creating invalid alarm->time values, for reasons like: |
| 132 | * and so might instead return -1 in some fields. | 135 | * |
| 133 | * We deal with that here by grabbing a current RTC timestamp | 136 | * - The hardware may not be capable of filling them in; |
| 134 | * and using values from that for any missing (-1) values. | 137 | * many alarms match only on time-of-day fields, not |
| 138 | * day/month/year calendar data. | ||
| 139 | * | ||
| 140 | * - Some hardware uses illegal values as "wildcard" match | ||
| 141 | * values, which non-Linux firmware (like a BIOS) may try | ||
| 142 | * to set up as e.g. "alarm 15 minutes after each hour". | ||
| 143 | * Linux uses only oneshot alarms. | ||
| 144 | * | ||
| 145 | * When we see that here, we deal with it by using values from | ||
| 146 | * a current RTC timestamp for any missing (-1) values. The | ||
| 147 | * RTC driver prevents "periodic alarm" modes. | ||
| 135 | * | 148 | * |
| 136 | * But this can be racey, because some fields of the RTC timestamp | 149 | * But this can be racey, because some fields of the RTC timestamp |
| 137 | * may have wrapped in the interval since we read the RTC alarm, | 150 | * may have wrapped in the interval since we read the RTC alarm, |
| @@ -174,6 +187,10 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | |||
| 174 | if (!alarm->enabled) | 187 | if (!alarm->enabled) |
| 175 | return 0; | 188 | return 0; |
| 176 | 189 | ||
| 190 | /* full-function RTCs won't have such missing fields */ | ||
| 191 | if (rtc_valid_tm(&alarm->time) == 0) | ||
| 192 | return 0; | ||
| 193 | |||
| 177 | /* get the "after" timestamp, to detect wrapped fields */ | 194 | /* get the "after" timestamp, to detect wrapped fields */ |
| 178 | err = rtc_read_time(rtc, &now); | 195 | err = rtc_read_time(rtc, &now); |
| 179 | if (err < 0) | 196 | if (err < 0) |
| @@ -183,22 +200,85 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) | |||
| 183 | } while ( before.tm_min != now.tm_min | 200 | } while ( before.tm_min != now.tm_min |
| 184 | || before.tm_hour != now.tm_hour | 201 | || before.tm_hour != now.tm_hour |
| 185 | || before.tm_mon != now.tm_mon | 202 | || before.tm_mon != now.tm_mon |
| 186 | || before.tm_year != now.tm_year | 203 | || before.tm_year != now.tm_year); |
| 187 | || before.tm_isdst != now.tm_isdst); | ||
| 188 | 204 | ||
| 189 | /* Fill in any missing alarm fields using the timestamp */ | 205 | /* Fill in the missing alarm fields using the timestamp; we |
| 206 | * know there's at least one since alarm->time is invalid. | ||
| 207 | */ | ||
| 190 | if (alarm->time.tm_sec == -1) | 208 | if (alarm->time.tm_sec == -1) |
| 191 | alarm->time.tm_sec = now.tm_sec; | 209 | alarm->time.tm_sec = now.tm_sec; |
| 192 | if (alarm->time.tm_min == -1) | 210 | if (alarm->time.tm_min == -1) |
| 193 | alarm->time.tm_min = now.tm_min; | 211 | alarm->time.tm_min = now.tm_min; |
| 194 | if (alarm->time.tm_hour == -1) | 212 | if (alarm->time.tm_hour == -1) |
| 195 | alarm->time.tm_hour = now.tm_hour; | 213 | alarm->time.tm_hour = now.tm_hour; |
| 196 | if (alarm->time.tm_mday == -1) | 214 | |
| 215 | /* For simplicity, only support date rollover for now */ | ||
| 216 | if (alarm->time.tm_mday == -1) { | ||
| 197 | alarm->time.tm_mday = now.tm_mday; | 217 | alarm->time.tm_mday = now.tm_mday; |
| 198 | if (alarm->time.tm_mon == -1) | 218 | missing = day; |
| 219 | } | ||
| 220 | if (alarm->time.tm_mon == -1) { | ||
| 199 | alarm->time.tm_mon = now.tm_mon; | 221 | alarm->time.tm_mon = now.tm_mon; |
| 200 | if (alarm->time.tm_year == -1) | 222 | if (missing == none) |
| 223 | missing = month; | ||
| 224 | } | ||
| 225 | if (alarm->time.tm_year == -1) { | ||
| 201 | alarm->time.tm_year = now.tm_year; | 226 | alarm->time.tm_year = now.tm_year; |
| 227 | if (missing == none) | ||
| 228 | missing = year; | ||
| 229 | } | ||
| 230 | |||
| 231 | /* with luck, no rollover is needed */ | ||
| 232 | rtc_tm_to_time(&now, &t_now); | ||
| 233 | rtc_tm_to_time(&alarm->time, &t_alm); | ||
| 234 | if (t_now < t_alm) | ||
| 235 | goto done; | ||
| 236 | |||
| 237 | switch (missing) { | ||
| 238 | |||
| 239 | /* 24 hour rollover ... if it's now 10am Monday, an alarm that | ||
| 240 | * that will trigger at 5am will do so at 5am Tuesday, which | ||
| 241 | * could also be in the next month or year. This is a common | ||
| 242 | * case, especially for PCs. | ||
| 243 | */ | ||
| 244 | case day: | ||
| 245 | dev_dbg(&rtc->dev, "alarm rollover: %s\n", "day"); | ||
| 246 | t_alm += 24 * 60 * 60; | ||
| 247 | rtc_time_to_tm(t_alm, &alarm->time); | ||
| 248 | break; | ||
| 249 | |||
| 250 | /* Month rollover ... if it's the 31th, an alarm on the 3rd will | ||
| 251 | * be next month. An alarm matching on the 30th, 29th, or 28th | ||
| 252 | * may end up in the month after that! Many newer PCs support | ||
| 253 | * this type of alarm. | ||
| 254 | */ | ||
| 255 | case month: | ||
| 256 | dev_dbg(&rtc->dev, "alarm rollover: %s\n", "month"); | ||
| 257 | do { | ||
| 258 | if (alarm->time.tm_mon < 11) | ||
| 259 | alarm->time.tm_mon++; | ||
| 260 | else { | ||
| 261 | alarm->time.tm_mon = 0; | ||
| 262 | alarm->time.tm_year++; | ||
| 263 | } | ||
| 264 | days = rtc_month_days(alarm->time.tm_mon, | ||
| 265 | alarm->time.tm_year); | ||
| 266 | } while (days < alarm->time.tm_mday); | ||
| 267 | break; | ||
| 268 | |||
| 269 | /* Year rollover ... easy except for leap years! */ | ||
| 270 | case year: | ||
| 271 | dev_dbg(&rtc->dev, "alarm rollover: %s\n", "year"); | ||
| 272 | do { | ||
| 273 | alarm->time.tm_year++; | ||
| 274 | } while (!rtc_valid_tm(&alarm->time)); | ||
| 275 | break; | ||
| 276 | |||
| 277 | default: | ||
| 278 | dev_warn(&rtc->dev, "alarm rollover not handled\n"); | ||
| 279 | } | ||
| 280 | |||
| 281 | done: | ||
| 202 | return 0; | 282 | return 0; |
| 203 | } | 283 | } |
| 204 | EXPORT_SYMBOL_GPL(rtc_read_alarm); | 284 | EXPORT_SYMBOL_GPL(rtc_read_alarm); |
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 82f62d25f921..67421b0d3a7b 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
| @@ -331,14 +331,14 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
| 331 | RCNR = 0; | 331 | RCNR = 0; |
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | device_init_wakeup(&pdev->dev, 1); | ||
| 335 | |||
| 334 | rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, | 336 | rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, |
| 335 | THIS_MODULE); | 337 | THIS_MODULE); |
| 336 | 338 | ||
| 337 | if (IS_ERR(rtc)) | 339 | if (IS_ERR(rtc)) |
| 338 | return PTR_ERR(rtc); | 340 | return PTR_ERR(rtc); |
| 339 | 341 | ||
| 340 | device_init_wakeup(&pdev->dev, 1); | ||
| 341 | |||
| 342 | platform_set_drvdata(pdev, rtc); | 342 | platform_set_drvdata(pdev, rtc); |
| 343 | 343 | ||
| 344 | return 0; | 344 | return 0; |
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index eaf55945f21b..7dcfba1bbfe1 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #define X1205_SR_RTCF 0x01 /* Clock failure */ | 71 | #define X1205_SR_RTCF 0x01 /* Clock failure */ |
| 72 | #define X1205_SR_WEL 0x02 /* Write Enable Latch */ | 72 | #define X1205_SR_WEL 0x02 /* Write Enable Latch */ |
| 73 | #define X1205_SR_RWEL 0x04 /* Register Write Enable */ | 73 | #define X1205_SR_RWEL 0x04 /* Register Write Enable */ |
| 74 | #define X1205_SR_AL0 0x20 /* Alarm 0 match */ | ||
| 74 | 75 | ||
| 75 | #define X1205_DTR_DTR0 0x01 | 76 | #define X1205_DTR_DTR0 0x01 |
| 76 | #define X1205_DTR_DTR1 0x02 | 77 | #define X1205_DTR_DTR1 0x02 |
| @@ -78,6 +79,8 @@ | |||
| 78 | 79 | ||
| 79 | #define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ | 80 | #define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ |
| 80 | 81 | ||
| 82 | #define X1205_INT_AL0E 0x20 /* Alarm 0 enable */ | ||
| 83 | |||
| 81 | static struct i2c_driver x1205_driver; | 84 | static struct i2c_driver x1205_driver; |
| 82 | 85 | ||
| 83 | /* | 86 | /* |
| @@ -89,8 +92,8 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, | |||
| 89 | unsigned char reg_base) | 92 | unsigned char reg_base) |
| 90 | { | 93 | { |
| 91 | unsigned char dt_addr[2] = { 0, reg_base }; | 94 | unsigned char dt_addr[2] = { 0, reg_base }; |
| 92 | |||
| 93 | unsigned char buf[8]; | 95 | unsigned char buf[8]; |
| 96 | int i; | ||
| 94 | 97 | ||
| 95 | struct i2c_msg msgs[] = { | 98 | struct i2c_msg msgs[] = { |
| 96 | { client->addr, 0, 2, dt_addr }, /* setup read ptr */ | 99 | { client->addr, 0, 2, dt_addr }, /* setup read ptr */ |
| @@ -98,7 +101,7 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, | |||
| 98 | }; | 101 | }; |
| 99 | 102 | ||
| 100 | /* read date registers */ | 103 | /* read date registers */ |
| 101 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 104 | if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { |
| 102 | dev_err(&client->dev, "%s: read error\n", __func__); | 105 | dev_err(&client->dev, "%s: read error\n", __func__); |
| 103 | return -EIO; | 106 | return -EIO; |
| 104 | } | 107 | } |
| @@ -110,6 +113,11 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm, | |||
| 110 | buf[0], buf[1], buf[2], buf[3], | 113 | buf[0], buf[1], buf[2], buf[3], |
| 111 | buf[4], buf[5], buf[6], buf[7]); | 114 | buf[4], buf[5], buf[6], buf[7]); |
| 112 | 115 | ||
| 116 | /* Mask out the enable bits if these are alarm registers */ | ||
| 117 | if (reg_base < X1205_CCR_BASE) | ||
| 118 | for (i = 0; i <= 4; i++) | ||
| 119 | buf[i] &= 0x7F; | ||
| 120 | |||
| 113 | tm->tm_sec = BCD2BIN(buf[CCR_SEC]); | 121 | tm->tm_sec = BCD2BIN(buf[CCR_SEC]); |
| 114 | tm->tm_min = BCD2BIN(buf[CCR_MIN]); | 122 | tm->tm_min = BCD2BIN(buf[CCR_MIN]); |
| 115 | tm->tm_hour = BCD2BIN(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */ | 123 | tm->tm_hour = BCD2BIN(buf[CCR_HOUR] & 0x3F); /* hr is 0-23 */ |
| @@ -138,7 +146,7 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr) | |||
| 138 | }; | 146 | }; |
| 139 | 147 | ||
| 140 | /* read status register */ | 148 | /* read status register */ |
| 141 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 149 | if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { |
| 142 | dev_err(&client->dev, "%s: read error\n", __func__); | 150 | dev_err(&client->dev, "%s: read error\n", __func__); |
| 143 | return -EIO; | 151 | return -EIO; |
| 144 | } | 152 | } |
| @@ -147,10 +155,11 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr) | |||
| 147 | } | 155 | } |
| 148 | 156 | ||
| 149 | static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, | 157 | static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, |
| 150 | int datetoo, u8 reg_base) | 158 | int datetoo, u8 reg_base, unsigned char alm_enable) |
| 151 | { | 159 | { |
| 152 | int i, xfer; | 160 | int i, xfer, nbytes; |
| 153 | unsigned char buf[8]; | 161 | unsigned char buf[8]; |
| 162 | unsigned char rdata[10] = { 0, reg_base }; | ||
| 154 | 163 | ||
| 155 | static const unsigned char wel[3] = { 0, X1205_REG_SR, | 164 | static const unsigned char wel[3] = { 0, X1205_REG_SR, |
| 156 | X1205_SR_WEL }; | 165 | X1205_SR_WEL }; |
| @@ -189,6 +198,11 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, | |||
| 189 | buf[CCR_Y2K] = BIN2BCD(tm->tm_year / 100); | 198 | buf[CCR_Y2K] = BIN2BCD(tm->tm_year / 100); |
| 190 | } | 199 | } |
| 191 | 200 | ||
| 201 | /* If writing alarm registers, set compare bits on registers 0-4 */ | ||
| 202 | if (reg_base < X1205_CCR_BASE) | ||
| 203 | for (i = 0; i <= 4; i++) | ||
| 204 | buf[i] |= 0x80; | ||
| 205 | |||
| 192 | /* this sequence is required to unlock the chip */ | 206 | /* this sequence is required to unlock the chip */ |
| 193 | if ((xfer = i2c_master_send(client, wel, 3)) != 3) { | 207 | if ((xfer = i2c_master_send(client, wel, 3)) != 3) { |
| 194 | dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); | 208 | dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); |
| @@ -200,19 +214,57 @@ static int x1205_set_datetime(struct i2c_client *client, struct rtc_time *tm, | |||
| 200 | return -EIO; | 214 | return -EIO; |
| 201 | } | 215 | } |
| 202 | 216 | ||
| 217 | |||
| 203 | /* write register's data */ | 218 | /* write register's data */ |
| 204 | for (i = 0; i < (datetoo ? 8 : 3); i++) { | 219 | if (datetoo) |
| 205 | unsigned char rdata[3] = { 0, reg_base + i, buf[i] }; | 220 | nbytes = 8; |
| 221 | else | ||
| 222 | nbytes = 3; | ||
| 223 | for (i = 0; i < nbytes; i++) | ||
| 224 | rdata[2+i] = buf[i]; | ||
| 225 | |||
| 226 | xfer = i2c_master_send(client, rdata, nbytes+2); | ||
| 227 | if (xfer != nbytes+2) { | ||
| 228 | dev_err(&client->dev, | ||
| 229 | "%s: result=%d addr=%02x, data=%02x\n", | ||
| 230 | __func__, | ||
| 231 | xfer, rdata[1], rdata[2]); | ||
| 232 | return -EIO; | ||
| 233 | } | ||
| 234 | |||
| 235 | /* If we wrote to the nonvolatile region, wait 10msec for write cycle*/ | ||
| 236 | if (reg_base < X1205_CCR_BASE) { | ||
| 237 | unsigned char al0e[3] = { 0, X1205_REG_INT, 0 }; | ||
| 238 | |||
| 239 | msleep(10); | ||
| 206 | 240 | ||
| 207 | xfer = i2c_master_send(client, rdata, 3); | 241 | /* ...and set or clear the AL0E bit in the INT register */ |
| 242 | |||
| 243 | /* Need to set RWEL again as the write has cleared it */ | ||
| 244 | xfer = i2c_master_send(client, rwel, 3); | ||
| 208 | if (xfer != 3) { | 245 | if (xfer != 3) { |
| 209 | dev_err(&client->dev, | 246 | dev_err(&client->dev, |
| 210 | "%s: xfer=%d addr=%02x, data=%02x\n", | 247 | "%s: aloe rwel - %d\n", |
| 211 | __func__, | 248 | __func__, |
| 212 | xfer, rdata[1], rdata[2]); | 249 | xfer); |
| 250 | return -EIO; | ||
| 251 | } | ||
| 252 | |||
| 253 | if (alm_enable) | ||
| 254 | al0e[2] = X1205_INT_AL0E; | ||
| 255 | |||
| 256 | xfer = i2c_master_send(client, al0e, 3); | ||
| 257 | if (xfer != 3) { | ||
| 258 | dev_err(&client->dev, | ||
| 259 | "%s: al0e - %d\n", | ||
| 260 | __func__, | ||
| 261 | xfer); | ||
| 213 | return -EIO; | 262 | return -EIO; |
| 214 | } | 263 | } |
| 215 | }; | 264 | |
| 265 | /* and wait 10msec again for this write to complete */ | ||
| 266 | msleep(10); | ||
| 267 | } | ||
| 216 | 268 | ||
| 217 | /* disable further writes */ | 269 | /* disable further writes */ |
| 218 | if ((xfer = i2c_master_send(client, diswe, 3)) != 3) { | 270 | if ((xfer = i2c_master_send(client, diswe, 3)) != 3) { |
| @@ -230,9 +282,9 @@ static int x1205_fix_osc(struct i2c_client *client) | |||
| 230 | 282 | ||
| 231 | tm.tm_hour = tm.tm_min = tm.tm_sec = 0; | 283 | tm.tm_hour = tm.tm_min = tm.tm_sec = 0; |
| 232 | 284 | ||
| 233 | if ((err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE)) < 0) | 285 | err = x1205_set_datetime(client, &tm, 0, X1205_CCR_BASE, 0); |
| 234 | dev_err(&client->dev, | 286 | if (err < 0) |
| 235 | "unable to restart the oscillator\n"); | 287 | dev_err(&client->dev, "unable to restart the oscillator\n"); |
| 236 | 288 | ||
| 237 | return err; | 289 | return err; |
| 238 | } | 290 | } |
| @@ -248,7 +300,7 @@ static int x1205_get_dtrim(struct i2c_client *client, int *trim) | |||
| 248 | }; | 300 | }; |
| 249 | 301 | ||
| 250 | /* read dtr register */ | 302 | /* read dtr register */ |
| 251 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 303 | if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { |
| 252 | dev_err(&client->dev, "%s: read error\n", __func__); | 304 | dev_err(&client->dev, "%s: read error\n", __func__); |
| 253 | return -EIO; | 305 | return -EIO; |
| 254 | } | 306 | } |
| @@ -280,7 +332,7 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim) | |||
| 280 | }; | 332 | }; |
| 281 | 333 | ||
| 282 | /* read atr register */ | 334 | /* read atr register */ |
| 283 | if ((i2c_transfer(client->adapter, &msgs[0], 2)) != 2) { | 335 | if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { |
| 284 | dev_err(&client->dev, "%s: read error\n", __func__); | 336 | dev_err(&client->dev, "%s: read error\n", __func__); |
| 285 | return -EIO; | 337 | return -EIO; |
| 286 | } | 338 | } |
| @@ -403,14 +455,33 @@ static int x1205_validate_client(struct i2c_client *client) | |||
| 403 | 455 | ||
| 404 | static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | 456 | static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) |
| 405 | { | 457 | { |
| 406 | return x1205_get_datetime(to_i2c_client(dev), | 458 | int err; |
| 407 | &alrm->time, X1205_ALM0_BASE); | 459 | unsigned char intreg, status; |
| 460 | static unsigned char int_addr[2] = { 0, X1205_REG_INT }; | ||
| 461 | struct i2c_client *client = to_i2c_client(dev); | ||
| 462 | struct i2c_msg msgs[] = { | ||
| 463 | { client->addr, 0, 2, int_addr }, /* setup read ptr */ | ||
| 464 | { client->addr, I2C_M_RD, 1, &intreg }, /* read INT register */ | ||
| 465 | }; | ||
| 466 | |||
| 467 | /* read interrupt register and status register */ | ||
| 468 | if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { | ||
| 469 | dev_err(&client->dev, "%s: read error\n", __func__); | ||
| 470 | return -EIO; | ||
| 471 | } | ||
| 472 | err = x1205_get_status(client, &status); | ||
| 473 | if (err == 0) { | ||
| 474 | alrm->pending = (status & X1205_SR_AL0) ? 1 : 0; | ||
| 475 | alrm->enabled = (intreg & X1205_INT_AL0E) ? 1 : 0; | ||
| 476 | err = x1205_get_datetime(client, &alrm->time, X1205_ALM0_BASE); | ||
| 477 | } | ||
| 478 | return err; | ||
| 408 | } | 479 | } |
| 409 | 480 | ||
| 410 | static int x1205_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) | 481 | static int x1205_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) |
| 411 | { | 482 | { |
| 412 | return x1205_set_datetime(to_i2c_client(dev), | 483 | return x1205_set_datetime(to_i2c_client(dev), |
| 413 | &alrm->time, 1, X1205_ALM0_BASE); | 484 | &alrm->time, 1, X1205_ALM0_BASE, alrm->enabled); |
| 414 | } | 485 | } |
| 415 | 486 | ||
| 416 | static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm) | 487 | static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm) |
| @@ -422,7 +493,7 @@ static int x1205_rtc_read_time(struct device *dev, struct rtc_time *tm) | |||
| 422 | static int x1205_rtc_set_time(struct device *dev, struct rtc_time *tm) | 493 | static int x1205_rtc_set_time(struct device *dev, struct rtc_time *tm) |
| 423 | { | 494 | { |
| 424 | return x1205_set_datetime(to_i2c_client(dev), | 495 | return x1205_set_datetime(to_i2c_client(dev), |
| 425 | tm, 1, X1205_CCR_BASE); | 496 | tm, 1, X1205_CCR_BASE, 0); |
| 426 | } | 497 | } |
| 427 | 498 | ||
| 428 | static int x1205_rtc_proc(struct device *dev, struct seq_file *seq) | 499 | static int x1205_rtc_proc(struct device *dev, struct seq_file *seq) |
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index a0b6d414953d..59fbef08d690 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c | |||
| @@ -2359,6 +2359,24 @@ void scsi_esp_unregister(struct esp *esp) | |||
| 2359 | } | 2359 | } |
| 2360 | EXPORT_SYMBOL(scsi_esp_unregister); | 2360 | EXPORT_SYMBOL(scsi_esp_unregister); |
| 2361 | 2361 | ||
| 2362 | static int esp_target_alloc(struct scsi_target *starget) | ||
| 2363 | { | ||
| 2364 | struct esp *esp = shost_priv(dev_to_shost(&starget->dev)); | ||
| 2365 | struct esp_target_data *tp = &esp->target[starget->id]; | ||
| 2366 | |||
| 2367 | tp->starget = starget; | ||
| 2368 | |||
| 2369 | return 0; | ||
| 2370 | } | ||
| 2371 | |||
| 2372 | static void esp_target_destroy(struct scsi_target *starget) | ||
| 2373 | { | ||
| 2374 | struct esp *esp = shost_priv(dev_to_shost(&starget->dev)); | ||
| 2375 | struct esp_target_data *tp = &esp->target[starget->id]; | ||
| 2376 | |||
| 2377 | tp->starget = NULL; | ||
| 2378 | } | ||
| 2379 | |||
| 2362 | static int esp_slave_alloc(struct scsi_device *dev) | 2380 | static int esp_slave_alloc(struct scsi_device *dev) |
| 2363 | { | 2381 | { |
| 2364 | struct esp *esp = shost_priv(dev->host); | 2382 | struct esp *esp = shost_priv(dev->host); |
| @@ -2370,8 +2388,6 @@ static int esp_slave_alloc(struct scsi_device *dev) | |||
| 2370 | return -ENOMEM; | 2388 | return -ENOMEM; |
| 2371 | dev->hostdata = lp; | 2389 | dev->hostdata = lp; |
| 2372 | 2390 | ||
| 2373 | tp->starget = dev->sdev_target; | ||
| 2374 | |||
| 2375 | spi_min_period(tp->starget) = esp->min_period; | 2391 | spi_min_period(tp->starget) = esp->min_period; |
| 2376 | spi_max_offset(tp->starget) = 15; | 2392 | spi_max_offset(tp->starget) = 15; |
| 2377 | 2393 | ||
| @@ -2608,6 +2624,8 @@ struct scsi_host_template scsi_esp_template = { | |||
| 2608 | .name = "esp", | 2624 | .name = "esp", |
| 2609 | .info = esp_info, | 2625 | .info = esp_info, |
| 2610 | .queuecommand = esp_queuecommand, | 2626 | .queuecommand = esp_queuecommand, |
| 2627 | .target_alloc = esp_target_alloc, | ||
| 2628 | .target_destroy = esp_target_destroy, | ||
| 2611 | .slave_alloc = esp_slave_alloc, | 2629 | .slave_alloc = esp_slave_alloc, |
| 2612 | .slave_configure = esp_slave_configure, | 2630 | .slave_configure = esp_slave_configure, |
| 2613 | .slave_destroy = esp_slave_destroy, | 2631 | .slave_destroy = esp_slave_destroy, |
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 45df83b9d847..0fe031f003e7 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c | |||
| @@ -61,7 +61,7 @@ static int ses_probe(struct device *dev) | |||
| 61 | return err; | 61 | return err; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | #define SES_TIMEOUT 30 | 64 | #define SES_TIMEOUT (30 * HZ) |
| 65 | #define SES_RETRIES 3 | 65 | #define SES_RETRIES 3 |
| 66 | 66 | ||
| 67 | static int ses_recv_diag(struct scsi_device *sdev, int page_code, | 67 | static int ses_recv_diag(struct scsi_device *sdev, int page_code, |
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c index c9b64e73c987..42d2e108b679 100644 --- a/drivers/serial/serial_core.c +++ b/drivers/serial/serial_core.c | |||
| @@ -1991,7 +1991,9 @@ struct uart_match { | |||
| 1991 | static int serial_match_port(struct device *dev, void *data) | 1991 | static int serial_match_port(struct device *dev, void *data) |
| 1992 | { | 1992 | { |
| 1993 | struct uart_match *match = data; | 1993 | struct uart_match *match = data; |
| 1994 | dev_t devt = MKDEV(match->driver->major, match->driver->minor) + match->port->line; | 1994 | struct tty_driver *tty_drv = match->driver->tty_driver; |
| 1995 | dev_t devt = MKDEV(tty_drv->major, tty_drv->minor_start) + | ||
| 1996 | match->port->line; | ||
| 1995 | 1997 | ||
| 1996 | return dev->devt == devt; /* Actually, only one tty per port */ | 1998 | return dev->devt == devt; /* Actually, only one tty per port */ |
| 1997 | } | 1999 | } |
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 799337f7fde1..f5b60c70389b 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c | |||
| @@ -167,14 +167,14 @@ spidev_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos) | |||
| 167 | 167 | ||
| 168 | mutex_lock(&spidev->buf_lock); | 168 | mutex_lock(&spidev->buf_lock); |
| 169 | status = spidev_sync_read(spidev, count); | 169 | status = spidev_sync_read(spidev, count); |
| 170 | if (status == 0) { | 170 | if (status > 0) { |
| 171 | unsigned long missing; | 171 | unsigned long missing; |
| 172 | 172 | ||
| 173 | missing = copy_to_user(buf, spidev->buffer, count); | 173 | missing = copy_to_user(buf, spidev->buffer, status); |
| 174 | if (count && missing == count) | 174 | if (missing == status) |
| 175 | status = -EFAULT; | 175 | status = -EFAULT; |
| 176 | else | 176 | else |
| 177 | status = count - missing; | 177 | status = status - missing; |
| 178 | } | 178 | } |
| 179 | mutex_unlock(&spidev->buf_lock); | 179 | mutex_unlock(&spidev->buf_lock); |
| 180 | 180 | ||
| @@ -200,8 +200,6 @@ spidev_write(struct file *filp, const char __user *buf, | |||
| 200 | missing = copy_from_user(spidev->buffer, buf, count); | 200 | missing = copy_from_user(spidev->buffer, buf, count); |
| 201 | if (missing == 0) { | 201 | if (missing == 0) { |
| 202 | status = spidev_sync_write(spidev, count); | 202 | status = spidev_sync_write(spidev, count); |
| 203 | if (status == 0) | ||
| 204 | status = count; | ||
| 205 | } else | 203 | } else |
| 206 | status = -EFAULT; | 204 | status = -EFAULT; |
| 207 | mutex_unlock(&spidev->buf_lock); | 205 | mutex_unlock(&spidev->buf_lock); |
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 4b628526df09..a86e952ed4ca 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig | |||
| @@ -12,3 +12,12 @@ menuconfig THERMAL | |||
| 12 | cooling devices. | 12 | cooling devices. |
| 13 | All platforms with ACPI thermal support can use this driver. | 13 | All platforms with ACPI thermal support can use this driver. |
| 14 | If you want this support, you should say Y or M here. | 14 | If you want this support, you should say Y or M here. |
| 15 | |||
| 16 | config THERMAL_HWMON | ||
| 17 | bool "Hardware monitoring support" | ||
| 18 | depends on HWMON=y || HWMON=THERMAL | ||
| 19 | help | ||
| 20 | The generic thermal sysfs driver's hardware monitoring support | ||
| 21 | requires a 2.10.7/3.0.2 or later lm-sensors userspace. | ||
| 22 | |||
| 23 | Say Y if your user-space is new enough. | ||
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 6098787341f3..fe07462d5947 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c | |||
| @@ -295,8 +295,8 @@ thermal_cooling_device_trip_point_show(struct device *dev, | |||
| 295 | 295 | ||
| 296 | /* Device management */ | 296 | /* Device management */ |
| 297 | 297 | ||
| 298 | #if defined(CONFIG_HWMON) || \ | 298 | #if defined(CONFIG_THERMAL_HWMON) |
| 299 | (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) | 299 | |
| 300 | /* hwmon sys I/F */ | 300 | /* hwmon sys I/F */ |
| 301 | #include <linux/hwmon.h> | 301 | #include <linux/hwmon.h> |
| 302 | static LIST_HEAD(thermal_hwmon_list); | 302 | static LIST_HEAD(thermal_hwmon_list); |
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 63c34043b4d9..c3201affa0b6 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1125,9 +1125,6 @@ static void stop_data_traffic(struct acm *acm) | |||
| 1125 | for (i = 0; i < acm->rx_buflimit; i++) | 1125 | for (i = 0; i < acm->rx_buflimit; i++) |
| 1126 | usb_kill_urb(acm->ru[i].urb); | 1126 | usb_kill_urb(acm->ru[i].urb); |
| 1127 | 1127 | ||
| 1128 | INIT_LIST_HEAD(&acm->filled_read_bufs); | ||
| 1129 | INIT_LIST_HEAD(&acm->spare_read_bufs); | ||
| 1130 | |||
| 1131 | tasklet_enable(&acm->urb_task); | 1128 | tasklet_enable(&acm->urb_task); |
| 1132 | 1129 | ||
| 1133 | cancel_work_sync(&acm->work); | 1130 | cancel_work_sync(&acm->work); |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 09a53e7f3327..42a436478b78 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -924,6 +924,15 @@ 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 | |||
| 927 | 936 | ||
| 928 | /*-------------------------------------------------------------------------*/ | 937 | /*-------------------------------------------------------------------------*/ |
| 929 | 938 | ||
| @@ -1684,19 +1693,30 @@ EXPORT_SYMBOL_GPL(usb_bus_start_enum); | |||
| 1684 | irqreturn_t usb_hcd_irq (int irq, void *__hcd) | 1693 | irqreturn_t usb_hcd_irq (int irq, void *__hcd) |
| 1685 | { | 1694 | { |
| 1686 | struct usb_hcd *hcd = __hcd; | 1695 | struct usb_hcd *hcd = __hcd; |
| 1687 | int start = hcd->state; | 1696 | unsigned long flags; |
| 1697 | irqreturn_t rc; | ||
| 1688 | 1698 | ||
| 1689 | if (unlikely(start == HC_STATE_HALT || | 1699 | /* IRQF_DISABLED doesn't work correctly with shared IRQs |
| 1690 | !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) | 1700 | * when the first handler doesn't use it. So let's just |
| 1691 | return IRQ_NONE; | 1701 | * assume it's never used. |
| 1692 | if (hcd->driver->irq (hcd) == IRQ_NONE) | 1702 | */ |
| 1693 | return IRQ_NONE; | 1703 | local_irq_save(flags); |
| 1694 | 1704 | ||
| 1695 | set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); | 1705 | if (unlikely(hcd->state == HC_STATE_HALT || |
| 1706 | !test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags))) { | ||
| 1707 | rc = IRQ_NONE; | ||
| 1708 | } else if (hcd->driver->irq(hcd) == IRQ_NONE) { | ||
| 1709 | rc = IRQ_NONE; | ||
| 1710 | } else { | ||
| 1711 | set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); | ||
| 1712 | |||
| 1713 | if (unlikely(hcd->state == HC_STATE_HALT)) | ||
| 1714 | usb_hc_died(hcd); | ||
| 1715 | rc = IRQ_HANDLED; | ||
| 1716 | } | ||
| 1696 | 1717 | ||
| 1697 | if (unlikely(hcd->state == HC_STATE_HALT)) | 1718 | local_irq_restore(flags); |
| 1698 | usb_hc_died (hcd); | 1719 | return rc; |
| 1699 | return IRQ_HANDLED; | ||
| 1700 | } | 1720 | } |
| 1701 | 1721 | ||
| 1702 | /*-------------------------------------------------------------------------*/ | 1722 | /*-------------------------------------------------------------------------*/ |
| @@ -1860,6 +1880,13 @@ int usb_add_hcd(struct usb_hcd *hcd, | |||
| 1860 | 1880 | ||
| 1861 | /* enable irqs just before we start the controller */ | 1881 | /* enable irqs just before we start the controller */ |
| 1862 | if (hcd->driver->irq) { | 1882 | if (hcd->driver->irq) { |
| 1883 | |||
| 1884 | /* IRQF_DISABLED doesn't work as advertised when used together | ||
| 1885 | * with IRQF_SHARED. As usb_hcd_irq() will always disable | ||
| 1886 | * interrupts we can remove it here. | ||
| 1887 | */ | ||
| 1888 | irqflags &= ~IRQF_DISABLED; | ||
| 1889 | |||
| 1863 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", | 1890 | snprintf(hcd->irq_descr, sizeof(hcd->irq_descr), "%s:usb%d", |
| 1864 | hcd->driver->description, hcd->self.busnum); | 1891 | hcd->driver->description, hcd->self.busnum); |
| 1865 | if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, | 1892 | if ((retval = request_irq(irqnum, &usb_hcd_irq, irqflags, |
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index a0bf5df6cb6f..b9de1569b39e 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h | |||
| @@ -210,6 +210,8 @@ struct hc_driver { | |||
| 210 | int (*bus_suspend)(struct usb_hcd *); | 210 | int (*bus_suspend)(struct usb_hcd *); |
| 211 | int (*bus_resume)(struct usb_hcd *); | 211 | int (*bus_resume)(struct usb_hcd *); |
| 212 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); | 212 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); |
| 213 | void (*hub_irq_enable)(struct usb_hcd *); | ||
| 214 | /* Needed only if port-change IRQs are level-triggered */ | ||
| 213 | 215 | ||
| 214 | /* force handover of high-speed port to full-speed companion */ | 216 | /* force handover of high-speed port to full-speed companion */ |
| 215 | void (*relinquish_port)(struct usb_hcd *, int); | 217 | void (*relinquish_port)(struct usb_hcd *, int); |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 94789be54ca3..4cfe32a16c37 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -713,18 +713,11 @@ static void hub_restart(struct usb_hub *hub, int type) | |||
| 713 | } | 713 | } |
| 714 | 714 | ||
| 715 | /* Was the power session lost while we were suspended? */ | 715 | /* Was the power session lost while we were suspended? */ |
| 716 | switch (type) { | 716 | status = hub_port_status(hub, port1, &portstatus, &portchange); |
| 717 | case HUB_RESET_RESUME: | ||
| 718 | portstatus = 0; | ||
| 719 | portchange = USB_PORT_STAT_C_CONNECTION; | ||
| 720 | break; | ||
| 721 | 717 | ||
| 722 | case HUB_RESET: | 718 | /* If the device is gone, khubd will handle it later */ |
| 723 | case HUB_RESUME: | 719 | if (status == 0 && !(portstatus & USB_PORT_STAT_CONNECTION)) |
| 724 | status = hub_port_status(hub, port1, | 720 | continue; |
| 725 | &portstatus, &portchange); | ||
| 726 | break; | ||
| 727 | } | ||
| 728 | 721 | ||
| 729 | /* For "USB_PERSIST"-enabled children we must | 722 | /* For "USB_PERSIST"-enabled children we must |
| 730 | * mark the child device for reset-resume and | 723 | * mark the child device for reset-resume and |
| @@ -2080,6 +2073,8 @@ int usb_port_resume(struct usb_device *udev) | |||
| 2080 | } | 2073 | } |
| 2081 | 2074 | ||
| 2082 | clear_bit(port1, hub->busy_bits); | 2075 | clear_bit(port1, hub->busy_bits); |
| 2076 | if (!hub->hdev->parent && !hub->busy_bits[0]) | ||
| 2077 | usb_enable_root_hub_irq(hub->hdev->bus); | ||
| 2083 | 2078 | ||
| 2084 | if (status == 0) | 2079 | if (status == 0) |
| 2085 | status = finish_port_resume(udev); | 2080 | status = finish_port_resume(udev); |
| @@ -3009,6 +3004,11 @@ static void hub_events(void) | |||
| 3009 | 3004 | ||
| 3010 | hub->activating = 0; | 3005 | hub->activating = 0; |
| 3011 | 3006 | ||
| 3007 | /* If this is a root hub, tell the HCD it's okay to | ||
| 3008 | * re-enable port-change interrupts now. */ | ||
| 3009 | if (!hdev->parent && !hub->busy_bits[0]) | ||
| 3010 | usb_enable_root_hub_irq(hdev->bus); | ||
| 3011 | |||
| 3012 | loop_autopm: | 3012 | loop_autopm: |
| 3013 | /* Allow autosuspend if we're not going to run again */ | 3013 | /* Allow autosuspend if we're not going to run again */ |
| 3014 | if (list_empty(&hub->event_list)) | 3014 | if (list_empty(&hub->event_list)) |
| @@ -3234,6 +3234,8 @@ int usb_reset_device(struct usb_device *udev) | |||
| 3234 | break; | 3234 | break; |
| 3235 | } | 3235 | } |
| 3236 | clear_bit(port1, parent_hub->busy_bits); | 3236 | clear_bit(port1, parent_hub->busy_bits); |
| 3237 | if (!parent_hdev->parent && !parent_hub->busy_bits[0]) | ||
| 3238 | usb_enable_root_hub_irq(parent_hdev->bus); | ||
| 3237 | 3239 | ||
| 3238 | if (ret < 0) | 3240 | if (ret < 0) |
| 3239 | goto re_enumerate; | 3241 | goto re_enumerate; |
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 35a03095757e..90245fd8bac4 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -177,6 +177,15 @@ timer_action_done (struct ehci_hcd *ehci, enum ehci_timer_action action) | |||
| 177 | static inline void | 177 | static inline void |
| 178 | timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) | 178 | timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) |
| 179 | { | 179 | { |
| 180 | /* Don't override timeouts which shrink or (later) disable | ||
| 181 | * the async ring; just the I/O watchdog. Note that if a | ||
| 182 | * SHRINK were pending, OFF would never be requested. | ||
| 183 | */ | ||
| 184 | if (timer_pending(&ehci->watchdog) | ||
| 185 | && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF)) | ||
| 186 | & ehci->actions)) | ||
| 187 | return; | ||
| 188 | |||
| 180 | if (!test_and_set_bit (action, &ehci->actions)) { | 189 | if (!test_and_set_bit (action, &ehci->actions)) { |
| 181 | unsigned long t; | 190 | unsigned long t; |
| 182 | 191 | ||
| @@ -192,15 +201,7 @@ timer_action (struct ehci_hcd *ehci, enum ehci_timer_action action) | |||
| 192 | t = EHCI_SHRINK_JIFFIES; | 201 | t = EHCI_SHRINK_JIFFIES; |
| 193 | break; | 202 | break; |
| 194 | } | 203 | } |
| 195 | t += jiffies; | 204 | mod_timer(&ehci->watchdog, t + jiffies); |
| 196 | // all timings except IAA watchdog can be overridden. | ||
| 197 | // async queue SHRINK often precedes IAA. while it's ready | ||
| 198 | // to go OFF neither can matter, and afterwards the IO | ||
| 199 | // watchdog stops unless there's still periodic traffic. | ||
| 200 | if (time_before_eq(t, ehci->watchdog.expires) | ||
| 201 | && timer_pending (&ehci->watchdog)) | ||
| 202 | return; | ||
| 203 | mod_timer (&ehci->watchdog, t); | ||
| 204 | } | 205 | } |
| 205 | } | 206 | } |
| 206 | 207 | ||
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index c96db1153dcf..e534f9de0f05 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -261,6 +261,7 @@ static const struct hc_driver ohci_at91_hc_driver = { | |||
| 261 | */ | 261 | */ |
| 262 | .hub_status_data = ohci_hub_status_data, | 262 | .hub_status_data = ohci_hub_status_data, |
| 263 | .hub_control = ohci_hub_control, | 263 | .hub_control = ohci_hub_control, |
| 264 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 264 | #ifdef CONFIG_PM | 265 | #ifdef CONFIG_PM |
| 265 | .bus_suspend = ohci_bus_suspend, | 266 | .bus_suspend = ohci_bus_suspend, |
| 266 | .bus_resume = ohci_bus_resume, | 267 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index 1b9abdba920b..f90fe0c7373f 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
| @@ -288,6 +288,7 @@ static const struct hc_driver ohci_au1xxx_hc_driver = { | |||
| 288 | */ | 288 | */ |
| 289 | .hub_status_data = ohci_hub_status_data, | 289 | .hub_status_data = ohci_hub_status_data, |
| 290 | .hub_control = ohci_hub_control, | 290 | .hub_control = ohci_hub_control, |
| 291 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 291 | #ifdef CONFIG_PM | 292 | #ifdef CONFIG_PM |
| 292 | .bus_suspend = ohci_bus_suspend, | 293 | .bus_suspend = ohci_bus_suspend, |
| 293 | .bus_resume = ohci_bus_resume, | 294 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 06aadfb0ec29..5adaf36e47d0 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
| @@ -135,6 +135,7 @@ static struct hc_driver ohci_ep93xx_hc_driver = { | |||
| 135 | .get_frame_number = ohci_get_frame, | 135 | .get_frame_number = ohci_get_frame, |
| 136 | .hub_status_data = ohci_hub_status_data, | 136 | .hub_status_data = ohci_hub_status_data, |
| 137 | .hub_control = ohci_hub_control, | 137 | .hub_control = ohci_hub_control, |
| 138 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 138 | #ifdef CONFIG_PM | 139 | #ifdef CONFIG_PM |
| 139 | .bus_suspend = ohci_bus_suspend, | 140 | .bus_suspend = ohci_bus_suspend, |
| 140 | .bus_resume = ohci_bus_resume, | 141 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 33f1c1c32edf..a8160d65f32b 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -1054,7 +1054,7 @@ MODULE_LICENSE ("GPL"); | |||
| 1054 | 1054 | ||
| 1055 | #ifdef CONFIG_MFD_SM501 | 1055 | #ifdef CONFIG_MFD_SM501 |
| 1056 | #include "ohci-sm501.c" | 1056 | #include "ohci-sm501.c" |
| 1057 | #define PLATFORM_DRIVER ohci_hcd_sm501_driver | 1057 | #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver |
| 1058 | #endif | 1058 | #endif |
| 1059 | 1059 | ||
| 1060 | #if !defined(PCI_DRIVER) && \ | 1060 | #if !defined(PCI_DRIVER) && \ |
| @@ -1062,6 +1062,7 @@ MODULE_LICENSE ("GPL"); | |||
| 1062 | !defined(OF_PLATFORM_DRIVER) && \ | 1062 | !defined(OF_PLATFORM_DRIVER) && \ |
| 1063 | !defined(SA1111_DRIVER) && \ | 1063 | !defined(SA1111_DRIVER) && \ |
| 1064 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ | 1064 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ |
| 1065 | !defined(SM501_OHCI_DRIVER) && \ | ||
| 1065 | !defined(SSB_OHCI_DRIVER) | 1066 | !defined(SSB_OHCI_DRIVER) |
| 1066 | #error "missing bus glue for ohci-hcd" | 1067 | #error "missing bus glue for ohci-hcd" |
| 1067 | #endif | 1068 | #endif |
| @@ -1121,9 +1122,18 @@ static int __init ohci_hcd_mod_init(void) | |||
| 1121 | goto error_ssb; | 1122 | goto error_ssb; |
| 1122 | #endif | 1123 | #endif |
| 1123 | 1124 | ||
| 1125 | #ifdef SM501_OHCI_DRIVER | ||
| 1126 | retval = platform_driver_register(&SM501_OHCI_DRIVER); | ||
| 1127 | if (retval < 0) | ||
| 1128 | goto error_sm501; | ||
| 1129 | #endif | ||
| 1130 | |||
| 1124 | return retval; | 1131 | return retval; |
| 1125 | 1132 | ||
| 1126 | /* Error path */ | 1133 | /* Error path */ |
| 1134 | #ifdef SM501_OHCI_DRIVER | ||
| 1135 | error_sm501: | ||
| 1136 | #endif | ||
| 1127 | #ifdef SSB_OHCI_DRIVER | 1137 | #ifdef SSB_OHCI_DRIVER |
| 1128 | error_ssb: | 1138 | error_ssb: |
| 1129 | #endif | 1139 | #endif |
| @@ -1159,6 +1169,9 @@ module_init(ohci_hcd_mod_init); | |||
| 1159 | 1169 | ||
| 1160 | static void __exit ohci_hcd_mod_exit(void) | 1170 | static void __exit ohci_hcd_mod_exit(void) |
| 1161 | { | 1171 | { |
| 1172 | #ifdef SM501_OHCI_DRIVER | ||
| 1173 | platform_driver_unregister(&SM501_OHCI_DRIVER); | ||
| 1174 | #endif | ||
| 1162 | #ifdef SSB_OHCI_DRIVER | 1175 | #ifdef SSB_OHCI_DRIVER |
| 1163 | ssb_driver_unregister(&SSB_OHCI_DRIVER); | 1176 | ssb_driver_unregister(&SSB_OHCI_DRIVER); |
| 1164 | #endif | 1177 | #endif |
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 79a78029f896..b56739221d11 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
| @@ -36,6 +36,18 @@ | |||
| 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 | |||
| 39 | #define OHCI_SCHED_ENABLES \ | 51 | #define OHCI_SCHED_ENABLES \ |
| 40 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) | 52 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) |
| 41 | 53 | ||
| @@ -362,28 +374,18 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 362 | int any_connected) | 374 | int any_connected) |
| 363 | { | 375 | { |
| 364 | int poll_rh = 1; | 376 | int poll_rh = 1; |
| 365 | int rhsc; | ||
| 366 | 377 | ||
| 367 | rhsc = ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC; | ||
| 368 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { | 378 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { |
| 369 | 379 | ||
| 370 | case OHCI_USB_OPER: | 380 | case OHCI_USB_OPER: |
| 371 | /* If no status changes are pending, enable status-change | 381 | /* keep on polling until we know a device is connected |
| 372 | * interrupts. | 382 | * and RHSC is enabled */ |
| 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 | */ | ||
| 382 | if (!ohci->autostop) { | 383 | if (!ohci->autostop) { |
| 383 | if (any_connected || | 384 | if (any_connected || |
| 384 | !device_may_wakeup(&ohci_to_hcd(ohci) | 385 | !device_may_wakeup(&ohci_to_hcd(ohci) |
| 385 | ->self.root_hub->dev)) { | 386 | ->self.root_hub->dev)) { |
| 386 | if (rhsc) | 387 | if (ohci_readl(ohci, &ohci->regs->intrenable) & |
| 388 | OHCI_INTR_RHSC) | ||
| 387 | poll_rh = 0; | 389 | poll_rh = 0; |
| 388 | } else { | 390 | } else { |
| 389 | ohci->autostop = 1; | 391 | ohci->autostop = 1; |
| @@ -396,13 +398,12 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 396 | ohci->autostop = 0; | 398 | ohci->autostop = 0; |
| 397 | ohci->next_statechange = jiffies + | 399 | ohci->next_statechange = jiffies + |
| 398 | STATECHANGE_DELAY; | 400 | STATECHANGE_DELAY; |
| 399 | } else if (rhsc && time_after_eq(jiffies, | 401 | } else if (time_after_eq(jiffies, |
| 400 | ohci->next_statechange) | 402 | ohci->next_statechange) |
| 401 | && !ohci->ed_rm_list | 403 | && !ohci->ed_rm_list |
| 402 | && !(ohci->hc_control & | 404 | && !(ohci->hc_control & |
| 403 | OHCI_SCHED_ENABLES)) { | 405 | OHCI_SCHED_ENABLES)) { |
| 404 | ohci_rh_suspend(ohci, 1); | 406 | ohci_rh_suspend(ohci, 1); |
| 405 | poll_rh = 0; | ||
| 406 | } | 407 | } |
| 407 | } | 408 | } |
| 408 | break; | 409 | break; |
| @@ -416,12 +417,6 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 416 | else | 417 | else |
| 417 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); | 418 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); |
| 418 | } else { | 419 | } 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 | |||
| 425 | /* everything is idle, no need for polling */ | 420 | /* everything is idle, no need for polling */ |
| 426 | poll_rh = 0; | 421 | poll_rh = 0; |
| 427 | } | 422 | } |
| @@ -443,16 +438,12 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci) | |||
| 443 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | 438 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, |
| 444 | int any_connected) | 439 | int any_connected) |
| 445 | { | 440 | { |
| 446 | /* If RHSC is enabled, don't poll */ | 441 | int poll_rh = 1; |
| 447 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) | ||
| 448 | return 0; | ||
| 449 | 442 | ||
| 450 | /* If no status changes are pending, enable status-change interrupts */ | 443 | /* keep on polling until RHSC is enabled */ |
| 451 | if (!changed) { | 444 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) |
| 452 | ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable); | 445 | poll_rh = 0; |
| 453 | return 0; | 446 | return poll_rh; |
| 454 | } | ||
| 455 | return 1; | ||
| 456 | } | 447 | } |
| 457 | 448 | ||
| 458 | #endif /* CONFIG_PM */ | 449 | #endif /* CONFIG_PM */ |
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 96d14fa1d833..13c12ed22252 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
| @@ -193,6 +193,7 @@ 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, | ||
| 196 | #ifdef CONFIG_PM | 197 | #ifdef CONFIG_PM |
| 197 | .bus_suspend = ohci_bus_suspend, | 198 | .bus_suspend = ohci_bus_suspend, |
| 198 | .bus_resume = ohci_bus_resume, | 199 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 6859fb5f1d6f..3a7c24c03671 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
| @@ -466,6 +466,7 @@ static const struct hc_driver ohci_omap_hc_driver = { | |||
| 466 | */ | 466 | */ |
| 467 | .hub_status_data = ohci_hub_status_data, | 467 | .hub_status_data = ohci_hub_status_data, |
| 468 | .hub_control = ohci_hub_control, | 468 | .hub_control = ohci_hub_control, |
| 469 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 469 | #ifdef CONFIG_PM | 470 | #ifdef CONFIG_PM |
| 470 | .bus_suspend = ohci_bus_suspend, | 471 | .bus_suspend = ohci_bus_suspend, |
| 471 | .bus_resume = ohci_bus_resume, | 472 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 3bf175d95a23..4696cc912e16 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -327,6 +327,7 @@ static const struct hc_driver ohci_pci_hc_driver = { | |||
| 327 | */ | 327 | */ |
| 328 | .hub_status_data = ohci_hub_status_data, | 328 | .hub_status_data = ohci_hub_status_data, |
| 329 | .hub_control = ohci_hub_control, | 329 | .hub_control = ohci_hub_control, |
| 330 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 330 | #ifdef CONFIG_PM | 331 | #ifdef CONFIG_PM |
| 331 | .bus_suspend = ohci_bus_suspend, | 332 | .bus_suspend = ohci_bus_suspend, |
| 332 | .bus_resume = ohci_bus_resume, | 333 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 664f07ee8732..28b458f20cc3 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
| @@ -280,6 +280,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = { | |||
| 280 | */ | 280 | */ |
| 281 | .hub_status_data = ohci_hub_status_data, | 281 | .hub_status_data = ohci_hub_status_data, |
| 282 | .hub_control = ohci_hub_control, | 282 | .hub_control = ohci_hub_control, |
| 283 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 283 | #ifdef CONFIG_PM | 284 | #ifdef CONFIG_PM |
| 284 | .bus_suspend = ohci_bus_suspend, | 285 | .bus_suspend = ohci_bus_suspend, |
| 285 | .bus_resume = ohci_bus_resume, | 286 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c index 28467e288a93..605d59cba28e 100644 --- a/drivers/usb/host/ohci-pnx8550.c +++ b/drivers/usb/host/ohci-pnx8550.c | |||
| @@ -201,6 +201,7 @@ 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, | ||
| 204 | #ifdef CONFIG_PM | 205 | #ifdef CONFIG_PM |
| 205 | .bus_suspend = ohci_bus_suspend, | 206 | .bus_suspend = ohci_bus_suspend, |
| 206 | .bus_resume = ohci_bus_resume, | 207 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 50e55db13636..a67252791223 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
| @@ -72,6 +72,7 @@ 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, | ||
| 75 | #ifdef CONFIG_PM | 76 | #ifdef CONFIG_PM |
| 76 | .bus_suspend = ohci_bus_suspend, | 77 | .bus_suspend = ohci_bus_suspend, |
| 77 | .bus_resume = ohci_bus_resume, | 78 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index cd3398b675b2..523c30125577 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
| @@ -172,6 +172,7 @@ 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, | ||
| 175 | #ifdef CONFIG_PM | 176 | #ifdef CONFIG_PM |
| 176 | .bus_suspend = ohci_bus_suspend, | 177 | .bus_suspend = ohci_bus_suspend, |
| 177 | .bus_resume = ohci_bus_resume, | 178 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index bfdeb0d22d05..c1935ae537f8 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
| @@ -68,6 +68,7 @@ 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, | ||
| 71 | .start_port_reset = ohci_start_port_reset, | 72 | .start_port_reset = ohci_start_port_reset, |
| 72 | #if defined(CONFIG_PM) | 73 | #if defined(CONFIG_PM) |
| 73 | .bus_suspend = ohci_bus_suspend, | 74 | .bus_suspend = ohci_bus_suspend, |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 70b0d4b459e7..d4ee27d92be8 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -298,6 +298,7 @@ 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, | ||
| 301 | #ifdef CONFIG_PM | 302 | #ifdef CONFIG_PM |
| 302 | .bus_suspend = ohci_bus_suspend, | 303 | .bus_suspend = ohci_bus_suspend, |
| 303 | .bus_resume = ohci_bus_resume, | 304 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index 9c9f3b59186f..9b547407c934 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
| @@ -952,6 +952,7 @@ rescan_this: | |||
| 952 | struct urb *urb; | 952 | struct urb *urb; |
| 953 | urb_priv_t *urb_priv; | 953 | urb_priv_t *urb_priv; |
| 954 | __hc32 savebits; | 954 | __hc32 savebits; |
| 955 | u32 tdINFO; | ||
| 955 | 956 | ||
| 956 | td = list_entry (entry, struct td, td_list); | 957 | td = list_entry (entry, struct td, td_list); |
| 957 | urb = td->urb; | 958 | urb = td->urb; |
| @@ -966,6 +967,17 @@ rescan_this: | |||
| 966 | savebits = *prev & ~cpu_to_hc32 (ohci, TD_MASK); | 967 | savebits = *prev & ~cpu_to_hc32 (ohci, TD_MASK); |
| 967 | *prev = td->hwNextTD | savebits; | 968 | *prev = td->hwNextTD | savebits; |
| 968 | 969 | ||
| 970 | /* If this was unlinked, the TD may not have been | ||
| 971 | * retired ... so manually save the data toggle. | ||
| 972 | * The controller ignores the value we save for | ||
| 973 | * control and ISO endpoints. | ||
| 974 | */ | ||
| 975 | tdINFO = hc32_to_cpup(ohci, &td->hwINFO); | ||
| 976 | if ((tdINFO & TD_T) == TD_T_DATA0) | ||
| 977 | ed->hwHeadP &= ~cpu_to_hc32(ohci, ED_C); | ||
| 978 | else if ((tdINFO & TD_T) == TD_T_DATA1) | ||
| 979 | ed->hwHeadP |= cpu_to_hc32(ohci, ED_C); | ||
| 980 | |||
| 969 | /* HC may have partly processed this TD */ | 981 | /* HC may have partly processed this TD */ |
| 970 | td_done (ohci, urb, td); | 982 | td_done (ohci, urb, td); |
| 971 | urb_priv->td_cnt++; | 983 | urb_priv->td_cnt++; |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index a73d2ff322e2..ead4772f0f27 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
| @@ -466,6 +466,7 @@ 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, | ||
| 469 | #ifdef CONFIG_PM | 470 | #ifdef CONFIG_PM |
| 470 | .bus_suspend = ohci_bus_suspend, | 471 | .bus_suspend = ohci_bus_suspend, |
| 471 | .bus_resume = ohci_bus_resume, | 472 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 99438c65981b..0f48f2d99226 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c | |||
| @@ -231,6 +231,7 @@ 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, | ||
| 234 | #ifdef CONFIG_PM | 235 | #ifdef CONFIG_PM |
| 235 | .bus_suspend = ohci_bus_suspend, | 236 | .bus_suspend = ohci_bus_suspend, |
| 236 | .bus_resume = ohci_bus_resume, | 237 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 60f03cc7ec4f..e7ee607278fe 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
| @@ -68,6 +68,7 @@ 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, | ||
| 71 | #ifdef CONFIG_PM | 72 | #ifdef CONFIG_PM |
| 72 | .bus_suspend = ohci_bus_suspend, | 73 | .bus_suspend = ohci_bus_suspend, |
| 73 | .bus_resume = ohci_bus_resume, | 74 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index e899a77dfb83..e610698c6b60 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
| @@ -75,6 +75,7 @@ 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, | ||
| 78 | #ifdef CONFIG_PM | 79 | #ifdef CONFIG_PM |
| 79 | .bus_suspend = ohci_bus_suspend, | 80 | .bus_suspend = ohci_bus_suspend, |
| 80 | .bus_resume = ohci_bus_resume, | 81 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index c4265caec780..7275186db315 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
| @@ -81,6 +81,7 @@ 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, | ||
| 84 | #ifdef CONFIG_PM | 85 | #ifdef CONFIG_PM |
| 85 | .bus_suspend = ohci_bus_suspend, | 86 | .bus_suspend = ohci_bus_suspend, |
| 86 | .bus_resume = ohci_bus_resume, | 87 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index f29307405bb3..9b6323f768b2 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
| @@ -2934,6 +2934,16 @@ 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 | |||
| 2937 | 2947 | ||
| 2938 | #ifdef CONFIG_PM | 2948 | #ifdef CONFIG_PM |
| 2939 | static int u132_bus_suspend(struct usb_hcd *hcd) | 2949 | static int u132_bus_suspend(struct usb_hcd *hcd) |
| @@ -2985,6 +2995,7 @@ static struct hc_driver u132_hc_driver = { | |||
| 2985 | .bus_suspend = u132_bus_suspend, | 2995 | .bus_suspend = u132_bus_suspend, |
| 2986 | .bus_resume = u132_bus_resume, | 2996 | .bus_resume = u132_bus_resume, |
| 2987 | .start_port_reset = u132_start_port_reset, | 2997 | .start_port_reset = u132_start_port_reset, |
| 2998 | .hub_irq_enable = u132_hub_irq_enable, | ||
| 2988 | }; | 2999 | }; |
| 2989 | 3000 | ||
| 2990 | /* | 3001 | /* |
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c index cb7fa0eaf3ae..33182f4c2267 100644 --- a/drivers/usb/misc/sisusbvga/sisusb.c +++ b/drivers/usb/misc/sisusbvga/sisusb.c | |||
| @@ -3264,8 +3264,6 @@ static void sisusb_disconnect(struct usb_interface *intf) | |||
| 3264 | 3264 | ||
| 3265 | /* decrement our usage count */ | 3265 | /* decrement our usage count */ |
| 3266 | kref_put(&sisusb->kref, sisusb_delete); | 3266 | kref_put(&sisusb->kref, sisusb_delete); |
| 3267 | |||
| 3268 | dev_info(&sisusb->sisusb_dev->dev, "Disconnected\n"); | ||
| 3269 | } | 3267 | } |
| 3270 | 3268 | ||
| 3271 | static struct usb_device_id sisusb_table [] = { | 3269 | static struct usb_device_id sisusb_table [] = { |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 5234e7a3bd2c..0ff4a3971e45 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -637,6 +637,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 637 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), | 637 | { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID), |
| 638 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 638 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 639 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, | 639 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, |
| 640 | { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, | ||
| 640 | { }, /* Optional parameter entry */ | 641 | { }, /* Optional parameter entry */ |
| 641 | { } /* Terminating entry */ | 642 | { } /* Terminating entry */ |
| 642 | }; | 643 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 06e0ecabb3eb..8302eca893ea 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -828,6 +828,9 @@ | |||
| 828 | /* Propox devices */ | 828 | /* Propox devices */ |
| 829 | #define FTDI_PROPOX_JTAGCABLEII_PID 0xD738 | 829 | #define FTDI_PROPOX_JTAGCABLEII_PID 0xD738 |
| 830 | 830 | ||
| 831 | /* Rig Expert Ukraine devices */ | ||
| 832 | #define FTDI_REU_TINY_PID 0xED22 /* RigExpert Tiny */ | ||
| 833 | |||
| 831 | /* Commands */ | 834 | /* Commands */ |
| 832 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 835 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
| 833 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 836 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index ea924dc48496..d9fb3768a2d7 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
| @@ -570,7 +570,12 @@ static struct usb_serial_driver ipaq_device = { | |||
| 570 | .description = "PocketPC PDA", | 570 | .description = "PocketPC PDA", |
| 571 | .usb_driver = &ipaq_driver, | 571 | .usb_driver = &ipaq_driver, |
| 572 | .id_table = ipaq_id_table, | 572 | .id_table = ipaq_id_table, |
| 573 | .num_ports = 2, | 573 | /* |
| 574 | * some devices have an extra endpoint, which | ||
| 575 | * must be ignored as it would make the core | ||
| 576 | * create a second port which oopses when used | ||
| 577 | */ | ||
| 578 | .num_ports = 1, | ||
| 574 | .open = ipaq_open, | 579 | .open = ipaq_open, |
| 575 | .close = ipaq_close, | 580 | .close = ipaq_close, |
| 576 | .attach = ipaq_startup, | 581 | .attach = ipaq_startup, |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 43cfde83a93b..a73420dd052a 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -306,6 +306,7 @@ static struct usb_device_id option_ids[] = { | |||
| 306 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, | 306 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, |
| 307 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, | 307 | { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, |
| 308 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, | 308 | { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) }, |
| 309 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */ | ||
| 309 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | 310 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ |
| 310 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ | 311 | { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ |
| 311 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, | 312 | { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 103195abd417..2a0dd1b50dc4 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -57,6 +57,7 @@ static struct usb_device_id id_table [] = { | |||
| 57 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) }, | 57 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) }, |
| 58 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, | 58 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) }, |
| 59 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) }, | 59 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) }, |
| 60 | { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_GPRS) }, | ||
| 60 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, | 61 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) }, |
| 61 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, | 62 | { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) }, |
| 62 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, | 63 | { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) }, |
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h index cff160abb130..6ac3bbcf7a22 100644 --- a/drivers/usb/serial/pl2303.h +++ b/drivers/usb/serial/pl2303.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2 | 15 | #define PL2303_PRODUCT_ID_RSAQ3 0xaaa2 |
| 16 | #define PL2303_PRODUCT_ID_ALDIGA 0x0611 | 16 | #define PL2303_PRODUCT_ID_ALDIGA 0x0611 |
| 17 | #define PL2303_PRODUCT_ID_MMX 0x0612 | 17 | #define PL2303_PRODUCT_ID_MMX 0x0612 |
| 18 | #define PL2303_PRODUCT_ID_GPRS 0x0609 | ||
| 18 | 19 | ||
| 19 | #define ATEN_VENDOR_ID 0x0557 | 20 | #define ATEN_VENDOR_ID 0x0557 |
| 20 | #define ATEN_VENDOR_ID2 0x0547 | 21 | #define ATEN_VENDOR_ID2 0x0547 |
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 45fe3663fa7f..39a7c11795c4 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -402,11 +402,19 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100, | |||
| 402 | US_FL_IGNORE_RESIDUE ), | 402 | US_FL_IGNORE_RESIDUE ), |
| 403 | 403 | ||
| 404 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB | 404 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB |
| 405 | /* CY7C68300 : support atacb */ | ||
| 405 | UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999, | 406 | UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999, |
| 406 | "Cypress", | 407 | "Cypress", |
| 407 | "Cypress AT2LP", | 408 | "Cypress AT2LP", |
| 408 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, | 409 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, |
| 409 | 0), | 410 | 0), |
| 411 | |||
| 412 | /* CY7C68310 : support atacb and atacb2 */ | ||
| 413 | UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, | ||
| 414 | "Cypress", | ||
| 415 | "Cypress ISD-300LP", | ||
| 416 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, | ||
| 417 | 0), | ||
| 410 | #endif | 418 | #endif |
| 411 | 419 | ||
| 412 | /* Reported by Simon Levitt <simon@whattf.com> | 420 | /* Reported by Simon Levitt <simon@whattf.com> |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 002b61b4f0f6..e0c5f96b273d 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1825,12 +1825,13 @@ config FB_FSL_DIU | |||
| 1825 | 1825 | ||
| 1826 | config FB_W100 | 1826 | config FB_W100 |
| 1827 | tristate "W100 frame buffer support" | 1827 | tristate "W100 frame buffer support" |
| 1828 | depends on FB && PXA_SHARPSL | 1828 | depends on FB && ARCH_PXA |
| 1829 | select FB_CFB_FILLRECT | 1829 | select FB_CFB_FILLRECT |
| 1830 | select FB_CFB_COPYAREA | 1830 | select FB_CFB_COPYAREA |
| 1831 | select FB_CFB_IMAGEBLIT | 1831 | select FB_CFB_IMAGEBLIT |
| 1832 | ---help--- | 1832 | ---help--- |
| 1833 | Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. | 1833 | Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. |
| 1834 | It can also drive the w3220 chip found on iPAQ hx4700. | ||
| 1834 | 1835 | ||
| 1835 | This driver is also available as a module ( = code which can be | 1836 | This driver is also available as a module ( = code which can be |
| 1836 | inserted and removed from the running kernel whenever you want). The | 1837 | inserted and removed from the running kernel whenever you want). The |
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index 0a2785361ca3..712dabc6269f 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c | |||
| @@ -286,7 +286,7 @@ static struct diu_pool pool; | |||
| 286 | * rheap and make the furture large allocation fail. | 286 | * rheap and make the furture large allocation fail. |
| 287 | */ | 287 | */ |
| 288 | 288 | ||
| 289 | void *fsl_diu_alloc(unsigned long size, phys_addr_t *phys) | 289 | static void *fsl_diu_alloc(unsigned long size, phys_addr_t *phys) |
| 290 | { | 290 | { |
| 291 | void *virt; | 291 | void *virt; |
| 292 | 292 | ||
| @@ -311,12 +311,12 @@ void *fsl_diu_alloc(unsigned long size, phys_addr_t *phys) | |||
| 311 | memset(virt, 0, size); | 311 | memset(virt, 0, size); |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | pr_debug("rh virt=%p phys=%lx\n", virt, *phys); | 314 | pr_debug("rh virt=%p phys=%llx\n", virt, (unsigned long long)*phys); |
| 315 | 315 | ||
| 316 | return virt; | 316 | return virt; |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | void fsl_diu_free(void *p, unsigned long size) | 319 | static void fsl_diu_free(void *p, unsigned long size) |
| 320 | { | 320 | { |
| 321 | pr_debug("p=%p size=%lu\n", p, size); | 321 | pr_debug("p=%p size=%lu\n", p, size); |
| 322 | 322 | ||
| @@ -770,7 +770,7 @@ static int map_video_memory(struct fb_info *info) | |||
| 770 | info->fix.smem_len = info->fix.line_length * info->var.yres_virtual; | 770 | info->fix.smem_len = info->fix.line_length * info->var.yres_virtual; |
| 771 | pr_debug("MAP_VIDEO_MEMORY: smem_len = %d\n", info->fix.smem_len); | 771 | pr_debug("MAP_VIDEO_MEMORY: smem_len = %d\n", info->fix.smem_len); |
| 772 | info->screen_base = fsl_diu_alloc(info->fix.smem_len, &phys); | 772 | info->screen_base = fsl_diu_alloc(info->fix.smem_len, &phys); |
| 773 | if (info->screen_base == 0) { | 773 | if (info->screen_base == NULL) { |
| 774 | printk(KERN_ERR "Unable to allocate fb memory\n"); | 774 | printk(KERN_ERR "Unable to allocate fb memory\n"); |
| 775 | return -ENOMEM; | 775 | return -ENOMEM; |
| 776 | } | 776 | } |
| @@ -788,7 +788,7 @@ static int map_video_memory(struct fb_info *info) | |||
| 788 | static void unmap_video_memory(struct fb_info *info) | 788 | static void unmap_video_memory(struct fb_info *info) |
| 789 | { | 789 | { |
| 790 | fsl_diu_free(info->screen_base, info->fix.smem_len); | 790 | fsl_diu_free(info->screen_base, info->fix.smem_len); |
| 791 | info->screen_base = 0; | 791 | info->screen_base = NULL; |
| 792 | info->fix.smem_start = 0; | 792 | info->fix.smem_start = 0; |
| 793 | info->fix.smem_len = 0; | 793 | info->fix.smem_len = 0; |
| 794 | } | 794 | } |
| @@ -1158,7 +1158,7 @@ static int init_fbinfo(struct fb_info *info) | |||
| 1158 | return 0; | 1158 | return 0; |
| 1159 | } | 1159 | } |
| 1160 | 1160 | ||
| 1161 | static int install_fb(struct fb_info *info) | 1161 | static int __devinit install_fb(struct fb_info *info) |
| 1162 | { | 1162 | { |
| 1163 | int rc; | 1163 | int rc; |
| 1164 | struct mfb_info *mfbi = info->par; | 1164 | struct mfb_info *mfbi = info->par; |
| @@ -1233,7 +1233,7 @@ static int install_fb(struct fb_info *info) | |||
| 1233 | return 0; | 1233 | return 0; |
| 1234 | } | 1234 | } |
| 1235 | 1235 | ||
| 1236 | static void __exit uninstall_fb(struct fb_info *info) | 1236 | static void uninstall_fb(struct fb_info *info) |
| 1237 | { | 1237 | { |
| 1238 | struct mfb_info *mfbi = info->par; | 1238 | struct mfb_info *mfbi = info->par; |
| 1239 | 1239 | ||
| @@ -1287,7 +1287,7 @@ static int request_irq_local(int irq) | |||
| 1287 | /* Read to clear the status */ | 1287 | /* Read to clear the status */ |
| 1288 | status = in_be32(&hw->int_status); | 1288 | status = in_be32(&hw->int_status); |
| 1289 | 1289 | ||
| 1290 | ret = request_irq(irq, fsl_diu_isr, 0, "diu", 0); | 1290 | ret = request_irq(irq, fsl_diu_isr, 0, "diu", NULL); |
| 1291 | if (ret) | 1291 | if (ret) |
| 1292 | pr_info("Request diu IRQ failed.\n"); | 1292 | pr_info("Request diu IRQ failed.\n"); |
| 1293 | else { | 1293 | else { |
| @@ -1312,7 +1312,7 @@ static void free_irq_local(int irq) | |||
| 1312 | /* Disable all LCDC interrupt */ | 1312 | /* Disable all LCDC interrupt */ |
| 1313 | out_be32(&hw->int_mask, 0x1f); | 1313 | out_be32(&hw->int_mask, 0x1f); |
| 1314 | 1314 | ||
| 1315 | free_irq(irq, 0); | 1315 | free_irq(irq, NULL); |
| 1316 | } | 1316 | } |
| 1317 | 1317 | ||
| 1318 | #ifdef CONFIG_PM | 1318 | #ifdef CONFIG_PM |
| @@ -1324,7 +1324,7 @@ static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state) | |||
| 1324 | { | 1324 | { |
| 1325 | struct fsl_diu_data *machine_data; | 1325 | struct fsl_diu_data *machine_data; |
| 1326 | 1326 | ||
| 1327 | machine_data = dev_get_drvdata(&ofdev->dev); | 1327 | machine_data = dev_get_drvdata(&dev->dev); |
| 1328 | disable_lcdc(machine_data->fsl_diu_info[0]); | 1328 | disable_lcdc(machine_data->fsl_diu_info[0]); |
| 1329 | 1329 | ||
| 1330 | return 0; | 1330 | return 0; |
| @@ -1334,7 +1334,7 @@ static int fsl_diu_resume(struct of_device *ofdev) | |||
| 1334 | { | 1334 | { |
| 1335 | struct fsl_diu_data *machine_data; | 1335 | struct fsl_diu_data *machine_data; |
| 1336 | 1336 | ||
| 1337 | machine_data = dev_get_drvdata(&ofdev->dev); | 1337 | machine_data = dev_get_drvdata(&dev->dev); |
| 1338 | enable_lcdc(machine_data->fsl_diu_info[0]); | 1338 | enable_lcdc(machine_data->fsl_diu_info[0]); |
| 1339 | 1339 | ||
| 1340 | return 0; | 1340 | return 0; |
| @@ -1353,7 +1353,8 @@ static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align) | |||
| 1353 | dma_addr_t paddr = 0; | 1353 | dma_addr_t paddr = 0; |
| 1354 | 1354 | ||
| 1355 | ssize = size + bytes_align; | 1355 | ssize = size + bytes_align; |
| 1356 | buf->vaddr = dma_alloc_coherent(0, ssize, &paddr, GFP_DMA | __GFP_ZERO); | 1356 | buf->vaddr = dma_alloc_coherent(NULL, ssize, &paddr, GFP_DMA | |
| 1357 | __GFP_ZERO); | ||
| 1357 | if (!buf->vaddr) | 1358 | if (!buf->vaddr) |
| 1358 | return -ENOMEM; | 1359 | return -ENOMEM; |
| 1359 | 1360 | ||
| @@ -1371,7 +1372,7 @@ static int allocate_buf(struct diu_addr *buf, u32 size, u32 bytes_align) | |||
| 1371 | 1372 | ||
| 1372 | static void free_buf(struct diu_addr *buf, u32 size, u32 bytes_align) | 1373 | static void free_buf(struct diu_addr *buf, u32 size, u32 bytes_align) |
| 1373 | { | 1374 | { |
| 1374 | dma_free_coherent(0, size + bytes_align, | 1375 | dma_free_coherent(NULL, size + bytes_align, |
| 1375 | buf->vaddr, (buf->paddr - buf->offset)); | 1376 | buf->vaddr, (buf->paddr - buf->offset)); |
| 1376 | return; | 1377 | return; |
| 1377 | } | 1378 | } |
| @@ -1411,7 +1412,7 @@ static ssize_t show_monitor(struct device *device, | |||
| 1411 | return diu_ops.show_monitor_port(machine_data->monitor_port, buf); | 1412 | return diu_ops.show_monitor_port(machine_data->monitor_port, buf); |
| 1412 | } | 1413 | } |
| 1413 | 1414 | ||
| 1414 | static int fsl_diu_probe(struct of_device *ofdev, | 1415 | static int __devinit fsl_diu_probe(struct of_device *ofdev, |
| 1415 | const struct of_device_id *match) | 1416 | const struct of_device_id *match) |
| 1416 | { | 1417 | { |
| 1417 | struct device_node *np = ofdev->node; | 1418 | struct device_node *np = ofdev->node; |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 7dcda187d9ba..fafe7db20d6d 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -1246,7 +1246,7 @@ static int pxafb_resume(struct platform_device *dev) | |||
| 1246 | * cache. Once this area is remapped, all virtual memory | 1246 | * cache. Once this area is remapped, all virtual memory |
| 1247 | * access to the video memory should occur at the new region. | 1247 | * access to the video memory should occur at the new region. |
| 1248 | */ | 1248 | */ |
| 1249 | static int __init pxafb_map_video_memory(struct pxafb_info *fbi) | 1249 | static int __devinit pxafb_map_video_memory(struct pxafb_info *fbi) |
| 1250 | { | 1250 | { |
| 1251 | /* | 1251 | /* |
| 1252 | * We reserve one page for the palette, plus the size | 1252 | * We reserve one page for the palette, plus the size |
| @@ -1348,7 +1348,7 @@ decode_mode: | |||
| 1348 | pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes); | 1348 | pxafb_decode_mode_info(fbi, inf->modes, inf->num_modes); |
| 1349 | } | 1349 | } |
| 1350 | 1350 | ||
| 1351 | static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev) | 1351 | static struct pxafb_info * __devinit pxafb_init_fbinfo(struct device *dev) |
| 1352 | { | 1352 | { |
| 1353 | struct pxafb_info *fbi; | 1353 | struct pxafb_info *fbi; |
| 1354 | void *addr; | 1354 | void *addr; |
| @@ -1410,7 +1410,7 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev) | |||
| 1410 | } | 1410 | } |
| 1411 | 1411 | ||
| 1412 | #ifdef CONFIG_FB_PXA_PARAMETERS | 1412 | #ifdef CONFIG_FB_PXA_PARAMETERS |
| 1413 | static int __init parse_opt_mode(struct device *dev, const char *this_opt) | 1413 | static int __devinit parse_opt_mode(struct device *dev, const char *this_opt) |
| 1414 | { | 1414 | { |
| 1415 | struct pxafb_mach_info *inf = dev->platform_data; | 1415 | struct pxafb_mach_info *inf = dev->platform_data; |
| 1416 | 1416 | ||
| @@ -1469,7 +1469,7 @@ done: | |||
| 1469 | return 0; | 1469 | return 0; |
| 1470 | } | 1470 | } |
| 1471 | 1471 | ||
| 1472 | static int __init parse_opt(struct device *dev, char *this_opt) | 1472 | static int __devinit parse_opt(struct device *dev, char *this_opt) |
| 1473 | { | 1473 | { |
| 1474 | struct pxafb_mach_info *inf = dev->platform_data; | 1474 | struct pxafb_mach_info *inf = dev->platform_data; |
| 1475 | struct pxafb_mode_info *mode = &inf->modes[0]; | 1475 | struct pxafb_mode_info *mode = &inf->modes[0]; |
| @@ -1567,7 +1567,7 @@ static int __init parse_opt(struct device *dev, char *this_opt) | |||
| 1567 | return 0; | 1567 | return 0; |
| 1568 | } | 1568 | } |
| 1569 | 1569 | ||
| 1570 | static int __init pxafb_parse_options(struct device *dev, char *options) | 1570 | static int __devinit pxafb_parse_options(struct device *dev, char *options) |
| 1571 | { | 1571 | { |
| 1572 | char *this_opt; | 1572 | char *this_opt; |
| 1573 | int ret; | 1573 | int ret; |
| @@ -1588,8 +1588,8 @@ static int __init pxafb_parse_options(struct device *dev, char *options) | |||
| 1588 | 1588 | ||
| 1589 | static char g_options[256] __devinitdata = ""; | 1589 | static char g_options[256] __devinitdata = ""; |
| 1590 | 1590 | ||
| 1591 | #ifndef CONFIG_MODULES | 1591 | #ifndef MODULE |
| 1592 | static int __devinit pxafb_setup_options(void) | 1592 | static int __init pxafb_setup_options(void) |
| 1593 | { | 1593 | { |
| 1594 | char *options = NULL; | 1594 | char *options = NULL; |
| 1595 | 1595 | ||
| @@ -1613,7 +1613,7 @@ MODULE_PARM_DESC(options, "LCD parameters (see Documentation/fb/pxafb.txt)"); | |||
| 1613 | #define pxafb_setup_options() (0) | 1613 | #define pxafb_setup_options() (0) |
| 1614 | #endif | 1614 | #endif |
| 1615 | 1615 | ||
| 1616 | static int __init pxafb_probe(struct platform_device *dev) | 1616 | static int __devinit pxafb_probe(struct platform_device *dev) |
| 1617 | { | 1617 | { |
| 1618 | struct pxafb_info *fbi; | 1618 | struct pxafb_info *fbi; |
| 1619 | struct pxafb_mach_info *inf; | 1619 | struct pxafb_mach_info *inf; |
| @@ -1685,14 +1685,14 @@ static int __init pxafb_probe(struct platform_device *dev) | |||
| 1685 | if (r == NULL) { | 1685 | if (r == NULL) { |
| 1686 | dev_err(&dev->dev, "no I/O memory resource defined\n"); | 1686 | dev_err(&dev->dev, "no I/O memory resource defined\n"); |
| 1687 | ret = -ENODEV; | 1687 | ret = -ENODEV; |
| 1688 | goto failed; | 1688 | goto failed_fbi; |
| 1689 | } | 1689 | } |
| 1690 | 1690 | ||
| 1691 | r = request_mem_region(r->start, r->end - r->start + 1, dev->name); | 1691 | r = request_mem_region(r->start, r->end - r->start + 1, dev->name); |
| 1692 | if (r == NULL) { | 1692 | if (r == NULL) { |
| 1693 | dev_err(&dev->dev, "failed to request I/O memory\n"); | 1693 | dev_err(&dev->dev, "failed to request I/O memory\n"); |
| 1694 | ret = -EBUSY; | 1694 | ret = -EBUSY; |
| 1695 | goto failed; | 1695 | goto failed_fbi; |
| 1696 | } | 1696 | } |
| 1697 | 1697 | ||
| 1698 | fbi->mmio_base = ioremap(r->start, r->end - r->start + 1); | 1698 | fbi->mmio_base = ioremap(r->start, r->end - r->start + 1); |
| @@ -1735,8 +1735,17 @@ static int __init pxafb_probe(struct platform_device *dev) | |||
| 1735 | * This makes sure that our colour bitfield | 1735 | * This makes sure that our colour bitfield |
| 1736 | * descriptors are correctly initialised. | 1736 | * descriptors are correctly initialised. |
| 1737 | */ | 1737 | */ |
| 1738 | pxafb_check_var(&fbi->fb.var, &fbi->fb); | 1738 | ret = pxafb_check_var(&fbi->fb.var, &fbi->fb); |
| 1739 | pxafb_set_par(&fbi->fb); | 1739 | if (ret) { |
| 1740 | dev_err(&dev->dev, "failed to get suitable mode\n"); | ||
| 1741 | goto failed_free_irq; | ||
| 1742 | } | ||
| 1743 | |||
| 1744 | ret = pxafb_set_par(&fbi->fb); | ||
| 1745 | if (ret) { | ||
| 1746 | dev_err(&dev->dev, "Failed to set parameters\n"); | ||
| 1747 | goto failed_free_irq; | ||
| 1748 | } | ||
| 1740 | 1749 | ||
| 1741 | platform_set_drvdata(dev, fbi); | 1750 | platform_set_drvdata(dev, fbi); |
| 1742 | 1751 | ||
| @@ -1744,7 +1753,7 @@ static int __init pxafb_probe(struct platform_device *dev) | |||
| 1744 | if (ret < 0) { | 1753 | if (ret < 0) { |
| 1745 | dev_err(&dev->dev, | 1754 | dev_err(&dev->dev, |
| 1746 | "Failed to register framebuffer device: %d\n", ret); | 1755 | "Failed to register framebuffer device: %d\n", ret); |
| 1747 | goto failed_free_irq; | 1756 | goto failed_free_cmap; |
| 1748 | } | 1757 | } |
| 1749 | 1758 | ||
| 1750 | #ifdef CONFIG_CPU_FREQ | 1759 | #ifdef CONFIG_CPU_FREQ |
| @@ -1763,18 +1772,23 @@ static int __init pxafb_probe(struct platform_device *dev) | |||
| 1763 | 1772 | ||
| 1764 | return 0; | 1773 | return 0; |
| 1765 | 1774 | ||
| 1775 | failed_free_cmap: | ||
| 1776 | if (fbi->fb.cmap.len) | ||
| 1777 | fb_dealloc_cmap(&fbi->fb.cmap); | ||
| 1766 | failed_free_irq: | 1778 | failed_free_irq: |
| 1767 | free_irq(irq, fbi); | 1779 | free_irq(irq, fbi); |
| 1768 | failed_free_res: | ||
| 1769 | release_mem_region(r->start, r->end - r->start + 1); | ||
| 1770 | failed_free_io: | ||
| 1771 | iounmap(fbi->mmio_base); | ||
| 1772 | failed_free_mem: | 1780 | failed_free_mem: |
| 1773 | dma_free_writecombine(&dev->dev, fbi->map_size, | 1781 | dma_free_writecombine(&dev->dev, fbi->map_size, |
| 1774 | fbi->map_cpu, fbi->map_dma); | 1782 | fbi->map_cpu, fbi->map_dma); |
| 1775 | failed: | 1783 | failed_free_io: |
| 1784 | iounmap(fbi->mmio_base); | ||
| 1785 | failed_free_res: | ||
| 1786 | release_mem_region(r->start, r->end - r->start + 1); | ||
| 1787 | failed_fbi: | ||
| 1788 | clk_put(fbi->clk); | ||
| 1776 | platform_set_drvdata(dev, NULL); | 1789 | platform_set_drvdata(dev, NULL); |
| 1777 | kfree(fbi); | 1790 | kfree(fbi); |
| 1791 | failed: | ||
| 1778 | return ret; | 1792 | return ret; |
| 1779 | } | 1793 | } |
| 1780 | 1794 | ||
| @@ -1787,7 +1801,7 @@ static struct platform_driver pxafb_driver = { | |||
| 1787 | }, | 1801 | }, |
| 1788 | }; | 1802 | }; |
| 1789 | 1803 | ||
| 1790 | static int __devinit pxafb_init(void) | 1804 | static int __init pxafb_init(void) |
| 1791 | { | 1805 | { |
| 1792 | if (pxafb_setup_options()) | 1806 | if (pxafb_setup_options()) |
| 1793 | return -EINVAL; | 1807 | return -EINVAL; |
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 30469bf906e5..d0674f1e3f10 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c | |||
| @@ -1003,6 +1003,7 @@ static struct w100_pll_info xtal_14318000[] = { | |||
| 1003 | static struct w100_pll_info xtal_16000000[] = { | 1003 | static struct w100_pll_info xtal_16000000[] = { |
| 1004 | /*freq M N_int N_fac tfgoal lock_time */ | 1004 | /*freq M N_int N_fac tfgoal lock_time */ |
| 1005 | { 72, 1, 8, 0, 0xe0, 48}, /* tfgoal guessed */ | 1005 | { 72, 1, 8, 0, 0xe0, 48}, /* tfgoal guessed */ |
| 1006 | { 80, 1, 9, 0, 0xe0, 13}, /* tfgoal guessed */ | ||
| 1006 | { 95, 1, 10, 7, 0xe0, 38}, /* tfgoal guessed */ | 1007 | { 95, 1, 10, 7, 0xe0, 38}, /* tfgoal guessed */ |
| 1007 | { 96, 1, 11, 0, 0xe0, 36}, /* tfgoal guessed */ | 1008 | { 96, 1, 11, 0, 0xe0, 36}, /* tfgoal guessed */ |
| 1008 | { 0, 0, 0, 0, 0, 0}, | 1009 | { 0, 0, 0, 0, 0, 0}, |
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h index fd01d90cada5..57997fa14e69 100644 --- a/fs/9p/v9fs_vfs.h +++ b/fs/9p/v9fs_vfs.h | |||
| @@ -51,4 +51,4 @@ int v9fs_dir_release(struct inode *inode, struct file *filp); | |||
| 51 | int v9fs_file_open(struct inode *inode, struct file *file); | 51 | int v9fs_file_open(struct inode *inode, struct file *file); |
| 52 | void v9fs_inode2stat(struct inode *inode, struct p9_stat *stat); | 52 | void v9fs_inode2stat(struct inode *inode, struct p9_stat *stat); |
| 53 | void v9fs_dentry_release(struct dentry *); | 53 | void v9fs_dentry_release(struct dentry *); |
| 54 | int v9fs_uflags2omode(int uflags); | 54 | int v9fs_uflags2omode(int uflags, int extended); |
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index 0d55affe37d4..52944d2249a4 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c | |||
| @@ -59,7 +59,7 @@ int v9fs_file_open(struct inode *inode, struct file *file) | |||
| 59 | 59 | ||
| 60 | P9_DPRINTK(P9_DEBUG_VFS, "inode: %p file: %p \n", inode, file); | 60 | P9_DPRINTK(P9_DEBUG_VFS, "inode: %p file: %p \n", inode, file); |
| 61 | v9ses = v9fs_inode2v9ses(inode); | 61 | v9ses = v9fs_inode2v9ses(inode); |
| 62 | omode = v9fs_uflags2omode(file->f_flags); | 62 | omode = v9fs_uflags2omode(file->f_flags, v9fs_extended(v9ses)); |
| 63 | fid = file->private_data; | 63 | fid = file->private_data; |
| 64 | if (!fid) { | 64 | if (!fid) { |
| 65 | fid = v9fs_fid_clone(file->f_path.dentry); | 65 | fid = v9fs_fid_clone(file->f_path.dentry); |
| @@ -75,6 +75,8 @@ int v9fs_file_open(struct inode *inode, struct file *file) | |||
| 75 | inode->i_size = 0; | 75 | inode->i_size = 0; |
| 76 | inode->i_blocks = 0; | 76 | inode->i_blocks = 0; |
| 77 | } | 77 | } |
| 78 | if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses))) | ||
| 79 | generic_file_llseek(file, 0, SEEK_END); | ||
| 78 | } | 80 | } |
| 79 | 81 | ||
| 80 | file->private_data = fid; | 82 | file->private_data = fid; |
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 40fa807bd929..c95295c65045 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
| @@ -132,10 +132,10 @@ static int p9mode2unixmode(struct v9fs_session_info *v9ses, int mode) | |||
| 132 | /** | 132 | /** |
| 133 | * v9fs_uflags2omode- convert posix open flags to plan 9 mode bits | 133 | * v9fs_uflags2omode- convert posix open flags to plan 9 mode bits |
| 134 | * @uflags: flags to convert | 134 | * @uflags: flags to convert |
| 135 | * | 135 | * @extended: if .u extensions are active |
| 136 | */ | 136 | */ |
| 137 | 137 | ||
| 138 | int v9fs_uflags2omode(int uflags) | 138 | int v9fs_uflags2omode(int uflags, int extended) |
| 139 | { | 139 | { |
| 140 | int ret; | 140 | int ret; |
| 141 | 141 | ||
| @@ -155,14 +155,16 @@ int v9fs_uflags2omode(int uflags) | |||
| 155 | break; | 155 | break; |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | if (uflags & O_EXCL) | ||
| 159 | ret |= P9_OEXCL; | ||
| 160 | |||
| 161 | if (uflags & O_TRUNC) | 158 | if (uflags & O_TRUNC) |
| 162 | ret |= P9_OTRUNC; | 159 | ret |= P9_OTRUNC; |
| 163 | 160 | ||
| 164 | if (uflags & O_APPEND) | 161 | if (extended) { |
| 165 | ret |= P9_OAPPEND; | 162 | if (uflags & O_EXCL) |
| 163 | ret |= P9_OEXCL; | ||
| 164 | |||
| 165 | if (uflags & O_APPEND) | ||
| 166 | ret |= P9_OAPPEND; | ||
| 167 | } | ||
| 166 | 168 | ||
| 167 | return ret; | 169 | return ret; |
| 168 | } | 170 | } |
| @@ -506,7 +508,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
| 506 | flags = O_RDWR; | 508 | flags = O_RDWR; |
| 507 | 509 | ||
| 508 | fid = v9fs_create(v9ses, dir, dentry, NULL, perm, | 510 | fid = v9fs_create(v9ses, dir, dentry, NULL, perm, |
| 509 | v9fs_uflags2omode(flags)); | 511 | v9fs_uflags2omode(flags, v9fs_extended(v9ses))); |
| 510 | if (IS_ERR(fid)) { | 512 | if (IS_ERR(fid)) { |
| 511 | err = PTR_ERR(fid); | 513 | err = PTR_ERR(fid); |
| 512 | fid = NULL; | 514 | fid = NULL; |
diff --git a/fs/Kconfig b/fs/Kconfig index cf12c403b8c7..2694648cbd1b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -830,7 +830,7 @@ config NTFS_FS | |||
| 830 | from the project web site. | 830 | from the project web site. |
| 831 | 831 | ||
| 832 | For more information see <file:Documentation/filesystems/ntfs.txt> | 832 | For more information see <file:Documentation/filesystems/ntfs.txt> |
| 833 | and <http://linux-ntfs.sourceforge.net/>. | 833 | and <http://www.linux-ntfs.org/>. |
| 834 | 834 | ||
| 835 | To compile this file system support as a module, choose M here: the | 835 | To compile this file system support as a module, choose M here: the |
| 836 | module will be called ntfs. | 836 | module will be called ntfs. |
diff --git a/fs/block_dev.c b/fs/block_dev.c index 470c10ceb0fb..10d8a0aa871a 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -931,8 +931,16 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part) | |||
| 931 | struct gendisk *disk; | 931 | struct gendisk *disk; |
| 932 | int ret; | 932 | int ret; |
| 933 | int part; | 933 | int part; |
| 934 | int perm = 0; | ||
| 934 | 935 | ||
| 935 | ret = devcgroup_inode_permission(bdev->bd_inode, file->f_mode); | 936 | if (file->f_mode & FMODE_READ) |
| 937 | perm |= MAY_READ; | ||
| 938 | if (file->f_mode & FMODE_WRITE) | ||
| 939 | perm |= MAY_WRITE; | ||
| 940 | /* | ||
| 941 | * hooks: /n/, see "layering violations". | ||
| 942 | */ | ||
| 943 | ret = devcgroup_inode_permission(bdev->bd_inode, perm); | ||
| 936 | if (ret != 0) | 944 | if (ret != 0) |
| 937 | return ret; | 945 | return ret; |
| 938 | 946 | ||
diff --git a/fs/buffer.c b/fs/buffer.c index a073f3f4f013..0f51c0f7c266 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -821,7 +821,7 @@ static int fsync_buffers_list(spinlock_t *lock, struct list_head *list) | |||
| 821 | * contents - it is a noop if I/O is still in | 821 | * contents - it is a noop if I/O is still in |
| 822 | * flight on potentially older contents. | 822 | * flight on potentially older contents. |
| 823 | */ | 823 | */ |
| 824 | ll_rw_block(SWRITE, 1, &bh); | 824 | ll_rw_block(SWRITE_SYNC, 1, &bh); |
| 825 | brelse(bh); | 825 | brelse(bh); |
| 826 | spin_lock(lock); | 826 | spin_lock(lock); |
| 827 | } | 827 | } |
| @@ -2940,16 +2940,19 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[]) | |||
| 2940 | for (i = 0; i < nr; i++) { | 2940 | for (i = 0; i < nr; i++) { |
| 2941 | struct buffer_head *bh = bhs[i]; | 2941 | struct buffer_head *bh = bhs[i]; |
| 2942 | 2942 | ||
| 2943 | if (rw == SWRITE) | 2943 | if (rw == SWRITE || rw == SWRITE_SYNC) |
| 2944 | lock_buffer(bh); | 2944 | lock_buffer(bh); |
| 2945 | else if (test_set_buffer_locked(bh)) | 2945 | else if (test_set_buffer_locked(bh)) |
| 2946 | continue; | 2946 | continue; |
| 2947 | 2947 | ||
| 2948 | if (rw == WRITE || rw == SWRITE) { | 2948 | if (rw == WRITE || rw == SWRITE || rw == SWRITE_SYNC) { |
| 2949 | if (test_clear_buffer_dirty(bh)) { | 2949 | if (test_clear_buffer_dirty(bh)) { |
| 2950 | bh->b_end_io = end_buffer_write_sync; | 2950 | bh->b_end_io = end_buffer_write_sync; |
| 2951 | get_bh(bh); | 2951 | get_bh(bh); |
| 2952 | submit_bh(WRITE, bh); | 2952 | if (rw == SWRITE_SYNC) |
| 2953 | submit_bh(WRITE_SYNC, bh); | ||
| 2954 | else | ||
| 2955 | submit_bh(WRITE, bh); | ||
| 2953 | continue; | 2956 | continue; |
| 2954 | } | 2957 | } |
| 2955 | } else { | 2958 | } else { |
| @@ -2978,7 +2981,7 @@ int sync_dirty_buffer(struct buffer_head *bh) | |||
| 2978 | if (test_clear_buffer_dirty(bh)) { | 2981 | if (test_clear_buffer_dirty(bh)) { |
| 2979 | get_bh(bh); | 2982 | get_bh(bh); |
| 2980 | bh->b_end_io = end_buffer_write_sync; | 2983 | bh->b_end_io = end_buffer_write_sync; |
| 2981 | ret = submit_bh(WRITE, bh); | 2984 | ret = submit_bh(WRITE_SYNC, bh); |
| 2982 | wait_on_buffer(bh); | 2985 | wait_on_buffer(bh); |
| 2983 | if (buffer_eopnotsupp(bh)) { | 2986 | if (buffer_eopnotsupp(bh)) { |
| 2984 | clear_buffer_eopnotsupp(bh); | 2987 | clear_buffer_eopnotsupp(bh); |
diff --git a/fs/dcache.c b/fs/dcache.c index 3ee588d5f585..6068c25b393c 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/syscalls.h> | 17 | #include <linux/syscalls.h> |
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/fdtable.h> | ||
| 20 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
| 21 | #include <linux/fsnotify.h> | 22 | #include <linux/fsnotify.h> |
| 22 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| @@ -106,9 +107,10 @@ static void dentry_lru_remove(struct dentry *dentry) | |||
| 106 | /* | 107 | /* |
| 107 | * Release the dentry's inode, using the filesystem | 108 | * Release the dentry's inode, using the filesystem |
| 108 | * d_iput() operation if defined. | 109 | * d_iput() operation if defined. |
| 109 | * Called with dcache_lock and per dentry lock held, drops both. | ||
| 110 | */ | 110 | */ |
| 111 | static void dentry_iput(struct dentry * dentry) | 111 | static void dentry_iput(struct dentry * dentry) |
| 112 | __releases(dentry->d_lock) | ||
| 113 | __releases(dcache_lock) | ||
| 112 | { | 114 | { |
| 113 | struct inode *inode = dentry->d_inode; | 115 | struct inode *inode = dentry->d_inode; |
| 114 | if (inode) { | 116 | if (inode) { |
| @@ -132,12 +134,13 @@ static void dentry_iput(struct dentry * dentry) | |||
| 132 | * d_kill - kill dentry and return parent | 134 | * d_kill - kill dentry and return parent |
| 133 | * @dentry: dentry to kill | 135 | * @dentry: dentry to kill |
| 134 | * | 136 | * |
| 135 | * Called with dcache_lock and d_lock, releases both. The dentry must | 137 | * The dentry must already be unhashed and removed from the LRU. |
| 136 | * already be unhashed and removed from the LRU. | ||
| 137 | * | 138 | * |
| 138 | * If this is the root of the dentry tree, return NULL. | 139 | * If this is the root of the dentry tree, return NULL. |
| 139 | */ | 140 | */ |
| 140 | static struct dentry *d_kill(struct dentry *dentry) | 141 | static struct dentry *d_kill(struct dentry *dentry) |
| 142 | __releases(dentry->d_lock) | ||
| 143 | __releases(dcache_lock) | ||
| 141 | { | 144 | { |
| 142 | struct dentry *parent; | 145 | struct dentry *parent; |
| 143 | 146 | ||
| @@ -383,11 +386,11 @@ restart: | |||
| 383 | * Try to prune ancestors as well. This is necessary to prevent | 386 | * Try to prune ancestors as well. This is necessary to prevent |
| 384 | * quadratic behavior of shrink_dcache_parent(), but is also expected | 387 | * quadratic behavior of shrink_dcache_parent(), but is also expected |
| 385 | * to be beneficial in reducing dentry cache fragmentation. | 388 | * to be beneficial in reducing dentry cache fragmentation. |
| 386 | * | ||
| 387 | * Called with dcache_lock, drops it and then regains. | ||
| 388 | * Called with dentry->d_lock held, drops it. | ||
| 389 | */ | 389 | */ |
| 390 | static void prune_one_dentry(struct dentry * dentry) | 390 | static void prune_one_dentry(struct dentry * dentry) |
| 391 | __releases(dentry->d_lock) | ||
| 392 | __releases(dcache_lock) | ||
| 393 | __acquires(dcache_lock) | ||
| 391 | { | 394 | { |
| 392 | __d_drop(dentry); | 395 | __d_drop(dentry); |
| 393 | dentry = d_kill(dentry); | 396 | dentry = d_kill(dentry); |
| @@ -1604,10 +1607,9 @@ static int d_isparent(struct dentry *p1, struct dentry *p2) | |||
| 1604 | * | 1607 | * |
| 1605 | * Note: If ever the locking in lock_rename() changes, then please | 1608 | * Note: If ever the locking in lock_rename() changes, then please |
| 1606 | * remember to update this too... | 1609 | * remember to update this too... |
| 1607 | * | ||
| 1608 | * On return, dcache_lock will have been unlocked. | ||
| 1609 | */ | 1610 | */ |
| 1610 | static struct dentry *__d_unalias(struct dentry *dentry, struct dentry *alias) | 1611 | static struct dentry *__d_unalias(struct dentry *dentry, struct dentry *alias) |
| 1612 | __releases(dcache_lock) | ||
| 1611 | { | 1613 | { |
| 1612 | struct mutex *m1 = NULL, *m2 = NULL; | 1614 | struct mutex *m1 = NULL, *m2 = NULL; |
| 1613 | struct dentry *ret; | 1615 | struct dentry *ret; |
| @@ -1743,11 +1745,9 @@ out_nolock: | |||
| 1743 | shouldnt_be_hashed: | 1745 | shouldnt_be_hashed: |
| 1744 | spin_unlock(&dcache_lock); | 1746 | spin_unlock(&dcache_lock); |
| 1745 | BUG(); | 1747 | BUG(); |
| 1746 | goto shouldnt_be_hashed; | ||
| 1747 | } | 1748 | } |
| 1748 | 1749 | ||
| 1749 | static int prepend(char **buffer, int *buflen, const char *str, | 1750 | static int prepend(char **buffer, int *buflen, const char *str, int namelen) |
| 1750 | int namelen) | ||
| 1751 | { | 1751 | { |
| 1752 | *buflen -= namelen; | 1752 | *buflen -= namelen; |
| 1753 | if (*buflen < 0) | 1753 | if (*buflen < 0) |
| @@ -1757,8 +1757,13 @@ static int prepend(char **buffer, int *buflen, const char *str, | |||
| 1757 | return 0; | 1757 | return 0; |
| 1758 | } | 1758 | } |
| 1759 | 1759 | ||
| 1760 | static int prepend_name(char **buffer, int *buflen, struct qstr *name) | ||
| 1761 | { | ||
| 1762 | return prepend(buffer, buflen, name->name, name->len); | ||
| 1763 | } | ||
| 1764 | |||
| 1760 | /** | 1765 | /** |
| 1761 | * d_path - return the path of a dentry | 1766 | * __d_path - return the path of a dentry |
| 1762 | * @path: the dentry/vfsmount to report | 1767 | * @path: the dentry/vfsmount to report |
| 1763 | * @root: root vfsmnt/dentry (may be modified by this function) | 1768 | * @root: root vfsmnt/dentry (may be modified by this function) |
| 1764 | * @buffer: buffer to return value in | 1769 | * @buffer: buffer to return value in |
| @@ -1779,9 +1784,10 @@ char *__d_path(const struct path *path, struct path *root, | |||
| 1779 | { | 1784 | { |
| 1780 | struct dentry *dentry = path->dentry; | 1785 | struct dentry *dentry = path->dentry; |
| 1781 | struct vfsmount *vfsmnt = path->mnt; | 1786 | struct vfsmount *vfsmnt = path->mnt; |
| 1782 | char * end = buffer+buflen; | 1787 | char *end = buffer + buflen; |
| 1783 | char * retval; | 1788 | char *retval; |
| 1784 | 1789 | ||
| 1790 | spin_lock(&vfsmount_lock); | ||
| 1785 | prepend(&end, &buflen, "\0", 1); | 1791 | prepend(&end, &buflen, "\0", 1); |
| 1786 | if (!IS_ROOT(dentry) && d_unhashed(dentry) && | 1792 | if (!IS_ROOT(dentry) && d_unhashed(dentry) && |
| 1787 | (prepend(&end, &buflen, " (deleted)", 10) != 0)) | 1793 | (prepend(&end, &buflen, " (deleted)", 10) != 0)) |
| @@ -1800,38 +1806,37 @@ char *__d_path(const struct path *path, struct path *root, | |||
| 1800 | break; | 1806 | break; |
| 1801 | if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { | 1807 | if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) { |
| 1802 | /* Global root? */ | 1808 | /* Global root? */ |
| 1803 | spin_lock(&vfsmount_lock); | ||
| 1804 | if (vfsmnt->mnt_parent == vfsmnt) { | 1809 | if (vfsmnt->mnt_parent == vfsmnt) { |
| 1805 | spin_unlock(&vfsmount_lock); | ||
| 1806 | goto global_root; | 1810 | goto global_root; |
| 1807 | } | 1811 | } |
| 1808 | dentry = vfsmnt->mnt_mountpoint; | 1812 | dentry = vfsmnt->mnt_mountpoint; |
| 1809 | vfsmnt = vfsmnt->mnt_parent; | 1813 | vfsmnt = vfsmnt->mnt_parent; |
| 1810 | spin_unlock(&vfsmount_lock); | ||
| 1811 | continue; | 1814 | continue; |
| 1812 | } | 1815 | } |
| 1813 | parent = dentry->d_parent; | 1816 | parent = dentry->d_parent; |
| 1814 | prefetch(parent); | 1817 | prefetch(parent); |
| 1815 | if ((prepend(&end, &buflen, dentry->d_name.name, | 1818 | if ((prepend_name(&end, &buflen, &dentry->d_name) != 0) || |
| 1816 | dentry->d_name.len) != 0) || | ||
| 1817 | (prepend(&end, &buflen, "/", 1) != 0)) | 1819 | (prepend(&end, &buflen, "/", 1) != 0)) |
| 1818 | goto Elong; | 1820 | goto Elong; |
| 1819 | retval = end; | 1821 | retval = end; |
| 1820 | dentry = parent; | 1822 | dentry = parent; |
| 1821 | } | 1823 | } |
| 1822 | 1824 | ||
| 1825 | out: | ||
| 1826 | spin_unlock(&vfsmount_lock); | ||
| 1823 | return retval; | 1827 | return retval; |
| 1824 | 1828 | ||
| 1825 | global_root: | 1829 | global_root: |
| 1826 | retval += 1; /* hit the slash */ | 1830 | retval += 1; /* hit the slash */ |
| 1827 | if (prepend(&retval, &buflen, dentry->d_name.name, | 1831 | if (prepend_name(&retval, &buflen, &dentry->d_name) != 0) |
| 1828 | dentry->d_name.len) != 0) | ||
| 1829 | goto Elong; | 1832 | goto Elong; |
| 1830 | root->mnt = vfsmnt; | 1833 | root->mnt = vfsmnt; |
| 1831 | root->dentry = dentry; | 1834 | root->dentry = dentry; |
| 1832 | return retval; | 1835 | goto out; |
| 1836 | |||
| 1833 | Elong: | 1837 | Elong: |
| 1834 | return ERR_PTR(-ENAMETOOLONG); | 1838 | retval = ERR_PTR(-ENAMETOOLONG); |
| 1839 | goto out; | ||
| 1835 | } | 1840 | } |
| 1836 | 1841 | ||
| 1837 | /** | 1842 | /** |
| @@ -1845,9 +1850,9 @@ Elong: | |||
| 1845 | * | 1850 | * |
| 1846 | * Returns the buffer or an error code if the path was too long. | 1851 | * Returns the buffer or an error code if the path was too long. |
| 1847 | * | 1852 | * |
| 1848 | * "buflen" should be positive. Caller holds the dcache_lock. | 1853 | * "buflen" should be positive. |
| 1849 | */ | 1854 | */ |
| 1850 | char *d_path(struct path *path, char *buf, int buflen) | 1855 | char *d_path(const struct path *path, char *buf, int buflen) |
| 1851 | { | 1856 | { |
| 1852 | char *res; | 1857 | char *res; |
| 1853 | struct path root; | 1858 | struct path root; |
| @@ -1915,16 +1920,11 @@ char *dentry_path(struct dentry *dentry, char *buf, int buflen) | |||
| 1915 | retval = end-1; | 1920 | retval = end-1; |
| 1916 | *retval = '/'; | 1921 | *retval = '/'; |
| 1917 | 1922 | ||
| 1918 | for (;;) { | 1923 | while (!IS_ROOT(dentry)) { |
| 1919 | struct dentry *parent; | 1924 | struct dentry *parent = dentry->d_parent; |
| 1920 | if (IS_ROOT(dentry)) | ||
| 1921 | break; | ||
| 1922 | 1925 | ||
| 1923 | parent = dentry->d_parent; | ||
| 1924 | prefetch(parent); | 1926 | prefetch(parent); |
| 1925 | 1927 | if ((prepend_name(&end, &buflen, &dentry->d_name) != 0) || | |
| 1926 | if ((prepend(&end, &buflen, dentry->d_name.name, | ||
| 1927 | dentry->d_name.len) != 0) || | ||
| 1928 | (prepend(&end, &buflen, "/", 1) != 0)) | 1928 | (prepend(&end, &buflen, "/", 1) != 0)) |
| 1929 | goto Elong; | 1929 | goto Elong; |
| 1930 | 1930 | ||
| @@ -1975,7 +1975,7 @@ asmlinkage long sys_getcwd(char __user *buf, unsigned long size) | |||
| 1975 | error = -ENOENT; | 1975 | error = -ENOENT; |
| 1976 | /* Has the current directory has been unlinked? */ | 1976 | /* Has the current directory has been unlinked? */ |
| 1977 | spin_lock(&dcache_lock); | 1977 | spin_lock(&dcache_lock); |
| 1978 | if (pwd.dentry->d_parent == pwd.dentry || !d_unhashed(pwd.dentry)) { | 1978 | if (IS_ROOT(pwd.dentry) || !d_unhashed(pwd.dentry)) { |
| 1979 | unsigned long len; | 1979 | unsigned long len; |
| 1980 | struct path tmp = root; | 1980 | struct path tmp = root; |
| 1981 | char * cwd; | 1981 | char * cwd; |
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c index 50c994a249a5..09a4522f65e6 100644 --- a/fs/ecryptfs/miscdev.c +++ b/fs/ecryptfs/miscdev.c | |||
| @@ -575,13 +575,11 @@ int ecryptfs_init_ecryptfs_miscdev(void) | |||
| 575 | int rc; | 575 | int rc; |
| 576 | 576 | ||
| 577 | atomic_set(&ecryptfs_num_miscdev_opens, 0); | 577 | atomic_set(&ecryptfs_num_miscdev_opens, 0); |
| 578 | mutex_lock(&ecryptfs_daemon_hash_mux); | ||
| 579 | rc = misc_register(&ecryptfs_miscdev); | 578 | rc = misc_register(&ecryptfs_miscdev); |
| 580 | if (rc) | 579 | if (rc) |
| 581 | printk(KERN_ERR "%s: Failed to register miscellaneous device " | 580 | printk(KERN_ERR "%s: Failed to register miscellaneous device " |
| 582 | "for communications with userspace daemons; rc = [%d]\n", | 581 | "for communications with userspace daemons; rc = [%d]\n", |
| 583 | __func__, rc); | 582 | __func__, rc); |
| 584 | mutex_unlock(&ecryptfs_daemon_hash_mux); | ||
| 585 | return rc; | 583 | return rc; |
| 586 | } | 584 | } |
| 587 | 585 | ||
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index fe3119a71ada..2845425077e8 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c | |||
| @@ -2875,8 +2875,10 @@ static ssize_t ext3_quota_write(struct super_block *sb, int type, | |||
| 2875 | blk++; | 2875 | blk++; |
| 2876 | } | 2876 | } |
| 2877 | out: | 2877 | out: |
| 2878 | if (len == towrite) | 2878 | if (len == towrite) { |
| 2879 | mutex_unlock(&inode->i_mutex); | ||
| 2879 | return err; | 2880 | return err; |
| 2881 | } | ||
| 2880 | if (inode->i_size < off+len-towrite) { | 2882 | if (inode->i_size < off+len-towrite) { |
| 2881 | i_size_write(inode, off+len-towrite); | 2883 | i_size_write(inode, off+len-towrite); |
| 2882 | EXT3_I(inode)->i_disksize = inode->i_size; | 2884 | EXT3_I(inode)->i_disksize = inode->i_size; |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index cb96f127c366..02bf24343979 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
| @@ -3337,8 +3337,10 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type, | |||
| 3337 | blk++; | 3337 | blk++; |
| 3338 | } | 3338 | } |
| 3339 | out: | 3339 | out: |
| 3340 | if (len == towrite) | 3340 | if (len == towrite) { |
| 3341 | mutex_unlock(&inode->i_mutex); | ||
| 3341 | return err; | 3342 | return err; |
| 3343 | } | ||
| 3342 | if (inode->i_size < off+len-towrite) { | 3344 | if (inode->i_size < off+len-towrite) { |
| 3343 | i_size_write(inode, off+len-towrite); | 3345 | i_size_write(inode, off+len-towrite); |
| 3344 | EXT4_I(inode)->i_disksize = inode->i_size; | 3346 | EXT4_I(inode)->i_disksize = inode->i_size; |
diff --git a/fs/libfs.c b/fs/libfs.c index 892d41cb3382..baeb71ee1cde 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
| @@ -512,6 +512,20 @@ void simple_release_fs(struct vfsmount **mount, int *count) | |||
| 512 | mntput(mnt); | 512 | mntput(mnt); |
| 513 | } | 513 | } |
| 514 | 514 | ||
| 515 | /** | ||
| 516 | * simple_read_from_buffer - copy data from the buffer to user space | ||
| 517 | * @to: the user space buffer to read to | ||
| 518 | * @count: the maximum number of bytes to read | ||
| 519 | * @ppos: the current position in the buffer | ||
| 520 | * @from: the buffer to read from | ||
| 521 | * @available: the size of the buffer | ||
| 522 | * | ||
| 523 | * The simple_read_from_buffer() function reads up to @count bytes from the | ||
| 524 | * buffer @from at offset @ppos into the user space address starting at @to. | ||
| 525 | * | ||
| 526 | * On success, the number of bytes read is returned and the offset @ppos is | ||
| 527 | * advanced by this number, or negative value is returned on error. | ||
| 528 | **/ | ||
| 515 | ssize_t simple_read_from_buffer(void __user *to, size_t count, loff_t *ppos, | 529 | ssize_t simple_read_from_buffer(void __user *to, size_t count, loff_t *ppos, |
| 516 | const void *from, size_t available) | 530 | const void *from, size_t available) |
| 517 | { | 531 | { |
| @@ -528,6 +542,20 @@ ssize_t simple_read_from_buffer(void __user *to, size_t count, loff_t *ppos, | |||
| 528 | return count; | 542 | return count; |
| 529 | } | 543 | } |
| 530 | 544 | ||
| 545 | /** | ||
| 546 | * memory_read_from_buffer - copy data from the buffer | ||
| 547 | * @to: the kernel space buffer to read to | ||
| 548 | * @count: the maximum number of bytes to read | ||
| 549 | * @ppos: the current position in the buffer | ||
| 550 | * @from: the buffer to read from | ||
| 551 | * @available: the size of the buffer | ||
| 552 | * | ||
| 553 | * The memory_read_from_buffer() function reads up to @count bytes from the | ||
| 554 | * buffer @from at offset @ppos into the kernel space address starting at @to. | ||
| 555 | * | ||
| 556 | * On success, the number of bytes read is returned and the offset @ppos is | ||
| 557 | * advanced by this number, or negative value is returned on error. | ||
| 558 | **/ | ||
| 531 | ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, | 559 | ssize_t memory_read_from_buffer(void *to, size_t count, loff_t *ppos, |
| 532 | const void *from, size_t available) | 560 | const void *from, size_t available) |
| 533 | { | 561 | { |
diff --git a/fs/locks.c b/fs/locks.c index 11dbf08651b7..dce8c747371c 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -561,9 +561,6 @@ static void locks_insert_lock(struct file_lock **pos, struct file_lock *fl) | |||
| 561 | /* insert into file's list */ | 561 | /* insert into file's list */ |
| 562 | fl->fl_next = *pos; | 562 | fl->fl_next = *pos; |
| 563 | *pos = fl; | 563 | *pos = fl; |
| 564 | |||
| 565 | if (fl->fl_ops && fl->fl_ops->fl_insert) | ||
| 566 | fl->fl_ops->fl_insert(fl); | ||
| 567 | } | 564 | } |
| 568 | 565 | ||
| 569 | /* | 566 | /* |
| @@ -586,9 +583,6 @@ static void locks_delete_lock(struct file_lock **thisfl_p) | |||
| 586 | fl->fl_fasync = NULL; | 583 | fl->fl_fasync = NULL; |
| 587 | } | 584 | } |
| 588 | 585 | ||
| 589 | if (fl->fl_ops && fl->fl_ops->fl_remove) | ||
| 590 | fl->fl_ops->fl_remove(fl); | ||
| 591 | |||
| 592 | if (fl->fl_nspid) { | 586 | if (fl->fl_nspid) { |
| 593 | put_pid(fl->fl_nspid); | 587 | put_pid(fl->fl_nspid); |
| 594 | fl->fl_nspid = NULL; | 588 | fl->fl_nspid = NULL; |
diff --git a/fs/namei.c b/fs/namei.c index c7e43536c49a..01e67dddcc3d 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -581,15 +581,13 @@ static __always_inline int link_path_walk(const char *name, struct nameidata *nd | |||
| 581 | int result; | 581 | int result; |
| 582 | 582 | ||
| 583 | /* make sure the stuff we saved doesn't go away */ | 583 | /* make sure the stuff we saved doesn't go away */ |
| 584 | dget(save.dentry); | 584 | path_get(&save); |
| 585 | mntget(save.mnt); | ||
| 586 | 585 | ||
| 587 | result = __link_path_walk(name, nd); | 586 | result = __link_path_walk(name, nd); |
| 588 | if (result == -ESTALE) { | 587 | if (result == -ESTALE) { |
| 589 | /* nd->path had been dropped */ | 588 | /* nd->path had been dropped */ |
| 590 | nd->path = save; | 589 | nd->path = save; |
| 591 | dget(nd->path.dentry); | 590 | path_get(&nd->path); |
| 592 | mntget(nd->path.mnt); | ||
| 593 | nd->flags |= LOOKUP_REVAL; | 591 | nd->flags |= LOOKUP_REVAL; |
| 594 | result = __link_path_walk(name, nd); | 592 | result = __link_path_walk(name, nd); |
| 595 | } | 593 | } |
| @@ -1216,8 +1214,9 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, | |||
| 1216 | nd->flags = flags; | 1214 | nd->flags = flags; |
| 1217 | nd->depth = 0; | 1215 | nd->depth = 0; |
| 1218 | 1216 | ||
| 1219 | nd->path.mnt = mntget(mnt); | 1217 | nd->path.dentry = dentry; |
| 1220 | nd->path.dentry = dget(dentry); | 1218 | nd->path.mnt = mnt; |
| 1219 | path_get(&nd->path); | ||
| 1221 | 1220 | ||
| 1222 | retval = path_walk(name, nd); | 1221 | retval = path_walk(name, nd); |
| 1223 | if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry && | 1222 | if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry && |
| @@ -2857,16 +2856,17 @@ int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen) | |||
| 2857 | { | 2856 | { |
| 2858 | struct nameidata nd; | 2857 | struct nameidata nd; |
| 2859 | void *cookie; | 2858 | void *cookie; |
| 2859 | int res; | ||
| 2860 | 2860 | ||
| 2861 | nd.depth = 0; | 2861 | nd.depth = 0; |
| 2862 | cookie = dentry->d_inode->i_op->follow_link(dentry, &nd); | 2862 | cookie = dentry->d_inode->i_op->follow_link(dentry, &nd); |
| 2863 | if (!IS_ERR(cookie)) { | 2863 | if (IS_ERR(cookie)) |
| 2864 | int res = vfs_readlink(dentry, buffer, buflen, nd_get_link(&nd)); | 2864 | return PTR_ERR(cookie); |
| 2865 | if (dentry->d_inode->i_op->put_link) | 2865 | |
| 2866 | dentry->d_inode->i_op->put_link(dentry, &nd, cookie); | 2866 | res = vfs_readlink(dentry, buffer, buflen, nd_get_link(&nd)); |
| 2867 | cookie = ERR_PTR(res); | 2867 | if (dentry->d_inode->i_op->put_link) |
| 2868 | } | 2868 | dentry->d_inode->i_op->put_link(dentry, &nd, cookie); |
| 2869 | return PTR_ERR(cookie); | 2869 | return res; |
| 2870 | } | 2870 | } |
| 2871 | 2871 | ||
| 2872 | int vfs_follow_link(struct nameidata *nd, const char *link) | 2872 | int vfs_follow_link(struct nameidata *nd, const char *link) |
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/namei.h> | 16 | #include <linux/namei.h> |
| 17 | #include <linux/backing-dev.h> | 17 | #include <linux/backing-dev.h> |
| 18 | #include <linux/capability.h> | 18 | #include <linux/capability.h> |
| 19 | #include <linux/securebits.h> | ||
| 19 | #include <linux/security.h> | 20 | #include <linux/security.h> |
| 20 | #include <linux/mount.h> | 21 | #include <linux/mount.h> |
| 21 | #include <linux/vfs.h> | 22 | #include <linux/vfs.h> |
| @@ -425,7 +426,7 @@ asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode) | |||
| 425 | { | 426 | { |
| 426 | struct nameidata nd; | 427 | struct nameidata nd; |
| 427 | int old_fsuid, old_fsgid; | 428 | int old_fsuid, old_fsgid; |
| 428 | kernel_cap_t old_cap; | 429 | kernel_cap_t uninitialized_var(old_cap); /* !SECURE_NO_SETUID_FIXUP */ |
| 429 | int res; | 430 | int res; |
| 430 | 431 | ||
| 431 | if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ | 432 | if (mode & ~S_IRWXO) /* where's F_OK, X_OK, W_OK, R_OK? */ |
| @@ -433,23 +434,27 @@ asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode) | |||
| 433 | 434 | ||
| 434 | old_fsuid = current->fsuid; | 435 | old_fsuid = current->fsuid; |
| 435 | old_fsgid = current->fsgid; | 436 | old_fsgid = current->fsgid; |
| 436 | old_cap = current->cap_effective; | ||
| 437 | 437 | ||
| 438 | current->fsuid = current->uid; | 438 | current->fsuid = current->uid; |
| 439 | current->fsgid = current->gid; | 439 | current->fsgid = current->gid; |
| 440 | 440 | ||
| 441 | /* | 441 | if (!issecure(SECURE_NO_SETUID_FIXUP)) { |
| 442 | * Clear the capabilities if we switch to a non-root user | 442 | /* |
| 443 | * | 443 | * Clear the capabilities if we switch to a non-root user |
| 444 | * FIXME: There is a race here against sys_capset. The | 444 | */ |
| 445 | * capabilities can change yet we will restore the old | 445 | #ifndef CONFIG_SECURITY_FILE_CAPABILITIES |
| 446 | * value below. We should hold task_capabilities_lock, | 446 | /* |
| 447 | * but we cannot because user_path_walk can sleep. | 447 | * FIXME: There is a race here against sys_capset. The |
| 448 | */ | 448 | * capabilities can change yet we will restore the old |
| 449 | if (current->uid) | 449 | * value below. We should hold task_capabilities_lock, |
| 450 | cap_clear(current->cap_effective); | 450 | * but we cannot because user_path_walk can sleep. |
| 451 | else | 451 | */ |
| 452 | current->cap_effective = current->cap_permitted; | 452 | #endif /* ndef CONFIG_SECURITY_FILE_CAPABILITIES */ |
| 453 | if (current->uid) | ||
| 454 | old_cap = cap_set_effective(__cap_empty_set); | ||
| 455 | else | ||
| 456 | old_cap = cap_set_effective(current->cap_permitted); | ||
| 457 | } | ||
| 453 | 458 | ||
| 454 | res = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW|LOOKUP_ACCESS, &nd); | 459 | res = __user_walk_fd(dfd, filename, LOOKUP_FOLLOW|LOOKUP_ACCESS, &nd); |
| 455 | if (res) | 460 | if (res) |
| @@ -478,7 +483,9 @@ out_path_release: | |||
| 478 | out: | 483 | out: |
| 479 | current->fsuid = old_fsuid; | 484 | current->fsuid = old_fsuid; |
| 480 | current->fsgid = old_fsgid; | 485 | current->fsgid = old_fsgid; |
| 481 | current->cap_effective = old_cap; | 486 | |
| 487 | if (!issecure(SECURE_NO_SETUID_FIXUP)) | ||
| 488 | cap_set_effective(old_cap); | ||
| 482 | 489 | ||
| 483 | return res; | 490 | return res; |
| 484 | } | 491 | } |
| @@ -1003,8 +1003,7 @@ struct file *create_write_pipe(void) | |||
| 1003 | void free_write_pipe(struct file *f) | 1003 | void free_write_pipe(struct file *f) |
| 1004 | { | 1004 | { |
| 1005 | free_pipe_info(f->f_dentry->d_inode); | 1005 | free_pipe_info(f->f_dentry->d_inode); |
| 1006 | dput(f->f_path.dentry); | 1006 | path_put(&f->f_path); |
| 1007 | mntput(f->f_path.mnt); | ||
| 1008 | put_filp(f); | 1007 | put_filp(f); |
| 1009 | } | 1008 | } |
| 1010 | 1009 | ||
| @@ -1015,8 +1014,8 @@ struct file *create_read_pipe(struct file *wrf) | |||
| 1015 | return ERR_PTR(-ENFILE); | 1014 | return ERR_PTR(-ENFILE); |
| 1016 | 1015 | ||
| 1017 | /* Grab pipe from the writer */ | 1016 | /* Grab pipe from the writer */ |
| 1018 | f->f_path.mnt = mntget(wrf->f_path.mnt); | 1017 | f->f_path = wrf->f_path; |
| 1019 | f->f_path.dentry = dget(wrf->f_path.dentry); | 1018 | path_get(&wrf->f_path); |
| 1020 | f->f_mapping = wrf->f_path.dentry->d_inode->i_mapping; | 1019 | f->f_mapping = wrf->f_path.dentry->d_inode->i_mapping; |
| 1021 | 1020 | ||
| 1022 | f->f_pos = 0; | 1021 | f->f_pos = 0; |
| @@ -1068,8 +1067,7 @@ int do_pipe(int *fd) | |||
| 1068 | err_fdr: | 1067 | err_fdr: |
| 1069 | put_unused_fd(fdr); | 1068 | put_unused_fd(fdr); |
| 1070 | err_read_pipe: | 1069 | err_read_pipe: |
| 1071 | dput(fr->f_dentry); | 1070 | path_put(&fr->f_path); |
| 1072 | mntput(fr->f_vfsmnt); | ||
| 1073 | put_filp(fr); | 1071 | put_filp(fr); |
| 1074 | err_write_pipe: | 1072 | err_write_pipe: |
| 1075 | free_write_pipe(fw); | 1073 | free_write_pipe(fw); |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 7e277f2ad466..c652d469dc08 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -123,6 +123,11 @@ static int uptime_read_proc(char *page, char **start, off_t off, | |||
| 123 | return proc_calc_metrics(page, start, off, count, eof, len); | 123 | return proc_calc_metrics(page, start, off, count, eof, len); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | int __attribute__((weak)) arch_report_meminfo(char *page) | ||
| 127 | { | ||
| 128 | return 0; | ||
| 129 | } | ||
| 130 | |||
| 126 | static int meminfo_read_proc(char *page, char **start, off_t off, | 131 | static int meminfo_read_proc(char *page, char **start, off_t off, |
| 127 | int count, int *eof, void *data) | 132 | int count, int *eof, void *data) |
| 128 | { | 133 | { |
| @@ -221,6 +226,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 221 | 226 | ||
| 222 | len += hugetlb_report_meminfo(page + len); | 227 | len += hugetlb_report_meminfo(page + len); |
| 223 | 228 | ||
| 229 | len += arch_report_meminfo(page + len); | ||
| 230 | |||
| 224 | return proc_calc_metrics(page, start, off, count, eof, len); | 231 | return proc_calc_metrics(page, start, off, count, eof, len); |
| 225 | #undef K | 232 | #undef K |
| 226 | } | 233 | } |
| @@ -472,6 +479,13 @@ static const struct file_operations proc_vmalloc_operations = { | |||
| 472 | }; | 479 | }; |
| 473 | #endif | 480 | #endif |
| 474 | 481 | ||
| 482 | #ifndef arch_irq_stat_cpu | ||
| 483 | #define arch_irq_stat_cpu(cpu) 0 | ||
| 484 | #endif | ||
| 485 | #ifndef arch_irq_stat | ||
| 486 | #define arch_irq_stat() 0 | ||
| 487 | #endif | ||
| 488 | |||
| 475 | static int show_stat(struct seq_file *p, void *v) | 489 | static int show_stat(struct seq_file *p, void *v) |
| 476 | { | 490 | { |
| 477 | int i; | 491 | int i; |
| @@ -509,7 +523,9 @@ static int show_stat(struct seq_file *p, void *v) | |||
| 509 | sum += temp; | 523 | sum += temp; |
| 510 | per_irq_sum[j] += temp; | 524 | per_irq_sum[j] += temp; |
| 511 | } | 525 | } |
| 526 | sum += arch_irq_stat_cpu(i); | ||
| 512 | } | 527 | } |
| 528 | sum += arch_irq_stat(); | ||
| 513 | 529 | ||
| 514 | seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n", | 530 | seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n", |
| 515 | (unsigned long long)cputime64_to_clock_t(user), | 531 | (unsigned long long)cputime64_to_clock_t(user), |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index ab8ccc9d14ff..c492449f3b45 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -476,10 +476,10 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, | |||
| 476 | return -ESRCH; | 476 | return -ESRCH; |
| 477 | mm = get_task_mm(task); | 477 | mm = get_task_mm(task); |
| 478 | if (mm) { | 478 | if (mm) { |
| 479 | static struct mm_walk clear_refs_walk; | 479 | struct mm_walk clear_refs_walk = { |
| 480 | memset(&clear_refs_walk, 0, sizeof(clear_refs_walk)); | 480 | .pmd_entry = clear_refs_pte_range, |
| 481 | clear_refs_walk.pmd_entry = clear_refs_pte_range; | 481 | .mm = mm, |
| 482 | clear_refs_walk.mm = mm; | 482 | }; |
| 483 | down_read(&mm->mmap_sem); | 483 | down_read(&mm->mmap_sem); |
| 484 | for (vma = mm->mmap; vma; vma = vma->vm_next) { | 484 | for (vma = mm->mmap; vma; vma = vma->vm_next) { |
| 485 | clear_refs_walk.private = vma; | 485 | clear_refs_walk.private = vma; |
| @@ -602,11 +602,6 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, | |||
| 602 | return err; | 602 | return err; |
| 603 | } | 603 | } |
| 604 | 604 | ||
| 605 | static struct mm_walk pagemap_walk = { | ||
| 606 | .pmd_entry = pagemap_pte_range, | ||
| 607 | .pte_hole = pagemap_pte_hole | ||
| 608 | }; | ||
| 609 | |||
| 610 | /* | 605 | /* |
| 611 | * /proc/pid/pagemap - an array mapping virtual pages to pfns | 606 | * /proc/pid/pagemap - an array mapping virtual pages to pfns |
| 612 | * | 607 | * |
| @@ -641,6 +636,11 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
| 641 | struct pagemapread pm; | 636 | struct pagemapread pm; |
| 642 | int pagecount; | 637 | int pagecount; |
| 643 | int ret = -ESRCH; | 638 | int ret = -ESRCH; |
| 639 | struct mm_walk pagemap_walk; | ||
| 640 | unsigned long src; | ||
| 641 | unsigned long svpfn; | ||
| 642 | unsigned long start_vaddr; | ||
| 643 | unsigned long end_vaddr; | ||
| 644 | 644 | ||
| 645 | if (!task) | 645 | if (!task) |
| 646 | goto out; | 646 | goto out; |
| @@ -659,11 +659,15 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
| 659 | if (!mm) | 659 | if (!mm) |
| 660 | goto out_task; | 660 | goto out_task; |
| 661 | 661 | ||
| 662 | ret = -ENOMEM; | 662 | |
| 663 | uaddr = (unsigned long)buf & PAGE_MASK; | 663 | uaddr = (unsigned long)buf & PAGE_MASK; |
| 664 | uend = (unsigned long)(buf + count); | 664 | uend = (unsigned long)(buf + count); |
| 665 | pagecount = (PAGE_ALIGN(uend) - uaddr) / PAGE_SIZE; | 665 | pagecount = (PAGE_ALIGN(uend) - uaddr) / PAGE_SIZE; |
| 666 | pages = kmalloc(pagecount * sizeof(struct page *), GFP_KERNEL); | 666 | ret = 0; |
| 667 | if (pagecount == 0) | ||
| 668 | goto out_mm; | ||
| 669 | pages = kcalloc(pagecount, sizeof(struct page *), GFP_KERNEL); | ||
| 670 | ret = -ENOMEM; | ||
| 667 | if (!pages) | 671 | if (!pages) |
| 668 | goto out_mm; | 672 | goto out_mm; |
| 669 | 673 | ||
| @@ -684,33 +688,33 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, | |||
| 684 | pm.out = (u64 *)buf; | 688 | pm.out = (u64 *)buf; |
| 685 | pm.end = (u64 *)(buf + count); | 689 | pm.end = (u64 *)(buf + count); |
| 686 | 690 | ||
| 687 | if (!ptrace_may_attach(task)) { | 691 | pagemap_walk.pmd_entry = pagemap_pte_range; |
| 688 | ret = -EIO; | 692 | pagemap_walk.pte_hole = pagemap_pte_hole; |
| 689 | } else { | 693 | pagemap_walk.mm = mm; |
| 690 | unsigned long src = *ppos; | 694 | pagemap_walk.private = ± |
| 691 | unsigned long svpfn = src / PM_ENTRY_BYTES; | 695 | |
| 692 | unsigned long start_vaddr = svpfn << PAGE_SHIFT; | 696 | src = *ppos; |
| 693 | unsigned long end_vaddr = TASK_SIZE_OF(task); | 697 | svpfn = src / PM_ENTRY_BYTES; |
| 694 | 698 | start_vaddr = svpfn << PAGE_SHIFT; | |
| 695 | /* watch out for wraparound */ | 699 | end_vaddr = TASK_SIZE_OF(task); |
| 696 | if (svpfn > TASK_SIZE_OF(task) >> PAGE_SHIFT) | 700 | |
| 697 | start_vaddr = end_vaddr; | 701 | /* watch out for wraparound */ |
| 698 | 702 | if (svpfn > TASK_SIZE_OF(task) >> PAGE_SHIFT) | |
| 699 | /* | 703 | start_vaddr = end_vaddr; |
| 700 | * The odds are that this will stop walking way | 704 | |
| 701 | * before end_vaddr, because the length of the | 705 | /* |
| 702 | * user buffer is tracked in "pm", and the walk | 706 | * The odds are that this will stop walking way |
| 703 | * will stop when we hit the end of the buffer. | 707 | * before end_vaddr, because the length of the |
| 704 | */ | 708 | * user buffer is tracked in "pm", and the walk |
| 705 | ret = walk_page_range(start_vaddr, end_vaddr, | 709 | * will stop when we hit the end of the buffer. |
| 706 | &pagemap_walk); | 710 | */ |
| 707 | if (ret == PM_END_OF_BUFFER) | 711 | ret = walk_page_range(start_vaddr, end_vaddr, &pagemap_walk); |
| 708 | ret = 0; | 712 | if (ret == PM_END_OF_BUFFER) |
| 709 | /* don't need mmap_sem for these, but this looks cleaner */ | 713 | ret = 0; |
| 710 | *ppos += (char *)pm.out - buf; | 714 | /* don't need mmap_sem for these, but this looks cleaner */ |
| 711 | if (!ret) | 715 | *ppos += (char *)pm.out - buf; |
| 712 | ret = (char *)pm.out - buf; | 716 | if (!ret) |
| 713 | } | 717 | ret = (char *)pm.out - buf; |
| 714 | 718 | ||
| 715 | out_pages: | 719 | out_pages: |
| 716 | for (; pagecount; pagecount--) { | 720 | for (; pagecount; pagecount--) { |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index ed424d708e69..1d40f2bd1970 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -2165,8 +2165,10 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type, | |||
| 2165 | blk++; | 2165 | blk++; |
| 2166 | } | 2166 | } |
| 2167 | out: | 2167 | out: |
| 2168 | if (len == towrite) | 2168 | if (len == towrite) { |
| 2169 | mutex_unlock(&inode->i_mutex); | ||
| 2169 | return err; | 2170 | return err; |
| 2171 | } | ||
| 2170 | if (inode->i_size < off + len - towrite) | 2172 | if (inode->i_size < off + len - towrite) |
| 2171 | i_size_write(inode, off + len - towrite); | 2173 | i_size_write(inode, off + len - towrite); |
| 2172 | inode->i_version++; | 2174 | inode->i_version++; |
diff --git a/fs/udf/super.c b/fs/udf/super.c index 7a5f69be6ac2..44cc702f96cc 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
| @@ -682,38 +682,26 @@ static int udf_vrs(struct super_block *sb, int silent) | |||
| 682 | /* | 682 | /* |
| 683 | * Check whether there is an anchor block in the given block | 683 | * Check whether there is an anchor block in the given block |
| 684 | */ | 684 | */ |
| 685 | static int udf_check_anchor_block(struct super_block *sb, sector_t block, | 685 | static int udf_check_anchor_block(struct super_block *sb, sector_t block) |
| 686 | bool varconv) | ||
| 687 | { | 686 | { |
| 688 | struct buffer_head *bh = NULL; | 687 | struct buffer_head *bh; |
| 689 | tag *t; | ||
| 690 | uint16_t ident; | 688 | uint16_t ident; |
| 691 | uint32_t location; | ||
| 692 | 689 | ||
| 693 | if (varconv) { | 690 | if (UDF_QUERY_FLAG(sb, UDF_FLAG_VARCONV) && |
| 694 | if (udf_fixed_to_variable(block) >= | 691 | udf_fixed_to_variable(block) >= |
| 695 | sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits) | 692 | sb->s_bdev->bd_inode->i_size >> sb->s_blocksize_bits) |
| 696 | return 0; | 693 | return 0; |
| 697 | bh = sb_bread(sb, udf_fixed_to_variable(block)); | ||
| 698 | } | ||
| 699 | else | ||
| 700 | bh = sb_bread(sb, block); | ||
| 701 | 694 | ||
| 695 | bh = udf_read_tagged(sb, block, block, &ident); | ||
| 702 | if (!bh) | 696 | if (!bh) |
| 703 | return 0; | 697 | return 0; |
| 704 | |||
| 705 | t = (tag *)bh->b_data; | ||
| 706 | ident = le16_to_cpu(t->tagIdent); | ||
| 707 | location = le32_to_cpu(t->tagLocation); | ||
| 708 | brelse(bh); | 698 | brelse(bh); |
| 709 | if (ident != TAG_IDENT_AVDP) | 699 | |
| 710 | return 0; | 700 | return ident == TAG_IDENT_AVDP; |
| 711 | return location == block; | ||
| 712 | } | 701 | } |
| 713 | 702 | ||
| 714 | /* Search for an anchor volume descriptor pointer */ | 703 | /* Search for an anchor volume descriptor pointer */ |
| 715 | static sector_t udf_scan_anchors(struct super_block *sb, bool varconv, | 704 | static sector_t udf_scan_anchors(struct super_block *sb, sector_t lastblock) |
| 716 | sector_t lastblock) | ||
| 717 | { | 705 | { |
| 718 | sector_t last[6]; | 706 | sector_t last[6]; |
| 719 | int i; | 707 | int i; |
| @@ -739,7 +727,7 @@ static sector_t udf_scan_anchors(struct super_block *sb, bool varconv, | |||
| 739 | sb->s_blocksize_bits) | 727 | sb->s_blocksize_bits) |
| 740 | continue; | 728 | continue; |
| 741 | 729 | ||
| 742 | if (udf_check_anchor_block(sb, last[i], varconv)) { | 730 | if (udf_check_anchor_block(sb, last[i])) { |
| 743 | sbi->s_anchor[0] = last[i]; | 731 | sbi->s_anchor[0] = last[i]; |
| 744 | sbi->s_anchor[1] = last[i] - 256; | 732 | sbi->s_anchor[1] = last[i] - 256; |
| 745 | return last[i]; | 733 | return last[i]; |
| @@ -748,17 +736,17 @@ static sector_t udf_scan_anchors(struct super_block *sb, bool varconv, | |||
| 748 | if (last[i] < 256) | 736 | if (last[i] < 256) |
| 749 | continue; | 737 | continue; |
| 750 | 738 | ||
| 751 | if (udf_check_anchor_block(sb, last[i] - 256, varconv)) { | 739 | if (udf_check_anchor_block(sb, last[i] - 256)) { |
| 752 | sbi->s_anchor[1] = last[i] - 256; | 740 | sbi->s_anchor[1] = last[i] - 256; |
| 753 | return last[i]; | 741 | return last[i]; |
| 754 | } | 742 | } |
| 755 | } | 743 | } |
| 756 | 744 | ||
| 757 | if (udf_check_anchor_block(sb, sbi->s_session + 256, varconv)) { | 745 | if (udf_check_anchor_block(sb, sbi->s_session + 256)) { |
| 758 | sbi->s_anchor[0] = sbi->s_session + 256; | 746 | sbi->s_anchor[0] = sbi->s_session + 256; |
| 759 | return last[0]; | 747 | return last[0]; |
| 760 | } | 748 | } |
| 761 | if (udf_check_anchor_block(sb, sbi->s_session + 512, varconv)) { | 749 | if (udf_check_anchor_block(sb, sbi->s_session + 512)) { |
| 762 | sbi->s_anchor[0] = sbi->s_session + 512; | 750 | sbi->s_anchor[0] = sbi->s_session + 512; |
| 763 | return last[0]; | 751 | return last[0]; |
| 764 | } | 752 | } |
| @@ -780,23 +768,24 @@ static void udf_find_anchor(struct super_block *sb) | |||
| 780 | int i; | 768 | int i; |
| 781 | struct udf_sb_info *sbi = UDF_SB(sb); | 769 | struct udf_sb_info *sbi = UDF_SB(sb); |
| 782 | 770 | ||
| 783 | lastblock = udf_scan_anchors(sb, 0, sbi->s_last_block); | 771 | lastblock = udf_scan_anchors(sb, sbi->s_last_block); |
| 784 | if (lastblock) | 772 | if (lastblock) |
| 785 | goto check_anchor; | 773 | goto check_anchor; |
| 786 | 774 | ||
| 787 | /* No anchor found? Try VARCONV conversion of block numbers */ | 775 | /* No anchor found? Try VARCONV conversion of block numbers */ |
| 776 | UDF_SET_FLAG(sb, UDF_FLAG_VARCONV); | ||
| 788 | /* Firstly, we try to not convert number of the last block */ | 777 | /* Firstly, we try to not convert number of the last block */ |
| 789 | lastblock = udf_scan_anchors(sb, 1, | 778 | lastblock = udf_scan_anchors(sb, |
| 790 | udf_variable_to_fixed(sbi->s_last_block)); | 779 | udf_variable_to_fixed(sbi->s_last_block)); |
| 791 | if (lastblock) { | 780 | if (lastblock) |
| 792 | UDF_SET_FLAG(sb, UDF_FLAG_VARCONV); | ||
| 793 | goto check_anchor; | 781 | goto check_anchor; |
| 794 | } | ||
| 795 | 782 | ||
| 796 | /* Secondly, we try with converted number of the last block */ | 783 | /* Secondly, we try with converted number of the last block */ |
| 797 | lastblock = udf_scan_anchors(sb, 1, sbi->s_last_block); | 784 | lastblock = udf_scan_anchors(sb, sbi->s_last_block); |
| 798 | if (lastblock) | 785 | if (!lastblock) { |
| 799 | UDF_SET_FLAG(sb, UDF_FLAG_VARCONV); | 786 | /* VARCONV didn't help. Clear it. */ |
| 787 | UDF_CLEAR_FLAG(sb, UDF_FLAG_VARCONV); | ||
| 788 | } | ||
| 800 | 789 | ||
| 801 | check_anchor: | 790 | check_anchor: |
| 802 | /* | 791 | /* |
diff --git a/fs/utimes.c b/fs/utimes.c index af059d5cb485..b6b664e7145e 100644 --- a/fs/utimes.c +++ b/fs/utimes.c | |||
| @@ -40,14 +40,9 @@ asmlinkage long sys_utime(char __user *filename, struct utimbuf __user *times) | |||
| 40 | 40 | ||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | static bool nsec_special(long nsec) | ||
| 44 | { | ||
| 45 | return nsec == UTIME_OMIT || nsec == UTIME_NOW; | ||
| 46 | } | ||
| 47 | |||
| 48 | static bool nsec_valid(long nsec) | 43 | static bool nsec_valid(long nsec) |
| 49 | { | 44 | { |
| 50 | if (nsec_special(nsec)) | 45 | if (nsec == UTIME_OMIT || nsec == UTIME_NOW) |
| 51 | return true; | 46 | return true; |
| 52 | 47 | ||
| 53 | return nsec >= 0 && nsec <= 999999999; | 48 | return nsec >= 0 && nsec <= 999999999; |
| @@ -102,7 +97,11 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags | |||
| 102 | if (error) | 97 | if (error) |
| 103 | goto dput_and_out; | 98 | goto dput_and_out; |
| 104 | 99 | ||
| 105 | /* Don't worry, the checks are done in inode_change_ok() */ | 100 | if (times && times[0].tv_nsec == UTIME_NOW && |
| 101 | times[1].tv_nsec == UTIME_NOW) | ||
| 102 | times = NULL; | ||
| 103 | |||
| 104 | /* In most cases, the checks are done in inode_change_ok() */ | ||
| 106 | newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME; | 105 | newattrs.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_ATIME; |
| 107 | if (times) { | 106 | if (times) { |
| 108 | error = -EPERM; | 107 | error = -EPERM; |
| @@ -124,28 +123,34 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags | |||
| 124 | newattrs.ia_mtime.tv_nsec = times[1].tv_nsec; | 123 | newattrs.ia_mtime.tv_nsec = times[1].tv_nsec; |
| 125 | newattrs.ia_valid |= ATTR_MTIME_SET; | 124 | newattrs.ia_valid |= ATTR_MTIME_SET; |
| 126 | } | 125 | } |
| 127 | } | ||
| 128 | 126 | ||
| 129 | /* | 127 | /* |
| 130 | * If times is NULL or both times are either UTIME_OMIT or | 128 | * For the UTIME_OMIT/UTIME_NOW and UTIME_NOW/UTIME_OMIT |
| 131 | * UTIME_NOW, then need to check permissions, because | 129 | * cases, we need to make an extra check that is not done by |
| 132 | * inode_change_ok() won't do it. | 130 | * inode_change_ok(). |
| 133 | */ | 131 | */ |
| 134 | if (!times || (nsec_special(times[0].tv_nsec) && | 132 | if (((times[0].tv_nsec == UTIME_NOW && |
| 135 | nsec_special(times[1].tv_nsec))) { | 133 | times[1].tv_nsec == UTIME_OMIT) |
| 134 | || | ||
| 135 | (times[0].tv_nsec == UTIME_OMIT && | ||
| 136 | times[1].tv_nsec == UTIME_NOW)) | ||
| 137 | && !is_owner_or_cap(inode)) | ||
| 138 | goto mnt_drop_write_and_out; | ||
| 139 | } else { | ||
| 140 | |||
| 141 | /* | ||
| 142 | * If times is NULL (or both times are UTIME_NOW), | ||
| 143 | * then we need to check permissions, because | ||
| 144 | * inode_change_ok() won't do it. | ||
| 145 | */ | ||
| 136 | error = -EACCES; | 146 | error = -EACCES; |
| 137 | if (IS_IMMUTABLE(inode)) | 147 | if (IS_IMMUTABLE(inode)) |
| 138 | goto mnt_drop_write_and_out; | 148 | goto mnt_drop_write_and_out; |
| 139 | 149 | ||
| 140 | if (!is_owner_or_cap(inode)) { | 150 | if (!is_owner_or_cap(inode)) { |
| 141 | if (f) { | 151 | error = permission(inode, MAY_WRITE, NULL); |
| 142 | if (!(f->f_mode & FMODE_WRITE)) | 152 | if (error) |
| 143 | goto mnt_drop_write_and_out; | 153 | goto mnt_drop_write_and_out; |
| 144 | } else { | ||
| 145 | error = vfs_permission(&nd, MAY_WRITE); | ||
| 146 | if (error) | ||
| 147 | goto mnt_drop_write_and_out; | ||
| 148 | } | ||
| 149 | } | 154 | } |
| 150 | } | 155 | } |
| 151 | mutex_lock(&inode->i_mutex); | 156 | mutex_lock(&inode->i_mutex); |
| @@ -169,14 +174,6 @@ asmlinkage long sys_utimensat(int dfd, char __user *filename, struct timespec __ | |||
| 169 | if (utimes) { | 174 | if (utimes) { |
| 170 | if (copy_from_user(&tstimes, utimes, sizeof(tstimes))) | 175 | if (copy_from_user(&tstimes, utimes, sizeof(tstimes))) |
| 171 | return -EFAULT; | 176 | return -EFAULT; |
| 172 | if ((tstimes[0].tv_nsec == UTIME_OMIT || | ||
| 173 | tstimes[0].tv_nsec == UTIME_NOW) && | ||
| 174 | tstimes[0].tv_sec != 0) | ||
| 175 | return -EINVAL; | ||
| 176 | if ((tstimes[1].tv_nsec == UTIME_OMIT || | ||
| 177 | tstimes[1].tv_nsec == UTIME_NOW) && | ||
| 178 | tstimes[1].tv_sec != 0) | ||
| 179 | return -EINVAL; | ||
| 180 | 177 | ||
| 181 | /* Nothing to do, we must not even check the path. */ | 178 | /* Nothing to do, we must not even check the path. */ |
| 182 | if (tstimes[0].tv_nsec == UTIME_OMIT && | 179 | if (tstimes[0].tv_nsec == UTIME_OMIT && |
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 92a6d91d0c1a..7cd25b8e7c9a 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | header-y += kvm.h | 1 | header-y += kvm.h |
| 2 | 2 | ||
| 3 | ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) | 3 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) |
| 4 | unifdef-y += a.out.h | 4 | unifdef-y += a.out.h |
| 5 | endif | 5 | endif |
| 6 | unifdef-y += auxvec.h | 6 | unifdef-y += auxvec.h |
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 85fd0aa27a8c..4ec0a296bdec 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define _ASM_GENERIC_ATOMIC_H | 2 | #define _ASM_GENERIC_ATOMIC_H |
| 3 | /* | 3 | /* |
| 4 | * Copyright (C) 2005 Silicon Graphics, Inc. | 4 | * Copyright (C) 2005 Silicon Graphics, Inc. |
| 5 | * Christoph Lameter <clameter@sgi.com> | 5 | * Christoph Lameter |
| 6 | * | 6 | * |
| 7 | * Allows to provide arch independent atomic definitions without the need to | 7 | * Allows to provide arch independent atomic definitions without the need to |
| 8 | * edit all arch specific atomic.h files. | 8 | * edit all arch specific atomic.h files. |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f054778e916c..f1992dc5c424 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -93,6 +93,8 @@ | |||
| 93 | VMLINUX_SYMBOL(__end_rio_route_ops) = .; \ | 93 | VMLINUX_SYMBOL(__end_rio_route_ops) = .; \ |
| 94 | } \ | 94 | } \ |
| 95 | \ | 95 | \ |
| 96 | TRACEDATA \ | ||
| 97 | \ | ||
| 96 | /* Kernel symbol table: Normal symbols */ \ | 98 | /* Kernel symbol table: Normal symbols */ \ |
| 97 | __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ | 99 | __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ |
| 98 | VMLINUX_SYMBOL(__start___ksymtab) = .; \ | 100 | VMLINUX_SYMBOL(__start___ksymtab) = .; \ |
| @@ -318,6 +320,18 @@ | |||
| 318 | __stop___bug_table = .; \ | 320 | __stop___bug_table = .; \ |
| 319 | } | 321 | } |
| 320 | 322 | ||
| 323 | #ifdef CONFIG_PM_TRACE | ||
| 324 | #define TRACEDATA \ | ||
| 325 | . = ALIGN(4); \ | ||
| 326 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ | ||
| 327 | __tracedata_start = .; \ | ||
| 328 | *(.tracedata) \ | ||
| 329 | __tracedata_end = .; \ | ||
| 330 | } | ||
| 331 | #else | ||
| 332 | #define TRACEDATA | ||
| 333 | #endif | ||
| 334 | |||
| 321 | #define NOTES \ | 335 | #define NOTES \ |
| 322 | .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ | 336 | .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ |
| 323 | VMLINUX_SYMBOL(__start_notes) = .; \ | 337 | VMLINUX_SYMBOL(__start_notes) = .; \ |
diff --git a/include/asm-mips/atomic.h b/include/asm-mips/atomic.h index a798d6299a79..1232be3885b0 100644 --- a/include/asm-mips/atomic.h +++ b/include/asm-mips/atomic.h | |||
| @@ -283,10 +283,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) | |||
| 283 | " beqz %0, 2f \n" | 283 | " beqz %0, 2f \n" |
| 284 | " subu %0, %1, %3 \n" | 284 | " subu %0, %1, %3 \n" |
| 285 | " .set reorder \n" | 285 | " .set reorder \n" |
| 286 | "1: \n" | ||
| 287 | " .subsection 2 \n" | 286 | " .subsection 2 \n" |
| 288 | "2: b 1b \n" | 287 | "2: b 1b \n" |
| 289 | " .previous \n" | 288 | " .previous \n" |
| 289 | "1: \n" | ||
| 290 | " .set mips0 \n" | 290 | " .set mips0 \n" |
| 291 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 291 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 292 | : "Ir" (i), "m" (v->counter) | 292 | : "Ir" (i), "m" (v->counter) |
| @@ -664,10 +664,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) | |||
| 664 | " beqz %0, 2f \n" | 664 | " beqz %0, 2f \n" |
| 665 | " dsubu %0, %1, %3 \n" | 665 | " dsubu %0, %1, %3 \n" |
| 666 | " .set reorder \n" | 666 | " .set reorder \n" |
| 667 | "1: \n" | ||
| 668 | " .subsection 2 \n" | 667 | " .subsection 2 \n" |
| 669 | "2: b 1b \n" | 668 | "2: b 1b \n" |
| 670 | " .previous \n" | 669 | " .previous \n" |
| 670 | "1: \n" | ||
| 671 | " .set mips0 \n" | 671 | " .set mips0 \n" |
| 672 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) | 672 | : "=&r" (result), "=&r" (temp), "=m" (v->counter) |
| 673 | : "Ir" (i), "m" (v->counter) | 673 | : "Ir" (i), "m" (v->counter) |
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild index 7381916dfcbb..bca352e033c3 100644 --- a/include/asm-powerpc/Kbuild +++ b/include/asm-powerpc/Kbuild | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-y += a.out.h | ||
| 4 | header-y += auxvec.h | 3 | header-y += auxvec.h |
| 5 | header-y += ioctls.h | 4 | header-y += ioctls.h |
| 6 | header-y += mman.h | 5 | header-y += mman.h |
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index be9639a9a186..313bcaf4b6c3 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
| @@ -36,14 +36,10 @@ extern void generic_apic_probe(void); | |||
| 36 | #ifdef CONFIG_X86_LOCAL_APIC | 36 | #ifdef CONFIG_X86_LOCAL_APIC |
| 37 | 37 | ||
| 38 | extern int apic_verbosity; | 38 | extern int apic_verbosity; |
| 39 | extern int timer_over_8254; | ||
| 40 | extern int local_apic_timer_c2_ok; | 39 | extern int local_apic_timer_c2_ok; |
| 41 | extern int local_apic_timer_disabled; | ||
| 42 | 40 | ||
| 43 | extern int apic_runs_main_timer; | ||
| 44 | extern int ioapic_force; | 41 | extern int ioapic_force; |
| 45 | extern int disable_apic; | 42 | extern int disable_apic; |
| 46 | extern int disable_apic_timer; | ||
| 47 | 43 | ||
| 48 | /* | 44 | /* |
| 49 | * Basic functions accessing APICs. | 45 | * Basic functions accessing APICs. |
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h index 90dec0c23646..70939820c55f 100644 --- a/include/asm-x86/asm.h +++ b/include/asm-x86/asm.h | |||
| @@ -1,33 +1,29 @@ | |||
| 1 | #ifndef _ASM_X86_ASM_H | 1 | #ifndef _ASM_X86_ASM_H |
| 2 | #define _ASM_X86_ASM_H | 2 | #define _ASM_X86_ASM_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_X86_32 | 4 | #ifdef __ASSEMBLY__ |
| 5 | /* 32 bits */ | 5 | # define __ASM_FORM(x) x |
| 6 | 6 | #else | |
| 7 | # define _ASM_PTR " .long " | 7 | # define __ASM_FORM(x) " " #x " " |
| 8 | # define _ASM_ALIGN " .balign 4 " | 8 | #endif |
| 9 | # define _ASM_MOV_UL " movl " | ||
| 10 | |||
| 11 | # define _ASM_INC " incl " | ||
| 12 | # define _ASM_DEC " decl " | ||
| 13 | # define _ASM_ADD " addl " | ||
| 14 | # define _ASM_SUB " subl " | ||
| 15 | # define _ASM_XADD " xaddl " | ||
| 16 | 9 | ||
| 10 | #ifdef CONFIG_X86_32 | ||
| 11 | # define __ASM_SEL(a,b) __ASM_FORM(a) | ||
| 17 | #else | 12 | #else |
| 18 | /* 64 bits */ | 13 | # define __ASM_SEL(a,b) __ASM_FORM(b) |
| 14 | #endif | ||
| 19 | 15 | ||
| 20 | # define _ASM_PTR " .quad " | 16 | #define __ASM_SIZE(inst) __ASM_SEL(inst##l, inst##q) |
| 21 | # define _ASM_ALIGN " .balign 8 " | ||
| 22 | # define _ASM_MOV_UL " movq " | ||
| 23 | 17 | ||
| 24 | # define _ASM_INC " incq " | 18 | #define _ASM_PTR __ASM_SEL(.long, .quad) |
| 25 | # define _ASM_DEC " decq " | 19 | #define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8) |
| 26 | # define _ASM_ADD " addq " | 20 | #define _ASM_MOV_UL __ASM_SIZE(mov) |
| 27 | # define _ASM_SUB " subq " | ||
| 28 | # define _ASM_XADD " xaddq " | ||
| 29 | 21 | ||
| 30 | #endif /* CONFIG_X86_32 */ | 22 | #define _ASM_INC __ASM_SIZE(inc) |
| 23 | #define _ASM_DEC __ASM_SIZE(dec) | ||
| 24 | #define _ASM_ADD __ASM_SIZE(add) | ||
| 25 | #define _ASM_SUB __ASM_SIZE(sub) | ||
| 26 | #define _ASM_XADD __ASM_SIZE(xadd) | ||
| 31 | 27 | ||
| 32 | /* Exception table entry */ | 28 | /* Exception table entry */ |
| 33 | # define _ASM_EXTABLE(from,to) \ | 29 | # define _ASM_EXTABLE(from,to) \ |
diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h index 3e0cd7d38335..fe589c153db8 100644 --- a/include/asm-x86/atomic_64.h +++ b/include/asm-x86/atomic_64.h | |||
| @@ -11,12 +11,6 @@ | |||
| 11 | * resource counting etc.. | 11 | * resource counting etc.. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_SMP | ||
| 15 | #define LOCK "lock ; " | ||
| 16 | #else | ||
| 17 | #define LOCK "" | ||
| 18 | #endif | ||
| 19 | |||
| 20 | /* | 14 | /* |
| 21 | * Make sure gcc doesn't try to be clever and move things around | 15 | * Make sure gcc doesn't try to be clever and move things around |
| 22 | * on us. We need to use _exactly_ the address the user gave us, | 16 | * on us. We need to use _exactly_ the address the user gave us, |
diff --git a/include/asm-x86/bitops.h b/include/asm-x86/bitops.h index ee4b3ead6a43..96b1829cea15 100644 --- a/include/asm-x86/bitops.h +++ b/include/asm-x86/bitops.h | |||
| @@ -23,11 +23,21 @@ | |||
| 23 | #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) | 23 | #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) |
| 24 | /* Technically wrong, but this avoids compilation errors on some gcc | 24 | /* Technically wrong, but this avoids compilation errors on some gcc |
| 25 | versions. */ | 25 | versions. */ |
| 26 | #define ADDR "=m" (*(volatile long *) addr) | 26 | #define BITOP_ADDR(x) "=m" (*(volatile long *) (x)) |
| 27 | #else | 27 | #else |
| 28 | #define ADDR "+m" (*(volatile long *) addr) | 28 | #define BITOP_ADDR(x) "+m" (*(volatile long *) (x)) |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #define ADDR BITOP_ADDR(addr) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * We do the locked ops that don't return the old value as | ||
| 35 | * a mask operation on a byte. | ||
| 36 | */ | ||
| 37 | #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr)) | ||
| 38 | #define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3)) | ||
| 39 | #define CONST_MASK(nr) (1 << ((nr) & 7)) | ||
| 40 | |||
| 31 | /** | 41 | /** |
| 32 | * set_bit - Atomically set a bit in memory | 42 | * set_bit - Atomically set a bit in memory |
| 33 | * @nr: the bit to set | 43 | * @nr: the bit to set |
| @@ -43,9 +53,17 @@ | |||
| 43 | * Note that @nr may be almost arbitrarily large; this function is not | 53 | * Note that @nr may be almost arbitrarily large; this function is not |
| 44 | * restricted to acting on a single-word quantity. | 54 | * restricted to acting on a single-word quantity. |
| 45 | */ | 55 | */ |
| 46 | static inline void set_bit(int nr, volatile void *addr) | 56 | static inline void set_bit(unsigned int nr, volatile unsigned long *addr) |
| 47 | { | 57 | { |
| 48 | asm volatile(LOCK_PREFIX "bts %1,%0" : ADDR : "Ir" (nr) : "memory"); | 58 | if (IS_IMMEDIATE(nr)) { |
| 59 | asm volatile(LOCK_PREFIX "orb %1,%0" | ||
| 60 | : CONST_MASK_ADDR(nr, addr) | ||
| 61 | : "iq" ((u8)CONST_MASK(nr)) | ||
| 62 | : "memory"); | ||
| 63 | } else { | ||
| 64 | asm volatile(LOCK_PREFIX "bts %1,%0" | ||
| 65 | : BITOP_ADDR(addr) : "Ir" (nr) : "memory"); | ||
| 66 | } | ||
| 49 | } | 67 | } |
| 50 | 68 | ||
| 51 | /** | 69 | /** |
| @@ -57,7 +75,7 @@ static inline void set_bit(int nr, volatile void *addr) | |||
| 57 | * If it's called on the same region of memory simultaneously, the effect | 75 | * If it's called on the same region of memory simultaneously, the effect |
| 58 | * may be that only one operation succeeds. | 76 | * may be that only one operation succeeds. |
| 59 | */ | 77 | */ |
| 60 | static inline void __set_bit(int nr, volatile void *addr) | 78 | static inline void __set_bit(int nr, volatile unsigned long *addr) |
| 61 | { | 79 | { |
| 62 | asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory"); | 80 | asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory"); |
| 63 | } | 81 | } |
| @@ -72,9 +90,17 @@ static inline void __set_bit(int nr, volatile void *addr) | |||
| 72 | * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() | 90 | * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() |
| 73 | * in order to ensure changes are visible on other processors. | 91 | * in order to ensure changes are visible on other processors. |
| 74 | */ | 92 | */ |
| 75 | static inline void clear_bit(int nr, volatile void *addr) | 93 | static inline void clear_bit(int nr, volatile unsigned long *addr) |
| 76 | { | 94 | { |
| 77 | asm volatile(LOCK_PREFIX "btr %1,%0" : ADDR : "Ir" (nr)); | 95 | if (IS_IMMEDIATE(nr)) { |
| 96 | asm volatile(LOCK_PREFIX "andb %1,%0" | ||
| 97 | : CONST_MASK_ADDR(nr, addr) | ||
| 98 | : "iq" ((u8)~CONST_MASK(nr))); | ||
| 99 | } else { | ||
| 100 | asm volatile(LOCK_PREFIX "btr %1,%0" | ||
| 101 | : BITOP_ADDR(addr) | ||
| 102 | : "Ir" (nr)); | ||
| 103 | } | ||
| 78 | } | 104 | } |
| 79 | 105 | ||
| 80 | /* | 106 | /* |
| @@ -85,13 +111,13 @@ static inline void clear_bit(int nr, volatile void *addr) | |||
| 85 | * clear_bit() is atomic and implies release semantics before the memory | 111 | * clear_bit() is atomic and implies release semantics before the memory |
| 86 | * operation. It can be used for an unlock. | 112 | * operation. It can be used for an unlock. |
| 87 | */ | 113 | */ |
| 88 | static inline void clear_bit_unlock(unsigned nr, volatile void *addr) | 114 | static inline void clear_bit_unlock(unsigned nr, volatile unsigned long *addr) |
| 89 | { | 115 | { |
| 90 | barrier(); | 116 | barrier(); |
| 91 | clear_bit(nr, addr); | 117 | clear_bit(nr, addr); |
| 92 | } | 118 | } |
| 93 | 119 | ||
| 94 | static inline void __clear_bit(int nr, volatile void *addr) | 120 | static inline void __clear_bit(int nr, volatile unsigned long *addr) |
| 95 | { | 121 | { |
| 96 | asm volatile("btr %1,%0" : ADDR : "Ir" (nr)); | 122 | asm volatile("btr %1,%0" : ADDR : "Ir" (nr)); |
| 97 | } | 123 | } |
| @@ -108,7 +134,7 @@ static inline void __clear_bit(int nr, volatile void *addr) | |||
| 108 | * No memory barrier is required here, because x86 cannot reorder stores past | 134 | * No memory barrier is required here, because x86 cannot reorder stores past |
| 109 | * older loads. Same principle as spin_unlock. | 135 | * older loads. Same principle as spin_unlock. |
| 110 | */ | 136 | */ |
| 111 | static inline void __clear_bit_unlock(unsigned nr, volatile void *addr) | 137 | static inline void __clear_bit_unlock(unsigned nr, volatile unsigned long *addr) |
| 112 | { | 138 | { |
| 113 | barrier(); | 139 | barrier(); |
| 114 | __clear_bit(nr, addr); | 140 | __clear_bit(nr, addr); |
| @@ -126,7 +152,7 @@ static inline void __clear_bit_unlock(unsigned nr, volatile void *addr) | |||
| 126 | * If it's called on the same region of memory simultaneously, the effect | 152 | * If it's called on the same region of memory simultaneously, the effect |
| 127 | * may be that only one operation succeeds. | 153 | * may be that only one operation succeeds. |
| 128 | */ | 154 | */ |
| 129 | static inline void __change_bit(int nr, volatile void *addr) | 155 | static inline void __change_bit(int nr, volatile unsigned long *addr) |
| 130 | { | 156 | { |
| 131 | asm volatile("btc %1,%0" : ADDR : "Ir" (nr)); | 157 | asm volatile("btc %1,%0" : ADDR : "Ir" (nr)); |
| 132 | } | 158 | } |
| @@ -140,7 +166,7 @@ static inline void __change_bit(int nr, volatile void *addr) | |||
| 140 | * Note that @nr may be almost arbitrarily large; this function is not | 166 | * Note that @nr may be almost arbitrarily large; this function is not |
| 141 | * restricted to acting on a single-word quantity. | 167 | * restricted to acting on a single-word quantity. |
| 142 | */ | 168 | */ |
| 143 | static inline void change_bit(int nr, volatile void *addr) | 169 | static inline void change_bit(int nr, volatile unsigned long *addr) |
| 144 | { | 170 | { |
| 145 | asm volatile(LOCK_PREFIX "btc %1,%0" : ADDR : "Ir" (nr)); | 171 | asm volatile(LOCK_PREFIX "btc %1,%0" : ADDR : "Ir" (nr)); |
| 146 | } | 172 | } |
| @@ -153,7 +179,7 @@ static inline void change_bit(int nr, volatile void *addr) | |||
| 153 | * This operation is atomic and cannot be reordered. | 179 | * This operation is atomic and cannot be reordered. |
| 154 | * It also implies a memory barrier. | 180 | * It also implies a memory barrier. |
| 155 | */ | 181 | */ |
| 156 | static inline int test_and_set_bit(int nr, volatile void *addr) | 182 | static inline int test_and_set_bit(int nr, volatile unsigned long *addr) |
| 157 | { | 183 | { |
| 158 | int oldbit; | 184 | int oldbit; |
| 159 | 185 | ||
| @@ -170,7 +196,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) | |||
| 170 | * | 196 | * |
| 171 | * This is the same as test_and_set_bit on x86. | 197 | * This is the same as test_and_set_bit on x86. |
| 172 | */ | 198 | */ |
| 173 | static inline int test_and_set_bit_lock(int nr, volatile void *addr) | 199 | static inline int test_and_set_bit_lock(int nr, volatile unsigned long *addr) |
| 174 | { | 200 | { |
| 175 | return test_and_set_bit(nr, addr); | 201 | return test_and_set_bit(nr, addr); |
| 176 | } | 202 | } |
| @@ -184,7 +210,7 @@ static inline int test_and_set_bit_lock(int nr, volatile void *addr) | |||
| 184 | * If two examples of this operation race, one can appear to succeed | 210 | * If two examples of this operation race, one can appear to succeed |
| 185 | * but actually fail. You must protect multiple accesses with a lock. | 211 | * but actually fail. You must protect multiple accesses with a lock. |
| 186 | */ | 212 | */ |
| 187 | static inline int __test_and_set_bit(int nr, volatile void *addr) | 213 | static inline int __test_and_set_bit(int nr, volatile unsigned long *addr) |
| 188 | { | 214 | { |
| 189 | int oldbit; | 215 | int oldbit; |
| 190 | 216 | ||
| @@ -203,7 +229,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr) | |||
| 203 | * This operation is atomic and cannot be reordered. | 229 | * This operation is atomic and cannot be reordered. |
| 204 | * It also implies a memory barrier. | 230 | * It also implies a memory barrier. |
| 205 | */ | 231 | */ |
| 206 | static inline int test_and_clear_bit(int nr, volatile void *addr) | 232 | static inline int test_and_clear_bit(int nr, volatile unsigned long *addr) |
| 207 | { | 233 | { |
| 208 | int oldbit; | 234 | int oldbit; |
| 209 | 235 | ||
| @@ -223,7 +249,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) | |||
| 223 | * If two examples of this operation race, one can appear to succeed | 249 | * If two examples of this operation race, one can appear to succeed |
| 224 | * but actually fail. You must protect multiple accesses with a lock. | 250 | * but actually fail. You must protect multiple accesses with a lock. |
| 225 | */ | 251 | */ |
| 226 | static inline int __test_and_clear_bit(int nr, volatile void *addr) | 252 | static inline int __test_and_clear_bit(int nr, volatile unsigned long *addr) |
| 227 | { | 253 | { |
| 228 | int oldbit; | 254 | int oldbit; |
| 229 | 255 | ||
| @@ -235,7 +261,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) | |||
| 235 | } | 261 | } |
| 236 | 262 | ||
| 237 | /* WARNING: non atomic and it can be reordered! */ | 263 | /* WARNING: non atomic and it can be reordered! */ |
| 238 | static inline int __test_and_change_bit(int nr, volatile void *addr) | 264 | static inline int __test_and_change_bit(int nr, volatile unsigned long *addr) |
| 239 | { | 265 | { |
| 240 | int oldbit; | 266 | int oldbit; |
| 241 | 267 | ||
| @@ -255,7 +281,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr) | |||
| 255 | * This operation is atomic and cannot be reordered. | 281 | * This operation is atomic and cannot be reordered. |
| 256 | * It also implies a memory barrier. | 282 | * It also implies a memory barrier. |
| 257 | */ | 283 | */ |
| 258 | static inline int test_and_change_bit(int nr, volatile void *addr) | 284 | static inline int test_and_change_bit(int nr, volatile unsigned long *addr) |
| 259 | { | 285 | { |
| 260 | int oldbit; | 286 | int oldbit; |
| 261 | 287 | ||
| @@ -266,13 +292,13 @@ static inline int test_and_change_bit(int nr, volatile void *addr) | |||
| 266 | return oldbit; | 292 | return oldbit; |
| 267 | } | 293 | } |
| 268 | 294 | ||
| 269 | static inline int constant_test_bit(int nr, const volatile void *addr) | 295 | static inline int constant_test_bit(int nr, const volatile unsigned long *addr) |
| 270 | { | 296 | { |
| 271 | return ((1UL << (nr % BITS_PER_LONG)) & | 297 | return ((1UL << (nr % BITS_PER_LONG)) & |
| 272 | (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0; | 298 | (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0; |
| 273 | } | 299 | } |
| 274 | 300 | ||
| 275 | static inline int variable_test_bit(int nr, volatile const void *addr) | 301 | static inline int variable_test_bit(int nr, volatile const unsigned long *addr) |
| 276 | { | 302 | { |
| 277 | int oldbit; | 303 | int oldbit; |
| 278 | 304 | ||
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 0d609c837a41..78b47e7404eb 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -142,11 +142,11 @@ extern const char * const x86_power_flags[32]; | |||
| 142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) | 142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) |
| 143 | #define setup_clear_cpu_cap(bit) do { \ | 143 | #define setup_clear_cpu_cap(bit) do { \ |
| 144 | clear_cpu_cap(&boot_cpu_data, bit); \ | 144 | clear_cpu_cap(&boot_cpu_data, bit); \ |
| 145 | set_bit(bit, cleared_cpu_caps); \ | 145 | set_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
| 146 | } while (0) | 146 | } while (0) |
| 147 | #define setup_force_cpu_cap(bit) do { \ | 147 | #define setup_force_cpu_cap(bit) do { \ |
| 148 | set_cpu_cap(&boot_cpu_data, bit); \ | 148 | set_cpu_cap(&boot_cpu_data, bit); \ |
| 149 | clear_bit(bit, cleared_cpu_caps); \ | 149 | clear_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
| 150 | } while (0) | 150 | } while (0) |
| 151 | 151 | ||
| 152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) | 152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) |
diff --git a/include/asm-x86/current.h b/include/asm-x86/current.h index d2526d3f7346..7515c19d4988 100644 --- a/include/asm-x86/current.h +++ b/include/asm-x86/current.h | |||
| @@ -1,5 +1,39 @@ | |||
| 1 | #ifndef _X86_CURRENT_H | ||
| 2 | #define _X86_CURRENT_H | ||
| 3 | |||
| 1 | #ifdef CONFIG_X86_32 | 4 | #ifdef CONFIG_X86_32 |
| 2 | # include "current_32.h" | 5 | #include <linux/compiler.h> |
| 3 | #else | 6 | #include <asm/percpu.h> |
| 4 | # include "current_64.h" | 7 | |
| 5 | #endif | 8 | struct task_struct; |
| 9 | |||
| 10 | DECLARE_PER_CPU(struct task_struct *, current_task); | ||
| 11 | static __always_inline struct task_struct *get_current(void) | ||
| 12 | { | ||
| 13 | return x86_read_percpu(current_task); | ||
| 14 | } | ||
| 15 | |||
| 16 | #else /* X86_32 */ | ||
| 17 | |||
| 18 | #ifndef __ASSEMBLY__ | ||
| 19 | #include <asm/pda.h> | ||
| 20 | |||
| 21 | struct task_struct; | ||
| 22 | |||
| 23 | static __always_inline struct task_struct *get_current(void) | ||
| 24 | { | ||
| 25 | return read_pda(pcurrent); | ||
| 26 | } | ||
| 27 | |||
| 28 | #else /* __ASSEMBLY__ */ | ||
| 29 | |||
| 30 | #include <asm/asm-offsets.h> | ||
| 31 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | ||
| 32 | |||
| 33 | #endif /* __ASSEMBLY__ */ | ||
| 34 | |||
| 35 | #endif /* X86_32 */ | ||
| 36 | |||
| 37 | #define current get_current() | ||
| 38 | |||
| 39 | #endif /* X86_CURRENT_H */ | ||
diff --git a/include/asm-x86/current_32.h b/include/asm-x86/current_32.h deleted file mode 100644 index 5af9bdb97a16..000000000000 --- a/include/asm-x86/current_32.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | #ifndef _I386_CURRENT_H | ||
| 2 | #define _I386_CURRENT_H | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | #include <asm/percpu.h> | ||
| 6 | |||
| 7 | struct task_struct; | ||
| 8 | |||
| 9 | DECLARE_PER_CPU(struct task_struct *, current_task); | ||
| 10 | static __always_inline struct task_struct *get_current(void) | ||
| 11 | { | ||
| 12 | return x86_read_percpu(current_task); | ||
| 13 | } | ||
| 14 | |||
| 15 | #define current get_current() | ||
| 16 | |||
| 17 | #endif /* !(_I386_CURRENT_H) */ | ||
diff --git a/include/asm-x86/current_64.h b/include/asm-x86/current_64.h deleted file mode 100644 index 2d368ede2fc1..000000000000 --- a/include/asm-x86/current_64.h +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | #ifndef _X86_64_CURRENT_H | ||
| 2 | #define _X86_64_CURRENT_H | ||
| 3 | |||
| 4 | #if !defined(__ASSEMBLY__) | ||
| 5 | struct task_struct; | ||
| 6 | |||
| 7 | #include <asm/pda.h> | ||
| 8 | |||
| 9 | static inline struct task_struct *get_current(void) | ||
| 10 | { | ||
| 11 | struct task_struct *t = read_pda(pcurrent); | ||
| 12 | return t; | ||
| 13 | } | ||
| 14 | |||
| 15 | #define current get_current() | ||
| 16 | |||
| 17 | #else | ||
| 18 | |||
| 19 | #ifndef ASM_OFFSET_H | ||
| 20 | #include <asm/asm-offsets.h> | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | ||
| 24 | |||
| 25 | #endif | ||
| 26 | |||
| 27 | #endif /* !(_X86_64_CURRENT_H) */ | ||
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index 7004251fc66b..5103d0b2c46c 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h | |||
| @@ -24,6 +24,7 @@ struct e820map { | |||
| 24 | 24 | ||
| 25 | #define ISA_START_ADDRESS 0xa0000 | 25 | #define ISA_START_ADDRESS 0xa0000 |
| 26 | #define ISA_END_ADDRESS 0x100000 | 26 | #define ISA_END_ADDRESS 0x100000 |
| 27 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) | ||
| 27 | 28 | ||
| 28 | #define BIOS_BEGIN 0x000a0000 | 29 | #define BIOS_BEGIN 0x000a0000 |
| 29 | #define BIOS_END 0x00100000 | 30 | #define BIOS_END 0x00100000 |
diff --git a/include/asm-x86/fixmap_32.h b/include/asm-x86/fixmap_32.h index 4b96148e90c1..f0df7ee96816 100644 --- a/include/asm-x86/fixmap_32.h +++ b/include/asm-x86/fixmap_32.h | |||
| @@ -79,10 +79,6 @@ enum fixed_addresses { | |||
| 79 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ | 79 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ |
| 80 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | 80 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, |
| 81 | #endif | 81 | #endif |
| 82 | #ifdef CONFIG_ACPI | ||
| 83 | FIX_ACPI_BEGIN, | ||
| 84 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
| 85 | #endif | ||
| 86 | #ifdef CONFIG_PCI_MMCONFIG | 82 | #ifdef CONFIG_PCI_MMCONFIG |
| 87 | FIX_PCIE_MCFG, | 83 | FIX_PCIE_MCFG, |
| 88 | #endif | 84 | #endif |
| @@ -103,6 +99,10 @@ enum fixed_addresses { | |||
| 103 | (__end_of_permanent_fixed_addresses & 511), | 99 | (__end_of_permanent_fixed_addresses & 511), |
| 104 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, | 100 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, |
| 105 | FIX_WP_TEST, | 101 | FIX_WP_TEST, |
| 102 | #ifdef CONFIG_ACPI | ||
| 103 | FIX_ACPI_BEGIN, | ||
| 104 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
| 105 | #endif | ||
| 106 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | 106 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
| 107 | FIX_OHCI1394_BASE, | 107 | FIX_OHCI1394_BASE, |
| 108 | #endif | 108 | #endif |
diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h index 90958ed993fa..eeca2f51fd8f 100644 --- a/include/asm-x86/gart.h +++ b/include/asm-x86/gart.h | |||
| @@ -1,16 +1,20 @@ | |||
| 1 | #ifndef _ASM_X8664_IOMMU_H | 1 | #ifndef _ASM_X8664_IOMMU_H |
| 2 | #define _ASM_X8664_IOMMU_H 1 | 2 | #define _ASM_X8664_IOMMU_H 1 |
| 3 | 3 | ||
| 4 | #include <asm/e820.h> | ||
| 5 | |||
| 4 | extern void pci_iommu_shutdown(void); | 6 | extern void pci_iommu_shutdown(void); |
| 5 | extern void no_iommu_init(void); | 7 | extern void no_iommu_init(void); |
| 6 | extern int force_iommu, no_iommu; | 8 | extern int force_iommu, no_iommu; |
| 7 | extern int iommu_detected; | 9 | extern int iommu_detected; |
| 10 | extern int agp_amd64_init(void); | ||
| 8 | #ifdef CONFIG_GART_IOMMU | 11 | #ifdef CONFIG_GART_IOMMU |
| 9 | extern void gart_iommu_init(void); | 12 | extern void gart_iommu_init(void); |
| 10 | extern void gart_iommu_shutdown(void); | 13 | extern void gart_iommu_shutdown(void); |
| 11 | extern void __init gart_parse_options(char *); | 14 | extern void __init gart_parse_options(char *); |
| 12 | extern void early_gart_iommu_check(void); | 15 | extern void early_gart_iommu_check(void); |
| 13 | extern void gart_iommu_hole_init(void); | 16 | extern void gart_iommu_hole_init(void); |
| 17 | extern void set_up_gart_resume(u32, u32); | ||
| 14 | extern int fallback_aper_order; | 18 | extern int fallback_aper_order; |
| 15 | extern int fallback_aper_force; | 19 | extern int fallback_aper_force; |
| 16 | extern int gart_iommu_aperture; | 20 | extern int gart_iommu_aperture; |
| @@ -31,4 +35,63 @@ static inline void gart_iommu_shutdown(void) | |||
| 31 | 35 | ||
| 32 | #endif | 36 | #endif |
| 33 | 37 | ||
| 38 | /* PTE bits. */ | ||
| 39 | #define GPTE_VALID 1 | ||
| 40 | #define GPTE_COHERENT 2 | ||
| 41 | |||
| 42 | /* Aperture control register bits. */ | ||
| 43 | #define GARTEN (1<<0) | ||
| 44 | #define DISGARTCPU (1<<4) | ||
| 45 | #define DISGARTIO (1<<5) | ||
| 46 | |||
| 47 | /* GART cache control register bits. */ | ||
| 48 | #define INVGART (1<<0) | ||
| 49 | #define GARTPTEERR (1<<1) | ||
| 50 | |||
| 51 | /* K8 On-cpu GART registers */ | ||
| 52 | #define AMD64_GARTAPERTURECTL 0x90 | ||
| 53 | #define AMD64_GARTAPERTUREBASE 0x94 | ||
| 54 | #define AMD64_GARTTABLEBASE 0x98 | ||
| 55 | #define AMD64_GARTCACHECTL 0x9c | ||
| 56 | #define AMD64_GARTEN (1<<0) | ||
| 57 | |||
| 58 | static inline void enable_gart_translation(struct pci_dev *dev, u64 addr) | ||
| 59 | { | ||
| 60 | u32 tmp, ctl; | ||
| 61 | |||
| 62 | /* address of the mappings table */ | ||
| 63 | addr >>= 12; | ||
| 64 | tmp = (u32) addr<<4; | ||
| 65 | tmp &= ~0xf; | ||
| 66 | pci_write_config_dword(dev, AMD64_GARTTABLEBASE, tmp); | ||
| 67 | |||
| 68 | /* Enable GART translation for this hammer. */ | ||
| 69 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); | ||
| 70 | ctl |= GARTEN; | ||
| 71 | ctl &= ~(DISGARTCPU | DISGARTIO); | ||
| 72 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); | ||
| 73 | } | ||
| 74 | |||
| 75 | static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) | ||
| 76 | { | ||
| 77 | if (!aper_base) | ||
| 78 | return 0; | ||
| 79 | |||
| 80 | if (aper_base + aper_size > 0x100000000ULL) { | ||
| 81 | printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); | ||
| 82 | return 0; | ||
| 83 | } | ||
| 84 | if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { | ||
| 85 | printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); | ||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | if (aper_size < min_size) { | ||
| 89 | printk(KERN_ERR "Aperture too small (%d MB) than (%d MB)\n", | ||
| 90 | aper_size>>20, min_size>>20); | ||
| 91 | return 0; | ||
| 92 | } | ||
| 93 | |||
| 94 | return 1; | ||
| 95 | } | ||
| 96 | |||
| 34 | #endif | 97 | #endif |
diff --git a/include/asm-x86/hardirq.h b/include/asm-x86/hardirq.h index 314434d664e7..000787df66e6 100644 --- a/include/asm-x86/hardirq.h +++ b/include/asm-x86/hardirq.h | |||
| @@ -3,3 +3,9 @@ | |||
| 3 | #else | 3 | #else |
| 4 | # include "hardirq_64.h" | 4 | # include "hardirq_64.h" |
| 5 | #endif | 5 | #endif |
| 6 | |||
| 7 | extern u64 arch_irq_stat_cpu(unsigned int cpu); | ||
| 8 | #define arch_irq_stat_cpu arch_irq_stat_cpu | ||
| 9 | |||
| 10 | extern u64 arch_irq_stat(void); | ||
| 11 | #define arch_irq_stat arch_irq_stat | ||
diff --git a/include/asm-x86/i8259.h b/include/asm-x86/i8259.h index 45d4df3e51e6..2f98df91f1f2 100644 --- a/include/asm-x86/i8259.h +++ b/include/asm-x86/i8259.h | |||
| @@ -55,4 +55,6 @@ static inline void outb_pic(unsigned char value, unsigned int port) | |||
| 55 | udelay(2); | 55 | udelay(2); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | extern struct irq_chip i8259A_chip; | ||
| 59 | |||
| 58 | #endif /* __ASM_I8259_H__ */ | 60 | #endif /* __ASM_I8259_H__ */ |
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h index d593e14f0341..dc0f55f2b034 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
| @@ -11,6 +11,15 @@ | |||
| 11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar | 11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | /* I/O Unit Redirection Table */ | ||
| 15 | #define IO_APIC_REDIR_VECTOR_MASK 0x000FF | ||
| 16 | #define IO_APIC_REDIR_DEST_LOGICAL 0x00800 | ||
| 17 | #define IO_APIC_REDIR_DEST_PHYSICAL 0x00000 | ||
| 18 | #define IO_APIC_REDIR_SEND_PENDING (1 << 12) | ||
| 19 | #define IO_APIC_REDIR_REMOTE_IRR (1 << 14) | ||
| 20 | #define IO_APIC_REDIR_LEVEL_TRIGGER (1 << 15) | ||
| 21 | #define IO_APIC_REDIR_MASKED (1 << 16) | ||
| 22 | |||
| 14 | /* | 23 | /* |
| 15 | * The structure of the IO-APIC: | 24 | * The structure of the IO-APIC: |
| 16 | */ | 25 | */ |
| @@ -137,6 +146,9 @@ extern int sis_apic_bug; | |||
| 137 | /* 1 if "noapic" boot option passed */ | 146 | /* 1 if "noapic" boot option passed */ |
| 138 | extern int skip_ioapic_setup; | 147 | extern int skip_ioapic_setup; |
| 139 | 148 | ||
| 149 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ | ||
| 150 | extern int timer_through_8259; | ||
| 151 | |||
| 140 | static inline void disable_ioapic_setup(void) | 152 | static inline void disable_ioapic_setup(void) |
| 141 | { | 153 | { |
| 142 | skip_ioapic_setup = 1; | 154 | skip_ioapic_setup = 1; |
| @@ -162,6 +174,7 @@ extern void ioapic_init_mappings(void); | |||
| 162 | 174 | ||
| 163 | #else /* !CONFIG_X86_IO_APIC */ | 175 | #else /* !CONFIG_X86_IO_APIC */ |
| 164 | #define io_apic_assign_pci_irqs 0 | 176 | #define io_apic_assign_pci_irqs 0 |
| 177 | static const int timer_through_8259 = 0; | ||
| 165 | #endif | 178 | #endif |
| 166 | 179 | ||
| 167 | #endif | 180 | #endif |
diff --git a/include/asm-x86/kvm_para.h b/include/asm-x86/kvm_para.h index bfd9900742bf..76f392146daa 100644 --- a/include/asm-x86/kvm_para.h +++ b/include/asm-x86/kvm_para.h | |||
| @@ -71,7 +71,8 @@ static inline long kvm_hypercall0(unsigned int nr) | |||
| 71 | long ret; | 71 | long ret; |
| 72 | asm volatile(KVM_HYPERCALL | 72 | asm volatile(KVM_HYPERCALL |
| 73 | : "=a"(ret) | 73 | : "=a"(ret) |
| 74 | : "a"(nr)); | 74 | : "a"(nr) |
| 75 | : "memory"); | ||
| 75 | return ret; | 76 | return ret; |
| 76 | } | 77 | } |
| 77 | 78 | ||
| @@ -80,7 +81,8 @@ static inline long kvm_hypercall1(unsigned int nr, unsigned long p1) | |||
| 80 | long ret; | 81 | long ret; |
| 81 | asm volatile(KVM_HYPERCALL | 82 | asm volatile(KVM_HYPERCALL |
| 82 | : "=a"(ret) | 83 | : "=a"(ret) |
| 83 | : "a"(nr), "b"(p1)); | 84 | : "a"(nr), "b"(p1) |
| 85 | : "memory"); | ||
| 84 | return ret; | 86 | return ret; |
| 85 | } | 87 | } |
| 86 | 88 | ||
| @@ -90,7 +92,8 @@ static inline long kvm_hypercall2(unsigned int nr, unsigned long p1, | |||
| 90 | long ret; | 92 | long ret; |
| 91 | asm volatile(KVM_HYPERCALL | 93 | asm volatile(KVM_HYPERCALL |
| 92 | : "=a"(ret) | 94 | : "=a"(ret) |
| 93 | : "a"(nr), "b"(p1), "c"(p2)); | 95 | : "a"(nr), "b"(p1), "c"(p2) |
| 96 | : "memory"); | ||
| 94 | return ret; | 97 | return ret; |
| 95 | } | 98 | } |
| 96 | 99 | ||
| @@ -100,7 +103,8 @@ static inline long kvm_hypercall3(unsigned int nr, unsigned long p1, | |||
| 100 | long ret; | 103 | long ret; |
| 101 | asm volatile(KVM_HYPERCALL | 104 | asm volatile(KVM_HYPERCALL |
| 102 | : "=a"(ret) | 105 | : "=a"(ret) |
| 103 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3)); | 106 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3) |
| 107 | : "memory"); | ||
| 104 | return ret; | 108 | return ret; |
| 105 | } | 109 | } |
| 106 | 110 | ||
| @@ -111,7 +115,8 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, | |||
| 111 | long ret; | 115 | long ret; |
| 112 | asm volatile(KVM_HYPERCALL | 116 | asm volatile(KVM_HYPERCALL |
| 113 | : "=a"(ret) | 117 | : "=a"(ret) |
| 114 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4)); | 118 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4) |
| 119 | : "memory"); | ||
| 115 | return ret; | 120 | return ret; |
| 116 | } | 121 | } |
| 117 | 122 | ||
diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h index 56d0e1fa0258..b63c52182006 100644 --- a/include/asm-x86/mach-default/smpboot_hooks.h +++ b/include/asm-x86/mach-default/smpboot_hooks.h | |||
| @@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void) | |||
| 41 | */ | 41 | */ |
| 42 | if (!skip_ioapic_setup && nr_ioapics) | 42 | if (!skip_ioapic_setup && nr_ioapics) |
| 43 | setup_IO_APIC(); | 43 | setup_IO_APIC(); |
| 44 | else | 44 | else { |
| 45 | nr_ioapics = 0; | 45 | nr_ioapics = 0; |
| 46 | localise_nmi_watchdog(); | ||
| 47 | } | ||
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | static inline void smpboot_clear_io_apic(void) | 50 | static inline void smpboot_clear_io_apic(void) |
diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h new file mode 100644 index 000000000000..95beda07c6fa --- /dev/null +++ b/include/asm-x86/mmconfig.h | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | #ifndef _ASM_MMCONFIG_H | ||
| 2 | #define _ASM_MMCONFIG_H | ||
| 3 | |||
| 4 | #ifdef CONFIG_PCI_MMCONFIG | ||
| 5 | extern void __cpuinit fam10h_check_enable_mmcfg(void); | ||
| 6 | extern void __init check_enable_amd_mmconf_dmi(void); | ||
| 7 | #else | ||
| 8 | static inline void fam10h_check_enable_mmcfg(void) { } | ||
| 9 | static inline void check_enable_amd_mmconf_dmi(void) { } | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #endif | ||
diff --git a/include/asm-x86/msr-index.h b/include/asm-x86/msr-index.h index 09413ad39d3c..44bce773012e 100644 --- a/include/asm-x86/msr-index.h +++ b/include/asm-x86/msr-index.h | |||
| @@ -111,7 +111,9 @@ | |||
| 111 | #define MSR_K8_TOP_MEM2 0xc001001d | 111 | #define MSR_K8_TOP_MEM2 0xc001001d |
| 112 | #define MSR_K8_SYSCFG 0xc0010010 | 112 | #define MSR_K8_SYSCFG 0xc0010010 |
| 113 | #define MSR_K8_HWCR 0xc0010015 | 113 | #define MSR_K8_HWCR 0xc0010015 |
| 114 | #define MSR_K8_ENABLE_C1E 0xc0010055 | 114 | #define MSR_K8_INT_PENDING_MSG 0xc0010055 |
| 115 | /* C1E active bits in int pending message */ | ||
| 116 | #define K8_INTP_C1E_ACTIVE_MASK 0x18000000 | ||
| 115 | #define MSR_K8_TSEG_ADDR 0xc0010112 | 117 | #define MSR_K8_TSEG_ADDR 0xc0010112 |
| 116 | #define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ | 118 | #define K8_MTRRFIXRANGE_DRAM_ENABLE 0x00040000 /* MtrrFixDramEn bit */ |
| 117 | #define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ | 119 | #define K8_MTRRFIXRANGE_DRAM_MODIFY 0x00080000 /* MtrrFixDramModEn bit */ |
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 3707650a169b..2b5f2c91db25 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h | |||
| @@ -18,7 +18,7 @@ static inline unsigned long long native_read_tscp(unsigned int *aux) | |||
| 18 | unsigned long low, high; | 18 | unsigned long low, high; |
| 19 | asm volatile(".byte 0x0f,0x01,0xf9" | 19 | asm volatile(".byte 0x0f,0x01,0xf9" |
| 20 | : "=a" (low), "=d" (high), "=c" (*aux)); | 20 | : "=a" (low), "=d" (high), "=c" (*aux)); |
| 21 | return low | ((u64)high >> 32); | 21 | return low | ((u64)high << 32); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | /* | 24 | /* |
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 1e363021e72f..05449ef830a7 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h | |||
| @@ -15,27 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | int do_nmi_callback(struct pt_regs *regs, int cpu); | 16 | int do_nmi_callback(struct pt_regs *regs, int cpu); |
| 17 | 17 | ||
| 18 | #ifdef CONFIG_PM | ||
| 19 | |||
| 20 | /** Replace the PM callback routine for NMI. */ | ||
| 21 | struct pm_dev *set_nmi_pm_callback(pm_callback callback); | ||
| 22 | |||
| 23 | /** Unset the PM callback routine back to the default. */ | ||
| 24 | void unset_nmi_pm_callback(struct pm_dev *dev); | ||
| 25 | |||
| 26 | #else | ||
| 27 | |||
| 28 | static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback) | ||
| 29 | { | ||
| 30 | return 0; | ||
| 31 | } | ||
| 32 | |||
| 33 | static inline void unset_nmi_pm_callback(struct pm_dev *dev) | ||
| 34 | { | ||
| 35 | } | ||
| 36 | |||
| 37 | #endif /* CONFIG_PM */ | ||
| 38 | |||
| 39 | #ifdef CONFIG_X86_64 | 18 | #ifdef CONFIG_X86_64 |
| 40 | extern void default_do_nmi(struct pt_regs *); | 19 | extern void default_do_nmi(struct pt_regs *); |
| 41 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); | 20 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); |
| @@ -46,7 +25,6 @@ extern void nmi_watchdog_default(void); | |||
| 46 | 25 | ||
| 47 | extern int check_nmi_watchdog(void); | 26 | extern int check_nmi_watchdog(void); |
| 48 | extern int nmi_watchdog_enabled; | 27 | extern int nmi_watchdog_enabled; |
| 49 | extern int unknown_nmi_panic; | ||
| 50 | extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); | 28 | extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); |
| 51 | extern int avail_to_resrv_perfctr_nmi(unsigned int); | 29 | extern int avail_to_resrv_perfctr_nmi(unsigned int); |
| 52 | extern int reserve_perfctr_nmi(unsigned int); | 30 | extern int reserve_perfctr_nmi(unsigned int); |
| @@ -78,6 +56,11 @@ extern int unknown_nmi_panic; | |||
| 78 | void __trigger_all_cpu_backtrace(void); | 56 | void __trigger_all_cpu_backtrace(void); |
| 79 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() | 57 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() |
| 80 | 58 | ||
| 59 | static inline void localise_nmi_watchdog(void) | ||
| 60 | { | ||
| 61 | if (nmi_watchdog == NMI_IO_APIC) | ||
| 62 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 63 | } | ||
| 81 | #endif | 64 | #endif |
| 82 | 65 | ||
| 83 | void lapic_watchdog_stop(void); | 66 | void lapic_watchdog_stop(void); |
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index a1e2b9470f25..b52ed85f32f5 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
| @@ -51,8 +51,15 @@ | |||
| 51 | 51 | ||
| 52 | #ifndef __ASSEMBLY__ | 52 | #ifndef __ASSEMBLY__ |
| 53 | 53 | ||
| 54 | typedef struct { pgdval_t pgd; } pgd_t; | ||
| 55 | typedef struct { pgprotval_t pgprot; } pgprot_t; | ||
| 56 | |||
| 54 | extern int page_is_ram(unsigned long pagenr); | 57 | extern int page_is_ram(unsigned long pagenr); |
| 55 | extern int devmem_is_allowed(unsigned long pagenr); | 58 | extern int devmem_is_allowed(unsigned long pagenr); |
| 59 | extern void map_devmem(unsigned long pfn, unsigned long size, | ||
| 60 | pgprot_t vma_prot); | ||
| 61 | extern void unmap_devmem(unsigned long pfn, unsigned long size, | ||
| 62 | pgprot_t vma_prot); | ||
| 56 | 63 | ||
| 57 | extern unsigned long max_pfn_mapped; | 64 | extern unsigned long max_pfn_mapped; |
| 58 | 65 | ||
| @@ -74,9 +81,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, | |||
| 74 | alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) | 81 | alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) |
| 75 | #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE | 82 | #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE |
| 76 | 83 | ||
| 77 | typedef struct { pgdval_t pgd; } pgd_t; | ||
| 78 | typedef struct { pgprotval_t pgprot; } pgprot_t; | ||
| 79 | |||
| 80 | static inline pgd_t native_make_pgd(pgdval_t val) | 84 | static inline pgd_t native_make_pgd(pgdval_t val) |
| 81 | { | 85 | { |
| 82 | return (pgd_t) { val }; | 86 | return (pgd_t) { val }; |
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index ccf0ba3c3aba..73ed2e4ebf95 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
| @@ -13,6 +13,14 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
| 15 | 15 | ||
| 16 | #ifdef CONFIG_4KSTACKS | ||
| 17 | #define THREAD_ORDER 0 | ||
| 18 | #else | ||
| 19 | #define THREAD_ORDER 1 | ||
| 20 | #endif | ||
| 21 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) | ||
| 22 | |||
| 23 | |||
| 16 | #ifdef CONFIG_X86_PAE | 24 | #ifdef CONFIG_X86_PAE |
| 17 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ | 25 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ |
| 18 | #define __PHYSICAL_MASK_SHIFT 44 | 26 | #define __PHYSICAL_MASK_SHIFT 44 |
diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h index 88f60cc6a227..7edc47307217 100644 --- a/include/asm-x86/pat.h +++ b/include/asm-x86/pat.h | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | |||
| 2 | #ifndef _ASM_PAT_H | 1 | #ifndef _ASM_PAT_H |
| 3 | #define _ASM_PAT_H 1 | 2 | #define _ASM_PAT_H |
| 4 | 3 | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | 5 | ||
| 7 | #ifdef CONFIG_X86_PAT | 6 | #ifdef CONFIG_X86_PAT |
| 8 | extern int pat_wc_enabled; | 7 | extern int pat_enabled; |
| 9 | extern void validate_pat_support(struct cpuinfo_x86 *c); | 8 | extern void validate_pat_support(struct cpuinfo_x86 *c); |
| 10 | #else | 9 | #else |
| 11 | static const int pat_wc_enabled = 0; | 10 | static const int pat_enabled; |
| 12 | static inline void validate_pat_support(struct cpuinfo_x86 *c) { } | 11 | static inline void validate_pat_support(struct cpuinfo_x86 *c) { } |
| 13 | #endif | 12 | #endif |
| 14 | 13 | ||
| @@ -21,4 +20,3 @@ extern int free_memtype(u64 start, u64 end); | |||
| 21 | extern void pat_disable(char *reason); | 20 | extern void pat_disable(char *reason); |
| 22 | 21 | ||
| 23 | #endif | 22 | #endif |
| 24 | |||
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index 30bbde0cb34b..2db14cf17db8 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h | |||
| @@ -18,6 +18,8 @@ struct pci_sysdata { | |||
| 18 | #endif | 18 | #endif |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | extern int pci_routeirq; | ||
| 22 | |||
| 21 | /* scan a bus after allocating a pci_sysdata for it */ | 23 | /* scan a bus after allocating a pci_sysdata for it */ |
| 22 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, | 24 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, |
| 23 | int node); | 25 | int node); |
diff --git a/include/asm-x86/pci_32.h b/include/asm-x86/pci_32.h index 8c4c3a0368e2..a50d46851285 100644 --- a/include/asm-x86/pci_32.h +++ b/include/asm-x86/pci_32.h | |||
| @@ -18,12 +18,14 @@ struct pci_dev; | |||
| 18 | #define PCI_DMA_BUS_IS_PHYS (1) | 18 | #define PCI_DMA_BUS_IS_PHYS (1) |
| 19 | 19 | ||
| 20 | /* pci_unmap_{page,single} is a nop so... */ | 20 | /* pci_unmap_{page,single} is a nop so... */ |
| 21 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | 21 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME[0]; |
| 22 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | 22 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0]; |
| 23 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | 23 | #define pci_unmap_addr(PTR, ADDR_NAME) sizeof((PTR)->ADDR_NAME) |
| 24 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | 24 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ |
| 25 | #define pci_unmap_len(PTR, LEN_NAME) (0) | 25 | do { break; } while (pci_unmap_addr(PTR, ADDR_NAME)) |
| 26 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | 26 | #define pci_unmap_len(PTR, LEN_NAME) sizeof((PTR)->LEN_NAME) |
| 27 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ | ||
| 28 | do { break; } while (pci_unmap_len(PTR, LEN_NAME)) | ||
| 27 | 29 | ||
| 28 | 30 | ||
| 29 | #endif /* __KERNEL__ */ | 31 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 47a852cb8c92..bcb5446a08d1 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
| @@ -20,30 +20,25 @@ | |||
| 20 | #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ | 20 | #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ |
| 21 | #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ | 21 | #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ |
| 22 | 22 | ||
| 23 | /* | 23 | #define _PAGE_PRESENT (_AT(pteval_t, 1) << _PAGE_BIT_PRESENT) |
| 24 | * Note: we use _AC(1, L) instead of _AC(1, UL) so that we get a | 24 | #define _PAGE_RW (_AT(pteval_t, 1) << _PAGE_BIT_RW) |
| 25 | * sign-extended value on 32-bit with all 1's in the upper word, | 25 | #define _PAGE_USER (_AT(pteval_t, 1) << _PAGE_BIT_USER) |
| 26 | * which preserves the upper pte values on 64-bit ptes: | 26 | #define _PAGE_PWT (_AT(pteval_t, 1) << _PAGE_BIT_PWT) |
| 27 | */ | 27 | #define _PAGE_PCD (_AT(pteval_t, 1) << _PAGE_BIT_PCD) |
| 28 | #define _PAGE_PRESENT (_AC(1, L)<<_PAGE_BIT_PRESENT) | 28 | #define _PAGE_ACCESSED (_AT(pteval_t, 1) << _PAGE_BIT_ACCESSED) |
| 29 | #define _PAGE_RW (_AC(1, L)<<_PAGE_BIT_RW) | 29 | #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY) |
| 30 | #define _PAGE_USER (_AC(1, L)<<_PAGE_BIT_USER) | 30 | #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE) |
| 31 | #define _PAGE_PWT (_AC(1, L)<<_PAGE_BIT_PWT) | 31 | #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL) |
| 32 | #define _PAGE_PCD (_AC(1, L)<<_PAGE_BIT_PCD) | 32 | #define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1) |
| 33 | #define _PAGE_ACCESSED (_AC(1, L)<<_PAGE_BIT_ACCESSED) | 33 | #define _PAGE_UNUSED2 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED2) |
| 34 | #define _PAGE_DIRTY (_AC(1, L)<<_PAGE_BIT_DIRTY) | 34 | #define _PAGE_UNUSED3 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED3) |
| 35 | #define _PAGE_PSE (_AC(1, L)<<_PAGE_BIT_PSE) /* 2MB page */ | 35 | #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) |
| 36 | #define _PAGE_GLOBAL (_AC(1, L)<<_PAGE_BIT_GLOBAL) /* Global TLB entry */ | 36 | #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE) |
| 37 | #define _PAGE_UNUSED1 (_AC(1, L)<<_PAGE_BIT_UNUSED1) | ||
| 38 | #define _PAGE_UNUSED2 (_AC(1, L)<<_PAGE_BIT_UNUSED2) | ||
| 39 | #define _PAGE_UNUSED3 (_AC(1, L)<<_PAGE_BIT_UNUSED3) | ||
| 40 | #define _PAGE_PAT (_AC(1, L)<<_PAGE_BIT_PAT) | ||
| 41 | #define _PAGE_PAT_LARGE (_AC(1, L)<<_PAGE_BIT_PAT_LARGE) | ||
| 42 | 37 | ||
| 43 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) | 38 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) |
| 44 | #define _PAGE_NX (_AC(1, ULL) << _PAGE_BIT_NX) | 39 | #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) |
| 45 | #else | 40 | #else |
| 46 | #define _PAGE_NX 0 | 41 | #define _PAGE_NX (_AT(pteval_t, 0)) |
| 47 | #endif | 42 | #endif |
| 48 | 43 | ||
| 49 | /* If _PAGE_PRESENT is clear, we use these: */ | 44 | /* If _PAGE_PRESENT is clear, we use these: */ |
| @@ -210,22 +205,22 @@ static inline int pmd_large(pmd_t pte) | |||
| 210 | 205 | ||
| 211 | static inline pte_t pte_mkclean(pte_t pte) | 206 | static inline pte_t pte_mkclean(pte_t pte) |
| 212 | { | 207 | { |
| 213 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_DIRTY); | 208 | return __pte(pte_val(pte) & ~_PAGE_DIRTY); |
| 214 | } | 209 | } |
| 215 | 210 | ||
| 216 | static inline pte_t pte_mkold(pte_t pte) | 211 | static inline pte_t pte_mkold(pte_t pte) |
| 217 | { | 212 | { |
| 218 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_ACCESSED); | 213 | return __pte(pte_val(pte) & ~_PAGE_ACCESSED); |
| 219 | } | 214 | } |
| 220 | 215 | ||
| 221 | static inline pte_t pte_wrprotect(pte_t pte) | 216 | static inline pte_t pte_wrprotect(pte_t pte) |
| 222 | { | 217 | { |
| 223 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_RW); | 218 | return __pte(pte_val(pte) & ~_PAGE_RW); |
| 224 | } | 219 | } |
| 225 | 220 | ||
| 226 | static inline pte_t pte_mkexec(pte_t pte) | 221 | static inline pte_t pte_mkexec(pte_t pte) |
| 227 | { | 222 | { |
| 228 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_NX); | 223 | return __pte(pte_val(pte) & ~_PAGE_NX); |
| 229 | } | 224 | } |
| 230 | 225 | ||
| 231 | static inline pte_t pte_mkdirty(pte_t pte) | 226 | static inline pte_t pte_mkdirty(pte_t pte) |
| @@ -250,7 +245,7 @@ static inline pte_t pte_mkhuge(pte_t pte) | |||
| 250 | 245 | ||
| 251 | static inline pte_t pte_clrhuge(pte_t pte) | 246 | static inline pte_t pte_clrhuge(pte_t pte) |
| 252 | { | 247 | { |
| 253 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_PSE); | 248 | return __pte(pte_val(pte) & ~_PAGE_PSE); |
| 254 | } | 249 | } |
| 255 | 250 | ||
| 256 | static inline pte_t pte_mkglobal(pte_t pte) | 251 | static inline pte_t pte_mkglobal(pte_t pte) |
| @@ -260,7 +255,7 @@ static inline pte_t pte_mkglobal(pte_t pte) | |||
| 260 | 255 | ||
| 261 | static inline pte_t pte_clrglobal(pte_t pte) | 256 | static inline pte_t pte_clrglobal(pte_t pte) |
| 262 | { | 257 | { |
| 263 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_GLOBAL); | 258 | return __pte(pte_val(pte) & ~_PAGE_GLOBAL); |
| 264 | } | 259 | } |
| 265 | 260 | ||
| 266 | static inline pte_t pte_mkspecial(pte_t pte) | 261 | static inline pte_t pte_mkspecial(pte_t pte) |
| @@ -369,8 +364,15 @@ enum { | |||
| 369 | PG_LEVEL_4K, | 364 | PG_LEVEL_4K, |
| 370 | PG_LEVEL_2M, | 365 | PG_LEVEL_2M, |
| 371 | PG_LEVEL_1G, | 366 | PG_LEVEL_1G, |
| 367 | PG_LEVEL_NUM | ||
| 372 | }; | 368 | }; |
| 373 | 369 | ||
| 370 | #ifdef CONFIG_PROC_FS | ||
| 371 | extern void update_page_count(int level, unsigned long pages); | ||
| 372 | #else | ||
| 373 | static inline void update_page_count(int level, unsigned long pages) { } | ||
| 374 | #endif | ||
| 375 | |||
| 374 | /* | 376 | /* |
| 375 | * Helper function that returns the kernel pagetable entry controlling | 377 | * Helper function that returns the kernel pagetable entry controlling |
| 376 | * the virtual address 'address'. NULL means no pagetable entry present. | 378 | * the virtual address 'address'. NULL means no pagetable entry present. |
diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h index 199cab107d85..092b39b3a7e6 100644 --- a/include/asm-x86/processor-flags.h +++ b/include/asm-x86/processor-flags.h | |||
| @@ -88,4 +88,10 @@ | |||
| 88 | #define CX86_ARR_BASE 0xc4 | 88 | #define CX86_ARR_BASE 0xc4 |
| 89 | #define CX86_RCR_BASE 0xdc | 89 | #define CX86_RCR_BASE 0xdc |
| 90 | 90 | ||
| 91 | #ifdef CONFIG_VM86 | ||
| 92 | #define X86_VM_MASK X86_EFLAGS_VM | ||
| 93 | #else | ||
| 94 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
| 95 | #endif | ||
| 96 | |||
| 91 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ | 97 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ |
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index 559105220a47..4ab2ede6f4b9 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
| @@ -263,15 +263,11 @@ struct tss_struct { | |||
| 263 | struct thread_struct *io_bitmap_owner; | 263 | struct thread_struct *io_bitmap_owner; |
| 264 | 264 | ||
| 265 | /* | 265 | /* |
| 266 | * Pad the TSS to be cacheline-aligned (size is 0x100): | ||
| 267 | */ | ||
| 268 | unsigned long __cacheline_filler[35]; | ||
| 269 | /* | ||
| 270 | * .. and then another 0x100 bytes for the emergency kernel stack: | 266 | * .. and then another 0x100 bytes for the emergency kernel stack: |
| 271 | */ | 267 | */ |
| 272 | unsigned long stack[64]; | 268 | unsigned long stack[64]; |
| 273 | 269 | ||
| 274 | } __attribute__((packed)); | 270 | } ____cacheline_aligned; |
| 275 | 271 | ||
| 276 | DECLARE_PER_CPU(struct tss_struct, init_tss); | 272 | DECLARE_PER_CPU(struct tss_struct, init_tss); |
| 277 | 273 | ||
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 9f922b0b95d6..8a71db803da6 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h | |||
| @@ -3,7 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> /* For __user */ | 4 | #include <linux/compiler.h> /* For __user */ |
| 5 | #include <asm/ptrace-abi.h> | 5 | #include <asm/ptrace-abi.h> |
| 6 | #include <asm/processor-flags.h> | ||
| 6 | 7 | ||
| 8 | #ifdef __KERNEL__ | ||
| 9 | #include <asm/ds.h> /* the DS BTS struct is used for ptrace too */ | ||
| 10 | #include <asm/segment.h> | ||
| 11 | #endif | ||
| 7 | 12 | ||
| 8 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 9 | 14 | ||
| @@ -55,9 +60,6 @@ struct pt_regs { | |||
| 55 | unsigned long ss; | 60 | unsigned long ss; |
| 56 | }; | 61 | }; |
| 57 | 62 | ||
| 58 | #include <asm/vm86.h> | ||
| 59 | #include <asm/segment.h> | ||
| 60 | |||
| 61 | #endif /* __KERNEL__ */ | 63 | #endif /* __KERNEL__ */ |
| 62 | 64 | ||
| 63 | #else /* __i386__ */ | 65 | #else /* __i386__ */ |
diff --git a/include/asm-x86/reboot.h b/include/asm-x86/reboot.h index e63741f19392..206f355786dc 100644 --- a/include/asm-x86/reboot.h +++ b/include/asm-x86/reboot.h | |||
| @@ -14,8 +14,8 @@ struct machine_ops { | |||
| 14 | 14 | ||
| 15 | extern struct machine_ops machine_ops; | 15 | extern struct machine_ops machine_ops; |
| 16 | 16 | ||
| 17 | void machine_real_restart(unsigned char *code, int length); | ||
| 18 | void native_machine_crash_shutdown(struct pt_regs *regs); | 17 | void native_machine_crash_shutdown(struct pt_regs *regs); |
| 19 | void native_machine_shutdown(void); | 18 | void native_machine_shutdown(void); |
| 19 | void machine_real_restart(const unsigned char *code, int length); | ||
| 20 | 20 | ||
| 21 | #endif /* _ASM_REBOOT_H */ | 21 | #endif /* _ASM_REBOOT_H */ |
diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h index 7400d3ad75c6..8c387198ca88 100644 --- a/include/asm-x86/required-features.h +++ b/include/asm-x86/required-features.h | |||
| @@ -19,9 +19,13 @@ | |||
| 19 | 19 | ||
| 20 | #if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) | 20 | #if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) |
| 21 | # define NEED_PAE (1<<(X86_FEATURE_PAE & 31)) | 21 | # define NEED_PAE (1<<(X86_FEATURE_PAE & 31)) |
| 22 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) | ||
| 23 | #else | 22 | #else |
| 24 | # define NEED_PAE 0 | 23 | # define NEED_PAE 0 |
| 24 | #endif | ||
| 25 | |||
| 26 | #ifdef CONFIG_X86_CMPXCHG64 | ||
| 27 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) | ||
| 28 | #else | ||
| 25 | # define NEED_CX8 0 | 29 | # define NEED_CX8 0 |
| 26 | #endif | 30 | #endif |
| 27 | 31 | ||
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h index 2557514d7ef6..8d9f0b41ee86 100644 --- a/include/asm-x86/resume-trace.h +++ b/include/asm-x86/resume-trace.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #define TRACE_RESUME(user) \ | 6 | #define TRACE_RESUME(user) \ |
| 7 | do { \ | 7 | do { \ |
| 8 | if (pm_trace_enabled) { \ | 8 | if (pm_trace_enabled) { \ |
| 9 | void *tracedata; \ | 9 | const void *tracedata; \ |
| 10 | asm volatile(_ASM_MOV_UL " $1f,%0\n" \ | 10 | asm volatile(_ASM_MOV_UL " $1f,%0\n" \ |
| 11 | ".section .tracedata,\"a\"\n" \ | 11 | ".section .tracedata,\"a\"\n" \ |
| 12 | "1:\t.word %c1\n\t" \ | 12 | "1:\t.word %c1\n\t" \ |
diff --git a/include/asm-x86/seccomp_32.h b/include/asm-x86/seccomp_32.h index 18da19e89bff..36e71c5f306f 100644 --- a/include/asm-x86/seccomp_32.h +++ b/include/asm-x86/seccomp_32.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef _ASM_SECCOMP_H | 1 | #ifndef _ASM_SECCOMP_H |
| 2 | #define _ASM_SECCOMP_H | ||
| 2 | 3 | ||
| 3 | #include <linux/thread_info.h> | 4 | #include <linux/thread_info.h> |
| 4 | 5 | ||
diff --git a/include/asm-x86/seccomp_64.h b/include/asm-x86/seccomp_64.h index 553af65a2287..76cfe69aa63c 100644 --- a/include/asm-x86/seccomp_64.h +++ b/include/asm-x86/seccomp_64.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef _ASM_SECCOMP_H | 1 | #ifndef _ASM_SECCOMP_H |
| 2 | #define _ASM_SECCOMP_H | ||
| 2 | 3 | ||
| 3 | #include <linux/thread_info.h> | 4 | #include <linux/thread_info.h> |
| 4 | 5 | ||
diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h index b49369ad9a61..193578cd1fd9 100644 --- a/include/asm-x86/string_32.h +++ b/include/asm-x86/string_32.h | |||
| @@ -29,81 +29,116 @@ extern char *strchr(const char *s, int c); | |||
| 29 | #define __HAVE_ARCH_STRLEN | 29 | #define __HAVE_ARCH_STRLEN |
| 30 | extern size_t strlen(const char *s); | 30 | extern size_t strlen(const char *s); |
| 31 | 31 | ||
| 32 | static __always_inline void * __memcpy(void * to, const void * from, size_t n) | 32 | static __always_inline void *__memcpy(void *to, const void *from, size_t n) |
| 33 | { | 33 | { |
| 34 | int d0, d1, d2; | 34 | int d0, d1, d2; |
| 35 | __asm__ __volatile__( | 35 | asm volatile("rep ; movsl\n\t" |
| 36 | "rep ; movsl\n\t" | 36 | "movl %4,%%ecx\n\t" |
| 37 | "movl %4,%%ecx\n\t" | 37 | "andl $3,%%ecx\n\t" |
| 38 | "andl $3,%%ecx\n\t" | 38 | "jz 1f\n\t" |
| 39 | "jz 1f\n\t" | 39 | "rep ; movsb\n\t" |
| 40 | "rep ; movsb\n\t" | 40 | "1:" |
| 41 | "1:" | 41 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) |
| 42 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) | 42 | : "0" (n / 4), "g" (n), "1" ((long)to), "2" ((long)from) |
| 43 | : "0" (n/4), "g" (n), "1" ((long) to), "2" ((long) from) | 43 | : "memory"); |
| 44 | : "memory"); | 44 | return to; |
| 45 | return (to); | ||
| 46 | } | 45 | } |
| 47 | 46 | ||
| 48 | /* | 47 | /* |
| 49 | * This looks ugly, but the compiler can optimize it totally, | 48 | * This looks ugly, but the compiler can optimize it totally, |
| 50 | * as the count is constant. | 49 | * as the count is constant. |
| 51 | */ | 50 | */ |
| 52 | static __always_inline void * __constant_memcpy(void * to, const void * from, size_t n) | 51 | static __always_inline void *__constant_memcpy(void *to, const void *from, |
| 52 | size_t n) | ||
| 53 | { | 53 | { |
| 54 | long esi, edi; | 54 | long esi, edi; |
| 55 | if (!n) return to; | 55 | if (!n) |
| 56 | #if 1 /* want to do small copies with non-string ops? */ | 56 | return to; |
| 57 | |||
| 57 | switch (n) { | 58 | switch (n) { |
| 58 | case 1: *(char*)to = *(char*)from; return to; | 59 | case 1: |
| 59 | case 2: *(short*)to = *(short*)from; return to; | 60 | *(char *)to = *(char *)from; |
| 60 | case 4: *(int*)to = *(int*)from; return to; | 61 | return to; |
| 61 | #if 1 /* including those doable with two moves? */ | 62 | case 2: |
| 62 | case 3: *(short*)to = *(short*)from; | 63 | *(short *)to = *(short *)from; |
| 63 | *((char*)to+2) = *((char*)from+2); return to; | 64 | return to; |
| 64 | case 5: *(int*)to = *(int*)from; | 65 | case 4: |
| 65 | *((char*)to+4) = *((char*)from+4); return to; | 66 | *(int *)to = *(int *)from; |
| 66 | case 6: *(int*)to = *(int*)from; | 67 | return to; |
| 67 | *((short*)to+2) = *((short*)from+2); return to; | 68 | |
| 68 | case 8: *(int*)to = *(int*)from; | 69 | case 3: |
| 69 | *((int*)to+1) = *((int*)from+1); return to; | 70 | *(short *)to = *(short *)from; |
| 70 | #endif | 71 | *((char *)to + 2) = *((char *)from + 2); |
| 72 | return to; | ||
| 73 | case 5: | ||
| 74 | *(int *)to = *(int *)from; | ||
| 75 | *((char *)to + 4) = *((char *)from + 4); | ||
| 76 | return to; | ||
| 77 | case 6: | ||
| 78 | *(int *)to = *(int *)from; | ||
| 79 | *((short *)to + 2) = *((short *)from + 2); | ||
| 80 | return to; | ||
| 81 | case 8: | ||
| 82 | *(int *)to = *(int *)from; | ||
| 83 | *((int *)to + 1) = *((int *)from + 1); | ||
| 84 | return to; | ||
| 71 | } | 85 | } |
| 72 | #endif | 86 | |
| 73 | esi = (long) from; | 87 | esi = (long)from; |
| 74 | edi = (long) to; | 88 | edi = (long)to; |
| 75 | if (n >= 5*4) { | 89 | if (n >= 5 * 4) { |
| 76 | /* large block: use rep prefix */ | 90 | /* large block: use rep prefix */ |
| 77 | int ecx; | 91 | int ecx; |
| 78 | __asm__ __volatile__( | 92 | asm volatile("rep ; movsl" |
| 79 | "rep ; movsl" | 93 | : "=&c" (ecx), "=&D" (edi), "=&S" (esi) |
| 80 | : "=&c" (ecx), "=&D" (edi), "=&S" (esi) | 94 | : "0" (n / 4), "1" (edi), "2" (esi) |
| 81 | : "0" (n/4), "1" (edi),"2" (esi) | 95 | : "memory" |
| 82 | : "memory" | ||
| 83 | ); | 96 | ); |
| 84 | } else { | 97 | } else { |
| 85 | /* small block: don't clobber ecx + smaller code */ | 98 | /* small block: don't clobber ecx + smaller code */ |
| 86 | if (n >= 4*4) __asm__ __volatile__("movsl" | 99 | if (n >= 4 * 4) |
| 87 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 100 | asm volatile("movsl" |
| 88 | if (n >= 3*4) __asm__ __volatile__("movsl" | 101 | : "=&D"(edi), "=&S"(esi) |
| 89 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 102 | : "0"(edi), "1"(esi) |
| 90 | if (n >= 2*4) __asm__ __volatile__("movsl" | 103 | : "memory"); |
| 91 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 104 | if (n >= 3 * 4) |
| 92 | if (n >= 1*4) __asm__ __volatile__("movsl" | 105 | asm volatile("movsl" |
| 93 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 106 | : "=&D"(edi), "=&S"(esi) |
| 107 | : "0"(edi), "1"(esi) | ||
| 108 | : "memory"); | ||
| 109 | if (n >= 2 * 4) | ||
| 110 | asm volatile("movsl" | ||
| 111 | : "=&D"(edi), "=&S"(esi) | ||
| 112 | : "0"(edi), "1"(esi) | ||
| 113 | : "memory"); | ||
| 114 | if (n >= 1 * 4) | ||
| 115 | asm volatile("movsl" | ||
| 116 | : "=&D"(edi), "=&S"(esi) | ||
| 117 | : "0"(edi), "1"(esi) | ||
| 118 | : "memory"); | ||
| 94 | } | 119 | } |
| 95 | switch (n % 4) { | 120 | switch (n % 4) { |
| 96 | /* tail */ | 121 | /* tail */ |
| 97 | case 0: return to; | 122 | case 0: |
| 98 | case 1: __asm__ __volatile__("movsb" | 123 | return to; |
| 99 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 124 | case 1: |
| 100 | return to; | 125 | asm volatile("movsb" |
| 101 | case 2: __asm__ __volatile__("movsw" | 126 | : "=&D"(edi), "=&S"(esi) |
| 102 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 127 | : "0"(edi), "1"(esi) |
| 103 | return to; | 128 | : "memory"); |
| 104 | default: __asm__ __volatile__("movsw\n\tmovsb" | 129 | return to; |
| 105 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 130 | case 2: |
| 106 | return to; | 131 | asm volatile("movsw" |
| 132 | : "=&D"(edi), "=&S"(esi) | ||
| 133 | : "0"(edi), "1"(esi) | ||
| 134 | : "memory"); | ||
| 135 | return to; | ||
| 136 | default: | ||
| 137 | asm volatile("movsw\n\tmovsb" | ||
| 138 | : "=&D"(edi), "=&S"(esi) | ||
| 139 | : "0"(edi), "1"(esi) | ||
| 140 | : "memory"); | ||
| 141 | return to; | ||
| 107 | } | 142 | } |
| 108 | } | 143 | } |
| 109 | 144 | ||
| @@ -117,87 +152,86 @@ static __always_inline void * __constant_memcpy(void * to, const void * from, si | |||
| 117 | * This CPU favours 3DNow strongly (eg AMD Athlon) | 152 | * This CPU favours 3DNow strongly (eg AMD Athlon) |
| 118 | */ | 153 | */ |
| 119 | 154 | ||
| 120 | static inline void * __constant_memcpy3d(void * to, const void * from, size_t len) | 155 | static inline void *__constant_memcpy3d(void *to, const void *from, size_t len) |
| 121 | { | 156 | { |
| 122 | if (len < 512) | 157 | if (len < 512) |
| 123 | return __constant_memcpy(to, from, len); | 158 | return __constant_memcpy(to, from, len); |
| 124 | return _mmx_memcpy(to, from, len); | 159 | return _mmx_memcpy(to, from, len); |
| 125 | } | 160 | } |
| 126 | 161 | ||
| 127 | static __inline__ void *__memcpy3d(void *to, const void *from, size_t len) | 162 | static inline void *__memcpy3d(void *to, const void *from, size_t len) |
| 128 | { | 163 | { |
| 129 | if (len < 512) | 164 | if (len < 512) |
| 130 | return __memcpy(to, from, len); | 165 | return __memcpy(to, from, len); |
| 131 | return _mmx_memcpy(to, from, len); | 166 | return _mmx_memcpy(to, from, len); |
| 132 | } | 167 | } |
| 133 | 168 | ||
| 134 | #define memcpy(t, f, n) \ | 169 | #define memcpy(t, f, n) \ |
| 135 | (__builtin_constant_p(n) ? \ | 170 | (__builtin_constant_p((n)) \ |
| 136 | __constant_memcpy3d((t),(f),(n)) : \ | 171 | ? __constant_memcpy3d((t), (f), (n)) \ |
| 137 | __memcpy3d((t),(f),(n))) | 172 | : __memcpy3d((t), (f), (n))) |
| 138 | 173 | ||
| 139 | #else | 174 | #else |
| 140 | 175 | ||
| 141 | /* | 176 | /* |
| 142 | * No 3D Now! | 177 | * No 3D Now! |
| 143 | */ | 178 | */ |
| 144 | 179 | ||
| 145 | #define memcpy(t, f, n) \ | 180 | #define memcpy(t, f, n) \ |
| 146 | (__builtin_constant_p(n) ? \ | 181 | (__builtin_constant_p((n)) \ |
| 147 | __constant_memcpy((t),(f),(n)) : \ | 182 | ? __constant_memcpy((t), (f), (n)) \ |
| 148 | __memcpy((t),(f),(n))) | 183 | : __memcpy((t), (f), (n))) |
| 149 | 184 | ||
| 150 | #endif | 185 | #endif |
| 151 | 186 | ||
| 152 | #define __HAVE_ARCH_MEMMOVE | 187 | #define __HAVE_ARCH_MEMMOVE |
| 153 | void *memmove(void * dest,const void * src, size_t n); | 188 | void *memmove(void *dest, const void *src, size_t n); |
| 154 | 189 | ||
| 155 | #define memcmp __builtin_memcmp | 190 | #define memcmp __builtin_memcmp |
| 156 | 191 | ||
| 157 | #define __HAVE_ARCH_MEMCHR | 192 | #define __HAVE_ARCH_MEMCHR |
| 158 | extern void *memchr(const void * cs,int c,size_t count); | 193 | extern void *memchr(const void *cs, int c, size_t count); |
| 159 | 194 | ||
| 160 | static inline void * __memset_generic(void * s, char c,size_t count) | 195 | static inline void *__memset_generic(void *s, char c, size_t count) |
| 161 | { | 196 | { |
| 162 | int d0, d1; | 197 | int d0, d1; |
| 163 | __asm__ __volatile__( | 198 | asm volatile("rep\n\t" |
| 164 | "rep\n\t" | 199 | "stosb" |
| 165 | "stosb" | 200 | : "=&c" (d0), "=&D" (d1) |
| 166 | : "=&c" (d0), "=&D" (d1) | 201 | : "a" (c), "1" (s), "0" (count) |
| 167 | :"a" (c),"1" (s),"0" (count) | 202 | : "memory"); |
| 168 | :"memory"); | 203 | return s; |
| 169 | return s; | ||
| 170 | } | 204 | } |
| 171 | 205 | ||
| 172 | /* we might want to write optimized versions of these later */ | 206 | /* we might want to write optimized versions of these later */ |
| 173 | #define __constant_count_memset(s,c,count) __memset_generic((s),(c),(count)) | 207 | #define __constant_count_memset(s, c, count) __memset_generic((s), (c), (count)) |
| 174 | 208 | ||
| 175 | /* | 209 | /* |
| 176 | * memset(x,0,y) is a reasonably common thing to do, so we want to fill | 210 | * memset(x, 0, y) is a reasonably common thing to do, so we want to fill |
| 177 | * things 32 bits at a time even when we don't know the size of the | 211 | * things 32 bits at a time even when we don't know the size of the |
| 178 | * area at compile-time.. | 212 | * area at compile-time.. |
| 179 | */ | 213 | */ |
| 180 | static __always_inline void * __constant_c_memset(void * s, unsigned long c, size_t count) | 214 | static __always_inline |
| 215 | void *__constant_c_memset(void *s, unsigned long c, size_t count) | ||
| 181 | { | 216 | { |
| 182 | int d0, d1; | 217 | int d0, d1; |
| 183 | __asm__ __volatile__( | 218 | asm volatile("rep ; stosl\n\t" |
| 184 | "rep ; stosl\n\t" | 219 | "testb $2,%b3\n\t" |
| 185 | "testb $2,%b3\n\t" | 220 | "je 1f\n\t" |
| 186 | "je 1f\n\t" | 221 | "stosw\n" |
| 187 | "stosw\n" | 222 | "1:\ttestb $1,%b3\n\t" |
| 188 | "1:\ttestb $1,%b3\n\t" | 223 | "je 2f\n\t" |
| 189 | "je 2f\n\t" | 224 | "stosb\n" |
| 190 | "stosb\n" | 225 | "2:" |
| 191 | "2:" | 226 | : "=&c" (d0), "=&D" (d1) |
| 192 | :"=&c" (d0), "=&D" (d1) | 227 | : "a" (c), "q" (count), "0" (count/4), "1" ((long)s) |
| 193 | :"a" (c), "q" (count), "0" (count/4), "1" ((long) s) | 228 | : "memory"); |
| 194 | :"memory"); | 229 | return s; |
| 195 | return (s); | ||
| 196 | } | 230 | } |
| 197 | 231 | ||
| 198 | /* Added by Gertjan van Wingerde to make minix and sysv module work */ | 232 | /* Added by Gertjan van Wingerde to make minix and sysv module work */ |
| 199 | #define __HAVE_ARCH_STRNLEN | 233 | #define __HAVE_ARCH_STRNLEN |
| 200 | extern size_t strnlen(const char * s, size_t count); | 234 | extern size_t strnlen(const char *s, size_t count); |
| 201 | /* end of additional stuff */ | 235 | /* end of additional stuff */ |
| 202 | 236 | ||
| 203 | #define __HAVE_ARCH_STRSTR | 237 | #define __HAVE_ARCH_STRSTR |
| @@ -207,66 +241,85 @@ extern char *strstr(const char *cs, const char *ct); | |||
| 207 | * This looks horribly ugly, but the compiler can optimize it totally, | 241 | * This looks horribly ugly, but the compiler can optimize it totally, |
| 208 | * as we by now know that both pattern and count is constant.. | 242 | * as we by now know that both pattern and count is constant.. |
| 209 | */ | 243 | */ |
| 210 | static __always_inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count) | 244 | static __always_inline |
| 245 | void *__constant_c_and_count_memset(void *s, unsigned long pattern, | ||
| 246 | size_t count) | ||
| 211 | { | 247 | { |
| 212 | switch (count) { | 248 | switch (count) { |
| 249 | case 0: | ||
| 250 | return s; | ||
| 251 | case 1: | ||
| 252 | *(unsigned char *)s = pattern & 0xff; | ||
| 253 | return s; | ||
| 254 | case 2: | ||
| 255 | *(unsigned short *)s = pattern & 0xffff; | ||
| 256 | return s; | ||
| 257 | case 3: | ||
| 258 | *(unsigned short *)s = pattern & 0xffff; | ||
| 259 | *((unsigned char *)s + 2) = pattern & 0xff; | ||
| 260 | return s; | ||
| 261 | case 4: | ||
| 262 | *(unsigned long *)s = pattern; | ||
| 263 | return s; | ||
| 264 | } | ||
| 265 | |||
| 266 | #define COMMON(x) \ | ||
| 267 | asm volatile("rep ; stosl" \ | ||
| 268 | x \ | ||
| 269 | : "=&c" (d0), "=&D" (d1) \ | ||
| 270 | : "a" (eax), "0" (count/4), "1" ((long)s) \ | ||
| 271 | : "memory") | ||
| 272 | |||
| 273 | { | ||
| 274 | int d0, d1; | ||
| 275 | #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 | ||
| 276 | /* Workaround for broken gcc 4.0 */ | ||
| 277 | register unsigned long eax asm("%eax") = pattern; | ||
| 278 | #else | ||
| 279 | unsigned long eax = pattern; | ||
| 280 | #endif | ||
| 281 | |||
| 282 | switch (count % 4) { | ||
| 213 | case 0: | 283 | case 0: |
| 284 | COMMON(""); | ||
| 214 | return s; | 285 | return s; |
| 215 | case 1: | 286 | case 1: |
| 216 | *(unsigned char *)s = pattern & 0xff; | 287 | COMMON("\n\tstosb"); |
| 217 | return s; | 288 | return s; |
| 218 | case 2: | 289 | case 2: |
| 219 | *(unsigned short *)s = pattern & 0xffff; | 290 | COMMON("\n\tstosw"); |
| 220 | return s; | 291 | return s; |
| 221 | case 3: | 292 | default: |
| 222 | *(unsigned short *)s = pattern & 0xffff; | 293 | COMMON("\n\tstosw\n\tstosb"); |
| 223 | *(2+(unsigned char *)s) = pattern & 0xff; | ||
| 224 | return s; | ||
| 225 | case 4: | ||
| 226 | *(unsigned long *)s = pattern; | ||
| 227 | return s; | 294 | return s; |
| 295 | } | ||
| 228 | } | 296 | } |
| 229 | #define COMMON(x) \ | 297 | |
| 230 | __asm__ __volatile__( \ | ||
| 231 | "rep ; stosl" \ | ||
| 232 | x \ | ||
| 233 | : "=&c" (d0), "=&D" (d1) \ | ||
| 234 | : "a" (pattern),"0" (count/4),"1" ((long) s) \ | ||
| 235 | : "memory") | ||
| 236 | { | ||
| 237 | int d0, d1; | ||
| 238 | switch (count % 4) { | ||
| 239 | case 0: COMMON(""); return s; | ||
| 240 | case 1: COMMON("\n\tstosb"); return s; | ||
| 241 | case 2: COMMON("\n\tstosw"); return s; | ||
| 242 | default: COMMON("\n\tstosw\n\tstosb"); return s; | ||
| 243 | } | ||
| 244 | } | ||
| 245 | |||
| 246 | #undef COMMON | 298 | #undef COMMON |
| 247 | } | 299 | } |
| 248 | 300 | ||
| 249 | #define __constant_c_x_memset(s, c, count) \ | 301 | #define __constant_c_x_memset(s, c, count) \ |
| 250 | (__builtin_constant_p(count) ? \ | 302 | (__builtin_constant_p(count) \ |
| 251 | __constant_c_and_count_memset((s),(c),(count)) : \ | 303 | ? __constant_c_and_count_memset((s), (c), (count)) \ |
| 252 | __constant_c_memset((s),(c),(count))) | 304 | : __constant_c_memset((s), (c), (count))) |
| 253 | 305 | ||
| 254 | #define __memset(s, c, count) \ | 306 | #define __memset(s, c, count) \ |
| 255 | (__builtin_constant_p(count) ? \ | 307 | (__builtin_constant_p(count) \ |
| 256 | __constant_count_memset((s),(c),(count)) : \ | 308 | ? __constant_count_memset((s), (c), (count)) \ |
| 257 | __memset_generic((s),(c),(count))) | 309 | : __memset_generic((s), (c), (count))) |
| 258 | 310 | ||
| 259 | #define __HAVE_ARCH_MEMSET | 311 | #define __HAVE_ARCH_MEMSET |
| 260 | #define memset(s, c, count) \ | 312 | #define memset(s, c, count) \ |
| 261 | (__builtin_constant_p(c) ? \ | 313 | (__builtin_constant_p(c) \ |
| 262 | __constant_c_x_memset((s),(0x01010101UL*(unsigned char)(c)),(count)) : \ | 314 | ? __constant_c_x_memset((s), (0x01010101UL * (unsigned char)(c)), \ |
| 263 | __memset((s),(c),(count))) | 315 | (count)) \ |
| 316 | : __memset((s), (c), (count))) | ||
| 264 | 317 | ||
| 265 | /* | 318 | /* |
| 266 | * find the first occurrence of byte 'c', or 1 past the area if none | 319 | * find the first occurrence of byte 'c', or 1 past the area if none |
| 267 | */ | 320 | */ |
| 268 | #define __HAVE_ARCH_MEMSCAN | 321 | #define __HAVE_ARCH_MEMSCAN |
| 269 | extern void *memscan(void * addr, int c, size_t size); | 322 | extern void *memscan(void *addr, int c, size_t size); |
| 270 | 323 | ||
| 271 | #endif /* __KERNEL__ */ | 324 | #endif /* __KERNEL__ */ |
| 272 | 325 | ||
diff --git a/include/asm-x86/suspend_32.h b/include/asm-x86/suspend_32.h index 24e1c080aa8a..8675c6782a7d 100644 --- a/include/asm-x86/suspend_32.h +++ b/include/asm-x86/suspend_32.h | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | * Based on code | 3 | * Based on code |
| 4 | * Copyright 2001 Patrick Mochel <mochel@osdl.org> | 4 | * Copyright 2001 Patrick Mochel <mochel@osdl.org> |
| 5 | */ | 5 | */ |
| 6 | #ifndef __ASM_X86_32_SUSPEND_H | ||
| 7 | #define __ASM_X86_32_SUSPEND_H | ||
| 8 | |||
| 6 | #include <asm/desc.h> | 9 | #include <asm/desc.h> |
| 7 | #include <asm/i387.h> | 10 | #include <asm/i387.h> |
| 8 | 11 | ||
| @@ -44,3 +47,5 @@ static inline void acpi_save_register_state(unsigned long return_point) | |||
| 44 | /* routines for saving/restoring kernel state */ | 47 | /* routines for saving/restoring kernel state */ |
| 45 | extern int acpi_save_state_mem(void); | 48 | extern int acpi_save_state_mem(void); |
| 46 | #endif | 49 | #endif |
| 50 | |||
| 51 | #endif /* __ASM_X86_32_SUSPEND_H */ | ||
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h index a2f04cd79b29..7e4c133795a1 100644 --- a/include/asm-x86/system.h +++ b/include/asm-x86/system.h | |||
| @@ -289,7 +289,7 @@ static inline void native_wbinvd(void) | |||
| 289 | 289 | ||
| 290 | #endif/* CONFIG_PARAVIRT */ | 290 | #endif/* CONFIG_PARAVIRT */ |
| 291 | 291 | ||
| 292 | #define stts() write_cr0(8 | read_cr0()) | 292 | #define stts() write_cr0(read_cr0() | X86_CR0_TS) |
| 293 | 293 | ||
| 294 | #endif /* __KERNEL__ */ | 294 | #endif /* __KERNEL__ */ |
| 295 | 295 | ||
diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h index 77244f17993f..895339d2bc0b 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h | |||
| @@ -1,9 +1,253 @@ | |||
| 1 | /* thread_info.h: low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 1 | #ifndef _ASM_X86_THREAD_INFO_H | 7 | #ifndef _ASM_X86_THREAD_INFO_H |
| 8 | #define _ASM_X86_THREAD_INFO_H | ||
| 9 | |||
| 10 | #include <linux/compiler.h> | ||
| 11 | #include <asm/page.h> | ||
| 12 | #include <asm/types.h> | ||
| 13 | |||
| 14 | /* | ||
| 15 | * low level task data that entry.S needs immediate access to | ||
| 16 | * - this struct should fit entirely inside of one cache line | ||
| 17 | * - this struct shares the supervisor stack pages | ||
| 18 | */ | ||
| 19 | #ifndef __ASSEMBLY__ | ||
| 20 | struct task_struct; | ||
| 21 | struct exec_domain; | ||
| 22 | #include <asm/processor.h> | ||
| 23 | |||
| 24 | struct thread_info { | ||
| 25 | struct task_struct *task; /* main task structure */ | ||
| 26 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 27 | unsigned long flags; /* low level flags */ | ||
| 28 | __u32 status; /* thread synchronous flags */ | ||
| 29 | __u32 cpu; /* current CPU */ | ||
| 30 | int preempt_count; /* 0 => preemptable, | ||
| 31 | <0 => BUG */ | ||
| 32 | mm_segment_t addr_limit; | ||
| 33 | struct restart_block restart_block; | ||
| 34 | void __user *sysenter_return; | ||
| 35 | #ifdef CONFIG_X86_32 | ||
| 36 | unsigned long previous_esp; /* ESP of the previous stack in | ||
| 37 | case of nested (IRQ) stacks | ||
| 38 | */ | ||
| 39 | __u8 supervisor_stack[0]; | ||
| 40 | #endif | ||
| 41 | }; | ||
| 42 | |||
| 43 | #define INIT_THREAD_INFO(tsk) \ | ||
| 44 | { \ | ||
| 45 | .task = &tsk, \ | ||
| 46 | .exec_domain = &default_exec_domain, \ | ||
| 47 | .flags = 0, \ | ||
| 48 | .cpu = 0, \ | ||
| 49 | .preempt_count = 1, \ | ||
| 50 | .addr_limit = KERNEL_DS, \ | ||
| 51 | .restart_block = { \ | ||
| 52 | .fn = do_no_restart_syscall, \ | ||
| 53 | }, \ | ||
| 54 | } | ||
| 55 | |||
| 56 | #define init_thread_info (init_thread_union.thread_info) | ||
| 57 | #define init_stack (init_thread_union.stack) | ||
| 58 | |||
| 59 | #else /* !__ASSEMBLY__ */ | ||
| 60 | |||
| 61 | #include <asm/asm-offsets.h> | ||
| 62 | |||
| 63 | #endif | ||
| 64 | |||
| 65 | /* | ||
| 66 | * thread information flags | ||
| 67 | * - these are process state flags that various assembly files | ||
| 68 | * may need to access | ||
| 69 | * - pending work-to-be-done flags are in LSW | ||
| 70 | * - other flags in MSW | ||
| 71 | * Warning: layout of LSW is hardcoded in entry.S | ||
| 72 | */ | ||
| 73 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 74 | #define TIF_SIGPENDING 2 /* signal pending */ | ||
| 75 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | ||
| 76 | #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ | ||
| 77 | #define TIF_IRET 5 /* force IRET */ | ||
| 2 | #ifdef CONFIG_X86_32 | 78 | #ifdef CONFIG_X86_32 |
| 3 | # include "thread_info_32.h" | 79 | #define TIF_SYSCALL_EMU 6 /* syscall emulation active */ |
| 80 | #endif | ||
| 81 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | ||
| 82 | #define TIF_SECCOMP 8 /* secure computing */ | ||
| 83 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | ||
| 84 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | ||
| 85 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ | ||
| 86 | #define TIF_IA32 17 /* 32bit process */ | ||
| 87 | #define TIF_FORK 18 /* ret_from_fork */ | ||
| 88 | #define TIF_ABI_PENDING 19 | ||
| 89 | #define TIF_MEMDIE 20 | ||
| 90 | #define TIF_DEBUG 21 /* uses debug registers */ | ||
| 91 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ | ||
| 92 | #define TIF_FREEZE 23 /* is freezing for suspend */ | ||
| 93 | #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ | ||
| 94 | #define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ | ||
| 95 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ | ||
| 96 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ | ||
| 97 | |||
| 98 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 99 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 100 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 101 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 102 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 103 | #ifdef CONFIG_X86_32 | ||
| 104 | #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) | ||
| 4 | #else | 105 | #else |
| 5 | # include "thread_info_64.h" | 106 | #define _TIF_SYSCALL_EMU 0 |
| 6 | #endif | 107 | #endif |
| 108 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 109 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 110 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) | ||
| 111 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 112 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 113 | #define _TIF_IA32 (1 << TIF_IA32) | ||
| 114 | #define _TIF_FORK (1 << TIF_FORK) | ||
| 115 | #define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING) | ||
| 116 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 117 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 118 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 119 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 120 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 121 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 122 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 123 | |||
| 124 | /* work to do on interrupt/exception return */ | ||
| 125 | #define _TIF_WORK_MASK \ | ||
| 126 | (0x0000FFFF & \ | ||
| 127 | ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP| \ | ||
| 128 | _TIF_SECCOMP|_TIF_SYSCALL_EMU)) | ||
| 129 | |||
| 130 | /* work to do on any return to user space */ | ||
| 131 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 132 | |||
| 133 | /* Only used for 64 bit */ | ||
| 134 | #define _TIF_DO_NOTIFY_MASK \ | ||
| 135 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | ||
| 136 | |||
| 137 | /* flags to check in __switch_to() */ | ||
| 138 | #define _TIF_WORK_CTXSW \ | ||
| 139 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS| \ | ||
| 140 | _TIF_NOTSC) | ||
| 141 | |||
| 142 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 143 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) | ||
| 144 | |||
| 145 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 146 | |||
| 147 | /* thread information allocation */ | ||
| 148 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 149 | #define THREAD_FLAGS (GFP_KERNEL | __GFP_ZERO) | ||
| 150 | #else | ||
| 151 | #define THREAD_FLAGS GFP_KERNEL | ||
| 152 | #endif | ||
| 153 | |||
| 154 | #define alloc_thread_info(tsk) \ | ||
| 155 | ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) | ||
| 156 | |||
| 157 | #ifdef CONFIG_X86_32 | ||
| 158 | |||
| 159 | #define STACK_WARN (THREAD_SIZE/8) | ||
| 160 | /* | ||
| 161 | * macros/functions for gaining access to the thread information structure | ||
| 162 | * | ||
| 163 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 164 | */ | ||
| 165 | #ifndef __ASSEMBLY__ | ||
| 166 | |||
| 167 | |||
| 168 | /* how to get the current stack pointer from C */ | ||
| 169 | register unsigned long current_stack_pointer asm("esp") __used; | ||
| 170 | |||
| 171 | /* how to get the thread information struct from C */ | ||
| 172 | static inline struct thread_info *current_thread_info(void) | ||
| 173 | { | ||
| 174 | return (struct thread_info *) | ||
| 175 | (current_stack_pointer & ~(THREAD_SIZE - 1)); | ||
| 176 | } | ||
| 177 | |||
| 178 | #else /* !__ASSEMBLY__ */ | ||
| 179 | |||
| 180 | /* how to get the thread information struct from ASM */ | ||
| 181 | #define GET_THREAD_INFO(reg) \ | ||
| 182 | movl $-THREAD_SIZE, reg; \ | ||
| 183 | andl %esp, reg | ||
| 184 | |||
| 185 | /* use this one if reg already contains %esp */ | ||
| 186 | #define GET_THREAD_INFO_WITH_ESP(reg) \ | ||
| 187 | andl $-THREAD_SIZE, reg | ||
| 188 | |||
| 189 | #endif | ||
| 190 | |||
| 191 | #else /* X86_32 */ | ||
| 192 | |||
| 193 | #include <asm/pda.h> | ||
| 194 | |||
| 195 | /* | ||
| 196 | * macros/functions for gaining access to the thread information structure | ||
| 197 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 198 | */ | ||
| 199 | #ifndef __ASSEMBLY__ | ||
| 200 | static inline struct thread_info *current_thread_info(void) | ||
| 201 | { | ||
| 202 | struct thread_info *ti; | ||
| 203 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); | ||
| 204 | return ti; | ||
| 205 | } | ||
| 206 | |||
| 207 | /* do not use in interrupt context */ | ||
| 208 | static inline struct thread_info *stack_thread_info(void) | ||
| 209 | { | ||
| 210 | struct thread_info *ti; | ||
| 211 | asm("andq %%rsp,%0; " : "=r" (ti) : "0" (~(THREAD_SIZE - 1))); | ||
| 212 | return ti; | ||
| 213 | } | ||
| 214 | |||
| 215 | #else /* !__ASSEMBLY__ */ | ||
| 216 | |||
| 217 | /* how to get the thread information struct from ASM */ | ||
| 218 | #define GET_THREAD_INFO(reg) \ | ||
| 219 | movq %gs:pda_kernelstack,reg ; \ | ||
| 220 | subq $(THREAD_SIZE-PDA_STACKOFFSET),reg | ||
| 221 | |||
| 222 | #endif | ||
| 223 | |||
| 224 | #endif /* !X86_32 */ | ||
| 225 | |||
| 226 | /* | ||
| 227 | * Thread-synchronous status. | ||
| 228 | * | ||
| 229 | * This is different from the flags in that nobody else | ||
| 230 | * ever touches our thread-synchronous status, so we don't | ||
| 231 | * have to worry about atomic accesses. | ||
| 232 | */ | ||
| 233 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 234 | this quantum (SMP) */ | ||
| 235 | #define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ | ||
| 236 | #define TS_POLLING 0x0004 /* true if in idle loop | ||
| 237 | and not sleeping */ | ||
| 238 | #define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */ | ||
| 239 | |||
| 240 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 241 | |||
| 242 | #ifndef __ASSEMBLY__ | ||
| 243 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 244 | static inline void set_restore_sigmask(void) | ||
| 245 | { | ||
| 246 | struct thread_info *ti = current_thread_info(); | ||
| 247 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 248 | set_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags); | ||
| 249 | } | ||
| 250 | #endif /* !__ASSEMBLY__ */ | ||
| 7 | 251 | ||
| 8 | #ifndef __ASSEMBLY__ | 252 | #ifndef __ASSEMBLY__ |
| 9 | extern void arch_task_cache_init(void); | 253 | extern void arch_task_cache_init(void); |
diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h deleted file mode 100644 index b6338829d1a8..000000000000 --- a/include/asm-x86/thread_info_32.h +++ /dev/null | |||
| @@ -1,205 +0,0 @@ | |||
| 1 | /* thread_info.h: i386 low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ASM_THREAD_INFO_H | ||
| 8 | #define _ASM_THREAD_INFO_H | ||
| 9 | |||
| 10 | #ifdef __KERNEL__ | ||
| 11 | |||
| 12 | #include <linux/compiler.h> | ||
| 13 | #include <asm/page.h> | ||
| 14 | |||
| 15 | #ifndef __ASSEMBLY__ | ||
| 16 | #include <asm/processor.h> | ||
| 17 | #endif | ||
| 18 | |||
| 19 | /* | ||
| 20 | * low level task data that entry.S needs immediate access to | ||
| 21 | * - this struct should fit entirely inside of one cache line | ||
| 22 | * - this struct shares the supervisor stack pages | ||
| 23 | * - if the contents of this structure are changed, | ||
| 24 | * the assembly constants must also be changed | ||
| 25 | */ | ||
| 26 | #ifndef __ASSEMBLY__ | ||
| 27 | |||
| 28 | struct thread_info { | ||
| 29 | struct task_struct *task; /* main task structure */ | ||
| 30 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 31 | unsigned long flags; /* low level flags */ | ||
| 32 | unsigned long status; /* thread-synchronous flags */ | ||
| 33 | __u32 cpu; /* current CPU */ | ||
| 34 | int preempt_count; /* 0 => preemptable, | ||
| 35 | <0 => BUG */ | ||
| 36 | mm_segment_t addr_limit; /* thread address space: | ||
| 37 | 0-0xBFFFFFFF user-thread | ||
| 38 | 0-0xFFFFFFFF kernel-thread | ||
| 39 | */ | ||
| 40 | void *sysenter_return; | ||
| 41 | struct restart_block restart_block; | ||
| 42 | unsigned long previous_esp; /* ESP of the previous stack in | ||
| 43 | case of nested (IRQ) stacks | ||
| 44 | */ | ||
| 45 | __u8 supervisor_stack[0]; | ||
| 46 | }; | ||
| 47 | |||
| 48 | #else /* !__ASSEMBLY__ */ | ||
| 49 | |||
| 50 | #include <asm/asm-offsets.h> | ||
| 51 | |||
| 52 | #endif | ||
| 53 | |||
| 54 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 55 | #ifdef CONFIG_4KSTACKS | ||
| 56 | #define THREAD_SIZE (4096) | ||
| 57 | #else | ||
| 58 | #define THREAD_SIZE (8192) | ||
| 59 | #endif | ||
| 60 | |||
| 61 | #define STACK_WARN (THREAD_SIZE/8) | ||
| 62 | /* | ||
| 63 | * macros/functions for gaining access to the thread information structure | ||
| 64 | * | ||
| 65 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 66 | */ | ||
| 67 | #ifndef __ASSEMBLY__ | ||
| 68 | |||
| 69 | #define INIT_THREAD_INFO(tsk) \ | ||
| 70 | { \ | ||
| 71 | .task = &tsk, \ | ||
| 72 | .exec_domain = &default_exec_domain, \ | ||
| 73 | .flags = 0, \ | ||
| 74 | .cpu = 0, \ | ||
| 75 | .preempt_count = 1, \ | ||
| 76 | .addr_limit = KERNEL_DS, \ | ||
| 77 | .restart_block = { \ | ||
| 78 | .fn = do_no_restart_syscall, \ | ||
| 79 | }, \ | ||
| 80 | } | ||
| 81 | |||
| 82 | #define init_thread_info (init_thread_union.thread_info) | ||
| 83 | #define init_stack (init_thread_union.stack) | ||
| 84 | |||
| 85 | |||
| 86 | /* how to get the current stack pointer from C */ | ||
| 87 | register unsigned long current_stack_pointer asm("esp") __used; | ||
| 88 | |||
| 89 | /* how to get the thread information struct from C */ | ||
| 90 | static inline struct thread_info *current_thread_info(void) | ||
| 91 | { | ||
| 92 | return (struct thread_info *) | ||
| 93 | (current_stack_pointer & ~(THREAD_SIZE - 1)); | ||
| 94 | } | ||
| 95 | |||
| 96 | /* thread information allocation */ | ||
| 97 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 98 | #define alloc_thread_info(tsk) ((struct thread_info *) \ | ||
| 99 | __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(THREAD_SIZE))) | ||
| 100 | #else | ||
| 101 | #define alloc_thread_info(tsk) ((struct thread_info *) \ | ||
| 102 | __get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE))) | ||
| 103 | #endif | ||
| 104 | |||
| 105 | #else /* !__ASSEMBLY__ */ | ||
| 106 | |||
| 107 | /* how to get the thread information struct from ASM */ | ||
| 108 | #define GET_THREAD_INFO(reg) \ | ||
| 109 | movl $-THREAD_SIZE, reg; \ | ||
| 110 | andl %esp, reg | ||
| 111 | |||
| 112 | /* use this one if reg already contains %esp */ | ||
| 113 | #define GET_THREAD_INFO_WITH_ESP(reg) \ | ||
| 114 | andl $-THREAD_SIZE, reg | ||
| 115 | |||
| 116 | #endif | ||
| 117 | |||
| 118 | /* | ||
| 119 | * thread information flags | ||
| 120 | * - these are process state flags that various | ||
| 121 | * assembly files may need to access | ||
| 122 | * - pending work-to-be-done flags are in LSW | ||
| 123 | * - other flags in MSW | ||
| 124 | */ | ||
| 125 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 126 | #define TIF_SIGPENDING 1 /* signal pending */ | ||
| 127 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | ||
| 128 | #define TIF_SINGLESTEP 3 /* restore singlestep on return to | ||
| 129 | user mode */ | ||
| 130 | #define TIF_IRET 4 /* return with iret */ | ||
| 131 | #define TIF_SYSCALL_EMU 5 /* syscall emulation active */ | ||
| 132 | #define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */ | ||
| 133 | #define TIF_SECCOMP 7 /* secure computing */ | ||
| 134 | #define TIF_HRTICK_RESCHED 9 /* reprogram hrtick timer */ | ||
| 135 | #define TIF_MEMDIE 16 | ||
| 136 | #define TIF_DEBUG 17 /* uses debug registers */ | ||
| 137 | #define TIF_IO_BITMAP 18 /* uses I/O bitmap */ | ||
| 138 | #define TIF_FREEZE 19 /* is freezing for suspend */ | ||
| 139 | #define TIF_NOTSC 20 /* TSC is not accessible in userland */ | ||
| 140 | #define TIF_FORCED_TF 21 /* true if TF in eflags artificially */ | ||
| 141 | #define TIF_DEBUGCTLMSR 22 /* uses thread_struct.debugctlmsr */ | ||
| 142 | #define TIF_DS_AREA_MSR 23 /* uses thread_struct.ds_area_msr */ | ||
| 143 | #define TIF_BTS_TRACE_TS 24 /* record scheduling event timestamps */ | ||
| 144 | |||
| 145 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 146 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 147 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 148 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 149 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 150 | #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) | ||
| 151 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 152 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 153 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 154 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 155 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 156 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 157 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 158 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 159 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 160 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 161 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 162 | |||
| 163 | /* work to do on interrupt/exception return */ | ||
| 164 | #define _TIF_WORK_MASK \ | ||
| 165 | (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ | ||
| 166 | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) | ||
| 167 | /* work to do on any return to u-space */ | ||
| 168 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 169 | |||
| 170 | /* flags to check in __switch_to() */ | ||
| 171 | #define _TIF_WORK_CTXSW \ | ||
| 172 | (_TIF_IO_BITMAP | _TIF_NOTSC | _TIF_DEBUGCTLMSR | \ | ||
| 173 | _TIF_DS_AREA_MSR | _TIF_BTS_TRACE_TS) | ||
| 174 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 175 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG) | ||
| 176 | |||
| 177 | |||
| 178 | /* | ||
| 179 | * Thread-synchronous status. | ||
| 180 | * | ||
| 181 | * This is different from the flags in that nobody else | ||
| 182 | * ever touches our thread-synchronous status, so we don't | ||
| 183 | * have to worry about atomic accesses. | ||
| 184 | */ | ||
| 185 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 186 | this quantum (SMP) */ | ||
| 187 | #define TS_POLLING 0x0002 /* True if in idle loop | ||
| 188 | and not sleeping */ | ||
| 189 | #define TS_RESTORE_SIGMASK 0x0004 /* restore signal mask in do_signal() */ | ||
| 190 | |||
| 191 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 192 | |||
| 193 | #ifndef __ASSEMBLY__ | ||
| 194 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 195 | static inline void set_restore_sigmask(void) | ||
| 196 | { | ||
| 197 | struct thread_info *ti = current_thread_info(); | ||
| 198 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 199 | set_bit(TIF_SIGPENDING, &ti->flags); | ||
| 200 | } | ||
| 201 | #endif /* !__ASSEMBLY__ */ | ||
| 202 | |||
| 203 | #endif /* __KERNEL__ */ | ||
| 204 | |||
| 205 | #endif /* _ASM_THREAD_INFO_H */ | ||
diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h deleted file mode 100644 index cb69f70abba1..000000000000 --- a/include/asm-x86/thread_info_64.h +++ /dev/null | |||
| @@ -1,195 +0,0 @@ | |||
| 1 | /* thread_info.h: x86_64 low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ASM_THREAD_INFO_H | ||
| 8 | #define _ASM_THREAD_INFO_H | ||
| 9 | |||
| 10 | #ifdef __KERNEL__ | ||
| 11 | |||
| 12 | #include <asm/page.h> | ||
| 13 | #include <asm/types.h> | ||
| 14 | #include <asm/pda.h> | ||
| 15 | |||
| 16 | /* | ||
| 17 | * low level task data that entry.S needs immediate access to | ||
| 18 | * - this struct should fit entirely inside of one cache line | ||
| 19 | * - this struct shares the supervisor stack pages | ||
| 20 | */ | ||
| 21 | #ifndef __ASSEMBLY__ | ||
| 22 | struct task_struct; | ||
| 23 | struct exec_domain; | ||
| 24 | #include <asm/processor.h> | ||
| 25 | |||
| 26 | struct thread_info { | ||
| 27 | struct task_struct *task; /* main task structure */ | ||
| 28 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 29 | __u32 flags; /* low level flags */ | ||
| 30 | __u32 status; /* thread synchronous flags */ | ||
| 31 | __u32 cpu; /* current CPU */ | ||
| 32 | int preempt_count; /* 0 => preemptable, | ||
| 33 | <0 => BUG */ | ||
| 34 | mm_segment_t addr_limit; | ||
| 35 | struct restart_block restart_block; | ||
| 36 | #ifdef CONFIG_IA32_EMULATION | ||
| 37 | void __user *sysenter_return; | ||
| 38 | #endif | ||
| 39 | }; | ||
| 40 | #endif | ||
| 41 | |||
| 42 | /* | ||
| 43 | * macros/functions for gaining access to the thread information structure | ||
| 44 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 45 | */ | ||
| 46 | #ifndef __ASSEMBLY__ | ||
| 47 | #define INIT_THREAD_INFO(tsk) \ | ||
| 48 | { \ | ||
| 49 | .task = &tsk, \ | ||
| 50 | .exec_domain = &default_exec_domain, \ | ||
| 51 | .flags = 0, \ | ||
| 52 | .cpu = 0, \ | ||
| 53 | .preempt_count = 1, \ | ||
| 54 | .addr_limit = KERNEL_DS, \ | ||
| 55 | .restart_block = { \ | ||
| 56 | .fn = do_no_restart_syscall, \ | ||
| 57 | }, \ | ||
| 58 | } | ||
| 59 | |||
| 60 | #define init_thread_info (init_thread_union.thread_info) | ||
| 61 | #define init_stack (init_thread_union.stack) | ||
| 62 | |||
| 63 | static inline struct thread_info *current_thread_info(void) | ||
| 64 | { | ||
| 65 | struct thread_info *ti; | ||
| 66 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); | ||
| 67 | return ti; | ||
| 68 | } | ||
| 69 | |||
| 70 | /* do not use in interrupt context */ | ||
| 71 | static inline struct thread_info *stack_thread_info(void) | ||
| 72 | { | ||
| 73 | struct thread_info *ti; | ||
| 74 | asm("andq %%rsp,%0; " : "=r" (ti) : "0" (~(THREAD_SIZE - 1))); | ||
| 75 | return ti; | ||
| 76 | } | ||
| 77 | |||
| 78 | /* thread information allocation */ | ||
| 79 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 80 | #define THREAD_FLAGS (GFP_KERNEL | __GFP_ZERO) | ||
| 81 | #else | ||
| 82 | #define THREAD_FLAGS GFP_KERNEL | ||
| 83 | #endif | ||
| 84 | |||
| 85 | #define alloc_thread_info(tsk) \ | ||
| 86 | ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) | ||
| 87 | |||
| 88 | #else /* !__ASSEMBLY__ */ | ||
| 89 | |||
| 90 | /* how to get the thread information struct from ASM */ | ||
| 91 | #define GET_THREAD_INFO(reg) \ | ||
| 92 | movq %gs:pda_kernelstack,reg ; \ | ||
| 93 | subq $(THREAD_SIZE-PDA_STACKOFFSET),reg | ||
| 94 | |||
| 95 | #endif | ||
| 96 | |||
| 97 | /* | ||
| 98 | * thread information flags | ||
| 99 | * - these are process state flags that various assembly files | ||
| 100 | * may need to access | ||
| 101 | * - pending work-to-be-done flags are in LSW | ||
| 102 | * - other flags in MSW | ||
| 103 | * Warning: layout of LSW is hardcoded in entry.S | ||
| 104 | */ | ||
| 105 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 106 | #define TIF_SIGPENDING 2 /* signal pending */ | ||
| 107 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | ||
| 108 | #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ | ||
| 109 | #define TIF_IRET 5 /* force IRET */ | ||
| 110 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | ||
| 111 | #define TIF_SECCOMP 8 /* secure computing */ | ||
| 112 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | ||
| 113 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | ||
| 114 | /* 16 free */ | ||
| 115 | #define TIF_IA32 17 /* 32bit process */ | ||
| 116 | #define TIF_FORK 18 /* ret_from_fork */ | ||
| 117 | #define TIF_ABI_PENDING 19 | ||
| 118 | #define TIF_MEMDIE 20 | ||
| 119 | #define TIF_DEBUG 21 /* uses debug registers */ | ||
| 120 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ | ||
| 121 | #define TIF_FREEZE 23 /* is freezing for suspend */ | ||
| 122 | #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ | ||
| 123 | #define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ | ||
| 124 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ | ||
| 125 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ | ||
| 126 | #define TIF_NOTSC 28 /* TSC is not accessible in userland */ | ||
| 127 | |||
| 128 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 129 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 130 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 131 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 132 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 133 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 134 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 135 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) | ||
| 136 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 137 | #define _TIF_IA32 (1 << TIF_IA32) | ||
| 138 | #define _TIF_FORK (1 << TIF_FORK) | ||
| 139 | #define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING) | ||
| 140 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 141 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 142 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 143 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 144 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 145 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 146 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 147 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 148 | |||
| 149 | /* work to do on interrupt/exception return */ | ||
| 150 | #define _TIF_WORK_MASK \ | ||
| 151 | (0x0000FFFF & \ | ||
| 152 | ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) | ||
| 153 | /* work to do on any return to user space */ | ||
| 154 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 155 | |||
| 156 | #define _TIF_DO_NOTIFY_MASK \ | ||
| 157 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | ||
| 158 | |||
| 159 | /* flags to check in __switch_to() */ | ||
| 160 | #define _TIF_WORK_CTXSW \ | ||
| 161 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS|_TIF_NOTSC) | ||
| 162 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 163 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) | ||
| 164 | |||
| 165 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 166 | |||
| 167 | /* | ||
| 168 | * Thread-synchronous status. | ||
| 169 | * | ||
| 170 | * This is different from the flags in that nobody else | ||
| 171 | * ever touches our thread-synchronous status, so we don't | ||
| 172 | * have to worry about atomic accesses. | ||
| 173 | */ | ||
| 174 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 175 | this quantum (SMP) */ | ||
| 176 | #define TS_COMPAT 0x0002 /* 32bit syscall active */ | ||
| 177 | #define TS_POLLING 0x0004 /* true if in idle loop | ||
| 178 | and not sleeping */ | ||
| 179 | #define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */ | ||
| 180 | |||
| 181 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 182 | |||
| 183 | #ifndef __ASSEMBLY__ | ||
| 184 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 185 | static inline void set_restore_sigmask(void) | ||
| 186 | { | ||
| 187 | struct thread_info *ti = current_thread_info(); | ||
| 188 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 189 | set_bit(TIF_SIGPENDING, &ti->flags); | ||
| 190 | } | ||
| 191 | #endif /* !__ASSEMBLY__ */ | ||
| 192 | |||
| 193 | #endif /* __KERNEL__ */ | ||
| 194 | |||
| 195 | #endif /* _ASM_THREAD_INFO_H */ | ||
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h index fe26e36d0f51..9c1a4a3470d9 100644 --- a/include/asm-x86/unistd_64.h +++ b/include/asm-x86/unistd_64.h | |||
| @@ -290,7 +290,7 @@ __SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait) | |||
| 290 | #define __NR_rt_sigqueueinfo 129 | 290 | #define __NR_rt_sigqueueinfo 129 |
| 291 | __SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo) | 291 | __SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo) |
| 292 | #define __NR_rt_sigsuspend 130 | 292 | #define __NR_rt_sigsuspend 130 |
| 293 | __SYSCALL(__NR_rt_sigsuspend, stub_rt_sigsuspend) | 293 | __SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend) |
| 294 | #define __NR_sigaltstack 131 | 294 | #define __NR_sigaltstack 131 |
| 295 | __SYSCALL(__NR_sigaltstack, stub_sigaltstack) | 295 | __SYSCALL(__NR_sigaltstack, stub_sigaltstack) |
| 296 | #define __NR_utime 132 | 296 | #define __NR_utime 132 |
diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h index 074b357146df..5ce351325e01 100644 --- a/include/asm-x86/vm86.h +++ b/include/asm-x86/vm86.h | |||
| @@ -14,12 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm/processor-flags.h> | 15 | #include <asm/processor-flags.h> |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_VM86 | ||
| 18 | #define X86_VM_MASK X86_EFLAGS_VM | ||
| 19 | #else | ||
| 20 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define BIOSSEG 0x0f000 | 17 | #define BIOSSEG 0x0f000 |
| 24 | 18 | ||
| 25 | #define CPU_086 0 | 19 | #define CPU_086 0 |
| @@ -121,7 +115,6 @@ struct vm86plus_info_struct { | |||
| 121 | unsigned long is_vm86pus:1; /* for vm86 internal use */ | 115 | unsigned long is_vm86pus:1; /* for vm86 internal use */ |
| 122 | unsigned char vm86dbg_intxxtab[32]; /* for debugger */ | 116 | unsigned char vm86dbg_intxxtab[32]; /* for debugger */ |
| 123 | }; | 117 | }; |
| 124 | |||
| 125 | struct vm86plus_struct { | 118 | struct vm86plus_struct { |
| 126 | struct vm86_regs regs; | 119 | struct vm86_regs regs; |
| 127 | unsigned long flags; | 120 | unsigned long flags; |
| @@ -133,6 +126,9 @@ struct vm86plus_struct { | |||
| 133 | }; | 126 | }; |
| 134 | 127 | ||
| 135 | #ifdef __KERNEL__ | 128 | #ifdef __KERNEL__ |
| 129 | |||
| 130 | #include <asm/ptrace.h> | ||
| 131 | |||
| 136 | /* | 132 | /* |
| 137 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 | 133 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 |
| 138 | * mode - the main change is that the old segment descriptors aren't | 134 | * mode - the main change is that the old segment descriptors aren't |
| @@ -141,7 +137,6 @@ struct vm86plus_struct { | |||
| 141 | * at the end of the structure. Look at ptrace.h to see the "normal" | 137 | * at the end of the structure. Look at ptrace.h to see the "normal" |
| 142 | * setup. For user space layout see 'struct vm86_regs' above. | 138 | * setup. For user space layout see 'struct vm86_regs' above. |
| 143 | */ | 139 | */ |
| 144 | #include <asm/ptrace.h> | ||
| 145 | 140 | ||
| 146 | struct kernel_vm86_regs { | 141 | struct kernel_vm86_regs { |
| 147 | /* | 142 | /* |
diff --git a/include/asm-x86/xor_32.h b/include/asm-x86/xor_32.h index 067b5c1835a3..921b45840449 100644 --- a/include/asm-x86/xor_32.h +++ b/include/asm-x86/xor_32.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef ASM_X86__XOR_32_H | ||
| 2 | #define ASM_X86__XOR_32_H | ||
| 3 | |||
| 1 | /* | 4 | /* |
| 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 5 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
| 3 | * | 6 | * |
| @@ -881,3 +884,5 @@ do { \ | |||
| 881 | deals with a load to a line that is being prefetched. */ | 884 | deals with a load to a line that is being prefetched. */ |
| 882 | #define XOR_SELECT_TEMPLATE(FASTEST) \ | 885 | #define XOR_SELECT_TEMPLATE(FASTEST) \ |
| 883 | (cpu_has_xmm ? &xor_block_pIII_sse : FASTEST) | 886 | (cpu_has_xmm ? &xor_block_pIII_sse : FASTEST) |
| 887 | |||
| 888 | #endif /* ASM_X86__XOR_32_H */ | ||
diff --git a/include/asm-x86/xor_64.h b/include/asm-x86/xor_64.h index 24957e39ac8a..2d3a18de295b 100644 --- a/include/asm-x86/xor_64.h +++ b/include/asm-x86/xor_64.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef ASM_X86__XOR_64_H | ||
| 2 | #define ASM_X86__XOR_64_H | ||
| 3 | |||
| 1 | /* | 4 | /* |
| 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 5 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
| 3 | * | 6 | * |
| @@ -354,3 +357,5 @@ do { \ | |||
| 354 | We may also be able to load into the L1 only depending on how the cpu | 357 | We may also be able to load into the L1 only depending on how the cpu |
| 355 | deals with a load to a line that is being prefetched. */ | 358 | deals with a load to a line that is being prefetched. */ |
| 356 | #define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) | 359 | #define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) |
| 360 | |||
| 361 | #endif /* ASM_X86__XOR_64_H */ | ||
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index b6fbb2573e88..71d70d1fbce2 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -166,7 +166,7 @@ unifdef-y += acct.h | |||
| 166 | unifdef-y += adb.h | 166 | unifdef-y += adb.h |
| 167 | unifdef-y += adfs_fs.h | 167 | unifdef-y += adfs_fs.h |
| 168 | unifdef-y += agpgart.h | 168 | unifdef-y += agpgart.h |
| 169 | ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) | 169 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) |
| 170 | unifdef-y += a.out.h | 170 | unifdef-y += a.out.h |
| 171 | endif | 171 | endif |
| 172 | unifdef-y += apm_bios.h | 172 | unifdef-y += apm_bios.h |
diff --git a/include/linux/audit.h b/include/linux/audit.h index 63c3bb98558f..8b82974bdc12 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h | |||
| @@ -571,7 +571,7 @@ extern void audit_log_lost(const char *message); | |||
| 571 | extern int audit_update_lsm_rules(void); | 571 | extern int audit_update_lsm_rules(void); |
| 572 | 572 | ||
| 573 | /* Private API (for audit.c only) */ | 573 | /* Private API (for audit.c only) */ |
| 574 | extern int audit_filter_user(struct netlink_skb_parms *cb, int type); | 574 | extern int audit_filter_user(struct netlink_skb_parms *cb); |
| 575 | extern int audit_filter_type(int type); | 575 | extern int audit_filter_type(int type); |
| 576 | extern int audit_receive_filter(int type, int pid, int uid, int seq, | 576 | extern int audit_receive_filter(int type, int pid, int uid, int seq, |
| 577 | void *data, size_t datasz, uid_t loginuid, | 577 | void *data, size_t datasz, uid_t loginuid, |
diff --git a/include/linux/capability.h b/include/linux/capability.h index fa830f8de032..02673846d205 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
| @@ -501,6 +501,8 @@ extern const kernel_cap_t __cap_empty_set; | |||
| 501 | extern const kernel_cap_t __cap_full_set; | 501 | extern const kernel_cap_t __cap_full_set; |
| 502 | extern const kernel_cap_t __cap_init_eff_set; | 502 | extern const kernel_cap_t __cap_init_eff_set; |
| 503 | 503 | ||
| 504 | kernel_cap_t cap_set_effective(const kernel_cap_t pE_new); | ||
| 505 | |||
| 504 | int capable(int cap); | 506 | int capable(int cap); |
| 505 | int __capable(struct task_struct *t, int cap); | 507 | int __capable(struct task_struct *t, int cap); |
| 506 | 508 | ||
diff --git a/include/linux/cfag12864b.h b/include/linux/cfag12864b.h index 1605dd8aa646..6f9f19d66591 100644 --- a/include/linux/cfag12864b.h +++ b/include/linux/cfag12864b.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Description: cfag12864b LCD driver header | 4 | * Description: cfag12864b LCD driver header |
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * | 6 | * |
| 7 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 7 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 8 | * Date: 2006-10-12 | 8 | * Date: 2006-10-12 |
| 9 | * | 9 | * |
| 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 |
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 5df3db58fcc6..c24875bd9c5b 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h | |||
| @@ -353,6 +353,10 @@ static inline void __cpus_fold(cpumask_t *dstp, const cpumask_t *origp, | |||
| 353 | for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) | 353 | for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask) |
| 354 | #endif /* NR_CPUS */ | 354 | #endif /* NR_CPUS */ |
| 355 | 355 | ||
| 356 | #define next_cpu_nr(n, src) next_cpu(n, src) | ||
| 357 | #define cpus_weight_nr(cpumask) cpus_weight(cpumask) | ||
| 358 | #define for_each_cpu_mask_nr(cpu, mask) for_each_cpu_mask(cpu, mask) | ||
| 359 | |||
| 356 | /* | 360 | /* |
| 357 | * The following particular system cpumasks and operations manage | 361 | * The following particular system cpumasks and operations manage |
| 358 | * possible, present and online cpus. Each of them is a fixed size | 362 | * possible, present and online cpus. Each of them is a fixed size |
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 2a6639407c80..d982eb89c77d 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h | |||
| @@ -300,7 +300,7 @@ extern int d_validate(struct dentry *, struct dentry *); | |||
| 300 | extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...); | 300 | extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...); |
| 301 | 301 | ||
| 302 | extern char *__d_path(const struct path *path, struct path *root, char *, int); | 302 | extern char *__d_path(const struct path *path, struct path *root, char *, int); |
| 303 | extern char *d_path(struct path *, char *, int); | 303 | extern char *d_path(const struct path *, char *, int); |
| 304 | extern char *dentry_path(struct dentry *, char *, int); | 304 | extern char *dentry_path(struct dentry *, char *, int); |
| 305 | 305 | ||
| 306 | /* Allocation counts.. */ | 306 | /* Allocation counts.. */ |
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h index f4a5871767f5..4aaa4afb1cb9 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef __LINUX_DEBUG_LOCKING_H | 1 | #ifndef __LINUX_DEBUG_LOCKING_H |
| 2 | #define __LINUX_DEBUG_LOCKING_H | 2 | #define __LINUX_DEBUG_LOCKING_H |
| 3 | 3 | ||
| 4 | #include <linux/kernel.h> | ||
| 5 | |||
| 4 | struct task_struct; | 6 | struct task_struct; |
| 5 | 7 | ||
| 6 | extern int debug_locks; | 8 | extern int debug_locks; |
| @@ -11,14 +13,6 @@ extern int debug_locks_silent; | |||
| 11 | */ | 13 | */ |
| 12 | extern int debug_locks_off(void); | 14 | extern int debug_locks_off(void); |
| 13 | 15 | ||
| 14 | /* | ||
| 15 | * In the debug case we carry the caller's instruction pointer into | ||
| 16 | * other functions, but we dont want the function argument overhead | ||
| 17 | * in the nondebug case - hence these macros: | ||
| 18 | */ | ||
| 19 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) | ||
| 20 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) | ||
| 21 | |||
| 22 | #define DEBUG_LOCKS_WARN_ON(c) \ | 16 | #define DEBUG_LOCKS_WARN_ON(c) \ |
| 23 | ({ \ | 17 | ({ \ |
| 24 | int __ret = 0; \ | 18 | int __ret = 0; \ |
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 4d10c7328d2d..6c7eff2ebada 100644 --- a/include/linux/firmware.h +++ b/include/linux/firmware.h | |||
| @@ -13,7 +13,7 @@ struct firmware { | |||
| 13 | 13 | ||
| 14 | struct device; | 14 | struct device; |
| 15 | 15 | ||
| 16 | #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) | 16 | #if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE)) |
| 17 | int request_firmware(const struct firmware **fw, const char *name, | 17 | int request_firmware(const struct firmware **fw, const char *name, |
| 18 | struct device *device); | 18 | struct device *device); |
| 19 | int request_firmware_nowait( | 19 | int request_firmware_nowait( |
diff --git a/include/linux/fs.h b/include/linux/fs.h index d490779f18d9..d8e2762ed14d 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -83,6 +83,7 @@ extern int dir_notify_enable; | |||
| 83 | #define READ_SYNC (READ | (1 << BIO_RW_SYNC)) | 83 | #define READ_SYNC (READ | (1 << BIO_RW_SYNC)) |
| 84 | #define READ_META (READ | (1 << BIO_RW_META)) | 84 | #define READ_META (READ | (1 << BIO_RW_META)) |
| 85 | #define WRITE_SYNC (WRITE | (1 << BIO_RW_SYNC)) | 85 | #define WRITE_SYNC (WRITE | (1 << BIO_RW_SYNC)) |
| 86 | #define SWRITE_SYNC (SWRITE | (1 << BIO_RW_SYNC)) | ||
| 86 | #define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER)) | 87 | #define WRITE_BARRIER ((1 << BIO_RW) | (1 << BIO_RW_BARRIER)) |
| 87 | 88 | ||
| 88 | #define SEL_IN 1 | 89 | #define SEL_IN 1 |
| @@ -894,8 +895,6 @@ static inline int file_check_writeable(struct file *filp) | |||
| 894 | typedef struct files_struct *fl_owner_t; | 895 | typedef struct files_struct *fl_owner_t; |
| 895 | 896 | ||
| 896 | struct file_lock_operations { | 897 | struct file_lock_operations { |
| 897 | void (*fl_insert)(struct file_lock *); /* lock insertion callback */ | ||
| 898 | void (*fl_remove)(struct file_lock *); /* lock removal callback */ | ||
| 899 | void (*fl_copy_lock)(struct file_lock *, struct file_lock *); | 898 | void (*fl_copy_lock)(struct file_lock *, struct file_lock *); |
| 900 | void (*fl_release_private)(struct file_lock *); | 899 | void (*fl_release_private)(struct file_lock *); |
| 901 | }; | 900 | }; |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index fb9af6a0fe9c..8dc730132192 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -171,7 +171,7 @@ struct i2c_client { | |||
| 171 | struct i2c_adapter *adapter; /* the adapter we sit on */ | 171 | struct i2c_adapter *adapter; /* the adapter we sit on */ |
| 172 | struct i2c_driver *driver; /* and our access routines */ | 172 | struct i2c_driver *driver; /* and our access routines */ |
| 173 | struct device dev; /* the device structure */ | 173 | struct device dev; /* the device structure */ |
| 174 | int irq; /* irq issued by device (or -1) */ | 174 | int irq; /* irq issued by device */ |
| 175 | struct list_head list; /* DEPRECATED */ | 175 | struct list_head list; /* DEPRECATED */ |
| 176 | struct completion released; | 176 | struct completion released; |
| 177 | }; | 177 | }; |
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h index 80335b7d77c5..c4335faebb63 100644 --- a/include/linux/inet_lro.h +++ b/include/linux/inet_lro.h | |||
| @@ -84,7 +84,11 @@ struct net_lro_mgr { | |||
| 84 | from received packets and eth protocol | 84 | from received packets and eth protocol |
| 85 | is still ETH_P_8021Q */ | 85 | is still ETH_P_8021Q */ |
| 86 | 86 | ||
| 87 | u32 ip_summed; /* Set in non generated SKBs in page mode */ | 87 | /* |
| 88 | * Set for generated SKBs that are not added to | ||
| 89 | * the frag list in fragmented mode | ||
| 90 | */ | ||
| 91 | u32 ip_summed; | ||
| 88 | u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY | 92 | u32 ip_summed_aggr; /* Set in aggregated SKBs: CHECKSUM_UNNECESSARY |
| 89 | * or CHECKSUM_NONE */ | 93 | * or CHECKSUM_NONE */ |
| 90 | 94 | ||
diff --git a/include/linux/input.h b/include/linux/input.h index e075c4b762fb..d150c57e5f0a 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -534,8 +534,8 @@ struct input_absinfo { | |||
| 534 | 534 | ||
| 535 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ | 535 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ |
| 536 | #define KEY_FRAMEFORWARD 0x1b5 | 536 | #define KEY_FRAMEFORWARD 0x1b5 |
| 537 | |||
| 538 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ | 537 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ |
| 538 | #define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ | ||
| 539 | 539 | ||
| 540 | #define KEY_DEL_EOL 0x1c0 | 540 | #define KEY_DEL_EOL 0x1c0 |
| 541 | #define KEY_DEL_EOS 0x1c1 | 541 | #define KEY_DEL_EOS 0x1c1 |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 792bf0aa779b..2e70006c7fa8 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -46,6 +46,9 @@ extern const char linux_proc_banner[]; | |||
| 46 | #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) | 46 | #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) |
| 47 | #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) | 47 | #define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) |
| 48 | 48 | ||
| 49 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) | ||
| 50 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) | ||
| 51 | |||
| 49 | #ifdef CONFIG_LBD | 52 | #ifdef CONFIG_LBD |
| 50 | # include <asm/div64.h> | 53 | # include <asm/div64.h> |
| 51 | # define sector_div(a, b) do_div(a, b) | 54 | # define sector_div(a, b) do_div(a, b) |
diff --git a/include/linux/ks0108.h b/include/linux/ks0108.h index a2c54acceb4e..cb311798e0bc 100644 --- a/include/linux/ks0108.h +++ b/include/linux/ks0108.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Description: ks0108 LCD Controller driver header | 4 | * Description: ks0108 LCD Controller driver header |
| 5 | * License: GPLv2 | 5 | * License: GPLv2 |
| 6 | * | 6 | * |
| 7 | * Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com> | 7 | * Author: Copyright (C) Miguel Ojeda Sandonis |
| 8 | * Date: 2006-10-31 | 8 | * Date: 2006-10-31 |
| 9 | * | 9 | * |
| 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 |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f27fd2009334..25f87102ab66 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -88,6 +88,8 @@ struct wireless_dev; | |||
| 88 | #define NETDEV_TX_BUSY 1 /* driver tx path was busy*/ | 88 | #define NETDEV_TX_BUSY 1 /* driver tx path was busy*/ |
| 89 | #define NETDEV_TX_LOCKED -1 /* driver tx lock was already taken */ | 89 | #define NETDEV_TX_LOCKED -1 /* driver tx lock was already taken */ |
| 90 | 90 | ||
| 91 | #ifdef __KERNEL__ | ||
| 92 | |||
| 91 | /* | 93 | /* |
| 92 | * Compute the worst case header length according to the protocols | 94 | * Compute the worst case header length according to the protocols |
| 93 | * used. | 95 | * used. |
| @@ -114,6 +116,8 @@ struct wireless_dev; | |||
| 114 | #define MAX_HEADER (LL_MAX_HEADER + 48) | 116 | #define MAX_HEADER (LL_MAX_HEADER + 48) |
| 115 | #endif | 117 | #endif |
| 116 | 118 | ||
| 119 | #endif /* __KERNEL__ */ | ||
| 120 | |||
| 117 | struct net_device_subqueue | 121 | struct net_device_subqueue |
| 118 | { | 122 | { |
| 119 | /* Give a control state for each queue. This struct may contain | 123 | /* Give a control state for each queue. This struct may contain |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index eafc9d6d2b35..65953822c9cb 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -1520,6 +1520,7 @@ | |||
| 1520 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 | 1520 | #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 |
| 1521 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 | 1521 | #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 |
| 1522 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 | 1522 | #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 |
| 1523 | #define PCI_DEVICE_ID_MARVELL_CAFE_SD 0x4101 | ||
| 1523 | 1524 | ||
| 1524 | #define PCI_VENDOR_ID_V3 0x11b0 | 1525 | #define PCI_VENDOR_ID_V3 0x11b0 |
| 1525 | #define PCI_DEVICE_ID_V3_V960 0x0001 | 1526 | #define PCI_DEVICE_ID_V3_V960 0x0001 |
diff --git a/include/linux/rculist.h b/include/linux/rculist.h new file mode 100644 index 000000000000..bde4586f4382 --- /dev/null +++ b/include/linux/rculist.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef _LINUX_RCULIST_H | ||
| 2 | #define _LINUX_RCULIST_H | ||
| 3 | |||
| 4 | #include <linux/list.h> | ||
| 5 | |||
| 6 | #endif /* _LINUX_RCULIST_H */ | ||
diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h index f3f4f28c6960..c9ba2fdf807d 100644 --- a/include/linux/resume-trace.h +++ b/include/linux/resume-trace.h | |||
| @@ -8,7 +8,7 @@ extern int pm_trace_enabled; | |||
| 8 | 8 | ||
| 9 | struct device; | 9 | struct device; |
| 10 | extern void set_trace_device(struct device *); | 10 | extern void set_trace_device(struct device *); |
| 11 | extern void generate_resume_trace(void *tracedata, unsigned int user); | 11 | extern void generate_resume_trace(const void *tracedata, unsigned int user); |
| 12 | 12 | ||
| 13 | #define TRACE_DEVICE(dev) do { \ | 13 | #define TRACE_DEVICE(dev) do { \ |
| 14 | if (pm_trace_enabled) \ | 14 | if (pm_trace_enabled) \ |
diff --git a/include/linux/securebits.h b/include/linux/securebits.h index c1f19dbceb05..92f09bdf1175 100644 --- a/include/linux/securebits.h +++ b/include/linux/securebits.h | |||
| @@ -7,14 +7,15 @@ | |||
| 7 | inheritance of root-permissions and suid-root executable under | 7 | inheritance of root-permissions and suid-root executable under |
| 8 | compatibility mode. We raise the effective and inheritable bitmasks | 8 | compatibility mode. We raise the effective and inheritable bitmasks |
| 9 | *of the executable file* if the effective uid of the new process is | 9 | *of the executable file* if the effective uid of the new process is |
| 10 | 0. If the real uid is 0, we raise the inheritable bitmask of the | 10 | 0. If the real uid is 0, we raise the effective (legacy) bit of the |
| 11 | executable file. */ | 11 | executable file. */ |
| 12 | #define SECURE_NOROOT 0 | 12 | #define SECURE_NOROOT 0 |
| 13 | #define SECURE_NOROOT_LOCKED 1 /* make bit-0 immutable */ | 13 | #define SECURE_NOROOT_LOCKED 1 /* make bit-0 immutable */ |
| 14 | 14 | ||
| 15 | /* When set, setuid to/from uid 0 does not trigger capability-"fixes" | 15 | /* When set, setuid to/from uid 0 does not trigger capability-"fixup". |
| 16 | to be compatible with old programs relying on set*uid to loose | 16 | When unset, to provide compatiblility with old programs relying on |
| 17 | privileges. When unset, setuid doesn't change privileges. */ | 17 | set*uid to gain/lose privilege, transitions to/from uid 0 cause |
| 18 | capabilities to be gained/lost. */ | ||
| 18 | #define SECURE_NO_SETUID_FIXUP 2 | 19 | #define SECURE_NO_SETUID_FIXUP 2 |
| 19 | #define SECURE_NO_SETUID_FIXUP_LOCKED 3 /* make bit-2 immutable */ | 20 | #define SECURE_NO_SETUID_FIXUP_LOCKED 3 /* make bit-2 immutable */ |
| 20 | 21 | ||
| @@ -26,10 +27,10 @@ | |||
| 26 | #define SECURE_KEEP_CAPS 4 | 27 | #define SECURE_KEEP_CAPS 4 |
| 27 | #define SECURE_KEEP_CAPS_LOCKED 5 /* make bit-4 immutable */ | 28 | #define SECURE_KEEP_CAPS_LOCKED 5 /* make bit-4 immutable */ |
| 28 | 29 | ||
| 29 | /* Each securesetting is implemented using two bits. One bit specify | 30 | /* Each securesetting is implemented using two bits. One bit specifies |
| 30 | whether the setting is on or off. The other bit specify whether the | 31 | whether the setting is on or off. The other bit specify whether the |
| 31 | setting is fixed or not. A setting which is fixed cannot be changed | 32 | setting is locked or not. A setting which is locked cannot be |
| 32 | from user-level. */ | 33 | changed from user-level. */ |
| 33 | #define issecure_mask(X) (1 << (X)) | 34 | #define issecure_mask(X) (1 << (X)) |
| 34 | #define issecure(X) (issecure_mask(X) & current->securebits) | 35 | #define issecure(X) (issecure_mask(X) & current->securebits) |
| 35 | 36 | ||
diff --git a/include/linux/slab.h b/include/linux/slab.h index c2ad35016599..9aa90a6f20e0 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Written by Mark Hemment, 1996 (markhe@nextd.demon.co.uk). | 2 | * Written by Mark Hemment, 1996 (markhe@nextd.demon.co.uk). |
| 3 | * | 3 | * |
| 4 | * (C) SGI 2006, Christoph Lameter <clameter@sgi.com> | 4 | * (C) SGI 2006, Christoph Lameter |
| 5 | * Cleaned up and restructured to ease the addition of alternative | 5 | * Cleaned up and restructured to ease the addition of alternative |
| 6 | * implementations of SLAB allocators. | 6 | * implementations of SLAB allocators. |
| 7 | */ | 7 | */ |
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 71e43a12ebbb..d117ea2825a9 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | /* | 4 | /* |
| 5 | * SLUB : A Slab allocator without object queues. | 5 | * SLUB : A Slab allocator without object queues. |
| 6 | * | 6 | * |
| 7 | * (C) 2007 SGI, Christoph Lameter <clameter@sgi.com> | 7 | * (C) 2007 SGI, Christoph Lameter |
| 8 | */ | 8 | */ |
| 9 | #include <linux/types.h> | 9 | #include <linux/types.h> |
| 10 | #include <linux/gfp.h> | 10 | #include <linux/gfp.h> |
| @@ -137,10 +137,12 @@ static __always_inline int kmalloc_index(size_t size) | |||
| 137 | if (size <= KMALLOC_MIN_SIZE) | 137 | if (size <= KMALLOC_MIN_SIZE) |
| 138 | return KMALLOC_SHIFT_LOW; | 138 | return KMALLOC_SHIFT_LOW; |
| 139 | 139 | ||
| 140 | #if KMALLOC_MIN_SIZE <= 64 | ||
| 140 | if (size > 64 && size <= 96) | 141 | if (size > 64 && size <= 96) |
| 141 | return 1; | 142 | return 1; |
| 142 | if (size > 128 && size <= 192) | 143 | if (size > 128 && size <= 192) |
| 143 | return 2; | 144 | return 2; |
| 145 | #endif | ||
| 144 | if (size <= 8) return 3; | 146 | if (size <= 8) return 3; |
| 145 | if (size <= 16) return 4; | 147 | if (size <= 16) return 4; |
| 146 | if (size <= 32) return 5; | 148 | if (size <= 32) return 5; |
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 06d3e6eb9ca8..917707e6151d 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h | |||
| @@ -66,8 +66,7 @@ struct thermal_cooling_device { | |||
| 66 | ((long)t-2732+5)/10 : ((long)t-2732-5)/10) | 66 | ((long)t-2732+5)/10 : ((long)t-2732-5)/10) |
| 67 | #define CELSIUS_TO_KELVIN(t) ((t)*10+2732) | 67 | #define CELSIUS_TO_KELVIN(t) ((t)*10+2732) |
| 68 | 68 | ||
| 69 | #if defined(CONFIG_HWMON) || \ | 69 | #if defined(CONFIG_THERMAL_HWMON) |
| 70 | (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) | ||
| 71 | /* thermal zone devices with the same type share one hwmon device */ | 70 | /* thermal zone devices with the same type share one hwmon device */ |
| 72 | struct thermal_hwmon_device { | 71 | struct thermal_hwmon_device { |
| 73 | char type[THERMAL_NAME_LENGTH]; | 72 | char type[THERMAL_NAME_LENGTH]; |
| @@ -94,8 +93,7 @@ struct thermal_zone_device { | |||
| 94 | struct idr idr; | 93 | struct idr idr; |
| 95 | struct mutex lock; /* protect cooling devices list */ | 94 | struct mutex lock; /* protect cooling devices list */ |
| 96 | struct list_head node; | 95 | struct list_head node; |
| 97 | #if defined(CONFIG_HWMON) || \ | 96 | #if defined(CONFIG_THERMAL_HWMON) |
| 98 | (defined(CONFIG_HWMON_MODULE) && defined(CONFIG_THERMAL_MODULE)) | ||
| 99 | struct list_head hwmon_node; | 97 | struct list_head hwmon_node; |
| 100 | struct thermal_hwmon_device *hwmon; | 98 | struct thermal_hwmon_device *hwmon; |
| 101 | struct thermal_hwmon_attr temp_input; /* hwmon sys attr */ | 99 | struct thermal_hwmon_attr temp_input; /* hwmon sys attr */ |
diff --git a/include/media/cx25840.h b/include/media/cx25840.h index cd599ad29fb2..db431d513f2f 100644 --- a/include/media/cx25840.h +++ b/include/media/cx25840.h | |||
| @@ -32,12 +32,16 @@ enum cx25840_video_input { | |||
| 32 | CX25840_COMPOSITE7, | 32 | CX25840_COMPOSITE7, |
| 33 | CX25840_COMPOSITE8, | 33 | CX25840_COMPOSITE8, |
| 34 | 34 | ||
| 35 | /* S-Video inputs consist of one luma input (In1-In4) ORed with one | 35 | /* S-Video inputs consist of one luma input (In1-In8) ORed with one |
| 36 | chroma input (In5-In8) */ | 36 | chroma input (In5-In8) */ |
| 37 | CX25840_SVIDEO_LUMA1 = 0x10, | 37 | CX25840_SVIDEO_LUMA1 = 0x10, |
| 38 | CX25840_SVIDEO_LUMA2 = 0x20, | 38 | CX25840_SVIDEO_LUMA2 = 0x20, |
| 39 | CX25840_SVIDEO_LUMA3 = 0x30, | 39 | CX25840_SVIDEO_LUMA3 = 0x30, |
| 40 | CX25840_SVIDEO_LUMA4 = 0x40, | 40 | CX25840_SVIDEO_LUMA4 = 0x40, |
| 41 | CX25840_SVIDEO_LUMA5 = 0x50, | ||
| 42 | CX25840_SVIDEO_LUMA6 = 0x60, | ||
| 43 | CX25840_SVIDEO_LUMA7 = 0x70, | ||
| 44 | CX25840_SVIDEO_LUMA8 = 0x80, | ||
| 41 | CX25840_SVIDEO_CHROMA4 = 0x400, | 45 | CX25840_SVIDEO_CHROMA4 = 0x400, |
| 42 | CX25840_SVIDEO_CHROMA5 = 0x500, | 46 | CX25840_SVIDEO_CHROMA5 = 0x500, |
| 43 | CX25840_SVIDEO_CHROMA6 = 0x600, | 47 | CX25840_SVIDEO_CHROMA6 = 0x600, |
diff --git a/include/media/ir-common.h b/include/media/ir-common.h index bfee8be5d63f..b8e8aa91905a 100644 --- a/include/media/ir-common.h +++ b/include/media/ir-common.h | |||
| @@ -146,6 +146,7 @@ extern IR_KEYTAB_TYPE ir_codes_behold_columbus[IR_KEYTAB_SIZE]; | |||
| 146 | extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE]; | 146 | extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE]; |
| 147 | extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE]; | 147 | extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE]; |
| 148 | extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE]; | 148 | extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE]; |
| 149 | extern IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE]; | ||
| 149 | 150 | ||
| 150 | #endif | 151 | #endif |
| 151 | 152 | ||
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 33f01ae08f76..859f7a6f6f67 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #define VFL_TYPE_VTX 3 | 40 | #define VFL_TYPE_VTX 3 |
| 41 | 41 | ||
| 42 | /* Video standard functions */ | 42 | /* Video standard functions */ |
| 43 | extern char *v4l2_norm_to_name(v4l2_std_id id); | 43 | extern const char *v4l2_norm_to_name(v4l2_std_id id); |
| 44 | extern int v4l2_video_std_construct(struct v4l2_standard *vs, | 44 | extern int v4l2_video_std_construct(struct v4l2_standard *vs, |
| 45 | int id, char *name); | 45 | int id, const char *name); |
| 46 | /* Prints the ioctl in a human-readable format */ | 46 | /* Prints the ioctl in a human-readable format */ |
| 47 | extern void v4l_printk_ioctl(unsigned int cmd); | 47 | extern void v4l_printk_ioctl(unsigned int cmd); |
| 48 | 48 | ||
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index dae3f9ec1154..bcd1623245cb 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -595,6 +595,15 @@ enum ieee80211_key_alg { | |||
| 595 | ALG_CCMP, | 595 | ALG_CCMP, |
| 596 | }; | 596 | }; |
| 597 | 597 | ||
| 598 | /** | ||
| 599 | * enum ieee80211_key_len - key length | ||
| 600 | * @WEP40: WEP 5 byte long key | ||
| 601 | * @WEP104: WEP 13 byte long key | ||
| 602 | */ | ||
| 603 | enum ieee80211_key_len { | ||
| 604 | LEN_WEP40 = 5, | ||
| 605 | LEN_WEP104 = 13, | ||
| 606 | }; | ||
| 598 | 607 | ||
| 599 | /** | 608 | /** |
| 600 | * enum ieee80211_key_flags - key flags | 609 | * enum ieee80211_key_flags - key flags |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index ab502ec1c61c..a87fc0312edc 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
| @@ -178,7 +178,7 @@ extern struct Qdisc *qdisc_alloc(struct net_device *dev, struct Qdisc_ops *ops); | |||
| 178 | extern struct Qdisc *qdisc_create_dflt(struct net_device *dev, | 178 | extern struct Qdisc *qdisc_create_dflt(struct net_device *dev, |
| 179 | struct Qdisc_ops *ops, u32 parentid); | 179 | struct Qdisc_ops *ops, u32 parentid); |
| 180 | extern void tcf_destroy(struct tcf_proto *tp); | 180 | extern void tcf_destroy(struct tcf_proto *tp); |
| 181 | extern void tcf_destroy_chain(struct tcf_proto *fl); | 181 | extern void tcf_destroy_chain(struct tcf_proto **fl); |
| 182 | 182 | ||
| 183 | static inline int __qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch, | 183 | static inline int __qdisc_enqueue_tail(struct sk_buff *skb, struct Qdisc *sch, |
| 184 | struct sk_buff_head *list) | 184 | struct sk_buff_head *list) |
diff --git a/kernel/audit.c b/kernel/audit.c index e8692a5748c2..e092f1c0ce30 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -738,7 +738,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 738 | if (!audit_enabled && msg_type != AUDIT_USER_AVC) | 738 | if (!audit_enabled && msg_type != AUDIT_USER_AVC) |
| 739 | return 0; | 739 | return 0; |
| 740 | 740 | ||
| 741 | err = audit_filter_user(&NETLINK_CB(skb), msg_type); | 741 | err = audit_filter_user(&NETLINK_CB(skb)); |
| 742 | if (err == 1) { | 742 | if (err == 1) { |
| 743 | err = 0; | 743 | err = 0; |
| 744 | if (msg_type == AUDIT_USER_TTY) { | 744 | if (msg_type == AUDIT_USER_TTY) { |
| @@ -779,7 +779,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 779 | } | 779 | } |
| 780 | /* fallthrough */ | 780 | /* fallthrough */ |
| 781 | case AUDIT_LIST: | 781 | case AUDIT_LIST: |
| 782 | err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, | 782 | err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid, |
| 783 | uid, seq, data, nlmsg_len(nlh), | 783 | uid, seq, data, nlmsg_len(nlh), |
| 784 | loginuid, sessionid, sid); | 784 | loginuid, sessionid, sid); |
| 785 | break; | 785 | break; |
| @@ -798,7 +798,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
| 798 | } | 798 | } |
| 799 | /* fallthrough */ | 799 | /* fallthrough */ |
| 800 | case AUDIT_LIST_RULES: | 800 | case AUDIT_LIST_RULES: |
| 801 | err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, | 801 | err = audit_receive_filter(msg_type, NETLINK_CB(skb).pid, |
| 802 | uid, seq, data, nlmsg_len(nlh), | 802 | uid, seq, data, nlmsg_len(nlh), |
| 803 | loginuid, sessionid, sid); | 803 | loginuid, sessionid, sid); |
| 804 | break; | 804 | break; |
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 0e0bd27e6512..98c50cc671bb 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
| @@ -1544,6 +1544,7 @@ static void audit_log_rule_change(uid_t loginuid, u32 sessionid, u32 sid, | |||
| 1544 | * @data: payload data | 1544 | * @data: payload data |
| 1545 | * @datasz: size of payload data | 1545 | * @datasz: size of payload data |
| 1546 | * @loginuid: loginuid of sender | 1546 | * @loginuid: loginuid of sender |
| 1547 | * @sessionid: sessionid for netlink audit message | ||
| 1547 | * @sid: SE Linux Security ID of sender | 1548 | * @sid: SE Linux Security ID of sender |
| 1548 | */ | 1549 | */ |
| 1549 | int audit_receive_filter(int type, int pid, int uid, int seq, void *data, | 1550 | int audit_receive_filter(int type, int pid, int uid, int seq, void *data, |
| @@ -1720,7 +1721,7 @@ static int audit_filter_user_rules(struct netlink_skb_parms *cb, | |||
| 1720 | return 1; | 1721 | return 1; |
| 1721 | } | 1722 | } |
| 1722 | 1723 | ||
| 1723 | int audit_filter_user(struct netlink_skb_parms *cb, int type) | 1724 | int audit_filter_user(struct netlink_skb_parms *cb) |
| 1724 | { | 1725 | { |
| 1725 | enum audit_state state = AUDIT_DISABLED; | 1726 | enum audit_state state = AUDIT_DISABLED; |
| 1726 | struct audit_entry *e; | 1727 | struct audit_entry *e; |
diff --git a/kernel/capability.c b/kernel/capability.c index cfbe44299488..901e0fdc3fff 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
| @@ -121,6 +121,27 @@ static int cap_validate_magic(cap_user_header_t header, unsigned *tocopy) | |||
| 121 | * uninteresting and/or not to be changed. | 121 | * uninteresting and/or not to be changed. |
| 122 | */ | 122 | */ |
| 123 | 123 | ||
| 124 | /* | ||
| 125 | * Atomically modify the effective capabilities returning the original | ||
| 126 | * value. No permission check is performed here - it is assumed that the | ||
| 127 | * caller is permitted to set the desired effective capabilities. | ||
| 128 | */ | ||
| 129 | kernel_cap_t cap_set_effective(const kernel_cap_t pE_new) | ||
| 130 | { | ||
| 131 | kernel_cap_t pE_old; | ||
| 132 | |||
| 133 | spin_lock(&task_capability_lock); | ||
| 134 | |||
| 135 | pE_old = current->cap_effective; | ||
| 136 | current->cap_effective = pE_new; | ||
| 137 | |||
| 138 | spin_unlock(&task_capability_lock); | ||
| 139 | |||
| 140 | return pE_old; | ||
| 141 | } | ||
| 142 | |||
| 143 | EXPORT_SYMBOL(cap_set_effective); | ||
| 144 | |||
| 124 | /** | 145 | /** |
| 125 | * sys_capget - get the capabilities of a given process. | 146 | * sys_capget - get the capabilities of a given process. |
| 126 | * @header: pointer to struct that contains capability version and | 147 | * @header: pointer to struct that contains capability version and |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 421be5fe5cc7..ab80515008f4 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -1003,10 +1003,18 @@ hrtimer_start(struct hrtimer *timer, ktime_t tim, const enum hrtimer_mode mode) | |||
| 1003 | */ | 1003 | */ |
| 1004 | raise = timer->state == HRTIMER_STATE_PENDING; | 1004 | raise = timer->state == HRTIMER_STATE_PENDING; |
| 1005 | 1005 | ||
| 1006 | /* | ||
| 1007 | * We use preempt_disable to prevent this task from migrating after | ||
| 1008 | * setting up the softirq and raising it. Otherwise, if me migrate | ||
| 1009 | * we will raise the softirq on the wrong CPU. | ||
| 1010 | */ | ||
| 1011 | preempt_disable(); | ||
| 1012 | |||
| 1006 | unlock_hrtimer_base(timer, &flags); | 1013 | unlock_hrtimer_base(timer, &flags); |
| 1007 | 1014 | ||
| 1008 | if (raise) | 1015 | if (raise) |
| 1009 | hrtimer_raise_softirq(); | 1016 | hrtimer_raise_softirq(); |
| 1017 | preempt_enable(); | ||
| 1010 | 1018 | ||
| 1011 | return ret; | 1019 | return ret; |
| 1012 | } | 1020 | } |
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index f4ffbd0f306f..a38895a5b8e2 100644 --- a/kernel/rcuclassic.c +++ b/kernel/rcuclassic.c | |||
| @@ -89,8 +89,22 @@ static void force_quiescent_state(struct rcu_data *rdp, | |||
| 89 | /* | 89 | /* |
| 90 | * Don't send IPI to itself. With irqs disabled, | 90 | * Don't send IPI to itself. With irqs disabled, |
| 91 | * rdp->cpu is the current cpu. | 91 | * rdp->cpu is the current cpu. |
| 92 | * | ||
| 93 | * cpu_online_map is updated by the _cpu_down() | ||
| 94 | * using stop_machine_run(). Since we're in irqs disabled | ||
| 95 | * section, stop_machine_run() is not exectuting, hence | ||
| 96 | * the cpu_online_map is stable. | ||
| 97 | * | ||
| 98 | * However, a cpu might have been offlined _just_ before | ||
| 99 | * we disabled irqs while entering here. | ||
| 100 | * And rcu subsystem might not yet have handled the CPU_DEAD | ||
| 101 | * notification, leading to the offlined cpu's bit | ||
| 102 | * being set in the rcp->cpumask. | ||
| 103 | * | ||
| 104 | * Hence cpumask = (rcp->cpumask & cpu_online_map) to prevent | ||
| 105 | * sending smp_reschedule() to an offlined CPU. | ||
| 92 | */ | 106 | */ |
| 93 | cpumask = rcp->cpumask; | 107 | cpus_and(cpumask, rcp->cpumask, cpu_online_map); |
| 94 | cpu_clear(rdp->cpu, cpumask); | 108 | cpu_clear(rdp->cpu, cpumask); |
| 95 | for_each_cpu_mask(cpu, cpumask) | 109 | for_each_cpu_mask(cpu, cpumask) |
| 96 | smp_send_reschedule(cpu); | 110 | smp_send_reschedule(cpu); |
diff --git a/kernel/sched.c b/kernel/sched.c index 3aaa5c8cb421..94ead43eda62 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -5887,6 +5887,7 @@ static void migrate_dead_tasks(unsigned int dead_cpu) | |||
| 5887 | next = pick_next_task(rq, rq->curr); | 5887 | next = pick_next_task(rq, rq->curr); |
| 5888 | if (!next) | 5888 | if (!next) |
| 5889 | break; | 5889 | break; |
| 5890 | next->sched_class->put_prev_task(rq, next); | ||
| 5890 | migrate_dead(dead_cpu, next); | 5891 | migrate_dead(dead_cpu, next); |
| 5891 | 5892 | ||
| 5892 | } | 5893 | } |
| @@ -8501,6 +8502,9 @@ int sched_group_set_rt_period(struct task_group *tg, long rt_period_us) | |||
| 8501 | rt_period = (u64)rt_period_us * NSEC_PER_USEC; | 8502 | rt_period = (u64)rt_period_us * NSEC_PER_USEC; |
| 8502 | rt_runtime = tg->rt_bandwidth.rt_runtime; | 8503 | rt_runtime = tg->rt_bandwidth.rt_runtime; |
| 8503 | 8504 | ||
| 8505 | if (rt_period == 0) | ||
| 8506 | return -EINVAL; | ||
| 8507 | |||
| 8504 | return tg_set_bandwidth(tg, rt_period, rt_runtime); | 8508 | return tg_set_bandwidth(tg, rt_period, rt_runtime); |
| 8505 | } | 8509 | } |
| 8506 | 8510 | ||
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index c828c2339cc9..a272d78185eb 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
| @@ -120,6 +120,7 @@ void softlockup_tick(void) | |||
| 120 | printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", | 120 | printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", |
| 121 | this_cpu, now - touch_timestamp, | 121 | this_cpu, now - touch_timestamp, |
| 122 | current->comm, task_pid_nr(current)); | 122 | current->comm, task_pid_nr(current)); |
| 123 | print_modules(); | ||
| 123 | if (regs) | 124 | if (regs) |
| 124 | show_regs(regs); | 125 | show_regs(regs); |
| 125 | else | 126 | else |
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index 57a1f02e5ec0..67f80c261709 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | struct tick_device tick_broadcast_device; | 30 | struct tick_device tick_broadcast_device; |
| 31 | static cpumask_t tick_broadcast_mask; | 31 | static cpumask_t tick_broadcast_mask; |
| 32 | static DEFINE_SPINLOCK(tick_broadcast_lock); | 32 | static DEFINE_SPINLOCK(tick_broadcast_lock); |
| 33 | static int tick_broadcast_force; | ||
| 33 | 34 | ||
| 34 | #ifdef CONFIG_TICK_ONESHOT | 35 | #ifdef CONFIG_TICK_ONESHOT |
| 35 | static void tick_broadcast_clear_oneshot(int cpu); | 36 | static void tick_broadcast_clear_oneshot(int cpu); |
| @@ -232,10 +233,11 @@ static void tick_do_broadcast_on_off(void *why) | |||
| 232 | CLOCK_EVT_MODE_SHUTDOWN); | 233 | CLOCK_EVT_MODE_SHUTDOWN); |
| 233 | } | 234 | } |
| 234 | if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE) | 235 | if (*reason == CLOCK_EVT_NOTIFY_BROADCAST_FORCE) |
| 235 | dev->features |= CLOCK_EVT_FEAT_DUMMY; | 236 | tick_broadcast_force = 1; |
| 236 | break; | 237 | break; |
| 237 | case CLOCK_EVT_NOTIFY_BROADCAST_OFF: | 238 | case CLOCK_EVT_NOTIFY_BROADCAST_OFF: |
| 238 | if (cpu_isset(cpu, tick_broadcast_mask)) { | 239 | if (!tick_broadcast_force && |
| 240 | cpu_isset(cpu, tick_broadcast_mask)) { | ||
| 239 | cpu_clear(cpu, tick_broadcast_mask); | 241 | cpu_clear(cpu, tick_broadcast_mask); |
| 240 | if (td->mode == TICKDEV_MODE_PERIODIC) | 242 | if (td->mode == TICKDEV_MODE_PERIODIC) |
| 241 | tick_setup_periodic(dev, 0); | 243 | tick_setup_periodic(dev, 0); |
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 29fc39f1029c..ce7799540c91 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * Kai Petzke <wpp@marie.physik.tu-berlin.de> | 13 | * Kai Petzke <wpp@marie.physik.tu-berlin.de> |
| 14 | * Theodore Ts'o <tytso@mit.edu> | 14 | * Theodore Ts'o <tytso@mit.edu> |
| 15 | * | 15 | * |
| 16 | * Made to use alloc_percpu by Christoph Lameter <clameter@sgi.com>. | 16 | * Made to use alloc_percpu by Christoph Lameter. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| @@ -37,6 +37,7 @@ | |||
| 37 | */ | 37 | */ |
| 38 | #include <linux/list.h> | 38 | #include <linux/list.h> |
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/kernel.h> | ||
| 40 | #include <linux/bug.h> | 41 | #include <linux/bug.h> |
| 41 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
| 42 | 43 | ||
| @@ -149,6 +150,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) | |||
| 149 | (void *)bugaddr); | 150 | (void *)bugaddr); |
| 150 | 151 | ||
| 151 | show_regs(regs); | 152 | show_regs(regs); |
| 153 | add_taint(TAINT_WARN); | ||
| 152 | return BUG_TRAP_TYPE_WARN; | 154 | return BUG_TRAP_TYPE_WARN; |
| 153 | } | 155 | } |
| 154 | 156 | ||
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index a76a5e122ae1..85b18d79be89 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
| @@ -68,6 +68,7 @@ static int fill_pool(void) | |||
| 68 | { | 68 | { |
| 69 | gfp_t gfp = GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN; | 69 | gfp_t gfp = GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN; |
| 70 | struct debug_obj *new; | 70 | struct debug_obj *new; |
| 71 | unsigned long flags; | ||
| 71 | 72 | ||
| 72 | if (likely(obj_pool_free >= ODEBUG_POOL_MIN_LEVEL)) | 73 | if (likely(obj_pool_free >= ODEBUG_POOL_MIN_LEVEL)) |
| 73 | return obj_pool_free; | 74 | return obj_pool_free; |
| @@ -81,10 +82,10 @@ static int fill_pool(void) | |||
| 81 | if (!new) | 82 | if (!new) |
| 82 | return obj_pool_free; | 83 | return obj_pool_free; |
| 83 | 84 | ||
| 84 | spin_lock(&pool_lock); | 85 | spin_lock_irqsave(&pool_lock, flags); |
| 85 | hlist_add_head(&new->node, &obj_pool); | 86 | hlist_add_head(&new->node, &obj_pool); |
| 86 | obj_pool_free++; | 87 | obj_pool_free++; |
| 87 | spin_unlock(&pool_lock); | 88 | spin_unlock_irqrestore(&pool_lock, flags); |
| 88 | } | 89 | } |
| 89 | return obj_pool_free; | 90 | return obj_pool_free; |
| 90 | } | 91 | } |
| @@ -110,16 +111,13 @@ static struct debug_obj *lookup_object(void *addr, struct debug_bucket *b) | |||
| 110 | } | 111 | } |
| 111 | 112 | ||
| 112 | /* | 113 | /* |
| 113 | * Allocate a new object. If the pool is empty and no refill possible, | 114 | * Allocate a new object. If the pool is empty, switch off the debugger. |
| 114 | * switch off the debugger. | ||
| 115 | */ | 115 | */ |
| 116 | static struct debug_obj * | 116 | static struct debug_obj * |
| 117 | alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr) | 117 | alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr) |
| 118 | { | 118 | { |
| 119 | struct debug_obj *obj = NULL; | 119 | struct debug_obj *obj = NULL; |
| 120 | int retry = 0; | ||
| 121 | 120 | ||
| 122 | repeat: | ||
| 123 | spin_lock(&pool_lock); | 121 | spin_lock(&pool_lock); |
| 124 | if (obj_pool.first) { | 122 | if (obj_pool.first) { |
| 125 | obj = hlist_entry(obj_pool.first, typeof(*obj), node); | 123 | obj = hlist_entry(obj_pool.first, typeof(*obj), node); |
| @@ -141,9 +139,6 @@ repeat: | |||
| 141 | } | 139 | } |
| 142 | spin_unlock(&pool_lock); | 140 | spin_unlock(&pool_lock); |
| 143 | 141 | ||
| 144 | if (fill_pool() && !obj && !retry++) | ||
| 145 | goto repeat; | ||
| 146 | |||
| 147 | return obj; | 142 | return obj; |
| 148 | } | 143 | } |
| 149 | 144 | ||
| @@ -261,6 +256,8 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack) | |||
| 261 | struct debug_obj *obj; | 256 | struct debug_obj *obj; |
| 262 | unsigned long flags; | 257 | unsigned long flags; |
| 263 | 258 | ||
| 259 | fill_pool(); | ||
| 260 | |||
| 264 | db = get_bucket((unsigned long) addr); | 261 | db = get_bucket((unsigned long) addr); |
| 265 | 262 | ||
| 266 | spin_lock_irqsave(&db->lock, flags); | 263 | spin_lock_irqsave(&db->lock, flags); |
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 169a2f8dabcc..56ec21a7f73d 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2001 Momchil Velikov | 2 | * Copyright (C) 2001 Momchil Velikov |
| 3 | * Portions Copyright (C) 2001 Christoph Hellwig | 3 | * Portions Copyright (C) 2001 Christoph Hellwig |
| 4 | * Copyright (C) 2005 SGI, Christoph Lameter <clameter@sgi.com> | 4 | * Copyright (C) 2005 SGI, Christoph Lameter |
| 5 | * Copyright (C) 2006 Nick Piggin | 5 | * Copyright (C) 2006 Nick Piggin |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
diff --git a/lib/ts_bm.c b/lib/ts_bm.c index d90822c378a4..4a7fce72898e 100644 --- a/lib/ts_bm.c +++ b/lib/ts_bm.c | |||
| @@ -63,7 +63,7 @@ static unsigned int bm_find(struct ts_config *conf, struct ts_state *state) | |||
| 63 | struct ts_bm *bm = ts_config_priv(conf); | 63 | struct ts_bm *bm = ts_config_priv(conf); |
| 64 | unsigned int i, text_len, consumed = state->offset; | 64 | unsigned int i, text_len, consumed = state->offset; |
| 65 | const u8 *text; | 65 | const u8 *text; |
| 66 | int shift = bm->patlen, bs; | 66 | int shift = bm->patlen - 1, bs; |
| 67 | 67 | ||
| 68 | for (;;) { | 68 | for (;;) { |
| 69 | text_len = conf->get_next_block(consumed, &text, conf, state); | 69 | text_len = conf->get_next_block(consumed, &text, conf, state); |
diff --git a/mm/allocpercpu.c b/mm/allocpercpu.c index f4026bae6eed..05f2b4009ccc 100644 --- a/mm/allocpercpu.c +++ b/mm/allocpercpu.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/mm/allocpercpu.c | 2 | * linux/mm/allocpercpu.c |
| 3 | * | 3 | * |
| 4 | * Separated from slab.c August 11, 2006 Christoph Lameter <clameter@sgi.com> | 4 | * Separated from slab.c August 11, 2006 Christoph Lameter |
| 5 | */ | 5 | */ |
| 6 | #include <linux/mm.h> | 6 | #include <linux/mm.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
diff --git a/mm/memory.c b/mm/memory.c index d14b251a25a6..2302d228fe04 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1151,7 +1151,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 1151 | * be processed until returning to user space. | 1151 | * be processed until returning to user space. |
| 1152 | */ | 1152 | */ |
| 1153 | if (unlikely(test_tsk_thread_flag(tsk, TIF_MEMDIE))) | 1153 | if (unlikely(test_tsk_thread_flag(tsk, TIF_MEMDIE))) |
| 1154 | return -ENOMEM; | 1154 | return i ? i : -ENOMEM; |
| 1155 | 1155 | ||
| 1156 | if (write) | 1156 | if (write) |
| 1157 | foll_flags |= FOLL_WRITE; | 1157 | foll_flags |= FOLL_WRITE; |
| @@ -1697,8 +1697,19 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 1697 | struct page *dirty_page = NULL; | 1697 | struct page *dirty_page = NULL; |
| 1698 | 1698 | ||
| 1699 | old_page = vm_normal_page(vma, address, orig_pte); | 1699 | old_page = vm_normal_page(vma, address, orig_pte); |
| 1700 | if (!old_page) | 1700 | if (!old_page) { |
| 1701 | /* | ||
| 1702 | * VM_MIXEDMAP !pfn_valid() case | ||
| 1703 | * | ||
| 1704 | * We should not cow pages in a shared writeable mapping. | ||
| 1705 | * Just mark the pages writable as we can't do any dirty | ||
| 1706 | * accounting on raw pfn maps. | ||
| 1707 | */ | ||
| 1708 | if ((vma->vm_flags & (VM_WRITE|VM_SHARED)) == | ||
| 1709 | (VM_WRITE|VM_SHARED)) | ||
| 1710 | goto reuse; | ||
| 1701 | goto gotten; | 1711 | goto gotten; |
| 1712 | } | ||
| 1702 | 1713 | ||
| 1703 | /* | 1714 | /* |
| 1704 | * Take out anonymous pages first, anonymous shared vmas are | 1715 | * Take out anonymous pages first, anonymous shared vmas are |
| @@ -1751,6 +1762,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 1751 | } | 1762 | } |
| 1752 | 1763 | ||
| 1753 | if (reuse) { | 1764 | if (reuse) { |
| 1765 | reuse: | ||
| 1754 | flush_cache_page(vma, address, pte_pfn(orig_pte)); | 1766 | flush_cache_page(vma, address, pte_pfn(orig_pte)); |
| 1755 | entry = pte_mkyoung(orig_pte); | 1767 | entry = pte_mkyoung(orig_pte); |
| 1756 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); | 1768 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index a37a5034f63d..c94e58b192c3 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
| @@ -729,7 +729,11 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask, | |||
| 729 | } else { | 729 | } else { |
| 730 | *policy = pol == &default_policy ? MPOL_DEFAULT : | 730 | *policy = pol == &default_policy ? MPOL_DEFAULT : |
| 731 | pol->mode; | 731 | pol->mode; |
| 732 | *policy |= pol->flags; | 732 | /* |
| 733 | * Internal mempolicy flags must be masked off before exposing | ||
| 734 | * the policy to userspace. | ||
| 735 | */ | ||
| 736 | *policy |= (pol->flags & MPOL_MODE_FLAGS); | ||
| 733 | } | 737 | } |
| 734 | 738 | ||
| 735 | if (vma) { | 739 | if (vma) { |
diff --git a/mm/migrate.c b/mm/migrate.c index 112bcaeaa104..55bd355d170d 100644 --- a/mm/migrate.c +++ b/mm/migrate.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | * IWAMOTO Toshihiro <iwamoto@valinux.co.jp> | 9 | * IWAMOTO Toshihiro <iwamoto@valinux.co.jp> |
| 10 | * Hirokazu Takahashi <taka@valinux.co.jp> | 10 | * Hirokazu Takahashi <taka@valinux.co.jp> |
| 11 | * Dave Hansen <haveblue@us.ibm.com> | 11 | * Dave Hansen <haveblue@us.ibm.com> |
| 12 | * Christoph Lameter <clameter@sgi.com> | 12 | * Christoph Lameter |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/migrate.h> | 15 | #include <linux/migrate.h> |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2f552955a02f..f32fae3121f0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2328,7 +2328,6 @@ static void build_zonelists(pg_data_t *pgdat) | |||
| 2328 | static void build_zonelist_cache(pg_data_t *pgdat) | 2328 | static void build_zonelist_cache(pg_data_t *pgdat) |
| 2329 | { | 2329 | { |
| 2330 | pgdat->node_zonelists[0].zlcache_ptr = NULL; | 2330 | pgdat->node_zonelists[0].zlcache_ptr = NULL; |
| 2331 | pgdat->node_zonelists[1].zlcache_ptr = NULL; | ||
| 2332 | } | 2331 | } |
| 2333 | 2332 | ||
| 2334 | #endif /* CONFIG_NUMA */ | 2333 | #endif /* CONFIG_NUMA */ |
| @@ -5,7 +5,7 @@ | |||
| 5 | * The allocator synchronizes using per slab locks and only | 5 | * The allocator synchronizes using per slab locks and only |
| 6 | * uses a centralized lock to manage a pool of partial slabs. | 6 | * uses a centralized lock to manage a pool of partial slabs. |
| 7 | * | 7 | * |
| 8 | * (C) 2007 SGI, Christoph Lameter <clameter@sgi.com> | 8 | * (C) 2007 SGI, Christoph Lameter |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| @@ -2995,8 +2995,6 @@ void __init kmem_cache_init(void) | |||
| 2995 | create_kmalloc_cache(&kmalloc_caches[1], | 2995 | create_kmalloc_cache(&kmalloc_caches[1], |
| 2996 | "kmalloc-96", 96, GFP_KERNEL); | 2996 | "kmalloc-96", 96, GFP_KERNEL); |
| 2997 | caches++; | 2997 | caches++; |
| 2998 | } | ||
| 2999 | if (KMALLOC_MIN_SIZE <= 128) { | ||
| 3000 | create_kmalloc_cache(&kmalloc_caches[2], | 2998 | create_kmalloc_cache(&kmalloc_caches[2], |
| 3001 | "kmalloc-192", 192, GFP_KERNEL); | 2999 | "kmalloc-192", 192, GFP_KERNEL); |
| 3002 | caches++; | 3000 | caches++; |
| @@ -3026,6 +3024,16 @@ void __init kmem_cache_init(void) | |||
| 3026 | for (i = 8; i < KMALLOC_MIN_SIZE; i += 8) | 3024 | for (i = 8; i < KMALLOC_MIN_SIZE; i += 8) |
| 3027 | size_index[(i - 1) / 8] = KMALLOC_SHIFT_LOW; | 3025 | size_index[(i - 1) / 8] = KMALLOC_SHIFT_LOW; |
| 3028 | 3026 | ||
| 3027 | if (KMALLOC_MIN_SIZE == 128) { | ||
| 3028 | /* | ||
| 3029 | * The 192 byte sized cache is not used if the alignment | ||
| 3030 | * is 128 byte. Redirect kmalloc to use the 256 byte cache | ||
| 3031 | * instead. | ||
| 3032 | */ | ||
| 3033 | for (i = 128 + 8; i <= 192; i += 8) | ||
| 3034 | size_index[(i - 1) / 8] = 8; | ||
| 3035 | } | ||
| 3036 | |||
| 3029 | slab_state = UP; | 3037 | slab_state = UP; |
| 3030 | 3038 | ||
| 3031 | /* Provide the correct kmalloc names now that the caches are up */ | 3039 | /* Provide the correct kmalloc names now that the caches are up */ |
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 99c4f36eb8a3..a91b5f8fcaf6 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Virtual Memory Map support | 2 | * Virtual Memory Map support |
| 3 | * | 3 | * |
| 4 | * (C) 2007 sgi. Christoph Lameter <clameter@sgi.com>. | 4 | * (C) 2007 sgi. Christoph Lameter. |
| 5 | * | 5 | * |
| 6 | * Virtual memory maps allow VM primitives pfn_to_page, page_to_pfn, | 6 | * Virtual memory maps allow VM primitives pfn_to_page, page_to_pfn, |
| 7 | * virt_to_page, page_address() to be implemented as a base offset | 7 | * virt_to_page, page_address() to be implemented as a base offset |
diff --git a/net/core/dev.c b/net/core/dev.c index c421a1f8f0b9..fca23a3bf12c 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -454,7 +454,7 @@ static int netdev_boot_setup_add(char *name, struct ifmap *map) | |||
| 454 | for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { | 454 | for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { |
| 455 | if (s[i].name[0] == '\0' || s[i].name[0] == ' ') { | 455 | if (s[i].name[0] == '\0' || s[i].name[0] == ' ') { |
| 456 | memset(s[i].name, 0, sizeof(s[i].name)); | 456 | memset(s[i].name, 0, sizeof(s[i].name)); |
| 457 | strcpy(s[i].name, name); | 457 | strlcpy(s[i].name, name, IFNAMSIZ); |
| 458 | memcpy(&s[i].map, map, sizeof(s[i].map)); | 458 | memcpy(&s[i].map, map, sizeof(s[i].map)); |
| 459 | break; | 459 | break; |
| 460 | } | 460 | } |
| @@ -479,7 +479,7 @@ int netdev_boot_setup_check(struct net_device *dev) | |||
| 479 | 479 | ||
| 480 | for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { | 480 | for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) { |
| 481 | if (s[i].name[0] != '\0' && s[i].name[0] != ' ' && | 481 | if (s[i].name[0] != '\0' && s[i].name[0] != ' ' && |
| 482 | !strncmp(dev->name, s[i].name, strlen(s[i].name))) { | 482 | !strcmp(dev->name, s[i].name)) { |
| 483 | dev->irq = s[i].map.irq; | 483 | dev->irq = s[i].map.irq; |
| 484 | dev->base_addr = s[i].map.base_addr; | 484 | dev->base_addr = s[i].map.base_addr; |
| 485 | dev->mem_start = s[i].map.mem_start; | 485 | dev->mem_start = s[i].map.mem_start; |
| @@ -2973,7 +2973,7 @@ EXPORT_SYMBOL(dev_unicast_delete); | |||
| 2973 | /** | 2973 | /** |
| 2974 | * dev_unicast_add - add a secondary unicast address | 2974 | * dev_unicast_add - add a secondary unicast address |
| 2975 | * @dev: device | 2975 | * @dev: device |
| 2976 | * @addr: address to delete | 2976 | * @addr: address to add |
| 2977 | * @alen: length of @addr | 2977 | * @alen: length of @addr |
| 2978 | * | 2978 | * |
| 2979 | * Add a secondary unicast address to the device or increase | 2979 | * Add a secondary unicast address to the device or increase |
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index e3e9ab0f74e3..277a2302eb3a 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c | |||
| @@ -226,7 +226,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) | |||
| 226 | 226 | ||
| 227 | ops = lookup_rules_ops(net, frh->family); | 227 | ops = lookup_rules_ops(net, frh->family); |
| 228 | if (ops == NULL) { | 228 | if (ops == NULL) { |
| 229 | err = EAFNOSUPPORT; | 229 | err = -EAFNOSUPPORT; |
| 230 | goto errout; | 230 | goto errout; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| @@ -365,7 +365,7 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) | |||
| 365 | 365 | ||
| 366 | ops = lookup_rules_ops(net, frh->family); | 366 | ops = lookup_rules_ops(net, frh->family); |
| 367 | if (ops == NULL) { | 367 | if (ops == NULL) { |
| 368 | err = EAFNOSUPPORT; | 368 | err = -EAFNOSUPPORT; |
| 369 | goto errout; | 369 | goto errout; |
| 370 | } | 370 | } |
| 371 | 371 | ||
diff --git a/net/core/filter.c b/net/core/filter.c index 4f8369729a4e..df3744355839 100644 --- a/net/core/filter.c +++ b/net/core/filter.c | |||
| @@ -68,7 +68,6 @@ static inline void *load_pointer(struct sk_buff *skb, int k, | |||
| 68 | * sk_filter - run a packet through a socket filter | 68 | * sk_filter - run a packet through a socket filter |
| 69 | * @sk: sock associated with &sk_buff | 69 | * @sk: sock associated with &sk_buff |
| 70 | * @skb: buffer to filter | 70 | * @skb: buffer to filter |
| 71 | * @needlock: set to 1 if the sock is not locked by caller. | ||
| 72 | * | 71 | * |
| 73 | * Run the filter code and then cut skb->data to correct size returned by | 72 | * Run the filter code and then cut skb->data to correct size returned by |
| 74 | * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller | 73 | * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 1e556d312117..366621610e76 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1292,12 +1292,14 @@ static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, | |||
| 1292 | { | 1292 | { |
| 1293 | unsigned int nr_pages = spd->nr_pages; | 1293 | unsigned int nr_pages = spd->nr_pages; |
| 1294 | unsigned int poff, plen, len, toff, tlen; | 1294 | unsigned int poff, plen, len, toff, tlen; |
| 1295 | int headlen, seg; | 1295 | int headlen, seg, error = 0; |
| 1296 | 1296 | ||
| 1297 | toff = *offset; | 1297 | toff = *offset; |
| 1298 | tlen = *total_len; | 1298 | tlen = *total_len; |
| 1299 | if (!tlen) | 1299 | if (!tlen) { |
| 1300 | error = 1; | ||
| 1300 | goto err; | 1301 | goto err; |
| 1302 | } | ||
| 1301 | 1303 | ||
| 1302 | /* | 1304 | /* |
| 1303 | * if the offset is greater than the linear part, go directly to | 1305 | * if the offset is greater than the linear part, go directly to |
| @@ -1339,7 +1341,8 @@ static int __skb_splice_bits(struct sk_buff *skb, unsigned int *offset, | |||
| 1339 | * just jump directly to update and return, no point | 1341 | * just jump directly to update and return, no point |
| 1340 | * in going over fragments when the output is full. | 1342 | * in going over fragments when the output is full. |
| 1341 | */ | 1343 | */ |
| 1342 | if (spd_fill_page(spd, virt_to_page(p), plen, poff, skb)) | 1344 | error = spd_fill_page(spd, virt_to_page(p), plen, poff, skb); |
| 1345 | if (error) | ||
| 1343 | goto done; | 1346 | goto done; |
| 1344 | 1347 | ||
| 1345 | tlen -= plen; | 1348 | tlen -= plen; |
| @@ -1369,7 +1372,8 @@ map_frag: | |||
| 1369 | if (!plen) | 1372 | if (!plen) |
| 1370 | break; | 1373 | break; |
| 1371 | 1374 | ||
| 1372 | if (spd_fill_page(spd, f->page, plen, poff, skb)) | 1375 | error = spd_fill_page(spd, f->page, plen, poff, skb); |
| 1376 | if (error) | ||
| 1373 | break; | 1377 | break; |
| 1374 | 1378 | ||
| 1375 | tlen -= plen; | 1379 | tlen -= plen; |
| @@ -1382,7 +1386,10 @@ done: | |||
| 1382 | return 0; | 1386 | return 0; |
| 1383 | } | 1387 | } |
| 1384 | err: | 1388 | err: |
| 1385 | return 1; | 1389 | /* update the offset to reflect the linear part skip, if any */ |
| 1390 | if (!error) | ||
| 1391 | *offset = toff; | ||
| 1392 | return error; | ||
| 1386 | } | 1393 | } |
| 1387 | 1394 | ||
| 1388 | /* | 1395 | /* |
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 4ed429bd5951..0546a0bc97ea 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
| @@ -192,14 +192,21 @@ EXPORT_SYMBOL(inet_frag_evictor); | |||
| 192 | 192 | ||
| 193 | static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, | 193 | static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, |
| 194 | struct inet_frag_queue *qp_in, struct inet_frags *f, | 194 | struct inet_frag_queue *qp_in, struct inet_frags *f, |
| 195 | unsigned int hash, void *arg) | 195 | void *arg) |
| 196 | { | 196 | { |
| 197 | struct inet_frag_queue *qp; | 197 | struct inet_frag_queue *qp; |
| 198 | #ifdef CONFIG_SMP | 198 | #ifdef CONFIG_SMP |
| 199 | struct hlist_node *n; | 199 | struct hlist_node *n; |
| 200 | #endif | 200 | #endif |
| 201 | unsigned int hash; | ||
| 201 | 202 | ||
| 202 | write_lock(&f->lock); | 203 | write_lock(&f->lock); |
| 204 | /* | ||
| 205 | * While we stayed w/o the lock other CPU could update | ||
| 206 | * the rnd seed, so we need to re-calculate the hash | ||
| 207 | * chain. Fortunatelly the qp_in can be used to get one. | ||
| 208 | */ | ||
| 209 | hash = f->hashfn(qp_in); | ||
| 203 | #ifdef CONFIG_SMP | 210 | #ifdef CONFIG_SMP |
| 204 | /* With SMP race we have to recheck hash table, because | 211 | /* With SMP race we have to recheck hash table, because |
| 205 | * such entry could be created on other cpu, while we | 212 | * such entry could be created on other cpu, while we |
| @@ -247,7 +254,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, | |||
| 247 | } | 254 | } |
| 248 | 255 | ||
| 249 | static struct inet_frag_queue *inet_frag_create(struct netns_frags *nf, | 256 | static struct inet_frag_queue *inet_frag_create(struct netns_frags *nf, |
| 250 | struct inet_frags *f, void *arg, unsigned int hash) | 257 | struct inet_frags *f, void *arg) |
| 251 | { | 258 | { |
| 252 | struct inet_frag_queue *q; | 259 | struct inet_frag_queue *q; |
| 253 | 260 | ||
| @@ -255,7 +262,7 @@ static struct inet_frag_queue *inet_frag_create(struct netns_frags *nf, | |||
| 255 | if (q == NULL) | 262 | if (q == NULL) |
| 256 | return NULL; | 263 | return NULL; |
| 257 | 264 | ||
| 258 | return inet_frag_intern(nf, q, f, hash, arg); | 265 | return inet_frag_intern(nf, q, f, arg); |
| 259 | } | 266 | } |
| 260 | 267 | ||
| 261 | struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, | 268 | struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, |
| @@ -264,7 +271,6 @@ struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, | |||
| 264 | struct inet_frag_queue *q; | 271 | struct inet_frag_queue *q; |
| 265 | struct hlist_node *n; | 272 | struct hlist_node *n; |
| 266 | 273 | ||
| 267 | read_lock(&f->lock); | ||
| 268 | hlist_for_each_entry(q, n, &f->hash[hash], list) { | 274 | hlist_for_each_entry(q, n, &f->hash[hash], list) { |
| 269 | if (q->net == nf && f->match(q, key)) { | 275 | if (q->net == nf && f->match(q, key)) { |
| 270 | atomic_inc(&q->refcnt); | 276 | atomic_inc(&q->refcnt); |
| @@ -274,6 +280,6 @@ struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, | |||
| 274 | } | 280 | } |
| 275 | read_unlock(&f->lock); | 281 | read_unlock(&f->lock); |
| 276 | 282 | ||
| 277 | return inet_frag_create(nf, f, key, hash); | 283 | return inet_frag_create(nf, f, key); |
| 278 | } | 284 | } |
| 279 | EXPORT_SYMBOL(inet_frag_find); | 285 | EXPORT_SYMBOL(inet_frag_find); |
diff --git a/net/ipv4/inet_lro.c b/net/ipv4/inet_lro.c index 4a4d49fca1f2..cfd034a2b96e 100644 --- a/net/ipv4/inet_lro.c +++ b/net/ipv4/inet_lro.c | |||
| @@ -383,8 +383,7 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb, | |||
| 383 | out2: /* send aggregated SKBs to stack */ | 383 | out2: /* send aggregated SKBs to stack */ |
| 384 | lro_flush(lro_mgr, lro_desc); | 384 | lro_flush(lro_mgr, lro_desc); |
| 385 | 385 | ||
| 386 | out: /* Original SKB has to be posted to stack */ | 386 | out: |
| 387 | skb->ip_summed = lro_mgr->ip_summed; | ||
| 388 | return 1; | 387 | return 1; |
| 389 | } | 388 | } |
| 390 | 389 | ||
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index cd6ce6ac6358..37221f659159 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -229,6 +229,8 @@ static inline struct ipq *ip_find(struct net *net, struct iphdr *iph, u32 user) | |||
| 229 | 229 | ||
| 230 | arg.iph = iph; | 230 | arg.iph = iph; |
| 231 | arg.user = user; | 231 | arg.user = user; |
| 232 | |||
| 233 | read_lock(&ip4_frags.lock); | ||
| 232 | hash = ipqhashfn(iph->id, iph->saddr, iph->daddr, iph->protocol); | 234 | hash = ipqhashfn(iph->id, iph->saddr, iph->daddr, iph->protocol); |
| 233 | 235 | ||
| 234 | q = inet_frag_find(&net->ipv4.frags, &ip4_frags, &arg, hash); | 236 | q = inet_frag_find(&net->ipv4.frags, &ip4_frags, &arg, hash); |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index fc54a48fde1e..850825dc86e6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -260,6 +260,8 @@ | |||
| 260 | #include <linux/socket.h> | 260 | #include <linux/socket.h> |
| 261 | #include <linux/random.h> | 261 | #include <linux/random.h> |
| 262 | #include <linux/bootmem.h> | 262 | #include <linux/bootmem.h> |
| 263 | #include <linux/highmem.h> | ||
| 264 | #include <linux/swap.h> | ||
| 263 | #include <linux/cache.h> | 265 | #include <linux/cache.h> |
| 264 | #include <linux/err.h> | 266 | #include <linux/err.h> |
| 265 | #include <linux/crypto.h> | 267 | #include <linux/crypto.h> |
| @@ -2620,7 +2622,7 @@ __setup("thash_entries=", set_thash_entries); | |||
| 2620 | void __init tcp_init(void) | 2622 | void __init tcp_init(void) |
| 2621 | { | 2623 | { |
| 2622 | struct sk_buff *skb = NULL; | 2624 | struct sk_buff *skb = NULL; |
| 2623 | unsigned long limit; | 2625 | unsigned long nr_pages, limit; |
| 2624 | int order, i, max_share; | 2626 | int order, i, max_share; |
| 2625 | 2627 | ||
| 2626 | BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb)); | 2628 | BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb)); |
| @@ -2689,8 +2691,9 @@ void __init tcp_init(void) | |||
| 2689 | * is up to 1/2 at 256 MB, decreasing toward zero with the amount of | 2691 | * is up to 1/2 at 256 MB, decreasing toward zero with the amount of |
| 2690 | * memory, with a floor of 128 pages. | 2692 | * memory, with a floor of 128 pages. |
| 2691 | */ | 2693 | */ |
| 2692 | limit = min(nr_all_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT); | 2694 | nr_pages = totalram_pages - totalhigh_pages; |
| 2693 | limit = (limit * (nr_all_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11); | 2695 | limit = min(nr_pages, 1UL<<(28-PAGE_SHIFT)) >> (20-PAGE_SHIFT); |
| 2696 | limit = (limit * (nr_pages >> (20-PAGE_SHIFT))) >> (PAGE_SHIFT-11); | ||
| 2694 | limit = max(limit, 128UL); | 2697 | limit = max(limit, 128UL); |
| 2695 | sysctl_tcp_mem[0] = limit / 4 * 3; | 2698 | sysctl_tcp_mem[0] = limit / 4 * 3; |
| 2696 | sysctl_tcp_mem[1] = limit; | 2699 | sysctl_tcp_mem[1] = limit; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 12695be2c255..ffe869ac1bcf 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -2291,7 +2291,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) | |||
| 2291 | } | 2291 | } |
| 2292 | 2292 | ||
| 2293 | seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " | 2293 | seq_printf(f, "%4d: %08X:%04X %08X:%04X %02X %08X:%08X %02X:%08lX " |
| 2294 | "%08X %5d %8d %lu %d %p %u %u %u %u %d%n", | 2294 | "%08X %5d %8d %lu %d %p %lu %lu %u %u %d%n", |
| 2295 | i, src, srcp, dest, destp, sk->sk_state, | 2295 | i, src, srcp, dest, destp, sk->sk_state, |
| 2296 | tp->write_seq - tp->snd_una, | 2296 | tp->write_seq - tp->snd_una, |
| 2297 | sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog : | 2297 | sk->sk_state == TCP_LISTEN ? sk->sk_ack_backlog : |
| @@ -2303,8 +2303,8 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len) | |||
| 2303 | icsk->icsk_probes_out, | 2303 | icsk->icsk_probes_out, |
| 2304 | sock_i_ino(sk), | 2304 | sock_i_ino(sk), |
| 2305 | atomic_read(&sk->sk_refcnt), sk, | 2305 | atomic_read(&sk->sk_refcnt), sk, |
| 2306 | icsk->icsk_rto, | 2306 | jiffies_to_clock_t(icsk->icsk_rto), |
| 2307 | icsk->icsk_ack.ato, | 2307 | jiffies_to_clock_t(icsk->icsk_ack.ato), |
| 2308 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, | 2308 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, |
| 2309 | tp->snd_cwnd, | 2309 | tp->snd_cwnd, |
| 2310 | tp->snd_ssthresh >= 0xFFFF ? -1 : tp->snd_ssthresh, | 2310 | tp->snd_ssthresh >= 0xFFFF ? -1 : tp->snd_ssthresh, |
diff --git a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c index 27a5e8b48d93..f405cea21a8b 100644 --- a/net/ipv6/netfilter/ip6table_mangle.c +++ b/net/ipv6/netfilter/ip6table_mangle.c | |||
| @@ -129,7 +129,7 @@ static struct nf_hook_ops ip6t_ops[] __read_mostly = { | |||
| 129 | .priority = NF_IP6_PRI_MANGLE, | 129 | .priority = NF_IP6_PRI_MANGLE, |
| 130 | }, | 130 | }, |
| 131 | { | 131 | { |
| 132 | .hook = ip6t_local_hook, | 132 | .hook = ip6t_route_hook, |
| 133 | .owner = THIS_MODULE, | 133 | .owner = THIS_MODULE, |
| 134 | .pf = PF_INET6, | 134 | .pf = PF_INET6, |
| 135 | .hooknum = NF_INET_LOCAL_IN, | 135 | .hooknum = NF_INET_LOCAL_IN, |
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index e65e26e210ee..cf20bc4fd60d 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
| @@ -207,9 +207,10 @@ fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst) | |||
| 207 | arg.id = id; | 207 | arg.id = id; |
| 208 | arg.src = src; | 208 | arg.src = src; |
| 209 | arg.dst = dst; | 209 | arg.dst = dst; |
| 210 | |||
| 211 | read_lock_bh(&nf_frags.lock); | ||
| 210 | hash = ip6qhashfn(id, src, dst); | 212 | hash = ip6qhashfn(id, src, dst); |
| 211 | 213 | ||
| 212 | local_bh_disable(); | ||
| 213 | q = inet_frag_find(&nf_init_frags, &nf_frags, &arg, hash); | 214 | q = inet_frag_find(&nf_init_frags, &nf_frags, &arg, hash); |
| 214 | local_bh_enable(); | 215 | local_bh_enable(); |
| 215 | if (q == NULL) | 216 | if (q == NULL) |
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 798cabc7535b..a60d7d129713 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
| @@ -247,6 +247,8 @@ fq_find(struct net *net, __be32 id, struct in6_addr *src, struct in6_addr *dst, | |||
| 247 | arg.id = id; | 247 | arg.id = id; |
| 248 | arg.src = src; | 248 | arg.src = src; |
| 249 | arg.dst = dst; | 249 | arg.dst = dst; |
| 250 | |||
| 251 | read_lock(&ip6_frags.lock); | ||
| 250 | hash = ip6qhashfn(id, src, dst); | 252 | hash = ip6qhashfn(id, src, dst); |
| 251 | 253 | ||
| 252 | q = inet_frag_find(&net->ipv6.frags, &ip6_frags, &arg, hash); | 254 | q = inet_frag_find(&net->ipv6.frags, &ip6_frags, &arg, hash); |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index d1f3e19b06c7..7ff687020fa9 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -240,7 +240,7 @@ static inline int rt6_need_strict(struct in6_addr *daddr) | |||
| 240 | static inline struct rt6_info *rt6_device_match(struct net *net, | 240 | static inline struct rt6_info *rt6_device_match(struct net *net, |
| 241 | struct rt6_info *rt, | 241 | struct rt6_info *rt, |
| 242 | int oif, | 242 | int oif, |
| 243 | int strict) | 243 | int flags) |
| 244 | { | 244 | { |
| 245 | struct rt6_info *local = NULL; | 245 | struct rt6_info *local = NULL; |
| 246 | struct rt6_info *sprt; | 246 | struct rt6_info *sprt; |
| @@ -253,7 +253,7 @@ static inline struct rt6_info *rt6_device_match(struct net *net, | |||
| 253 | if (dev->flags & IFF_LOOPBACK) { | 253 | if (dev->flags & IFF_LOOPBACK) { |
| 254 | if (sprt->rt6i_idev == NULL || | 254 | if (sprt->rt6i_idev == NULL || |
| 255 | sprt->rt6i_idev->dev->ifindex != oif) { | 255 | sprt->rt6i_idev->dev->ifindex != oif) { |
| 256 | if (strict && oif) | 256 | if (flags & RT6_LOOKUP_F_IFACE && oif) |
| 257 | continue; | 257 | continue; |
| 258 | if (local && (!oif || | 258 | if (local && (!oif || |
| 259 | local->rt6i_idev->dev->ifindex == oif)) | 259 | local->rt6i_idev->dev->ifindex == oif)) |
| @@ -266,7 +266,7 @@ static inline struct rt6_info *rt6_device_match(struct net *net, | |||
| 266 | if (local) | 266 | if (local) |
| 267 | return local; | 267 | return local; |
| 268 | 268 | ||
| 269 | if (strict) | 269 | if (flags & RT6_LOOKUP_F_IFACE) |
| 270 | return net->ipv6.ip6_null_entry; | 270 | return net->ipv6.ip6_null_entry; |
| 271 | } | 271 | } |
| 272 | return rt; | 272 | return rt; |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index cb46749d4c32..40ea9c36d24b 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -2036,7 +2036,7 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) | |||
| 2036 | 2036 | ||
| 2037 | seq_printf(seq, | 2037 | seq_printf(seq, |
| 2038 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " | 2038 | "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X " |
| 2039 | "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %u %u %u %u %d\n", | 2039 | "%02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %lu %lu %u %u %d\n", |
| 2040 | i, | 2040 | i, |
| 2041 | src->s6_addr32[0], src->s6_addr32[1], | 2041 | src->s6_addr32[0], src->s6_addr32[1], |
| 2042 | src->s6_addr32[2], src->s6_addr32[3], srcp, | 2042 | src->s6_addr32[2], src->s6_addr32[3], srcp, |
| @@ -2052,8 +2052,8 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i) | |||
| 2052 | icsk->icsk_probes_out, | 2052 | icsk->icsk_probes_out, |
| 2053 | sock_i_ino(sp), | 2053 | sock_i_ino(sp), |
| 2054 | atomic_read(&sp->sk_refcnt), sp, | 2054 | atomic_read(&sp->sk_refcnt), sp, |
| 2055 | icsk->icsk_rto, | 2055 | jiffies_to_clock_t(icsk->icsk_rto), |
| 2056 | icsk->icsk_ack.ato, | 2056 | jiffies_to_clock_t(icsk->icsk_ack.ato), |
| 2057 | (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, | 2057 | (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong, |
| 2058 | tp->snd_cwnd, tp->snd_ssthresh>=0xFFFF?-1:tp->snd_ssthresh | 2058 | tp->snd_cwnd, tp->snd_ssthresh>=0xFFFF?-1:tp->snd_ssthresh |
| 2059 | ); | 2059 | ); |
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 150d66dbda9d..220e83be3ef4 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c | |||
| @@ -380,6 +380,15 @@ void ieee80211_key_free(struct ieee80211_key *key) | |||
| 380 | if (!key) | 380 | if (!key) |
| 381 | return; | 381 | return; |
| 382 | 382 | ||
| 383 | if (!key->sdata) { | ||
| 384 | /* The key has not been linked yet, simply free it | ||
| 385 | * and don't Oops */ | ||
| 386 | if (key->conf.alg == ALG_CCMP) | ||
| 387 | ieee80211_aes_key_free(key->u.ccmp.tfm); | ||
| 388 | kfree(key); | ||
| 389 | return; | ||
| 390 | } | ||
| 391 | |||
| 383 | spin_lock_irqsave(&key->sdata->local->key_lock, flags); | 392 | spin_lock_irqsave(&key->sdata->local->key_lock, flags); |
| 384 | __ieee80211_key_free(key); | 393 | __ieee80211_key_free(key); |
| 385 | spin_unlock_irqrestore(&key->sdata->local->key_lock, flags); | 394 | spin_unlock_irqrestore(&key->sdata->local->key_lock, flags); |
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 6106cb79060c..e8404212ad57 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
| @@ -95,6 +95,13 @@ static int ieee80211_set_encryption(struct net_device *dev, u8 *sta_addr, | |||
| 95 | } | 95 | } |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | if (alg == ALG_WEP && | ||
| 99 | key_len != LEN_WEP40 && key_len != LEN_WEP104) { | ||
| 100 | ieee80211_key_free(key); | ||
| 101 | err = -EINVAL; | ||
| 102 | goto out_unlock; | ||
| 103 | } | ||
| 104 | |||
| 98 | ieee80211_key_link(key, sdata, sta); | 105 | ieee80211_key_link(key, sdata, sta); |
| 99 | 106 | ||
| 100 | if (set_tx_key || (!sta && !sdata->default_key && key)) | 107 | if (set_tx_key || (!sta && !sdata->default_key && key)) |
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 635b996c8c35..5d09e8698b57 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -323,8 +323,7 @@ static void wme_qdiscop_destroy(struct Qdisc* qd) | |||
| 323 | struct ieee80211_hw *hw = &local->hw; | 323 | struct ieee80211_hw *hw = &local->hw; |
| 324 | int queue; | 324 | int queue; |
| 325 | 325 | ||
| 326 | tcf_destroy_chain(q->filter_list); | 326 | tcf_destroy_chain(&q->filter_list); |
| 327 | q->filter_list = NULL; | ||
| 328 | 327 | ||
| 329 | for (queue=0; queue < hw->queues; queue++) { | 328 | for (queue=0; queue < hw->queues; queue++) { |
| 330 | skb_queue_purge(&q->requeued[queue]); | 329 | skb_queue_purge(&q->requeued[queue]); |
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index ba94004fe323..271cd01d57ae 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c | |||
| @@ -331,12 +331,13 @@ static unsigned int get_conntrack_index(const struct tcphdr *tcph) | |||
| 331 | 331 | ||
| 332 | I. Upper bound for valid data: seq <= sender.td_maxend | 332 | I. Upper bound for valid data: seq <= sender.td_maxend |
| 333 | II. Lower bound for valid data: seq + len >= sender.td_end - receiver.td_maxwin | 333 | II. Lower bound for valid data: seq + len >= sender.td_end - receiver.td_maxwin |
| 334 | III. Upper bound for valid ack: sack <= receiver.td_end | 334 | III. Upper bound for valid (s)ack: sack <= receiver.td_end |
| 335 | IV. Lower bound for valid ack: ack >= receiver.td_end - MAXACKWINDOW | 335 | IV. Lower bound for valid (s)ack: sack >= receiver.td_end - MAXACKWINDOW |
| 336 | 336 | ||
| 337 | where sack is the highest right edge of sack block found in the packet. | 337 | where sack is the highest right edge of sack block found in the packet |
| 338 | or ack in the case of packet without SACK option. | ||
| 338 | 339 | ||
| 339 | The upper bound limit for a valid ack is not ignored - | 340 | The upper bound limit for a valid (s)ack is not ignored - |
| 340 | we doesn't have to deal with fragments. | 341 | we doesn't have to deal with fragments. |
| 341 | */ | 342 | */ |
| 342 | 343 | ||
| @@ -606,12 +607,12 @@ static bool tcp_in_window(const struct nf_conn *ct, | |||
| 606 | before(seq, sender->td_maxend + 1), | 607 | before(seq, sender->td_maxend + 1), |
| 607 | after(end, sender->td_end - receiver->td_maxwin - 1), | 608 | after(end, sender->td_end - receiver->td_maxwin - 1), |
| 608 | before(sack, receiver->td_end + 1), | 609 | before(sack, receiver->td_end + 1), |
| 609 | after(ack, receiver->td_end - MAXACKWINDOW(sender))); | 610 | after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)); |
| 610 | 611 | ||
| 611 | if (before(seq, sender->td_maxend + 1) && | 612 | if (before(seq, sender->td_maxend + 1) && |
| 612 | after(end, sender->td_end - receiver->td_maxwin - 1) && | 613 | after(end, sender->td_end - receiver->td_maxwin - 1) && |
| 613 | before(sack, receiver->td_end + 1) && | 614 | before(sack, receiver->td_end + 1) && |
| 614 | after(ack, receiver->td_end - MAXACKWINDOW(sender))) { | 615 | after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) { |
| 615 | /* | 616 | /* |
| 616 | * Take into account window scaling (RFC 1323). | 617 | * Take into account window scaling (RFC 1323). |
| 617 | */ | 618 | */ |
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index 0099da5b2591..52b2611a6eb6 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
| @@ -1534,7 +1534,7 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, | |||
| 1534 | } | 1534 | } |
| 1535 | } | 1535 | } |
| 1536 | list_for_each_entry_rcu(addr6, &iface->addr6_list, list) { | 1536 | list_for_each_entry_rcu(addr6, &iface->addr6_list, list) { |
| 1537 | if (addr6->valid || iter_addr6++ < skip_addr6) | 1537 | if (!addr6->valid || iter_addr6++ < skip_addr6) |
| 1538 | continue; | 1538 | continue; |
| 1539 | if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, | 1539 | if (netlbl_unlabel_staticlist_gen(NLBL_UNLABEL_C_STATICLISTDEF, |
| 1540 | iface, | 1540 | iface, |
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 9b97f8006c9c..349aba189558 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -886,7 +886,7 @@ retry: | |||
| 886 | return netlink_unicast_kernel(sk, skb); | 886 | return netlink_unicast_kernel(sk, skb); |
| 887 | 887 | ||
| 888 | if (sk_filter(sk, skb)) { | 888 | if (sk_filter(sk, skb)) { |
| 889 | int err = skb->len; | 889 | err = skb->len; |
| 890 | kfree_skb(skb); | 890 | kfree_skb(skb); |
| 891 | sock_put(sk); | 891 | sock_put(sk); |
| 892 | return err; | 892 | return err; |
diff --git a/net/netlink/attr.c b/net/netlink/attr.c index 47bbf45ae5d7..2d106cfe1d27 100644 --- a/net/netlink/attr.c +++ b/net/netlink/attr.c | |||
| @@ -132,6 +132,7 @@ errout: | |||
| 132 | * @maxtype: maximum attribute type to be expected | 132 | * @maxtype: maximum attribute type to be expected |
| 133 | * @head: head of attribute stream | 133 | * @head: head of attribute stream |
| 134 | * @len: length of attribute stream | 134 | * @len: length of attribute stream |
| 135 | * @policy: validation policy | ||
| 135 | * | 136 | * |
| 136 | * Parses a stream of attributes and stores a pointer to each attribute in | 137 | * Parses a stream of attributes and stores a pointer to each attribute in |
| 137 | * the tb array accessable via the attribute type. Attributes with a type | 138 | * the tb array accessable via the attribute type. Attributes with a type |
| @@ -194,7 +195,7 @@ struct nlattr *nla_find(struct nlattr *head, int len, int attrtype) | |||
| 194 | /** | 195 | /** |
| 195 | * nla_strlcpy - Copy string attribute payload into a sized buffer | 196 | * nla_strlcpy - Copy string attribute payload into a sized buffer |
| 196 | * @dst: where to copy the string to | 197 | * @dst: where to copy the string to |
| 197 | * @src: attribute to copy the string from | 198 | * @nla: attribute to copy the string from |
| 198 | * @dstsize: size of destination buffer | 199 | * @dstsize: size of destination buffer |
| 199 | * | 200 | * |
| 200 | * Copies at most dstsize - 1 bytes into the destination buffer. | 201 | * Copies at most dstsize - 1 bytes into the destination buffer. |
| @@ -340,9 +341,9 @@ struct nlattr *nla_reserve(struct sk_buff *skb, int attrtype, int attrlen) | |||
| 340 | } | 341 | } |
| 341 | 342 | ||
| 342 | /** | 343 | /** |
| 343 | * nla_reserve - reserve room for attribute without header | 344 | * nla_reserve_nohdr - reserve room for attribute without header |
| 344 | * @skb: socket buffer to reserve room on | 345 | * @skb: socket buffer to reserve room on |
| 345 | * @len: length of attribute payload | 346 | * @attrlen: length of attribute payload |
| 346 | * | 347 | * |
| 347 | * Reserves room for attribute payload without a header. | 348 | * Reserves room for attribute payload without a header. |
| 348 | * | 349 | * |
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 82adfe6447d7..9437b27ff84d 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig | |||
| @@ -106,17 +106,6 @@ config NET_SCH_PRIO | |||
| 106 | To compile this code as a module, choose M here: the | 106 | To compile this code as a module, choose M here: the |
| 107 | module will be called sch_prio. | 107 | module will be called sch_prio. |
| 108 | 108 | ||
| 109 | config NET_SCH_RR | ||
| 110 | tristate "Multi Band Round Robin Queuing (RR)" | ||
| 111 | select NET_SCH_PRIO | ||
| 112 | ---help--- | ||
| 113 | Say Y here if you want to use an n-band round robin packet | ||
| 114 | scheduler. | ||
| 115 | |||
| 116 | The module uses sch_prio for its framework and is aliased as | ||
| 117 | sch_rr, so it will load sch_prio, although it is referred | ||
| 118 | to using sch_rr. | ||
| 119 | |||
| 120 | config NET_SCH_RED | 109 | config NET_SCH_RED |
| 121 | tristate "Random Early Detection (RED)" | 110 | tristate "Random Early Detection (RED)" |
| 122 | ---help--- | 111 | ---help--- |
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index c40773cdbe45..10f01ad04380 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -1252,12 +1252,12 @@ void tcf_destroy(struct tcf_proto *tp) | |||
| 1252 | kfree(tp); | 1252 | kfree(tp); |
| 1253 | } | 1253 | } |
| 1254 | 1254 | ||
| 1255 | void tcf_destroy_chain(struct tcf_proto *fl) | 1255 | void tcf_destroy_chain(struct tcf_proto **fl) |
| 1256 | { | 1256 | { |
| 1257 | struct tcf_proto *tp; | 1257 | struct tcf_proto *tp; |
| 1258 | 1258 | ||
| 1259 | while ((tp = fl) != NULL) { | 1259 | while ((tp = *fl) != NULL) { |
| 1260 | fl = tp->next; | 1260 | *fl = tp->next; |
| 1261 | tcf_destroy(tp); | 1261 | tcf_destroy(tp); |
| 1262 | } | 1262 | } |
| 1263 | } | 1263 | } |
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 335273416384..db0e23ae85f8 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c | |||
| @@ -160,7 +160,7 @@ static void atm_tc_put(struct Qdisc *sch, unsigned long cl) | |||
| 160 | *prev = flow->next; | 160 | *prev = flow->next; |
| 161 | pr_debug("atm_tc_put: qdisc %p\n", flow->q); | 161 | pr_debug("atm_tc_put: qdisc %p\n", flow->q); |
| 162 | qdisc_destroy(flow->q); | 162 | qdisc_destroy(flow->q); |
| 163 | tcf_destroy_chain(flow->filter_list); | 163 | tcf_destroy_chain(&flow->filter_list); |
| 164 | if (flow->sock) { | 164 | if (flow->sock) { |
| 165 | pr_debug("atm_tc_put: f_count %d\n", | 165 | pr_debug("atm_tc_put: f_count %d\n", |
| 166 | file_count(flow->sock->file)); | 166 | file_count(flow->sock->file)); |
| @@ -586,10 +586,11 @@ static void atm_tc_destroy(struct Qdisc *sch) | |||
| 586 | struct atm_flow_data *flow; | 586 | struct atm_flow_data *flow; |
| 587 | 587 | ||
| 588 | pr_debug("atm_tc_destroy(sch %p,[qdisc %p])\n", sch, p); | 588 | pr_debug("atm_tc_destroy(sch %p,[qdisc %p])\n", sch, p); |
| 589 | for (flow = p->flows; flow; flow = flow->next) | ||
| 590 | tcf_destroy_chain(&flow->filter_list); | ||
| 591 | |||
| 589 | /* races ? */ | 592 | /* races ? */ |
| 590 | while ((flow = p->flows)) { | 593 | while ((flow = p->flows)) { |
| 591 | tcf_destroy_chain(flow->filter_list); | ||
| 592 | flow->filter_list = NULL; | ||
| 593 | if (flow->ref > 1) | 594 | if (flow->ref > 1) |
| 594 | printk(KERN_ERR "atm_destroy: %p->ref = %d\n", flow, | 595 | printk(KERN_ERR "atm_destroy: %p->ref = %d\n", flow, |
| 595 | flow->ref); | 596 | flow->ref); |
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 09969c1fbc08..2a3c97f7dc63 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
| @@ -1704,7 +1704,7 @@ static void cbq_destroy_class(struct Qdisc *sch, struct cbq_class *cl) | |||
| 1704 | 1704 | ||
| 1705 | BUG_TRAP(!cl->filters); | 1705 | BUG_TRAP(!cl->filters); |
| 1706 | 1706 | ||
| 1707 | tcf_destroy_chain(cl->filter_list); | 1707 | tcf_destroy_chain(&cl->filter_list); |
| 1708 | qdisc_destroy(cl->q); | 1708 | qdisc_destroy(cl->q); |
| 1709 | qdisc_put_rtab(cl->R_tab); | 1709 | qdisc_put_rtab(cl->R_tab); |
| 1710 | gen_kill_estimator(&cl->bstats, &cl->rate_est); | 1710 | gen_kill_estimator(&cl->bstats, &cl->rate_est); |
| @@ -1728,10 +1728,8 @@ cbq_destroy(struct Qdisc* sch) | |||
| 1728 | * be bound to classes which have been destroyed already. --TGR '04 | 1728 | * be bound to classes which have been destroyed already. --TGR '04 |
| 1729 | */ | 1729 | */ |
| 1730 | for (h = 0; h < 16; h++) { | 1730 | for (h = 0; h < 16; h++) { |
| 1731 | for (cl = q->classes[h]; cl; cl = cl->next) { | 1731 | for (cl = q->classes[h]; cl; cl = cl->next) |
| 1732 | tcf_destroy_chain(cl->filter_list); | 1732 | tcf_destroy_chain(&cl->filter_list); |
| 1733 | cl->filter_list = NULL; | ||
| 1734 | } | ||
| 1735 | } | 1733 | } |
| 1736 | for (h = 0; h < 16; h++) { | 1734 | for (h = 0; h < 16; h++) { |
| 1737 | struct cbq_class *next; | 1735 | struct cbq_class *next; |
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index 64465bacbe79..c4c1317cd47d 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c | |||
| @@ -416,7 +416,7 @@ static void dsmark_destroy(struct Qdisc *sch) | |||
| 416 | 416 | ||
| 417 | pr_debug("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p); | 417 | pr_debug("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p); |
| 418 | 418 | ||
| 419 | tcf_destroy_chain(p->filter_list); | 419 | tcf_destroy_chain(&p->filter_list); |
| 420 | qdisc_destroy(p->q); | 420 | qdisc_destroy(p->q); |
| 421 | kfree(p->mask); | 421 | kfree(p->mask); |
| 422 | } | 422 | } |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index d355e5e47fe3..13afa7214392 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
| @@ -468,7 +468,7 @@ struct Qdisc *qdisc_alloc(struct net_device *dev, struct Qdisc_ops *ops) | |||
| 468 | 468 | ||
| 469 | return sch; | 469 | return sch; |
| 470 | errout: | 470 | errout: |
| 471 | return ERR_PTR(-err); | 471 | return ERR_PTR(err); |
| 472 | } | 472 | } |
| 473 | 473 | ||
| 474 | struct Qdisc * qdisc_create_dflt(struct net_device *dev, struct Qdisc_ops *ops, | 474 | struct Qdisc * qdisc_create_dflt(struct net_device *dev, struct Qdisc_ops *ops, |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index fdfaa3fcc16d..e817aa00441d 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
| @@ -1123,7 +1123,7 @@ hfsc_destroy_class(struct Qdisc *sch, struct hfsc_class *cl) | |||
| 1123 | { | 1123 | { |
| 1124 | struct hfsc_sched *q = qdisc_priv(sch); | 1124 | struct hfsc_sched *q = qdisc_priv(sch); |
| 1125 | 1125 | ||
| 1126 | tcf_destroy_chain(cl->filter_list); | 1126 | tcf_destroy_chain(&cl->filter_list); |
| 1127 | qdisc_destroy(cl->qdisc); | 1127 | qdisc_destroy(cl->qdisc); |
| 1128 | gen_kill_estimator(&cl->bstats, &cl->rate_est); | 1128 | gen_kill_estimator(&cl->bstats, &cl->rate_est); |
| 1129 | if (cl != &q->root) | 1129 | if (cl != &q->root) |
| @@ -1541,6 +1541,10 @@ hfsc_destroy_qdisc(struct Qdisc *sch) | |||
| 1541 | unsigned int i; | 1541 | unsigned int i; |
| 1542 | 1542 | ||
| 1543 | for (i = 0; i < HFSC_HSIZE; i++) { | 1543 | for (i = 0; i < HFSC_HSIZE; i++) { |
| 1544 | list_for_each_entry(cl, &q->clhash[i], hlist) | ||
| 1545 | tcf_destroy_chain(&cl->filter_list); | ||
| 1546 | } | ||
| 1547 | for (i = 0; i < HFSC_HSIZE; i++) { | ||
| 1544 | list_for_each_entry_safe(cl, next, &q->clhash[i], hlist) | 1548 | list_for_each_entry_safe(cl, next, &q->clhash[i], hlist) |
| 1545 | hfsc_destroy_class(sch, cl); | 1549 | hfsc_destroy_class(sch, cl); |
| 1546 | } | 1550 | } |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6807c97985a5..3fb58f428f72 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
| @@ -1238,7 +1238,7 @@ static void htb_destroy_class(struct Qdisc *sch, struct htb_class *cl) | |||
| 1238 | qdisc_put_rtab(cl->rate); | 1238 | qdisc_put_rtab(cl->rate); |
| 1239 | qdisc_put_rtab(cl->ceil); | 1239 | qdisc_put_rtab(cl->ceil); |
| 1240 | 1240 | ||
| 1241 | tcf_destroy_chain(cl->filter_list); | 1241 | tcf_destroy_chain(&cl->filter_list); |
| 1242 | 1242 | ||
| 1243 | while (!list_empty(&cl->children)) | 1243 | while (!list_empty(&cl->children)) |
| 1244 | htb_destroy_class(sch, list_entry(cl->children.next, | 1244 | htb_destroy_class(sch, list_entry(cl->children.next, |
| @@ -1267,7 +1267,7 @@ static void htb_destroy(struct Qdisc *sch) | |||
| 1267 | and surprisingly it worked in 2.4. But it must precede it | 1267 | and surprisingly it worked in 2.4. But it must precede it |
| 1268 | because filter need its target class alive to be able to call | 1268 | because filter need its target class alive to be able to call |
| 1269 | unbind_filter on it (without Oops). */ | 1269 | unbind_filter on it (without Oops). */ |
| 1270 | tcf_destroy_chain(q->filter_list); | 1270 | tcf_destroy_chain(&q->filter_list); |
| 1271 | 1271 | ||
| 1272 | while (!list_empty(&q->root)) | 1272 | while (!list_empty(&q->root)) |
| 1273 | htb_destroy_class(sch, list_entry(q->root.next, | 1273 | htb_destroy_class(sch, list_entry(q->root.next, |
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 274b1ddb160c..956c80ad5965 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
| @@ -104,7 +104,7 @@ static void ingress_destroy(struct Qdisc *sch) | |||
| 104 | { | 104 | { |
| 105 | struct ingress_qdisc_data *p = qdisc_priv(sch); | 105 | struct ingress_qdisc_data *p = qdisc_priv(sch); |
| 106 | 106 | ||
| 107 | tcf_destroy_chain(p->filter_list); | 107 | tcf_destroy_chain(&p->filter_list); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb) | 110 | static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb) |
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c index 4aa2b45dad0a..5532f1031ab5 100644 --- a/net/sched/sch_prio.c +++ b/net/sched/sch_prio.c | |||
| @@ -219,7 +219,7 @@ prio_destroy(struct Qdisc* sch) | |||
| 219 | int prio; | 219 | int prio; |
| 220 | struct prio_sched_data *q = qdisc_priv(sch); | 220 | struct prio_sched_data *q = qdisc_priv(sch); |
| 221 | 221 | ||
| 222 | tcf_destroy_chain(q->filter_list); | 222 | tcf_destroy_chain(&q->filter_list); |
| 223 | for (prio=0; prio<q->bands; prio++) | 223 | for (prio=0; prio<q->bands; prio++) |
| 224 | qdisc_destroy(q->queues[prio]); | 224 | qdisc_destroy(q->queues[prio]); |
| 225 | } | 225 | } |
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index f0463d757a98..6a97afbfb952 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
| @@ -520,7 +520,7 @@ static void sfq_destroy(struct Qdisc *sch) | |||
| 520 | { | 520 | { |
| 521 | struct sfq_sched_data *q = qdisc_priv(sch); | 521 | struct sfq_sched_data *q = qdisc_priv(sch); |
| 522 | 522 | ||
| 523 | tcf_destroy_chain(q->filter_list); | 523 | tcf_destroy_chain(&q->filter_list); |
| 524 | q->perturb_period = 0; | 524 | q->perturb_period = 0; |
| 525 | del_timer_sync(&q->perturb_timer); | 525 | del_timer_sync(&q->perturb_timer); |
| 526 | } | 526 | } |
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 5905d56737d6..81ae3d62a0cc 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
| @@ -1144,20 +1144,20 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp) | |||
| 1144 | case RPC_GSS_SVC_NONE: | 1144 | case RPC_GSS_SVC_NONE: |
| 1145 | break; | 1145 | break; |
| 1146 | case RPC_GSS_SVC_INTEGRITY: | 1146 | case RPC_GSS_SVC_INTEGRITY: |
| 1147 | /* placeholders for length and seq. number: */ | ||
| 1148 | svc_putnl(resv, 0); | ||
| 1149 | svc_putnl(resv, 0); | ||
| 1147 | if (unwrap_integ_data(&rqstp->rq_arg, | 1150 | if (unwrap_integ_data(&rqstp->rq_arg, |
| 1148 | gc->gc_seq, rsci->mechctx)) | 1151 | gc->gc_seq, rsci->mechctx)) |
| 1149 | goto garbage_args; | 1152 | goto garbage_args; |
| 1153 | break; | ||
| 1154 | case RPC_GSS_SVC_PRIVACY: | ||
| 1150 | /* placeholders for length and seq. number: */ | 1155 | /* placeholders for length and seq. number: */ |
| 1151 | svc_putnl(resv, 0); | 1156 | svc_putnl(resv, 0); |
| 1152 | svc_putnl(resv, 0); | 1157 | svc_putnl(resv, 0); |
| 1153 | break; | ||
| 1154 | case RPC_GSS_SVC_PRIVACY: | ||
| 1155 | if (unwrap_priv_data(rqstp, &rqstp->rq_arg, | 1158 | if (unwrap_priv_data(rqstp, &rqstp->rq_arg, |
| 1156 | gc->gc_seq, rsci->mechctx)) | 1159 | gc->gc_seq, rsci->mechctx)) |
| 1157 | goto garbage_args; | 1160 | goto garbage_args; |
| 1158 | /* placeholders for length and seq. number: */ | ||
| 1159 | svc_putnl(resv, 0); | ||
| 1160 | svc_putnl(resv, 0); | ||
| 1161 | break; | 1161 | break; |
| 1162 | default: | 1162 | default: |
| 1163 | goto auth_err; | 1163 | goto auth_err; |
| @@ -1170,8 +1170,6 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp) | |||
| 1170 | goto out; | 1170 | goto out; |
| 1171 | } | 1171 | } |
| 1172 | garbage_args: | 1172 | garbage_args: |
| 1173 | /* Restore write pointer to its original value: */ | ||
| 1174 | xdr_ressize_check(rqstp, reject_stat); | ||
| 1175 | ret = SVC_GARBAGE; | 1173 | ret = SVC_GARBAGE; |
| 1176 | goto out; | 1174 | goto out; |
| 1177 | auth_err: | 1175 | auth_err: |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 657835f227d3..783317dacd30 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -487,8 +487,8 @@ static int unix_socketpair(struct socket *, struct socket *); | |||
| 487 | static int unix_accept(struct socket *, struct socket *, int); | 487 | static int unix_accept(struct socket *, struct socket *, int); |
| 488 | static int unix_getname(struct socket *, struct sockaddr *, int *, int); | 488 | static int unix_getname(struct socket *, struct sockaddr *, int *, int); |
| 489 | static unsigned int unix_poll(struct file *, struct socket *, poll_table *); | 489 | static unsigned int unix_poll(struct file *, struct socket *, poll_table *); |
| 490 | static unsigned int unix_datagram_poll(struct file *, struct socket *, | 490 | static unsigned int unix_dgram_poll(struct file *, struct socket *, |
| 491 | poll_table *); | 491 | poll_table *); |
| 492 | static int unix_ioctl(struct socket *, unsigned int, unsigned long); | 492 | static int unix_ioctl(struct socket *, unsigned int, unsigned long); |
| 493 | static int unix_shutdown(struct socket *, int); | 493 | static int unix_shutdown(struct socket *, int); |
| 494 | static int unix_stream_sendmsg(struct kiocb *, struct socket *, | 494 | static int unix_stream_sendmsg(struct kiocb *, struct socket *, |
| @@ -534,7 +534,7 @@ static const struct proto_ops unix_dgram_ops = { | |||
| 534 | .socketpair = unix_socketpair, | 534 | .socketpair = unix_socketpair, |
| 535 | .accept = sock_no_accept, | 535 | .accept = sock_no_accept, |
| 536 | .getname = unix_getname, | 536 | .getname = unix_getname, |
| 537 | .poll = unix_datagram_poll, | 537 | .poll = unix_dgram_poll, |
| 538 | .ioctl = unix_ioctl, | 538 | .ioctl = unix_ioctl, |
| 539 | .listen = sock_no_listen, | 539 | .listen = sock_no_listen, |
| 540 | .shutdown = unix_shutdown, | 540 | .shutdown = unix_shutdown, |
| @@ -555,7 +555,7 @@ static const struct proto_ops unix_seqpacket_ops = { | |||
| 555 | .socketpair = unix_socketpair, | 555 | .socketpair = unix_socketpair, |
| 556 | .accept = unix_accept, | 556 | .accept = unix_accept, |
| 557 | .getname = unix_getname, | 557 | .getname = unix_getname, |
| 558 | .poll = unix_datagram_poll, | 558 | .poll = unix_dgram_poll, |
| 559 | .ioctl = unix_ioctl, | 559 | .ioctl = unix_ioctl, |
| 560 | .listen = unix_listen, | 560 | .listen = unix_listen, |
| 561 | .shutdown = unix_shutdown, | 561 | .shutdown = unix_shutdown, |
| @@ -1994,29 +1994,13 @@ static unsigned int unix_poll(struct file * file, struct socket *sock, poll_tabl | |||
| 1994 | return mask; | 1994 | return mask; |
| 1995 | } | 1995 | } |
| 1996 | 1996 | ||
| 1997 | static unsigned int unix_datagram_poll(struct file *file, struct socket *sock, | 1997 | static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, |
| 1998 | poll_table *wait) | 1998 | poll_table *wait) |
| 1999 | { | 1999 | { |
| 2000 | struct sock *sk = sock->sk, *peer; | 2000 | struct sock *sk = sock->sk, *other; |
| 2001 | unsigned int mask; | 2001 | unsigned int mask, writable; |
| 2002 | 2002 | ||
| 2003 | poll_wait(file, sk->sk_sleep, wait); | 2003 | poll_wait(file, sk->sk_sleep, wait); |
| 2004 | |||
| 2005 | peer = unix_peer_get(sk); | ||
| 2006 | if (peer) { | ||
| 2007 | if (peer != sk) { | ||
| 2008 | /* | ||
| 2009 | * Writability of a connected socket additionally | ||
| 2010 | * depends on the state of the receive queue of the | ||
| 2011 | * peer. | ||
| 2012 | */ | ||
| 2013 | poll_wait(file, &unix_sk(peer)->peer_wait, wait); | ||
| 2014 | } else { | ||
| 2015 | sock_put(peer); | ||
| 2016 | peer = NULL; | ||
| 2017 | } | ||
| 2018 | } | ||
| 2019 | |||
| 2020 | mask = 0; | 2004 | mask = 0; |
| 2021 | 2005 | ||
| 2022 | /* exceptional events? */ | 2006 | /* exceptional events? */ |
| @@ -2042,14 +2026,26 @@ static unsigned int unix_datagram_poll(struct file *file, struct socket *sock, | |||
| 2042 | } | 2026 | } |
| 2043 | 2027 | ||
| 2044 | /* writable? */ | 2028 | /* writable? */ |
| 2045 | if (unix_writable(sk) && !(peer && unix_recvq_full(peer))) | 2029 | writable = unix_writable(sk); |
| 2030 | if (writable) { | ||
| 2031 | other = unix_peer_get(sk); | ||
| 2032 | if (other) { | ||
| 2033 | if (unix_peer(other) != sk) { | ||
| 2034 | poll_wait(file, &unix_sk(other)->peer_wait, | ||
| 2035 | wait); | ||
| 2036 | if (unix_recvq_full(other)) | ||
| 2037 | writable = 0; | ||
| 2038 | } | ||
| 2039 | |||
| 2040 | sock_put(other); | ||
| 2041 | } | ||
| 2042 | } | ||
| 2043 | |||
| 2044 | if (writable) | ||
| 2046 | mask |= POLLOUT | POLLWRNORM | POLLWRBAND; | 2045 | mask |= POLLOUT | POLLWRNORM | POLLWRBAND; |
| 2047 | else | 2046 | else |
| 2048 | set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); | 2047 | set_bit(SOCK_ASYNC_NOSPACE, &sk->sk_socket->flags); |
| 2049 | 2048 | ||
| 2050 | if (peer) | ||
| 2051 | sock_put(peer); | ||
| 2052 | |||
| 2053 | return mask; | 2049 | return mask; |
| 2054 | } | 2050 | } |
| 2055 | 2051 | ||
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 185488da2466..855bff4b3250 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -80,6 +80,23 @@ static const struct ieee80211_channel_range ieee80211_JP_channels[] = { | |||
| 80 | IEEE80211_CHAN_RADAR), | 80 | IEEE80211_CHAN_RADAR), |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | static const struct ieee80211_channel_range ieee80211_EU_channels[] = { | ||
| 84 | /* IEEE 802.11b/g, channels 1..13 */ | ||
| 85 | RANGE_PWR(2412, 2472, 20, 6, 0), | ||
| 86 | /* IEEE 802.11a, channel 36*/ | ||
| 87 | RANGE_PWR(5180, 5180, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), | ||
| 88 | /* IEEE 802.11a, channel 40*/ | ||
| 89 | RANGE_PWR(5200, 5200, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), | ||
| 90 | /* IEEE 802.11a, channel 44*/ | ||
| 91 | RANGE_PWR(5220, 5220, 23, 6, IEEE80211_CHAN_PASSIVE_SCAN), | ||
| 92 | /* IEEE 802.11a, channels 48..64 */ | ||
| 93 | RANGE_PWR(5240, 5320, 23, 6, IEEE80211_CHAN_NO_IBSS | | ||
| 94 | IEEE80211_CHAN_RADAR), | ||
| 95 | /* IEEE 802.11a, channels 100..140 */ | ||
| 96 | RANGE_PWR(5500, 5700, 30, 6, IEEE80211_CHAN_NO_IBSS | | ||
| 97 | IEEE80211_CHAN_RADAR), | ||
| 98 | }; | ||
| 99 | |||
| 83 | #define REGDOM(_code) \ | 100 | #define REGDOM(_code) \ |
| 84 | { \ | 101 | { \ |
| 85 | .code = __stringify(_code), \ | 102 | .code = __stringify(_code), \ |
| @@ -90,6 +107,7 @@ static const struct ieee80211_channel_range ieee80211_JP_channels[] = { | |||
| 90 | static const struct ieee80211_regdomain ieee80211_regdoms[] = { | 107 | static const struct ieee80211_regdomain ieee80211_regdoms[] = { |
| 91 | REGDOM(US), | 108 | REGDOM(US), |
| 92 | REGDOM(JP), | 109 | REGDOM(JP), |
| 110 | REGDOM(EU), | ||
| 93 | }; | 111 | }; |
| 94 | 112 | ||
| 95 | 113 | ||
diff --git a/security/commoncap.c b/security/commoncap.c index 5edabc7542ae..33d343308413 100644 --- a/security/commoncap.c +++ b/security/commoncap.c | |||
| @@ -103,10 +103,16 @@ static inline int cap_inh_is_capped(void) | |||
| 103 | return (cap_capable(current, CAP_SETPCAP) != 0); | 103 | return (cap_capable(current, CAP_SETPCAP) != 0); |
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | static inline int cap_limit_ptraced_target(void) { return 1; } | ||
| 107 | |||
| 106 | #else /* ie., ndef CONFIG_SECURITY_FILE_CAPABILITIES */ | 108 | #else /* ie., ndef CONFIG_SECURITY_FILE_CAPABILITIES */ |
| 107 | 109 | ||
| 108 | static inline int cap_block_setpcap(struct task_struct *t) { return 0; } | 110 | static inline int cap_block_setpcap(struct task_struct *t) { return 0; } |
| 109 | static inline int cap_inh_is_capped(void) { return 1; } | 111 | static inline int cap_inh_is_capped(void) { return 1; } |
| 112 | static inline int cap_limit_ptraced_target(void) | ||
| 113 | { | ||
| 114 | return !capable(CAP_SETPCAP); | ||
| 115 | } | ||
| 110 | 116 | ||
| 111 | #endif /* def CONFIG_SECURITY_FILE_CAPABILITIES */ | 117 | #endif /* def CONFIG_SECURITY_FILE_CAPABILITIES */ |
| 112 | 118 | ||
| @@ -342,9 +348,10 @@ void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe) | |||
| 342 | bprm->e_uid = current->uid; | 348 | bprm->e_uid = current->uid; |
| 343 | bprm->e_gid = current->gid; | 349 | bprm->e_gid = current->gid; |
| 344 | } | 350 | } |
| 345 | if (!capable (CAP_SETPCAP)) { | 351 | if (cap_limit_ptraced_target()) { |
| 346 | new_permitted = cap_intersect (new_permitted, | 352 | new_permitted = |
| 347 | current->cap_permitted); | 353 | cap_intersect(new_permitted, |
| 354 | current->cap_permitted); | ||
| 348 | } | 355 | } |
| 349 | } | 356 | } |
| 350 | } | 357 | } |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index baf348834b66..fd764a0858d0 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
| @@ -382,6 +382,8 @@ static ssize_t devcgroup_access_write(struct cgroup *cgroup, struct cftype *cft, | |||
| 382 | case 'a': | 382 | case 'a': |
| 383 | wh.type = DEV_ALL; | 383 | wh.type = DEV_ALL; |
| 384 | wh.access = ACC_MASK; | 384 | wh.access = ACC_MASK; |
| 385 | wh.major = ~0; | ||
| 386 | wh.minor = ~0; | ||
| 385 | goto handle; | 387 | goto handle; |
| 386 | case 'b': | 388 | case 'b': |
| 387 | wh.type = DEV_BLOCK; | 389 | wh.type = DEV_BLOCK; |
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 1dcf9f3d1107..44589088941f 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
| @@ -278,7 +278,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi) | |||
| 278 | 278 | ||
| 279 | ent->fields.remote_irr = 0; | 279 | ent->fields.remote_irr = 0; |
| 280 | if (!ent->fields.mask && (ioapic->irr & (1 << gsi))) | 280 | if (!ent->fields.mask && (ioapic->irr & (1 << gsi))) |
| 281 | ioapic_deliver(ioapic, gsi); | 281 | ioapic_service(ioapic, gsi); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) | 284 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) |