diff options
365 files changed, 2515 insertions, 6059 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 2f7fd4360848..9c27e5125dd2 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl | |||
| @@ -102,9 +102,12 @@ X!Iinclude/linux/kobject.h | |||
| 102 | !Iinclude/linux/device.h | 102 | !Iinclude/linux/device.h |
| 103 | </sect1> | 103 | </sect1> |
| 104 | <sect1><title>Device Drivers Base</title> | 104 | <sect1><title>Device Drivers Base</title> |
| 105 | !Idrivers/base/init.c | ||
| 105 | !Edrivers/base/driver.c | 106 | !Edrivers/base/driver.c |
| 106 | !Edrivers/base/core.c | 107 | !Edrivers/base/core.c |
| 108 | !Edrivers/base/syscore.c | ||
| 107 | !Edrivers/base/class.c | 109 | !Edrivers/base/class.c |
| 110 | !Idrivers/base/node.c | ||
| 108 | !Edrivers/base/firmware_class.c | 111 | !Edrivers/base/firmware_class.c |
| 109 | !Edrivers/base/transport_class.c | 112 | !Edrivers/base/transport_class.c |
| 110 | <!-- Cannot be included, because | 113 | <!-- Cannot be included, because |
| @@ -113,7 +116,7 @@ X!Iinclude/linux/kobject.h | |||
| 113 | exceed allowed 44 characters maximum | 116 | exceed allowed 44 characters maximum |
| 114 | X!Edrivers/base/attribute_container.c | 117 | X!Edrivers/base/attribute_container.c |
| 115 | --> | 118 | --> |
| 116 | !Edrivers/base/sys.c | 119 | !Edrivers/base/dd.c |
| 117 | <!-- | 120 | <!-- |
| 118 | X!Edrivers/base/interface.c | 121 | X!Edrivers/base/interface.c |
| 119 | --> | 122 | --> |
| @@ -121,6 +124,11 @@ X!Edrivers/base/interface.c | |||
| 121 | !Edrivers/base/platform.c | 124 | !Edrivers/base/platform.c |
| 122 | !Edrivers/base/bus.c | 125 | !Edrivers/base/bus.c |
| 123 | </sect1> | 126 | </sect1> |
| 127 | <sect1><title>Device Drivers DMA Management</title> | ||
| 128 | !Edrivers/base/dma-buf.c | ||
| 129 | !Edrivers/base/dma-coherent.c | ||
| 130 | !Edrivers/base/dma-mapping.c | ||
| 131 | </sect1> | ||
| 124 | <sect1><title>Device Drivers Power Management</title> | 132 | <sect1><title>Device Drivers Power Management</title> |
| 125 | !Edrivers/base/power/main.c | 133 | !Edrivers/base/power/main.c |
| 126 | </sect1> | 134 | </sect1> |
| @@ -219,7 +227,7 @@ X!Isound/sound_firmware.c | |||
| 219 | <chapter id="uart16x50"> | 227 | <chapter id="uart16x50"> |
| 220 | <title>16x50 UART Driver</title> | 228 | <title>16x50 UART Driver</title> |
| 221 | !Edrivers/tty/serial/serial_core.c | 229 | !Edrivers/tty/serial/serial_core.c |
| 222 | !Edrivers/tty/serial/8250.c | 230 | !Edrivers/tty/serial/8250/8250.c |
| 223 | </chapter> | 231 | </chapter> |
| 224 | 232 | ||
| 225 | <chapter id="fbdev"> | 233 | <chapter id="fbdev"> |
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 10c64c8a13d4..41c0c5d1ba14 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt | |||
| @@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer). | |||
| 233 | 6. List of managed interfaces | 233 | 6. List of managed interfaces |
| 234 | ----------------------------- | 234 | ----------------------------- |
| 235 | 235 | ||
| 236 | MEM | ||
| 237 | devm_kzalloc() | ||
| 238 | devm_kfree() | ||
| 239 | |||
| 236 | IO region | 240 | IO region |
| 237 | devm_request_region() | 241 | devm_request_region() |
| 238 | devm_request_mem_region() | 242 | devm_request_mem_region() |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 1bea46a54b1c..a0ffac029a0d 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The | |||
| 510 | convert to using pci_scan_root_bus() so they can supply a list of | 510 | convert to using pci_scan_root_bus() so they can supply a list of |
| 511 | bus resources when the bus is created. | 511 | bus resources when the bus is created. |
| 512 | Who: Bjorn Helgaas <bhelgaas@google.com> | 512 | Who: Bjorn Helgaas <bhelgaas@google.com> |
| 513 | |||
| 514 | ---------------------------- | ||
| 515 | |||
| 516 | What: The CAP9 SoC family will be removed | ||
| 517 | When: 3.4 | ||
| 518 | Files: arch/arm/mach-at91/at91cap9.c | ||
| 519 | arch/arm/mach-at91/at91cap9_devices.c | ||
| 520 | arch/arm/mach-at91/include/mach/at91cap9.h | ||
| 521 | arch/arm/mach-at91/include/mach/at91cap9_matrix.h | ||
| 522 | arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | ||
| 523 | arch/arm/mach-at91/board-cap9adk.c | ||
| 524 | Why: The code is not actively maintained and platforms are now hard to find. | ||
| 525 | Who: Nicolas Ferre <nicolas.ferre@atmel.com> | ||
| 526 | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | ||
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index 6727b92bc2fb..150fd3833d0b 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt | |||
| @@ -857,42 +857,41 @@ case), we define a mapping like this: | |||
| 857 | 857 | ||
| 858 | ... | 858 | ... |
| 859 | { | 859 | { |
| 860 | .name "2bit" | 860 | .name = "2bit" |
| 861 | .ctrl_dev_name = "pinctrl-foo", | 861 | .ctrl_dev_name = "pinctrl-foo", |
| 862 | .function = "mmc0", | 862 | .function = "mmc0", |
| 863 | .group = "mmc0_1_grp", | 863 | .group = "mmc0_1_grp", |
| 864 | .dev_name = "foo-mmc.0", | 864 | .dev_name = "foo-mmc.0", |
| 865 | }, | 865 | }, |
| 866 | { | 866 | { |
| 867 | .name "4bit" | 867 | .name = "4bit" |
| 868 | .ctrl_dev_name = "pinctrl-foo", | 868 | .ctrl_dev_name = "pinctrl-foo", |
| 869 | .function = "mmc0", | 869 | .function = "mmc0", |
| 870 | .group = "mmc0_1_grp", | 870 | .group = "mmc0_1_grp", |
| 871 | .dev_name = "foo-mmc.0", | 871 | .dev_name = "foo-mmc.0", |
| 872 | }, | 872 | }, |
| 873 | { | 873 | { |
| 874 | .name "4bit" | 874 | .name = "4bit" |
| 875 | .ctrl_dev_name = "pinctrl-foo", | 875 | .ctrl_dev_name = "pinctrl-foo", |
| 876 | .function = "mmc0", | 876 | .function = "mmc0", |
| 877 | .group = "mmc0_2_grp", | 877 | .group = "mmc0_2_grp", |
| 878 | .dev_name = "foo-mmc.0", | 878 | .dev_name = "foo-mmc.0", |
| 879 | }, | 879 | }, |
| 880 | { | 880 | { |
| 881 | .name "8bit" | 881 | .name = "8bit" |
| 882 | .ctrl_dev_name = "pinctrl-foo", | 882 | .ctrl_dev_name = "pinctrl-foo", |
| 883 | .function = "mmc0", | ||
| 884 | .group = "mmc0_1_grp", | 883 | .group = "mmc0_1_grp", |
| 885 | .dev_name = "foo-mmc.0", | 884 | .dev_name = "foo-mmc.0", |
| 886 | }, | 885 | }, |
| 887 | { | 886 | { |
| 888 | .name "8bit" | 887 | .name = "8bit" |
| 889 | .ctrl_dev_name = "pinctrl-foo", | 888 | .ctrl_dev_name = "pinctrl-foo", |
| 890 | .function = "mmc0", | 889 | .function = "mmc0", |
| 891 | .group = "mmc0_2_grp", | 890 | .group = "mmc0_2_grp", |
| 892 | .dev_name = "foo-mmc.0", | 891 | .dev_name = "foo-mmc.0", |
| 893 | }, | 892 | }, |
| 894 | { | 893 | { |
| 895 | .name "8bit" | 894 | .name = "8bit" |
| 896 | .ctrl_dev_name = "pinctrl-foo", | 895 | .ctrl_dev_name = "pinctrl-foo", |
| 897 | .function = "mmc0", | 896 | .function = "mmc0", |
| 898 | .group = "mmc0_3_grp", | 897 | .group = "mmc0_3_grp", |
| @@ -995,7 +994,7 @@ This is enabled by simply setting the .hog_on_boot field in the map to true, | |||
| 995 | like this: | 994 | like this: |
| 996 | 995 | ||
| 997 | { | 996 | { |
| 998 | .name "POWERMAP" | 997 | .name = "POWERMAP" |
| 999 | .ctrl_dev_name = "pinctrl-foo", | 998 | .ctrl_dev_name = "pinctrl-foo", |
| 1000 | .function = "power_func", | 999 | .function = "power_func", |
| 1001 | .hog_on_boot = true, | 1000 | .hog_on_boot = true, |
| @@ -1025,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B: | |||
| 1025 | 1024 | ||
| 1026 | foo_switch() | 1025 | foo_switch() |
| 1027 | { | 1026 | { |
| 1028 | struct pinmux pmx; | 1027 | struct pinmux *pmx; |
| 1029 | 1028 | ||
| 1030 | /* Enable on position A */ | 1029 | /* Enable on position A */ |
| 1031 | pmx = pinmux_get(&device, "spi0-pos-A"); | 1030 | pmx = pinmux_get(&device, "spi0-pos-A"); |
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt index 21fd05c28e73..f0ab5cf28fca 100644 --- a/Documentation/stable_kernel_rules.txt +++ b/Documentation/stable_kernel_rules.txt | |||
| @@ -25,7 +25,8 @@ Procedure for submitting patches to the -stable tree: | |||
| 25 | 25 | ||
| 26 | - Send the patch, after verifying that it follows the above rules, to | 26 | - Send the patch, after verifying that it follows the above rules, to |
| 27 | stable@vger.kernel.org. You must note the upstream commit ID in the | 27 | stable@vger.kernel.org. You must note the upstream commit ID in the |
| 28 | changelog of your submission. | 28 | changelog of your submission, as well as the kernel version you wish |
| 29 | it to be applied to. | ||
| 29 | - To have the patch automatically included in the stable tree, add the tag | 30 | - To have the patch automatically included in the stable tree, add the tag |
| 30 | Cc: stable@vger.kernel.org | 31 | Cc: stable@vger.kernel.org |
| 31 | in the sign-off area. Once the patch is merged it will be applied to | 32 | in the sign-off area. Once the patch is merged it will be applied to |
diff --git a/Documentation/virtual/00-INDEX b/Documentation/virtual/00-INDEX index 8e601991d91c..924bd462675e 100644 --- a/Documentation/virtual/00-INDEX +++ b/Documentation/virtual/00-INDEX | |||
| @@ -4,8 +4,6 @@ Virtualization support in the Linux kernel. | |||
| 4 | - this file. | 4 | - this file. |
| 5 | kvm/ | 5 | kvm/ |
| 6 | - Kernel Virtual Machine. See also http://linux-kvm.org | 6 | - Kernel Virtual Machine. See also http://linux-kvm.org |
| 7 | lguest/ | ||
| 8 | - Extremely simple hypervisor for experimental/educational use. | ||
| 9 | uml/ | 7 | uml/ |
| 10 | - User Mode Linux, builds/runs Linux kernel as a userspace program. | 8 | - User Mode Linux, builds/runs Linux kernel as a userspace program. |
| 11 | virtio.txt | 9 | virtio.txt |
diff --git a/MAINTAINERS b/MAINTAINERS index 260d9c1785d0..252972b6c4a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -159,7 +159,7 @@ S: Maintained | |||
| 159 | F: drivers/net/ethernet/realtek/r8169.c | 159 | F: drivers/net/ethernet/realtek/r8169.c |
| 160 | 160 | ||
| 161 | 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER | 161 | 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER |
| 162 | M: Greg Kroah-Hartman <gregkh@suse.de> | 162 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 163 | L: linux-serial@vger.kernel.org | 163 | L: linux-serial@vger.kernel.org |
| 164 | W: http://serial.sourceforge.net | 164 | W: http://serial.sourceforge.net |
| 165 | S: Maintained | 165 | S: Maintained |
| @@ -1783,9 +1783,9 @@ X: net/wireless/wext* | |||
| 1783 | 1783 | ||
| 1784 | CHAR and MISC DRIVERS | 1784 | CHAR and MISC DRIVERS |
| 1785 | M: Arnd Bergmann <arnd@arndb.de> | 1785 | M: Arnd Bergmann <arnd@arndb.de> |
| 1786 | M: Greg Kroah-Hartman <greg@kroah.com> | 1786 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 1787 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git | 1787 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git |
| 1788 | S: Maintained | 1788 | S: Supported |
| 1789 | F: drivers/char/* | 1789 | F: drivers/char/* |
| 1790 | F: drivers/misc/* | 1790 | F: drivers/misc/* |
| 1791 | 1791 | ||
| @@ -2320,7 +2320,7 @@ F: lib/lru_cache.c | |||
| 2320 | F: Documentation/blockdev/drbd/ | 2320 | F: Documentation/blockdev/drbd/ |
| 2321 | 2321 | ||
| 2322 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS | 2322 | DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS |
| 2323 | M: Greg Kroah-Hartman <gregkh@suse.de> | 2323 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 2324 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git | 2324 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git |
| 2325 | S: Supported | 2325 | S: Supported |
| 2326 | F: Documentation/kobject.txt | 2326 | F: Documentation/kobject.txt |
| @@ -2350,6 +2350,9 @@ F: include/drm/i915* | |||
| 2350 | 2350 | ||
| 2351 | DRM DRIVERS FOR EXYNOS | 2351 | DRM DRIVERS FOR EXYNOS |
| 2352 | M: Inki Dae <inki.dae@samsung.com> | 2352 | M: Inki Dae <inki.dae@samsung.com> |
| 2353 | M: Joonyoung Shim <jy0922.shim@samsung.com> | ||
| 2354 | M: Seung-Woo Kim <sw0312.kim@samsung.com> | ||
| 2355 | M: Kyungmin Park <kyungmin.park@samsung.com> | ||
| 2353 | L: dri-devel@lists.freedesktop.org | 2356 | L: dri-devel@lists.freedesktop.org |
| 2354 | S: Supported | 2357 | S: Supported |
| 2355 | F: drivers/gpu/drm/exynos | 2358 | F: drivers/gpu/drm/exynos |
| @@ -4137,6 +4140,7 @@ F: fs/partitions/ldm.* | |||
| 4137 | 4140 | ||
| 4138 | LogFS | 4141 | LogFS |
| 4139 | M: Joern Engel <joern@logfs.org> | 4142 | M: Joern Engel <joern@logfs.org> |
| 4143 | M: Prasad Joshi <prasadjoshi.linux@gmail.com> | ||
| 4140 | L: logfs@logfs.org | 4144 | L: logfs@logfs.org |
| 4141 | W: logfs.org | 4145 | W: logfs.org |
| 4142 | S: Maintained | 4146 | S: Maintained |
| @@ -4278,13 +4282,6 @@ S: Orphan | |||
| 4278 | F: drivers/video/matrox/matroxfb_* | 4282 | F: drivers/video/matrox/matroxfb_* |
| 4279 | F: include/linux/matroxfb.h | 4283 | F: include/linux/matroxfb.h |
| 4280 | 4284 | ||
| 4281 | MAX1668 TEMPERATURE SENSOR DRIVER | ||
| 4282 | M: "David George" <david.george@ska.ac.za> | ||
| 4283 | L: lm-sensors@lm-sensors.org | ||
| 4284 | S: Maintained | ||
| 4285 | F: Documentation/hwmon/max1668 | ||
| 4286 | F: drivers/hwmon/max1668.c | ||
| 4287 | |||
| 4288 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER | 4285 | MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER |
| 4289 | M: "Hans J. Koch" <hjk@hansjkoch.de> | 4286 | M: "Hans J. Koch" <hjk@hansjkoch.de> |
| 4290 | L: lm-sensors@lm-sensors.org | 4287 | L: lm-sensors@lm-sensors.org |
| @@ -6279,15 +6276,15 @@ S: Maintained | |||
| 6279 | F: arch/alpha/kernel/srm_env.c | 6276 | F: arch/alpha/kernel/srm_env.c |
| 6280 | 6277 | ||
| 6281 | STABLE BRANCH | 6278 | STABLE BRANCH |
| 6282 | M: Greg Kroah-Hartman <greg@kroah.com> | 6279 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6283 | L: stable@vger.kernel.org | 6280 | L: stable@vger.kernel.org |
| 6284 | S: Maintained | 6281 | S: Supported |
| 6285 | 6282 | ||
| 6286 | STAGING SUBSYSTEM | 6283 | STAGING SUBSYSTEM |
| 6287 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6284 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6288 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git | 6285 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git |
| 6289 | L: devel@driverdev.osuosl.org | 6286 | L: devel@driverdev.osuosl.org |
| 6290 | S: Maintained | 6287 | S: Supported |
| 6291 | F: drivers/staging/ | 6288 | F: drivers/staging/ |
| 6292 | 6289 | ||
| 6293 | STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS | 6290 | STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS |
| @@ -6672,10 +6669,10 @@ S: Maintained | |||
| 6672 | K: ^Subject:.*(?i)trivial | 6669 | K: ^Subject:.*(?i)trivial |
| 6673 | 6670 | ||
| 6674 | TTY LAYER | 6671 | TTY LAYER |
| 6675 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6672 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6676 | S: Maintained | 6673 | S: Supported |
| 6677 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git | 6674 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git |
| 6678 | F: drivers/tty/* | 6675 | F: drivers/tty/ |
| 6679 | F: drivers/tty/serial/serial_core.c | 6676 | F: drivers/tty/serial/serial_core.c |
| 6680 | F: include/linux/serial_core.h | 6677 | F: include/linux/serial_core.h |
| 6681 | F: include/linux/serial.h | 6678 | F: include/linux/serial.h |
| @@ -6961,7 +6958,7 @@ S: Maintained | |||
| 6961 | F: drivers/usb/serial/digi_acceleport.c | 6958 | F: drivers/usb/serial/digi_acceleport.c |
| 6962 | 6959 | ||
| 6963 | USB SERIAL DRIVER | 6960 | USB SERIAL DRIVER |
| 6964 | M: Greg Kroah-Hartman <gregkh@suse.de> | 6961 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6965 | L: linux-usb@vger.kernel.org | 6962 | L: linux-usb@vger.kernel.org |
| 6966 | S: Supported | 6963 | S: Supported |
| 6967 | F: Documentation/usb/usb-serial.txt | 6964 | F: Documentation/usb/usb-serial.txt |
| @@ -6976,9 +6973,8 @@ S: Maintained | |||
| 6976 | F: drivers/usb/serial/empeg.c | 6973 | F: drivers/usb/serial/empeg.c |
| 6977 | 6974 | ||
| 6978 | USB SERIAL KEYSPAN DRIVER | 6975 | USB SERIAL KEYSPAN DRIVER |
| 6979 | M: Greg Kroah-Hartman <greg@kroah.com> | 6976 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6980 | L: linux-usb@vger.kernel.org | 6977 | L: linux-usb@vger.kernel.org |
| 6981 | W: http://www.kroah.com/linux/ | ||
| 6982 | S: Maintained | 6978 | S: Maintained |
| 6983 | F: drivers/usb/serial/*keyspan* | 6979 | F: drivers/usb/serial/*keyspan* |
| 6984 | 6980 | ||
| @@ -7006,7 +7002,7 @@ F: Documentation/video4linux/sn9c102.txt | |||
| 7006 | F: drivers/media/video/sn9c102/ | 7002 | F: drivers/media/video/sn9c102/ |
| 7007 | 7003 | ||
| 7008 | USB SUBSYSTEM | 7004 | USB SUBSYSTEM |
| 7009 | M: Greg Kroah-Hartman <gregkh@suse.de> | 7005 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 7010 | L: linux-usb@vger.kernel.org | 7006 | L: linux-usb@vger.kernel.org |
| 7011 | W: http://www.linux-usb.org | 7007 | W: http://www.linux-usb.org |
| 7012 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git | 7008 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git |
| @@ -7093,7 +7089,7 @@ F: fs/hppfs/ | |||
| 7093 | 7089 | ||
| 7094 | USERSPACE I/O (UIO) | 7090 | USERSPACE I/O (UIO) |
| 7095 | M: "Hans J. Koch" <hjk@hansjkoch.de> | 7091 | M: "Hans J. Koch" <hjk@hansjkoch.de> |
| 7096 | M: Greg Kroah-Hartman <gregkh@suse.de> | 7092 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 7097 | S: Maintained | 7093 | S: Maintained |
| 7098 | F: Documentation/DocBook/uio-howto.tmpl | 7094 | F: Documentation/DocBook/uio-howto.tmpl |
| 7099 | F: drivers/uio/ | 7095 | F: drivers/uio/ |
| @@ -7368,6 +7364,7 @@ S: Supported | |||
| 7368 | F: Documentation/hwmon/wm83?? | 7364 | F: Documentation/hwmon/wm83?? |
| 7369 | F: arch/arm/mach-s3c64xx/mach-crag6410* | 7365 | F: arch/arm/mach-s3c64xx/mach-crag6410* |
| 7370 | F: drivers/leds/leds-wm83*.c | 7366 | F: drivers/leds/leds-wm83*.c |
| 7367 | F: drivers/hwmon/wm83??-hwmon.c | ||
| 7371 | F: drivers/input/misc/wm831x-on.c | 7368 | F: drivers/input/misc/wm831x-on.c |
| 7372 | F: drivers/input/touchscreen/wm831x-ts.c | 7369 | F: drivers/input/touchscreen/wm831x-ts.c |
| 7373 | F: drivers/input/touchscreen/wm97*.c | 7370 | F: drivers/input/touchscreen/wm97*.c |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 3 | 2 | PATCHLEVEL = 3 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc1 | 4 | EXTRAVERSION = -rc2 |
| 5 | NAME = Saber-toothed Squirrel | 5 | NAME = Saber-toothed Squirrel |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24626b0419ee..a48aecc17eac 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -754,7 +754,7 @@ config ARCH_SA1100 | |||
| 754 | select ARCH_HAS_CPUFREQ | 754 | select ARCH_HAS_CPUFREQ |
| 755 | select CPU_FREQ | 755 | select CPU_FREQ |
| 756 | select GENERIC_CLOCKEVENTS | 756 | select GENERIC_CLOCKEVENTS |
| 757 | select CLKDEV_LOOKUP | 757 | select HAVE_CLK |
| 758 | select HAVE_SCHED_CLOCK | 758 | select HAVE_SCHED_CLOCK |
| 759 | select TICK_ONESHOT | 759 | select TICK_ONESHOT |
| 760 | select ARCH_REQUIRE_GPIOLIB | 760 | select ARCH_REQUIRE_GPIOLIB |
| @@ -825,7 +825,6 @@ config ARCH_S5PC100 | |||
| 825 | select HAVE_CLK | 825 | select HAVE_CLK |
| 826 | select CLKDEV_LOOKUP | 826 | select CLKDEV_LOOKUP |
| 827 | select CPU_V7 | 827 | select CPU_V7 |
| 828 | select ARM_L1_CACHE_SHIFT_6 | ||
| 829 | select ARCH_USES_GETTIMEOFFSET | 828 | select ARCH_USES_GETTIMEOFFSET |
| 830 | select HAVE_S3C2410_I2C if I2C | 829 | select HAVE_S3C2410_I2C if I2C |
| 831 | select HAVE_S3C_RTC if RTC_CLASS | 830 | select HAVE_S3C_RTC if RTC_CLASS |
| @@ -842,7 +841,6 @@ config ARCH_S5PV210 | |||
| 842 | select HAVE_CLK | 841 | select HAVE_CLK |
| 843 | select CLKDEV_LOOKUP | 842 | select CLKDEV_LOOKUP |
| 844 | select CLKSRC_MMIO | 843 | select CLKSRC_MMIO |
| 845 | select ARM_L1_CACHE_SHIFT_6 | ||
| 846 | select ARCH_HAS_CPUFREQ | 844 | select ARCH_HAS_CPUFREQ |
| 847 | select GENERIC_CLOCKEVENTS | 845 | select GENERIC_CLOCKEVENTS |
| 848 | select HAVE_SCHED_CLOCK | 846 | select HAVE_SCHED_CLOCK |
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index b2dc2dd7f1df..c47d6199b784 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | 41 | ||
| 42 | #include <asm/irq.h> | 42 | #include <asm/irq.h> |
| 43 | #include <asm/exception.h> | 43 | #include <asm/exception.h> |
| 44 | #include <asm/smp_plat.h> | ||
| 44 | #include <asm/mach/irq.h> | 45 | #include <asm/mach/irq.h> |
| 45 | #include <asm/hardware/gic.h> | 46 | #include <asm/hardware/gic.h> |
| 46 | 47 | ||
| @@ -352,11 +353,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic) | |||
| 352 | unsigned int gic_irqs = gic->gic_irqs; | 353 | unsigned int gic_irqs = gic->gic_irqs; |
| 353 | struct irq_domain *domain = &gic->domain; | 354 | struct irq_domain *domain = &gic->domain; |
| 354 | void __iomem *base = gic_data_dist_base(gic); | 355 | void __iomem *base = gic_data_dist_base(gic); |
| 355 | u32 cpu = 0; | 356 | u32 cpu = cpu_logical_map(smp_processor_id()); |
| 356 | |||
| 357 | #ifdef CONFIG_SMP | ||
| 358 | cpu = cpu_logical_map(smp_processor_id()); | ||
| 359 | #endif | ||
| 360 | 357 | ||
| 361 | cpumask = 1 << cpu; | 358 | cpumask = 1 << cpu; |
| 362 | cpumask |= cpumask << 8; | 359 | cpumask |= cpumask << 8; |
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index b6e65dedfd71..62f8095d46de 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h | |||
| @@ -237,7 +237,7 @@ | |||
| 237 | */ | 237 | */ |
| 238 | #ifdef CONFIG_THUMB2_KERNEL | 238 | #ifdef CONFIG_THUMB2_KERNEL |
| 239 | 239 | ||
| 240 | .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=T() | 240 | .macro usraccoff, instr, reg, ptr, inc, off, cond, abort, t=TUSER() |
| 241 | 9999: | 241 | 9999: |
| 242 | .if \inc == 1 | 242 | .if \inc == 1 |
| 243 | \instr\cond\()b\()\t\().w \reg, [\ptr, #\off] | 243 | \instr\cond\()b\()\t\().w \reg, [\ptr, #\off] |
| @@ -277,7 +277,7 @@ | |||
| 277 | 277 | ||
| 278 | #else /* !CONFIG_THUMB2_KERNEL */ | 278 | #else /* !CONFIG_THUMB2_KERNEL */ |
| 279 | 279 | ||
| 280 | .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=T() | 280 | .macro usracc, instr, reg, ptr, inc, cond, rept, abort, t=TUSER() |
| 281 | .rept \rept | 281 | .rept \rept |
| 282 | 9999: | 282 | 9999: |
| 283 | .if \inc == 1 | 283 | .if \inc == 1 |
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index af18ceaacf5d..b5dc173d336f 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h | |||
| @@ -83,9 +83,9 @@ | |||
| 83 | * instructions (inline assembly) | 83 | * instructions (inline assembly) |
| 84 | */ | 84 | */ |
| 85 | #ifdef CONFIG_CPU_USE_DOMAINS | 85 | #ifdef CONFIG_CPU_USE_DOMAINS |
| 86 | #define T(instr) #instr "t" | 86 | #define TUSER(instr) #instr "t" |
| 87 | #else | 87 | #else |
| 88 | #define T(instr) #instr | 88 | #define TUSER(instr) #instr |
| 89 | #endif | 89 | #endif |
| 90 | 90 | ||
| 91 | #else /* __ASSEMBLY__ */ | 91 | #else /* __ASSEMBLY__ */ |
| @@ -95,9 +95,9 @@ | |||
| 95 | * instructions | 95 | * instructions |
| 96 | */ | 96 | */ |
| 97 | #ifdef CONFIG_CPU_USE_DOMAINS | 97 | #ifdef CONFIG_CPU_USE_DOMAINS |
| 98 | #define T(instr) instr ## t | 98 | #define TUSER(instr) instr ## t |
| 99 | #else | 99 | #else |
| 100 | #define T(instr) instr | 100 | #define TUSER(instr) instr |
| 101 | #endif | 101 | #endif |
| 102 | 102 | ||
| 103 | #endif /* __ASSEMBLY__ */ | 103 | #endif /* __ASSEMBLY__ */ |
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h index 253cc86318bf..7be54690aeec 100644 --- a/arch/arm/include/asm/futex.h +++ b/arch/arm/include/asm/futex.h | |||
| @@ -75,9 +75,9 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
| 75 | 75 | ||
| 76 | #define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \ | 76 | #define __futex_atomic_op(insn, ret, oldval, tmp, uaddr, oparg) \ |
| 77 | __asm__ __volatile__( \ | 77 | __asm__ __volatile__( \ |
| 78 | "1: " T(ldr) " %1, [%3]\n" \ | 78 | "1: " TUSER(ldr) " %1, [%3]\n" \ |
| 79 | " " insn "\n" \ | 79 | " " insn "\n" \ |
| 80 | "2: " T(str) " %0, [%3]\n" \ | 80 | "2: " TUSER(str) " %0, [%3]\n" \ |
| 81 | " mov %0, #0\n" \ | 81 | " mov %0, #0\n" \ |
| 82 | __futex_atomic_ex_table("%5") \ | 82 | __futex_atomic_ex_table("%5") \ |
| 83 | : "=&r" (ret), "=&r" (oldval), "=&r" (tmp) \ | 83 | : "=&r" (ret), "=&r" (oldval), "=&r" (tmp) \ |
| @@ -95,10 +95,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, | |||
| 95 | return -EFAULT; | 95 | return -EFAULT; |
| 96 | 96 | ||
| 97 | __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" | 97 | __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" |
| 98 | "1: " T(ldr) " %1, [%4]\n" | 98 | "1: " TUSER(ldr) " %1, [%4]\n" |
| 99 | " teq %1, %2\n" | 99 | " teq %1, %2\n" |
| 100 | " it eq @ explicit IT needed for the 2b label\n" | 100 | " it eq @ explicit IT needed for the 2b label\n" |
| 101 | "2: " T(streq) " %3, [%4]\n" | 101 | "2: " TUSER(streq) " %3, [%4]\n" |
| 102 | __futex_atomic_ex_table("%5") | 102 | __futex_atomic_ex_table("%5") |
| 103 | : "+r" (ret), "=&r" (val) | 103 | : "+r" (ret), "=&r" (val) |
| 104 | : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) | 104 | : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT) |
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index 1e5717afc4ac..ae29293270a3 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h | |||
| @@ -71,12 +71,6 @@ extern void platform_secondary_init(unsigned int cpu); | |||
| 71 | extern void platform_smp_prepare_cpus(unsigned int); | 71 | extern void platform_smp_prepare_cpus(unsigned int); |
| 72 | 72 | ||
| 73 | /* | 73 | /* |
| 74 | * Logical CPU mapping. | ||
| 75 | */ | ||
| 76 | extern int __cpu_logical_map[NR_CPUS]; | ||
| 77 | #define cpu_logical_map(cpu) __cpu_logical_map[cpu] | ||
| 78 | |||
| 79 | /* | ||
| 80 | * Initial data for bringing up a secondary CPU. | 74 | * Initial data for bringing up a secondary CPU. |
| 81 | */ | 75 | */ |
| 82 | struct secondary_data { | 76 | struct secondary_data { |
diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h index f24c1b9e211d..558d6c80aca9 100644 --- a/arch/arm/include/asm/smp_plat.h +++ b/arch/arm/include/asm/smp_plat.h | |||
| @@ -43,4 +43,10 @@ static inline int cache_ops_need_broadcast(void) | |||
| 43 | } | 43 | } |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | /* | ||
| 47 | * Logical CPU mapping. | ||
| 48 | */ | ||
| 49 | extern int __cpu_logical_map[]; | ||
| 50 | #define cpu_logical_map(cpu) __cpu_logical_map[cpu] | ||
| 51 | |||
| 46 | #endif | 52 | #endif |
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index b293616a1a1a..2958976d867b 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h | |||
| @@ -227,7 +227,7 @@ do { \ | |||
| 227 | 227 | ||
| 228 | #define __get_user_asm_byte(x,addr,err) \ | 228 | #define __get_user_asm_byte(x,addr,err) \ |
| 229 | __asm__ __volatile__( \ | 229 | __asm__ __volatile__( \ |
| 230 | "1: " T(ldrb) " %1,[%2],#0\n" \ | 230 | "1: " TUSER(ldrb) " %1,[%2],#0\n" \ |
| 231 | "2:\n" \ | 231 | "2:\n" \ |
| 232 | " .pushsection .fixup,\"ax\"\n" \ | 232 | " .pushsection .fixup,\"ax\"\n" \ |
| 233 | " .align 2\n" \ | 233 | " .align 2\n" \ |
| @@ -263,7 +263,7 @@ do { \ | |||
| 263 | 263 | ||
| 264 | #define __get_user_asm_word(x,addr,err) \ | 264 | #define __get_user_asm_word(x,addr,err) \ |
| 265 | __asm__ __volatile__( \ | 265 | __asm__ __volatile__( \ |
| 266 | "1: " T(ldr) " %1,[%2],#0\n" \ | 266 | "1: " TUSER(ldr) " %1,[%2],#0\n" \ |
| 267 | "2:\n" \ | 267 | "2:\n" \ |
| 268 | " .pushsection .fixup,\"ax\"\n" \ | 268 | " .pushsection .fixup,\"ax\"\n" \ |
| 269 | " .align 2\n" \ | 269 | " .align 2\n" \ |
| @@ -308,7 +308,7 @@ do { \ | |||
| 308 | 308 | ||
| 309 | #define __put_user_asm_byte(x,__pu_addr,err) \ | 309 | #define __put_user_asm_byte(x,__pu_addr,err) \ |
| 310 | __asm__ __volatile__( \ | 310 | __asm__ __volatile__( \ |
| 311 | "1: " T(strb) " %1,[%2],#0\n" \ | 311 | "1: " TUSER(strb) " %1,[%2],#0\n" \ |
| 312 | "2:\n" \ | 312 | "2:\n" \ |
| 313 | " .pushsection .fixup,\"ax\"\n" \ | 313 | " .pushsection .fixup,\"ax\"\n" \ |
| 314 | " .align 2\n" \ | 314 | " .align 2\n" \ |
| @@ -341,7 +341,7 @@ do { \ | |||
| 341 | 341 | ||
| 342 | #define __put_user_asm_word(x,__pu_addr,err) \ | 342 | #define __put_user_asm_word(x,__pu_addr,err) \ |
| 343 | __asm__ __volatile__( \ | 343 | __asm__ __volatile__( \ |
| 344 | "1: " T(str) " %1,[%2],#0\n" \ | 344 | "1: " TUSER(str) " %1,[%2],#0\n" \ |
| 345 | "2:\n" \ | 345 | "2:\n" \ |
| 346 | " .pushsection .fixup,\"ax\"\n" \ | 346 | " .pushsection .fixup,\"ax\"\n" \ |
| 347 | " .align 2\n" \ | 347 | " .align 2\n" \ |
| @@ -366,10 +366,10 @@ do { \ | |||
| 366 | 366 | ||
| 367 | #define __put_user_asm_dword(x,__pu_addr,err) \ | 367 | #define __put_user_asm_dword(x,__pu_addr,err) \ |
| 368 | __asm__ __volatile__( \ | 368 | __asm__ __volatile__( \ |
| 369 | ARM( "1: " T(str) " " __reg_oper1 ", [%1], #4\n" ) \ | 369 | ARM( "1: " TUSER(str) " " __reg_oper1 ", [%1], #4\n" ) \ |
| 370 | ARM( "2: " T(str) " " __reg_oper0 ", [%1]\n" ) \ | 370 | ARM( "2: " TUSER(str) " " __reg_oper0 ", [%1]\n" ) \ |
| 371 | THUMB( "1: " T(str) " " __reg_oper1 ", [%1]\n" ) \ | 371 | THUMB( "1: " TUSER(str) " " __reg_oper1 ", [%1]\n" ) \ |
| 372 | THUMB( "2: " T(str) " " __reg_oper0 ", [%1, #4]\n" ) \ | 372 | THUMB( "2: " TUSER(str) " " __reg_oper0 ", [%1, #4]\n" ) \ |
| 373 | "3:\n" \ | 373 | "3:\n" \ |
| 374 | " .pushsection .fixup,\"ax\"\n" \ | 374 | " .pushsection .fixup,\"ax\"\n" \ |
| 375 | " .align 2\n" \ | 375 | " .align 2\n" \ |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 520889cf1b5b..9fd0ba90c1d2 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
| @@ -149,6 +149,11 @@ ENDPROC(ret_from_fork) | |||
| 149 | #endif | 149 | #endif |
| 150 | #endif | 150 | #endif |
| 151 | 151 | ||
| 152 | .macro mcount_adjust_addr rd, rn | ||
| 153 | bic \rd, \rn, #1 @ clear the Thumb bit if present | ||
| 154 | sub \rd, \rd, #MCOUNT_INSN_SIZE | ||
| 155 | .endm | ||
| 156 | |||
| 152 | .macro __mcount suffix | 157 | .macro __mcount suffix |
| 153 | mcount_enter | 158 | mcount_enter |
| 154 | ldr r0, =ftrace_trace_function | 159 | ldr r0, =ftrace_trace_function |
| @@ -173,8 +178,7 @@ ENDPROC(ret_from_fork) | |||
| 173 | mcount_exit | 178 | mcount_exit |
| 174 | 179 | ||
| 175 | 1: mcount_get_lr r1 @ lr of instrumented func | 180 | 1: mcount_get_lr r1 @ lr of instrumented func |
| 176 | mov r0, lr @ instrumented function | 181 | mcount_adjust_addr r0, lr @ instrumented function |
| 177 | sub r0, r0, #MCOUNT_INSN_SIZE | ||
| 178 | adr lr, BSYM(2f) | 182 | adr lr, BSYM(2f) |
| 179 | mov pc, r2 | 183 | mov pc, r2 |
| 180 | 2: mcount_exit | 184 | 2: mcount_exit |
| @@ -184,8 +188,7 @@ ENDPROC(ret_from_fork) | |||
| 184 | mcount_enter | 188 | mcount_enter |
| 185 | 189 | ||
| 186 | mcount_get_lr r1 @ lr of instrumented func | 190 | mcount_get_lr r1 @ lr of instrumented func |
| 187 | mov r0, lr @ instrumented function | 191 | mcount_adjust_addr r0, lr @ instrumented function |
| 188 | sub r0, r0, #MCOUNT_INSN_SIZE | ||
| 189 | 192 | ||
| 190 | .globl ftrace_call\suffix | 193 | .globl ftrace_call\suffix |
| 191 | ftrace_call\suffix: | 194 | ftrace_call\suffix: |
| @@ -205,11 +208,11 @@ ftrace_graph_call\suffix: | |||
| 205 | #ifdef CONFIG_DYNAMIC_FTRACE | 208 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 206 | @ called from __ftrace_caller, saved in mcount_enter | 209 | @ called from __ftrace_caller, saved in mcount_enter |
| 207 | ldr r1, [sp, #16] @ instrumented routine (func) | 210 | ldr r1, [sp, #16] @ instrumented routine (func) |
| 211 | mcount_adjust_addr r1, r1 | ||
| 208 | #else | 212 | #else |
| 209 | @ called from __mcount, untouched in lr | 213 | @ called from __mcount, untouched in lr |
| 210 | mov r1, lr @ instrumented routine (func) | 214 | mcount_adjust_addr r1, lr @ instrumented routine (func) |
| 211 | #endif | 215 | #endif |
| 212 | sub r1, r1, #MCOUNT_INSN_SIZE | ||
| 213 | mov r2, fp @ frame pointer | 216 | mov r2, fp @ frame pointer |
| 214 | bl prepare_ftrace_return | 217 | bl prepare_ftrace_return |
| 215 | mcount_exit | 218 | mcount_exit |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 129fbd55bde8..a255c39612ca 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/kexec.h> | 22 | #include <linux/kexec.h> |
| 23 | #include <linux/of_fdt.h> | 23 | #include <linux/of_fdt.h> |
| 24 | #include <linux/crash_dump.h> | ||
| 25 | #include <linux/root_dev.h> | 24 | #include <linux/root_dev.h> |
| 26 | #include <linux/cpu.h> | 25 | #include <linux/cpu.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| @@ -160,7 +159,7 @@ static struct resource mem_res[] = { | |||
| 160 | .flags = IORESOURCE_MEM | 159 | .flags = IORESOURCE_MEM |
| 161 | }, | 160 | }, |
| 162 | { | 161 | { |
| 163 | .name = "Kernel text", | 162 | .name = "Kernel code", |
| 164 | .start = 0, | 163 | .start = 0, |
| 165 | .end = 0, | 164 | .end = 0, |
| 166 | .flags = IORESOURCE_MEM | 165 | .flags = IORESOURCE_MEM |
| @@ -427,6 +426,20 @@ void cpu_init(void) | |||
| 427 | : "r14"); | 426 | : "r14"); |
| 428 | } | 427 | } |
| 429 | 428 | ||
| 429 | int __cpu_logical_map[NR_CPUS]; | ||
| 430 | |||
| 431 | void __init smp_setup_processor_id(void) | ||
| 432 | { | ||
| 433 | int i; | ||
| 434 | u32 cpu = is_smp() ? read_cpuid_mpidr() & 0xff : 0; | ||
| 435 | |||
| 436 | cpu_logical_map(0) = cpu; | ||
| 437 | for (i = 1; i < NR_CPUS; ++i) | ||
| 438 | cpu_logical_map(i) = i == cpu ? 0 : i; | ||
| 439 | |||
| 440 | printk(KERN_INFO "Booting Linux on physical CPU %d\n", cpu); | ||
| 441 | } | ||
| 442 | |||
| 430 | static void __init setup_processor(void) | 443 | static void __init setup_processor(void) |
| 431 | { | 444 | { |
| 432 | struct proc_info_list *list; | 445 | struct proc_info_list *list; |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 57db122a4f62..cdeb727527d3 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -233,20 +233,6 @@ void __ref cpu_die(void) | |||
| 233 | } | 233 | } |
| 234 | #endif /* CONFIG_HOTPLUG_CPU */ | 234 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 235 | 235 | ||
| 236 | int __cpu_logical_map[NR_CPUS]; | ||
| 237 | |||
| 238 | void __init smp_setup_processor_id(void) | ||
| 239 | { | ||
| 240 | int i; | ||
| 241 | u32 cpu = is_smp() ? read_cpuid_mpidr() & 0xff : 0; | ||
| 242 | |||
| 243 | cpu_logical_map(0) = cpu; | ||
| 244 | for (i = 1; i < NR_CPUS; ++i) | ||
| 245 | cpu_logical_map(i) = i == cpu ? 0 : i; | ||
| 246 | |||
| 247 | printk(KERN_INFO "Booting Linux on physical CPU %d\n", cpu); | ||
| 248 | } | ||
| 249 | |||
| 250 | /* | 236 | /* |
| 251 | * Called by both boot and secondaries to move global data into | 237 | * Called by both boot and secondaries to move global data into |
| 252 | * per-processor storage. | 238 | * per-processor storage. |
| @@ -443,9 +429,7 @@ static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent); | |||
| 443 | static void ipi_timer(void) | 429 | static void ipi_timer(void) |
| 444 | { | 430 | { |
| 445 | struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent); | 431 | struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent); |
| 446 | irq_enter(); | ||
| 447 | evt->event_handler(evt); | 432 | evt->event_handler(evt); |
| 448 | irq_exit(); | ||
| 449 | } | 433 | } |
| 450 | 434 | ||
| 451 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | 435 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST |
| @@ -548,7 +532,9 @@ void handle_IPI(int ipinr, struct pt_regs *regs) | |||
| 548 | 532 | ||
| 549 | switch (ipinr) { | 533 | switch (ipinr) { |
| 550 | case IPI_TIMER: | 534 | case IPI_TIMER: |
| 535 | irq_enter(); | ||
| 551 | ipi_timer(); | 536 | ipi_timer(); |
| 537 | irq_exit(); | ||
| 552 | break; | 538 | break; |
| 553 | 539 | ||
| 554 | case IPI_RESCHEDULE: | 540 | case IPI_RESCHEDULE: |
| @@ -556,15 +542,21 @@ void handle_IPI(int ipinr, struct pt_regs *regs) | |||
| 556 | break; | 542 | break; |
| 557 | 543 | ||
| 558 | case IPI_CALL_FUNC: | 544 | case IPI_CALL_FUNC: |
| 545 | irq_enter(); | ||
| 559 | generic_smp_call_function_interrupt(); | 546 | generic_smp_call_function_interrupt(); |
| 547 | irq_exit(); | ||
| 560 | break; | 548 | break; |
| 561 | 549 | ||
| 562 | case IPI_CALL_FUNC_SINGLE: | 550 | case IPI_CALL_FUNC_SINGLE: |
| 551 | irq_enter(); | ||
| 563 | generic_smp_call_function_single_interrupt(); | 552 | generic_smp_call_function_single_interrupt(); |
| 553 | irq_exit(); | ||
| 564 | break; | 554 | break; |
| 565 | 555 | ||
| 566 | case IPI_CPU_STOP: | 556 | case IPI_CPU_STOP: |
| 557 | irq_enter(); | ||
| 567 | ipi_cpu_stop(cpu); | 558 | ipi_cpu_stop(cpu); |
| 559 | irq_exit(); | ||
| 568 | break; | 560 | break; |
| 569 | 561 | ||
| 570 | default: | 562 | default: |
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index c8e938553d47..4285daa077b0 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c | |||
| @@ -252,6 +252,8 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) | |||
| 252 | else | 252 | else |
| 253 | twd_calibrate_rate(); | 253 | twd_calibrate_rate(); |
| 254 | 254 | ||
| 255 | __raw_writel(0, twd_base + TWD_TIMER_CONTROL); | ||
| 256 | |||
| 255 | clk->name = "local_timer"; | 257 | clk->name = "local_timer"; |
| 256 | clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT | | 258 | clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT | |
| 257 | CLOCK_EVT_FEAT_C3STOP; | 259 | CLOCK_EVT_FEAT_C3STOP; |
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index f76e75548670..1e19691e0406 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <asm-generic/vmlinux.lds.h> | 6 | #include <asm-generic/vmlinux.lds.h> |
| 7 | #include <asm/cache.h> | ||
| 7 | #include <asm/thread_info.h> | 8 | #include <asm/thread_info.h> |
| 8 | #include <asm/memory.h> | 9 | #include <asm/memory.h> |
| 9 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| @@ -181,7 +182,7 @@ SECTIONS | |||
| 181 | } | 182 | } |
| 182 | #endif | 183 | #endif |
| 183 | 184 | ||
| 184 | PERCPU_SECTION(32) | 185 | PERCPU_SECTION(L1_CACHE_BYTES) |
| 185 | 186 | ||
| 186 | #ifdef CONFIG_XIP_KERNEL | 187 | #ifdef CONFIG_XIP_KERNEL |
| 187 | __data_loc = ALIGN(4); /* location in binary */ | 188 | __data_loc = ALIGN(4); /* location in binary */ |
| @@ -212,13 +213,13 @@ SECTIONS | |||
| 212 | #endif | 213 | #endif |
| 213 | 214 | ||
| 214 | NOSAVE_DATA | 215 | NOSAVE_DATA |
| 215 | CACHELINE_ALIGNED_DATA(32) | 216 | CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) |
| 216 | READ_MOSTLY_DATA(32) | 217 | READ_MOSTLY_DATA(L1_CACHE_BYTES) |
| 217 | 218 | ||
| 218 | /* | 219 | /* |
| 219 | * The exception fixup table (might need resorting at runtime) | 220 | * The exception fixup table (might need resorting at runtime) |
| 220 | */ | 221 | */ |
| 221 | . = ALIGN(32); | 222 | . = ALIGN(4); |
| 222 | __start___ex_table = .; | 223 | __start___ex_table = .; |
| 223 | #ifdef CONFIG_MMU | 224 | #ifdef CONFIG_MMU |
| 224 | *(__ex_table) | 225 | *(__ex_table) |
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 1b049cd7a49a..11093a7c3e32 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
| @@ -31,18 +31,18 @@ | |||
| 31 | #include <asm/domain.h> | 31 | #include <asm/domain.h> |
| 32 | 32 | ||
| 33 | ENTRY(__get_user_1) | 33 | ENTRY(__get_user_1) |
| 34 | 1: T(ldrb) r2, [r0] | 34 | 1: TUSER(ldrb) r2, [r0] |
| 35 | mov r0, #0 | 35 | mov r0, #0 |
| 36 | mov pc, lr | 36 | mov pc, lr |
| 37 | ENDPROC(__get_user_1) | 37 | ENDPROC(__get_user_1) |
| 38 | 38 | ||
| 39 | ENTRY(__get_user_2) | 39 | ENTRY(__get_user_2) |
| 40 | #ifdef CONFIG_THUMB2_KERNEL | 40 | #ifdef CONFIG_THUMB2_KERNEL |
| 41 | 2: T(ldrb) r2, [r0] | 41 | 2: TUSER(ldrb) r2, [r0] |
| 42 | 3: T(ldrb) r3, [r0, #1] | 42 | 3: TUSER(ldrb) r3, [r0, #1] |
| 43 | #else | 43 | #else |
| 44 | 2: T(ldrb) r2, [r0], #1 | 44 | 2: TUSER(ldrb) r2, [r0], #1 |
| 45 | 3: T(ldrb) r3, [r0] | 45 | 3: TUSER(ldrb) r3, [r0] |
| 46 | #endif | 46 | #endif |
| 47 | #ifndef __ARMEB__ | 47 | #ifndef __ARMEB__ |
| 48 | orr r2, r2, r3, lsl #8 | 48 | orr r2, r2, r3, lsl #8 |
| @@ -54,7 +54,7 @@ ENTRY(__get_user_2) | |||
| 54 | ENDPROC(__get_user_2) | 54 | ENDPROC(__get_user_2) |
| 55 | 55 | ||
| 56 | ENTRY(__get_user_4) | 56 | ENTRY(__get_user_4) |
| 57 | 4: T(ldr) r2, [r0] | 57 | 4: TUSER(ldr) r2, [r0] |
| 58 | mov r0, #0 | 58 | mov r0, #0 |
| 59 | mov pc, lr | 59 | mov pc, lr |
| 60 | ENDPROC(__get_user_4) | 60 | ENDPROC(__get_user_4) |
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S index c023fc11e86c..7db25990c589 100644 --- a/arch/arm/lib/putuser.S +++ b/arch/arm/lib/putuser.S | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/domain.h> | 31 | #include <asm/domain.h> |
| 32 | 32 | ||
| 33 | ENTRY(__put_user_1) | 33 | ENTRY(__put_user_1) |
| 34 | 1: T(strb) r2, [r0] | 34 | 1: TUSER(strb) r2, [r0] |
| 35 | mov r0, #0 | 35 | mov r0, #0 |
| 36 | mov pc, lr | 36 | mov pc, lr |
| 37 | ENDPROC(__put_user_1) | 37 | ENDPROC(__put_user_1) |
| @@ -40,19 +40,19 @@ ENTRY(__put_user_2) | |||
| 40 | mov ip, r2, lsr #8 | 40 | mov ip, r2, lsr #8 |
| 41 | #ifdef CONFIG_THUMB2_KERNEL | 41 | #ifdef CONFIG_THUMB2_KERNEL |
| 42 | #ifndef __ARMEB__ | 42 | #ifndef __ARMEB__ |
| 43 | 2: T(strb) r2, [r0] | 43 | 2: TUSER(strb) r2, [r0] |
| 44 | 3: T(strb) ip, [r0, #1] | 44 | 3: TUSER(strb) ip, [r0, #1] |
| 45 | #else | 45 | #else |
| 46 | 2: T(strb) ip, [r0] | 46 | 2: TUSER(strb) ip, [r0] |
| 47 | 3: T(strb) r2, [r0, #1] | 47 | 3: TUSER(strb) r2, [r0, #1] |
| 48 | #endif | 48 | #endif |
| 49 | #else /* !CONFIG_THUMB2_KERNEL */ | 49 | #else /* !CONFIG_THUMB2_KERNEL */ |
| 50 | #ifndef __ARMEB__ | 50 | #ifndef __ARMEB__ |
| 51 | 2: T(strb) r2, [r0], #1 | 51 | 2: TUSER(strb) r2, [r0], #1 |
| 52 | 3: T(strb) ip, [r0] | 52 | 3: TUSER(strb) ip, [r0] |
| 53 | #else | 53 | #else |
| 54 | 2: T(strb) ip, [r0], #1 | 54 | 2: TUSER(strb) ip, [r0], #1 |
| 55 | 3: T(strb) r2, [r0] | 55 | 3: TUSER(strb) r2, [r0] |
| 56 | #endif | 56 | #endif |
| 57 | #endif /* CONFIG_THUMB2_KERNEL */ | 57 | #endif /* CONFIG_THUMB2_KERNEL */ |
| 58 | mov r0, #0 | 58 | mov r0, #0 |
| @@ -60,18 +60,18 @@ ENTRY(__put_user_2) | |||
| 60 | ENDPROC(__put_user_2) | 60 | ENDPROC(__put_user_2) |
| 61 | 61 | ||
| 62 | ENTRY(__put_user_4) | 62 | ENTRY(__put_user_4) |
| 63 | 4: T(str) r2, [r0] | 63 | 4: TUSER(str) r2, [r0] |
| 64 | mov r0, #0 | 64 | mov r0, #0 |
| 65 | mov pc, lr | 65 | mov pc, lr |
| 66 | ENDPROC(__put_user_4) | 66 | ENDPROC(__put_user_4) |
| 67 | 67 | ||
| 68 | ENTRY(__put_user_8) | 68 | ENTRY(__put_user_8) |
| 69 | #ifdef CONFIG_THUMB2_KERNEL | 69 | #ifdef CONFIG_THUMB2_KERNEL |
| 70 | 5: T(str) r2, [r0] | 70 | 5: TUSER(str) r2, [r0] |
| 71 | 6: T(str) r3, [r0, #4] | 71 | 6: TUSER(str) r3, [r0, #4] |
| 72 | #else | 72 | #else |
| 73 | 5: T(str) r2, [r0], #4 | 73 | 5: TUSER(str) r2, [r0], #4 |
| 74 | 6: T(str) r3, [r0] | 74 | 6: TUSER(str) r3, [r0] |
| 75 | #endif | 75 | #endif |
| 76 | mov r0, #0 | 76 | mov r0, #0 |
| 77 | mov pc, lr | 77 | mov pc, lr |
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S index d0ece2aeb70d..5c908b1cb8ed 100644 --- a/arch/arm/lib/uaccess.S +++ b/arch/arm/lib/uaccess.S | |||
| @@ -32,11 +32,11 @@ | |||
| 32 | rsb ip, ip, #4 | 32 | rsb ip, ip, #4 |
| 33 | cmp ip, #2 | 33 | cmp ip, #2 |
| 34 | ldrb r3, [r1], #1 | 34 | ldrb r3, [r1], #1 |
| 35 | USER( T(strb) r3, [r0], #1) @ May fault | 35 | USER( TUSER( strb) r3, [r0], #1) @ May fault |
| 36 | ldrgeb r3, [r1], #1 | 36 | ldrgeb r3, [r1], #1 |
| 37 | USER( T(strgeb) r3, [r0], #1) @ May fault | 37 | USER( TUSER( strgeb) r3, [r0], #1) @ May fault |
| 38 | ldrgtb r3, [r1], #1 | 38 | ldrgtb r3, [r1], #1 |
| 39 | USER( T(strgtb) r3, [r0], #1) @ May fault | 39 | USER( TUSER( strgtb) r3, [r0], #1) @ May fault |
| 40 | sub r2, r2, ip | 40 | sub r2, r2, ip |
| 41 | b .Lc2u_dest_aligned | 41 | b .Lc2u_dest_aligned |
| 42 | 42 | ||
| @@ -59,7 +59,7 @@ ENTRY(__copy_to_user) | |||
| 59 | addmi ip, r2, #4 | 59 | addmi ip, r2, #4 |
| 60 | bmi .Lc2u_0nowords | 60 | bmi .Lc2u_0nowords |
| 61 | ldr r3, [r1], #4 | 61 | ldr r3, [r1], #4 |
| 62 | USER( T(str) r3, [r0], #4) @ May fault | 62 | USER( TUSER( str) r3, [r0], #4) @ May fault |
| 63 | mov ip, r0, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction | 63 | mov ip, r0, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction |
| 64 | rsb ip, ip, #0 | 64 | rsb ip, ip, #0 |
| 65 | movs ip, ip, lsr #32 - PAGE_SHIFT | 65 | movs ip, ip, lsr #32 - PAGE_SHIFT |
| @@ -88,18 +88,18 @@ USER( T(str) r3, [r0], #4) @ May fault | |||
| 88 | stmneia r0!, {r3 - r4} @ Shouldnt fault | 88 | stmneia r0!, {r3 - r4} @ Shouldnt fault |
| 89 | tst ip, #4 | 89 | tst ip, #4 |
| 90 | ldrne r3, [r1], #4 | 90 | ldrne r3, [r1], #4 |
| 91 | T(strne) r3, [r0], #4 @ Shouldnt fault | 91 | TUSER( strne) r3, [r0], #4 @ Shouldnt fault |
| 92 | ands ip, ip, #3 | 92 | ands ip, ip, #3 |
| 93 | beq .Lc2u_0fupi | 93 | beq .Lc2u_0fupi |
| 94 | .Lc2u_0nowords: teq ip, #0 | 94 | .Lc2u_0nowords: teq ip, #0 |
| 95 | beq .Lc2u_finished | 95 | beq .Lc2u_finished |
| 96 | .Lc2u_nowords: cmp ip, #2 | 96 | .Lc2u_nowords: cmp ip, #2 |
| 97 | ldrb r3, [r1], #1 | 97 | ldrb r3, [r1], #1 |
| 98 | USER( T(strb) r3, [r0], #1) @ May fault | 98 | USER( TUSER( strb) r3, [r0], #1) @ May fault |
| 99 | ldrgeb r3, [r1], #1 | 99 | ldrgeb r3, [r1], #1 |
| 100 | USER( T(strgeb) r3, [r0], #1) @ May fault | 100 | USER( TUSER( strgeb) r3, [r0], #1) @ May fault |
| 101 | ldrgtb r3, [r1], #1 | 101 | ldrgtb r3, [r1], #1 |
| 102 | USER( T(strgtb) r3, [r0], #1) @ May fault | 102 | USER( TUSER( strgtb) r3, [r0], #1) @ May fault |
| 103 | b .Lc2u_finished | 103 | b .Lc2u_finished |
| 104 | 104 | ||
| 105 | .Lc2u_not_enough: | 105 | .Lc2u_not_enough: |
| @@ -120,7 +120,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault | |||
| 120 | mov r3, r7, pull #8 | 120 | mov r3, r7, pull #8 |
| 121 | ldr r7, [r1], #4 | 121 | ldr r7, [r1], #4 |
| 122 | orr r3, r3, r7, push #24 | 122 | orr r3, r3, r7, push #24 |
| 123 | USER( T(str) r3, [r0], #4) @ May fault | 123 | USER( TUSER( str) r3, [r0], #4) @ May fault |
| 124 | mov ip, r0, lsl #32 - PAGE_SHIFT | 124 | mov ip, r0, lsl #32 - PAGE_SHIFT |
| 125 | rsb ip, ip, #0 | 125 | rsb ip, ip, #0 |
| 126 | movs ip, ip, lsr #32 - PAGE_SHIFT | 126 | movs ip, ip, lsr #32 - PAGE_SHIFT |
| @@ -155,18 +155,18 @@ USER( T(str) r3, [r0], #4) @ May fault | |||
| 155 | movne r3, r7, pull #8 | 155 | movne r3, r7, pull #8 |
| 156 | ldrne r7, [r1], #4 | 156 | ldrne r7, [r1], #4 |
| 157 | orrne r3, r3, r7, push #24 | 157 | orrne r3, r3, r7, push #24 |
| 158 | T(strne) r3, [r0], #4 @ Shouldnt fault | 158 | TUSER( strne) r3, [r0], #4 @ Shouldnt fault |
| 159 | ands ip, ip, #3 | 159 | ands ip, ip, #3 |
| 160 | beq .Lc2u_1fupi | 160 | beq .Lc2u_1fupi |
| 161 | .Lc2u_1nowords: mov r3, r7, get_byte_1 | 161 | .Lc2u_1nowords: mov r3, r7, get_byte_1 |
| 162 | teq ip, #0 | 162 | teq ip, #0 |
| 163 | beq .Lc2u_finished | 163 | beq .Lc2u_finished |
| 164 | cmp ip, #2 | 164 | cmp ip, #2 |
| 165 | USER( T(strb) r3, [r0], #1) @ May fault | 165 | USER( TUSER( strb) r3, [r0], #1) @ May fault |
| 166 | movge r3, r7, get_byte_2 | 166 | movge r3, r7, get_byte_2 |
| 167 | USER( T(strgeb) r3, [r0], #1) @ May fault | 167 | USER( TUSER( strgeb) r3, [r0], #1) @ May fault |
| 168 | movgt r3, r7, get_byte_3 | 168 | movgt r3, r7, get_byte_3 |
| 169 | USER( T(strgtb) r3, [r0], #1) @ May fault | 169 | USER( TUSER( strgtb) r3, [r0], #1) @ May fault |
| 170 | b .Lc2u_finished | 170 | b .Lc2u_finished |
| 171 | 171 | ||
| 172 | .Lc2u_2fupi: subs r2, r2, #4 | 172 | .Lc2u_2fupi: subs r2, r2, #4 |
| @@ -175,7 +175,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault | |||
| 175 | mov r3, r7, pull #16 | 175 | mov r3, r7, pull #16 |
| 176 | ldr r7, [r1], #4 | 176 | ldr r7, [r1], #4 |
| 177 | orr r3, r3, r7, push #16 | 177 | orr r3, r3, r7, push #16 |
| 178 | USER( T(str) r3, [r0], #4) @ May fault | 178 | USER( TUSER( str) r3, [r0], #4) @ May fault |
| 179 | mov ip, r0, lsl #32 - PAGE_SHIFT | 179 | mov ip, r0, lsl #32 - PAGE_SHIFT |
| 180 | rsb ip, ip, #0 | 180 | rsb ip, ip, #0 |
| 181 | movs ip, ip, lsr #32 - PAGE_SHIFT | 181 | movs ip, ip, lsr #32 - PAGE_SHIFT |
| @@ -210,18 +210,18 @@ USER( T(str) r3, [r0], #4) @ May fault | |||
| 210 | movne r3, r7, pull #16 | 210 | movne r3, r7, pull #16 |
| 211 | ldrne r7, [r1], #4 | 211 | ldrne r7, [r1], #4 |
| 212 | orrne r3, r3, r7, push #16 | 212 | orrne r3, r3, r7, push #16 |
| 213 | T(strne) r3, [r0], #4 @ Shouldnt fault | 213 | TUSER( strne) r3, [r0], #4 @ Shouldnt fault |
| 214 | ands ip, ip, #3 | 214 | ands ip, ip, #3 |
| 215 | beq .Lc2u_2fupi | 215 | beq .Lc2u_2fupi |
| 216 | .Lc2u_2nowords: mov r3, r7, get_byte_2 | 216 | .Lc2u_2nowords: mov r3, r7, get_byte_2 |
| 217 | teq ip, #0 | 217 | teq ip, #0 |
| 218 | beq .Lc2u_finished | 218 | beq .Lc2u_finished |
| 219 | cmp ip, #2 | 219 | cmp ip, #2 |
| 220 | USER( T(strb) r3, [r0], #1) @ May fault | 220 | USER( TUSER( strb) r3, [r0], #1) @ May fault |
| 221 | movge r3, r7, get_byte_3 | 221 | movge r3, r7, get_byte_3 |
| 222 | USER( T(strgeb) r3, [r0], #1) @ May fault | 222 | USER( TUSER( strgeb) r3, [r0], #1) @ May fault |
| 223 | ldrgtb r3, [r1], #0 | 223 | ldrgtb r3, [r1], #0 |
| 224 | USER( T(strgtb) r3, [r0], #1) @ May fault | 224 | USER( TUSER( strgtb) r3, [r0], #1) @ May fault |
| 225 | b .Lc2u_finished | 225 | b .Lc2u_finished |
| 226 | 226 | ||
| 227 | .Lc2u_3fupi: subs r2, r2, #4 | 227 | .Lc2u_3fupi: subs r2, r2, #4 |
| @@ -230,7 +230,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault | |||
| 230 | mov r3, r7, pull #24 | 230 | mov r3, r7, pull #24 |
| 231 | ldr r7, [r1], #4 | 231 | ldr r7, [r1], #4 |
| 232 | orr r3, r3, r7, push #8 | 232 | orr r3, r3, r7, push #8 |
| 233 | USER( T(str) r3, [r0], #4) @ May fault | 233 | USER( TUSER( str) r3, [r0], #4) @ May fault |
| 234 | mov ip, r0, lsl #32 - PAGE_SHIFT | 234 | mov ip, r0, lsl #32 - PAGE_SHIFT |
| 235 | rsb ip, ip, #0 | 235 | rsb ip, ip, #0 |
| 236 | movs ip, ip, lsr #32 - PAGE_SHIFT | 236 | movs ip, ip, lsr #32 - PAGE_SHIFT |
| @@ -265,18 +265,18 @@ USER( T(str) r3, [r0], #4) @ May fault | |||
| 265 | movne r3, r7, pull #24 | 265 | movne r3, r7, pull #24 |
| 266 | ldrne r7, [r1], #4 | 266 | ldrne r7, [r1], #4 |
| 267 | orrne r3, r3, r7, push #8 | 267 | orrne r3, r3, r7, push #8 |
| 268 | T(strne) r3, [r0], #4 @ Shouldnt fault | 268 | TUSER( strne) r3, [r0], #4 @ Shouldnt fault |
| 269 | ands ip, ip, #3 | 269 | ands ip, ip, #3 |
| 270 | beq .Lc2u_3fupi | 270 | beq .Lc2u_3fupi |
| 271 | .Lc2u_3nowords: mov r3, r7, get_byte_3 | 271 | .Lc2u_3nowords: mov r3, r7, get_byte_3 |
| 272 | teq ip, #0 | 272 | teq ip, #0 |
| 273 | beq .Lc2u_finished | 273 | beq .Lc2u_finished |
| 274 | cmp ip, #2 | 274 | cmp ip, #2 |
| 275 | USER( T(strb) r3, [r0], #1) @ May fault | 275 | USER( TUSER( strb) r3, [r0], #1) @ May fault |
| 276 | ldrgeb r3, [r1], #1 | 276 | ldrgeb r3, [r1], #1 |
| 277 | USER( T(strgeb) r3, [r0], #1) @ May fault | 277 | USER( TUSER( strgeb) r3, [r0], #1) @ May fault |
| 278 | ldrgtb r3, [r1], #0 | 278 | ldrgtb r3, [r1], #0 |
| 279 | USER( T(strgtb) r3, [r0], #1) @ May fault | 279 | USER( TUSER( strgtb) r3, [r0], #1) @ May fault |
| 280 | b .Lc2u_finished | 280 | b .Lc2u_finished |
| 281 | ENDPROC(__copy_to_user) | 281 | ENDPROC(__copy_to_user) |
| 282 | 282 | ||
| @@ -295,11 +295,11 @@ ENDPROC(__copy_to_user) | |||
| 295 | .Lcfu_dest_not_aligned: | 295 | .Lcfu_dest_not_aligned: |
| 296 | rsb ip, ip, #4 | 296 | rsb ip, ip, #4 |
| 297 | cmp ip, #2 | 297 | cmp ip, #2 |
| 298 | USER( T(ldrb) r3, [r1], #1) @ May fault | 298 | USER( TUSER( ldrb) r3, [r1], #1) @ May fault |
| 299 | strb r3, [r0], #1 | 299 | strb r3, [r0], #1 |
| 300 | USER( T(ldrgeb) r3, [r1], #1) @ May fault | 300 | USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault |
| 301 | strgeb r3, [r0], #1 | 301 | strgeb r3, [r0], #1 |
| 302 | USER( T(ldrgtb) r3, [r1], #1) @ May fault | 302 | USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault |
| 303 | strgtb r3, [r0], #1 | 303 | strgtb r3, [r0], #1 |
| 304 | sub r2, r2, ip | 304 | sub r2, r2, ip |
| 305 | b .Lcfu_dest_aligned | 305 | b .Lcfu_dest_aligned |
| @@ -322,7 +322,7 @@ ENTRY(__copy_from_user) | |||
| 322 | .Lcfu_0fupi: subs r2, r2, #4 | 322 | .Lcfu_0fupi: subs r2, r2, #4 |
| 323 | addmi ip, r2, #4 | 323 | addmi ip, r2, #4 |
| 324 | bmi .Lcfu_0nowords | 324 | bmi .Lcfu_0nowords |
| 325 | USER( T(ldr) r3, [r1], #4) | 325 | USER( TUSER( ldr) r3, [r1], #4) |
| 326 | str r3, [r0], #4 | 326 | str r3, [r0], #4 |
| 327 | mov ip, r1, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction | 327 | mov ip, r1, lsl #32 - PAGE_SHIFT @ On each page, use a ld/st??t instruction |
| 328 | rsb ip, ip, #0 | 328 | rsb ip, ip, #0 |
| @@ -351,18 +351,18 @@ USER( T(ldr) r3, [r1], #4) | |||
| 351 | ldmneia r1!, {r3 - r4} @ Shouldnt fault | 351 | ldmneia r1!, {r3 - r4} @ Shouldnt fault |
| 352 | stmneia r0!, {r3 - r4} | 352 | stmneia r0!, {r3 - r4} |
| 353 | tst ip, #4 | 353 | tst ip, #4 |
| 354 | T(ldrne) r3, [r1], #4 @ Shouldnt fault | 354 | TUSER( ldrne) r3, [r1], #4 @ Shouldnt fault |
| 355 | strne r3, [r0], #4 | 355 | strne r3, [r0], #4 |
| 356 | ands ip, ip, #3 | 356 | ands ip, ip, #3 |
| 357 | beq .Lcfu_0fupi | 357 | beq .Lcfu_0fupi |
| 358 | .Lcfu_0nowords: teq ip, #0 | 358 | .Lcfu_0nowords: teq ip, #0 |
| 359 | beq .Lcfu_finished | 359 | beq .Lcfu_finished |
| 360 | .Lcfu_nowords: cmp ip, #2 | 360 | .Lcfu_nowords: cmp ip, #2 |
| 361 | USER( T(ldrb) r3, [r1], #1) @ May fault | 361 | USER( TUSER( ldrb) r3, [r1], #1) @ May fault |
| 362 | strb r3, [r0], #1 | 362 | strb r3, [r0], #1 |
| 363 | USER( T(ldrgeb) r3, [r1], #1) @ May fault | 363 | USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault |
| 364 | strgeb r3, [r0], #1 | 364 | strgeb r3, [r0], #1 |
| 365 | USER( T(ldrgtb) r3, [r1], #1) @ May fault | 365 | USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault |
| 366 | strgtb r3, [r0], #1 | 366 | strgtb r3, [r0], #1 |
| 367 | b .Lcfu_finished | 367 | b .Lcfu_finished |
| 368 | 368 | ||
| @@ -375,7 +375,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault | |||
| 375 | 375 | ||
| 376 | .Lcfu_src_not_aligned: | 376 | .Lcfu_src_not_aligned: |
| 377 | bic r1, r1, #3 | 377 | bic r1, r1, #3 |
| 378 | USER( T(ldr) r7, [r1], #4) @ May fault | 378 | USER( TUSER( ldr) r7, [r1], #4) @ May fault |
| 379 | cmp ip, #2 | 379 | cmp ip, #2 |
| 380 | bgt .Lcfu_3fupi | 380 | bgt .Lcfu_3fupi |
| 381 | beq .Lcfu_2fupi | 381 | beq .Lcfu_2fupi |
| @@ -383,7 +383,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault | |||
| 383 | addmi ip, r2, #4 | 383 | addmi ip, r2, #4 |
| 384 | bmi .Lcfu_1nowords | 384 | bmi .Lcfu_1nowords |
| 385 | mov r3, r7, pull #8 | 385 | mov r3, r7, pull #8 |
| 386 | USER( T(ldr) r7, [r1], #4) @ May fault | 386 | USER( TUSER( ldr) r7, [r1], #4) @ May fault |
| 387 | orr r3, r3, r7, push #24 | 387 | orr r3, r3, r7, push #24 |
| 388 | str r3, [r0], #4 | 388 | str r3, [r0], #4 |
| 389 | mov ip, r1, lsl #32 - PAGE_SHIFT | 389 | mov ip, r1, lsl #32 - PAGE_SHIFT |
| @@ -418,7 +418,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault | |||
| 418 | stmneia r0!, {r3 - r4} | 418 | stmneia r0!, {r3 - r4} |
| 419 | tst ip, #4 | 419 | tst ip, #4 |
| 420 | movne r3, r7, pull #8 | 420 | movne r3, r7, pull #8 |
| 421 | USER( T(ldrne) r7, [r1], #4) @ May fault | 421 | USER( TUSER( ldrne) r7, [r1], #4) @ May fault |
| 422 | orrne r3, r3, r7, push #24 | 422 | orrne r3, r3, r7, push #24 |
| 423 | strne r3, [r0], #4 | 423 | strne r3, [r0], #4 |
| 424 | ands ip, ip, #3 | 424 | ands ip, ip, #3 |
| @@ -438,7 +438,7 @@ USER( T(ldrne) r7, [r1], #4) @ May fault | |||
| 438 | addmi ip, r2, #4 | 438 | addmi ip, r2, #4 |
| 439 | bmi .Lcfu_2nowords | 439 | bmi .Lcfu_2nowords |
| 440 | mov r3, r7, pull #16 | 440 | mov r3, r7, pull #16 |
| 441 | USER( T(ldr) r7, [r1], #4) @ May fault | 441 | USER( TUSER( ldr) r7, [r1], #4) @ May fault |
| 442 | orr r3, r3, r7, push #16 | 442 | orr r3, r3, r7, push #16 |
| 443 | str r3, [r0], #4 | 443 | str r3, [r0], #4 |
| 444 | mov ip, r1, lsl #32 - PAGE_SHIFT | 444 | mov ip, r1, lsl #32 - PAGE_SHIFT |
| @@ -474,7 +474,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault | |||
| 474 | stmneia r0!, {r3 - r4} | 474 | stmneia r0!, {r3 - r4} |
| 475 | tst ip, #4 | 475 | tst ip, #4 |
| 476 | movne r3, r7, pull #16 | 476 | movne r3, r7, pull #16 |
| 477 | USER( T(ldrne) r7, [r1], #4) @ May fault | 477 | USER( TUSER( ldrne) r7, [r1], #4) @ May fault |
| 478 | orrne r3, r3, r7, push #16 | 478 | orrne r3, r3, r7, push #16 |
| 479 | strne r3, [r0], #4 | 479 | strne r3, [r0], #4 |
| 480 | ands ip, ip, #3 | 480 | ands ip, ip, #3 |
| @@ -486,7 +486,7 @@ USER( T(ldrne) r7, [r1], #4) @ May fault | |||
| 486 | strb r3, [r0], #1 | 486 | strb r3, [r0], #1 |
| 487 | movge r3, r7, get_byte_3 | 487 | movge r3, r7, get_byte_3 |
| 488 | strgeb r3, [r0], #1 | 488 | strgeb r3, [r0], #1 |
| 489 | USER( T(ldrgtb) r3, [r1], #0) @ May fault | 489 | USER( TUSER( ldrgtb) r3, [r1], #0) @ May fault |
| 490 | strgtb r3, [r0], #1 | 490 | strgtb r3, [r0], #1 |
| 491 | b .Lcfu_finished | 491 | b .Lcfu_finished |
| 492 | 492 | ||
| @@ -494,7 +494,7 @@ USER( T(ldrgtb) r3, [r1], #0) @ May fault | |||
| 494 | addmi ip, r2, #4 | 494 | addmi ip, r2, #4 |
| 495 | bmi .Lcfu_3nowords | 495 | bmi .Lcfu_3nowords |
| 496 | mov r3, r7, pull #24 | 496 | mov r3, r7, pull #24 |
| 497 | USER( T(ldr) r7, [r1], #4) @ May fault | 497 | USER( TUSER( ldr) r7, [r1], #4) @ May fault |
| 498 | orr r3, r3, r7, push #8 | 498 | orr r3, r3, r7, push #8 |
| 499 | str r3, [r0], #4 | 499 | str r3, [r0], #4 |
| 500 | mov ip, r1, lsl #32 - PAGE_SHIFT | 500 | mov ip, r1, lsl #32 - PAGE_SHIFT |
| @@ -529,7 +529,7 @@ USER( T(ldr) r7, [r1], #4) @ May fault | |||
| 529 | stmneia r0!, {r3 - r4} | 529 | stmneia r0!, {r3 - r4} |
| 530 | tst ip, #4 | 530 | tst ip, #4 |
| 531 | movne r3, r7, pull #24 | 531 | movne r3, r7, pull #24 |
| 532 | USER( T(ldrne) r7, [r1], #4) @ May fault | 532 | USER( TUSER( ldrne) r7, [r1], #4) @ May fault |
| 533 | orrne r3, r3, r7, push #8 | 533 | orrne r3, r3, r7, push #8 |
| 534 | strne r3, [r0], #4 | 534 | strne r3, [r0], #4 |
| 535 | ands ip, ip, #3 | 535 | ands ip, ip, #3 |
| @@ -539,9 +539,9 @@ USER( T(ldrne) r7, [r1], #4) @ May fault | |||
| 539 | beq .Lcfu_finished | 539 | beq .Lcfu_finished |
| 540 | cmp ip, #2 | 540 | cmp ip, #2 |
| 541 | strb r3, [r0], #1 | 541 | strb r3, [r0], #1 |
| 542 | USER( T(ldrgeb) r3, [r1], #1) @ May fault | 542 | USER( TUSER( ldrgeb) r3, [r1], #1) @ May fault |
| 543 | strgeb r3, [r0], #1 | 543 | strgeb r3, [r0], #1 |
| 544 | USER( T(ldrgtb) r3, [r1], #1) @ May fault | 544 | USER( TUSER( ldrgtb) r3, [r1], #1) @ May fault |
| 545 | strgtb r3, [r0], #1 | 545 | strgtb r3, [r0], #1 |
| 546 | b .Lcfu_finished | 546 | b .Lcfu_finished |
| 547 | ENDPROC(__copy_from_user) | 547 | ENDPROC(__copy_from_user) |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 4f991f295284..71feb00a1e99 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -18,6 +18,12 @@ config HAVE_AT91_USART4 | |||
| 18 | config HAVE_AT91_USART5 | 18 | config HAVE_AT91_USART5 |
| 19 | bool | 19 | bool |
| 20 | 20 | ||
| 21 | config AT91_SAM9_ALT_RESET | ||
| 22 | bool | ||
| 23 | |||
| 24 | config AT91_SAM9G45_RESET | ||
| 25 | bool | ||
| 26 | |||
| 21 | menu "Atmel AT91 System-on-Chip" | 27 | menu "Atmel AT91 System-on-Chip" |
| 22 | 28 | ||
| 23 | choice | 29 | choice |
| @@ -39,6 +45,7 @@ config ARCH_AT91SAM9260 | |||
| 39 | select HAVE_AT91_USART4 | 45 | select HAVE_AT91_USART4 |
| 40 | select HAVE_AT91_USART5 | 46 | select HAVE_AT91_USART5 |
| 41 | select HAVE_NET_MACB | 47 | select HAVE_NET_MACB |
| 48 | select AT91_SAM9_ALT_RESET | ||
| 42 | 49 | ||
| 43 | config ARCH_AT91SAM9261 | 50 | config ARCH_AT91SAM9261 |
| 44 | bool "AT91SAM9261" | 51 | bool "AT91SAM9261" |
| @@ -46,6 +53,7 @@ config ARCH_AT91SAM9261 | |||
| 46 | select GENERIC_CLOCKEVENTS | 53 | select GENERIC_CLOCKEVENTS |
| 47 | select HAVE_FB_ATMEL | 54 | select HAVE_FB_ATMEL |
| 48 | select HAVE_AT91_DBGU0 | 55 | select HAVE_AT91_DBGU0 |
| 56 | select AT91_SAM9_ALT_RESET | ||
| 49 | 57 | ||
| 50 | config ARCH_AT91SAM9G10 | 58 | config ARCH_AT91SAM9G10 |
| 51 | bool "AT91SAM9G10" | 59 | bool "AT91SAM9G10" |
| @@ -53,6 +61,7 @@ config ARCH_AT91SAM9G10 | |||
| 53 | select GENERIC_CLOCKEVENTS | 61 | select GENERIC_CLOCKEVENTS |
| 54 | select HAVE_AT91_DBGU0 | 62 | select HAVE_AT91_DBGU0 |
| 55 | select HAVE_FB_ATMEL | 63 | select HAVE_FB_ATMEL |
| 64 | select AT91_SAM9_ALT_RESET | ||
| 56 | 65 | ||
| 57 | config ARCH_AT91SAM9263 | 66 | config ARCH_AT91SAM9263 |
| 58 | bool "AT91SAM9263" | 67 | bool "AT91SAM9263" |
| @@ -61,6 +70,7 @@ config ARCH_AT91SAM9263 | |||
| 61 | select HAVE_FB_ATMEL | 70 | select HAVE_FB_ATMEL |
| 62 | select HAVE_NET_MACB | 71 | select HAVE_NET_MACB |
| 63 | select HAVE_AT91_DBGU1 | 72 | select HAVE_AT91_DBGU1 |
| 73 | select AT91_SAM9_ALT_RESET | ||
| 64 | 74 | ||
| 65 | config ARCH_AT91SAM9RL | 75 | config ARCH_AT91SAM9RL |
| 66 | bool "AT91SAM9RL" | 76 | bool "AT91SAM9RL" |
| @@ -69,6 +79,7 @@ config ARCH_AT91SAM9RL | |||
| 69 | select HAVE_AT91_USART3 | 79 | select HAVE_AT91_USART3 |
| 70 | select HAVE_FB_ATMEL | 80 | select HAVE_FB_ATMEL |
| 71 | select HAVE_AT91_DBGU0 | 81 | select HAVE_AT91_DBGU0 |
| 82 | select AT91_SAM9_ALT_RESET | ||
| 72 | 83 | ||
| 73 | config ARCH_AT91SAM9G20 | 84 | config ARCH_AT91SAM9G20 |
| 74 | bool "AT91SAM9G20" | 85 | bool "AT91SAM9G20" |
| @@ -79,6 +90,7 @@ config ARCH_AT91SAM9G20 | |||
| 79 | select HAVE_AT91_USART4 | 90 | select HAVE_AT91_USART4 |
| 80 | select HAVE_AT91_USART5 | 91 | select HAVE_AT91_USART5 |
| 81 | select HAVE_NET_MACB | 92 | select HAVE_NET_MACB |
| 93 | select AT91_SAM9_ALT_RESET | ||
| 82 | 94 | ||
| 83 | config ARCH_AT91SAM9G45 | 95 | config ARCH_AT91SAM9G45 |
| 84 | bool "AT91SAM9G45" | 96 | bool "AT91SAM9G45" |
| @@ -88,6 +100,7 @@ config ARCH_AT91SAM9G45 | |||
| 88 | select HAVE_FB_ATMEL | 100 | select HAVE_FB_ATMEL |
| 89 | select HAVE_NET_MACB | 101 | select HAVE_NET_MACB |
| 90 | select HAVE_AT91_DBGU1 | 102 | select HAVE_AT91_DBGU1 |
| 103 | select AT91_SAM9G45_RESET | ||
| 91 | 104 | ||
| 92 | config ARCH_AT91CAP9 | 105 | config ARCH_AT91CAP9 |
| 93 | bool "AT91CAP9" | 106 | bool "AT91CAP9" |
| @@ -96,6 +109,7 @@ config ARCH_AT91CAP9 | |||
| 96 | select HAVE_FB_ATMEL | 109 | select HAVE_FB_ATMEL |
| 97 | select HAVE_NET_MACB | 110 | select HAVE_NET_MACB |
| 98 | select HAVE_AT91_DBGU1 | 111 | select HAVE_AT91_DBGU1 |
| 112 | select AT91_SAM9G45_RESET | ||
| 99 | 113 | ||
| 100 | config ARCH_AT91X40 | 114 | config ARCH_AT91X40 |
| 101 | bool "AT91x40" | 115 | bool "AT91x40" |
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 242174f9f355..705e1fbded39 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
| @@ -8,15 +8,17 @@ obj-n := | |||
| 8 | obj- := | 8 | obj- := |
| 9 | 9 | ||
| 10 | obj-$(CONFIG_AT91_PMC_UNIT) += clock.o | 10 | obj-$(CONFIG_AT91_PMC_UNIT) += clock.o |
| 11 | obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o | ||
| 12 | obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o | ||
| 11 | 13 | ||
| 12 | # CPU-specific support | 14 | # CPU-specific support |
| 13 | obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o | 15 | obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o |
| 14 | obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o | 16 | obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o |
| 15 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o | 17 | obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o |
| 16 | obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o at91sam9_alt_reset.o | 18 | obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o |
| 17 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o at91sam9_alt_reset.o | 19 | obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o |
| 18 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o at91sam9_alt_reset.o | 20 | obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o |
| 19 | obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o at91sam9_alt_reset.o | 21 | obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o |
| 20 | obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o | 22 | obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o |
| 21 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o | 23 | obj-$(CONFIG_ARCH_AT91CAP9) += at91cap9.o at91sam926x_time.o at91cap9_devices.o sam9_smc.o |
| 22 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o | 24 | obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o |
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index edb879ac04c8..a42edc25a87e 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <mach/cpu.h> | 21 | #include <mach/cpu.h> |
| 22 | #include <mach/at91cap9.h> | 22 | #include <mach/at91cap9.h> |
| 23 | #include <mach/at91_pmc.h> | 23 | #include <mach/at91_pmc.h> |
| 24 | #include <mach/at91_rstc.h> | ||
| 25 | 24 | ||
| 26 | #include "soc.h" | 25 | #include "soc.h" |
| 27 | #include "generic.h" | 26 | #include "generic.h" |
| @@ -314,11 +313,6 @@ static struct at91_gpio_bank at91cap9_gpio[] __initdata = { | |||
| 314 | } | 313 | } |
| 315 | }; | 314 | }; |
| 316 | 315 | ||
| 317 | static void at91cap9_restart(char mode, const char *cmd) | ||
| 318 | { | ||
| 319 | at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); | ||
| 320 | } | ||
| 321 | |||
| 322 | /* -------------------------------------------------------------------- | 316 | /* -------------------------------------------------------------------- |
| 323 | * AT91CAP9 processor initialization | 317 | * AT91CAP9 processor initialization |
| 324 | * -------------------------------------------------------------------- */ | 318 | * -------------------------------------------------------------------- */ |
| @@ -331,13 +325,14 @@ static void __init at91cap9_map_io(void) | |||
| 331 | static void __init at91cap9_ioremap_registers(void) | 325 | static void __init at91cap9_ioremap_registers(void) |
| 332 | { | 326 | { |
| 333 | at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC); | 327 | at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC); |
| 328 | at91_ioremap_rstc(AT91CAP9_BASE_RSTC); | ||
| 334 | at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT); | 329 | at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT); |
| 335 | at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC); | 330 | at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC); |
| 336 | } | 331 | } |
| 337 | 332 | ||
| 338 | static void __init at91cap9_initialize(void) | 333 | static void __init at91cap9_initialize(void) |
| 339 | { | 334 | { |
| 340 | arm_pm_restart = at91cap9_restart; | 335 | arm_pm_restart = at91sam9g45_restart; |
| 341 | at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); | 336 | at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1); |
| 342 | 337 | ||
| 343 | /* Register GPIO subsystem */ | 338 | /* Register GPIO subsystem */ |
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 5e46e4a96430..d4036ba43612 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
| @@ -323,6 +323,7 @@ static void __init at91sam9260_map_io(void) | |||
| 323 | static void __init at91sam9260_ioremap_registers(void) | 323 | static void __init at91sam9260_ioremap_registers(void) |
| 324 | { | 324 | { |
| 325 | at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC); | 325 | at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC); |
| 326 | at91_ioremap_rstc(AT91SAM9260_BASE_RSTC); | ||
| 326 | at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT); | 327 | at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT); |
| 327 | at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC); | 328 | at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC); |
| 328 | } | 329 | } |
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index b85b9ea60170..023c2ff138df 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c | |||
| @@ -281,6 +281,7 @@ static void __init at91sam9261_map_io(void) | |||
| 281 | static void __init at91sam9261_ioremap_registers(void) | 281 | static void __init at91sam9261_ioremap_registers(void) |
| 282 | { | 282 | { |
| 283 | at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC); | 283 | at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC); |
| 284 | at91_ioremap_rstc(AT91SAM9261_BASE_RSTC); | ||
| 284 | at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT); | 285 | at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT); |
| 285 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); | 286 | at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC); |
| 286 | } | 287 | } |
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index 79e3669b1117..75e876c258af 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c | |||
| @@ -301,6 +301,7 @@ static void __init at91sam9263_map_io(void) | |||
| 301 | static void __init at91sam9263_ioremap_registers(void) | 301 | static void __init at91sam9263_ioremap_registers(void) |
| 302 | { | 302 | { |
| 303 | at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC); | 303 | at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC); |
| 304 | at91_ioremap_rstc(AT91SAM9263_BASE_RSTC); | ||
| 304 | at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT); | 305 | at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT); |
| 305 | at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0); | 306 | at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0); |
| 306 | at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); | 307 | at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1); |
diff --git a/arch/arm/mach-at91/at91sam9_alt_reset.S b/arch/arm/mach-at91/at91sam9_alt_reset.S index d3f931c5942e..518e42377171 100644 --- a/arch/arm/mach-at91/at91sam9_alt_reset.S +++ b/arch/arm/mach-at91/at91sam9_alt_reset.S | |||
| @@ -23,7 +23,8 @@ | |||
| 23 | .globl at91sam9_alt_restart | 23 | .globl at91sam9_alt_restart |
| 24 | 24 | ||
| 25 | at91sam9_alt_restart: ldr r0, .at91_va_base_sdramc @ preload constants | 25 | at91sam9_alt_restart: ldr r0, .at91_va_base_sdramc @ preload constants |
| 26 | ldr r1, .at91_va_base_rstc_cr | 26 | ldr r1, =at91_rstc_base |
| 27 | ldr r1, [r1] | ||
| 27 | 28 | ||
| 28 | mov r2, #1 | 29 | mov r2, #1 |
| 29 | mov r3, #AT91_SDRAMC_LPCB_POWER_DOWN | 30 | mov r3, #AT91_SDRAMC_LPCB_POWER_DOWN |
| @@ -33,11 +34,9 @@ at91sam9_alt_restart: ldr r0, .at91_va_base_sdramc @ preload constants | |||
| 33 | 34 | ||
| 34 | str r2, [r0, #AT91_SDRAMC_TR] @ disable SDRAM access | 35 | str r2, [r0, #AT91_SDRAMC_TR] @ disable SDRAM access |
| 35 | str r3, [r0, #AT91_SDRAMC_LPR] @ power down SDRAM | 36 | str r3, [r0, #AT91_SDRAMC_LPR] @ power down SDRAM |
| 36 | str r4, [r1] @ reset processor | 37 | str r4, [r1, #AT91_RSTC_CR] @ reset processor |
| 37 | 38 | ||
| 38 | b . | 39 | b . |
| 39 | 40 | ||
| 40 | .at91_va_base_sdramc: | 41 | .at91_va_base_sdramc: |
| 41 | .word AT91_VA_BASE_SYS + AT91_SDRAMC0 | 42 | .word AT91_VA_BASE_SYS + AT91_SDRAMC0 |
| 42 | .at91_va_base_rstc_cr: | ||
| 43 | .word AT91_VA_BASE_SYS + AT91_RSTC_CR | ||
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 7032dd32cdf0..1cb6a96b1c1e 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
| 19 | #include <mach/at91sam9g45.h> | 19 | #include <mach/at91sam9g45.h> |
| 20 | #include <mach/at91_pmc.h> | 20 | #include <mach/at91_pmc.h> |
| 21 | #include <mach/at91_rstc.h> | ||
| 22 | #include <mach/cpu.h> | 21 | #include <mach/cpu.h> |
| 23 | 22 | ||
| 24 | #include "soc.h" | 23 | #include "soc.h" |
| @@ -318,11 +317,6 @@ static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = { | |||
| 318 | } | 317 | } |
| 319 | }; | 318 | }; |
| 320 | 319 | ||
| 321 | static void at91sam9g45_restart(char mode, const char *cmd) | ||
| 322 | { | ||
| 323 | at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST); | ||
| 324 | } | ||
| 325 | |||
| 326 | /* -------------------------------------------------------------------- | 320 | /* -------------------------------------------------------------------- |
| 327 | * AT91SAM9G45 processor initialization | 321 | * AT91SAM9G45 processor initialization |
| 328 | * -------------------------------------------------------------------- */ | 322 | * -------------------------------------------------------------------- */ |
| @@ -336,6 +330,7 @@ static void __init at91sam9g45_map_io(void) | |||
| 336 | static void __init at91sam9g45_ioremap_registers(void) | 330 | static void __init at91sam9g45_ioremap_registers(void) |
| 337 | { | 331 | { |
| 338 | at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC); | 332 | at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC); |
| 333 | at91_ioremap_rstc(AT91SAM9G45_BASE_RSTC); | ||
| 339 | at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT); | 334 | at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT); |
| 340 | at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC); | 335 | at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC); |
| 341 | } | 336 | } |
diff --git a/arch/arm/mach-at91/at91sam9g45_reset.S b/arch/arm/mach-at91/at91sam9g45_reset.S new file mode 100644 index 000000000000..0468be10980b --- /dev/null +++ b/arch/arm/mach-at91/at91sam9g45_reset.S | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | /* | ||
| 2 | * reset AT91SAM9G45 as per errata | ||
| 3 | * | ||
| 4 | * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcosoft.com> | ||
| 5 | * | ||
| 6 | * unless the SDRAM is cleanly shutdown before we hit the | ||
| 7 | * reset register it can be left driving the data bus and | ||
| 8 | * killing the chance of a subsequent boot from NAND | ||
| 9 | * | ||
| 10 | * GPLv2 Only | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <linux/linkage.h> | ||
| 14 | #include <mach/hardware.h> | ||
| 15 | #include <mach/at91sam9_ddrsdr.h> | ||
| 16 | #include <mach/at91_rstc.h> | ||
| 17 | |||
| 18 | .arm | ||
| 19 | |||
| 20 | .globl at91sam9g45_restart | ||
| 21 | |||
| 22 | at91sam9g45_restart: | ||
| 23 | ldr r0, .at91_va_base_sdramc0 @ preload constants | ||
| 24 | ldr r1, =at91_rstc_base | ||
| 25 | ldr r1, [r1] | ||
| 26 | |||
| 27 | mov r2, #1 | ||
| 28 | mov r3, #AT91_DDRSDRC_LPCB_POWER_DOWN | ||
| 29 | ldr r4, =AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST | ||
| 30 | |||
| 31 | .balign 32 @ align to cache line | ||
| 32 | |||
| 33 | str r2, [r0, #AT91_DDRSDRC_RTR] @ disable DDR0 access | ||
| 34 | str r3, [r0, #AT91_DDRSDRC_LPR] @ power down DDR0 | ||
| 35 | str r4, [r1, #AT91_RSTC_CR] @ reset processor | ||
| 36 | |||
| 37 | b . | ||
| 38 | |||
| 39 | .at91_va_base_sdramc0: | ||
| 40 | .word AT91_VA_BASE_SYS + AT91_DDRSDRC0 | ||
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index d6bcb1da11df..d2c91a841cb8 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c | |||
| @@ -286,6 +286,7 @@ static void __init at91sam9rl_map_io(void) | |||
| 286 | static void __init at91sam9rl_ioremap_registers(void) | 286 | static void __init at91sam9rl_ioremap_registers(void) |
| 287 | { | 287 | { |
| 288 | at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC); | 288 | at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC); |
| 289 | at91_ioremap_rstc(AT91SAM9RL_BASE_RSTC); | ||
| 289 | at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT); | 290 | at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT); |
| 290 | at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC); | 291 | at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC); |
| 291 | } | 292 | } |
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 4866b8180d66..594133451c0c 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
| @@ -58,7 +58,9 @@ extern void at91_irq_suspend(void); | |||
| 58 | extern void at91_irq_resume(void); | 58 | extern void at91_irq_resume(void); |
| 59 | 59 | ||
| 60 | /* reset */ | 60 | /* reset */ |
| 61 | extern void at91_ioremap_rstc(u32 base_addr); | ||
| 61 | extern void at91sam9_alt_restart(char, const char *); | 62 | extern void at91sam9_alt_restart(char, const char *); |
| 63 | extern void at91sam9g45_restart(char, const char *); | ||
| 62 | 64 | ||
| 63 | /* shutdown */ | 65 | /* shutdown */ |
| 64 | extern void at91_ioremap_shdwc(u32 base_addr); | 66 | extern void at91_ioremap_shdwc(u32 base_addr); |
diff --git a/arch/arm/mach-at91/include/mach/at91_rstc.h b/arch/arm/mach-at91/include/mach/at91_rstc.h index cbd2bf052c1f..875fa336800b 100644 --- a/arch/arm/mach-at91/include/mach/at91_rstc.h +++ b/arch/arm/mach-at91/include/mach/at91_rstc.h | |||
| @@ -16,13 +16,25 @@ | |||
| 16 | #ifndef AT91_RSTC_H | 16 | #ifndef AT91_RSTC_H |
| 17 | #define AT91_RSTC_H | 17 | #define AT91_RSTC_H |
| 18 | 18 | ||
| 19 | #define AT91_RSTC_CR (AT91_RSTC + 0x00) /* Reset Controller Control Register */ | 19 | #ifndef __ASSEMBLY__ |
| 20 | extern void __iomem *at91_rstc_base; | ||
| 21 | |||
| 22 | #define at91_rstc_read(field) \ | ||
| 23 | __raw_readl(at91_rstc_base + field) | ||
| 24 | |||
| 25 | #define at91_rstc_write(field, value) \ | ||
| 26 | __raw_writel(value, at91_rstc_base + field); | ||
| 27 | #else | ||
| 28 | .extern at91_rstc_base | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #define AT91_RSTC_CR 0x00 /* Reset Controller Control Register */ | ||
| 20 | #define AT91_RSTC_PROCRST (1 << 0) /* Processor Reset */ | 32 | #define AT91_RSTC_PROCRST (1 << 0) /* Processor Reset */ |
| 21 | #define AT91_RSTC_PERRST (1 << 2) /* Peripheral Reset */ | 33 | #define AT91_RSTC_PERRST (1 << 2) /* Peripheral Reset */ |
| 22 | #define AT91_RSTC_EXTRST (1 << 3) /* External Reset */ | 34 | #define AT91_RSTC_EXTRST (1 << 3) /* External Reset */ |
| 23 | #define AT91_RSTC_KEY (0xa5 << 24) /* KEY Password */ | 35 | #define AT91_RSTC_KEY (0xa5 << 24) /* KEY Password */ |
| 24 | 36 | ||
| 25 | #define AT91_RSTC_SR (AT91_RSTC + 0x04) /* Reset Controller Status Register */ | 37 | #define AT91_RSTC_SR 0x04 /* Reset Controller Status Register */ |
| 26 | #define AT91_RSTC_URSTS (1 << 0) /* User Reset Status */ | 38 | #define AT91_RSTC_URSTS (1 << 0) /* User Reset Status */ |
| 27 | #define AT91_RSTC_RSTTYP (7 << 8) /* Reset Type */ | 39 | #define AT91_RSTC_RSTTYP (7 << 8) /* Reset Type */ |
| 28 | #define AT91_RSTC_RSTTYP_GENERAL (0 << 8) | 40 | #define AT91_RSTC_RSTTYP_GENERAL (0 << 8) |
| @@ -33,7 +45,7 @@ | |||
| 33 | #define AT91_RSTC_NRSTL (1 << 16) /* NRST Pin Level */ | 45 | #define AT91_RSTC_NRSTL (1 << 16) /* NRST Pin Level */ |
| 34 | #define AT91_RSTC_SRCMP (1 << 17) /* Software Reset Command in Progress */ | 46 | #define AT91_RSTC_SRCMP (1 << 17) /* Software Reset Command in Progress */ |
| 35 | 47 | ||
| 36 | #define AT91_RSTC_MR (AT91_RSTC + 0x08) /* Reset Controller Mode Register */ | 48 | #define AT91_RSTC_MR 0x08 /* Reset Controller Mode Register */ |
| 37 | #define AT91_RSTC_URSTEN (1 << 0) /* User Reset Enable */ | 49 | #define AT91_RSTC_URSTEN (1 << 0) /* User Reset Enable */ |
| 38 | #define AT91_RSTC_URSTIEN (1 << 4) /* User Reset Interrupt Enable */ | 50 | #define AT91_RSTC_URSTIEN (1 << 4) /* User Reset Interrupt Enable */ |
| 39 | #define AT91_RSTC_ERSTL (0xf << 8) /* External Reset Length */ | 51 | #define AT91_RSTC_ERSTL (0xf << 8) /* External Reset Length */ |
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h index 4c0e2f6011d7..61d952902f2b 100644 --- a/arch/arm/mach-at91/include/mach/at91cap9.h +++ b/arch/arm/mach-at91/include/mach/at91cap9.h | |||
| @@ -83,7 +83,6 @@ | |||
| 83 | #define AT91_DDRSDRC0 (0xffffe600 - AT91_BASE_SYS) | 83 | #define AT91_DDRSDRC0 (0xffffe600 - AT91_BASE_SYS) |
| 84 | #define AT91_MATRIX (0xffffea00 - AT91_BASE_SYS) | 84 | #define AT91_MATRIX (0xffffea00 - AT91_BASE_SYS) |
| 85 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 85 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 86 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 87 | #define AT91_GPBR (cpu_is_at91cap9_revB() ? \ | 86 | #define AT91_GPBR (cpu_is_at91cap9_revB() ? \ |
| 88 | (0xfffffd50 - AT91_BASE_SYS) : \ | 87 | (0xfffffd50 - AT91_BASE_SYS) : \ |
| 89 | (0xfffffd60 - AT91_BASE_SYS)) | 88 | (0xfffffd60 - AT91_BASE_SYS)) |
| @@ -96,6 +95,7 @@ | |||
| 96 | #define AT91CAP9_BASE_PIOB 0xfffff400 | 95 | #define AT91CAP9_BASE_PIOB 0xfffff400 |
| 97 | #define AT91CAP9_BASE_PIOC 0xfffff600 | 96 | #define AT91CAP9_BASE_PIOC 0xfffff600 |
| 98 | #define AT91CAP9_BASE_PIOD 0xfffff800 | 97 | #define AT91CAP9_BASE_PIOD 0xfffff800 |
| 98 | #define AT91CAP9_BASE_RSTC 0xfffffd00 | ||
| 99 | #define AT91CAP9_BASE_SHDWC 0xfffffd10 | 99 | #define AT91CAP9_BASE_SHDWC 0xfffffd10 |
| 100 | #define AT91CAP9_BASE_RTT 0xfffffd20 | 100 | #define AT91CAP9_BASE_RTT 0xfffffd20 |
| 101 | #define AT91CAP9_BASE_PIT 0xfffffd30 | 101 | #define AT91CAP9_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h deleted file mode 100644 index 976f4a6c3353..000000000000 --- a/arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h +++ /dev/null | |||
| @@ -1,108 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h | ||
| 3 | * | ||
| 4 | * (C) 2008 Andrew Victor | ||
| 5 | * | ||
| 6 | * DDR/SDR Controller (DDRSDRC) - System peripherals registers. | ||
| 7 | * Based on AT91CAP9 datasheet revision B. | ||
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License as published by | ||
| 11 | * the Free Software Foundation; either version 2 of the License, or | ||
| 12 | * (at your option) any later version. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #ifndef AT91CAP9_DDRSDR_H | ||
| 16 | #define AT91CAP9_DDRSDR_H | ||
| 17 | |||
| 18 | #define AT91_DDRSDRC_MR 0x00 /* Mode Register */ | ||
| 19 | #define AT91_DDRSDRC_MODE (0xf << 0) /* Command Mode */ | ||
| 20 | #define AT91_DDRSDRC_MODE_NORMAL 0 | ||
| 21 | #define AT91_DDRSDRC_MODE_NOP 1 | ||
| 22 | #define AT91_DDRSDRC_MODE_PRECHARGE 2 | ||
| 23 | #define AT91_DDRSDRC_MODE_LMR 3 | ||
| 24 | #define AT91_DDRSDRC_MODE_REFRESH 4 | ||
| 25 | #define AT91_DDRSDRC_MODE_EXT_LMR 5 | ||
| 26 | #define AT91_DDRSDRC_MODE_DEEP 6 | ||
| 27 | |||
| 28 | #define AT91_DDRSDRC_RTR 0x04 /* Refresh Timer Register */ | ||
| 29 | #define AT91_DDRSDRC_COUNT (0xfff << 0) /* Refresh Timer Counter */ | ||
| 30 | |||
| 31 | #define AT91_DDRSDRC_CR 0x08 /* Configuration Register */ | ||
| 32 | #define AT91_DDRSDRC_NC (3 << 0) /* Number of Column Bits */ | ||
| 33 | #define AT91_DDRSDRC_NC_SDR8 (0 << 0) | ||
| 34 | #define AT91_DDRSDRC_NC_SDR9 (1 << 0) | ||
| 35 | #define AT91_DDRSDRC_NC_SDR10 (2 << 0) | ||
| 36 | #define AT91_DDRSDRC_NC_SDR11 (3 << 0) | ||
| 37 | #define AT91_DDRSDRC_NC_DDR9 (0 << 0) | ||
| 38 | #define AT91_DDRSDRC_NC_DDR10 (1 << 0) | ||
| 39 | #define AT91_DDRSDRC_NC_DDR11 (2 << 0) | ||
| 40 | #define AT91_DDRSDRC_NC_DDR12 (3 << 0) | ||
| 41 | #define AT91_DDRSDRC_NR (3 << 2) /* Number of Row Bits */ | ||
| 42 | #define AT91_DDRSDRC_NR_11 (0 << 2) | ||
| 43 | #define AT91_DDRSDRC_NR_12 (1 << 2) | ||
| 44 | #define AT91_DDRSDRC_NR_13 (2 << 2) | ||
| 45 | #define AT91_DDRSDRC_CAS (7 << 4) /* CAS Latency */ | ||
| 46 | #define AT91_DDRSDRC_CAS_2 (2 << 4) | ||
| 47 | #define AT91_DDRSDRC_CAS_3 (3 << 4) | ||
| 48 | #define AT91_DDRSDRC_CAS_25 (6 << 4) | ||
| 49 | #define AT91_DDRSDRC_DLL (1 << 7) /* Reset DLL */ | ||
| 50 | #define AT91_DDRSDRC_DICDS (1 << 8) /* Output impedance control */ | ||
| 51 | |||
| 52 | #define AT91_DDRSDRC_T0PR 0x0C /* Timing 0 Register */ | ||
| 53 | #define AT91_DDRSDRC_TRAS (0xf << 0) /* Active to Precharge delay */ | ||
| 54 | #define AT91_DDRSDRC_TRCD (0xf << 4) /* Row to Column delay */ | ||
| 55 | #define AT91_DDRSDRC_TWR (0xf << 8) /* Write recovery delay */ | ||
| 56 | #define AT91_DDRSDRC_TRC (0xf << 12) /* Row cycle delay */ | ||
| 57 | #define AT91_DDRSDRC_TRP (0xf << 16) /* Row precharge delay */ | ||
| 58 | #define AT91_DDRSDRC_TRRD (0xf << 20) /* Active BankA to BankB */ | ||
| 59 | #define AT91_DDRSDRC_TWTR (1 << 24) /* Internal Write to Read delay */ | ||
| 60 | #define AT91_DDRSDRC_TMRD (0xf << 28) /* Load mode to active/refresh delay */ | ||
| 61 | |||
| 62 | #define AT91_DDRSDRC_T1PR 0x10 /* Timing 1 Register */ | ||
| 63 | #define AT91_DDRSDRC_TRFC (0x1f << 0) /* Row Cycle Delay */ | ||
| 64 | #define AT91_DDRSDRC_TXSNR (0xff << 8) /* Exit self-refresh to non-read */ | ||
| 65 | #define AT91_DDRSDRC_TXSRD (0xff << 16) /* Exit self-refresh to read */ | ||
| 66 | #define AT91_DDRSDRC_TXP (0xf << 24) /* Exit power-down delay */ | ||
| 67 | |||
| 68 | #define AT91_DDRSDRC_LPR 0x18 /* Low Power Register */ | ||
| 69 | #define AT91_DDRSDRC_LPCB (3 << 0) /* Low-power Configurations */ | ||
| 70 | #define AT91_DDRSDRC_LPCB_DISABLE 0 | ||
| 71 | #define AT91_DDRSDRC_LPCB_SELF_REFRESH 1 | ||
| 72 | #define AT91_DDRSDRC_LPCB_POWER_DOWN 2 | ||
| 73 | #define AT91_DDRSDRC_LPCB_DEEP_POWER_DOWN 3 | ||
| 74 | #define AT91_DDRSDRC_CLKFR (1 << 2) /* Clock Frozen */ | ||
| 75 | #define AT91_DDRSDRC_PASR (7 << 4) /* Partial Array Self Refresh */ | ||
| 76 | #define AT91_DDRSDRC_TCSR (3 << 8) /* Temperature Compensated Self Refresh */ | ||
| 77 | #define AT91_DDRSDRC_DS (3 << 10) /* Drive Strength */ | ||
| 78 | #define AT91_DDRSDRC_TIMEOUT (3 << 12) /* Time to define when Low Power Mode is enabled */ | ||
| 79 | #define AT91_DDRSDRC_TIMEOUT_0_CLK_CYCLES (0 << 12) | ||
| 80 | #define AT91_DDRSDRC_TIMEOUT_64_CLK_CYCLES (1 << 12) | ||
| 81 | #define AT91_DDRSDRC_TIMEOUT_128_CLK_CYCLES (2 << 12) | ||
| 82 | |||
| 83 | #define AT91_DDRSDRC_MDR 0x1C /* Memory Device Register */ | ||
| 84 | #define AT91_DDRSDRC_MD (3 << 0) /* Memory Device Type */ | ||
| 85 | #define AT91_DDRSDRC_MD_SDR 0 | ||
| 86 | #define AT91_DDRSDRC_MD_LOW_POWER_SDR 1 | ||
| 87 | #define AT91_DDRSDRC_MD_DDR 2 | ||
| 88 | #define AT91_DDRSDRC_MD_LOW_POWER_DDR 3 | ||
| 89 | |||
| 90 | #define AT91_DDRSDRC_DLLR 0x20 /* DLL Information Register */ | ||
| 91 | #define AT91_DDRSDRC_MDINC (1 << 0) /* Master Delay increment */ | ||
| 92 | #define AT91_DDRSDRC_MDDEC (1 << 1) /* Master Delay decrement */ | ||
| 93 | #define AT91_DDRSDRC_MDOVF (1 << 2) /* Master Delay Overflow */ | ||
| 94 | #define AT91_DDRSDRC_SDCOVF (1 << 3) /* Slave Delay Correction Overflow */ | ||
| 95 | #define AT91_DDRSDRC_SDCUDF (1 << 4) /* Slave Delay Correction Underflow */ | ||
| 96 | #define AT91_DDRSDRC_SDERF (1 << 5) /* Slave Delay Correction error */ | ||
| 97 | #define AT91_DDRSDRC_MDVAL (0xff << 8) /* Master Delay value */ | ||
| 98 | #define AT91_DDRSDRC_SDVAL (0xff << 16) /* Slave Delay value */ | ||
| 99 | #define AT91_DDRSDRC_SDCVAL (0xff << 24) /* Slave Delay Correction value */ | ||
| 100 | |||
| 101 | /* Register access macros */ | ||
| 102 | #define at91_ramc_read(num, reg) \ | ||
| 103 | at91_sys_read(AT91_DDRSDRC##num + reg) | ||
| 104 | #define at91_ramc_write(num, reg, value) \ | ||
| 105 | at91_sys_write(AT91_DDRSDRC##num + reg, value) | ||
| 106 | |||
| 107 | |||
| 108 | #endif | ||
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h index f937c476bb67..fa5ca278adeb 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h | |||
| @@ -83,7 +83,6 @@ | |||
| 83 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) | 83 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) |
| 84 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) | 84 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) |
| 85 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 85 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 86 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 87 | #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) | 86 | #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) |
| 88 | 87 | ||
| 89 | #define AT91SAM9260_BASE_ECC 0xffffe800 | 88 | #define AT91SAM9260_BASE_ECC 0xffffe800 |
| @@ -92,6 +91,7 @@ | |||
| 92 | #define AT91SAM9260_BASE_PIOA 0xfffff400 | 91 | #define AT91SAM9260_BASE_PIOA 0xfffff400 |
| 93 | #define AT91SAM9260_BASE_PIOB 0xfffff600 | 92 | #define AT91SAM9260_BASE_PIOB 0xfffff600 |
| 94 | #define AT91SAM9260_BASE_PIOC 0xfffff800 | 93 | #define AT91SAM9260_BASE_PIOC 0xfffff800 |
| 94 | #define AT91SAM9260_BASE_RSTC 0xfffffd00 | ||
| 95 | #define AT91SAM9260_BASE_SHDWC 0xfffffd10 | 95 | #define AT91SAM9260_BASE_SHDWC 0xfffffd10 |
| 96 | #define AT91SAM9260_BASE_RTT 0xfffffd20 | 96 | #define AT91SAM9260_BASE_RTT 0xfffffd20 |
| 97 | #define AT91SAM9260_BASE_PIT 0xfffffd30 | 97 | #define AT91SAM9260_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index 175604e261be..7cde2d36570e 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) | 68 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) |
| 69 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) | 69 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) |
| 70 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 70 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 71 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 72 | #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) | 71 | #define AT91_GPBR (0xfffffd50 - AT91_BASE_SYS) |
| 73 | 72 | ||
| 74 | #define AT91SAM9261_BASE_SMC 0xffffec00 | 73 | #define AT91SAM9261_BASE_SMC 0xffffec00 |
| @@ -76,6 +75,7 @@ | |||
| 76 | #define AT91SAM9261_BASE_PIOA 0xfffff400 | 75 | #define AT91SAM9261_BASE_PIOA 0xfffff400 |
| 77 | #define AT91SAM9261_BASE_PIOB 0xfffff600 | 76 | #define AT91SAM9261_BASE_PIOB 0xfffff600 |
| 78 | #define AT91SAM9261_BASE_PIOC 0xfffff800 | 77 | #define AT91SAM9261_BASE_PIOC 0xfffff800 |
| 78 | #define AT91SAM9261_BASE_RSTC 0xfffffd00 | ||
| 79 | #define AT91SAM9261_BASE_SHDWC 0xfffffd10 | 79 | #define AT91SAM9261_BASE_SHDWC 0xfffffd10 |
| 80 | #define AT91SAM9261_BASE_RTT 0xfffffd20 | 80 | #define AT91SAM9261_BASE_RTT 0xfffffd20 |
| 81 | #define AT91SAM9261_BASE_PIT 0xfffffd30 | 81 | #define AT91SAM9261_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 80c915002d83..5949abda962b 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h | |||
| @@ -78,7 +78,6 @@ | |||
| 78 | #define AT91_SDRAMC1 (0xffffe800 - AT91_BASE_SYS) | 78 | #define AT91_SDRAMC1 (0xffffe800 - AT91_BASE_SYS) |
| 79 | #define AT91_MATRIX (0xffffec00 - AT91_BASE_SYS) | 79 | #define AT91_MATRIX (0xffffec00 - AT91_BASE_SYS) |
| 80 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 80 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 81 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 82 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) | 81 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) |
| 83 | 82 | ||
| 84 | #define AT91SAM9263_BASE_ECC0 0xffffe000 | 83 | #define AT91SAM9263_BASE_ECC0 0xffffe000 |
| @@ -91,6 +90,7 @@ | |||
| 91 | #define AT91SAM9263_BASE_PIOC 0xfffff600 | 90 | #define AT91SAM9263_BASE_PIOC 0xfffff600 |
| 92 | #define AT91SAM9263_BASE_PIOD 0xfffff800 | 91 | #define AT91SAM9263_BASE_PIOD 0xfffff800 |
| 93 | #define AT91SAM9263_BASE_PIOE 0xfffffa00 | 92 | #define AT91SAM9263_BASE_PIOE 0xfffffa00 |
| 93 | #define AT91SAM9263_BASE_RSTC 0xfffffd00 | ||
| 94 | #define AT91SAM9263_BASE_SHDWC 0xfffffd10 | 94 | #define AT91SAM9263_BASE_SHDWC 0xfffffd10 |
| 95 | #define AT91SAM9263_BASE_RTT0 0xfffffd20 | 95 | #define AT91SAM9263_BASE_RTT0 0xfffffd20 |
| 96 | #define AT91SAM9263_BASE_PIT 0xfffffd30 | 96 | #define AT91SAM9263_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h index d27b15ba8ebf..e2f8da8ce5bc 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_ddrsdr.h | |||
| @@ -46,10 +46,10 @@ | |||
| 46 | #define AT91_DDRSDRC_CAS_25 (6 << 4) | 46 | #define AT91_DDRSDRC_CAS_25 (6 << 4) |
| 47 | #define AT91_DDRSDRC_RST_DLL (1 << 7) /* Reset DLL */ | 47 | #define AT91_DDRSDRC_RST_DLL (1 << 7) /* Reset DLL */ |
| 48 | #define AT91_DDRSDRC_DICDS (1 << 8) /* Output impedance control */ | 48 | #define AT91_DDRSDRC_DICDS (1 << 8) /* Output impedance control */ |
| 49 | #define AT91_DDRSDRC_DIS_DLL (1 << 9) /* Disable DLL */ | 49 | #define AT91_DDRSDRC_DIS_DLL (1 << 9) /* Disable DLL [SAM9 Only] */ |
| 50 | #define AT91_DDRSDRC_OCD (1 << 12) /* Off-Chip Driver */ | 50 | #define AT91_DDRSDRC_OCD (1 << 12) /* Off-Chip Driver [SAM9 Only] */ |
| 51 | #define AT91_DDRSDRC_DQMS (1 << 16) /* Mask Data is Shared */ | 51 | #define AT91_DDRSDRC_DQMS (1 << 16) /* Mask Data is Shared [SAM9 Only] */ |
| 52 | #define AT91_DDRSDRC_ACTBST (1 << 18) /* Active Bank X to Burst Stop Read Access Bank Y */ | 52 | #define AT91_DDRSDRC_ACTBST (1 << 18) /* Active Bank X to Burst Stop Read Access Bank Y [SAM9 Only] */ |
| 53 | 53 | ||
| 54 | #define AT91_DDRSDRC_T0PR 0x0C /* Timing 0 Register */ | 54 | #define AT91_DDRSDRC_T0PR 0x0C /* Timing 0 Register */ |
| 55 | #define AT91_DDRSDRC_TRAS (0xf << 0) /* Active to Precharge delay */ | 55 | #define AT91_DDRSDRC_TRAS (0xf << 0) /* Active to Precharge delay */ |
| @@ -59,7 +59,8 @@ | |||
| 59 | #define AT91_DDRSDRC_TRP (0xf << 16) /* Row precharge delay */ | 59 | #define AT91_DDRSDRC_TRP (0xf << 16) /* Row precharge delay */ |
| 60 | #define AT91_DDRSDRC_TRRD (0xf << 20) /* Active BankA to BankB */ | 60 | #define AT91_DDRSDRC_TRRD (0xf << 20) /* Active BankA to BankB */ |
| 61 | #define AT91_DDRSDRC_TWTR (0x7 << 24) /* Internal Write to Read delay */ | 61 | #define AT91_DDRSDRC_TWTR (0x7 << 24) /* Internal Write to Read delay */ |
| 62 | #define AT91_DDRSDRC_RED_WRRD (0x1 << 27) /* Reduce Write to Read Delay */ | 62 | #define AT91CAP9_DDRSDRC_TWTR (1 << 24) /* Internal Write to Read delay */ |
| 63 | #define AT91_DDRSDRC_RED_WRRD (0x1 << 27) /* Reduce Write to Read Delay [SAM9 Only] */ | ||
| 63 | #define AT91_DDRSDRC_TMRD (0xf << 28) /* Load mode to active/refresh delay */ | 64 | #define AT91_DDRSDRC_TMRD (0xf << 28) /* Load mode to active/refresh delay */ |
| 64 | 65 | ||
| 65 | #define AT91_DDRSDRC_T1PR 0x10 /* Timing 1 Register */ | 66 | #define AT91_DDRSDRC_T1PR 0x10 /* Timing 1 Register */ |
| @@ -68,13 +69,14 @@ | |||
| 68 | #define AT91_DDRSDRC_TXSRD (0xff << 16) /* Exit self-refresh to read */ | 69 | #define AT91_DDRSDRC_TXSRD (0xff << 16) /* Exit self-refresh to read */ |
| 69 | #define AT91_DDRSDRC_TXP (0xf << 24) /* Exit power-down delay */ | 70 | #define AT91_DDRSDRC_TXP (0xf << 24) /* Exit power-down delay */ |
| 70 | 71 | ||
| 71 | #define AT91_DDRSDRC_T2PR 0x14 /* Timing 2 Register */ | 72 | #define AT91_DDRSDRC_T2PR 0x14 /* Timing 2 Register [SAM9 Only] */ |
| 72 | #define AT91_DDRSDRC_TXARD (0xf << 0) /* Exit active power down delay to read command in mode "Fast Exit" */ | 73 | #define AT91_DDRSDRC_TXARD (0xf << 0) /* Exit active power down delay to read command in mode "Fast Exit" */ |
| 73 | #define AT91_DDRSDRC_TXARDS (0xf << 4) /* Exit active power down delay to read command in mode "Slow Exit" */ | 74 | #define AT91_DDRSDRC_TXARDS (0xf << 4) /* Exit active power down delay to read command in mode "Slow Exit" */ |
| 74 | #define AT91_DDRSDRC_TRPA (0xf << 8) /* Row Precharge All delay */ | 75 | #define AT91_DDRSDRC_TRPA (0xf << 8) /* Row Precharge All delay */ |
| 75 | #define AT91_DDRSDRC_TRTP (0x7 << 12) /* Read to Precharge delay */ | 76 | #define AT91_DDRSDRC_TRTP (0x7 << 12) /* Read to Precharge delay */ |
| 76 | 77 | ||
| 77 | #define AT91_DDRSDRC_LPR 0x1C /* Low Power Register */ | 78 | #define AT91_DDRSDRC_LPR 0x1C /* Low Power Register */ |
| 79 | #define AT91CAP9_DDRSDRC_LPR 0x18 /* Low Power Register */ | ||
| 78 | #define AT91_DDRSDRC_LPCB (3 << 0) /* Low-power Configurations */ | 80 | #define AT91_DDRSDRC_LPCB (3 << 0) /* Low-power Configurations */ |
| 79 | #define AT91_DDRSDRC_LPCB_DISABLE 0 | 81 | #define AT91_DDRSDRC_LPCB_DISABLE 0 |
| 80 | #define AT91_DDRSDRC_LPCB_SELF_REFRESH 1 | 82 | #define AT91_DDRSDRC_LPCB_SELF_REFRESH 1 |
| @@ -92,32 +94,40 @@ | |||
| 92 | #define AT91_DDRSDRC_UPD_MR (3 << 20) /* Update load mode register and extended mode register */ | 94 | #define AT91_DDRSDRC_UPD_MR (3 << 20) /* Update load mode register and extended mode register */ |
| 93 | 95 | ||
| 94 | #define AT91_DDRSDRC_MDR 0x20 /* Memory Device Register */ | 96 | #define AT91_DDRSDRC_MDR 0x20 /* Memory Device Register */ |
| 97 | #define AT91CAP9_DDRSDRC_MDR 0x1C /* Memory Device Register */ | ||
| 95 | #define AT91_DDRSDRC_MD (3 << 0) /* Memory Device Type */ | 98 | #define AT91_DDRSDRC_MD (3 << 0) /* Memory Device Type */ |
| 96 | #define AT91_DDRSDRC_MD_SDR 0 | 99 | #define AT91_DDRSDRC_MD_SDR 0 |
| 97 | #define AT91_DDRSDRC_MD_LOW_POWER_SDR 1 | 100 | #define AT91_DDRSDRC_MD_LOW_POWER_SDR 1 |
| 101 | #define AT91CAP9_DDRSDRC_MD_DDR 2 | ||
| 98 | #define AT91_DDRSDRC_MD_LOW_POWER_DDR 3 | 102 | #define AT91_DDRSDRC_MD_LOW_POWER_DDR 3 |
| 99 | #define AT91_DDRSDRC_MD_DDR2 6 | 103 | #define AT91_DDRSDRC_MD_DDR2 6 /* [SAM9 Only] */ |
| 100 | #define AT91_DDRSDRC_DBW (1 << 4) /* Data Bus Width */ | 104 | #define AT91_DDRSDRC_DBW (1 << 4) /* Data Bus Width */ |
| 101 | #define AT91_DDRSDRC_DBW_32BITS (0 << 4) | 105 | #define AT91_DDRSDRC_DBW_32BITS (0 << 4) |
| 102 | #define AT91_DDRSDRC_DBW_16BITS (1 << 4) | 106 | #define AT91_DDRSDRC_DBW_16BITS (1 << 4) |
| 103 | 107 | ||
| 104 | #define AT91_DDRSDRC_DLL 0x24 /* DLL Information Register */ | 108 | #define AT91_DDRSDRC_DLL 0x24 /* DLL Information Register */ |
| 109 | #define AT91CAP9_DDRSDRC_DLL 0x20 /* DLL Information Register */ | ||
| 105 | #define AT91_DDRSDRC_MDINC (1 << 0) /* Master Delay increment */ | 110 | #define AT91_DDRSDRC_MDINC (1 << 0) /* Master Delay increment */ |
| 106 | #define AT91_DDRSDRC_MDDEC (1 << 1) /* Master Delay decrement */ | 111 | #define AT91_DDRSDRC_MDDEC (1 << 1) /* Master Delay decrement */ |
| 107 | #define AT91_DDRSDRC_MDOVF (1 << 2) /* Master Delay Overflow */ | 112 | #define AT91_DDRSDRC_MDOVF (1 << 2) /* Master Delay Overflow */ |
| 113 | #define AT91CAP9_DDRSDRC_SDCOVF (1 << 3) /* Slave Delay Correction Overflow */ | ||
| 114 | #define AT91CAP9_DDRSDRC_SDCUDF (1 << 4) /* Slave Delay Correction Underflow */ | ||
| 115 | #define AT91CAP9_DDRSDRC_SDERF (1 << 5) /* Slave Delay Correction error */ | ||
| 108 | #define AT91_DDRSDRC_MDVAL (0xff << 8) /* Master Delay value */ | 116 | #define AT91_DDRSDRC_MDVAL (0xff << 8) /* Master Delay value */ |
| 117 | #define AT91CAP9_DDRSDRC_SDVAL (0xff << 16) /* Slave Delay value */ | ||
| 118 | #define AT91CAP9_DDRSDRC_SDCVAL (0xff << 24) /* Slave Delay Correction value */ | ||
| 109 | 119 | ||
| 110 | #define AT91_DDRSDRC_HS 0x2C /* High Speed Register */ | 120 | #define AT91_DDRSDRC_HS 0x2C /* High Speed Register [SAM9 Only] */ |
| 111 | #define AT91_DDRSDRC_DIS_ATCP_RD (1 << 2) /* Anticip read access is disabled */ | 121 | #define AT91_DDRSDRC_DIS_ATCP_RD (1 << 2) /* Anticip read access is disabled */ |
| 112 | 122 | ||
| 113 | #define AT91_DDRSDRC_DELAY(n) (0x30 + (0x4 * (n))) /* Delay I/O Register n */ | 123 | #define AT91_DDRSDRC_DELAY(n) (0x30 + (0x4 * (n))) /* Delay I/O Register n */ |
| 114 | 124 | ||
| 115 | #define AT91_DDRSDRC_WPMR 0xE4 /* Write Protect Mode Register */ | 125 | #define AT91_DDRSDRC_WPMR 0xE4 /* Write Protect Mode Register [SAM9 Only] */ |
| 116 | #define AT91_DDRSDRC_WP (1 << 0) /* Write protect enable */ | 126 | #define AT91_DDRSDRC_WP (1 << 0) /* Write protect enable */ |
| 117 | #define AT91_DDRSDRC_WPKEY (0xffffff << 8) /* Write protect key */ | 127 | #define AT91_DDRSDRC_WPKEY (0xffffff << 8) /* Write protect key */ |
| 118 | #define AT91_DDRSDRC_KEY (0x444452 << 8) /* Write protect key = "DDR" */ | 128 | #define AT91_DDRSDRC_KEY (0x444452 << 8) /* Write protect key = "DDR" */ |
| 119 | 129 | ||
| 120 | #define AT91_DDRSDRC_WPSR 0xE8 /* Write Protect Status Register */ | 130 | #define AT91_DDRSDRC_WPSR 0xE8 /* Write Protect Status Register [SAM9 Only] */ |
| 121 | #define AT91_DDRSDRC_WPVS (1 << 0) /* Write protect violation status */ | 131 | #define AT91_DDRSDRC_WPVS (1 << 0) /* Write protect violation status */ |
| 122 | #define AT91_DDRSDRC_WPVSRC (0xffff << 8) /* Write protect violation source */ | 132 | #define AT91_DDRSDRC_WPVSRC (0xffff << 8) /* Write protect violation source */ |
| 123 | 133 | ||
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index f0c23c960dec..dd9c95ea0862 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h | |||
| @@ -90,7 +90,6 @@ | |||
| 90 | #define AT91_DDRSDRC0 (0xffffe600 - AT91_BASE_SYS) | 90 | #define AT91_DDRSDRC0 (0xffffe600 - AT91_BASE_SYS) |
| 91 | #define AT91_MATRIX (0xffffea00 - AT91_BASE_SYS) | 91 | #define AT91_MATRIX (0xffffea00 - AT91_BASE_SYS) |
| 92 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 92 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 93 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 94 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) | 93 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) |
| 95 | 94 | ||
| 96 | #define AT91SAM9G45_BASE_ECC 0xffffe200 | 95 | #define AT91SAM9G45_BASE_ECC 0xffffe200 |
| @@ -102,6 +101,7 @@ | |||
| 102 | #define AT91SAM9G45_BASE_PIOC 0xfffff600 | 101 | #define AT91SAM9G45_BASE_PIOC 0xfffff600 |
| 103 | #define AT91SAM9G45_BASE_PIOD 0xfffff800 | 102 | #define AT91SAM9G45_BASE_PIOD 0xfffff800 |
| 104 | #define AT91SAM9G45_BASE_PIOE 0xfffffa00 | 103 | #define AT91SAM9G45_BASE_PIOE 0xfffffa00 |
| 104 | #define AT91SAM9G45_BASE_RSTC 0xfffffd00 | ||
| 105 | #define AT91SAM9G45_BASE_SHDWC 0xfffffd10 | 105 | #define AT91SAM9G45_BASE_SHDWC 0xfffffd10 |
| 106 | #define AT91SAM9G45_BASE_RTT 0xfffffd20 | 106 | #define AT91SAM9G45_BASE_RTT 0xfffffd20 |
| 107 | #define AT91SAM9G45_BASE_PIT 0xfffffd30 | 107 | #define AT91SAM9G45_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h index 2bb359e60b97..d7bead7118da 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9rl.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h | |||
| @@ -72,7 +72,6 @@ | |||
| 72 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) | 72 | #define AT91_SDRAMC0 (0xffffea00 - AT91_BASE_SYS) |
| 73 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) | 73 | #define AT91_MATRIX (0xffffee00 - AT91_BASE_SYS) |
| 74 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) | 74 | #define AT91_PMC (0xfffffc00 - AT91_BASE_SYS) |
| 75 | #define AT91_RSTC (0xfffffd00 - AT91_BASE_SYS) | ||
| 76 | #define AT91_SCKCR (0xfffffd50 - AT91_BASE_SYS) | 75 | #define AT91_SCKCR (0xfffffd50 - AT91_BASE_SYS) |
| 77 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) | 76 | #define AT91_GPBR (0xfffffd60 - AT91_BASE_SYS) |
| 78 | 77 | ||
| @@ -84,6 +83,7 @@ | |||
| 84 | #define AT91SAM9RL_BASE_PIOB 0xfffff600 | 83 | #define AT91SAM9RL_BASE_PIOB 0xfffff600 |
| 85 | #define AT91SAM9RL_BASE_PIOC 0xfffff800 | 84 | #define AT91SAM9RL_BASE_PIOC 0xfffff800 |
| 86 | #define AT91SAM9RL_BASE_PIOD 0xfffffa00 | 85 | #define AT91SAM9RL_BASE_PIOD 0xfffffa00 |
| 86 | #define AT91SAM9RL_BASE_RSTC 0xfffffd00 | ||
| 87 | #define AT91SAM9RL_BASE_SHDWC 0xfffffd10 | 87 | #define AT91SAM9RL_BASE_SHDWC 0xfffffd10 |
| 88 | #define AT91SAM9RL_BASE_RTT 0xfffffd20 | 88 | #define AT91SAM9RL_BASE_RTT 0xfffffd20 |
| 89 | #define AT91SAM9RL_BASE_PIT 0xfffffd30 | 89 | #define AT91SAM9RL_BASE_PIT 0xfffffd30 |
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h index d0b377b21bd7..3b33f07b1e11 100644 --- a/arch/arm/mach-at91/include/mach/board.h +++ b/arch/arm/mach-at91/include/mach/board.h | |||
| @@ -88,7 +88,7 @@ extern void __init at91_add_device_eth(struct macb_platform_data *data); | |||
| 88 | struct at91_usbh_data { | 88 | struct at91_usbh_data { |
| 89 | u8 ports; /* number of ports on root hub */ | 89 | u8 ports; /* number of ports on root hub */ |
| 90 | int vbus_pin[2]; /* port power-control pin */ | 90 | int vbus_pin[2]; /* port power-control pin */ |
| 91 | u8 vbus_pin_inverted; | 91 | u8 vbus_pin_active_low[2]; |
| 92 | u8 overcurrent_supported; | 92 | u8 overcurrent_supported; |
| 93 | int overcurrent_pin[2]; | 93 | int overcurrent_pin[2]; |
| 94 | u8 overcurrent_status[2]; | 94 | u8 overcurrent_status[2]; |
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 62ad95556c36..1606379ac284 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | /* | 34 | /* |
| 35 | * Show the reason for the previous system reset. | 35 | * Show the reason for the previous system reset. |
| 36 | */ | 36 | */ |
| 37 | #if defined(AT91_RSTC) | ||
| 38 | 37 | ||
| 39 | #include <mach/at91_rstc.h> | 38 | #include <mach/at91_rstc.h> |
| 40 | #include <mach/at91_shdwc.h> | 39 | #include <mach/at91_shdwc.h> |
| @@ -58,10 +57,10 @@ static void __init show_reset_status(void) | |||
| 58 | char *reason, *r2 = reset; | 57 | char *reason, *r2 = reset; |
| 59 | u32 reset_type, wake_type; | 58 | u32 reset_type, wake_type; |
| 60 | 59 | ||
| 61 | if (!at91_shdwc_base) | 60 | if (!at91_shdwc_base || !at91_rstc_base) |
| 62 | return; | 61 | return; |
| 63 | 62 | ||
| 64 | reset_type = at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP; | 63 | reset_type = at91_rstc_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP; |
| 65 | wake_type = at91_shdwc_read(AT91_SHDW_SR); | 64 | wake_type = at91_shdwc_read(AT91_SHDW_SR); |
| 66 | 65 | ||
| 67 | switch (reset_type) { | 66 | switch (reset_type) { |
| @@ -102,10 +101,6 @@ static void __init show_reset_status(void) | |||
| 102 | } | 101 | } |
| 103 | pr_info("AT91: Starting after %s %s\n", reason, r2); | 102 | pr_info("AT91: Starting after %s %s\n", reason, r2); |
| 104 | } | 103 | } |
| 105 | #else | ||
| 106 | static void __init show_reset_status(void) {} | ||
| 107 | #endif | ||
| 108 | |||
| 109 | 104 | ||
| 110 | static int at91_pm_valid_state(suspend_state_t state) | 105 | static int at91_pm_valid_state(suspend_state_t state) |
| 111 | { | 106 | { |
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h index ce9a20699111..7eb40d24242f 100644 --- a/arch/arm/mach-at91/pm.h +++ b/arch/arm/mach-at91/pm.h | |||
| @@ -25,21 +25,21 @@ static inline u32 sdram_selfrefresh_enable(void) | |||
| 25 | : : "r" (0)) | 25 | : : "r" (0)) |
| 26 | 26 | ||
| 27 | #elif defined(CONFIG_ARCH_AT91CAP9) | 27 | #elif defined(CONFIG_ARCH_AT91CAP9) |
| 28 | #include <mach/at91cap9_ddrsdr.h> | 28 | #include <mach/at91sam9_ddrsdr.h> |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | static inline u32 sdram_selfrefresh_enable(void) | 31 | static inline u32 sdram_selfrefresh_enable(void) |
| 32 | { | 32 | { |
| 33 | u32 saved_lpr, lpr; | 33 | u32 saved_lpr, lpr; |
| 34 | 34 | ||
| 35 | saved_lpr = at91_ramc_read(0, AT91_DDRSDRC_LPR); | 35 | saved_lpr = at91_ramc_read(0, AT91CAP9_DDRSDRC_LPR); |
| 36 | 36 | ||
| 37 | lpr = saved_lpr & ~AT91_DDRSDRC_LPCB; | 37 | lpr = saved_lpr & ~AT91_DDRSDRC_LPCB; |
| 38 | at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH); | 38 | at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, lpr | AT91_DDRSDRC_LPCB_SELF_REFRESH); |
| 39 | return saved_lpr; | 39 | return saved_lpr; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | #define sdram_selfrefresh_disable(saved_lpr) at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr) | 42 | #define sdram_selfrefresh_disable(saved_lpr) at91_ramc_write(0, AT91CAP9_DDRSDRC_LPR, saved_lpr) |
| 43 | #define wait_for_interrupt_enable() cpu_do_idle() | 43 | #define wait_for_interrupt_enable() cpu_do_idle() |
| 44 | 44 | ||
| 45 | #elif defined(CONFIG_ARCH_AT91SAM9G45) | 45 | #elif defined(CONFIG_ARCH_AT91SAM9G45) |
diff --git a/arch/arm/mach-at91/pm_slowclock.S b/arch/arm/mach-at91/pm_slowclock.S index f7922a436172..92dfb8461392 100644 --- a/arch/arm/mach-at91/pm_slowclock.S +++ b/arch/arm/mach-at91/pm_slowclock.S | |||
| @@ -18,9 +18,8 @@ | |||
| 18 | 18 | ||
| 19 | #if defined(CONFIG_ARCH_AT91RM9200) | 19 | #if defined(CONFIG_ARCH_AT91RM9200) |
| 20 | #include <mach/at91rm9200_mc.h> | 20 | #include <mach/at91rm9200_mc.h> |
| 21 | #elif defined(CONFIG_ARCH_AT91CAP9) | 21 | #elif defined(CONFIG_ARCH_AT91CAP9) \ |
| 22 | #include <mach/at91cap9_ddrsdr.h> | 22 | || defined(CONFIG_ARCH_AT91SAM9G45) |
| 23 | #elif defined(CONFIG_ARCH_AT91SAM9G45) | ||
| 24 | #include <mach/at91sam9_ddrsdr.h> | 23 | #include <mach/at91sam9_ddrsdr.h> |
| 25 | #else | 24 | #else |
| 26 | #include <mach/at91sam9_sdramc.h> | 25 | #include <mach/at91sam9_sdramc.h> |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 8bdcc3cb6012..69d3fc4c46f3 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
| @@ -29,9 +29,12 @@ EXPORT_SYMBOL(at91_soc_initdata); | |||
| 29 | void __init at91rm9200_set_type(int type) | 29 | void __init at91rm9200_set_type(int type) |
| 30 | { | 30 | { |
| 31 | if (type == ARCH_REVISON_9200_PQFP) | 31 | if (type == ARCH_REVISON_9200_PQFP) |
| 32 | at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; | ||
| 33 | else | ||
| 34 | at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP; | 32 | at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP; |
| 33 | else | ||
| 34 | at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; | ||
| 35 | |||
| 36 | pr_info("AT91: filled in soc subtype: %s\n", | ||
| 37 | at91_get_soc_subtype(&at91_soc_initdata)); | ||
| 35 | } | 38 | } |
| 36 | 39 | ||
| 37 | void __init at91_init_irq_default(void) | 40 | void __init at91_init_irq_default(void) |
| @@ -281,6 +284,15 @@ void __init at91_ioremap_shdwc(u32 base_addr) | |||
| 281 | pm_power_off = at91sam9_poweroff; | 284 | pm_power_off = at91sam9_poweroff; |
| 282 | } | 285 | } |
| 283 | 286 | ||
| 287 | void __iomem *at91_rstc_base; | ||
| 288 | |||
| 289 | void __init at91_ioremap_rstc(u32 base_addr) | ||
| 290 | { | ||
| 291 | at91_rstc_base = ioremap(base_addr, 16); | ||
| 292 | if (!at91_rstc_base) | ||
| 293 | panic("Impossible to ioremap at91_rstc_base\n"); | ||
| 294 | } | ||
| 295 | |||
| 284 | void __init at91_initialize(unsigned long main_clock) | 296 | void __init at91_initialize(unsigned long main_clock) |
| 285 | { | 297 | { |
| 286 | at91_boot_soc.ioremap_registers(); | 298 | at91_boot_soc.ioremap_registers(); |
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c index da70e7e39937..dd1ad55524c9 100644 --- a/arch/arm/mach-exynos/hotplug.c +++ b/arch/arm/mach-exynos/hotplug.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | 17 | ||
| 18 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
| 19 | #include <asm/smp_plat.h> | ||
| 19 | 20 | ||
| 20 | #include <mach/regs-pmu.h> | 21 | #include <mach/regs-pmu.h> |
| 21 | 22 | ||
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 683aec786b78..0f2035a1eb6e 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <asm/cacheflush.h> | 24 | #include <asm/cacheflush.h> |
| 25 | #include <asm/hardware/gic.h> | 25 | #include <asm/hardware/gic.h> |
| 26 | #include <asm/smp_plat.h> | ||
| 26 | #include <asm/smp_scu.h> | 27 | #include <asm/smp_scu.h> |
| 27 | 28 | ||
| 28 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 7afbe1e55beb..8394d512a402 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/smp.h> | 25 | #include <linux/smp.h> |
| 26 | 26 | ||
| 27 | #include <asm/cacheflush.h> | 27 | #include <asm/cacheflush.h> |
| 28 | #include <asm/smp_plat.h> | ||
| 28 | #include <asm/smp_scu.h> | 29 | #include <asm/smp_scu.h> |
| 29 | #include <asm/hardware/arm_timer.h> | 30 | #include <asm/hardware/arm_timer.h> |
| 30 | #include <asm/hardware/timer-sp.h> | 31 | #include <asm/hardware/timer-sp.h> |
| @@ -72,9 +73,7 @@ static void __init highbank_map_io(void) | |||
| 72 | 73 | ||
| 73 | void highbank_set_cpu_jump(int cpu, void *jump_addr) | 74 | void highbank_set_cpu_jump(int cpu, void *jump_addr) |
| 74 | { | 75 | { |
| 75 | #ifdef CONFIG_SMP | ||
| 76 | cpu = cpu_logical_map(cpu); | 76 | cpu = cpu_logical_map(cpu); |
| 77 | #endif | ||
| 78 | writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu)); | 77 | writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu)); |
| 79 | __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16); | 78 | __cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16); |
| 80 | outer_clean_range(HB_JUMP_TABLE_PHYS(cpu), | 79 | outer_clean_range(HB_JUMP_TABLE_PHYS(cpu), |
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 09f357bcecde..4defb97bbfc8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -87,7 +87,6 @@ config SOC_IMX35 | |||
| 87 | 87 | ||
| 88 | config SOC_IMX5 | 88 | config SOC_IMX5 |
| 89 | select CPU_V7 | 89 | select CPU_V7 |
| 90 | select ARM_L1_CACHE_SHIFT_6 | ||
| 91 | select MXC_TZIC | 90 | select MXC_TZIC |
| 92 | select ARCH_MXC_IOMUX_V3 | 91 | select ARCH_MXC_IOMUX_V3 |
| 93 | select ARCH_MXC_AUDMUX_V2 | 92 | select ARCH_MXC_AUDMUX_V2 |
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c index 9273c2a24b54..2d88f8b9a454 100644 --- a/arch/arm/mach-imx/clock-imx6q.c +++ b/arch/arm/mach-imx/clock-imx6q.c | |||
| @@ -814,6 +814,16 @@ DEF_PFD(pll3_pfd_540m, PFD_480, PFD1, &pll3_usb_otg); | |||
| 814 | DEF_PFD(pll3_pfd_508m, PFD_480, PFD2, &pll3_usb_otg); | 814 | DEF_PFD(pll3_pfd_508m, PFD_480, PFD2, &pll3_usb_otg); |
| 815 | DEF_PFD(pll3_pfd_454m, PFD_480, PFD3, &pll3_usb_otg); | 815 | DEF_PFD(pll3_pfd_454m, PFD_480, PFD3, &pll3_usb_otg); |
| 816 | 816 | ||
| 817 | static unsigned long twd_clk_get_rate(struct clk *clk) | ||
| 818 | { | ||
| 819 | return clk_get_rate(clk->parent) / 2; | ||
| 820 | } | ||
| 821 | |||
| 822 | static struct clk twd_clk = { | ||
| 823 | .parent = &arm_clk, | ||
| 824 | .get_rate = twd_clk_get_rate, | ||
| 825 | }; | ||
| 826 | |||
| 817 | static unsigned long pll2_200m_get_rate(struct clk *clk) | 827 | static unsigned long pll2_200m_get_rate(struct clk *clk) |
| 818 | { | 828 | { |
| 819 | return clk_get_rate(clk->parent) / 2; | 829 | return clk_get_rate(clk->parent) / 2; |
| @@ -1894,6 +1904,7 @@ static struct clk_lookup lookups[] = { | |||
| 1894 | _REGISTER_CLOCK("20ec000.sdma", NULL, sdma_clk), | 1904 | _REGISTER_CLOCK("20ec000.sdma", NULL, sdma_clk), |
| 1895 | _REGISTER_CLOCK("20bc000.wdog", NULL, dummy_clk), | 1905 | _REGISTER_CLOCK("20bc000.wdog", NULL, dummy_clk), |
| 1896 | _REGISTER_CLOCK("20c0000.wdog", NULL, dummy_clk), | 1906 | _REGISTER_CLOCK("20c0000.wdog", NULL, dummy_clk), |
| 1907 | _REGISTER_CLOCK("smp_twd", NULL, twd_clk), | ||
| 1897 | _REGISTER_CLOCK(NULL, "ckih", ckih_clk), | 1908 | _REGISTER_CLOCK(NULL, "ckih", ckih_clk), |
| 1898 | _REGISTER_CLOCK(NULL, "ckil_clk", ckil_clk), | 1909 | _REGISTER_CLOCK(NULL, "ckil_clk", ckil_clk), |
| 1899 | _REGISTER_CLOCK(NULL, "aips_tz1_clk", aips_tz1_clk), | 1910 | _REGISTER_CLOCK(NULL, "aips_tz1_clk", aips_tz1_clk), |
diff --git a/arch/arm/mach-imx/mach-mx53_ard.c b/arch/arm/mach-imx/mach-mx53_ard.c index 08dfb7628d2d..753f4fc9ec04 100644 --- a/arch/arm/mach-imx/mach-mx53_ard.c +++ b/arch/arm/mach-imx/mach-mx53_ard.c | |||
| @@ -188,8 +188,10 @@ static int weim_cs_config(void) | |||
| 188 | return -ENOMEM; | 188 | return -ENOMEM; |
| 189 | 189 | ||
| 190 | iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); | 190 | iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); |
| 191 | if (!iomuxc_base) | 191 | if (!iomuxc_base) { |
| 192 | iounmap(weim_base); | ||
| 192 | return -ENOMEM; | 193 | return -ENOMEM; |
| 194 | } | ||
| 193 | 195 | ||
| 194 | /* CS1 timings for LAN9220 */ | 196 | /* CS1 timings for LAN9220 */ |
| 195 | writel(0x20001, (weim_base + 0x18)); | 197 | writel(0x20001, (weim_base + 0x18)); |
diff --git a/arch/arm/mach-imx/src.c b/arch/arm/mach-imx/src.c index 29bd1243781e..e15f1555c59b 100644 --- a/arch/arm/mach-imx/src.c +++ b/arch/arm/mach-imx/src.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/of.h> | 15 | #include <linux/of.h> |
| 16 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
| 17 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
| 18 | #include <asm/smp_plat.h> | ||
| 18 | 19 | ||
| 19 | #define SRC_SCR 0x000 | 20 | #define SRC_SCR 0x000 |
| 20 | #define SRC_GPR1 0x020 | 21 | #define SRC_GPR1 0x020 |
| @@ -24,10 +25,6 @@ | |||
| 24 | 25 | ||
| 25 | static void __iomem *src_base; | 26 | static void __iomem *src_base; |
| 26 | 27 | ||
| 27 | #ifndef CONFIG_SMP | ||
| 28 | #define cpu_logical_map(cpu) 0 | ||
| 29 | #endif | ||
| 30 | |||
| 31 | void imx_enable_cpu(int cpu, bool enable) | 28 | void imx_enable_cpu(int cpu, bool enable) |
| 32 | { | 29 | { |
| 33 | u32 mask, val; | 30 | u32 mask, val; |
diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c index 41c252de0215..a446fc14221f 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/smp.h> | 11 | #include <linux/smp.h> |
| 12 | 12 | ||
| 13 | #include <asm/cacheflush.h> | 13 | #include <asm/cacheflush.h> |
| 14 | #include <asm/smp_plat.h> | ||
| 14 | 15 | ||
| 15 | extern volatile int pen_release; | 16 | extern volatile int pen_release; |
| 16 | 17 | ||
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c index 0b3e357c4c8c..db0117ec55f4 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
| 21 | #include <asm/cputype.h> | 21 | #include <asm/cputype.h> |
| 22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
| 23 | #include <asm/smp_plat.h> | ||
| 23 | 24 | ||
| 24 | #include <mach/msm_iomap.h> | 25 | #include <mach/msm_iomap.h> |
| 25 | 26 | ||
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a8ba7b96dcd1..41e6612ecbaf 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -33,7 +33,6 @@ config ARCH_OMAP3 | |||
| 33 | default y | 33 | default y |
| 34 | select CPU_V7 | 34 | select CPU_V7 |
| 35 | select USB_ARCH_HAS_EHCI | 35 | select USB_ARCH_HAS_EHCI |
| 36 | select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 | ||
| 37 | select ARCH_HAS_OPP | 36 | select ARCH_HAS_OPP |
| 38 | select PM_OPP if PM | 37 | select PM_OPP if PM |
| 39 | select ARM_CPU_SUSPEND if PM | 38 | select ARM_CPU_SUSPEND if PM |
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 18fd177073f4..5bc13121eac5 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c | |||
| @@ -415,29 +415,9 @@ static struct resource pxa_rtc_resources[] = { | |||
| 415 | }, | 415 | }, |
| 416 | }; | 416 | }; |
| 417 | 417 | ||
| 418 | static struct resource sa1100_rtc_resources[] = { | ||
| 419 | [0] = { | ||
| 420 | .start = 0x40900000, | ||
| 421 | .end = 0x409000ff, | ||
| 422 | .flags = IORESOURCE_MEM, | ||
| 423 | }, | ||
| 424 | [1] = { | ||
| 425 | .start = IRQ_RTC1Hz, | ||
| 426 | .end = IRQ_RTC1Hz, | ||
| 427 | .flags = IORESOURCE_IRQ, | ||
| 428 | }, | ||
| 429 | [2] = { | ||
| 430 | .start = IRQ_RTCAlrm, | ||
| 431 | .end = IRQ_RTCAlrm, | ||
| 432 | .flags = IORESOURCE_IRQ, | ||
| 433 | }, | ||
| 434 | }; | ||
| 435 | |||
| 436 | struct platform_device sa1100_device_rtc = { | 418 | struct platform_device sa1100_device_rtc = { |
| 437 | .name = "sa1100-rtc", | 419 | .name = "sa1100-rtc", |
| 438 | .id = -1, | 420 | .id = -1, |
| 439 | .num_resources = ARRAY_SIZE(sa1100_rtc_resources), | ||
| 440 | .resource = sa1100_rtc_resources, | ||
| 441 | }; | 421 | }; |
| 442 | 422 | ||
| 443 | struct platform_device pxa_device_rtc = { | 423 | struct platform_device pxa_device_rtc = { |
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index adf058fa97ee..91e4f6c03766 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -209,8 +209,6 @@ static struct clk_lookup pxa25x_clkregs[] = { | |||
| 209 | INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"), | 209 | INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"), |
| 210 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), | 210 | INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"), |
| 211 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), | 211 | INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL), |
| 212 | INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), | ||
| 213 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 214 | }; | 212 | }; |
| 215 | 213 | ||
| 216 | static struct clk_lookup pxa25x_hwuart_clkreg = | 214 | static struct clk_lookup pxa25x_hwuart_clkreg = |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 180bd8675d4b..aed6cbcf3866 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -230,8 +230,6 @@ static struct clk_lookup pxa27x_clkregs[] = { | |||
| 230 | INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"), | 230 | INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"), |
| 231 | INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"), | 231 | INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"), |
| 232 | INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), | 232 | INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL), |
| 233 | INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL), | ||
| 234 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 235 | }; | 233 | }; |
| 236 | 234 | ||
| 237 | #ifdef CONFIG_PM | 235 | #ifdef CONFIG_PM |
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 0388eda7878a..40bb16501d86 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
| @@ -89,7 +89,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0); | |||
| 89 | static struct clk_lookup common_clkregs[] = { | 89 | static struct clk_lookup common_clkregs[] = { |
| 90 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), | 90 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), |
| 91 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), | 91 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), |
| 92 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 93 | }; | 92 | }; |
| 94 | 93 | ||
| 95 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); | 94 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); |
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index d487e1ff4c9a..8d614ecd8e99 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
| @@ -83,7 +83,6 @@ static DEFINE_PXA3_CKEN(gcu, PXA320_GCU, 0, 0); | |||
| 83 | static struct clk_lookup pxa320_clkregs[] = { | 83 | static struct clk_lookup pxa320_clkregs[] = { |
| 84 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), | 84 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), |
| 85 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), | 85 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), |
| 86 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 87 | }; | 86 | }; |
| 88 | 87 | ||
| 89 | static int __init pxa320_init(void) | 88 | static int __init pxa320_init(void) |
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index f107c71c7589..4f402afa6609 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -67,7 +67,6 @@ static struct clk_lookup pxa3xx_clkregs[] = { | |||
| 67 | INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"), | 67 | INIT_CLKREG(&clk_pxa3xx_pout, NULL, "CLK_POUT"), |
| 68 | /* Power I2C clock is always on */ | 68 | /* Power I2C clock is always on */ |
| 69 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), | 69 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), |
| 70 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 71 | INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL), | 70 | INIT_CLKREG(&clk_pxa3xx_lcd, "pxa2xx-fb", NULL), |
| 72 | INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"), | 71 | INIT_CLKREG(&clk_pxa3xx_camera, NULL, "CAMCLK"), |
| 73 | INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"), | 72 | INIT_CLKREG(&clk_pxa3xx_ac97, NULL, "AC97CLK"), |
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c index fccc644702e6..d082a583df78 100644 --- a/arch/arm/mach-pxa/pxa95x.c +++ b/arch/arm/mach-pxa/pxa95x.c | |||
| @@ -217,7 +217,6 @@ static struct clk_lookup pxa95x_clkregs[] = { | |||
| 217 | INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"), | 217 | INIT_CLKREG(&clk_pxa95x_pout, NULL, "CLK_POUT"), |
| 218 | /* Power I2C clock is always on */ | 218 | /* Power I2C clock is always on */ |
| 219 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), | 219 | INIT_CLKREG(&clk_dummy, "pxa3xx-pwri2c.1", NULL), |
| 220 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 221 | INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL), | 220 | INIT_CLKREG(&clk_pxa95x_lcd, "pxa2xx-fb", NULL), |
| 222 | INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL), | 221 | INIT_CLKREG(&clk_pxa95x_ffuart, "pxa2xx-uart.0", NULL), |
| 223 | INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL), | 222 | INIT_CLKREG(&clk_pxa95x_btuart, "pxa2xx-uart.1", NULL), |
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c index ac1aed2a8da4..eb55f05bef3a 100644 --- a/arch/arm/mach-realview/hotplug.c +++ b/arch/arm/mach-realview/hotplug.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | 14 | ||
| 15 | #include <asm/cacheflush.h> | 15 | #include <asm/cacheflush.h> |
| 16 | #include <asm/smp_plat.h> | ||
| 16 | 17 | ||
| 17 | extern volatile int pen_release; | 18 | extern volatile int pen_release; |
| 18 | 19 | ||
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h index 794a8d91a6a6..124bce6b4d7b 100644 --- a/arch/arm/mach-realview/include/mach/board-eb.h +++ b/arch/arm/mach-realview/include/mach/board-eb.h | |||
| @@ -47,21 +47,23 @@ | |||
| 47 | #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */ | 47 | #define REALVIEW_EB_USB_BASE 0x4F000000 /* USB */ |
| 48 | 48 | ||
| 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB | 49 | #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB |
| 50 | #define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */ | 50 | #define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000 |
| 51 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ | ||
| 52 | #define REALVIEW_EB11MP_TWD_BASE 0x10100600 | ||
| 53 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ | ||
| 54 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ | 51 | #define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ |
| 55 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ | 52 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ |
| 56 | #else | 53 | #else |
| 57 | #define REALVIEW_EB11MP_SCU_BASE 0x1F000000 /* SCU registers */ | 54 | #define REALVIEW_EB11MP_PRIV_MEM_BASE 0x1F000000 |
| 58 | #define REALVIEW_EB11MP_GIC_CPU_BASE 0x1F000100 /* Generic interrupt controller CPU interface */ | ||
| 59 | #define REALVIEW_EB11MP_TWD_BASE 0x1F000600 | ||
| 60 | #define REALVIEW_EB11MP_GIC_DIST_BASE 0x1F001000 /* Generic interrupt controller distributor */ | ||
| 61 | #define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */ | 55 | #define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */ |
| 62 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */ | 56 | #define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */ |
| 63 | #endif | 57 | #endif |
| 64 | 58 | ||
| 59 | #define REALVIEW_EB11MP_PRIV_MEM_SIZE SZ_8K | ||
| 60 | #define REALVIEW_EB11MP_PRIV_MEM_OFF(x) (REALVIEW_EB11MP_PRIV_MEM_BASE + (x)) | ||
| 61 | |||
| 62 | #define REALVIEW_EB11MP_SCU_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0) /* SCU registers */ | ||
| 63 | #define REALVIEW_EB11MP_GIC_CPU_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x0100) /* Generic interrupt controller CPU interface */ | ||
| 64 | #define REALVIEW_EB11MP_TWD_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x0600) | ||
| 65 | #define REALVIEW_EB11MP_GIC_DIST_BASE REALVIEW_EB11MP_PRIV_MEM_OFF(0x1000) /* Generic interrupt controller distributor */ | ||
| 66 | |||
| 65 | /* | 67 | /* |
| 66 | * Core tile identification (REALVIEW_SYS_PROCID) | 68 | * Core tile identification (REALVIEW_SYS_PROCID) |
| 67 | */ | 69 | */ |
diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h index 7abf918b77e9..aa2d4e02ea2c 100644 --- a/arch/arm/mach-realview/include/mach/board-pb11mp.h +++ b/arch/arm/mach-realview/include/mach/board-pb11mp.h | |||
| @@ -75,6 +75,8 @@ | |||
| 75 | /* | 75 | /* |
| 76 | * Testchip peripheral and fpga gic regions | 76 | * Testchip peripheral and fpga gic regions |
| 77 | */ | 77 | */ |
| 78 | #define REALVIEW_TC11MP_PRIV_MEM_BASE 0x1F000000 | ||
| 79 | #define REALVIEW_TC11MP_PRIV_MEM_SIZE SZ_8K | ||
| 78 | #define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */ | 80 | #define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */ |
| 79 | #define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */ | 81 | #define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */ |
| 80 | #define REALVIEW_TC11MP_TWD_BASE 0x1F000600 | 82 | #define REALVIEW_TC11MP_TWD_BASE 0x1F000600 |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index e62962117763..9578145f2df0 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -91,14 +91,9 @@ static struct map_desc realview_eb_io_desc[] __initdata = { | |||
| 91 | 91 | ||
| 92 | static struct map_desc realview_eb11mp_io_desc[] __initdata = { | 92 | static struct map_desc realview_eb11mp_io_desc[] __initdata = { |
| 93 | { | 93 | { |
| 94 | .virtual = IO_ADDRESS(REALVIEW_EB11MP_SCU_BASE), | 94 | .virtual = IO_ADDRESS(REALVIEW_EB11MP_PRIV_MEM_BASE), |
| 95 | .pfn = __phys_to_pfn(REALVIEW_EB11MP_SCU_BASE), | 95 | .pfn = __phys_to_pfn(REALVIEW_EB11MP_PRIV_MEM_BASE), |
| 96 | .length = SZ_4K, | 96 | .length = REALVIEW_EB11MP_PRIV_MEM_SIZE, |
| 97 | .type = MT_DEVICE, | ||
| 98 | }, { | ||
| 99 | .virtual = IO_ADDRESS(REALVIEW_EB11MP_GIC_DIST_BASE), | ||
| 100 | .pfn = __phys_to_pfn(REALVIEW_EB11MP_GIC_DIST_BASE), | ||
| 101 | .length = SZ_4K, | ||
| 102 | .type = MT_DEVICE, | 97 | .type = MT_DEVICE, |
| 103 | }, { | 98 | }, { |
| 104 | .virtual = IO_ADDRESS(REALVIEW_EB11MP_L220_BASE), | 99 | .virtual = IO_ADDRESS(REALVIEW_EB11MP_L220_BASE), |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 127a3fd42ab1..2147335f66f5 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -64,15 +64,10 @@ static struct map_desc realview_pb11mp_io_desc[] __initdata = { | |||
| 64 | .pfn = __phys_to_pfn(REALVIEW_PB11MP_GIC_DIST_BASE), | 64 | .pfn = __phys_to_pfn(REALVIEW_PB11MP_GIC_DIST_BASE), |
| 65 | .length = SZ_4K, | 65 | .length = SZ_4K, |
| 66 | .type = MT_DEVICE, | 66 | .type = MT_DEVICE, |
| 67 | }, { | 67 | }, { /* Maps the SCU, GIC CPU interface, TWD, GIC DIST */ |
| 68 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_GIC_CPU_BASE), | 68 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_PRIV_MEM_BASE), |
| 69 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_GIC_CPU_BASE), | 69 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_PRIV_MEM_BASE), |
| 70 | .length = SZ_4K, | 70 | .length = REALVIEW_TC11MP_PRIV_MEM_SIZE, |
| 71 | .type = MT_DEVICE, | ||
| 72 | }, { | ||
| 73 | .virtual = IO_ADDRESS(REALVIEW_TC11MP_GIC_DIST_BASE), | ||
| 74 | .pfn = __phys_to_pfn(REALVIEW_TC11MP_GIC_DIST_BASE), | ||
| 75 | .length = SZ_4K, | ||
| 76 | .type = MT_DEVICE, | 71 | .type = MT_DEVICE, |
| 77 | }, { | 72 | }, { |
| 78 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), | 73 | .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE), |
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index ebafe8aa8956..0c4b76ab4d8e 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
| @@ -202,7 +202,6 @@ static struct irda_platform_data assabet_irda_data = { | |||
| 202 | static struct mcp_plat_data assabet_mcp_data = { | 202 | static struct mcp_plat_data assabet_mcp_data = { |
| 203 | .mccr0 = MCCR0_ADM, | 203 | .mccr0 = MCCR0_ADM, |
| 204 | .sclk_rate = 11981000, | 204 | .sclk_rate = 11981000, |
| 205 | .codec = "ucb1x00", | ||
| 206 | }; | 205 | }; |
| 207 | 206 | ||
| 208 | static void __init assabet_init(void) | 207 | static void __init assabet_init(void) |
| @@ -253,17 +252,6 @@ static void __init assabet_init(void) | |||
| 253 | sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources, | 252 | sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources, |
| 254 | ARRAY_SIZE(assabet_flash_resources)); | 253 | ARRAY_SIZE(assabet_flash_resources)); |
| 255 | sa11x0_register_irda(&assabet_irda_data); | 254 | sa11x0_register_irda(&assabet_irda_data); |
| 256 | |||
| 257 | /* | ||
| 258 | * Setup the PPC unit correctly. | ||
| 259 | */ | ||
| 260 | PPDR &= ~PPC_RXD4; | ||
| 261 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 262 | PSDR |= PPC_RXD4; | ||
| 263 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 264 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 265 | |||
| 266 | ASSABET_BCR_set(ASSABET_BCR_CODEC_RST); | ||
| 267 | sa11x0_register_mcp(&assabet_mcp_data); | 255 | sa11x0_register_mcp(&assabet_mcp_data); |
| 268 | } | 256 | } |
| 269 | 257 | ||
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index d12d0f48b1dc..11bb6d0b9be3 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c | |||
| @@ -124,23 +124,12 @@ static void __init cerf_map_io(void) | |||
| 124 | static struct mcp_plat_data cerf_mcp_data = { | 124 | static struct mcp_plat_data cerf_mcp_data = { |
| 125 | .mccr0 = MCCR0_ADM, | 125 | .mccr0 = MCCR0_ADM, |
| 126 | .sclk_rate = 11981000, | 126 | .sclk_rate = 11981000, |
| 127 | .codec = "ucb1x00", | ||
| 128 | }; | 127 | }; |
| 129 | 128 | ||
| 130 | static void __init cerf_init(void) | 129 | static void __init cerf_init(void) |
| 131 | { | 130 | { |
| 132 | platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices)); | 131 | platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices)); |
| 133 | sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1); | 132 | sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1); |
| 134 | |||
| 135 | /* | ||
| 136 | * Setup the PPC unit correctly. | ||
| 137 | */ | ||
| 138 | PPDR &= ~PPC_RXD4; | ||
| 139 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 140 | PSDR |= PPC_RXD4; | ||
| 141 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 142 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 143 | |||
| 144 | sa11x0_register_mcp(&cerf_mcp_data); | 133 | sa11x0_register_mcp(&cerf_mcp_data); |
| 145 | } | 134 | } |
| 146 | 135 | ||
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c index d6df9f6c9f7e..dab3c6347a8f 100644 --- a/arch/arm/mach-sa1100/clock.c +++ b/arch/arm/mach-sa1100/clock.c | |||
| @@ -11,39 +11,17 @@ | |||
| 11 | #include <linux/clk.h> | 11 | #include <linux/clk.h> |
| 12 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
| 13 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 14 | #include <linux/io.h> | ||
| 15 | #include <linux/clkdev.h> | ||
| 16 | 14 | ||
| 17 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
| 18 | 16 | ||
| 19 | struct clkops { | 17 | /* |
| 20 | void (*enable)(struct clk *); | 18 | * Very simple clock implementation - we only have one clock to deal with. |
| 21 | void (*disable)(struct clk *); | 19 | */ |
| 22 | unsigned long (*getrate)(struct clk *); | ||
| 23 | }; | ||
| 24 | |||
| 25 | struct clk { | 20 | struct clk { |
| 26 | const struct clkops *ops; | ||
| 27 | unsigned long rate; | ||
| 28 | unsigned int enabled; | 21 | unsigned int enabled; |
| 29 | }; | 22 | }; |
| 30 | 23 | ||
| 31 | #define INIT_CLKREG(_clk, _devname, _conname) \ | 24 | static void clk_gpio27_enable(void) |
| 32 | { \ | ||
| 33 | .clk = _clk, \ | ||
| 34 | .dev_id = _devname, \ | ||
| 35 | .con_id = _conname, \ | ||
| 36 | } | ||
| 37 | |||
| 38 | #define DEFINE_CLK(_name, _ops, _rate) \ | ||
| 39 | struct clk clk_##_name = { \ | ||
| 40 | .ops = _ops, \ | ||
| 41 | .rate = _rate, \ | ||
| 42 | } | ||
| 43 | |||
| 44 | static DEFINE_SPINLOCK(clocks_lock); | ||
| 45 | |||
| 46 | static void clk_gpio27_enable(struct clk *clk) | ||
| 47 | { | 25 | { |
| 48 | /* | 26 | /* |
| 49 | * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111: | 27 | * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111: |
| @@ -54,22 +32,38 @@ static void clk_gpio27_enable(struct clk *clk) | |||
| 54 | TUCR = TUCR_3_6864MHz; | 32 | TUCR = TUCR_3_6864MHz; |
| 55 | } | 33 | } |
| 56 | 34 | ||
| 57 | static void clk_gpio27_disable(struct clk *clk) | 35 | static void clk_gpio27_disable(void) |
| 58 | { | 36 | { |
| 59 | TUCR = 0; | 37 | TUCR = 0; |
| 60 | GPDR &= ~GPIO_32_768kHz; | 38 | GPDR &= ~GPIO_32_768kHz; |
| 61 | GAFR &= ~GPIO_32_768kHz; | 39 | GAFR &= ~GPIO_32_768kHz; |
| 62 | } | 40 | } |
| 63 | 41 | ||
| 42 | static struct clk clk_gpio27; | ||
| 43 | |||
| 44 | static DEFINE_SPINLOCK(clocks_lock); | ||
| 45 | |||
| 46 | struct clk *clk_get(struct device *dev, const char *id) | ||
| 47 | { | ||
| 48 | const char *devname = dev_name(dev); | ||
| 49 | |||
| 50 | return strcmp(devname, "sa1111.0") ? ERR_PTR(-ENOENT) : &clk_gpio27; | ||
| 51 | } | ||
| 52 | EXPORT_SYMBOL(clk_get); | ||
| 53 | |||
| 54 | void clk_put(struct clk *clk) | ||
| 55 | { | ||
| 56 | } | ||
| 57 | EXPORT_SYMBOL(clk_put); | ||
| 58 | |||
| 64 | int clk_enable(struct clk *clk) | 59 | int clk_enable(struct clk *clk) |
| 65 | { | 60 | { |
| 66 | unsigned long flags; | 61 | unsigned long flags; |
| 67 | 62 | ||
| 68 | spin_lock_irqsave(&clocks_lock, flags); | 63 | spin_lock_irqsave(&clocks_lock, flags); |
| 69 | if (clk->enabled++ == 0) | 64 | if (clk->enabled++ == 0) |
| 70 | clk->ops->enable(clk); | 65 | clk_gpio27_enable(); |
| 71 | spin_unlock_irqrestore(&clocks_lock, flags); | 66 | spin_unlock_irqrestore(&clocks_lock, flags); |
| 72 | |||
| 73 | return 0; | 67 | return 0; |
| 74 | } | 68 | } |
| 75 | EXPORT_SYMBOL(clk_enable); | 69 | EXPORT_SYMBOL(clk_enable); |
| @@ -82,48 +76,13 @@ void clk_disable(struct clk *clk) | |||
| 82 | 76 | ||
| 83 | spin_lock_irqsave(&clocks_lock, flags); | 77 | spin_lock_irqsave(&clocks_lock, flags); |
| 84 | if (--clk->enabled == 0) | 78 | if (--clk->enabled == 0) |
| 85 | clk->ops->disable(clk); | 79 | clk_gpio27_disable(); |
| 86 | spin_unlock_irqrestore(&clocks_lock, flags); | 80 | spin_unlock_irqrestore(&clocks_lock, flags); |
| 87 | } | 81 | } |
| 88 | EXPORT_SYMBOL(clk_disable); | 82 | EXPORT_SYMBOL(clk_disable); |
| 89 | 83 | ||
| 90 | unsigned long clk_get_rate(struct clk *clk) | 84 | unsigned long clk_get_rate(struct clk *clk) |
| 91 | { | 85 | { |
| 92 | unsigned long rate; | 86 | return 3686400; |
| 93 | |||
| 94 | rate = clk->rate; | ||
| 95 | if (clk->ops->getrate) | ||
| 96 | rate = clk->ops->getrate(clk); | ||
| 97 | |||
| 98 | return rate; | ||
| 99 | } | 87 | } |
| 100 | EXPORT_SYMBOL(clk_get_rate); | 88 | EXPORT_SYMBOL(clk_get_rate); |
| 101 | |||
| 102 | const struct clkops clk_gpio27_ops = { | ||
| 103 | .enable = clk_gpio27_enable, | ||
| 104 | .disable = clk_gpio27_disable, | ||
| 105 | }; | ||
| 106 | |||
| 107 | static void clk_dummy_enable(struct clk *clk) { } | ||
| 108 | static void clk_dummy_disable(struct clk *clk) { } | ||
| 109 | |||
| 110 | const struct clkops clk_dummy_ops = { | ||
| 111 | .enable = clk_dummy_enable, | ||
| 112 | .disable = clk_dummy_disable, | ||
| 113 | }; | ||
| 114 | |||
| 115 | static DEFINE_CLK(gpio27, &clk_gpio27_ops, 3686400); | ||
| 116 | static DEFINE_CLK(dummy, &clk_dummy_ops, 0); | ||
| 117 | |||
| 118 | static struct clk_lookup sa11xx_clkregs[] = { | ||
| 119 | INIT_CLKREG(&clk_gpio27, "sa1111.0", NULL), | ||
| 120 | INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL), | ||
| 121 | }; | ||
| 122 | |||
| 123 | static int __init sa11xx_clk_init(void) | ||
| 124 | { | ||
| 125 | clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs)); | ||
| 126 | return 0; | ||
| 127 | } | ||
| 128 | |||
| 129 | postcore_initcall(sa11xx_clk_init); | ||
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index c483912d08af..fd5652118ed1 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
| 28 | #include <linux/gpio.h> | 28 | #include <linux/gpio.h> |
| 29 | #include <linux/pda_power.h> | 29 | #include <linux/pda_power.h> |
| 30 | #include <linux/mfd/ucb1x00.h> | ||
| 31 | 30 | ||
| 32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
| 33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| @@ -86,15 +85,10 @@ static struct scoop_pcmcia_config collie_pcmcia_config = { | |||
| 86 | .num_devs = 1, | 85 | .num_devs = 1, |
| 87 | }; | 86 | }; |
| 88 | 87 | ||
| 89 | static struct ucb1x00_plat_data collie_ucb1x00_data = { | ||
| 90 | .gpio_base = COLLIE_TC35143_GPIO_BASE, | ||
| 91 | }; | ||
| 92 | |||
| 93 | static struct mcp_plat_data collie_mcp_data = { | 88 | static struct mcp_plat_data collie_mcp_data = { |
| 94 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, | 89 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, |
| 95 | .sclk_rate = 9216000, | 90 | .sclk_rate = 9216000, |
| 96 | .codec = "ucb1x00", | 91 | .gpio_base = COLLIE_TC35143_GPIO_BASE, |
| 97 | .codec_pdata = &collie_ucb1x00_data, | ||
| 98 | }; | 92 | }; |
| 99 | 93 | ||
| 100 | /* | 94 | /* |
| @@ -144,8 +138,6 @@ static struct pda_power_pdata collie_power_data = { | |||
| 144 | static struct resource collie_power_resource[] = { | 138 | static struct resource collie_power_resource[] = { |
| 145 | { | 139 | { |
| 146 | .name = "ac", | 140 | .name = "ac", |
| 147 | .start = gpio_to_irq(COLLIE_GPIO_AC_IN), | ||
| 148 | .end = gpio_to_irq(COLLIE_GPIO_AC_IN), | ||
| 149 | .flags = IORESOURCE_IRQ | | 141 | .flags = IORESOURCE_IRQ | |
| 150 | IORESOURCE_IRQ_HIGHEDGE | | 142 | IORESOURCE_IRQ_HIGHEDGE | |
| 151 | IORESOURCE_IRQ_LOWEDGE, | 143 | IORESOURCE_IRQ_LOWEDGE, |
| @@ -347,7 +339,8 @@ static void __init collie_init(void) | |||
| 347 | 339 | ||
| 348 | GPSR |= _COLLIE_GPIO_UCB1x00_RESET; | 340 | GPSR |= _COLLIE_GPIO_UCB1x00_RESET; |
| 349 | 341 | ||
| 350 | 342 | collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN); | |
| 343 | collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN); | ||
| 351 | platform_scoop_config = &collie_pcmcia_config; | 344 | platform_scoop_config = &collie_pcmcia_config; |
| 352 | 345 | ||
| 353 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | 346 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |
| @@ -357,16 +350,6 @@ static void __init collie_init(void) | |||
| 357 | 350 | ||
| 358 | sa11x0_register_mtd(&collie_flash_data, collie_flash_resources, | 351 | sa11x0_register_mtd(&collie_flash_data, collie_flash_resources, |
| 359 | ARRAY_SIZE(collie_flash_resources)); | 352 | ARRAY_SIZE(collie_flash_resources)); |
| 360 | |||
| 361 | /* | ||
| 362 | * Setup the PPC unit correctly. | ||
| 363 | */ | ||
| 364 | PPDR &= ~PPC_RXD4; | ||
| 365 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 366 | PSDR |= PPC_RXD4; | ||
| 367 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 368 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 369 | |||
| 370 | sa11x0_register_mcp(&collie_mcp_data); | 353 | sa11x0_register_mcp(&collie_mcp_data); |
| 371 | 354 | ||
| 372 | sharpsl_save_param(); | 355 | sharpsl_save_param(); |
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index aaa8acf76b7b..19b2053f5af4 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c | |||
| @@ -228,7 +228,7 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) | |||
| 228 | return 0; | 228 | return 0; |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | static struct cpufreq_driver sa1100_driver = { | 231 | static struct cpufreq_driver sa1100_driver __refdata = { |
| 232 | .flags = CPUFREQ_STICKY, | 232 | .flags = CPUFREQ_STICKY, |
| 233 | .verify = sa11x0_verify_speed, | 233 | .verify = sa11x0_verify_speed, |
| 234 | .target = sa1100_target, | 234 | .target = sa1100_target, |
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index e3a28ca2a7b7..bb10ee2cb89f 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
| @@ -217,15 +217,10 @@ static struct platform_device sa11x0uart3_device = { | |||
| 217 | static struct resource sa11x0mcp_resources[] = { | 217 | static struct resource sa11x0mcp_resources[] = { |
| 218 | [0] = { | 218 | [0] = { |
| 219 | .start = __PREG(Ser4MCCR0), | 219 | .start = __PREG(Ser4MCCR0), |
| 220 | .end = __PREG(Ser4MCCR0) + 0x1C - 1, | 220 | .end = __PREG(Ser4MCCR0) + 0xffff, |
| 221 | .flags = IORESOURCE_MEM, | 221 | .flags = IORESOURCE_MEM, |
| 222 | }, | 222 | }, |
| 223 | [1] = { | 223 | [1] = { |
| 224 | .start = __PREG(Ser4MCCR1), | ||
| 225 | .end = __PREG(Ser4MCCR1) + 0x4 - 1, | ||
| 226 | .flags = IORESOURCE_MEM, | ||
| 227 | }, | ||
| 228 | [2] = { | ||
| 229 | .start = IRQ_Ser4MCP, | 224 | .start = IRQ_Ser4MCP, |
| 230 | .end = IRQ_Ser4MCP, | 225 | .end = IRQ_Ser4MCP, |
| 231 | .flags = IORESOURCE_IRQ, | 226 | .flags = IORESOURCE_IRQ, |
| @@ -350,29 +345,9 @@ void sa11x0_register_irda(struct irda_platform_data *irda) | |||
| 350 | sa11x0_register_device(&sa11x0ir_device, irda); | 345 | sa11x0_register_device(&sa11x0ir_device, irda); |
| 351 | } | 346 | } |
| 352 | 347 | ||
| 353 | static struct resource sa11x0rtc_resources[] = { | ||
| 354 | [0] = { | ||
| 355 | .start = 0x90010000, | ||
| 356 | .end = 0x900100ff, | ||
| 357 | .flags = IORESOURCE_MEM, | ||
| 358 | }, | ||
| 359 | [1] = { | ||
| 360 | .start = IRQ_RTC1Hz, | ||
| 361 | .end = IRQ_RTC1Hz, | ||
| 362 | .flags = IORESOURCE_IRQ, | ||
| 363 | }, | ||
| 364 | [2] = { | ||
| 365 | .start = IRQ_RTCAlrm, | ||
| 366 | .end = IRQ_RTCAlrm, | ||
| 367 | .flags = IORESOURCE_IRQ, | ||
| 368 | }, | ||
| 369 | }; | ||
| 370 | |||
| 371 | static struct platform_device sa11x0rtc_device = { | 348 | static struct platform_device sa11x0rtc_device = { |
| 372 | .name = "sa1100-rtc", | 349 | .name = "sa1100-rtc", |
| 373 | .id = -1, | 350 | .id = -1, |
| 374 | .resource = sa11x0rtc_resources, | ||
| 375 | .num_resources = ARRAY_SIZE(sa11x0rtc_resources), | ||
| 376 | }; | 351 | }; |
| 377 | 352 | ||
| 378 | static struct platform_device *sa11x0_devices[] __initdata = { | 353 | static struct platform_device *sa11x0_devices[] __initdata = { |
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h index 586cec898b35..ed1a331508a7 100644 --- a/arch/arm/mach-sa1100/include/mach/mcp.h +++ b/arch/arm/mach-sa1100/include/mach/mcp.h | |||
| @@ -17,8 +17,6 @@ struct mcp_plat_data { | |||
| 17 | u32 mccr1; | 17 | u32 mccr1; |
| 18 | unsigned int sclk_rate; | 18 | unsigned int sclk_rate; |
| 19 | int gpio_base; | 19 | int gpio_base; |
| 20 | const char *codec; | ||
| 21 | void *codec_pdata; | ||
| 22 | }; | 20 | }; |
| 23 | 21 | ||
| 24 | #endif | 22 | #endif |
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index f50b00bd18a0..b412fc09c80c 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
| @@ -198,3 +198,5 @@ static int __init jornada_ssp_init(void) | |||
| 198 | { | 198 | { |
| 199 | return platform_driver_register(&jornadassp_driver); | 199 | return platform_driver_register(&jornadassp_driver); |
| 200 | } | 200 | } |
| 201 | |||
| 202 | module_init(jornada_ssp_init); | ||
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index d117ceab6215..af4e2761f3db 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c | |||
| @@ -24,20 +24,10 @@ | |||
| 24 | static struct mcp_plat_data lart_mcp_data = { | 24 | static struct mcp_plat_data lart_mcp_data = { |
| 25 | .mccr0 = MCCR0_ADM, | 25 | .mccr0 = MCCR0_ADM, |
| 26 | .sclk_rate = 11981000, | 26 | .sclk_rate = 11981000, |
| 27 | .codec = "ucb1x00", | ||
| 28 | }; | 27 | }; |
| 29 | 28 | ||
| 30 | static void __init lart_init(void) | 29 | static void __init lart_init(void) |
| 31 | { | 30 | { |
| 32 | /* | ||
| 33 | * Setup the PPC unit correctly. | ||
| 34 | */ | ||
| 35 | PPDR &= ~PPC_RXD4; | ||
| 36 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 37 | PSDR |= PPC_RXD4; | ||
| 38 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 39 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 40 | |||
| 41 | sa11x0_register_mcp(&lart_mcp_data); | 31 | sa11x0_register_mcp(&lart_mcp_data); |
| 42 | } | 32 | } |
| 43 | 33 | ||
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 748d34435b3f..318b2b766a0b 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
| @@ -55,22 +55,11 @@ static struct resource shannon_flash_resource = { | |||
| 55 | static struct mcp_plat_data shannon_mcp_data = { | 55 | static struct mcp_plat_data shannon_mcp_data = { |
| 56 | .mccr0 = MCCR0_ADM, | 56 | .mccr0 = MCCR0_ADM, |
| 57 | .sclk_rate = 11981000, | 57 | .sclk_rate = 11981000, |
| 58 | .codec = "ucb1x00", | ||
| 59 | }; | 58 | }; |
| 60 | 59 | ||
| 61 | static void __init shannon_init(void) | 60 | static void __init shannon_init(void) |
| 62 | { | 61 | { |
| 63 | sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); | 62 | sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); |
| 64 | |||
| 65 | /* | ||
| 66 | * Setup the PPC unit correctly. | ||
| 67 | */ | ||
| 68 | PPDR &= ~PPC_RXD4; | ||
| 69 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 70 | PSDR |= PPC_RXD4; | ||
| 71 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 72 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 73 | |||
| 74 | sa11x0_register_mcp(&shannon_mcp_data); | 63 | sa11x0_register_mcp(&shannon_mcp_data); |
| 75 | } | 64 | } |
| 76 | 65 | ||
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index 458ececefa58..e17c04d6e324 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/mtd/partitions.h> | 14 | #include <linux/mtd/partitions.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
| 17 | #include <linux/mfd/ucb1x00.h> | ||
| 18 | 17 | ||
| 19 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
| 20 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
| @@ -188,15 +187,10 @@ static struct resource simpad_flash_resources [] = { | |||
| 188 | } | 187 | } |
| 189 | }; | 188 | }; |
| 190 | 189 | ||
| 191 | static struct ucb1x00_plat_data simpad_ucb1x00_data = { | ||
| 192 | .gpio_base = SIMPAD_UCB1X00_GPIO_BASE, | ||
| 193 | }; | ||
| 194 | |||
| 195 | static struct mcp_plat_data simpad_mcp_data = { | 190 | static struct mcp_plat_data simpad_mcp_data = { |
| 196 | .mccr0 = MCCR0_ADM, | 191 | .mccr0 = MCCR0_ADM, |
| 197 | .sclk_rate = 11981000, | 192 | .sclk_rate = 11981000, |
| 198 | .codec = "ucb1300", | 193 | .gpio_base = SIMPAD_UCB1X00_GPIO_BASE, |
| 199 | .codec_pdata = &simpad_ucb1x00_data, | ||
| 200 | }; | 194 | }; |
| 201 | 195 | ||
| 202 | 196 | ||
| @@ -384,16 +378,6 @@ static int __init simpad_init(void) | |||
| 384 | 378 | ||
| 385 | sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, | 379 | sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, |
| 386 | ARRAY_SIZE(simpad_flash_resources)); | 380 | ARRAY_SIZE(simpad_flash_resources)); |
| 387 | |||
| 388 | /* | ||
| 389 | * Setup the PPC unit correctly. | ||
| 390 | */ | ||
| 391 | PPDR &= ~PPC_RXD4; | ||
| 392 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 393 | PSDR |= PPC_RXD4; | ||
| 394 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 395 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 396 | |||
| 397 | sa11x0_register_mcp(&simpad_mcp_data); | 381 | sa11x0_register_mcp(&simpad_mcp_data); |
| 398 | 382 | ||
| 399 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); | 383 | ret = platform_add_devices(devices, ARRAY_SIZE(devices)); |
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c index cc97ef892d1b..4fe2e9eaf501 100644 --- a/arch/arm/mach-shmobile/smp-r8a7779.c +++ b/arch/arm/mach-shmobile/smp-r8a7779.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <mach/common.h> | 26 | #include <mach/common.h> |
| 27 | #include <mach/r8a7779.h> | 27 | #include <mach/r8a7779.h> |
| 28 | #include <asm/smp_plat.h> | ||
| 28 | #include <asm/smp_scu.h> | 29 | #include <asm/smp_scu.h> |
| 29 | #include <asm/smp_twd.h> | 30 | #include <asm/smp_twd.h> |
| 30 | #include <asm/hardware/gic.h> | 31 | #include <asm/hardware/gic.h> |
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c index be1ade76ccc8..0d159d64a345 100644 --- a/arch/arm/mach-shmobile/smp-sh73a0.c +++ b/arch/arm/mach-shmobile/smp-sh73a0.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <mach/common.h> | 25 | #include <mach/common.h> |
| 26 | #include <asm/smp_plat.h> | ||
| 26 | #include <asm/smp_scu.h> | 27 | #include <asm/smp_scu.h> |
| 27 | #include <asm/smp_twd.h> | 28 | #include <asm/smp_twd.h> |
| 28 | #include <asm/hardware/gic.h> | 29 | #include <asm/hardware/gic.h> |
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index a3e0c8692f0d..52af00446a63 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig | |||
| @@ -7,6 +7,7 @@ config UX500_SOC_COMMON | |||
| 7 | select HAS_MTU | 7 | select HAS_MTU |
| 8 | select ARM_ERRATA_753970 | 8 | select ARM_ERRATA_753970 |
| 9 | select ARM_ERRATA_754322 | 9 | select ARM_ERRATA_754322 |
| 10 | select ARM_ERRATA_764369 | ||
| 10 | 11 | ||
| 11 | menu "Ux500 SoC" | 12 | menu "Ux500 SoC" |
| 12 | 13 | ||
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 23be34b3bb6e..5dde4d4ebe88 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c | |||
| @@ -261,6 +261,8 @@ void __init mop500_sdi_init(void) | |||
| 261 | 261 | ||
| 262 | void __init snowball_sdi_init(void) | 262 | void __init snowball_sdi_init(void) |
| 263 | { | 263 | { |
| 264 | /* On Snowball MMC_CAP_SD_HIGHSPEED isn't supported (Hardware issue?) */ | ||
| 265 | mop500_sdi0_data.capabilities &= ~MMC_CAP_SD_HIGHSPEED; | ||
| 264 | /* On-board eMMC */ | 266 | /* On-board eMMC */ |
| 265 | db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID); | 267 | db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID); |
| 266 | /* External Micro SD slot */ | 268 | /* External Micro SD slot */ |
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c index 122ddde00ba7..da5569d83d58 100644 --- a/arch/arm/mach-ux500/cache-l2x0.c +++ b/arch/arm/mach-ux500/cache-l2x0.c | |||
| @@ -12,44 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | static void __iomem *l2x0_base; | 13 | static void __iomem *l2x0_base; |
| 14 | 14 | ||
| 15 | static inline void ux500_cache_wait(void __iomem *reg, unsigned long mask) | ||
| 16 | { | ||
| 17 | /* wait for the operation to complete */ | ||
| 18 | while (readl_relaxed(reg) & mask) | ||
| 19 | cpu_relax(); | ||
| 20 | } | ||
| 21 | |||
| 22 | static inline void ux500_cache_sync(void) | ||
| 23 | { | ||
| 24 | writel_relaxed(0, l2x0_base + L2X0_CACHE_SYNC); | ||
| 25 | ux500_cache_wait(l2x0_base + L2X0_CACHE_SYNC, 1); | ||
| 26 | } | ||
| 27 | |||
| 28 | /* | ||
| 29 | * The L2 cache cannot be turned off in the non-secure world. | ||
| 30 | * Dummy until a secure service is in place. | ||
| 31 | */ | ||
| 32 | static void ux500_l2x0_disable(void) | ||
| 33 | { | ||
| 34 | } | ||
| 35 | |||
| 36 | /* | ||
| 37 | * This is only called when doing a kexec, just after turning off the L2 | ||
| 38 | * and L1 cache, and it is surrounded by a spinlock in the generic version. | ||
| 39 | * However, we're not really turning off the L2 cache right now and the | ||
| 40 | * PL310 does not support exclusive accesses (used to implement the spinlock). | ||
| 41 | * So, the invalidation needs to be done without the spinlock. | ||
| 42 | */ | ||
| 43 | static void ux500_l2x0_inv_all(void) | ||
| 44 | { | ||
| 45 | uint32_t l2x0_way_mask = (1<<16) - 1; /* Bitmask of active ways */ | ||
| 46 | |||
| 47 | /* invalidate all ways */ | ||
| 48 | writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_INV_WAY); | ||
| 49 | ux500_cache_wait(l2x0_base + L2X0_INV_WAY, l2x0_way_mask); | ||
| 50 | ux500_cache_sync(); | ||
| 51 | } | ||
| 52 | |||
| 53 | static int __init ux500_l2x0_unlock(void) | 15 | static int __init ux500_l2x0_unlock(void) |
| 54 | { | 16 | { |
| 55 | int i; | 17 | int i; |
| @@ -85,9 +47,13 @@ static int __init ux500_l2x0_init(void) | |||
| 85 | /* 64KB way size, 8 way associativity, force WA */ | 47 | /* 64KB way size, 8 way associativity, force WA */ |
| 86 | l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff); | 48 | l2x0_init(l2x0_base, 0x3e060000, 0xc0000fff); |
| 87 | 49 | ||
| 88 | /* Override invalidate function */ | 50 | /* |
| 89 | outer_cache.disable = ux500_l2x0_disable; | 51 | * We can't disable l2 as we are in non secure mode, currently |
| 90 | outer_cache.inv_all = ux500_l2x0_inv_all; | 52 | * this seems be called only during kexec path. So let's |
| 53 | * override outer.disable with nasty assignment until we have | ||
| 54 | * some SMI service available. | ||
| 55 | */ | ||
| 56 | outer_cache.disable = NULL; | ||
| 91 | 57 | ||
| 92 | return 0; | 58 | return 0; |
| 93 | } | 59 | } |
diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c index 572015e57cd9..c76f0f456f04 100644 --- a/arch/arm/mach-ux500/hotplug.c +++ b/arch/arm/mach-ux500/hotplug.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | 14 | ||
| 15 | #include <asm/cacheflush.h> | 15 | #include <asm/cacheflush.h> |
| 16 | #include <asm/smp_plat.h> | ||
| 16 | 17 | ||
| 17 | extern volatile int pen_release; | 18 | extern volatile int pen_release; |
| 18 | 19 | ||
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index a19e398dade3..d2058ef8345f 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <asm/cacheflush.h> | 20 | #include <asm/cacheflush.h> |
| 21 | #include <asm/hardware/gic.h> | 21 | #include <asm/hardware/gic.h> |
| 22 | #include <asm/smp_plat.h> | ||
| 22 | #include <asm/smp_scu.h> | 23 | #include <asm/smp_scu.h> |
| 23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 24 | #include <mach/setup.h> | 25 | #include <mach/setup.h> |
diff --git a/arch/arm/mach-ux500/usb.c b/arch/arm/mach-ux500/usb.c index 0a01cbdfe063..9f9e1c203061 100644 --- a/arch/arm/mach-ux500/usb.c +++ b/arch/arm/mach-ux500/usb.c | |||
| @@ -95,13 +95,7 @@ static struct musb_hdrc_config musb_hdrc_config = { | |||
| 95 | }; | 95 | }; |
| 96 | 96 | ||
| 97 | static struct musb_hdrc_platform_data musb_platform_data = { | 97 | static struct musb_hdrc_platform_data musb_platform_data = { |
| 98 | #if defined(CONFIG_USB_MUSB_OTG) | ||
| 99 | .mode = MUSB_OTG, | 98 | .mode = MUSB_OTG, |
| 100 | #elif defined(CONFIG_USB_MUSB_PERIPHERAL) | ||
| 101 | .mode = MUSB_PERIPHERAL, | ||
| 102 | #else /* defined(CONFIG_USB_MUSB_HOST) */ | ||
| 103 | .mode = MUSB_HOST, | ||
| 104 | #endif | ||
| 105 | .config = &musb_hdrc_config, | 99 | .config = &musb_hdrc_config, |
| 106 | .board_data = &musb_board_data, | 100 | .board_data = &musb_board_data, |
| 107 | }; | 101 | }; |
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 2b1e836a76ed..b1e87c184e54 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
| @@ -217,7 +217,7 @@ static void __init ct_ca9x4_init(void) | |||
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | #ifdef CONFIG_SMP | 219 | #ifdef CONFIG_SMP |
| 220 | static void ct_ca9x4_init_cpu_map(void) | 220 | static void __init ct_ca9x4_init_cpu_map(void) |
| 221 | { | 221 | { |
| 222 | int i, ncores = scu_get_core_count(MMIO_P2V(A9_MPCORE_SCU)); | 222 | int i, ncores = scu_get_core_count(MMIO_P2V(A9_MPCORE_SCU)); |
| 223 | 223 | ||
| @@ -233,7 +233,7 @@ static void ct_ca9x4_init_cpu_map(void) | |||
| 233 | set_smp_cross_call(gic_raise_softirq); | 233 | set_smp_cross_call(gic_raise_softirq); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | static void ct_ca9x4_smp_enable(unsigned int max_cpus) | 236 | static void __init ct_ca9x4_smp_enable(unsigned int max_cpus) |
| 237 | { | 237 | { |
| 238 | scu_enable(MMIO_P2V(A9_MPCORE_SCU)); | 238 | scu_enable(MMIO_P2V(A9_MPCORE_SCU)); |
| 239 | } | 239 | } |
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c index 813ee08f96e6..3034a4dab4a1 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | 14 | ||
| 15 | #include <asm/cacheflush.h> | 15 | #include <asm/cacheflush.h> |
| 16 | #include <asm/smp_plat.h> | ||
| 16 | #include <asm/system.h> | 17 | #include <asm/system.h> |
| 17 | 18 | ||
| 18 | extern volatile int pen_release; | 19 | extern volatile int pen_release; |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4cefb57d9ed2..1a3ca2488164 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -882,6 +882,7 @@ config CACHE_XSC3L2 | |||
| 882 | 882 | ||
| 883 | config ARM_L1_CACHE_SHIFT_6 | 883 | config ARM_L1_CACHE_SHIFT_6 |
| 884 | bool | 884 | bool |
| 885 | default y if CPU_V7 | ||
| 885 | help | 886 | help |
| 886 | Setting ARM L1 cache line size to 64 Bytes. | 887 | Setting ARM L1 cache line size to 64 Bytes. |
| 887 | 888 | ||
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 6ec1226fc62d..5dc7d127a40f 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
| @@ -310,7 +310,7 @@ static void arm_memory_present(void) | |||
| 310 | 310 | ||
| 311 | static bool arm_memblock_steal_permitted = true; | 311 | static bool arm_memblock_steal_permitted = true; |
| 312 | 312 | ||
| 313 | phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align) | 313 | phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) |
| 314 | { | 314 | { |
| 315 | phys_addr_t phys; | 315 | phys_addr_t phys; |
| 316 | 316 | ||
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 80632e8d7538..ba159370fa5f 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -225,7 +225,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn, | |||
| 225 | if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype)) | 225 | if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype)) |
| 226 | continue; | 226 | continue; |
| 227 | if (__phys_to_pfn(area->phys_addr) > pfn || | 227 | if (__phys_to_pfn(area->phys_addr) > pfn || |
| 228 | __pfn_to_phys(pfn) + size-1 > area->phys_addr + area->size-1) | 228 | __pfn_to_phys(pfn) + offset + size-1 > |
| 229 | area->phys_addr + area->size-1) | ||
| 229 | continue; | 230 | continue; |
| 230 | /* we can drop the lock here as we know *area is static */ | 231 | /* we can drop the lock here as we know *area is static */ |
| 231 | read_unlock(&vmlist_lock); | 232 | read_unlock(&vmlist_lock); |
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 7e9b5bf910c1..0404ccbb8aa3 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
| @@ -148,10 +148,6 @@ ENDPROC(cpu_v7_do_resume) | |||
| 148 | * Initialise TLB, Caches, and MMU state ready to switch the MMU | 148 | * Initialise TLB, Caches, and MMU state ready to switch the MMU |
| 149 | * on. Return in r0 the new CP15 C1 control register setting. | 149 | * on. Return in r0 the new CP15 C1 control register setting. |
| 150 | * | 150 | * |
| 151 | * We automatically detect if we have a Harvard cache, and use the | ||
| 152 | * Harvard cache control instructions insead of the unified cache | ||
| 153 | * control instructions. | ||
| 154 | * | ||
| 155 | * This should be able to cover all ARMv7 cores. | 151 | * This should be able to cover all ARMv7 cores. |
| 156 | * | 152 | * |
| 157 | * It is assumed that: | 153 | * It is assumed that: |
| @@ -251,9 +247,7 @@ __v7_setup: | |||
| 251 | #endif | 247 | #endif |
| 252 | 248 | ||
| 253 | 3: mov r10, #0 | 249 | 3: mov r10, #0 |
| 254 | #ifdef HARVARD_CACHE | ||
| 255 | mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate | 250 | mcr p15, 0, r10, c7, c5, 0 @ I+BTB cache invalidate |
| 256 | #endif | ||
| 257 | dsb | 251 | dsb |
| 258 | #ifdef CONFIG_MMU | 252 | #ifdef CONFIG_MMU |
| 259 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs | 253 | mcr p15, 0, r10, c8, c7, 0 @ invalidate I + D TLBs |
| @@ -330,16 +324,6 @@ __v7_ca5mp_proc_info: | |||
| 330 | .size __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info | 324 | .size __v7_ca5mp_proc_info, . - __v7_ca5mp_proc_info |
| 331 | 325 | ||
| 332 | /* | 326 | /* |
| 333 | * ARM Ltd. Cortex A7 processor. | ||
| 334 | */ | ||
| 335 | .type __v7_ca7mp_proc_info, #object | ||
| 336 | __v7_ca7mp_proc_info: | ||
| 337 | .long 0x410fc070 | ||
| 338 | .long 0xff0ffff0 | ||
| 339 | __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV | ||
| 340 | .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info | ||
| 341 | |||
| 342 | /* | ||
| 343 | * ARM Ltd. Cortex A9 processor. | 327 | * ARM Ltd. Cortex A9 processor. |
| 344 | */ | 328 | */ |
| 345 | .type __v7_ca9mp_proc_info, #object | 329 | .type __v7_ca9mp_proc_info, #object |
| @@ -351,6 +335,16 @@ __v7_ca9mp_proc_info: | |||
| 351 | #endif /* CONFIG_ARM_LPAE */ | 335 | #endif /* CONFIG_ARM_LPAE */ |
| 352 | 336 | ||
| 353 | /* | 337 | /* |
| 338 | * ARM Ltd. Cortex A7 processor. | ||
| 339 | */ | ||
| 340 | .type __v7_ca7mp_proc_info, #object | ||
| 341 | __v7_ca7mp_proc_info: | ||
| 342 | .long 0x410fc070 | ||
| 343 | .long 0xff0ffff0 | ||
| 344 | __v7_proc __v7_ca7mp_setup, hwcaps = HWCAP_IDIV | ||
| 345 | .size __v7_ca7mp_proc_info, . - __v7_ca7mp_proc_info | ||
| 346 | |||
| 347 | /* | ||
| 354 | * ARM Ltd. Cortex A15 processor. | 348 | * ARM Ltd. Cortex A15 processor. |
| 355 | */ | 349 | */ |
| 356 | .type __v7_ca15mp_proc_info, #object | 350 | .type __v7_ca15mp_proc_info, #object |
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h index 6fa8a707b9a0..f7d18046c04f 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v1.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h | |||
| @@ -96,6 +96,6 @@ extern int mxc_gpio_mode(int gpio_mode); | |||
| 96 | extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, | 96 | extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, |
| 97 | const char *label); | 97 | const char *label); |
| 98 | 98 | ||
| 99 | extern int __init imx_iomuxv1_init(void __iomem *base, int numports); | 99 | extern int imx_iomuxv1_init(void __iomem *base, int numports); |
| 100 | 100 | ||
| 101 | #endif /* __MACH_IOMUX_V1_H__ */ | 101 | #endif /* __MACH_IOMUX_V1_H__ */ |
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c index 92f18d372b69..49c7db48c7f1 100644 --- a/arch/arm/plat-versatile/platsmp.c +++ b/arch/arm/plat-versatile/platsmp.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/smp.h> | 16 | #include <linux/smp.h> |
| 17 | 17 | ||
| 18 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
| 19 | #include <asm/smp_plat.h> | ||
| 19 | #include <asm/hardware/gic.h> | 20 | #include <asm/hardware/gic.h> |
| 20 | 21 | ||
| 21 | /* | 22 | /* |
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 74f23a460ba2..c8d6efb99dbf 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -19,6 +19,7 @@ config MICROBLAZE | |||
| 19 | select GENERIC_IRQ_SHOW | 19 | select GENERIC_IRQ_SHOW |
| 20 | select GENERIC_PCI_IOMAP | 20 | select GENERIC_PCI_IOMAP |
| 21 | select GENERIC_CPU_DEVICES | 21 | select GENERIC_CPU_DEVICES |
| 22 | select GENERIC_ATOMIC64 | ||
| 22 | 23 | ||
| 23 | config SWAP | 24 | config SWAP |
| 24 | def_bool n | 25 | def_bool n |
diff --git a/arch/microblaze/include/asm/atomic.h b/arch/microblaze/include/asm/atomic.h index 6d2e1d418be7..615f53992c65 100644 --- a/arch/microblaze/include/asm/atomic.h +++ b/arch/microblaze/include/asm/atomic.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define _ASM_MICROBLAZE_ATOMIC_H | 2 | #define _ASM_MICROBLAZE_ATOMIC_H |
| 3 | 3 | ||
| 4 | #include <asm-generic/atomic.h> | 4 | #include <asm-generic/atomic.h> |
| 5 | #include <asm-generic/atomic64.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * Atomically test *v and decrement if it is greater than 0. | 8 | * Atomically test *v and decrement if it is greater than 0. |
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index d4fc1a971779..604cd9dd1333 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/cache.h> | 26 | #include <linux/cache.h> |
| 27 | #include <linux/of_platform.h> | 27 | #include <linux/of_platform.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/cpu.h> | ||
| 30 | #include <asm/cacheflush.h> | 29 | #include <asm/cacheflush.h> |
| 31 | #include <asm/entry.h> | 30 | #include <asm/entry.h> |
| 32 | #include <asm/cpuinfo.h> | 31 | #include <asm/cpuinfo.h> |
| @@ -227,23 +226,5 @@ static int __init setup_bus_notifier(void) | |||
| 227 | 226 | ||
| 228 | return 0; | 227 | return 0; |
| 229 | } | 228 | } |
| 230 | arch_initcall(setup_bus_notifier); | ||
| 231 | |||
| 232 | static DEFINE_PER_CPU(struct cpu, cpu_devices); | ||
| 233 | |||
| 234 | static int __init topology_init(void) | ||
| 235 | { | ||
| 236 | int i, ret; | ||
| 237 | |||
| 238 | for_each_present_cpu(i) { | ||
| 239 | struct cpu *c = &per_cpu(cpu_devices, i); | ||
| 240 | 229 | ||
| 241 | ret = register_cpu(c, i); | 230 | arch_initcall(setup_bus_notifier); |
| 242 | if (ret) | ||
| 243 | printk(KERN_WARNING "topology_init: register_cpu %d " | ||
| 244 | "failed (%d)\n", i, ret); | ||
| 245 | } | ||
| 246 | |||
| 247 | return 0; | ||
| 248 | } | ||
| 249 | subsys_initcall(topology_init); | ||
diff --git a/arch/s390/Makefile b/arch/s390/Makefile index e9f353341693..0ad2f1e1ce9e 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile | |||
| @@ -88,7 +88,6 @@ KBUILD_CFLAGS += -pipe -fno-strength-reduce -Wno-sign-compare | |||
| 88 | KBUILD_AFLAGS += $(aflags-y) | 88 | KBUILD_AFLAGS += $(aflags-y) |
| 89 | 89 | ||
| 90 | OBJCOPYFLAGS := -O binary | 90 | OBJCOPYFLAGS := -O binary |
| 91 | LDFLAGS_vmlinux := -e start | ||
| 92 | 91 | ||
| 93 | head-y := arch/s390/kernel/head.o | 92 | head-y := arch/s390/kernel/head.o |
| 94 | head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o) | 93 | head-y += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o) |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index e4c79ebb40e6..21109c63eb12 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
| @@ -9,12 +9,12 @@ | |||
| 9 | #ifndef CONFIG_64BIT | 9 | #ifndef CONFIG_64BIT |
| 10 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") | 10 | OUTPUT_FORMAT("elf32-s390", "elf32-s390", "elf32-s390") |
| 11 | OUTPUT_ARCH(s390) | 11 | OUTPUT_ARCH(s390) |
| 12 | ENTRY(_start) | 12 | ENTRY(startup) |
| 13 | jiffies = jiffies_64 + 4; | 13 | jiffies = jiffies_64 + 4; |
| 14 | #else | 14 | #else |
| 15 | OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") | 15 | OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390") |
| 16 | OUTPUT_ARCH(s390:64-bit) | 16 | OUTPUT_ARCH(s390:64-bit) |
| 17 | ENTRY(_start) | 17 | ENTRY(startup) |
| 18 | jiffies = jiffies_64; | 18 | jiffies = jiffies_64; |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 96657992a72e..ca5580e4d813 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -33,6 +33,7 @@ config SPARC | |||
| 33 | config SPARC32 | 33 | config SPARC32 |
| 34 | def_bool !64BIT | 34 | def_bool !64BIT |
| 35 | select GENERIC_ATOMIC64 | 35 | select GENERIC_ATOMIC64 |
| 36 | select CLZ_TAB | ||
| 36 | 37 | ||
| 37 | config SPARC64 | 38 | config SPARC64 |
| 38 | def_bool 64BIT | 39 | def_bool 64BIT |
diff --git a/arch/sparc/lib/divdi3.S b/arch/sparc/lib/divdi3.S index 681b3683da9e..d74bc0925f2d 100644 --- a/arch/sparc/lib/divdi3.S +++ b/arch/sparc/lib/divdi3.S | |||
| @@ -17,23 +17,9 @@ along with GNU CC; see the file COPYING. If not, write to | |||
| 17 | the Free Software Foundation, 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, 59 Temple Place - Suite 330, |
| 18 | Boston, MA 02111-1307, USA. */ | 18 | Boston, MA 02111-1307, USA. */ |
| 19 | 19 | ||
| 20 | .data | ||
| 21 | .align 8 | ||
| 22 | .globl __clz_tab | ||
| 23 | __clz_tab: | ||
| 24 | .byte 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 | ||
| 25 | .byte 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6 | ||
| 26 | .byte 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 | ||
| 27 | .byte 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 | ||
| 28 | .byte 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 | ||
| 29 | .byte 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 | ||
| 30 | .byte 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 | ||
| 31 | .byte 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 | ||
| 32 | .size __clz_tab,256 | ||
| 33 | .global .udiv | ||
| 34 | |||
| 35 | .text | 20 | .text |
| 36 | .align 4 | 21 | .align 4 |
| 22 | .global .udiv | ||
| 37 | .globl __divdi3 | 23 | .globl __divdi3 |
| 38 | __divdi3: | 24 | __divdi3: |
| 39 | save %sp,-104,%sp | 25 | save %sp,-104,%sp |
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h index 0c9fa2745f13..b3b733262909 100644 --- a/arch/x86/include/asm/cmpxchg.h +++ b/arch/x86/include/asm/cmpxchg.h | |||
| @@ -145,13 +145,13 @@ extern void __add_wrong_size(void) | |||
| 145 | 145 | ||
| 146 | #ifdef __HAVE_ARCH_CMPXCHG | 146 | #ifdef __HAVE_ARCH_CMPXCHG |
| 147 | #define cmpxchg(ptr, old, new) \ | 147 | #define cmpxchg(ptr, old, new) \ |
| 148 | __cmpxchg((ptr), (old), (new), sizeof(*ptr)) | 148 | __cmpxchg(ptr, old, new, sizeof(*(ptr))) |
| 149 | 149 | ||
| 150 | #define sync_cmpxchg(ptr, old, new) \ | 150 | #define sync_cmpxchg(ptr, old, new) \ |
| 151 | __sync_cmpxchg((ptr), (old), (new), sizeof(*ptr)) | 151 | __sync_cmpxchg(ptr, old, new, sizeof(*(ptr))) |
| 152 | 152 | ||
| 153 | #define cmpxchg_local(ptr, old, new) \ | 153 | #define cmpxchg_local(ptr, old, new) \ |
| 154 | __cmpxchg_local((ptr), (old), (new), sizeof(*ptr)) | 154 | __cmpxchg_local(ptr, old, new, sizeof(*(ptr))) |
| 155 | #endif | 155 | #endif |
| 156 | 156 | ||
| 157 | /* | 157 | /* |
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index f8bddb5b0600..3c44b712380c 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -988,9 +988,6 @@ static void x86_pmu_start(struct perf_event *event, int flags) | |||
| 988 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); | 988 | struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); |
| 989 | int idx = event->hw.idx; | 989 | int idx = event->hw.idx; |
| 990 | 990 | ||
| 991 | if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED))) | ||
| 992 | return; | ||
| 993 | |||
| 994 | if (WARN_ON_ONCE(idx == -1)) | 991 | if (WARN_ON_ONCE(idx == -1)) |
| 995 | return; | 992 | return; |
| 996 | 993 | ||
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c index 73da6b64f5b7..d6bd49faa40c 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c | |||
| @@ -439,7 +439,6 @@ void intel_pmu_pebs_enable(struct perf_event *event) | |||
| 439 | hwc->config &= ~ARCH_PERFMON_EVENTSEL_INT; | 439 | hwc->config &= ~ARCH_PERFMON_EVENTSEL_INT; |
| 440 | 440 | ||
| 441 | cpuc->pebs_enabled |= 1ULL << hwc->idx; | 441 | cpuc->pebs_enabled |= 1ULL << hwc->idx; |
| 442 | WARN_ON_ONCE(cpuc->enabled); | ||
| 443 | 442 | ||
| 444 | if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1) | 443 | if (x86_pmu.intel_cap.pebs_trap && event->attr.precise_ip > 1) |
| 445 | intel_pmu_lbr_enable(event); | 444 | intel_pmu_lbr_enable(event); |
diff --git a/arch/x86/kernel/cpu/perf_event_intel_lbr.c b/arch/x86/kernel/cpu/perf_event_intel_lbr.c index 3fab3de3ce96..47a7e63bfe54 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_lbr.c +++ b/arch/x86/kernel/cpu/perf_event_intel_lbr.c | |||
| @@ -72,8 +72,6 @@ void intel_pmu_lbr_enable(struct perf_event *event) | |||
| 72 | if (!x86_pmu.lbr_nr) | 72 | if (!x86_pmu.lbr_nr) |
| 73 | return; | 73 | return; |
| 74 | 74 | ||
| 75 | WARN_ON_ONCE(cpuc->enabled); | ||
| 76 | |||
| 77 | /* | 75 | /* |
| 78 | * Reset the LBR stack if we changed task context to | 76 | * Reset the LBR stack if we changed task context to |
| 79 | * avoid data leaks. | 77 | * avoid data leaks. |
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 1aae78f775fc..4025fe4f928f 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -252,7 +252,8 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) | |||
| 252 | unsigned short ss; | 252 | unsigned short ss; |
| 253 | unsigned long sp; | 253 | unsigned long sp; |
| 254 | #endif | 254 | #endif |
| 255 | printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); | 255 | printk(KERN_DEFAULT |
| 256 | "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); | ||
| 256 | #ifdef CONFIG_PREEMPT | 257 | #ifdef CONFIG_PREEMPT |
| 257 | printk("PREEMPT "); | 258 | printk("PREEMPT "); |
| 258 | #endif | 259 | #endif |
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index af7785ff5aa0..17107bd6e1f0 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c | |||
| @@ -269,11 +269,11 @@ void show_registers(struct pt_regs *regs) | |||
| 269 | unsigned char c; | 269 | unsigned char c; |
| 270 | u8 *ip; | 270 | u8 *ip; |
| 271 | 271 | ||
| 272 | printk(KERN_EMERG "Stack:\n"); | 272 | printk(KERN_DEFAULT "Stack:\n"); |
| 273 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, | 273 | show_stack_log_lvl(NULL, regs, (unsigned long *)sp, |
| 274 | 0, KERN_EMERG); | 274 | 0, KERN_DEFAULT); |
| 275 | 275 | ||
| 276 | printk(KERN_EMERG "Code: "); | 276 | printk(KERN_DEFAULT "Code: "); |
| 277 | 277 | ||
| 278 | ip = (u8 *)regs->ip - code_prologue; | 278 | ip = (u8 *)regs->ip - code_prologue; |
| 279 | if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { | 279 | if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 37a458b521a6..d840e69a853c 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -39,6 +39,14 @@ static int reboot_mode; | |||
| 39 | enum reboot_type reboot_type = BOOT_ACPI; | 39 | enum reboot_type reboot_type = BOOT_ACPI; |
| 40 | int reboot_force; | 40 | int reboot_force; |
| 41 | 41 | ||
| 42 | /* This variable is used privately to keep track of whether or not | ||
| 43 | * reboot_type is still set to its default value (i.e., reboot= hasn't | ||
| 44 | * been set on the command line). This is needed so that we can | ||
| 45 | * suppress DMI scanning for reboot quirks. Without it, it's | ||
| 46 | * impossible to override a faulty reboot quirk without recompiling. | ||
| 47 | */ | ||
| 48 | static int reboot_default = 1; | ||
| 49 | |||
| 42 | #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) | 50 | #if defined(CONFIG_X86_32) && defined(CONFIG_SMP) |
| 43 | static int reboot_cpu = -1; | 51 | static int reboot_cpu = -1; |
| 44 | #endif | 52 | #endif |
| @@ -67,6 +75,12 @@ bool port_cf9_safe = false; | |||
| 67 | static int __init reboot_setup(char *str) | 75 | static int __init reboot_setup(char *str) |
| 68 | { | 76 | { |
| 69 | for (;;) { | 77 | for (;;) { |
| 78 | /* Having anything passed on the command line via | ||
| 79 | * reboot= will cause us to disable DMI checking | ||
| 80 | * below. | ||
| 81 | */ | ||
| 82 | reboot_default = 0; | ||
| 83 | |||
| 70 | switch (*str) { | 84 | switch (*str) { |
| 71 | case 'w': | 85 | case 'w': |
| 72 | reboot_mode = 0x1234; | 86 | reboot_mode = 0x1234; |
| @@ -295,14 +309,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
| 295 | DMI_MATCH(DMI_BOARD_NAME, "P4S800"), | 309 | DMI_MATCH(DMI_BOARD_NAME, "P4S800"), |
| 296 | }, | 310 | }, |
| 297 | }, | 311 | }, |
| 298 | { /* Handle problems with rebooting on VersaLogic Menlow boards */ | ||
| 299 | .callback = set_bios_reboot, | ||
| 300 | .ident = "VersaLogic Menlow based board", | ||
| 301 | .matches = { | ||
| 302 | DMI_MATCH(DMI_BOARD_VENDOR, "VersaLogic Corporation"), | ||
| 303 | DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"), | ||
| 304 | }, | ||
| 305 | }, | ||
| 306 | { /* Handle reboot issue on Acer Aspire one */ | 312 | { /* Handle reboot issue on Acer Aspire one */ |
| 307 | .callback = set_kbd_reboot, | 313 | .callback = set_kbd_reboot, |
| 308 | .ident = "Acer Aspire One A110", | 314 | .ident = "Acer Aspire One A110", |
| @@ -316,7 +322,12 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { | |||
| 316 | 322 | ||
| 317 | static int __init reboot_init(void) | 323 | static int __init reboot_init(void) |
| 318 | { | 324 | { |
| 319 | dmi_check_system(reboot_dmi_table); | 325 | /* Only do the DMI check if reboot_type hasn't been overridden |
| 326 | * on the command line | ||
| 327 | */ | ||
| 328 | if (reboot_default) { | ||
| 329 | dmi_check_system(reboot_dmi_table); | ||
| 330 | } | ||
| 320 | return 0; | 331 | return 0; |
| 321 | } | 332 | } |
| 322 | core_initcall(reboot_init); | 333 | core_initcall(reboot_init); |
| @@ -465,7 +476,12 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { | |||
| 465 | 476 | ||
| 466 | static int __init pci_reboot_init(void) | 477 | static int __init pci_reboot_init(void) |
| 467 | { | 478 | { |
| 468 | dmi_check_system(pci_reboot_dmi_table); | 479 | /* Only do the DMI check if reboot_type hasn't been overridden |
| 480 | * on the command line | ||
| 481 | */ | ||
| 482 | if (reboot_default) { | ||
| 483 | dmi_check_system(pci_reboot_dmi_table); | ||
| 484 | } | ||
| 469 | return 0; | 485 | return 0; |
| 470 | } | 486 | } |
| 471 | core_initcall(pci_reboot_init); | 487 | core_initcall(pci_reboot_init); |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 9d74824a708d..f0b4caf85c1a 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -673,7 +673,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, | |||
| 673 | 673 | ||
| 674 | stackend = end_of_stack(tsk); | 674 | stackend = end_of_stack(tsk); |
| 675 | if (tsk != &init_task && *stackend != STACK_END_MAGIC) | 675 | if (tsk != &init_task && *stackend != STACK_END_MAGIC) |
| 676 | printk(KERN_ALERT "Thread overran stack, or stack corrupted\n"); | 676 | printk(KERN_EMERG "Thread overran stack, or stack corrupted\n"); |
| 677 | 677 | ||
| 678 | tsk->thread.cr2 = address; | 678 | tsk->thread.cr2 = address; |
| 679 | tsk->thread.trap_no = 14; | 679 | tsk->thread.trap_no = 14; |
| @@ -684,7 +684,7 @@ no_context(struct pt_regs *regs, unsigned long error_code, | |||
| 684 | sig = 0; | 684 | sig = 0; |
| 685 | 685 | ||
| 686 | /* Executive summary in case the body of the oops scrolled away */ | 686 | /* Executive summary in case the body of the oops scrolled away */ |
| 687 | printk(KERN_EMERG "CR2: %016lx\n", address); | 687 | printk(KERN_DEFAULT "CR2: %016lx\n", address); |
| 688 | 688 | ||
| 689 | oops_end(flags, regs, sig); | 689 | oops_end(flags, regs, sig); |
| 690 | } | 690 | } |
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index cc9b1e182fcf..d69cc6c3f808 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c | |||
| @@ -116,9 +116,26 @@ static inline void spin_time_accum_blocked(u64 start) | |||
| 116 | } | 116 | } |
| 117 | #endif /* CONFIG_XEN_DEBUG_FS */ | 117 | #endif /* CONFIG_XEN_DEBUG_FS */ |
| 118 | 118 | ||
| 119 | /* | ||
| 120 | * Size struct xen_spinlock so it's the same as arch_spinlock_t. | ||
| 121 | */ | ||
| 122 | #if NR_CPUS < 256 | ||
| 123 | typedef u8 xen_spinners_t; | ||
| 124 | # define inc_spinners(xl) \ | ||
| 125 | asm(LOCK_PREFIX " incb %0" : "+m" ((xl)->spinners) : : "memory"); | ||
| 126 | # define dec_spinners(xl) \ | ||
| 127 | asm(LOCK_PREFIX " decb %0" : "+m" ((xl)->spinners) : : "memory"); | ||
| 128 | #else | ||
| 129 | typedef u16 xen_spinners_t; | ||
| 130 | # define inc_spinners(xl) \ | ||
| 131 | asm(LOCK_PREFIX " incw %0" : "+m" ((xl)->spinners) : : "memory"); | ||
| 132 | # define dec_spinners(xl) \ | ||
| 133 | asm(LOCK_PREFIX " decw %0" : "+m" ((xl)->spinners) : : "memory"); | ||
| 134 | #endif | ||
| 135 | |||
| 119 | struct xen_spinlock { | 136 | struct xen_spinlock { |
| 120 | unsigned char lock; /* 0 -> free; 1 -> locked */ | 137 | unsigned char lock; /* 0 -> free; 1 -> locked */ |
| 121 | unsigned short spinners; /* count of waiting cpus */ | 138 | xen_spinners_t spinners; /* count of waiting cpus */ |
| 122 | }; | 139 | }; |
| 123 | 140 | ||
| 124 | static int xen_spin_is_locked(struct arch_spinlock *lock) | 141 | static int xen_spin_is_locked(struct arch_spinlock *lock) |
| @@ -164,8 +181,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl) | |||
| 164 | 181 | ||
| 165 | wmb(); /* set lock of interest before count */ | 182 | wmb(); /* set lock of interest before count */ |
| 166 | 183 | ||
| 167 | asm(LOCK_PREFIX " incw %0" | 184 | inc_spinners(xl); |
| 168 | : "+m" (xl->spinners) : : "memory"); | ||
| 169 | 185 | ||
| 170 | return prev; | 186 | return prev; |
| 171 | } | 187 | } |
| @@ -176,8 +192,7 @@ static inline struct xen_spinlock *spinning_lock(struct xen_spinlock *xl) | |||
| 176 | */ | 192 | */ |
| 177 | static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock *prev) | 193 | static inline void unspinning_lock(struct xen_spinlock *xl, struct xen_spinlock *prev) |
| 178 | { | 194 | { |
| 179 | asm(LOCK_PREFIX " decw %0" | 195 | dec_spinners(xl); |
| 180 | : "+m" (xl->spinners) : : "memory"); | ||
| 181 | wmb(); /* decrement count before restoring lock */ | 196 | wmb(); /* decrement count before restoring lock */ |
| 182 | __this_cpu_write(lock_spinners, prev); | 197 | __this_cpu_write(lock_spinners, prev); |
| 183 | } | 198 | } |
| @@ -373,6 +388,8 @@ void xen_uninit_lock_cpu(int cpu) | |||
| 373 | 388 | ||
| 374 | void __init xen_init_spinlocks(void) | 389 | void __init xen_init_spinlocks(void) |
| 375 | { | 390 | { |
| 391 | BUILD_BUG_ON(sizeof(struct xen_spinlock) > sizeof(arch_spinlock_t)); | ||
| 392 | |||
| 376 | pv_lock_ops.spin_is_locked = xen_spin_is_locked; | 393 | pv_lock_ops.spin_is_locked = xen_spin_is_locked; |
| 377 | pv_lock_ops.spin_is_contended = xen_spin_is_contended; | 394 | pv_lock_ops.spin_is_contended = xen_spin_is_contended; |
| 378 | pv_lock_ops.spin_lock = xen_spin_lock; | 395 | pv_lock_ops.spin_lock = xen_spin_lock; |
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 2c8272dd93c4..610f9997a403 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Makefile for the Linux device tree | 1 | # Makefile for the Linux device tree |
| 2 | 2 | ||
| 3 | obj-y := core.o sys.o bus.o dd.o syscore.o \ | 3 | obj-y := core.o bus.o dd.o syscore.o \ |
| 4 | driver.o class.o platform.o \ | 4 | driver.o class.o platform.o \ |
| 5 | cpu.o firmware.o init.o map.o devres.o \ | 5 | cpu.o firmware.o init.o map.o devres.o \ |
| 6 | attribute_container.o transport_class.o \ | 6 | attribute_container.o transport_class.o \ |
diff --git a/drivers/base/core.c b/drivers/base/core.c index 4a67cc0c8b37..74dda4f697f9 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -632,6 +632,11 @@ static void klist_children_put(struct klist_node *n) | |||
| 632 | * may be used for reference counting of @dev after calling this | 632 | * may be used for reference counting of @dev after calling this |
| 633 | * function. | 633 | * function. |
| 634 | * | 634 | * |
| 635 | * All fields in @dev must be initialized by the caller to 0, except | ||
| 636 | * for those explicitly set to some other value. The simplest | ||
| 637 | * approach is to use kzalloc() to allocate the structure containing | ||
| 638 | * @dev. | ||
| 639 | * | ||
| 635 | * NOTE: Use put_device() to give up your reference instead of freeing | 640 | * NOTE: Use put_device() to give up your reference instead of freeing |
| 636 | * @dev directly once you have called this function. | 641 | * @dev directly once you have called this function. |
| 637 | */ | 642 | */ |
| @@ -930,6 +935,13 @@ int device_private_init(struct device *dev) | |||
| 930 | * to the global and sibling lists for the device, then | 935 | * to the global and sibling lists for the device, then |
| 931 | * adds it to the other relevant subsystems of the driver model. | 936 | * adds it to the other relevant subsystems of the driver model. |
| 932 | * | 937 | * |
| 938 | * Do not call this routine or device_register() more than once for | ||
| 939 | * any device structure. The driver model core is not designed to work | ||
| 940 | * with devices that get unregistered and then spring back to life. | ||
| 941 | * (Among other things, it's very hard to guarantee that all references | ||
| 942 | * to the previous incarnation of @dev have been dropped.) Allocate | ||
| 943 | * and register a fresh new struct device instead. | ||
| 944 | * | ||
| 933 | * NOTE: _Never_ directly free @dev after calling this function, even | 945 | * NOTE: _Never_ directly free @dev after calling this function, even |
| 934 | * if it returned an error! Always use put_device() to give up your | 946 | * if it returned an error! Always use put_device() to give up your |
| 935 | * reference instead. | 947 | * reference instead. |
| @@ -1022,7 +1034,7 @@ int device_add(struct device *dev) | |||
| 1022 | device_pm_add(dev); | 1034 | device_pm_add(dev); |
| 1023 | 1035 | ||
| 1024 | /* Notify clients of device addition. This call must come | 1036 | /* Notify clients of device addition. This call must come |
| 1025 | * after dpm_sysf_add() and before kobject_uevent(). | 1037 | * after dpm_sysfs_add() and before kobject_uevent(). |
| 1026 | */ | 1038 | */ |
| 1027 | if (dev->bus) | 1039 | if (dev->bus) |
| 1028 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, | 1040 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, |
| @@ -1090,6 +1102,9 @@ name_error: | |||
| 1090 | * have a clearly defined need to use and refcount the device | 1102 | * have a clearly defined need to use and refcount the device |
| 1091 | * before it is added to the hierarchy. | 1103 | * before it is added to the hierarchy. |
| 1092 | * | 1104 | * |
| 1105 | * For more information, see the kerneldoc for device_initialize() | ||
| 1106 | * and device_add(). | ||
| 1107 | * | ||
| 1093 | * NOTE: _Never_ directly free @dev after calling this function, even | 1108 | * NOTE: _Never_ directly free @dev after calling this function, even |
| 1094 | * if it returned an error! Always use put_device() to give up the | 1109 | * if it returned an error! Always use put_device() to give up the |
| 1095 | * reference initialized in this function instead. | 1110 | * reference initialized in this function instead. |
diff --git a/drivers/base/sys.c b/drivers/base/sys.c deleted file mode 100644 index 409f5ce78829..000000000000 --- a/drivers/base/sys.c +++ /dev/null | |||
| @@ -1,383 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * sys.c - pseudo-bus for system 'devices' (cpus, PICs, timers, etc) | ||
| 3 | * | ||
| 4 | * Copyright (c) 2002-3 Patrick Mochel | ||
| 5 | * 2002-3 Open Source Development Lab | ||
| 6 | * | ||
| 7 | * This file is released under the GPLv2 | ||
| 8 | * | ||
| 9 | * This exports a 'system' bus type. | ||
| 10 | * By default, a 'sys' bus gets added to the root of the system. There will | ||
| 11 | * always be core system devices. Devices can use sysdev_register() to | ||
| 12 | * add themselves as children of the system bus. | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include <linux/sysdev.h> | ||
| 16 | #include <linux/err.h> | ||
| 17 | #include <linux/module.h> | ||
| 18 | #include <linux/kernel.h> | ||
| 19 | #include <linux/init.h> | ||
| 20 | #include <linux/string.h> | ||
| 21 | #include <linux/pm.h> | ||
| 22 | #include <linux/device.h> | ||
| 23 | #include <linux/mutex.h> | ||
| 24 | #include <linux/interrupt.h> | ||
| 25 | |||
| 26 | #include "base.h" | ||
| 27 | |||
| 28 | #define to_sysdev(k) container_of(k, struct sys_device, kobj) | ||
| 29 | #define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr) | ||
| 30 | |||
| 31 | |||
| 32 | static ssize_t | ||
| 33 | sysdev_show(struct kobject *kobj, struct attribute *attr, char *buffer) | ||
| 34 | { | ||
| 35 | struct sys_device *sysdev = to_sysdev(kobj); | ||
| 36 | struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr); | ||
| 37 | |||
| 38 | if (sysdev_attr->show) | ||
| 39 | return sysdev_attr->show(sysdev, sysdev_attr, buffer); | ||
| 40 | return -EIO; | ||
| 41 | } | ||
| 42 | |||
| 43 | |||
| 44 | static ssize_t | ||
| 45 | sysdev_store(struct kobject *kobj, struct attribute *attr, | ||
| 46 | const char *buffer, size_t count) | ||
| 47 | { | ||
| 48 | struct sys_device *sysdev = to_sysdev(kobj); | ||
| 49 | struct sysdev_attribute *sysdev_attr = to_sysdev_attr(attr); | ||
| 50 | |||
| 51 | if (sysdev_attr->store) | ||
| 52 | return sysdev_attr->store(sysdev, sysdev_attr, buffer, count); | ||
| 53 | return -EIO; | ||
| 54 | } | ||
| 55 | |||
| 56 | static const struct sysfs_ops sysfs_ops = { | ||
| 57 | .show = sysdev_show, | ||
| 58 | .store = sysdev_store, | ||
| 59 | }; | ||
| 60 | |||
| 61 | static struct kobj_type ktype_sysdev = { | ||
| 62 | .sysfs_ops = &sysfs_ops, | ||
| 63 | }; | ||
| 64 | |||
| 65 | |||
| 66 | int sysdev_create_file(struct sys_device *s, struct sysdev_attribute *a) | ||
| 67 | { | ||
| 68 | return sysfs_create_file(&s->kobj, &a->attr); | ||
| 69 | } | ||
| 70 | |||
| 71 | |||
| 72 | void sysdev_remove_file(struct sys_device *s, struct sysdev_attribute *a) | ||
| 73 | { | ||
| 74 | sysfs_remove_file(&s->kobj, &a->attr); | ||
| 75 | } | ||
| 76 | |||
| 77 | EXPORT_SYMBOL_GPL(sysdev_create_file); | ||
| 78 | EXPORT_SYMBOL_GPL(sysdev_remove_file); | ||
| 79 | |||
| 80 | #define to_sysdev_class(k) container_of(k, struct sysdev_class, kset.kobj) | ||
| 81 | #define to_sysdev_class_attr(a) container_of(a, \ | ||
| 82 | struct sysdev_class_attribute, attr) | ||
| 83 | |||
| 84 | static ssize_t sysdev_class_show(struct kobject *kobj, struct attribute *attr, | ||
| 85 | char *buffer) | ||
| 86 | { | ||
| 87 | struct sysdev_class *class = to_sysdev_class(kobj); | ||
| 88 | struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr); | ||
| 89 | |||
| 90 | if (class_attr->show) | ||
| 91 | return class_attr->show(class, class_attr, buffer); | ||
| 92 | return -EIO; | ||
| 93 | } | ||
| 94 | |||
| 95 | static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr, | ||
| 96 | const char *buffer, size_t count) | ||
| 97 | { | ||
| 98 | struct sysdev_class *class = to_sysdev_class(kobj); | ||
| 99 | struct sysdev_class_attribute *class_attr = to_sysdev_class_attr(attr); | ||
| 100 | |||
| 101 | if (class_attr->store) | ||
| 102 | return class_attr->store(class, class_attr, buffer, count); | ||
| 103 | return -EIO; | ||
| 104 | } | ||
| 105 | |||
| 106 | static const struct sysfs_ops sysfs_class_ops = { | ||
| 107 | .show = sysdev_class_show, | ||
| 108 | .store = sysdev_class_store, | ||
| 109 | }; | ||
| 110 | |||
| 111 | static struct kobj_type ktype_sysdev_class = { | ||
| 112 | .sysfs_ops = &sysfs_class_ops, | ||
| 113 | }; | ||
| 114 | |||
| 115 | int sysdev_class_create_file(struct sysdev_class *c, | ||
| 116 | struct sysdev_class_attribute *a) | ||
| 117 | { | ||
| 118 | return sysfs_create_file(&c->kset.kobj, &a->attr); | ||
| 119 | } | ||
| 120 | EXPORT_SYMBOL_GPL(sysdev_class_create_file); | ||
| 121 | |||
| 122 | void sysdev_class_remove_file(struct sysdev_class *c, | ||
| 123 | struct sysdev_class_attribute *a) | ||
| 124 | { | ||
| 125 | sysfs_remove_file(&c->kset.kobj, &a->attr); | ||
| 126 | } | ||
| 127 | EXPORT_SYMBOL_GPL(sysdev_class_remove_file); | ||
| 128 | |||
| 129 | extern struct kset *system_kset; | ||
| 130 | |||
| 131 | int sysdev_class_register(struct sysdev_class *cls) | ||
| 132 | { | ||
| 133 | int retval; | ||
| 134 | |||
| 135 | pr_debug("Registering sysdev class '%s'\n", cls->name); | ||
| 136 | |||
| 137 | INIT_LIST_HEAD(&cls->drivers); | ||
| 138 | memset(&cls->kset.kobj, 0x00, sizeof(struct kobject)); | ||
| 139 | cls->kset.kobj.parent = &system_kset->kobj; | ||
| 140 | cls->kset.kobj.ktype = &ktype_sysdev_class; | ||
| 141 | cls->kset.kobj.kset = system_kset; | ||
| 142 | |||
| 143 | retval = kobject_set_name(&cls->kset.kobj, "%s", cls->name); | ||
| 144 | if (retval) | ||
| 145 | return retval; | ||
| 146 | |||
| 147 | retval = kset_register(&cls->kset); | ||
| 148 | if (!retval && cls->attrs) | ||
| 149 | retval = sysfs_create_files(&cls->kset.kobj, | ||
| 150 | (const struct attribute **)cls->attrs); | ||
| 151 | return retval; | ||
| 152 | } | ||
| 153 | |||
| 154 | void sysdev_class_unregister(struct sysdev_class *cls) | ||
| 155 | { | ||
| 156 | pr_debug("Unregistering sysdev class '%s'\n", | ||
| 157 | kobject_name(&cls->kset.kobj)); | ||
| 158 | if (cls->attrs) | ||
| 159 | sysfs_remove_files(&cls->kset.kobj, | ||
| 160 | (const struct attribute **)cls->attrs); | ||
| 161 | kset_unregister(&cls->kset); | ||
| 162 | } | ||
| 163 | |||
| 164 | EXPORT_SYMBOL_GPL(sysdev_class_register); | ||
| 165 | EXPORT_SYMBOL_GPL(sysdev_class_unregister); | ||
| 166 | |||
| 167 | static DEFINE_MUTEX(sysdev_drivers_lock); | ||
| 168 | |||
| 169 | /* | ||
| 170 | * @dev != NULL means that we're unwinding because some drv->add() | ||
| 171 | * failed for some reason. You need to grab sysdev_drivers_lock before | ||
| 172 | * calling this. | ||
| 173 | */ | ||
| 174 | static void __sysdev_driver_remove(struct sysdev_class *cls, | ||
| 175 | struct sysdev_driver *drv, | ||
| 176 | struct sys_device *from_dev) | ||
| 177 | { | ||
| 178 | struct sys_device *dev = from_dev; | ||
| 179 | |||
| 180 | list_del_init(&drv->entry); | ||
| 181 | if (!cls) | ||
| 182 | return; | ||
| 183 | |||
| 184 | if (!drv->remove) | ||
| 185 | goto kset_put; | ||
| 186 | |||
| 187 | if (dev) | ||
| 188 | list_for_each_entry_continue_reverse(dev, &cls->kset.list, | ||
| 189 | kobj.entry) | ||
| 190 | drv->remove(dev); | ||
| 191 | else | ||
| 192 | list_for_each_entry(dev, &cls->kset.list, kobj.entry) | ||
| 193 | drv->remove(dev); | ||
| 194 | |||
| 195 | kset_put: | ||
| 196 | kset_put(&cls->kset); | ||
| 197 | } | ||
| 198 | |||
| 199 | /** | ||
| 200 | * sysdev_driver_register - Register auxiliary driver | ||
| 201 | * @cls: Device class driver belongs to. | ||
| 202 | * @drv: Driver. | ||
| 203 | * | ||
| 204 | * @drv is inserted into @cls->drivers to be | ||
| 205 | * called on each operation on devices of that class. The refcount | ||
| 206 | * of @cls is incremented. | ||
| 207 | */ | ||
| 208 | int sysdev_driver_register(struct sysdev_class *cls, struct sysdev_driver *drv) | ||
| 209 | { | ||
| 210 | struct sys_device *dev = NULL; | ||
| 211 | int err = 0; | ||
| 212 | |||
| 213 | if (!cls) { | ||
| 214 | WARN(1, KERN_WARNING "sysdev: invalid class passed to %s!\n", | ||
| 215 | __func__); | ||
| 216 | return -EINVAL; | ||
| 217 | } | ||
| 218 | |||
| 219 | /* Check whether this driver has already been added to a class. */ | ||
| 220 | if (drv->entry.next && !list_empty(&drv->entry)) | ||
| 221 | WARN(1, KERN_WARNING "sysdev: class %s: driver (%p) has already" | ||
| 222 | " been registered to a class, something is wrong, but " | ||
| 223 | "will forge on!\n", cls->name, drv); | ||
| 224 | |||
| 225 | mutex_lock(&sysdev_drivers_lock); | ||
| 226 | if (cls && kset_get(&cls->kset)) { | ||
| 227 | list_add_tail(&drv->entry, &cls->drivers); | ||
| 228 | |||
| 229 | /* If devices of this class already exist, tell the driver */ | ||
| 230 | if (drv->add) { | ||
| 231 | list_for_each_entry(dev, &cls->kset.list, kobj.entry) { | ||
| 232 | err = drv->add(dev); | ||
| 233 | if (err) | ||
| 234 | goto unwind; | ||
| 235 | } | ||
| 236 | } | ||
| 237 | } else { | ||
| 238 | err = -EINVAL; | ||
| 239 | WARN(1, KERN_ERR "%s: invalid device class\n", __func__); | ||
| 240 | } | ||
| 241 | |||
| 242 | goto unlock; | ||
| 243 | |||
| 244 | unwind: | ||
| 245 | __sysdev_driver_remove(cls, drv, dev); | ||
| 246 | |||
| 247 | unlock: | ||
| 248 | mutex_unlock(&sysdev_drivers_lock); | ||
| 249 | return err; | ||
| 250 | } | ||
| 251 | |||
| 252 | /** | ||
| 253 | * sysdev_driver_unregister - Remove an auxiliary driver. | ||
| 254 | * @cls: Class driver belongs to. | ||
| 255 | * @drv: Driver. | ||
| 256 | */ | ||
| 257 | void sysdev_driver_unregister(struct sysdev_class *cls, | ||
| 258 | struct sysdev_driver *drv) | ||
| 259 | { | ||
| 260 | mutex_lock(&sysdev_drivers_lock); | ||
| 261 | __sysdev_driver_remove(cls, drv, NULL); | ||
| 262 | mutex_unlock(&sysdev_drivers_lock); | ||
| 263 | } | ||
| 264 | EXPORT_SYMBOL_GPL(sysdev_driver_register); | ||
| 265 | EXPORT_SYMBOL_GPL(sysdev_driver_unregister); | ||
| 266 | |||
| 267 | /** | ||
| 268 | * sysdev_register - add a system device to the tree | ||
| 269 | * @sysdev: device in question | ||
| 270 | * | ||
| 271 | */ | ||
| 272 | int sysdev_register(struct sys_device *sysdev) | ||
| 273 | { | ||
| 274 | int error; | ||
| 275 | struct sysdev_class *cls = sysdev->cls; | ||
| 276 | |||
| 277 | if (!cls) | ||
| 278 | return -EINVAL; | ||
| 279 | |||
| 280 | pr_debug("Registering sys device of class '%s'\n", | ||
| 281 | kobject_name(&cls->kset.kobj)); | ||
| 282 | |||
| 283 | /* initialize the kobject to 0, in case it had previously been used */ | ||
| 284 | memset(&sysdev->kobj, 0x00, sizeof(struct kobject)); | ||
| 285 | |||
| 286 | /* Make sure the kset is set */ | ||
| 287 | sysdev->kobj.kset = &cls->kset; | ||
| 288 | |||
| 289 | /* Register the object */ | ||
| 290 | error = kobject_init_and_add(&sysdev->kobj, &ktype_sysdev, NULL, | ||
| 291 | "%s%d", kobject_name(&cls->kset.kobj), | ||
| 292 | sysdev->id); | ||
| 293 | |||
| 294 | if (!error) { | ||
| 295 | struct sysdev_driver *drv; | ||
| 296 | |||
| 297 | pr_debug("Registering sys device '%s'\n", | ||
| 298 | kobject_name(&sysdev->kobj)); | ||
| 299 | |||
| 300 | mutex_lock(&sysdev_drivers_lock); | ||
| 301 | /* Generic notification is implicit, because it's that | ||
| 302 | * code that should have called us. | ||
| 303 | */ | ||
| 304 | |||
| 305 | /* Notify class auxiliary drivers */ | ||
| 306 | list_for_each_entry(drv, &cls->drivers, entry) { | ||
| 307 | if (drv->add) | ||
| 308 | drv->add(sysdev); | ||
| 309 | } | ||
| 310 | mutex_unlock(&sysdev_drivers_lock); | ||
| 311 | kobject_uevent(&sysdev->kobj, KOBJ_ADD); | ||
| 312 | } | ||
| 313 | |||
| 314 | return error; | ||
| 315 | } | ||
| 316 | |||
| 317 | void sysdev_unregister(struct sys_device *sysdev) | ||
| 318 | { | ||
| 319 | struct sysdev_driver *drv; | ||
| 320 | |||
| 321 | mutex_lock(&sysdev_drivers_lock); | ||
| 322 | list_for_each_entry(drv, &sysdev->cls->drivers, entry) { | ||
| 323 | if (drv->remove) | ||
| 324 | drv->remove(sysdev); | ||
| 325 | } | ||
| 326 | mutex_unlock(&sysdev_drivers_lock); | ||
| 327 | |||
| 328 | kobject_put(&sysdev->kobj); | ||
| 329 | } | ||
| 330 | |||
| 331 | EXPORT_SYMBOL_GPL(sysdev_register); | ||
| 332 | EXPORT_SYMBOL_GPL(sysdev_unregister); | ||
| 333 | |||
| 334 | #define to_ext_attr(x) container_of(x, struct sysdev_ext_attribute, attr) | ||
| 335 | |||
| 336 | ssize_t sysdev_store_ulong(struct sys_device *sysdev, | ||
| 337 | struct sysdev_attribute *attr, | ||
| 338 | const char *buf, size_t size) | ||
| 339 | { | ||
| 340 | struct sysdev_ext_attribute *ea = to_ext_attr(attr); | ||
| 341 | char *end; | ||
| 342 | unsigned long new = simple_strtoul(buf, &end, 0); | ||
| 343 | if (end == buf) | ||
| 344 | return -EINVAL; | ||
| 345 | *(unsigned long *)(ea->var) = new; | ||
| 346 | /* Always return full write size even if we didn't consume all */ | ||
| 347 | return size; | ||
| 348 | } | ||
| 349 | EXPORT_SYMBOL_GPL(sysdev_store_ulong); | ||
| 350 | |||
| 351 | ssize_t sysdev_show_ulong(struct sys_device *sysdev, | ||
| 352 | struct sysdev_attribute *attr, | ||
| 353 | char *buf) | ||
| 354 | { | ||
| 355 | struct sysdev_ext_attribute *ea = to_ext_attr(attr); | ||
| 356 | return snprintf(buf, PAGE_SIZE, "%lx\n", *(unsigned long *)(ea->var)); | ||
| 357 | } | ||
| 358 | EXPORT_SYMBOL_GPL(sysdev_show_ulong); | ||
| 359 | |||
| 360 | ssize_t sysdev_store_int(struct sys_device *sysdev, | ||
| 361 | struct sysdev_attribute *attr, | ||
| 362 | const char *buf, size_t size) | ||
| 363 | { | ||
| 364 | struct sysdev_ext_attribute *ea = to_ext_attr(attr); | ||
| 365 | char *end; | ||
| 366 | long new = simple_strtol(buf, &end, 0); | ||
| 367 | if (end == buf || new > INT_MAX || new < INT_MIN) | ||
| 368 | return -EINVAL; | ||
| 369 | *(int *)(ea->var) = new; | ||
| 370 | /* Always return full write size even if we didn't consume all */ | ||
| 371 | return size; | ||
| 372 | } | ||
| 373 | EXPORT_SYMBOL_GPL(sysdev_store_int); | ||
| 374 | |||
| 375 | ssize_t sysdev_show_int(struct sys_device *sysdev, | ||
| 376 | struct sysdev_attribute *attr, | ||
| 377 | char *buf) | ||
| 378 | { | ||
| 379 | struct sysdev_ext_attribute *ea = to_ext_attr(attr); | ||
| 380 | return snprintf(buf, PAGE_SIZE, "%d\n", *(int *)(ea->var)); | ||
| 381 | } | ||
| 382 | EXPORT_SYMBOL_GPL(sysdev_show_int); | ||
| 383 | |||
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 3fd31dec8c9c..a6278e7e61a0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
| @@ -380,6 +380,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr, | |||
| 380 | rbdc = __rbd_client_find(opt); | 380 | rbdc = __rbd_client_find(opt); |
| 381 | if (rbdc) { | 381 | if (rbdc) { |
| 382 | ceph_destroy_options(opt); | 382 | ceph_destroy_options(opt); |
| 383 | kfree(rbd_opts); | ||
| 383 | 384 | ||
| 384 | /* using an existing client */ | 385 | /* using an existing client */ |
| 385 | kref_get(&rbdc->kref); | 386 | kref_get(&rbdc->kref); |
| @@ -406,15 +407,15 @@ done_err: | |||
| 406 | 407 | ||
| 407 | /* | 408 | /* |
| 408 | * Destroy ceph client | 409 | * Destroy ceph client |
| 410 | * | ||
| 411 | * Caller must hold node_lock. | ||
| 409 | */ | 412 | */ |
| 410 | static void rbd_client_release(struct kref *kref) | 413 | static void rbd_client_release(struct kref *kref) |
| 411 | { | 414 | { |
| 412 | struct rbd_client *rbdc = container_of(kref, struct rbd_client, kref); | 415 | struct rbd_client *rbdc = container_of(kref, struct rbd_client, kref); |
| 413 | 416 | ||
| 414 | dout("rbd_release_client %p\n", rbdc); | 417 | dout("rbd_release_client %p\n", rbdc); |
| 415 | spin_lock(&node_lock); | ||
| 416 | list_del(&rbdc->node); | 418 | list_del(&rbdc->node); |
| 417 | spin_unlock(&node_lock); | ||
| 418 | 419 | ||
| 419 | ceph_destroy_client(rbdc->client); | 420 | ceph_destroy_client(rbdc->client); |
| 420 | kfree(rbdc->rbd_opts); | 421 | kfree(rbdc->rbd_opts); |
| @@ -427,7 +428,9 @@ static void rbd_client_release(struct kref *kref) | |||
| 427 | */ | 428 | */ |
| 428 | static void rbd_put_client(struct rbd_device *rbd_dev) | 429 | static void rbd_put_client(struct rbd_device *rbd_dev) |
| 429 | { | 430 | { |
| 431 | spin_lock(&node_lock); | ||
| 430 | kref_put(&rbd_dev->rbd_client->kref, rbd_client_release); | 432 | kref_put(&rbd_dev->rbd_client->kref, rbd_client_release); |
| 433 | spin_unlock(&node_lock); | ||
| 431 | rbd_dev->rbd_client = NULL; | 434 | rbd_dev->rbd_client = NULL; |
| 432 | rbd_dev->client = NULL; | 435 | rbd_dev->client = NULL; |
| 433 | } | 436 | } |
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index 4b71647782d0..317c28ce8328 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
| @@ -194,10 +194,10 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge) | |||
| 194 | 194 | ||
| 195 | err_out: | 195 | err_out: |
| 196 | if (bridge->driver->needs_scratch_page) { | 196 | if (bridge->driver->needs_scratch_page) { |
| 197 | void *va = page_address(bridge->scratch_page_page); | 197 | struct page *page = bridge->scratch_page_page; |
| 198 | 198 | ||
| 199 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP); | 199 | bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP); |
| 200 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE); | 200 | bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE); |
| 201 | } | 201 | } |
| 202 | if (got_gatt) | 202 | if (got_gatt) |
| 203 | bridge->driver->free_gatt_table(bridge); | 203 | bridge->driver->free_gatt_table(bridge); |
| @@ -221,10 +221,10 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge) | |||
| 221 | 221 | ||
| 222 | if (bridge->driver->agp_destroy_page && | 222 | if (bridge->driver->agp_destroy_page && |
| 223 | bridge->driver->needs_scratch_page) { | 223 | bridge->driver->needs_scratch_page) { |
| 224 | void *va = page_address(bridge->scratch_page_page); | 224 | struct page *page = bridge->scratch_page_page; |
| 225 | 225 | ||
| 226 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_UNMAP); | 226 | bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_UNMAP); |
| 227 | bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE); | 227 | bridge->driver->agp_destroy_page(page, AGP_PAGE_DESTROY_FREE); |
| 228 | } | 228 | } |
| 229 | } | 229 | } |
| 230 | 230 | ||
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 6628feaa7622..7f5f0da726da 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -263,6 +263,7 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card) | |||
| 263 | static char ohci_driver_name[] = KBUILD_MODNAME; | 263 | static char ohci_driver_name[] = KBUILD_MODNAME; |
| 264 | 264 | ||
| 265 | #define PCI_DEVICE_ID_AGERE_FW643 0x5901 | 265 | #define PCI_DEVICE_ID_AGERE_FW643 0x5901 |
| 266 | #define PCI_DEVICE_ID_CREATIVE_SB1394 0x4001 | ||
| 266 | #define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380 | 267 | #define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380 |
| 267 | #define PCI_DEVICE_ID_TI_TSB12LV22 0x8009 | 268 | #define PCI_DEVICE_ID_TI_TSB12LV22 0x8009 |
| 268 | #define PCI_DEVICE_ID_TI_TSB12LV26 0x8020 | 269 | #define PCI_DEVICE_ID_TI_TSB12LV26 0x8020 |
| @@ -289,6 +290,9 @@ static const struct { | |||
| 289 | {PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6, | 290 | {PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_AGERE_FW643, 6, |
| 290 | QUIRK_NO_MSI}, | 291 | QUIRK_NO_MSI}, |
| 291 | 292 | ||
| 293 | {PCI_VENDOR_ID_CREATIVE, PCI_DEVICE_ID_CREATIVE_SB1394, PCI_ANY_ID, | ||
| 294 | QUIRK_RESET_PACKET}, | ||
| 295 | |||
| 292 | {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID, | 296 | {PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_FW, PCI_ANY_ID, |
| 293 | QUIRK_NO_MSI}, | 297 | QUIRK_NO_MSI}, |
| 294 | 298 | ||
| @@ -299,7 +303,7 @@ static const struct { | |||
| 299 | QUIRK_NO_MSI}, | 303 | QUIRK_NO_MSI}, |
| 300 | 304 | ||
| 301 | {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID, | 305 | {PCI_VENDOR_ID_RICOH, PCI_ANY_ID, PCI_ANY_ID, |
| 302 | QUIRK_CYCLE_TIMER}, | 306 | QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, |
| 303 | 307 | ||
| 304 | {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID, | 308 | {PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TSB12LV22, PCI_ANY_ID, |
| 305 | QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A}, | 309 | QUIRK_CYCLE_TIMER | QUIRK_RESET_PACKET | QUIRK_NO_1394A}, |
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 396e60ce8114..f8625e290728 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
| @@ -140,7 +140,7 @@ int drm_gem_object_init(struct drm_device *dev, | |||
| 140 | obj->dev = dev; | 140 | obj->dev = dev; |
| 141 | obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE); | 141 | obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE); |
| 142 | if (IS_ERR(obj->filp)) | 142 | if (IS_ERR(obj->filp)) |
| 143 | return -ENOMEM; | 143 | return PTR_ERR(obj->filp); |
| 144 | 144 | ||
| 145 | kref_init(&obj->refcount); | 145 | kref_init(&obj->refcount); |
| 146 | atomic_set(&obj->handle_count, 0); | 146 | atomic_set(&obj->handle_count, 0); |
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index f9aaa56eae07..b9e5266c341b 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig | |||
| @@ -13,7 +13,7 @@ config DRM_EXYNOS | |||
| 13 | 13 | ||
| 14 | config DRM_EXYNOS_FIMD | 14 | config DRM_EXYNOS_FIMD |
| 15 | tristate "Exynos DRM FIMD" | 15 | tristate "Exynos DRM FIMD" |
| 16 | depends on DRM_EXYNOS | 16 | depends on DRM_EXYNOS && !FB_S3C |
| 17 | default n | 17 | default n |
| 18 | help | 18 | help |
| 19 | Choose this option if you want to use Exynos FIMD for DRM. | 19 | Choose this option if you want to use Exynos FIMD for DRM. |
| @@ -21,7 +21,7 @@ config DRM_EXYNOS_FIMD | |||
| 21 | 21 | ||
| 22 | config DRM_EXYNOS_HDMI | 22 | config DRM_EXYNOS_HDMI |
| 23 | tristate "Exynos DRM HDMI" | 23 | tristate "Exynos DRM HDMI" |
| 24 | depends on DRM_EXYNOS | 24 | depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV |
| 25 | help | 25 | help |
| 26 | Choose this option if you want to use Exynos HDMI for DRM. | 26 | Choose this option if you want to use Exynos HDMI for DRM. |
| 27 | If M is selected, the module will be called exynos_drm_hdmi | 27 | If M is selected, the module will be called exynos_drm_hdmi |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index ca83139cd309..b6a737d196ae 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c | |||
| @@ -158,7 +158,8 @@ static void fimd_dpms(struct device *subdrv_dev, int mode) | |||
| 158 | case DRM_MODE_DPMS_STANDBY: | 158 | case DRM_MODE_DPMS_STANDBY: |
| 159 | case DRM_MODE_DPMS_SUSPEND: | 159 | case DRM_MODE_DPMS_SUSPEND: |
| 160 | case DRM_MODE_DPMS_OFF: | 160 | case DRM_MODE_DPMS_OFF: |
| 161 | pm_runtime_put_sync(subdrv_dev); | 161 | if (!ctx->suspended) |
| 162 | pm_runtime_put_sync(subdrv_dev); | ||
| 162 | break; | 163 | break; |
| 163 | default: | 164 | default: |
| 164 | DRM_DEBUG_KMS("unspecified mode %d\n", mode); | 165 | DRM_DEBUG_KMS("unspecified mode %d\n", mode); |
| @@ -734,6 +735,46 @@ static void fimd_clear_win(struct fimd_context *ctx, int win) | |||
| 734 | writel(val, ctx->regs + SHADOWCON); | 735 | writel(val, ctx->regs + SHADOWCON); |
| 735 | } | 736 | } |
| 736 | 737 | ||
| 738 | static int fimd_power_on(struct fimd_context *ctx, bool enable) | ||
| 739 | { | ||
| 740 | struct exynos_drm_subdrv *subdrv = &ctx->subdrv; | ||
| 741 | struct device *dev = subdrv->manager.dev; | ||
| 742 | |||
| 743 | DRM_DEBUG_KMS("%s\n", __FILE__); | ||
| 744 | |||
| 745 | if (enable != false && enable != true) | ||
| 746 | return -EINVAL; | ||
| 747 | |||
| 748 | if (enable) { | ||
| 749 | int ret; | ||
| 750 | |||
| 751 | ret = clk_enable(ctx->bus_clk); | ||
| 752 | if (ret < 0) | ||
| 753 | return ret; | ||
| 754 | |||
| 755 | ret = clk_enable(ctx->lcd_clk); | ||
| 756 | if (ret < 0) { | ||
| 757 | clk_disable(ctx->bus_clk); | ||
| 758 | return ret; | ||
| 759 | } | ||
| 760 | |||
| 761 | ctx->suspended = false; | ||
| 762 | |||
| 763 | /* if vblank was enabled status, enable it again. */ | ||
| 764 | if (test_and_clear_bit(0, &ctx->irq_flags)) | ||
| 765 | fimd_enable_vblank(dev); | ||
| 766 | |||
| 767 | fimd_apply(dev); | ||
| 768 | } else { | ||
| 769 | clk_disable(ctx->lcd_clk); | ||
| 770 | clk_disable(ctx->bus_clk); | ||
| 771 | |||
| 772 | ctx->suspended = true; | ||
| 773 | } | ||
| 774 | |||
| 775 | return 0; | ||
| 776 | } | ||
| 777 | |||
| 737 | static int __devinit fimd_probe(struct platform_device *pdev) | 778 | static int __devinit fimd_probe(struct platform_device *pdev) |
| 738 | { | 779 | { |
| 739 | struct device *dev = &pdev->dev; | 780 | struct device *dev = &pdev->dev; |
| @@ -911,39 +952,30 @@ out: | |||
| 911 | #ifdef CONFIG_PM_SLEEP | 952 | #ifdef CONFIG_PM_SLEEP |
| 912 | static int fimd_suspend(struct device *dev) | 953 | static int fimd_suspend(struct device *dev) |
| 913 | { | 954 | { |
| 914 | int ret; | 955 | struct fimd_context *ctx = get_fimd_context(dev); |
| 915 | 956 | ||
| 916 | if (pm_runtime_suspended(dev)) | 957 | if (pm_runtime_suspended(dev)) |
| 917 | return 0; | 958 | return 0; |
| 918 | 959 | ||
| 919 | ret = pm_runtime_suspend(dev); | 960 | /* |
| 920 | if (ret < 0) | 961 | * do not use pm_runtime_suspend(). if pm_runtime_suspend() is |
| 921 | return ret; | 962 | * called here, an error would be returned by that interface |
| 922 | 963 | * because the usage_count of pm runtime is more than 1. | |
| 923 | return 0; | 964 | */ |
| 965 | return fimd_power_on(ctx, false); | ||
| 924 | } | 966 | } |
| 925 | 967 | ||
| 926 | static int fimd_resume(struct device *dev) | 968 | static int fimd_resume(struct device *dev) |
| 927 | { | 969 | { |
| 928 | int ret; | 970 | struct fimd_context *ctx = get_fimd_context(dev); |
| 929 | |||
| 930 | ret = pm_runtime_resume(dev); | ||
| 931 | if (ret < 0) { | ||
| 932 | DRM_ERROR("failed to resume runtime pm.\n"); | ||
| 933 | return ret; | ||
| 934 | } | ||
| 935 | |||
| 936 | pm_runtime_disable(dev); | ||
| 937 | |||
| 938 | ret = pm_runtime_set_active(dev); | ||
| 939 | if (ret < 0) { | ||
| 940 | DRM_ERROR("failed to active runtime pm.\n"); | ||
| 941 | pm_runtime_enable(dev); | ||
| 942 | pm_runtime_suspend(dev); | ||
| 943 | return ret; | ||
| 944 | } | ||
| 945 | 971 | ||
| 946 | pm_runtime_enable(dev); | 972 | /* |
| 973 | * if entered to sleep when lcd panel was on, the usage_count | ||
| 974 | * of pm runtime would still be 1 so in this case, fimd driver | ||
| 975 | * should be on directly not drawing on pm runtime interface. | ||
| 976 | */ | ||
| 977 | if (!pm_runtime_suspended(dev)) | ||
| 978 | return fimd_power_on(ctx, true); | ||
| 947 | 979 | ||
| 948 | return 0; | 980 | return 0; |
| 949 | } | 981 | } |
| @@ -956,39 +988,16 @@ static int fimd_runtime_suspend(struct device *dev) | |||
| 956 | 988 | ||
| 957 | DRM_DEBUG_KMS("%s\n", __FILE__); | 989 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 958 | 990 | ||
| 959 | clk_disable(ctx->lcd_clk); | 991 | return fimd_power_on(ctx, false); |
| 960 | clk_disable(ctx->bus_clk); | ||
| 961 | |||
| 962 | ctx->suspended = true; | ||
| 963 | return 0; | ||
| 964 | } | 992 | } |
| 965 | 993 | ||
| 966 | static int fimd_runtime_resume(struct device *dev) | 994 | static int fimd_runtime_resume(struct device *dev) |
| 967 | { | 995 | { |
| 968 | struct fimd_context *ctx = get_fimd_context(dev); | 996 | struct fimd_context *ctx = get_fimd_context(dev); |
| 969 | int ret; | ||
| 970 | 997 | ||
| 971 | DRM_DEBUG_KMS("%s\n", __FILE__); | 998 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 972 | 999 | ||
| 973 | ret = clk_enable(ctx->bus_clk); | 1000 | return fimd_power_on(ctx, true); |
| 974 | if (ret < 0) | ||
| 975 | return ret; | ||
| 976 | |||
| 977 | ret = clk_enable(ctx->lcd_clk); | ||
| 978 | if (ret < 0) { | ||
| 979 | clk_disable(ctx->bus_clk); | ||
| 980 | return ret; | ||
| 981 | } | ||
| 982 | |||
| 983 | ctx->suspended = false; | ||
| 984 | |||
| 985 | /* if vblank was enabled status, enable it again. */ | ||
| 986 | if (test_and_clear_bit(0, &ctx->irq_flags)) | ||
| 987 | fimd_enable_vblank(dev); | ||
| 988 | |||
| 989 | fimd_apply(dev); | ||
| 990 | |||
| 991 | return 0; | ||
| 992 | } | 1001 | } |
| 993 | #endif | 1002 | #endif |
| 994 | 1003 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index f48f7ce92f5f..3429d3fd93f3 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
| @@ -1116,8 +1116,8 @@ err_ddc: | |||
| 1116 | err_iomap: | 1116 | err_iomap: |
| 1117 | iounmap(hdata->regs); | 1117 | iounmap(hdata->regs); |
| 1118 | err_req_region: | 1118 | err_req_region: |
| 1119 | release_resource(hdata->regs_res); | 1119 | release_mem_region(hdata->regs_res->start, |
| 1120 | kfree(hdata->regs_res); | 1120 | resource_size(hdata->regs_res)); |
| 1121 | err_resource: | 1121 | err_resource: |
| 1122 | hdmi_resources_cleanup(hdata); | 1122 | hdmi_resources_cleanup(hdata); |
| 1123 | err_data: | 1123 | err_data: |
| @@ -1145,8 +1145,8 @@ static int __devexit hdmi_remove(struct platform_device *pdev) | |||
| 1145 | 1145 | ||
| 1146 | iounmap(hdata->regs); | 1146 | iounmap(hdata->regs); |
| 1147 | 1147 | ||
| 1148 | release_resource(hdata->regs_res); | 1148 | release_mem_region(hdata->regs_res->start, |
| 1149 | kfree(hdata->regs_res); | 1149 | resource_size(hdata->regs_res)); |
| 1150 | 1150 | ||
| 1151 | /* hdmiphy i2c driver */ | 1151 | /* hdmiphy i2c driver */ |
| 1152 | i2c_del_driver(&hdmiphy_driver); | 1152 | i2c_del_driver(&hdmiphy_driver); |
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 791c0ef1a65b..830dfdd6bf15 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c | |||
| @@ -113,12 +113,12 @@ static int psbfb_pan(struct fb_var_screeninfo *var, struct fb_info *info) | |||
| 113 | 113 | ||
| 114 | void psbfb_suspend(struct drm_device *dev) | 114 | void psbfb_suspend(struct drm_device *dev) |
| 115 | { | 115 | { |
| 116 | struct drm_framebuffer *fb = 0; | 116 | struct drm_framebuffer *fb; |
| 117 | struct psb_framebuffer *psbfb = to_psb_fb(fb); | ||
| 118 | 117 | ||
| 119 | console_lock(); | 118 | console_lock(); |
| 120 | mutex_lock(&dev->mode_config.mutex); | 119 | mutex_lock(&dev->mode_config.mutex); |
| 121 | list_for_each_entry(fb, &dev->mode_config.fb_list, head) { | 120 | list_for_each_entry(fb, &dev->mode_config.fb_list, head) { |
| 121 | struct psb_framebuffer *psbfb = to_psb_fb(fb); | ||
| 122 | struct fb_info *info = psbfb->fbdev; | 122 | struct fb_info *info = psbfb->fbdev; |
| 123 | fb_set_suspend(info, 1); | 123 | fb_set_suspend(info, 1); |
| 124 | drm_fb_helper_blank(FB_BLANK_POWERDOWN, info); | 124 | drm_fb_helper_blank(FB_BLANK_POWERDOWN, info); |
| @@ -129,12 +129,12 @@ void psbfb_suspend(struct drm_device *dev) | |||
| 129 | 129 | ||
| 130 | void psbfb_resume(struct drm_device *dev) | 130 | void psbfb_resume(struct drm_device *dev) |
| 131 | { | 131 | { |
| 132 | struct drm_framebuffer *fb = 0; | 132 | struct drm_framebuffer *fb; |
| 133 | struct psb_framebuffer *psbfb = to_psb_fb(fb); | ||
| 134 | 133 | ||
| 135 | console_lock(); | 134 | console_lock(); |
| 136 | mutex_lock(&dev->mode_config.mutex); | 135 | mutex_lock(&dev->mode_config.mutex); |
| 137 | list_for_each_entry(fb, &dev->mode_config.fb_list, head) { | 136 | list_for_each_entry(fb, &dev->mode_config.fb_list, head) { |
| 137 | struct psb_framebuffer *psbfb = to_psb_fb(fb); | ||
| 138 | struct fb_info *info = psbfb->fbdev; | 138 | struct fb_info *info = psbfb->fbdev; |
| 139 | fb_set_suspend(info, 0); | 139 | fb_set_suspend(info, 0); |
| 140 | drm_fb_helper_blank(FB_BLANK_UNBLANK, info); | 140 | drm_fb_helper_blank(FB_BLANK_UNBLANK, info); |
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index f7c17b239833..7f4b4e10246e 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c | |||
| @@ -886,7 +886,7 @@ static int i810_flush_queue(struct drm_device *dev) | |||
| 886 | } | 886 | } |
| 887 | 887 | ||
| 888 | /* Must be called with the lock held */ | 888 | /* Must be called with the lock held */ |
| 889 | void i810_driver_reclaim_buffers(struct drm_device *dev, | 889 | static void i810_reclaim_buffers(struct drm_device *dev, |
| 890 | struct drm_file *file_priv) | 890 | struct drm_file *file_priv) |
| 891 | { | 891 | { |
| 892 | struct drm_device_dma *dma = dev->dma; | 892 | struct drm_device_dma *dma = dev->dma; |
| @@ -1223,17 +1223,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv) | |||
| 1223 | if (dev_priv->page_flipping) | 1223 | if (dev_priv->page_flipping) |
| 1224 | i810_do_cleanup_pageflip(dev); | 1224 | i810_do_cleanup_pageflip(dev); |
| 1225 | } | 1225 | } |
| 1226 | } | ||
| 1226 | 1227 | ||
| 1227 | if (file_priv->master && file_priv->master->lock.hw_lock) { | 1228 | void i810_driver_reclaim_buffers_locked(struct drm_device *dev, |
| 1228 | drm_idlelock_take(&file_priv->master->lock); | 1229 | struct drm_file *file_priv) |
| 1229 | i810_driver_reclaim_buffers(dev, file_priv); | 1230 | { |
| 1230 | drm_idlelock_release(&file_priv->master->lock); | 1231 | i810_reclaim_buffers(dev, file_priv); |
| 1231 | } else { | ||
| 1232 | /* master disappeared, clean up stuff anyway and hope nothing | ||
| 1233 | * goes wrong */ | ||
| 1234 | i810_driver_reclaim_buffers(dev, file_priv); | ||
| 1235 | } | ||
| 1236 | |||
| 1237 | } | 1232 | } |
| 1238 | 1233 | ||
| 1239 | int i810_driver_dma_quiescent(struct drm_device *dev) | 1234 | int i810_driver_dma_quiescent(struct drm_device *dev) |
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index 053f1ee58393..ec12f7dc717a 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c | |||
| @@ -63,6 +63,7 @@ static struct drm_driver driver = { | |||
| 63 | .lastclose = i810_driver_lastclose, | 63 | .lastclose = i810_driver_lastclose, |
| 64 | .preclose = i810_driver_preclose, | 64 | .preclose = i810_driver_preclose, |
| 65 | .device_is_agp = i810_driver_device_is_agp, | 65 | .device_is_agp = i810_driver_device_is_agp, |
| 66 | .reclaim_buffers_locked = i810_driver_reclaim_buffers_locked, | ||
| 66 | .dma_quiescent = i810_driver_dma_quiescent, | 67 | .dma_quiescent = i810_driver_dma_quiescent, |
| 67 | .ioctls = i810_ioctls, | 68 | .ioctls = i810_ioctls, |
| 68 | .fops = &i810_driver_fops, | 69 | .fops = &i810_driver_fops, |
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h index 6e0acad9e0f5..c9339f481795 100644 --- a/drivers/gpu/drm/i810/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h | |||
| @@ -116,12 +116,14 @@ typedef struct drm_i810_private { | |||
| 116 | 116 | ||
| 117 | /* i810_dma.c */ | 117 | /* i810_dma.c */ |
| 118 | extern int i810_driver_dma_quiescent(struct drm_device *dev); | 118 | extern int i810_driver_dma_quiescent(struct drm_device *dev); |
| 119 | void i810_driver_reclaim_buffers(struct drm_device *dev, | 119 | extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev, |
| 120 | struct drm_file *file_priv); | 120 | struct drm_file *file_priv); |
| 121 | extern int i810_driver_load(struct drm_device *, unsigned long flags); | 121 | extern int i810_driver_load(struct drm_device *, unsigned long flags); |
| 122 | extern void i810_driver_lastclose(struct drm_device *dev); | 122 | extern void i810_driver_lastclose(struct drm_device *dev); |
| 123 | extern void i810_driver_preclose(struct drm_device *dev, | 123 | extern void i810_driver_preclose(struct drm_device *dev, |
| 124 | struct drm_file *file_priv); | 124 | struct drm_file *file_priv); |
| 125 | extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev, | ||
| 126 | struct drm_file *file_priv); | ||
| 125 | extern int i810_driver_device_is_agp(struct drm_device *dev); | 127 | extern int i810_driver_device_is_agp(struct drm_device *dev); |
| 126 | 128 | ||
| 127 | extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg); | 129 | extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg); |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 11807989f918..deaa657292b4 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -121,11 +121,11 @@ static const char *cache_level_str(int type) | |||
| 121 | static void | 121 | static void |
| 122 | describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) | 122 | describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) |
| 123 | { | 123 | { |
| 124 | seq_printf(m, "%p: %s%s %8zd %04x %04x %d %d%s%s%s", | 124 | seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d%s%s%s", |
| 125 | &obj->base, | 125 | &obj->base, |
| 126 | get_pin_flag(obj), | 126 | get_pin_flag(obj), |
| 127 | get_tiling_flag(obj), | 127 | get_tiling_flag(obj), |
| 128 | obj->base.size, | 128 | obj->base.size / 1024, |
| 129 | obj->base.read_domains, | 129 | obj->base.read_domains, |
| 130 | obj->base.write_domain, | 130 | obj->base.write_domain, |
| 131 | obj->last_rendering_seqno, | 131 | obj->last_rendering_seqno, |
| @@ -653,7 +653,7 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data) | |||
| 653 | seq_printf(m, " Size : %08x\n", ring->size); | 653 | seq_printf(m, " Size : %08x\n", ring->size); |
| 654 | seq_printf(m, " Active : %08x\n", intel_ring_get_active_head(ring)); | 654 | seq_printf(m, " Active : %08x\n", intel_ring_get_active_head(ring)); |
| 655 | seq_printf(m, " NOPID : %08x\n", I915_READ_NOPID(ring)); | 655 | seq_printf(m, " NOPID : %08x\n", I915_READ_NOPID(ring)); |
| 656 | if (IS_GEN6(dev)) { | 656 | if (IS_GEN6(dev) || IS_GEN7(dev)) { |
| 657 | seq_printf(m, " Sync 0 : %08x\n", I915_READ_SYNC_0(ring)); | 657 | seq_printf(m, " Sync 0 : %08x\n", I915_READ_SYNC_0(ring)); |
| 658 | seq_printf(m, " Sync 1 : %08x\n", I915_READ_SYNC_1(ring)); | 658 | seq_printf(m, " Sync 1 : %08x\n", I915_READ_SYNC_1(ring)); |
| 659 | } | 659 | } |
| @@ -1075,6 +1075,7 @@ static int gen6_drpc_info(struct seq_file *m) | |||
| 1075 | struct drm_device *dev = node->minor->dev; | 1075 | struct drm_device *dev = node->minor->dev; |
| 1076 | struct drm_i915_private *dev_priv = dev->dev_private; | 1076 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1077 | u32 rpmodectl1, gt_core_status, rcctl1; | 1077 | u32 rpmodectl1, gt_core_status, rcctl1; |
| 1078 | unsigned forcewake_count; | ||
| 1078 | int count=0, ret; | 1079 | int count=0, ret; |
| 1079 | 1080 | ||
| 1080 | 1081 | ||
| @@ -1082,9 +1083,13 @@ static int gen6_drpc_info(struct seq_file *m) | |||
| 1082 | if (ret) | 1083 | if (ret) |
| 1083 | return ret; | 1084 | return ret; |
| 1084 | 1085 | ||
| 1085 | if (atomic_read(&dev_priv->forcewake_count)) { | 1086 | spin_lock_irq(&dev_priv->gt_lock); |
| 1086 | seq_printf(m, "RC information inaccurate because userspace " | 1087 | forcewake_count = dev_priv->forcewake_count; |
| 1087 | "holds a reference \n"); | 1088 | spin_unlock_irq(&dev_priv->gt_lock); |
| 1089 | |||
| 1090 | if (forcewake_count) { | ||
| 1091 | seq_printf(m, "RC information inaccurate because somebody " | ||
| 1092 | "holds a forcewake reference \n"); | ||
| 1088 | } else { | 1093 | } else { |
| 1089 | /* NB: we cannot use forcewake, else we read the wrong values */ | 1094 | /* NB: we cannot use forcewake, else we read the wrong values */ |
| 1090 | while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_ACK) & 1)) | 1095 | while (count++ < 50 && (I915_READ_NOTRACE(FORCEWAKE_ACK) & 1)) |
| @@ -1106,7 +1111,7 @@ static int gen6_drpc_info(struct seq_file *m) | |||
| 1106 | seq_printf(m, "SW control enabled: %s\n", | 1111 | seq_printf(m, "SW control enabled: %s\n", |
| 1107 | yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) == | 1112 | yesno((rpmodectl1 & GEN6_RP_MEDIA_MODE_MASK) == |
| 1108 | GEN6_RP_MEDIA_SW_MODE)); | 1113 | GEN6_RP_MEDIA_SW_MODE)); |
| 1109 | seq_printf(m, "RC6 Enabled: %s\n", | 1114 | seq_printf(m, "RC1e Enabled: %s\n", |
| 1110 | yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); | 1115 | yesno(rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); |
| 1111 | seq_printf(m, "RC6 Enabled: %s\n", | 1116 | seq_printf(m, "RC6 Enabled: %s\n", |
| 1112 | yesno(rcctl1 & GEN6_RC_CTL_RC6_ENABLE)); | 1117 | yesno(rcctl1 & GEN6_RC_CTL_RC6_ENABLE)); |
| @@ -1398,9 +1403,13 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data) | |||
| 1398 | struct drm_info_node *node = (struct drm_info_node *) m->private; | 1403 | struct drm_info_node *node = (struct drm_info_node *) m->private; |
| 1399 | struct drm_device *dev = node->minor->dev; | 1404 | struct drm_device *dev = node->minor->dev; |
| 1400 | struct drm_i915_private *dev_priv = dev->dev_private; | 1405 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1406 | unsigned forcewake_count; | ||
| 1407 | |||
| 1408 | spin_lock_irq(&dev_priv->gt_lock); | ||
| 1409 | forcewake_count = dev_priv->forcewake_count; | ||
| 1410 | spin_unlock_irq(&dev_priv->gt_lock); | ||
| 1401 | 1411 | ||
| 1402 | seq_printf(m, "forcewake count = %d\n", | 1412 | seq_printf(m, "forcewake count = %u\n", forcewake_count); |
| 1403 | atomic_read(&dev_priv->forcewake_count)); | ||
| 1404 | 1413 | ||
| 1405 | return 0; | 1414 | return 0; |
| 1406 | } | 1415 | } |
| @@ -1665,7 +1674,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file) | |||
| 1665 | struct drm_i915_private *dev_priv = dev->dev_private; | 1674 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1666 | int ret; | 1675 | int ret; |
| 1667 | 1676 | ||
| 1668 | if (!IS_GEN6(dev)) | 1677 | if (INTEL_INFO(dev)->gen < 6) |
| 1669 | return 0; | 1678 | return 0; |
| 1670 | 1679 | ||
| 1671 | ret = mutex_lock_interruptible(&dev->struct_mutex); | 1680 | ret = mutex_lock_interruptible(&dev->struct_mutex); |
| @@ -1682,7 +1691,7 @@ int i915_forcewake_release(struct inode *inode, struct file *file) | |||
| 1682 | struct drm_device *dev = inode->i_private; | 1691 | struct drm_device *dev = inode->i_private; |
| 1683 | struct drm_i915_private *dev_priv = dev->dev_private; | 1692 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 1684 | 1693 | ||
| 1685 | if (!IS_GEN6(dev)) | 1694 | if (INTEL_INFO(dev)->gen < 6) |
| 1686 | return 0; | 1695 | return 0; |
| 1687 | 1696 | ||
| 1688 | /* | 1697 | /* |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 5f4d5893e983..ddfe3d902b2a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -2045,6 +2045,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 2045 | if (!IS_I945G(dev) && !IS_I945GM(dev)) | 2045 | if (!IS_I945G(dev) && !IS_I945GM(dev)) |
| 2046 | pci_enable_msi(dev->pdev); | 2046 | pci_enable_msi(dev->pdev); |
| 2047 | 2047 | ||
| 2048 | spin_lock_init(&dev_priv->gt_lock); | ||
| 2048 | spin_lock_init(&dev_priv->irq_lock); | 2049 | spin_lock_init(&dev_priv->irq_lock); |
| 2049 | spin_lock_init(&dev_priv->error_lock); | 2050 | spin_lock_init(&dev_priv->error_lock); |
| 2050 | spin_lock_init(&dev_priv->rps_lock); | 2051 | spin_lock_init(&dev_priv->rps_lock); |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8f7187915b0d..308f81913562 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -368,11 +368,12 @@ void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) | |||
| 368 | */ | 368 | */ |
| 369 | void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) | 369 | void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) |
| 370 | { | 370 | { |
| 371 | WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex)); | 371 | unsigned long irqflags; |
| 372 | 372 | ||
| 373 | /* Forcewake is atomic in case we get in here without the lock */ | 373 | spin_lock_irqsave(&dev_priv->gt_lock, irqflags); |
| 374 | if (atomic_add_return(1, &dev_priv->forcewake_count) == 1) | 374 | if (dev_priv->forcewake_count++ == 0) |
| 375 | dev_priv->display.force_wake_get(dev_priv); | 375 | dev_priv->display.force_wake_get(dev_priv); |
| 376 | spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); | ||
| 376 | } | 377 | } |
| 377 | 378 | ||
| 378 | void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) | 379 | void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) |
| @@ -392,10 +393,12 @@ void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv) | |||
| 392 | */ | 393 | */ |
| 393 | void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) | 394 | void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) |
| 394 | { | 395 | { |
| 395 | WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex)); | 396 | unsigned long irqflags; |
| 396 | 397 | ||
| 397 | if (atomic_dec_and_test(&dev_priv->forcewake_count)) | 398 | spin_lock_irqsave(&dev_priv->gt_lock, irqflags); |
| 399 | if (--dev_priv->forcewake_count == 0) | ||
| 398 | dev_priv->display.force_wake_put(dev_priv); | 400 | dev_priv->display.force_wake_put(dev_priv); |
| 401 | spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); | ||
| 399 | } | 402 | } |
| 400 | 403 | ||
| 401 | void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv) | 404 | void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv) |
| @@ -597,9 +600,36 @@ static int ironlake_do_reset(struct drm_device *dev, u8 flags) | |||
| 597 | static int gen6_do_reset(struct drm_device *dev, u8 flags) | 600 | static int gen6_do_reset(struct drm_device *dev, u8 flags) |
| 598 | { | 601 | { |
| 599 | struct drm_i915_private *dev_priv = dev->dev_private; | 602 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 603 | int ret; | ||
| 604 | unsigned long irqflags; | ||
| 600 | 605 | ||
| 601 | I915_WRITE(GEN6_GDRST, GEN6_GRDOM_FULL); | 606 | /* Hold gt_lock across reset to prevent any register access |
| 602 | return wait_for((I915_READ(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500); | 607 | * with forcewake not set correctly |
| 608 | */ | ||
| 609 | spin_lock_irqsave(&dev_priv->gt_lock, irqflags); | ||
| 610 | |||
| 611 | /* Reset the chip */ | ||
| 612 | |||
| 613 | /* GEN6_GDRST is not in the gt power well, no need to check | ||
| 614 | * for fifo space for the write or forcewake the chip for | ||
| 615 | * the read | ||
| 616 | */ | ||
| 617 | I915_WRITE_NOTRACE(GEN6_GDRST, GEN6_GRDOM_FULL); | ||
| 618 | |||
| 619 | /* Spin waiting for the device to ack the reset request */ | ||
| 620 | ret = wait_for((I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0, 500); | ||
| 621 | |||
| 622 | /* If reset with a user forcewake, try to restore, otherwise turn it off */ | ||
| 623 | if (dev_priv->forcewake_count) | ||
| 624 | dev_priv->display.force_wake_get(dev_priv); | ||
| 625 | else | ||
| 626 | dev_priv->display.force_wake_put(dev_priv); | ||
| 627 | |||
| 628 | /* Restore fifo count */ | ||
| 629 | dev_priv->gt_fifo_count = I915_READ_NOTRACE(GT_FIFO_FREE_ENTRIES); | ||
| 630 | |||
| 631 | spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); | ||
| 632 | return ret; | ||
| 603 | } | 633 | } |
| 604 | 634 | ||
| 605 | /** | 635 | /** |
| @@ -643,9 +673,6 @@ int i915_reset(struct drm_device *dev, u8 flags) | |||
| 643 | case 7: | 673 | case 7: |
| 644 | case 6: | 674 | case 6: |
| 645 | ret = gen6_do_reset(dev, flags); | 675 | ret = gen6_do_reset(dev, flags); |
| 646 | /* If reset with a user forcewake, try to restore */ | ||
| 647 | if (atomic_read(&dev_priv->forcewake_count)) | ||
| 648 | __gen6_gt_force_wake_get(dev_priv); | ||
| 649 | break; | 676 | break; |
| 650 | case 5: | 677 | case 5: |
| 651 | ret = ironlake_do_reset(dev, flags); | 678 | ret = ironlake_do_reset(dev, flags); |
| @@ -927,9 +954,14 @@ MODULE_LICENSE("GPL and additional rights"); | |||
| 927 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ | 954 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg) { \ |
| 928 | u##x val = 0; \ | 955 | u##x val = 0; \ |
| 929 | if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ | 956 | if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ |
| 930 | gen6_gt_force_wake_get(dev_priv); \ | 957 | unsigned long irqflags; \ |
| 958 | spin_lock_irqsave(&dev_priv->gt_lock, irqflags); \ | ||
| 959 | if (dev_priv->forcewake_count == 0) \ | ||
| 960 | dev_priv->display.force_wake_get(dev_priv); \ | ||
| 931 | val = read##y(dev_priv->regs + reg); \ | 961 | val = read##y(dev_priv->regs + reg); \ |
| 932 | gen6_gt_force_wake_put(dev_priv); \ | 962 | if (dev_priv->forcewake_count == 0) \ |
| 963 | dev_priv->display.force_wake_put(dev_priv); \ | ||
| 964 | spin_unlock_irqrestore(&dev_priv->gt_lock, irqflags); \ | ||
| 933 | } else { \ | 965 | } else { \ |
| 934 | val = read##y(dev_priv->regs + reg); \ | 966 | val = read##y(dev_priv->regs + reg); \ |
| 935 | } \ | 967 | } \ |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 602bc80baabb..9689ca38b2b3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -288,7 +288,13 @@ typedef struct drm_i915_private { | |||
| 288 | int relative_constants_mode; | 288 | int relative_constants_mode; |
| 289 | 289 | ||
| 290 | void __iomem *regs; | 290 | void __iomem *regs; |
| 291 | u32 gt_fifo_count; | 291 | /** gt_fifo_count and the subsequent register write are synchronized |
| 292 | * with dev->struct_mutex. */ | ||
| 293 | unsigned gt_fifo_count; | ||
| 294 | /** forcewake_count is protected by gt_lock */ | ||
| 295 | unsigned forcewake_count; | ||
| 296 | /** gt_lock is also taken in irq contexts. */ | ||
| 297 | struct spinlock gt_lock; | ||
| 292 | 298 | ||
| 293 | struct intel_gmbus { | 299 | struct intel_gmbus { |
| 294 | struct i2c_adapter adapter; | 300 | struct i2c_adapter adapter; |
| @@ -741,8 +747,6 @@ typedef struct drm_i915_private { | |||
| 741 | 747 | ||
| 742 | struct drm_property *broadcast_rgb_property; | 748 | struct drm_property *broadcast_rgb_property; |
| 743 | struct drm_property *force_audio_property; | 749 | struct drm_property *force_audio_property; |
| 744 | |||
| 745 | atomic_t forcewake_count; | ||
| 746 | } drm_i915_private_t; | 750 | } drm_i915_private_t; |
| 747 | 751 | ||
| 748 | enum i915_cache_level { | 752 | enum i915_cache_level { |
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5d433fc11ace..5bd4361ea84d 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -1751,7 +1751,8 @@ static void ironlake_irq_preinstall(struct drm_device *dev) | |||
| 1751 | INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); | 1751 | INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work); |
| 1752 | 1752 | ||
| 1753 | I915_WRITE(HWSTAM, 0xeffe); | 1753 | I915_WRITE(HWSTAM, 0xeffe); |
| 1754 | if (IS_GEN6(dev) || IS_GEN7(dev)) { | 1754 | |
| 1755 | if (IS_GEN6(dev)) { | ||
| 1755 | /* Workaround stalls observed on Sandy Bridge GPUs by | 1756 | /* Workaround stalls observed on Sandy Bridge GPUs by |
| 1756 | * making the blitter command streamer generate a | 1757 | * making the blitter command streamer generate a |
| 1757 | * write to the Hardware Status Page for | 1758 | * write to the Hardware Status Page for |
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 7886e4fb60e3..2b5eb229ff2c 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
| @@ -28,14 +28,19 @@ | |||
| 28 | #include "drm.h" | 28 | #include "drm.h" |
| 29 | #include "i915_drm.h" | 29 | #include "i915_drm.h" |
| 30 | #include "intel_drv.h" | 30 | #include "intel_drv.h" |
| 31 | #include "i915_reg.h" | ||
| 31 | 32 | ||
| 32 | static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe) | 33 | static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe) |
| 33 | { | 34 | { |
| 34 | struct drm_i915_private *dev_priv = dev->dev_private; | 35 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 35 | u32 dpll_reg; | 36 | u32 dpll_reg; |
| 36 | 37 | ||
| 38 | /* On IVB, 3rd pipe shares PLL with another one */ | ||
| 39 | if (pipe > 1) | ||
| 40 | return false; | ||
| 41 | |||
| 37 | if (HAS_PCH_SPLIT(dev)) | 42 | if (HAS_PCH_SPLIT(dev)) |
| 38 | dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B; | 43 | dpll_reg = PCH_DPLL(pipe); |
| 39 | else | 44 | else |
| 40 | dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B; | 45 | dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B; |
| 41 | 46 | ||
| @@ -822,7 +827,7 @@ int i915_save_state(struct drm_device *dev) | |||
| 822 | 827 | ||
| 823 | if (IS_IRONLAKE_M(dev)) | 828 | if (IS_IRONLAKE_M(dev)) |
| 824 | ironlake_disable_drps(dev); | 829 | ironlake_disable_drps(dev); |
| 825 | if (IS_GEN6(dev)) | 830 | if (INTEL_INFO(dev)->gen >= 6) |
| 826 | gen6_disable_rps(dev); | 831 | gen6_disable_rps(dev); |
| 827 | 832 | ||
| 828 | /* Cache mode state */ | 833 | /* Cache mode state */ |
| @@ -881,7 +886,7 @@ int i915_restore_state(struct drm_device *dev) | |||
| 881 | intel_init_emon(dev); | 886 | intel_init_emon(dev); |
| 882 | } | 887 | } |
| 883 | 888 | ||
| 884 | if (IS_GEN6(dev)) { | 889 | if (INTEL_INFO(dev)->gen >= 6) { |
| 885 | gen6_enable_rps(dev_priv); | 890 | gen6_enable_rps(dev_priv); |
| 886 | gen6_update_ring_freq(dev_priv); | 891 | gen6_update_ring_freq(dev_priv); |
| 887 | } | 892 | } |
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index 8af3735e27c6..dbda6e3bdf07 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h | |||
| @@ -467,8 +467,12 @@ struct edp_link_params { | |||
| 467 | struct bdb_edp { | 467 | struct bdb_edp { |
| 468 | struct edp_power_seq power_seqs[16]; | 468 | struct edp_power_seq power_seqs[16]; |
| 469 | u32 color_depth; | 469 | u32 color_depth; |
| 470 | u32 sdrrs_msa_timing_delay; | ||
| 471 | struct edp_link_params link_params[16]; | 470 | struct edp_link_params link_params[16]; |
| 471 | u32 sdrrs_msa_timing_delay; | ||
| 472 | |||
| 473 | /* ith bit indicates enabled/disabled for (i+1)th panel */ | ||
| 474 | u16 edp_s3d_feature; | ||
| 475 | u16 edp_t3_optimization; | ||
| 472 | } __attribute__ ((packed)); | 476 | } __attribute__ ((packed)); |
| 473 | 477 | ||
| 474 | void intel_setup_bios(struct drm_device *dev); | 478 | void intel_setup_bios(struct drm_device *dev); |
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index fee0ad02c6d0..dd729d46a61f 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * Eric Anholt <eric@anholt.net> | 24 | * Eric Anholt <eric@anholt.net> |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/dmi.h> | ||
| 27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 28 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| @@ -540,6 +541,24 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { | |||
| 540 | .destroy = intel_encoder_destroy, | 541 | .destroy = intel_encoder_destroy, |
| 541 | }; | 542 | }; |
| 542 | 543 | ||
| 544 | static int __init intel_no_crt_dmi_callback(const struct dmi_system_id *id) | ||
| 545 | { | ||
| 546 | DRM_DEBUG_KMS("Skipping CRT initialization for %s\n", id->ident); | ||
| 547 | return 1; | ||
| 548 | } | ||
| 549 | |||
| 550 | static const struct dmi_system_id intel_no_crt[] = { | ||
| 551 | { | ||
| 552 | .callback = intel_no_crt_dmi_callback, | ||
| 553 | .ident = "ACER ZGB", | ||
| 554 | .matches = { | ||
| 555 | DMI_MATCH(DMI_SYS_VENDOR, "ACER"), | ||
| 556 | DMI_MATCH(DMI_PRODUCT_NAME, "ZGB"), | ||
| 557 | }, | ||
| 558 | }, | ||
| 559 | { } | ||
| 560 | }; | ||
| 561 | |||
| 543 | void intel_crt_init(struct drm_device *dev) | 562 | void intel_crt_init(struct drm_device *dev) |
| 544 | { | 563 | { |
| 545 | struct drm_connector *connector; | 564 | struct drm_connector *connector; |
| @@ -547,6 +566,10 @@ void intel_crt_init(struct drm_device *dev) | |||
| 547 | struct intel_connector *intel_connector; | 566 | struct intel_connector *intel_connector; |
| 548 | struct drm_i915_private *dev_priv = dev->dev_private; | 567 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 549 | 568 | ||
| 569 | /* Skip machines without VGA that falsely report hotplug events */ | ||
| 570 | if (dmi_check_system(intel_no_crt)) | ||
| 571 | return; | ||
| 572 | |||
| 550 | crt = kzalloc(sizeof(struct intel_crt), GFP_KERNEL); | 573 | crt = kzalloc(sizeof(struct intel_crt), GFP_KERNEL); |
| 551 | if (!crt) | 574 | if (!crt) |
| 552 | return; | 575 | return; |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2a3f707caab8..b3b51c43dad0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -5808,12 +5808,15 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, | |||
| 5808 | if (is_lvds) { | 5808 | if (is_lvds) { |
| 5809 | temp = I915_READ(PCH_LVDS); | 5809 | temp = I915_READ(PCH_LVDS); |
| 5810 | temp |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; | 5810 | temp |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP; |
| 5811 | if (HAS_PCH_CPT(dev)) | 5811 | if (HAS_PCH_CPT(dev)) { |
| 5812 | temp &= ~PORT_TRANS_SEL_MASK; | ||
| 5812 | temp |= PORT_TRANS_SEL_CPT(pipe); | 5813 | temp |= PORT_TRANS_SEL_CPT(pipe); |
| 5813 | else if (pipe == 1) | 5814 | } else { |
| 5814 | temp |= LVDS_PIPEB_SELECT; | 5815 | if (pipe == 1) |
| 5815 | else | 5816 | temp |= LVDS_PIPEB_SELECT; |
| 5816 | temp &= ~LVDS_PIPEB_SELECT; | 5817 | else |
| 5818 | temp &= ~LVDS_PIPEB_SELECT; | ||
| 5819 | } | ||
| 5817 | 5820 | ||
| 5818 | /* set the corresponsding LVDS_BORDER bit */ | 5821 | /* set the corresponsding LVDS_BORDER bit */ |
| 5819 | temp |= dev_priv->lvds_border_bits; | 5822 | temp |= dev_priv->lvds_border_bits; |
| @@ -9025,12 +9028,9 @@ void intel_modeset_init(struct drm_device *dev) | |||
| 9025 | 9028 | ||
| 9026 | for (i = 0; i < dev_priv->num_pipe; i++) { | 9029 | for (i = 0; i < dev_priv->num_pipe; i++) { |
| 9027 | intel_crtc_init(dev, i); | 9030 | intel_crtc_init(dev, i); |
| 9028 | if (HAS_PCH_SPLIT(dev)) { | 9031 | ret = intel_plane_init(dev, i); |
| 9029 | ret = intel_plane_init(dev, i); | 9032 | if (ret) |
| 9030 | if (ret) | 9033 | DRM_DEBUG_KMS("plane %d init failed: %d\n", i, ret); |
| 9031 | DRM_ERROR("plane %d init failed: %d\n", | ||
| 9032 | i, ret); | ||
| 9033 | } | ||
| 9034 | } | 9034 | } |
| 9035 | 9035 | ||
| 9036 | /* Just disable it once at startup */ | 9036 | /* Just disable it once at startup */ |
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index e44191132ac4..798f6e1aa544 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -708,6 +708,14 @@ static const struct dmi_system_id intel_no_lvds[] = { | |||
| 708 | }, | 708 | }, |
| 709 | }, | 709 | }, |
| 710 | { | 710 | { |
| 711 | .callback = intel_no_lvds_dmi_callback, | ||
| 712 | .ident = "Clientron E830", | ||
| 713 | .matches = { | ||
| 714 | DMI_MATCH(DMI_SYS_VENDOR, "Clientron"), | ||
| 715 | DMI_MATCH(DMI_PRODUCT_NAME, "E830"), | ||
| 716 | }, | ||
| 717 | }, | ||
| 718 | { | ||
| 711 | .callback = intel_no_lvds_dmi_callback, | 719 | .callback = intel_no_lvds_dmi_callback, |
| 712 | .ident = "Asus EeeBox PC EB1007", | 720 | .ident = "Asus EeeBox PC EB1007", |
| 713 | .matches = { | 721 | .matches = { |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 77e729d4e4f0..1ab842c6032e 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
| @@ -636,6 +636,19 @@ render_ring_add_request(struct intel_ring_buffer *ring, | |||
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | static u32 | 638 | static u32 |
| 639 | gen6_ring_get_seqno(struct intel_ring_buffer *ring) | ||
| 640 | { | ||
| 641 | struct drm_device *dev = ring->dev; | ||
| 642 | |||
| 643 | /* Workaround to force correct ordering between irq and seqno writes on | ||
| 644 | * ivb (and maybe also on snb) by reading from a CS register (like | ||
| 645 | * ACTHD) before reading the status page. */ | ||
| 646 | if (IS_GEN7(dev)) | ||
| 647 | intel_ring_get_active_head(ring); | ||
| 648 | return intel_read_status_page(ring, I915_GEM_HWS_INDEX); | ||
| 649 | } | ||
| 650 | |||
| 651 | static u32 | ||
| 639 | ring_get_seqno(struct intel_ring_buffer *ring) | 652 | ring_get_seqno(struct intel_ring_buffer *ring) |
| 640 | { | 653 | { |
| 641 | return intel_read_status_page(ring, I915_GEM_HWS_INDEX); | 654 | return intel_read_status_page(ring, I915_GEM_HWS_INDEX); |
| @@ -792,17 +805,6 @@ ring_add_request(struct intel_ring_buffer *ring, | |||
| 792 | } | 805 | } |
| 793 | 806 | ||
| 794 | static bool | 807 | static bool |
| 795 | gen7_blt_ring_get_irq(struct intel_ring_buffer *ring) | ||
| 796 | { | ||
| 797 | /* The BLT ring on IVB appears to have broken synchronization | ||
| 798 | * between the seqno write and the interrupt, so that the | ||
| 799 | * interrupt appears first. Returning false here makes | ||
| 800 | * i915_wait_request() do a polling loop, instead. | ||
| 801 | */ | ||
| 802 | return false; | ||
| 803 | } | ||
| 804 | |||
| 805 | static bool | ||
| 806 | gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) | 808 | gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) |
| 807 | { | 809 | { |
| 808 | struct drm_device *dev = ring->dev; | 810 | struct drm_device *dev = ring->dev; |
| @@ -811,6 +813,12 @@ gen6_ring_get_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) | |||
| 811 | if (!dev->irq_enabled) | 813 | if (!dev->irq_enabled) |
| 812 | return false; | 814 | return false; |
| 813 | 815 | ||
| 816 | /* It looks like we need to prevent the gt from suspending while waiting | ||
| 817 | * for an notifiy irq, otherwise irqs seem to get lost on at least the | ||
| 818 | * blt/bsd rings on ivb. */ | ||
| 819 | if (IS_GEN7(dev)) | ||
| 820 | gen6_gt_force_wake_get(dev_priv); | ||
| 821 | |||
| 814 | spin_lock(&ring->irq_lock); | 822 | spin_lock(&ring->irq_lock); |
| 815 | if (ring->irq_refcount++ == 0) { | 823 | if (ring->irq_refcount++ == 0) { |
| 816 | ring->irq_mask &= ~rflag; | 824 | ring->irq_mask &= ~rflag; |
| @@ -835,6 +843,9 @@ gen6_ring_put_irq(struct intel_ring_buffer *ring, u32 gflag, u32 rflag) | |||
| 835 | ironlake_disable_irq(dev_priv, gflag); | 843 | ironlake_disable_irq(dev_priv, gflag); |
| 836 | } | 844 | } |
| 837 | spin_unlock(&ring->irq_lock); | 845 | spin_unlock(&ring->irq_lock); |
| 846 | |||
| 847 | if (IS_GEN7(dev)) | ||
| 848 | gen6_gt_force_wake_put(dev_priv); | ||
| 838 | } | 849 | } |
| 839 | 850 | ||
| 840 | static bool | 851 | static bool |
| @@ -1341,7 +1352,7 @@ static const struct intel_ring_buffer gen6_bsd_ring = { | |||
| 1341 | .write_tail = gen6_bsd_ring_write_tail, | 1352 | .write_tail = gen6_bsd_ring_write_tail, |
| 1342 | .flush = gen6_ring_flush, | 1353 | .flush = gen6_ring_flush, |
| 1343 | .add_request = gen6_add_request, | 1354 | .add_request = gen6_add_request, |
| 1344 | .get_seqno = ring_get_seqno, | 1355 | .get_seqno = gen6_ring_get_seqno, |
| 1345 | .irq_get = gen6_bsd_ring_get_irq, | 1356 | .irq_get = gen6_bsd_ring_get_irq, |
| 1346 | .irq_put = gen6_bsd_ring_put_irq, | 1357 | .irq_put = gen6_bsd_ring_put_irq, |
| 1347 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, | 1358 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, |
| @@ -1476,7 +1487,7 @@ static const struct intel_ring_buffer gen6_blt_ring = { | |||
| 1476 | .write_tail = ring_write_tail, | 1487 | .write_tail = ring_write_tail, |
| 1477 | .flush = blt_ring_flush, | 1488 | .flush = blt_ring_flush, |
| 1478 | .add_request = gen6_add_request, | 1489 | .add_request = gen6_add_request, |
| 1479 | .get_seqno = ring_get_seqno, | 1490 | .get_seqno = gen6_ring_get_seqno, |
| 1480 | .irq_get = blt_ring_get_irq, | 1491 | .irq_get = blt_ring_get_irq, |
| 1481 | .irq_put = blt_ring_put_irq, | 1492 | .irq_put = blt_ring_put_irq, |
| 1482 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, | 1493 | .dispatch_execbuffer = gen6_ring_dispatch_execbuffer, |
| @@ -1499,6 +1510,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) | |||
| 1499 | ring->flush = gen6_render_ring_flush; | 1510 | ring->flush = gen6_render_ring_flush; |
| 1500 | ring->irq_get = gen6_render_ring_get_irq; | 1511 | ring->irq_get = gen6_render_ring_get_irq; |
| 1501 | ring->irq_put = gen6_render_ring_put_irq; | 1512 | ring->irq_put = gen6_render_ring_put_irq; |
| 1513 | ring->get_seqno = gen6_ring_get_seqno; | ||
| 1502 | } else if (IS_GEN5(dev)) { | 1514 | } else if (IS_GEN5(dev)) { |
| 1503 | ring->add_request = pc_render_add_request; | 1515 | ring->add_request = pc_render_add_request; |
| 1504 | ring->get_seqno = pc_render_get_seqno; | 1516 | ring->get_seqno = pc_render_get_seqno; |
| @@ -1577,8 +1589,5 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) | |||
| 1577 | 1589 | ||
| 1578 | *ring = gen6_blt_ring; | 1590 | *ring = gen6_blt_ring; |
| 1579 | 1591 | ||
| 1580 | if (IS_GEN7(dev)) | ||
| 1581 | ring->irq_get = gen7_blt_ring_get_irq; | ||
| 1582 | |||
| 1583 | return intel_init_ring_buffer(dev, ring); | 1592 | return intel_init_ring_buffer(dev, ring); |
| 1584 | } | 1593 | } |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index f7b9268df266..e334ec33a47d 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
| @@ -1066,15 +1066,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, | |||
| 1066 | 1066 | ||
| 1067 | /* Set the SDVO control regs. */ | 1067 | /* Set the SDVO control regs. */ |
| 1068 | if (INTEL_INFO(dev)->gen >= 4) { | 1068 | if (INTEL_INFO(dev)->gen >= 4) { |
| 1069 | sdvox = 0; | 1069 | /* The real mode polarity is set by the SDVO commands, using |
| 1070 | * struct intel_sdvo_dtd. */ | ||
| 1071 | sdvox = SDVO_VSYNC_ACTIVE_HIGH | SDVO_HSYNC_ACTIVE_HIGH; | ||
| 1070 | if (intel_sdvo->is_hdmi) | 1072 | if (intel_sdvo->is_hdmi) |
| 1071 | sdvox |= intel_sdvo->color_range; | 1073 | sdvox |= intel_sdvo->color_range; |
| 1072 | if (INTEL_INFO(dev)->gen < 5) | 1074 | if (INTEL_INFO(dev)->gen < 5) |
| 1073 | sdvox |= SDVO_BORDER_ENABLE; | 1075 | sdvox |= SDVO_BORDER_ENABLE; |
| 1074 | if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) | ||
| 1075 | sdvox |= SDVO_VSYNC_ACTIVE_HIGH; | ||
| 1076 | if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) | ||
| 1077 | sdvox |= SDVO_HSYNC_ACTIVE_HIGH; | ||
| 1078 | } else { | 1076 | } else { |
| 1079 | sdvox = I915_READ(intel_sdvo->sdvo_reg); | 1077 | sdvox = I915_READ(intel_sdvo->sdvo_reg); |
| 1080 | switch (intel_sdvo->sdvo_reg) { | 1078 | switch (intel_sdvo->sdvo_reg) { |
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index d13989fda501..2288abf88cce 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
| @@ -466,10 +466,8 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, | |||
| 466 | mutex_lock(&dev->struct_mutex); | 466 | mutex_lock(&dev->struct_mutex); |
| 467 | 467 | ||
| 468 | ret = intel_pin_and_fence_fb_obj(dev, obj, NULL); | 468 | ret = intel_pin_and_fence_fb_obj(dev, obj, NULL); |
| 469 | if (ret) { | 469 | if (ret) |
| 470 | DRM_ERROR("failed to pin object\n"); | ||
| 471 | goto out_unlock; | 470 | goto out_unlock; |
| 472 | } | ||
| 473 | 471 | ||
| 474 | intel_plane->obj = obj; | 472 | intel_plane->obj = obj; |
| 475 | 473 | ||
| @@ -632,10 +630,8 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe) | |||
| 632 | unsigned long possible_crtcs; | 630 | unsigned long possible_crtcs; |
| 633 | int ret; | 631 | int ret; |
| 634 | 632 | ||
| 635 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) { | 633 | if (!(IS_GEN6(dev) || IS_GEN7(dev))) |
| 636 | DRM_ERROR("new plane code only for SNB+\n"); | ||
| 637 | return -ENODEV; | 634 | return -ENODEV; |
| 638 | } | ||
| 639 | 635 | ||
| 640 | intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL); | 636 | intel_plane = kzalloc(sizeof(struct intel_plane), GFP_KERNEL); |
| 641 | if (!intel_plane) | 637 | if (!intel_plane) |
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index f3c6a9a8b081..1571be37ce3e 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
| @@ -417,7 +417,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 417 | { | 417 | { |
| 418 | .name = "NTSC-M", | 418 | .name = "NTSC-M", |
| 419 | .clock = 108000, | 419 | .clock = 108000, |
| 420 | .refresh = 29970, | 420 | .refresh = 59940, |
| 421 | .oversample = TV_OVERSAMPLE_8X, | 421 | .oversample = TV_OVERSAMPLE_8X, |
| 422 | .component_only = 0, | 422 | .component_only = 0, |
| 423 | /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 3.580MHz */ | 423 | /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 3.580MHz */ |
| @@ -460,7 +460,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 460 | { | 460 | { |
| 461 | .name = "NTSC-443", | 461 | .name = "NTSC-443", |
| 462 | .clock = 108000, | 462 | .clock = 108000, |
| 463 | .refresh = 29970, | 463 | .refresh = 59940, |
| 464 | .oversample = TV_OVERSAMPLE_8X, | 464 | .oversample = TV_OVERSAMPLE_8X, |
| 465 | .component_only = 0, | 465 | .component_only = 0, |
| 466 | /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 4.43MHz */ | 466 | /* 525 Lines, 60 Fields, 15.734KHz line, Sub-Carrier 4.43MHz */ |
| @@ -502,7 +502,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 502 | { | 502 | { |
| 503 | .name = "NTSC-J", | 503 | .name = "NTSC-J", |
| 504 | .clock = 108000, | 504 | .clock = 108000, |
| 505 | .refresh = 29970, | 505 | .refresh = 59940, |
| 506 | .oversample = TV_OVERSAMPLE_8X, | 506 | .oversample = TV_OVERSAMPLE_8X, |
| 507 | .component_only = 0, | 507 | .component_only = 0, |
| 508 | 508 | ||
| @@ -545,7 +545,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 545 | { | 545 | { |
| 546 | .name = "PAL-M", | 546 | .name = "PAL-M", |
| 547 | .clock = 108000, | 547 | .clock = 108000, |
| 548 | .refresh = 29970, | 548 | .refresh = 59940, |
| 549 | .oversample = TV_OVERSAMPLE_8X, | 549 | .oversample = TV_OVERSAMPLE_8X, |
| 550 | .component_only = 0, | 550 | .component_only = 0, |
| 551 | 551 | ||
| @@ -589,7 +589,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 589 | /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ | 589 | /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ |
| 590 | .name = "PAL-N", | 590 | .name = "PAL-N", |
| 591 | .clock = 108000, | 591 | .clock = 108000, |
| 592 | .refresh = 25000, | 592 | .refresh = 50000, |
| 593 | .oversample = TV_OVERSAMPLE_8X, | 593 | .oversample = TV_OVERSAMPLE_8X, |
| 594 | .component_only = 0, | 594 | .component_only = 0, |
| 595 | 595 | ||
| @@ -634,7 +634,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 634 | /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ | 634 | /* 625 Lines, 50 Fields, 15.625KHz line, Sub-Carrier 4.434MHz */ |
| 635 | .name = "PAL", | 635 | .name = "PAL", |
| 636 | .clock = 108000, | 636 | .clock = 108000, |
| 637 | .refresh = 25000, | 637 | .refresh = 50000, |
| 638 | .oversample = TV_OVERSAMPLE_8X, | 638 | .oversample = TV_OVERSAMPLE_8X, |
| 639 | .component_only = 0, | 639 | .component_only = 0, |
| 640 | 640 | ||
| @@ -674,78 +674,6 @@ static const struct tv_mode tv_modes[] = { | |||
| 674 | .filter_table = filter_table, | 674 | .filter_table = filter_table, |
| 675 | }, | 675 | }, |
| 676 | { | 676 | { |
| 677 | .name = "480p@59.94Hz", | ||
| 678 | .clock = 107520, | ||
| 679 | .refresh = 59940, | ||
| 680 | .oversample = TV_OVERSAMPLE_4X, | ||
| 681 | .component_only = 1, | ||
| 682 | |||
| 683 | .hsync_end = 64, .hblank_end = 122, | ||
| 684 | .hblank_start = 842, .htotal = 857, | ||
| 685 | |||
| 686 | .progressive = true, .trilevel_sync = false, | ||
| 687 | |||
| 688 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, | ||
| 689 | .vsync_len = 12, | ||
| 690 | |||
| 691 | .veq_ena = false, | ||
| 692 | |||
| 693 | .vi_end_f1 = 44, .vi_end_f2 = 44, | ||
| 694 | .nbr_end = 479, | ||
| 695 | |||
| 696 | .burst_ena = false, | ||
| 697 | |||
| 698 | .filter_table = filter_table, | ||
| 699 | }, | ||
| 700 | { | ||
| 701 | .name = "480p@60Hz", | ||
| 702 | .clock = 107520, | ||
| 703 | .refresh = 60000, | ||
| 704 | .oversample = TV_OVERSAMPLE_4X, | ||
| 705 | .component_only = 1, | ||
| 706 | |||
| 707 | .hsync_end = 64, .hblank_end = 122, | ||
| 708 | .hblank_start = 842, .htotal = 856, | ||
| 709 | |||
| 710 | .progressive = true, .trilevel_sync = false, | ||
| 711 | |||
| 712 | .vsync_start_f1 = 12, .vsync_start_f2 = 12, | ||
| 713 | .vsync_len = 12, | ||
| 714 | |||
| 715 | .veq_ena = false, | ||
| 716 | |||
| 717 | .vi_end_f1 = 44, .vi_end_f2 = 44, | ||
| 718 | .nbr_end = 479, | ||
| 719 | |||
| 720 | .burst_ena = false, | ||
| 721 | |||
| 722 | .filter_table = filter_table, | ||
| 723 | }, | ||
| 724 | { | ||
| 725 | .name = "576p", | ||
| 726 | .clock = 107520, | ||
| 727 | .refresh = 50000, | ||
| 728 | .oversample = TV_OVERSAMPLE_4X, | ||
| 729 | .component_only = 1, | ||
| 730 | |||
| 731 | .hsync_end = 64, .hblank_end = 139, | ||
| 732 | .hblank_start = 859, .htotal = 863, | ||
| 733 | |||
| 734 | .progressive = true, .trilevel_sync = false, | ||
| 735 | |||
| 736 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, | ||
| 737 | .vsync_len = 10, | ||
| 738 | |||
| 739 | .veq_ena = false, | ||
| 740 | |||
| 741 | .vi_end_f1 = 48, .vi_end_f2 = 48, | ||
| 742 | .nbr_end = 575, | ||
| 743 | |||
| 744 | .burst_ena = false, | ||
| 745 | |||
| 746 | .filter_table = filter_table, | ||
| 747 | }, | ||
| 748 | { | ||
| 749 | .name = "720p@60Hz", | 677 | .name = "720p@60Hz", |
| 750 | .clock = 148800, | 678 | .clock = 148800, |
| 751 | .refresh = 60000, | 679 | .refresh = 60000, |
| @@ -770,30 +698,6 @@ static const struct tv_mode tv_modes[] = { | |||
| 770 | .filter_table = filter_table, | 698 | .filter_table = filter_table, |
| 771 | }, | 699 | }, |
| 772 | { | 700 | { |
| 773 | .name = "720p@59.94Hz", | ||
| 774 | .clock = 148800, | ||
| 775 | .refresh = 59940, | ||
| 776 | .oversample = TV_OVERSAMPLE_2X, | ||
| 777 | .component_only = 1, | ||
| 778 | |||
| 779 | .hsync_end = 80, .hblank_end = 300, | ||
| 780 | .hblank_start = 1580, .htotal = 1651, | ||
| 781 | |||
| 782 | .progressive = true, .trilevel_sync = true, | ||
| 783 | |||
| 784 | .vsync_start_f1 = 10, .vsync_start_f2 = 10, | ||
| 785 | .vsync_len = 10, | ||
| 786 | |||
| 787 | .veq_ena = false, | ||
| 788 | |||
| 789 | .vi_end_f1 = 29, .vi_end_f2 = 29, | ||
| 790 | .nbr_end = 719, | ||
| 791 | |||
| 792 | .burst_ena = false, | ||
| 793 | |||
| 794 | .filter_table = filter_table, | ||
| 795 | }, | ||
| 796 | { | ||
| 797 | .name = "720p@50Hz", | 701 | .name = "720p@50Hz", |
| 798 | .clock = 148800, | 702 | .clock = 148800, |
| 799 | .refresh = 50000, | 703 | .refresh = 50000, |
| @@ -821,7 +725,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 821 | { | 725 | { |
| 822 | .name = "1080i@50Hz", | 726 | .name = "1080i@50Hz", |
| 823 | .clock = 148800, | 727 | .clock = 148800, |
| 824 | .refresh = 25000, | 728 | .refresh = 50000, |
| 825 | .oversample = TV_OVERSAMPLE_2X, | 729 | .oversample = TV_OVERSAMPLE_2X, |
| 826 | .component_only = 1, | 730 | .component_only = 1, |
| 827 | 731 | ||
| @@ -847,7 +751,7 @@ static const struct tv_mode tv_modes[] = { | |||
| 847 | { | 751 | { |
| 848 | .name = "1080i@60Hz", | 752 | .name = "1080i@60Hz", |
| 849 | .clock = 148800, | 753 | .clock = 148800, |
| 850 | .refresh = 30000, | 754 | .refresh = 60000, |
| 851 | .oversample = TV_OVERSAMPLE_2X, | 755 | .oversample = TV_OVERSAMPLE_2X, |
| 852 | .component_only = 1, | 756 | .component_only = 1, |
| 853 | 757 | ||
| @@ -870,32 +774,6 @@ static const struct tv_mode tv_modes[] = { | |||
| 870 | 774 | ||
| 871 | .filter_table = filter_table, | 775 | .filter_table = filter_table, |
| 872 | }, | 776 | }, |
| 873 | { | ||
| 874 | .name = "1080i@59.94Hz", | ||
| 875 | .clock = 148800, | ||
| 876 | .refresh = 29970, | ||
| 877 | .oversample = TV_OVERSAMPLE_2X, | ||
| 878 | .component_only = 1, | ||
| 879 | |||
| 880 | .hsync_end = 88, .hblank_end = 235, | ||
| 881 | .hblank_start = 2155, .htotal = 2201, | ||
| 882 | |||
| 883 | .progressive = false, .trilevel_sync = true, | ||
| 884 | |||
| 885 | .vsync_start_f1 = 4, .vsync_start_f2 = 5, | ||
| 886 | .vsync_len = 10, | ||
| 887 | |||
| 888 | .veq_ena = true, .veq_start_f1 = 4, | ||
| 889 | .veq_start_f2 = 4, .veq_len = 10, | ||
| 890 | |||
| 891 | |||
| 892 | .vi_end_f1 = 21, .vi_end_f2 = 22, | ||
| 893 | .nbr_end = 539, | ||
| 894 | |||
| 895 | .burst_ena = false, | ||
| 896 | |||
| 897 | .filter_table = filter_table, | ||
| 898 | }, | ||
| 899 | }; | 777 | }; |
| 900 | 778 | ||
| 901 | static struct intel_tv *enc_to_intel_tv(struct drm_encoder *encoder) | 779 | static struct intel_tv *enc_to_intel_tv(struct drm_encoder *encoder) |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 1e382ad5a2b8..a37c31e358aa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h | |||
| @@ -54,9 +54,10 @@ struct bit_entry { | |||
| 54 | int bit_table(struct drm_device *, u8 id, struct bit_entry *); | 54 | int bit_table(struct drm_device *, u8 id, struct bit_entry *); |
| 55 | 55 | ||
| 56 | enum dcb_gpio_tag { | 56 | enum dcb_gpio_tag { |
| 57 | DCB_GPIO_TVDAC0 = 0xc, | 57 | DCB_GPIO_PANEL_POWER = 0x01, |
| 58 | DCB_GPIO_TVDAC0 = 0x0c, | ||
| 58 | DCB_GPIO_TVDAC1 = 0x2d, | 59 | DCB_GPIO_TVDAC1 = 0x2d, |
| 59 | DCB_GPIO_PWM_FAN = 0x9, | 60 | DCB_GPIO_PWM_FAN = 0x09, |
| 60 | DCB_GPIO_FAN_SENSE = 0x3d, | 61 | DCB_GPIO_FAN_SENSE = 0x3d, |
| 61 | DCB_GPIO_UNUSED = 0xff | 62 | DCB_GPIO_UNUSED = 0xff |
| 62 | }; | 63 | }; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 3cb52bc52b21..795a9e3c990a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c | |||
| @@ -219,6 +219,16 @@ nouveau_display_init(struct drm_device *dev) | |||
| 219 | if (ret) | 219 | if (ret) |
| 220 | return ret; | 220 | return ret; |
| 221 | 221 | ||
| 222 | /* power on internal panel if it's not already. the init tables of | ||
| 223 | * some vbios default this to off for some reason, causing the | ||
| 224 | * panel to not work after resume | ||
| 225 | */ | ||
| 226 | if (nouveau_gpio_func_get(dev, DCB_GPIO_PANEL_POWER) == 0) { | ||
| 227 | nouveau_gpio_func_set(dev, DCB_GPIO_PANEL_POWER, true); | ||
| 228 | msleep(300); | ||
| 229 | } | ||
| 230 | |||
| 231 | /* enable polling for external displays */ | ||
| 222 | drm_kms_helper_poll_enable(dev); | 232 | drm_kms_helper_poll_enable(dev); |
| 223 | 233 | ||
| 224 | /* enable hotplug interrupts */ | 234 | /* enable hotplug interrupts */ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index e4a7cfe7898d..81d7962e7252 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
| @@ -124,7 +124,7 @@ MODULE_PARM_DESC(ctxfw, "Use external HUB/GPC ucode (fermi)\n"); | |||
| 124 | int nouveau_ctxfw; | 124 | int nouveau_ctxfw; |
| 125 | module_param_named(ctxfw, nouveau_ctxfw, int, 0400); | 125 | module_param_named(ctxfw, nouveau_ctxfw, int, 0400); |
| 126 | 126 | ||
| 127 | MODULE_PARM_DESC(ctxfw, "Santise DCB table according to MXM-SIS\n"); | 127 | MODULE_PARM_DESC(mxmdcb, "Santise DCB table according to MXM-SIS\n"); |
| 128 | int nouveau_mxmdcb = 1; | 128 | int nouveau_mxmdcb = 1; |
| 129 | module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400); | 129 | module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400); |
| 130 | 130 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 5f0bc57fdaab..7ce3fde40743 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c | |||
| @@ -380,6 +380,25 @@ retry: | |||
| 380 | } | 380 | } |
| 381 | 381 | ||
| 382 | static int | 382 | static int |
| 383 | validate_sync(struct nouveau_channel *chan, struct nouveau_bo *nvbo) | ||
| 384 | { | ||
| 385 | struct nouveau_fence *fence = NULL; | ||
| 386 | int ret = 0; | ||
| 387 | |||
| 388 | spin_lock(&nvbo->bo.bdev->fence_lock); | ||
| 389 | if (nvbo->bo.sync_obj) | ||
| 390 | fence = nouveau_fence_ref(nvbo->bo.sync_obj); | ||
| 391 | spin_unlock(&nvbo->bo.bdev->fence_lock); | ||
| 392 | |||
| 393 | if (fence) { | ||
| 394 | ret = nouveau_fence_sync(fence, chan); | ||
| 395 | nouveau_fence_unref(&fence); | ||
| 396 | } | ||
| 397 | |||
| 398 | return ret; | ||
| 399 | } | ||
| 400 | |||
| 401 | static int | ||
| 383 | validate_list(struct nouveau_channel *chan, struct list_head *list, | 402 | validate_list(struct nouveau_channel *chan, struct list_head *list, |
| 384 | struct drm_nouveau_gem_pushbuf_bo *pbbo, uint64_t user_pbbo_ptr) | 403 | struct drm_nouveau_gem_pushbuf_bo *pbbo, uint64_t user_pbbo_ptr) |
| 385 | { | 404 | { |
| @@ -393,7 +412,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list, | |||
| 393 | list_for_each_entry(nvbo, list, entry) { | 412 | list_for_each_entry(nvbo, list, entry) { |
| 394 | struct drm_nouveau_gem_pushbuf_bo *b = &pbbo[nvbo->pbbo_index]; | 413 | struct drm_nouveau_gem_pushbuf_bo *b = &pbbo[nvbo->pbbo_index]; |
| 395 | 414 | ||
| 396 | ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan); | 415 | ret = validate_sync(chan, nvbo); |
| 397 | if (unlikely(ret)) { | 416 | if (unlikely(ret)) { |
| 398 | NV_ERROR(dev, "fail pre-validate sync\n"); | 417 | NV_ERROR(dev, "fail pre-validate sync\n"); |
| 399 | return ret; | 418 | return ret; |
| @@ -416,7 +435,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list, | |||
| 416 | return ret; | 435 | return ret; |
| 417 | } | 436 | } |
| 418 | 437 | ||
| 419 | ret = nouveau_fence_sync(nvbo->bo.sync_obj, chan); | 438 | ret = validate_sync(chan, nvbo); |
| 420 | if (unlikely(ret)) { | 439 | if (unlikely(ret)) { |
| 421 | NV_ERROR(dev, "fail post-validate sync\n"); | 440 | NV_ERROR(dev, "fail post-validate sync\n"); |
| 422 | return ret; | 441 | return ret; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c index 8bccddf4eff0..e5a64f0f4cb7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mxm.c +++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c | |||
| @@ -656,7 +656,16 @@ nouveau_mxm_init(struct drm_device *dev) | |||
| 656 | 656 | ||
| 657 | if (mxm_shadow(dev, mxm[0])) { | 657 | if (mxm_shadow(dev, mxm[0])) { |
| 658 | MXM_MSG(dev, "failed to locate valid SIS\n"); | 658 | MXM_MSG(dev, "failed to locate valid SIS\n"); |
| 659 | #if 0 | ||
| 660 | /* we should, perhaps, fall back to some kind of limited | ||
| 661 | * mode here if the x86 vbios hasn't already done the | ||
| 662 | * work for us (so we prevent loading with completely | ||
| 663 | * whacked vbios tables). | ||
| 664 | */ | ||
| 659 | return -EINVAL; | 665 | return -EINVAL; |
| 666 | #else | ||
| 667 | return 0; | ||
| 668 | #endif | ||
| 660 | } | 669 | } |
| 661 | 670 | ||
| 662 | MXM_MSG(dev, "MXMS Version %d.%d\n", | 671 | MXM_MSG(dev, "MXMS Version %d.%d\n", |
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c index 03937212e9d8..ec5481dfcd82 100644 --- a/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/drivers/gpu/drm/nouveau/nv50_pm.c | |||
| @@ -495,9 +495,9 @@ nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl) | |||
| 495 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 495 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
| 496 | struct nv50_pm_state *info; | 496 | struct nv50_pm_state *info; |
| 497 | struct pll_lims pll; | 497 | struct pll_lims pll; |
| 498 | int ret = -EINVAL; | 498 | int clk, ret = -EINVAL; |
| 499 | int N, M, P1, P2; | 499 | int N, M, P1, P2; |
| 500 | u32 clk, out; | 500 | u32 out; |
| 501 | 501 | ||
| 502 | if (dev_priv->chipset == 0xaa || | 502 | if (dev_priv->chipset == 0xaa || |
| 503 | dev_priv->chipset == 0xac) | 503 | dev_priv->chipset == 0xac) |
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 891935271d34..742f17f009a9 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -1184,7 +1184,7 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, | |||
| 1184 | WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset, 1); | 1184 | WREG32(EVERGREEN_GRPH_ENABLE + radeon_crtc->crtc_offset, 1); |
| 1185 | 1185 | ||
| 1186 | WREG32(EVERGREEN_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, | 1186 | WREG32(EVERGREEN_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, |
| 1187 | crtc->mode.vdisplay); | 1187 | target_fb->height); |
| 1188 | x &= ~3; | 1188 | x &= ~3; |
| 1189 | y &= ~1; | 1189 | y &= ~1; |
| 1190 | WREG32(EVERGREEN_VIEWPORT_START + radeon_crtc->crtc_offset, | 1190 | WREG32(EVERGREEN_VIEWPORT_START + radeon_crtc->crtc_offset, |
| @@ -1353,7 +1353,7 @@ static int avivo_crtc_do_set_base(struct drm_crtc *crtc, | |||
| 1353 | WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1); | 1353 | WREG32(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1); |
| 1354 | 1354 | ||
| 1355 | WREG32(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, | 1355 | WREG32(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, |
| 1356 | crtc->mode.vdisplay); | 1356 | target_fb->height); |
| 1357 | x &= ~3; | 1357 | x &= ~3; |
| 1358 | y &= ~1; | 1358 | y &= ~1; |
| 1359 | WREG32(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, | 1359 | WREG32(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, |
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index a71557ce01dc..552b436451fd 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -564,9 +564,21 @@ int radeon_dp_get_panel_mode(struct drm_encoder *encoder, | |||
| 564 | ENCODER_OBJECT_ID_NUTMEG) | 564 | ENCODER_OBJECT_ID_NUTMEG) |
| 565 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; | 565 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; |
| 566 | else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == | 566 | else if (radeon_connector_encoder_get_dp_bridge_encoder_id(connector) == |
| 567 | ENCODER_OBJECT_ID_TRAVIS) | 567 | ENCODER_OBJECT_ID_TRAVIS) { |
| 568 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | 568 | u8 id[6]; |
| 569 | else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { | 569 | int i; |
| 570 | for (i = 0; i < 6; i++) | ||
| 571 | id[i] = radeon_read_dpcd_reg(radeon_connector, 0x503 + i); | ||
| 572 | if (id[0] == 0x73 && | ||
| 573 | id[1] == 0x69 && | ||
| 574 | id[2] == 0x76 && | ||
| 575 | id[3] == 0x61 && | ||
| 576 | id[4] == 0x72 && | ||
| 577 | id[5] == 0x54) | ||
| 578 | panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE; | ||
| 579 | else | ||
| 580 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | ||
| 581 | } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { | ||
| 570 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); | 582 | u8 tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP); |
| 571 | if (tmp & 1) | 583 | if (tmp & 1) |
| 572 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; | 584 | panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE; |
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index d996f4381130..accc032c103f 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |||
| @@ -468,27 +468,42 @@ set_default_state(struct radeon_device *rdev) | |||
| 468 | radeon_ring_write(ring, sq_stack_resource_mgmt_2); | 468 | radeon_ring_write(ring, sq_stack_resource_mgmt_2); |
| 469 | } | 469 | } |
| 470 | 470 | ||
| 471 | #define I2F_MAX_BITS 15 | ||
| 472 | #define I2F_MAX_INPUT ((1 << I2F_MAX_BITS) - 1) | ||
| 473 | #define I2F_SHIFT (24 - I2F_MAX_BITS) | ||
| 474 | |||
| 475 | /* | ||
| 476 | * Converts unsigned integer into 32-bit IEEE floating point representation. | ||
| 477 | * Conversion is not universal and only works for the range from 0 | ||
| 478 | * to 2^I2F_MAX_BITS-1. Currently we only use it with inputs between | ||
| 479 | * 0 and 16384 (inclusive), so I2F_MAX_BITS=15 is enough. If necessary, | ||
| 480 | * I2F_MAX_BITS can be increased, but that will add to the loop iterations | ||
| 481 | * and slow us down. Conversion is done by shifting the input and counting | ||
| 482 | * down until the first 1 reaches bit position 23. The resulting counter | ||
| 483 | * and the shifted input are, respectively, the exponent and the fraction. | ||
| 484 | * The sign is always zero. | ||
| 485 | */ | ||
| 471 | static uint32_t i2f(uint32_t input) | 486 | static uint32_t i2f(uint32_t input) |
| 472 | { | 487 | { |
| 473 | u32 result, i, exponent, fraction; | 488 | u32 result, i, exponent, fraction; |
| 474 | 489 | ||
| 475 | if ((input & 0x3fff) == 0) | 490 | WARN_ON_ONCE(input > I2F_MAX_INPUT); |
| 476 | result = 0; /* 0 is a special case */ | 491 | |
| 492 | if ((input & I2F_MAX_INPUT) == 0) | ||
| 493 | result = 0; | ||
| 477 | else { | 494 | else { |
| 478 | exponent = 140; /* exponent biased by 127; */ | 495 | exponent = 126 + I2F_MAX_BITS; |
| 479 | fraction = (input & 0x3fff) << 10; /* cheat and only | 496 | fraction = (input & I2F_MAX_INPUT) << I2F_SHIFT; |
| 480 | handle numbers below 2^^15 */ | 497 | |
| 481 | for (i = 0; i < 14; i++) { | 498 | for (i = 0; i < I2F_MAX_BITS; i++) { |
| 482 | if (fraction & 0x800000) | 499 | if (fraction & 0x800000) |
| 483 | break; | 500 | break; |
| 484 | else { | 501 | else { |
| 485 | fraction = fraction << 1; /* keep | 502 | fraction = fraction << 1; |
| 486 | shifting left until top bit = 1 */ | ||
| 487 | exponent = exponent - 1; | 503 | exponent = exponent - 1; |
| 488 | } | 504 | } |
| 489 | } | 505 | } |
| 490 | result = exponent << 23 | (fraction & 0x7fffff); /* mask | 506 | result = exponent << 23 | (fraction & 0x7fffff); |
| 491 | off top bit; assumed 1 */ | ||
| 492 | } | 507 | } |
| 493 | return result; | 508 | return result; |
| 494 | } | 509 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 13ac63ba6075..98724fcb0088 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c | |||
| @@ -59,8 +59,9 @@ static int radeon_atrm_call(acpi_handle atrm_handle, uint8_t *bios, | |||
| 59 | 59 | ||
| 60 | obj = (union acpi_object *)buffer.pointer; | 60 | obj = (union acpi_object *)buffer.pointer; |
| 61 | memcpy(bios+offset, obj->buffer.pointer, obj->buffer.length); | 61 | memcpy(bios+offset, obj->buffer.pointer, obj->buffer.length); |
| 62 | len = obj->buffer.length; | ||
| 62 | kfree(buffer.pointer); | 63 | kfree(buffer.pointer); |
| 63 | return obj->buffer.length; | 64 | return len; |
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | bool radeon_atrm_supported(struct pci_dev *pdev) | 67 | bool radeon_atrm_supported(struct pci_dev *pdev) |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index cec51a5b69dd..49f7cb7e226b 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -883,6 +883,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) | |||
| 883 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) | 883 | if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) |
| 884 | return 0; | 884 | return 0; |
| 885 | 885 | ||
| 886 | drm_kms_helper_poll_disable(dev); | ||
| 887 | |||
| 886 | /* turn off display hw */ | 888 | /* turn off display hw */ |
| 887 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 889 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
| 888 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); | 890 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); |
| @@ -972,6 +974,8 @@ int radeon_resume_kms(struct drm_device *dev) | |||
| 972 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 974 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
| 973 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); | 975 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); |
| 974 | } | 976 | } |
| 977 | |||
| 978 | drm_kms_helper_poll_enable(dev); | ||
| 975 | return 0; | 979 | return 0; |
| 976 | } | 980 | } |
| 977 | 981 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index 7bb1b079f480..98a8ad680109 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c | |||
| @@ -897,6 +897,7 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, | |||
| 897 | i2c->rec = *rec; | 897 | i2c->rec = *rec; |
| 898 | i2c->adapter.owner = THIS_MODULE; | 898 | i2c->adapter.owner = THIS_MODULE; |
| 899 | i2c->adapter.class = I2C_CLASS_DDC; | 899 | i2c->adapter.class = I2C_CLASS_DDC; |
| 900 | i2c->adapter.dev.parent = &dev->pdev->dev; | ||
| 900 | i2c->dev = dev; | 901 | i2c->dev = dev; |
| 901 | i2c_set_adapdata(&i2c->adapter, i2c); | 902 | i2c_set_adapdata(&i2c->adapter, i2c); |
| 902 | if (rec->mm_i2c || | 903 | if (rec->mm_i2c || |
| @@ -957,6 +958,7 @@ struct radeon_i2c_chan *radeon_i2c_create_dp(struct drm_device *dev, | |||
| 957 | i2c->rec = *rec; | 958 | i2c->rec = *rec; |
| 958 | i2c->adapter.owner = THIS_MODULE; | 959 | i2c->adapter.owner = THIS_MODULE; |
| 959 | i2c->adapter.class = I2C_CLASS_DDC; | 960 | i2c->adapter.class = I2C_CLASS_DDC; |
| 961 | i2c->adapter.dev.parent = &dev->pdev->dev; | ||
| 960 | i2c->dev = dev; | 962 | i2c->dev = dev; |
| 961 | snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), | 963 | snprintf(i2c->adapter.name, sizeof(i2c->adapter.name), |
| 962 | "Radeon aux bus %s", name); | 964 | "Radeon aux bus %s", name); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 0af6ebdf205d..b66ef0e3cde1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
| @@ -378,7 +378,7 @@ int vmw_framebuffer_create_handle(struct drm_framebuffer *fb, | |||
| 378 | unsigned int *handle) | 378 | unsigned int *handle) |
| 379 | { | 379 | { |
| 380 | if (handle) | 380 | if (handle) |
| 381 | handle = 0; | 381 | *handle = 0; |
| 382 | 382 | ||
| 383 | return 0; | 383 | return 0; |
| 384 | } | 384 | } |
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c index 92f949767ece..6dbfd3e516e4 100644 --- a/drivers/hwmon/f71805f.c +++ b/drivers/hwmon/f71805f.c | |||
| @@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg) | |||
| 283 | 283 | ||
| 284 | static inline u8 temp_to_reg(long val) | 284 | static inline u8 temp_to_reg(long val) |
| 285 | { | 285 | { |
| 286 | if (val < 0) | 286 | if (val <= 0) |
| 287 | val = 0; | 287 | return 0; |
| 288 | else if (val > 1000 * 0xff) | 288 | if (val >= 1000 * 0xff) |
| 289 | val = 0xff; | 289 | return 0xff; |
| 290 | return ((val + 500) / 1000); | 290 | return (val + 500) / 1000; |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | /* | 293 | /* |
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index 6ddeae049058..91fdd1fe18b0 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c | |||
| @@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb, | |||
| 883 | 883 | ||
| 884 | static int __devinit sht15_probe(struct platform_device *pdev) | 884 | static int __devinit sht15_probe(struct platform_device *pdev) |
| 885 | { | 885 | { |
| 886 | int ret = 0; | 886 | int ret; |
| 887 | struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); | 887 | struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); |
| 888 | u8 status = 0; | 888 | u8 status = 0; |
| 889 | 889 | ||
| @@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev) | |||
| 901 | init_waitqueue_head(&data->wait_queue); | 901 | init_waitqueue_head(&data->wait_queue); |
| 902 | 902 | ||
| 903 | if (pdev->dev.platform_data == NULL) { | 903 | if (pdev->dev.platform_data == NULL) { |
| 904 | ret = -EINVAL; | ||
| 904 | dev_err(&pdev->dev, "no platform data supplied\n"); | 905 | dev_err(&pdev->dev, "no platform data supplied\n"); |
| 905 | goto err_free_data; | 906 | goto err_free_data; |
| 906 | } | 907 | } |
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 0e0af0445222..2dfae7d7cc5b 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
| @@ -1319,6 +1319,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr, | |||
| 1319 | { | 1319 | { |
| 1320 | struct w83627ehf_data *data = dev_get_drvdata(dev); | 1320 | struct w83627ehf_data *data = dev_get_drvdata(dev); |
| 1321 | struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); | 1321 | struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); |
| 1322 | struct w83627ehf_sio_data *sio_data = dev->platform_data; | ||
| 1322 | int nr = sensor_attr->index; | 1323 | int nr = sensor_attr->index; |
| 1323 | unsigned long val; | 1324 | unsigned long val; |
| 1324 | int err; | 1325 | int err; |
| @@ -1330,6 +1331,11 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr, | |||
| 1330 | 1331 | ||
| 1331 | if (val > 1) | 1332 | if (val > 1) |
| 1332 | return -EINVAL; | 1333 | return -EINVAL; |
| 1334 | |||
| 1335 | /* On NCT67766F, DC mode is only supported for pwm1 */ | ||
| 1336 | if (sio_data->kind == nct6776 && nr && val != 1) | ||
| 1337 | return -EINVAL; | ||
| 1338 | |||
| 1333 | mutex_lock(&data->update_lock); | 1339 | mutex_lock(&data->update_lock); |
| 1334 | reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]); | 1340 | reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]); |
| 1335 | data->pwm_mode[nr] = val; | 1341 | data->pwm_mode[nr] = val; |
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index b37b0c02a7b9..5034a87cc72d 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c | |||
| @@ -808,9 +808,12 @@ static ssize_t ucma_accept(struct ucma_file *file, const char __user *inbuf, | |||
| 808 | return PTR_ERR(ctx); | 808 | return PTR_ERR(ctx); |
| 809 | 809 | ||
| 810 | if (cmd.conn_param.valid) { | 810 | if (cmd.conn_param.valid) { |
| 811 | ctx->uid = cmd.uid; | ||
| 812 | ucma_copy_conn_param(&conn_param, &cmd.conn_param); | 811 | ucma_copy_conn_param(&conn_param, &cmd.conn_param); |
| 812 | mutex_lock(&file->mut); | ||
| 813 | ret = rdma_accept(ctx->cm_id, &conn_param); | 813 | ret = rdma_accept(ctx->cm_id, &conn_param); |
| 814 | if (!ret) | ||
| 815 | ctx->uid = cmd.uid; | ||
| 816 | mutex_unlock(&file->mut); | ||
| 814 | } else | 817 | } else |
| 815 | ret = rdma_accept(ctx->cm_id, NULL); | 818 | ret = rdma_accept(ctx->cm_id, NULL); |
| 816 | 819 | ||
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index b930da4c0c63..4d27e4c3fe34 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
| @@ -1485,6 +1485,7 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, | |||
| 1485 | qp->event_handler = attr.event_handler; | 1485 | qp->event_handler = attr.event_handler; |
| 1486 | qp->qp_context = attr.qp_context; | 1486 | qp->qp_context = attr.qp_context; |
| 1487 | qp->qp_type = attr.qp_type; | 1487 | qp->qp_type = attr.qp_type; |
| 1488 | atomic_set(&qp->usecnt, 0); | ||
| 1488 | atomic_inc(&pd->usecnt); | 1489 | atomic_inc(&pd->usecnt); |
| 1489 | atomic_inc(&attr.send_cq->usecnt); | 1490 | atomic_inc(&attr.send_cq->usecnt); |
| 1490 | if (attr.recv_cq) | 1491 | if (attr.recv_cq) |
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index 602b1bd723a9..575b78045aaf 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c | |||
| @@ -421,6 +421,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, | |||
| 421 | qp->uobject = NULL; | 421 | qp->uobject = NULL; |
| 422 | qp->qp_type = qp_init_attr->qp_type; | 422 | qp->qp_type = qp_init_attr->qp_type; |
| 423 | 423 | ||
| 424 | atomic_set(&qp->usecnt, 0); | ||
| 424 | if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) { | 425 | if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) { |
| 425 | qp->event_handler = __ib_shared_qp_event_handler; | 426 | qp->event_handler = __ib_shared_qp_event_handler; |
| 426 | qp->qp_context = qp; | 427 | qp->qp_context = qp; |
| @@ -430,7 +431,6 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, | |||
| 430 | qp->xrcd = qp_init_attr->xrcd; | 431 | qp->xrcd = qp_init_attr->xrcd; |
| 431 | atomic_inc(&qp_init_attr->xrcd->usecnt); | 432 | atomic_inc(&qp_init_attr->xrcd->usecnt); |
| 432 | INIT_LIST_HEAD(&qp->open_list); | 433 | INIT_LIST_HEAD(&qp->open_list); |
| 433 | atomic_set(&qp->usecnt, 0); | ||
| 434 | 434 | ||
| 435 | real_qp = qp; | 435 | real_qp = qp; |
| 436 | qp = __ib_open_qp(real_qp, qp_init_attr->event_handler, | 436 | qp = __ib_open_qp(real_qp, qp_init_attr->event_handler, |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index b7d4216db3c3..a4de9d58e9b4 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -89,7 +89,7 @@ static int create_file(const char *name, umode_t mode, | |||
| 89 | error = ipathfs_mknod(parent->d_inode, *dentry, | 89 | error = ipathfs_mknod(parent->d_inode, *dentry, |
| 90 | mode, fops, data); | 90 | mode, fops, data); |
| 91 | else | 91 | else |
| 92 | error = PTR_ERR(dentry); | 92 | error = PTR_ERR(*dentry); |
| 93 | mutex_unlock(&parent->d_inode->i_mutex); | 93 | mutex_unlock(&parent->d_inode->i_mutex); |
| 94 | 94 | ||
| 95 | return error; | 95 | return error; |
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 95c94d8f0254..259b0670b51c 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c | |||
| @@ -257,12 +257,9 @@ static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num, | |||
| 257 | return IB_MAD_RESULT_SUCCESS; | 257 | return IB_MAD_RESULT_SUCCESS; |
| 258 | 258 | ||
| 259 | /* | 259 | /* |
| 260 | * Don't process SMInfo queries or vendor-specific | 260 | * Don't process SMInfo queries -- the SMA can't handle them. |
| 261 | * MADs -- the SMA can't handle them. | ||
| 262 | */ | 261 | */ |
| 263 | if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO || | 262 | if (in_mad->mad_hdr.attr_id == IB_SMP_ATTR_SM_INFO) |
| 264 | ((in_mad->mad_hdr.attr_id & IB_SMP_ATTR_VENDOR_MASK) == | ||
| 265 | IB_SMP_ATTR_VENDOR_MASK)) | ||
| 266 | return IB_MAD_RESULT_SUCCESS; | 263 | return IB_MAD_RESULT_SUCCESS; |
| 267 | } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT || | 264 | } else if (in_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_PERF_MGMT || |
| 268 | in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1 || | 265 | in_mad->mad_hdr.mgmt_class == MLX4_IB_VENDOR_CLASS1 || |
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 7013da5e9eda..7140199f562e 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. | 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h index 568b4f11380a..c438e4691b3c 100644 --- a/drivers/infiniband/hw/nes/nes.h +++ b/drivers/infiniband/hw/nes/nes.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. | 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 425065b36b8c..a4972abedef1 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
| @@ -233,6 +233,7 @@ static int send_mpa_reject(struct nes_cm_node *cm_node) | |||
| 233 | u8 *start_ptr = &start_addr; | 233 | u8 *start_ptr = &start_addr; |
| 234 | u8 **start_buff = &start_ptr; | 234 | u8 **start_buff = &start_ptr; |
| 235 | u16 buff_len = 0; | 235 | u16 buff_len = 0; |
| 236 | struct ietf_mpa_v1 *mpa_frame; | ||
| 236 | 237 | ||
| 237 | skb = dev_alloc_skb(MAX_CM_BUFFER); | 238 | skb = dev_alloc_skb(MAX_CM_BUFFER); |
| 238 | if (!skb) { | 239 | if (!skb) { |
| @@ -242,6 +243,8 @@ static int send_mpa_reject(struct nes_cm_node *cm_node) | |||
| 242 | 243 | ||
| 243 | /* send an MPA reject frame */ | 244 | /* send an MPA reject frame */ |
| 244 | cm_build_mpa_frame(cm_node, start_buff, &buff_len, NULL, MPA_KEY_REPLY); | 245 | cm_build_mpa_frame(cm_node, start_buff, &buff_len, NULL, MPA_KEY_REPLY); |
| 246 | mpa_frame = (struct ietf_mpa_v1 *)*start_buff; | ||
| 247 | mpa_frame->flags |= IETF_MPA_FLAGS_REJECT; | ||
| 245 | form_cm_frame(skb, cm_node, NULL, 0, *start_buff, buff_len, SET_ACK | SET_FIN); | 248 | form_cm_frame(skb, cm_node, NULL, 0, *start_buff, buff_len, SET_ACK | SET_FIN); |
| 246 | 249 | ||
| 247 | cm_node->state = NES_CM_STATE_FIN_WAIT1; | 250 | cm_node->state = NES_CM_STATE_FIN_WAIT1; |
| @@ -1360,8 +1363,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi | |||
| 1360 | if (!memcmp(nesadapter->arp_table[arpindex].mac_addr, | 1363 | if (!memcmp(nesadapter->arp_table[arpindex].mac_addr, |
| 1361 | neigh->ha, ETH_ALEN)) { | 1364 | neigh->ha, ETH_ALEN)) { |
| 1362 | /* Mac address same as in nes_arp_table */ | 1365 | /* Mac address same as in nes_arp_table */ |
| 1363 | ip_rt_put(rt); | 1366 | goto out; |
| 1364 | return rc; | ||
| 1365 | } | 1367 | } |
| 1366 | 1368 | ||
| 1367 | nes_manage_arp_cache(nesvnic->netdev, | 1369 | nes_manage_arp_cache(nesvnic->netdev, |
| @@ -1377,6 +1379,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi | |||
| 1377 | neigh_event_send(neigh, NULL); | 1379 | neigh_event_send(neigh, NULL); |
| 1378 | } | 1380 | } |
| 1379 | } | 1381 | } |
| 1382 | |||
| 1383 | out: | ||
| 1380 | rcu_read_unlock(); | 1384 | rcu_read_unlock(); |
| 1381 | ip_rt_put(rt); | 1385 | ip_rt_put(rt); |
| 1382 | return rc; | 1386 | return rc; |
diff --git a/drivers/infiniband/hw/nes/nes_cm.h b/drivers/infiniband/hw/nes/nes_cm.h index bdfa1fbb35fc..4646e6666087 100644 --- a/drivers/infiniband/hw/nes/nes_cm.h +++ b/drivers/infiniband/hw/nes/nes_cm.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_context.h b/drivers/infiniband/hw/nes/nes_context.h index b4393a16099d..a69eef16d72d 100644 --- a/drivers/infiniband/hw/nes/nes_context.h +++ b/drivers/infiniband/hw/nes/nes_context.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 055f4b545df0..d42c9f435b1b 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h index 0b590e152c6a..d748e4b31b8d 100644 --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c index b3b2a240c6e9..3ba7be369452 100644 --- a/drivers/infiniband/hw/nes/nes_mgt.c +++ b/drivers/infiniband/hw/nes/nes_mgt.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel-NE, Inc. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel-NE, Inc. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_mgt.h b/drivers/infiniband/hw/nes/nes_mgt.h index 8c8af254555a..4f7f701c4a81 100644 --- a/drivers/infiniband/hw/nes/nes_mgt.h +++ b/drivers/infiniband/hw/nes/nes_mgt.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 Intel-NE, Inc. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel-NE, Inc. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 4b3fa711a247..f3a3ecf8d09e 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h index 71e133ab209b..4926de744488 100644 --- a/drivers/infiniband/hw/nes/nes_user.h +++ b/drivers/infiniband/hw/nes/nes_user.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * Copyright (c) 2005 Topspin Communications. All rights reserved. | 3 | * Copyright (c) 2005 Topspin Communications. All rights reserved. |
| 4 | * Copyright (c) 2005 Cisco Systems. All rights reserved. | 4 | * Copyright (c) 2005 Cisco Systems. All rights reserved. |
| 5 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. | 5 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. |
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index 8b4c2ff54888..e98f4fc0b768 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 5095bc41c6cc..0927b5cc65d3 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * | 3 | * |
| 4 | * This software is available to you under a choice of one of two | 4 | * This software is available to you under a choice of one of two |
| 5 | * licenses. You may choose to be licensed under the terms of the GNU | 5 | * licenses. You may choose to be licensed under the terms of the GNU |
| @@ -3428,6 +3428,8 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, | |||
| 3428 | NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX, | 3428 | NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX, |
| 3429 | ib_wr->wr.fast_reg.length); | 3429 | ib_wr->wr.fast_reg.length); |
| 3430 | set_wqe_32bit_value(wqe->wqe_words, | 3430 | set_wqe_32bit_value(wqe->wqe_words, |
| 3431 | NES_IWARP_SQ_FMR_WQE_LENGTH_HIGH_IDX, 0); | ||
| 3432 | set_wqe_32bit_value(wqe->wqe_words, | ||
| 3431 | NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX, | 3433 | NES_IWARP_SQ_FMR_WQE_MR_STAG_IDX, |
| 3432 | ib_wr->wr.fast_reg.rkey); | 3434 | ib_wr->wr.fast_reg.rkey); |
| 3433 | /* Set page size: */ | 3435 | /* Set page size: */ |
| @@ -3724,7 +3726,7 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry) | |||
| 3724 | entry->opcode = IB_WC_SEND; | 3726 | entry->opcode = IB_WC_SEND; |
| 3725 | break; | 3727 | break; |
| 3726 | case NES_IWARP_SQ_OP_LOCINV: | 3728 | case NES_IWARP_SQ_OP_LOCINV: |
| 3727 | entry->opcode = IB_WR_LOCAL_INV; | 3729 | entry->opcode = IB_WC_LOCAL_INV; |
| 3728 | break; | 3730 | break; |
| 3729 | case NES_IWARP_SQ_OP_FAST_REG: | 3731 | case NES_IWARP_SQ_OP_FAST_REG: |
| 3730 | entry->opcode = IB_WC_FAST_REG_MR; | 3732 | entry->opcode = IB_WC_FAST_REG_MR; |
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h index fe6b6e92fa90..0eff7c44d76b 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.h +++ b/drivers/infiniband/hw/nes/nes_verbs.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2006 - 2009 Intel Corporation. All rights reserved. | 2 | * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. |
| 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. | 3 | * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c index 4f18e2d332df..d0c64d514813 100644 --- a/drivers/infiniband/hw/qib/qib_iba6120.c +++ b/drivers/infiniband/hw/qib/qib_iba6120.c | |||
| @@ -2105,7 +2105,7 @@ static void alloc_dummy_hdrq(struct qib_devdata *dd) | |||
| 2105 | dd->cspec->dummy_hdrq = dma_alloc_coherent(&dd->pcidev->dev, | 2105 | dd->cspec->dummy_hdrq = dma_alloc_coherent(&dd->pcidev->dev, |
| 2106 | dd->rcd[0]->rcvhdrq_size, | 2106 | dd->rcd[0]->rcvhdrq_size, |
| 2107 | &dd->cspec->dummy_hdrq_phys, | 2107 | &dd->cspec->dummy_hdrq_phys, |
| 2108 | GFP_KERNEL | __GFP_COMP); | 2108 | GFP_ATOMIC | __GFP_COMP); |
| 2109 | if (!dd->cspec->dummy_hdrq) { | 2109 | if (!dd->cspec->dummy_hdrq) { |
| 2110 | qib_devinfo(dd->pcidev, "Couldn't allocate dummy hdrq\n"); | 2110 | qib_devinfo(dd->pcidev, "Couldn't allocate dummy hdrq\n"); |
| 2111 | /* fallback to just 0'ing */ | 2111 | /* fallback to just 0'ing */ |
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c index f695061d688e..0fde788e1100 100644 --- a/drivers/infiniband/hw/qib/qib_pcie.c +++ b/drivers/infiniband/hw/qib/qib_pcie.c | |||
| @@ -560,7 +560,7 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd) | |||
| 560 | * BIOS may not set PCIe bus-utilization parameters for best performance. | 560 | * BIOS may not set PCIe bus-utilization parameters for best performance. |
| 561 | * Check and optionally adjust them to maximize our throughput. | 561 | * Check and optionally adjust them to maximize our throughput. |
| 562 | */ | 562 | */ |
| 563 | static int qib_pcie_caps = 0x51; | 563 | static int qib_pcie_caps; |
| 564 | module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO); | 564 | module_param_named(pcie_caps, qib_pcie_caps, int, S_IRUGO); |
| 565 | MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)"); | 565 | MODULE_PARM_DESC(pcie_caps, "Max PCIe tuning: Payload (0..3), ReadReq (4..7)"); |
| 566 | 566 | ||
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index 63be60bc3455..86cc3f7841cd 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c | |||
| @@ -26,35 +26,9 @@ | |||
| 26 | #define to_mcp(d) container_of(d, struct mcp, attached_device) | 26 | #define to_mcp(d) container_of(d, struct mcp, attached_device) |
| 27 | #define to_mcp_driver(d) container_of(d, struct mcp_driver, drv) | 27 | #define to_mcp_driver(d) container_of(d, struct mcp_driver, drv) |
| 28 | 28 | ||
| 29 | static const struct mcp_device_id *mcp_match_id(const struct mcp_device_id *id, | ||
| 30 | const char *codec) | ||
| 31 | { | ||
| 32 | while (id->name[0]) { | ||
| 33 | if (strcmp(codec, id->name) == 0) | ||
| 34 | return id; | ||
| 35 | id++; | ||
| 36 | } | ||
| 37 | return NULL; | ||
| 38 | } | ||
| 39 | |||
| 40 | const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp) | ||
| 41 | { | ||
| 42 | const struct mcp_driver *driver = | ||
| 43 | to_mcp_driver(mcp->attached_device.driver); | ||
| 44 | |||
| 45 | return mcp_match_id(driver->id_table, mcp->codec); | ||
| 46 | } | ||
| 47 | EXPORT_SYMBOL(mcp_get_device_id); | ||
| 48 | |||
| 49 | static int mcp_bus_match(struct device *dev, struct device_driver *drv) | 29 | static int mcp_bus_match(struct device *dev, struct device_driver *drv) |
| 50 | { | 30 | { |
| 51 | const struct mcp *mcp = to_mcp(dev); | 31 | return 1; |
| 52 | const struct mcp_driver *driver = to_mcp_driver(drv); | ||
| 53 | |||
| 54 | if (driver->id_table) | ||
| 55 | return !!mcp_match_id(driver->id_table, mcp->codec); | ||
| 56 | |||
| 57 | return 0; | ||
| 58 | } | 32 | } |
| 59 | 33 | ||
| 60 | static int mcp_bus_probe(struct device *dev) | 34 | static int mcp_bus_probe(struct device *dev) |
| @@ -100,18 +74,9 @@ static int mcp_bus_resume(struct device *dev) | |||
| 100 | return ret; | 74 | return ret; |
| 101 | } | 75 | } |
| 102 | 76 | ||
| 103 | static int mcp_bus_uevent(struct device *dev, struct kobj_uevent_env *env) | ||
| 104 | { | ||
| 105 | struct mcp *mcp = to_mcp(dev); | ||
| 106 | |||
| 107 | add_uevent_var(env, "MODALIAS=%s%s", MCP_MODULE_PREFIX, mcp->codec); | ||
| 108 | return 0; | ||
| 109 | } | ||
| 110 | |||
| 111 | static struct bus_type mcp_bus_type = { | 77 | static struct bus_type mcp_bus_type = { |
| 112 | .name = "mcp", | 78 | .name = "mcp", |
| 113 | .match = mcp_bus_match, | 79 | .match = mcp_bus_match, |
| 114 | .uevent = mcp_bus_uevent, | ||
| 115 | .probe = mcp_bus_probe, | 80 | .probe = mcp_bus_probe, |
| 116 | .remove = mcp_bus_remove, | 81 | .remove = mcp_bus_remove, |
| 117 | .suspend = mcp_bus_suspend, | 82 | .suspend = mcp_bus_suspend, |
| @@ -128,9 +93,11 @@ static struct bus_type mcp_bus_type = { | |||
| 128 | */ | 93 | */ |
| 129 | void mcp_set_telecom_divisor(struct mcp *mcp, unsigned int div) | 94 | void mcp_set_telecom_divisor(struct mcp *mcp, unsigned int div) |
| 130 | { | 95 | { |
| 131 | spin_lock_irq(&mcp->lock); | 96 | unsigned long flags; |
| 97 | |||
| 98 | spin_lock_irqsave(&mcp->lock, flags); | ||
| 132 | mcp->ops->set_telecom_divisor(mcp, div); | 99 | mcp->ops->set_telecom_divisor(mcp, div); |
| 133 | spin_unlock_irq(&mcp->lock); | 100 | spin_unlock_irqrestore(&mcp->lock, flags); |
| 134 | } | 101 | } |
| 135 | EXPORT_SYMBOL(mcp_set_telecom_divisor); | 102 | EXPORT_SYMBOL(mcp_set_telecom_divisor); |
| 136 | 103 | ||
| @@ -143,9 +110,11 @@ EXPORT_SYMBOL(mcp_set_telecom_divisor); | |||
| 143 | */ | 110 | */ |
| 144 | void mcp_set_audio_divisor(struct mcp *mcp, unsigned int div) | 111 | void mcp_set_audio_divisor(struct mcp *mcp, unsigned int div) |
| 145 | { | 112 | { |
| 146 | spin_lock_irq(&mcp->lock); | 113 | unsigned long flags; |
| 114 | |||
| 115 | spin_lock_irqsave(&mcp->lock, flags); | ||
| 147 | mcp->ops->set_audio_divisor(mcp, div); | 116 | mcp->ops->set_audio_divisor(mcp, div); |
| 148 | spin_unlock_irq(&mcp->lock); | 117 | spin_unlock_irqrestore(&mcp->lock, flags); |
| 149 | } | 118 | } |
| 150 | EXPORT_SYMBOL(mcp_set_audio_divisor); | 119 | EXPORT_SYMBOL(mcp_set_audio_divisor); |
| 151 | 120 | ||
| @@ -198,10 +167,11 @@ EXPORT_SYMBOL(mcp_reg_read); | |||
| 198 | */ | 167 | */ |
| 199 | void mcp_enable(struct mcp *mcp) | 168 | void mcp_enable(struct mcp *mcp) |
| 200 | { | 169 | { |
| 201 | spin_lock_irq(&mcp->lock); | 170 | unsigned long flags; |
| 171 | spin_lock_irqsave(&mcp->lock, flags); | ||
| 202 | if (mcp->use_count++ == 0) | 172 | if (mcp->use_count++ == 0) |
| 203 | mcp->ops->enable(mcp); | 173 | mcp->ops->enable(mcp); |
| 204 | spin_unlock_irq(&mcp->lock); | 174 | spin_unlock_irqrestore(&mcp->lock, flags); |
| 205 | } | 175 | } |
| 206 | EXPORT_SYMBOL(mcp_enable); | 176 | EXPORT_SYMBOL(mcp_enable); |
| 207 | 177 | ||
| @@ -247,14 +217,9 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size) | |||
| 247 | } | 217 | } |
| 248 | EXPORT_SYMBOL(mcp_host_alloc); | 218 | EXPORT_SYMBOL(mcp_host_alloc); |
| 249 | 219 | ||
| 250 | int mcp_host_register(struct mcp *mcp, void *pdata) | 220 | int mcp_host_register(struct mcp *mcp) |
| 251 | { | 221 | { |
| 252 | if (!mcp->codec) | ||
| 253 | return -EINVAL; | ||
| 254 | |||
| 255 | mcp->attached_device.platform_data = pdata; | ||
| 256 | dev_set_name(&mcp->attached_device, "mcp0"); | 222 | dev_set_name(&mcp->attached_device, "mcp0"); |
| 257 | request_module("%s%s", MCP_MODULE_PREFIX, mcp->codec); | ||
| 258 | return device_register(&mcp->attached_device); | 223 | return device_register(&mcp->attached_device); |
| 259 | } | 224 | } |
| 260 | EXPORT_SYMBOL(mcp_host_register); | 225 | EXPORT_SYMBOL(mcp_host_register); |
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index 9adc2eb69492..02c53a0766c4 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/mfd/mcp.h> | 21 | #include <linux/mfd/mcp.h> |
| 22 | #include <linux/io.h> | ||
| 23 | 22 | ||
| 24 | #include <mach/dma.h> | 23 | #include <mach/dma.h> |
| 25 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| @@ -27,19 +26,12 @@ | |||
| 27 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 28 | #include <mach/mcp.h> | 27 | #include <mach/mcp.h> |
| 29 | 28 | ||
| 30 | /* Register offsets */ | 29 | #include <mach/assabet.h> |
| 31 | #define MCCR0 0x00 | 30 | |
| 32 | #define MCDR0 0x08 | ||
| 33 | #define MCDR1 0x0C | ||
| 34 | #define MCDR2 0x10 | ||
| 35 | #define MCSR 0x18 | ||
| 36 | #define MCCR1 0x00 | ||
| 37 | 31 | ||
| 38 | struct mcp_sa11x0 { | 32 | struct mcp_sa11x0 { |
| 39 | u32 mccr0; | 33 | u32 mccr0; |
| 40 | u32 mccr1; | 34 | u32 mccr1; |
| 41 | unsigned char *mccr0_base; | ||
| 42 | unsigned char *mccr1_base; | ||
| 43 | }; | 35 | }; |
| 44 | 36 | ||
| 45 | #define priv(mcp) ((struct mcp_sa11x0 *)mcp_priv(mcp)) | 37 | #define priv(mcp) ((struct mcp_sa11x0 *)mcp_priv(mcp)) |
| @@ -47,25 +39,25 @@ struct mcp_sa11x0 { | |||
| 47 | static void | 39 | static void |
| 48 | mcp_sa11x0_set_telecom_divisor(struct mcp *mcp, unsigned int divisor) | 40 | mcp_sa11x0_set_telecom_divisor(struct mcp *mcp, unsigned int divisor) |
| 49 | { | 41 | { |
| 50 | struct mcp_sa11x0 *priv = priv(mcp); | 42 | unsigned int mccr0; |
| 51 | 43 | ||
| 52 | divisor /= 32; | 44 | divisor /= 32; |
| 53 | 45 | ||
| 54 | priv->mccr0 &= ~0x00007f00; | 46 | mccr0 = Ser4MCCR0 & ~0x00007f00; |
| 55 | priv->mccr0 |= divisor << 8; | 47 | mccr0 |= divisor << 8; |
| 56 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | 48 | Ser4MCCR0 = mccr0; |
| 57 | } | 49 | } |
| 58 | 50 | ||
| 59 | static void | 51 | static void |
| 60 | mcp_sa11x0_set_audio_divisor(struct mcp *mcp, unsigned int divisor) | 52 | mcp_sa11x0_set_audio_divisor(struct mcp *mcp, unsigned int divisor) |
| 61 | { | 53 | { |
| 62 | struct mcp_sa11x0 *priv = priv(mcp); | 54 | unsigned int mccr0; |
| 63 | 55 | ||
| 64 | divisor /= 32; | 56 | divisor /= 32; |
| 65 | 57 | ||
| 66 | priv->mccr0 &= ~0x0000007f; | 58 | mccr0 = Ser4MCCR0 & ~0x0000007f; |
| 67 | priv->mccr0 |= divisor; | 59 | mccr0 |= divisor; |
| 68 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | 60 | Ser4MCCR0 = mccr0; |
| 69 | } | 61 | } |
| 70 | 62 | ||
| 71 | /* | 63 | /* |
| @@ -79,16 +71,12 @@ mcp_sa11x0_write(struct mcp *mcp, unsigned int reg, unsigned int val) | |||
| 79 | { | 71 | { |
| 80 | int ret = -ETIME; | 72 | int ret = -ETIME; |
| 81 | int i; | 73 | int i; |
| 82 | u32 mcpreg; | ||
| 83 | struct mcp_sa11x0 *priv = priv(mcp); | ||
| 84 | 74 | ||
| 85 | mcpreg = reg << 17 | MCDR2_Wr | (val & 0xffff); | 75 | Ser4MCDR2 = reg << 17 | MCDR2_Wr | (val & 0xffff); |
| 86 | __raw_writel(mcpreg, priv->mccr0_base + MCDR2); | ||
| 87 | 76 | ||
| 88 | for (i = 0; i < 2; i++) { | 77 | for (i = 0; i < 2; i++) { |
| 89 | udelay(mcp->rw_timeout); | 78 | udelay(mcp->rw_timeout); |
| 90 | mcpreg = __raw_readl(priv->mccr0_base + MCSR); | 79 | if (Ser4MCSR & MCSR_CWC) { |
| 91 | if (mcpreg & MCSR_CWC) { | ||
| 92 | ret = 0; | 80 | ret = 0; |
| 93 | break; | 81 | break; |
| 94 | } | 82 | } |
| @@ -109,18 +97,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg) | |||
| 109 | { | 97 | { |
| 110 | int ret = -ETIME; | 98 | int ret = -ETIME; |
| 111 | int i; | 99 | int i; |
| 112 | u32 mcpreg; | ||
| 113 | struct mcp_sa11x0 *priv = priv(mcp); | ||
| 114 | 100 | ||
| 115 | mcpreg = reg << 17 | MCDR2_Rd; | 101 | Ser4MCDR2 = reg << 17 | MCDR2_Rd; |
| 116 | __raw_writel(mcpreg, priv->mccr0_base + MCDR2); | ||
| 117 | 102 | ||
| 118 | for (i = 0; i < 2; i++) { | 103 | for (i = 0; i < 2; i++) { |
| 119 | udelay(mcp->rw_timeout); | 104 | udelay(mcp->rw_timeout); |
| 120 | mcpreg = __raw_readl(priv->mccr0_base + MCSR); | 105 | if (Ser4MCSR & MCSR_CRC) { |
| 121 | if (mcpreg & MCSR_CRC) { | 106 | ret = Ser4MCDR2 & 0xffff; |
| 122 | ret = __raw_readl(priv->mccr0_base + MCDR2) | ||
| 123 | & 0xffff; | ||
| 124 | break; | 107 | break; |
| 125 | } | 108 | } |
| 126 | } | 109 | } |
| @@ -133,19 +116,13 @@ mcp_sa11x0_read(struct mcp *mcp, unsigned int reg) | |||
| 133 | 116 | ||
| 134 | static void mcp_sa11x0_enable(struct mcp *mcp) | 117 | static void mcp_sa11x0_enable(struct mcp *mcp) |
| 135 | { | 118 | { |
| 136 | struct mcp_sa11x0 *priv = priv(mcp); | 119 | Ser4MCSR = -1; |
| 137 | 120 | Ser4MCCR0 |= MCCR0_MCE; | |
| 138 | __raw_writel(-1, priv->mccr0_base + MCSR); | ||
| 139 | priv->mccr0 |= MCCR0_MCE; | ||
| 140 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | ||
| 141 | } | 121 | } |
| 142 | 122 | ||
| 143 | static void mcp_sa11x0_disable(struct mcp *mcp) | 123 | static void mcp_sa11x0_disable(struct mcp *mcp) |
| 144 | { | 124 | { |
| 145 | struct mcp_sa11x0 *priv = priv(mcp); | 125 | Ser4MCCR0 &= ~MCCR0_MCE; |
| 146 | |||
| 147 | priv->mccr0 &= ~MCCR0_MCE; | ||
| 148 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | ||
| 149 | } | 126 | } |
| 150 | 127 | ||
| 151 | /* | 128 | /* |
| @@ -165,69 +142,50 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) | |||
| 165 | struct mcp_plat_data *data = pdev->dev.platform_data; | 142 | struct mcp_plat_data *data = pdev->dev.platform_data; |
| 166 | struct mcp *mcp; | 143 | struct mcp *mcp; |
| 167 | int ret; | 144 | int ret; |
| 168 | struct mcp_sa11x0 *priv; | ||
| 169 | struct resource *res_mem0, *res_mem1; | ||
| 170 | u32 size0, size1; | ||
| 171 | 145 | ||
| 172 | if (!data) | 146 | if (!data) |
| 173 | return -ENODEV; | 147 | return -ENODEV; |
| 174 | 148 | ||
| 175 | if (!data->codec) | 149 | if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp")) |
| 176 | return -ENODEV; | ||
| 177 | |||
| 178 | res_mem0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 179 | if (!res_mem0) | ||
| 180 | return -ENODEV; | ||
| 181 | size0 = res_mem0->end - res_mem0->start + 1; | ||
| 182 | |||
| 183 | res_mem1 = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
| 184 | if (!res_mem1) | ||
| 185 | return -ENODEV; | ||
| 186 | size1 = res_mem1->end - res_mem1->start + 1; | ||
| 187 | |||
| 188 | if (!request_mem_region(res_mem0->start, size0, "sa11x0-mcp")) | ||
| 189 | return -EBUSY; | 150 | return -EBUSY; |
| 190 | 151 | ||
| 191 | if (!request_mem_region(res_mem1->start, size1, "sa11x0-mcp")) { | ||
| 192 | ret = -EBUSY; | ||
| 193 | goto release; | ||
| 194 | } | ||
| 195 | |||
| 196 | mcp = mcp_host_alloc(&pdev->dev, sizeof(struct mcp_sa11x0)); | 152 | mcp = mcp_host_alloc(&pdev->dev, sizeof(struct mcp_sa11x0)); |
| 197 | if (!mcp) { | 153 | if (!mcp) { |
| 198 | ret = -ENOMEM; | 154 | ret = -ENOMEM; |
| 199 | goto release2; | 155 | goto release; |
| 200 | } | 156 | } |
| 201 | 157 | ||
| 202 | priv = priv(mcp); | ||
| 203 | |||
| 204 | mcp->owner = THIS_MODULE; | 158 | mcp->owner = THIS_MODULE; |
| 205 | mcp->ops = &mcp_sa11x0; | 159 | mcp->ops = &mcp_sa11x0; |
| 206 | mcp->sclk_rate = data->sclk_rate; | 160 | mcp->sclk_rate = data->sclk_rate; |
| 207 | mcp->dma_audio_rd = DDAR_DevAdd(res_mem0->start + MCDR0) | 161 | mcp->dma_audio_rd = DMA_Ser4MCP0Rd; |
| 208 | + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev; | 162 | mcp->dma_audio_wr = DMA_Ser4MCP0Wr; |
| 209 | mcp->dma_audio_wr = DDAR_DevAdd(res_mem0->start + MCDR0) | 163 | mcp->dma_telco_rd = DMA_Ser4MCP1Rd; |
| 210 | + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev; | 164 | mcp->dma_telco_wr = DMA_Ser4MCP1Wr; |
| 211 | mcp->dma_telco_rd = DDAR_DevAdd(res_mem0->start + MCDR1) | 165 | mcp->gpio_base = data->gpio_base; |
| 212 | + DDAR_DevRd + DDAR_Brst4 + DDAR_8BitDev; | ||
| 213 | mcp->dma_telco_wr = DDAR_DevAdd(res_mem0->start + MCDR1) | ||
| 214 | + DDAR_DevWr + DDAR_Brst4 + DDAR_8BitDev; | ||
| 215 | mcp->codec = data->codec; | ||
| 216 | 166 | ||
| 217 | platform_set_drvdata(pdev, mcp); | 167 | platform_set_drvdata(pdev, mcp); |
| 218 | 168 | ||
| 169 | if (machine_is_assabet()) { | ||
| 170 | ASSABET_BCR_set(ASSABET_BCR_CODEC_RST); | ||
| 171 | } | ||
| 172 | |||
| 173 | /* | ||
| 174 | * Setup the PPC unit correctly. | ||
| 175 | */ | ||
| 176 | PPDR &= ~PPC_RXD4; | ||
| 177 | PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM; | ||
| 178 | PSDR |= PPC_RXD4; | ||
| 179 | PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 180 | PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM); | ||
| 181 | |||
| 219 | /* | 182 | /* |
| 220 | * Initialise device. Note that we initially | 183 | * Initialise device. Note that we initially |
| 221 | * set the sampling rate to minimum. | 184 | * set the sampling rate to minimum. |
| 222 | */ | 185 | */ |
| 223 | priv->mccr0_base = ioremap(res_mem0->start, size0); | 186 | Ser4MCSR = -1; |
| 224 | priv->mccr1_base = ioremap(res_mem1->start, size1); | 187 | Ser4MCCR1 = data->mccr1; |
| 225 | 188 | Ser4MCCR0 = data->mccr0 | 0x7f7f; | |
| 226 | __raw_writel(-1, priv->mccr0_base + MCSR); | ||
| 227 | priv->mccr1 = data->mccr1; | ||
| 228 | priv->mccr0 = data->mccr0 | 0x7f7f; | ||
| 229 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | ||
| 230 | __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1); | ||
| 231 | 189 | ||
| 232 | /* | 190 | /* |
| 233 | * Calculate the read/write timeout (us) from the bit clock | 191 | * Calculate the read/write timeout (us) from the bit clock |
| @@ -237,53 +195,36 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) | |||
| 237 | mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) / | 195 | mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) / |
| 238 | mcp->sclk_rate; | 196 | mcp->sclk_rate; |
| 239 | 197 | ||
| 240 | ret = mcp_host_register(mcp, data->codec_pdata); | 198 | ret = mcp_host_register(mcp); |
| 241 | if (ret == 0) | 199 | if (ret == 0) |
| 242 | goto out; | 200 | goto out; |
| 243 | 201 | ||
| 244 | release2: | ||
| 245 | release_mem_region(res_mem1->start, size1); | ||
| 246 | release: | 202 | release: |
| 247 | release_mem_region(res_mem0->start, size0); | 203 | release_mem_region(0x80060000, 0x60); |
| 248 | platform_set_drvdata(pdev, NULL); | 204 | platform_set_drvdata(pdev, NULL); |
| 249 | 205 | ||
| 250 | out: | 206 | out: |
| 251 | return ret; | 207 | return ret; |
| 252 | } | 208 | } |
| 253 | 209 | ||
| 254 | static int mcp_sa11x0_remove(struct platform_device *pdev) | 210 | static int mcp_sa11x0_remove(struct platform_device *dev) |
| 255 | { | 211 | { |
| 256 | struct mcp *mcp = platform_get_drvdata(pdev); | 212 | struct mcp *mcp = platform_get_drvdata(dev); |
| 257 | struct mcp_sa11x0 *priv = priv(mcp); | ||
| 258 | struct resource *res_mem; | ||
| 259 | u32 size; | ||
| 260 | 213 | ||
| 261 | platform_set_drvdata(pdev, NULL); | 214 | platform_set_drvdata(dev, NULL); |
| 262 | mcp_host_unregister(mcp); | 215 | mcp_host_unregister(mcp); |
| 216 | release_mem_region(0x80060000, 0x60); | ||
| 263 | 217 | ||
| 264 | res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 265 | if (res_mem) { | ||
| 266 | size = res_mem->end - res_mem->start + 1; | ||
| 267 | release_mem_region(res_mem->start, size); | ||
| 268 | } | ||
| 269 | res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
| 270 | if (res_mem) { | ||
| 271 | size = res_mem->end - res_mem->start + 1; | ||
| 272 | release_mem_region(res_mem->start, size); | ||
| 273 | } | ||
| 274 | iounmap(priv->mccr0_base); | ||
| 275 | iounmap(priv->mccr1_base); | ||
| 276 | return 0; | 218 | return 0; |
| 277 | } | 219 | } |
| 278 | 220 | ||
| 279 | static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state) | 221 | static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state) |
| 280 | { | 222 | { |
| 281 | struct mcp *mcp = platform_get_drvdata(dev); | 223 | struct mcp *mcp = platform_get_drvdata(dev); |
| 282 | struct mcp_sa11x0 *priv = priv(mcp); | ||
| 283 | u32 mccr0; | ||
| 284 | 224 | ||
| 285 | mccr0 = priv->mccr0 & ~MCCR0_MCE; | 225 | priv(mcp)->mccr0 = Ser4MCCR0; |
| 286 | __raw_writel(mccr0, priv->mccr0_base + MCCR0); | 226 | priv(mcp)->mccr1 = Ser4MCCR1; |
| 227 | Ser4MCCR0 &= ~MCCR0_MCE; | ||
| 287 | 228 | ||
| 288 | return 0; | 229 | return 0; |
| 289 | } | 230 | } |
| @@ -291,10 +232,9 @@ static int mcp_sa11x0_suspend(struct platform_device *dev, pm_message_t state) | |||
| 291 | static int mcp_sa11x0_resume(struct platform_device *dev) | 232 | static int mcp_sa11x0_resume(struct platform_device *dev) |
| 292 | { | 233 | { |
| 293 | struct mcp *mcp = platform_get_drvdata(dev); | 234 | struct mcp *mcp = platform_get_drvdata(dev); |
| 294 | struct mcp_sa11x0 *priv = priv(mcp); | ||
| 295 | 235 | ||
| 296 | __raw_writel(priv->mccr0, priv->mccr0_base + MCCR0); | 236 | Ser4MCCR1 = priv(mcp)->mccr1; |
| 297 | __raw_writel(priv->mccr1, priv->mccr1_base + MCCR1); | 237 | Ser4MCCR0 = priv(mcp)->mccr0; |
| 298 | 238 | ||
| 299 | return 0; | 239 | return 0; |
| 300 | } | 240 | } |
| @@ -311,7 +251,6 @@ static struct platform_driver mcp_sa11x0_driver = { | |||
| 311 | .resume = mcp_sa11x0_resume, | 251 | .resume = mcp_sa11x0_resume, |
| 312 | .driver = { | 252 | .driver = { |
| 313 | .name = "sa11x0-mcp", | 253 | .name = "sa11x0-mcp", |
| 314 | .owner = THIS_MODULE, | ||
| 315 | }, | 254 | }, |
| 316 | }; | 255 | }; |
| 317 | 256 | ||
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 91c4f25e0e55..febc90cdef7e 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
| @@ -36,15 +36,6 @@ static DEFINE_MUTEX(ucb1x00_mutex); | |||
| 36 | static LIST_HEAD(ucb1x00_drivers); | 36 | static LIST_HEAD(ucb1x00_drivers); |
| 37 | static LIST_HEAD(ucb1x00_devices); | 37 | static LIST_HEAD(ucb1x00_devices); |
| 38 | 38 | ||
| 39 | static struct mcp_device_id ucb1x00_id[] = { | ||
| 40 | { "ucb1x00", 0 }, /* auto-detection */ | ||
| 41 | { "ucb1200", UCB_ID_1200 }, | ||
| 42 | { "ucb1300", UCB_ID_1300 }, | ||
| 43 | { "tc35143", UCB_ID_TC35143 }, | ||
| 44 | { } | ||
| 45 | }; | ||
| 46 | MODULE_DEVICE_TABLE(mcp, ucb1x00_id); | ||
| 47 | |||
| 48 | /** | 39 | /** |
| 49 | * ucb1x00_io_set_dir - set IO direction | 40 | * ucb1x00_io_set_dir - set IO direction |
| 50 | * @ucb: UCB1x00 structure describing chip | 41 | * @ucb: UCB1x00 structure describing chip |
| @@ -157,16 +148,22 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset | |||
| 157 | { | 148 | { |
| 158 | struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); | 149 | struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); |
| 159 | unsigned long flags; | 150 | unsigned long flags; |
| 151 | unsigned old, mask = 1 << offset; | ||
| 160 | 152 | ||
| 161 | spin_lock_irqsave(&ucb->io_lock, flags); | 153 | spin_lock_irqsave(&ucb->io_lock, flags); |
| 162 | ucb->io_dir |= (1 << offset); | 154 | old = ucb->io_out; |
| 163 | ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir); | ||
| 164 | |||
| 165 | if (value) | 155 | if (value) |
| 166 | ucb->io_out |= 1 << offset; | 156 | ucb->io_out |= mask; |
| 167 | else | 157 | else |
| 168 | ucb->io_out &= ~(1 << offset); | 158 | ucb->io_out &= ~mask; |
| 169 | ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out); | 159 | |
| 160 | if (old != ucb->io_out) | ||
| 161 | ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out); | ||
| 162 | |||
| 163 | if (!(ucb->io_dir & mask)) { | ||
| 164 | ucb->io_dir |= mask; | ||
| 165 | ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir); | ||
| 166 | } | ||
| 170 | spin_unlock_irqrestore(&ucb->io_lock, flags); | 167 | spin_unlock_irqrestore(&ucb->io_lock, flags); |
| 171 | 168 | ||
| 172 | return 0; | 169 | return 0; |
| @@ -536,33 +533,17 @@ static struct class ucb1x00_class = { | |||
| 536 | 533 | ||
| 537 | static int ucb1x00_probe(struct mcp *mcp) | 534 | static int ucb1x00_probe(struct mcp *mcp) |
| 538 | { | 535 | { |
| 539 | const struct mcp_device_id *mid; | ||
| 540 | struct ucb1x00 *ucb; | 536 | struct ucb1x00 *ucb; |
| 541 | struct ucb1x00_driver *drv; | 537 | struct ucb1x00_driver *drv; |
| 542 | struct ucb1x00_plat_data *pdata; | ||
| 543 | unsigned int id; | 538 | unsigned int id; |
| 544 | int ret = -ENODEV; | 539 | int ret = -ENODEV; |
| 545 | int temp; | 540 | int temp; |
| 546 | 541 | ||
| 547 | mcp_enable(mcp); | 542 | mcp_enable(mcp); |
| 548 | id = mcp_reg_read(mcp, UCB_ID); | 543 | id = mcp_reg_read(mcp, UCB_ID); |
| 549 | mid = mcp_get_device_id(mcp); | ||
| 550 | 544 | ||
| 551 | if (mid && mid->driver_data) { | 545 | if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) { |
| 552 | if (id != mid->driver_data) { | 546 | printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id); |
| 553 | printk(KERN_WARNING "%s wrong ID %04x found: %04x\n", | ||
| 554 | mid->name, (unsigned int) mid->driver_data, id); | ||
| 555 | goto err_disable; | ||
| 556 | } | ||
| 557 | } else { | ||
| 558 | mid = &ucb1x00_id[1]; | ||
| 559 | while (mid->driver_data) { | ||
| 560 | if (id == mid->driver_data) | ||
| 561 | break; | ||
| 562 | mid++; | ||
| 563 | } | ||
| 564 | printk(KERN_WARNING "%s ID not found: %04x\n", | ||
| 565 | ucb1x00_id[0].name, id); | ||
| 566 | goto err_disable; | 547 | goto err_disable; |
| 567 | } | 548 | } |
| 568 | 549 | ||
| @@ -571,28 +552,28 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
| 571 | if (!ucb) | 552 | if (!ucb) |
| 572 | goto err_disable; | 553 | goto err_disable; |
| 573 | 554 | ||
| 574 | pdata = mcp->attached_device.platform_data; | 555 | |
| 575 | ucb->dev.class = &ucb1x00_class; | 556 | ucb->dev.class = &ucb1x00_class; |
| 576 | ucb->dev.parent = &mcp->attached_device; | 557 | ucb->dev.parent = &mcp->attached_device; |
| 577 | dev_set_name(&ucb->dev, mid->name); | 558 | dev_set_name(&ucb->dev, "ucb1x00"); |
| 578 | 559 | ||
| 579 | spin_lock_init(&ucb->lock); | 560 | spin_lock_init(&ucb->lock); |
| 580 | spin_lock_init(&ucb->io_lock); | 561 | spin_lock_init(&ucb->io_lock); |
| 581 | sema_init(&ucb->adc_sem, 1); | 562 | sema_init(&ucb->adc_sem, 1); |
| 582 | 563 | ||
| 583 | ucb->id = mid; | 564 | ucb->id = id; |
| 584 | ucb->mcp = mcp; | 565 | ucb->mcp = mcp; |
| 585 | ucb->irq = ucb1x00_detect_irq(ucb); | 566 | ucb->irq = ucb1x00_detect_irq(ucb); |
| 586 | if (ucb->irq == NO_IRQ) { | 567 | if (ucb->irq == NO_IRQ) { |
| 587 | printk(KERN_ERR "%s: IRQ probe failed\n", mid->name); | 568 | printk(KERN_ERR "UCB1x00: IRQ probe failed\n"); |
| 588 | ret = -ENODEV; | 569 | ret = -ENODEV; |
| 589 | goto err_free; | 570 | goto err_free; |
| 590 | } | 571 | } |
| 591 | 572 | ||
| 592 | ucb->gpio.base = -1; | 573 | ucb->gpio.base = -1; |
| 593 | if (pdata && (pdata->gpio_base >= 0)) { | 574 | if (mcp->gpio_base != 0) { |
| 594 | ucb->gpio.label = dev_name(&ucb->dev); | 575 | ucb->gpio.label = dev_name(&ucb->dev); |
| 595 | ucb->gpio.base = pdata->gpio_base; | 576 | ucb->gpio.base = mcp->gpio_base; |
| 596 | ucb->gpio.ngpio = 10; | 577 | ucb->gpio.ngpio = 10; |
| 597 | ucb->gpio.set = ucb1x00_gpio_set; | 578 | ucb->gpio.set = ucb1x00_gpio_set; |
| 598 | ucb->gpio.get = ucb1x00_gpio_get; | 579 | ucb->gpio.get = ucb1x00_gpio_get; |
| @@ -605,10 +586,10 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
| 605 | dev_info(&ucb->dev, "gpio_base not set so no gpiolib support"); | 586 | dev_info(&ucb->dev, "gpio_base not set so no gpiolib support"); |
| 606 | 587 | ||
| 607 | ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING, | 588 | ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING, |
| 608 | mid->name, ucb); | 589 | "UCB1x00", ucb); |
| 609 | if (ret) { | 590 | if (ret) { |
| 610 | printk(KERN_ERR "%s: unable to grab irq%d: %d\n", | 591 | printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n", |
| 611 | mid->name, ucb->irq, ret); | 592 | ucb->irq, ret); |
| 612 | goto err_gpio; | 593 | goto err_gpio; |
| 613 | } | 594 | } |
| 614 | 595 | ||
| @@ -712,6 +693,7 @@ static int ucb1x00_resume(struct mcp *mcp) | |||
| 712 | struct ucb1x00 *ucb = mcp_get_drvdata(mcp); | 693 | struct ucb1x00 *ucb = mcp_get_drvdata(mcp); |
| 713 | struct ucb1x00_dev *dev; | 694 | struct ucb1x00_dev *dev; |
| 714 | 695 | ||
| 696 | ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out); | ||
| 715 | ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir); | 697 | ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir); |
| 716 | mutex_lock(&ucb1x00_mutex); | 698 | mutex_lock(&ucb1x00_mutex); |
| 717 | list_for_each_entry(dev, &ucb->devs, dev_node) { | 699 | list_for_each_entry(dev, &ucb->devs, dev_node) { |
| @@ -730,7 +712,6 @@ static struct mcp_driver ucb1x00_driver = { | |||
| 730 | .remove = ucb1x00_remove, | 712 | .remove = ucb1x00_remove, |
| 731 | .suspend = ucb1x00_suspend, | 713 | .suspend = ucb1x00_suspend, |
| 732 | .resume = ucb1x00_resume, | 714 | .resume = ucb1x00_resume, |
| 733 | .id_table = ucb1x00_id, | ||
| 734 | }; | 715 | }; |
| 735 | 716 | ||
| 736 | static int __init ucb1x00_init(void) | 717 | static int __init ucb1x00_init(void) |
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index 40ec3c118868..63a3cbdfa3f3 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
| @@ -47,7 +47,6 @@ struct ucb1x00_ts { | |||
| 47 | u16 x_res; | 47 | u16 x_res; |
| 48 | u16 y_res; | 48 | u16 y_res; |
| 49 | 49 | ||
| 50 | unsigned int restart:1; | ||
| 51 | unsigned int adcsync:1; | 50 | unsigned int adcsync:1; |
| 52 | }; | 51 | }; |
| 53 | 52 | ||
| @@ -207,15 +206,17 @@ static int ucb1x00_thread(void *_ts) | |||
| 207 | { | 206 | { |
| 208 | struct ucb1x00_ts *ts = _ts; | 207 | struct ucb1x00_ts *ts = _ts; |
| 209 | DECLARE_WAITQUEUE(wait, current); | 208 | DECLARE_WAITQUEUE(wait, current); |
| 209 | bool frozen, ignore = false; | ||
| 210 | int valid = 0; | 210 | int valid = 0; |
| 211 | 211 | ||
| 212 | set_freezable(); | 212 | set_freezable(); |
| 213 | add_wait_queue(&ts->irq_wait, &wait); | 213 | add_wait_queue(&ts->irq_wait, &wait); |
| 214 | while (!kthread_should_stop()) { | 214 | while (!kthread_freezable_should_stop(&frozen)) { |
| 215 | unsigned int x, y, p; | 215 | unsigned int x, y, p; |
| 216 | signed long timeout; | 216 | signed long timeout; |
| 217 | 217 | ||
| 218 | ts->restart = 0; | 218 | if (frozen) |
| 219 | ignore = true; | ||
| 219 | 220 | ||
| 220 | ucb1x00_adc_enable(ts->ucb); | 221 | ucb1x00_adc_enable(ts->ucb); |
| 221 | 222 | ||
| @@ -258,7 +259,7 @@ static int ucb1x00_thread(void *_ts) | |||
| 258 | * space. We therefore leave it to user space | 259 | * space. We therefore leave it to user space |
| 259 | * to do any filtering they please. | 260 | * to do any filtering they please. |
| 260 | */ | 261 | */ |
| 261 | if (!ts->restart) { | 262 | if (!ignore) { |
| 262 | ucb1x00_ts_evt_add(ts, p, x, y); | 263 | ucb1x00_ts_evt_add(ts, p, x, y); |
| 263 | valid = 1; | 264 | valid = 1; |
| 264 | } | 265 | } |
| @@ -267,8 +268,6 @@ static int ucb1x00_thread(void *_ts) | |||
| 267 | timeout = HZ / 100; | 268 | timeout = HZ / 100; |
| 268 | } | 269 | } |
| 269 | 270 | ||
| 270 | try_to_freeze(); | ||
| 271 | |||
| 272 | schedule_timeout(timeout); | 271 | schedule_timeout(timeout); |
| 273 | } | 272 | } |
| 274 | 273 | ||
| @@ -340,26 +339,6 @@ static void ucb1x00_ts_close(struct input_dev *idev) | |||
| 340 | ucb1x00_disable(ts->ucb); | 339 | ucb1x00_disable(ts->ucb); |
| 341 | } | 340 | } |
| 342 | 341 | ||
| 343 | #ifdef CONFIG_PM | ||
| 344 | static int ucb1x00_ts_resume(struct ucb1x00_dev *dev) | ||
| 345 | { | ||
| 346 | struct ucb1x00_ts *ts = dev->priv; | ||
| 347 | |||
| 348 | if (ts->rtask != NULL) { | ||
| 349 | /* | ||
| 350 | * Restart the TS thread to ensure the | ||
| 351 | * TS interrupt mode is set up again | ||
| 352 | * after sleep. | ||
| 353 | */ | ||
| 354 | ts->restart = 1; | ||
| 355 | wake_up(&ts->irq_wait); | ||
| 356 | } | ||
| 357 | return 0; | ||
| 358 | } | ||
| 359 | #else | ||
| 360 | #define ucb1x00_ts_resume NULL | ||
| 361 | #endif | ||
| 362 | |||
| 363 | 342 | ||
| 364 | /* | 343 | /* |
| 365 | * Initialisation. | 344 | * Initialisation. |
| @@ -382,7 +361,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) | |||
| 382 | ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; | 361 | ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; |
| 383 | 362 | ||
| 384 | idev->name = "Touchscreen panel"; | 363 | idev->name = "Touchscreen panel"; |
| 385 | idev->id.product = ts->ucb->id->driver_data; | 364 | idev->id.product = ts->ucb->id; |
| 386 | idev->open = ucb1x00_ts_open; | 365 | idev->open = ucb1x00_ts_open; |
| 387 | idev->close = ucb1x00_ts_close; | 366 | idev->close = ucb1x00_ts_close; |
| 388 | 367 | ||
| @@ -425,7 +404,6 @@ static void ucb1x00_ts_remove(struct ucb1x00_dev *dev) | |||
| 425 | static struct ucb1x00_driver ucb1x00_ts_driver = { | 404 | static struct ucb1x00_driver ucb1x00_ts_driver = { |
| 426 | .add = ucb1x00_ts_add, | 405 | .add = ucb1x00_ts_add, |
| 427 | .remove = ucb1x00_ts_remove, | 406 | .remove = ucb1x00_ts_remove, |
| 428 | .resume = ucb1x00_ts_resume, | ||
| 429 | }; | 407 | }; |
| 430 | 408 | ||
| 431 | static int __init ucb1x00_ts_init(void) | 409 | static int __init ucb1x00_ts_init(void) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index 752493f00406..65d1f05007be 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |||
| @@ -972,11 +972,11 @@ void iwl_irq_tasklet(struct iwl_trans *trans) | |||
| 972 | } | 972 | } |
| 973 | #endif | 973 | #endif |
| 974 | 974 | ||
| 975 | spin_unlock_irqrestore(&trans->shrd->lock, flags); | ||
| 976 | |||
| 977 | /* saved interrupt in inta variable now we can reset trans_pcie->inta */ | 975 | /* saved interrupt in inta variable now we can reset trans_pcie->inta */ |
| 978 | trans_pcie->inta = 0; | 976 | trans_pcie->inta = 0; |
| 979 | 977 | ||
| 978 | spin_unlock_irqrestore(&trans->shrd->lock, flags); | ||
| 979 | |||
| 980 | /* Now service all interrupt bits discovered above. */ | 980 | /* Now service all interrupt bits discovered above. */ |
| 981 | if (inta & CSR_INT_BIT_HW_ERR) { | 981 | if (inta & CSR_INT_BIT_HW_ERR) { |
| 982 | IWL_ERR(trans, "Hardware error detected. Restarting.\n"); | 982 | IWL_ERR(trans, "Hardware error detected. Restarting.\n"); |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index fa679057630f..698b905058dd 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -68,7 +68,7 @@ struct netfront_cb { | |||
| 68 | 68 | ||
| 69 | #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) | 69 | #define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE) |
| 70 | #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) | 70 | #define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE) |
| 71 | #define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256) | 71 | #define TX_MAX_TARGET min_t(int, NET_TX_RING_SIZE, 256) |
| 72 | 72 | ||
| 73 | struct netfront_stats { | 73 | struct netfront_stats { |
| 74 | u64 rx_packets; | 74 | u64 rx_packets; |
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 59866905ea37..27f2fe3b7fb4 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
| @@ -205,7 +205,8 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev) | |||
| 205 | 205 | ||
| 206 | dev_set_drvdata(&dev->dev, NULL); | 206 | dev_set_drvdata(&dev->dev, NULL); |
| 207 | 207 | ||
| 208 | for (; next = s->next, s; s = next) { | 208 | for (; s; s = next) { |
| 209 | next = s->next; | ||
| 209 | soc_pcmcia_remove_one(&s->soc); | 210 | soc_pcmcia_remove_one(&s->soc); |
| 210 | kfree(s); | 211 | kfree(s); |
| 211 | } | 212 | } |
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 569bdb3ef104..8fe15cf15ac8 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
| @@ -510,10 +510,12 @@ static struct dentry *debugfs_root; | |||
| 510 | 510 | ||
| 511 | static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev) | 511 | static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev) |
| 512 | { | 512 | { |
| 513 | static struct dentry *device_root; | 513 | struct dentry *device_root; |
| 514 | 514 | ||
| 515 | device_root = debugfs_create_dir(dev_name(pctldev->dev), | 515 | device_root = debugfs_create_dir(dev_name(pctldev->dev), |
| 516 | debugfs_root); | 516 | debugfs_root); |
| 517 | pctldev->device_root = device_root; | ||
| 518 | |||
| 517 | if (IS_ERR(device_root) || !device_root) { | 519 | if (IS_ERR(device_root) || !device_root) { |
| 518 | pr_warn("failed to create debugfs directory for %s\n", | 520 | pr_warn("failed to create debugfs directory for %s\n", |
| 519 | dev_name(pctldev->dev)); | 521 | dev_name(pctldev->dev)); |
| @@ -529,6 +531,11 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev) | |||
| 529 | pinconf_init_device_debugfs(device_root, pctldev); | 531 | pinconf_init_device_debugfs(device_root, pctldev); |
| 530 | } | 532 | } |
| 531 | 533 | ||
| 534 | static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev) | ||
| 535 | { | ||
| 536 | debugfs_remove_recursive(pctldev->device_root); | ||
| 537 | } | ||
| 538 | |||
| 532 | static void pinctrl_init_debugfs(void) | 539 | static void pinctrl_init_debugfs(void) |
| 533 | { | 540 | { |
| 534 | debugfs_root = debugfs_create_dir("pinctrl", NULL); | 541 | debugfs_root = debugfs_create_dir("pinctrl", NULL); |
| @@ -553,6 +560,10 @@ static void pinctrl_init_debugfs(void) | |||
| 553 | { | 560 | { |
| 554 | } | 561 | } |
| 555 | 562 | ||
| 563 | static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev) | ||
| 564 | { | ||
| 565 | } | ||
| 566 | |||
| 556 | #endif | 567 | #endif |
| 557 | 568 | ||
| 558 | /** | 569 | /** |
| @@ -572,40 +583,40 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, | |||
| 572 | if (pctldesc->name == NULL) | 583 | if (pctldesc->name == NULL) |
| 573 | return NULL; | 584 | return NULL; |
| 574 | 585 | ||
| 586 | pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL); | ||
| 587 | if (pctldev == NULL) | ||
| 588 | return NULL; | ||
| 589 | |||
| 590 | /* Initialize pin control device struct */ | ||
| 591 | pctldev->owner = pctldesc->owner; | ||
| 592 | pctldev->desc = pctldesc; | ||
| 593 | pctldev->driver_data = driver_data; | ||
| 594 | INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL); | ||
| 595 | spin_lock_init(&pctldev->pin_desc_tree_lock); | ||
| 596 | INIT_LIST_HEAD(&pctldev->gpio_ranges); | ||
| 597 | mutex_init(&pctldev->gpio_ranges_lock); | ||
| 598 | pctldev->dev = dev; | ||
| 599 | |||
| 575 | /* If we're implementing pinmuxing, check the ops for sanity */ | 600 | /* If we're implementing pinmuxing, check the ops for sanity */ |
| 576 | if (pctldesc->pmxops) { | 601 | if (pctldesc->pmxops) { |
| 577 | ret = pinmux_check_ops(pctldesc->pmxops); | 602 | ret = pinmux_check_ops(pctldev); |
| 578 | if (ret) { | 603 | if (ret) { |
| 579 | pr_err("%s pinmux ops lacks necessary functions\n", | 604 | pr_err("%s pinmux ops lacks necessary functions\n", |
| 580 | pctldesc->name); | 605 | pctldesc->name); |
| 581 | return NULL; | 606 | goto out_err; |
| 582 | } | 607 | } |
| 583 | } | 608 | } |
| 584 | 609 | ||
| 585 | /* If we're implementing pinconfig, check the ops for sanity */ | 610 | /* If we're implementing pinconfig, check the ops for sanity */ |
| 586 | if (pctldesc->confops) { | 611 | if (pctldesc->confops) { |
| 587 | ret = pinconf_check_ops(pctldesc->confops); | 612 | ret = pinconf_check_ops(pctldev); |
| 588 | if (ret) { | 613 | if (ret) { |
| 589 | pr_err("%s pin config ops lacks necessary functions\n", | 614 | pr_err("%s pin config ops lacks necessary functions\n", |
| 590 | pctldesc->name); | 615 | pctldesc->name); |
| 591 | return NULL; | 616 | goto out_err; |
| 592 | } | 617 | } |
| 593 | } | 618 | } |
| 594 | 619 | ||
| 595 | pctldev = kzalloc(sizeof(struct pinctrl_dev), GFP_KERNEL); | ||
| 596 | if (pctldev == NULL) | ||
| 597 | return NULL; | ||
| 598 | |||
| 599 | /* Initialize pin control device struct */ | ||
| 600 | pctldev->owner = pctldesc->owner; | ||
| 601 | pctldev->desc = pctldesc; | ||
| 602 | pctldev->driver_data = driver_data; | ||
| 603 | INIT_RADIX_TREE(&pctldev->pin_desc_tree, GFP_KERNEL); | ||
| 604 | spin_lock_init(&pctldev->pin_desc_tree_lock); | ||
| 605 | INIT_LIST_HEAD(&pctldev->gpio_ranges); | ||
| 606 | mutex_init(&pctldev->gpio_ranges_lock); | ||
| 607 | pctldev->dev = dev; | ||
| 608 | |||
| 609 | /* Register all the pins */ | 620 | /* Register all the pins */ |
| 610 | pr_debug("try to register %d pins on %s...\n", | 621 | pr_debug("try to register %d pins on %s...\n", |
| 611 | pctldesc->npins, pctldesc->name); | 622 | pctldesc->npins, pctldesc->name); |
| @@ -641,6 +652,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev) | |||
| 641 | if (pctldev == NULL) | 652 | if (pctldev == NULL) |
| 642 | return; | 653 | return; |
| 643 | 654 | ||
| 655 | pinctrl_remove_device_debugfs(pctldev); | ||
| 644 | pinmux_unhog_maps(pctldev); | 656 | pinmux_unhog_maps(pctldev); |
| 645 | /* TODO: check that no pinmuxes are still active? */ | 657 | /* TODO: check that no pinmuxes are still active? */ |
| 646 | mutex_lock(&pinctrldev_list_mutex); | 658 | mutex_lock(&pinctrldev_list_mutex); |
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 177a3310547f..cfa86da6b4b1 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h | |||
| @@ -41,6 +41,9 @@ struct pinctrl_dev { | |||
| 41 | struct device *dev; | 41 | struct device *dev; |
| 42 | struct module *owner; | 42 | struct module *owner; |
| 43 | void *driver_data; | 43 | void *driver_data; |
| 44 | #ifdef CONFIG_DEBUG_FS | ||
| 45 | struct dentry *device_root; | ||
| 46 | #endif | ||
| 44 | #ifdef CONFIG_PINMUX | 47 | #ifdef CONFIG_PINMUX |
| 45 | struct mutex pinmux_hogs_lock; | 48 | struct mutex pinmux_hogs_lock; |
| 46 | struct list_head pinmux_hogs; | 49 | struct list_head pinmux_hogs; |
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index 1259872b0a1d..9fb75456824c 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c | |||
| @@ -205,8 +205,10 @@ int pin_config_group_set(const char *dev_name, const char *pin_group, | |||
| 205 | } | 205 | } |
| 206 | EXPORT_SYMBOL(pin_config_group_set); | 206 | EXPORT_SYMBOL(pin_config_group_set); |
| 207 | 207 | ||
| 208 | int pinconf_check_ops(const struct pinconf_ops *ops) | 208 | int pinconf_check_ops(struct pinctrl_dev *pctldev) |
| 209 | { | 209 | { |
| 210 | const struct pinconf_ops *ops = pctldev->desc->confops; | ||
| 211 | |||
| 210 | /* We must be able to read out pin status */ | 212 | /* We must be able to read out pin status */ |
| 211 | if (!ops->pin_config_get && !ops->pin_config_group_get) | 213 | if (!ops->pin_config_get && !ops->pin_config_group_get) |
| 212 | return -EINVAL; | 214 | return -EINVAL; |
| @@ -236,7 +238,7 @@ static int pinconf_pins_show(struct seq_file *s, void *what) | |||
| 236 | seq_puts(s, "Format: pin (name): pinmux setting array\n"); | 238 | seq_puts(s, "Format: pin (name): pinmux setting array\n"); |
| 237 | 239 | ||
| 238 | /* The pin number can be retrived from the pin controller descriptor */ | 240 | /* The pin number can be retrived from the pin controller descriptor */ |
| 239 | for (i = 0; pin < pctldev->desc->npins; i++) { | 241 | for (i = 0; i < pctldev->desc->npins; i++) { |
| 240 | struct pin_desc *desc; | 242 | struct pin_desc *desc; |
| 241 | 243 | ||
| 242 | pin = pctldev->desc->pins[i].number; | 244 | pin = pctldev->desc->pins[i].number; |
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h index e7dc6165032a..006b77fa737e 100644 --- a/drivers/pinctrl/pinconf.h +++ b/drivers/pinctrl/pinconf.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #ifdef CONFIG_PINCONF | 14 | #ifdef CONFIG_PINCONF |
| 15 | 15 | ||
| 16 | int pinconf_check_ops(const struct pinconf_ops *ops); | 16 | int pinconf_check_ops(struct pinctrl_dev *pctldev); |
| 17 | void pinconf_init_device_debugfs(struct dentry *devroot, | 17 | void pinconf_init_device_debugfs(struct dentry *devroot, |
| 18 | struct pinctrl_dev *pctldev); | 18 | struct pinctrl_dev *pctldev); |
| 19 | int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin, | 19 | int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin, |
| @@ -23,7 +23,7 @@ int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin, | |||
| 23 | 23 | ||
| 24 | #else | 24 | #else |
| 25 | 25 | ||
| 26 | static inline int pinconf_check_ops(const struct pinconf_ops *ops) | 26 | static inline int pinconf_check_ops(struct pinctrl_dev *pctldev) |
| 27 | { | 27 | { |
| 28 | return 0; | 28 | return 0; |
| 29 | } | 29 | } |
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index a76a348321bb..7c3193f7a044 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c | |||
| @@ -53,11 +53,6 @@ struct pinmux_group { | |||
| 53 | * @dev: the device using this pinmux | 53 | * @dev: the device using this pinmux |
| 54 | * @usecount: the number of active users of this mux setting, used to keep | 54 | * @usecount: the number of active users of this mux setting, used to keep |
| 55 | * track of nested use cases | 55 | * track of nested use cases |
| 56 | * @pins: an array of discrete physical pins used in this mapping, taken | ||
| 57 | * from the global pin enumeration space (copied from pinmux map) | ||
| 58 | * @num_pins: the number of pins in this mapping array, i.e. the number of | ||
| 59 | * elements in .pins so we can iterate over that array (copied from | ||
| 60 | * pinmux map) | ||
| 61 | * @pctldev: pin control device handling this pinmux | 56 | * @pctldev: pin control device handling this pinmux |
| 62 | * @func_selector: the function selector for the pinmux device handling | 57 | * @func_selector: the function selector for the pinmux device handling |
| 63 | * this pinmux | 58 | * this pinmux |
| @@ -152,8 +147,7 @@ static int pin_request(struct pinctrl_dev *pctldev, | |||
| 152 | status = 0; | 147 | status = 0; |
| 153 | 148 | ||
| 154 | if (status) | 149 | if (status) |
| 155 | dev_err(pctldev->dev, "->request on device %s failed " | 150 | dev_err(pctldev->dev, "->request on device %s failed for pin %d\n", |
| 156 | "for pin %d\n", | ||
| 157 | pctldev->desc->name, pin); | 151 | pctldev->desc->name, pin); |
| 158 | out_free_pin: | 152 | out_free_pin: |
| 159 | if (status) { | 153 | if (status) { |
| @@ -355,21 +349,20 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps, | |||
| 355 | /* First sanity check the new mapping */ | 349 | /* First sanity check the new mapping */ |
| 356 | for (i = 0; i < num_maps; i++) { | 350 | for (i = 0; i < num_maps; i++) { |
| 357 | if (!maps[i].name) { | 351 | if (!maps[i].name) { |
| 358 | pr_err("failed to register map %d: " | 352 | pr_err("failed to register map %d: no map name given\n", |
| 359 | "no map name given\n", i); | 353 | i); |
| 360 | return -EINVAL; | 354 | return -EINVAL; |
| 361 | } | 355 | } |
| 362 | 356 | ||
| 363 | if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) { | 357 | if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) { |
| 364 | pr_err("failed to register map %s (%d): " | 358 | pr_err("failed to register map %s (%d): no pin control device given\n", |
| 365 | "no pin control device given\n", | ||
| 366 | maps[i].name, i); | 359 | maps[i].name, i); |
| 367 | return -EINVAL; | 360 | return -EINVAL; |
| 368 | } | 361 | } |
| 369 | 362 | ||
| 370 | if (!maps[i].function) { | 363 | if (!maps[i].function) { |
| 371 | pr_err("failed to register map %s (%d): " | 364 | pr_err("failed to register map %s (%d): no function ID given\n", |
| 372 | "no function ID given\n", maps[i].name, i); | 365 | maps[i].name, i); |
| 373 | return -EINVAL; | 366 | return -EINVAL; |
| 374 | } | 367 | } |
| 375 | 368 | ||
| @@ -411,7 +404,7 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps, | |||
| 411 | } | 404 | } |
| 412 | 405 | ||
| 413 | /** | 406 | /** |
| 414 | * acquire_pins() - acquire all the pins for a certain funcion on a pinmux | 407 | * acquire_pins() - acquire all the pins for a certain function on a pinmux |
| 415 | * @pctldev: the device to take the pins on | 408 | * @pctldev: the device to take the pins on |
| 416 | * @func_selector: the function selector to acquire the pins for | 409 | * @func_selector: the function selector to acquire the pins for |
| 417 | * @group_selector: the group selector containing the pins to acquire | 410 | * @group_selector: the group selector containing the pins to acquire |
| @@ -442,8 +435,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev, | |||
| 442 | ret = pin_request(pctldev, pins[i], func, NULL); | 435 | ret = pin_request(pctldev, pins[i], func, NULL); |
| 443 | if (ret) { | 436 | if (ret) { |
| 444 | dev_err(pctldev->dev, | 437 | dev_err(pctldev->dev, |
| 445 | "could not get pin %d for function %s " | 438 | "could not get pin %d for function %s on device %s - conflicting mux mappings?\n", |
| 446 | "on device %s - conflicting mux mappings?\n", | ||
| 447 | pins[i], func ? : "(undefined)", | 439 | pins[i], func ? : "(undefined)", |
| 448 | pinctrl_dev_get_name(pctldev)); | 440 | pinctrl_dev_get_name(pctldev)); |
| 449 | /* On error release all taken pins */ | 441 | /* On error release all taken pins */ |
| @@ -458,7 +450,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev, | |||
| 458 | 450 | ||
| 459 | /** | 451 | /** |
| 460 | * release_pins() - release pins taken by earlier acquirement | 452 | * release_pins() - release pins taken by earlier acquirement |
| 461 | * @pctldev: the device to free the pinx on | 453 | * @pctldev: the device to free the pins on |
| 462 | * @group_selector: the group selector containing the pins to free | 454 | * @group_selector: the group selector containing the pins to free |
| 463 | */ | 455 | */ |
| 464 | static void release_pins(struct pinctrl_dev *pctldev, | 456 | static void release_pins(struct pinctrl_dev *pctldev, |
| @@ -473,8 +465,7 @@ static void release_pins(struct pinctrl_dev *pctldev, | |||
| 473 | ret = pctlops->get_group_pins(pctldev, group_selector, | 465 | ret = pctlops->get_group_pins(pctldev, group_selector, |
| 474 | &pins, &num_pins); | 466 | &pins, &num_pins); |
| 475 | if (ret) { | 467 | if (ret) { |
| 476 | dev_err(pctldev->dev, "could not get pins to release for " | 468 | dev_err(pctldev->dev, "could not get pins to release for group selector %d\n", |
| 477 | "group selector %d\n", | ||
| 478 | group_selector); | 469 | group_selector); |
| 479 | return; | 470 | return; |
| 480 | } | 471 | } |
| @@ -526,8 +517,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev, | |||
| 526 | ret = pinctrl_get_group_selector(pctldev, groups[0]); | 517 | ret = pinctrl_get_group_selector(pctldev, groups[0]); |
| 527 | if (ret < 0) { | 518 | if (ret < 0) { |
| 528 | dev_err(pctldev->dev, | 519 | dev_err(pctldev->dev, |
| 529 | "function %s wants group %s but the pin " | 520 | "function %s wants group %s but the pin controller does not seem to have that group\n", |
| 530 | "controller does not seem to have that group\n", | ||
| 531 | pmxops->get_function_name(pctldev, func_selector), | 521 | pmxops->get_function_name(pctldev, func_selector), |
| 532 | groups[0]); | 522 | groups[0]); |
| 533 | return ret; | 523 | return ret; |
| @@ -535,8 +525,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev, | |||
| 535 | 525 | ||
| 536 | if (num_groups > 1) | 526 | if (num_groups > 1) |
| 537 | dev_dbg(pctldev->dev, | 527 | dev_dbg(pctldev->dev, |
| 538 | "function %s support more than one group, " | 528 | "function %s support more than one group, default-selecting first group %s (%d)\n", |
| 539 | "default-selecting first group %s (%d)\n", | ||
| 540 | pmxops->get_function_name(pctldev, func_selector), | 529 | pmxops->get_function_name(pctldev, func_selector), |
| 541 | groups[0], | 530 | groups[0], |
| 542 | ret); | 531 | ret); |
| @@ -628,10 +617,8 @@ static int pinmux_enable_muxmap(struct pinctrl_dev *pctldev, | |||
| 628 | 617 | ||
| 629 | if (pmx->pctldev && pmx->pctldev != pctldev) { | 618 | if (pmx->pctldev && pmx->pctldev != pctldev) { |
| 630 | dev_err(pctldev->dev, | 619 | dev_err(pctldev->dev, |
| 631 | "different pin control devices given for device %s, " | 620 | "different pin control devices given for device %s, function %s\n", |
| 632 | "function %s\n", | 621 | devname, map->function); |
| 633 | devname, | ||
| 634 | map->function); | ||
| 635 | return -EINVAL; | 622 | return -EINVAL; |
| 636 | } | 623 | } |
| 637 | pmx->dev = dev; | 624 | pmx->dev = dev; |
| @@ -695,7 +682,6 @@ static void pinmux_free_groups(struct pinmux *pmx) | |||
| 695 | */ | 682 | */ |
| 696 | struct pinmux *pinmux_get(struct device *dev, const char *name) | 683 | struct pinmux *pinmux_get(struct device *dev, const char *name) |
| 697 | { | 684 | { |
| 698 | |||
| 699 | struct pinmux_map const *map = NULL; | 685 | struct pinmux_map const *map = NULL; |
| 700 | struct pinctrl_dev *pctldev = NULL; | 686 | struct pinctrl_dev *pctldev = NULL; |
| 701 | const char *devname = NULL; | 687 | const char *devname = NULL; |
| @@ -745,8 +731,7 @@ struct pinmux *pinmux_get(struct device *dev, const char *name) | |||
| 745 | else if (map->ctrl_dev_name) | 731 | else if (map->ctrl_dev_name) |
| 746 | devname = map->ctrl_dev_name; | 732 | devname = map->ctrl_dev_name; |
| 747 | 733 | ||
| 748 | pr_warning("could not find a pinctrl device for pinmux " | 734 | pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n", |
| 749 | "function %s, fishy, they shall all have one\n", | ||
| 750 | map->function); | 735 | map->function); |
| 751 | pr_warning("given pinctrl device name: %s", | 736 | pr_warning("given pinctrl device name: %s", |
| 752 | devname ? devname : "UNDEFINED"); | 737 | devname ? devname : "UNDEFINED"); |
| @@ -904,8 +889,11 @@ void pinmux_disable(struct pinmux *pmx) | |||
| 904 | } | 889 | } |
| 905 | EXPORT_SYMBOL_GPL(pinmux_disable); | 890 | EXPORT_SYMBOL_GPL(pinmux_disable); |
| 906 | 891 | ||
| 907 | int pinmux_check_ops(const struct pinmux_ops *ops) | 892 | int pinmux_check_ops(struct pinctrl_dev *pctldev) |
| 908 | { | 893 | { |
| 894 | const struct pinmux_ops *ops = pctldev->desc->pmxops; | ||
| 895 | unsigned selector = 0; | ||
| 896 | |||
| 909 | /* Check that we implement required operations */ | 897 | /* Check that we implement required operations */ |
| 910 | if (!ops->list_functions || | 898 | if (!ops->list_functions || |
| 911 | !ops->get_function_name || | 899 | !ops->get_function_name || |
| @@ -914,6 +902,18 @@ int pinmux_check_ops(const struct pinmux_ops *ops) | |||
| 914 | !ops->disable) | 902 | !ops->disable) |
| 915 | return -EINVAL; | 903 | return -EINVAL; |
| 916 | 904 | ||
| 905 | /* Check that all functions registered have names */ | ||
| 906 | while (ops->list_functions(pctldev, selector) >= 0) { | ||
| 907 | const char *fname = ops->get_function_name(pctldev, | ||
| 908 | selector); | ||
| 909 | if (!fname) { | ||
| 910 | pr_err("pinmux ops has no name for function%u\n", | ||
| 911 | selector); | ||
| 912 | return -EINVAL; | ||
| 913 | } | ||
| 914 | selector++; | ||
| 915 | } | ||
| 916 | |||
| 917 | return 0; | 917 | return 0; |
| 918 | } | 918 | } |
| 919 | 919 | ||
| @@ -932,8 +932,8 @@ static int pinmux_hog_map(struct pinctrl_dev *pctldev, | |||
| 932 | * without any problems, so then we can hog pinmuxes for | 932 | * without any problems, so then we can hog pinmuxes for |
| 933 | * all devices that just want a static pin mux at this point. | 933 | * all devices that just want a static pin mux at this point. |
| 934 | */ | 934 | */ |
| 935 | dev_err(pctldev->dev, "map %s wants to hog a non-system " | 935 | dev_err(pctldev->dev, "map %s wants to hog a non-system pinmux, this is not going to work\n", |
| 936 | "pinmux, this is not going to work\n", map->name); | 936 | map->name); |
| 937 | return -EINVAL; | 937 | return -EINVAL; |
| 938 | } | 938 | } |
| 939 | 939 | ||
| @@ -993,9 +993,12 @@ int pinmux_hog_maps(struct pinctrl_dev *pctldev) | |||
| 993 | for (i = 0; i < pinmux_maps_num; i++) { | 993 | for (i = 0; i < pinmux_maps_num; i++) { |
| 994 | struct pinmux_map const *map = &pinmux_maps[i]; | 994 | struct pinmux_map const *map = &pinmux_maps[i]; |
| 995 | 995 | ||
| 996 | if (((map->ctrl_dev == dev) || | 996 | if (!map->hog_on_boot) |
| 997 | !strcmp(map->ctrl_dev_name, devname)) && | 997 | continue; |
| 998 | map->hog_on_boot) { | 998 | |
| 999 | if ((map->ctrl_dev == dev) || | ||
| 1000 | (map->ctrl_dev_name && | ||
| 1001 | !strcmp(map->ctrl_dev_name, devname))) { | ||
| 999 | /* OK time to hog! */ | 1002 | /* OK time to hog! */ |
| 1000 | ret = pinmux_hog_map(pctldev, map); | 1003 | ret = pinmux_hog_map(pctldev, map); |
| 1001 | if (ret) | 1004 | if (ret) |
| @@ -1122,13 +1125,15 @@ static int pinmux_show(struct seq_file *s, void *what) | |||
| 1122 | 1125 | ||
| 1123 | seq_printf(s, "device: %s function: %s (%u),", | 1126 | seq_printf(s, "device: %s function: %s (%u),", |
| 1124 | pinctrl_dev_get_name(pmx->pctldev), | 1127 | pinctrl_dev_get_name(pmx->pctldev), |
| 1125 | pmxops->get_function_name(pctldev, pmx->func_selector), | 1128 | pmxops->get_function_name(pctldev, |
| 1129 | pmx->func_selector), | ||
| 1126 | pmx->func_selector); | 1130 | pmx->func_selector); |
| 1127 | 1131 | ||
| 1128 | seq_printf(s, " groups: ["); | 1132 | seq_printf(s, " groups: ["); |
| 1129 | list_for_each_entry(grp, &pmx->groups, node) { | 1133 | list_for_each_entry(grp, &pmx->groups, node) { |
| 1130 | seq_printf(s, " %s (%u)", | 1134 | seq_printf(s, " %s (%u)", |
| 1131 | pctlops->get_group_name(pctldev, grp->group_selector), | 1135 | pctlops->get_group_name(pctldev, |
| 1136 | grp->group_selector), | ||
| 1132 | grp->group_selector); | 1137 | grp->group_selector); |
| 1133 | } | 1138 | } |
| 1134 | seq_printf(s, " ]"); | 1139 | seq_printf(s, " ]"); |
diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h index 844500b3331b..97f52223fbc2 100644 --- a/drivers/pinctrl/pinmux.h +++ b/drivers/pinctrl/pinmux.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #ifdef CONFIG_PINMUX | 13 | #ifdef CONFIG_PINMUX |
| 14 | 14 | ||
| 15 | int pinmux_check_ops(const struct pinmux_ops *ops); | 15 | int pinmux_check_ops(struct pinctrl_dev *pctldev); |
| 16 | void pinmux_init_device_debugfs(struct dentry *devroot, | 16 | void pinmux_init_device_debugfs(struct dentry *devroot, |
| 17 | struct pinctrl_dev *pctldev); | 17 | struct pinctrl_dev *pctldev); |
| 18 | void pinmux_init_debugfs(struct dentry *subsys_root); | 18 | void pinmux_init_debugfs(struct dentry *subsys_root); |
| @@ -21,7 +21,7 @@ void pinmux_unhog_maps(struct pinctrl_dev *pctldev); | |||
| 21 | 21 | ||
| 22 | #else | 22 | #else |
| 23 | 23 | ||
| 24 | static inline int pinmux_check_ops(const struct pinmux_ops *ops) | 24 | static inline int pinmux_check_ops(struct pinctrl_dev *pctldev) |
| 25 | { | 25 | { |
| 26 | return 0; | 26 | return 0; |
| 27 | } | 27 | } |
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index f1651eb69648..679734d26a16 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c | |||
| @@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np, | |||
| 35 | if (constraints->min_uV != constraints->max_uV) | 35 | if (constraints->min_uV != constraints->max_uV) |
| 36 | constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE; | 36 | constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE; |
| 37 | /* Only one voltage? Then make sure it's set. */ | 37 | /* Only one voltage? Then make sure it's set. */ |
| 38 | if (constraints->min_uV == constraints->max_uV) | 38 | if (min_uV && max_uV && constraints->min_uV == constraints->max_uV) |
| 39 | constraints->apply_uV = true; | 39 | constraints->apply_uV = true; |
| 40 | 40 | ||
| 41 | uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL); | 41 | uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL); |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index e19a4031f45e..3a125b835546 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -774,7 +774,7 @@ config RTC_DRV_EP93XX | |||
| 774 | 774 | ||
| 775 | config RTC_DRV_SA1100 | 775 | config RTC_DRV_SA1100 |
| 776 | tristate "SA11x0/PXA2xx" | 776 | tristate "SA11x0/PXA2xx" |
| 777 | depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP | 777 | depends on ARCH_SA1100 || ARCH_PXA |
| 778 | help | 778 | help |
| 779 | If you say Y here you will get access to the real time clock | 779 | If you say Y here you will get access to the real time clock |
| 780 | built into your SA11x0 or PXA2xx CPU. | 780 | built into your SA11x0 or PXA2xx CPU. |
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 4595d3e645a7..cb9a585312cc 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
| @@ -27,42 +27,34 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/string.h> | ||
| 30 | #include <linux/pm.h> | 31 | #include <linux/pm.h> |
| 31 | #include <linux/slab.h> | 32 | #include <linux/bitops.h> |
| 32 | #include <linux/clk.h> | ||
| 33 | #include <linux/io.h> | ||
| 34 | 33 | ||
| 35 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 36 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 37 | 36 | ||
| 37 | #ifdef CONFIG_ARCH_PXA | ||
| 38 | #include <mach/regs-rtc.h> | ||
| 39 | #endif | ||
| 40 | |||
| 38 | #define RTC_DEF_DIVIDER (32768 - 1) | 41 | #define RTC_DEF_DIVIDER (32768 - 1) |
| 39 | #define RTC_DEF_TRIM 0 | 42 | #define RTC_DEF_TRIM 0 |
| 40 | #define RTC_FREQ 1024 | 43 | |
| 41 | 44 | static const unsigned long RTC_FREQ = 1024; | |
| 42 | #define RCNR 0x00 /* RTC Count Register */ | 45 | static struct rtc_time rtc_alarm; |
| 43 | #define RTAR 0x04 /* RTC Alarm Register */ | 46 | static DEFINE_SPINLOCK(sa1100_rtc_lock); |
| 44 | #define RTSR 0x08 /* RTC Status Register */ | 47 | |
| 45 | #define RTTR 0x0c /* RTC Timer Trim Register */ | 48 | static inline int rtc_periodic_alarm(struct rtc_time *tm) |
| 46 | 49 | { | |
| 47 | #define RTSR_HZE (1 << 3) /* HZ interrupt enable */ | 50 | return (tm->tm_year == -1) || |
| 48 | #define RTSR_ALE (1 << 2) /* RTC alarm interrupt enable */ | 51 | ((unsigned)tm->tm_mon >= 12) || |
| 49 | #define RTSR_HZ (1 << 1) /* HZ rising-edge detected */ | 52 | ((unsigned)(tm->tm_mday - 1) >= 31) || |
| 50 | #define RTSR_AL (1 << 0) /* RTC alarm detected */ | 53 | ((unsigned)tm->tm_hour > 23) || |
| 51 | 54 | ((unsigned)tm->tm_min > 59) || | |
| 52 | #define rtc_readl(sa1100_rtc, reg) \ | 55 | ((unsigned)tm->tm_sec > 59); |
| 53 | readl_relaxed((sa1100_rtc)->base + (reg)) | 56 | } |
| 54 | #define rtc_writel(sa1100_rtc, reg, value) \ | 57 | |
| 55 | writel_relaxed((value), (sa1100_rtc)->base + (reg)) | ||
| 56 | |||
| 57 | struct sa1100_rtc { | ||
| 58 | struct resource *ress; | ||
| 59 | void __iomem *base; | ||
| 60 | struct clk *clk; | ||
| 61 | int irq_1Hz; | ||
| 62 | int irq_Alrm; | ||
| 63 | struct rtc_device *rtc; | ||
| 64 | spinlock_t lock; /* Protects this structure */ | ||
| 65 | }; | ||
| 66 | /* | 58 | /* |
| 67 | * Calculate the next alarm time given the requested alarm time mask | 59 | * Calculate the next alarm time given the requested alarm time mask |
| 68 | * and the current time. | 60 | * and the current time. |
| @@ -90,26 +82,46 @@ static void rtc_next_alarm_time(struct rtc_time *next, struct rtc_time *now, | |||
| 90 | } | 82 | } |
| 91 | } | 83 | } |
| 92 | 84 | ||
| 85 | static int rtc_update_alarm(struct rtc_time *alrm) | ||
| 86 | { | ||
| 87 | struct rtc_time alarm_tm, now_tm; | ||
| 88 | unsigned long now, time; | ||
| 89 | int ret; | ||
| 90 | |||
| 91 | do { | ||
| 92 | now = RCNR; | ||
| 93 | rtc_time_to_tm(now, &now_tm); | ||
| 94 | rtc_next_alarm_time(&alarm_tm, &now_tm, alrm); | ||
| 95 | ret = rtc_tm_to_time(&alarm_tm, &time); | ||
| 96 | if (ret != 0) | ||
| 97 | break; | ||
| 98 | |||
| 99 | RTSR = RTSR & (RTSR_HZE|RTSR_ALE|RTSR_AL); | ||
| 100 | RTAR = time; | ||
| 101 | } while (now != RCNR); | ||
| 102 | |||
| 103 | return ret; | ||
| 104 | } | ||
| 105 | |||
| 93 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) | 106 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) |
| 94 | { | 107 | { |
| 95 | struct platform_device *pdev = to_platform_device(dev_id); | 108 | struct platform_device *pdev = to_platform_device(dev_id); |
| 96 | struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev); | 109 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
| 97 | unsigned int rtsr; | 110 | unsigned int rtsr; |
| 98 | unsigned long events = 0; | 111 | unsigned long events = 0; |
| 99 | 112 | ||
| 100 | spin_lock(&sa1100_rtc->lock); | 113 | spin_lock(&sa1100_rtc_lock); |
| 101 | 114 | ||
| 115 | rtsr = RTSR; | ||
| 102 | /* clear interrupt sources */ | 116 | /* clear interrupt sources */ |
| 103 | rtsr = rtc_readl(sa1100_rtc, RTSR); | 117 | RTSR = 0; |
| 104 | rtc_writel(sa1100_rtc, RTSR, 0); | ||
| 105 | |||
| 106 | /* Fix for a nasty initialization problem the in SA11xx RTSR register. | 118 | /* Fix for a nasty initialization problem the in SA11xx RTSR register. |
| 107 | * See also the comments in sa1100_rtc_probe(). */ | 119 | * See also the comments in sa1100_rtc_probe(). */ |
| 108 | if (rtsr & (RTSR_ALE | RTSR_HZE)) { | 120 | if (rtsr & (RTSR_ALE | RTSR_HZE)) { |
| 109 | /* This is the original code, before there was the if test | 121 | /* This is the original code, before there was the if test |
| 110 | * above. This code does not clear interrupts that were not | 122 | * above. This code does not clear interrupts that were not |
| 111 | * enabled. */ | 123 | * enabled. */ |
| 112 | rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ) & (rtsr >> 2)); | 124 | RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2); |
| 113 | } else { | 125 | } else { |
| 114 | /* For some reason, it is possible to enter this routine | 126 | /* For some reason, it is possible to enter this routine |
| 115 | * without interruptions enabled, it has been tested with | 127 | * without interruptions enabled, it has been tested with |
| @@ -118,13 +130,13 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) | |||
| 118 | * This situation leads to an infinite "loop" of interrupt | 130 | * This situation leads to an infinite "loop" of interrupt |
| 119 | * routine calling and as a result the processor seems to | 131 | * routine calling and as a result the processor seems to |
| 120 | * lock on its first call to open(). */ | 132 | * lock on its first call to open(). */ |
| 121 | rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ)); | 133 | RTSR = RTSR_AL | RTSR_HZ; |
| 122 | } | 134 | } |
| 123 | 135 | ||
| 124 | /* clear alarm interrupt if it has occurred */ | 136 | /* clear alarm interrupt if it has occurred */ |
| 125 | if (rtsr & RTSR_AL) | 137 | if (rtsr & RTSR_AL) |
| 126 | rtsr &= ~RTSR_ALE; | 138 | rtsr &= ~RTSR_ALE; |
| 127 | rtc_writel(sa1100_rtc, RTSR, rtsr & (RTSR_ALE | RTSR_HZE)); | 139 | RTSR = rtsr & (RTSR_ALE | RTSR_HZE); |
| 128 | 140 | ||
| 129 | /* update irq data & counter */ | 141 | /* update irq data & counter */ |
| 130 | if (rtsr & RTSR_AL) | 142 | if (rtsr & RTSR_AL) |
| @@ -132,100 +144,89 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) | |||
| 132 | if (rtsr & RTSR_HZ) | 144 | if (rtsr & RTSR_HZ) |
| 133 | events |= RTC_UF | RTC_IRQF; | 145 | events |= RTC_UF | RTC_IRQF; |
| 134 | 146 | ||
| 135 | rtc_update_irq(sa1100_rtc->rtc, 1, events); | 147 | rtc_update_irq(rtc, 1, events); |
| 136 | 148 | ||
| 137 | spin_unlock(&sa1100_rtc->lock); | 149 | if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm)) |
| 150 | rtc_update_alarm(&rtc_alarm); | ||
| 151 | |||
| 152 | spin_unlock(&sa1100_rtc_lock); | ||
| 138 | 153 | ||
| 139 | return IRQ_HANDLED; | 154 | return IRQ_HANDLED; |
| 140 | } | 155 | } |
| 141 | 156 | ||
| 142 | static int sa1100_rtc_open(struct device *dev) | 157 | static int sa1100_rtc_open(struct device *dev) |
| 143 | { | 158 | { |
| 144 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | ||
| 145 | int ret; | 159 | int ret; |
| 160 | struct platform_device *plat_dev = to_platform_device(dev); | ||
| 161 | struct rtc_device *rtc = platform_get_drvdata(plat_dev); | ||
| 146 | 162 | ||
| 147 | ret = request_irq(sa1100_rtc->irq_1Hz, sa1100_rtc_interrupt, | 163 | ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, |
| 148 | IRQF_DISABLED, "rtc 1Hz", dev); | 164 | "rtc 1Hz", dev); |
| 149 | if (ret) { | 165 | if (ret) { |
| 150 | dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_1Hz); | 166 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); |
| 151 | goto fail_ui; | 167 | goto fail_ui; |
| 152 | } | 168 | } |
| 153 | ret = request_irq(sa1100_rtc->irq_Alrm, sa1100_rtc_interrupt, | 169 | ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED, |
| 154 | IRQF_DISABLED, "rtc Alrm", dev); | 170 | "rtc Alrm", dev); |
| 155 | if (ret) { | 171 | if (ret) { |
| 156 | dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_Alrm); | 172 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); |
| 157 | goto fail_ai; | 173 | goto fail_ai; |
| 158 | } | 174 | } |
| 159 | sa1100_rtc->rtc->max_user_freq = RTC_FREQ; | 175 | rtc->max_user_freq = RTC_FREQ; |
| 160 | rtc_irq_set_freq(sa1100_rtc->rtc, NULL, RTC_FREQ); | 176 | rtc_irq_set_freq(rtc, NULL, RTC_FREQ); |
| 161 | 177 | ||
| 162 | return 0; | 178 | return 0; |
| 163 | 179 | ||
| 164 | fail_ai: | 180 | fail_ai: |
| 165 | free_irq(sa1100_rtc->irq_1Hz, dev); | 181 | free_irq(IRQ_RTC1Hz, dev); |
| 166 | fail_ui: | 182 | fail_ui: |
| 167 | return ret; | 183 | return ret; |
| 168 | } | 184 | } |
| 169 | 185 | ||
| 170 | static void sa1100_rtc_release(struct device *dev) | 186 | static void sa1100_rtc_release(struct device *dev) |
| 171 | { | 187 | { |
| 172 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 188 | spin_lock_irq(&sa1100_rtc_lock); |
| 173 | 189 | RTSR = 0; | |
| 174 | spin_lock_irq(&sa1100_rtc->lock); | 190 | spin_unlock_irq(&sa1100_rtc_lock); |
| 175 | rtc_writel(sa1100_rtc, RTSR, 0); | ||
| 176 | spin_unlock_irq(&sa1100_rtc->lock); | ||
| 177 | 191 | ||
| 178 | free_irq(sa1100_rtc->irq_Alrm, dev); | 192 | free_irq(IRQ_RTCAlrm, dev); |
| 179 | free_irq(sa1100_rtc->irq_1Hz, dev); | 193 | free_irq(IRQ_RTC1Hz, dev); |
| 180 | } | 194 | } |
| 181 | 195 | ||
| 182 | static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) | 196 | static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) |
| 183 | { | 197 | { |
| 184 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 198 | spin_lock_irq(&sa1100_rtc_lock); |
| 185 | unsigned int rtsr; | ||
| 186 | |||
| 187 | spin_lock_irq(&sa1100_rtc->lock); | ||
| 188 | |||
| 189 | rtsr = rtc_readl(sa1100_rtc, RTSR); | ||
| 190 | if (enabled) | 199 | if (enabled) |
| 191 | rtsr |= RTSR_ALE; | 200 | RTSR |= RTSR_ALE; |
| 192 | else | 201 | else |
| 193 | rtsr &= ~RTSR_ALE; | 202 | RTSR &= ~RTSR_ALE; |
| 194 | rtc_writel(sa1100_rtc, RTSR, rtsr); | 203 | spin_unlock_irq(&sa1100_rtc_lock); |
| 195 | |||
| 196 | spin_unlock_irq(&sa1100_rtc->lock); | ||
| 197 | return 0; | 204 | return 0; |
| 198 | } | 205 | } |
| 199 | 206 | ||
| 200 | static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm) | 207 | static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm) |
| 201 | { | 208 | { |
| 202 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 209 | rtc_time_to_tm(RCNR, tm); |
| 203 | |||
| 204 | rtc_time_to_tm(rtc_readl(sa1100_rtc, RCNR), tm); | ||
| 205 | return 0; | 210 | return 0; |
| 206 | } | 211 | } |
| 207 | 212 | ||
| 208 | static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm) | 213 | static int sa1100_rtc_set_time(struct device *dev, struct rtc_time *tm) |
| 209 | { | 214 | { |
| 210 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | ||
| 211 | unsigned long time; | 215 | unsigned long time; |
| 212 | int ret; | 216 | int ret; |
| 213 | 217 | ||
| 214 | ret = rtc_tm_to_time(tm, &time); | 218 | ret = rtc_tm_to_time(tm, &time); |
| 215 | if (ret == 0) | 219 | if (ret == 0) |
| 216 | rtc_writel(sa1100_rtc, RCNR, time); | 220 | RCNR = time; |
| 217 | return ret; | 221 | return ret; |
| 218 | } | 222 | } |
| 219 | 223 | ||
| 220 | static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | 224 | static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) |
| 221 | { | 225 | { |
| 222 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 226 | u32 rtsr; |
| 223 | unsigned long time; | ||
| 224 | unsigned int rtsr; | ||
| 225 | 227 | ||
| 226 | time = rtc_readl(sa1100_rtc, RCNR); | 228 | memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time)); |
| 227 | rtc_time_to_tm(time, &alrm->time); | 229 | rtsr = RTSR; |
| 228 | rtsr = rtc_readl(sa1100_rtc, RTSR); | ||
| 229 | alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0; | 230 | alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0; |
| 230 | alrm->pending = (rtsr & RTSR_AL) ? 1 : 0; | 231 | alrm->pending = (rtsr & RTSR_AL) ? 1 : 0; |
| 231 | return 0; | 232 | return 0; |
| @@ -233,39 +234,26 @@ static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 233 | 234 | ||
| 234 | static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) | 235 | static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) |
| 235 | { | 236 | { |
| 236 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 237 | int ret; |
| 237 | struct rtc_time now_tm, alarm_tm; | ||
| 238 | unsigned long time, alarm; | ||
| 239 | unsigned int rtsr; | ||
| 240 | |||
| 241 | spin_lock_irq(&sa1100_rtc->lock); | ||
| 242 | |||
| 243 | time = rtc_readl(sa1100_rtc, RCNR); | ||
| 244 | rtc_time_to_tm(time, &now_tm); | ||
| 245 | rtc_next_alarm_time(&alarm_tm, &now_tm, &alrm->time); | ||
| 246 | rtc_tm_to_time(&alarm_tm, &alarm); | ||
| 247 | rtc_writel(sa1100_rtc, RTAR, alarm); | ||
| 248 | |||
| 249 | rtsr = rtc_readl(sa1100_rtc, RTSR); | ||
| 250 | if (alrm->enabled) | ||
| 251 | rtsr |= RTSR_ALE; | ||
| 252 | else | ||
| 253 | rtsr &= ~RTSR_ALE; | ||
| 254 | rtc_writel(sa1100_rtc, RTSR, rtsr); | ||
| 255 | 238 | ||
| 256 | spin_unlock_irq(&sa1100_rtc->lock); | 239 | spin_lock_irq(&sa1100_rtc_lock); |
| 240 | ret = rtc_update_alarm(&alrm->time); | ||
| 241 | if (ret == 0) { | ||
| 242 | if (alrm->enabled) | ||
| 243 | RTSR |= RTSR_ALE; | ||
| 244 | else | ||
| 245 | RTSR &= ~RTSR_ALE; | ||
| 246 | } | ||
| 247 | spin_unlock_irq(&sa1100_rtc_lock); | ||
| 257 | 248 | ||
| 258 | return 0; | 249 | return ret; |
| 259 | } | 250 | } |
| 260 | 251 | ||
| 261 | static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq) | 252 | static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq) |
| 262 | { | 253 | { |
| 263 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | 254 | seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR); |
| 255 | seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR); | ||
| 264 | 256 | ||
| 265 | seq_printf(seq, "trim/divider\t\t: 0x%08x\n", | ||
| 266 | rtc_readl(sa1100_rtc, RTTR)); | ||
| 267 | seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", | ||
| 268 | rtc_readl(sa1100_rtc, RTSR)); | ||
| 269 | return 0; | 257 | return 0; |
| 270 | } | 258 | } |
| 271 | 259 | ||
| @@ -282,51 +270,7 @@ static const struct rtc_class_ops sa1100_rtc_ops = { | |||
| 282 | 270 | ||
| 283 | static int sa1100_rtc_probe(struct platform_device *pdev) | 271 | static int sa1100_rtc_probe(struct platform_device *pdev) |
| 284 | { | 272 | { |
| 285 | struct sa1100_rtc *sa1100_rtc; | 273 | struct rtc_device *rtc; |
| 286 | unsigned int rttr; | ||
| 287 | int ret; | ||
| 288 | |||
| 289 | sa1100_rtc = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL); | ||
| 290 | if (!sa1100_rtc) | ||
| 291 | return -ENOMEM; | ||
| 292 | |||
| 293 | spin_lock_init(&sa1100_rtc->lock); | ||
| 294 | platform_set_drvdata(pdev, sa1100_rtc); | ||
| 295 | |||
| 296 | ret = -ENXIO; | ||
| 297 | sa1100_rtc->ress = platform_get_resource(pdev, IORESOURCE_MEM, 0); | ||
| 298 | if (!sa1100_rtc->ress) { | ||
| 299 | dev_err(&pdev->dev, "No I/O memory resource defined\n"); | ||
| 300 | goto err_ress; | ||
| 301 | } | ||
| 302 | |||
| 303 | sa1100_rtc->irq_1Hz = platform_get_irq(pdev, 0); | ||
| 304 | if (sa1100_rtc->irq_1Hz < 0) { | ||
| 305 | dev_err(&pdev->dev, "No 1Hz IRQ resource defined\n"); | ||
| 306 | goto err_ress; | ||
| 307 | } | ||
| 308 | sa1100_rtc->irq_Alrm = platform_get_irq(pdev, 1); | ||
| 309 | if (sa1100_rtc->irq_Alrm < 0) { | ||
| 310 | dev_err(&pdev->dev, "No alarm IRQ resource defined\n"); | ||
| 311 | goto err_ress; | ||
| 312 | } | ||
| 313 | |||
| 314 | ret = -ENOMEM; | ||
| 315 | sa1100_rtc->base = ioremap(sa1100_rtc->ress->start, | ||
| 316 | resource_size(sa1100_rtc->ress)); | ||
| 317 | if (!sa1100_rtc->base) { | ||
| 318 | dev_err(&pdev->dev, "Unable to map pxa RTC I/O memory\n"); | ||
| 319 | goto err_map; | ||
| 320 | } | ||
| 321 | |||
| 322 | sa1100_rtc->clk = clk_get(&pdev->dev, NULL); | ||
| 323 | if (IS_ERR(sa1100_rtc->clk)) { | ||
| 324 | dev_err(&pdev->dev, "failed to find rtc clock source\n"); | ||
| 325 | ret = PTR_ERR(sa1100_rtc->clk); | ||
| 326 | goto err_clk; | ||
| 327 | } | ||
| 328 | clk_prepare(sa1100_rtc->clk); | ||
| 329 | clk_enable(sa1100_rtc->clk); | ||
| 330 | 274 | ||
| 331 | /* | 275 | /* |
| 332 | * According to the manual we should be able to let RTTR be zero | 276 | * According to the manual we should be able to let RTTR be zero |
| @@ -335,24 +279,24 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
| 335 | * If the clock divider is uninitialized then reset it to the | 279 | * If the clock divider is uninitialized then reset it to the |
| 336 | * default value to get the 1Hz clock. | 280 | * default value to get the 1Hz clock. |
| 337 | */ | 281 | */ |
| 338 | if (rtc_readl(sa1100_rtc, RTTR) == 0) { | 282 | if (RTTR == 0) { |
| 339 | rttr = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16); | 283 | RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16); |
| 340 | rtc_writel(sa1100_rtc, RTTR, rttr); | 284 | dev_warn(&pdev->dev, "warning: " |
| 341 | dev_warn(&pdev->dev, "warning: initializing default clock" | 285 | "initializing default clock divider/trim value\n"); |
| 342 | " divider/trim value\n"); | ||
| 343 | /* The current RTC value probably doesn't make sense either */ | 286 | /* The current RTC value probably doesn't make sense either */ |
| 344 | rtc_writel(sa1100_rtc, RCNR, 0); | 287 | RCNR = 0; |
| 345 | } | 288 | } |
| 346 | 289 | ||
| 347 | device_init_wakeup(&pdev->dev, 1); | 290 | device_init_wakeup(&pdev->dev, 1); |
| 348 | 291 | ||
| 349 | sa1100_rtc->rtc = rtc_device_register(pdev->name, &pdev->dev, | 292 | rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops, |
| 350 | &sa1100_rtc_ops, THIS_MODULE); | 293 | THIS_MODULE); |
| 351 | if (IS_ERR(sa1100_rtc->rtc)) { | 294 | |
| 352 | dev_err(&pdev->dev, "Failed to register RTC device -> %d\n", | 295 | if (IS_ERR(rtc)) |
| 353 | ret); | 296 | return PTR_ERR(rtc); |
| 354 | goto err_rtc_reg; | 297 | |
| 355 | } | 298 | platform_set_drvdata(pdev, rtc); |
| 299 | |||
| 356 | /* Fix for a nasty initialization problem the in SA11xx RTSR register. | 300 | /* Fix for a nasty initialization problem the in SA11xx RTSR register. |
| 357 | * See also the comments in sa1100_rtc_interrupt(). | 301 | * See also the comments in sa1100_rtc_interrupt(). |
| 358 | * | 302 | * |
| @@ -375,46 +319,33 @@ static int sa1100_rtc_probe(struct platform_device *pdev) | |||
| 375 | * | 319 | * |
| 376 | * Notice that clearing bit 1 and 0 is accomplished by writting ONES to | 320 | * Notice that clearing bit 1 and 0 is accomplished by writting ONES to |
| 377 | * the corresponding bits in RTSR. */ | 321 | * the corresponding bits in RTSR. */ |
| 378 | rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ)); | 322 | RTSR = RTSR_AL | RTSR_HZ; |
| 379 | 323 | ||
| 380 | return 0; | 324 | return 0; |
| 381 | |||
| 382 | err_rtc_reg: | ||
| 383 | err_clk: | ||
| 384 | iounmap(sa1100_rtc->base); | ||
| 385 | err_ress: | ||
| 386 | err_map: | ||
| 387 | kfree(sa1100_rtc); | ||
| 388 | return ret; | ||
| 389 | } | 325 | } |
| 390 | 326 | ||
| 391 | static int sa1100_rtc_remove(struct platform_device *pdev) | 327 | static int sa1100_rtc_remove(struct platform_device *pdev) |
| 392 | { | 328 | { |
| 393 | struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev); | 329 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
| 330 | |||
| 331 | if (rtc) | ||
| 332 | rtc_device_unregister(rtc); | ||
| 394 | 333 | ||
| 395 | rtc_device_unregister(sa1100_rtc->rtc); | ||
| 396 | clk_disable(sa1100_rtc->clk); | ||
| 397 | clk_unprepare(sa1100_rtc->clk); | ||
| 398 | iounmap(sa1100_rtc->base); | ||
| 399 | return 0; | 334 | return 0; |
| 400 | } | 335 | } |
| 401 | 336 | ||
| 402 | #ifdef CONFIG_PM | 337 | #ifdef CONFIG_PM |
| 403 | static int sa1100_rtc_suspend(struct device *dev) | 338 | static int sa1100_rtc_suspend(struct device *dev) |
| 404 | { | 339 | { |
| 405 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | ||
| 406 | |||
| 407 | if (device_may_wakeup(dev)) | 340 | if (device_may_wakeup(dev)) |
| 408 | enable_irq_wake(sa1100_rtc->irq_Alrm); | 341 | enable_irq_wake(IRQ_RTCAlrm); |
| 409 | return 0; | 342 | return 0; |
| 410 | } | 343 | } |
| 411 | 344 | ||
| 412 | static int sa1100_rtc_resume(struct device *dev) | 345 | static int sa1100_rtc_resume(struct device *dev) |
| 413 | { | 346 | { |
| 414 | struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev); | ||
| 415 | |||
| 416 | if (device_may_wakeup(dev)) | 347 | if (device_may_wakeup(dev)) |
| 417 | disable_irq_wake(sa1100_rtc->irq_Alrm); | 348 | disable_irq_wake(IRQ_RTCAlrm); |
| 418 | return 0; | 349 | return 0; |
| 419 | } | 350 | } |
| 420 | 351 | ||
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index eef27a197c00..110137e7ec81 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
| @@ -3261,6 +3261,12 @@ void dasd_generic_path_event(struct ccw_device *cdev, int *path_event) | |||
| 3261 | device->path_data.tbvpm |= eventlpm; | 3261 | device->path_data.tbvpm |= eventlpm; |
| 3262 | dasd_schedule_device_bh(device); | 3262 | dasd_schedule_device_bh(device); |
| 3263 | } | 3263 | } |
| 3264 | if (path_event[chp] & PE_PATHGROUP_ESTABLISHED) { | ||
| 3265 | DBF_DEV_EVENT(DBF_WARNING, device, "%s", | ||
| 3266 | "Pathgroup re-established\n"); | ||
| 3267 | if (device->discipline->kick_validate) | ||
| 3268 | device->discipline->kick_validate(device); | ||
| 3269 | } | ||
| 3264 | } | 3270 | } |
| 3265 | dasd_put_device(device); | 3271 | dasd_put_device(device); |
| 3266 | } | 3272 | } |
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c index 553b3c5abb0a..b3beed5434e4 100644 --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c | |||
| @@ -189,14 +189,12 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device) | |||
| 189 | unsigned long flags; | 189 | unsigned long flags; |
| 190 | struct alias_server *server, *newserver; | 190 | struct alias_server *server, *newserver; |
| 191 | struct alias_lcu *lcu, *newlcu; | 191 | struct alias_lcu *lcu, *newlcu; |
| 192 | int is_lcu_known; | ||
| 193 | struct dasd_uid uid; | 192 | struct dasd_uid uid; |
| 194 | 193 | ||
| 195 | private = (struct dasd_eckd_private *) device->private; | 194 | private = (struct dasd_eckd_private *) device->private; |
| 196 | 195 | ||
| 197 | device->discipline->get_uid(device, &uid); | 196 | device->discipline->get_uid(device, &uid); |
| 198 | spin_lock_irqsave(&aliastree.lock, flags); | 197 | spin_lock_irqsave(&aliastree.lock, flags); |
| 199 | is_lcu_known = 1; | ||
| 200 | server = _find_server(&uid); | 198 | server = _find_server(&uid); |
| 201 | if (!server) { | 199 | if (!server) { |
| 202 | spin_unlock_irqrestore(&aliastree.lock, flags); | 200 | spin_unlock_irqrestore(&aliastree.lock, flags); |
| @@ -208,7 +206,6 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device) | |||
| 208 | if (!server) { | 206 | if (!server) { |
| 209 | list_add(&newserver->server, &aliastree.serverlist); | 207 | list_add(&newserver->server, &aliastree.serverlist); |
| 210 | server = newserver; | 208 | server = newserver; |
| 211 | is_lcu_known = 0; | ||
| 212 | } else { | 209 | } else { |
| 213 | /* someone was faster */ | 210 | /* someone was faster */ |
| 214 | _free_server(newserver); | 211 | _free_server(newserver); |
| @@ -226,12 +223,10 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device) | |||
| 226 | if (!lcu) { | 223 | if (!lcu) { |
| 227 | list_add(&newlcu->lcu, &server->lculist); | 224 | list_add(&newlcu->lcu, &server->lculist); |
| 228 | lcu = newlcu; | 225 | lcu = newlcu; |
| 229 | is_lcu_known = 0; | ||
| 230 | } else { | 226 | } else { |
| 231 | /* someone was faster */ | 227 | /* someone was faster */ |
| 232 | _free_lcu(newlcu); | 228 | _free_lcu(newlcu); |
| 233 | } | 229 | } |
| 234 | is_lcu_known = 0; | ||
| 235 | } | 230 | } |
| 236 | spin_lock(&lcu->lock); | 231 | spin_lock(&lcu->lock); |
| 237 | list_add(&device->alias_list, &lcu->inactive_devices); | 232 | list_add(&device->alias_list, &lcu->inactive_devices); |
| @@ -239,64 +234,7 @@ int dasd_alias_make_device_known_to_lcu(struct dasd_device *device) | |||
| 239 | spin_unlock(&lcu->lock); | 234 | spin_unlock(&lcu->lock); |
| 240 | spin_unlock_irqrestore(&aliastree.lock, flags); | 235 | spin_unlock_irqrestore(&aliastree.lock, flags); |
| 241 | 236 | ||
| 242 | return is_lcu_known; | 237 | return 0; |
| 243 | } | ||
| 244 | |||
| 245 | /* | ||
| 246 | * The first device to be registered on an LCU will have to do | ||
| 247 | * some additional setup steps to configure that LCU on the | ||
| 248 | * storage server. All further devices should wait with their | ||
| 249 | * initialization until the first device is done. | ||
| 250 | * To synchronize this work, the first device will call | ||
| 251 | * dasd_alias_lcu_setup_complete when it is done, and all | ||
| 252 | * other devices will wait for it with dasd_alias_wait_for_lcu_setup. | ||
| 253 | */ | ||
| 254 | void dasd_alias_lcu_setup_complete(struct dasd_device *device) | ||
| 255 | { | ||
| 256 | unsigned long flags; | ||
| 257 | struct alias_server *server; | ||
| 258 | struct alias_lcu *lcu; | ||
| 259 | struct dasd_uid uid; | ||
| 260 | |||
| 261 | device->discipline->get_uid(device, &uid); | ||
| 262 | lcu = NULL; | ||
| 263 | spin_lock_irqsave(&aliastree.lock, flags); | ||
| 264 | server = _find_server(&uid); | ||
| 265 | if (server) | ||
| 266 | lcu = _find_lcu(server, &uid); | ||
| 267 | spin_unlock_irqrestore(&aliastree.lock, flags); | ||
| 268 | if (!lcu) { | ||
| 269 | DBF_EVENT_DEVID(DBF_ERR, device->cdev, | ||
| 270 | "could not find lcu for %04x %02x", | ||
| 271 | uid.ssid, uid.real_unit_addr); | ||
| 272 | WARN_ON(1); | ||
| 273 | return; | ||
| 274 | } | ||
| 275 | complete_all(&lcu->lcu_setup); | ||
| 276 | } | ||
| 277 | |||
| 278 | void dasd_alias_wait_for_lcu_setup(struct dasd_device *device) | ||
| 279 | { | ||
| 280 | unsigned long flags; | ||
| 281 | struct alias_server *server; | ||
| 282 | struct alias_lcu *lcu; | ||
| 283 | struct dasd_uid uid; | ||
| 284 | |||
| 285 | device->discipline->get_uid(device, &uid); | ||
| 286 | lcu = NULL; | ||
| 287 | spin_lock_irqsave(&aliastree.lock, flags); | ||
| 288 | server = _find_server(&uid); | ||
| 289 | if (server) | ||
| 290 | lcu = _find_lcu(server, &uid); | ||
| 291 | spin_unlock_irqrestore(&aliastree.lock, flags); | ||
| 292 | if (!lcu) { | ||
| 293 | DBF_EVENT_DEVID(DBF_ERR, device->cdev, | ||
| 294 | "could not find lcu for %04x %02x", | ||
| 295 | uid.ssid, uid.real_unit_addr); | ||
| 296 | WARN_ON(1); | ||
| 297 | return; | ||
| 298 | } | ||
| 299 | wait_for_completion(&lcu->lcu_setup); | ||
| 300 | } | 238 | } |
| 301 | 239 | ||
| 302 | /* | 240 | /* |
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index bbcd5e9206ee..70880be26015 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
| @@ -1534,6 +1534,10 @@ static void dasd_eckd_validate_server(struct dasd_device *device) | |||
| 1534 | struct dasd_eckd_private *private; | 1534 | struct dasd_eckd_private *private; |
| 1535 | int enable_pav; | 1535 | int enable_pav; |
| 1536 | 1536 | ||
| 1537 | private = (struct dasd_eckd_private *) device->private; | ||
| 1538 | if (private->uid.type == UA_BASE_PAV_ALIAS || | ||
| 1539 | private->uid.type == UA_HYPER_PAV_ALIAS) | ||
| 1540 | return; | ||
| 1537 | if (dasd_nopav || MACHINE_IS_VM) | 1541 | if (dasd_nopav || MACHINE_IS_VM) |
| 1538 | enable_pav = 0; | 1542 | enable_pav = 0; |
| 1539 | else | 1543 | else |
| @@ -1542,11 +1546,28 @@ static void dasd_eckd_validate_server(struct dasd_device *device) | |||
| 1542 | 1546 | ||
| 1543 | /* may be requested feature is not available on server, | 1547 | /* may be requested feature is not available on server, |
| 1544 | * therefore just report error and go ahead */ | 1548 | * therefore just report error and go ahead */ |
| 1545 | private = (struct dasd_eckd_private *) device->private; | ||
| 1546 | DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x " | 1549 | DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "PSF-SSC for SSID %04x " |
| 1547 | "returned rc=%d", private->uid.ssid, rc); | 1550 | "returned rc=%d", private->uid.ssid, rc); |
| 1548 | } | 1551 | } |
| 1549 | 1552 | ||
| 1553 | /* | ||
| 1554 | * worker to do a validate server in case of a lost pathgroup | ||
| 1555 | */ | ||
| 1556 | static void dasd_eckd_do_validate_server(struct work_struct *work) | ||
| 1557 | { | ||
| 1558 | struct dasd_device *device = container_of(work, struct dasd_device, | ||
| 1559 | kick_validate); | ||
| 1560 | dasd_eckd_validate_server(device); | ||
| 1561 | dasd_put_device(device); | ||
| 1562 | } | ||
| 1563 | |||
| 1564 | static void dasd_eckd_kick_validate_server(struct dasd_device *device) | ||
| 1565 | { | ||
| 1566 | dasd_get_device(device); | ||
| 1567 | /* queue call to do_validate_server to the kernel event daemon. */ | ||
| 1568 | schedule_work(&device->kick_validate); | ||
| 1569 | } | ||
| 1570 | |||
| 1550 | static u32 get_fcx_max_data(struct dasd_device *device) | 1571 | static u32 get_fcx_max_data(struct dasd_device *device) |
| 1551 | { | 1572 | { |
| 1552 | #if defined(CONFIG_64BIT) | 1573 | #if defined(CONFIG_64BIT) |
| @@ -1588,10 +1609,13 @@ dasd_eckd_check_characteristics(struct dasd_device *device) | |||
| 1588 | struct dasd_eckd_private *private; | 1609 | struct dasd_eckd_private *private; |
| 1589 | struct dasd_block *block; | 1610 | struct dasd_block *block; |
| 1590 | struct dasd_uid temp_uid; | 1611 | struct dasd_uid temp_uid; |
| 1591 | int is_known, rc, i; | 1612 | int rc, i; |
| 1592 | int readonly; | 1613 | int readonly; |
| 1593 | unsigned long value; | 1614 | unsigned long value; |
| 1594 | 1615 | ||
| 1616 | /* setup work queue for validate server*/ | ||
| 1617 | INIT_WORK(&device->kick_validate, dasd_eckd_do_validate_server); | ||
| 1618 | |||
| 1595 | if (!ccw_device_is_pathgroup(device->cdev)) { | 1619 | if (!ccw_device_is_pathgroup(device->cdev)) { |
| 1596 | dev_warn(&device->cdev->dev, | 1620 | dev_warn(&device->cdev->dev, |
| 1597 | "A channel path group could not be established\n"); | 1621 | "A channel path group could not be established\n"); |
| @@ -1651,22 +1675,12 @@ dasd_eckd_check_characteristics(struct dasd_device *device) | |||
| 1651 | block->base = device; | 1675 | block->base = device; |
| 1652 | } | 1676 | } |
| 1653 | 1677 | ||
| 1654 | /* register lcu with alias handling, enable PAV if this is a new lcu */ | 1678 | /* register lcu with alias handling, enable PAV */ |
| 1655 | is_known = dasd_alias_make_device_known_to_lcu(device); | 1679 | rc = dasd_alias_make_device_known_to_lcu(device); |
| 1656 | if (is_known < 0) { | 1680 | if (rc) |
| 1657 | rc = is_known; | ||
| 1658 | goto out_err2; | 1681 | goto out_err2; |
| 1659 | } | 1682 | |
| 1660 | /* | 1683 | dasd_eckd_validate_server(device); |
| 1661 | * dasd_eckd_validate_server is done on the first device that | ||
| 1662 | * is found for an LCU. All later other devices have to wait | ||
| 1663 | * for it, so they will read the correct feature codes. | ||
| 1664 | */ | ||
| 1665 | if (!is_known) { | ||
| 1666 | dasd_eckd_validate_server(device); | ||
| 1667 | dasd_alias_lcu_setup_complete(device); | ||
| 1668 | } else | ||
| 1669 | dasd_alias_wait_for_lcu_setup(device); | ||
| 1670 | 1684 | ||
| 1671 | /* device may report different configuration data after LCU setup */ | 1685 | /* device may report different configuration data after LCU setup */ |
| 1672 | rc = dasd_eckd_read_conf(device); | 1686 | rc = dasd_eckd_read_conf(device); |
| @@ -4098,7 +4112,7 @@ static int dasd_eckd_restore_device(struct dasd_device *device) | |||
| 4098 | { | 4112 | { |
| 4099 | struct dasd_eckd_private *private; | 4113 | struct dasd_eckd_private *private; |
| 4100 | struct dasd_eckd_characteristics temp_rdc_data; | 4114 | struct dasd_eckd_characteristics temp_rdc_data; |
| 4101 | int is_known, rc; | 4115 | int rc; |
| 4102 | struct dasd_uid temp_uid; | 4116 | struct dasd_uid temp_uid; |
| 4103 | unsigned long flags; | 4117 | unsigned long flags; |
| 4104 | 4118 | ||
| @@ -4121,14 +4135,10 @@ static int dasd_eckd_restore_device(struct dasd_device *device) | |||
| 4121 | goto out_err; | 4135 | goto out_err; |
| 4122 | 4136 | ||
| 4123 | /* register lcu with alias handling, enable PAV if this is a new lcu */ | 4137 | /* register lcu with alias handling, enable PAV if this is a new lcu */ |
| 4124 | is_known = dasd_alias_make_device_known_to_lcu(device); | 4138 | rc = dasd_alias_make_device_known_to_lcu(device); |
| 4125 | if (is_known < 0) | 4139 | if (rc) |
| 4126 | return is_known; | 4140 | return rc; |
| 4127 | if (!is_known) { | 4141 | dasd_eckd_validate_server(device); |
| 4128 | dasd_eckd_validate_server(device); | ||
| 4129 | dasd_alias_lcu_setup_complete(device); | ||
| 4130 | } else | ||
| 4131 | dasd_alias_wait_for_lcu_setup(device); | ||
| 4132 | 4142 | ||
| 4133 | /* RE-Read Configuration Data */ | 4143 | /* RE-Read Configuration Data */ |
| 4134 | rc = dasd_eckd_read_conf(device); | 4144 | rc = dasd_eckd_read_conf(device); |
| @@ -4270,6 +4280,7 @@ static struct dasd_discipline dasd_eckd_discipline = { | |||
| 4270 | .restore = dasd_eckd_restore_device, | 4280 | .restore = dasd_eckd_restore_device, |
| 4271 | .reload = dasd_eckd_reload_device, | 4281 | .reload = dasd_eckd_reload_device, |
| 4272 | .get_uid = dasd_eckd_get_uid, | 4282 | .get_uid = dasd_eckd_get_uid, |
| 4283 | .kick_validate = dasd_eckd_kick_validate_server, | ||
| 4273 | }; | 4284 | }; |
| 4274 | 4285 | ||
| 4275 | static int __init | 4286 | static int __init |
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index afe8c33422ed..33a6743ddc55 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h | |||
| @@ -355,6 +355,7 @@ struct dasd_discipline { | |||
| 355 | int (*reload) (struct dasd_device *); | 355 | int (*reload) (struct dasd_device *); |
| 356 | 356 | ||
| 357 | int (*get_uid) (struct dasd_device *, struct dasd_uid *); | 357 | int (*get_uid) (struct dasd_device *, struct dasd_uid *); |
| 358 | void (*kick_validate) (struct dasd_device *); | ||
| 358 | }; | 359 | }; |
| 359 | 360 | ||
| 360 | extern struct dasd_discipline *dasd_diag_discipline_pointer; | 361 | extern struct dasd_discipline *dasd_diag_discipline_pointer; |
| @@ -455,6 +456,7 @@ struct dasd_device { | |||
| 455 | struct work_struct kick_work; | 456 | struct work_struct kick_work; |
| 456 | struct work_struct restore_device; | 457 | struct work_struct restore_device; |
| 457 | struct work_struct reload_device; | 458 | struct work_struct reload_device; |
| 459 | struct work_struct kick_validate; | ||
| 458 | struct timer_list timer; | 460 | struct timer_list timer; |
| 459 | 461 | ||
| 460 | debug_info_t *debug_area; | 462 | debug_info_t *debug_area; |
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c index 70e006b50f29..5443e25086e9 100644 --- a/drivers/staging/media/go7007/go7007-usb.c +++ b/drivers/staging/media/go7007/go7007-usb.c | |||
| @@ -1279,3 +1279,4 @@ static struct usb_driver go7007_usb_driver = { | |||
| 1279 | }; | 1279 | }; |
| 1280 | 1280 | ||
| 1281 | module_usb_driver(go7007_usb_driver); | 1281 | module_usb_driver(go7007_usb_driver); |
| 1282 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250/8250.c index 9f50c4e3c2be..9f50c4e3c2be 100644 --- a/drivers/tty/serial/8250.c +++ b/drivers/tty/serial/8250/8250.c | |||
diff --git a/drivers/tty/serial/8250.h b/drivers/tty/serial/8250/8250.h index ae027be57e25..ae027be57e25 100644 --- a/drivers/tty/serial/8250.h +++ b/drivers/tty/serial/8250/8250.h | |||
diff --git a/drivers/tty/serial/8250_accent.c b/drivers/tty/serial/8250/8250_accent.c index 34b51c651192..34b51c651192 100644 --- a/drivers/tty/serial/8250_accent.c +++ b/drivers/tty/serial/8250/8250_accent.c | |||
diff --git a/drivers/tty/serial/8250_acorn.c b/drivers/tty/serial/8250/8250_acorn.c index b0ce8c56f1a4..b0ce8c56f1a4 100644 --- a/drivers/tty/serial/8250_acorn.c +++ b/drivers/tty/serial/8250/8250_acorn.c | |||
diff --git a/drivers/tty/serial/8250_boca.c b/drivers/tty/serial/8250/8250_boca.c index d125dc107985..d125dc107985 100644 --- a/drivers/tty/serial/8250_boca.c +++ b/drivers/tty/serial/8250/8250_boca.c | |||
diff --git a/drivers/tty/serial/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index f574eef3075f..f574eef3075f 100644 --- a/drivers/tty/serial/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c | |||
diff --git a/drivers/tty/serial/8250_early.c b/drivers/tty/serial/8250/8250_early.c index eaafb98debed..eaafb98debed 100644 --- a/drivers/tty/serial/8250_early.c +++ b/drivers/tty/serial/8250/8250_early.c | |||
diff --git a/drivers/tty/serial/8250_exar_st16c554.c b/drivers/tty/serial/8250/8250_exar_st16c554.c index bf53aabf9b5e..bf53aabf9b5e 100644 --- a/drivers/tty/serial/8250_exar_st16c554.c +++ b/drivers/tty/serial/8250/8250_exar_st16c554.c | |||
diff --git a/drivers/tty/serial/8250_fourport.c b/drivers/tty/serial/8250/8250_fourport.c index be1582609626..be1582609626 100644 --- a/drivers/tty/serial/8250_fourport.c +++ b/drivers/tty/serial/8250/8250_fourport.c | |||
diff --git a/drivers/tty/serial/8250_fsl.c b/drivers/tty/serial/8250/8250_fsl.c index f4d3c47b88e8..f4d3c47b88e8 100644 --- a/drivers/tty/serial/8250_fsl.c +++ b/drivers/tty/serial/8250/8250_fsl.c | |||
diff --git a/drivers/tty/serial/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c index d8c0ffbfa6e3..d8c0ffbfa6e3 100644 --- a/drivers/tty/serial/8250_gsc.c +++ b/drivers/tty/serial/8250/8250_gsc.c | |||
diff --git a/drivers/tty/serial/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c index c13438c93012..c13438c93012 100644 --- a/drivers/tty/serial/8250_hp300.c +++ b/drivers/tty/serial/8250/8250_hp300.c | |||
diff --git a/drivers/tty/serial/8250_hub6.c b/drivers/tty/serial/8250/8250_hub6.c index a5c778e83de0..a5c778e83de0 100644 --- a/drivers/tty/serial/8250_hub6.c +++ b/drivers/tty/serial/8250/8250_hub6.c | |||
diff --git a/drivers/tty/serial/8250_mca.c b/drivers/tty/serial/8250/8250_mca.c index d20abf04541e..d20abf04541e 100644 --- a/drivers/tty/serial/8250_mca.c +++ b/drivers/tty/serial/8250/8250_mca.c | |||
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index da2b0b0a183f..da2b0b0a183f 100644 --- a/drivers/tty/serial/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c | |||
diff --git a/drivers/tty/serial/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c index a2f236510ff1..a2f236510ff1 100644 --- a/drivers/tty/serial/8250_pnp.c +++ b/drivers/tty/serial/8250/8250_pnp.c | |||
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig new file mode 100644 index 000000000000..591f8018e7dd --- /dev/null +++ b/drivers/tty/serial/8250/Kconfig | |||
| @@ -0,0 +1,280 @@ | |||
| 1 | # | ||
| 2 | # The 8250/16550 serial drivers. You shouldn't be in this list unless | ||
| 3 | # you somehow have an implicit or explicit dependency on SERIAL_8250. | ||
| 4 | # | ||
| 5 | |||
| 6 | config SERIAL_8250 | ||
| 7 | tristate "8250/16550 and compatible serial support" | ||
| 8 | select SERIAL_CORE | ||
| 9 | ---help--- | ||
| 10 | This selects whether you want to include the driver for the standard | ||
| 11 | serial ports. The standard answer is Y. People who might say N | ||
| 12 | here are those that are setting up dedicated Ethernet WWW/FTP | ||
| 13 | servers, or users that have one of the various bus mice instead of a | ||
| 14 | serial mouse and don't intend to use their machine's standard serial | ||
| 15 | port for anything. (Note that the Cyclades and Stallion multi | ||
| 16 | serial port drivers do not need this driver built in for them to | ||
| 17 | work.) | ||
| 18 | |||
| 19 | To compile this driver as a module, choose M here: the | ||
| 20 | module will be called 8250. | ||
| 21 | [WARNING: Do not compile this driver as a module if you are using | ||
| 22 | non-standard serial ports, since the configuration information will | ||
| 23 | be lost when the driver is unloaded. This limitation may be lifted | ||
| 24 | in the future.] | ||
| 25 | |||
| 26 | BTW1: If you have a mouseman serial mouse which is not recognized by | ||
| 27 | the X window system, try running gpm first. | ||
| 28 | |||
| 29 | BTW2: If you intend to use a software modem (also called Winmodem) | ||
| 30 | under Linux, forget it. These modems are crippled and require | ||
| 31 | proprietary drivers which are only available under Windows. | ||
| 32 | |||
| 33 | Most people will say Y or M here, so that they can use serial mice, | ||
| 34 | modems and similar devices connecting to the standard serial ports. | ||
| 35 | |||
| 36 | config SERIAL_8250_CONSOLE | ||
| 37 | bool "Console on 8250/16550 and compatible serial port" | ||
| 38 | depends on SERIAL_8250=y | ||
| 39 | select SERIAL_CORE_CONSOLE | ||
| 40 | ---help--- | ||
| 41 | If you say Y here, it will be possible to use a serial port as the | ||
| 42 | system console (the system console is the device which receives all | ||
| 43 | kernel messages and warnings and which allows logins in single user | ||
| 44 | mode). This could be useful if some terminal or printer is connected | ||
| 45 | to that serial port. | ||
| 46 | |||
| 47 | Even if you say Y here, the currently visible virtual console | ||
| 48 | (/dev/tty0) will still be used as the system console by default, but | ||
| 49 | you can alter that using a kernel command line option such as | ||
| 50 | "console=ttyS1". (Try "man bootparam" or see the documentation of | ||
| 51 | your boot loader (grub or lilo or loadlin) about how to pass options | ||
| 52 | to the kernel at boot time.) | ||
| 53 | |||
| 54 | If you don't have a VGA card installed and you say Y here, the | ||
| 55 | kernel will automatically use the first serial line, /dev/ttyS0, as | ||
| 56 | system console. | ||
| 57 | |||
| 58 | You can set that using a kernel command line option such as | ||
| 59 | "console=uart8250,io,0x3f8,9600n8" | ||
| 60 | "console=uart8250,mmio,0xff5e0000,115200n8". | ||
| 61 | and it will switch to normal serial console when the corresponding | ||
| 62 | port is ready. | ||
| 63 | "earlycon=uart8250,io,0x3f8,9600n8" | ||
| 64 | "earlycon=uart8250,mmio,0xff5e0000,115200n8". | ||
| 65 | it will not only setup early console. | ||
| 66 | |||
| 67 | If unsure, say N. | ||
| 68 | |||
| 69 | config FIX_EARLYCON_MEM | ||
| 70 | bool | ||
| 71 | depends on X86 | ||
| 72 | default y | ||
| 73 | |||
| 74 | config SERIAL_8250_GSC | ||
| 75 | tristate | ||
| 76 | depends on SERIAL_8250 && GSC | ||
| 77 | default SERIAL_8250 | ||
| 78 | |||
| 79 | config SERIAL_8250_PCI | ||
| 80 | tristate "8250/16550 PCI device support" if EXPERT | ||
| 81 | depends on SERIAL_8250 && PCI | ||
| 82 | default SERIAL_8250 | ||
| 83 | help | ||
| 84 | This builds standard PCI serial support. You may be able to | ||
| 85 | disable this feature if you only need legacy serial support. | ||
| 86 | Saves about 9K. | ||
| 87 | |||
| 88 | config SERIAL_8250_PNP | ||
| 89 | tristate "8250/16550 PNP device support" if EXPERT | ||
| 90 | depends on SERIAL_8250 && PNP | ||
| 91 | default SERIAL_8250 | ||
| 92 | help | ||
| 93 | This builds standard PNP serial support. You may be able to | ||
| 94 | disable this feature if you only need legacy serial support. | ||
| 95 | |||
| 96 | config SERIAL_8250_HP300 | ||
| 97 | tristate | ||
| 98 | depends on SERIAL_8250 && HP300 | ||
| 99 | default SERIAL_8250 | ||
| 100 | |||
| 101 | config SERIAL_8250_CS | ||
| 102 | tristate "8250/16550 PCMCIA device support" | ||
| 103 | depends on PCMCIA && SERIAL_8250 | ||
| 104 | ---help--- | ||
| 105 | Say Y here to enable support for 16-bit PCMCIA serial devices, | ||
| 106 | including serial port cards, modems, and the modem functions of | ||
| 107 | multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are | ||
| 108 | credit-card size devices often used with laptops.) | ||
| 109 | |||
| 110 | To compile this driver as a module, choose M here: the | ||
| 111 | module will be called serial_cs. | ||
| 112 | |||
| 113 | If unsure, say N. | ||
| 114 | |||
| 115 | config SERIAL_8250_NR_UARTS | ||
| 116 | int "Maximum number of 8250/16550 serial ports" | ||
| 117 | depends on SERIAL_8250 | ||
| 118 | default "4" | ||
| 119 | help | ||
| 120 | Set this to the number of serial ports you want the driver | ||
| 121 | to support. This includes any ports discovered via ACPI or | ||
| 122 | PCI enumeration and any ports that may be added at run-time | ||
| 123 | via hot-plug, or any ISA multi-port serial cards. | ||
| 124 | |||
| 125 | config SERIAL_8250_RUNTIME_UARTS | ||
| 126 | int "Number of 8250/16550 serial ports to register at runtime" | ||
| 127 | depends on SERIAL_8250 | ||
| 128 | range 0 SERIAL_8250_NR_UARTS | ||
| 129 | default "4" | ||
| 130 | help | ||
| 131 | Set this to the maximum number of serial ports you want | ||
| 132 | the kernel to register at boot time. This can be overridden | ||
| 133 | with the module parameter "nr_uarts", or boot-time parameter | ||
| 134 | 8250.nr_uarts | ||
| 135 | |||
| 136 | config SERIAL_8250_EXTENDED | ||
| 137 | bool "Extended 8250/16550 serial driver options" | ||
| 138 | depends on SERIAL_8250 | ||
| 139 | help | ||
| 140 | If you wish to use any non-standard features of the standard "dumb" | ||
| 141 | driver, say Y here. This includes HUB6 support, shared serial | ||
| 142 | interrupts, special multiport support, support for more than the | ||
| 143 | four COM 1/2/3/4 boards, etc. | ||
| 144 | |||
| 145 | Note that the answer to this question won't directly affect the | ||
| 146 | kernel: saying N will just cause the configurator to skip all | ||
| 147 | the questions about serial driver options. If unsure, say N. | ||
| 148 | |||
| 149 | config SERIAL_8250_MANY_PORTS | ||
| 150 | bool "Support more than 4 legacy serial ports" | ||
| 151 | depends on SERIAL_8250_EXTENDED && !IA64 | ||
| 152 | help | ||
| 153 | Say Y here if you have dumb serial boards other than the four | ||
| 154 | standard COM 1/2/3/4 ports. This may happen if you have an AST | ||
| 155 | FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available | ||
| 156 | from <http://www.tldp.org/docs.html#howto>), or other custom | ||
| 157 | serial port hardware which acts similar to standard serial port | ||
| 158 | hardware. If you only use the standard COM 1/2/3/4 ports, you can | ||
| 159 | say N here to save some memory. You can also say Y if you have an | ||
| 160 | "intelligent" multiport card such as Cyclades, Digiboards, etc. | ||
| 161 | |||
| 162 | # | ||
| 163 | # Multi-port serial cards | ||
| 164 | # | ||
| 165 | |||
| 166 | config SERIAL_8250_FOURPORT | ||
| 167 | tristate "Support Fourport cards" | ||
| 168 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 169 | help | ||
| 170 | Say Y here if you have an AST FourPort serial board. | ||
| 171 | |||
| 172 | To compile this driver as a module, choose M here: the module | ||
| 173 | will be called 8250_fourport. | ||
| 174 | |||
| 175 | config SERIAL_8250_ACCENT | ||
| 176 | tristate "Support Accent cards" | ||
| 177 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 178 | help | ||
| 179 | Say Y here if you have an Accent Async serial board. | ||
| 180 | |||
| 181 | To compile this driver as a module, choose M here: the module | ||
| 182 | will be called 8250_accent. | ||
| 183 | |||
| 184 | config SERIAL_8250_BOCA | ||
| 185 | tristate "Support Boca cards" | ||
| 186 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 187 | help | ||
| 188 | Say Y here if you have a Boca serial board. Please read the Boca | ||
| 189 | mini-HOWTO, available from <http://www.tldp.org/docs.html#howto> | ||
| 190 | |||
| 191 | To compile this driver as a module, choose M here: the module | ||
| 192 | will be called 8250_boca. | ||
| 193 | |||
| 194 | config SERIAL_8250_EXAR_ST16C554 | ||
| 195 | tristate "Support Exar ST16C554/554D Quad UART" | ||
| 196 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 197 | help | ||
| 198 | The Uplogix Envoy TU301 uses this Exar Quad UART. If you are | ||
| 199 | tinkering with your Envoy TU301, or have a machine with this UART, | ||
| 200 | say Y here. | ||
| 201 | |||
| 202 | To compile this driver as a module, choose M here: the module | ||
| 203 | will be called 8250_exar_st16c554. | ||
| 204 | |||
| 205 | config SERIAL_8250_HUB6 | ||
| 206 | tristate "Support Hub6 cards" | ||
| 207 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 208 | help | ||
| 209 | Say Y here if you have a HUB6 serial board. | ||
| 210 | |||
| 211 | To compile this driver as a module, choose M here: the module | ||
| 212 | will be called 8250_hub6. | ||
| 213 | |||
| 214 | # | ||
| 215 | # Misc. options/drivers. | ||
| 216 | # | ||
| 217 | |||
| 218 | config SERIAL_8250_SHARE_IRQ | ||
| 219 | bool "Support for sharing serial interrupts" | ||
| 220 | depends on SERIAL_8250_EXTENDED | ||
| 221 | help | ||
| 222 | Some serial boards have hardware support which allows multiple dumb | ||
| 223 | serial ports on the same board to share a single IRQ. To enable | ||
| 224 | support for this in the serial driver, say Y here. | ||
| 225 | |||
| 226 | config SERIAL_8250_DETECT_IRQ | ||
| 227 | bool "Autodetect IRQ on standard ports (unsafe)" | ||
| 228 | depends on SERIAL_8250_EXTENDED | ||
| 229 | help | ||
| 230 | Say Y here if you want the kernel to try to guess which IRQ | ||
| 231 | to use for your serial port. | ||
| 232 | |||
| 233 | This is considered unsafe; it is far better to configure the IRQ in | ||
| 234 | a boot script using the setserial command. | ||
| 235 | |||
| 236 | If unsure, say N. | ||
| 237 | |||
| 238 | config SERIAL_8250_RSA | ||
| 239 | bool "Support RSA serial ports" | ||
| 240 | depends on SERIAL_8250_EXTENDED | ||
| 241 | help | ||
| 242 | ::: To be written ::: | ||
| 243 | |||
| 244 | config SERIAL_8250_MCA | ||
| 245 | tristate "Support 8250-type ports on MCA buses" | ||
| 246 | depends on SERIAL_8250 != n && MCA | ||
| 247 | help | ||
| 248 | Say Y here if you have a MCA serial ports. | ||
| 249 | |||
| 250 | To compile this driver as a module, choose M here: the module | ||
| 251 | will be called 8250_mca. | ||
| 252 | |||
| 253 | config SERIAL_8250_ACORN | ||
| 254 | tristate "Acorn expansion card serial port support" | ||
| 255 | depends on ARCH_ACORN && SERIAL_8250 | ||
| 256 | help | ||
| 257 | If you have an Atomwide Serial card or Serial Port card for an Acorn | ||
| 258 | system, say Y to this option. The driver can handle 1, 2, or 3 port | ||
| 259 | cards. If unsure, say N. | ||
| 260 | |||
| 261 | config SERIAL_8250_RM9K | ||
| 262 | bool "Support for MIPS RM9xxx integrated serial port" | ||
| 263 | depends on SERIAL_8250 != n && SERIAL_RM9000 | ||
| 264 | select SERIAL_8250_SHARE_IRQ | ||
| 265 | help | ||
| 266 | Selecting this option will add support for the integrated serial | ||
| 267 | port hardware found on MIPS RM9122 and similar processors. | ||
| 268 | If unsure, say N. | ||
| 269 | |||
| 270 | config SERIAL_8250_FSL | ||
| 271 | bool | ||
| 272 | depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550 | ||
| 273 | default PPC | ||
| 274 | |||
| 275 | config SERIAL_8250_DW | ||
| 276 | tristate "Support for Synopsys DesignWare 8250 quirks" | ||
| 277 | depends on SERIAL_8250 && OF | ||
| 278 | help | ||
| 279 | Selecting this option will enable handling of the extra features | ||
| 280 | present in the Synopsys DesignWare APB UART. | ||
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile new file mode 100644 index 000000000000..867bba738908 --- /dev/null +++ b/drivers/tty/serial/8250/Makefile | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the 8250 serial device drivers. | ||
| 3 | # | ||
| 4 | |||
| 5 | obj-$(CONFIG_SERIAL_8250) += 8250.o | ||
| 6 | obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o | ||
| 7 | obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o | ||
| 8 | obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o | ||
| 9 | obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o | ||
| 10 | obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o | ||
| 11 | obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o | ||
| 12 | obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o | ||
| 13 | obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o | ||
| 14 | obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o | ||
| 15 | obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o | ||
| 16 | obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o | ||
| 17 | obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o | ||
| 18 | obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o | ||
| 19 | obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o | ||
| 20 | obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o | ||
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/8250/m32r_sio.c index 94a6792bf97b..94a6792bf97b 100644 --- a/drivers/tty/serial/m32r_sio.c +++ b/drivers/tty/serial/8250/m32r_sio.c | |||
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/8250/m32r_sio.h index e9b7e11793b1..e9b7e11793b1 100644 --- a/drivers/tty/serial/m32r_sio.h +++ b/drivers/tty/serial/8250/m32r_sio.h | |||
diff --git a/drivers/tty/serial/m32r_sio_reg.h b/drivers/tty/serial/8250/m32r_sio_reg.h index 4671473793e3..4671473793e3 100644 --- a/drivers/tty/serial/m32r_sio_reg.h +++ b/drivers/tty/serial/8250/m32r_sio_reg.h | |||
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c index 86090605a84e..86090605a84e 100644 --- a/drivers/tty/serial/serial_cs.c +++ b/drivers/tty/serial/8250/serial_cs.c | |||
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index aca2386c5ef1..2de99248dfae 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -5,279 +5,7 @@ | |||
| 5 | menu "Serial drivers" | 5 | menu "Serial drivers" |
| 6 | depends on HAS_IOMEM | 6 | depends on HAS_IOMEM |
| 7 | 7 | ||
| 8 | # | 8 | source "drivers/tty/serial/8250/Kconfig" |
| 9 | # The new 8250/16550 serial drivers | ||
| 10 | config SERIAL_8250 | ||
| 11 | tristate "8250/16550 and compatible serial support" | ||
| 12 | select SERIAL_CORE | ||
| 13 | ---help--- | ||
| 14 | This selects whether you want to include the driver for the standard | ||
| 15 | serial ports. The standard answer is Y. People who might say N | ||
| 16 | here are those that are setting up dedicated Ethernet WWW/FTP | ||
| 17 | servers, or users that have one of the various bus mice instead of a | ||
| 18 | serial mouse and don't intend to use their machine's standard serial | ||
| 19 | port for anything. (Note that the Cyclades and Stallion multi | ||
| 20 | serial port drivers do not need this driver built in for them to | ||
| 21 | work.) | ||
| 22 | |||
| 23 | To compile this driver as a module, choose M here: the | ||
| 24 | module will be called 8250. | ||
| 25 | [WARNING: Do not compile this driver as a module if you are using | ||
| 26 | non-standard serial ports, since the configuration information will | ||
| 27 | be lost when the driver is unloaded. This limitation may be lifted | ||
| 28 | in the future.] | ||
| 29 | |||
| 30 | BTW1: If you have a mouseman serial mouse which is not recognized by | ||
| 31 | the X window system, try running gpm first. | ||
| 32 | |||
| 33 | BTW2: If you intend to use a software modem (also called Winmodem) | ||
| 34 | under Linux, forget it. These modems are crippled and require | ||
| 35 | proprietary drivers which are only available under Windows. | ||
| 36 | |||
| 37 | Most people will say Y or M here, so that they can use serial mice, | ||
| 38 | modems and similar devices connecting to the standard serial ports. | ||
| 39 | |||
| 40 | config SERIAL_8250_CONSOLE | ||
| 41 | bool "Console on 8250/16550 and compatible serial port" | ||
| 42 | depends on SERIAL_8250=y | ||
| 43 | select SERIAL_CORE_CONSOLE | ||
| 44 | ---help--- | ||
| 45 | If you say Y here, it will be possible to use a serial port as the | ||
| 46 | system console (the system console is the device which receives all | ||
| 47 | kernel messages and warnings and which allows logins in single user | ||
| 48 | mode). This could be useful if some terminal or printer is connected | ||
| 49 | to that serial port. | ||
| 50 | |||
| 51 | Even if you say Y here, the currently visible virtual console | ||
| 52 | (/dev/tty0) will still be used as the system console by default, but | ||
| 53 | you can alter that using a kernel command line option such as | ||
| 54 | "console=ttyS1". (Try "man bootparam" or see the documentation of | ||
| 55 | your boot loader (grub or lilo or loadlin) about how to pass options | ||
| 56 | to the kernel at boot time.) | ||
| 57 | |||
| 58 | If you don't have a VGA card installed and you say Y here, the | ||
| 59 | kernel will automatically use the first serial line, /dev/ttyS0, as | ||
| 60 | system console. | ||
| 61 | |||
| 62 | You can set that using a kernel command line option such as | ||
| 63 | "console=uart8250,io,0x3f8,9600n8" | ||
| 64 | "console=uart8250,mmio,0xff5e0000,115200n8". | ||
| 65 | and it will switch to normal serial console when the corresponding | ||
| 66 | port is ready. | ||
| 67 | "earlycon=uart8250,io,0x3f8,9600n8" | ||
| 68 | "earlycon=uart8250,mmio,0xff5e0000,115200n8". | ||
| 69 | it will not only setup early console. | ||
| 70 | |||
| 71 | If unsure, say N. | ||
| 72 | |||
| 73 | config FIX_EARLYCON_MEM | ||
| 74 | bool | ||
| 75 | depends on X86 | ||
| 76 | default y | ||
| 77 | |||
| 78 | config SERIAL_8250_GSC | ||
| 79 | tristate | ||
| 80 | depends on SERIAL_8250 && GSC | ||
| 81 | default SERIAL_8250 | ||
| 82 | |||
| 83 | config SERIAL_8250_PCI | ||
| 84 | tristate "8250/16550 PCI device support" if EXPERT | ||
| 85 | depends on SERIAL_8250 && PCI | ||
| 86 | default SERIAL_8250 | ||
| 87 | help | ||
| 88 | This builds standard PCI serial support. You may be able to | ||
| 89 | disable this feature if you only need legacy serial support. | ||
| 90 | Saves about 9K. | ||
| 91 | |||
| 92 | config SERIAL_8250_PNP | ||
| 93 | tristate "8250/16550 PNP device support" if EXPERT | ||
| 94 | depends on SERIAL_8250 && PNP | ||
| 95 | default SERIAL_8250 | ||
| 96 | help | ||
| 97 | This builds standard PNP serial support. You may be able to | ||
| 98 | disable this feature if you only need legacy serial support. | ||
| 99 | |||
| 100 | config SERIAL_8250_FSL | ||
| 101 | bool | ||
| 102 | depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550 | ||
| 103 | default PPC | ||
| 104 | |||
| 105 | config SERIAL_8250_HP300 | ||
| 106 | tristate | ||
| 107 | depends on SERIAL_8250 && HP300 | ||
| 108 | default SERIAL_8250 | ||
| 109 | |||
| 110 | config SERIAL_8250_CS | ||
| 111 | tristate "8250/16550 PCMCIA device support" | ||
| 112 | depends on PCMCIA && SERIAL_8250 | ||
| 113 | ---help--- | ||
| 114 | Say Y here to enable support for 16-bit PCMCIA serial devices, | ||
| 115 | including serial port cards, modems, and the modem functions of | ||
| 116 | multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are | ||
| 117 | credit-card size devices often used with laptops.) | ||
| 118 | |||
| 119 | To compile this driver as a module, choose M here: the | ||
| 120 | module will be called serial_cs. | ||
| 121 | |||
| 122 | If unsure, say N. | ||
| 123 | |||
| 124 | config SERIAL_8250_NR_UARTS | ||
| 125 | int "Maximum number of 8250/16550 serial ports" | ||
| 126 | depends on SERIAL_8250 | ||
| 127 | default "4" | ||
| 128 | help | ||
| 129 | Set this to the number of serial ports you want the driver | ||
| 130 | to support. This includes any ports discovered via ACPI or | ||
| 131 | PCI enumeration and any ports that may be added at run-time | ||
| 132 | via hot-plug, or any ISA multi-port serial cards. | ||
| 133 | |||
| 134 | config SERIAL_8250_RUNTIME_UARTS | ||
| 135 | int "Number of 8250/16550 serial ports to register at runtime" | ||
| 136 | depends on SERIAL_8250 | ||
| 137 | range 0 SERIAL_8250_NR_UARTS | ||
| 138 | default "4" | ||
| 139 | help | ||
| 140 | Set this to the maximum number of serial ports you want | ||
| 141 | the kernel to register at boot time. This can be overridden | ||
| 142 | with the module parameter "nr_uarts", or boot-time parameter | ||
| 143 | 8250.nr_uarts | ||
| 144 | |||
| 145 | config SERIAL_8250_EXTENDED | ||
| 146 | bool "Extended 8250/16550 serial driver options" | ||
| 147 | depends on SERIAL_8250 | ||
| 148 | help | ||
| 149 | If you wish to use any non-standard features of the standard "dumb" | ||
| 150 | driver, say Y here. This includes HUB6 support, shared serial | ||
| 151 | interrupts, special multiport support, support for more than the | ||
| 152 | four COM 1/2/3/4 boards, etc. | ||
| 153 | |||
| 154 | Note that the answer to this question won't directly affect the | ||
| 155 | kernel: saying N will just cause the configurator to skip all | ||
| 156 | the questions about serial driver options. If unsure, say N. | ||
| 157 | |||
| 158 | config SERIAL_8250_MANY_PORTS | ||
| 159 | bool "Support more than 4 legacy serial ports" | ||
| 160 | depends on SERIAL_8250_EXTENDED && !IA64 | ||
| 161 | help | ||
| 162 | Say Y here if you have dumb serial boards other than the four | ||
| 163 | standard COM 1/2/3/4 ports. This may happen if you have an AST | ||
| 164 | FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available | ||
| 165 | from <http://www.tldp.org/docs.html#howto>), or other custom | ||
| 166 | serial port hardware which acts similar to standard serial port | ||
| 167 | hardware. If you only use the standard COM 1/2/3/4 ports, you can | ||
| 168 | say N here to save some memory. You can also say Y if you have an | ||
| 169 | "intelligent" multiport card such as Cyclades, Digiboards, etc. | ||
| 170 | |||
| 171 | # | ||
| 172 | # Multi-port serial cards | ||
| 173 | # | ||
| 174 | |||
| 175 | config SERIAL_8250_FOURPORT | ||
| 176 | tristate "Support Fourport cards" | ||
| 177 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 178 | help | ||
| 179 | Say Y here if you have an AST FourPort serial board. | ||
| 180 | |||
| 181 | To compile this driver as a module, choose M here: the module | ||
| 182 | will be called 8250_fourport. | ||
| 183 | |||
| 184 | config SERIAL_8250_ACCENT | ||
| 185 | tristate "Support Accent cards" | ||
| 186 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 187 | help | ||
| 188 | Say Y here if you have an Accent Async serial board. | ||
| 189 | |||
| 190 | To compile this driver as a module, choose M here: the module | ||
| 191 | will be called 8250_accent. | ||
| 192 | |||
| 193 | config SERIAL_8250_BOCA | ||
| 194 | tristate "Support Boca cards" | ||
| 195 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 196 | help | ||
| 197 | Say Y here if you have a Boca serial board. Please read the Boca | ||
| 198 | mini-HOWTO, available from <http://www.tldp.org/docs.html#howto> | ||
| 199 | |||
| 200 | To compile this driver as a module, choose M here: the module | ||
| 201 | will be called 8250_boca. | ||
| 202 | |||
| 203 | config SERIAL_8250_EXAR_ST16C554 | ||
| 204 | tristate "Support Exar ST16C554/554D Quad UART" | ||
| 205 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 206 | help | ||
| 207 | The Uplogix Envoy TU301 uses this Exar Quad UART. If you are | ||
| 208 | tinkering with your Envoy TU301, or have a machine with this UART, | ||
| 209 | say Y here. | ||
| 210 | |||
| 211 | To compile this driver as a module, choose M here: the module | ||
| 212 | will be called 8250_exar_st16c554. | ||
| 213 | |||
| 214 | config SERIAL_8250_HUB6 | ||
| 215 | tristate "Support Hub6 cards" | ||
| 216 | depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS | ||
| 217 | help | ||
| 218 | Say Y here if you have a HUB6 serial board. | ||
| 219 | |||
| 220 | To compile this driver as a module, choose M here: the module | ||
| 221 | will be called 8250_hub6. | ||
| 222 | |||
| 223 | config SERIAL_8250_SHARE_IRQ | ||
| 224 | bool "Support for sharing serial interrupts" | ||
| 225 | depends on SERIAL_8250_EXTENDED | ||
| 226 | help | ||
| 227 | Some serial boards have hardware support which allows multiple dumb | ||
| 228 | serial ports on the same board to share a single IRQ. To enable | ||
| 229 | support for this in the serial driver, say Y here. | ||
| 230 | |||
| 231 | config SERIAL_8250_DETECT_IRQ | ||
| 232 | bool "Autodetect IRQ on standard ports (unsafe)" | ||
| 233 | depends on SERIAL_8250_EXTENDED | ||
| 234 | help | ||
| 235 | Say Y here if you want the kernel to try to guess which IRQ | ||
| 236 | to use for your serial port. | ||
| 237 | |||
| 238 | This is considered unsafe; it is far better to configure the IRQ in | ||
| 239 | a boot script using the setserial command. | ||
| 240 | |||
| 241 | If unsure, say N. | ||
| 242 | |||
| 243 | config SERIAL_8250_RSA | ||
| 244 | bool "Support RSA serial ports" | ||
| 245 | depends on SERIAL_8250_EXTENDED | ||
| 246 | help | ||
| 247 | ::: To be written ::: | ||
| 248 | |||
| 249 | config SERIAL_8250_MCA | ||
| 250 | tristate "Support 8250-type ports on MCA buses" | ||
| 251 | depends on SERIAL_8250 != n && MCA | ||
| 252 | help | ||
| 253 | Say Y here if you have a MCA serial ports. | ||
| 254 | |||
| 255 | To compile this driver as a module, choose M here: the module | ||
| 256 | will be called 8250_mca. | ||
| 257 | |||
| 258 | config SERIAL_8250_ACORN | ||
| 259 | tristate "Acorn expansion card serial port support" | ||
| 260 | depends on ARCH_ACORN && SERIAL_8250 | ||
| 261 | help | ||
| 262 | If you have an Atomwide Serial card or Serial Port card for an Acorn | ||
| 263 | system, say Y to this option. The driver can handle 1, 2, or 3 port | ||
| 264 | cards. If unsure, say N. | ||
| 265 | |||
| 266 | config SERIAL_8250_RM9K | ||
| 267 | bool "Support for MIPS RM9xxx integrated serial port" | ||
| 268 | depends on SERIAL_8250 != n && SERIAL_RM9000 | ||
| 269 | select SERIAL_8250_SHARE_IRQ | ||
| 270 | help | ||
| 271 | Selecting this option will add support for the integrated serial | ||
| 272 | port hardware found on MIPS RM9122 and similar processors. | ||
| 273 | If unsure, say N. | ||
| 274 | |||
| 275 | config SERIAL_8250_DW | ||
| 276 | tristate "Support for Synopsys DesignWare 8250 quirks" | ||
| 277 | depends on SERIAL_8250 && OF | ||
| 278 | help | ||
| 279 | Selecting this option will enable handling of the extra features | ||
| 280 | present in the Synopsys DesignWare APB UART. | ||
| 281 | 9 | ||
| 282 | comment "Non-8250 serial port support" | 10 | comment "Non-8250 serial port support" |
| 283 | 11 | ||
| @@ -536,15 +264,6 @@ config SERIAL_MAX3107 | |||
| 536 | help | 264 | help |
| 537 | MAX3107 chip support | 265 | MAX3107 chip support |
| 538 | 266 | ||
| 539 | config SERIAL_MAX3107_AAVA | ||
| 540 | tristate "MAX3107 AAVA platform support" | ||
| 541 | depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB | ||
| 542 | select SERIAL_CORE | ||
| 543 | help | ||
| 544 | Support for the MAX3107 chip configuration found on the AAVA | ||
| 545 | platform. Includes the extra initialisation and GPIO support | ||
| 546 | neded for this device. | ||
| 547 | |||
| 548 | config SERIAL_DZ | 267 | config SERIAL_DZ |
| 549 | bool "DECstation DZ serial driver" | 268 | bool "DECstation DZ serial driver" |
| 550 | depends on MACH_DECSTATION && 32BIT | 269 | depends on MACH_DECSTATION && 32BIT |
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index f5b01f2ce525..fef32e10c851 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile | |||
| @@ -14,22 +14,9 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o | |||
| 14 | obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o | 14 | obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o |
| 15 | obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o | 15 | obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o |
| 16 | 16 | ||
| 17 | obj-$(CONFIG_SERIAL_8250) += 8250.o | 17 | # Now bring in any enabled 8250/16450/16550 type drivers. |
| 18 | obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o | 18 | obj-$(CONFIG_SERIAL_8250) += 8250/ |
| 19 | obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o | 19 | |
| 20 | obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o | ||
| 21 | obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o | ||
| 22 | obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o | ||
| 23 | obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o | ||
| 24 | obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o | ||
| 25 | obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o | ||
| 26 | obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o | ||
| 27 | obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o | ||
| 28 | obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o | ||
| 29 | obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o | ||
| 30 | obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o | ||
| 31 | obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o | ||
| 32 | obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o | ||
| 33 | obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o | 20 | obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o |
| 34 | obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o | 21 | obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o |
| 35 | obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o | 22 | obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o |
| @@ -42,7 +29,6 @@ obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o | |||
| 42 | obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o | 29 | obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o |
| 43 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o | 30 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o |
| 44 | obj-$(CONFIG_SERIAL_MAX3107) += max3107.o | 31 | obj-$(CONFIG_SERIAL_MAX3107) += max3107.o |
| 45 | obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o | ||
| 46 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o | 32 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o |
| 47 | obj-$(CONFIG_SERIAL_MUX) += mux.o | 33 | obj-$(CONFIG_SERIAL_MUX) += mux.o |
| 48 | obj-$(CONFIG_SERIAL_68328) += 68328serial.o | 34 | obj-$(CONFIG_SERIAL_68328) += 68328serial.o |
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 9ae024025ff3..6800f5f26241 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c | |||
| @@ -159,6 +159,7 @@ struct uart_amba_port { | |||
| 159 | unsigned int fifosize; /* vendor-specific */ | 159 | unsigned int fifosize; /* vendor-specific */ |
| 160 | unsigned int lcrh_tx; /* vendor-specific */ | 160 | unsigned int lcrh_tx; /* vendor-specific */ |
| 161 | unsigned int lcrh_rx; /* vendor-specific */ | 161 | unsigned int lcrh_rx; /* vendor-specific */ |
| 162 | unsigned int old_cr; /* state during shutdown */ | ||
| 162 | bool autorts; | 163 | bool autorts; |
| 163 | char type[12]; | 164 | char type[12]; |
| 164 | bool interrupt_may_hang; /* vendor-specific */ | 165 | bool interrupt_may_hang; /* vendor-specific */ |
| @@ -1411,7 +1412,9 @@ static int pl011_startup(struct uart_port *port) | |||
| 1411 | while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY) | 1412 | while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY) |
| 1412 | barrier(); | 1413 | barrier(); |
| 1413 | 1414 | ||
| 1414 | cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE; | 1415 | /* restore RTS and DTR */ |
| 1416 | cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR); | ||
| 1417 | cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE; | ||
| 1415 | writew(cr, uap->port.membase + UART011_CR); | 1418 | writew(cr, uap->port.membase + UART011_CR); |
| 1416 | 1419 | ||
| 1417 | /* Clear pending error interrupts */ | 1420 | /* Clear pending error interrupts */ |
| @@ -1469,6 +1472,7 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap, | |||
| 1469 | static void pl011_shutdown(struct uart_port *port) | 1472 | static void pl011_shutdown(struct uart_port *port) |
| 1470 | { | 1473 | { |
| 1471 | struct uart_amba_port *uap = (struct uart_amba_port *)port; | 1474 | struct uart_amba_port *uap = (struct uart_amba_port *)port; |
| 1475 | unsigned int cr; | ||
| 1472 | 1476 | ||
| 1473 | /* | 1477 | /* |
| 1474 | * disable all interrupts | 1478 | * disable all interrupts |
| @@ -1488,9 +1492,16 @@ static void pl011_shutdown(struct uart_port *port) | |||
| 1488 | 1492 | ||
| 1489 | /* | 1493 | /* |
| 1490 | * disable the port | 1494 | * disable the port |
| 1495 | * disable the port. It should not disable RTS and DTR. | ||
| 1496 | * Also RTS and DTR state should be preserved to restore | ||
| 1497 | * it during startup(). | ||
| 1491 | */ | 1498 | */ |
| 1492 | uap->autorts = false; | 1499 | uap->autorts = false; |
| 1493 | writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR); | 1500 | cr = readw(uap->port.membase + UART011_CR); |
| 1501 | uap->old_cr = cr; | ||
| 1502 | cr &= UART011_CR_RTS | UART011_CR_DTR; | ||
| 1503 | cr |= UART01x_CR_UARTEN | UART011_CR_TXE; | ||
| 1504 | writew(cr, uap->port.membase + UART011_CR); | ||
| 1494 | 1505 | ||
| 1495 | /* | 1506 | /* |
| 1496 | * disable break condition and fifos | 1507 | * disable break condition and fifos |
| @@ -1740,9 +1751,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) | |||
| 1740 | { | 1751 | { |
| 1741 | struct uart_amba_port *uap = amba_ports[co->index]; | 1752 | struct uart_amba_port *uap = amba_ports[co->index]; |
| 1742 | unsigned int status, old_cr, new_cr; | 1753 | unsigned int status, old_cr, new_cr; |
| 1754 | unsigned long flags; | ||
| 1755 | int locked = 1; | ||
| 1743 | 1756 | ||
| 1744 | clk_enable(uap->clk); | 1757 | clk_enable(uap->clk); |
| 1745 | 1758 | ||
| 1759 | local_irq_save(flags); | ||
| 1760 | if (uap->port.sysrq) | ||
| 1761 | locked = 0; | ||
| 1762 | else if (oops_in_progress) | ||
| 1763 | locked = spin_trylock(&uap->port.lock); | ||
| 1764 | else | ||
| 1765 | spin_lock(&uap->port.lock); | ||
| 1766 | |||
| 1746 | /* | 1767 | /* |
| 1747 | * First save the CR then disable the interrupts | 1768 | * First save the CR then disable the interrupts |
| 1748 | */ | 1769 | */ |
| @@ -1762,6 +1783,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) | |||
| 1762 | } while (status & UART01x_FR_BUSY); | 1783 | } while (status & UART01x_FR_BUSY); |
| 1763 | writew(old_cr, uap->port.membase + UART011_CR); | 1784 | writew(old_cr, uap->port.membase + UART011_CR); |
| 1764 | 1785 | ||
| 1786 | if (locked) | ||
| 1787 | spin_unlock(&uap->port.lock); | ||
| 1788 | local_irq_restore(flags); | ||
| 1789 | |||
| 1765 | clk_disable(uap->clk); | 1790 | clk_disable(uap->clk); |
| 1766 | } | 1791 | } |
| 1767 | 1792 | ||
| @@ -1905,6 +1930,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) | |||
| 1905 | uap->vendor = vendor; | 1930 | uap->vendor = vendor; |
| 1906 | uap->lcrh_rx = vendor->lcrh_rx; | 1931 | uap->lcrh_rx = vendor->lcrh_rx; |
| 1907 | uap->lcrh_tx = vendor->lcrh_tx; | 1932 | uap->lcrh_tx = vendor->lcrh_tx; |
| 1933 | uap->old_cr = 0; | ||
| 1908 | uap->fifosize = vendor->fifosize; | 1934 | uap->fifosize = vendor->fifosize; |
| 1909 | uap->interrupt_may_hang = vendor->interrupt_may_hang; | 1935 | uap->interrupt_may_hang = vendor->interrupt_may_hang; |
| 1910 | uap->port.dev = &dev->dev; | 1936 | uap->port.dev = &dev->dev; |
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c index 7c867a046c97..7545fe1b9925 100644 --- a/drivers/tty/serial/jsm/jsm_driver.c +++ b/drivers/tty/serial/jsm/jsm_driver.c | |||
| @@ -251,6 +251,7 @@ static void jsm_io_resume(struct pci_dev *pdev) | |||
| 251 | struct jsm_board *brd = pci_get_drvdata(pdev); | 251 | struct jsm_board *brd = pci_get_drvdata(pdev); |
| 252 | 252 | ||
| 253 | pci_restore_state(pdev); | 253 | pci_restore_state(pdev); |
| 254 | pci_save_state(pdev); | ||
| 254 | 255 | ||
| 255 | jsm_uart_port_init(brd); | 256 | jsm_uart_port_init(brd); |
| 256 | } | 257 | } |
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c deleted file mode 100644 index aae772a71de6..000000000000 --- a/drivers/tty/serial/max3107-aava.c +++ /dev/null | |||
| @@ -1,344 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * max3107.c - spi uart protocol driver for Maxim 3107 | ||
| 3 | * Based on max3100.c | ||
| 4 | * by Christian Pellegrin <chripell@evolware.org> | ||
| 5 | * and max3110.c | ||
| 6 | * by Feng Tang <feng.tang@intel.com> | ||
| 7 | * | ||
| 8 | * Copyright (C) Aavamobile 2009 | ||
| 9 | * | ||
| 10 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 11 | * | ||
| 12 | * This program is free software; you can redistribute it and/or modify | ||
| 13 | * it under the terms of the GNU General Public License as published by | ||
| 14 | * the Free Software Foundation; either version 2 of the License, or | ||
| 15 | * (at your option) any later version. | ||
| 16 | * | ||
| 17 | * This program is distributed in the hope that it will be useful, | ||
| 18 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 19 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 20 | * GNU General Public License for more details. | ||
| 21 | * | ||
| 22 | * You should have received a copy of the GNU General Public License | ||
| 23 | * along with this program; if not, write to the Free Software | ||
| 24 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 25 | * | ||
| 26 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 27 | * | ||
| 28 | */ | ||
| 29 | |||
| 30 | #include <linux/delay.h> | ||
| 31 | #include <linux/device.h> | ||
| 32 | #include <linux/serial_core.h> | ||
| 33 | #include <linux/serial.h> | ||
| 34 | #include <linux/spi/spi.h> | ||
| 35 | #include <linux/freezer.h> | ||
| 36 | #include <linux/platform_device.h> | ||
| 37 | #include <linux/gpio.h> | ||
| 38 | #include <linux/sfi.h> | ||
| 39 | #include <linux/module.h> | ||
| 40 | #include <asm/mrst.h> | ||
| 41 | #include "max3107.h" | ||
| 42 | |||
| 43 | /* GPIO direction to input function */ | ||
| 44 | static int max3107_gpio_direction_in(struct gpio_chip *chip, unsigned offset) | ||
| 45 | { | ||
| 46 | struct max3107_port *s = container_of(chip, struct max3107_port, chip); | ||
| 47 | u16 buf[1]; /* Buffer for SPI transfer */ | ||
| 48 | |||
| 49 | if (offset >= MAX3107_GPIO_COUNT) { | ||
| 50 | dev_err(&s->spi->dev, "Invalid GPIO\n"); | ||
| 51 | return -EINVAL; | ||
| 52 | } | ||
| 53 | |||
| 54 | /* Read current GPIO configuration register */ | ||
| 55 | buf[0] = MAX3107_GPIOCFG_REG; | ||
| 56 | /* Perform SPI transfer */ | ||
| 57 | if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) { | ||
| 58 | dev_err(&s->spi->dev, "SPI transfer GPIO read failed\n"); | ||
| 59 | return -EIO; | ||
| 60 | } | ||
| 61 | buf[0] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 62 | |||
| 63 | /* Set GPIO to input */ | ||
| 64 | buf[0] &= ~(0x0001 << offset); | ||
| 65 | |||
| 66 | /* Write new GPIO configuration register value */ | ||
| 67 | buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG); | ||
| 68 | /* Perform SPI transfer */ | ||
| 69 | if (max3107_rw(s, (u8 *)buf, NULL, 2)) { | ||
| 70 | dev_err(&s->spi->dev, "SPI transfer GPIO write failed\n"); | ||
| 71 | return -EIO; | ||
| 72 | } | ||
| 73 | return 0; | ||
| 74 | } | ||
| 75 | |||
| 76 | /* GPIO direction to output function */ | ||
| 77 | static int max3107_gpio_direction_out(struct gpio_chip *chip, unsigned offset, | ||
| 78 | int value) | ||
| 79 | { | ||
| 80 | struct max3107_port *s = container_of(chip, struct max3107_port, chip); | ||
| 81 | u16 buf[2]; /* Buffer for SPI transfers */ | ||
| 82 | |||
| 83 | if (offset >= MAX3107_GPIO_COUNT) { | ||
| 84 | dev_err(&s->spi->dev, "Invalid GPIO\n"); | ||
| 85 | return -EINVAL; | ||
| 86 | } | ||
| 87 | |||
| 88 | /* Read current GPIO configuration and data registers */ | ||
| 89 | buf[0] = MAX3107_GPIOCFG_REG; | ||
| 90 | buf[1] = MAX3107_GPIODATA_REG; | ||
| 91 | /* Perform SPI transfer */ | ||
| 92 | if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) { | ||
| 93 | dev_err(&s->spi->dev, "SPI transfer gpio failed\n"); | ||
| 94 | return -EIO; | ||
| 95 | } | ||
| 96 | buf[0] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 97 | buf[1] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 98 | |||
| 99 | /* Set GPIO to output */ | ||
| 100 | buf[0] |= (0x0001 << offset); | ||
| 101 | /* Set value */ | ||
| 102 | if (value) | ||
| 103 | buf[1] |= (0x0001 << offset); | ||
| 104 | else | ||
| 105 | buf[1] &= ~(0x0001 << offset); | ||
| 106 | |||
| 107 | /* Write new GPIO configuration and data register values */ | ||
| 108 | buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG); | ||
| 109 | buf[1] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG); | ||
| 110 | /* Perform SPI transfer */ | ||
| 111 | if (max3107_rw(s, (u8 *)buf, NULL, 4)) { | ||
| 112 | dev_err(&s->spi->dev, | ||
| 113 | "SPI transfer for GPIO conf data w failed\n"); | ||
| 114 | return -EIO; | ||
| 115 | } | ||
| 116 | return 0; | ||
| 117 | } | ||
| 118 | |||
| 119 | /* GPIO value query function */ | ||
| 120 | static int max3107_gpio_get(struct gpio_chip *chip, unsigned offset) | ||
| 121 | { | ||
| 122 | struct max3107_port *s = container_of(chip, struct max3107_port, chip); | ||
| 123 | u16 buf[1]; /* Buffer for SPI transfer */ | ||
| 124 | |||
| 125 | if (offset >= MAX3107_GPIO_COUNT) { | ||
| 126 | dev_err(&s->spi->dev, "Invalid GPIO\n"); | ||
| 127 | return -EINVAL; | ||
| 128 | } | ||
| 129 | |||
| 130 | /* Read current GPIO data register */ | ||
| 131 | buf[0] = MAX3107_GPIODATA_REG; | ||
| 132 | /* Perform SPI transfer */ | ||
| 133 | if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) { | ||
| 134 | dev_err(&s->spi->dev, "SPI transfer GPIO data r failed\n"); | ||
| 135 | return -EIO; | ||
| 136 | } | ||
| 137 | buf[0] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 138 | |||
| 139 | /* Return value */ | ||
| 140 | return buf[0] & (0x0001 << offset); | ||
| 141 | } | ||
| 142 | |||
| 143 | /* GPIO value set function */ | ||
| 144 | static void max3107_gpio_set(struct gpio_chip *chip, unsigned offset, int value) | ||
| 145 | { | ||
| 146 | struct max3107_port *s = container_of(chip, struct max3107_port, chip); | ||
| 147 | u16 buf[2]; /* Buffer for SPI transfers */ | ||
| 148 | |||
| 149 | if (offset >= MAX3107_GPIO_COUNT) { | ||
| 150 | dev_err(&s->spi->dev, "Invalid GPIO\n"); | ||
| 151 | return; | ||
| 152 | } | ||
| 153 | |||
| 154 | /* Read current GPIO configuration registers*/ | ||
| 155 | buf[0] = MAX3107_GPIODATA_REG; | ||
| 156 | buf[1] = MAX3107_GPIOCFG_REG; | ||
| 157 | /* Perform SPI transfer */ | ||
| 158 | if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) { | ||
| 159 | dev_err(&s->spi->dev, | ||
| 160 | "SPI transfer for GPIO data and config read failed\n"); | ||
| 161 | return; | ||
| 162 | } | ||
| 163 | buf[0] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 164 | buf[1] &= MAX3107_SPI_RX_DATA_MASK; | ||
| 165 | |||
| 166 | if (!(buf[1] & (0x0001 << offset))) { | ||
| 167 | /* Configured as input, can't set value */ | ||
| 168 | dev_warn(&s->spi->dev, | ||
| 169 | "Trying to set value for input GPIO\n"); | ||
| 170 | return; | ||
| 171 | } | ||
| 172 | |||
| 173 | /* Set value */ | ||
| 174 | if (value) | ||
| 175 | buf[0] |= (0x0001 << offset); | ||
| 176 | else | ||
| 177 | buf[0] &= ~(0x0001 << offset); | ||
| 178 | |||
| 179 | /* Write new GPIO data register value */ | ||
| 180 | buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG); | ||
| 181 | /* Perform SPI transfer */ | ||
| 182 | if (max3107_rw(s, (u8 *)buf, NULL, 2)) | ||
| 183 | dev_err(&s->spi->dev, "SPI transfer GPIO data w failed\n"); | ||
| 184 | } | ||
| 185 | |||
| 186 | /* GPIO chip data */ | ||
| 187 | static struct gpio_chip max3107_gpio_chip = { | ||
| 188 | .owner = THIS_MODULE, | ||
| 189 | .direction_input = max3107_gpio_direction_in, | ||
| 190 | .direction_output = max3107_gpio_direction_out, | ||
| 191 | .get = max3107_gpio_get, | ||
| 192 | .set = max3107_gpio_set, | ||
| 193 | .can_sleep = 1, | ||
| 194 | .base = MAX3107_GPIO_BASE, | ||
| 195 | .ngpio = MAX3107_GPIO_COUNT, | ||
| 196 | }; | ||
| 197 | |||
| 198 | /** | ||
| 199 | * max3107_aava_reset - reset on AAVA systems | ||
| 200 | * @spi: The SPI device we are probing | ||
| 201 | * | ||
| 202 | * Reset the device ready for probing. | ||
| 203 | */ | ||
| 204 | |||
| 205 | static int max3107_aava_reset(struct spi_device *spi) | ||
| 206 | { | ||
| 207 | /* Reset the chip */ | ||
| 208 | if (gpio_request(MAX3107_RESET_GPIO, "max3107")) { | ||
| 209 | pr_err("Requesting RESET GPIO failed\n"); | ||
| 210 | return -EIO; | ||
| 211 | } | ||
| 212 | if (gpio_direction_output(MAX3107_RESET_GPIO, 0)) { | ||
| 213 | pr_err("Setting RESET GPIO to 0 failed\n"); | ||
| 214 | gpio_free(MAX3107_RESET_GPIO); | ||
| 215 | return -EIO; | ||
| 216 | } | ||
| 217 | msleep(MAX3107_RESET_DELAY); | ||
| 218 | if (gpio_direction_output(MAX3107_RESET_GPIO, 1)) { | ||
| 219 | pr_err("Setting RESET GPIO to 1 failed\n"); | ||
| 220 | gpio_free(MAX3107_RESET_GPIO); | ||
| 221 | return -EIO; | ||
| 222 | } | ||
| 223 | gpio_free(MAX3107_RESET_GPIO); | ||
| 224 | msleep(MAX3107_WAKEUP_DELAY); | ||
| 225 | return 0; | ||
| 226 | } | ||
| 227 | |||
| 228 | static int max3107_aava_configure(struct max3107_port *s) | ||
| 229 | { | ||
| 230 | int retval; | ||
| 231 | |||
| 232 | /* Initialize GPIO chip data */ | ||
| 233 | s->chip = max3107_gpio_chip; | ||
| 234 | s->chip.label = s->spi->modalias; | ||
| 235 | s->chip.dev = &s->spi->dev; | ||
| 236 | |||
| 237 | /* Add GPIO chip */ | ||
| 238 | retval = gpiochip_add(&s->chip); | ||
| 239 | if (retval) { | ||
| 240 | dev_err(&s->spi->dev, "Adding GPIO chip failed\n"); | ||
| 241 | return retval; | ||
| 242 | } | ||
| 243 | |||
| 244 | /* Temporary fix for EV2 boot problems, set modem reset to 0 */ | ||
| 245 | max3107_gpio_direction_out(&s->chip, 3, 0); | ||
| 246 | return 0; | ||
| 247 | } | ||
| 248 | |||
| 249 | #if 0 | ||
| 250 | /* This will get enabled once we have the board stuff merged for this | ||
| 251 | specific case */ | ||
| 252 | |||
| 253 | static const struct baud_table brg13_ext[] = { | ||
| 254 | { 300, MAX3107_BRG13_B300 }, | ||
| 255 | { 600, MAX3107_BRG13_B600 }, | ||
| 256 | { 1200, MAX3107_BRG13_B1200 }, | ||
| 257 | { 2400, MAX3107_BRG13_B2400 }, | ||
| 258 | { 4800, MAX3107_BRG13_B4800 }, | ||
| 259 | { 9600, MAX3107_BRG13_B9600 }, | ||
| 260 | { 19200, MAX3107_BRG13_B19200 }, | ||
| 261 | { 57600, MAX3107_BRG13_B57600 }, | ||
| 262 | { 115200, MAX3107_BRG13_B115200 }, | ||
| 263 | { 230400, MAX3107_BRG13_B230400 }, | ||
| 264 | { 460800, MAX3107_BRG13_B460800 }, | ||
| 265 | { 921600, MAX3107_BRG13_B921600 }, | ||
| 266 | { 0, 0 } | ||
| 267 | }; | ||
| 268 | |||
| 269 | static void max3107_aava_init(struct max3107_port *s) | ||
| 270 | { | ||
| 271 | /*override for AAVA SC specific*/ | ||
| 272 | if (mrst_platform_id() == MRST_PLATFORM_AAVA_SC) { | ||
| 273 | if (get_koski_build_id() <= KOSKI_EV2) | ||
| 274 | if (s->ext_clk) { | ||
| 275 | s->brg_cfg = MAX3107_BRG13_B9600; | ||
| 276 | s->baud_tbl = (struct baud_table *)brg13_ext; | ||
| 277 | } | ||
| 278 | } | ||
| 279 | } | ||
| 280 | #endif | ||
| 281 | |||
| 282 | static int __devexit max3107_aava_remove(struct spi_device *spi) | ||
| 283 | { | ||
| 284 | struct max3107_port *s = dev_get_drvdata(&spi->dev); | ||
| 285 | |||
| 286 | /* Remove GPIO chip */ | ||
| 287 | if (gpiochip_remove(&s->chip)) | ||
| 288 | dev_warn(&spi->dev, "Removing GPIO chip failed\n"); | ||
| 289 | |||
| 290 | /* Then do the default remove */ | ||
| 291 | return max3107_remove(spi); | ||
| 292 | } | ||
| 293 | |||
| 294 | /* Platform data */ | ||
| 295 | static struct max3107_plat aava_plat_data = { | ||
| 296 | .loopback = 0, | ||
| 297 | .ext_clk = 1, | ||
| 298 | /* .init = max3107_aava_init, */ | ||
| 299 | .configure = max3107_aava_configure, | ||
| 300 | .hw_suspend = max3107_hw_susp, | ||
| 301 | .polled_mode = 0, | ||
| 302 | .poll_time = 0, | ||
| 303 | }; | ||
| 304 | |||
| 305 | |||
| 306 | static int __devinit max3107_probe_aava(struct spi_device *spi) | ||
| 307 | { | ||
| 308 | int err = max3107_aava_reset(spi); | ||
| 309 | if (err < 0) | ||
| 310 | return err; | ||
| 311 | return max3107_probe(spi, &aava_plat_data); | ||
| 312 | } | ||
| 313 | |||
| 314 | /* Spi driver data */ | ||
| 315 | static struct spi_driver max3107_driver = { | ||
| 316 | .driver = { | ||
| 317 | .name = "aava-max3107", | ||
| 318 | .owner = THIS_MODULE, | ||
| 319 | }, | ||
| 320 | .probe = max3107_probe_aava, | ||
| 321 | .remove = __devexit_p(max3107_aava_remove), | ||
| 322 | .suspend = max3107_suspend, | ||
| 323 | .resume = max3107_resume, | ||
| 324 | }; | ||
| 325 | |||
| 326 | /* Driver init function */ | ||
| 327 | static int __init max3107_init(void) | ||
| 328 | { | ||
| 329 | return spi_register_driver(&max3107_driver); | ||
| 330 | } | ||
| 331 | |||
| 332 | /* Driver exit function */ | ||
| 333 | static void __exit max3107_exit(void) | ||
| 334 | { | ||
| 335 | spi_unregister_driver(&max3107_driver); | ||
| 336 | } | ||
| 337 | |||
| 338 | module_init(max3107_init); | ||
| 339 | module_exit(max3107_exit); | ||
| 340 | |||
| 341 | MODULE_DESCRIPTION("MAX3107 driver"); | ||
| 342 | MODULE_AUTHOR("Aavamobile"); | ||
| 343 | MODULE_ALIAS("spi:aava-max3107"); | ||
| 344 | MODULE_LICENSE("GPL v2"); | ||
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index d192dcbb82f5..1c2426931484 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
| @@ -1160,7 +1160,7 @@ static struct uart_driver serial_omap_reg = { | |||
| 1160 | .cons = OMAP_CONSOLE, | 1160 | .cons = OMAP_CONSOLE, |
| 1161 | }; | 1161 | }; |
| 1162 | 1162 | ||
| 1163 | #ifdef CONFIG_SUSPEND | 1163 | #ifdef CONFIG_PM_SLEEP |
| 1164 | static int serial_omap_suspend(struct device *dev) | 1164 | static int serial_omap_suspend(struct device *dev) |
| 1165 | { | 1165 | { |
| 1166 | struct uart_omap_port *up = dev_get_drvdata(dev); | 1166 | struct uart_omap_port *up = dev_get_drvdata(dev); |
| @@ -1521,6 +1521,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1) | |||
| 1521 | } | 1521 | } |
| 1522 | } | 1522 | } |
| 1523 | 1523 | ||
| 1524 | #ifdef CONFIG_PM_RUNTIME | ||
| 1524 | static void serial_omap_restore_context(struct uart_omap_port *up) | 1525 | static void serial_omap_restore_context(struct uart_omap_port *up) |
| 1525 | { | 1526 | { |
| 1526 | if (up->errata & UART_ERRATA_i202_MDR1_ACCESS) | 1527 | if (up->errata & UART_ERRATA_i202_MDR1_ACCESS) |
| @@ -1550,7 +1551,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up) | |||
| 1550 | serial_out(up, UART_OMAP_MDR1, up->mdr1); | 1551 | serial_out(up, UART_OMAP_MDR1, up->mdr1); |
| 1551 | } | 1552 | } |
| 1552 | 1553 | ||
| 1553 | #ifdef CONFIG_PM_RUNTIME | ||
| 1554 | static int serial_omap_runtime_suspend(struct device *dev) | 1554 | static int serial_omap_runtime_suspend(struct device *dev) |
| 1555 | { | 1555 | { |
| 1556 | struct uart_omap_port *up = dev_get_drvdata(dev); | 1556 | struct uart_omap_port *up = dev_get_drvdata(dev); |
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index c7bf31a6a7e7..13056180adf5 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c | |||
| @@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) | |||
| 2348 | */ | 2348 | */ |
| 2349 | tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev); | 2349 | tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev); |
| 2350 | if (likely(!IS_ERR(tty_dev))) { | 2350 | if (likely(!IS_ERR(tty_dev))) { |
| 2351 | device_init_wakeup(tty_dev, 1); | 2351 | device_set_wakeup_capable(tty_dev, 1); |
| 2352 | device_set_wakeup_enable(tty_dev, 0); | 2352 | } else { |
| 2353 | } else | ||
| 2354 | printk(KERN_ERR "Cannot register tty device on line %d\n", | 2353 | printk(KERN_ERR "Cannot register tty device on line %d\n", |
| 2355 | uport->line); | 2354 | uport->line); |
| 2355 | } | ||
| 2356 | 2356 | ||
| 2357 | /* | 2357 | /* |
| 2358 | * Ensure UPF_DEAD is not set. | 2358 | * Ensure UPF_DEAD is not set. |
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index ef9dd628ba0b..bf6e238146ae 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c | |||
| @@ -227,7 +227,6 @@ int tty_port_block_til_ready(struct tty_port *port, | |||
| 227 | int do_clocal = 0, retval; | 227 | int do_clocal = 0, retval; |
| 228 | unsigned long flags; | 228 | unsigned long flags; |
| 229 | DEFINE_WAIT(wait); | 229 | DEFINE_WAIT(wait); |
| 230 | int cd; | ||
| 231 | 230 | ||
| 232 | /* block if port is in the process of being closed */ | 231 | /* block if port is in the process of being closed */ |
| 233 | if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) { | 232 | if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) { |
| @@ -284,11 +283,14 @@ int tty_port_block_til_ready(struct tty_port *port, | |||
| 284 | retval = -ERESTARTSYS; | 283 | retval = -ERESTARTSYS; |
| 285 | break; | 284 | break; |
| 286 | } | 285 | } |
| 287 | /* Probe the carrier. For devices with no carrier detect this | 286 | /* |
| 288 | will always return true */ | 287 | * Probe the carrier. For devices with no carrier detect |
| 289 | cd = tty_port_carrier_raised(port); | 288 | * tty_port_carrier_raised will always return true. |
| 289 | * Never ask drivers if CLOCAL is set, this causes troubles | ||
| 290 | * on some hardware. | ||
| 291 | */ | ||
| 290 | if (!(port->flags & ASYNC_CLOSING) && | 292 | if (!(port->flags & ASYNC_CLOSING) && |
| 291 | (do_clocal || cd)) | 293 | (do_clocal || tty_port_carrier_raised(port))) |
| 292 | break; | 294 | break; |
| 293 | if (signal_pending(current)) { | 295 | if (signal_pending(current)) { |
| 294 | retval = -ERESTARTSYS; | 296 | retval = -ERESTARTSYS; |
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 1c50baff7725..d2b3cffca3f7 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c | |||
| @@ -57,6 +57,8 @@ MODULE_DEVICE_TABLE (usb, wdm_ids); | |||
| 57 | 57 | ||
| 58 | #define WDM_MAX 16 | 58 | #define WDM_MAX 16 |
| 59 | 59 | ||
| 60 | /* CDC-WMC r1.1 requires wMaxCommand to be "at least 256 decimal (0x100)" */ | ||
| 61 | #define WDM_DEFAULT_BUFSIZE 256 | ||
| 60 | 62 | ||
| 61 | static DEFINE_MUTEX(wdm_mutex); | 63 | static DEFINE_MUTEX(wdm_mutex); |
| 62 | 64 | ||
| @@ -88,7 +90,8 @@ struct wdm_device { | |||
| 88 | int count; | 90 | int count; |
| 89 | dma_addr_t shandle; | 91 | dma_addr_t shandle; |
| 90 | dma_addr_t ihandle; | 92 | dma_addr_t ihandle; |
| 91 | struct mutex lock; | 93 | struct mutex wlock; |
| 94 | struct mutex rlock; | ||
| 92 | wait_queue_head_t wait; | 95 | wait_queue_head_t wait; |
| 93 | struct work_struct rxwork; | 96 | struct work_struct rxwork; |
| 94 | int werr; | 97 | int werr; |
| @@ -323,7 +326,7 @@ static ssize_t wdm_write | |||
| 323 | } | 326 | } |
| 324 | 327 | ||
| 325 | /* concurrent writes and disconnect */ | 328 | /* concurrent writes and disconnect */ |
| 326 | r = mutex_lock_interruptible(&desc->lock); | 329 | r = mutex_lock_interruptible(&desc->wlock); |
| 327 | rv = -ERESTARTSYS; | 330 | rv = -ERESTARTSYS; |
| 328 | if (r) { | 331 | if (r) { |
| 329 | kfree(buf); | 332 | kfree(buf); |
| @@ -386,7 +389,7 @@ static ssize_t wdm_write | |||
| 386 | out: | 389 | out: |
| 387 | usb_autopm_put_interface(desc->intf); | 390 | usb_autopm_put_interface(desc->intf); |
| 388 | outnp: | 391 | outnp: |
| 389 | mutex_unlock(&desc->lock); | 392 | mutex_unlock(&desc->wlock); |
| 390 | outnl: | 393 | outnl: |
| 391 | return rv < 0 ? rv : count; | 394 | return rv < 0 ? rv : count; |
| 392 | } | 395 | } |
| @@ -399,7 +402,7 @@ static ssize_t wdm_read | |||
| 399 | struct wdm_device *desc = file->private_data; | 402 | struct wdm_device *desc = file->private_data; |
| 400 | 403 | ||
| 401 | 404 | ||
| 402 | rv = mutex_lock_interruptible(&desc->lock); /*concurrent reads */ | 405 | rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */ |
| 403 | if (rv < 0) | 406 | if (rv < 0) |
| 404 | return -ERESTARTSYS; | 407 | return -ERESTARTSYS; |
| 405 | 408 | ||
| @@ -467,14 +470,16 @@ retry: | |||
| 467 | for (i = 0; i < desc->length - cntr; i++) | 470 | for (i = 0; i < desc->length - cntr; i++) |
| 468 | desc->ubuf[i] = desc->ubuf[i + cntr]; | 471 | desc->ubuf[i] = desc->ubuf[i + cntr]; |
| 469 | 472 | ||
| 473 | spin_lock_irq(&desc->iuspin); | ||
| 470 | desc->length -= cntr; | 474 | desc->length -= cntr; |
| 475 | spin_unlock_irq(&desc->iuspin); | ||
| 471 | /* in case we had outstanding data */ | 476 | /* in case we had outstanding data */ |
| 472 | if (!desc->length) | 477 | if (!desc->length) |
| 473 | clear_bit(WDM_READ, &desc->flags); | 478 | clear_bit(WDM_READ, &desc->flags); |
| 474 | rv = cntr; | 479 | rv = cntr; |
| 475 | 480 | ||
| 476 | err: | 481 | err: |
| 477 | mutex_unlock(&desc->lock); | 482 | mutex_unlock(&desc->rlock); |
| 478 | return rv; | 483 | return rv; |
| 479 | } | 484 | } |
| 480 | 485 | ||
| @@ -540,7 +545,8 @@ static int wdm_open(struct inode *inode, struct file *file) | |||
| 540 | } | 545 | } |
| 541 | intf->needs_remote_wakeup = 1; | 546 | intf->needs_remote_wakeup = 1; |
| 542 | 547 | ||
| 543 | mutex_lock(&desc->lock); | 548 | /* using write lock to protect desc->count */ |
| 549 | mutex_lock(&desc->wlock); | ||
| 544 | if (!desc->count++) { | 550 | if (!desc->count++) { |
| 545 | desc->werr = 0; | 551 | desc->werr = 0; |
| 546 | desc->rerr = 0; | 552 | desc->rerr = 0; |
| @@ -553,7 +559,7 @@ static int wdm_open(struct inode *inode, struct file *file) | |||
| 553 | } else { | 559 | } else { |
| 554 | rv = 0; | 560 | rv = 0; |
| 555 | } | 561 | } |
| 556 | mutex_unlock(&desc->lock); | 562 | mutex_unlock(&desc->wlock); |
| 557 | usb_autopm_put_interface(desc->intf); | 563 | usb_autopm_put_interface(desc->intf); |
| 558 | out: | 564 | out: |
| 559 | mutex_unlock(&wdm_mutex); | 565 | mutex_unlock(&wdm_mutex); |
| @@ -565,9 +571,11 @@ static int wdm_release(struct inode *inode, struct file *file) | |||
| 565 | struct wdm_device *desc = file->private_data; | 571 | struct wdm_device *desc = file->private_data; |
| 566 | 572 | ||
| 567 | mutex_lock(&wdm_mutex); | 573 | mutex_lock(&wdm_mutex); |
| 568 | mutex_lock(&desc->lock); | 574 | |
| 575 | /* using write lock to protect desc->count */ | ||
| 576 | mutex_lock(&desc->wlock); | ||
| 569 | desc->count--; | 577 | desc->count--; |
| 570 | mutex_unlock(&desc->lock); | 578 | mutex_unlock(&desc->wlock); |
| 571 | 579 | ||
| 572 | if (!desc->count) { | 580 | if (!desc->count) { |
| 573 | dev_dbg(&desc->intf->dev, "wdm_release: cleanup"); | 581 | dev_dbg(&desc->intf->dev, "wdm_release: cleanup"); |
| @@ -630,7 +638,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
| 630 | struct usb_cdc_dmm_desc *dmhd; | 638 | struct usb_cdc_dmm_desc *dmhd; |
| 631 | u8 *buffer = intf->altsetting->extra; | 639 | u8 *buffer = intf->altsetting->extra; |
| 632 | int buflen = intf->altsetting->extralen; | 640 | int buflen = intf->altsetting->extralen; |
| 633 | u16 maxcom = 0; | 641 | u16 maxcom = WDM_DEFAULT_BUFSIZE; |
| 634 | 642 | ||
| 635 | if (!buffer) | 643 | if (!buffer) |
| 636 | goto out; | 644 | goto out; |
| @@ -665,7 +673,8 @@ next_desc: | |||
| 665 | desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL); | 673 | desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL); |
| 666 | if (!desc) | 674 | if (!desc) |
| 667 | goto out; | 675 | goto out; |
| 668 | mutex_init(&desc->lock); | 676 | mutex_init(&desc->rlock); |
| 677 | mutex_init(&desc->wlock); | ||
| 669 | spin_lock_init(&desc->iuspin); | 678 | spin_lock_init(&desc->iuspin); |
| 670 | init_waitqueue_head(&desc->wait); | 679 | init_waitqueue_head(&desc->wait); |
| 671 | desc->wMaxCommand = maxcom; | 680 | desc->wMaxCommand = maxcom; |
| @@ -716,7 +725,7 @@ next_desc: | |||
| 716 | goto err; | 725 | goto err; |
| 717 | 726 | ||
| 718 | desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf), | 727 | desc->inbuf = usb_alloc_coherent(interface_to_usbdev(intf), |
| 719 | desc->bMaxPacketSize0, | 728 | desc->wMaxCommand, |
| 720 | GFP_KERNEL, | 729 | GFP_KERNEL, |
| 721 | &desc->response->transfer_dma); | 730 | &desc->response->transfer_dma); |
| 722 | if (!desc->inbuf) | 731 | if (!desc->inbuf) |
| @@ -779,11 +788,13 @@ static void wdm_disconnect(struct usb_interface *intf) | |||
| 779 | /* to terminate pending flushes */ | 788 | /* to terminate pending flushes */ |
| 780 | clear_bit(WDM_IN_USE, &desc->flags); | 789 | clear_bit(WDM_IN_USE, &desc->flags); |
| 781 | spin_unlock_irqrestore(&desc->iuspin, flags); | 790 | spin_unlock_irqrestore(&desc->iuspin, flags); |
| 782 | mutex_lock(&desc->lock); | 791 | wake_up_all(&desc->wait); |
| 792 | mutex_lock(&desc->rlock); | ||
| 793 | mutex_lock(&desc->wlock); | ||
| 783 | kill_urbs(desc); | 794 | kill_urbs(desc); |
| 784 | cancel_work_sync(&desc->rxwork); | 795 | cancel_work_sync(&desc->rxwork); |
| 785 | mutex_unlock(&desc->lock); | 796 | mutex_unlock(&desc->wlock); |
| 786 | wake_up_all(&desc->wait); | 797 | mutex_unlock(&desc->rlock); |
| 787 | if (!desc->count) | 798 | if (!desc->count) |
| 788 | cleanup(desc); | 799 | cleanup(desc); |
| 789 | mutex_unlock(&wdm_mutex); | 800 | mutex_unlock(&wdm_mutex); |
| @@ -798,8 +809,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message) | |||
| 798 | dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor); | 809 | dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor); |
| 799 | 810 | ||
| 800 | /* if this is an autosuspend the caller does the locking */ | 811 | /* if this is an autosuspend the caller does the locking */ |
| 801 | if (!PMSG_IS_AUTO(message)) | 812 | if (!PMSG_IS_AUTO(message)) { |
| 802 | mutex_lock(&desc->lock); | 813 | mutex_lock(&desc->rlock); |
| 814 | mutex_lock(&desc->wlock); | ||
| 815 | } | ||
| 803 | spin_lock_irq(&desc->iuspin); | 816 | spin_lock_irq(&desc->iuspin); |
| 804 | 817 | ||
| 805 | if (PMSG_IS_AUTO(message) && | 818 | if (PMSG_IS_AUTO(message) && |
| @@ -815,8 +828,10 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message) | |||
| 815 | kill_urbs(desc); | 828 | kill_urbs(desc); |
| 816 | cancel_work_sync(&desc->rxwork); | 829 | cancel_work_sync(&desc->rxwork); |
| 817 | } | 830 | } |
| 818 | if (!PMSG_IS_AUTO(message)) | 831 | if (!PMSG_IS_AUTO(message)) { |
| 819 | mutex_unlock(&desc->lock); | 832 | mutex_unlock(&desc->wlock); |
| 833 | mutex_unlock(&desc->rlock); | ||
| 834 | } | ||
| 820 | 835 | ||
| 821 | return rv; | 836 | return rv; |
| 822 | } | 837 | } |
| @@ -854,7 +869,8 @@ static int wdm_pre_reset(struct usb_interface *intf) | |||
| 854 | { | 869 | { |
| 855 | struct wdm_device *desc = usb_get_intfdata(intf); | 870 | struct wdm_device *desc = usb_get_intfdata(intf); |
| 856 | 871 | ||
| 857 | mutex_lock(&desc->lock); | 872 | mutex_lock(&desc->rlock); |
| 873 | mutex_lock(&desc->wlock); | ||
| 858 | kill_urbs(desc); | 874 | kill_urbs(desc); |
| 859 | 875 | ||
| 860 | /* | 876 | /* |
| @@ -876,7 +892,8 @@ static int wdm_post_reset(struct usb_interface *intf) | |||
| 876 | int rv; | 892 | int rv; |
| 877 | 893 | ||
| 878 | rv = recover_from_urb_loss(desc); | 894 | rv = recover_from_urb_loss(desc); |
| 879 | mutex_unlock(&desc->lock); | 895 | mutex_unlock(&desc->wlock); |
| 896 | mutex_unlock(&desc->rlock); | ||
| 880 | return 0; | 897 | return 0; |
| 881 | } | 898 | } |
| 882 | 899 | ||
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 2f51de57593a..c8df1dd967ef 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c | |||
| @@ -126,7 +126,6 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep, | |||
| 126 | struct dwc3_request *req) | 126 | struct dwc3_request *req) |
| 127 | { | 127 | { |
| 128 | struct dwc3 *dwc = dep->dwc; | 128 | struct dwc3 *dwc = dep->dwc; |
| 129 | u32 type; | ||
| 130 | int ret = 0; | 129 | int ret = 0; |
| 131 | 130 | ||
| 132 | req->request.actual = 0; | 131 | req->request.actual = 0; |
| @@ -149,20 +148,14 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep, | |||
| 149 | 148 | ||
| 150 | direction = !!(dep->flags & DWC3_EP0_DIR_IN); | 149 | direction = !!(dep->flags & DWC3_EP0_DIR_IN); |
| 151 | 150 | ||
| 152 | if (dwc->ep0state == EP0_STATUS_PHASE) { | 151 | if (dwc->ep0state != EP0_DATA_PHASE) { |
| 153 | type = dwc->three_stage_setup | 152 | dev_WARN(dwc->dev, "Unexpected pending request\n"); |
| 154 | ? DWC3_TRBCTL_CONTROL_STATUS3 | ||
| 155 | : DWC3_TRBCTL_CONTROL_STATUS2; | ||
| 156 | } else if (dwc->ep0state == EP0_DATA_PHASE) { | ||
| 157 | type = DWC3_TRBCTL_CONTROL_DATA; | ||
| 158 | } else { | ||
| 159 | /* should never happen */ | ||
| 160 | WARN_ON(1); | ||
| 161 | return 0; | 153 | return 0; |
| 162 | } | 154 | } |
| 163 | 155 | ||
| 164 | ret = dwc3_ep0_start_trans(dwc, direction, | 156 | ret = dwc3_ep0_start_trans(dwc, direction, |
| 165 | req->request.dma, req->request.length, type); | 157 | req->request.dma, req->request.length, |
| 158 | DWC3_TRBCTL_CONTROL_DATA); | ||
| 166 | dep->flags &= ~(DWC3_EP_PENDING_REQUEST | | 159 | dep->flags &= ~(DWC3_EP_PENDING_REQUEST | |
| 167 | DWC3_EP0_DIR_IN); | 160 | DWC3_EP0_DIR_IN); |
| 168 | } else if (dwc->delayed_status) { | 161 | } else if (dwc->delayed_status) { |
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index a696bde53222..064b6e2cd411 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c | |||
| @@ -101,7 +101,7 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req) | |||
| 101 | if (req->request.num_mapped_sgs) { | 101 | if (req->request.num_mapped_sgs) { |
| 102 | req->request.dma = DMA_ADDR_INVALID; | 102 | req->request.dma = DMA_ADDR_INVALID; |
| 103 | dma_unmap_sg(dwc->dev, req->request.sg, | 103 | dma_unmap_sg(dwc->dev, req->request.sg, |
| 104 | req->request.num_sgs, | 104 | req->request.num_mapped_sgs, |
| 105 | req->direction ? DMA_TO_DEVICE | 105 | req->direction ? DMA_TO_DEVICE |
| 106 | : DMA_FROM_DEVICE); | 106 | : DMA_FROM_DEVICE); |
| 107 | 107 | ||
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a95de6a4a134..baaebf2830fc 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c | |||
| @@ -175,13 +175,12 @@ ep_found: | |||
| 175 | _ep->comp_desc = comp_desc; | 175 | _ep->comp_desc = comp_desc; |
| 176 | if (g->speed == USB_SPEED_SUPER) { | 176 | if (g->speed == USB_SPEED_SUPER) { |
| 177 | switch (usb_endpoint_type(_ep->desc)) { | 177 | switch (usb_endpoint_type(_ep->desc)) { |
| 178 | case USB_ENDPOINT_XFER_BULK: | ||
| 179 | case USB_ENDPOINT_XFER_INT: | ||
| 180 | _ep->maxburst = comp_desc->bMaxBurst; | ||
| 181 | break; | ||
| 182 | case USB_ENDPOINT_XFER_ISOC: | 178 | case USB_ENDPOINT_XFER_ISOC: |
| 183 | /* mult: bits 1:0 of bmAttributes */ | 179 | /* mult: bits 1:0 of bmAttributes */ |
| 184 | _ep->mult = comp_desc->bmAttributes & 0x3; | 180 | _ep->mult = comp_desc->bmAttributes & 0x3; |
| 181 | case USB_ENDPOINT_XFER_BULK: | ||
| 182 | case USB_ENDPOINT_XFER_INT: | ||
| 183 | _ep->maxburst = comp_desc->bMaxBurst; | ||
| 185 | break; | 184 | break; |
| 186 | default: | 185 | default: |
| 187 | /* Do nothing for control endpoints */ | 186 | /* Do nothing for control endpoints */ |
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index 753aa0683ac1..e0e6375ef5dd 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c | |||
| @@ -126,7 +126,7 @@ ep_matches ( | |||
| 126 | * descriptor and see if the EP matches it | 126 | * descriptor and see if the EP matches it |
| 127 | */ | 127 | */ |
| 128 | if (usb_endpoint_xfer_bulk(desc)) { | 128 | if (usb_endpoint_xfer_bulk(desc)) { |
| 129 | if (ep_comp) { | 129 | if (ep_comp && gadget->max_speed >= USB_SPEED_SUPER) { |
| 130 | num_req_streams = ep_comp->bmAttributes & 0x1f; | 130 | num_req_streams = ep_comp->bmAttributes & 0x1f; |
| 131 | if (num_req_streams > ep->max_streams) | 131 | if (num_req_streams > ep->max_streams) |
| 132 | return 0; | 132 | return 0; |
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 6353eca1e852..ee8ceec01560 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c | |||
| @@ -3123,15 +3123,15 @@ fsg_add(struct usb_composite_dev *cdev, struct usb_configuration *c, | |||
| 3123 | 3123 | ||
| 3124 | struct fsg_module_parameters { | 3124 | struct fsg_module_parameters { |
| 3125 | char *file[FSG_MAX_LUNS]; | 3125 | char *file[FSG_MAX_LUNS]; |
| 3126 | int ro[FSG_MAX_LUNS]; | 3126 | bool ro[FSG_MAX_LUNS]; |
| 3127 | int removable[FSG_MAX_LUNS]; | 3127 | bool removable[FSG_MAX_LUNS]; |
| 3128 | int cdrom[FSG_MAX_LUNS]; | 3128 | bool cdrom[FSG_MAX_LUNS]; |
| 3129 | int nofua[FSG_MAX_LUNS]; | 3129 | bool nofua[FSG_MAX_LUNS]; |
| 3130 | 3130 | ||
| 3131 | unsigned int file_count, ro_count, removable_count, cdrom_count; | 3131 | unsigned int file_count, ro_count, removable_count, cdrom_count; |
| 3132 | unsigned int nofua_count; | 3132 | unsigned int nofua_count; |
| 3133 | unsigned int luns; /* nluns */ | 3133 | unsigned int luns; /* nluns */ |
| 3134 | int stall; /* can_stall */ | 3134 | bool stall; /* can_stall */ |
| 3135 | }; | 3135 | }; |
| 3136 | 3136 | ||
| 3137 | #define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc) \ | 3137 | #define _FSG_MODULE_PARAM_ARRAY(prefix, params, name, type, desc) \ |
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index d7ea6c076ce9..b04712f19f1e 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c | |||
| @@ -1430,7 +1430,7 @@ static void setup_received_irq(struct fsl_udc *udc, | |||
| 1430 | int pipe = get_pipe_by_windex(wIndex); | 1430 | int pipe = get_pipe_by_windex(wIndex); |
| 1431 | struct fsl_ep *ep; | 1431 | struct fsl_ep *ep; |
| 1432 | 1432 | ||
| 1433 | if (wValue != 0 || wLength != 0 || pipe > udc->max_ep) | 1433 | if (wValue != 0 || wLength != 0 || pipe >= udc->max_ep) |
| 1434 | break; | 1434 | break; |
| 1435 | ep = get_ep_by_pipe(udc, pipe); | 1435 | ep = get_ep_by_pipe(udc, pipe); |
| 1436 | 1436 | ||
| @@ -1673,7 +1673,7 @@ static void dtd_complete_irq(struct fsl_udc *udc) | |||
| 1673 | if (!bit_pos) | 1673 | if (!bit_pos) |
| 1674 | return; | 1674 | return; |
| 1675 | 1675 | ||
| 1676 | for (i = 0; i < udc->max_ep * 2; i++) { | 1676 | for (i = 0; i < udc->max_ep; i++) { |
| 1677 | ep_num = i >> 1; | 1677 | ep_num = i >> 1; |
| 1678 | direction = i % 2; | 1678 | direction = i % 2; |
| 1679 | 1679 | ||
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index fa0fcc11263f..e2293c1588ee 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c | |||
| @@ -11,11 +11,6 @@ | |||
| 11 | /* #undef DEBUG */ | 11 | /* #undef DEBUG */ |
| 12 | /* #undef VERBOSE_DEBUG */ | 12 | /* #undef VERBOSE_DEBUG */ |
| 13 | 13 | ||
| 14 | #if defined(CONFIG_USB_LANGWELL_OTG) | ||
| 15 | #define OTG_TRANSCEIVER | ||
| 16 | #endif | ||
| 17 | |||
| 18 | |||
| 19 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 20 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 21 | #include <linux/dma-mapping.h> | 16 | #include <linux/dma-mapping.h> |
| @@ -1522,8 +1517,7 @@ static void langwell_udc_stop(struct langwell_udc *dev) | |||
| 1522 | 1517 | ||
| 1523 | 1518 | ||
| 1524 | /* stop all USB activities */ | 1519 | /* stop all USB activities */ |
| 1525 | static void stop_activity(struct langwell_udc *dev, | 1520 | static void stop_activity(struct langwell_udc *dev) |
| 1526 | struct usb_gadget_driver *driver) | ||
| 1527 | { | 1521 | { |
| 1528 | struct langwell_ep *ep; | 1522 | struct langwell_ep *ep; |
| 1529 | dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__); | 1523 | dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__); |
| @@ -1535,9 +1529,9 @@ static void stop_activity(struct langwell_udc *dev, | |||
| 1535 | } | 1529 | } |
| 1536 | 1530 | ||
| 1537 | /* report disconnect; the driver is already quiesced */ | 1531 | /* report disconnect; the driver is already quiesced */ |
| 1538 | if (driver) { | 1532 | if (dev->driver) { |
| 1539 | spin_unlock(&dev->lock); | 1533 | spin_unlock(&dev->lock); |
| 1540 | driver->disconnect(&dev->gadget); | 1534 | dev->driver->disconnect(&dev->gadget); |
| 1541 | spin_lock(&dev->lock); | 1535 | spin_lock(&dev->lock); |
| 1542 | } | 1536 | } |
| 1543 | 1537 | ||
| @@ -1925,11 +1919,10 @@ static int langwell_stop(struct usb_gadget *g, | |||
| 1925 | 1919 | ||
| 1926 | /* stop all usb activities */ | 1920 | /* stop all usb activities */ |
| 1927 | dev->gadget.speed = USB_SPEED_UNKNOWN; | 1921 | dev->gadget.speed = USB_SPEED_UNKNOWN; |
| 1928 | stop_activity(dev, driver); | ||
| 1929 | spin_unlock_irqrestore(&dev->lock, flags); | ||
| 1930 | |||
| 1931 | dev->gadget.dev.driver = NULL; | 1922 | dev->gadget.dev.driver = NULL; |
| 1932 | dev->driver = NULL; | 1923 | dev->driver = NULL; |
| 1924 | stop_activity(dev); | ||
| 1925 | spin_unlock_irqrestore(&dev->lock, flags); | ||
| 1933 | 1926 | ||
| 1934 | device_remove_file(&dev->pdev->dev, &dev_attr_function); | 1927 | device_remove_file(&dev->pdev->dev, &dev_attr_function); |
| 1935 | 1928 | ||
| @@ -2315,13 +2308,9 @@ static void handle_setup_packet(struct langwell_udc *dev, | |||
| 2315 | 2308 | ||
| 2316 | if (!gadget_is_otg(&dev->gadget)) | 2309 | if (!gadget_is_otg(&dev->gadget)) |
| 2317 | break; | 2310 | break; |
| 2318 | else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) { | 2311 | else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) |
| 2319 | dev->gadget.b_hnp_enable = 1; | 2312 | dev->gadget.b_hnp_enable = 1; |
| 2320 | #ifdef OTG_TRANSCEIVER | 2313 | else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT) |
| 2321 | if (!dev->lotg->otg.default_a) | ||
| 2322 | dev->lotg->hsm.b_hnp_enable = 1; | ||
| 2323 | #endif | ||
| 2324 | } else if (setup->bRequest == USB_DEVICE_A_HNP_SUPPORT) | ||
| 2325 | dev->gadget.a_hnp_support = 1; | 2314 | dev->gadget.a_hnp_support = 1; |
| 2326 | else if (setup->bRequest == | 2315 | else if (setup->bRequest == |
| 2327 | USB_DEVICE_A_ALT_HNP_SUPPORT) | 2316 | USB_DEVICE_A_ALT_HNP_SUPPORT) |
| @@ -2733,7 +2722,7 @@ static void handle_usb_reset(struct langwell_udc *dev) | |||
| 2733 | dev->bus_reset = 1; | 2722 | dev->bus_reset = 1; |
| 2734 | 2723 | ||
| 2735 | /* reset all the queues, stop all USB activities */ | 2724 | /* reset all the queues, stop all USB activities */ |
| 2736 | stop_activity(dev, dev->driver); | 2725 | stop_activity(dev); |
| 2737 | dev->usb_state = USB_STATE_DEFAULT; | 2726 | dev->usb_state = USB_STATE_DEFAULT; |
| 2738 | } else { | 2727 | } else { |
| 2739 | dev_vdbg(&dev->pdev->dev, "device controller reset\n"); | 2728 | dev_vdbg(&dev->pdev->dev, "device controller reset\n"); |
| @@ -2741,7 +2730,7 @@ static void handle_usb_reset(struct langwell_udc *dev) | |||
| 2741 | langwell_udc_reset(dev); | 2730 | langwell_udc_reset(dev); |
| 2742 | 2731 | ||
| 2743 | /* reset all the queues, stop all USB activities */ | 2732 | /* reset all the queues, stop all USB activities */ |
| 2744 | stop_activity(dev, dev->driver); | 2733 | stop_activity(dev); |
| 2745 | 2734 | ||
| 2746 | /* reset ep0 dQH and endptctrl */ | 2735 | /* reset ep0 dQH and endptctrl */ |
| 2747 | ep0_reset(dev); | 2736 | ep0_reset(dev); |
| @@ -2752,12 +2741,6 @@ static void handle_usb_reset(struct langwell_udc *dev) | |||
| 2752 | dev->usb_state = USB_STATE_ATTACHED; | 2741 | dev->usb_state = USB_STATE_ATTACHED; |
| 2753 | } | 2742 | } |
| 2754 | 2743 | ||
| 2755 | #ifdef OTG_TRANSCEIVER | ||
| 2756 | /* refer to USB OTG 6.6.2.3 b_hnp_en is cleared */ | ||
| 2757 | if (!dev->lotg->otg.default_a) | ||
| 2758 | dev->lotg->hsm.b_hnp_enable = 0; | ||
| 2759 | #endif | ||
| 2760 | |||
| 2761 | dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); | 2744 | dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); |
| 2762 | } | 2745 | } |
| 2763 | 2746 | ||
| @@ -2770,29 +2753,6 @@ static void handle_bus_suspend(struct langwell_udc *dev) | |||
| 2770 | dev->resume_state = dev->usb_state; | 2753 | dev->resume_state = dev->usb_state; |
| 2771 | dev->usb_state = USB_STATE_SUSPENDED; | 2754 | dev->usb_state = USB_STATE_SUSPENDED; |
| 2772 | 2755 | ||
| 2773 | #ifdef OTG_TRANSCEIVER | ||
| 2774 | if (dev->lotg->otg.default_a) { | ||
| 2775 | if (dev->lotg->hsm.b_bus_suspend_vld == 1) { | ||
| 2776 | dev->lotg->hsm.b_bus_suspend = 1; | ||
| 2777 | /* notify transceiver the state changes */ | ||
| 2778 | if (spin_trylock(&dev->lotg->wq_lock)) { | ||
| 2779 | langwell_update_transceiver(); | ||
| 2780 | spin_unlock(&dev->lotg->wq_lock); | ||
| 2781 | } | ||
| 2782 | } | ||
| 2783 | dev->lotg->hsm.b_bus_suspend_vld++; | ||
| 2784 | } else { | ||
| 2785 | if (!dev->lotg->hsm.a_bus_suspend) { | ||
| 2786 | dev->lotg->hsm.a_bus_suspend = 1; | ||
| 2787 | /* notify transceiver the state changes */ | ||
| 2788 | if (spin_trylock(&dev->lotg->wq_lock)) { | ||
| 2789 | langwell_update_transceiver(); | ||
| 2790 | spin_unlock(&dev->lotg->wq_lock); | ||
| 2791 | } | ||
| 2792 | } | ||
| 2793 | } | ||
| 2794 | #endif | ||
| 2795 | |||
| 2796 | /* report suspend to the driver */ | 2756 | /* report suspend to the driver */ |
| 2797 | if (dev->driver) { | 2757 | if (dev->driver) { |
| 2798 | if (dev->driver->suspend) { | 2758 | if (dev->driver->suspend) { |
| @@ -2823,11 +2783,6 @@ static void handle_bus_resume(struct langwell_udc *dev) | |||
| 2823 | if (dev->pdev->device != 0x0829) | 2783 | if (dev->pdev->device != 0x0829) |
| 2824 | langwell_phy_low_power(dev, 0); | 2784 | langwell_phy_low_power(dev, 0); |
| 2825 | 2785 | ||
| 2826 | #ifdef OTG_TRANSCEIVER | ||
| 2827 | if (dev->lotg->otg.default_a == 0) | ||
| 2828 | dev->lotg->hsm.a_bus_suspend = 0; | ||
| 2829 | #endif | ||
| 2830 | |||
| 2831 | /* report resume to the driver */ | 2786 | /* report resume to the driver */ |
| 2832 | if (dev->driver) { | 2787 | if (dev->driver) { |
| 2833 | if (dev->driver->resume) { | 2788 | if (dev->driver->resume) { |
| @@ -3020,7 +2975,6 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
| 3020 | 2975 | ||
| 3021 | dev->done = &done; | 2976 | dev->done = &done; |
| 3022 | 2977 | ||
| 3023 | #ifndef OTG_TRANSCEIVER | ||
| 3024 | /* free dTD dma_pool and dQH */ | 2978 | /* free dTD dma_pool and dQH */ |
| 3025 | if (dev->dtd_pool) | 2979 | if (dev->dtd_pool) |
| 3026 | dma_pool_destroy(dev->dtd_pool); | 2980 | dma_pool_destroy(dev->dtd_pool); |
| @@ -3032,7 +2986,6 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
| 3032 | /* release SRAM caching */ | 2986 | /* release SRAM caching */ |
| 3033 | if (dev->has_sram && dev->got_sram) | 2987 | if (dev->has_sram && dev->got_sram) |
| 3034 | sram_deinit(dev); | 2988 | sram_deinit(dev); |
| 3035 | #endif | ||
| 3036 | 2989 | ||
| 3037 | if (dev->status_req) { | 2990 | if (dev->status_req) { |
| 3038 | kfree(dev->status_req->req.buf); | 2991 | kfree(dev->status_req->req.buf); |
| @@ -3045,7 +2998,6 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
| 3045 | if (dev->got_irq) | 2998 | if (dev->got_irq) |
| 3046 | free_irq(pdev->irq, dev); | 2999 | free_irq(pdev->irq, dev); |
| 3047 | 3000 | ||
| 3048 | #ifndef OTG_TRANSCEIVER | ||
| 3049 | if (dev->cap_regs) | 3001 | if (dev->cap_regs) |
| 3050 | iounmap(dev->cap_regs); | 3002 | iounmap(dev->cap_regs); |
| 3051 | 3003 | ||
| @@ -3055,13 +3007,6 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
| 3055 | 3007 | ||
| 3056 | if (dev->enabled) | 3008 | if (dev->enabled) |
| 3057 | pci_disable_device(pdev); | 3009 | pci_disable_device(pdev); |
| 3058 | #else | ||
| 3059 | if (dev->transceiver) { | ||
| 3060 | otg_put_transceiver(dev->transceiver); | ||
| 3061 | dev->transceiver = NULL; | ||
| 3062 | dev->lotg = NULL; | ||
| 3063 | } | ||
| 3064 | #endif | ||
| 3065 | 3010 | ||
| 3066 | dev->cap_regs = NULL; | 3011 | dev->cap_regs = NULL; |
| 3067 | 3012 | ||
| @@ -3072,9 +3017,7 @@ static void langwell_udc_remove(struct pci_dev *pdev) | |||
| 3072 | device_remove_file(&pdev->dev, &dev_attr_langwell_udc); | 3017 | device_remove_file(&pdev->dev, &dev_attr_langwell_udc); |
| 3073 | device_remove_file(&pdev->dev, &dev_attr_remote_wakeup); | 3018 | device_remove_file(&pdev->dev, &dev_attr_remote_wakeup); |
| 3074 | 3019 | ||
| 3075 | #ifndef OTG_TRANSCEIVER | ||
| 3076 | pci_set_drvdata(pdev, NULL); | 3020 | pci_set_drvdata(pdev, NULL); |
| 3077 | #endif | ||
| 3078 | 3021 | ||
| 3079 | /* free dev, wait for the release() finished */ | 3022 | /* free dev, wait for the release() finished */ |
| 3080 | wait_for_completion(&done); | 3023 | wait_for_completion(&done); |
| @@ -3089,9 +3032,7 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3089 | const struct pci_device_id *id) | 3032 | const struct pci_device_id *id) |
| 3090 | { | 3033 | { |
| 3091 | struct langwell_udc *dev; | 3034 | struct langwell_udc *dev; |
| 3092 | #ifndef OTG_TRANSCEIVER | ||
| 3093 | unsigned long resource, len; | 3035 | unsigned long resource, len; |
| 3094 | #endif | ||
| 3095 | void __iomem *base = NULL; | 3036 | void __iomem *base = NULL; |
| 3096 | size_t size; | 3037 | size_t size; |
| 3097 | int retval; | 3038 | int retval; |
| @@ -3109,16 +3050,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3109 | dev->pdev = pdev; | 3050 | dev->pdev = pdev; |
| 3110 | dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__); | 3051 | dev_dbg(&dev->pdev->dev, "---> %s()\n", __func__); |
| 3111 | 3052 | ||
| 3112 | #ifdef OTG_TRANSCEIVER | ||
| 3113 | /* PCI device is already enabled by otg_transceiver driver */ | ||
| 3114 | dev->enabled = 1; | ||
| 3115 | |||
| 3116 | /* mem region and register base */ | ||
| 3117 | dev->region = 1; | ||
| 3118 | dev->transceiver = otg_get_transceiver(); | ||
| 3119 | dev->lotg = otg_to_langwell(dev->transceiver); | ||
| 3120 | base = dev->lotg->regs; | ||
| 3121 | #else | ||
| 3122 | pci_set_drvdata(pdev, dev); | 3053 | pci_set_drvdata(pdev, dev); |
| 3123 | 3054 | ||
| 3124 | /* now all the pci goodies ... */ | 3055 | /* now all the pci goodies ... */ |
| @@ -3139,7 +3070,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3139 | dev->region = 1; | 3070 | dev->region = 1; |
| 3140 | 3071 | ||
| 3141 | base = ioremap_nocache(resource, len); | 3072 | base = ioremap_nocache(resource, len); |
| 3142 | #endif | ||
| 3143 | if (base == NULL) { | 3073 | if (base == NULL) { |
| 3144 | dev_err(&dev->pdev->dev, "can't map memory\n"); | 3074 | dev_err(&dev->pdev->dev, "can't map memory\n"); |
| 3145 | retval = -EFAULT; | 3075 | retval = -EFAULT; |
| @@ -3163,7 +3093,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3163 | dev->got_sram = 0; | 3093 | dev->got_sram = 0; |
| 3164 | dev_vdbg(&dev->pdev->dev, "dev->has_sram: %d\n", dev->has_sram); | 3094 | dev_vdbg(&dev->pdev->dev, "dev->has_sram: %d\n", dev->has_sram); |
| 3165 | 3095 | ||
| 3166 | #ifndef OTG_TRANSCEIVER | ||
| 3167 | /* enable SRAM caching if detected */ | 3096 | /* enable SRAM caching if detected */ |
| 3168 | if (dev->has_sram && !dev->got_sram) | 3097 | if (dev->has_sram && !dev->got_sram) |
| 3169 | sram_init(dev); | 3098 | sram_init(dev); |
| @@ -3182,7 +3111,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3182 | goto error; | 3111 | goto error; |
| 3183 | } | 3112 | } |
| 3184 | dev->got_irq = 1; | 3113 | dev->got_irq = 1; |
| 3185 | #endif | ||
| 3186 | 3114 | ||
| 3187 | /* set stopped bit */ | 3115 | /* set stopped bit */ |
| 3188 | dev->stopped = 1; | 3116 | dev->stopped = 1; |
| @@ -3257,10 +3185,8 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3257 | dev->remote_wakeup = 0; | 3185 | dev->remote_wakeup = 0; |
| 3258 | dev->dev_status = 1 << USB_DEVICE_SELF_POWERED; | 3186 | dev->dev_status = 1 << USB_DEVICE_SELF_POWERED; |
| 3259 | 3187 | ||
| 3260 | #ifndef OTG_TRANSCEIVER | ||
| 3261 | /* reset device controller */ | 3188 | /* reset device controller */ |
| 3262 | langwell_udc_reset(dev); | 3189 | langwell_udc_reset(dev); |
| 3263 | #endif | ||
| 3264 | 3190 | ||
| 3265 | /* initialize gadget structure */ | 3191 | /* initialize gadget structure */ |
| 3266 | dev->gadget.ops = &langwell_ops; /* usb_gadget_ops */ | 3192 | dev->gadget.ops = &langwell_ops; /* usb_gadget_ops */ |
| @@ -3268,9 +3194,6 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3268 | INIT_LIST_HEAD(&dev->gadget.ep_list); /* ep_list */ | 3194 | INIT_LIST_HEAD(&dev->gadget.ep_list); /* ep_list */ |
| 3269 | dev->gadget.speed = USB_SPEED_UNKNOWN; /* speed */ | 3195 | dev->gadget.speed = USB_SPEED_UNKNOWN; /* speed */ |
| 3270 | dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */ | 3196 | dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */ |
| 3271 | #ifdef OTG_TRANSCEIVER | ||
| 3272 | dev->gadget.is_otg = 1; /* support otg mode */ | ||
| 3273 | #endif | ||
| 3274 | 3197 | ||
| 3275 | /* the "gadget" abstracts/virtualizes the controller */ | 3198 | /* the "gadget" abstracts/virtualizes the controller */ |
| 3276 | dev_set_name(&dev->gadget.dev, "gadget"); | 3199 | dev_set_name(&dev->gadget.dev, "gadget"); |
| @@ -3282,10 +3205,8 @@ static int langwell_udc_probe(struct pci_dev *pdev, | |||
| 3282 | /* controller endpoints reinit */ | 3205 | /* controller endpoints reinit */ |
| 3283 | eps_reinit(dev); | 3206 | eps_reinit(dev); |
| 3284 | 3207 | ||
| 3285 | #ifndef OTG_TRANSCEIVER | ||
| 3286 | /* reset ep0 dQH and endptctrl */ | 3208 | /* reset ep0 dQH and endptctrl */ |
| 3287 | ep0_reset(dev); | 3209 | ep0_reset(dev); |
| 3288 | #endif | ||
| 3289 | 3210 | ||
| 3290 | /* create dTD dma_pool resource */ | 3211 | /* create dTD dma_pool resource */ |
| 3291 | dev->dtd_pool = dma_pool_create("langwell_dtd", | 3212 | dev->dtd_pool = dma_pool_create("langwell_dtd", |
| @@ -3367,7 +3288,7 @@ static int langwell_udc_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 3367 | 3288 | ||
| 3368 | spin_lock_irq(&dev->lock); | 3289 | spin_lock_irq(&dev->lock); |
| 3369 | /* stop all usb activities */ | 3290 | /* stop all usb activities */ |
| 3370 | stop_activity(dev, dev->driver); | 3291 | stop_activity(dev); |
| 3371 | spin_unlock_irq(&dev->lock); | 3292 | spin_unlock_irq(&dev->lock); |
| 3372 | 3293 | ||
| 3373 | /* free dTD dma_pool and dQH */ | 3294 | /* free dTD dma_pool and dQH */ |
| @@ -3525,22 +3446,14 @@ static struct pci_driver langwell_pci_driver = { | |||
| 3525 | 3446 | ||
| 3526 | static int __init init(void) | 3447 | static int __init init(void) |
| 3527 | { | 3448 | { |
| 3528 | #ifdef OTG_TRANSCEIVER | ||
| 3529 | return langwell_register_peripheral(&langwell_pci_driver); | ||
| 3530 | #else | ||
| 3531 | return pci_register_driver(&langwell_pci_driver); | 3449 | return pci_register_driver(&langwell_pci_driver); |
| 3532 | #endif | ||
| 3533 | } | 3450 | } |
| 3534 | module_init(init); | 3451 | module_init(init); |
| 3535 | 3452 | ||
| 3536 | 3453 | ||
| 3537 | static void __exit cleanup(void) | 3454 | static void __exit cleanup(void) |
| 3538 | { | 3455 | { |
| 3539 | #ifdef OTG_TRANSCEIVER | ||
| 3540 | return langwell_unregister_peripheral(&langwell_pci_driver); | ||
| 3541 | #else | ||
| 3542 | pci_unregister_driver(&langwell_pci_driver); | 3456 | pci_unregister_driver(&langwell_pci_driver); |
| 3543 | #endif | ||
| 3544 | } | 3457 | } |
| 3545 | module_exit(cleanup); | 3458 | module_exit(cleanup); |
| 3546 | 3459 | ||
diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h index ef79e242b7b0..d6e78accaffe 100644 --- a/drivers/usb/gadget/langwell_udc.h +++ b/drivers/usb/gadget/langwell_udc.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/usb/langwell_udc.h> | 10 | #include <linux/usb/langwell_udc.h> |
| 11 | #include <linux/usb/langwell_otg.h> | ||
| 12 | 11 | ||
| 13 | /*-------------------------------------------------------------------------*/ | 12 | /*-------------------------------------------------------------------------*/ |
| 14 | 13 | ||
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index c7f291a331df..85ea14e2545e 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c | |||
| @@ -598,16 +598,16 @@ static __maybe_unused struct usb_ss_cap_descriptor fsg_ss_cap_desc = { | |||
| 598 | | USB_5GBPS_OPERATION), | 598 | | USB_5GBPS_OPERATION), |
| 599 | .bFunctionalitySupport = USB_LOW_SPEED_OPERATION, | 599 | .bFunctionalitySupport = USB_LOW_SPEED_OPERATION, |
| 600 | .bU1devExitLat = USB_DEFAULT_U1_DEV_EXIT_LAT, | 600 | .bU1devExitLat = USB_DEFAULT_U1_DEV_EXIT_LAT, |
| 601 | .bU2DevExitLat = USB_DEFAULT_U2_DEV_EXIT_LAT, | 601 | .bU2DevExitLat = cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT), |
| 602 | }; | 602 | }; |
| 603 | 603 | ||
| 604 | static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = { | 604 | static __maybe_unused struct usb_bos_descriptor fsg_bos_desc = { |
| 605 | .bLength = USB_DT_BOS_SIZE, | 605 | .bLength = USB_DT_BOS_SIZE, |
| 606 | .bDescriptorType = USB_DT_BOS, | 606 | .bDescriptorType = USB_DT_BOS, |
| 607 | 607 | ||
| 608 | .wTotalLength = USB_DT_BOS_SIZE | 608 | .wTotalLength = cpu_to_le16(USB_DT_BOS_SIZE |
| 609 | + USB_DT_USB_EXT_CAP_SIZE | 609 | + USB_DT_USB_EXT_CAP_SIZE |
| 610 | + USB_DT_USB_SS_CAP_SIZE, | 610 | + USB_DT_USB_SS_CAP_SIZE), |
| 611 | 611 | ||
| 612 | .bNumDeviceCaps = 2, | 612 | .bNumDeviceCaps = 2, |
| 613 | }; | 613 | }; |
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index e90344a17631..b556a72264d1 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
| @@ -125,7 +125,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
| 125 | */ | 125 | */ |
| 126 | if (pdata->init && pdata->init(pdev)) { | 126 | if (pdata->init && pdata->init(pdev)) { |
| 127 | retval = -ENODEV; | 127 | retval = -ENODEV; |
| 128 | goto err3; | 128 | goto err4; |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /* Enable USB controller, 83xx or 8536 */ | 131 | /* Enable USB controller, 83xx or 8536 */ |
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index f4b627d343ac..01bb7241d6ef 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
| @@ -276,6 +276,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd) | |||
| 276 | 276 | ||
| 277 | /* Serial Bus Release Number is at PCI 0x60 offset */ | 277 | /* Serial Bus Release Number is at PCI 0x60 offset */ |
| 278 | pci_read_config_byte(pdev, 0x60, &ehci->sbrn); | 278 | pci_read_config_byte(pdev, 0x60, &ehci->sbrn); |
| 279 | if (pdev->vendor == PCI_VENDOR_ID_STMICRO | ||
| 280 | && pdev->device == PCI_DEVICE_ID_STMICRO_USB_HOST) | ||
| 281 | ehci->sbrn = 0x20; /* ConneXT has no sbrn register */ | ||
| 279 | 282 | ||
| 280 | /* Keep this around for a while just in case some EHCI | 283 | /* Keep this around for a while just in case some EHCI |
| 281 | * implementation uses legacy PCI PM support. This test | 284 | * implementation uses legacy PCI PM support. This test |
| @@ -526,6 +529,9 @@ static const struct pci_device_id pci_ids [] = { { | |||
| 526 | /* handle any USB 2.0 EHCI controller */ | 529 | /* handle any USB 2.0 EHCI controller */ |
| 527 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), | 530 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), |
| 528 | .driver_data = (unsigned long) &ehci_pci_hc_driver, | 531 | .driver_data = (unsigned long) &ehci_pci_hc_driver, |
| 532 | }, { | ||
| 533 | PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_HOST), | ||
| 534 | .driver_data = (unsigned long) &ehci_pci_hc_driver, | ||
| 529 | }, | 535 | }, |
| 530 | { /* end: all zeroes */ } | 536 | { /* end: all zeroes */ } |
| 531 | }; | 537 | }; |
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 5df0b0e3392b..77afabc77f9b 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -139,8 +139,23 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, | |||
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | iclk = clk_get(&pdev->dev, "ohci_clk"); | 141 | iclk = clk_get(&pdev->dev, "ohci_clk"); |
| 142 | if (IS_ERR(iclk)) { | ||
| 143 | dev_err(&pdev->dev, "failed to get ohci_clk\n"); | ||
| 144 | retval = PTR_ERR(iclk); | ||
| 145 | goto err3; | ||
| 146 | } | ||
| 142 | fclk = clk_get(&pdev->dev, "uhpck"); | 147 | fclk = clk_get(&pdev->dev, "uhpck"); |
| 148 | if (IS_ERR(fclk)) { | ||
| 149 | dev_err(&pdev->dev, "failed to get uhpck\n"); | ||
| 150 | retval = PTR_ERR(fclk); | ||
| 151 | goto err4; | ||
| 152 | } | ||
| 143 | hclk = clk_get(&pdev->dev, "hclk"); | 153 | hclk = clk_get(&pdev->dev, "hclk"); |
| 154 | if (IS_ERR(hclk)) { | ||
| 155 | dev_err(&pdev->dev, "failed to get hclk\n"); | ||
| 156 | retval = PTR_ERR(hclk); | ||
| 157 | goto err5; | ||
| 158 | } | ||
| 144 | 159 | ||
| 145 | at91_start_hc(pdev); | 160 | at91_start_hc(pdev); |
| 146 | ohci_hcd_init(hcd_to_ohci(hcd)); | 161 | ohci_hcd_init(hcd_to_ohci(hcd)); |
| @@ -153,9 +168,12 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, | |||
| 153 | at91_stop_hc(pdev); | 168 | at91_stop_hc(pdev); |
| 154 | 169 | ||
| 155 | clk_put(hclk); | 170 | clk_put(hclk); |
| 171 | err5: | ||
| 156 | clk_put(fclk); | 172 | clk_put(fclk); |
| 173 | err4: | ||
| 157 | clk_put(iclk); | 174 | clk_put(iclk); |
| 158 | 175 | ||
| 176 | err3: | ||
| 159 | iounmap(hcd->regs); | 177 | iounmap(hcd->regs); |
| 160 | 178 | ||
| 161 | err2: | 179 | err2: |
| @@ -226,7 +244,8 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int | |||
| 226 | if (!gpio_is_valid(pdata->vbus_pin[port])) | 244 | if (!gpio_is_valid(pdata->vbus_pin[port])) |
| 227 | return; | 245 | return; |
| 228 | 246 | ||
| 229 | gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable); | 247 | gpio_set_value(pdata->vbus_pin[port], |
| 248 | !pdata->vbus_pin_active_low[port] ^ enable); | ||
| 230 | } | 249 | } |
| 231 | 250 | ||
| 232 | static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port) | 251 | static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port) |
| @@ -237,7 +256,8 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port) | |||
| 237 | if (!gpio_is_valid(pdata->vbus_pin[port])) | 256 | if (!gpio_is_valid(pdata->vbus_pin[port])) |
| 238 | return -EINVAL; | 257 | return -EINVAL; |
| 239 | 258 | ||
| 240 | return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted; | 259 | return gpio_get_value(pdata->vbus_pin[port]) ^ |
| 260 | !pdata->vbus_pin_active_low[port]; | ||
| 241 | } | 261 | } |
| 242 | 262 | ||
| 243 | /* | 263 | /* |
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c index 5179fcd73d8a..e4bcb62b930a 100644 --- a/drivers/usb/host/ohci-dbg.c +++ b/drivers/usb/host/ohci-dbg.c | |||
| @@ -82,6 +82,14 @@ urb_print(struct urb * urb, char * str, int small, int status) | |||
| 82 | ohci_dbg(ohci,format, ## arg ); \ | 82 | ohci_dbg(ohci,format, ## arg ); \ |
| 83 | } while (0); | 83 | } while (0); |
| 84 | 84 | ||
| 85 | /* Version for use where "next" is the address of a local variable */ | ||
| 86 | #define ohci_dbg_nosw(ohci, next, size, format, arg...) \ | ||
| 87 | do { \ | ||
| 88 | unsigned s_len; \ | ||
| 89 | s_len = scnprintf(*next, *size, format, ## arg); \ | ||
| 90 | *size -= s_len; *next += s_len; \ | ||
| 91 | } while (0); | ||
| 92 | |||
| 85 | 93 | ||
| 86 | static void ohci_dump_intr_mask ( | 94 | static void ohci_dump_intr_mask ( |
| 87 | struct ohci_hcd *ohci, | 95 | struct ohci_hcd *ohci, |
| @@ -653,7 +661,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
| 653 | 661 | ||
| 654 | /* dump driver info, then registers in spec order */ | 662 | /* dump driver info, then registers in spec order */ |
| 655 | 663 | ||
| 656 | ohci_dbg_sw (ohci, &next, &size, | 664 | ohci_dbg_nosw(ohci, &next, &size, |
| 657 | "bus %s, device %s\n" | 665 | "bus %s, device %s\n" |
| 658 | "%s\n" | 666 | "%s\n" |
| 659 | "%s\n", | 667 | "%s\n", |
| @@ -672,7 +680,7 @@ static ssize_t fill_registers_buffer(struct debug_buffer *buf) | |||
| 672 | 680 | ||
| 673 | /* hcca */ | 681 | /* hcca */ |
| 674 | if (ohci->hcca) | 682 | if (ohci->hcca) |
| 675 | ohci_dbg_sw (ohci, &next, &size, | 683 | ohci_dbg_nosw(ohci, &next, &size, |
| 676 | "hcca frame 0x%04x\n", ohci_frame_no(ohci)); | 684 | "hcca frame 0x%04x\n", ohci_frame_no(ohci)); |
| 677 | 685 | ||
| 678 | /* other registers mostly affect frame timings */ | 686 | /* other registers mostly affect frame timings */ |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 6109810cc2d3..1843bb68ac7c 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -397,6 +397,10 @@ static const struct pci_device_id pci_ids [] = { { | |||
| 397 | /* handle any USB OHCI controller */ | 397 | /* handle any USB OHCI controller */ |
| 398 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0), | 398 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0), |
| 399 | .driver_data = (unsigned long) &ohci_pci_hc_driver, | 399 | .driver_data = (unsigned long) &ohci_pci_hc_driver, |
| 400 | }, { | ||
| 401 | /* The device in the ConneXT I/O hub has no class reg */ | ||
| 402 | PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI), | ||
| 403 | .driver_data = (unsigned long) &ohci_pci_hc_driver, | ||
| 400 | }, { /* end: all zeroes */ } | 404 | }, { /* end: all zeroes */ } |
| 401 | }; | 405 | }; |
| 402 | MODULE_DEVICE_TABLE (pci, pci_ids); | 406 | MODULE_DEVICE_TABLE (pci, pci_ids); |
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index b90e1386418b..b62037bff688 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -1204,6 +1204,7 @@ static void handle_vendor_event(struct xhci_hcd *xhci, | |||
| 1204 | * | 1204 | * |
| 1205 | * Returns a zero-based port number, which is suitable for indexing into each of | 1205 | * Returns a zero-based port number, which is suitable for indexing into each of |
| 1206 | * the split roothubs' port arrays and bus state arrays. | 1206 | * the split roothubs' port arrays and bus state arrays. |
| 1207 | * Add one to it in order to call xhci_find_slot_id_by_port. | ||
| 1207 | */ | 1208 | */ |
| 1208 | static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd, | 1209 | static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd, |
| 1209 | struct xhci_hcd *xhci, u32 port_id) | 1210 | struct xhci_hcd *xhci, u32 port_id) |
| @@ -1324,7 +1325,7 @@ static void handle_port_status(struct xhci_hcd *xhci, | |||
| 1324 | xhci_set_link_state(xhci, port_array, faked_port_index, | 1325 | xhci_set_link_state(xhci, port_array, faked_port_index, |
| 1325 | XDEV_U0); | 1326 | XDEV_U0); |
| 1326 | slot_id = xhci_find_slot_id_by_port(hcd, xhci, | 1327 | slot_id = xhci_find_slot_id_by_port(hcd, xhci, |
| 1327 | faked_port_index); | 1328 | faked_port_index + 1); |
| 1328 | if (!slot_id) { | 1329 | if (!slot_id) { |
| 1329 | xhci_dbg(xhci, "slot_id is zero\n"); | 1330 | xhci_dbg(xhci, "slot_id is zero\n"); |
| 1330 | goto cleanup; | 1331 | goto cleanup; |
| @@ -3323,7 +3324,8 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
| 3323 | /* Check TD length */ | 3324 | /* Check TD length */ |
| 3324 | if (running_total != td_len) { | 3325 | if (running_total != td_len) { |
| 3325 | xhci_err(xhci, "ISOC TD length unmatch\n"); | 3326 | xhci_err(xhci, "ISOC TD length unmatch\n"); |
| 3326 | return -EINVAL; | 3327 | ret = -EINVAL; |
| 3328 | goto cleanup; | ||
| 3327 | } | 3329 | } |
| 3328 | } | 3330 | } |
| 3329 | 3331 | ||
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c index d9b6a0355443..da97dcec1f32 100644 --- a/drivers/usb/misc/emi26.c +++ b/drivers/usb/misc/emi26.c | |||
| @@ -37,9 +37,6 @@ static int emi26_set_reset(struct usb_device *dev, unsigned char reset_bit); | |||
| 37 | static int emi26_load_firmware (struct usb_device *dev); | 37 | static int emi26_load_firmware (struct usb_device *dev); |
| 38 | static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *id); | 38 | static int emi26_probe(struct usb_interface *intf, const struct usb_device_id *id); |
| 39 | static void emi26_disconnect(struct usb_interface *intf); | 39 | static void emi26_disconnect(struct usb_interface *intf); |
| 40 | static int __init emi26_init (void); | ||
| 41 | static void __exit emi26_exit (void); | ||
| 42 | |||
| 43 | 40 | ||
| 44 | /* thanks to drivers/usb/serial/keyspan_pda.c code */ | 41 | /* thanks to drivers/usb/serial/keyspan_pda.c code */ |
| 45 | static int emi26_writememory (struct usb_device *dev, int address, | 42 | static int emi26_writememory (struct usb_device *dev, int address, |
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c index 9f39062ebb08..4e0f167a6c4e 100644 --- a/drivers/usb/misc/emi62.c +++ b/drivers/usb/misc/emi62.c | |||
| @@ -46,9 +46,6 @@ static int emi62_set_reset(struct usb_device *dev, unsigned char reset_bit); | |||
| 46 | static int emi62_load_firmware (struct usb_device *dev); | 46 | static int emi62_load_firmware (struct usb_device *dev); |
| 47 | static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *id); | 47 | static int emi62_probe(struct usb_interface *intf, const struct usb_device_id *id); |
| 48 | static void emi62_disconnect(struct usb_interface *intf); | 48 | static void emi62_disconnect(struct usb_interface *intf); |
| 49 | static int __init emi62_init (void); | ||
| 50 | static void __exit emi62_exit (void); | ||
| 51 | |||
| 52 | 49 | ||
| 53 | /* thanks to drivers/usb/serial/keyspan_pda.c code */ | 50 | /* thanks to drivers/usb/serial/keyspan_pda.c code */ |
| 54 | static int emi62_writememory(struct usb_device *dev, int address, | 51 | static int emi62_writememory(struct usb_device *dev, int address, |
diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c index 107bf13b1cf1..b2d82b937392 100644 --- a/drivers/usb/misc/usbsevseg.c +++ b/drivers/usb/misc/usbsevseg.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #define VENDOR_ID 0x0fc5 | 25 | #define VENDOR_ID 0x0fc5 |
| 26 | #define PRODUCT_ID 0x1227 | 26 | #define PRODUCT_ID 0x1227 |
| 27 | #define MAXLEN 6 | 27 | #define MAXLEN 8 |
| 28 | 28 | ||
| 29 | /* table of devices that work with this driver */ | 29 | /* table of devices that work with this driver */ |
| 30 | static const struct usb_device_id id_table[] = { | 30 | static const struct usb_device_id id_table[] = { |
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index f9a3f62a83b5..7c569f51212a 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
| @@ -33,9 +33,6 @@ | |||
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | 35 | ||
| 36 | #include <mach/hardware.h> | ||
| 37 | #include <mach/memory.h> | ||
| 38 | #include <asm/gpio.h> | ||
| 39 | #include <mach/cputype.h> | 36 | #include <mach/cputype.h> |
| 40 | 37 | ||
| 41 | #include <asm/mach-types.h> | 38 | #include <asm/mach-types.h> |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 56cf0243979e..3d11cf64ebd1 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
| @@ -981,6 +981,9 @@ static void musb_shutdown(struct platform_device *pdev) | |||
| 981 | unsigned long flags; | 981 | unsigned long flags; |
| 982 | 982 | ||
| 983 | pm_runtime_get_sync(musb->controller); | 983 | pm_runtime_get_sync(musb->controller); |
| 984 | |||
| 985 | musb_gadget_cleanup(musb); | ||
| 986 | |||
| 984 | spin_lock_irqsave(&musb->lock, flags); | 987 | spin_lock_irqsave(&musb->lock, flags); |
| 985 | musb_platform_disable(musb); | 988 | musb_platform_disable(musb); |
| 986 | musb_generic_disable(musb); | 989 | musb_generic_disable(musb); |
| @@ -1827,8 +1830,6 @@ static void musb_free(struct musb *musb) | |||
| 1827 | sysfs_remove_group(&musb->controller->kobj, &musb_attr_group); | 1830 | sysfs_remove_group(&musb->controller->kobj, &musb_attr_group); |
| 1828 | #endif | 1831 | #endif |
| 1829 | 1832 | ||
| 1830 | musb_gadget_cleanup(musb); | ||
| 1831 | |||
| 1832 | if (musb->nIrq >= 0) { | 1833 | if (musb->nIrq >= 0) { |
| 1833 | if (musb->irq_wake) | 1834 | if (musb->irq_wake) |
| 1834 | disable_irq_wake(musb->nIrq); | 1835 | disable_irq_wake(musb->nIrq); |
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index c27bbbf32b52..df719eae3b03 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
| @@ -222,7 +222,6 @@ static inline void omap2430_low_level_init(struct musb *musb) | |||
| 222 | musb_writel(musb->mregs, OTG_FORCESTDBY, l); | 222 | musb_writel(musb->mregs, OTG_FORCESTDBY, l); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | /* blocking notifier support */ | ||
| 226 | static int musb_otg_notifications(struct notifier_block *nb, | 225 | static int musb_otg_notifications(struct notifier_block *nb, |
| 227 | unsigned long event, void *unused) | 226 | unsigned long event, void *unused) |
| 228 | { | 227 | { |
| @@ -231,7 +230,7 @@ static int musb_otg_notifications(struct notifier_block *nb, | |||
| 231 | musb->xceiv_event = event; | 230 | musb->xceiv_event = event; |
| 232 | schedule_work(&musb->otg_notifier_work); | 231 | schedule_work(&musb->otg_notifier_work); |
| 233 | 232 | ||
| 234 | return 0; | 233 | return NOTIFY_OK; |
| 235 | } | 234 | } |
| 236 | 235 | ||
| 237 | static void musb_otg_notifier_work(struct work_struct *data_notifier_work) | 236 | static void musb_otg_notifier_work(struct work_struct *data_notifier_work) |
| @@ -386,6 +385,7 @@ static void omap2430_musb_disable(struct musb *musb) | |||
| 386 | static int omap2430_musb_exit(struct musb *musb) | 385 | static int omap2430_musb_exit(struct musb *musb) |
| 387 | { | 386 | { |
| 388 | del_timer_sync(&musb_idle_timer); | 387 | del_timer_sync(&musb_idle_timer); |
| 388 | cancel_work_sync(&musb->otg_notifier_work); | ||
| 389 | 389 | ||
| 390 | omap2430_low_level_exit(musb); | 390 | omap2430_low_level_exit(musb); |
| 391 | otg_put_transceiver(musb->xceiv); | 391 | otg_put_transceiver(musb->xceiv); |
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 2a25955881fc..76d629345418 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig | |||
| @@ -86,20 +86,6 @@ config NOP_USB_XCEIV | |||
| 86 | built-in with usb ip or which are autonomous and doesn't require any | 86 | built-in with usb ip or which are autonomous and doesn't require any |
| 87 | phy programming such as ISP1x04 etc. | 87 | phy programming such as ISP1x04 etc. |
| 88 | 88 | ||
| 89 | config USB_LANGWELL_OTG | ||
| 90 | tristate "Intel Langwell USB OTG dual-role support" | ||
| 91 | depends on USB && PCI && INTEL_SCU_IPC | ||
| 92 | select USB_OTG | ||
| 93 | select USB_OTG_UTILS | ||
| 94 | help | ||
| 95 | Say Y here if you want to build Intel Langwell USB OTG | ||
| 96 | transciever driver in kernel. This driver implements role | ||
| 97 | switch between EHCI host driver and Langwell USB OTG | ||
| 98 | client driver. | ||
| 99 | |||
| 100 | To compile this driver as a module, choose M here: the | ||
| 101 | module will be called langwell_otg. | ||
| 102 | |||
| 103 | config USB_MSM_OTG | 89 | config USB_MSM_OTG |
| 104 | tristate "OTG support for Qualcomm on-chip USB controller" | 90 | tristate "OTG support for Qualcomm on-chip USB controller" |
| 105 | depends on (USB || USB_GADGET) && ARCH_MSM | 91 | depends on (USB || USB_GADGET) && ARCH_MSM |
| @@ -124,7 +110,7 @@ config AB8500_USB | |||
| 124 | 110 | ||
| 125 | config FSL_USB2_OTG | 111 | config FSL_USB2_OTG |
| 126 | bool "Freescale USB OTG Transceiver Driver" | 112 | bool "Freescale USB OTG Transceiver Driver" |
| 127 | depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 | 113 | depends on USB_EHCI_FSL && USB_GADGET_FSL_USB2 && USB_SUSPEND |
| 128 | select USB_OTG | 114 | select USB_OTG |
| 129 | select USB_OTG_UTILS | 115 | select USB_OTG_UTILS |
| 130 | help | 116 | help |
| @@ -132,7 +118,7 @@ config FSL_USB2_OTG | |||
| 132 | 118 | ||
| 133 | config USB_MV_OTG | 119 | config USB_MV_OTG |
| 134 | tristate "Marvell USB OTG support" | 120 | tristate "Marvell USB OTG support" |
| 135 | depends on USB_MV_UDC | 121 | depends on USB_MV_UDC && USB_SUSPEND |
| 136 | select USB_OTG | 122 | select USB_OTG |
| 137 | select USB_OTG_UTILS | 123 | select USB_OTG_UTILS |
| 138 | help | 124 | help |
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile index b2c5a9598637..41aa5098b139 100644 --- a/drivers/usb/otg/Makefile +++ b/drivers/usb/otg/Makefile | |||
| @@ -13,7 +13,6 @@ obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o | |||
| 13 | obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o | 13 | obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o |
| 14 | obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o | 14 | obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o |
| 15 | obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o | 15 | obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o |
| 16 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o | ||
| 17 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o | 16 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o |
| 18 | obj-$(CONFIG_USB_ULPI) += ulpi.o | 17 | obj-$(CONFIG_USB_ULPI) += ulpi.o |
| 19 | obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o | 18 | obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o |
diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c deleted file mode 100644 index f08f784086f7..000000000000 --- a/drivers/usb/otg/langwell_otg.c +++ /dev/null | |||
| @@ -1,2347 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Intel Langwell USB OTG transceiver driver | ||
| 3 | * Copyright (C) 2008 - 2010, Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, write to the Free Software Foundation, Inc., | ||
| 16 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 17 | * | ||
| 18 | */ | ||
| 19 | /* This driver helps to switch Langwell OTG controller function between host | ||
| 20 | * and peripheral. It works with EHCI driver and Langwell client controller | ||
| 21 | * driver together. | ||
| 22 | */ | ||
| 23 | #include <linux/module.h> | ||
| 24 | #include <linux/init.h> | ||
| 25 | #include <linux/pci.h> | ||
| 26 | #include <linux/errno.h> | ||
| 27 | #include <linux/interrupt.h> | ||
| 28 | #include <linux/kernel.h> | ||
| 29 | #include <linux/device.h> | ||
| 30 | #include <linux/moduleparam.h> | ||
| 31 | #include <linux/usb/ch9.h> | ||
| 32 | #include <linux/usb/gadget.h> | ||
| 33 | #include <linux/usb.h> | ||
| 34 | #include <linux/usb/otg.h> | ||
| 35 | #include <linux/usb/hcd.h> | ||
| 36 | #include <linux/notifier.h> | ||
| 37 | #include <linux/delay.h> | ||
| 38 | #include <asm/intel_scu_ipc.h> | ||
| 39 | |||
| 40 | #include <linux/usb/langwell_otg.h> | ||
| 41 | |||
| 42 | #define DRIVER_DESC "Intel Langwell USB OTG transceiver driver" | ||
| 43 | #define DRIVER_VERSION "July 10, 2010" | ||
| 44 | |||
| 45 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
| 46 | MODULE_AUTHOR("Henry Yuan <hang.yuan@intel.com>, Hao Wu <hao.wu@intel.com>"); | ||
| 47 | MODULE_VERSION(DRIVER_VERSION); | ||
| 48 | MODULE_LICENSE("GPL"); | ||
| 49 | |||
| 50 | static const char driver_name[] = "langwell_otg"; | ||
| 51 | |||
| 52 | static int langwell_otg_probe(struct pci_dev *pdev, | ||
| 53 | const struct pci_device_id *id); | ||
| 54 | static void langwell_otg_remove(struct pci_dev *pdev); | ||
| 55 | static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message); | ||
| 56 | static int langwell_otg_resume(struct pci_dev *pdev); | ||
| 57 | |||
| 58 | static int langwell_otg_set_host(struct otg_transceiver *otg, | ||
| 59 | struct usb_bus *host); | ||
| 60 | static int langwell_otg_set_peripheral(struct otg_transceiver *otg, | ||
| 61 | struct usb_gadget *gadget); | ||
| 62 | static int langwell_otg_start_srp(struct otg_transceiver *otg); | ||
| 63 | |||
| 64 | static const struct pci_device_id pci_ids[] = {{ | ||
| 65 | .class = ((PCI_CLASS_SERIAL_USB << 8) | 0xfe), | ||
| 66 | .class_mask = ~0, | ||
| 67 | .vendor = 0x8086, | ||
| 68 | .device = 0x0811, | ||
| 69 | .subvendor = PCI_ANY_ID, | ||
| 70 | .subdevice = PCI_ANY_ID, | ||
| 71 | }, { /* end: all zeroes */ } | ||
| 72 | }; | ||
| 73 | |||
| 74 | static struct pci_driver otg_pci_driver = { | ||
| 75 | .name = (char *) driver_name, | ||
| 76 | .id_table = pci_ids, | ||
| 77 | |||
| 78 | .probe = langwell_otg_probe, | ||
| 79 | .remove = langwell_otg_remove, | ||
| 80 | |||
| 81 | .suspend = langwell_otg_suspend, | ||
| 82 | .resume = langwell_otg_resume, | ||
| 83 | }; | ||
| 84 | |||
| 85 | /* HSM timers */ | ||
| 86 | static inline struct langwell_otg_timer *otg_timer_initializer | ||
| 87 | (void (*function)(unsigned long), unsigned long expires, unsigned long data) | ||
| 88 | { | ||
| 89 | struct langwell_otg_timer *timer; | ||
| 90 | timer = kmalloc(sizeof(struct langwell_otg_timer), GFP_KERNEL); | ||
| 91 | if (timer == NULL) | ||
| 92 | return timer; | ||
| 93 | |||
| 94 | timer->function = function; | ||
| 95 | timer->expires = expires; | ||
| 96 | timer->data = data; | ||
| 97 | return timer; | ||
| 98 | } | ||
| 99 | |||
| 100 | static struct langwell_otg_timer *a_wait_vrise_tmr, *a_aidl_bdis_tmr, | ||
| 101 | *b_se0_srp_tmr, *b_srp_init_tmr; | ||
| 102 | |||
| 103 | static struct list_head active_timers; | ||
| 104 | |||
| 105 | static struct langwell_otg *the_transceiver; | ||
| 106 | |||
| 107 | /* host/client notify transceiver when event affects HNP state */ | ||
| 108 | void langwell_update_transceiver(void) | ||
| 109 | { | ||
| 110 | struct langwell_otg *lnw = the_transceiver; | ||
| 111 | |||
| 112 | dev_dbg(lnw->dev, "transceiver is updated\n"); | ||
| 113 | |||
| 114 | if (!lnw->qwork) | ||
| 115 | return ; | ||
| 116 | |||
| 117 | queue_work(lnw->qwork, &lnw->work); | ||
| 118 | } | ||
| 119 | EXPORT_SYMBOL(langwell_update_transceiver); | ||
| 120 | |||
| 121 | static int langwell_otg_set_host(struct otg_transceiver *otg, | ||
| 122 | struct usb_bus *host) | ||
| 123 | { | ||
| 124 | otg->host = host; | ||
| 125 | |||
| 126 | return 0; | ||
| 127 | } | ||
| 128 | |||
| 129 | static int langwell_otg_set_peripheral(struct otg_transceiver *otg, | ||
| 130 | struct usb_gadget *gadget) | ||
| 131 | { | ||
| 132 | otg->gadget = gadget; | ||
| 133 | |||
| 134 | return 0; | ||
| 135 | } | ||
| 136 | |||
| 137 | static int langwell_otg_set_power(struct otg_transceiver *otg, | ||
| 138 | unsigned mA) | ||
| 139 | { | ||
| 140 | return 0; | ||
| 141 | } | ||
| 142 | |||
| 143 | /* A-device drives vbus, controlled through IPC commands */ | ||
| 144 | static int langwell_otg_set_vbus(struct otg_transceiver *otg, bool enabled) | ||
| 145 | { | ||
| 146 | struct langwell_otg *lnw = the_transceiver; | ||
| 147 | u8 sub_id; | ||
| 148 | |||
| 149 | dev_dbg(lnw->dev, "%s <--- %s\n", __func__, enabled ? "on" : "off"); | ||
| 150 | |||
| 151 | if (enabled) | ||
| 152 | sub_id = 0x8; /* Turn on the VBus */ | ||
| 153 | else | ||
| 154 | sub_id = 0x9; /* Turn off the VBus */ | ||
| 155 | |||
| 156 | if (intel_scu_ipc_simple_command(0xef, sub_id)) { | ||
| 157 | dev_dbg(lnw->dev, "Failed to set Vbus via IPC commands\n"); | ||
| 158 | return -EBUSY; | ||
| 159 | } | ||
| 160 | |||
| 161 | dev_dbg(lnw->dev, "%s --->\n", __func__); | ||
| 162 | |||
| 163 | return 0; | ||
| 164 | } | ||
| 165 | |||
| 166 | /* charge vbus or discharge vbus through a resistor to ground */ | ||
| 167 | static void langwell_otg_chrg_vbus(int on) | ||
| 168 | { | ||
| 169 | struct langwell_otg *lnw = the_transceiver; | ||
| 170 | u32 val; | ||
| 171 | |||
| 172 | val = readl(lnw->iotg.base + CI_OTGSC); | ||
| 173 | |||
| 174 | if (on) | ||
| 175 | writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VC, | ||
| 176 | lnw->iotg.base + CI_OTGSC); | ||
| 177 | else | ||
| 178 | writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_VD, | ||
| 179 | lnw->iotg.base + CI_OTGSC); | ||
| 180 | } | ||
| 181 | |||
| 182 | /* Start SRP */ | ||
| 183 | static int langwell_otg_start_srp(struct otg_transceiver *otg) | ||
| 184 | { | ||
| 185 | struct langwell_otg *lnw = the_transceiver; | ||
| 186 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 187 | u32 val; | ||
| 188 | |||
| 189 | dev_dbg(lnw->dev, "%s --->\n", __func__); | ||
| 190 | |||
| 191 | val = readl(iotg->base + CI_OTGSC); | ||
| 192 | |||
| 193 | writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HADP, | ||
| 194 | iotg->base + CI_OTGSC); | ||
| 195 | |||
| 196 | /* Check if the data plus is finished or not */ | ||
| 197 | msleep(8); | ||
| 198 | val = readl(iotg->base + CI_OTGSC); | ||
| 199 | if (val & (OTGSC_HADP | OTGSC_DP)) | ||
| 200 | dev_dbg(lnw->dev, "DataLine SRP Error\n"); | ||
| 201 | |||
| 202 | /* Disable interrupt - b_sess_vld */ | ||
| 203 | val = readl(iotg->base + CI_OTGSC); | ||
| 204 | val &= (~(OTGSC_BSVIE | OTGSC_BSEIE)); | ||
| 205 | writel(val, iotg->base + CI_OTGSC); | ||
| 206 | |||
| 207 | /* Start VBus SRP, drive vbus to generate VBus pulse */ | ||
| 208 | iotg->otg.set_vbus(&iotg->otg, true); | ||
| 209 | msleep(15); | ||
| 210 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 211 | |||
| 212 | /* Enable interrupt - b_sess_vld*/ | ||
| 213 | val = readl(iotg->base + CI_OTGSC); | ||
| 214 | dev_dbg(lnw->dev, "after VBUS pulse otgsc = %x\n", val); | ||
| 215 | |||
| 216 | val |= (OTGSC_BSVIE | OTGSC_BSEIE); | ||
| 217 | writel(val, iotg->base + CI_OTGSC); | ||
| 218 | |||
| 219 | /* If Vbus is valid, then update the hsm */ | ||
| 220 | if (val & OTGSC_BSV) { | ||
| 221 | dev_dbg(lnw->dev, "no b_sess_vld interrupt\n"); | ||
| 222 | |||
| 223 | lnw->iotg.hsm.b_sess_vld = 1; | ||
| 224 | langwell_update_transceiver(); | ||
| 225 | } | ||
| 226 | |||
| 227 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 228 | return 0; | ||
| 229 | } | ||
| 230 | |||
| 231 | /* stop SOF via bus_suspend */ | ||
| 232 | static void langwell_otg_loc_sof(int on) | ||
| 233 | { | ||
| 234 | struct langwell_otg *lnw = the_transceiver; | ||
| 235 | struct usb_hcd *hcd; | ||
| 236 | int err; | ||
| 237 | |||
| 238 | dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "suspend" : "resume"); | ||
| 239 | |||
| 240 | hcd = bus_to_hcd(lnw->iotg.otg.host); | ||
| 241 | if (on) | ||
| 242 | err = hcd->driver->bus_resume(hcd); | ||
| 243 | else | ||
| 244 | err = hcd->driver->bus_suspend(hcd); | ||
| 245 | |||
| 246 | if (err) | ||
| 247 | dev_dbg(lnw->dev, "Fail to resume/suspend USB bus - %d\n", err); | ||
| 248 | |||
| 249 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 250 | } | ||
| 251 | |||
| 252 | static int langwell_otg_check_otgsc(void) | ||
| 253 | { | ||
| 254 | struct langwell_otg *lnw = the_transceiver; | ||
| 255 | u32 otgsc, usbcfg; | ||
| 256 | |||
| 257 | dev_dbg(lnw->dev, "check sync OTGSC and USBCFG registers\n"); | ||
| 258 | |||
| 259 | otgsc = readl(lnw->iotg.base + CI_OTGSC); | ||
| 260 | usbcfg = readl(lnw->usbcfg); | ||
| 261 | |||
| 262 | dev_dbg(lnw->dev, "OTGSC = %08x, USBCFG = %08x\n", | ||
| 263 | otgsc, usbcfg); | ||
| 264 | dev_dbg(lnw->dev, "OTGSC_AVV = %d\n", !!(otgsc & OTGSC_AVV)); | ||
| 265 | dev_dbg(lnw->dev, "USBCFG.VBUSVAL = %d\n", | ||
| 266 | !!(usbcfg & USBCFG_VBUSVAL)); | ||
| 267 | dev_dbg(lnw->dev, "OTGSC_ASV = %d\n", !!(otgsc & OTGSC_ASV)); | ||
| 268 | dev_dbg(lnw->dev, "USBCFG.AVALID = %d\n", | ||
| 269 | !!(usbcfg & USBCFG_AVALID)); | ||
| 270 | dev_dbg(lnw->dev, "OTGSC_BSV = %d\n", !!(otgsc & OTGSC_BSV)); | ||
| 271 | dev_dbg(lnw->dev, "USBCFG.BVALID = %d\n", | ||
| 272 | !!(usbcfg & USBCFG_BVALID)); | ||
| 273 | dev_dbg(lnw->dev, "OTGSC_BSE = %d\n", !!(otgsc & OTGSC_BSE)); | ||
| 274 | dev_dbg(lnw->dev, "USBCFG.SESEND = %d\n", | ||
| 275 | !!(usbcfg & USBCFG_SESEND)); | ||
| 276 | |||
| 277 | /* Check USBCFG VBusValid/AValid/BValid/SessEnd */ | ||
| 278 | if (!!(otgsc & OTGSC_AVV) ^ !!(usbcfg & USBCFG_VBUSVAL)) { | ||
| 279 | dev_dbg(lnw->dev, "OTGSC.AVV != USBCFG.VBUSVAL\n"); | ||
| 280 | goto err; | ||
| 281 | } | ||
| 282 | if (!!(otgsc & OTGSC_ASV) ^ !!(usbcfg & USBCFG_AVALID)) { | ||
| 283 | dev_dbg(lnw->dev, "OTGSC.ASV != USBCFG.AVALID\n"); | ||
| 284 | goto err; | ||
| 285 | } | ||
| 286 | if (!!(otgsc & OTGSC_BSV) ^ !!(usbcfg & USBCFG_BVALID)) { | ||
| 287 | dev_dbg(lnw->dev, "OTGSC.BSV != USBCFG.BVALID\n"); | ||
| 288 | goto err; | ||
| 289 | } | ||
| 290 | if (!!(otgsc & OTGSC_BSE) ^ !!(usbcfg & USBCFG_SESEND)) { | ||
| 291 | dev_dbg(lnw->dev, "OTGSC.BSE != USBCFG.SESSEN\n"); | ||
| 292 | goto err; | ||
| 293 | } | ||
| 294 | |||
| 295 | dev_dbg(lnw->dev, "OTGSC and USBCFG are synced\n"); | ||
| 296 | |||
| 297 | return 0; | ||
| 298 | |||
| 299 | err: | ||
| 300 | dev_warn(lnw->dev, "OTGSC isn't equal to USBCFG\n"); | ||
| 301 | return -EPIPE; | ||
| 302 | } | ||
| 303 | |||
| 304 | |||
| 305 | static void langwell_otg_phy_low_power(int on) | ||
| 306 | { | ||
| 307 | struct langwell_otg *lnw = the_transceiver; | ||
| 308 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 309 | u8 val, phcd; | ||
| 310 | int retval; | ||
| 311 | |||
| 312 | dev_dbg(lnw->dev, "%s ---> %s mode\n", | ||
| 313 | __func__, on ? "Low power" : "Normal"); | ||
| 314 | |||
| 315 | phcd = 0x40; | ||
| 316 | |||
| 317 | val = readb(iotg->base + CI_HOSTPC1 + 2); | ||
| 318 | |||
| 319 | if (on) { | ||
| 320 | /* Due to hardware issue, after set PHCD, sync will failed | ||
| 321 | * between USBCFG and OTGSC, so before set PHCD, check if | ||
| 322 | * sync is in process now. If the answer is "yes", then do | ||
| 323 | * not touch PHCD bit */ | ||
| 324 | retval = langwell_otg_check_otgsc(); | ||
| 325 | if (retval) { | ||
| 326 | dev_dbg(lnw->dev, "Skip PHCD programming..\n"); | ||
| 327 | return ; | ||
| 328 | } | ||
| 329 | |||
| 330 | writeb(val | phcd, iotg->base + CI_HOSTPC1 + 2); | ||
| 331 | } else | ||
| 332 | writeb(val & ~phcd, iotg->base + CI_HOSTPC1 + 2); | ||
| 333 | |||
| 334 | dev_dbg(lnw->dev, "%s <--- done\n", __func__); | ||
| 335 | } | ||
| 336 | |||
| 337 | /* After drv vbus, add 5 ms delay to set PHCD */ | ||
| 338 | static void langwell_otg_phy_low_power_wait(int on) | ||
| 339 | { | ||
| 340 | struct langwell_otg *lnw = the_transceiver; | ||
| 341 | |||
| 342 | dev_dbg(lnw->dev, "add 5ms delay before programing PHCD\n"); | ||
| 343 | |||
| 344 | mdelay(5); | ||
| 345 | langwell_otg_phy_low_power(on); | ||
| 346 | } | ||
| 347 | |||
| 348 | /* Enable/Disable OTG interrupt */ | ||
| 349 | static void langwell_otg_intr(int on) | ||
| 350 | { | ||
| 351 | struct langwell_otg *lnw = the_transceiver; | ||
| 352 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 353 | u32 val; | ||
| 354 | |||
| 355 | dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off"); | ||
| 356 | |||
| 357 | val = readl(iotg->base + CI_OTGSC); | ||
| 358 | |||
| 359 | /* OTGSC_INT_MASK doesn't contains 1msInt */ | ||
| 360 | if (on) { | ||
| 361 | val = val | (OTGSC_INT_MASK); | ||
| 362 | writel(val, iotg->base + CI_OTGSC); | ||
| 363 | } else { | ||
| 364 | val = val & ~(OTGSC_INT_MASK); | ||
| 365 | writel(val, iotg->base + CI_OTGSC); | ||
| 366 | } | ||
| 367 | |||
| 368 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 369 | } | ||
| 370 | |||
| 371 | /* set HAAR: Hardware Assist Auto-Reset */ | ||
| 372 | static void langwell_otg_HAAR(int on) | ||
| 373 | { | ||
| 374 | struct langwell_otg *lnw = the_transceiver; | ||
| 375 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 376 | u32 val; | ||
| 377 | |||
| 378 | dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off"); | ||
| 379 | |||
| 380 | val = readl(iotg->base + CI_OTGSC); | ||
| 381 | if (on) | ||
| 382 | writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HAAR, | ||
| 383 | iotg->base + CI_OTGSC); | ||
| 384 | else | ||
| 385 | writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HAAR, | ||
| 386 | iotg->base + CI_OTGSC); | ||
| 387 | |||
| 388 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 389 | } | ||
| 390 | |||
| 391 | /* set HABA: Hardware Assist B-Disconnect to A-Connect */ | ||
| 392 | static void langwell_otg_HABA(int on) | ||
| 393 | { | ||
| 394 | struct langwell_otg *lnw = the_transceiver; | ||
| 395 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 396 | u32 val; | ||
| 397 | |||
| 398 | dev_dbg(lnw->dev, "%s ---> %s\n", __func__, on ? "on" : "off"); | ||
| 399 | |||
| 400 | val = readl(iotg->base + CI_OTGSC); | ||
| 401 | if (on) | ||
| 402 | writel((val & ~OTGSC_INTSTS_MASK) | OTGSC_HABA, | ||
| 403 | iotg->base + CI_OTGSC); | ||
| 404 | else | ||
| 405 | writel((val & ~OTGSC_INTSTS_MASK) & ~OTGSC_HABA, | ||
| 406 | iotg->base + CI_OTGSC); | ||
| 407 | |||
| 408 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 409 | } | ||
| 410 | |||
| 411 | static int langwell_otg_check_se0_srp(int on) | ||
| 412 | { | ||
| 413 | struct langwell_otg *lnw = the_transceiver; | ||
| 414 | int delay_time = TB_SE0_SRP * 10; | ||
| 415 | u32 val; | ||
| 416 | |||
| 417 | dev_dbg(lnw->dev, "%s --->\n", __func__); | ||
| 418 | |||
| 419 | do { | ||
| 420 | udelay(100); | ||
| 421 | if (!delay_time--) | ||
| 422 | break; | ||
| 423 | val = readl(lnw->iotg.base + CI_PORTSC1); | ||
| 424 | val &= PORTSC_LS; | ||
| 425 | } while (!val); | ||
| 426 | |||
| 427 | dev_dbg(lnw->dev, "%s <---\n", __func__); | ||
| 428 | return val; | ||
| 429 | } | ||
| 430 | |||
| 431 | /* The timeout callback function to set time out bit */ | ||
| 432 | static void set_tmout(unsigned long indicator) | ||
| 433 | { | ||
| 434 | *(int *)indicator = 1; | ||
| 435 | } | ||
| 436 | |||
| 437 | void langwell_otg_nsf_msg(unsigned long indicator) | ||
| 438 | { | ||
| 439 | struct langwell_otg *lnw = the_transceiver; | ||
| 440 | |||
| 441 | switch (indicator) { | ||
| 442 | case 2: | ||
| 443 | case 4: | ||
| 444 | case 6: | ||
| 445 | case 7: | ||
| 446 | dev_warn(lnw->dev, | ||
| 447 | "OTG:NSF-%lu - deivce not responding\n", indicator); | ||
| 448 | break; | ||
| 449 | case 3: | ||
| 450 | dev_warn(lnw->dev, | ||
| 451 | "OTG:NSF-%lu - deivce not supported\n", indicator); | ||
| 452 | break; | ||
| 453 | default: | ||
| 454 | dev_warn(lnw->dev, "Do not have this kind of NSF\n"); | ||
| 455 | break; | ||
| 456 | } | ||
| 457 | } | ||
| 458 | |||
| 459 | /* Initialize timers */ | ||
| 460 | static int langwell_otg_init_timers(struct otg_hsm *hsm) | ||
| 461 | { | ||
| 462 | /* HSM used timers */ | ||
| 463 | a_wait_vrise_tmr = otg_timer_initializer(&set_tmout, TA_WAIT_VRISE, | ||
| 464 | (unsigned long)&hsm->a_wait_vrise_tmout); | ||
| 465 | if (a_wait_vrise_tmr == NULL) | ||
| 466 | return -ENOMEM; | ||
| 467 | a_aidl_bdis_tmr = otg_timer_initializer(&set_tmout, TA_AIDL_BDIS, | ||
| 468 | (unsigned long)&hsm->a_aidl_bdis_tmout); | ||
| 469 | if (a_aidl_bdis_tmr == NULL) | ||
| 470 | return -ENOMEM; | ||
| 471 | b_se0_srp_tmr = otg_timer_initializer(&set_tmout, TB_SE0_SRP, | ||
| 472 | (unsigned long)&hsm->b_se0_srp); | ||
| 473 | if (b_se0_srp_tmr == NULL) | ||
| 474 | return -ENOMEM; | ||
| 475 | b_srp_init_tmr = otg_timer_initializer(&set_tmout, TB_SRP_INIT, | ||
| 476 | (unsigned long)&hsm->b_srp_init_tmout); | ||
| 477 | if (b_srp_init_tmr == NULL) | ||
| 478 | return -ENOMEM; | ||
| 479 | |||
| 480 | return 0; | ||
| 481 | } | ||
| 482 | |||
| 483 | /* Free timers */ | ||
| 484 | static void langwell_otg_free_timers(void) | ||
| 485 | { | ||
| 486 | kfree(a_wait_vrise_tmr); | ||
| 487 | kfree(a_aidl_bdis_tmr); | ||
| 488 | kfree(b_se0_srp_tmr); | ||
| 489 | kfree(b_srp_init_tmr); | ||
| 490 | } | ||
| 491 | |||
| 492 | /* The timeout callback function to set time out bit */ | ||
| 493 | static void langwell_otg_timer_fn(unsigned long indicator) | ||
| 494 | { | ||
| 495 | struct langwell_otg *lnw = the_transceiver; | ||
| 496 | |||
| 497 | *(int *)indicator = 1; | ||
| 498 | |||
| 499 | dev_dbg(lnw->dev, "kernel timer - timeout\n"); | ||
| 500 | |||
| 501 | langwell_update_transceiver(); | ||
| 502 | } | ||
| 503 | |||
| 504 | /* kernel timer used instead of HW based interrupt */ | ||
| 505 | static void langwell_otg_add_ktimer(enum langwell_otg_timer_type timers) | ||
| 506 | { | ||
| 507 | struct langwell_otg *lnw = the_transceiver; | ||
| 508 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 509 | unsigned long j = jiffies; | ||
| 510 | unsigned long data, time; | ||
| 511 | |||
| 512 | switch (timers) { | ||
| 513 | case TA_WAIT_VRISE_TMR: | ||
| 514 | iotg->hsm.a_wait_vrise_tmout = 0; | ||
| 515 | data = (unsigned long)&iotg->hsm.a_wait_vrise_tmout; | ||
| 516 | time = TA_WAIT_VRISE; | ||
| 517 | break; | ||
| 518 | case TA_WAIT_BCON_TMR: | ||
| 519 | iotg->hsm.a_wait_bcon_tmout = 0; | ||
| 520 | data = (unsigned long)&iotg->hsm.a_wait_bcon_tmout; | ||
| 521 | time = TA_WAIT_BCON; | ||
| 522 | break; | ||
| 523 | case TA_AIDL_BDIS_TMR: | ||
| 524 | iotg->hsm.a_aidl_bdis_tmout = 0; | ||
| 525 | data = (unsigned long)&iotg->hsm.a_aidl_bdis_tmout; | ||
| 526 | time = TA_AIDL_BDIS; | ||
| 527 | break; | ||
| 528 | case TB_ASE0_BRST_TMR: | ||
| 529 | iotg->hsm.b_ase0_brst_tmout = 0; | ||
| 530 | data = (unsigned long)&iotg->hsm.b_ase0_brst_tmout; | ||
| 531 | time = TB_ASE0_BRST; | ||
| 532 | break; | ||
| 533 | case TB_SRP_INIT_TMR: | ||
| 534 | iotg->hsm.b_srp_init_tmout = 0; | ||
| 535 | data = (unsigned long)&iotg->hsm.b_srp_init_tmout; | ||
| 536 | time = TB_SRP_INIT; | ||
| 537 | break; | ||
| 538 | case TB_SRP_FAIL_TMR: | ||
| 539 | iotg->hsm.b_srp_fail_tmout = 0; | ||
| 540 | data = (unsigned long)&iotg->hsm.b_srp_fail_tmout; | ||
| 541 | time = TB_SRP_FAIL; | ||
| 542 | break; | ||
| 543 | case TB_BUS_SUSPEND_TMR: | ||
| 544 | iotg->hsm.b_bus_suspend_tmout = 0; | ||
| 545 | data = (unsigned long)&iotg->hsm.b_bus_suspend_tmout; | ||
| 546 | time = TB_BUS_SUSPEND; | ||
| 547 | break; | ||
| 548 | default: | ||
| 549 | dev_dbg(lnw->dev, "unknown timer, cannot enable it\n"); | ||
| 550 | return; | ||
| 551 | } | ||
| 552 | |||
| 553 | lnw->hsm_timer.data = data; | ||
| 554 | lnw->hsm_timer.function = langwell_otg_timer_fn; | ||
| 555 | lnw->hsm_timer.expires = j + time * HZ / 1000; /* milliseconds */ | ||
| 556 | |||
| 557 | add_timer(&lnw->hsm_timer); | ||
| 558 | |||
| 559 | dev_dbg(lnw->dev, "add timer successfully\n"); | ||
| 560 | } | ||
| 561 | |||
| 562 | /* Add timer to timer list */ | ||
| 563 | static void langwell_otg_add_timer(void *gtimer) | ||
| 564 | { | ||
| 565 | struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer; | ||
| 566 | struct langwell_otg_timer *tmp_timer; | ||
| 567 | struct intel_mid_otg_xceiv *iotg = &the_transceiver->iotg; | ||
| 568 | u32 val32; | ||
| 569 | |||
| 570 | /* Check if the timer is already in the active list, | ||
| 571 | * if so update timer count | ||
| 572 | */ | ||
| 573 | list_for_each_entry(tmp_timer, &active_timers, list) | ||
| 574 | if (tmp_timer == timer) { | ||
| 575 | timer->count = timer->expires; | ||
| 576 | return; | ||
| 577 | } | ||
| 578 | timer->count = timer->expires; | ||
| 579 | |||
| 580 | if (list_empty(&active_timers)) { | ||
| 581 | val32 = readl(iotg->base + CI_OTGSC); | ||
| 582 | writel(val32 | OTGSC_1MSE, iotg->base + CI_OTGSC); | ||
| 583 | } | ||
| 584 | |||
| 585 | list_add_tail(&timer->list, &active_timers); | ||
| 586 | } | ||
| 587 | |||
| 588 | /* Remove timer from the timer list; clear timeout status */ | ||
| 589 | static void langwell_otg_del_timer(void *gtimer) | ||
| 590 | { | ||
| 591 | struct langwell_otg *lnw = the_transceiver; | ||
| 592 | struct langwell_otg_timer *timer = (struct langwell_otg_timer *)gtimer; | ||
| 593 | struct langwell_otg_timer *tmp_timer, *del_tmp; | ||
| 594 | u32 val32; | ||
| 595 | |||
| 596 | list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) | ||
| 597 | if (tmp_timer == timer) | ||
| 598 | list_del(&timer->list); | ||
| 599 | |||
| 600 | if (list_empty(&active_timers)) { | ||
| 601 | val32 = readl(lnw->iotg.base + CI_OTGSC); | ||
| 602 | writel(val32 & ~OTGSC_1MSE, lnw->iotg.base + CI_OTGSC); | ||
| 603 | } | ||
| 604 | } | ||
| 605 | |||
| 606 | /* Reduce timer count by 1, and find timeout conditions.*/ | ||
| 607 | static int langwell_otg_tick_timer(u32 *int_sts) | ||
| 608 | { | ||
| 609 | struct langwell_otg *lnw = the_transceiver; | ||
| 610 | struct langwell_otg_timer *tmp_timer, *del_tmp; | ||
| 611 | int expired = 0; | ||
| 612 | |||
| 613 | list_for_each_entry_safe(tmp_timer, del_tmp, &active_timers, list) { | ||
| 614 | tmp_timer->count--; | ||
| 615 | /* check if timer expires */ | ||
| 616 | if (!tmp_timer->count) { | ||
| 617 | list_del(&tmp_timer->list); | ||
| 618 | tmp_timer->function(tmp_timer->data); | ||
| 619 | expired = 1; | ||
| 620 | } | ||
| 621 | } | ||
| 622 | |||
| 623 | if (list_empty(&active_timers)) { | ||
| 624 | dev_dbg(lnw->dev, "tick timer: disable 1ms int\n"); | ||
| 625 | *int_sts = *int_sts & ~OTGSC_1MSE; | ||
| 626 | } | ||
| 627 | return expired; | ||
| 628 | } | ||
| 629 | |||
| 630 | static void reset_otg(void) | ||
| 631 | { | ||
| 632 | struct langwell_otg *lnw = the_transceiver; | ||
| 633 | int delay_time = 1000; | ||
| 634 | u32 val; | ||
| 635 | |||
| 636 | dev_dbg(lnw->dev, "reseting OTG controller ...\n"); | ||
| 637 | val = readl(lnw->iotg.base + CI_USBCMD); | ||
| 638 | writel(val | USBCMD_RST, lnw->iotg.base + CI_USBCMD); | ||
| 639 | do { | ||
| 640 | udelay(100); | ||
| 641 | if (!delay_time--) | ||
| 642 | dev_dbg(lnw->dev, "reset timeout\n"); | ||
| 643 | val = readl(lnw->iotg.base + CI_USBCMD); | ||
| 644 | val &= USBCMD_RST; | ||
| 645 | } while (val != 0); | ||
| 646 | dev_dbg(lnw->dev, "reset done.\n"); | ||
| 647 | } | ||
| 648 | |||
| 649 | static void set_host_mode(void) | ||
| 650 | { | ||
| 651 | struct langwell_otg *lnw = the_transceiver; | ||
| 652 | u32 val; | ||
| 653 | |||
| 654 | reset_otg(); | ||
| 655 | val = readl(lnw->iotg.base + CI_USBMODE); | ||
| 656 | val = (val & (~USBMODE_CM)) | USBMODE_HOST; | ||
| 657 | writel(val, lnw->iotg.base + CI_USBMODE); | ||
| 658 | } | ||
| 659 | |||
| 660 | static void set_client_mode(void) | ||
| 661 | { | ||
| 662 | struct langwell_otg *lnw = the_transceiver; | ||
| 663 | u32 val; | ||
| 664 | |||
| 665 | reset_otg(); | ||
| 666 | val = readl(lnw->iotg.base + CI_USBMODE); | ||
| 667 | val = (val & (~USBMODE_CM)) | USBMODE_DEVICE; | ||
| 668 | writel(val, lnw->iotg.base + CI_USBMODE); | ||
| 669 | } | ||
| 670 | |||
| 671 | static void init_hsm(void) | ||
| 672 | { | ||
| 673 | struct langwell_otg *lnw = the_transceiver; | ||
| 674 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 675 | u32 val32; | ||
| 676 | |||
| 677 | /* read OTGSC after reset */ | ||
| 678 | val32 = readl(lnw->iotg.base + CI_OTGSC); | ||
| 679 | dev_dbg(lnw->dev, "%s: OTGSC init value = 0x%x\n", __func__, val32); | ||
| 680 | |||
| 681 | /* set init state */ | ||
| 682 | if (val32 & OTGSC_ID) { | ||
| 683 | iotg->hsm.id = 1; | ||
| 684 | iotg->otg.default_a = 0; | ||
| 685 | set_client_mode(); | ||
| 686 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 687 | } else { | ||
| 688 | iotg->hsm.id = 0; | ||
| 689 | iotg->otg.default_a = 1; | ||
| 690 | set_host_mode(); | ||
| 691 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 692 | } | ||
| 693 | |||
| 694 | /* set session indicator */ | ||
| 695 | if (val32 & OTGSC_BSE) | ||
| 696 | iotg->hsm.b_sess_end = 1; | ||
| 697 | if (val32 & OTGSC_BSV) | ||
| 698 | iotg->hsm.b_sess_vld = 1; | ||
| 699 | if (val32 & OTGSC_ASV) | ||
| 700 | iotg->hsm.a_sess_vld = 1; | ||
| 701 | if (val32 & OTGSC_AVV) | ||
| 702 | iotg->hsm.a_vbus_vld = 1; | ||
| 703 | |||
| 704 | /* defautly power the bus */ | ||
| 705 | iotg->hsm.a_bus_req = 1; | ||
| 706 | iotg->hsm.a_bus_drop = 0; | ||
| 707 | /* defautly don't request bus as B device */ | ||
| 708 | iotg->hsm.b_bus_req = 0; | ||
| 709 | /* no system error */ | ||
| 710 | iotg->hsm.a_clr_err = 0; | ||
| 711 | |||
| 712 | langwell_otg_phy_low_power_wait(1); | ||
| 713 | } | ||
| 714 | |||
| 715 | static void update_hsm(void) | ||
| 716 | { | ||
| 717 | struct langwell_otg *lnw = the_transceiver; | ||
| 718 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 719 | u32 val32; | ||
| 720 | |||
| 721 | /* read OTGSC */ | ||
| 722 | val32 = readl(lnw->iotg.base + CI_OTGSC); | ||
| 723 | dev_dbg(lnw->dev, "%s: OTGSC value = 0x%x\n", __func__, val32); | ||
| 724 | |||
| 725 | iotg->hsm.id = !!(val32 & OTGSC_ID); | ||
| 726 | iotg->hsm.b_sess_end = !!(val32 & OTGSC_BSE); | ||
| 727 | iotg->hsm.b_sess_vld = !!(val32 & OTGSC_BSV); | ||
| 728 | iotg->hsm.a_sess_vld = !!(val32 & OTGSC_ASV); | ||
| 729 | iotg->hsm.a_vbus_vld = !!(val32 & OTGSC_AVV); | ||
| 730 | } | ||
| 731 | |||
| 732 | static irqreturn_t otg_dummy_irq(int irq, void *_dev) | ||
| 733 | { | ||
| 734 | struct langwell_otg *lnw = the_transceiver; | ||
| 735 | void __iomem *reg_base = _dev; | ||
| 736 | u32 val; | ||
| 737 | u32 int_mask = 0; | ||
| 738 | |||
| 739 | val = readl(reg_base + CI_USBMODE); | ||
| 740 | if ((val & USBMODE_CM) != USBMODE_DEVICE) | ||
| 741 | return IRQ_NONE; | ||
| 742 | |||
| 743 | val = readl(reg_base + CI_USBSTS); | ||
| 744 | int_mask = val & INTR_DUMMY_MASK; | ||
| 745 | |||
| 746 | if (int_mask == 0) | ||
| 747 | return IRQ_NONE; | ||
| 748 | |||
| 749 | /* clear hsm.b_conn here since host driver can't detect it | ||
| 750 | * otg_dummy_irq called means B-disconnect happened. | ||
| 751 | */ | ||
| 752 | if (lnw->iotg.hsm.b_conn) { | ||
| 753 | lnw->iotg.hsm.b_conn = 0; | ||
| 754 | if (spin_trylock(&lnw->wq_lock)) { | ||
| 755 | langwell_update_transceiver(); | ||
| 756 | spin_unlock(&lnw->wq_lock); | ||
| 757 | } | ||
| 758 | } | ||
| 759 | |||
| 760 | /* Clear interrupts */ | ||
| 761 | writel(int_mask, reg_base + CI_USBSTS); | ||
| 762 | return IRQ_HANDLED; | ||
| 763 | } | ||
| 764 | |||
| 765 | static irqreturn_t otg_irq(int irq, void *_dev) | ||
| 766 | { | ||
| 767 | struct langwell_otg *lnw = _dev; | ||
| 768 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 769 | u32 int_sts, int_en; | ||
| 770 | u32 int_mask = 0; | ||
| 771 | int flag = 0; | ||
| 772 | |||
| 773 | int_sts = readl(lnw->iotg.base + CI_OTGSC); | ||
| 774 | int_en = (int_sts & OTGSC_INTEN_MASK) >> 8; | ||
| 775 | int_mask = int_sts & int_en; | ||
| 776 | if (int_mask == 0) | ||
| 777 | return IRQ_NONE; | ||
| 778 | |||
| 779 | if (int_mask & OTGSC_IDIS) { | ||
| 780 | dev_dbg(lnw->dev, "%s: id change int\n", __func__); | ||
| 781 | iotg->hsm.id = (int_sts & OTGSC_ID) ? 1 : 0; | ||
| 782 | dev_dbg(lnw->dev, "id = %d\n", iotg->hsm.id); | ||
| 783 | flag = 1; | ||
| 784 | } | ||
| 785 | if (int_mask & OTGSC_DPIS) { | ||
| 786 | dev_dbg(lnw->dev, "%s: data pulse int\n", __func__); | ||
| 787 | iotg->hsm.a_srp_det = (int_sts & OTGSC_DPS) ? 1 : 0; | ||
| 788 | dev_dbg(lnw->dev, "data pulse = %d\n", iotg->hsm.a_srp_det); | ||
| 789 | flag = 1; | ||
| 790 | } | ||
| 791 | if (int_mask & OTGSC_BSEIS) { | ||
| 792 | dev_dbg(lnw->dev, "%s: b session end int\n", __func__); | ||
| 793 | iotg->hsm.b_sess_end = (int_sts & OTGSC_BSE) ? 1 : 0; | ||
| 794 | dev_dbg(lnw->dev, "b_sess_end = %d\n", iotg->hsm.b_sess_end); | ||
| 795 | flag = 1; | ||
| 796 | } | ||
| 797 | if (int_mask & OTGSC_BSVIS) { | ||
| 798 | dev_dbg(lnw->dev, "%s: b session valid int\n", __func__); | ||
| 799 | iotg->hsm.b_sess_vld = (int_sts & OTGSC_BSV) ? 1 : 0; | ||
| 800 | dev_dbg(lnw->dev, "b_sess_vld = %d\n", iotg->hsm.b_sess_end); | ||
| 801 | flag = 1; | ||
| 802 | } | ||
| 803 | if (int_mask & OTGSC_ASVIS) { | ||
| 804 | dev_dbg(lnw->dev, "%s: a session valid int\n", __func__); | ||
| 805 | iotg->hsm.a_sess_vld = (int_sts & OTGSC_ASV) ? 1 : 0; | ||
| 806 | dev_dbg(lnw->dev, "a_sess_vld = %d\n", iotg->hsm.a_sess_vld); | ||
| 807 | flag = 1; | ||
| 808 | } | ||
| 809 | if (int_mask & OTGSC_AVVIS) { | ||
| 810 | dev_dbg(lnw->dev, "%s: a vbus valid int\n", __func__); | ||
| 811 | iotg->hsm.a_vbus_vld = (int_sts & OTGSC_AVV) ? 1 : 0; | ||
| 812 | dev_dbg(lnw->dev, "a_vbus_vld = %d\n", iotg->hsm.a_vbus_vld); | ||
| 813 | flag = 1; | ||
| 814 | } | ||
| 815 | |||
| 816 | if (int_mask & OTGSC_1MSS) { | ||
| 817 | /* need to schedule otg_work if any timer is expired */ | ||
| 818 | if (langwell_otg_tick_timer(&int_sts)) | ||
| 819 | flag = 1; | ||
| 820 | } | ||
| 821 | |||
| 822 | writel((int_sts & ~OTGSC_INTSTS_MASK) | int_mask, | ||
| 823 | lnw->iotg.base + CI_OTGSC); | ||
| 824 | if (flag) | ||
| 825 | langwell_update_transceiver(); | ||
| 826 | |||
| 827 | return IRQ_HANDLED; | ||
| 828 | } | ||
| 829 | |||
| 830 | static int langwell_otg_iotg_notify(struct notifier_block *nb, | ||
| 831 | unsigned long action, void *data) | ||
| 832 | { | ||
| 833 | struct langwell_otg *lnw = the_transceiver; | ||
| 834 | struct intel_mid_otg_xceiv *iotg = data; | ||
| 835 | int flag = 0; | ||
| 836 | |||
| 837 | if (iotg == NULL) | ||
| 838 | return NOTIFY_BAD; | ||
| 839 | |||
| 840 | if (lnw == NULL) | ||
| 841 | return NOTIFY_BAD; | ||
| 842 | |||
| 843 | switch (action) { | ||
| 844 | case MID_OTG_NOTIFY_CONNECT: | ||
| 845 | dev_dbg(lnw->dev, "Lnw OTG Notify Connect Event\n"); | ||
| 846 | if (iotg->otg.default_a == 1) | ||
| 847 | iotg->hsm.b_conn = 1; | ||
| 848 | else | ||
| 849 | iotg->hsm.a_conn = 1; | ||
| 850 | flag = 1; | ||
| 851 | break; | ||
| 852 | case MID_OTG_NOTIFY_DISCONN: | ||
| 853 | dev_dbg(lnw->dev, "Lnw OTG Notify Disconnect Event\n"); | ||
| 854 | if (iotg->otg.default_a == 1) | ||
| 855 | iotg->hsm.b_conn = 0; | ||
| 856 | else | ||
| 857 | iotg->hsm.a_conn = 0; | ||
| 858 | flag = 1; | ||
| 859 | break; | ||
| 860 | case MID_OTG_NOTIFY_HSUSPEND: | ||
| 861 | dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus suspend Event\n"); | ||
| 862 | if (iotg->otg.default_a == 1) | ||
| 863 | iotg->hsm.a_suspend_req = 1; | ||
| 864 | else | ||
| 865 | iotg->hsm.b_bus_req = 0; | ||
| 866 | flag = 1; | ||
| 867 | break; | ||
| 868 | case MID_OTG_NOTIFY_HRESUME: | ||
| 869 | dev_dbg(lnw->dev, "Lnw OTG Notify Host Bus resume Event\n"); | ||
| 870 | if (iotg->otg.default_a == 1) | ||
| 871 | iotg->hsm.b_bus_resume = 1; | ||
| 872 | flag = 1; | ||
| 873 | break; | ||
| 874 | case MID_OTG_NOTIFY_CSUSPEND: | ||
| 875 | dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus suspend Event\n"); | ||
| 876 | if (iotg->otg.default_a == 1) { | ||
| 877 | if (iotg->hsm.b_bus_suspend_vld == 2) { | ||
| 878 | iotg->hsm.b_bus_suspend = 1; | ||
| 879 | iotg->hsm.b_bus_suspend_vld = 0; | ||
| 880 | flag = 1; | ||
| 881 | } else { | ||
| 882 | iotg->hsm.b_bus_suspend_vld++; | ||
| 883 | flag = 0; | ||
| 884 | } | ||
| 885 | } else { | ||
| 886 | if (iotg->hsm.a_bus_suspend == 0) { | ||
| 887 | iotg->hsm.a_bus_suspend = 1; | ||
| 888 | flag = 1; | ||
| 889 | } | ||
| 890 | } | ||
| 891 | break; | ||
| 892 | case MID_OTG_NOTIFY_CRESUME: | ||
| 893 | dev_dbg(lnw->dev, "Lnw OTG Notify Client Bus resume Event\n"); | ||
| 894 | if (iotg->otg.default_a == 0) | ||
| 895 | iotg->hsm.a_bus_suspend = 0; | ||
| 896 | flag = 0; | ||
| 897 | break; | ||
| 898 | case MID_OTG_NOTIFY_HOSTADD: | ||
| 899 | dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver Add\n"); | ||
| 900 | flag = 1; | ||
| 901 | break; | ||
| 902 | case MID_OTG_NOTIFY_HOSTREMOVE: | ||
| 903 | dev_dbg(lnw->dev, "Lnw OTG Nofity Host Driver remove\n"); | ||
| 904 | flag = 1; | ||
| 905 | break; | ||
| 906 | case MID_OTG_NOTIFY_CLIENTADD: | ||
| 907 | dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver Add\n"); | ||
| 908 | flag = 1; | ||
| 909 | break; | ||
| 910 | case MID_OTG_NOTIFY_CLIENTREMOVE: | ||
| 911 | dev_dbg(lnw->dev, "Lnw OTG Nofity Client Driver remove\n"); | ||
| 912 | flag = 1; | ||
| 913 | break; | ||
| 914 | default: | ||
| 915 | dev_dbg(lnw->dev, "Lnw OTG Nofity unknown notify message\n"); | ||
| 916 | return NOTIFY_DONE; | ||
| 917 | } | ||
| 918 | |||
| 919 | if (flag) | ||
| 920 | langwell_update_transceiver(); | ||
| 921 | |||
| 922 | return NOTIFY_OK; | ||
| 923 | } | ||
| 924 | |||
| 925 | static void langwell_otg_work(struct work_struct *work) | ||
| 926 | { | ||
| 927 | struct langwell_otg *lnw; | ||
| 928 | struct intel_mid_otg_xceiv *iotg; | ||
| 929 | int retval; | ||
| 930 | struct pci_dev *pdev; | ||
| 931 | |||
| 932 | lnw = container_of(work, struct langwell_otg, work); | ||
| 933 | iotg = &lnw->iotg; | ||
| 934 | pdev = to_pci_dev(lnw->dev); | ||
| 935 | |||
| 936 | dev_dbg(lnw->dev, "%s: old state = %s\n", __func__, | ||
| 937 | otg_state_string(iotg->otg.state)); | ||
| 938 | |||
| 939 | switch (iotg->otg.state) { | ||
| 940 | case OTG_STATE_UNDEFINED: | ||
| 941 | case OTG_STATE_B_IDLE: | ||
| 942 | if (!iotg->hsm.id) { | ||
| 943 | langwell_otg_del_timer(b_srp_init_tmr); | ||
| 944 | del_timer_sync(&lnw->hsm_timer); | ||
| 945 | |||
| 946 | iotg->otg.default_a = 1; | ||
| 947 | iotg->hsm.a_srp_det = 0; | ||
| 948 | |||
| 949 | langwell_otg_chrg_vbus(0); | ||
| 950 | set_host_mode(); | ||
| 951 | langwell_otg_phy_low_power(1); | ||
| 952 | |||
| 953 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 954 | langwell_update_transceiver(); | ||
| 955 | } else if (iotg->hsm.b_sess_vld) { | ||
| 956 | langwell_otg_del_timer(b_srp_init_tmr); | ||
| 957 | del_timer_sync(&lnw->hsm_timer); | ||
| 958 | iotg->hsm.b_sess_end = 0; | ||
| 959 | iotg->hsm.a_bus_suspend = 0; | ||
| 960 | langwell_otg_chrg_vbus(0); | ||
| 961 | |||
| 962 | if (lnw->iotg.start_peripheral) { | ||
| 963 | lnw->iotg.start_peripheral(&lnw->iotg); | ||
| 964 | iotg->otg.state = OTG_STATE_B_PERIPHERAL; | ||
| 965 | } else | ||
| 966 | dev_dbg(lnw->dev, "client driver not loaded\n"); | ||
| 967 | |||
| 968 | } else if (iotg->hsm.b_srp_init_tmout) { | ||
| 969 | iotg->hsm.b_srp_init_tmout = 0; | ||
| 970 | dev_warn(lnw->dev, "SRP init timeout\n"); | ||
| 971 | } else if (iotg->hsm.b_srp_fail_tmout) { | ||
| 972 | iotg->hsm.b_srp_fail_tmout = 0; | ||
| 973 | iotg->hsm.b_bus_req = 0; | ||
| 974 | |||
| 975 | /* No silence failure */ | ||
| 976 | langwell_otg_nsf_msg(6); | ||
| 977 | } else if (iotg->hsm.b_bus_req && iotg->hsm.b_sess_end) { | ||
| 978 | del_timer_sync(&lnw->hsm_timer); | ||
| 979 | /* workaround for b_se0_srp detection */ | ||
| 980 | retval = langwell_otg_check_se0_srp(0); | ||
| 981 | if (retval) { | ||
| 982 | iotg->hsm.b_bus_req = 0; | ||
| 983 | dev_dbg(lnw->dev, "LS isn't SE0, try later\n"); | ||
| 984 | } else { | ||
| 985 | /* clear the PHCD before start srp */ | ||
| 986 | langwell_otg_phy_low_power(0); | ||
| 987 | |||
| 988 | /* Start SRP */ | ||
| 989 | langwell_otg_add_timer(b_srp_init_tmr); | ||
| 990 | iotg->otg.start_srp(&iotg->otg); | ||
| 991 | langwell_otg_del_timer(b_srp_init_tmr); | ||
| 992 | langwell_otg_add_ktimer(TB_SRP_FAIL_TMR); | ||
| 993 | |||
| 994 | /* reset PHY low power mode here */ | ||
| 995 | langwell_otg_phy_low_power_wait(1); | ||
| 996 | } | ||
| 997 | } | ||
| 998 | break; | ||
| 999 | case OTG_STATE_B_SRP_INIT: | ||
| 1000 | if (!iotg->hsm.id) { | ||
| 1001 | iotg->otg.default_a = 1; | ||
| 1002 | iotg->hsm.a_srp_det = 0; | ||
| 1003 | |||
| 1004 | /* Turn off VBus */ | ||
| 1005 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1006 | langwell_otg_chrg_vbus(0); | ||
| 1007 | set_host_mode(); | ||
| 1008 | langwell_otg_phy_low_power(1); | ||
| 1009 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 1010 | langwell_update_transceiver(); | ||
| 1011 | } else if (iotg->hsm.b_sess_vld) { | ||
| 1012 | langwell_otg_chrg_vbus(0); | ||
| 1013 | if (lnw->iotg.start_peripheral) { | ||
| 1014 | lnw->iotg.start_peripheral(&lnw->iotg); | ||
| 1015 | iotg->otg.state = OTG_STATE_B_PERIPHERAL; | ||
| 1016 | } else | ||
| 1017 | dev_dbg(lnw->dev, "client driver not loaded\n"); | ||
| 1018 | } | ||
| 1019 | break; | ||
| 1020 | case OTG_STATE_B_PERIPHERAL: | ||
| 1021 | if (!iotg->hsm.id) { | ||
| 1022 | iotg->otg.default_a = 1; | ||
| 1023 | iotg->hsm.a_srp_det = 0; | ||
| 1024 | |||
| 1025 | langwell_otg_chrg_vbus(0); | ||
| 1026 | |||
| 1027 | if (lnw->iotg.stop_peripheral) | ||
| 1028 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1029 | else | ||
| 1030 | dev_dbg(lnw->dev, | ||
| 1031 | "client driver has been removed.\n"); | ||
| 1032 | |||
| 1033 | set_host_mode(); | ||
| 1034 | langwell_otg_phy_low_power(1); | ||
| 1035 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 1036 | langwell_update_transceiver(); | ||
| 1037 | } else if (!iotg->hsm.b_sess_vld) { | ||
| 1038 | iotg->hsm.b_hnp_enable = 0; | ||
| 1039 | |||
| 1040 | if (lnw->iotg.stop_peripheral) | ||
| 1041 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1042 | else | ||
| 1043 | dev_dbg(lnw->dev, | ||
| 1044 | "client driver has been removed.\n"); | ||
| 1045 | |||
| 1046 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1047 | } else if (iotg->hsm.b_bus_req && iotg->otg.gadget && | ||
| 1048 | iotg->otg.gadget->b_hnp_enable && | ||
| 1049 | iotg->hsm.a_bus_suspend) { | ||
| 1050 | |||
| 1051 | if (lnw->iotg.stop_peripheral) | ||
| 1052 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1053 | else | ||
| 1054 | dev_dbg(lnw->dev, | ||
| 1055 | "client driver has been removed.\n"); | ||
| 1056 | |||
| 1057 | langwell_otg_HAAR(1); | ||
| 1058 | iotg->hsm.a_conn = 0; | ||
| 1059 | |||
| 1060 | if (lnw->iotg.start_host) { | ||
| 1061 | lnw->iotg.start_host(&lnw->iotg); | ||
| 1062 | iotg->otg.state = OTG_STATE_B_WAIT_ACON; | ||
| 1063 | } else | ||
| 1064 | dev_dbg(lnw->dev, | ||
| 1065 | "host driver not loaded.\n"); | ||
| 1066 | |||
| 1067 | iotg->hsm.a_bus_resume = 0; | ||
| 1068 | langwell_otg_add_ktimer(TB_ASE0_BRST_TMR); | ||
| 1069 | } | ||
| 1070 | break; | ||
| 1071 | |||
| 1072 | case OTG_STATE_B_WAIT_ACON: | ||
| 1073 | if (!iotg->hsm.id) { | ||
| 1074 | /* delete hsm timer for b_ase0_brst_tmr */ | ||
| 1075 | del_timer_sync(&lnw->hsm_timer); | ||
| 1076 | |||
| 1077 | iotg->otg.default_a = 1; | ||
| 1078 | iotg->hsm.a_srp_det = 0; | ||
| 1079 | |||
| 1080 | langwell_otg_chrg_vbus(0); | ||
| 1081 | |||
| 1082 | langwell_otg_HAAR(0); | ||
| 1083 | if (lnw->iotg.stop_host) | ||
| 1084 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1085 | else | ||
| 1086 | dev_dbg(lnw->dev, | ||
| 1087 | "host driver has been removed.\n"); | ||
| 1088 | |||
| 1089 | set_host_mode(); | ||
| 1090 | langwell_otg_phy_low_power(1); | ||
| 1091 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 1092 | langwell_update_transceiver(); | ||
| 1093 | } else if (!iotg->hsm.b_sess_vld) { | ||
| 1094 | /* delete hsm timer for b_ase0_brst_tmr */ | ||
| 1095 | del_timer_sync(&lnw->hsm_timer); | ||
| 1096 | |||
| 1097 | iotg->hsm.b_hnp_enable = 0; | ||
| 1098 | iotg->hsm.b_bus_req = 0; | ||
| 1099 | |||
| 1100 | langwell_otg_chrg_vbus(0); | ||
| 1101 | langwell_otg_HAAR(0); | ||
| 1102 | |||
| 1103 | if (lnw->iotg.stop_host) | ||
| 1104 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1105 | else | ||
| 1106 | dev_dbg(lnw->dev, | ||
| 1107 | "host driver has been removed.\n"); | ||
| 1108 | |||
| 1109 | set_client_mode(); | ||
| 1110 | langwell_otg_phy_low_power(1); | ||
| 1111 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1112 | } else if (iotg->hsm.a_conn) { | ||
| 1113 | /* delete hsm timer for b_ase0_brst_tmr */ | ||
| 1114 | del_timer_sync(&lnw->hsm_timer); | ||
| 1115 | |||
| 1116 | langwell_otg_HAAR(0); | ||
| 1117 | iotg->otg.state = OTG_STATE_B_HOST; | ||
| 1118 | langwell_update_transceiver(); | ||
| 1119 | } else if (iotg->hsm.a_bus_resume || | ||
| 1120 | iotg->hsm.b_ase0_brst_tmout) { | ||
| 1121 | /* delete hsm timer for b_ase0_brst_tmr */ | ||
| 1122 | del_timer_sync(&lnw->hsm_timer); | ||
| 1123 | |||
| 1124 | langwell_otg_HAAR(0); | ||
| 1125 | langwell_otg_nsf_msg(7); | ||
| 1126 | |||
| 1127 | if (lnw->iotg.stop_host) | ||
| 1128 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1129 | else | ||
| 1130 | dev_dbg(lnw->dev, | ||
| 1131 | "host driver has been removed.\n"); | ||
| 1132 | |||
| 1133 | iotg->hsm.a_bus_suspend = 0; | ||
| 1134 | iotg->hsm.b_bus_req = 0; | ||
| 1135 | |||
| 1136 | if (lnw->iotg.start_peripheral) | ||
| 1137 | lnw->iotg.start_peripheral(&lnw->iotg); | ||
| 1138 | else | ||
| 1139 | dev_dbg(lnw->dev, | ||
| 1140 | "client driver not loaded.\n"); | ||
| 1141 | |||
| 1142 | iotg->otg.state = OTG_STATE_B_PERIPHERAL; | ||
| 1143 | } | ||
| 1144 | break; | ||
| 1145 | |||
| 1146 | case OTG_STATE_B_HOST: | ||
| 1147 | if (!iotg->hsm.id) { | ||
| 1148 | iotg->otg.default_a = 1; | ||
| 1149 | iotg->hsm.a_srp_det = 0; | ||
| 1150 | |||
| 1151 | langwell_otg_chrg_vbus(0); | ||
| 1152 | |||
| 1153 | if (lnw->iotg.stop_host) | ||
| 1154 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1155 | else | ||
| 1156 | dev_dbg(lnw->dev, | ||
| 1157 | "host driver has been removed.\n"); | ||
| 1158 | |||
| 1159 | set_host_mode(); | ||
| 1160 | langwell_otg_phy_low_power(1); | ||
| 1161 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 1162 | langwell_update_transceiver(); | ||
| 1163 | } else if (!iotg->hsm.b_sess_vld) { | ||
| 1164 | iotg->hsm.b_hnp_enable = 0; | ||
| 1165 | iotg->hsm.b_bus_req = 0; | ||
| 1166 | |||
| 1167 | langwell_otg_chrg_vbus(0); | ||
| 1168 | if (lnw->iotg.stop_host) | ||
| 1169 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1170 | else | ||
| 1171 | dev_dbg(lnw->dev, | ||
| 1172 | "host driver has been removed.\n"); | ||
| 1173 | |||
| 1174 | set_client_mode(); | ||
| 1175 | langwell_otg_phy_low_power(1); | ||
| 1176 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1177 | } else if ((!iotg->hsm.b_bus_req) || | ||
| 1178 | (!iotg->hsm.a_conn)) { | ||
| 1179 | iotg->hsm.b_bus_req = 0; | ||
| 1180 | langwell_otg_loc_sof(0); | ||
| 1181 | |||
| 1182 | if (lnw->iotg.stop_host) | ||
| 1183 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1184 | else | ||
| 1185 | dev_dbg(lnw->dev, | ||
| 1186 | "host driver has been removed.\n"); | ||
| 1187 | |||
| 1188 | iotg->hsm.a_bus_suspend = 0; | ||
| 1189 | |||
| 1190 | if (lnw->iotg.start_peripheral) | ||
| 1191 | lnw->iotg.start_peripheral(&lnw->iotg); | ||
| 1192 | else | ||
| 1193 | dev_dbg(lnw->dev, | ||
| 1194 | "client driver not loaded.\n"); | ||
| 1195 | |||
| 1196 | iotg->otg.state = OTG_STATE_B_PERIPHERAL; | ||
| 1197 | } | ||
| 1198 | break; | ||
| 1199 | |||
| 1200 | case OTG_STATE_A_IDLE: | ||
| 1201 | iotg->otg.default_a = 1; | ||
| 1202 | if (iotg->hsm.id) { | ||
| 1203 | iotg->otg.default_a = 0; | ||
| 1204 | iotg->hsm.b_bus_req = 0; | ||
| 1205 | iotg->hsm.vbus_srp_up = 0; | ||
| 1206 | |||
| 1207 | langwell_otg_chrg_vbus(0); | ||
| 1208 | set_client_mode(); | ||
| 1209 | langwell_otg_phy_low_power(1); | ||
| 1210 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1211 | langwell_update_transceiver(); | ||
| 1212 | } else if (!iotg->hsm.a_bus_drop && | ||
| 1213 | (iotg->hsm.a_srp_det || iotg->hsm.a_bus_req)) { | ||
| 1214 | langwell_otg_phy_low_power(0); | ||
| 1215 | |||
| 1216 | /* Turn on VBus */ | ||
| 1217 | iotg->otg.set_vbus(&iotg->otg, true); | ||
| 1218 | |||
| 1219 | iotg->hsm.vbus_srp_up = 0; | ||
| 1220 | iotg->hsm.a_wait_vrise_tmout = 0; | ||
| 1221 | langwell_otg_add_timer(a_wait_vrise_tmr); | ||
| 1222 | iotg->otg.state = OTG_STATE_A_WAIT_VRISE; | ||
| 1223 | langwell_update_transceiver(); | ||
| 1224 | } else if (!iotg->hsm.a_bus_drop && iotg->hsm.a_sess_vld) { | ||
| 1225 | iotg->hsm.vbus_srp_up = 1; | ||
| 1226 | } else if (!iotg->hsm.a_sess_vld && iotg->hsm.vbus_srp_up) { | ||
| 1227 | msleep(10); | ||
| 1228 | langwell_otg_phy_low_power(0); | ||
| 1229 | |||
| 1230 | /* Turn on VBus */ | ||
| 1231 | iotg->otg.set_vbus(&iotg->otg, true); | ||
| 1232 | iotg->hsm.a_srp_det = 1; | ||
| 1233 | iotg->hsm.vbus_srp_up = 0; | ||
| 1234 | iotg->hsm.a_wait_vrise_tmout = 0; | ||
| 1235 | langwell_otg_add_timer(a_wait_vrise_tmr); | ||
| 1236 | iotg->otg.state = OTG_STATE_A_WAIT_VRISE; | ||
| 1237 | langwell_update_transceiver(); | ||
| 1238 | } else if (!iotg->hsm.a_sess_vld && | ||
| 1239 | !iotg->hsm.vbus_srp_up) { | ||
| 1240 | langwell_otg_phy_low_power(1); | ||
| 1241 | } | ||
| 1242 | break; | ||
| 1243 | case OTG_STATE_A_WAIT_VRISE: | ||
| 1244 | if (iotg->hsm.id) { | ||
| 1245 | langwell_otg_del_timer(a_wait_vrise_tmr); | ||
| 1246 | iotg->hsm.b_bus_req = 0; | ||
| 1247 | iotg->otg.default_a = 0; | ||
| 1248 | |||
| 1249 | /* Turn off VBus */ | ||
| 1250 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1251 | set_client_mode(); | ||
| 1252 | langwell_otg_phy_low_power_wait(1); | ||
| 1253 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1254 | } else if (iotg->hsm.a_vbus_vld) { | ||
| 1255 | langwell_otg_del_timer(a_wait_vrise_tmr); | ||
| 1256 | iotg->hsm.b_conn = 0; | ||
| 1257 | if (lnw->iotg.start_host) | ||
| 1258 | lnw->iotg.start_host(&lnw->iotg); | ||
| 1259 | else { | ||
| 1260 | dev_dbg(lnw->dev, "host driver not loaded.\n"); | ||
| 1261 | break; | ||
| 1262 | } | ||
| 1263 | |||
| 1264 | langwell_otg_add_ktimer(TA_WAIT_BCON_TMR); | ||
| 1265 | iotg->otg.state = OTG_STATE_A_WAIT_BCON; | ||
| 1266 | } else if (iotg->hsm.a_wait_vrise_tmout) { | ||
| 1267 | iotg->hsm.b_conn = 0; | ||
| 1268 | if (iotg->hsm.a_vbus_vld) { | ||
| 1269 | if (lnw->iotg.start_host) | ||
| 1270 | lnw->iotg.start_host(&lnw->iotg); | ||
| 1271 | else { | ||
| 1272 | dev_dbg(lnw->dev, | ||
| 1273 | "host driver not loaded.\n"); | ||
| 1274 | break; | ||
| 1275 | } | ||
| 1276 | langwell_otg_add_ktimer(TA_WAIT_BCON_TMR); | ||
| 1277 | iotg->otg.state = OTG_STATE_A_WAIT_BCON; | ||
| 1278 | } else { | ||
| 1279 | |||
| 1280 | /* Turn off VBus */ | ||
| 1281 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1282 | langwell_otg_phy_low_power_wait(1); | ||
| 1283 | iotg->otg.state = OTG_STATE_A_VBUS_ERR; | ||
| 1284 | } | ||
| 1285 | } | ||
| 1286 | break; | ||
| 1287 | case OTG_STATE_A_WAIT_BCON: | ||
| 1288 | if (iotg->hsm.id) { | ||
| 1289 | /* delete hsm timer for a_wait_bcon_tmr */ | ||
| 1290 | del_timer_sync(&lnw->hsm_timer); | ||
| 1291 | |||
| 1292 | iotg->otg.default_a = 0; | ||
| 1293 | iotg->hsm.b_bus_req = 0; | ||
| 1294 | |||
| 1295 | if (lnw->iotg.stop_host) | ||
| 1296 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1297 | else | ||
| 1298 | dev_dbg(lnw->dev, | ||
| 1299 | "host driver has been removed.\n"); | ||
| 1300 | |||
| 1301 | /* Turn off VBus */ | ||
| 1302 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1303 | set_client_mode(); | ||
| 1304 | langwell_otg_phy_low_power_wait(1); | ||
| 1305 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1306 | langwell_update_transceiver(); | ||
| 1307 | } else if (!iotg->hsm.a_vbus_vld) { | ||
| 1308 | /* delete hsm timer for a_wait_bcon_tmr */ | ||
| 1309 | del_timer_sync(&lnw->hsm_timer); | ||
| 1310 | |||
| 1311 | if (lnw->iotg.stop_host) | ||
| 1312 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1313 | else | ||
| 1314 | dev_dbg(lnw->dev, | ||
| 1315 | "host driver has been removed.\n"); | ||
| 1316 | |||
| 1317 | /* Turn off VBus */ | ||
| 1318 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1319 | langwell_otg_phy_low_power_wait(1); | ||
| 1320 | iotg->otg.state = OTG_STATE_A_VBUS_ERR; | ||
| 1321 | } else if (iotg->hsm.a_bus_drop || | ||
| 1322 | (iotg->hsm.a_wait_bcon_tmout && | ||
| 1323 | !iotg->hsm.a_bus_req)) { | ||
| 1324 | /* delete hsm timer for a_wait_bcon_tmr */ | ||
| 1325 | del_timer_sync(&lnw->hsm_timer); | ||
| 1326 | |||
| 1327 | if (lnw->iotg.stop_host) | ||
| 1328 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1329 | else | ||
| 1330 | dev_dbg(lnw->dev, | ||
| 1331 | "host driver has been removed.\n"); | ||
| 1332 | |||
| 1333 | /* Turn off VBus */ | ||
| 1334 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1335 | iotg->otg.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1336 | } else if (iotg->hsm.b_conn) { | ||
| 1337 | /* delete hsm timer for a_wait_bcon_tmr */ | ||
| 1338 | del_timer_sync(&lnw->hsm_timer); | ||
| 1339 | |||
| 1340 | iotg->hsm.a_suspend_req = 0; | ||
| 1341 | iotg->otg.state = OTG_STATE_A_HOST; | ||
| 1342 | if (iotg->hsm.a_srp_det && iotg->otg.host && | ||
| 1343 | !iotg->otg.host->b_hnp_enable) { | ||
| 1344 | /* SRP capable peripheral-only device */ | ||
| 1345 | iotg->hsm.a_bus_req = 1; | ||
| 1346 | iotg->hsm.a_srp_det = 0; | ||
| 1347 | } else if (!iotg->hsm.a_bus_req && iotg->otg.host && | ||
| 1348 | iotg->otg.host->b_hnp_enable) { | ||
| 1349 | /* It is not safe enough to do a fast | ||
| 1350 | * transition from A_WAIT_BCON to | ||
| 1351 | * A_SUSPEND */ | ||
| 1352 | msleep(10000); | ||
| 1353 | if (iotg->hsm.a_bus_req) | ||
| 1354 | break; | ||
| 1355 | |||
| 1356 | if (request_irq(pdev->irq, | ||
| 1357 | otg_dummy_irq, IRQF_SHARED, | ||
| 1358 | driver_name, iotg->base) != 0) { | ||
| 1359 | dev_dbg(lnw->dev, | ||
| 1360 | "request interrupt %d fail\n", | ||
| 1361 | pdev->irq); | ||
| 1362 | } | ||
| 1363 | |||
| 1364 | langwell_otg_HABA(1); | ||
| 1365 | iotg->hsm.b_bus_resume = 0; | ||
| 1366 | iotg->hsm.a_aidl_bdis_tmout = 0; | ||
| 1367 | |||
| 1368 | langwell_otg_loc_sof(0); | ||
| 1369 | /* clear PHCD to enable HW timer */ | ||
| 1370 | langwell_otg_phy_low_power(0); | ||
| 1371 | langwell_otg_add_timer(a_aidl_bdis_tmr); | ||
| 1372 | iotg->otg.state = OTG_STATE_A_SUSPEND; | ||
| 1373 | } else if (!iotg->hsm.a_bus_req && iotg->otg.host && | ||
| 1374 | !iotg->otg.host->b_hnp_enable) { | ||
| 1375 | if (lnw->iotg.stop_host) | ||
| 1376 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1377 | else | ||
| 1378 | dev_dbg(lnw->dev, | ||
| 1379 | "host driver removed.\n"); | ||
| 1380 | |||
| 1381 | /* Turn off VBus */ | ||
| 1382 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1383 | iotg->otg.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1384 | } | ||
| 1385 | } | ||
| 1386 | break; | ||
| 1387 | case OTG_STATE_A_HOST: | ||
| 1388 | if (iotg->hsm.id) { | ||
| 1389 | iotg->otg.default_a = 0; | ||
| 1390 | iotg->hsm.b_bus_req = 0; | ||
| 1391 | |||
| 1392 | if (lnw->iotg.stop_host) | ||
| 1393 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1394 | else | ||
| 1395 | dev_dbg(lnw->dev, | ||
| 1396 | "host driver has been removed.\n"); | ||
| 1397 | |||
| 1398 | /* Turn off VBus */ | ||
| 1399 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1400 | set_client_mode(); | ||
| 1401 | langwell_otg_phy_low_power_wait(1); | ||
| 1402 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1403 | langwell_update_transceiver(); | ||
| 1404 | } else if (iotg->hsm.a_bus_drop || | ||
| 1405 | (iotg->otg.host && | ||
| 1406 | !iotg->otg.host->b_hnp_enable && | ||
| 1407 | !iotg->hsm.a_bus_req)) { | ||
| 1408 | if (lnw->iotg.stop_host) | ||
| 1409 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1410 | else | ||
| 1411 | dev_dbg(lnw->dev, | ||
| 1412 | "host driver has been removed.\n"); | ||
| 1413 | |||
| 1414 | /* Turn off VBus */ | ||
| 1415 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1416 | iotg->otg.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1417 | } else if (!iotg->hsm.a_vbus_vld) { | ||
| 1418 | if (lnw->iotg.stop_host) | ||
| 1419 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1420 | else | ||
| 1421 | dev_dbg(lnw->dev, | ||
| 1422 | "host driver has been removed.\n"); | ||
| 1423 | |||
| 1424 | /* Turn off VBus */ | ||
| 1425 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1426 | langwell_otg_phy_low_power_wait(1); | ||
| 1427 | iotg->otg.state = OTG_STATE_A_VBUS_ERR; | ||
| 1428 | } else if (iotg->otg.host && | ||
| 1429 | iotg->otg.host->b_hnp_enable && | ||
| 1430 | !iotg->hsm.a_bus_req) { | ||
| 1431 | /* Set HABA to enable hardware assistance to signal | ||
| 1432 | * A-connect after receiver B-disconnect. Hardware | ||
| 1433 | * will then set client mode and enable URE, SLE and | ||
| 1434 | * PCE after the assistance. otg_dummy_irq is used to | ||
| 1435 | * clean these ints when client driver is not resumed. | ||
| 1436 | */ | ||
| 1437 | if (request_irq(pdev->irq, otg_dummy_irq, IRQF_SHARED, | ||
| 1438 | driver_name, iotg->base) != 0) { | ||
| 1439 | dev_dbg(lnw->dev, | ||
| 1440 | "request interrupt %d failed\n", | ||
| 1441 | pdev->irq); | ||
| 1442 | } | ||
| 1443 | |||
| 1444 | /* set HABA */ | ||
| 1445 | langwell_otg_HABA(1); | ||
| 1446 | iotg->hsm.b_bus_resume = 0; | ||
| 1447 | iotg->hsm.a_aidl_bdis_tmout = 0; | ||
| 1448 | langwell_otg_loc_sof(0); | ||
| 1449 | /* clear PHCD to enable HW timer */ | ||
| 1450 | langwell_otg_phy_low_power(0); | ||
| 1451 | langwell_otg_add_timer(a_aidl_bdis_tmr); | ||
| 1452 | iotg->otg.state = OTG_STATE_A_SUSPEND; | ||
| 1453 | } else if (!iotg->hsm.b_conn || !iotg->hsm.a_bus_req) { | ||
| 1454 | langwell_otg_add_ktimer(TA_WAIT_BCON_TMR); | ||
| 1455 | iotg->otg.state = OTG_STATE_A_WAIT_BCON; | ||
| 1456 | } | ||
| 1457 | break; | ||
| 1458 | case OTG_STATE_A_SUSPEND: | ||
| 1459 | if (iotg->hsm.id) { | ||
| 1460 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 1461 | langwell_otg_HABA(0); | ||
| 1462 | free_irq(pdev->irq, iotg->base); | ||
| 1463 | iotg->otg.default_a = 0; | ||
| 1464 | iotg->hsm.b_bus_req = 0; | ||
| 1465 | |||
| 1466 | if (lnw->iotg.stop_host) | ||
| 1467 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1468 | else | ||
| 1469 | dev_dbg(lnw->dev, | ||
| 1470 | "host driver has been removed.\n"); | ||
| 1471 | |||
| 1472 | /* Turn off VBus */ | ||
| 1473 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1474 | set_client_mode(); | ||
| 1475 | langwell_otg_phy_low_power(1); | ||
| 1476 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1477 | langwell_update_transceiver(); | ||
| 1478 | } else if (iotg->hsm.a_bus_req || | ||
| 1479 | iotg->hsm.b_bus_resume) { | ||
| 1480 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 1481 | langwell_otg_HABA(0); | ||
| 1482 | free_irq(pdev->irq, iotg->base); | ||
| 1483 | iotg->hsm.a_suspend_req = 0; | ||
| 1484 | langwell_otg_loc_sof(1); | ||
| 1485 | iotg->otg.state = OTG_STATE_A_HOST; | ||
| 1486 | } else if (iotg->hsm.a_aidl_bdis_tmout || | ||
| 1487 | iotg->hsm.a_bus_drop) { | ||
| 1488 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 1489 | langwell_otg_HABA(0); | ||
| 1490 | free_irq(pdev->irq, iotg->base); | ||
| 1491 | if (lnw->iotg.stop_host) | ||
| 1492 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1493 | else | ||
| 1494 | dev_dbg(lnw->dev, | ||
| 1495 | "host driver has been removed.\n"); | ||
| 1496 | |||
| 1497 | /* Turn off VBus */ | ||
| 1498 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1499 | iotg->otg.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1500 | } else if (!iotg->hsm.b_conn && iotg->otg.host && | ||
| 1501 | iotg->otg.host->b_hnp_enable) { | ||
| 1502 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 1503 | langwell_otg_HABA(0); | ||
| 1504 | free_irq(pdev->irq, iotg->base); | ||
| 1505 | |||
| 1506 | if (lnw->iotg.stop_host) | ||
| 1507 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1508 | else | ||
| 1509 | dev_dbg(lnw->dev, | ||
| 1510 | "host driver has been removed.\n"); | ||
| 1511 | |||
| 1512 | iotg->hsm.b_bus_suspend = 0; | ||
| 1513 | iotg->hsm.b_bus_suspend_vld = 0; | ||
| 1514 | |||
| 1515 | /* msleep(200); */ | ||
| 1516 | if (lnw->iotg.start_peripheral) | ||
| 1517 | lnw->iotg.start_peripheral(&lnw->iotg); | ||
| 1518 | else | ||
| 1519 | dev_dbg(lnw->dev, | ||
| 1520 | "client driver not loaded.\n"); | ||
| 1521 | |||
| 1522 | langwell_otg_add_ktimer(TB_BUS_SUSPEND_TMR); | ||
| 1523 | iotg->otg.state = OTG_STATE_A_PERIPHERAL; | ||
| 1524 | break; | ||
| 1525 | } else if (!iotg->hsm.a_vbus_vld) { | ||
| 1526 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 1527 | langwell_otg_HABA(0); | ||
| 1528 | free_irq(pdev->irq, iotg->base); | ||
| 1529 | if (lnw->iotg.stop_host) | ||
| 1530 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 1531 | else | ||
| 1532 | dev_dbg(lnw->dev, | ||
| 1533 | "host driver has been removed.\n"); | ||
| 1534 | |||
| 1535 | /* Turn off VBus */ | ||
| 1536 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1537 | langwell_otg_phy_low_power_wait(1); | ||
| 1538 | iotg->otg.state = OTG_STATE_A_VBUS_ERR; | ||
| 1539 | } | ||
| 1540 | break; | ||
| 1541 | case OTG_STATE_A_PERIPHERAL: | ||
| 1542 | if (iotg->hsm.id) { | ||
| 1543 | /* delete hsm timer for b_bus_suspend_tmr */ | ||
| 1544 | del_timer_sync(&lnw->hsm_timer); | ||
| 1545 | iotg->otg.default_a = 0; | ||
| 1546 | iotg->hsm.b_bus_req = 0; | ||
| 1547 | if (lnw->iotg.stop_peripheral) | ||
| 1548 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1549 | else | ||
| 1550 | dev_dbg(lnw->dev, | ||
| 1551 | "client driver has been removed.\n"); | ||
| 1552 | |||
| 1553 | /* Turn off VBus */ | ||
| 1554 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1555 | set_client_mode(); | ||
| 1556 | langwell_otg_phy_low_power_wait(1); | ||
| 1557 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1558 | langwell_update_transceiver(); | ||
| 1559 | } else if (!iotg->hsm.a_vbus_vld) { | ||
| 1560 | /* delete hsm timer for b_bus_suspend_tmr */ | ||
| 1561 | del_timer_sync(&lnw->hsm_timer); | ||
| 1562 | |||
| 1563 | if (lnw->iotg.stop_peripheral) | ||
| 1564 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1565 | else | ||
| 1566 | dev_dbg(lnw->dev, | ||
| 1567 | "client driver has been removed.\n"); | ||
| 1568 | |||
| 1569 | /* Turn off VBus */ | ||
| 1570 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1571 | langwell_otg_phy_low_power_wait(1); | ||
| 1572 | iotg->otg.state = OTG_STATE_A_VBUS_ERR; | ||
| 1573 | } else if (iotg->hsm.a_bus_drop) { | ||
| 1574 | /* delete hsm timer for b_bus_suspend_tmr */ | ||
| 1575 | del_timer_sync(&lnw->hsm_timer); | ||
| 1576 | |||
| 1577 | if (lnw->iotg.stop_peripheral) | ||
| 1578 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1579 | else | ||
| 1580 | dev_dbg(lnw->dev, | ||
| 1581 | "client driver has been removed.\n"); | ||
| 1582 | |||
| 1583 | /* Turn off VBus */ | ||
| 1584 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 1585 | iotg->otg.state = OTG_STATE_A_WAIT_VFALL; | ||
| 1586 | } else if (iotg->hsm.b_bus_suspend) { | ||
| 1587 | /* delete hsm timer for b_bus_suspend_tmr */ | ||
| 1588 | del_timer_sync(&lnw->hsm_timer); | ||
| 1589 | |||
| 1590 | if (lnw->iotg.stop_peripheral) | ||
| 1591 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1592 | else | ||
| 1593 | dev_dbg(lnw->dev, | ||
| 1594 | "client driver has been removed.\n"); | ||
| 1595 | |||
| 1596 | if (lnw->iotg.start_host) | ||
| 1597 | lnw->iotg.start_host(&lnw->iotg); | ||
| 1598 | else | ||
| 1599 | dev_dbg(lnw->dev, | ||
| 1600 | "host driver not loaded.\n"); | ||
| 1601 | langwell_otg_add_ktimer(TA_WAIT_BCON_TMR); | ||
| 1602 | iotg->otg.state = OTG_STATE_A_WAIT_BCON; | ||
| 1603 | } else if (iotg->hsm.b_bus_suspend_tmout) { | ||
| 1604 | u32 val; | ||
| 1605 | val = readl(lnw->iotg.base + CI_PORTSC1); | ||
| 1606 | if (!(val & PORTSC_SUSP)) | ||
| 1607 | break; | ||
| 1608 | |||
| 1609 | if (lnw->iotg.stop_peripheral) | ||
| 1610 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 1611 | else | ||
| 1612 | dev_dbg(lnw->dev, | ||
| 1613 | "client driver has been removed.\n"); | ||
| 1614 | |||
| 1615 | if (lnw->iotg.start_host) | ||
| 1616 | lnw->iotg.start_host(&lnw->iotg); | ||
| 1617 | else | ||
| 1618 | dev_dbg(lnw->dev, | ||
| 1619 | "host driver not loaded.\n"); | ||
| 1620 | langwell_otg_add_ktimer(TA_WAIT_BCON_TMR); | ||
| 1621 | iotg->otg.state = OTG_STATE_A_WAIT_BCON; | ||
| 1622 | } | ||
| 1623 | break; | ||
| 1624 | case OTG_STATE_A_VBUS_ERR: | ||
| 1625 | if (iotg->hsm.id) { | ||
| 1626 | iotg->otg.default_a = 0; | ||
| 1627 | iotg->hsm.a_clr_err = 0; | ||
| 1628 | iotg->hsm.a_srp_det = 0; | ||
| 1629 | set_client_mode(); | ||
| 1630 | langwell_otg_phy_low_power(1); | ||
| 1631 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1632 | langwell_update_transceiver(); | ||
| 1633 | } else if (iotg->hsm.a_clr_err) { | ||
| 1634 | iotg->hsm.a_clr_err = 0; | ||
| 1635 | iotg->hsm.a_srp_det = 0; | ||
| 1636 | reset_otg(); | ||
| 1637 | init_hsm(); | ||
| 1638 | if (iotg->otg.state == OTG_STATE_A_IDLE) | ||
| 1639 | langwell_update_transceiver(); | ||
| 1640 | } else { | ||
| 1641 | /* FW will clear PHCD bit when any VBus | ||
| 1642 | * event detected. Reset PHCD to 1 again */ | ||
| 1643 | langwell_otg_phy_low_power(1); | ||
| 1644 | } | ||
| 1645 | break; | ||
| 1646 | case OTG_STATE_A_WAIT_VFALL: | ||
| 1647 | if (iotg->hsm.id) { | ||
| 1648 | iotg->otg.default_a = 0; | ||
| 1649 | set_client_mode(); | ||
| 1650 | langwell_otg_phy_low_power(1); | ||
| 1651 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 1652 | langwell_update_transceiver(); | ||
| 1653 | } else if (iotg->hsm.a_bus_req) { | ||
| 1654 | |||
| 1655 | /* Turn on VBus */ | ||
| 1656 | iotg->otg.set_vbus(&iotg->otg, true); | ||
| 1657 | iotg->hsm.a_wait_vrise_tmout = 0; | ||
| 1658 | langwell_otg_add_timer(a_wait_vrise_tmr); | ||
| 1659 | iotg->otg.state = OTG_STATE_A_WAIT_VRISE; | ||
| 1660 | } else if (!iotg->hsm.a_sess_vld) { | ||
| 1661 | iotg->hsm.a_srp_det = 0; | ||
| 1662 | set_host_mode(); | ||
| 1663 | langwell_otg_phy_low_power(1); | ||
| 1664 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 1665 | } | ||
| 1666 | break; | ||
| 1667 | default: | ||
| 1668 | ; | ||
| 1669 | } | ||
| 1670 | |||
| 1671 | dev_dbg(lnw->dev, "%s: new state = %s\n", __func__, | ||
| 1672 | otg_state_string(iotg->otg.state)); | ||
| 1673 | } | ||
| 1674 | |||
| 1675 | static ssize_t | ||
| 1676 | show_registers(struct device *_dev, struct device_attribute *attr, char *buf) | ||
| 1677 | { | ||
| 1678 | struct langwell_otg *lnw = the_transceiver; | ||
| 1679 | char *next; | ||
| 1680 | unsigned size, t; | ||
| 1681 | |||
| 1682 | next = buf; | ||
| 1683 | size = PAGE_SIZE; | ||
| 1684 | |||
| 1685 | t = scnprintf(next, size, | ||
| 1686 | "\n" | ||
| 1687 | "USBCMD = 0x%08x\n" | ||
| 1688 | "USBSTS = 0x%08x\n" | ||
| 1689 | "USBINTR = 0x%08x\n" | ||
| 1690 | "ASYNCLISTADDR = 0x%08x\n" | ||
| 1691 | "PORTSC1 = 0x%08x\n" | ||
| 1692 | "HOSTPC1 = 0x%08x\n" | ||
| 1693 | "OTGSC = 0x%08x\n" | ||
| 1694 | "USBMODE = 0x%08x\n", | ||
| 1695 | readl(lnw->iotg.base + 0x30), | ||
| 1696 | readl(lnw->iotg.base + 0x34), | ||
| 1697 | readl(lnw->iotg.base + 0x38), | ||
| 1698 | readl(lnw->iotg.base + 0x48), | ||
| 1699 | readl(lnw->iotg.base + 0x74), | ||
| 1700 | readl(lnw->iotg.base + 0xb4), | ||
| 1701 | readl(lnw->iotg.base + 0xf4), | ||
| 1702 | readl(lnw->iotg.base + 0xf8) | ||
| 1703 | ); | ||
| 1704 | size -= t; | ||
| 1705 | next += t; | ||
| 1706 | |||
| 1707 | return PAGE_SIZE - size; | ||
| 1708 | } | ||
| 1709 | static DEVICE_ATTR(registers, S_IRUGO, show_registers, NULL); | ||
| 1710 | |||
| 1711 | static ssize_t | ||
| 1712 | show_hsm(struct device *_dev, struct device_attribute *attr, char *buf) | ||
| 1713 | { | ||
| 1714 | struct langwell_otg *lnw = the_transceiver; | ||
| 1715 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 1716 | char *next; | ||
| 1717 | unsigned size, t; | ||
| 1718 | |||
| 1719 | next = buf; | ||
| 1720 | size = PAGE_SIZE; | ||
| 1721 | |||
| 1722 | if (iotg->otg.host) | ||
| 1723 | iotg->hsm.a_set_b_hnp_en = iotg->otg.host->b_hnp_enable; | ||
| 1724 | |||
| 1725 | if (iotg->otg.gadget) | ||
| 1726 | iotg->hsm.b_hnp_enable = iotg->otg.gadget->b_hnp_enable; | ||
| 1727 | |||
| 1728 | t = scnprintf(next, size, | ||
| 1729 | "\n" | ||
| 1730 | "current state = %s\n" | ||
| 1731 | "a_bus_resume = \t%d\n" | ||
| 1732 | "a_bus_suspend = \t%d\n" | ||
| 1733 | "a_conn = \t%d\n" | ||
| 1734 | "a_sess_vld = \t%d\n" | ||
| 1735 | "a_srp_det = \t%d\n" | ||
| 1736 | "a_vbus_vld = \t%d\n" | ||
| 1737 | "b_bus_resume = \t%d\n" | ||
| 1738 | "b_bus_suspend = \t%d\n" | ||
| 1739 | "b_conn = \t%d\n" | ||
| 1740 | "b_se0_srp = \t%d\n" | ||
| 1741 | "b_sess_end = \t%d\n" | ||
| 1742 | "b_sess_vld = \t%d\n" | ||
| 1743 | "id = \t%d\n" | ||
| 1744 | "a_set_b_hnp_en = \t%d\n" | ||
| 1745 | "b_srp_done = \t%d\n" | ||
| 1746 | "b_hnp_enable = \t%d\n" | ||
| 1747 | "a_wait_vrise_tmout = \t%d\n" | ||
| 1748 | "a_wait_bcon_tmout = \t%d\n" | ||
| 1749 | "a_aidl_bdis_tmout = \t%d\n" | ||
| 1750 | "b_ase0_brst_tmout = \t%d\n" | ||
| 1751 | "a_bus_drop = \t%d\n" | ||
| 1752 | "a_bus_req = \t%d\n" | ||
| 1753 | "a_clr_err = \t%d\n" | ||
| 1754 | "a_suspend_req = \t%d\n" | ||
| 1755 | "b_bus_req = \t%d\n" | ||
| 1756 | "b_bus_suspend_tmout = \t%d\n" | ||
| 1757 | "b_bus_suspend_vld = \t%d\n", | ||
| 1758 | otg_state_string(iotg->otg.state), | ||
| 1759 | iotg->hsm.a_bus_resume, | ||
| 1760 | iotg->hsm.a_bus_suspend, | ||
| 1761 | iotg->hsm.a_conn, | ||
| 1762 | iotg->hsm.a_sess_vld, | ||
| 1763 | iotg->hsm.a_srp_det, | ||
| 1764 | iotg->hsm.a_vbus_vld, | ||
| 1765 | iotg->hsm.b_bus_resume, | ||
| 1766 | iotg->hsm.b_bus_suspend, | ||
| 1767 | iotg->hsm.b_conn, | ||
| 1768 | iotg->hsm.b_se0_srp, | ||
| 1769 | iotg->hsm.b_sess_end, | ||
| 1770 | iotg->hsm.b_sess_vld, | ||
| 1771 | iotg->hsm.id, | ||
| 1772 | iotg->hsm.a_set_b_hnp_en, | ||
| 1773 | iotg->hsm.b_srp_done, | ||
| 1774 | iotg->hsm.b_hnp_enable, | ||
| 1775 | iotg->hsm.a_wait_vrise_tmout, | ||
| 1776 | iotg->hsm.a_wait_bcon_tmout, | ||
| 1777 | iotg->hsm.a_aidl_bdis_tmout, | ||
| 1778 | iotg->hsm.b_ase0_brst_tmout, | ||
| 1779 | iotg->hsm.a_bus_drop, | ||
| 1780 | iotg->hsm.a_bus_req, | ||
| 1781 | iotg->hsm.a_clr_err, | ||
| 1782 | iotg->hsm.a_suspend_req, | ||
| 1783 | iotg->hsm.b_bus_req, | ||
| 1784 | iotg->hsm.b_bus_suspend_tmout, | ||
| 1785 | iotg->hsm.b_bus_suspend_vld | ||
| 1786 | ); | ||
| 1787 | size -= t; | ||
| 1788 | next += t; | ||
| 1789 | |||
| 1790 | return PAGE_SIZE - size; | ||
| 1791 | } | ||
| 1792 | static DEVICE_ATTR(hsm, S_IRUGO, show_hsm, NULL); | ||
| 1793 | |||
| 1794 | static ssize_t | ||
| 1795 | get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 1796 | { | ||
| 1797 | struct langwell_otg *lnw = the_transceiver; | ||
| 1798 | char *next; | ||
| 1799 | unsigned size, t; | ||
| 1800 | |||
| 1801 | next = buf; | ||
| 1802 | size = PAGE_SIZE; | ||
| 1803 | |||
| 1804 | t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_req); | ||
| 1805 | size -= t; | ||
| 1806 | next += t; | ||
| 1807 | |||
| 1808 | return PAGE_SIZE - size; | ||
| 1809 | } | ||
| 1810 | |||
| 1811 | static ssize_t | ||
| 1812 | set_a_bus_req(struct device *dev, struct device_attribute *attr, | ||
| 1813 | const char *buf, size_t count) | ||
| 1814 | { | ||
| 1815 | struct langwell_otg *lnw = the_transceiver; | ||
| 1816 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 1817 | |||
| 1818 | if (!iotg->otg.default_a) | ||
| 1819 | return -1; | ||
| 1820 | if (count > 2) | ||
| 1821 | return -1; | ||
| 1822 | |||
| 1823 | if (buf[0] == '0') { | ||
| 1824 | iotg->hsm.a_bus_req = 0; | ||
| 1825 | dev_dbg(lnw->dev, "User request: a_bus_req = 0\n"); | ||
| 1826 | } else if (buf[0] == '1') { | ||
| 1827 | /* If a_bus_drop is TRUE, a_bus_req can't be set */ | ||
| 1828 | if (iotg->hsm.a_bus_drop) | ||
| 1829 | return -1; | ||
| 1830 | iotg->hsm.a_bus_req = 1; | ||
| 1831 | dev_dbg(lnw->dev, "User request: a_bus_req = 1\n"); | ||
| 1832 | } | ||
| 1833 | if (spin_trylock(&lnw->wq_lock)) { | ||
| 1834 | langwell_update_transceiver(); | ||
| 1835 | spin_unlock(&lnw->wq_lock); | ||
| 1836 | } | ||
| 1837 | return count; | ||
| 1838 | } | ||
| 1839 | static DEVICE_ATTR(a_bus_req, S_IRUGO | S_IWUSR, get_a_bus_req, set_a_bus_req); | ||
| 1840 | |||
| 1841 | static ssize_t | ||
| 1842 | get_a_bus_drop(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 1843 | { | ||
| 1844 | struct langwell_otg *lnw = the_transceiver; | ||
| 1845 | char *next; | ||
| 1846 | unsigned size, t; | ||
| 1847 | |||
| 1848 | next = buf; | ||
| 1849 | size = PAGE_SIZE; | ||
| 1850 | |||
| 1851 | t = scnprintf(next, size, "%d", lnw->iotg.hsm.a_bus_drop); | ||
| 1852 | size -= t; | ||
| 1853 | next += t; | ||
| 1854 | |||
| 1855 | return PAGE_SIZE - size; | ||
| 1856 | } | ||
| 1857 | |||
| 1858 | static ssize_t | ||
| 1859 | set_a_bus_drop(struct device *dev, struct device_attribute *attr, | ||
| 1860 | const char *buf, size_t count) | ||
| 1861 | { | ||
| 1862 | struct langwell_otg *lnw = the_transceiver; | ||
| 1863 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 1864 | |||
| 1865 | if (!iotg->otg.default_a) | ||
| 1866 | return -1; | ||
| 1867 | if (count > 2) | ||
| 1868 | return -1; | ||
| 1869 | |||
| 1870 | if (buf[0] == '0') { | ||
| 1871 | iotg->hsm.a_bus_drop = 0; | ||
| 1872 | dev_dbg(lnw->dev, "User request: a_bus_drop = 0\n"); | ||
| 1873 | } else if (buf[0] == '1') { | ||
| 1874 | iotg->hsm.a_bus_drop = 1; | ||
| 1875 | iotg->hsm.a_bus_req = 0; | ||
| 1876 | dev_dbg(lnw->dev, "User request: a_bus_drop = 1\n"); | ||
| 1877 | dev_dbg(lnw->dev, "User request: and a_bus_req = 0\n"); | ||
| 1878 | } | ||
| 1879 | if (spin_trylock(&lnw->wq_lock)) { | ||
| 1880 | langwell_update_transceiver(); | ||
| 1881 | spin_unlock(&lnw->wq_lock); | ||
| 1882 | } | ||
| 1883 | return count; | ||
| 1884 | } | ||
| 1885 | static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR, get_a_bus_drop, set_a_bus_drop); | ||
| 1886 | |||
| 1887 | static ssize_t | ||
| 1888 | get_b_bus_req(struct device *dev, struct device_attribute *attr, char *buf) | ||
| 1889 | { | ||
| 1890 | struct langwell_otg *lnw = the_transceiver; | ||
| 1891 | char *next; | ||
| 1892 | unsigned size, t; | ||
| 1893 | |||
| 1894 | next = buf; | ||
| 1895 | size = PAGE_SIZE; | ||
| 1896 | |||
| 1897 | t = scnprintf(next, size, "%d", lnw->iotg.hsm.b_bus_req); | ||
| 1898 | size -= t; | ||
| 1899 | next += t; | ||
| 1900 | |||
| 1901 | return PAGE_SIZE - size; | ||
| 1902 | } | ||
| 1903 | |||
| 1904 | static ssize_t | ||
| 1905 | set_b_bus_req(struct device *dev, struct device_attribute *attr, | ||
| 1906 | const char *buf, size_t count) | ||
| 1907 | { | ||
| 1908 | struct langwell_otg *lnw = the_transceiver; | ||
| 1909 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 1910 | |||
| 1911 | if (iotg->otg.default_a) | ||
| 1912 | return -1; | ||
| 1913 | |||
| 1914 | if (count > 2) | ||
| 1915 | return -1; | ||
| 1916 | |||
| 1917 | if (buf[0] == '0') { | ||
| 1918 | iotg->hsm.b_bus_req = 0; | ||
| 1919 | dev_dbg(lnw->dev, "User request: b_bus_req = 0\n"); | ||
| 1920 | } else if (buf[0] == '1') { | ||
| 1921 | iotg->hsm.b_bus_req = 1; | ||
| 1922 | dev_dbg(lnw->dev, "User request: b_bus_req = 1\n"); | ||
| 1923 | } | ||
| 1924 | if (spin_trylock(&lnw->wq_lock)) { | ||
| 1925 | langwell_update_transceiver(); | ||
| 1926 | spin_unlock(&lnw->wq_lock); | ||
| 1927 | } | ||
| 1928 | return count; | ||
| 1929 | } | ||
| 1930 | static DEVICE_ATTR(b_bus_req, S_IRUGO | S_IWUSR, get_b_bus_req, set_b_bus_req); | ||
| 1931 | |||
| 1932 | static ssize_t | ||
| 1933 | set_a_clr_err(struct device *dev, struct device_attribute *attr, | ||
| 1934 | const char *buf, size_t count) | ||
| 1935 | { | ||
| 1936 | struct langwell_otg *lnw = the_transceiver; | ||
| 1937 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 1938 | |||
| 1939 | if (!iotg->otg.default_a) | ||
| 1940 | return -1; | ||
| 1941 | if (count > 2) | ||
| 1942 | return -1; | ||
| 1943 | |||
| 1944 | if (buf[0] == '1') { | ||
| 1945 | iotg->hsm.a_clr_err = 1; | ||
| 1946 | dev_dbg(lnw->dev, "User request: a_clr_err = 1\n"); | ||
| 1947 | } | ||
| 1948 | if (spin_trylock(&lnw->wq_lock)) { | ||
| 1949 | langwell_update_transceiver(); | ||
| 1950 | spin_unlock(&lnw->wq_lock); | ||
| 1951 | } | ||
| 1952 | return count; | ||
| 1953 | } | ||
| 1954 | static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err); | ||
| 1955 | |||
| 1956 | static struct attribute *inputs_attrs[] = { | ||
| 1957 | &dev_attr_a_bus_req.attr, | ||
| 1958 | &dev_attr_a_bus_drop.attr, | ||
| 1959 | &dev_attr_b_bus_req.attr, | ||
| 1960 | &dev_attr_a_clr_err.attr, | ||
| 1961 | NULL, | ||
| 1962 | }; | ||
| 1963 | |||
| 1964 | static struct attribute_group debug_dev_attr_group = { | ||
| 1965 | .name = "inputs", | ||
| 1966 | .attrs = inputs_attrs, | ||
| 1967 | }; | ||
| 1968 | |||
| 1969 | static int langwell_otg_probe(struct pci_dev *pdev, | ||
| 1970 | const struct pci_device_id *id) | ||
| 1971 | { | ||
| 1972 | unsigned long resource, len; | ||
| 1973 | void __iomem *base = NULL; | ||
| 1974 | int retval; | ||
| 1975 | u32 val32; | ||
| 1976 | struct langwell_otg *lnw; | ||
| 1977 | char qname[] = "langwell_otg_queue"; | ||
| 1978 | |||
| 1979 | retval = 0; | ||
| 1980 | dev_dbg(&pdev->dev, "\notg controller is detected.\n"); | ||
| 1981 | if (pci_enable_device(pdev) < 0) { | ||
| 1982 | retval = -ENODEV; | ||
| 1983 | goto done; | ||
| 1984 | } | ||
| 1985 | |||
| 1986 | lnw = kzalloc(sizeof *lnw, GFP_KERNEL); | ||
| 1987 | if (lnw == NULL) { | ||
| 1988 | retval = -ENOMEM; | ||
| 1989 | goto done; | ||
| 1990 | } | ||
| 1991 | the_transceiver = lnw; | ||
| 1992 | |||
| 1993 | /* control register: BAR 0 */ | ||
| 1994 | resource = pci_resource_start(pdev, 0); | ||
| 1995 | len = pci_resource_len(pdev, 0); | ||
| 1996 | if (!request_mem_region(resource, len, driver_name)) { | ||
| 1997 | retval = -EBUSY; | ||
| 1998 | goto err; | ||
| 1999 | } | ||
| 2000 | lnw->region = 1; | ||
| 2001 | |||
| 2002 | base = ioremap_nocache(resource, len); | ||
| 2003 | if (base == NULL) { | ||
| 2004 | retval = -EFAULT; | ||
| 2005 | goto err; | ||
| 2006 | } | ||
| 2007 | lnw->iotg.base = base; | ||
| 2008 | |||
| 2009 | if (!request_mem_region(USBCFG_ADDR, USBCFG_LEN, driver_name)) { | ||
| 2010 | retval = -EBUSY; | ||
| 2011 | goto err; | ||
| 2012 | } | ||
| 2013 | lnw->cfg_region = 1; | ||
| 2014 | |||
| 2015 | /* For the SCCB.USBCFG register */ | ||
| 2016 | base = ioremap_nocache(USBCFG_ADDR, USBCFG_LEN); | ||
| 2017 | if (base == NULL) { | ||
| 2018 | retval = -EFAULT; | ||
| 2019 | goto err; | ||
| 2020 | } | ||
| 2021 | lnw->usbcfg = base; | ||
| 2022 | |||
| 2023 | if (!pdev->irq) { | ||
| 2024 | dev_dbg(&pdev->dev, "No IRQ.\n"); | ||
| 2025 | retval = -ENODEV; | ||
| 2026 | goto err; | ||
| 2027 | } | ||
| 2028 | |||
| 2029 | lnw->qwork = create_singlethread_workqueue(qname); | ||
| 2030 | if (!lnw->qwork) { | ||
| 2031 | dev_dbg(&pdev->dev, "cannot create workqueue %s\n", qname); | ||
| 2032 | retval = -ENOMEM; | ||
| 2033 | goto err; | ||
| 2034 | } | ||
| 2035 | INIT_WORK(&lnw->work, langwell_otg_work); | ||
| 2036 | |||
| 2037 | /* OTG common part */ | ||
| 2038 | lnw->dev = &pdev->dev; | ||
| 2039 | lnw->iotg.otg.dev = lnw->dev; | ||
| 2040 | lnw->iotg.otg.label = driver_name; | ||
| 2041 | lnw->iotg.otg.set_host = langwell_otg_set_host; | ||
| 2042 | lnw->iotg.otg.set_peripheral = langwell_otg_set_peripheral; | ||
| 2043 | lnw->iotg.otg.set_power = langwell_otg_set_power; | ||
| 2044 | lnw->iotg.otg.set_vbus = langwell_otg_set_vbus; | ||
| 2045 | lnw->iotg.otg.start_srp = langwell_otg_start_srp; | ||
| 2046 | lnw->iotg.otg.state = OTG_STATE_UNDEFINED; | ||
| 2047 | |||
| 2048 | if (otg_set_transceiver(&lnw->iotg.otg)) { | ||
| 2049 | dev_dbg(lnw->dev, "can't set transceiver\n"); | ||
| 2050 | retval = -EBUSY; | ||
| 2051 | goto err; | ||
| 2052 | } | ||
| 2053 | |||
| 2054 | reset_otg(); | ||
| 2055 | init_hsm(); | ||
| 2056 | |||
| 2057 | spin_lock_init(&lnw->lock); | ||
| 2058 | spin_lock_init(&lnw->wq_lock); | ||
| 2059 | INIT_LIST_HEAD(&active_timers); | ||
| 2060 | retval = langwell_otg_init_timers(&lnw->iotg.hsm); | ||
| 2061 | if (retval) { | ||
| 2062 | dev_dbg(&pdev->dev, "Failed to init timers\n"); | ||
| 2063 | goto err; | ||
| 2064 | } | ||
| 2065 | |||
| 2066 | init_timer(&lnw->hsm_timer); | ||
| 2067 | ATOMIC_INIT_NOTIFIER_HEAD(&lnw->iotg.iotg_notifier); | ||
| 2068 | |||
| 2069 | lnw->iotg_notifier.notifier_call = langwell_otg_iotg_notify; | ||
| 2070 | |||
| 2071 | retval = intel_mid_otg_register_notifier(&lnw->iotg, | ||
| 2072 | &lnw->iotg_notifier); | ||
| 2073 | if (retval) { | ||
| 2074 | dev_dbg(lnw->dev, "Failed to register notifier\n"); | ||
| 2075 | goto err; | ||
| 2076 | } | ||
| 2077 | |||
| 2078 | if (request_irq(pdev->irq, otg_irq, IRQF_SHARED, | ||
| 2079 | driver_name, lnw) != 0) { | ||
| 2080 | dev_dbg(lnw->dev, "request interrupt %d failed\n", pdev->irq); | ||
| 2081 | retval = -EBUSY; | ||
| 2082 | goto err; | ||
| 2083 | } | ||
| 2084 | |||
| 2085 | /* enable OTGSC int */ | ||
| 2086 | val32 = OTGSC_DPIE | OTGSC_BSEIE | OTGSC_BSVIE | | ||
| 2087 | OTGSC_ASVIE | OTGSC_AVVIE | OTGSC_IDIE | OTGSC_IDPU; | ||
| 2088 | writel(val32, lnw->iotg.base + CI_OTGSC); | ||
| 2089 | |||
| 2090 | retval = device_create_file(&pdev->dev, &dev_attr_registers); | ||
| 2091 | if (retval < 0) { | ||
| 2092 | dev_dbg(lnw->dev, | ||
| 2093 | "Can't register sysfs attribute: %d\n", retval); | ||
| 2094 | goto err; | ||
| 2095 | } | ||
| 2096 | |||
| 2097 | retval = device_create_file(&pdev->dev, &dev_attr_hsm); | ||
| 2098 | if (retval < 0) { | ||
| 2099 | dev_dbg(lnw->dev, "Can't hsm sysfs attribute: %d\n", retval); | ||
| 2100 | goto err; | ||
| 2101 | } | ||
| 2102 | |||
| 2103 | retval = sysfs_create_group(&pdev->dev.kobj, &debug_dev_attr_group); | ||
| 2104 | if (retval < 0) { | ||
| 2105 | dev_dbg(lnw->dev, | ||
| 2106 | "Can't register sysfs attr group: %d\n", retval); | ||
| 2107 | goto err; | ||
| 2108 | } | ||
| 2109 | |||
| 2110 | if (lnw->iotg.otg.state == OTG_STATE_A_IDLE) | ||
| 2111 | langwell_update_transceiver(); | ||
| 2112 | |||
| 2113 | return 0; | ||
| 2114 | |||
| 2115 | err: | ||
| 2116 | if (the_transceiver) | ||
| 2117 | langwell_otg_remove(pdev); | ||
| 2118 | done: | ||
| 2119 | return retval; | ||
| 2120 | } | ||
| 2121 | |||
| 2122 | static void langwell_otg_remove(struct pci_dev *pdev) | ||
| 2123 | { | ||
| 2124 | struct langwell_otg *lnw = the_transceiver; | ||
| 2125 | |||
| 2126 | if (lnw->qwork) { | ||
| 2127 | flush_workqueue(lnw->qwork); | ||
| 2128 | destroy_workqueue(lnw->qwork); | ||
| 2129 | } | ||
| 2130 | intel_mid_otg_unregister_notifier(&lnw->iotg, &lnw->iotg_notifier); | ||
| 2131 | langwell_otg_free_timers(); | ||
| 2132 | |||
| 2133 | /* disable OTGSC interrupt as OTGSC doesn't change in reset */ | ||
| 2134 | writel(0, lnw->iotg.base + CI_OTGSC); | ||
| 2135 | |||
| 2136 | if (pdev->irq) | ||
| 2137 | free_irq(pdev->irq, lnw); | ||
| 2138 | if (lnw->usbcfg) | ||
| 2139 | iounmap(lnw->usbcfg); | ||
| 2140 | if (lnw->cfg_region) | ||
| 2141 | release_mem_region(USBCFG_ADDR, USBCFG_LEN); | ||
| 2142 | if (lnw->iotg.base) | ||
| 2143 | iounmap(lnw->iotg.base); | ||
| 2144 | if (lnw->region) | ||
| 2145 | release_mem_region(pci_resource_start(pdev, 0), | ||
| 2146 | pci_resource_len(pdev, 0)); | ||
| 2147 | |||
| 2148 | otg_set_transceiver(NULL); | ||
| 2149 | pci_disable_device(pdev); | ||
| 2150 | sysfs_remove_group(&pdev->dev.kobj, &debug_dev_attr_group); | ||
| 2151 | device_remove_file(&pdev->dev, &dev_attr_hsm); | ||
| 2152 | device_remove_file(&pdev->dev, &dev_attr_registers); | ||
| 2153 | kfree(lnw); | ||
| 2154 | lnw = NULL; | ||
| 2155 | } | ||
| 2156 | |||
| 2157 | static void transceiver_suspend(struct pci_dev *pdev) | ||
| 2158 | { | ||
| 2159 | pci_save_state(pdev); | ||
| 2160 | pci_set_power_state(pdev, PCI_D3hot); | ||
| 2161 | langwell_otg_phy_low_power(1); | ||
| 2162 | } | ||
| 2163 | |||
| 2164 | static int langwell_otg_suspend(struct pci_dev *pdev, pm_message_t message) | ||
| 2165 | { | ||
| 2166 | struct langwell_otg *lnw = the_transceiver; | ||
| 2167 | struct intel_mid_otg_xceiv *iotg = &lnw->iotg; | ||
| 2168 | int ret = 0; | ||
| 2169 | |||
| 2170 | /* Disbale OTG interrupts */ | ||
| 2171 | langwell_otg_intr(0); | ||
| 2172 | |||
| 2173 | if (pdev->irq) | ||
| 2174 | free_irq(pdev->irq, lnw); | ||
| 2175 | |||
| 2176 | /* Prevent more otg_work */ | ||
| 2177 | flush_workqueue(lnw->qwork); | ||
| 2178 | destroy_workqueue(lnw->qwork); | ||
| 2179 | lnw->qwork = NULL; | ||
| 2180 | |||
| 2181 | /* start actions */ | ||
| 2182 | switch (iotg->otg.state) { | ||
| 2183 | case OTG_STATE_A_WAIT_VFALL: | ||
| 2184 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2185 | case OTG_STATE_A_IDLE: | ||
| 2186 | case OTG_STATE_B_IDLE: | ||
| 2187 | case OTG_STATE_A_VBUS_ERR: | ||
| 2188 | transceiver_suspend(pdev); | ||
| 2189 | break; | ||
| 2190 | case OTG_STATE_A_WAIT_VRISE: | ||
| 2191 | langwell_otg_del_timer(a_wait_vrise_tmr); | ||
| 2192 | iotg->hsm.a_srp_det = 0; | ||
| 2193 | |||
| 2194 | /* Turn off VBus */ | ||
| 2195 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 2196 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2197 | transceiver_suspend(pdev); | ||
| 2198 | break; | ||
| 2199 | case OTG_STATE_A_WAIT_BCON: | ||
| 2200 | del_timer_sync(&lnw->hsm_timer); | ||
| 2201 | if (lnw->iotg.stop_host) | ||
| 2202 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 2203 | else | ||
| 2204 | dev_dbg(&pdev->dev, "host driver has been removed.\n"); | ||
| 2205 | |||
| 2206 | iotg->hsm.a_srp_det = 0; | ||
| 2207 | |||
| 2208 | /* Turn off VBus */ | ||
| 2209 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 2210 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2211 | transceiver_suspend(pdev); | ||
| 2212 | break; | ||
| 2213 | case OTG_STATE_A_HOST: | ||
| 2214 | if (lnw->iotg.stop_host) | ||
| 2215 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 2216 | else | ||
| 2217 | dev_dbg(&pdev->dev, "host driver has been removed.\n"); | ||
| 2218 | |||
| 2219 | iotg->hsm.a_srp_det = 0; | ||
| 2220 | |||
| 2221 | /* Turn off VBus */ | ||
| 2222 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 2223 | |||
| 2224 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2225 | transceiver_suspend(pdev); | ||
| 2226 | break; | ||
| 2227 | case OTG_STATE_A_SUSPEND: | ||
| 2228 | langwell_otg_del_timer(a_aidl_bdis_tmr); | ||
| 2229 | langwell_otg_HABA(0); | ||
| 2230 | if (lnw->iotg.stop_host) | ||
| 2231 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 2232 | else | ||
| 2233 | dev_dbg(lnw->dev, "host driver has been removed.\n"); | ||
| 2234 | iotg->hsm.a_srp_det = 0; | ||
| 2235 | |||
| 2236 | /* Turn off VBus */ | ||
| 2237 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 2238 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2239 | transceiver_suspend(pdev); | ||
| 2240 | break; | ||
| 2241 | case OTG_STATE_A_PERIPHERAL: | ||
| 2242 | del_timer_sync(&lnw->hsm_timer); | ||
| 2243 | |||
| 2244 | if (lnw->iotg.stop_peripheral) | ||
| 2245 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 2246 | else | ||
| 2247 | dev_dbg(&pdev->dev, | ||
| 2248 | "client driver has been removed.\n"); | ||
| 2249 | iotg->hsm.a_srp_det = 0; | ||
| 2250 | |||
| 2251 | /* Turn off VBus */ | ||
| 2252 | iotg->otg.set_vbus(&iotg->otg, false); | ||
| 2253 | iotg->otg.state = OTG_STATE_A_IDLE; | ||
| 2254 | transceiver_suspend(pdev); | ||
| 2255 | break; | ||
| 2256 | case OTG_STATE_B_HOST: | ||
| 2257 | if (lnw->iotg.stop_host) | ||
| 2258 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 2259 | else | ||
| 2260 | dev_dbg(&pdev->dev, "host driver has been removed.\n"); | ||
| 2261 | iotg->hsm.b_bus_req = 0; | ||
| 2262 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 2263 | transceiver_suspend(pdev); | ||
| 2264 | break; | ||
| 2265 | case OTG_STATE_B_PERIPHERAL: | ||
| 2266 | if (lnw->iotg.stop_peripheral) | ||
| 2267 | lnw->iotg.stop_peripheral(&lnw->iotg); | ||
| 2268 | else | ||
| 2269 | dev_dbg(&pdev->dev, | ||
| 2270 | "client driver has been removed.\n"); | ||
| 2271 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 2272 | transceiver_suspend(pdev); | ||
| 2273 | break; | ||
| 2274 | case OTG_STATE_B_WAIT_ACON: | ||
| 2275 | /* delete hsm timer for b_ase0_brst_tmr */ | ||
| 2276 | del_timer_sync(&lnw->hsm_timer); | ||
| 2277 | |||
| 2278 | langwell_otg_HAAR(0); | ||
| 2279 | |||
| 2280 | if (lnw->iotg.stop_host) | ||
| 2281 | lnw->iotg.stop_host(&lnw->iotg); | ||
| 2282 | else | ||
| 2283 | dev_dbg(&pdev->dev, "host driver has been removed.\n"); | ||
| 2284 | iotg->hsm.b_bus_req = 0; | ||
| 2285 | iotg->otg.state = OTG_STATE_B_IDLE; | ||
| 2286 | transceiver_suspend(pdev); | ||
| 2287 | break; | ||
| 2288 | default: | ||
| 2289 | dev_dbg(lnw->dev, "error state before suspend\n"); | ||
| 2290 | break; | ||
| 2291 | } | ||
| 2292 | |||
| 2293 | return ret; | ||
| 2294 | } | ||
| 2295 | |||
| 2296 | static void transceiver_resume(struct pci_dev *pdev) | ||
| 2297 | { | ||
| 2298 | pci_restore_state(pdev); | ||
| 2299 | pci_set_power_state(pdev, PCI_D0); | ||
| 2300 | } | ||
| 2301 | |||
| 2302 | static int langwell_otg_resume(struct pci_dev *pdev) | ||
| 2303 | { | ||
| 2304 | struct langwell_otg *lnw = the_transceiver; | ||
| 2305 | int ret = 0; | ||
| 2306 | |||
| 2307 | transceiver_resume(pdev); | ||
| 2308 | |||
| 2309 | lnw->qwork = create_singlethread_workqueue("langwell_otg_queue"); | ||
| 2310 | if (!lnw->qwork) { | ||
| 2311 | dev_dbg(&pdev->dev, "cannot create langwell otg workqueuen"); | ||
| 2312 | ret = -ENOMEM; | ||
| 2313 | goto error; | ||
| 2314 | } | ||
| 2315 | |||
| 2316 | if (request_irq(pdev->irq, otg_irq, IRQF_SHARED, | ||
| 2317 | driver_name, lnw) != 0) { | ||
| 2318 | dev_dbg(&pdev->dev, "request interrupt %d failed\n", pdev->irq); | ||
| 2319 | ret = -EBUSY; | ||
| 2320 | goto error; | ||
| 2321 | } | ||
| 2322 | |||
| 2323 | /* enable OTG interrupts */ | ||
| 2324 | langwell_otg_intr(1); | ||
| 2325 | |||
| 2326 | update_hsm(); | ||
| 2327 | |||
| 2328 | langwell_update_transceiver(); | ||
| 2329 | |||
| 2330 | return ret; | ||
| 2331 | error: | ||
| 2332 | langwell_otg_intr(0); | ||
| 2333 | transceiver_suspend(pdev); | ||
| 2334 | return ret; | ||
| 2335 | } | ||
| 2336 | |||
| 2337 | static int __init langwell_otg_init(void) | ||
| 2338 | { | ||
| 2339 | return pci_register_driver(&otg_pci_driver); | ||
| 2340 | } | ||
| 2341 | module_init(langwell_otg_init); | ||
| 2342 | |||
| 2343 | static void __exit langwell_otg_cleanup(void) | ||
| 2344 | { | ||
| 2345 | pci_unregister_driver(&otg_pci_driver); | ||
| 2346 | } | ||
| 2347 | module_exit(langwell_otg_cleanup); | ||
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c index db0d4fcdc8e2..b5fbe1452ab0 100644 --- a/drivers/usb/otg/mv_otg.c +++ b/drivers/usb/otg/mv_otg.c | |||
| @@ -202,6 +202,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg) | |||
| 202 | 202 | ||
| 203 | static void mv_otg_start_host(struct mv_otg *mvotg, int on) | 203 | static void mv_otg_start_host(struct mv_otg *mvotg, int on) |
| 204 | { | 204 | { |
| 205 | #ifdef CONFIG_USB | ||
| 205 | struct otg_transceiver *otg = &mvotg->otg; | 206 | struct otg_transceiver *otg = &mvotg->otg; |
| 206 | struct usb_hcd *hcd; | 207 | struct usb_hcd *hcd; |
| 207 | 208 | ||
| @@ -216,6 +217,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on) | |||
| 216 | usb_add_hcd(hcd, hcd->irq, IRQF_SHARED); | 217 | usb_add_hcd(hcd, hcd->irq, IRQF_SHARED); |
| 217 | else | 218 | else |
| 218 | usb_remove_hcd(hcd); | 219 | usb_remove_hcd(hcd); |
| 220 | #endif /* CONFIG_USB */ | ||
| 219 | } | 221 | } |
| 220 | 222 | ||
| 221 | static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on) | 223 | static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on) |
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 528691d5f3e2..7542aa94a462 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c | |||
| @@ -425,7 +425,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv, | |||
| 425 | struct usbhs_pipe *pipe; | 425 | struct usbhs_pipe *pipe; |
| 426 | int recip = ctrl->bRequestType & USB_RECIP_MASK; | 426 | int recip = ctrl->bRequestType & USB_RECIP_MASK; |
| 427 | int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK; | 427 | int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK; |
| 428 | int ret; | 428 | int ret = 0; |
| 429 | int (*func)(struct usbhs_priv *priv, struct usbhsg_uep *uep, | 429 | int (*func)(struct usbhs_priv *priv, struct usbhsg_uep *uep, |
| 430 | struct usb_ctrlrequest *ctrl); | 430 | struct usb_ctrlrequest *ctrl); |
| 431 | char *msg; | 431 | char *msg; |
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index fba1147ed916..8dbf51a43c45 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
| @@ -39,6 +39,8 @@ static void cp210x_get_termios(struct tty_struct *, | |||
| 39 | struct usb_serial_port *port); | 39 | struct usb_serial_port *port); |
| 40 | static void cp210x_get_termios_port(struct usb_serial_port *port, | 40 | static void cp210x_get_termios_port(struct usb_serial_port *port, |
| 41 | unsigned int *cflagp, unsigned int *baudp); | 41 | unsigned int *cflagp, unsigned int *baudp); |
| 42 | static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *, | ||
| 43 | struct ktermios *); | ||
| 42 | static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, | 44 | static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, |
| 43 | struct ktermios*); | 45 | struct ktermios*); |
| 44 | static int cp210x_tiocmget(struct tty_struct *); | 46 | static int cp210x_tiocmget(struct tty_struct *); |
| @@ -138,6 +140,7 @@ static const struct usb_device_id id_table[] = { | |||
| 138 | { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ | 140 | { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ |
| 139 | { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ | 141 | { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ |
| 140 | { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ | 142 | { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ |
| 143 | { USB_DEVICE(0x3195, 0xF190) }, /* Link Instruments MSO-19 */ | ||
| 141 | { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ | 144 | { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */ |
| 142 | { } /* Terminating Entry */ | 145 | { } /* Terminating Entry */ |
| 143 | }; | 146 | }; |
| @@ -201,6 +204,8 @@ static struct usb_serial_driver cp210x_device = { | |||
| 201 | #define CP210X_EMBED_EVENTS 0x15 | 204 | #define CP210X_EMBED_EVENTS 0x15 |
| 202 | #define CP210X_GET_EVENTSTATE 0x16 | 205 | #define CP210X_GET_EVENTSTATE 0x16 |
| 203 | #define CP210X_SET_CHARS 0x19 | 206 | #define CP210X_SET_CHARS 0x19 |
| 207 | #define CP210X_GET_BAUDRATE 0x1D | ||
| 208 | #define CP210X_SET_BAUDRATE 0x1E | ||
| 204 | 209 | ||
| 205 | /* CP210X_IFC_ENABLE */ | 210 | /* CP210X_IFC_ENABLE */ |
| 206 | #define UART_ENABLE 0x0001 | 211 | #define UART_ENABLE 0x0001 |
| @@ -360,8 +365,8 @@ static inline int cp210x_set_config_single(struct usb_serial_port *port, | |||
| 360 | * Quantises the baud rate as per AN205 Table 1 | 365 | * Quantises the baud rate as per AN205 Table 1 |
| 361 | */ | 366 | */ |
| 362 | static unsigned int cp210x_quantise_baudrate(unsigned int baud) { | 367 | static unsigned int cp210x_quantise_baudrate(unsigned int baud) { |
| 363 | if (baud <= 56) baud = 0; | 368 | if (baud <= 300) |
| 364 | else if (baud <= 300) baud = 300; | 369 | baud = 300; |
| 365 | else if (baud <= 600) baud = 600; | 370 | else if (baud <= 600) baud = 600; |
| 366 | else if (baud <= 1200) baud = 1200; | 371 | else if (baud <= 1200) baud = 1200; |
| 367 | else if (baud <= 1800) baud = 1800; | 372 | else if (baud <= 1800) baud = 1800; |
| @@ -389,10 +394,10 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) { | |||
| 389 | else if (baud <= 491520) baud = 460800; | 394 | else if (baud <= 491520) baud = 460800; |
| 390 | else if (baud <= 567138) baud = 500000; | 395 | else if (baud <= 567138) baud = 500000; |
| 391 | else if (baud <= 670254) baud = 576000; | 396 | else if (baud <= 670254) baud = 576000; |
| 392 | else if (baud <= 1053257) baud = 921600; | 397 | else if (baud < 1000000) |
| 393 | else if (baud <= 1474560) baud = 1228800; | 398 | baud = 921600; |
| 394 | else if (baud <= 2457600) baud = 1843200; | 399 | else if (baud > 2000000) |
| 395 | else baud = 3686400; | 400 | baud = 2000000; |
| 396 | return baud; | 401 | return baud; |
| 397 | } | 402 | } |
| 398 | 403 | ||
| @@ -409,13 +414,14 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
| 409 | return result; | 414 | return result; |
| 410 | } | 415 | } |
| 411 | 416 | ||
| 412 | result = usb_serial_generic_open(tty, port); | ||
| 413 | if (result) | ||
| 414 | return result; | ||
| 415 | |||
| 416 | /* Configure the termios structure */ | 417 | /* Configure the termios structure */ |
| 417 | cp210x_get_termios(tty, port); | 418 | cp210x_get_termios(tty, port); |
| 418 | return 0; | 419 | |
| 420 | /* The baud rate must be initialised on cp2104 */ | ||
| 421 | if (tty) | ||
| 422 | cp210x_change_speed(tty, port, NULL); | ||
| 423 | |||
| 424 | return usb_serial_generic_open(tty, port); | ||
| 419 | } | 425 | } |
| 420 | 426 | ||
| 421 | static void cp210x_close(struct usb_serial_port *port) | 427 | static void cp210x_close(struct usb_serial_port *port) |
| @@ -467,10 +473,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, | |||
| 467 | 473 | ||
| 468 | dbg("%s - port %d", __func__, port->number); | 474 | dbg("%s - port %d", __func__, port->number); |
| 469 | 475 | ||
| 470 | cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2); | 476 | cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, 4); |
| 471 | /* Convert to baudrate */ | ||
| 472 | if (baud) | ||
| 473 | baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud); | ||
| 474 | 477 | ||
| 475 | dbg("%s - baud rate = %d", __func__, baud); | 478 | dbg("%s - baud rate = %d", __func__, baud); |
| 476 | *baudp = baud; | 479 | *baudp = baud; |
| @@ -579,11 +582,64 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, | |||
| 579 | *cflagp = cflag; | 582 | *cflagp = cflag; |
| 580 | } | 583 | } |
| 581 | 584 | ||
| 585 | /* | ||
| 586 | * CP2101 supports the following baud rates: | ||
| 587 | * | ||
| 588 | * 300, 600, 1200, 1800, 2400, 4800, 7200, 9600, 14400, 19200, 28800, | ||
| 589 | * 38400, 56000, 57600, 115200, 128000, 230400, 460800, 921600 | ||
| 590 | * | ||
| 591 | * CP2102 and CP2103 support the following additional rates: | ||
| 592 | * | ||
| 593 | * 4000, 16000, 51200, 64000, 76800, 153600, 250000, 256000, 500000, | ||
| 594 | * 576000 | ||
| 595 | * | ||
| 596 | * The device will map a requested rate to a supported one, but the result | ||
| 597 | * of requests for rates greater than 1053257 is undefined (see AN205). | ||
| 598 | * | ||
| 599 | * CP2104, CP2105 and CP2110 support most rates up to 2M, 921k and 1M baud, | ||
| 600 | * respectively, with an error less than 1%. The actual rates are determined | ||
| 601 | * by | ||
| 602 | * | ||
| 603 | * div = round(freq / (2 x prescale x request)) | ||
| 604 | * actual = freq / (2 x prescale x div) | ||
| 605 | * | ||
| 606 | * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps | ||
| 607 | * or 1 otherwise. | ||
| 608 | * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1 | ||
| 609 | * otherwise. | ||
| 610 | */ | ||
| 611 | static void cp210x_change_speed(struct tty_struct *tty, | ||
| 612 | struct usb_serial_port *port, struct ktermios *old_termios) | ||
| 613 | { | ||
| 614 | u32 baud; | ||
| 615 | |||
| 616 | baud = tty->termios->c_ospeed; | ||
| 617 | |||
| 618 | /* This maps the requested rate to a rate valid on cp2102 or cp2103, | ||
| 619 | * or to an arbitrary rate in [1M,2M]. | ||
| 620 | * | ||
| 621 | * NOTE: B0 is not implemented. | ||
| 622 | */ | ||
| 623 | baud = cp210x_quantise_baudrate(baud); | ||
| 624 | |||
| 625 | dbg("%s - setting baud rate to %u", __func__, baud); | ||
| 626 | if (cp210x_set_config(port, CP210X_SET_BAUDRATE, &baud, | ||
| 627 | sizeof(baud))) { | ||
| 628 | dev_warn(&port->dev, "failed to set baud rate to %u\n", baud); | ||
| 629 | if (old_termios) | ||
| 630 | baud = old_termios->c_ospeed; | ||
| 631 | else | ||
| 632 | baud = 9600; | ||
| 633 | } | ||
| 634 | |||
| 635 | tty_encode_baud_rate(tty, baud, baud); | ||
| 636 | } | ||
| 637 | |||
| 582 | static void cp210x_set_termios(struct tty_struct *tty, | 638 | static void cp210x_set_termios(struct tty_struct *tty, |
| 583 | struct usb_serial_port *port, struct ktermios *old_termios) | 639 | struct usb_serial_port *port, struct ktermios *old_termios) |
| 584 | { | 640 | { |
| 585 | unsigned int cflag, old_cflag; | 641 | unsigned int cflag, old_cflag; |
| 586 | unsigned int baud = 0, bits; | 642 | unsigned int bits; |
| 587 | unsigned int modem_ctl[4]; | 643 | unsigned int modem_ctl[4]; |
| 588 | 644 | ||
| 589 | dbg("%s - port %d", __func__, port->number); | 645 | dbg("%s - port %d", __func__, port->number); |
| @@ -593,20 +649,9 @@ static void cp210x_set_termios(struct tty_struct *tty, | |||
| 593 | 649 | ||
| 594 | cflag = tty->termios->c_cflag; | 650 | cflag = tty->termios->c_cflag; |
| 595 | old_cflag = old_termios->c_cflag; | 651 | old_cflag = old_termios->c_cflag; |
| 596 | baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty)); | 652 | |
| 597 | 653 | if (tty->termios->c_ospeed != old_termios->c_ospeed) | |
| 598 | /* If the baud rate is to be updated*/ | 654 | cp210x_change_speed(tty, port, old_termios); |
| 599 | if (baud != tty_termios_baud_rate(old_termios) && baud != 0) { | ||
| 600 | dbg("%s - Setting baud rate to %d baud", __func__, | ||
| 601 | baud); | ||
| 602 | if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, | ||
| 603 | ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { | ||
| 604 | dbg("Baud rate requested not supported by device"); | ||
| 605 | baud = tty_termios_baud_rate(old_termios); | ||
| 606 | } | ||
| 607 | } | ||
| 608 | /* Report back the resulting baud rate */ | ||
| 609 | tty_encode_baud_rate(tty, baud, baud); | ||
| 610 | 655 | ||
| 611 | /* If the number of data bits is to be updated */ | 656 | /* If the number of data bits is to be updated */ |
| 612 | if ((cflag & CSIZE) != (old_cflag & CSIZE)) { | 657 | if ((cflag & CSIZE) != (old_cflag & CSIZE)) { |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 01b6404df395..ad654f8208ef 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -797,6 +797,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 797 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 797 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 798 | { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID), | 798 | { USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID), |
| 799 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 799 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 800 | { USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) }, | ||
| 800 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, | 801 | { USB_DEVICE(JETI_VID, JETI_SPC1201_PID) }, |
| 801 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), | 802 | { USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID), |
| 802 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 803 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| @@ -805,6 +806,8 @@ static struct usb_device_id id_table_combined [] = { | |||
| 805 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, | 806 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, |
| 806 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), | 807 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), |
| 807 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 808 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 809 | { USB_DEVICE(FTDI_VID, TI_XDS100V2_PID), | ||
| 810 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
| 808 | { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, | 811 | { USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) }, |
| 809 | { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) }, | 812 | { USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) }, |
| 810 | { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) }, | 813 | { USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) }, |
| @@ -841,6 +844,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 841 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 844 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 842 | { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), | 845 | { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), |
| 843 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, | 846 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, |
| 847 | { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, | ||
| 844 | { }, /* Optional parameter entry */ | 848 | { }, /* Optional parameter entry */ |
| 845 | { } /* Terminating entry */ | 849 | { } /* Terminating entry */ |
| 846 | }; | 850 | }; |
| @@ -1333,8 +1337,7 @@ static int set_serial_info(struct tty_struct *tty, | |||
| 1333 | goto check_and_exit; | 1337 | goto check_and_exit; |
| 1334 | } | 1338 | } |
| 1335 | 1339 | ||
| 1336 | if ((new_serial.baud_base != priv->baud_base) && | 1340 | if (new_serial.baud_base != priv->baud_base) { |
| 1337 | (new_serial.baud_base < 9600)) { | ||
| 1338 | mutex_unlock(&priv->cfg_lock); | 1341 | mutex_unlock(&priv->cfg_lock); |
| 1339 | return -EINVAL; | 1342 | return -EINVAL; |
| 1340 | } | 1343 | } |
| @@ -1824,6 +1827,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) | |||
| 1824 | 1827 | ||
| 1825 | static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) | 1828 | static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 1826 | { | 1829 | { |
| 1830 | struct ktermios dummy; | ||
| 1827 | struct usb_device *dev = port->serial->dev; | 1831 | struct usb_device *dev = port->serial->dev; |
| 1828 | struct ftdi_private *priv = usb_get_serial_port_data(port); | 1832 | struct ftdi_private *priv = usb_get_serial_port_data(port); |
| 1829 | int result; | 1833 | int result; |
| @@ -1842,8 +1846,10 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
| 1842 | This is same behaviour as serial.c/rs_open() - Kuba */ | 1846 | This is same behaviour as serial.c/rs_open() - Kuba */ |
| 1843 | 1847 | ||
| 1844 | /* ftdi_set_termios will send usb control messages */ | 1848 | /* ftdi_set_termios will send usb control messages */ |
| 1845 | if (tty) | 1849 | if (tty) { |
| 1846 | ftdi_set_termios(tty, port, tty->termios); | 1850 | memset(&dummy, 0, sizeof(dummy)); |
| 1851 | ftdi_set_termios(tty, port, &dummy); | ||
| 1852 | } | ||
| 1847 | 1853 | ||
| 1848 | /* Start reading from the device */ | 1854 | /* Start reading from the device */ |
| 1849 | result = usb_serial_generic_open(tty, port); | 1855 | result = usb_serial_generic_open(tty, port); |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index df1d7da933ec..f994503df2dd 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -39,6 +39,13 @@ | |||
| 39 | /* www.candapter.com Ewert Energy Systems CANdapter device */ | 39 | /* www.candapter.com Ewert Energy Systems CANdapter device */ |
| 40 | #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */ | 40 | #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */ |
| 41 | 41 | ||
| 42 | /* | ||
| 43 | * Texas Instruments XDS100v2 JTAG / BeagleBone A3 | ||
| 44 | * http://processors.wiki.ti.com/index.php/XDS100 | ||
| 45 | * http://beagleboard.org/bone | ||
| 46 | */ | ||
| 47 | #define TI_XDS100V2_PID 0xa6d0 | ||
| 48 | |||
| 42 | #define FTDI_NXTCAM_PID 0xABB8 /* NXTCam for Mindstorms NXT */ | 49 | #define FTDI_NXTCAM_PID 0xABB8 /* NXTCam for Mindstorms NXT */ |
| 43 | 50 | ||
| 44 | /* US Interface Navigator (http://www.usinterface.com/) */ | 51 | /* US Interface Navigator (http://www.usinterface.com/) */ |
| @@ -525,6 +532,12 @@ | |||
| 525 | #define ADI_GNICEPLUS_PID 0xF001 | 532 | #define ADI_GNICEPLUS_PID 0xF001 |
| 526 | 533 | ||
| 527 | /* | 534 | /* |
| 535 | * Hornby Elite | ||
| 536 | */ | ||
| 537 | #define HORNBY_VID 0x04D8 | ||
| 538 | #define HORNBY_ELITE_PID 0x000A | ||
| 539 | |||
| 540 | /* | ||
| 528 | * RATOC REX-USB60F | 541 | * RATOC REX-USB60F |
| 529 | */ | 542 | */ |
| 530 | #define RATOC_VENDOR_ID 0x0584 | 543 | #define RATOC_VENDOR_ID 0x0584 |
| @@ -1168,3 +1181,9 @@ | |||
| 1168 | */ | 1181 | */ |
| 1169 | /* TagTracer MIFARE*/ | 1182 | /* TagTracer MIFARE*/ |
| 1170 | #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 | 1183 | #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 |
| 1184 | |||
| 1185 | /* | ||
| 1186 | * Rainforest Automation | ||
| 1187 | */ | ||
| 1188 | /* ZigBee controller */ | ||
| 1189 | #define FTDI_RF_R106 0x8A28 | ||
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 65bf06aa591a..5818bfc3261e 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -2657,15 +2657,7 @@ cleanup: | |||
| 2657 | 2657 | ||
| 2658 | static void edge_disconnect(struct usb_serial *serial) | 2658 | static void edge_disconnect(struct usb_serial *serial) |
| 2659 | { | 2659 | { |
| 2660 | int i; | ||
| 2661 | struct edgeport_port *edge_port; | ||
| 2662 | |||
| 2663 | dbg("%s", __func__); | 2660 | dbg("%s", __func__); |
| 2664 | |||
| 2665 | for (i = 0; i < serial->num_ports; ++i) { | ||
| 2666 | edge_port = usb_get_serial_port_data(serial->port[i]); | ||
| 2667 | edge_remove_sysfs_attrs(edge_port->port); | ||
| 2668 | } | ||
| 2669 | } | 2661 | } |
| 2670 | 2662 | ||
| 2671 | static void edge_release(struct usb_serial *serial) | 2663 | static void edge_release(struct usb_serial *serial) |
| @@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = { | |||
| 2744 | .disconnect = edge_disconnect, | 2736 | .disconnect = edge_disconnect, |
| 2745 | .release = edge_release, | 2737 | .release = edge_release, |
| 2746 | .port_probe = edge_create_sysfs_attrs, | 2738 | .port_probe = edge_create_sysfs_attrs, |
| 2739 | .port_remove = edge_remove_sysfs_attrs, | ||
| 2747 | .ioctl = edge_ioctl, | 2740 | .ioctl = edge_ioctl, |
| 2748 | .set_termios = edge_set_termios, | 2741 | .set_termios = edge_set_termios, |
| 2749 | .tiocmget = edge_tiocmget, | 2742 | .tiocmget = edge_tiocmget, |
| @@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = { | |||
| 2775 | .disconnect = edge_disconnect, | 2768 | .disconnect = edge_disconnect, |
| 2776 | .release = edge_release, | 2769 | .release = edge_release, |
| 2777 | .port_probe = edge_create_sysfs_attrs, | 2770 | .port_probe = edge_create_sysfs_attrs, |
| 2771 | .port_remove = edge_remove_sysfs_attrs, | ||
| 2778 | .ioctl = edge_ioctl, | 2772 | .ioctl = edge_ioctl, |
| 2779 | .set_termios = edge_set_termios, | 2773 | .set_termios = edge_set_termios, |
| 2780 | .tiocmget = edge_tiocmget, | 2774 | .tiocmget = edge_tiocmget, |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 5d3beeeb5fd9..a92a3efb507b 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <linux/ioctl.h> | 38 | #include <linux/ioctl.h> |
| 39 | #include "kobil_sct.h" | 39 | #include "kobil_sct.h" |
| 40 | 40 | ||
| 41 | static int debug; | 41 | static bool debug; |
| 42 | 42 | ||
| 43 | /* Version Information */ | 43 | /* Version Information */ |
| 44 | #define DRIVER_VERSION "21/05/2004" | 44 | #define DRIVER_VERSION "21/05/2004" |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 420d9857394a..ea126a4490cd 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -480,6 +480,10 @@ static void option_instat_callback(struct urb *urb); | |||
| 480 | #define ZD_VENDOR_ID 0x0685 | 480 | #define ZD_VENDOR_ID 0x0685 |
| 481 | #define ZD_PRODUCT_7000 0x7000 | 481 | #define ZD_PRODUCT_7000 0x7000 |
| 482 | 482 | ||
| 483 | /* LG products */ | ||
| 484 | #define LG_VENDOR_ID 0x1004 | ||
| 485 | #define LG_PRODUCT_L02C 0x618f | ||
| 486 | |||
| 483 | /* some devices interfaces need special handling due to a number of reasons */ | 487 | /* some devices interfaces need special handling due to a number of reasons */ |
| 484 | enum option_blacklist_reason { | 488 | enum option_blacklist_reason { |
| 485 | OPTION_BLACKLIST_NONE = 0, | 489 | OPTION_BLACKLIST_NONE = 0, |
| @@ -1183,6 +1187,7 @@ static const struct usb_device_id option_ids[] = { | |||
| 1183 | { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) }, | 1187 | { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) }, |
| 1184 | { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) }, | 1188 | { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) }, |
| 1185 | { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) }, | 1189 | { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) }, |
| 1190 | { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */ | ||
| 1186 | { } /* Terminating entry */ | 1191 | { } /* Terminating entry */ |
| 1187 | }; | 1192 | }; |
| 1188 | MODULE_DEVICE_TABLE(usb, option_ids); | 1193 | MODULE_DEVICE_TABLE(usb, option_ids); |
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c index 30b73e68a904..a34819884c1a 100644 --- a/drivers/usb/serial/qcaux.c +++ b/drivers/usb/serial/qcaux.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #define UTSTARCOM_PRODUCT_UM175_V1 0x3712 | 36 | #define UTSTARCOM_PRODUCT_UM175_V1 0x3712 |
| 37 | #define UTSTARCOM_PRODUCT_UM175_V2 0x3714 | 37 | #define UTSTARCOM_PRODUCT_UM175_V2 0x3714 |
| 38 | #define UTSTARCOM_PRODUCT_UM175_ALLTEL 0x3715 | 38 | #define UTSTARCOM_PRODUCT_UM175_ALLTEL 0x3715 |
| 39 | #define PANTECH_PRODUCT_UML190_VZW 0x3716 | ||
| 39 | #define PANTECH_PRODUCT_UML290_VZW 0x3718 | 40 | #define PANTECH_PRODUCT_UML290_VZW 0x3718 |
| 40 | 41 | ||
| 41 | /* CMOTECH devices */ | 42 | /* CMOTECH devices */ |
| @@ -67,7 +68,11 @@ static struct usb_device_id id_table[] = { | |||
| 67 | { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) }, | 68 | { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) }, |
| 68 | { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) }, | 69 | { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) }, |
| 69 | { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) }, | 70 | { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_U520, 0xff, 0x00, 0x00) }, |
| 70 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) }, | 71 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xff, 0xff) }, |
| 72 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML190_VZW, 0xff, 0xfe, 0xff) }, | ||
| 73 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfd, 0xff) }, /* NMEA */ | ||
| 74 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xfe, 0xff) }, /* WMC */ | ||
| 75 | { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, PANTECH_PRODUCT_UML290_VZW, 0xff, 0xff, 0xff) }, /* DIAG */ | ||
| 71 | { }, | 76 | { }, |
| 72 | }; | 77 | }; |
| 73 | MODULE_DEVICE_TABLE(usb, id_table); | 78 | MODULE_DEVICE_TABLE(usb, id_table); |
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c index 1f62723ef1a8..d32f72061c09 100644 --- a/drivers/usb/storage/realtek_cr.c +++ b/drivers/usb/storage/realtek_cr.c | |||
| @@ -789,7 +789,7 @@ static void rts51x_suspend_timer_fn(unsigned long data) | |||
| 789 | rts51x_set_stat(chip, RTS51X_STAT_SS); | 789 | rts51x_set_stat(chip, RTS51X_STAT_SS); |
| 790 | /* ignore mass storage interface's children */ | 790 | /* ignore mass storage interface's children */ |
| 791 | pm_suspend_ignore_children(&us->pusb_intf->dev, true); | 791 | pm_suspend_ignore_children(&us->pusb_intf->dev, true); |
| 792 | usb_autopm_put_interface(us->pusb_intf); | 792 | usb_autopm_put_interface_async(us->pusb_intf); |
| 793 | US_DEBUGP("%s: RTS51X_STAT_SS 01," | 793 | US_DEBUGP("%s: RTS51X_STAT_SS 01," |
| 794 | "intf->pm_usage_cnt:%d, power.usage:%d\n", | 794 | "intf->pm_usage_cnt:%d, power.usage:%d\n", |
| 795 | __func__, | 795 | __func__, |
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c index 8efeae24764f..b4a71679c933 100644 --- a/drivers/usb/usb-skeleton.c +++ b/drivers/usb/usb-skeleton.c | |||
| @@ -27,8 +27,6 @@ | |||
| 27 | #define USB_SKEL_VENDOR_ID 0xfff0 | 27 | #define USB_SKEL_VENDOR_ID 0xfff0 |
| 28 | #define USB_SKEL_PRODUCT_ID 0xfff0 | 28 | #define USB_SKEL_PRODUCT_ID 0xfff0 |
| 29 | 29 | ||
| 30 | static DEFINE_MUTEX(skel_mutex); | ||
| 31 | |||
| 32 | /* table of devices that work with this driver */ | 30 | /* table of devices that work with this driver */ |
| 33 | static const struct usb_device_id skel_table[] = { | 31 | static const struct usb_device_id skel_table[] = { |
| 34 | { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) }, | 32 | { USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) }, |
| @@ -101,25 +99,18 @@ static int skel_open(struct inode *inode, struct file *file) | |||
| 101 | goto exit; | 99 | goto exit; |
| 102 | } | 100 | } |
| 103 | 101 | ||
| 104 | mutex_lock(&skel_mutex); | ||
| 105 | dev = usb_get_intfdata(interface); | 102 | dev = usb_get_intfdata(interface); |
| 106 | if (!dev) { | 103 | if (!dev) { |
| 107 | mutex_unlock(&skel_mutex); | ||
| 108 | retval = -ENODEV; | 104 | retval = -ENODEV; |
| 109 | goto exit; | 105 | goto exit; |
| 110 | } | 106 | } |
| 111 | 107 | ||
| 112 | /* increment our usage count for the device */ | 108 | /* increment our usage count for the device */ |
| 113 | kref_get(&dev->kref); | 109 | kref_get(&dev->kref); |
| 114 | mutex_unlock(&skel_mutex); | ||
| 115 | 110 | ||
| 116 | /* lock the device to allow correctly handling errors | 111 | /* lock the device to allow correctly handling errors |
| 117 | * in resumption */ | 112 | * in resumption */ |
| 118 | mutex_lock(&dev->io_mutex); | 113 | mutex_lock(&dev->io_mutex); |
| 119 | if (!dev->interface) { | ||
| 120 | retval = -ENODEV; | ||
| 121 | goto out_err; | ||
| 122 | } | ||
| 123 | 114 | ||
| 124 | retval = usb_autopm_get_interface(interface); | 115 | retval = usb_autopm_get_interface(interface); |
| 125 | if (retval) | 116 | if (retval) |
| @@ -127,11 +118,7 @@ static int skel_open(struct inode *inode, struct file *file) | |||
| 127 | 118 | ||
| 128 | /* save our object in the file's private structure */ | 119 | /* save our object in the file's private structure */ |
| 129 | file->private_data = dev; | 120 | file->private_data = dev; |
| 130 | |||
| 131 | out_err: | ||
| 132 | mutex_unlock(&dev->io_mutex); | 121 | mutex_unlock(&dev->io_mutex); |
| 133 | if (retval) | ||
| 134 | kref_put(&dev->kref, skel_delete); | ||
| 135 | 122 | ||
| 136 | exit: | 123 | exit: |
| 137 | return retval; | 124 | return retval; |
| @@ -611,6 +598,7 @@ static void skel_disconnect(struct usb_interface *interface) | |||
| 611 | int minor = interface->minor; | 598 | int minor = interface->minor; |
| 612 | 599 | ||
| 613 | dev = usb_get_intfdata(interface); | 600 | dev = usb_get_intfdata(interface); |
| 601 | usb_set_intfdata(interface, NULL); | ||
| 614 | 602 | ||
| 615 | /* give back our minor */ | 603 | /* give back our minor */ |
| 616 | usb_deregister_dev(interface, &skel_class); | 604 | usb_deregister_dev(interface, &skel_class); |
| @@ -622,12 +610,8 @@ static void skel_disconnect(struct usb_interface *interface) | |||
| 622 | 610 | ||
| 623 | usb_kill_anchored_urbs(&dev->submitted); | 611 | usb_kill_anchored_urbs(&dev->submitted); |
| 624 | 612 | ||
| 625 | mutex_lock(&skel_mutex); | ||
| 626 | usb_set_intfdata(interface, NULL); | ||
| 627 | |||
| 628 | /* decrement our usage count */ | 613 | /* decrement our usage count */ |
| 629 | kref_put(&dev->kref, skel_delete); | 614 | kref_put(&dev->kref, skel_delete); |
| 630 | mutex_unlock(&skel_mutex); | ||
| 631 | 615 | ||
| 632 | dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor); | 616 | dev_info(&interface->dev, "USB Skeleton #%d now disconnected", minor); |
| 633 | } | 617 | } |
diff --git a/drivers/usb/wusbcore/Kconfig b/drivers/usb/wusbcore/Kconfig index 0ead8826ec79..f29fdd7f6d75 100644 --- a/drivers/usb/wusbcore/Kconfig +++ b/drivers/usb/wusbcore/Kconfig | |||
| @@ -6,7 +6,7 @@ config USB_WUSB | |||
| 6 | depends on EXPERIMENTAL | 6 | depends on EXPERIMENTAL |
| 7 | depends on USB | 7 | depends on USB |
| 8 | depends on PCI | 8 | depends on PCI |
| 9 | select UWB | 9 | depends on UWB |
| 10 | select CRYPTO | 10 | select CRYPTO |
| 11 | select CRYPTO_BLKCIPHER | 11 | select CRYPTO_BLKCIPHER |
| 12 | select CRYPTO_CBC | 12 | select CRYPTO_CBC |
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 79e1b292c030..5aa43c3392a2 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define virtio_rmb(vq) \ | 35 | #define virtio_rmb(vq) \ |
| 36 | do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) | 36 | do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) |
| 37 | #define virtio_wmb(vq) \ | 37 | #define virtio_wmb(vq) \ |
| 38 | do { if ((vq)->weak_barriers) smp_rmb(); else rmb(); } while(0) | 38 | do { if ((vq)->weak_barriers) smp_wmb(); else wmb(); } while(0) |
| 39 | #else | 39 | #else |
| 40 | /* We must force memory ordering even if guest is UP since host could be | 40 | /* We must force memory ordering even if guest is UP since host could be |
| 41 | * running on another CPU, but SMP barriers are defined to barrier() in that | 41 | * running on another CPU, but SMP barriers are defined to barrier() in that |
| @@ -308,9 +308,9 @@ bool virtqueue_kick_prepare(struct virtqueue *_vq) | |||
| 308 | bool needs_kick; | 308 | bool needs_kick; |
| 309 | 309 | ||
| 310 | START_USE(vq); | 310 | START_USE(vq); |
| 311 | /* Descriptors and available array need to be set before we expose the | 311 | /* We need to expose available array entries before checking avail |
| 312 | * new available array entries. */ | 312 | * event. */ |
| 313 | virtio_wmb(vq); | 313 | virtio_mb(vq); |
| 314 | 314 | ||
| 315 | old = vq->vring.avail->idx - vq->num_added; | 315 | old = vq->vring.avail->idx - vq->num_added; |
| 316 | new = vq->vring.avail->idx; | 316 | new = vq->vring.avail->idx; |
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c index 1b0e3dd81c1a..63d7b58f1c7d 100644 --- a/drivers/watchdog/dw_wdt.c +++ b/drivers/watchdog/dw_wdt.c | |||
| @@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev) | |||
| 300 | if (!mem) | 300 | if (!mem) |
| 301 | return -EINVAL; | 301 | return -EINVAL; |
| 302 | 302 | ||
| 303 | if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem), | 303 | dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem); |
| 304 | "dw_wdt")) | ||
| 305 | return -ENOMEM; | ||
| 306 | |||
| 307 | dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); | ||
| 308 | if (!dw_wdt.regs) | 304 | if (!dw_wdt.regs) |
| 309 | return -ENOMEM; | 305 | return -ENOMEM; |
| 310 | 306 | ||
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c index 99796c5d913d..bdf401b240b5 100644 --- a/drivers/watchdog/iTCO_wdt.c +++ b/drivers/watchdog/iTCO_wdt.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | * document number TBD : Patsburg (PBG) | 36 | * document number TBD : Patsburg (PBG) |
| 37 | * document number TBD : DH89xxCC | 37 | * document number TBD : DH89xxCC |
| 38 | * document number TBD : Panther Point | 38 | * document number TBD : Panther Point |
| 39 | * document number TBD : Lynx Point | ||
| 39 | */ | 40 | */ |
| 40 | 41 | ||
| 41 | /* | 42 | /* |
| @@ -126,6 +127,7 @@ enum iTCO_chipsets { | |||
| 126 | TCO_PBG, /* Patsburg */ | 127 | TCO_PBG, /* Patsburg */ |
| 127 | TCO_DH89XXCC, /* DH89xxCC */ | 128 | TCO_DH89XXCC, /* DH89xxCC */ |
| 128 | TCO_PPT, /* Panther Point */ | 129 | TCO_PPT, /* Panther Point */ |
| 130 | TCO_LPT, /* Lynx Point */ | ||
| 129 | }; | 131 | }; |
| 130 | 132 | ||
| 131 | static struct { | 133 | static struct { |
| @@ -189,6 +191,7 @@ static struct { | |||
| 189 | {"Patsburg", 2}, | 191 | {"Patsburg", 2}, |
| 190 | {"DH89xxCC", 2}, | 192 | {"DH89xxCC", 2}, |
| 191 | {"Panther Point", 2}, | 193 | {"Panther Point", 2}, |
| 194 | {"Lynx Point", 2}, | ||
| 192 | {NULL, 0} | 195 | {NULL, 0} |
| 193 | }; | 196 | }; |
| 194 | 197 | ||
| @@ -331,6 +334,38 @@ static DEFINE_PCI_DEVICE_TABLE(iTCO_wdt_pci_tbl) = { | |||
| 331 | { PCI_VDEVICE(INTEL, 0x1e5d), TCO_PPT}, | 334 | { PCI_VDEVICE(INTEL, 0x1e5d), TCO_PPT}, |
| 332 | { PCI_VDEVICE(INTEL, 0x1e5e), TCO_PPT}, | 335 | { PCI_VDEVICE(INTEL, 0x1e5e), TCO_PPT}, |
| 333 | { PCI_VDEVICE(INTEL, 0x1e5f), TCO_PPT}, | 336 | { PCI_VDEVICE(INTEL, 0x1e5f), TCO_PPT}, |
| 337 | { PCI_VDEVICE(INTEL, 0x8c40), TCO_LPT}, | ||
| 338 | { PCI_VDEVICE(INTEL, 0x8c41), TCO_LPT}, | ||
| 339 | { PCI_VDEVICE(INTEL, 0x8c42), TCO_LPT}, | ||
| 340 | { PCI_VDEVICE(INTEL, 0x8c43), TCO_LPT}, | ||
| 341 | { PCI_VDEVICE(INTEL, 0x8c44), TCO_LPT}, | ||
| 342 | { PCI_VDEVICE(INTEL, 0x8c45), TCO_LPT}, | ||
| 343 | { PCI_VDEVICE(INTEL, 0x8c46), TCO_LPT}, | ||
| 344 | { PCI_VDEVICE(INTEL, 0x8c47), TCO_LPT}, | ||
| 345 | { PCI_VDEVICE(INTEL, 0x8c48), TCO_LPT}, | ||
| 346 | { PCI_VDEVICE(INTEL, 0x8c49), TCO_LPT}, | ||
| 347 | { PCI_VDEVICE(INTEL, 0x8c4a), TCO_LPT}, | ||
| 348 | { PCI_VDEVICE(INTEL, 0x8c4b), TCO_LPT}, | ||
| 349 | { PCI_VDEVICE(INTEL, 0x8c4c), TCO_LPT}, | ||
| 350 | { PCI_VDEVICE(INTEL, 0x8c4d), TCO_LPT}, | ||
| 351 | { PCI_VDEVICE(INTEL, 0x8c4e), TCO_LPT}, | ||
| 352 | { PCI_VDEVICE(INTEL, 0x8c4f), TCO_LPT}, | ||
| 353 | { PCI_VDEVICE(INTEL, 0x8c50), TCO_LPT}, | ||
| 354 | { PCI_VDEVICE(INTEL, 0x8c51), TCO_LPT}, | ||
| 355 | { PCI_VDEVICE(INTEL, 0x8c52), TCO_LPT}, | ||
| 356 | { PCI_VDEVICE(INTEL, 0x8c53), TCO_LPT}, | ||
| 357 | { PCI_VDEVICE(INTEL, 0x8c54), TCO_LPT}, | ||
| 358 | { PCI_VDEVICE(INTEL, 0x8c55), TCO_LPT}, | ||
| 359 | { PCI_VDEVICE(INTEL, 0x8c56), TCO_LPT}, | ||
| 360 | { PCI_VDEVICE(INTEL, 0x8c57), TCO_LPT}, | ||
| 361 | { PCI_VDEVICE(INTEL, 0x8c58), TCO_LPT}, | ||
| 362 | { PCI_VDEVICE(INTEL, 0x8c59), TCO_LPT}, | ||
| 363 | { PCI_VDEVICE(INTEL, 0x8c5a), TCO_LPT}, | ||
| 364 | { PCI_VDEVICE(INTEL, 0x8c5b), TCO_LPT}, | ||
| 365 | { PCI_VDEVICE(INTEL, 0x8c5c), TCO_LPT}, | ||
| 366 | { PCI_VDEVICE(INTEL, 0x8c5d), TCO_LPT}, | ||
| 367 | { PCI_VDEVICE(INTEL, 0x8c5e), TCO_LPT}, | ||
| 368 | { PCI_VDEVICE(INTEL, 0x8c5f), TCO_LPT}, | ||
| 334 | { 0, }, /* End of list */ | 369 | { 0, }, /* End of list */ |
| 335 | }; | 370 | }; |
| 336 | MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl); | 371 | MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl); |
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index b8ef2c6dca7c..c44c3334003a 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c | |||
| @@ -247,7 +247,6 @@ static struct miscdevice imx2_wdt_miscdev = { | |||
| 247 | static int __init imx2_wdt_probe(struct platform_device *pdev) | 247 | static int __init imx2_wdt_probe(struct platform_device *pdev) |
| 248 | { | 248 | { |
| 249 | int ret; | 249 | int ret; |
| 250 | int res_size; | ||
| 251 | struct resource *res; | 250 | struct resource *res; |
| 252 | 251 | ||
| 253 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 252 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| @@ -256,15 +255,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) | |||
| 256 | return -ENODEV; | 255 | return -ENODEV; |
| 257 | } | 256 | } |
| 258 | 257 | ||
| 259 | res_size = resource_size(res); | 258 | imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res); |
| 260 | if (!devm_request_mem_region(&pdev->dev, res->start, res_size, | ||
| 261 | res->name)) { | ||
| 262 | dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n", | ||
| 263 | res_size, res->start); | ||
| 264 | return -ENOMEM; | ||
| 265 | } | ||
| 266 | |||
| 267 | imx2_wdt.base = devm_ioremap_nocache(&pdev->dev, res->start, res_size); | ||
| 268 | if (!imx2_wdt.base) { | 259 | if (!imx2_wdt.base) { |
| 269 | dev_err(&pdev->dev, "ioremap failed\n"); | 260 | dev_err(&pdev->dev, "ioremap failed\n"); |
| 270 | return -ENOMEM; | 261 | return -ENOMEM; |
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c index 50359bad9177..529085b8b8fb 100644 --- a/drivers/watchdog/nuc900_wdt.c +++ b/drivers/watchdog/nuc900_wdt.c | |||
| @@ -72,7 +72,7 @@ struct nuc900_wdt { | |||
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | static unsigned long nuc900wdt_busy; | 74 | static unsigned long nuc900wdt_busy; |
| 75 | struct nuc900_wdt *nuc900_wdt; | 75 | static struct nuc900_wdt *nuc900_wdt; |
| 76 | 76 | ||
| 77 | static inline void nuc900_wdt_keepalive(void) | 77 | static inline void nuc900_wdt_keepalive(void) |
| 78 | { | 78 | { |
| @@ -287,7 +287,8 @@ static int __devinit nuc900wdt_probe(struct platform_device *pdev) | |||
| 287 | 287 | ||
| 288 | setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0); | 288 | setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0); |
| 289 | 289 | ||
| 290 | if (misc_register(&nuc900wdt_miscdev)) { | 290 | ret = misc_register(&nuc900wdt_miscdev); |
| 291 | if (ret) { | ||
| 291 | dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n", | 292 | dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n", |
| 292 | WATCHDOG_MINOR, ret); | 293 | WATCHDOG_MINOR, ret); |
| 293 | goto err_clk; | 294 | goto err_clk; |
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 4b33e3fd726b..d19ff5145e82 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c | |||
| @@ -339,6 +339,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev) | |||
| 339 | return 0; | 339 | return 0; |
| 340 | 340 | ||
| 341 | err_misc: | 341 | err_misc: |
| 342 | pm_runtime_disable(wdev->dev); | ||
| 342 | platform_set_drvdata(pdev, NULL); | 343 | platform_set_drvdata(pdev, NULL); |
| 343 | iounmap(wdev->base); | 344 | iounmap(wdev->base); |
| 344 | 345 | ||
| @@ -371,6 +372,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev) | |||
| 371 | struct omap_wdt_dev *wdev = platform_get_drvdata(pdev); | 372 | struct omap_wdt_dev *wdev = platform_get_drvdata(pdev); |
| 372 | struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 373 | struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 373 | 374 | ||
| 375 | pm_runtime_disable(wdev->dev); | ||
| 374 | if (!res) | 376 | if (!res) |
| 375 | return -ENOENT; | 377 | return -ENOENT; |
| 376 | 378 | ||
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index bd143c9dd3e6..8e210aafdfd0 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
| @@ -226,7 +226,7 @@ static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd, | |||
| 226 | static int pnx4008_wdt_release(struct inode *inode, struct file *file) | 226 | static int pnx4008_wdt_release(struct inode *inode, struct file *file) |
| 227 | { | 227 | { |
| 228 | if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) | 228 | if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) |
| 229 | printk(KERN_WARNING "WATCHDOG: Device closed unexpectdly\n"); | 229 | printk(KERN_WARNING "WATCHDOG: Device closed unexpectedly\n"); |
| 230 | 230 | ||
| 231 | wdt_disable(); | 231 | wdt_disable(); |
| 232 | clk_disable(wdt_clk); | 232 | clk_disable(wdt_clk); |
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c index 4c2a4e8698f9..e37d81178b9e 100644 --- a/drivers/watchdog/stmp3xxx_wdt.c +++ b/drivers/watchdog/stmp3xxx_wdt.c | |||
| @@ -174,7 +174,7 @@ static int stmp3xxx_wdt_release(struct inode *inode, struct file *file) | |||
| 174 | if (!nowayout) { | 174 | if (!nowayout) { |
| 175 | if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) { | 175 | if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) { |
| 176 | wdt_ping(); | 176 | wdt_ping(); |
| 177 | pr_debug("%s: Device closed unexpectdly\n", __func__); | 177 | pr_debug("%s: Device closed unexpectedly\n", __func__); |
| 178 | ret = -EINVAL; | 178 | ret = -EINVAL; |
| 179 | } else { | 179 | } else { |
| 180 | wdt_disable(); | 180 | wdt_disable(); |
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index 026b4bbfa0aa..8f07dd4bd94a 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c | |||
| @@ -124,8 +124,6 @@ static int wdt_stop(struct watchdog_device *wdd) | |||
| 124 | static int wdt_set_timeout(struct watchdog_device *wdd, | 124 | static int wdt_set_timeout(struct watchdog_device *wdd, |
| 125 | unsigned int new_timeout) | 125 | unsigned int new_timeout) |
| 126 | { | 126 | { |
| 127 | if (new_timeout < 1 || new_timeout > WDT_TIMEOUT_MAX) | ||
| 128 | return -EINVAL; | ||
| 129 | writel(new_timeout, wdt_mem + VIA_WDT_COUNT); | 127 | writel(new_timeout, wdt_mem + VIA_WDT_COUNT); |
| 130 | timeout = new_timeout; | 128 | timeout = new_timeout; |
| 131 | return 0; | 129 | return 0; |
| @@ -150,6 +148,8 @@ static const struct watchdog_ops wdt_ops = { | |||
| 150 | static struct watchdog_device wdt_dev = { | 148 | static struct watchdog_device wdt_dev = { |
| 151 | .info = &wdt_info, | 149 | .info = &wdt_info, |
| 152 | .ops = &wdt_ops, | 150 | .ops = &wdt_ops, |
| 151 | .min_timeout = 1, | ||
| 152 | .max_timeout = WDT_TIMEOUT_MAX, | ||
| 153 | }; | 153 | }; |
| 154 | 154 | ||
| 155 | static int __devinit wdt_probe(struct pci_dev *pdev, | 155 | static int __devinit wdt_probe(struct pci_dev *pdev, |
| @@ -233,7 +233,7 @@ static void __devexit wdt_remove(struct pci_dev *pdev) | |||
| 233 | pci_disable_device(pdev); | 233 | pci_disable_device(pdev); |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = { | 236 | static DEFINE_PCI_DEVICE_TABLE(wdt_pci_table) = { |
| 237 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) }, | 237 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CX700) }, |
| 238 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) }, | 238 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX800) }, |
| 239 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, | 239 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855) }, |
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c index 42e940c23891..c3c3188c34d7 100644 --- a/drivers/watchdog/wafer5823wdt.c +++ b/drivers/watchdog/wafer5823wdt.c | |||
| @@ -152,12 +152,12 @@ static long wafwdt_ioctl(struct file *file, unsigned int cmd, | |||
| 152 | return -EFAULT; | 152 | return -EFAULT; |
| 153 | 153 | ||
| 154 | if (options & WDIOS_DISABLECARD) { | 154 | if (options & WDIOS_DISABLECARD) { |
| 155 | wafwdt_start(); | 155 | wafwdt_stop(); |
| 156 | retval = 0; | 156 | retval = 0; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | if (options & WDIOS_ENABLECARD) { | 159 | if (options & WDIOS_ENABLECARD) { |
| 160 | wafwdt_stop(); | 160 | wafwdt_start(); |
| 161 | retval = 0; | 161 | retval = 0; |
| 162 | } | 162 | } |
| 163 | 163 | ||
diff --git a/drivers/watchdog/wm8350_wdt.c b/drivers/watchdog/wm8350_wdt.c index 909c78650d3e..5d7113c7e501 100644 --- a/drivers/watchdog/wm8350_wdt.c +++ b/drivers/watchdog/wm8350_wdt.c | |||
| @@ -212,10 +212,10 @@ static long wm8350_wdt_ioctl(struct file *file, unsigned int cmd, | |||
| 212 | 212 | ||
| 213 | /* Setting both simultaneously means at least one must fail */ | 213 | /* Setting both simultaneously means at least one must fail */ |
| 214 | if (options == WDIOS_DISABLECARD) | 214 | if (options == WDIOS_DISABLECARD) |
| 215 | ret = wm8350_wdt_start(wm8350); | 215 | ret = wm8350_wdt_stop(wm8350); |
| 216 | 216 | ||
| 217 | if (options == WDIOS_ENABLECARD) | 217 | if (options == WDIOS_ENABLECARD) |
| 218 | ret = wm8350_wdt_stop(wm8350); | 218 | ret = wm8350_wdt_start(wm8350); |
| 219 | break; | 219 | break; |
| 220 | } | 220 | } |
| 221 | 221 | ||
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 1cd94daa71db..b4d4eac761db 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -948,9 +948,12 @@ static void gnttab_request_version(void) | |||
| 948 | int rc; | 948 | int rc; |
| 949 | struct gnttab_set_version gsv; | 949 | struct gnttab_set_version gsv; |
| 950 | 950 | ||
| 951 | gsv.version = 2; | 951 | if (xen_hvm_domain()) |
| 952 | gsv.version = 1; | ||
| 953 | else | ||
| 954 | gsv.version = 2; | ||
| 952 | rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); | 955 | rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); |
| 953 | if (rc == 0) { | 956 | if (rc == 0 && gsv.version == 2) { |
| 954 | grant_table_version = 2; | 957 | grant_table_version = 2; |
| 955 | gnttab_interface = &gnttab_v2_ops; | 958 | gnttab_interface = &gnttab_v2_ops; |
| 956 | } else if (grant_table_version == 2) { | 959 | } else if (grant_table_version == 2) { |
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index b9a843226de8..633c701a287d 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c | |||
| @@ -297,7 +297,7 @@ static int __add_delayed_refs(struct btrfs_delayed_ref_head *head, u64 seq, | |||
| 297 | struct btrfs_delayed_extent_op *extent_op = head->extent_op; | 297 | struct btrfs_delayed_extent_op *extent_op = head->extent_op; |
| 298 | struct rb_node *n = &head->node.rb_node; | 298 | struct rb_node *n = &head->node.rb_node; |
| 299 | int sgn; | 299 | int sgn; |
| 300 | int ret; | 300 | int ret = 0; |
| 301 | 301 | ||
| 302 | if (extent_op && extent_op->update_key) | 302 | if (extent_op && extent_op->update_key) |
| 303 | btrfs_disk_key_to_cpu(info_key, &extent_op->key); | 303 | btrfs_disk_key_to_cpu(info_key, &extent_op->key); |
| @@ -392,7 +392,7 @@ static int __add_inline_refs(struct btrfs_fs_info *fs_info, | |||
| 392 | struct btrfs_key *info_key, int *info_level, | 392 | struct btrfs_key *info_key, int *info_level, |
| 393 | struct list_head *prefs) | 393 | struct list_head *prefs) |
| 394 | { | 394 | { |
| 395 | int ret; | 395 | int ret = 0; |
| 396 | int slot; | 396 | int slot; |
| 397 | struct extent_buffer *leaf; | 397 | struct extent_buffer *leaf; |
| 398 | struct btrfs_key key; | 398 | struct btrfs_key key; |
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index ad0b3ba735b7..b669a7d8e499 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c | |||
| @@ -1662,7 +1662,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, | |||
| 1662 | block = btrfsic_block_hashtable_lookup(bdev, dev_bytenr, | 1662 | block = btrfsic_block_hashtable_lookup(bdev, dev_bytenr, |
| 1663 | &state->block_hashtable); | 1663 | &state->block_hashtable); |
| 1664 | if (NULL != block) { | 1664 | if (NULL != block) { |
| 1665 | u64 bytenr; | 1665 | u64 bytenr = 0; |
| 1666 | struct list_head *elem_ref_to; | 1666 | struct list_head *elem_ref_to; |
| 1667 | struct list_head *tmp_ref_to; | 1667 | struct list_head *tmp_ref_to; |
| 1668 | 1668 | ||
| @@ -2777,9 +2777,10 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh) | |||
| 2777 | printk(KERN_INFO | 2777 | printk(KERN_INFO |
| 2778 | "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu)," | 2778 | "submit_bh(rw=0x%x, blocknr=%lu (bytenr %llu)," |
| 2779 | " size=%lu, data=%p, bdev=%p)\n", | 2779 | " size=%lu, data=%p, bdev=%p)\n", |
| 2780 | rw, bh->b_blocknr, | 2780 | rw, (unsigned long)bh->b_blocknr, |
| 2781 | (unsigned long long)dev_bytenr, bh->b_size, | 2781 | (unsigned long long)dev_bytenr, |
| 2782 | bh->b_data, bh->b_bdev); | 2782 | (unsigned long)bh->b_size, bh->b_data, |
| 2783 | bh->b_bdev); | ||
| 2783 | btrfsic_process_written_block(dev_state, dev_bytenr, | 2784 | btrfsic_process_written_block(dev_state, dev_bytenr, |
| 2784 | bh->b_data, bh->b_size, NULL, | 2785 | bh->b_data, bh->b_size, NULL, |
| 2785 | NULL, bh, rw); | 2786 | NULL, bh, rw); |
| @@ -2844,7 +2845,7 @@ void btrfsic_submit_bio(int rw, struct bio *bio) | |||
| 2844 | printk(KERN_INFO | 2845 | printk(KERN_INFO |
| 2845 | "submit_bio(rw=0x%x, bi_vcnt=%u," | 2846 | "submit_bio(rw=0x%x, bi_vcnt=%u," |
| 2846 | " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n", | 2847 | " bi_sector=%lu (bytenr %llu), bi_bdev=%p)\n", |
| 2847 | rw, bio->bi_vcnt, bio->bi_sector, | 2848 | rw, bio->bi_vcnt, (unsigned long)bio->bi_sector, |
| 2848 | (unsigned long long)dev_bytenr, | 2849 | (unsigned long long)dev_bytenr, |
| 2849 | bio->bi_bdev); | 2850 | bio->bi_bdev); |
| 2850 | 2851 | ||
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7aa9cd36bf1b..811d9f918b1c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -962,6 +962,13 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags) | |||
| 962 | tree = &BTRFS_I(page->mapping->host)->io_tree; | 962 | tree = &BTRFS_I(page->mapping->host)->io_tree; |
| 963 | map = &BTRFS_I(page->mapping->host)->extent_tree; | 963 | map = &BTRFS_I(page->mapping->host)->extent_tree; |
| 964 | 964 | ||
| 965 | /* | ||
| 966 | * We need to mask out eg. __GFP_HIGHMEM and __GFP_DMA32 as we're doing | ||
| 967 | * slab allocation from alloc_extent_state down the callchain where | ||
| 968 | * it'd hit a BUG_ON as those flags are not allowed. | ||
| 969 | */ | ||
| 970 | gfp_flags &= ~GFP_SLAB_BUG_MASK; | ||
| 971 | |||
| 965 | ret = try_release_extent_state(map, tree, page, gfp_flags); | 972 | ret = try_release_extent_state(map, tree, page, gfp_flags); |
| 966 | if (!ret) | 973 | if (!ret) |
| 967 | return 0; | 974 | return 0; |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 700879ed64cf..283af7a676a3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
| @@ -34,23 +34,24 @@ | |||
| 34 | #include "locking.h" | 34 | #include "locking.h" |
| 35 | #include "free-space-cache.h" | 35 | #include "free-space-cache.h" |
| 36 | 36 | ||
| 37 | /* control flags for do_chunk_alloc's force field | 37 | /* |
| 38 | * control flags for do_chunk_alloc's force field | ||
| 38 | * CHUNK_ALLOC_NO_FORCE means to only allocate a chunk | 39 | * CHUNK_ALLOC_NO_FORCE means to only allocate a chunk |
| 39 | * if we really need one. | 40 | * if we really need one. |
| 40 | * | 41 | * |
| 41 | * CHUNK_ALLOC_FORCE means it must try to allocate one | ||
| 42 | * | ||
| 43 | * CHUNK_ALLOC_LIMITED means to only try and allocate one | 42 | * CHUNK_ALLOC_LIMITED means to only try and allocate one |
| 44 | * if we have very few chunks already allocated. This is | 43 | * if we have very few chunks already allocated. This is |
| 45 | * used as part of the clustering code to help make sure | 44 | * used as part of the clustering code to help make sure |
| 46 | * we have a good pool of storage to cluster in, without | 45 | * we have a good pool of storage to cluster in, without |
| 47 | * filling the FS with empty chunks | 46 | * filling the FS with empty chunks |
| 48 | * | 47 | * |
| 48 | * CHUNK_ALLOC_FORCE means it must try to allocate one | ||
| 49 | * | ||
| 49 | */ | 50 | */ |
| 50 | enum { | 51 | enum { |
| 51 | CHUNK_ALLOC_NO_FORCE = 0, | 52 | CHUNK_ALLOC_NO_FORCE = 0, |
| 52 | CHUNK_ALLOC_FORCE = 1, | 53 | CHUNK_ALLOC_LIMITED = 1, |
| 53 | CHUNK_ALLOC_LIMITED = 2, | 54 | CHUNK_ALLOC_FORCE = 2, |
| 54 | }; | 55 | }; |
| 55 | 56 | ||
| 56 | /* | 57 | /* |
| @@ -3414,7 +3415,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, | |||
| 3414 | 3415 | ||
| 3415 | again: | 3416 | again: |
| 3416 | spin_lock(&space_info->lock); | 3417 | spin_lock(&space_info->lock); |
| 3417 | if (space_info->force_alloc) | 3418 | if (force < space_info->force_alloc) |
| 3418 | force = space_info->force_alloc; | 3419 | force = space_info->force_alloc; |
| 3419 | if (space_info->full) { | 3420 | if (space_info->full) { |
| 3420 | spin_unlock(&space_info->lock); | 3421 | spin_unlock(&space_info->lock); |
| @@ -5794,6 +5795,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans, | |||
| 5794 | u64 search_end, struct btrfs_key *ins, | 5795 | u64 search_end, struct btrfs_key *ins, |
| 5795 | u64 data) | 5796 | u64 data) |
| 5796 | { | 5797 | { |
| 5798 | bool final_tried = false; | ||
| 5797 | int ret; | 5799 | int ret; |
| 5798 | u64 search_start = 0; | 5800 | u64 search_start = 0; |
| 5799 | 5801 | ||
| @@ -5813,22 +5815,25 @@ again: | |||
| 5813 | search_start, search_end, hint_byte, | 5815 | search_start, search_end, hint_byte, |
| 5814 | ins, data); | 5816 | ins, data); |
| 5815 | 5817 | ||
| 5816 | if (ret == -ENOSPC && num_bytes > min_alloc_size) { | 5818 | if (ret == -ENOSPC) { |
| 5817 | num_bytes = num_bytes >> 1; | 5819 | if (!final_tried) { |
| 5818 | num_bytes = num_bytes & ~(root->sectorsize - 1); | 5820 | num_bytes = num_bytes >> 1; |
| 5819 | num_bytes = max(num_bytes, min_alloc_size); | 5821 | num_bytes = num_bytes & ~(root->sectorsize - 1); |
| 5820 | do_chunk_alloc(trans, root->fs_info->extent_root, | 5822 | num_bytes = max(num_bytes, min_alloc_size); |
| 5821 | num_bytes, data, CHUNK_ALLOC_FORCE); | 5823 | do_chunk_alloc(trans, root->fs_info->extent_root, |
| 5822 | goto again; | 5824 | num_bytes, data, CHUNK_ALLOC_FORCE); |
| 5823 | } | 5825 | if (num_bytes == min_alloc_size) |
| 5824 | if (ret == -ENOSPC && btrfs_test_opt(root, ENOSPC_DEBUG)) { | 5826 | final_tried = true; |
| 5825 | struct btrfs_space_info *sinfo; | 5827 | goto again; |
| 5826 | 5828 | } else if (btrfs_test_opt(root, ENOSPC_DEBUG)) { | |
| 5827 | sinfo = __find_space_info(root->fs_info, data); | 5829 | struct btrfs_space_info *sinfo; |
| 5828 | printk(KERN_ERR "btrfs allocation failed flags %llu, " | 5830 | |
| 5829 | "wanted %llu\n", (unsigned long long)data, | 5831 | sinfo = __find_space_info(root->fs_info, data); |
| 5830 | (unsigned long long)num_bytes); | 5832 | printk(KERN_ERR "btrfs allocation failed flags %llu, " |
| 5831 | dump_space_info(sinfo, num_bytes, 1); | 5833 | "wanted %llu\n", (unsigned long long)data, |
| 5834 | (unsigned long long)num_bytes); | ||
| 5835 | dump_space_info(sinfo, num_bytes, 1); | ||
| 5836 | } | ||
| 5832 | } | 5837 | } |
| 5833 | 5838 | ||
| 5834 | trace_btrfs_reserved_extent_alloc(root, ins->objectid, ins->offset); | 5839 | trace_btrfs_reserved_extent_alloc(root, ins->objectid, ins->offset); |
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 9d09a4f81875..fcf77e1ded40 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
| @@ -3909,6 +3909,8 @@ int extent_range_uptodate(struct extent_io_tree *tree, | |||
| 3909 | while (start <= end) { | 3909 | while (start <= end) { |
| 3910 | index = start >> PAGE_CACHE_SHIFT; | 3910 | index = start >> PAGE_CACHE_SHIFT; |
| 3911 | page = find_get_page(tree->mapping, index); | 3911 | page = find_get_page(tree->mapping, index); |
| 3912 | if (!page) | ||
| 3913 | return 1; | ||
| 3912 | uptodate = PageUptodate(page); | 3914 | uptodate = PageUptodate(page); |
| 3913 | page_cache_release(page); | 3915 | page_cache_release(page); |
| 3914 | if (!uptodate) { | 3916 | if (!uptodate) { |
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index d20ff87ca603..c2f20594c9f7 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
| @@ -2242,7 +2242,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, | |||
| 2242 | if (entry->bitmap) { | 2242 | if (entry->bitmap) { |
| 2243 | ret = btrfs_alloc_from_bitmap(block_group, | 2243 | ret = btrfs_alloc_from_bitmap(block_group, |
| 2244 | cluster, entry, bytes, | 2244 | cluster, entry, bytes, |
| 2245 | min_start); | 2245 | cluster->window_start); |
| 2246 | if (ret == 0) { | 2246 | if (ret == 0) { |
| 2247 | node = rb_next(&entry->offset_index); | 2247 | node = rb_next(&entry->offset_index); |
| 2248 | if (!node) | 2248 | if (!node) |
| @@ -2251,6 +2251,7 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group, | |||
| 2251 | offset_index); | 2251 | offset_index); |
| 2252 | continue; | 2252 | continue; |
| 2253 | } | 2253 | } |
| 2254 | cluster->window_start += bytes; | ||
| 2254 | } else { | 2255 | } else { |
| 2255 | ret = entry->offset; | 2256 | ret = entry->offset; |
| 2256 | 2257 | ||
| @@ -2475,7 +2476,7 @@ setup_cluster_bitmap(struct btrfs_block_group_cache *block_group, | |||
| 2475 | } | 2476 | } |
| 2476 | 2477 | ||
| 2477 | list_for_each_entry(entry, bitmaps, list) { | 2478 | list_for_each_entry(entry, bitmaps, list) { |
| 2478 | if (entry->bytes < min_bytes) | 2479 | if (entry->bytes < bytes) |
| 2479 | continue; | 2480 | continue; |
| 2480 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, offset, | 2481 | ret = btrfs_bitmap_cluster(block_group, entry, cluster, offset, |
| 2481 | bytes, cont1_bytes, min_bytes); | 2482 | bytes, cont1_bytes, min_bytes); |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0da19a0ea00d..32214fe0f7e3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -6401,18 +6401,23 @@ int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
| 6401 | unsigned long zero_start; | 6401 | unsigned long zero_start; |
| 6402 | loff_t size; | 6402 | loff_t size; |
| 6403 | int ret; | 6403 | int ret; |
| 6404 | int reserved = 0; | ||
| 6404 | u64 page_start; | 6405 | u64 page_start; |
| 6405 | u64 page_end; | 6406 | u64 page_end; |
| 6406 | 6407 | ||
| 6407 | ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE); | 6408 | ret = btrfs_delalloc_reserve_space(inode, PAGE_CACHE_SIZE); |
| 6408 | if (!ret) | 6409 | if (!ret) { |
| 6409 | ret = btrfs_update_time(vma->vm_file); | 6410 | ret = btrfs_update_time(vma->vm_file); |
| 6411 | reserved = 1; | ||
| 6412 | } | ||
| 6410 | if (ret) { | 6413 | if (ret) { |
| 6411 | if (ret == -ENOMEM) | 6414 | if (ret == -ENOMEM) |
| 6412 | ret = VM_FAULT_OOM; | 6415 | ret = VM_FAULT_OOM; |
| 6413 | else /* -ENOSPC, -EIO, etc */ | 6416 | else /* -ENOSPC, -EIO, etc */ |
| 6414 | ret = VM_FAULT_SIGBUS; | 6417 | ret = VM_FAULT_SIGBUS; |
| 6415 | goto out; | 6418 | if (reserved) |
| 6419 | goto out; | ||
| 6420 | goto out_noreserve; | ||
| 6416 | } | 6421 | } |
| 6417 | 6422 | ||
| 6418 | ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */ | 6423 | ret = VM_FAULT_NOPAGE; /* make the VM retry the fault */ |
| @@ -6495,6 +6500,7 @@ out_unlock: | |||
| 6495 | unlock_page(page); | 6500 | unlock_page(page); |
| 6496 | out: | 6501 | out: |
| 6497 | btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE); | 6502 | btrfs_delalloc_release_space(inode, PAGE_CACHE_SIZE); |
| 6503 | out_noreserve: | ||
| 6498 | return ret; | 6504 | return ret; |
| 6499 | } | 6505 | } |
| 6500 | 6506 | ||
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index ab620014bcc3..03bb62a9ee24 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -1065,7 +1065,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, | |||
| 1065 | i = range->start >> PAGE_CACHE_SHIFT; | 1065 | i = range->start >> PAGE_CACHE_SHIFT; |
| 1066 | } | 1066 | } |
| 1067 | if (!max_to_defrag) | 1067 | if (!max_to_defrag) |
| 1068 | max_to_defrag = last_index; | 1068 | max_to_defrag = last_index + 1; |
| 1069 | 1069 | ||
| 1070 | /* | 1070 | /* |
| 1071 | * make writeback starts from i, so the defrag range can be | 1071 | * make writeback starts from i, so the defrag range can be |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index cb877e0886a7..966cc74f5d6c 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -1957,7 +1957,8 @@ static int wait_log_commit(struct btrfs_trans_handle *trans, | |||
| 1957 | 1957 | ||
| 1958 | finish_wait(&root->log_commit_wait[index], &wait); | 1958 | finish_wait(&root->log_commit_wait[index], &wait); |
| 1959 | mutex_lock(&root->log_mutex); | 1959 | mutex_lock(&root->log_mutex); |
| 1960 | } while (root->log_transid < transid + 2 && | 1960 | } while (root->fs_info->last_trans_log_full_commit != |
| 1961 | trans->transid && root->log_transid < transid + 2 && | ||
| 1961 | atomic_read(&root->log_commit[index])); | 1962 | atomic_read(&root->log_commit[index])); |
| 1962 | return 0; | 1963 | return 0; |
| 1963 | } | 1964 | } |
| @@ -1966,7 +1967,8 @@ static int wait_for_writer(struct btrfs_trans_handle *trans, | |||
| 1966 | struct btrfs_root *root) | 1967 | struct btrfs_root *root) |
| 1967 | { | 1968 | { |
| 1968 | DEFINE_WAIT(wait); | 1969 | DEFINE_WAIT(wait); |
| 1969 | while (atomic_read(&root->log_writers)) { | 1970 | while (root->fs_info->last_trans_log_full_commit != |
| 1971 | trans->transid && atomic_read(&root->log_writers)) { | ||
| 1970 | prepare_to_wait(&root->log_writer_wait, | 1972 | prepare_to_wait(&root->log_writer_wait, |
| 1971 | &wait, TASK_UNINTERRUPTIBLE); | 1973 | &wait, TASK_UNINTERRUPTIBLE); |
| 1972 | mutex_unlock(&root->log_mutex); | 1974 | mutex_unlock(&root->log_mutex); |
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index b60fc8bfb3e9..620daad201db 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c | |||
| @@ -641,10 +641,10 @@ static int __cap_is_valid(struct ceph_cap *cap) | |||
| 641 | unsigned long ttl; | 641 | unsigned long ttl; |
| 642 | u32 gen; | 642 | u32 gen; |
| 643 | 643 | ||
| 644 | spin_lock(&cap->session->s_cap_lock); | 644 | spin_lock(&cap->session->s_gen_ttl_lock); |
| 645 | gen = cap->session->s_cap_gen; | 645 | gen = cap->session->s_cap_gen; |
| 646 | ttl = cap->session->s_cap_ttl; | 646 | ttl = cap->session->s_cap_ttl; |
| 647 | spin_unlock(&cap->session->s_cap_lock); | 647 | spin_unlock(&cap->session->s_gen_ttl_lock); |
| 648 | 648 | ||
| 649 | if (cap->cap_gen < gen || time_after_eq(jiffies, ttl)) { | 649 | if (cap->cap_gen < gen || time_after_eq(jiffies, ttl)) { |
| 650 | dout("__cap_is_valid %p cap %p issued %s " | 650 | dout("__cap_is_valid %p cap %p issued %s " |
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 618246bc2196..3e8094be4604 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c | |||
| @@ -975,10 +975,10 @@ static int dentry_lease_is_valid(struct dentry *dentry) | |||
| 975 | di = ceph_dentry(dentry); | 975 | di = ceph_dentry(dentry); |
| 976 | if (di->lease_session) { | 976 | if (di->lease_session) { |
| 977 | s = di->lease_session; | 977 | s = di->lease_session; |
| 978 | spin_lock(&s->s_cap_lock); | 978 | spin_lock(&s->s_gen_ttl_lock); |
| 979 | gen = s->s_cap_gen; | 979 | gen = s->s_cap_gen; |
| 980 | ttl = s->s_cap_ttl; | 980 | ttl = s->s_cap_ttl; |
| 981 | spin_unlock(&s->s_cap_lock); | 981 | spin_unlock(&s->s_gen_ttl_lock); |
| 982 | 982 | ||
| 983 | if (di->lease_gen == gen && | 983 | if (di->lease_gen == gen && |
| 984 | time_before(jiffies, dentry->d_time) && | 984 | time_before(jiffies, dentry->d_time) && |
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 23ab6a3f1825..866e8d7ca37d 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
| @@ -262,6 +262,7 @@ static int parse_reply_info(struct ceph_msg *msg, | |||
| 262 | /* trace */ | 262 | /* trace */ |
| 263 | ceph_decode_32_safe(&p, end, len, bad); | 263 | ceph_decode_32_safe(&p, end, len, bad); |
| 264 | if (len > 0) { | 264 | if (len > 0) { |
| 265 | ceph_decode_need(&p, end, len, bad); | ||
| 265 | err = parse_reply_info_trace(&p, p+len, info, features); | 266 | err = parse_reply_info_trace(&p, p+len, info, features); |
| 266 | if (err < 0) | 267 | if (err < 0) |
| 267 | goto out_bad; | 268 | goto out_bad; |
| @@ -270,6 +271,7 @@ static int parse_reply_info(struct ceph_msg *msg, | |||
| 270 | /* extra */ | 271 | /* extra */ |
| 271 | ceph_decode_32_safe(&p, end, len, bad); | 272 | ceph_decode_32_safe(&p, end, len, bad); |
| 272 | if (len > 0) { | 273 | if (len > 0) { |
| 274 | ceph_decode_need(&p, end, len, bad); | ||
| 273 | err = parse_reply_info_extra(&p, p+len, info, features); | 275 | err = parse_reply_info_extra(&p, p+len, info, features); |
| 274 | if (err < 0) | 276 | if (err < 0) |
| 275 | goto out_bad; | 277 | goto out_bad; |
| @@ -398,9 +400,11 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, | |||
| 398 | s->s_con.peer_name.type = CEPH_ENTITY_TYPE_MDS; | 400 | s->s_con.peer_name.type = CEPH_ENTITY_TYPE_MDS; |
| 399 | s->s_con.peer_name.num = cpu_to_le64(mds); | 401 | s->s_con.peer_name.num = cpu_to_le64(mds); |
| 400 | 402 | ||
| 401 | spin_lock_init(&s->s_cap_lock); | 403 | spin_lock_init(&s->s_gen_ttl_lock); |
| 402 | s->s_cap_gen = 0; | 404 | s->s_cap_gen = 0; |
| 403 | s->s_cap_ttl = 0; | 405 | s->s_cap_ttl = 0; |
| 406 | |||
| 407 | spin_lock_init(&s->s_cap_lock); | ||
| 404 | s->s_renew_requested = 0; | 408 | s->s_renew_requested = 0; |
| 405 | s->s_renew_seq = 0; | 409 | s->s_renew_seq = 0; |
| 406 | INIT_LIST_HEAD(&s->s_caps); | 410 | INIT_LIST_HEAD(&s->s_caps); |
| @@ -2326,10 +2330,10 @@ static void handle_session(struct ceph_mds_session *session, | |||
| 2326 | case CEPH_SESSION_STALE: | 2330 | case CEPH_SESSION_STALE: |
| 2327 | pr_info("mds%d caps went stale, renewing\n", | 2331 | pr_info("mds%d caps went stale, renewing\n", |
| 2328 | session->s_mds); | 2332 | session->s_mds); |
| 2329 | spin_lock(&session->s_cap_lock); | 2333 | spin_lock(&session->s_gen_ttl_lock); |
| 2330 | session->s_cap_gen++; | 2334 | session->s_cap_gen++; |
| 2331 | session->s_cap_ttl = 0; | 2335 | session->s_cap_ttl = 0; |
| 2332 | spin_unlock(&session->s_cap_lock); | 2336 | spin_unlock(&session->s_gen_ttl_lock); |
| 2333 | send_renew_caps(mdsc, session); | 2337 | send_renew_caps(mdsc, session); |
| 2334 | break; | 2338 | break; |
| 2335 | 2339 | ||
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index a50ca0e39475..8c7c04ebb595 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h | |||
| @@ -117,10 +117,13 @@ struct ceph_mds_session { | |||
| 117 | void *s_authorizer_buf, *s_authorizer_reply_buf; | 117 | void *s_authorizer_buf, *s_authorizer_reply_buf; |
| 118 | size_t s_authorizer_buf_len, s_authorizer_reply_buf_len; | 118 | size_t s_authorizer_buf_len, s_authorizer_reply_buf_len; |
| 119 | 119 | ||
| 120 | /* protected by s_cap_lock */ | 120 | /* protected by s_gen_ttl_lock */ |
| 121 | spinlock_t s_cap_lock; | 121 | spinlock_t s_gen_ttl_lock; |
| 122 | u32 s_cap_gen; /* inc each time we get mds stale msg */ | 122 | u32 s_cap_gen; /* inc each time we get mds stale msg */ |
| 123 | unsigned long s_cap_ttl; /* when session caps expire */ | 123 | unsigned long s_cap_ttl; /* when session caps expire */ |
| 124 | |||
| 125 | /* protected by s_cap_lock */ | ||
| 126 | spinlock_t s_cap_lock; | ||
| 124 | struct list_head s_caps; /* all caps issued by this session */ | 127 | struct list_head s_caps; /* all caps issued by this session */ |
| 125 | int s_nr_caps, s_trim_caps; | 128 | int s_nr_caps, s_trim_caps; |
| 126 | int s_num_cap_releases; | 129 | int s_num_cap_releases; |
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c index 857214ae8c08..a76f697303d9 100644 --- a/fs/ceph/xattr.c +++ b/fs/ceph/xattr.c | |||
| @@ -111,8 +111,10 @@ static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val, | |||
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | static struct ceph_vxattr_cb ceph_file_vxattrs[] = { | 113 | static struct ceph_vxattr_cb ceph_file_vxattrs[] = { |
| 114 | { true, "ceph.file.layout", ceph_vxattrcb_layout}, | ||
| 115 | /* The following extended attribute name is deprecated */ | ||
| 114 | { true, "ceph.layout", ceph_vxattrcb_layout}, | 116 | { true, "ceph.layout", ceph_vxattrcb_layout}, |
| 115 | { NULL, NULL } | 117 | { true, NULL, NULL } |
| 116 | }; | 118 | }; |
| 117 | 119 | ||
| 118 | static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode) | 120 | static struct ceph_vxattr_cb *ceph_inode_vxattrs(struct inode *inode) |
diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c index e97404d611e0..9c501449450d 100644 --- a/fs/logfs/dev_mtd.c +++ b/fs/logfs/dev_mtd.c | |||
| @@ -152,9 +152,6 @@ static struct page *logfs_mtd_find_first_sb(struct super_block *sb, u64 *ofs) | |||
| 152 | filler_t *filler = logfs_mtd_readpage; | 152 | filler_t *filler = logfs_mtd_readpage; |
| 153 | struct mtd_info *mtd = super->s_mtd; | 153 | struct mtd_info *mtd = super->s_mtd; |
| 154 | 154 | ||
| 155 | if (!mtd_can_have_bb(mtd)) | ||
| 156 | return NULL; | ||
| 157 | |||
| 158 | *ofs = 0; | 155 | *ofs = 0; |
| 159 | while (mtd_block_isbad(mtd, *ofs)) { | 156 | while (mtd_block_isbad(mtd, *ofs)) { |
| 160 | *ofs += mtd->erasesize; | 157 | *ofs += mtd->erasesize; |
| @@ -172,9 +169,6 @@ static struct page *logfs_mtd_find_last_sb(struct super_block *sb, u64 *ofs) | |||
| 172 | filler_t *filler = logfs_mtd_readpage; | 169 | filler_t *filler = logfs_mtd_readpage; |
| 173 | struct mtd_info *mtd = super->s_mtd; | 170 | struct mtd_info *mtd = super->s_mtd; |
| 174 | 171 | ||
| 175 | if (!mtd_can_have_bb(mtd)) | ||
| 176 | return NULL; | ||
| 177 | |||
| 178 | *ofs = mtd->size - mtd->erasesize; | 172 | *ofs = mtd->size - mtd->erasesize; |
| 179 | while (mtd_block_isbad(mtd, *ofs)) { | 173 | while (mtd_block_isbad(mtd, *ofs)) { |
| 180 | *ofs -= mtd->erasesize; | 174 | *ofs -= mtd->erasesize; |
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index 501043e8966c..3de7a32cadbe 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
| @@ -71,7 +71,7 @@ static int write_dir(struct inode *dir, struct logfs_disk_dentry *dd, | |||
| 71 | 71 | ||
| 72 | static int write_inode(struct inode *inode) | 72 | static int write_inode(struct inode *inode) |
| 73 | { | 73 | { |
| 74 | return __logfs_write_inode(inode, WF_LOCK); | 74 | return __logfs_write_inode(inode, NULL, WF_LOCK); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | static s64 dir_seek_data(struct inode *inode, s64 pos) | 77 | static s64 dir_seek_data(struct inode *inode, s64 pos) |
diff --git a/fs/logfs/file.c b/fs/logfs/file.c index b548c87a86f1..3886cded283c 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c | |||
| @@ -230,7 +230,9 @@ int logfs_fsync(struct file *file, loff_t start, loff_t end, int datasync) | |||
| 230 | return ret; | 230 | return ret; |
| 231 | 231 | ||
| 232 | mutex_lock(&inode->i_mutex); | 232 | mutex_lock(&inode->i_mutex); |
| 233 | logfs_get_wblocks(sb, NULL, WF_LOCK); | ||
| 233 | logfs_write_anchor(sb); | 234 | logfs_write_anchor(sb); |
| 235 | logfs_put_wblocks(sb, NULL, WF_LOCK); | ||
| 234 | mutex_unlock(&inode->i_mutex); | 236 | mutex_unlock(&inode->i_mutex); |
| 235 | 237 | ||
| 236 | return 0; | 238 | return 0; |
diff --git a/fs/logfs/gc.c b/fs/logfs/gc.c index caa4419285dc..d4efb061bdc5 100644 --- a/fs/logfs/gc.c +++ b/fs/logfs/gc.c | |||
| @@ -367,7 +367,7 @@ static struct gc_candidate *get_candidate(struct super_block *sb) | |||
| 367 | int i, max_dist; | 367 | int i, max_dist; |
| 368 | struct gc_candidate *cand = NULL, *this; | 368 | struct gc_candidate *cand = NULL, *this; |
| 369 | 369 | ||
| 370 | max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS); | 370 | max_dist = min(no_free_segments(sb), LOGFS_NO_AREAS - 1); |
| 371 | 371 | ||
| 372 | for (i = max_dist; i >= 0; i--) { | 372 | for (i = max_dist; i >= 0; i--) { |
| 373 | this = first_in_list(&super->s_low_list[i]); | 373 | this = first_in_list(&super->s_low_list[i]); |
diff --git a/fs/logfs/inode.c b/fs/logfs/inode.c index 388df1aa35e5..a422f42238b2 100644 --- a/fs/logfs/inode.c +++ b/fs/logfs/inode.c | |||
| @@ -286,7 +286,7 @@ static int logfs_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 286 | if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN) | 286 | if (logfs_inode(inode)->li_flags & LOGFS_IF_STILLBORN) |
| 287 | return 0; | 287 | return 0; |
| 288 | 288 | ||
| 289 | ret = __logfs_write_inode(inode, flags); | 289 | ret = __logfs_write_inode(inode, NULL, flags); |
| 290 | LOGFS_BUG_ON(ret, inode->i_sb); | 290 | LOGFS_BUG_ON(ret, inode->i_sb); |
| 291 | return ret; | 291 | return ret; |
| 292 | } | 292 | } |
| @@ -363,7 +363,9 @@ static void logfs_init_once(void *_li) | |||
| 363 | 363 | ||
| 364 | static int logfs_sync_fs(struct super_block *sb, int wait) | 364 | static int logfs_sync_fs(struct super_block *sb, int wait) |
| 365 | { | 365 | { |
| 366 | logfs_get_wblocks(sb, NULL, WF_LOCK); | ||
| 366 | logfs_write_anchor(sb); | 367 | logfs_write_anchor(sb); |
| 368 | logfs_put_wblocks(sb, NULL, WF_LOCK); | ||
| 367 | return 0; | 369 | return 0; |
| 368 | } | 370 | } |
| 369 | 371 | ||
diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c index 9da29706f91c..1e1c369df22b 100644 --- a/fs/logfs/journal.c +++ b/fs/logfs/journal.c | |||
| @@ -612,7 +612,6 @@ static size_t __logfs_write_je(struct super_block *sb, void *buf, u16 type, | |||
| 612 | if (len == 0) | 612 | if (len == 0) |
| 613 | return logfs_write_header(super, header, 0, type); | 613 | return logfs_write_header(super, header, 0, type); |
| 614 | 614 | ||
| 615 | BUG_ON(len > sb->s_blocksize); | ||
| 616 | compr_len = logfs_compress(buf, data, len, sb->s_blocksize); | 615 | compr_len = logfs_compress(buf, data, len, sb->s_blocksize); |
| 617 | if (compr_len < 0 || type == JE_ANCHOR) { | 616 | if (compr_len < 0 || type == JE_ANCHOR) { |
| 618 | memcpy(data, buf, len); | 617 | memcpy(data, buf, len); |
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index 926373866a55..5f0937609465 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
| @@ -528,7 +528,7 @@ void logfs_destroy_inode_cache(void); | |||
| 528 | void logfs_set_blocks(struct inode *inode, u64 no); | 528 | void logfs_set_blocks(struct inode *inode, u64 no); |
| 529 | /* these logically belong into inode.c but actually reside in readwrite.c */ | 529 | /* these logically belong into inode.c but actually reside in readwrite.c */ |
| 530 | int logfs_read_inode(struct inode *inode); | 530 | int logfs_read_inode(struct inode *inode); |
| 531 | int __logfs_write_inode(struct inode *inode, long flags); | 531 | int __logfs_write_inode(struct inode *inode, struct page *, long flags); |
| 532 | void logfs_evict_inode(struct inode *inode); | 532 | void logfs_evict_inode(struct inode *inode); |
| 533 | 533 | ||
| 534 | /* journal.c */ | 534 | /* journal.c */ |
| @@ -577,6 +577,8 @@ void initialize_block_counters(struct page *page, struct logfs_block *block, | |||
| 577 | __be64 *array, int page_is_empty); | 577 | __be64 *array, int page_is_empty); |
| 578 | int logfs_exist_block(struct inode *inode, u64 bix); | 578 | int logfs_exist_block(struct inode *inode, u64 bix); |
| 579 | int get_page_reserve(struct inode *inode, struct page *page); | 579 | int get_page_reserve(struct inode *inode, struct page *page); |
| 580 | void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock); | ||
| 581 | void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock); | ||
| 580 | extern struct logfs_block_ops indirect_block_ops; | 582 | extern struct logfs_block_ops indirect_block_ops; |
| 581 | 583 | ||
| 582 | /* segment.c */ | 584 | /* segment.c */ |
| @@ -594,6 +596,7 @@ int logfs_init_mapping(struct super_block *sb); | |||
| 594 | void logfs_sync_area(struct logfs_area *area); | 596 | void logfs_sync_area(struct logfs_area *area); |
| 595 | void logfs_sync_segments(struct super_block *sb); | 597 | void logfs_sync_segments(struct super_block *sb); |
| 596 | void freeseg(struct super_block *sb, u32 segno); | 598 | void freeseg(struct super_block *sb, u32 segno); |
| 599 | void free_areas(struct super_block *sb); | ||
| 597 | 600 | ||
| 598 | /* area handling */ | 601 | /* area handling */ |
| 599 | int logfs_init_areas(struct super_block *sb); | 602 | int logfs_init_areas(struct super_block *sb); |
diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c index 2ac4217b7901..4153e65b0148 100644 --- a/fs/logfs/readwrite.c +++ b/fs/logfs/readwrite.c | |||
| @@ -244,8 +244,7 @@ static void preunlock_page(struct super_block *sb, struct page *page, int lock) | |||
| 244 | * is waiting for s_write_mutex. We annotate this fact by setting PG_pre_locked | 244 | * is waiting for s_write_mutex. We annotate this fact by setting PG_pre_locked |
| 245 | * in addition to PG_locked. | 245 | * in addition to PG_locked. |
| 246 | */ | 246 | */ |
| 247 | static void logfs_get_wblocks(struct super_block *sb, struct page *page, | 247 | void logfs_get_wblocks(struct super_block *sb, struct page *page, int lock) |
| 248 | int lock) | ||
| 249 | { | 248 | { |
| 250 | struct logfs_super *super = logfs_super(sb); | 249 | struct logfs_super *super = logfs_super(sb); |
| 251 | 250 | ||
| @@ -260,8 +259,7 @@ static void logfs_get_wblocks(struct super_block *sb, struct page *page, | |||
| 260 | } | 259 | } |
| 261 | } | 260 | } |
| 262 | 261 | ||
| 263 | static void logfs_put_wblocks(struct super_block *sb, struct page *page, | 262 | void logfs_put_wblocks(struct super_block *sb, struct page *page, int lock) |
| 264 | int lock) | ||
| 265 | { | 263 | { |
| 266 | struct logfs_super *super = logfs_super(sb); | 264 | struct logfs_super *super = logfs_super(sb); |
| 267 | 265 | ||
| @@ -424,7 +422,7 @@ static void inode_write_block(struct logfs_block *block) | |||
| 424 | if (inode->i_ino == LOGFS_INO_MASTER) | 422 | if (inode->i_ino == LOGFS_INO_MASTER) |
| 425 | logfs_write_anchor(inode->i_sb); | 423 | logfs_write_anchor(inode->i_sb); |
| 426 | else { | 424 | else { |
| 427 | ret = __logfs_write_inode(inode, 0); | 425 | ret = __logfs_write_inode(inode, NULL, 0); |
| 428 | /* see indirect_write_block comment */ | 426 | /* see indirect_write_block comment */ |
| 429 | BUG_ON(ret); | 427 | BUG_ON(ret); |
| 430 | } | 428 | } |
| @@ -560,8 +558,13 @@ static void inode_free_block(struct super_block *sb, struct logfs_block *block) | |||
| 560 | static void indirect_free_block(struct super_block *sb, | 558 | static void indirect_free_block(struct super_block *sb, |
| 561 | struct logfs_block *block) | 559 | struct logfs_block *block) |
| 562 | { | 560 | { |
| 563 | ClearPagePrivate(block->page); | 561 | struct page *page = block->page; |
| 564 | block->page->private = 0; | 562 | |
| 563 | if (PagePrivate(page)) { | ||
| 564 | ClearPagePrivate(page); | ||
| 565 | page_cache_release(page); | ||
| 566 | set_page_private(page, 0); | ||
| 567 | } | ||
| 565 | __free_block(sb, block); | 568 | __free_block(sb, block); |
| 566 | } | 569 | } |
| 567 | 570 | ||
| @@ -650,8 +653,11 @@ static void alloc_data_block(struct inode *inode, struct page *page) | |||
| 650 | logfs_unpack_index(page->index, &bix, &level); | 653 | logfs_unpack_index(page->index, &bix, &level); |
| 651 | block = __alloc_block(inode->i_sb, inode->i_ino, bix, level); | 654 | block = __alloc_block(inode->i_sb, inode->i_ino, bix, level); |
| 652 | block->page = page; | 655 | block->page = page; |
| 656 | |||
| 653 | SetPagePrivate(page); | 657 | SetPagePrivate(page); |
| 654 | page->private = (unsigned long)block; | 658 | page_cache_get(page); |
| 659 | set_page_private(page, (unsigned long) block); | ||
| 660 | |||
| 655 | block->ops = &indirect_block_ops; | 661 | block->ops = &indirect_block_ops; |
| 656 | } | 662 | } |
| 657 | 663 | ||
| @@ -1570,11 +1576,15 @@ int logfs_write_buf(struct inode *inode, struct page *page, long flags) | |||
| 1570 | static int __logfs_delete(struct inode *inode, struct page *page) | 1576 | static int __logfs_delete(struct inode *inode, struct page *page) |
| 1571 | { | 1577 | { |
| 1572 | long flags = WF_DELETE; | 1578 | long flags = WF_DELETE; |
| 1579 | int err; | ||
| 1573 | 1580 | ||
| 1574 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; | 1581 | inode->i_ctime = inode->i_mtime = CURRENT_TIME; |
| 1575 | 1582 | ||
| 1576 | if (page->index < I0_BLOCKS) | 1583 | if (page->index < I0_BLOCKS) |
| 1577 | return logfs_write_direct(inode, page, flags); | 1584 | return logfs_write_direct(inode, page, flags); |
| 1585 | err = grow_inode(inode, page->index, 0); | ||
| 1586 | if (err) | ||
| 1587 | return err; | ||
| 1578 | return logfs_write_rec(inode, page, page->index, 0, flags); | 1588 | return logfs_write_rec(inode, page, page->index, 0, flags); |
| 1579 | } | 1589 | } |
| 1580 | 1590 | ||
| @@ -1623,7 +1633,7 @@ int logfs_rewrite_block(struct inode *inode, u64 bix, u64 ofs, | |||
| 1623 | if (inode->i_ino == LOGFS_INO_MASTER) | 1633 | if (inode->i_ino == LOGFS_INO_MASTER) |
| 1624 | logfs_write_anchor(inode->i_sb); | 1634 | logfs_write_anchor(inode->i_sb); |
| 1625 | else { | 1635 | else { |
| 1626 | err = __logfs_write_inode(inode, flags); | 1636 | err = __logfs_write_inode(inode, page, flags); |
| 1627 | } | 1637 | } |
| 1628 | } | 1638 | } |
| 1629 | } | 1639 | } |
| @@ -1873,7 +1883,7 @@ int logfs_truncate(struct inode *inode, u64 target) | |||
| 1873 | logfs_get_wblocks(sb, NULL, 1); | 1883 | logfs_get_wblocks(sb, NULL, 1); |
| 1874 | err = __logfs_truncate(inode, size); | 1884 | err = __logfs_truncate(inode, size); |
| 1875 | if (!err) | 1885 | if (!err) |
| 1876 | err = __logfs_write_inode(inode, 0); | 1886 | err = __logfs_write_inode(inode, NULL, 0); |
| 1877 | logfs_put_wblocks(sb, NULL, 1); | 1887 | logfs_put_wblocks(sb, NULL, 1); |
| 1878 | } | 1888 | } |
| 1879 | 1889 | ||
| @@ -1901,8 +1911,11 @@ static void move_page_to_inode(struct inode *inode, struct page *page) | |||
| 1901 | li->li_block = block; | 1911 | li->li_block = block; |
| 1902 | 1912 | ||
| 1903 | block->page = NULL; | 1913 | block->page = NULL; |
| 1904 | page->private = 0; | 1914 | if (PagePrivate(page)) { |
| 1905 | ClearPagePrivate(page); | 1915 | ClearPagePrivate(page); |
| 1916 | page_cache_release(page); | ||
| 1917 | set_page_private(page, 0); | ||
| 1918 | } | ||
| 1906 | } | 1919 | } |
| 1907 | 1920 | ||
| 1908 | static void move_inode_to_page(struct page *page, struct inode *inode) | 1921 | static void move_inode_to_page(struct page *page, struct inode *inode) |
| @@ -1918,8 +1931,12 @@ static void move_inode_to_page(struct page *page, struct inode *inode) | |||
| 1918 | BUG_ON(PagePrivate(page)); | 1931 | BUG_ON(PagePrivate(page)); |
| 1919 | block->ops = &indirect_block_ops; | 1932 | block->ops = &indirect_block_ops; |
| 1920 | block->page = page; | 1933 | block->page = page; |
| 1921 | page->private = (unsigned long)block; | 1934 | |
| 1922 | SetPagePrivate(page); | 1935 | if (!PagePrivate(page)) { |
| 1936 | SetPagePrivate(page); | ||
| 1937 | page_cache_get(page); | ||
| 1938 | set_page_private(page, (unsigned long) block); | ||
| 1939 | } | ||
| 1923 | 1940 | ||
| 1924 | block->inode = NULL; | 1941 | block->inode = NULL; |
| 1925 | li->li_block = NULL; | 1942 | li->li_block = NULL; |
| @@ -2106,14 +2123,14 @@ void logfs_set_segment_unreserved(struct super_block *sb, u32 segno, u32 ec) | |||
| 2106 | ec_level); | 2123 | ec_level); |
| 2107 | } | 2124 | } |
| 2108 | 2125 | ||
| 2109 | int __logfs_write_inode(struct inode *inode, long flags) | 2126 | int __logfs_write_inode(struct inode *inode, struct page *page, long flags) |
| 2110 | { | 2127 | { |
| 2111 | struct super_block *sb = inode->i_sb; | 2128 | struct super_block *sb = inode->i_sb; |
| 2112 | int ret; | 2129 | int ret; |
| 2113 | 2130 | ||
| 2114 | logfs_get_wblocks(sb, NULL, flags & WF_LOCK); | 2131 | logfs_get_wblocks(sb, page, flags & WF_LOCK); |
| 2115 | ret = do_write_inode(inode); | 2132 | ret = do_write_inode(inode); |
| 2116 | logfs_put_wblocks(sb, NULL, flags & WF_LOCK); | 2133 | logfs_put_wblocks(sb, page, flags & WF_LOCK); |
| 2117 | return ret; | 2134 | return ret; |
| 2118 | } | 2135 | } |
| 2119 | 2136 | ||
diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c index 9d5187353255..ab798ed1cc88 100644 --- a/fs/logfs/segment.c +++ b/fs/logfs/segment.c | |||
| @@ -86,7 +86,11 @@ int __logfs_buf_write(struct logfs_area *area, u64 ofs, void *buf, size_t len, | |||
| 86 | BUG_ON(!page); /* FIXME: reserve a pool */ | 86 | BUG_ON(!page); /* FIXME: reserve a pool */ |
| 87 | SetPageUptodate(page); | 87 | SetPageUptodate(page); |
| 88 | memcpy(page_address(page) + offset, buf, copylen); | 88 | memcpy(page_address(page) + offset, buf, copylen); |
| 89 | SetPagePrivate(page); | 89 | |
| 90 | if (!PagePrivate(page)) { | ||
| 91 | SetPagePrivate(page); | ||
| 92 | page_cache_get(page); | ||
| 93 | } | ||
| 90 | page_cache_release(page); | 94 | page_cache_release(page); |
| 91 | 95 | ||
| 92 | buf += copylen; | 96 | buf += copylen; |
| @@ -110,7 +114,10 @@ static void pad_partial_page(struct logfs_area *area) | |||
| 110 | page = get_mapping_page(sb, index, 0); | 114 | page = get_mapping_page(sb, index, 0); |
| 111 | BUG_ON(!page); /* FIXME: reserve a pool */ | 115 | BUG_ON(!page); /* FIXME: reserve a pool */ |
| 112 | memset(page_address(page) + offset, 0xff, len); | 116 | memset(page_address(page) + offset, 0xff, len); |
| 113 | SetPagePrivate(page); | 117 | if (!PagePrivate(page)) { |
| 118 | SetPagePrivate(page); | ||
| 119 | page_cache_get(page); | ||
| 120 | } | ||
| 114 | page_cache_release(page); | 121 | page_cache_release(page); |
| 115 | } | 122 | } |
| 116 | } | 123 | } |
| @@ -130,7 +137,10 @@ static void pad_full_pages(struct logfs_area *area) | |||
| 130 | BUG_ON(!page); /* FIXME: reserve a pool */ | 137 | BUG_ON(!page); /* FIXME: reserve a pool */ |
| 131 | SetPageUptodate(page); | 138 | SetPageUptodate(page); |
| 132 | memset(page_address(page), 0xff, PAGE_CACHE_SIZE); | 139 | memset(page_address(page), 0xff, PAGE_CACHE_SIZE); |
| 133 | SetPagePrivate(page); | 140 | if (!PagePrivate(page)) { |
| 141 | SetPagePrivate(page); | ||
| 142 | page_cache_get(page); | ||
| 143 | } | ||
| 134 | page_cache_release(page); | 144 | page_cache_release(page); |
| 135 | index++; | 145 | index++; |
| 136 | no_indizes--; | 146 | no_indizes--; |
| @@ -485,8 +495,12 @@ static void move_btree_to_page(struct inode *inode, struct page *page, | |||
| 485 | mempool_free(item, super->s_alias_pool); | 495 | mempool_free(item, super->s_alias_pool); |
| 486 | } | 496 | } |
| 487 | block->page = page; | 497 | block->page = page; |
| 488 | SetPagePrivate(page); | 498 | |
| 489 | page->private = (unsigned long)block; | 499 | if (!PagePrivate(page)) { |
| 500 | SetPagePrivate(page); | ||
| 501 | page_cache_get(page); | ||
| 502 | set_page_private(page, (unsigned long) block); | ||
| 503 | } | ||
| 490 | block->ops = &indirect_block_ops; | 504 | block->ops = &indirect_block_ops; |
| 491 | initialize_block_counters(page, block, data, 0); | 505 | initialize_block_counters(page, block, data, 0); |
| 492 | } | 506 | } |
| @@ -536,8 +550,12 @@ void move_page_to_btree(struct page *page) | |||
| 536 | list_add(&item->list, &block->item_list); | 550 | list_add(&item->list, &block->item_list); |
| 537 | } | 551 | } |
| 538 | block->page = NULL; | 552 | block->page = NULL; |
| 539 | ClearPagePrivate(page); | 553 | |
| 540 | page->private = 0; | 554 | if (PagePrivate(page)) { |
| 555 | ClearPagePrivate(page); | ||
| 556 | page_cache_release(page); | ||
| 557 | set_page_private(page, 0); | ||
| 558 | } | ||
| 541 | block->ops = &btree_block_ops; | 559 | block->ops = &btree_block_ops; |
| 542 | err = alias_tree_insert(block->sb, block->ino, block->bix, block->level, | 560 | err = alias_tree_insert(block->sb, block->ino, block->bix, block->level, |
| 543 | block); | 561 | block); |
| @@ -702,7 +720,10 @@ void freeseg(struct super_block *sb, u32 segno) | |||
| 702 | page = find_get_page(mapping, ofs >> PAGE_SHIFT); | 720 | page = find_get_page(mapping, ofs >> PAGE_SHIFT); |
| 703 | if (!page) | 721 | if (!page) |
| 704 | continue; | 722 | continue; |
| 705 | ClearPagePrivate(page); | 723 | if (PagePrivate(page)) { |
| 724 | ClearPagePrivate(page); | ||
| 725 | page_cache_release(page); | ||
| 726 | } | ||
| 706 | page_cache_release(page); | 727 | page_cache_release(page); |
| 707 | } | 728 | } |
| 708 | } | 729 | } |
| @@ -841,6 +862,16 @@ static void free_area(struct logfs_area *area) | |||
| 841 | kfree(area); | 862 | kfree(area); |
| 842 | } | 863 | } |
| 843 | 864 | ||
| 865 | void free_areas(struct super_block *sb) | ||
| 866 | { | ||
| 867 | struct logfs_super *super = logfs_super(sb); | ||
| 868 | int i; | ||
| 869 | |||
| 870 | for_each_area(i) | ||
| 871 | free_area(super->s_area[i]); | ||
| 872 | free_area(super->s_journal_area); | ||
| 873 | } | ||
| 874 | |||
| 844 | static struct logfs_area *alloc_area(struct super_block *sb) | 875 | static struct logfs_area *alloc_area(struct super_block *sb) |
| 845 | { | 876 | { |
| 846 | struct logfs_area *area; | 877 | struct logfs_area *area; |
| @@ -923,10 +954,6 @@ err: | |||
| 923 | void logfs_cleanup_areas(struct super_block *sb) | 954 | void logfs_cleanup_areas(struct super_block *sb) |
| 924 | { | 955 | { |
| 925 | struct logfs_super *super = logfs_super(sb); | 956 | struct logfs_super *super = logfs_super(sb); |
| 926 | int i; | ||
| 927 | 957 | ||
| 928 | btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias); | 958 | btree_grim_visitor128(&super->s_object_alias_tree, 0, kill_alias); |
| 929 | for_each_area(i) | ||
| 930 | free_area(super->s_area[i]); | ||
| 931 | free_area(super->s_journal_area); | ||
| 932 | } | 959 | } |
diff --git a/fs/logfs/super.c b/fs/logfs/super.c index e795c234ea33..c9ee7f5d1caf 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c | |||
| @@ -486,14 +486,15 @@ static void logfs_kill_sb(struct super_block *sb) | |||
| 486 | /* Alias entries slow down mount, so evict as many as possible */ | 486 | /* Alias entries slow down mount, so evict as many as possible */ |
| 487 | sync_filesystem(sb); | 487 | sync_filesystem(sb); |
| 488 | logfs_write_anchor(sb); | 488 | logfs_write_anchor(sb); |
| 489 | free_areas(sb); | ||
| 489 | 490 | ||
| 490 | /* | 491 | /* |
| 491 | * From this point on alias entries are simply dropped - and any | 492 | * From this point on alias entries are simply dropped - and any |
| 492 | * writes to the object store are considered bugs. | 493 | * writes to the object store are considered bugs. |
| 493 | */ | 494 | */ |
| 494 | super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN; | ||
| 495 | log_super("LogFS: Now in shutdown\n"); | 495 | log_super("LogFS: Now in shutdown\n"); |
| 496 | generic_shutdown_super(sb); | 496 | generic_shutdown_super(sb); |
| 497 | super->s_flags |= LOGFS_SB_FLAG_SHUTDOWN; | ||
| 497 | 498 | ||
| 498 | BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes); | 499 | BUG_ON(super->s_dirty_used_bytes || super->s_dirty_free_bytes); |
| 499 | 500 | ||
diff --git a/fs/proc/base.c b/fs/proc/base.c index 9cde9edf9c4d..d4548dd49b02 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
| @@ -198,26 +198,6 @@ static int proc_root_link(struct dentry *dentry, struct path *path) | |||
| 198 | return result; | 198 | return result; |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) | ||
| 202 | { | ||
| 203 | struct mm_struct *mm; | ||
| 204 | int err; | ||
| 205 | |||
| 206 | err = mutex_lock_killable(&task->signal->cred_guard_mutex); | ||
| 207 | if (err) | ||
| 208 | return ERR_PTR(err); | ||
| 209 | |||
| 210 | mm = get_task_mm(task); | ||
| 211 | if (mm && mm != current->mm && | ||
| 212 | !ptrace_may_access(task, mode)) { | ||
| 213 | mmput(mm); | ||
| 214 | mm = ERR_PTR(-EACCES); | ||
| 215 | } | ||
| 216 | mutex_unlock(&task->signal->cred_guard_mutex); | ||
| 217 | |||
| 218 | return mm; | ||
| 219 | } | ||
| 220 | |||
| 221 | struct mm_struct *mm_for_maps(struct task_struct *task) | 201 | struct mm_struct *mm_for_maps(struct task_struct *task) |
| 222 | { | 202 | { |
| 223 | return mm_access(task, PTRACE_MODE_READ); | 203 | return mm_access(task, PTRACE_MODE_READ); |
| @@ -711,6 +691,13 @@ static int mem_open(struct inode* inode, struct file* file) | |||
| 711 | if (IS_ERR(mm)) | 691 | if (IS_ERR(mm)) |
| 712 | return PTR_ERR(mm); | 692 | return PTR_ERR(mm); |
| 713 | 693 | ||
| 694 | if (mm) { | ||
| 695 | /* ensure this mm_struct can't be freed */ | ||
| 696 | atomic_inc(&mm->mm_count); | ||
| 697 | /* but do not pin its memory */ | ||
| 698 | mmput(mm); | ||
| 699 | } | ||
| 700 | |||
| 714 | /* OK to pass negative loff_t, we can catch out-of-range */ | 701 | /* OK to pass negative loff_t, we can catch out-of-range */ |
| 715 | file->f_mode |= FMODE_UNSIGNED_OFFSET; | 702 | file->f_mode |= FMODE_UNSIGNED_OFFSET; |
| 716 | file->private_data = mm; | 703 | file->private_data = mm; |
| @@ -718,57 +705,13 @@ static int mem_open(struct inode* inode, struct file* file) | |||
| 718 | return 0; | 705 | return 0; |
| 719 | } | 706 | } |
| 720 | 707 | ||
| 721 | static ssize_t mem_read(struct file * file, char __user * buf, | 708 | static ssize_t mem_rw(struct file *file, char __user *buf, |
| 722 | size_t count, loff_t *ppos) | 709 | size_t count, loff_t *ppos, int write) |
| 723 | { | 710 | { |
| 724 | int ret; | ||
| 725 | char *page; | ||
| 726 | unsigned long src = *ppos; | ||
| 727 | struct mm_struct *mm = file->private_data; | 711 | struct mm_struct *mm = file->private_data; |
| 728 | 712 | unsigned long addr = *ppos; | |
| 729 | if (!mm) | 713 | ssize_t copied; |
| 730 | return 0; | ||
| 731 | |||
| 732 | page = (char *)__get_free_page(GFP_TEMPORARY); | ||
| 733 | if (!page) | ||
| 734 | return -ENOMEM; | ||
| 735 | |||
| 736 | ret = 0; | ||
| 737 | |||
| 738 | while (count > 0) { | ||
| 739 | int this_len, retval; | ||
| 740 | |||
| 741 | this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count; | ||
| 742 | retval = access_remote_vm(mm, src, page, this_len, 0); | ||
| 743 | if (!retval) { | ||
| 744 | if (!ret) | ||
| 745 | ret = -EIO; | ||
| 746 | break; | ||
| 747 | } | ||
| 748 | |||
| 749 | if (copy_to_user(buf, page, retval)) { | ||
| 750 | ret = -EFAULT; | ||
| 751 | break; | ||
| 752 | } | ||
| 753 | |||
| 754 | ret += retval; | ||
| 755 | src += retval; | ||
| 756 | buf += retval; | ||
| 757 | count -= retval; | ||
| 758 | } | ||
| 759 | *ppos = src; | ||
| 760 | |||
| 761 | free_page((unsigned long) page); | ||
| 762 | return ret; | ||
| 763 | } | ||
| 764 | |||
| 765 | static ssize_t mem_write(struct file * file, const char __user *buf, | ||
| 766 | size_t count, loff_t *ppos) | ||
| 767 | { | ||
| 768 | int copied; | ||
| 769 | char *page; | 714 | char *page; |
| 770 | unsigned long dst = *ppos; | ||
| 771 | struct mm_struct *mm = file->private_data; | ||
| 772 | 715 | ||
| 773 | if (!mm) | 716 | if (!mm) |
| 774 | return 0; | 717 | return 0; |
| @@ -778,31 +721,54 @@ static ssize_t mem_write(struct file * file, const char __user *buf, | |||
| 778 | return -ENOMEM; | 721 | return -ENOMEM; |
| 779 | 722 | ||
| 780 | copied = 0; | 723 | copied = 0; |
| 724 | if (!atomic_inc_not_zero(&mm->mm_users)) | ||
| 725 | goto free; | ||
| 726 | |||
| 781 | while (count > 0) { | 727 | while (count > 0) { |
| 782 | int this_len, retval; | 728 | int this_len = min_t(int, count, PAGE_SIZE); |
| 783 | 729 | ||
| 784 | this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count; | 730 | if (write && copy_from_user(page, buf, this_len)) { |
| 785 | if (copy_from_user(page, buf, this_len)) { | ||
| 786 | copied = -EFAULT; | 731 | copied = -EFAULT; |
| 787 | break; | 732 | break; |
| 788 | } | 733 | } |
| 789 | retval = access_remote_vm(mm, dst, page, this_len, 1); | 734 | |
| 790 | if (!retval) { | 735 | this_len = access_remote_vm(mm, addr, page, this_len, write); |
| 736 | if (!this_len) { | ||
| 791 | if (!copied) | 737 | if (!copied) |
| 792 | copied = -EIO; | 738 | copied = -EIO; |
| 793 | break; | 739 | break; |
| 794 | } | 740 | } |
| 795 | copied += retval; | 741 | |
| 796 | buf += retval; | 742 | if (!write && copy_to_user(buf, page, this_len)) { |
| 797 | dst += retval; | 743 | copied = -EFAULT; |
| 798 | count -= retval; | 744 | break; |
| 745 | } | ||
| 746 | |||
| 747 | buf += this_len; | ||
| 748 | addr += this_len; | ||
| 749 | copied += this_len; | ||
| 750 | count -= this_len; | ||
| 799 | } | 751 | } |
| 800 | *ppos = dst; | 752 | *ppos = addr; |
| 801 | 753 | ||
| 754 | mmput(mm); | ||
| 755 | free: | ||
| 802 | free_page((unsigned long) page); | 756 | free_page((unsigned long) page); |
| 803 | return copied; | 757 | return copied; |
| 804 | } | 758 | } |
| 805 | 759 | ||
| 760 | static ssize_t mem_read(struct file *file, char __user *buf, | ||
| 761 | size_t count, loff_t *ppos) | ||
| 762 | { | ||
| 763 | return mem_rw(file, buf, count, ppos, 0); | ||
| 764 | } | ||
| 765 | |||
| 766 | static ssize_t mem_write(struct file *file, const char __user *buf, | ||
| 767 | size_t count, loff_t *ppos) | ||
| 768 | { | ||
| 769 | return mem_rw(file, (char __user*)buf, count, ppos, 1); | ||
| 770 | } | ||
| 771 | |||
| 806 | loff_t mem_lseek(struct file *file, loff_t offset, int orig) | 772 | loff_t mem_lseek(struct file *file, loff_t offset, int orig) |
| 807 | { | 773 | { |
| 808 | switch (orig) { | 774 | switch (orig) { |
| @@ -822,8 +788,8 @@ loff_t mem_lseek(struct file *file, loff_t offset, int orig) | |||
| 822 | static int mem_release(struct inode *inode, struct file *file) | 788 | static int mem_release(struct inode *inode, struct file *file) |
| 823 | { | 789 | { |
| 824 | struct mm_struct *mm = file->private_data; | 790 | struct mm_struct *mm = file->private_data; |
| 825 | 791 | if (mm) | |
| 826 | mmput(mm); | 792 | mmdrop(mm); |
| 827 | return 0; | 793 | return 0; |
| 828 | } | 794 | } |
| 829 | 795 | ||
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 62f4fb37789e..00012e31829d 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -493,6 +493,12 @@ int sysfs_attr_ns(struct kobject *kobj, const struct attribute *attr, | |||
| 493 | const void *ns = NULL; | 493 | const void *ns = NULL; |
| 494 | int err; | 494 | int err; |
| 495 | 495 | ||
| 496 | if (!dir_sd) { | ||
| 497 | WARN(1, KERN_ERR "sysfs: kobject %s without dirent\n", | ||
| 498 | kobject_name(kobj)); | ||
| 499 | return -ENOENT; | ||
| 500 | } | ||
| 501 | |||
| 496 | err = 0; | 502 | err = 0; |
| 497 | if (!sysfs_ns_type(dir_sd)) | 503 | if (!sysfs_ns_type(dir_sd)) |
| 498 | goto out; | 504 | goto out; |
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 4a802b4a9056..85eb81683a29 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c | |||
| @@ -318,8 +318,11 @@ int sysfs_hash_and_remove(struct sysfs_dirent *dir_sd, const void *ns, const cha | |||
| 318 | struct sysfs_addrm_cxt acxt; | 318 | struct sysfs_addrm_cxt acxt; |
| 319 | struct sysfs_dirent *sd; | 319 | struct sysfs_dirent *sd; |
| 320 | 320 | ||
| 321 | if (!dir_sd) | 321 | if (!dir_sd) { |
| 322 | WARN(1, KERN_WARNING "sysfs: can not remove '%s', no directory\n", | ||
| 323 | name); | ||
| 322 | return -ENOENT; | 324 | return -ENOENT; |
| 325 | } | ||
| 323 | 326 | ||
| 324 | sysfs_addrm_start(&acxt, dir_sd); | 327 | sysfs_addrm_start(&acxt, dir_sd); |
| 325 | 328 | ||
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index 0ab54e16a91f..d09af4b67cf1 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h | |||
| @@ -39,6 +39,7 @@ extern bool __refrigerator(bool check_kthr_stop); | |||
| 39 | extern int freeze_processes(void); | 39 | extern int freeze_processes(void); |
| 40 | extern int freeze_kernel_threads(void); | 40 | extern int freeze_kernel_threads(void); |
| 41 | extern void thaw_processes(void); | 41 | extern void thaw_processes(void); |
| 42 | extern void thaw_kernel_threads(void); | ||
| 42 | 43 | ||
| 43 | static inline bool try_to_freeze(void) | 44 | static inline bool try_to_freeze(void) |
| 44 | { | 45 | { |
| @@ -174,6 +175,7 @@ static inline bool __refrigerator(bool check_kthr_stop) { return false; } | |||
| 174 | static inline int freeze_processes(void) { return -ENOSYS; } | 175 | static inline int freeze_processes(void) { return -ENOSYS; } |
| 175 | static inline int freeze_kernel_threads(void) { return -ENOSYS; } | 176 | static inline int freeze_kernel_threads(void) { return -ENOSYS; } |
| 176 | static inline void thaw_processes(void) {} | 177 | static inline void thaw_processes(void) {} |
| 178 | static inline void thaw_kernel_threads(void) {} | ||
| 177 | 179 | ||
| 178 | static inline bool try_to_freeze(void) { return false; } | 180 | static inline bool try_to_freeze(void) { return false; } |
| 179 | 181 | ||
diff --git a/include/linux/lp8727.h b/include/linux/lp8727.h index d21fa2865bf4..d21fa2865bf4 100755..100644 --- a/include/linux/lp8727.h +++ b/include/linux/lp8727.h | |||
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h index 1515e64e3663..f88c1cc0cb0f 100644 --- a/include/linux/mfd/mcp.h +++ b/include/linux/mfd/mcp.h | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #ifndef MCP_H | 10 | #ifndef MCP_H |
| 11 | #define MCP_H | 11 | #define MCP_H |
| 12 | 12 | ||
| 13 | #include <linux/mod_devicetable.h> | ||
| 14 | #include <mach/dma.h> | 13 | #include <mach/dma.h> |
| 15 | 14 | ||
| 16 | struct mcp_ops; | 15 | struct mcp_ops; |
| @@ -27,7 +26,7 @@ struct mcp { | |||
| 27 | dma_device_t dma_telco_rd; | 26 | dma_device_t dma_telco_rd; |
| 28 | dma_device_t dma_telco_wr; | 27 | dma_device_t dma_telco_wr; |
| 29 | struct device attached_device; | 28 | struct device attached_device; |
| 30 | const char *codec; | 29 | int gpio_base; |
| 31 | }; | 30 | }; |
| 32 | 31 | ||
| 33 | struct mcp_ops { | 32 | struct mcp_ops { |
| @@ -45,11 +44,10 @@ void mcp_reg_write(struct mcp *, unsigned int, unsigned int); | |||
| 45 | unsigned int mcp_reg_read(struct mcp *, unsigned int); | 44 | unsigned int mcp_reg_read(struct mcp *, unsigned int); |
| 46 | void mcp_enable(struct mcp *); | 45 | void mcp_enable(struct mcp *); |
| 47 | void mcp_disable(struct mcp *); | 46 | void mcp_disable(struct mcp *); |
| 48 | const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp); | ||
| 49 | #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) | 47 | #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) |
| 50 | 48 | ||
| 51 | struct mcp *mcp_host_alloc(struct device *, size_t); | 49 | struct mcp *mcp_host_alloc(struct device *, size_t); |
| 52 | int mcp_host_register(struct mcp *, void *); | 50 | int mcp_host_register(struct mcp *); |
| 53 | void mcp_host_unregister(struct mcp *); | 51 | void mcp_host_unregister(struct mcp *); |
| 54 | 52 | ||
| 55 | struct mcp_driver { | 53 | struct mcp_driver { |
| @@ -58,7 +56,6 @@ struct mcp_driver { | |||
| 58 | void (*remove)(struct mcp *); | 56 | void (*remove)(struct mcp *); |
| 59 | int (*suspend)(struct mcp *, pm_message_t); | 57 | int (*suspend)(struct mcp *, pm_message_t); |
| 60 | int (*resume)(struct mcp *); | 58 | int (*resume)(struct mcp *); |
| 61 | const struct mcp_device_id *id_table; | ||
| 62 | }; | 59 | }; |
| 63 | 60 | ||
| 64 | int mcp_driver_register(struct mcp_driver *); | 61 | int mcp_driver_register(struct mcp_driver *); |
| @@ -67,6 +64,9 @@ void mcp_driver_unregister(struct mcp_driver *); | |||
| 67 | #define mcp_get_drvdata(mcp) dev_get_drvdata(&(mcp)->attached_device) | 64 | #define mcp_get_drvdata(mcp) dev_get_drvdata(&(mcp)->attached_device) |
| 68 | #define mcp_set_drvdata(mcp,d) dev_set_drvdata(&(mcp)->attached_device, d) | 65 | #define mcp_set_drvdata(mcp,d) dev_set_drvdata(&(mcp)->attached_device, d) |
| 69 | 66 | ||
| 70 | #define mcp_priv(mcp) ((void *)((mcp)+1)) | 67 | static inline void *mcp_priv(struct mcp *mcp) |
| 68 | { | ||
| 69 | return mcp + 1; | ||
| 70 | } | ||
| 71 | 71 | ||
| 72 | #endif | 72 | #endif |
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h index bc19e5fb7ea8..4321f044d1e4 100644 --- a/include/linux/mfd/ucb1x00.h +++ b/include/linux/mfd/ucb1x00.h | |||
| @@ -104,9 +104,6 @@ | |||
| 104 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) | 104 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) |
| 105 | #define UCB_MODE_AUD_OFF_CAN (1 << 13) | 105 | #define UCB_MODE_AUD_OFF_CAN (1 << 13) |
| 106 | 106 | ||
| 107 | struct ucb1x00_plat_data { | ||
| 108 | int gpio_base; | ||
| 109 | }; | ||
| 110 | 107 | ||
| 111 | struct ucb1x00_irq { | 108 | struct ucb1x00_irq { |
| 112 | void *devid; | 109 | void *devid; |
| @@ -119,7 +116,7 @@ struct ucb1x00 { | |||
| 119 | unsigned int irq; | 116 | unsigned int irq; |
| 120 | struct semaphore adc_sem; | 117 | struct semaphore adc_sem; |
| 121 | spinlock_t io_lock; | 118 | spinlock_t io_lock; |
| 122 | const struct mcp_device_id *id; | 119 | u16 id; |
| 123 | u16 io_dir; | 120 | u16 io_dir; |
| 124 | u16 io_out; | 121 | u16 io_out; |
| 125 | u16 adc_cr; | 122 | u16 adc_cr; |
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index b29e7f6f8fa5..83ac0713ed0a 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -436,17 +436,6 @@ struct spi_device_id { | |||
| 436 | __attribute__((aligned(sizeof(kernel_ulong_t)))); | 436 | __attribute__((aligned(sizeof(kernel_ulong_t)))); |
| 437 | }; | 437 | }; |
| 438 | 438 | ||
| 439 | /* mcp */ | ||
| 440 | |||
| 441 | #define MCP_NAME_SIZE 20 | ||
| 442 | #define MCP_MODULE_PREFIX "mcp:" | ||
| 443 | |||
| 444 | struct mcp_device_id { | ||
| 445 | char name[MCP_NAME_SIZE]; | ||
| 446 | kernel_ulong_t driver_data /* Data private to the driver */ | ||
| 447 | __attribute__((aligned(sizeof(kernel_ulong_t)))); | ||
| 448 | }; | ||
| 449 | |||
| 450 | /* dmi */ | 439 | /* dmi */ |
| 451 | enum dmi_field { | 440 | enum dmi_field { |
| 452 | DMI_NONE, | 441 | DMI_NONE, |
diff --git a/include/linux/mpi.h b/include/linux/mpi.h index 06f88994ccaa..d02cca6cc8ce 100644 --- a/include/linux/mpi.h +++ b/include/linux/mpi.h | |||
| @@ -57,8 +57,6 @@ struct gcry_mpi { | |||
| 57 | 57 | ||
| 58 | typedef struct gcry_mpi *MPI; | 58 | typedef struct gcry_mpi *MPI; |
| 59 | 59 | ||
| 60 | #define MPI_NULL NULL | ||
| 61 | |||
| 62 | #define mpi_get_nlimbs(a) ((a)->nlimbs) | 60 | #define mpi_get_nlimbs(a) ((a)->nlimbs) |
| 63 | #define mpi_is_neg(a) ((a)->sign) | 61 | #define mpi_is_neg(a) ((a)->sign) |
| 64 | 62 | ||
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 1a81fde8f333..887ebe318c75 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h | |||
| @@ -441,7 +441,7 @@ static inline void mtd_resume(struct mtd_info *mtd) | |||
| 441 | static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs) | 441 | static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs) |
| 442 | { | 442 | { |
| 443 | if (!mtd->block_isbad) | 443 | if (!mtd->block_isbad) |
| 444 | return -EOPNOTSUPP; | 444 | return 0; |
| 445 | return mtd->block_isbad(mtd, ofs); | 445 | return mtd->block_isbad(mtd, ofs); |
| 446 | } | 446 | } |
| 447 | 447 | ||
diff --git a/include/linux/sched.h b/include/linux/sched.h index 2234985a5e65..7d379a6bfd88 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2259,6 +2259,12 @@ static inline void mmdrop(struct mm_struct * mm) | |||
| 2259 | extern void mmput(struct mm_struct *); | 2259 | extern void mmput(struct mm_struct *); |
| 2260 | /* Grab a reference to a task's mm, if it is not already going away */ | 2260 | /* Grab a reference to a task's mm, if it is not already going away */ |
| 2261 | extern struct mm_struct *get_task_mm(struct task_struct *task); | 2261 | extern struct mm_struct *get_task_mm(struct task_struct *task); |
| 2262 | /* | ||
| 2263 | * Grab a reference to a task's mm, if it is not already going away | ||
| 2264 | * and ptrace_may_access with the mode parameter passed to it | ||
| 2265 | * succeeds. | ||
| 2266 | */ | ||
| 2267 | extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode); | ||
| 2262 | /* Remove the current tasks stale references to the old mm_struct */ | 2268 | /* Remove the current tasks stale references to the old mm_struct */ |
| 2263 | extern void mm_release(struct task_struct *, struct mm_struct *); | 2269 | extern void mm_release(struct task_struct *, struct mm_struct *); |
| 2264 | /* Allocate a new mm structure and copy contents from tsk->mm */ | 2270 | /* Allocate a new mm structure and copy contents from tsk->mm */ |
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h deleted file mode 100644 index 20f63d3e6144..000000000000 --- a/include/linux/sysdev.h +++ /dev/null | |||
| @@ -1,164 +0,0 @@ | |||
| 1 | /** | ||
| 2 | * System devices follow a slightly different driver model. | ||
| 3 | * They don't need to do dynammic driver binding, can't be probed, | ||
| 4 | * and don't reside on any type of peripheral bus. | ||
| 5 | * So, we represent and treat them a little differently. | ||
| 6 | * | ||
| 7 | * We still have a notion of a driver for a system device, because we still | ||
| 8 | * want to perform basic operations on these devices. | ||
| 9 | * | ||
| 10 | * We also support auxiliary drivers binding to devices of a certain class. | ||
| 11 | * | ||
| 12 | * This allows configurable drivers to register themselves for devices of | ||
| 13 | * a certain type. And, it allows class definitions to reside in generic | ||
| 14 | * code while arch-specific code can register specific drivers. | ||
| 15 | * | ||
| 16 | * Auxiliary drivers registered with a NULL cls are registered as drivers | ||
| 17 | * for all system devices, and get notification calls for each device. | ||
| 18 | */ | ||
| 19 | |||
| 20 | |||
| 21 | #ifndef _SYSDEV_H_ | ||
| 22 | #define _SYSDEV_H_ | ||
| 23 | |||
| 24 | #include <linux/kobject.h> | ||
| 25 | #include <linux/pm.h> | ||
| 26 | |||
| 27 | |||
| 28 | struct sys_device; | ||
| 29 | struct sysdev_class_attribute; | ||
| 30 | |||
| 31 | struct sysdev_class { | ||
| 32 | const char *name; | ||
| 33 | struct list_head drivers; | ||
| 34 | struct sysdev_class_attribute **attrs; | ||
| 35 | struct kset kset; | ||
| 36 | }; | ||
| 37 | |||
| 38 | struct sysdev_class_attribute { | ||
| 39 | struct attribute attr; | ||
| 40 | ssize_t (*show)(struct sysdev_class *, struct sysdev_class_attribute *, | ||
| 41 | char *); | ||
| 42 | ssize_t (*store)(struct sysdev_class *, struct sysdev_class_attribute *, | ||
| 43 | const char *, size_t); | ||
| 44 | }; | ||
| 45 | |||
| 46 | #define _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) \ | ||
| 47 | { \ | ||
| 48 | .attr = {.name = __stringify(_name), .mode = _mode }, \ | ||
| 49 | .show = _show, \ | ||
| 50 | .store = _store, \ | ||
| 51 | } | ||
| 52 | |||
| 53 | #define SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) \ | ||
| 54 | struct sysdev_class_attribute attr_##_name = \ | ||
| 55 | _SYSDEV_CLASS_ATTR(_name,_mode,_show,_store) | ||
| 56 | |||
| 57 | |||
| 58 | extern int sysdev_class_register(struct sysdev_class *); | ||
| 59 | extern void sysdev_class_unregister(struct sysdev_class *); | ||
| 60 | |||
| 61 | extern int sysdev_class_create_file(struct sysdev_class *, | ||
| 62 | struct sysdev_class_attribute *); | ||
| 63 | extern void sysdev_class_remove_file(struct sysdev_class *, | ||
| 64 | struct sysdev_class_attribute *); | ||
| 65 | /** | ||
| 66 | * Auxiliary system device drivers. | ||
| 67 | */ | ||
| 68 | |||
| 69 | struct sysdev_driver { | ||
| 70 | struct list_head entry; | ||
| 71 | int (*add)(struct sys_device *); | ||
| 72 | int (*remove)(struct sys_device *); | ||
| 73 | }; | ||
| 74 | |||
| 75 | |||
| 76 | extern int sysdev_driver_register(struct sysdev_class *, struct sysdev_driver *); | ||
| 77 | extern void sysdev_driver_unregister(struct sysdev_class *, struct sysdev_driver *); | ||
| 78 | |||
| 79 | |||
| 80 | /** | ||
| 81 | * sys_devices can be simplified a lot from regular devices, because they're | ||
| 82 | * simply not as versatile. | ||
| 83 | */ | ||
| 84 | |||
| 85 | struct sys_device { | ||
| 86 | u32 id; | ||
| 87 | struct sysdev_class * cls; | ||
| 88 | struct kobject kobj; | ||
| 89 | }; | ||
| 90 | |||
| 91 | extern int sysdev_register(struct sys_device *); | ||
| 92 | extern void sysdev_unregister(struct sys_device *); | ||
| 93 | |||
| 94 | |||
| 95 | struct sysdev_attribute { | ||
| 96 | struct attribute attr; | ||
| 97 | ssize_t (*show)(struct sys_device *, struct sysdev_attribute *, char *); | ||
| 98 | ssize_t (*store)(struct sys_device *, struct sysdev_attribute *, | ||
| 99 | const char *, size_t); | ||
| 100 | }; | ||
| 101 | |||
| 102 | |||
| 103 | #define _SYSDEV_ATTR(_name, _mode, _show, _store) \ | ||
| 104 | { \ | ||
| 105 | .attr = { .name = __stringify(_name), .mode = _mode }, \ | ||
| 106 | .show = _show, \ | ||
| 107 | .store = _store, \ | ||
| 108 | } | ||
| 109 | |||
| 110 | #define SYSDEV_ATTR(_name, _mode, _show, _store) \ | ||
| 111 | struct sysdev_attribute attr_##_name = \ | ||
| 112 | _SYSDEV_ATTR(_name, _mode, _show, _store); | ||
| 113 | |||
| 114 | extern int sysdev_create_file(struct sys_device *, struct sysdev_attribute *); | ||
| 115 | extern void sysdev_remove_file(struct sys_device *, struct sysdev_attribute *); | ||
| 116 | |||
| 117 | /* Create/remove NULL terminated attribute list */ | ||
| 118 | static inline int | ||
| 119 | sysdev_create_files(struct sys_device *d, struct sysdev_attribute **a) | ||
| 120 | { | ||
| 121 | return sysfs_create_files(&d->kobj, (const struct attribute **)a); | ||
| 122 | } | ||
| 123 | |||
| 124 | static inline void | ||
| 125 | sysdev_remove_files(struct sys_device *d, struct sysdev_attribute **a) | ||
| 126 | { | ||
| 127 | return sysfs_remove_files(&d->kobj, (const struct attribute **)a); | ||
| 128 | } | ||
| 129 | |||
| 130 | struct sysdev_ext_attribute { | ||
| 131 | struct sysdev_attribute attr; | ||
| 132 | void *var; | ||
| 133 | }; | ||
| 134 | |||
| 135 | /* | ||
| 136 | * Support for simple variable sysdev attributes. | ||
| 137 | * The pointer to the variable is stored in a sysdev_ext_attribute | ||
| 138 | */ | ||
| 139 | |||
| 140 | /* Add more types as needed */ | ||
| 141 | |||
| 142 | extern ssize_t sysdev_show_ulong(struct sys_device *, struct sysdev_attribute *, | ||
| 143 | char *); | ||
| 144 | extern ssize_t sysdev_store_ulong(struct sys_device *, | ||
| 145 | struct sysdev_attribute *, const char *, size_t); | ||
| 146 | extern ssize_t sysdev_show_int(struct sys_device *, struct sysdev_attribute *, | ||
| 147 | char *); | ||
| 148 | extern ssize_t sysdev_store_int(struct sys_device *, | ||
| 149 | struct sysdev_attribute *, const char *, size_t); | ||
| 150 | |||
| 151 | #define _SYSDEV_ULONG_ATTR(_name, _mode, _var) \ | ||
| 152 | { _SYSDEV_ATTR(_name, _mode, sysdev_show_ulong, sysdev_store_ulong), \ | ||
| 153 | &(_var) } | ||
| 154 | #define SYSDEV_ULONG_ATTR(_name, _mode, _var) \ | ||
| 155 | struct sysdev_ext_attribute attr_##_name = \ | ||
| 156 | _SYSDEV_ULONG_ATTR(_name, _mode, _var); | ||
| 157 | #define _SYSDEV_INT_ATTR(_name, _mode, _var) \ | ||
| 158 | { _SYSDEV_ATTR(_name, _mode, sysdev_show_int, sysdev_store_int), \ | ||
| 159 | &(_var) } | ||
| 160 | #define SYSDEV_INT_ATTR(_name, _mode, _var) \ | ||
| 161 | struct sysdev_ext_attribute attr_##_name = \ | ||
| 162 | _SYSDEV_INT_ATTR(_name, _mode, _var); | ||
| 163 | |||
| 164 | #endif /* _SYSDEV_H_ */ | ||
diff --git a/include/linux/usb/langwell_otg.h b/include/linux/usb/langwell_otg.h deleted file mode 100644 index 51f17b16d312..000000000000 --- a/include/linux/usb/langwell_otg.h +++ /dev/null | |||
| @@ -1,139 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Intel Langwell USB OTG transceiver driver | ||
| 3 | * Copyright (C) 2008 - 2010, Intel Corporation. | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms and conditions of the GNU General Public License, | ||
| 7 | * version 2, as published by the Free Software Foundation. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 12 | * more details. | ||
| 13 | * | ||
| 14 | * You should have received a copy of the GNU General Public License along with | ||
| 15 | * this program; if not, write to the Free Software Foundation, Inc., | ||
| 16 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | ||
| 17 | * | ||
| 18 | */ | ||
| 19 | |||
| 20 | #ifndef __LANGWELL_OTG_H | ||
| 21 | #define __LANGWELL_OTG_H | ||
| 22 | |||
| 23 | #include <linux/usb/intel_mid_otg.h> | ||
| 24 | |||
| 25 | #define CI_USBCMD 0x30 | ||
| 26 | # define USBCMD_RST BIT(1) | ||
| 27 | # define USBCMD_RS BIT(0) | ||
| 28 | #define CI_USBSTS 0x34 | ||
| 29 | # define USBSTS_SLI BIT(8) | ||
| 30 | # define USBSTS_URI BIT(6) | ||
| 31 | # define USBSTS_PCI BIT(2) | ||
| 32 | #define CI_PORTSC1 0x74 | ||
| 33 | # define PORTSC_PP BIT(12) | ||
| 34 | # define PORTSC_LS (BIT(11) | BIT(10)) | ||
| 35 | # define PORTSC_SUSP BIT(7) | ||
| 36 | # define PORTSC_CCS BIT(0) | ||
| 37 | #define CI_HOSTPC1 0xb4 | ||
| 38 | # define HOSTPC1_PHCD BIT(22) | ||
| 39 | #define CI_OTGSC 0xf4 | ||
| 40 | # define OTGSC_DPIE BIT(30) | ||
| 41 | # define OTGSC_1MSE BIT(29) | ||
| 42 | # define OTGSC_BSEIE BIT(28) | ||
| 43 | # define OTGSC_BSVIE BIT(27) | ||
| 44 | # define OTGSC_ASVIE BIT(26) | ||
| 45 | # define OTGSC_AVVIE BIT(25) | ||
| 46 | # define OTGSC_IDIE BIT(24) | ||
| 47 | # define OTGSC_DPIS BIT(22) | ||
| 48 | # define OTGSC_1MSS BIT(21) | ||
| 49 | # define OTGSC_BSEIS BIT(20) | ||
| 50 | # define OTGSC_BSVIS BIT(19) | ||
| 51 | # define OTGSC_ASVIS BIT(18) | ||
| 52 | # define OTGSC_AVVIS BIT(17) | ||
| 53 | # define OTGSC_IDIS BIT(16) | ||
| 54 | # define OTGSC_DPS BIT(14) | ||
| 55 | # define OTGSC_1MST BIT(13) | ||
| 56 | # define OTGSC_BSE BIT(12) | ||
| 57 | # define OTGSC_BSV BIT(11) | ||
| 58 | # define OTGSC_ASV BIT(10) | ||
| 59 | # define OTGSC_AVV BIT(9) | ||
| 60 | # define OTGSC_ID BIT(8) | ||
| 61 | # define OTGSC_HABA BIT(7) | ||
| 62 | # define OTGSC_HADP BIT(6) | ||
| 63 | # define OTGSC_IDPU BIT(5) | ||
| 64 | # define OTGSC_DP BIT(4) | ||
| 65 | # define OTGSC_OT BIT(3) | ||
| 66 | # define OTGSC_HAAR BIT(2) | ||
| 67 | # define OTGSC_VC BIT(1) | ||
| 68 | # define OTGSC_VD BIT(0) | ||
| 69 | # define OTGSC_INTEN_MASK (0x7f << 24) | ||
| 70 | # define OTGSC_INT_MASK (0x5f << 24) | ||
| 71 | # define OTGSC_INTSTS_MASK (0x7f << 16) | ||
| 72 | #define CI_USBMODE 0xf8 | ||
| 73 | # define USBMODE_CM (BIT(1) | BIT(0)) | ||
| 74 | # define USBMODE_IDLE 0 | ||
| 75 | # define USBMODE_DEVICE 0x2 | ||
| 76 | # define USBMODE_HOST 0x3 | ||
| 77 | #define USBCFG_ADDR 0xff10801c | ||
| 78 | #define USBCFG_LEN 4 | ||
| 79 | # define USBCFG_VBUSVAL BIT(14) | ||
| 80 | # define USBCFG_AVALID BIT(13) | ||
| 81 | # define USBCFG_BVALID BIT(12) | ||
| 82 | # define USBCFG_SESEND BIT(11) | ||
| 83 | |||
| 84 | #define INTR_DUMMY_MASK (USBSTS_SLI | USBSTS_URI | USBSTS_PCI) | ||
| 85 | |||
| 86 | enum langwell_otg_timer_type { | ||
| 87 | TA_WAIT_VRISE_TMR, | ||
| 88 | TA_WAIT_BCON_TMR, | ||
| 89 | TA_AIDL_BDIS_TMR, | ||
| 90 | TB_ASE0_BRST_TMR, | ||
| 91 | TB_SE0_SRP_TMR, | ||
| 92 | TB_SRP_INIT_TMR, | ||
| 93 | TB_SRP_FAIL_TMR, | ||
| 94 | TB_BUS_SUSPEND_TMR | ||
| 95 | }; | ||
| 96 | |||
| 97 | #define TA_WAIT_VRISE 100 | ||
| 98 | #define TA_WAIT_BCON 30000 | ||
| 99 | #define TA_AIDL_BDIS 15000 | ||
| 100 | #define TB_ASE0_BRST 5000 | ||
| 101 | #define TB_SE0_SRP 2 | ||
| 102 | #define TB_SRP_INIT 100 | ||
| 103 | #define TB_SRP_FAIL 5500 | ||
| 104 | #define TB_BUS_SUSPEND 500 | ||
| 105 | |||
| 106 | struct langwell_otg_timer { | ||
| 107 | unsigned long expires; /* Number of count increase to timeout */ | ||
| 108 | unsigned long count; /* Tick counter */ | ||
| 109 | void (*function)(unsigned long); /* Timeout function */ | ||
| 110 | unsigned long data; /* Data passed to function */ | ||
| 111 | struct list_head list; | ||
| 112 | }; | ||
| 113 | |||
| 114 | struct langwell_otg { | ||
| 115 | struct intel_mid_otg_xceiv iotg; | ||
| 116 | struct device *dev; | ||
| 117 | |||
| 118 | void __iomem *usbcfg; /* SCCBUSB config Reg */ | ||
| 119 | |||
| 120 | unsigned region; | ||
| 121 | unsigned cfg_region; | ||
| 122 | |||
| 123 | struct work_struct work; | ||
| 124 | struct workqueue_struct *qwork; | ||
| 125 | struct timer_list hsm_timer; | ||
| 126 | |||
| 127 | spinlock_t lock; | ||
| 128 | spinlock_t wq_lock; | ||
| 129 | |||
| 130 | struct notifier_block iotg_notifier; | ||
| 131 | }; | ||
| 132 | |||
| 133 | static inline | ||
| 134 | struct langwell_otg *mid_xceiv_to_lnw(struct intel_mid_otg_xceiv *iotg) | ||
| 135 | { | ||
| 136 | return container_of(iotg, struct langwell_otg, iotg); | ||
| 137 | } | ||
| 138 | |||
| 139 | #endif /* __LANGWELL_OTG_H__ */ | ||
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h index 3419bf5cd154..d55f43443335 100644 --- a/include/net/netns/generic.h +++ b/include/net/netns/generic.h | |||
| @@ -41,6 +41,7 @@ static inline void *net_generic(const struct net *net, int id) | |||
| 41 | ptr = ng->ptr[id - 1]; | 41 | ptr = ng->ptr[id - 1]; |
| 42 | rcu_read_unlock(); | 42 | rcu_read_unlock(); |
| 43 | 43 | ||
| 44 | BUG_ON(!ptr); | ||
| 44 | return ptr; | 45 | return ptr; |
| 45 | } | 46 | } |
| 46 | #endif | 47 | #endif |
diff --git a/include/net/sock.h b/include/net/sock.h index 4c69ac165e6b..91c1c8baf020 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | #include <linux/uaccess.h> | 55 | #include <linux/uaccess.h> |
| 56 | #include <linux/memcontrol.h> | 56 | #include <linux/memcontrol.h> |
| 57 | #include <linux/res_counter.h> | 57 | #include <linux/res_counter.h> |
| 58 | #include <linux/jump_label.h> | ||
| 58 | 59 | ||
| 59 | #include <linux/filter.h> | 60 | #include <linux/filter.h> |
| 60 | #include <linux/rculist_nulls.h> | 61 | #include <linux/rculist_nulls.h> |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 0118ea999f67..d49db0113a06 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -311,6 +311,8 @@ extern struct proto tcp_prot; | |||
| 311 | #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val) | 311 | #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val) |
| 312 | #define TCP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) | 312 | #define TCP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) |
| 313 | 313 | ||
| 314 | extern void tcp_init_mem(struct net *net); | ||
| 315 | |||
| 314 | extern void tcp_v4_err(struct sk_buff *skb, u32); | 316 | extern void tcp_v4_err(struct sk_buff *skb, u32); |
| 315 | 317 | ||
| 316 | extern void tcp_shutdown (struct sock *sk, int how); | 318 | extern void tcp_shutdown (struct sock *sk, int how); |
diff --git a/kernel/exit.c b/kernel/exit.c index 294b1709170d..4b4042f9bc6a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1038,6 +1038,22 @@ void do_exit(long code) | |||
| 1038 | if (tsk->nr_dirtied) | 1038 | if (tsk->nr_dirtied) |
| 1039 | __this_cpu_add(dirty_throttle_leaks, tsk->nr_dirtied); | 1039 | __this_cpu_add(dirty_throttle_leaks, tsk->nr_dirtied); |
| 1040 | exit_rcu(); | 1040 | exit_rcu(); |
| 1041 | |||
| 1042 | /* | ||
| 1043 | * The setting of TASK_RUNNING by try_to_wake_up() may be delayed | ||
| 1044 | * when the following two conditions become true. | ||
| 1045 | * - There is race condition of mmap_sem (It is acquired by | ||
| 1046 | * exit_mm()), and | ||
| 1047 | * - SMI occurs before setting TASK_RUNINNG. | ||
| 1048 | * (or hypervisor of virtual machine switches to other guest) | ||
| 1049 | * As a result, we may become TASK_RUNNING after becoming TASK_DEAD | ||
| 1050 | * | ||
| 1051 | * To avoid it, we have to wait for releasing tsk->pi_lock which | ||
| 1052 | * is held by try_to_wake_up() | ||
| 1053 | */ | ||
| 1054 | smp_mb(); | ||
| 1055 | raw_spin_unlock_wait(&tsk->pi_lock); | ||
| 1056 | |||
| 1041 | /* causes final put_task_struct in finish_task_switch(). */ | 1057 | /* causes final put_task_struct in finish_task_switch(). */ |
| 1042 | tsk->state = TASK_DEAD; | 1058 | tsk->state = TASK_DEAD; |
| 1043 | tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ | 1059 | tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ |
diff --git a/kernel/fork.c b/kernel/fork.c index 051f090d40c1..1b2ef3c23ae4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -647,6 +647,26 @@ struct mm_struct *get_task_mm(struct task_struct *task) | |||
| 647 | } | 647 | } |
| 648 | EXPORT_SYMBOL_GPL(get_task_mm); | 648 | EXPORT_SYMBOL_GPL(get_task_mm); |
| 649 | 649 | ||
| 650 | struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) | ||
| 651 | { | ||
| 652 | struct mm_struct *mm; | ||
| 653 | int err; | ||
| 654 | |||
| 655 | err = mutex_lock_killable(&task->signal->cred_guard_mutex); | ||
| 656 | if (err) | ||
| 657 | return ERR_PTR(err); | ||
| 658 | |||
| 659 | mm = get_task_mm(task); | ||
| 660 | if (mm && mm != current->mm && | ||
| 661 | !ptrace_may_access(task, mode)) { | ||
| 662 | mmput(mm); | ||
| 663 | mm = ERR_PTR(-EACCES); | ||
| 664 | } | ||
| 665 | mutex_unlock(&task->signal->cred_guard_mutex); | ||
| 666 | |||
| 667 | return mm; | ||
| 668 | } | ||
| 669 | |||
| 650 | /* Please note the differences between mmput and mm_release. | 670 | /* Please note the differences between mmput and mm_release. |
| 651 | * mmput is called whenever we stop holding onto a mm_struct, | 671 | * mmput is called whenever we stop holding onto a mm_struct, |
| 652 | * error success whatever. | 672 | * error success whatever. |
diff --git a/kernel/power/process.c b/kernel/power/process.c index 77274c9ba2f1..eeca00311f39 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c | |||
| @@ -188,3 +188,22 @@ void thaw_processes(void) | |||
| 188 | printk("done.\n"); | 188 | printk("done.\n"); |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | void thaw_kernel_threads(void) | ||
| 192 | { | ||
| 193 | struct task_struct *g, *p; | ||
| 194 | |||
| 195 | pm_nosig_freezing = false; | ||
| 196 | printk("Restarting kernel threads ... "); | ||
| 197 | |||
| 198 | thaw_workqueues(); | ||
| 199 | |||
| 200 | read_lock(&tasklist_lock); | ||
| 201 | do_each_thread(g, p) { | ||
| 202 | if (p->flags & (PF_KTHREAD | PF_WQ_WORKER)) | ||
| 203 | __thaw_task(p); | ||
| 204 | } while_each_thread(g, p); | ||
| 205 | read_unlock(&tasklist_lock); | ||
| 206 | |||
| 207 | schedule(); | ||
| 208 | printk("done.\n"); | ||
| 209 | } | ||
diff --git a/kernel/power/user.c b/kernel/power/user.c index 6b1ab7a88522..e5a21a857302 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c | |||
| @@ -274,6 +274,15 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, | |||
| 274 | swsusp_free(); | 274 | swsusp_free(); |
| 275 | memset(&data->handle, 0, sizeof(struct snapshot_handle)); | 275 | memset(&data->handle, 0, sizeof(struct snapshot_handle)); |
| 276 | data->ready = 0; | 276 | data->ready = 0; |
| 277 | /* | ||
| 278 | * It is necessary to thaw kernel threads here, because | ||
| 279 | * SNAPSHOT_CREATE_IMAGE may be invoked directly after | ||
| 280 | * SNAPSHOT_FREE. In that case, if kernel threads were not | ||
| 281 | * thawed, the preallocation of memory carried out by | ||
| 282 | * hibernation_snapshot() might run into problems (i.e. it | ||
| 283 | * might fail or even deadlock). | ||
| 284 | */ | ||
| 285 | thaw_kernel_threads(); | ||
| 277 | break; | 286 | break; |
| 278 | 287 | ||
| 279 | case SNAPSHOT_PREF_IMAGE_SIZE: | 288 | case SNAPSHOT_PREF_IMAGE_SIZE: |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index df00cb09263e..5255c9d2e053 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | 74 | ||
| 75 | #include <asm/tlb.h> | 75 | #include <asm/tlb.h> |
| 76 | #include <asm/irq_regs.h> | 76 | #include <asm/irq_regs.h> |
| 77 | #include <asm/mutex.h> | ||
| 77 | #ifdef CONFIG_PARAVIRT | 78 | #ifdef CONFIG_PARAVIRT |
| 78 | #include <asm/paravirt.h> | 79 | #include <asm/paravirt.h> |
| 79 | #endif | 80 | #endif |
| @@ -723,9 +724,6 @@ static void dequeue_task(struct rq *rq, struct task_struct *p, int flags) | |||
| 723 | p->sched_class->dequeue_task(rq, p, flags); | 724 | p->sched_class->dequeue_task(rq, p, flags); |
| 724 | } | 725 | } |
| 725 | 726 | ||
| 726 | /* | ||
| 727 | * activate_task - move a task to the runqueue. | ||
| 728 | */ | ||
| 729 | void activate_task(struct rq *rq, struct task_struct *p, int flags) | 727 | void activate_task(struct rq *rq, struct task_struct *p, int flags) |
| 730 | { | 728 | { |
| 731 | if (task_contributes_to_load(p)) | 729 | if (task_contributes_to_load(p)) |
| @@ -734,9 +732,6 @@ void activate_task(struct rq *rq, struct task_struct *p, int flags) | |||
| 734 | enqueue_task(rq, p, flags); | 732 | enqueue_task(rq, p, flags); |
| 735 | } | 733 | } |
| 736 | 734 | ||
| 737 | /* | ||
| 738 | * deactivate_task - remove a task from the runqueue. | ||
| 739 | */ | ||
| 740 | void deactivate_task(struct rq *rq, struct task_struct *p, int flags) | 735 | void deactivate_task(struct rq *rq, struct task_struct *p, int flags) |
| 741 | { | 736 | { |
| 742 | if (task_contributes_to_load(p)) | 737 | if (task_contributes_to_load(p)) |
| @@ -4134,7 +4129,7 @@ recheck: | |||
| 4134 | on_rq = p->on_rq; | 4129 | on_rq = p->on_rq; |
| 4135 | running = task_current(rq, p); | 4130 | running = task_current(rq, p); |
| 4136 | if (on_rq) | 4131 | if (on_rq) |
| 4137 | deactivate_task(rq, p, 0); | 4132 | dequeue_task(rq, p, 0); |
| 4138 | if (running) | 4133 | if (running) |
| 4139 | p->sched_class->put_prev_task(rq, p); | 4134 | p->sched_class->put_prev_task(rq, p); |
| 4140 | 4135 | ||
| @@ -4147,7 +4142,7 @@ recheck: | |||
| 4147 | if (running) | 4142 | if (running) |
| 4148 | p->sched_class->set_curr_task(rq); | 4143 | p->sched_class->set_curr_task(rq); |
| 4149 | if (on_rq) | 4144 | if (on_rq) |
| 4150 | activate_task(rq, p, 0); | 4145 | enqueue_task(rq, p, 0); |
| 4151 | 4146 | ||
| 4152 | check_class_changed(rq, p, prev_class, oldprio); | 4147 | check_class_changed(rq, p, prev_class, oldprio); |
| 4153 | task_rq_unlock(rq, p, &flags); | 4148 | task_rq_unlock(rq, p, &flags); |
| @@ -4998,9 +4993,9 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) | |||
| 4998 | * placed properly. | 4993 | * placed properly. |
| 4999 | */ | 4994 | */ |
| 5000 | if (p->on_rq) { | 4995 | if (p->on_rq) { |
| 5001 | deactivate_task(rq_src, p, 0); | 4996 | dequeue_task(rq_src, p, 0); |
| 5002 | set_task_cpu(p, dest_cpu); | 4997 | set_task_cpu(p, dest_cpu); |
| 5003 | activate_task(rq_dest, p, 0); | 4998 | enqueue_task(rq_dest, p, 0); |
| 5004 | check_preempt_curr(rq_dest, p, 0); | 4999 | check_preempt_curr(rq_dest, p, 0); |
| 5005 | } | 5000 | } |
| 5006 | done: | 5001 | done: |
| @@ -7032,10 +7027,10 @@ static void normalize_task(struct rq *rq, struct task_struct *p) | |||
| 7032 | 7027 | ||
| 7033 | on_rq = p->on_rq; | 7028 | on_rq = p->on_rq; |
| 7034 | if (on_rq) | 7029 | if (on_rq) |
| 7035 | deactivate_task(rq, p, 0); | 7030 | dequeue_task(rq, p, 0); |
| 7036 | __setscheduler(rq, p, SCHED_NORMAL, 0); | 7031 | __setscheduler(rq, p, SCHED_NORMAL, 0); |
| 7037 | if (on_rq) { | 7032 | if (on_rq) { |
| 7038 | activate_task(rq, p, 0); | 7033 | enqueue_task(rq, p, 0); |
| 7039 | resched_task(rq->curr); | 7034 | resched_task(rq->curr); |
| 7040 | } | 7035 | } |
| 7041 | 7036 | ||
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 84adb2d66cbd..7c6414fc669d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
| @@ -4866,6 +4866,15 @@ static void nohz_balancer_kick(int cpu) | |||
| 4866 | return; | 4866 | return; |
| 4867 | } | 4867 | } |
| 4868 | 4868 | ||
| 4869 | static inline void clear_nohz_tick_stopped(int cpu) | ||
| 4870 | { | ||
| 4871 | if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) { | ||
| 4872 | cpumask_clear_cpu(cpu, nohz.idle_cpus_mask); | ||
| 4873 | atomic_dec(&nohz.nr_cpus); | ||
| 4874 | clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)); | ||
| 4875 | } | ||
| 4876 | } | ||
| 4877 | |||
| 4869 | static inline void set_cpu_sd_state_busy(void) | 4878 | static inline void set_cpu_sd_state_busy(void) |
| 4870 | { | 4879 | { |
| 4871 | struct sched_domain *sd; | 4880 | struct sched_domain *sd; |
| @@ -4904,6 +4913,12 @@ void select_nohz_load_balancer(int stop_tick) | |||
| 4904 | { | 4913 | { |
| 4905 | int cpu = smp_processor_id(); | 4914 | int cpu = smp_processor_id(); |
| 4906 | 4915 | ||
| 4916 | /* | ||
| 4917 | * If this cpu is going down, then nothing needs to be done. | ||
| 4918 | */ | ||
| 4919 | if (!cpu_active(cpu)) | ||
| 4920 | return; | ||
| 4921 | |||
| 4907 | if (stop_tick) { | 4922 | if (stop_tick) { |
| 4908 | if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu))) | 4923 | if (test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu))) |
| 4909 | return; | 4924 | return; |
| @@ -4914,6 +4929,18 @@ void select_nohz_load_balancer(int stop_tick) | |||
| 4914 | } | 4929 | } |
| 4915 | return; | 4930 | return; |
| 4916 | } | 4931 | } |
| 4932 | |||
| 4933 | static int __cpuinit sched_ilb_notifier(struct notifier_block *nfb, | ||
| 4934 | unsigned long action, void *hcpu) | ||
| 4935 | { | ||
| 4936 | switch (action & ~CPU_TASKS_FROZEN) { | ||
| 4937 | case CPU_DYING: | ||
| 4938 | clear_nohz_tick_stopped(smp_processor_id()); | ||
| 4939 | return NOTIFY_OK; | ||
| 4940 | default: | ||
| 4941 | return NOTIFY_DONE; | ||
| 4942 | } | ||
| 4943 | } | ||
| 4917 | #endif | 4944 | #endif |
| 4918 | 4945 | ||
| 4919 | static DEFINE_SPINLOCK(balancing); | 4946 | static DEFINE_SPINLOCK(balancing); |
| @@ -5070,11 +5097,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu) | |||
| 5070 | * busy tick after returning from idle, we will update the busy stats. | 5097 | * busy tick after returning from idle, we will update the busy stats. |
| 5071 | */ | 5098 | */ |
| 5072 | set_cpu_sd_state_busy(); | 5099 | set_cpu_sd_state_busy(); |
| 5073 | if (unlikely(test_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)))) { | 5100 | clear_nohz_tick_stopped(cpu); |
| 5074 | clear_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu)); | ||
| 5075 | cpumask_clear_cpu(cpu, nohz.idle_cpus_mask); | ||
| 5076 | atomic_dec(&nohz.nr_cpus); | ||
| 5077 | } | ||
| 5078 | 5101 | ||
| 5079 | /* | 5102 | /* |
| 5080 | * None are in tickless mode and hence no need for NOHZ idle load | 5103 | * None are in tickless mode and hence no need for NOHZ idle load |
| @@ -5590,6 +5613,7 @@ __init void init_sched_fair_class(void) | |||
| 5590 | 5613 | ||
| 5591 | #ifdef CONFIG_NO_HZ | 5614 | #ifdef CONFIG_NO_HZ |
| 5592 | zalloc_cpumask_var(&nohz.idle_cpus_mask, GFP_NOWAIT); | 5615 | zalloc_cpumask_var(&nohz.idle_cpus_mask, GFP_NOWAIT); |
| 5616 | cpu_notifier(sched_ilb_notifier, 0); | ||
| 5593 | #endif | 5617 | #endif |
| 5594 | #endif /* SMP */ | 5618 | #endif /* SMP */ |
| 5595 | 5619 | ||
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 3640ebbb466b..f42ae7fb5ec5 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c | |||
| @@ -1587,6 +1587,11 @@ static int push_rt_task(struct rq *rq) | |||
| 1587 | if (!next_task) | 1587 | if (!next_task) |
| 1588 | return 0; | 1588 | return 0; |
| 1589 | 1589 | ||
| 1590 | #ifdef __ARCH_WANT_INTERRUPTS_ON_CTXSW | ||
| 1591 | if (unlikely(task_running(rq, next_task))) | ||
| 1592 | return 0; | ||
| 1593 | #endif | ||
| 1594 | |||
| 1590 | retry: | 1595 | retry: |
| 1591 | if (unlikely(next_task == rq->curr)) { | 1596 | if (unlikely(next_task == rq->curr)) { |
| 1592 | WARN_ON(1); | 1597 | WARN_ON(1); |
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 1d7bca7f4f52..d117262deba3 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
| @@ -296,7 +296,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) | |||
| 296 | if (__this_cpu_read(soft_watchdog_warn) == true) | 296 | if (__this_cpu_read(soft_watchdog_warn) == true) |
| 297 | return HRTIMER_RESTART; | 297 | return HRTIMER_RESTART; |
| 298 | 298 | ||
| 299 | printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n", | 299 | printk(KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n", |
| 300 | smp_processor_id(), duration, | 300 | smp_processor_id(), duration, |
| 301 | current->comm, task_pid_nr(current)); | 301 | current->comm, task_pid_nr(current)); |
| 302 | print_modules(); | 302 | print_modules(); |
diff --git a/lib/Kconfig b/lib/Kconfig index 169eb7c598e5..d69d321a0997 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -279,6 +279,9 @@ config AVERAGE | |||
| 279 | 279 | ||
| 280 | If unsure, say N. | 280 | If unsure, say N. |
| 281 | 281 | ||
| 282 | config CLZ_TAB | ||
| 283 | bool | ||
| 284 | |||
| 282 | config CORDIC | 285 | config CORDIC |
| 283 | tristate "CORDIC algorithm" | 286 | tristate "CORDIC algorithm" |
| 284 | help | 287 | help |
| @@ -287,6 +290,7 @@ config CORDIC | |||
| 287 | 290 | ||
| 288 | config MPILIB | 291 | config MPILIB |
| 289 | tristate | 292 | tristate |
| 293 | select CLZ_TAB | ||
| 290 | help | 294 | help |
| 291 | Multiprecision maths library from GnuPG. | 295 | Multiprecision maths library from GnuPG. |
| 292 | It is used to implement RSA digital signature verification, | 296 | It is used to implement RSA digital signature verification, |
diff --git a/lib/Makefile b/lib/Makefile index d71aae1b01b3..18515f0267c4 100644 --- a/lib/Makefile +++ b/lib/Makefile | |||
| @@ -121,6 +121,8 @@ obj-$(CONFIG_DQL) += dynamic_queue_limits.o | |||
| 121 | obj-$(CONFIG_MPILIB) += mpi/ | 121 | obj-$(CONFIG_MPILIB) += mpi/ |
| 122 | obj-$(CONFIG_SIGNATURE) += digsig.o | 122 | obj-$(CONFIG_SIGNATURE) += digsig.o |
| 123 | 123 | ||
| 124 | obj-$(CONFIG_CLZ_TAB) += clz_tab.o | ||
| 125 | |||
| 124 | hostprogs-y := gen_crc32table | 126 | hostprogs-y := gen_crc32table |
| 125 | clean-files := crc32table.h | 127 | clean-files := crc32table.h |
| 126 | 128 | ||
| @@ -169,7 +169,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) | |||
| 169 | return BUG_TRAP_TYPE_WARN; | 169 | return BUG_TRAP_TYPE_WARN; |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | printk(KERN_EMERG "------------[ cut here ]------------\n"); | 172 | printk(KERN_DEFAULT "------------[ cut here ]------------\n"); |
| 173 | 173 | ||
| 174 | if (file) | 174 | if (file) |
| 175 | printk(KERN_CRIT "kernel BUG at %s:%u!\n", | 175 | printk(KERN_CRIT "kernel BUG at %s:%u!\n", |
diff --git a/lib/clz_tab.c b/lib/clz_tab.c new file mode 100644 index 000000000000..7287b4a991a7 --- /dev/null +++ b/lib/clz_tab.c | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | const unsigned char __clz_tab[] = { | ||
| 2 | 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, | ||
| 3 | 5, 5, 5, 5, 5, 5, 5, 5, | ||
| 4 | 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, | ||
| 5 | 6, 6, 6, 6, 6, 6, 6, 6, | ||
| 6 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 7 | 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 8 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 9 | 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 10 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 11 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 12 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 13 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 14 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 15 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 16 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 17 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 18 | }; | ||
diff --git a/lib/digsig.c b/lib/digsig.c index fd2402f67f89..286d558033e2 100644 --- a/lib/digsig.c +++ b/lib/digsig.c | |||
| @@ -34,14 +34,9 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg, | |||
| 34 | unsigned long msglen, | 34 | unsigned long msglen, |
| 35 | unsigned long modulus_bitlen, | 35 | unsigned long modulus_bitlen, |
| 36 | unsigned char *out, | 36 | unsigned char *out, |
| 37 | unsigned long *outlen, | 37 | unsigned long *outlen) |
| 38 | int *is_valid) | ||
| 39 | { | 38 | { |
| 40 | unsigned long modulus_len, ps_len, i; | 39 | unsigned long modulus_len, ps_len, i; |
| 41 | int result; | ||
| 42 | |||
| 43 | /* default to invalid packet */ | ||
| 44 | *is_valid = 0; | ||
| 45 | 40 | ||
| 46 | modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0); | 41 | modulus_len = (modulus_bitlen >> 3) + (modulus_bitlen & 7 ? 1 : 0); |
| 47 | 42 | ||
| @@ -50,39 +45,30 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg, | |||
| 50 | return -EINVAL; | 45 | return -EINVAL; |
| 51 | 46 | ||
| 52 | /* separate encoded message */ | 47 | /* separate encoded message */ |
| 53 | if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1)) { | 48 | if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1)) |
| 54 | result = -EINVAL; | 49 | return -EINVAL; |
| 55 | goto bail; | ||
| 56 | } | ||
| 57 | 50 | ||
| 58 | for (i = 2; i < modulus_len - 1; i++) | 51 | for (i = 2; i < modulus_len - 1; i++) |
| 59 | if (msg[i] != 0xFF) | 52 | if (msg[i] != 0xFF) |
| 60 | break; | 53 | break; |
| 61 | 54 | ||
| 62 | /* separator check */ | 55 | /* separator check */ |
| 63 | if (msg[i] != 0) { | 56 | if (msg[i] != 0) |
| 64 | /* There was no octet with hexadecimal value 0x00 | 57 | /* There was no octet with hexadecimal value 0x00 |
| 65 | to separate ps from m. */ | 58 | to separate ps from m. */ |
| 66 | result = -EINVAL; | 59 | return -EINVAL; |
| 67 | goto bail; | ||
| 68 | } | ||
| 69 | 60 | ||
| 70 | ps_len = i - 2; | 61 | ps_len = i - 2; |
| 71 | 62 | ||
| 72 | if (*outlen < (msglen - (2 + ps_len + 1))) { | 63 | if (*outlen < (msglen - (2 + ps_len + 1))) { |
| 73 | *outlen = msglen - (2 + ps_len + 1); | 64 | *outlen = msglen - (2 + ps_len + 1); |
| 74 | result = -EOVERFLOW; | 65 | return -EOVERFLOW; |
| 75 | goto bail; | ||
| 76 | } | 66 | } |
| 77 | 67 | ||
| 78 | *outlen = (msglen - (2 + ps_len + 1)); | 68 | *outlen = (msglen - (2 + ps_len + 1)); |
| 79 | memcpy(out, &msg[2 + ps_len + 1], *outlen); | 69 | memcpy(out, &msg[2 + ps_len + 1], *outlen); |
| 80 | 70 | ||
| 81 | /* valid packet */ | 71 | return 0; |
| 82 | *is_valid = 1; | ||
| 83 | result = 0; | ||
| 84 | bail: | ||
| 85 | return result; | ||
| 86 | } | 72 | } |
| 87 | 73 | ||
| 88 | /* | 74 | /* |
| @@ -96,7 +82,7 @@ static int digsig_verify_rsa(struct key *key, | |||
| 96 | unsigned long len; | 82 | unsigned long len; |
| 97 | unsigned long mlen, mblen; | 83 | unsigned long mlen, mblen; |
| 98 | unsigned nret, l; | 84 | unsigned nret, l; |
| 99 | int valid, head, i; | 85 | int head, i; |
| 100 | unsigned char *out1 = NULL, *out2 = NULL; | 86 | unsigned char *out1 = NULL, *out2 = NULL; |
| 101 | MPI in = NULL, res = NULL, pkey[2]; | 87 | MPI in = NULL, res = NULL, pkey[2]; |
| 102 | uint8_t *p, *datap, *endp; | 88 | uint8_t *p, *datap, *endp; |
| @@ -105,6 +91,10 @@ static int digsig_verify_rsa(struct key *key, | |||
| 105 | 91 | ||
| 106 | down_read(&key->sem); | 92 | down_read(&key->sem); |
| 107 | ukp = key->payload.data; | 93 | ukp = key->payload.data; |
| 94 | |||
| 95 | if (ukp->datalen < sizeof(*pkh)) | ||
| 96 | goto err1; | ||
| 97 | |||
| 108 | pkh = (struct pubkey_hdr *)ukp->data; | 98 | pkh = (struct pubkey_hdr *)ukp->data; |
| 109 | 99 | ||
| 110 | if (pkh->version != 1) | 100 | if (pkh->version != 1) |
| @@ -117,18 +107,23 @@ static int digsig_verify_rsa(struct key *key, | |||
| 117 | goto err1; | 107 | goto err1; |
| 118 | 108 | ||
| 119 | datap = pkh->mpi; | 109 | datap = pkh->mpi; |
| 120 | endp = datap + ukp->datalen; | 110 | endp = ukp->data + ukp->datalen; |
| 111 | |||
| 112 | err = -ENOMEM; | ||
| 121 | 113 | ||
| 122 | for (i = 0; i < pkh->nmpi; i++) { | 114 | for (i = 0; i < pkh->nmpi; i++) { |
| 123 | unsigned int remaining = endp - datap; | 115 | unsigned int remaining = endp - datap; |
| 124 | pkey[i] = mpi_read_from_buffer(datap, &remaining); | 116 | pkey[i] = mpi_read_from_buffer(datap, &remaining); |
| 117 | if (!pkey[i]) | ||
| 118 | goto err; | ||
| 125 | datap += remaining; | 119 | datap += remaining; |
| 126 | } | 120 | } |
| 127 | 121 | ||
| 128 | mblen = mpi_get_nbits(pkey[0]); | 122 | mblen = mpi_get_nbits(pkey[0]); |
| 129 | mlen = (mblen + 7)/8; | 123 | mlen = (mblen + 7)/8; |
| 130 | 124 | ||
| 131 | err = -ENOMEM; | 125 | if (mlen == 0) |
| 126 | goto err; | ||
| 132 | 127 | ||
| 133 | out1 = kzalloc(mlen, GFP_KERNEL); | 128 | out1 = kzalloc(mlen, GFP_KERNEL); |
| 134 | if (!out1) | 129 | if (!out1) |
| @@ -167,10 +162,9 @@ static int digsig_verify_rsa(struct key *key, | |||
| 167 | memset(out1, 0, head); | 162 | memset(out1, 0, head); |
| 168 | memcpy(out1 + head, p, l); | 163 | memcpy(out1 + head, p, l); |
| 169 | 164 | ||
| 170 | err = -EINVAL; | 165 | err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len); |
| 171 | pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len, &valid); | ||
| 172 | 166 | ||
| 173 | if (valid && len == hlen) | 167 | if (!err && len == hlen) |
| 174 | err = memcmp(out2, h, hlen); | 168 | err = memcmp(out2, h, hlen); |
| 175 | 169 | ||
| 176 | err: | 170 | err: |
| @@ -178,8 +172,8 @@ err: | |||
| 178 | mpi_free(res); | 172 | mpi_free(res); |
| 179 | kfree(out1); | 173 | kfree(out1); |
| 180 | kfree(out2); | 174 | kfree(out2); |
| 181 | mpi_free(pkey[0]); | 175 | while (--i >= 0) |
| 182 | mpi_free(pkey[1]); | 176 | mpi_free(pkey[i]); |
| 183 | err1: | 177 | err1: |
| 184 | up_read(&key->sem); | 178 | up_read(&key->sem); |
| 185 | 179 | ||
diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h index b87487b40a8b..29f98624ef93 100644 --- a/lib/mpi/longlong.h +++ b/lib/mpi/longlong.h | |||
| @@ -1200,18 +1200,40 @@ do { \ | |||
| 1200 | "r" ((USItype)(v)) \ | 1200 | "r" ((USItype)(v)) \ |
| 1201 | : "%g1", "%g2" __AND_CLOBBER_CC) | 1201 | : "%g1", "%g2" __AND_CLOBBER_CC) |
| 1202 | #define UMUL_TIME 39 /* 39 instructions */ | 1202 | #define UMUL_TIME 39 /* 39 instructions */ |
| 1203 | #endif | 1203 | /* It's quite necessary to add this much assembler for the sparc. |
| 1204 | #ifndef udiv_qrnnd | 1204 | The default udiv_qrnnd (in C) is more than 10 times slower! */ |
| 1205 | #ifndef LONGLONG_STANDALONE | ||
| 1206 | #define udiv_qrnnd(q, r, n1, n0, d) \ | 1205 | #define udiv_qrnnd(q, r, n1, n0, d) \ |
| 1207 | do { USItype __r; \ | 1206 | __asm__ ("! Inlined udiv_qrnnd\n\t" \ |
| 1208 | (q) = __udiv_qrnnd(&__r, (n1), (n0), (d)); \ | 1207 | "mov 32,%%g1\n\t" \ |
| 1209 | (r) = __r; \ | 1208 | "subcc %1,%2,%%g0\n\t" \ |
| 1210 | } while (0) | 1209 | "1: bcs 5f\n\t" \ |
| 1211 | extern USItype __udiv_qrnnd(); | 1210 | "addxcc %0,%0,%0 ! shift n1n0 and a q-bit in lsb\n\t" \ |
| 1212 | #define UDIV_TIME 140 | 1211 | "sub %1,%2,%1 ! this kills msb of n\n\t" \ |
| 1213 | #endif /* LONGLONG_STANDALONE */ | 1212 | "addx %1,%1,%1 ! so this can't give carry\n\t" \ |
| 1214 | #endif /* udiv_qrnnd */ | 1213 | "subcc %%g1,1,%%g1\n\t" \ |
| 1214 | "2: bne 1b\n\t" \ | ||
| 1215 | "subcc %1,%2,%%g0\n\t" \ | ||
| 1216 | "bcs 3f\n\t" \ | ||
| 1217 | "addxcc %0,%0,%0 ! shift n1n0 and a q-bit in lsb\n\t" \ | ||
| 1218 | "b 3f\n\t" \ | ||
| 1219 | "sub %1,%2,%1 ! this kills msb of n\n\t" \ | ||
| 1220 | "4: sub %1,%2,%1\n\t" \ | ||
| 1221 | "5: addxcc %1,%1,%1\n\t" \ | ||
| 1222 | "bcc 2b\n\t" \ | ||
| 1223 | "subcc %%g1,1,%%g1\n\t" \ | ||
| 1224 | "! Got carry from n. Subtract next step to cancel this carry.\n\t" \ | ||
| 1225 | "bne 4b\n\t" \ | ||
| 1226 | "addcc %0,%0,%0 ! shift n1n0 and a 0-bit in lsb\n\t" \ | ||
| 1227 | "sub %1,%2,%1\n\t" \ | ||
| 1228 | "3: xnor %0,0,%0\n\t" \ | ||
| 1229 | "! End of inline udiv_qrnnd\n" \ | ||
| 1230 | : "=&r" ((USItype)(q)), \ | ||
| 1231 | "=&r" ((USItype)(r)) \ | ||
| 1232 | : "r" ((USItype)(d)), \ | ||
| 1233 | "1" ((USItype)(n1)), \ | ||
| 1234 | "0" ((USItype)(n0)) : "%g1", "cc") | ||
| 1235 | #define UDIV_TIME (3+7*32) /* 7 instructions/iteration. 32 iterations. */ | ||
| 1236 | #endif | ||
| 1215 | #endif /* __sparc__ */ | 1237 | #endif /* __sparc__ */ |
| 1216 | 1238 | ||
| 1217 | /*************************************** | 1239 | /*************************************** |
diff --git a/lib/mpi/mpi-bit.c b/lib/mpi/mpi-bit.c index 854c9c6da025..2f526627e4f5 100644 --- a/lib/mpi/mpi-bit.c +++ b/lib/mpi/mpi-bit.c | |||
| @@ -21,25 +21,6 @@ | |||
| 21 | #include "mpi-internal.h" | 21 | #include "mpi-internal.h" |
| 22 | #include "longlong.h" | 22 | #include "longlong.h" |
| 23 | 23 | ||
| 24 | const unsigned char __clz_tab[] = { | ||
| 25 | 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, | ||
| 26 | 5, 5, 5, 5, 5, 5, 5, 5, | ||
| 27 | 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, | ||
| 28 | 6, 6, 6, 6, 6, 6, 6, 6, | ||
| 29 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 30 | 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 31 | 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 32 | 7, 7, 7, 7, 7, 7, 7, 7, | ||
| 33 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 34 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 35 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 36 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 37 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 38 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 39 | 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 40 | 8, 8, 8, 8, 8, 8, 8, 8, | ||
| 41 | }; | ||
| 42 | |||
| 43 | #define A_LIMB_1 ((mpi_limb_t) 1) | 24 | #define A_LIMB_1 ((mpi_limb_t) 1) |
| 44 | 25 | ||
| 45 | /**************** | 26 | /**************** |
diff --git a/lib/mpi/mpi-div.c b/lib/mpi/mpi-div.c index c3087d1390ce..f68cbbb4d4a4 100644 --- a/lib/mpi/mpi-div.c +++ b/lib/mpi/mpi-div.c | |||
| @@ -149,6 +149,9 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den) | |||
| 149 | mpi_ptr_t marker[5]; | 149 | mpi_ptr_t marker[5]; |
| 150 | int markidx = 0; | 150 | int markidx = 0; |
| 151 | 151 | ||
| 152 | if (!dsize) | ||
| 153 | return -EINVAL; | ||
| 154 | |||
| 152 | memset(marker, 0, sizeof(marker)); | 155 | memset(marker, 0, sizeof(marker)); |
| 153 | 156 | ||
| 154 | /* Ensure space is enough for quotient and remainder. | 157 | /* Ensure space is enough for quotient and remainder. |
| @@ -207,6 +210,8 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den) | |||
| 207 | * numerator would be gradually overwritten by the quotient limbs. */ | 210 | * numerator would be gradually overwritten by the quotient limbs. */ |
| 208 | if (qp == np) { /* Copy NP object to temporary space. */ | 211 | if (qp == np) { /* Copy NP object to temporary space. */ |
| 209 | np = marker[markidx++] = mpi_alloc_limb_space(nsize); | 212 | np = marker[markidx++] = mpi_alloc_limb_space(nsize); |
| 213 | if (!np) | ||
| 214 | goto nomem; | ||
| 210 | MPN_COPY(np, qp, nsize); | 215 | MPN_COPY(np, qp, nsize); |
| 211 | } | 216 | } |
| 212 | } else /* Put quotient at top of remainder. */ | 217 | } else /* Put quotient at top of remainder. */ |
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c index b04a3cf80080..67f3e79af914 100644 --- a/lib/mpi/mpi-pow.c +++ b/lib/mpi/mpi-pow.c | |||
| @@ -59,7 +59,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) | |||
| 59 | ep = exp->d; | 59 | ep = exp->d; |
| 60 | 60 | ||
| 61 | if (!msize) | 61 | if (!msize) |
| 62 | msize = 1 / msize; /* provoke a signal */ | 62 | return -EINVAL; |
| 63 | 63 | ||
| 64 | if (!esize) { | 64 | if (!esize) { |
| 65 | /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0 | 65 | /* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0 |
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c index 716802b774ea..f26b41fcb48c 100644 --- a/lib/mpi/mpicoder.c +++ b/lib/mpi/mpicoder.c | |||
| @@ -20,78 +20,15 @@ | |||
| 20 | 20 | ||
| 21 | #include "mpi-internal.h" | 21 | #include "mpi-internal.h" |
| 22 | 22 | ||
| 23 | #define DIM(v) (sizeof(v)/sizeof((v)[0])) | ||
| 24 | #define MAX_EXTERN_MPI_BITS 16384 | 23 | #define MAX_EXTERN_MPI_BITS 16384 |
| 25 | 24 | ||
| 26 | static uint8_t asn[15] = /* Object ID is 1.3.14.3.2.26 */ | ||
| 27 | { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, | ||
| 28 | 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14 | ||
| 29 | }; | ||
| 30 | |||
| 31 | MPI do_encode_md(const void *sha_buffer, unsigned nbits) | ||
| 32 | { | ||
| 33 | int nframe = (nbits + 7) / 8; | ||
| 34 | uint8_t *frame, *fr_pt; | ||
| 35 | int i = 0, n; | ||
| 36 | size_t asnlen = DIM(asn); | ||
| 37 | MPI a = MPI_NULL; | ||
| 38 | |||
| 39 | if (SHA1_DIGEST_LENGTH + asnlen + 4 > nframe) | ||
| 40 | pr_info("MPI: can't encode a %d bit MD into a %d bits frame\n", | ||
| 41 | (int)(SHA1_DIGEST_LENGTH * 8), (int)nbits); | ||
| 42 | |||
| 43 | /* We encode the MD in this way: | ||
| 44 | * | ||
| 45 | * 0 A PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) | ||
| 46 | * | ||
| 47 | * PAD consists of FF bytes. | ||
| 48 | */ | ||
| 49 | frame = kmalloc(nframe, GFP_KERNEL); | ||
| 50 | if (!frame) | ||
| 51 | return MPI_NULL; | ||
| 52 | n = 0; | ||
| 53 | frame[n++] = 0; | ||
| 54 | frame[n++] = 1; /* block type */ | ||
| 55 | i = nframe - SHA1_DIGEST_LENGTH - asnlen - 3; | ||
| 56 | |||
| 57 | if (i <= 1) { | ||
| 58 | pr_info("MPI: message digest encoding failed\n"); | ||
| 59 | kfree(frame); | ||
| 60 | return a; | ||
| 61 | } | ||
| 62 | |||
| 63 | memset(frame + n, 0xff, i); | ||
| 64 | n += i; | ||
| 65 | frame[n++] = 0; | ||
| 66 | memcpy(frame + n, &asn, asnlen); | ||
| 67 | n += asnlen; | ||
| 68 | memcpy(frame + n, sha_buffer, SHA1_DIGEST_LENGTH); | ||
| 69 | n += SHA1_DIGEST_LENGTH; | ||
| 70 | |||
| 71 | i = nframe; | ||
| 72 | fr_pt = frame; | ||
| 73 | |||
| 74 | if (n != nframe) { | ||
| 75 | printk | ||
| 76 | ("MPI: message digest encoding failed, frame length is wrong\n"); | ||
| 77 | kfree(frame); | ||
| 78 | return a; | ||
| 79 | } | ||
| 80 | |||
| 81 | a = mpi_alloc((nframe + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB); | ||
| 82 | mpi_set_buffer(a, frame, nframe, 0); | ||
| 83 | kfree(frame); | ||
| 84 | |||
| 85 | return a; | ||
| 86 | } | ||
| 87 | |||
| 88 | MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) | 25 | MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) |
| 89 | { | 26 | { |
| 90 | const uint8_t *buffer = xbuffer; | 27 | const uint8_t *buffer = xbuffer; |
| 91 | int i, j; | 28 | int i, j; |
| 92 | unsigned nbits, nbytes, nlimbs, nread = 0; | 29 | unsigned nbits, nbytes, nlimbs, nread = 0; |
| 93 | mpi_limb_t a; | 30 | mpi_limb_t a; |
| 94 | MPI val = MPI_NULL; | 31 | MPI val = NULL; |
| 95 | 32 | ||
| 96 | if (*ret_nread < 2) | 33 | if (*ret_nread < 2) |
| 97 | goto leave; | 34 | goto leave; |
| @@ -108,7 +45,7 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) | |||
| 108 | nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB; | 45 | nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB; |
| 109 | val = mpi_alloc(nlimbs); | 46 | val = mpi_alloc(nlimbs); |
| 110 | if (!val) | 47 | if (!val) |
| 111 | return MPI_NULL; | 48 | return NULL; |
| 112 | i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB; | 49 | i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB; |
| 113 | i %= BYTES_PER_MPI_LIMB; | 50 | i %= BYTES_PER_MPI_LIMB; |
| 114 | val->nbits = nbits; | 51 | val->nbits = nbits; |
| @@ -212,30 +149,6 @@ int mpi_fromstr(MPI val, const char *str) | |||
| 212 | EXPORT_SYMBOL_GPL(mpi_fromstr); | 149 | EXPORT_SYMBOL_GPL(mpi_fromstr); |
| 213 | 150 | ||
| 214 | /**************** | 151 | /**************** |
| 215 | * Special function to get the low 8 bytes from an mpi. | ||
| 216 | * This can be used as a keyid; KEYID is an 2 element array. | ||
| 217 | * Return the low 4 bytes. | ||
| 218 | */ | ||
| 219 | u32 mpi_get_keyid(const MPI a, u32 *keyid) | ||
| 220 | { | ||
| 221 | #if BYTES_PER_MPI_LIMB == 4 | ||
| 222 | if (keyid) { | ||
| 223 | keyid[0] = a->nlimbs >= 2 ? a->d[1] : 0; | ||
| 224 | keyid[1] = a->nlimbs >= 1 ? a->d[0] : 0; | ||
| 225 | } | ||
| 226 | return a->nlimbs >= 1 ? a->d[0] : 0; | ||
| 227 | #elif BYTES_PER_MPI_LIMB == 8 | ||
| 228 | if (keyid) { | ||
| 229 | keyid[0] = a->nlimbs ? (u32) (a->d[0] >> 32) : 0; | ||
| 230 | keyid[1] = a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0; | ||
| 231 | } | ||
| 232 | return a->nlimbs ? (u32) (a->d[0] & 0xffffffff) : 0; | ||
| 233 | #else | ||
| 234 | #error Make this function work with other LIMB sizes | ||
| 235 | #endif | ||
| 236 | } | ||
| 237 | |||
| 238 | /**************** | ||
| 239 | * Return an allocated buffer with the MPI (msb first). | 152 | * Return an allocated buffer with the MPI (msb first). |
| 240 | * NBYTES receives the length of this buffer. Caller must free the | 153 | * NBYTES receives the length of this buffer. Caller must free the |
| 241 | * return string (This function does return a 0 byte buffer with NBYTES | 154 | * return string (This function does return a 0 byte buffer with NBYTES |
diff --git a/lib/mpi/mpih-div.c b/lib/mpi/mpih-div.c index 87ede162dfab..cde1aaec18da 100644 --- a/lib/mpi/mpih-div.c +++ b/lib/mpi/mpih-div.c | |||
| @@ -217,6 +217,10 @@ mpihelp_divrem(mpi_ptr_t qp, mpi_size_t qextra_limbs, | |||
| 217 | case 0: | 217 | case 0: |
| 218 | /* We are asked to divide by zero, so go ahead and do it! (To make | 218 | /* We are asked to divide by zero, so go ahead and do it! (To make |
| 219 | the compiler not remove this statement, return the value.) */ | 219 | the compiler not remove this statement, return the value.) */ |
| 220 | /* | ||
| 221 | * existing clients of this function have been modified | ||
| 222 | * not to call it with dsize == 0, so this should not happen | ||
| 223 | */ | ||
| 220 | return 1 / dsize; | 224 | return 1 / dsize; |
| 221 | 225 | ||
| 222 | case 1: | 226 | case 1: |
diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c index eefc55d6b7f5..26e4ed31e256 100644 --- a/lib/mpi/mpiutil.c +++ b/lib/mpi/mpiutil.c | |||
| @@ -58,6 +58,9 @@ mpi_ptr_t mpi_alloc_limb_space(unsigned nlimbs) | |||
| 58 | { | 58 | { |
| 59 | size_t len = nlimbs * sizeof(mpi_limb_t); | 59 | size_t len = nlimbs * sizeof(mpi_limb_t); |
| 60 | 60 | ||
| 61 | if (!len) | ||
| 62 | return NULL; | ||
| 63 | |||
| 61 | return kmalloc(len, GFP_KERNEL); | 64 | return kmalloc(len, GFP_KERNEL); |
| 62 | } | 65 | } |
| 63 | 66 | ||
| @@ -135,7 +138,7 @@ int mpi_copy(MPI *copied, const MPI a) | |||
| 135 | size_t i; | 138 | size_t i; |
| 136 | MPI b; | 139 | MPI b; |
| 137 | 140 | ||
| 138 | *copied = MPI_NULL; | 141 | *copied = NULL; |
| 139 | 142 | ||
| 140 | if (a) { | 143 | if (a) { |
| 141 | b = mpi_alloc(a->nlimbs); | 144 | b = mpi_alloc(a->nlimbs); |
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index e920aa3ce104..c20ff48994c2 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c | |||
| @@ -298,23 +298,18 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec, | |||
| 298 | goto free_proc_pages; | 298 | goto free_proc_pages; |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | task_lock(task); | 301 | mm = mm_access(task, PTRACE_MODE_ATTACH); |
| 302 | if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) { | 302 | if (!mm || IS_ERR(mm)) { |
| 303 | task_unlock(task); | 303 | rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH; |
| 304 | rc = -EPERM; | 304 | /* |
| 305 | goto put_task_struct; | 305 | * Explicitly map EACCES to EPERM as EPERM is a more a |
| 306 | } | 306 | * appropriate error code for process_vw_readv/writev |
| 307 | mm = task->mm; | 307 | */ |
| 308 | 308 | if (rc == -EACCES) | |
| 309 | if (!mm || (task->flags & PF_KTHREAD)) { | 309 | rc = -EPERM; |
| 310 | task_unlock(task); | ||
| 311 | rc = -EINVAL; | ||
| 312 | goto put_task_struct; | 310 | goto put_task_struct; |
| 313 | } | 311 | } |
| 314 | 312 | ||
| 315 | atomic_inc(&mm->mm_users); | ||
| 316 | task_unlock(task); | ||
| 317 | |||
| 318 | for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) { | 313 | for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) { |
| 319 | rc = process_vm_rw_single_vec( | 314 | rc = process_vm_rw_single_vec( |
| 320 | (unsigned long)rvec[i].iov_base, rvec[i].iov_len, | 315 | (unsigned long)rvec[i].iov_base, rvec[i].iov_len, |
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 673728add60b..82c57069415f 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c | |||
| @@ -59,8 +59,6 @@ struct cfcnfg *get_cfcnfg(struct net *net) | |||
| 59 | { | 59 | { |
| 60 | struct caif_net *caifn; | 60 | struct caif_net *caifn; |
| 61 | caifn = net_generic(net, caif_net_id); | 61 | caifn = net_generic(net, caif_net_id); |
| 62 | if (!caifn) | ||
| 63 | return NULL; | ||
| 64 | return caifn->cfg; | 62 | return caifn->cfg; |
| 65 | } | 63 | } |
| 66 | EXPORT_SYMBOL(get_cfcnfg); | 64 | EXPORT_SYMBOL(get_cfcnfg); |
| @@ -69,8 +67,6 @@ static struct caif_device_entry_list *caif_device_list(struct net *net) | |||
| 69 | { | 67 | { |
| 70 | struct caif_net *caifn; | 68 | struct caif_net *caifn; |
| 71 | caifn = net_generic(net, caif_net_id); | 69 | caifn = net_generic(net, caif_net_id); |
| 72 | if (!caifn) | ||
| 73 | return NULL; | ||
| 74 | return &caifn->caifdevs; | 70 | return &caifn->caifdevs; |
| 75 | } | 71 | } |
| 76 | 72 | ||
| @@ -99,8 +95,6 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev) | |||
| 99 | struct caif_device_entry *caifd; | 95 | struct caif_device_entry *caifd; |
| 100 | 96 | ||
| 101 | caifdevs = caif_device_list(dev_net(dev)); | 97 | caifdevs = caif_device_list(dev_net(dev)); |
| 102 | if (!caifdevs) | ||
| 103 | return NULL; | ||
| 104 | 98 | ||
| 105 | caifd = kzalloc(sizeof(*caifd), GFP_KERNEL); | 99 | caifd = kzalloc(sizeof(*caifd), GFP_KERNEL); |
| 106 | if (!caifd) | 100 | if (!caifd) |
| @@ -120,8 +114,6 @@ static struct caif_device_entry *caif_get(struct net_device *dev) | |||
| 120 | struct caif_device_entry_list *caifdevs = | 114 | struct caif_device_entry_list *caifdevs = |
| 121 | caif_device_list(dev_net(dev)); | 115 | caif_device_list(dev_net(dev)); |
| 122 | struct caif_device_entry *caifd; | 116 | struct caif_device_entry *caifd; |
| 123 | if (!caifdevs) | ||
| 124 | return NULL; | ||
| 125 | 117 | ||
| 126 | list_for_each_entry_rcu(caifd, &caifdevs->list, list) { | 118 | list_for_each_entry_rcu(caifd, &caifdevs->list, list) { |
| 127 | if (caifd->netdev == dev) | 119 | if (caifd->netdev == dev) |
| @@ -321,8 +313,6 @@ void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev, | |||
| 321 | struct caif_device_entry_list *caifdevs; | 313 | struct caif_device_entry_list *caifdevs; |
| 322 | 314 | ||
| 323 | caifdevs = caif_device_list(dev_net(dev)); | 315 | caifdevs = caif_device_list(dev_net(dev)); |
| 324 | if (!cfg || !caifdevs) | ||
| 325 | return; | ||
| 326 | caifd = caif_device_alloc(dev); | 316 | caifd = caif_device_alloc(dev); |
| 327 | if (!caifd) | 317 | if (!caifd) |
| 328 | return; | 318 | return; |
| @@ -374,8 +364,6 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what, | |||
| 374 | 364 | ||
| 375 | cfg = get_cfcnfg(dev_net(dev)); | 365 | cfg = get_cfcnfg(dev_net(dev)); |
| 376 | caifdevs = caif_device_list(dev_net(dev)); | 366 | caifdevs = caif_device_list(dev_net(dev)); |
| 377 | if (!cfg || !caifdevs) | ||
| 378 | return 0; | ||
| 379 | 367 | ||
| 380 | caifd = caif_get(dev); | 368 | caifd = caif_get(dev); |
| 381 | if (caifd == NULL && dev->type != ARPHRD_CAIF) | 369 | if (caifd == NULL && dev->type != ARPHRD_CAIF) |
| @@ -507,9 +495,6 @@ static struct notifier_block caif_device_notifier = { | |||
| 507 | static int caif_init_net(struct net *net) | 495 | static int caif_init_net(struct net *net) |
| 508 | { | 496 | { |
| 509 | struct caif_net *caifn = net_generic(net, caif_net_id); | 497 | struct caif_net *caifn = net_generic(net, caif_net_id); |
| 510 | if (WARN_ON(!caifn)) | ||
| 511 | return -EINVAL; | ||
| 512 | |||
| 513 | INIT_LIST_HEAD(&caifn->caifdevs.list); | 498 | INIT_LIST_HEAD(&caifn->caifdevs.list); |
| 514 | mutex_init(&caifn->caifdevs.lock); | 499 | mutex_init(&caifn->caifdevs.lock); |
| 515 | 500 | ||
| @@ -527,9 +512,6 @@ static void caif_exit_net(struct net *net) | |||
| 527 | caif_device_list(net); | 512 | caif_device_list(net); |
| 528 | struct cfcnfg *cfg = get_cfcnfg(net); | 513 | struct cfcnfg *cfg = get_cfcnfg(net); |
| 529 | 514 | ||
| 530 | if (!cfg || !caifdevs) | ||
| 531 | return; | ||
| 532 | |||
| 533 | rtnl_lock(); | 515 | rtnl_lock(); |
| 534 | mutex_lock(&caifdevs->lock); | 516 | mutex_lock(&caifdevs->lock); |
| 535 | 517 | ||
| @@ -569,7 +551,7 @@ static int __init caif_device_init(void) | |||
| 569 | { | 551 | { |
| 570 | int result; | 552 | int result; |
| 571 | 553 | ||
| 572 | result = register_pernet_device(&caif_net_ops); | 554 | result = register_pernet_subsys(&caif_net_ops); |
| 573 | 555 | ||
| 574 | if (result) | 556 | if (result) |
| 575 | return result; | 557 | return result; |
| @@ -582,7 +564,7 @@ static int __init caif_device_init(void) | |||
| 582 | 564 | ||
| 583 | static void __exit caif_device_exit(void) | 565 | static void __exit caif_device_exit(void) |
| 584 | { | 566 | { |
| 585 | unregister_pernet_device(&caif_net_ops); | 567 | unregister_pernet_subsys(&caif_net_ops); |
| 586 | unregister_netdevice_notifier(&caif_device_notifier); | 568 | unregister_netdevice_notifier(&caif_device_notifier); |
| 587 | dev_remove_pack(&caif_packet_type); | 569 | dev_remove_pack(&caif_packet_type); |
| 588 | } | 570 | } |
diff --git a/net/caif/cfcnfg.c b/net/caif/cfcnfg.c index 598aafb4cb51..ba9cfd47778a 100644 --- a/net/caif/cfcnfg.c +++ b/net/caif/cfcnfg.c | |||
| @@ -309,7 +309,6 @@ int caif_connect_client(struct net *net, struct caif_connect_request *conn_req, | |||
| 309 | int err; | 309 | int err; |
| 310 | struct cfctrl_link_param param; | 310 | struct cfctrl_link_param param; |
| 311 | struct cfcnfg *cfg = get_cfcnfg(net); | 311 | struct cfcnfg *cfg = get_cfcnfg(net); |
| 312 | caif_assert(cfg != NULL); | ||
| 313 | 312 | ||
| 314 | rcu_read_lock(); | 313 | rcu_read_lock(); |
| 315 | err = caif_connect_req_to_link_param(cfg, conn_req, ¶m); | 314 | err = caif_connect_req_to_link_param(cfg, conn_req, ¶m); |
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c index 97f70e50ad3b..761ad9d6cc3b 100644 --- a/net/ceph/ceph_common.c +++ b/net/ceph/ceph_common.c | |||
| @@ -85,8 +85,6 @@ int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid) | |||
| 85 | } else { | 85 | } else { |
| 86 | pr_info("client%lld fsid %pU\n", ceph_client_id(client), fsid); | 86 | pr_info("client%lld fsid %pU\n", ceph_client_id(client), fsid); |
| 87 | memcpy(&client->fsid, fsid, sizeof(*fsid)); | 87 | memcpy(&client->fsid, fsid, sizeof(*fsid)); |
| 88 | ceph_debugfs_client_init(client); | ||
| 89 | client->have_fsid = true; | ||
| 90 | } | 88 | } |
| 91 | return 0; | 89 | return 0; |
| 92 | } | 90 | } |
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 0b62deae42bd..1845cde26227 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/ceph/mon_client.h> | 9 | #include <linux/ceph/mon_client.h> |
| 10 | #include <linux/ceph/libceph.h> | 10 | #include <linux/ceph/libceph.h> |
| 11 | #include <linux/ceph/debugfs.h> | ||
| 11 | #include <linux/ceph/decode.h> | 12 | #include <linux/ceph/decode.h> |
| 12 | |||
| 13 | #include <linux/ceph/auth.h> | 13 | #include <linux/ceph/auth.h> |
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| @@ -340,8 +340,19 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc, | |||
| 340 | client->monc.monmap = monmap; | 340 | client->monc.monmap = monmap; |
| 341 | kfree(old); | 341 | kfree(old); |
| 342 | 342 | ||
| 343 | if (!client->have_fsid) { | ||
| 344 | client->have_fsid = true; | ||
| 345 | mutex_unlock(&monc->mutex); | ||
| 346 | /* | ||
| 347 | * do debugfs initialization without mutex to avoid | ||
| 348 | * creating a locking dependency | ||
| 349 | */ | ||
| 350 | ceph_debugfs_client_init(client); | ||
| 351 | goto out_unlocked; | ||
| 352 | } | ||
| 343 | out: | 353 | out: |
| 344 | mutex_unlock(&monc->mutex); | 354 | mutex_unlock(&monc->mutex); |
| 355 | out_unlocked: | ||
| 345 | wake_up_all(&client->auth_wq); | 356 | wake_up_all(&client->auth_wq); |
| 346 | } | 357 | } |
| 347 | 358 | ||
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index aefcd7acbffa..0e950fda9a0a 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c | |||
| @@ -30,6 +30,20 @@ EXPORT_SYMBOL(init_net); | |||
| 30 | 30 | ||
| 31 | #define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */ | 31 | #define INITIAL_NET_GEN_PTRS 13 /* +1 for len +2 for rcu_head */ |
| 32 | 32 | ||
| 33 | static unsigned int max_gen_ptrs = INITIAL_NET_GEN_PTRS; | ||
| 34 | |||
| 35 | static struct net_generic *net_alloc_generic(void) | ||
| 36 | { | ||
| 37 | struct net_generic *ng; | ||
| 38 | size_t generic_size = offsetof(struct net_generic, ptr[max_gen_ptrs]); | ||
| 39 | |||
| 40 | ng = kzalloc(generic_size, GFP_KERNEL); | ||
| 41 | if (ng) | ||
| 42 | ng->len = max_gen_ptrs; | ||
| 43 | |||
| 44 | return ng; | ||
| 45 | } | ||
| 46 | |||
| 33 | static int net_assign_generic(struct net *net, int id, void *data) | 47 | static int net_assign_generic(struct net *net, int id, void *data) |
| 34 | { | 48 | { |
| 35 | struct net_generic *ng, *old_ng; | 49 | struct net_generic *ng, *old_ng; |
| @@ -43,8 +57,7 @@ static int net_assign_generic(struct net *net, int id, void *data) | |||
| 43 | if (old_ng->len >= id) | 57 | if (old_ng->len >= id) |
| 44 | goto assign; | 58 | goto assign; |
| 45 | 59 | ||
| 46 | ng = kzalloc(sizeof(struct net_generic) + | 60 | ng = net_alloc_generic(); |
| 47 | id * sizeof(void *), GFP_KERNEL); | ||
| 48 | if (ng == NULL) | 61 | if (ng == NULL) |
| 49 | return -ENOMEM; | 62 | return -ENOMEM; |
| 50 | 63 | ||
| @@ -59,7 +72,6 @@ static int net_assign_generic(struct net *net, int id, void *data) | |||
| 59 | * the old copy for kfree after a grace period. | 72 | * the old copy for kfree after a grace period. |
| 60 | */ | 73 | */ |
| 61 | 74 | ||
| 62 | ng->len = id; | ||
| 63 | memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*)); | 75 | memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*)); |
| 64 | 76 | ||
| 65 | rcu_assign_pointer(net->gen, ng); | 77 | rcu_assign_pointer(net->gen, ng); |
| @@ -161,18 +173,6 @@ out_undo: | |||
| 161 | goto out; | 173 | goto out; |
| 162 | } | 174 | } |
| 163 | 175 | ||
| 164 | static struct net_generic *net_alloc_generic(void) | ||
| 165 | { | ||
| 166 | struct net_generic *ng; | ||
| 167 | size_t generic_size = sizeof(struct net_generic) + | ||
| 168 | INITIAL_NET_GEN_PTRS * sizeof(void *); | ||
| 169 | |||
| 170 | ng = kzalloc(generic_size, GFP_KERNEL); | ||
| 171 | if (ng) | ||
| 172 | ng->len = INITIAL_NET_GEN_PTRS; | ||
| 173 | |||
| 174 | return ng; | ||
| 175 | } | ||
| 176 | 176 | ||
| 177 | #ifdef CONFIG_NET_NS | 177 | #ifdef CONFIG_NET_NS |
| 178 | static struct kmem_cache *net_cachep; | 178 | static struct kmem_cache *net_cachep; |
| @@ -483,6 +483,7 @@ again: | |||
| 483 | } | 483 | } |
| 484 | return error; | 484 | return error; |
| 485 | } | 485 | } |
| 486 | max_gen_ptrs = max_t(unsigned int, max_gen_ptrs, *ops->id); | ||
| 486 | } | 487 | } |
| 487 | error = __register_pernet_operations(list, ops); | 488 | error = __register_pernet_operations(list, ops); |
| 488 | if (error) { | 489 | if (error) { |
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index f16444bc6cbb..65aebd450027 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -1509,6 +1509,9 @@ errout: | |||
| 1509 | 1509 | ||
| 1510 | if (send_addr_notify) | 1510 | if (send_addr_notify) |
| 1511 | call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); | 1511 | call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); |
| 1512 | min_ifinfo_dump_size = max_t(u16, if_nlmsg_size(dev), | ||
| 1513 | min_ifinfo_dump_size); | ||
| 1514 | |||
| 1512 | return err; | 1515 | return err; |
| 1513 | } | 1516 | } |
| 1514 | 1517 | ||
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 2e4e24476c4c..19d66cefd7d3 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
| @@ -123,11 +123,14 @@ again: | |||
| 123 | smallest_size = tb->num_owners; | 123 | smallest_size = tb->num_owners; |
| 124 | smallest_rover = rover; | 124 | smallest_rover = rover; |
| 125 | if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) { | 125 | if (atomic_read(&hashinfo->bsockets) > (high - low) + 1) { |
| 126 | spin_unlock(&head->lock); | ||
| 127 | snum = smallest_rover; | 126 | snum = smallest_rover; |
| 128 | goto have_snum; | 127 | goto tb_found; |
| 129 | } | 128 | } |
| 130 | } | 129 | } |
| 130 | if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb)) { | ||
| 131 | snum = rover; | ||
| 132 | goto tb_found; | ||
| 133 | } | ||
| 131 | goto next; | 134 | goto next; |
| 132 | } | 135 | } |
| 133 | break; | 136 | break; |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2b53a1f7abf6..6b3ca5ba4450 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -422,6 +422,10 @@ static struct ip_tunnel *ipgre_tunnel_locate(struct net *net, | |||
| 422 | if (register_netdevice(dev) < 0) | 422 | if (register_netdevice(dev) < 0) |
| 423 | goto failed_free; | 423 | goto failed_free; |
| 424 | 424 | ||
| 425 | /* Can use a lockless transmit, unless we generate output sequences */ | ||
| 426 | if (!(nt->parms.o_flags & GRE_SEQ)) | ||
| 427 | dev->features |= NETIF_F_LLTX; | ||
| 428 | |||
| 425 | dev_hold(dev); | 429 | dev_hold(dev); |
| 426 | ipgre_tunnel_link(ign, nt); | 430 | ipgre_tunnel_link(ign, nt); |
| 427 | return nt; | 431 | return nt; |
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 4aa7e9dc0cbb..4cb9cd2f2c39 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
| @@ -814,6 +814,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) | |||
| 814 | 814 | ||
| 815 | net->ipv4.sysctl_rt_cache_rebuild_count = 4; | 815 | net->ipv4.sysctl_rt_cache_rebuild_count = 4; |
| 816 | 816 | ||
| 817 | tcp_init_mem(net); | ||
| 817 | limit = nr_free_buffer_pages() / 8; | 818 | limit = nr_free_buffer_pages() / 8; |
| 818 | limit = max(limit, 128UL); | 819 | limit = max(limit, 128UL); |
| 819 | net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; | 820 | net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 9bcdec3ad772..06373b4a449a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -3216,6 +3216,16 @@ static int __init set_thash_entries(char *str) | |||
| 3216 | } | 3216 | } |
| 3217 | __setup("thash_entries=", set_thash_entries); | 3217 | __setup("thash_entries=", set_thash_entries); |
| 3218 | 3218 | ||
| 3219 | void tcp_init_mem(struct net *net) | ||
| 3220 | { | ||
| 3221 | /* Set per-socket limits to no more than 1/128 the pressure threshold */ | ||
| 3222 | unsigned long limit = nr_free_buffer_pages() / 8; | ||
| 3223 | limit = max(limit, 128UL); | ||
| 3224 | net->ipv4.sysctl_tcp_mem[0] = limit / 4 * 3; | ||
| 3225 | net->ipv4.sysctl_tcp_mem[1] = limit; | ||
| 3226 | net->ipv4.sysctl_tcp_mem[2] = net->ipv4.sysctl_tcp_mem[0] * 2; | ||
| 3227 | } | ||
| 3228 | |||
| 3219 | void __init tcp_init(void) | 3229 | void __init tcp_init(void) |
| 3220 | { | 3230 | { |
| 3221 | struct sk_buff *skb = NULL; | 3231 | struct sk_buff *skb = NULL; |
| @@ -3276,9 +3286,9 @@ void __init tcp_init(void) | |||
| 3276 | sysctl_tcp_max_orphans = cnt / 2; | 3286 | sysctl_tcp_max_orphans = cnt / 2; |
| 3277 | sysctl_max_syn_backlog = max(128, cnt / 256); | 3287 | sysctl_max_syn_backlog = max(128, cnt / 256); |
| 3278 | 3288 | ||
| 3279 | /* Set per-socket limits to no more than 1/128 the pressure threshold */ | 3289 | tcp_init_mem(&init_net); |
| 3280 | limit = ((unsigned long)init_net.ipv4.sysctl_tcp_mem[1]) | 3290 | limit = nr_free_buffer_pages() / 8; |
| 3281 | << (PAGE_SHIFT - 7); | 3291 | limit = max(limit, 128UL); |
| 3282 | max_share = min(4UL*1024*1024, limit); | 3292 | max_share = min(4UL*1024*1024, limit); |
| 3283 | 3293 | ||
| 3284 | sysctl_tcp_wmem[0] = SK_MEM_QUANTUM; | 3294 | sysctl_tcp_wmem[0] = SK_MEM_QUANTUM; |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 8c8de2780c7a..4ff3b6dc74fc 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -1141,11 +1141,9 @@ int tcp_trim_head(struct sock *sk, struct sk_buff *skb, u32 len) | |||
| 1141 | sk_mem_uncharge(sk, len); | 1141 | sk_mem_uncharge(sk, len); |
| 1142 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); | 1142 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); |
| 1143 | 1143 | ||
| 1144 | /* Any change of skb->len requires recalculation of tso | 1144 | /* Any change of skb->len requires recalculation of tso factor. */ |
| 1145 | * factor and mss. | ||
| 1146 | */ | ||
| 1147 | if (tcp_skb_pcount(skb) > 1) | 1145 | if (tcp_skb_pcount(skb) > 1) |
| 1148 | tcp_set_skb_tso_segs(sk, skb, tcp_current_mss(sk)); | 1146 | tcp_set_skb_tso_segs(sk, skb, tcp_skb_mss(skb)); |
| 1149 | 1147 | ||
| 1150 | return 0; | 1148 | return 0; |
| 1151 | } | 1149 | } |
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index d21e7ebd91ca..55670ec3cd0f 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -393,11 +393,6 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb) | |||
| 393 | { | 393 | { |
| 394 | int rc; | 394 | int rc; |
| 395 | 395 | ||
| 396 | if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) | ||
| 397 | goto drop; | ||
| 398 | |||
| 399 | nf_reset(skb); | ||
| 400 | |||
| 401 | /* Charge it to the socket, dropping if the queue is full. */ | 396 | /* Charge it to the socket, dropping if the queue is full. */ |
| 402 | rc = sock_queue_rcv_skb(sk, skb); | 397 | rc = sock_queue_rcv_skb(sk, skb); |
| 403 | if (rc < 0) | 398 | if (rc < 0) |
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index b3d76b756cd5..a4643969a13b 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
| @@ -106,6 +106,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
| 106 | 106 | ||
| 107 | sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0; | 107 | sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0; |
| 108 | 108 | ||
| 109 | local->oper_channel = chan; | ||
| 109 | channel_type = ifibss->channel_type; | 110 | channel_type = ifibss->channel_type; |
| 110 | if (channel_type > NL80211_CHAN_HT20 && | 111 | if (channel_type > NL80211_CHAN_HT20 && |
| 111 | !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type)) | 112 | !cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type)) |
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index e47768cb8cb3..01a21c2f6ab3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -1314,6 +1314,7 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local) | |||
| 1314 | continue; | 1314 | continue; |
| 1315 | } | 1315 | } |
| 1316 | /* count everything else */ | 1316 | /* count everything else */ |
| 1317 | sdata->vif.bss_conf.idle = false; | ||
| 1317 | count++; | 1318 | count++; |
| 1318 | } | 1319 | } |
| 1319 | 1320 | ||
diff --git a/net/sunrpc/auth_generic.c b/net/sunrpc/auth_generic.c index 1426ec3d0a53..75762f346975 100644 --- a/net/sunrpc/auth_generic.c +++ b/net/sunrpc/auth_generic.c | |||
| @@ -92,6 +92,7 @@ generic_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int flags) | |||
| 92 | if (gcred->acred.group_info != NULL) | 92 | if (gcred->acred.group_info != NULL) |
| 93 | get_group_info(gcred->acred.group_info); | 93 | get_group_info(gcred->acred.group_info); |
| 94 | gcred->acred.machine_cred = acred->machine_cred; | 94 | gcred->acred.machine_cred = acred->machine_cred; |
| 95 | gcred->acred.principal = acred->principal; | ||
| 95 | 96 | ||
| 96 | dprintk("RPC: allocated %s cred %p for uid %d gid %d\n", | 97 | dprintk("RPC: allocated %s cred %p for uid %d gid %d\n", |
| 97 | gcred->acred.machine_cred ? "machine" : "generic", | 98 | gcred->acred.machine_cred ? "machine" : "generic", |
| @@ -123,6 +124,17 @@ generic_destroy_cred(struct rpc_cred *cred) | |||
| 123 | call_rcu(&cred->cr_rcu, generic_free_cred_callback); | 124 | call_rcu(&cred->cr_rcu, generic_free_cred_callback); |
| 124 | } | 125 | } |
| 125 | 126 | ||
| 127 | static int | ||
| 128 | machine_cred_match(struct auth_cred *acred, struct generic_cred *gcred, int flags) | ||
| 129 | { | ||
| 130 | if (!gcred->acred.machine_cred || | ||
| 131 | gcred->acred.principal != acred->principal || | ||
| 132 | gcred->acred.uid != acred->uid || | ||
| 133 | gcred->acred.gid != acred->gid) | ||
| 134 | return 0; | ||
| 135 | return 1; | ||
| 136 | } | ||
| 137 | |||
| 126 | /* | 138 | /* |
| 127 | * Match credentials against current process creds. | 139 | * Match credentials against current process creds. |
| 128 | */ | 140 | */ |
| @@ -132,9 +144,12 @@ generic_match(struct auth_cred *acred, struct rpc_cred *cred, int flags) | |||
| 132 | struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base); | 144 | struct generic_cred *gcred = container_of(cred, struct generic_cred, gc_base); |
| 133 | int i; | 145 | int i; |
| 134 | 146 | ||
| 147 | if (acred->machine_cred) | ||
| 148 | return machine_cred_match(acred, gcred, flags); | ||
| 149 | |||
| 135 | if (gcred->acred.uid != acred->uid || | 150 | if (gcred->acred.uid != acred->uid || |
| 136 | gcred->acred.gid != acred->gid || | 151 | gcred->acred.gid != acred->gid || |
| 137 | gcred->acred.machine_cred != acred->machine_cred) | 152 | gcred->acred.machine_cred != 0) |
| 138 | goto out_nomatch; | 153 | goto out_nomatch; |
| 139 | 154 | ||
| 140 | /* Optimisation in the case where pointers are identical... */ | 155 | /* Optimisation in the case where pointers are identical... */ |
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index aad8fb699989..85d3bb7490aa 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -1918,7 +1918,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1918 | struct sk_buff *skb; | 1918 | struct sk_buff *skb; |
| 1919 | 1919 | ||
| 1920 | unix_state_lock(sk); | 1920 | unix_state_lock(sk); |
| 1921 | skb = skb_dequeue(&sk->sk_receive_queue); | 1921 | skb = skb_peek(&sk->sk_receive_queue); |
| 1922 | if (skb == NULL) { | 1922 | if (skb == NULL) { |
| 1923 | unix_sk(sk)->recursion_level = 0; | 1923 | unix_sk(sk)->recursion_level = 0; |
| 1924 | if (copied >= target) | 1924 | if (copied >= target) |
| @@ -1958,11 +1958,8 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1958 | if (check_creds) { | 1958 | if (check_creds) { |
| 1959 | /* Never glue messages from different writers */ | 1959 | /* Never glue messages from different writers */ |
| 1960 | if ((UNIXCB(skb).pid != siocb->scm->pid) || | 1960 | if ((UNIXCB(skb).pid != siocb->scm->pid) || |
| 1961 | (UNIXCB(skb).cred != siocb->scm->cred)) { | 1961 | (UNIXCB(skb).cred != siocb->scm->cred)) |
| 1962 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
| 1963 | sk->sk_data_ready(sk, skb->len); | ||
| 1964 | break; | 1962 | break; |
| 1965 | } | ||
| 1966 | } else { | 1963 | } else { |
| 1967 | /* Copy credentials */ | 1964 | /* Copy credentials */ |
| 1968 | scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred); | 1965 | scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred); |
| @@ -1977,8 +1974,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1977 | 1974 | ||
| 1978 | chunk = min_t(unsigned int, skb->len, size); | 1975 | chunk = min_t(unsigned int, skb->len, size); |
| 1979 | if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) { | 1976 | if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) { |
| 1980 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
| 1981 | sk->sk_data_ready(sk, skb->len); | ||
| 1982 | if (copied == 0) | 1977 | if (copied == 0) |
| 1983 | copied = -EFAULT; | 1978 | copied = -EFAULT; |
| 1984 | break; | 1979 | break; |
| @@ -1993,13 +1988,10 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 1993 | if (UNIXCB(skb).fp) | 1988 | if (UNIXCB(skb).fp) |
| 1994 | unix_detach_fds(siocb->scm, skb); | 1989 | unix_detach_fds(siocb->scm, skb); |
| 1995 | 1990 | ||
| 1996 | /* put the skb back if we didn't use it up.. */ | 1991 | if (skb->len) |
| 1997 | if (skb->len) { | ||
| 1998 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
| 1999 | sk->sk_data_ready(sk, skb->len); | ||
| 2000 | break; | 1992 | break; |
| 2001 | } | ||
| 2002 | 1993 | ||
| 1994 | skb_unlink(skb, &sk->sk_receive_queue); | ||
| 2003 | consume_skb(skb); | 1995 | consume_skb(skb); |
| 2004 | 1996 | ||
| 2005 | if (siocb->scm->fp) | 1997 | if (siocb->scm->fp) |
| @@ -2010,9 +2002,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
| 2010 | if (UNIXCB(skb).fp) | 2002 | if (UNIXCB(skb).fp) |
| 2011 | siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp); | 2003 | siocb->scm->fp = scm_fp_dup(UNIXCB(skb).fp); |
| 2012 | 2004 | ||
| 2013 | /* put message back and return */ | ||
| 2014 | skb_queue_head(&sk->sk_receive_queue, skb); | ||
| 2015 | sk->sk_data_ready(sk, skb->len); | ||
| 2016 | break; | 2005 | break; |
| 2017 | } | 2006 | } |
| 2018 | } while (size); | 2007 | } while (size); |
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index c0e14b3f2306..e8c969577768 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
| @@ -823,16 +823,6 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id, | |||
| 823 | } | 823 | } |
| 824 | ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry); | 824 | ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry); |
| 825 | 825 | ||
| 826 | /* Looks like: mcp:S */ | ||
| 827 | static int do_mcp_entry(const char *filename, struct mcp_device_id *id, | ||
| 828 | char *alias) | ||
| 829 | { | ||
| 830 | sprintf(alias, MCP_MODULE_PREFIX "%s", id->name); | ||
| 831 | |||
| 832 | return 1; | ||
| 833 | } | ||
| 834 | ADD_TO_DEVTABLE("mcp", struct mcp_device_id, do_mcp_entry); | ||
| 835 | |||
| 836 | static const struct dmifield { | 826 | static const struct dmifield { |
| 837 | const char *prefix; | 827 | const char *prefix; |
| 838 | int field; | 828 | int field; |
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index dac3633507c9..a68aed7fce02 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c | |||
| @@ -441,19 +441,22 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) | |||
| 441 | params = kmalloc(sizeof(*params), GFP_KERNEL); | 441 | params = kmalloc(sizeof(*params), GFP_KERNEL); |
| 442 | if (!params) | 442 | if (!params) |
| 443 | return -ENOMEM; | 443 | return -ENOMEM; |
| 444 | if (copy_from_user(params, (void __user *)arg, sizeof(*params))) | 444 | if (copy_from_user(params, (void __user *)arg, sizeof(*params))) { |
| 445 | return -EFAULT; | 445 | retval = -EFAULT; |
| 446 | goto out; | ||
| 447 | } | ||
| 446 | retval = snd_compr_allocate_buffer(stream, params); | 448 | retval = snd_compr_allocate_buffer(stream, params); |
| 447 | if (retval) { | 449 | if (retval) { |
| 448 | kfree(params); | 450 | retval = -ENOMEM; |
| 449 | return -ENOMEM; | 451 | goto out; |
| 450 | } | 452 | } |
| 451 | retval = stream->ops->set_params(stream, params); | 453 | retval = stream->ops->set_params(stream, params); |
| 452 | if (retval) | 454 | if (retval) |
| 453 | goto out; | 455 | goto out; |
| 454 | stream->runtime->state = SNDRV_PCM_STATE_SETUP; | 456 | stream->runtime->state = SNDRV_PCM_STATE_SETUP; |
| 455 | } else | 457 | } else { |
| 456 | return -EPERM; | 458 | return -EPERM; |
| 459 | } | ||
| 457 | out: | 460 | out: |
| 458 | kfree(params); | 461 | kfree(params); |
| 459 | return retval; | 462 | return retval; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c95c8bde12d0..0db1dc49382b 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -5586,6 +5586,7 @@ static const struct hda_amp_list alc861_loopbacks[] = { | |||
| 5586 | /* Pin config fixes */ | 5586 | /* Pin config fixes */ |
| 5587 | enum { | 5587 | enum { |
| 5588 | PINFIX_FSC_AMILO_PI1505, | 5588 | PINFIX_FSC_AMILO_PI1505, |
| 5589 | PINFIX_ASUS_A6RP, | ||
| 5589 | }; | 5590 | }; |
| 5590 | 5591 | ||
| 5591 | static const struct alc_fixup alc861_fixups[] = { | 5592 | static const struct alc_fixup alc861_fixups[] = { |
| @@ -5597,9 +5598,19 @@ static const struct alc_fixup alc861_fixups[] = { | |||
| 5597 | { } | 5598 | { } |
| 5598 | } | 5599 | } |
| 5599 | }, | 5600 | }, |
| 5601 | [PINFIX_ASUS_A6RP] = { | ||
| 5602 | .type = ALC_FIXUP_VERBS, | ||
| 5603 | .v.verbs = (const struct hda_verb[]) { | ||
| 5604 | /* node 0x0f VREF seems controlling the master output */ | ||
| 5605 | { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 }, | ||
| 5606 | { } | ||
| 5607 | }, | ||
| 5608 | }, | ||
| 5600 | }; | 5609 | }; |
| 5601 | 5610 | ||
| 5602 | static const struct snd_pci_quirk alc861_fixup_tbl[] = { | 5611 | static const struct snd_pci_quirk alc861_fixup_tbl[] = { |
| 5612 | SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP), | ||
| 5613 | SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP), | ||
| 5603 | SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505), | 5614 | SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505), |
| 5604 | {} | 5615 | {} |
| 5605 | }; | 5616 | }; |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 336cfcd324f9..948f0be2f4f3 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -4870,7 +4870,14 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity) | |||
| 4870 | /* BIOS bug: unfilled OEM string */ | 4870 | /* BIOS bug: unfilled OEM string */ |
| 4871 | if (strstr(dev->name, "HP_Mute_LED_P_G")) { | 4871 | if (strstr(dev->name, "HP_Mute_LED_P_G")) { |
| 4872 | set_hp_led_gpio(codec); | 4872 | set_hp_led_gpio(codec); |
| 4873 | spec->gpio_led_polarity = 1; | 4873 | switch (codec->subsystem_id) { |
| 4874 | case 0x103c148a: | ||
| 4875 | spec->gpio_led_polarity = 0; | ||
| 4876 | break; | ||
| 4877 | default: | ||
| 4878 | spec->gpio_led_polarity = 1; | ||
| 4879 | break; | ||
| 4880 | } | ||
| 4874 | return 1; | 4881 | return 1; |
| 4875 | } | 4882 | } |
| 4876 | } | 4883 | } |
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index e57b89e8aa89..94ab728f5ca8 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
| @@ -286,17 +286,22 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, | |||
| 286 | snd_card_free(card); | 286 | snd_card_free(card); |
| 287 | return err; | 287 | return err; |
| 288 | } | 288 | } |
| 289 | if ((err = snd_ymfpci_pcm_4ch(chip, 2, NULL)) < 0) { | 289 | err = snd_ymfpci_mixer(chip, rear_switch[dev]); |
| 290 | if (err < 0) { | ||
| 290 | snd_card_free(card); | 291 | snd_card_free(card); |
| 291 | return err; | 292 | return err; |
| 292 | } | 293 | } |
| 293 | if ((err = snd_ymfpci_pcm2(chip, 3, NULL)) < 0) { | 294 | if (chip->ac97->ext_id & AC97_EI_SDAC) { |
| 294 | snd_card_free(card); | 295 | err = snd_ymfpci_pcm_4ch(chip, 2, NULL); |
| 295 | return err; | 296 | if (err < 0) { |
| 296 | } | 297 | snd_card_free(card); |
| 297 | if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) { | 298 | return err; |
| 298 | snd_card_free(card); | 299 | } |
| 299 | return err; | 300 | err = snd_ymfpci_pcm2(chip, 3, NULL); |
| 301 | if (err < 0) { | ||
| 302 | snd_card_free(card); | ||
| 303 | return err; | ||
| 304 | } | ||
| 300 | } | 305 | } |
| 301 | if ((err = snd_ymfpci_timer(chip, 0)) < 0) { | 306 | if ((err = snd_ymfpci_timer(chip, 0)) < 0) { |
| 302 | snd_card_free(card); | 307 | snd_card_free(card); |
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 03ee4e365311..12a9a2b03387 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c | |||
| @@ -1614,6 +1614,14 @@ static int snd_ymfpci_put_dup4ch(struct snd_kcontrol *kcontrol, struct snd_ctl_e | |||
| 1614 | return change; | 1614 | return change; |
| 1615 | } | 1615 | } |
| 1616 | 1616 | ||
| 1617 | static struct snd_kcontrol_new snd_ymfpci_dup4ch __devinitdata = { | ||
| 1618 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 1619 | .name = "4ch Duplication", | ||
| 1620 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | ||
| 1621 | .info = snd_ymfpci_info_dup4ch, | ||
| 1622 | .get = snd_ymfpci_get_dup4ch, | ||
| 1623 | .put = snd_ymfpci_put_dup4ch, | ||
| 1624 | }; | ||
| 1617 | 1625 | ||
| 1618 | static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = { | 1626 | static struct snd_kcontrol_new snd_ymfpci_controls[] __devinitdata = { |
| 1619 | { | 1627 | { |
| @@ -1642,13 +1650,6 @@ YMFPCI_DOUBLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,VOLUME), 1, YDSXGR_SPDIFLOOPVOL), | |||
| 1642 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL, 0), | 1650 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL, 0), |
| 1643 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL, 0), | 1651 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL, 0), |
| 1644 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("Loop",NONE,NONE), 0, YDSXGR_SPDIFINCTRL, 4), | 1652 | YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("Loop",NONE,NONE), 0, YDSXGR_SPDIFINCTRL, 4), |
| 1645 | { | ||
| 1646 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | ||
| 1647 | .name = "4ch Duplication", | ||
| 1648 | .info = snd_ymfpci_info_dup4ch, | ||
| 1649 | .get = snd_ymfpci_get_dup4ch, | ||
| 1650 | .put = snd_ymfpci_put_dup4ch, | ||
| 1651 | }, | ||
| 1652 | }; | 1653 | }; |
| 1653 | 1654 | ||
| 1654 | 1655 | ||
| @@ -1838,6 +1839,12 @@ int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch) | |||
| 1838 | if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_ymfpci_controls[idx], chip))) < 0) | 1839 | if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snd_ymfpci_controls[idx], chip))) < 0) |
| 1839 | return err; | 1840 | return err; |
| 1840 | } | 1841 | } |
| 1842 | if (chip->ac97->ext_id & AC97_EI_SDAC) { | ||
| 1843 | kctl = snd_ctl_new1(&snd_ymfpci_dup4ch, chip); | ||
| 1844 | err = snd_ctl_add(chip->card, kctl); | ||
| 1845 | if (err < 0) | ||
| 1846 | return err; | ||
| 1847 | } | ||
| 1841 | 1848 | ||
| 1842 | /* add S/PDIF control */ | 1849 | /* add S/PDIF control */ |
| 1843 | if (snd_BUG_ON(!chip->pcm_spdif)) | 1850 | if (snd_BUG_ON(!chip->pcm_spdif)) |
diff --git a/tools/perf/bench/mem-memcpy-x86-64-asm.S b/tools/perf/bench/mem-memcpy-x86-64-asm.S index a20780bd0771..fcd9cf00600a 100644 --- a/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S | |||
| @@ -4,3 +4,9 @@ | |||
| 4 | #define Lmemcpy_c globl memcpy_c; memcpy_c | 4 | #define Lmemcpy_c globl memcpy_c; memcpy_c |
| 5 | #define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e | 5 | #define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e |
| 6 | #include "../../../arch/x86/lib/memcpy_64.S" | 6 | #include "../../../arch/x86/lib/memcpy_64.S" |
| 7 | /* | ||
| 8 | * We need to provide note.GNU-stack section, saying that we want | ||
| 9 | * NOT executable stack. Otherwise the final linking will assume that | ||
| 10 | * the ELF stack should not be restricted at all and set it RWX. | ||
| 11 | */ | ||
| 12 | .section .note.GNU-stack,"",@progbits | ||
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 73ddaf06b8e7..2044324b755a 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
| @@ -554,7 +554,7 @@ static int perf_event__process_kernel_mmap(struct perf_tool *tool __used, | |||
| 554 | 554 | ||
| 555 | is_kernel_mmap = memcmp(event->mmap.filename, | 555 | is_kernel_mmap = memcmp(event->mmap.filename, |
| 556 | kmmap_prefix, | 556 | kmmap_prefix, |
| 557 | strlen(kmmap_prefix)) == 0; | 557 | strlen(kmmap_prefix) - 1) == 0; |
| 558 | if (event->mmap.filename[0] == '/' || | 558 | if (event->mmap.filename[0] == '/' || |
| 559 | (!is_kernel_mmap && event->mmap.filename[0] == '[')) { | 559 | (!is_kernel_mmap && event->mmap.filename[0] == '[')) { |
| 560 | 560 | ||
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index dcfefab53e00..9a11f9edac12 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
| @@ -463,6 +463,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, | |||
| 463 | memset(data, 0, sizeof(*data)); | 463 | memset(data, 0, sizeof(*data)); |
| 464 | data->cpu = data->pid = data->tid = -1; | 464 | data->cpu = data->pid = data->tid = -1; |
| 465 | data->stream_id = data->id = data->time = -1ULL; | 465 | data->stream_id = data->id = data->time = -1ULL; |
| 466 | data->period = 1; | ||
| 466 | 467 | ||
| 467 | if (event->header.type != PERF_RECORD_SAMPLE) { | 468 | if (event->header.type != PERF_RECORD_SAMPLE) { |
| 468 | if (!sample_id_all) | 469 | if (!sample_id_all) |