This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next so that everyone can sync up properly.
Unified · Split
| @@ -111,6 +111,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> · 110 unmodified lines | |||
| 111 | Uwe Kleine-König <ukl@pengutronix.de> | 111 | Uwe Kleine-König <ukl@pengutronix.de> |
| 112 | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> | 112 | Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> |
| 113 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> | 113 | Valdis Kletnieks <Valdis.Kletnieks@vt.edu> |
| 114 | Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com> | ||
| 114 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> | 115 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> |
| 115 | Yusuke Goda <goda.yusuke@renesas.com> | 116 | Yusuke Goda <goda.yusuke@renesas.com> |
| 116 | Gustavo Padovan <gustavo@las.ic.unicamp.br> | 117 | Gustavo Padovan <gustavo@las.ic.unicamp.br> |
| @@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale · 218 unmodified lines | |||
| 219 | What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale | 219 | What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale |
| 220 | What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale | 220 | What: /sys/bus/iio/devices/iio:deviceX/in_voltage_scale |
| 221 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale | 221 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_scale |
| 222 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale | ||
| 222 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale | 223 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale |
| 223 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale | 224 | What: /sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale |
| 224 | What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale | 225 | What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_scale |
| @@ -273,6 +274,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available · 48 unmodified lines | |||
| 273 | What: /sys/.../iio:deviceX/in_voltageX_scale_available | 274 | What: /sys/.../iio:deviceX/in_voltageX_scale_available |
| 274 | What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available | 275 | What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available |
| 275 | What: /sys/.../iio:deviceX/out_voltageX_scale_available | 276 | What: /sys/.../iio:deviceX/out_voltageX_scale_available |
| 277 | What: /sys/.../iio:deviceX/out_altvoltageX_scale_available | ||
| 276 | What: /sys/.../iio:deviceX/in_capacitance_scale_available | 278 | What: /sys/.../iio:deviceX/in_capacitance_scale_available |
| 277 | KernelVersion: 2.635 | 279 | KernelVersion: 2.635 |
| 278 | Contact: linux-iio@vger.kernel.org | 280 | Contact: linux-iio@vger.kernel.org |
| @@ -298,14 +300,19 @@ Description: · 19 unmodified lines | |||
| 298 | gives the 3dB frequency of the filter in Hz. | 300 | gives the 3dB frequency of the filter in Hz. |
| 299 | 301 | ||
| 300 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw | 302 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw |
| 303 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw | ||
| 301 | KernelVersion: 2.6.37 | 304 | KernelVersion: 2.6.37 |
| 302 | Contact: linux-iio@vger.kernel.org | 305 | Contact: linux-iio@vger.kernel.org |
| 303 | Description: | 306 | Description: |
| 304 | Raw (unscaled, no bias etc.) output voltage for | 307 | Raw (unscaled, no bias etc.) output voltage for |
| 305 | channel Y. The number must always be specified and | 308 | channel Y. The number must always be specified and |
| 306 | unique if the output corresponds to a single channel. | 309 | unique if the output corresponds to a single channel. |
| 310 | While DAC like devices typically use out_voltage, | ||
| 311 | a continuous frequency generating device, such as | ||
| 312 | a DDS or PLL should use out_altvoltage. | ||
| 307 | 313 | ||
| 308 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw | 314 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw |
| 315 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw | ||
| 309 | KernelVersion: 2.6.37 | 316 | KernelVersion: 2.6.37 |
| 310 | Contact: linux-iio@vger.kernel.org | 317 | Contact: linux-iio@vger.kernel.org |
| 311 | Description: | 318 | Description: |
| @@ -316,6 +323,8 @@ Description: · 4 unmodified lines | |||
| 316 | 323 | ||
| 317 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode | 324 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode |
| 318 | What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode | 325 | What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode |
| 326 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode | ||
| 327 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode | ||
| 319 | KernelVersion: 2.6.38 | 328 | KernelVersion: 2.6.38 |
| 320 | Contact: linux-iio@vger.kernel.org | 329 | Contact: linux-iio@vger.kernel.org |
| 321 | Description: | 330 | Description: |
| @@ -330,6 +339,8 @@ Description: · 8 unmodified lines | |||
| 330 | 339 | ||
| 331 | What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available | 340 | What: /sys/.../iio:deviceX/out_votlageY_powerdown_mode_available |
| 332 | What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available | 341 | What: /sys/.../iio:deviceX/out_voltage_powerdown_mode_available |
| 342 | What: /sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available | ||
| 343 | What: /sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available | ||
| 333 | KernelVersion: 2.6.38 | 344 | KernelVersion: 2.6.38 |
| 334 | Contact: linux-iio@vger.kernel.org | 345 | Contact: linux-iio@vger.kernel.org |
| 335 | Description: | 346 | Description: |
| @@ -338,6 +349,8 @@ Description: · 2 unmodified lines | |||
| 338 | 349 | ||
| 339 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown | 350 | What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown |
| 340 | What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown | 351 | What: /sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown |
| 352 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown | ||
| 353 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown | ||
| 341 | KernelVersion: 2.6.38 | 354 | KernelVersion: 2.6.38 |
| 342 | Contact: linux-iio@vger.kernel.org | 355 | Contact: linux-iio@vger.kernel.org |
| 343 | Description: | 356 | Description: |
| @@ -346,6 +359,24 @@ Description: · 2 unmodified lines | |||
| 346 | normal operation. Y may be suppressed if all outputs are | 359 | normal operation. Y may be suppressed if all outputs are |
| 347 | controlled together. | 360 | controlled together. |
| 348 | 361 | ||
| 362 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency | ||
| 363 | KernelVersion: 3.4.0 | ||
| 364 | Contact: linux-iio@vger.kernel.org | ||
| 365 | Description: | ||
| 366 | Output frequency for channel Y in Hz. The number must always be | ||
| 367 | specified and unique if the output corresponds to a single | ||
| 368 | channel. | ||
| 369 | |||
| 370 | What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase | ||
| 371 | KernelVersion: 3.4.0 | ||
| 372 | Contact: linux-iio@vger.kernel.org | ||
| 373 | Description: | ||
| 374 | Phase in radians of one frequency/clock output Y | ||
| 375 | (out_altvoltageY) relative to another frequency/clock output | ||
| 376 | (out_altvoltageZ) of the device X. The number must always be | ||
| 377 | specified and unique if the output corresponds to a single | ||
| 378 | channel. | ||
| 379 | |||
| 349 | What: /sys/bus/iio/devices/iio:deviceX/events | 380 | What: /sys/bus/iio/devices/iio:deviceX/events |
| 350 | KernelVersion: 2.6.35 | 381 | KernelVersion: 2.6.35 |
| 351 | Contact: linux-iio@vger.kernel.org | 382 | Contact: linux-iio@vger.kernel.org |
| @@ -60,4 +60,4 @@ Introduction · 59 unmodified lines | |||
| 60 | Document Author | 60 | Document Author |
| 61 | --------------- | 61 | --------------- |
| 62 | 62 | ||
| 63 | Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics | 63 | Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics |
| @@ -6,7 +6,9 @@ Supported chips: · 5 unmodified lines | |||
| 6 | Prefix: 'coretemp' | 6 | Prefix: 'coretemp' |
| 7 | CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm), | 7 | CPUID: family 0x6, models 0xe (Pentium M DC), 0xf (Core 2 DC 65nm), |
| 8 | 0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm), | 8 | 0x16 (Core 2 SC 65nm), 0x17 (Penryn 45nm), |
| 9 | 0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield) | 9 | 0x1a (Nehalem), 0x1c (Atom), 0x1e (Lynnfield), |
| 10 | 0x26 (Tunnel Creek Atom), 0x27 (Medfield Atom), | ||
| 11 | 0x36 (Cedar Trail Atom) | ||
| 10 | Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual | 12 | Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual |
| 11 | Volume 3A: System Programming Guide | 13 | Volume 3A: System Programming Guide |
| 12 | http://softwarecommunity.intel.com/Wiki/Mobility/720.htm | 14 | http://softwarecommunity.intel.com/Wiki/Mobility/720.htm |
| @@ -52,6 +54,17 @@ Some information comes from ark.intel.com · 39 unmodified lines | |||
| 52 | 54 | ||
| 53 | Process Processor TjMax(C) | 55 | Process Processor TjMax(C) |
| 54 | 56 | ||
| 57 | 22nm Core i5/i7 Processors | ||
| 58 | i7 3920XM, 3820QM, 3720QM, 3667U, 3520M 105 | ||
| 59 | i5 3427U, 3360M/3320M 105 | ||
| 60 | i7 3770/3770K 105 | ||
| 61 | i5 3570/3570K, 3550, 3470/3450 105 | ||
| 62 | i7 3770S 103 | ||
| 63 | i5 3570S/3550S, 3475S/3470S/3450S 103 | ||
| 64 | i7 3770T 94 | ||
| 65 | i5 3570T 94 | ||
| 66 | i5 3470T 91 | ||
| 67 | |||
| 55 | 32nm Core i3/i5/i7 Processors | 68 | 32nm Core i3/i5/i7 Processors |
| 56 | i7 660UM/640/620, 640LM/620, 620M, 610E 105 | 69 | i7 660UM/640/620, 640LM/620, 620M, 610E 105 |
| 57 | i5 540UM/520/430, 540M/520/450/430 105 | 70 | i5 540UM/520/430, 540M/520/450/430 105 |
| @@ -65,6 +78,11 @@ Process Processor TjMax(C) · 7 unmodified lines | |||
| 65 | U3400 105 | 78 | U3400 105 |
| 66 | P4505/P4500 90 | 79 | P4505/P4500 90 |
| 67 | 80 | ||
| 81 | 32nm Atom Processors | ||
| 82 | Z2460 90 | ||
| 83 | D2700/2550/2500 100 | ||
| 84 | N2850/2800/2650/2600 100 | ||
| 85 | |||
| 68 | 45nm Xeon Processors 5400 Quad-Core | 86 | 45nm Xeon Processors 5400 Quad-Core |
| 69 | X5492, X5482, X5472, X5470, X5460, X5450 85 | 87 | X5492, X5482, X5472, X5470, X5460, X5450 85 |
| 70 | E5472, E5462, E5450/40/30/20/10/05 85 | 88 | E5472, E5462, E5450/40/30/20/10/05 85 |
| @@ -85,6 +103,8 @@ Process Processor TjMax(C) · 14 unmodified lines | |||
| 85 | N475/470/455/450 100 | 103 | N475/470/455/450 100 |
| 86 | N280/270 90 | 104 | N280/270 90 |
| 87 | 330/230 125 | 105 | 330/230 125 |
| 106 | E680/660/640/620 90 | ||
| 107 | E680T/660T/640T/620T 110 | ||
| 88 | 108 | ||
| 89 | 45nm Core2 Processors | 109 | 45nm Core2 Processors |
| 90 | Solo ULV SU3500/3300 100 | 110 | Solo ULV SU3500/3300 100 |
| @@ -579,7 +579,7 @@ F: drivers/net/appletalk/ · 578 unmodified lines | |||
| 579 | F: net/appletalk/ | 579 | F: net/appletalk/ |
| 580 | 580 | ||
| 581 | ARASAN COMPACT FLASH PATA CONTROLLER | 581 | ARASAN COMPACT FLASH PATA CONTROLLER |
| 582 | M: Viresh Kumar <viresh.kumar@st.com> | 582 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 583 | L: linux-ide@vger.kernel.org | 583 | L: linux-ide@vger.kernel.org |
| 584 | S: Maintained | 584 | S: Maintained |
| 585 | F: include/linux/pata_arasan_cf_data.h | 585 | F: include/linux/pata_arasan_cf_data.h |
| @@ -5296,7 +5296,7 @@ S: Maintained · 4710 unmodified lines | |||
| 5296 | F: drivers/pinctrl/ | 5296 | F: drivers/pinctrl/ |
| 5297 | 5297 | ||
| 5298 | PIN CONTROLLER - ST SPEAR | 5298 | PIN CONTROLLER - ST SPEAR |
| 5299 | M: Viresh Kumar <viresh.kumar@st.com> | 5299 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 5300 | L: spear-devel@list.st.com | 5300 | L: spear-devel@list.st.com |
| 5301 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 5301 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 5302 | W: http://www.st.com/spear | 5302 | W: http://www.st.com/spear |
| @@ -5873,7 +5873,7 @@ S: Maintained · 570 unmodified lines | |||
| 5873 | F: drivers/tty/serial | 5873 | F: drivers/tty/serial |
| 5874 | 5874 | ||
| 5875 | SYNOPSYS DESIGNWARE DMAC DRIVER | 5875 | SYNOPSYS DESIGNWARE DMAC DRIVER |
| 5876 | M: Viresh Kumar <viresh.kumar@st.com> | 5876 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 5877 | S: Maintained | 5877 | S: Maintained |
| 5878 | F: include/linux/dw_dmac.h | 5878 | F: include/linux/dw_dmac.h |
| 5879 | F: drivers/dma/dw_dmac_regs.h | 5879 | F: drivers/dma/dw_dmac_regs.h |
| @@ -6021,7 +6021,7 @@ S: Maintained · 141 unmodified lines | |||
| 6021 | F: drivers/mmc/host/sdhci-s3c.c | 6021 | F: drivers/mmc/host/sdhci-s3c.c |
| 6022 | 6022 | ||
| 6023 | SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER | 6023 | SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER |
| 6024 | M: Viresh Kumar <viresh.kumar@st.com> | 6024 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6025 | L: spear-devel@list.st.com | 6025 | L: spear-devel@list.st.com |
| 6026 | L: linux-mmc@vger.kernel.org | 6026 | L: linux-mmc@vger.kernel.org |
| 6027 | S: Maintained | 6027 | S: Maintained |
| @@ -6377,7 +6377,7 @@ S: Maintained · 349 unmodified lines | |||
| 6377 | F: include/linux/compiler.h | 6377 | F: include/linux/compiler.h |
| 6378 | 6378 | ||
| 6379 | SPEAR PLATFORM SUPPORT | 6379 | SPEAR PLATFORM SUPPORT |
| 6380 | M: Viresh Kumar <viresh.kumar@st.com> | 6380 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6381 | M: Shiraz Hashim <shiraz.hashim@st.com> | 6381 | M: Shiraz Hashim <shiraz.hashim@st.com> |
| 6382 | L: spear-devel@list.st.com | 6382 | L: spear-devel@list.st.com |
| 6383 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 6383 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| @@ -6386,7 +6386,7 @@ S: Maintained · 2 unmodified lines | |||
| 6386 | F: arch/arm/plat-spear/ | 6386 | F: arch/arm/plat-spear/ |
| 6387 | 6387 | ||
| 6388 | SPEAR13XX MACHINE SUPPORT | 6388 | SPEAR13XX MACHINE SUPPORT |
| 6389 | M: Viresh Kumar <viresh.kumar@st.com> | 6389 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6390 | M: Shiraz Hashim <shiraz.hashim@st.com> | 6390 | M: Shiraz Hashim <shiraz.hashim@st.com> |
| 6391 | L: spear-devel@list.st.com | 6391 | L: spear-devel@list.st.com |
| 6392 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 6392 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| @@ -6395,7 +6395,7 @@ S: Maintained · 2 unmodified lines | |||
| 6395 | F: arch/arm/mach-spear13xx/ | 6395 | F: arch/arm/mach-spear13xx/ |
| 6396 | 6396 | ||
| 6397 | SPEAR3XX MACHINE SUPPORT | 6397 | SPEAR3XX MACHINE SUPPORT |
| 6398 | M: Viresh Kumar <viresh.kumar@st.com> | 6398 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6399 | M: Shiraz Hashim <shiraz.hashim@st.com> | 6399 | M: Shiraz Hashim <shiraz.hashim@st.com> |
| 6400 | L: spear-devel@list.st.com | 6400 | L: spear-devel@list.st.com |
| 6401 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 6401 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| @@ -6406,7 +6406,7 @@ F: arch/arm/mach-spear3xx/ · 4 unmodified lines | |||
| 6406 | SPEAR6XX MACHINE SUPPORT | 6406 | SPEAR6XX MACHINE SUPPORT |
| 6407 | M: Rajeev Kumar <rajeev-dlh.kumar@st.com> | 6407 | M: Rajeev Kumar <rajeev-dlh.kumar@st.com> |
| 6408 | M: Shiraz Hashim <shiraz.hashim@st.com> | 6408 | M: Shiraz Hashim <shiraz.hashim@st.com> |
| 6409 | M: Viresh Kumar <viresh.kumar@st.com> | 6409 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6410 | L: spear-devel@list.st.com | 6410 | L: spear-devel@list.st.com |
| 6411 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 6411 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 6412 | W: http://www.st.com/spear | 6412 | W: http://www.st.com/spear |
| @@ -6414,7 +6414,7 @@ S: Maintained · 1 unmodified line | |||
| 6414 | F: arch/arm/mach-spear6xx/ | 6414 | F: arch/arm/mach-spear6xx/ |
| 6415 | 6415 | ||
| 6416 | SPEAR CLOCK FRAMEWORK SUPPORT | 6416 | SPEAR CLOCK FRAMEWORK SUPPORT |
| 6417 | M: Viresh Kumar <viresh.kumar@st.com> | 6417 | M: Viresh Kumar <viresh.linux@gmail.com> |
| 6418 | L: spear-devel@list.st.com | 6418 | L: spear-devel@list.st.com |
| 6419 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 6419 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 6420 | W: http://www.st.com/spear | 6420 | W: http://www.st.com/spear |
| @@ -7421,7 +7421,7 @@ F: include/linux/vlynq.h · 1000 unmodified lines | |||
| 7421 | 7421 | ||
| 7422 | VME SUBSYSTEM | 7422 | VME SUBSYSTEM |
| 7423 | M: Martyn Welch <martyn.welch@ge.com> | 7423 | M: Martyn Welch <martyn.welch@ge.com> |
| 7424 | M: Manohar Vanga <manohar.vanga@cern.ch> | 7424 | M: Manohar Vanga <manohar.vanga@gmail.com> |
| 7425 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 7425 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 7426 | L: devel@driverdev.osuosl.org | 7426 | L: devel@driverdev.osuosl.org |
| 7427 | S: Maintained | 7427 | S: Maintained |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 5 | 2 | PATCHLEVEL = 5 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc3 | 4 | EXTRAVERSION = -rc4 |
| 5 | NAME = Saber-toothed Squirrel | 5 | NAME = Saber-toothed Squirrel |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -561,6 +561,8 @@ else · 553 unmodified lines | |||
| 561 | KBUILD_CFLAGS += -O2 | 561 | KBUILD_CFLAGS += -O2 |
| 562 | endif | 562 | endif |
| 563 | 563 | ||
| 564 | include $(srctree)/arch/$(SRCARCH)/Makefile | ||
| 565 | |||
| 564 | ifdef CONFIG_READABLE_ASM | 566 | ifdef CONFIG_READABLE_ASM |
| 565 | # Disable optimizations that make assembler listings hard to read. | 567 | # Disable optimizations that make assembler listings hard to read. |
| 566 | # reorder blocks reorders the control in the function | 568 | # reorder blocks reorders the control in the function |
| @@ -571,8 +573,6 @@ KBUILD_CFLAGS += $(call cc-option,-fno-reorder-blocks,) \ · 4 unmodified lines | |||
| 571 | $(call cc-option,-fno-partial-inlining) | 573 | $(call cc-option,-fno-partial-inlining) |
| 572 | endif | 574 | endif |
| 573 | 575 | ||
| 574 | include $(srctree)/arch/$(SRCARCH)/Makefile | ||
| 575 | |||
| 576 | ifneq ($(CONFIG_FRAME_WARN),0) | 576 | ifneq ($(CONFIG_FRAME_WARN),0) |
| 577 | KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) | 577 | KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN}) |
| 578 | endif | 578 | endif |
| @@ -293,6 +293,7 @@ config ARCH_VERSATILE · 292 unmodified lines | |||
| 293 | select ICST | 293 | select ICST |
| 294 | select GENERIC_CLOCKEVENTS | 294 | select GENERIC_CLOCKEVENTS |
| 295 | select ARCH_WANT_OPTIONAL_GPIOLIB | 295 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 296 | select NEED_MACH_IO_H if PCI | ||
| 296 | select PLAT_VERSATILE | 297 | select PLAT_VERSATILE |
| 297 | select PLAT_VERSATILE_CLCD | 298 | select PLAT_VERSATILE_CLCD |
| 298 | select PLAT_VERSATILE_FPGA_IRQ | 299 | select PLAT_VERSATILE_FPGA_IRQ |
| @@ -588,6 +589,7 @@ config ARCH_ORION5X · 289 unmodified lines | |||
| 588 | select PCI | 589 | select PCI |
| 589 | select ARCH_REQUIRE_GPIOLIB | 590 | select ARCH_REQUIRE_GPIOLIB |
| 590 | select GENERIC_CLOCKEVENTS | 591 | select GENERIC_CLOCKEVENTS |
| 592 | select NEED_MACH_IO_H | ||
| 591 | select PLAT_ORION | 593 | select PLAT_ORION |
| 592 | help | 594 | help |
| 593 | Support for the following Marvell Orion 5x series SoCs: | 595 | Support for the following Marvell Orion 5x series SoCs: |
| @@ -11,7 +11,7 @@ · 10 unmodified lines | |||
| 11 | /include/ "mmp2.dtsi" | 11 | /include/ "mmp2.dtsi" |
| 12 | 12 | ||
| 13 | / { | 13 | / { |
| 14 | model = "Marvell MMP2 Aspenite Development Board"; | 14 | model = "Marvell MMP2 Brownstone Development Board"; |
| 15 | compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; | 15 | compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; |
| 16 | 16 | ||
| 17 | chosen { | 17 | chosen { |
| @@ -19,7 +19,7 @@ · 1 unmodified line | |||
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | memory { | 21 | memory { |
| 22 | reg = <0x00000000 0x04000000>; | 22 | reg = <0x00000000 0x08000000>; |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | soc { | 25 | soc { |
| @@ -44,6 +44,8 @@ · 43 unmodified lines | |||
| 44 | compatible = "ti,omap2-intc"; | 44 | compatible = "ti,omap2-intc"; |
| 45 | interrupt-controller; | 45 | interrupt-controller; |
| 46 | #interrupt-cells = <1>; | 46 | #interrupt-cells = <1>; |
| 47 | ti,intc-size = <96>; | ||
| 48 | reg = <0x480FE000 0x1000>; | ||
| 47 | }; | 49 | }; |
| 48 | 50 | ||
| 49 | uart1: serial@4806a000 { | 51 | uart1: serial@4806a000 { |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr1310 Evaluation Baord | 2 | * DTS file for SPEAr1310 Evaluation Baord |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for all SPEAr1310 SoCs | 2 | * DTS file for all SPEAr1310 SoCs |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr1340 Evaluation Baord | 2 | * DTS file for SPEAr1340 Evaluation Baord |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for all SPEAr1340 SoCs | 2 | * DTS file for all SPEAr1340 SoCs |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for all SPEAr13xx SoCs | 2 | * DTS file for all SPEAr13xx SoCs |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr300 Evaluation Baord | 2 | * DTS file for SPEAr300 Evaluation Baord |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr300 SoC | 2 | * DTS file for SPEAr300 SoC |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr310 Evaluation Baord | 2 | * DTS file for SPEAr310 Evaluation Baord |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr310 SoC | 2 | * DTS file for SPEAr310 SoC |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr320 Evaluation Baord | 2 | * DTS file for SPEAr320 Evaluation Baord |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for SPEAr320 SoC | 2 | * DTS file for SPEAr320 SoC |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * DTS file for all SPEAr3xx SoCs | 2 | * DTS file for all SPEAr3xx SoCs |
| 3 | * | 3 | * |
| 4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
| 5 | * | 5 | * |
| 6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
| 7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
| @@ -19,6 +19,7 @@ · 18 unmodified lines | |||
| 19 | " .long 1b, 4f, 2b, 4f\n" \ | 19 | " .long 1b, 4f, 2b, 4f\n" \ |
| 20 | " .popsection\n" \ | 20 | " .popsection\n" \ |
| 21 | " .pushsection .fixup,\"ax\"\n" \ | 21 | " .pushsection .fixup,\"ax\"\n" \ |
| 22 | " .align 2\n" \ | ||
| 22 | "4: mov %0, " err_reg "\n" \ | 23 | "4: mov %0, " err_reg "\n" \ |
| 23 | " b 3b\n" \ | 24 | " b 3b\n" \ |
| 24 | " .popsection" | 25 | " .popsection" |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * ARM PrimeXsys System Controller SP810 header file | 4 | * ARM PrimeXsys System Controller SP810 header file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -495,6 +495,7 @@ ENDPROC(__und_usr) · 494 unmodified lines | |||
| 495 | * The out of line fixup for the ldrt above. | 495 | * The out of line fixup for the ldrt above. |
| 496 | */ | 496 | */ |
| 497 | .pushsection .fixup, "ax" | 497 | .pushsection .fixup, "ax" |
| 498 | .align 2 | ||
| 498 | 4: mov pc, r9 | 499 | 4: mov pc, r9 |
| 499 | .popsection | 500 | .popsection |
| 500 | .pushsection __ex_table,"a" | 501 | .pushsection __ex_table,"a" |
| @@ -660,7 +660,7 @@ static const union decode_item t32_table_1111_100x[] = { · 659 unmodified lines | |||
| 660 | /* LDRSB (literal) 1111 1001 x001 1111 xxxx xxxx xxxx xxxx */ | 660 | /* LDRSB (literal) 1111 1001 x001 1111 xxxx xxxx xxxx xxxx */ |
| 661 | /* LDRH (literal) 1111 1000 x011 1111 xxxx xxxx xxxx xxxx */ | 661 | /* LDRH (literal) 1111 1000 x011 1111 xxxx xxxx xxxx xxxx */ |
| 662 | /* LDRSH (literal) 1111 1001 x011 1111 xxxx xxxx xxxx xxxx */ | 662 | /* LDRSH (literal) 1111 1001 x011 1111 xxxx xxxx xxxx xxxx */ |
| 663 | DECODE_EMULATEX (0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal, | 663 | DECODE_SIMULATEX(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal, |
| 664 | REGS(PC, NOSPPCX, 0, 0, 0)), | 664 | REGS(PC, NOSPPCX, 0, 0, 0)), |
| 665 | 665 | ||
| 666 | /* STRB (immediate) 1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */ | 666 | /* STRB (immediate) 1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */ |
| @@ -1,4 +1,8 @@ | |||
| 1 | obj-y := clock.o highbank.o system.o | 1 | obj-y := clock.o highbank.o system.o smc.o |
| 2 | |||
| 3 | plus_sec := $(call as-instr,.arch_extension sec,+sec) | ||
| 4 | AFLAGS_smc.o :=-Wa,-march=armv7-a$(plus_sec) | ||
| 5 | |||
| 2 | obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o | 6 | obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o |
| 3 | obj-$(CONFIG_SMP) += platsmp.o | 7 | obj-$(CONFIG_SMP) += platsmp.o |
| 4 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o | 8 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |
| @@ -8,3 +8,4 @@ extern void highbank_lluart_map_io(void); · 7 unmodified lines | |||
| 8 | static inline void highbank_lluart_map_io(void) {} | 8 | static inline void highbank_lluart_map_io(void) {} |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | extern void highbank_smc1(int fn, int arg); | ||
| @@ -85,10 +85,24 @@ const static struct of_device_id irq_match[] = { · 84 unmodified lines | |||
| 85 | {} | 85 | {} |
| 86 | }; | 86 | }; |
| 87 | 87 | ||
| 88 | #ifdef CONFIG_CACHE_L2X0 | ||
| 89 | static void highbank_l2x0_disable(void) | ||
| 90 | { | ||
| 91 | /* Disable PL310 L2 Cache controller */ | ||
| 92 | highbank_smc1(0x102, 0x0); | ||
| 93 | } | ||
| 94 | #endif | ||
| 95 | |||
| 88 | static void __init highbank_init_irq(void) | 96 | static void __init highbank_init_irq(void) |
| 89 | { | 97 | { |
| 90 | of_irq_init(irq_match); | 98 | of_irq_init(irq_match); |
| 99 | |||
| 100 | #ifdef CONFIG_CACHE_L2X0 | ||
| 101 | /* Enable PL310 L2 Cache controller */ | ||
| 102 | highbank_smc1(0x102, 0x1); | ||
| 91 | l2x0_of_init(0, ~0UL); | 103 | l2x0_of_init(0, ~0UL); |
| 104 | outer_cache.disable = highbank_l2x0_disable; | ||
| 105 | #endif | ||
| 92 | } | 106 | } |
| 93 | 107 | ||
| 94 | static void __init highbank_timer_init(void) | 108 | static void __init highbank_timer_init(void) |
| @@ -0,0 +1,27 @@ | |||
| 1 | /* | ||
| 2 | * Copied from omap44xx-smc.S Copyright (C) 2010 Texas Instruments, Inc. | ||
| 3 | * Copyright 2012 Calxeda, Inc. | ||
| 4 | * | ||
| 5 | * This program is free software,you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundation. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #include <linux/linkage.h> | ||
| 11 | |||
| 12 | /* | ||
| 13 | * This is common routine to manage secure monitor API | ||
| 14 | * used to modify the PL310 secure registers. | ||
| 15 | * 'r0' contains the value to be modified and 'r12' contains | ||
| 16 | * the monitor API number. | ||
| 17 | * Function signature : void highbank_smc1(u32 fn, u32 arg) | ||
| 18 | */ | ||
| 19 | |||
| 20 | ENTRY(highbank_smc1) | ||
| 21 | stmfd sp!, {r4-r11, lr} | ||
| 22 | mov r12, r0 | ||
| 23 | mov r0, r1 | ||
| 24 | dsb | ||
| 25 | smc #0 | ||
| 26 | ldmfd sp!, {r4-r11, pc} | ||
| 27 | ENDPROC(highbank_smc1) | ||
| @@ -477,6 +477,7 @@ config MACH_MX31_3DS · 476 unmodified lines | |||
| 477 | select IMX_HAVE_PLATFORM_IMX2_WDT | 477 | select IMX_HAVE_PLATFORM_IMX2_WDT |
| 478 | select IMX_HAVE_PLATFORM_IMX_I2C | 478 | select IMX_HAVE_PLATFORM_IMX_I2C |
| 479 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | 479 | select IMX_HAVE_PLATFORM_IMX_KEYPAD |
| 480 | select IMX_HAVE_PLATFORM_IMX_SSI | ||
| 480 | select IMX_HAVE_PLATFORM_IMX_UART | 481 | select IMX_HAVE_PLATFORM_IMX_UART |
| 481 | select IMX_HAVE_PLATFORM_IPU_CORE | 482 | select IMX_HAVE_PLATFORM_IPU_CORE |
| 482 | select IMX_HAVE_PLATFORM_MXC_EHCI | 483 | select IMX_HAVE_PLATFORM_MXC_EHCI |
| @@ -108,8 +108,7 @@ int __init mx1_clocks_init(unsigned long fref) · 107 unmodified lines | |||
| 108 | clk_register_clkdev(clk[clk32], NULL, "mxc_rtc.0"); | 108 | clk_register_clkdev(clk[clk32], NULL, "mxc_rtc.0"); |
| 109 | clk_register_clkdev(clk[clko], "clko", NULL); | 109 | clk_register_clkdev(clk[clko], "clko", NULL); |
| 110 | 110 | ||
| 111 | mxc_timer_init(NULL, MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), | 111 | mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT); |
| 112 | MX1_TIM1_INT); | ||
| 113 | 112 | ||
| 114 | return 0; | 113 | return 0; |
| 115 | } | 114 | } |
| @@ -180,7 +180,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) · 179 unmodified lines | |||
| 180 | clk_register_clkdev(clk[sdhc1_ipg_gate], "sdhc1", NULL); | 180 | clk_register_clkdev(clk[sdhc1_ipg_gate], "sdhc1", NULL); |
| 181 | clk_register_clkdev(clk[sdhc2_ipg_gate], "sdhc2", NULL); | 181 | clk_register_clkdev(clk[sdhc2_ipg_gate], "sdhc2", NULL); |
| 182 | 182 | ||
| 183 | mxc_timer_init(NULL, MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), | 183 | mxc_timer_init(MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), MX21_INT_GPT1); |
| 184 | MX21_INT_GPT1); | 184 | |
| 185 | return 0; | 185 | return 0; |
| 186 | } | 186 | } |
| @@ -243,6 +243,6 @@ int __init mx25_clocks_init(void) · 242 unmodified lines | |||
| 243 | clk_register_clkdev(clk[sdma_ahb], "ahb", "imx35-sdma"); | 243 | clk_register_clkdev(clk[sdma_ahb], "ahb", "imx35-sdma"); |
| 244 | clk_register_clkdev(clk[iim_ipg], "iim", NULL); | 244 | clk_register_clkdev(clk[iim_ipg], "iim", NULL); |
| 245 | 245 | ||
| 246 | mxc_timer_init(NULL, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54); | 246 | mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54); |
| 247 | return 0; | 247 | return 0; |
| 248 | } | 248 | } |
| @@ -263,8 +263,7 @@ int __init mx27_clocks_init(unsigned long fref) · 262 unmodified lines | |||
| 263 | clk_register_clkdev(clk[ssi1_baud_gate], "bitrate" , "imx-ssi.0"); | 263 | clk_register_clkdev(clk[ssi1_baud_gate], "bitrate" , "imx-ssi.0"); |
| 264 | clk_register_clkdev(clk[ssi2_baud_gate], "bitrate" , "imx-ssi.1"); | 264 | clk_register_clkdev(clk[ssi2_baud_gate], "bitrate" , "imx-ssi.1"); |
| 265 | 265 | ||
| 266 | mxc_timer_init(NULL, MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), | 266 | mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1); |
| 267 | MX27_INT_GPT1); | ||
| 268 | 267 | ||
| 269 | clk_prepare_enable(clk[emi_ahb_gate]); | 268 | clk_prepare_enable(clk[emi_ahb_gate]); |
| 270 | 269 | ||
| @@ -175,8 +175,7 @@ int __init mx31_clocks_init(unsigned long fref) · 174 unmodified lines | |||
| 175 | mx31_revision(); | 175 | mx31_revision(); |
| 176 | clk_disable_unprepare(clk[iim_gate]); | 176 | clk_disable_unprepare(clk[iim_gate]); |
| 177 | 177 | ||
| 178 | mxc_timer_init(NULL, MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR), | 178 | mxc_timer_init(MX31_IO_ADDRESS(MX31_GPT1_BASE_ADDR), MX31_INT_GPT); |
| 179 | MX31_INT_GPT); | ||
| 180 | 179 | ||
| 181 | return 0; | 180 | return 0; |
| 182 | } | 181 | } |
| @@ -267,11 +267,9 @@ int __init mx35_clocks_init() · 266 unmodified lines | |||
| 267 | imx_print_silicon_rev("i.MX35", mx35_revision()); | 267 | imx_print_silicon_rev("i.MX35", mx35_revision()); |
| 268 | 268 | ||
| 269 | #ifdef CONFIG_MXC_USE_EPIT | 269 | #ifdef CONFIG_MXC_USE_EPIT |
| 270 | epit_timer_init(&epit1_clk, | 270 | epit_timer_init(MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1); |
| 271 | MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1); | ||
| 272 | #else | 271 | #else |
| 273 | mxc_timer_init(NULL, MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), | 272 | mxc_timer_init(MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT); |
| 274 | MX35_INT_GPT); | ||
| 275 | #endif | 273 | #endif |
| 276 | 274 | ||
| 277 | return 0; | 275 | return 0; |
| @@ -104,12 +104,12 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, · 103 unmodified lines | |||
| 104 | periph_apm_sel, ARRAY_SIZE(periph_apm_sel)); | 104 | periph_apm_sel, ARRAY_SIZE(periph_apm_sel)); |
| 105 | clk[main_bus] = imx_clk_mux("main_bus", MXC_CCM_CBCDR, 25, 1, | 105 | clk[main_bus] = imx_clk_mux("main_bus", MXC_CCM_CBCDR, 25, 1, |
| 106 | main_bus_sel, ARRAY_SIZE(main_bus_sel)); | 106 | main_bus_sel, ARRAY_SIZE(main_bus_sel)); |
| 107 | clk[per_lp_apm] = imx_clk_mux("per_lp_apm", MXC_CCM_CBCDR, 1, 1, | 107 | clk[per_lp_apm] = imx_clk_mux("per_lp_apm", MXC_CCM_CBCMR, 1, 1, |
| 108 | per_lp_apm_sel, ARRAY_SIZE(per_lp_apm_sel)); | 108 | per_lp_apm_sel, ARRAY_SIZE(per_lp_apm_sel)); |
| 109 | clk[per_pred1] = imx_clk_divider("per_pred1", "per_lp_apm", MXC_CCM_CBCDR, 6, 2); | 109 | clk[per_pred1] = imx_clk_divider("per_pred1", "per_lp_apm", MXC_CCM_CBCDR, 6, 2); |
| 110 | clk[per_pred2] = imx_clk_divider("per_pred2", "per_pred1", MXC_CCM_CBCDR, 3, 3); | 110 | clk[per_pred2] = imx_clk_divider("per_pred2", "per_pred1", MXC_CCM_CBCDR, 3, 3); |
| 111 | clk[per_podf] = imx_clk_divider("per_podf", "per_pred2", MXC_CCM_CBCDR, 0, 3); | 111 | clk[per_podf] = imx_clk_divider("per_podf", "per_pred2", MXC_CCM_CBCDR, 0, 3); |
| 112 | clk[per_root] = imx_clk_mux("per_root", MXC_CCM_CBCDR, 1, 0, | 112 | clk[per_root] = imx_clk_mux("per_root", MXC_CCM_CBCMR, 0, 1, |
| 113 | per_root_sel, ARRAY_SIZE(per_root_sel)); | 113 | per_root_sel, ARRAY_SIZE(per_root_sel)); |
| 114 | clk[ahb] = imx_clk_divider("ahb", "main_bus", MXC_CCM_CBCDR, 10, 3); | 114 | clk[ahb] = imx_clk_divider("ahb", "main_bus", MXC_CCM_CBCDR, 10, 3); |
| 115 | clk[ahb_max] = imx_clk_gate2("ahb_max", "ahb", MXC_CCM_CCGR0, 28); | 115 | clk[ahb_max] = imx_clk_gate2("ahb_max", "ahb", MXC_CCM_CCGR0, 28); |
| @@ -172,7 +172,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, · 56 unmodified lines | |||
| 172 | clk[pwm1_hf_gate] = imx_clk_gate2("pwm1_hf_gate", "ipg", MXC_CCM_CCGR2, 12); | 172 | clk[pwm1_hf_gate] = imx_clk_gate2("pwm1_hf_gate", "ipg", MXC_CCM_CCGR2, 12); |
| 173 | clk[pwm2_ipg_gate] = imx_clk_gate2("pwm2_ipg_gate", "ipg", MXC_CCM_CCGR2, 14); | 173 | clk[pwm2_ipg_gate] = imx_clk_gate2("pwm2_ipg_gate", "ipg", MXC_CCM_CCGR2, 14); |
| 174 | clk[pwm2_hf_gate] = imx_clk_gate2("pwm2_hf_gate", "ipg", MXC_CCM_CCGR2, 16); | 174 | clk[pwm2_hf_gate] = imx_clk_gate2("pwm2_hf_gate", "ipg", MXC_CCM_CCGR2, 16); |
| 175 | clk[gpt_gate] = imx_clk_gate2("gpt_gate", "ipg", MXC_CCM_CCGR2, 18); | 175 | clk[gpt_gate] = imx_clk_gate2("gpt_gate", "per_root", MXC_CCM_CCGR2, 18); |
| 176 | clk[fec_gate] = imx_clk_gate2("fec_gate", "ipg", MXC_CCM_CCGR2, 24); | 176 | clk[fec_gate] = imx_clk_gate2("fec_gate", "ipg", MXC_CCM_CCGR2, 24); |
| 177 | clk[usboh3_gate] = imx_clk_gate2("usboh3_gate", "ipg", MXC_CCM_CCGR2, 26); | 177 | clk[usboh3_gate] = imx_clk_gate2("usboh3_gate", "ipg", MXC_CCM_CCGR2, 26); |
| 178 | clk[usboh3_per_gate] = imx_clk_gate2("usboh3_per_gate", "usboh3_podf", MXC_CCM_CCGR2, 28); | 178 | clk[usboh3_per_gate] = imx_clk_gate2("usboh3_per_gate", "usboh3_podf", MXC_CCM_CCGR2, 28); |
| @@ -366,8 +366,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, · 187 unmodified lines | |||
| 366 | clk_set_rate(clk[esdhc_b_podf], 166250000); | 366 | clk_set_rate(clk[esdhc_b_podf], 166250000); |
| 367 | 367 | ||
| 368 | /* System timer */ | 368 | /* System timer */ |
| 369 | mxc_timer_init(NULL, MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), | 369 | mxc_timer_init(MX51_IO_ADDRESS(MX51_GPT1_BASE_ADDR), MX51_INT_GPT); |
| 370 | MX51_INT_GPT); | ||
| 371 | 370 | ||
| 372 | clk_prepare_enable(clk[iim_gate]); | 371 | clk_prepare_enable(clk[iim_gate]); |
| 373 | imx_print_silicon_rev("i.MX51", mx51_revision()); | 372 | imx_print_silicon_rev("i.MX51", mx51_revision()); |
| @@ -452,8 +451,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, · 78 unmodified lines | |||
| 452 | clk_set_rate(clk[esdhc_b_podf], 200000000); | 451 | clk_set_rate(clk[esdhc_b_podf], 200000000); |
| 453 | 452 | ||
| 454 | /* System timer */ | 453 | /* System timer */ |
| 455 | mxc_timer_init(NULL, MX53_IO_ADDRESS(MX53_GPT1_BASE_ADDR), | 454 | mxc_timer_init(MX53_IO_ADDRESS(MX53_GPT1_BASE_ADDR), MX53_INT_GPT); |
| 456 | MX53_INT_GPT); | ||
| 457 | 455 | ||
| 458 | clk_prepare_enable(clk[iim_gate]); | 456 | clk_prepare_enable(clk[iim_gate]); |
| 459 | imx_print_silicon_rev("i.MX53", mx53_revision()); | 457 | imx_print_silicon_rev("i.MX53", mx53_revision()); |
| @@ -122,10 +122,6 @@ static const char *cko1_sels[] = { "pll3_usb_otg", "pll2_bus", "pll1_sys", "pll5 · 121 unmodified lines | |||
| 122 | "dummy", "axi", "enfc", "ipu1_di0", "ipu1_di1", "ipu2_di0", | 122 | "dummy", "axi", "enfc", "ipu1_di0", "ipu1_di1", "ipu2_di0", |
| 123 | "ipu2_di1", "ahb", "ipg", "ipg_per", "ckil", "pll4_audio", }; | 123 | "ipu2_di1", "ahb", "ipg", "ipg_per", "ckil", "pll4_audio", }; |
| 124 | 124 | ||
| 125 | static const char * const clks_init_on[] __initconst = { | ||
| 126 | "mmdc_ch0_axi", "mmdc_ch1_axi", "usboh3", | ||
| 127 | }; | ||
| 128 | |||
| 129 | enum mx6q_clks { | 125 | enum mx6q_clks { |
| 130 | dummy, ckil, ckih, osc, pll2_pfd0_352m, pll2_pfd1_594m, pll2_pfd2_396m, | 126 | dummy, ckil, ckih, osc, pll2_pfd0_352m, pll2_pfd1_594m, pll2_pfd2_396m, |
| 131 | pll3_pfd0_720m, pll3_pfd1_540m, pll3_pfd2_508m, pll3_pfd3_454m, | 127 | pll3_pfd0_720m, pll3_pfd1_540m, pll3_pfd2_508m, pll3_pfd3_454m, |
| @@ -161,11 +157,14 @@ enum mx6q_clks { · 29 unmodified lines | |||
| 161 | 157 | ||
| 162 | static struct clk *clk[clk_max]; | 158 | static struct clk *clk[clk_max]; |
| 163 | 159 | ||
| 160 | static enum mx6q_clks const clks_init_on[] __initconst = { | ||
| 161 | mmdc_ch0_axi, mmdc_ch1_axi, | ||
| 162 | }; | ||
| 163 | |||
| 164 | int __init mx6q_clocks_init(void) | 164 | int __init mx6q_clocks_init(void) |
| 165 | { | 165 | { |
| 166 | struct device_node *np; | 166 | struct device_node *np; |
| 167 | void __iomem *base; | 167 | void __iomem *base; |
| 168 | struct clk *c; | ||
| 169 | int i, irq; | 168 | int i, irq; |
| 170 | 169 | ||
| 171 | clk[dummy] = imx_clk_fixed("dummy", 0); | 170 | clk[dummy] = imx_clk_fixed("dummy", 0); |
| @@ -424,21 +423,14 @@ int __init mx6q_clocks_init(void) · 252 unmodified lines | |||
| 424 | clk_register_clkdev(clk[ahb], "ahb", NULL); | 423 | clk_register_clkdev(clk[ahb], "ahb", NULL); |
| 425 | clk_register_clkdev(clk[cko1], "cko1", NULL); | 424 | clk_register_clkdev(clk[cko1], "cko1", NULL); |
| 426 | 425 | ||
| 427 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) { | 426 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) |
| 428 | c = clk_get_sys(clks_init_on[i], NULL); | 427 | clk_prepare_enable(clk[clks_init_on[i]]); |
| 429 | if (IS_ERR(c)) { | ||
| 430 | pr_err("%s: failed to get clk %s", __func__, | ||
| 431 | clks_init_on[i]); | ||
| 432 | return PTR_ERR(c); | ||
| 433 | } | ||
| 434 | clk_prepare_enable(c); | ||
| 435 | } | ||
| 436 | 428 | ||
| 437 | np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); | 429 | np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); |
| 438 | base = of_iomap(np, 0); | 430 | base = of_iomap(np, 0); |
| 439 | WARN_ON(!base); | 431 | WARN_ON(!base); |
| 440 | irq = irq_of_parse_and_map(np, 0); | 432 | irq = irq_of_parse_and_map(np, 0); |
| 441 | mxc_timer_init(NULL, base, irq); | 433 | mxc_timer_init(base, irq); |
| 442 | 434 | ||
| 443 | return 0; | 435 | return 0; |
| 444 | } | 436 | } |
| @@ -74,30 +74,15 @@ struct clk_pllv2 { · 73 unmodified lines | |||
| 74 | void __iomem *base; | 74 | void __iomem *base; |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | static unsigned long clk_pllv2_recalc_rate(struct clk_hw *hw, | 77 | static unsigned long __clk_pllv2_recalc_rate(unsigned long parent_rate, |
| 78 | unsigned long parent_rate) | 78 | u32 dp_ctl, u32 dp_op, u32 dp_mfd, u32 dp_mfn) |
| 79 | { | 79 | { |
| 80 | long mfi, mfn, mfd, pdf, ref_clk, mfn_abs; | 80 | long mfi, mfn, mfd, pdf, ref_clk, mfn_abs; |
| 81 | unsigned long dp_op, dp_mfd, dp_mfn, dp_ctl, pll_hfsm, dbl; | 81 | unsigned long dbl; |
| 82 | void __iomem *pllbase; | ||
| 83 | s64 temp; | 82 | s64 temp; |
| 84 | struct clk_pllv2 *pll = to_clk_pllv2(hw); | ||
| 85 | |||
| 86 | pllbase = pll->base; | ||
| 87 | 83 | ||
| 88 | dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL); | ||
| 89 | pll_hfsm = dp_ctl & MXC_PLL_DP_CTL_HFSM; | ||
| 90 | dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN; | 84 | dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN; |
| 91 | 85 | ||
| 92 | if (pll_hfsm == 0) { | ||
| 93 | dp_op = __raw_readl(pllbase + MXC_PLL_DP_OP); | ||
| 94 | dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_MFD); | ||
| 95 | dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_MFN); | ||
| 96 | } else { | ||
| 97 | dp_op = __raw_readl(pllbase + MXC_PLL_DP_HFS_OP); | ||
| 98 | dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFD); | ||
| 99 | dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFN); | ||
| 100 | } | ||
| 101 | pdf = dp_op & MXC_PLL_DP_OP_PDF_MASK; | 86 | pdf = dp_op & MXC_PLL_DP_OP_PDF_MASK; |
| 102 | mfi = (dp_op & MXC_PLL_DP_OP_MFI_MASK) >> MXC_PLL_DP_OP_MFI_OFFSET; | 87 | mfi = (dp_op & MXC_PLL_DP_OP_MFI_MASK) >> MXC_PLL_DP_OP_MFI_OFFSET; |
| 103 | mfi = (mfi <= 5) ? 5 : mfi; | 88 | mfi = (mfi <= 5) ? 5 : mfi; |
| @@ -123,18 +108,30 @@ static unsigned long clk_pllv2_recalc_rate(struct clk_hw *hw, · 19 unmodified lines | |||
| 123 | return temp; | 108 | return temp; |
| 124 | } | 109 | } |
| 125 | 110 | ||
| 126 | static int clk_pllv2_set_rate(struct clk_hw *hw, unsigned long rate, | 111 | static unsigned long clk_pllv2_recalc_rate(struct clk_hw *hw, |
| 127 | unsigned long parent_rate) | 112 | unsigned long parent_rate) |
| 128 | { | 113 | { |
| 114 | u32 dp_op, dp_mfd, dp_mfn, dp_ctl; | ||
| 115 | void __iomem *pllbase; | ||
| 129 | struct clk_pllv2 *pll = to_clk_pllv2(hw); | 116 | struct clk_pllv2 *pll = to_clk_pllv2(hw); |
| 117 | |||
| 118 | pllbase = pll->base; | ||
| 119 | |||
| 120 | dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL); | ||
| 121 | dp_op = __raw_readl(pllbase + MXC_PLL_DP_OP); | ||
| 122 | dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_MFD); | ||
| 123 | dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_MFN); | ||
| 124 | |||
| 125 | return __clk_pllv2_recalc_rate(parent_rate, dp_ctl, dp_op, dp_mfd, dp_mfn); | ||
| 126 | } | ||
| 127 | |||
| 128 | static int __clk_pllv2_set_rate(unsigned long rate, unsigned long parent_rate, | ||
| 129 | u32 *dp_op, u32 *dp_mfd, u32 *dp_mfn) | ||
| 130 | { | ||
| 130 | u32 reg; | 131 | u32 reg; |
| 131 | void __iomem *pllbase; | ||
| 132 | long mfi, pdf, mfn, mfd = 999999; | 132 | long mfi, pdf, mfn, mfd = 999999; |
| 133 | s64 temp64; | 133 | s64 temp64; |
| 134 | unsigned long quad_parent_rate; | 134 | unsigned long quad_parent_rate; |
| 135 | unsigned long pll_hfsm, dp_ctl; | ||
| 136 | |||
| 137 | pllbase = pll->base; | ||
| 138 | 135 | ||
| 139 | quad_parent_rate = 4 * parent_rate; | 136 | quad_parent_rate = 4 * parent_rate; |
| 140 | pdf = mfi = -1; | 137 | pdf = mfi = -1; |
| @@ -144,25 +141,41 @@ static int clk_pllv2_set_rate(struct clk_hw *hw, unsigned long rate, · 3 unmodified lines | |||
| 144 | return -EINVAL; | 141 | return -EINVAL; |
| 145 | pdf--; | 142 | pdf--; |
| 146 | 143 | ||
| 147 | temp64 = rate * (pdf+1) - quad_parent_rate * mfi; | 144 | temp64 = rate * (pdf + 1) - quad_parent_rate * mfi; |
| 148 | do_div(temp64, quad_parent_rate/1000000); | 145 | do_div(temp64, quad_parent_rate / 1000000); |
| 149 | mfn = (long)temp64; | 146 | mfn = (long)temp64; |
| 150 | 147 | ||
| 148 | reg = mfi << 4 | pdf; | ||
| 149 | |||
| 150 | *dp_op = reg; | ||
| 151 | *dp_mfd = mfd; | ||
| 152 | *dp_mfn = mfn; | ||
| 153 | |||
| 154 | return 0; | ||
| 155 | } | ||
| 156 | |||
| 157 | static int clk_pllv2_set_rate(struct clk_hw *hw, unsigned long rate, | ||
| 158 | unsigned long parent_rate) | ||
| 159 | { | ||
| 160 | struct clk_pllv2 *pll = to_clk_pllv2(hw); | ||
| 161 | void __iomem *pllbase; | ||
| 162 | u32 dp_ctl, dp_op, dp_mfd, dp_mfn; | ||
| 163 | int ret; | ||
| 164 | |||
| 165 | pllbase = pll->base; | ||
| 166 | |||
| 167 | |||
| 168 | ret = __clk_pllv2_set_rate(rate, parent_rate, &dp_op, &dp_mfd, &dp_mfn); | ||
| 169 | if (ret) | ||
| 170 | return ret; | ||
| 171 | |||
| 151 | dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL); | 172 | dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL); |
| 152 | /* use dpdck0_2 */ | 173 | /* use dpdck0_2 */ |
| 153 | __raw_writel(dp_ctl | 0x1000L, pllbase + MXC_PLL_DP_CTL); | 174 | __raw_writel(dp_ctl | 0x1000L, pllbase + MXC_PLL_DP_CTL); |
| 154 | pll_hfsm = dp_ctl & MXC_PLL_DP_CTL_HFSM; | 175 | |
| 155 | if (pll_hfsm == 0) { | 176 | __raw_writel(dp_op, pllbase + MXC_PLL_DP_OP); |
| 156 | reg = mfi << 4 | pdf; | 177 | __raw_writel(dp_mfd, pllbase + MXC_PLL_DP_MFD); |
| 157 | __raw_writel(reg, pllbase + MXC_PLL_DP_OP); | 178 | __raw_writel(dp_mfn, pllbase + MXC_PLL_DP_MFN); |
| 158 | __raw_writel(mfd, pllbase + MXC_PLL_DP_MFD); | ||
| 159 | __raw_writel(mfn, pllbase + MXC_PLL_DP_MFN); | ||
| 160 | } else { | ||
| 161 | reg = mfi << 4 | pdf; | ||
| 162 | __raw_writel(reg, pllbase + MXC_PLL_DP_HFS_OP); | ||
| 163 | __raw_writel(mfd, pllbase + MXC_PLL_DP_HFS_MFD); | ||
| 164 | __raw_writel(mfn, pllbase + MXC_PLL_DP_HFS_MFN); | ||
| 165 | } | ||
| 166 | 179 | ||
| 167 | return 0; | 180 | return 0; |
| 168 | } | 181 | } |
| @@ -170,7 +183,11 @@ static int clk_pllv2_set_rate(struct clk_hw *hw, unsigned long rate, · 1 unmodified line | |||
| 170 | static long clk_pllv2_round_rate(struct clk_hw *hw, unsigned long rate, | 183 | static long clk_pllv2_round_rate(struct clk_hw *hw, unsigned long rate, |
| 171 | unsigned long *prate) | 184 | unsigned long *prate) |
| 172 | { | 185 | { |
| 173 | return rate; | 186 | u32 dp_op, dp_mfd, dp_mfn; |
| 187 | |||
| 188 | __clk_pllv2_set_rate(rate, *prate, &dp_op, &dp_mfd, &dp_mfn); | ||
| 189 | return __clk_pllv2_recalc_rate(*prate, MXC_PLL_DP_CTL_DPDCK0_2_EN, | ||
| 190 | dp_op, dp_mfd, dp_mfn); | ||
| 174 | } | 191 | } |
| 175 | 192 | ||
| 176 | static int clk_pllv2_prepare(struct clk_hw *hw) | 193 | static int clk_pllv2_prepare(struct clk_hw *hw) |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | #define MX53_DPLL1_BASE MX53_IO_ADDRESS(MX53_PLL1_BASE_ADDR) | 23 | #define MX53_DPLL1_BASE MX53_IO_ADDRESS(MX53_PLL1_BASE_ADDR) |
| 24 | #define MX53_DPLL2_BASE MX53_IO_ADDRESS(MX53_PLL2_BASE_ADDR) | 24 | #define MX53_DPLL2_BASE MX53_IO_ADDRESS(MX53_PLL2_BASE_ADDR) |
| 25 | #define MX53_DPLL3_BASE MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR) | 25 | #define MX53_DPLL3_BASE MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR) |
| 26 | #define MX53_DPLL4_BASE MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR) | 26 | #define MX53_DPLL4_BASE MX53_IO_ADDRESS(MX53_PLL4_BASE_ADDR) |
| 27 | 27 | ||
| 28 | /* PLL Register Offsets */ | 28 | /* PLL Register Offsets */ |
| 29 | #define MXC_PLL_DP_CTL 0x00 | 29 | #define MXC_PLL_DP_CTL 0x00 |
| @@ -12,6 +12,7 @@ · 11 unmodified lines | |||
| 12 | 12 | ||
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <asm/cacheflush.h> | 14 | #include <asm/cacheflush.h> |
| 15 | #include <asm/cp15.h> | ||
| 15 | #include <mach/common.h> | 16 | #include <mach/common.h> |
| 16 | 17 | ||
| 17 | int platform_cpu_kill(unsigned int cpu) | 18 | int platform_cpu_kill(unsigned int cpu) |
| @@ -19,6 +20,44 @@ int platform_cpu_kill(unsigned int cpu) · 1 unmodified line | |||
| 19 | return 1; | 20 | return 1; |
| 20 | } | 21 | } |
| 21 | 22 | ||
| 23 | static inline void cpu_enter_lowpower(void) | ||
| 24 | { | ||
| 25 | unsigned int v; | ||
| 26 | |||
| 27 | flush_cache_all(); | ||
| 28 | asm volatile( | ||
| 29 | "mcr p15, 0, %1, c7, c5, 0\n" | ||
| 30 | " mcr p15, 0, %1, c7, c10, 4\n" | ||
| 31 | /* | ||
| 32 | * Turn off coherency | ||
| 33 | */ | ||
| 34 | " mrc p15, 0, %0, c1, c0, 1\n" | ||
| 35 | " bic %0, %0, %3\n" | ||
| 36 | " mcr p15, 0, %0, c1, c0, 1\n" | ||
| 37 | " mrc p15, 0, %0, c1, c0, 0\n" | ||
| 38 | " bic %0, %0, %2\n" | ||
| 39 | " mcr p15, 0, %0, c1, c0, 0\n" | ||
| 40 | : "=&r" (v) | ||
| 41 | : "r" (0), "Ir" (CR_C), "Ir" (0x40) | ||
| 42 | : "cc"); | ||
| 43 | } | ||
| 44 | |||
| 45 | static inline void cpu_leave_lowpower(void) | ||
| 46 | { | ||
| 47 | unsigned int v; | ||
| 48 | |||
| 49 | asm volatile( | ||
| 50 | "mrc p15, 0, %0, c1, c0, 0\n" | ||
| 51 | " orr %0, %0, %1\n" | ||
| 52 | " mcr p15, 0, %0, c1, c0, 0\n" | ||
| 53 | " mrc p15, 0, %0, c1, c0, 1\n" | ||
| 54 | " orr %0, %0, %2\n" | ||
| 55 | " mcr p15, 0, %0, c1, c0, 1\n" | ||
| 56 | : "=&r" (v) | ||
| 57 | : "Ir" (CR_C), "Ir" (0x40) | ||
| 58 | : "cc"); | ||
| 59 | } | ||
| 60 | |||
| 22 | /* | 61 | /* |
| 23 | * platform-specific code to shutdown a CPU | 62 | * platform-specific code to shutdown a CPU |
| 24 | * | 63 | * |
| @@ -26,9 +65,10 @@ int platform_cpu_kill(unsigned int cpu) · 1 unmodified line | |||
| 26 | */ | 65 | */ |
| 27 | void platform_cpu_die(unsigned int cpu) | 66 | void platform_cpu_die(unsigned int cpu) |
| 28 | { | 67 | { |
| 29 | flush_cache_all(); | 68 | cpu_enter_lowpower(); |
| 30 | imx_enable_cpu(cpu, false); | 69 | imx_enable_cpu(cpu, false); |
| 31 | cpu_do_idle(); | 70 | cpu_do_idle(); |
| 71 | cpu_leave_lowpower(); | ||
| 32 | 72 | ||
| 33 | /* We should never return from idle */ | 73 | /* We should never return from idle */ |
| 34 | panic("cpu %d unexpectedly exit from shutdown\n", cpu); | 74 | panic("cpu %d unexpectedly exit from shutdown\n", cpu); |
| @@ -70,7 +70,6 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { · 69 unmodified lines | |||
| 70 | I2C_BOARD_INFO("pcf8563", 0x51), | 70 | I2C_BOARD_INFO("pcf8563", 0x51), |
| 71 | }, { | 71 | }, { |
| 72 | I2C_BOARD_INFO("tsc2007", 0x48), | 72 | I2C_BOARD_INFO("tsc2007", 0x48), |
| 73 | .type = "tsc2007", | ||
| 74 | .platform_data = &tsc2007_info, | 73 | .platform_data = &tsc2007_info, |
| 75 | .irq = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO), | 74 | .irq = IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO), |
| 76 | }, | 75 | }, |
| @@ -142,7 +142,6 @@ static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = { · 141 unmodified lines | |||
| 142 | I2C_BOARD_INFO("pcf8563", 0x51), | 142 | I2C_BOARD_INFO("pcf8563", 0x51), |
| 143 | }, { | 143 | }, { |
| 144 | I2C_BOARD_INFO("tsc2007", 0x49), | 144 | I2C_BOARD_INFO("tsc2007", 0x49), |
| 145 | .type = "tsc2007", | ||
| 146 | .platform_data = &tsc2007_info, | 145 | .platform_data = &tsc2007_info, |
| 147 | }, | 146 | }, |
| 148 | }; | 147 | }; |
| @@ -116,6 +116,8 @@ static const int visstrim_m10_pins[] __initconst = { · 115 unmodified lines | |||
| 116 | PB23_PF_USB_PWR, | 116 | PB23_PF_USB_PWR, |
| 117 | PB24_PF_USB_OC, | 117 | PB24_PF_USB_OC, |
| 118 | /* CSI */ | 118 | /* CSI */ |
| 119 | TVP5150_RSTN | GPIO_GPIO | GPIO_OUT, | ||
| 120 | TVP5150_PWDN | GPIO_GPIO | GPIO_OUT, | ||
| 119 | PB10_PF_CSI_D0, | 121 | PB10_PF_CSI_D0, |
| 120 | PB11_PF_CSI_D1, | 122 | PB11_PF_CSI_D1, |
| 121 | PB12_PF_CSI_D2, | 123 | PB12_PF_CSI_D2, |
| @@ -147,6 +149,24 @@ static struct gpio visstrim_m10_version_gpios[] = { · 25 unmodified lines | |||
| 147 | { MOTHERBOARD_BIT2, GPIOF_IN, "mother-version-2" }, | 149 | { MOTHERBOARD_BIT2, GPIOF_IN, "mother-version-2" }, |
| 148 | }; | 150 | }; |
| 149 | 151 | ||
| 152 | static const struct gpio visstrim_m10_gpios[] __initconst = { | ||
| 153 | { | ||
| 154 | .gpio = TVP5150_RSTN, | ||
| 155 | .flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH, | ||
| 156 | .label = "tvp5150_rstn", | ||
| 157 | }, | ||
| 158 | { | ||
| 159 | .gpio = TVP5150_PWDN, | ||
| 160 | .flags = GPIOF_DIR_OUT | GPIOF_INIT_LOW, | ||
| 161 | .label = "tvp5150_pwdn", | ||
| 162 | }, | ||
| 163 | { | ||
| 164 | .gpio = OTG_PHY_CS_GPIO, | ||
| 165 | .flags = GPIOF_DIR_OUT | GPIOF_INIT_LOW, | ||
| 166 | .label = "usbotg_cs", | ||
| 167 | }, | ||
| 168 | }; | ||
| 169 | |||
| 150 | /* Camera */ | 170 | /* Camera */ |
| 151 | static int visstrim_camera_power(struct device *dev, int on) | 171 | static int visstrim_camera_power(struct device *dev, int on) |
| 152 | { | 172 | { |
| @@ -190,13 +210,6 @@ static void __init visstrim_camera_init(void) · 37 unmodified lines | |||
| 190 | struct platform_device *pdev; | 210 | struct platform_device *pdev; |
| 191 | int dma; | 211 | int dma; |
| 192 | 212 | ||
| 193 | /* Initialize tvp5150 gpios */ | ||
| 194 | mxc_gpio_mode(TVP5150_RSTN | GPIO_GPIO | GPIO_OUT); | ||
| 195 | mxc_gpio_mode(TVP5150_PWDN | GPIO_GPIO | GPIO_OUT); | ||
| 196 | gpio_set_value(TVP5150_RSTN, 1); | ||
| 197 | gpio_set_value(TVP5150_PWDN, 0); | ||
| 198 | ndelay(1); | ||
| 199 | |||
| 200 | gpio_set_value(TVP5150_PWDN, 1); | 213 | gpio_set_value(TVP5150_PWDN, 1); |
| 201 | ndelay(1); | 214 | ndelay(1); |
| 202 | gpio_set_value(TVP5150_RSTN, 0); | 215 | gpio_set_value(TVP5150_RSTN, 0); |
| @@ -377,10 +390,6 @@ static struct i2c_board_info visstrim_m10_i2c_devices[] = { · 174 unmodified lines | |||
| 377 | /* USB OTG */ | 390 | /* USB OTG */ |
| 378 | static int otg_phy_init(struct platform_device *pdev) | 391 | static int otg_phy_init(struct platform_device *pdev) |
| 379 | { | 392 | { |
| 380 | gpio_set_value(OTG_PHY_CS_GPIO, 0); | ||
| 381 | |||
| 382 | mdelay(10); | ||
| 383 | |||
| 384 | return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED); | 393 | return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_POWER_PINS_ENABLED); |
| 385 | } | 394 | } |
| 386 | 395 | ||
| @@ -435,6 +444,11 @@ static void __init visstrim_m10_board_init(void) · 48 unmodified lines | |||
| 435 | if (ret) | 444 | if (ret) |
| 436 | pr_err("Failed to setup pins (%d)\n", ret); | 445 | pr_err("Failed to setup pins (%d)\n", ret); |
| 437 | 446 | ||
| 447 | ret = gpio_request_array(visstrim_m10_gpios, | ||
| 448 | ARRAY_SIZE(visstrim_m10_gpios)); | ||
| 449 | if (ret) | ||
| 450 | pr_err("Failed to request gpios (%d)\n", ret); | ||
| 451 | |||
| 438 | imx27_add_imx_ssi(0, &visstrim_m10_ssi_pdata); | 452 | imx27_add_imx_ssi(0, &visstrim_m10_ssi_pdata); |
| 439 | imx27_add_imx_uart0(&uart_pdata); | 453 | imx27_add_imx_uart0(&uart_pdata); |
| 440 | 454 | ||
| @@ -32,7 +32,7 @@ · 31 unmodified lines | |||
| 32 | * Memory-mapped I/O on MX21ADS base board | 32 | * Memory-mapped I/O on MX21ADS base board |
| 33 | */ | 33 | */ |
| 34 | #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 | 34 | #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 |
| 35 | #define MX21ADS_MMIO_SIZE SZ_16M | 35 | #define MX21ADS_MMIO_SIZE 0xc00000 |
| 36 | 36 | ||
| 37 | #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \ | 37 | #define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \ |
| 38 | (MX21ADS_MMIO_BASE_ADDR + (offset)) | 38 | (MX21ADS_MMIO_BASE_ADDR + (offset)) |
| @@ -86,6 +86,7 @@ static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size, · 85 unmodified lines | |||
| 86 | 86 | ||
| 87 | void __init imx3_init_l2x0(void) | 87 | void __init imx3_init_l2x0(void) |
| 88 | { | 88 | { |
| 89 | #ifdef CONFIG_CACHE_L2X0 | ||
| 89 | void __iomem *l2x0_base; | 90 | void __iomem *l2x0_base; |
| 90 | void __iomem *clkctl_base; | 91 | void __iomem *clkctl_base; |
| 91 | 92 | ||
| @@ -115,6 +116,7 @@ void __init imx3_init_l2x0(void) · 23 unmodified lines | |||
| 115 | } | 116 | } |
| 116 | 117 | ||
| 117 | l2x0_init(l2x0_base, 0x00030024, 0x00000000); | 118 | l2x0_init(l2x0_base, 0x00030024, 0x00000000); |
| 119 | #endif | ||
| 118 | } | 120 | } |
| 119 | 121 | ||
| 120 | #ifdef CONFIG_SOC_IMX31 | 122 | #ifdef CONFIG_SOC_IMX31 |
| @@ -179,6 +181,8 @@ void __init imx31_soc_init(void) · 58 unmodified lines | |||
| 179 | mxc_register_gpio("imx31-gpio", 1, MX31_GPIO2_BASE_ADDR, SZ_16K, MX31_INT_GPIO2, 0); | 181 | mxc_register_gpio("imx31-gpio", 1, MX31_GPIO2_BASE_ADDR, SZ_16K, MX31_INT_GPIO2, 0); |
| 180 | mxc_register_gpio("imx31-gpio", 2, MX31_GPIO3_BASE_ADDR, SZ_16K, MX31_INT_GPIO3, 0); | 182 | mxc_register_gpio("imx31-gpio", 2, MX31_GPIO3_BASE_ADDR, SZ_16K, MX31_INT_GPIO3, 0); |
| 181 | 183 | ||
| 184 | pinctrl_provide_dummies(); | ||
| 185 | |||
| 182 | if (to_version == 1) { | 186 | if (to_version == 1) { |
| 183 | strncpy(imx31_sdma_pdata.fw_name, "sdma-imx31-to1.bin", | 187 | strncpy(imx31_sdma_pdata.fw_name, "sdma-imx31-to1.bin", |
| 184 | strlen(imx31_sdma_pdata.fw_name)); | 188 | strlen(imx31_sdma_pdata.fw_name)); |
| @@ -202,6 +202,8 @@ void __init imx51_soc_init(void) · 201 unmodified lines | |||
| 202 | mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH); | 202 | mxc_register_gpio("imx31-gpio", 2, MX51_GPIO3_BASE_ADDR, SZ_16K, MX51_INT_GPIO3_LOW, MX51_INT_GPIO3_HIGH); |
| 203 | mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH); | 203 | mxc_register_gpio("imx31-gpio", 3, MX51_GPIO4_BASE_ADDR, SZ_16K, MX51_INT_GPIO4_LOW, MX51_INT_GPIO4_HIGH); |
| 204 | 204 | ||
| 205 | pinctrl_provide_dummies(); | ||
| 206 | |||
| 205 | /* i.mx51 has the i.mx35 type sdma */ | 207 | /* i.mx51 has the i.mx35 type sdma */ |
| 206 | imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); | 208 | imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata); |
| 207 | 209 | ||
| @@ -20,9 +20,6 @@ · 19 unmodified lines | |||
| 20 | #include <linux/mv643xx_eth.h> | 20 | #include <linux/mv643xx_eth.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/leds.h> | 22 | #include <linux/leds.h> |
| 23 | #include <linux/spi/flash.h> | ||
| 24 | #include <linux/spi/spi.h> | ||
| 25 | #include <linux/spi/orion_spi.h> | ||
| 26 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 27 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 28 | #include <linux/gpio_keys.h> | 25 | #include <linux/gpio_keys.h> |
| @@ -159,6 +159,7 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, · 158 unmodified lines | |||
| 159 | gate_fn->gate.flags = clk_gate_flags; | 159 | gate_fn->gate.flags = clk_gate_flags; |
| 160 | gate_fn->gate.lock = lock; | 160 | gate_fn->gate.lock = lock; |
| 161 | gate_fn->gate.hw.init = &init; | 161 | gate_fn->gate.hw.init = &init; |
| 162 | gate_fn->fn = fn; | ||
| 162 | 163 | ||
| 163 | /* ops is the gate ops, but with our disable function */ | 164 | /* ops is the gate ops, but with our disable function */ |
| 164 | if (clk_gate_fn_ops.disable != clk_gate_fn_disable) { | 165 | if (clk_gate_fn_ops.disable != clk_gate_fn_disable) { |
| @@ -193,9 +194,11 @@ static struct clk __init *kirkwood_register_gate_fn(const char *name, · 28 unmodified lines | |||
| 193 | bit_idx, 0, &gating_lock, fn); | 194 | bit_idx, 0, &gating_lock, fn); |
| 194 | } | 195 | } |
| 195 | 196 | ||
| 197 | static struct clk *ge0, *ge1; | ||
| 198 | |||
| 196 | void __init kirkwood_clk_init(void) | 199 | void __init kirkwood_clk_init(void) |
| 197 | { | 200 | { |
| 198 | struct clk *runit, *ge0, *ge1, *sata0, *sata1, *usb0, *sdio; | 201 | struct clk *runit, *sata0, *sata1, *usb0, *sdio; |
| 199 | struct clk *crypto, *xor0, *xor1, *pex0, *pex1, *audio; | 202 | struct clk *crypto, *xor0, *xor1, *pex0, *pex1, *audio; |
| 200 | 203 | ||
| 201 | tclk = clk_register_fixed_rate(NULL, "tclk", NULL, | 204 | tclk = clk_register_fixed_rate(NULL, "tclk", NULL, |
| @@ -257,6 +260,9 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) · 55 unmodified lines | |||
| 257 | orion_ge00_init(eth_data, | 260 | orion_ge00_init(eth_data, |
| 258 | GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM, | 261 | GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM, |
| 259 | IRQ_KIRKWOOD_GE00_ERR); | 262 | IRQ_KIRKWOOD_GE00_ERR); |
| 263 | /* The interface forgets the MAC address assigned by u-boot if | ||
| 264 | the clock is turned off, so claim the clk now. */ | ||
| 265 | clk_prepare_enable(ge0); | ||
| 260 | } | 266 | } |
| 261 | 267 | ||
| 262 | 268 | ||
| @@ -268,6 +274,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) · 5 unmodified lines | |||
| 268 | orion_ge01_init(eth_data, | 274 | orion_ge01_init(eth_data, |
| 269 | GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM, | 275 | GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM, |
| 270 | IRQ_KIRKWOOD_GE01_ERR); | 276 | IRQ_KIRKWOOD_GE01_ERR); |
| 277 | clk_prepare_enable(ge1); | ||
| 271 | } | 278 | } |
| 272 | 279 | ||
| 273 | 280 | ||
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #define IRQ_MASK_HIGH_OFF 0x0014 | 38 | #define IRQ_MASK_HIGH_OFF 0x0014 |
| 39 | 39 | ||
| 40 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) | 40 | #define TIMER_VIRT_BASE (BRIDGE_VIRT_BASE | 0x0300) |
| 41 | #define TIMER_PHYS_BASE (BRIDGE_PHYS_BASE | 0x0300) | ||
| 41 | 42 | ||
| 42 | #define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128) | 43 | #define L2_CONFIG_REG (BRIDGE_VIRT_BASE | 0x0128) |
| 43 | #define L2_WRITETHROUGH 0x00000010 | 44 | #define L2_WRITETHROUGH 0x00000010 |
| @@ -80,6 +80,7 @@ · 79 unmodified lines | |||
| 80 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) | 80 | #define UART1_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2100) |
| 81 | 81 | ||
| 82 | #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) | 82 | #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) |
| 83 | #define BRIDGE_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x20000) | ||
| 83 | 84 | ||
| 84 | #define CRYPTO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x30000) | 85 | #define CRYPTO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x30000) |
| 85 | 86 | ||
| @@ -241,6 +241,7 @@ void __init mmp2_init_icu(void) · 240 unmodified lines | |||
| 241 | icu_data[1].clr_mfp_irq_base = IRQ_MMP2_PMIC_BASE; | 241 | icu_data[1].clr_mfp_irq_base = IRQ_MMP2_PMIC_BASE; |
| 242 | icu_data[1].clr_mfp_hwirq = IRQ_MMP2_PMIC - IRQ_MMP2_PMIC_BASE; | 242 | icu_data[1].clr_mfp_hwirq = IRQ_MMP2_PMIC - IRQ_MMP2_PMIC_BASE; |
| 243 | icu_data[1].nr_irqs = 2; | 243 | icu_data[1].nr_irqs = 2; |
| 244 | icu_data[1].cascade_irq = 4; | ||
| 244 | icu_data[1].virq_base = IRQ_MMP2_PMIC_BASE; | 245 | icu_data[1].virq_base = IRQ_MMP2_PMIC_BASE; |
| 245 | icu_data[1].domain = irq_domain_add_legacy(NULL, icu_data[1].nr_irqs, | 246 | icu_data[1].domain = irq_domain_add_legacy(NULL, icu_data[1].nr_irqs, |
| 246 | icu_data[1].virq_base, 0, | 247 | icu_data[1].virq_base, 0, |
| @@ -249,6 +250,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 249 | icu_data[2].reg_status = mmp_icu_base + 0x154; | 250 | icu_data[2].reg_status = mmp_icu_base + 0x154; |
| 250 | icu_data[2].reg_mask = mmp_icu_base + 0x16c; | 251 | icu_data[2].reg_mask = mmp_icu_base + 0x16c; |
| 251 | icu_data[2].nr_irqs = 2; | 252 | icu_data[2].nr_irqs = 2; |
| 253 | icu_data[2].cascade_irq = 5; | ||
| 252 | icu_data[2].virq_base = IRQ_MMP2_RTC_BASE; | 254 | icu_data[2].virq_base = IRQ_MMP2_RTC_BASE; |
| 253 | icu_data[2].domain = irq_domain_add_legacy(NULL, icu_data[2].nr_irqs, | 255 | icu_data[2].domain = irq_domain_add_legacy(NULL, icu_data[2].nr_irqs, |
| 254 | icu_data[2].virq_base, 0, | 256 | icu_data[2].virq_base, 0, |
| @@ -257,6 +259,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 257 | icu_data[3].reg_status = mmp_icu_base + 0x180; | 259 | icu_data[3].reg_status = mmp_icu_base + 0x180; |
| 258 | icu_data[3].reg_mask = mmp_icu_base + 0x17c; | 260 | icu_data[3].reg_mask = mmp_icu_base + 0x17c; |
| 259 | icu_data[3].nr_irqs = 3; | 261 | icu_data[3].nr_irqs = 3; |
| 262 | icu_data[3].cascade_irq = 9; | ||
| 260 | icu_data[3].virq_base = IRQ_MMP2_KEYPAD_BASE; | 263 | icu_data[3].virq_base = IRQ_MMP2_KEYPAD_BASE; |
| 261 | icu_data[3].domain = irq_domain_add_legacy(NULL, icu_data[3].nr_irqs, | 264 | icu_data[3].domain = irq_domain_add_legacy(NULL, icu_data[3].nr_irqs, |
| 262 | icu_data[3].virq_base, 0, | 265 | icu_data[3].virq_base, 0, |
| @@ -265,6 +268,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 265 | icu_data[4].reg_status = mmp_icu_base + 0x158; | 268 | icu_data[4].reg_status = mmp_icu_base + 0x158; |
| 266 | icu_data[4].reg_mask = mmp_icu_base + 0x170; | 269 | icu_data[4].reg_mask = mmp_icu_base + 0x170; |
| 267 | icu_data[4].nr_irqs = 5; | 270 | icu_data[4].nr_irqs = 5; |
| 271 | icu_data[4].cascade_irq = 17; | ||
| 268 | icu_data[4].virq_base = IRQ_MMP2_TWSI_BASE; | 272 | icu_data[4].virq_base = IRQ_MMP2_TWSI_BASE; |
| 269 | icu_data[4].domain = irq_domain_add_legacy(NULL, icu_data[4].nr_irqs, | 273 | icu_data[4].domain = irq_domain_add_legacy(NULL, icu_data[4].nr_irqs, |
| 270 | icu_data[4].virq_base, 0, | 274 | icu_data[4].virq_base, 0, |
| @@ -273,6 +277,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 273 | icu_data[5].reg_status = mmp_icu_base + 0x15c; | 277 | icu_data[5].reg_status = mmp_icu_base + 0x15c; |
| 274 | icu_data[5].reg_mask = mmp_icu_base + 0x174; | 278 | icu_data[5].reg_mask = mmp_icu_base + 0x174; |
| 275 | icu_data[5].nr_irqs = 15; | 279 | icu_data[5].nr_irqs = 15; |
| 280 | icu_data[5].cascade_irq = 35; | ||
| 276 | icu_data[5].virq_base = IRQ_MMP2_MISC_BASE; | 281 | icu_data[5].virq_base = IRQ_MMP2_MISC_BASE; |
| 277 | icu_data[5].domain = irq_domain_add_legacy(NULL, icu_data[5].nr_irqs, | 282 | icu_data[5].domain = irq_domain_add_legacy(NULL, icu_data[5].nr_irqs, |
| 278 | icu_data[5].virq_base, 0, | 283 | icu_data[5].virq_base, 0, |
| @@ -281,6 +286,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 281 | icu_data[6].reg_status = mmp_icu_base + 0x160; | 286 | icu_data[6].reg_status = mmp_icu_base + 0x160; |
| 282 | icu_data[6].reg_mask = mmp_icu_base + 0x178; | 287 | icu_data[6].reg_mask = mmp_icu_base + 0x178; |
| 283 | icu_data[6].nr_irqs = 2; | 288 | icu_data[6].nr_irqs = 2; |
| 289 | icu_data[6].cascade_irq = 51; | ||
| 284 | icu_data[6].virq_base = IRQ_MMP2_MIPI_HSI1_BASE; | 290 | icu_data[6].virq_base = IRQ_MMP2_MIPI_HSI1_BASE; |
| 285 | icu_data[6].domain = irq_domain_add_legacy(NULL, icu_data[6].nr_irqs, | 291 | icu_data[6].domain = irq_domain_add_legacy(NULL, icu_data[6].nr_irqs, |
| 286 | icu_data[6].virq_base, 0, | 292 | icu_data[6].virq_base, 0, |
| @@ -289,6 +295,7 @@ void __init mmp2_init_icu(void) · 2 unmodified lines | |||
| 289 | icu_data[7].reg_status = mmp_icu_base + 0x188; | 295 | icu_data[7].reg_status = mmp_icu_base + 0x188; |
| 290 | icu_data[7].reg_mask = mmp_icu_base + 0x184; | 296 | icu_data[7].reg_mask = mmp_icu_base + 0x184; |
| 291 | icu_data[7].nr_irqs = 2; | 297 | icu_data[7].nr_irqs = 2; |
| 298 | icu_data[7].cascade_irq = 55; | ||
| 292 | icu_data[7].virq_base = IRQ_MMP2_MIPI_HSI0_BASE; | 299 | icu_data[7].virq_base = IRQ_MMP2_MIPI_HSI0_BASE; |
| 293 | icu_data[7].domain = irq_domain_add_legacy(NULL, icu_data[7].nr_irqs, | 300 | icu_data[7].domain = irq_domain_add_legacy(NULL, icu_data[7].nr_irqs, |
| 294 | icu_data[7].virq_base, 0, | 301 | icu_data[7].virq_base, 0, |
| @@ -83,11 +83,9 @@ static struct musb_hdrc_config musb_config = { · 82 unmodified lines | |||
| 83 | }; | 83 | }; |
| 84 | 84 | ||
| 85 | static struct musb_hdrc_platform_data tusb_data = { | 85 | static struct musb_hdrc_platform_data tusb_data = { |
| 86 | #if defined(CONFIG_USB_MUSB_OTG) | 86 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC |
| 87 | .mode = MUSB_OTG, | 87 | .mode = MUSB_OTG, |
| 88 | #elif defined(CONFIG_USB_MUSB_PERIPHERAL) | 88 | #else |
| 89 | .mode = MUSB_PERIPHERAL, | ||
| 90 | #else /* defined(CONFIG_USB_MUSB_HOST) */ | ||
| 91 | .mode = MUSB_HOST, | 89 | .mode = MUSB_HOST, |
| 92 | #endif | 90 | #endif |
| 93 | .set_power = tusb_set_power, | 91 | .set_power = tusb_set_power, |
| @@ -81,13 +81,13 @@ static u8 omap3_beagle_version; · 80 unmodified lines | |||
| 81 | static struct { | 81 | static struct { |
| 82 | int mmc1_gpio_wp; | 82 | int mmc1_gpio_wp; |
| 83 | int usb_pwr_level; | 83 | int usb_pwr_level; |
| 84 | int reset_gpio; | 84 | int dvi_pd_gpio; |
| 85 | int usr_button_gpio; | 85 | int usr_button_gpio; |
| 86 | int mmc_caps; | 86 | int mmc_caps; |
| 87 | } beagle_config = { | 87 | } beagle_config = { |
| 88 | .mmc1_gpio_wp = -EINVAL, | 88 | .mmc1_gpio_wp = -EINVAL, |
| 89 | .usb_pwr_level = GPIOF_OUT_INIT_LOW, | 89 | .usb_pwr_level = GPIOF_OUT_INIT_LOW, |
| 90 | .reset_gpio = 129, | 90 | .dvi_pd_gpio = -EINVAL, |
| 91 | .usr_button_gpio = 4, | 91 | .usr_button_gpio = 4, |
| 92 | .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, | 92 | .mmc_caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA, |
| 93 | }; | 93 | }; |
| @@ -126,21 +126,21 @@ static void __init omap3_beagle_init_rev(void) · 32 unmodified lines | |||
| 126 | printk(KERN_INFO "OMAP3 Beagle Rev: Ax/Bx\n"); | 126 | printk(KERN_INFO "OMAP3 Beagle Rev: Ax/Bx\n"); |
| 127 | omap3_beagle_version = OMAP3BEAGLE_BOARD_AXBX; | 127 | omap3_beagle_version = OMAP3BEAGLE_BOARD_AXBX; |
| 128 | beagle_config.mmc1_gpio_wp = 29; | 128 | beagle_config.mmc1_gpio_wp = 29; |
| 129 | beagle_config.reset_gpio = 170; | 129 | beagle_config.dvi_pd_gpio = 170; |
| 130 | beagle_config.usr_button_gpio = 7; | 130 | beagle_config.usr_button_gpio = 7; |
| 131 | break; | 131 | break; |
| 132 | case 6: | 132 | case 6: |
| 133 | printk(KERN_INFO "OMAP3 Beagle Rev: C1/C2/C3\n"); | 133 | printk(KERN_INFO "OMAP3 Beagle Rev: C1/C2/C3\n"); |
| 134 | omap3_beagle_version = OMAP3BEAGLE_BOARD_C1_3; | 134 | omap3_beagle_version = OMAP3BEAGLE_BOARD_C1_3; |
| 135 | beagle_config.mmc1_gpio_wp = 23; | 135 | beagle_config.mmc1_gpio_wp = 23; |
| 136 | beagle_config.reset_gpio = 170; | 136 | beagle_config.dvi_pd_gpio = 170; |
| 137 | beagle_config.usr_button_gpio = 7; | 137 | beagle_config.usr_button_gpio = 7; |
| 138 | break; | 138 | break; |
| 139 | case 5: | 139 | case 5: |
| 140 | printk(KERN_INFO "OMAP3 Beagle Rev: C4\n"); | 140 | printk(KERN_INFO "OMAP3 Beagle Rev: C4\n"); |
| 141 | omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; | 141 | omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; |
| 142 | beagle_config.mmc1_gpio_wp = 23; | 142 | beagle_config.mmc1_gpio_wp = 23; |
| 143 | beagle_config.reset_gpio = 170; | 143 | beagle_config.dvi_pd_gpio = 170; |
| 144 | beagle_config.usr_button_gpio = 7; | 144 | beagle_config.usr_button_gpio = 7; |
| 145 | break; | 145 | break; |
| 146 | case 0: | 146 | case 0: |
| @@ -274,11 +274,9 @@ static int beagle_twl_gpio_setup(struct device *dev, · 127 unmodified lines | |||
| 274 | if (r) | 274 | if (r) |
| 275 | pr_err("%s: unable to configure nDVI_PWR_EN\n", | 275 | pr_err("%s: unable to configure nDVI_PWR_EN\n", |
| 276 | __func__); | 276 | __func__); |
| 277 | r = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH, | 277 | |
| 278 | "DVI_LDO_EN"); | 278 | beagle_config.dvi_pd_gpio = gpio + 2; |
| 279 | if (r) | 279 | |
| 280 | pr_err("%s: unable to configure DVI_LDO_EN\n", | ||
| 281 | __func__); | ||
| 282 | } else { | 280 | } else { |
| 283 | /* | 281 | /* |
| 284 | * REVISIT: need ehci-omap hooks for external VBUS | 282 | * REVISIT: need ehci-omap hooks for external VBUS |
| @@ -287,7 +285,7 @@ static int beagle_twl_gpio_setup(struct device *dev, · 2 unmodified lines | |||
| 287 | if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC")) | 285 | if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC")) |
| 288 | pr_err("%s: unable to configure EHCI_nOC\n", __func__); | 286 | pr_err("%s: unable to configure EHCI_nOC\n", __func__); |
| 289 | } | 287 | } |
| 290 | dvi_panel.power_down_gpio = beagle_config.reset_gpio; | 288 | dvi_panel.power_down_gpio = beagle_config.dvi_pd_gpio; |
| 291 | 289 | ||
| 292 | gpio_request_one(gpio + TWL4030_GPIO_MAX, beagle_config.usb_pwr_level, | 290 | gpio_request_one(gpio + TWL4030_GPIO_MAX, beagle_config.usb_pwr_level, |
| 293 | "nEN_USB_PWR"); | 291 | "nEN_USB_PWR"); |
| @@ -499,7 +497,7 @@ static void __init omap3_beagle_init(void) · 205 unmodified lines | |||
| 499 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 497 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
| 500 | omap3_beagle_init_rev(); | 498 | omap3_beagle_init_rev(); |
| 501 | 499 | ||
| 502 | if (beagle_config.mmc1_gpio_wp != -EINVAL) | 500 | if (gpio_is_valid(beagle_config.mmc1_gpio_wp)) |
| 503 | omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); | 501 | omap_mux_init_gpio(beagle_config.mmc1_gpio_wp, OMAP_PIN_INPUT); |
| 504 | mmc[0].caps = beagle_config.mmc_caps; | 502 | mmc[0].caps = beagle_config.mmc_caps; |
| 505 | omap_hsmmc_init(mmc); | 503 | omap_hsmmc_init(mmc); |
| @@ -510,15 +508,13 @@ static void __init omap3_beagle_init(void) · 4 unmodified lines | |||
| 510 | 508 | ||
| 511 | platform_add_devices(omap3_beagle_devices, | 509 | platform_add_devices(omap3_beagle_devices, |
| 512 | ARRAY_SIZE(omap3_beagle_devices)); | 510 | ARRAY_SIZE(omap3_beagle_devices)); |
| 511 | if (gpio_is_valid(beagle_config.dvi_pd_gpio)) | ||
| 512 | omap_mux_init_gpio(beagle_config.dvi_pd_gpio, OMAP_PIN_OUTPUT); | ||
| 513 | omap_display_init(&beagle_dss_data); | 513 | omap_display_init(&beagle_dss_data); |
| 514 | omap_serial_init(); | 514 | omap_serial_init(); |
| 515 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | 515 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, |
| 516 | mt46h32m32lf6_sdrc_params); | 516 | mt46h32m32lf6_sdrc_params); |
| 517 | 517 | ||
| 518 | omap_mux_init_gpio(170, OMAP_PIN_INPUT); | ||
| 519 | /* REVISIT leave DVI powered down until it's needed ... */ | ||
| 520 | gpio_request_one(170, GPIOF_OUT_INIT_HIGH, "DVI_nPD"); | ||
| 521 | |||
| 522 | usb_musb_init(NULL); | 518 | usb_musb_init(NULL); |
| 523 | usbhs_init(&usbhs_bdata); | 519 | usbhs_init(&usbhs_bdata); |
| 524 | omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, | 520 | omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions, |
| @@ -144,7 +144,6 @@ static struct lis3lv02d_platform_data rx51_lis3lv02d_data = { · 143 unmodified lines | |||
| 144 | .release_resources = lis302_release, | 144 | .release_resources = lis302_release, |
| 145 | .st_min_limits = {-32, 3, 3}, | 145 | .st_min_limits = {-32, 3, 3}, |
| 146 | .st_max_limits = {-3, 32, 32}, | 146 | .st_max_limits = {-3, 32, 32}, |
| 147 | .irq2 = OMAP_GPIO_IRQ(LIS302_IRQ2_GPIO), | ||
| 148 | }; | 147 | }; |
| 149 | #endif | 148 | #endif |
| 150 | 149 | ||
| @@ -1030,7 +1029,6 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_3[] = { · 879 unmodified lines | |||
| 1030 | { | 1029 | { |
| 1031 | I2C_BOARD_INFO("lis3lv02d", 0x1d), | 1030 | I2C_BOARD_INFO("lis3lv02d", 0x1d), |
| 1032 | .platform_data = &rx51_lis3lv02d_data, | 1031 | .platform_data = &rx51_lis3lv02d_data, |
| 1033 | .irq = OMAP_GPIO_IRQ(LIS302_IRQ1_GPIO), | ||
| 1034 | }, | 1032 | }, |
| 1035 | #endif | 1033 | #endif |
| 1036 | }; | 1034 | }; |
| @@ -1056,6 +1054,10 @@ static int __init rx51_i2c_init(void) · 19 unmodified lines | |||
| 1056 | omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata); | 1054 | omap_pmic_init(1, 2200, "twl5030", INT_34XX_SYS_NIRQ, &rx51_twldata); |
| 1057 | omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2, | 1055 | omap_register_i2c_bus(2, 100, rx51_peripherals_i2c_board_info_2, |
| 1058 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_2)); | 1056 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_2)); |
| 1057 | #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE) | ||
| 1058 | rx51_lis3lv02d_data.irq2 = gpio_to_irq(LIS302_IRQ2_GPIO); | ||
| 1059 | rx51_peripherals_i2c_board_info_3[0].irq = gpio_to_irq(LIS302_IRQ1_GPIO); | ||
| 1060 | #endif | ||
| 1059 | omap_register_i2c_bus(3, 400, rx51_peripherals_i2c_board_info_3, | 1061 | omap_register_i2c_bus(3, 400, rx51_peripherals_i2c_board_info_3, |
| 1060 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_3)); | 1062 | ARRAY_SIZE(rx51_peripherals_i2c_board_info_3)); |
| 1061 | return 0; | 1063 | return 0; |
| @@ -3514,7 +3514,7 @@ int __init omap3xxx_clk_init(void) · 3513 unmodified lines | |||
| 3514 | struct omap_clk *c; | 3514 | struct omap_clk *c; |
| 3515 | u32 cpu_clkflg = 0; | 3515 | u32 cpu_clkflg = 0; |
| 3516 | 3516 | ||
| 3517 | if (cpu_is_omap3517()) { | 3517 | if (soc_is_am35xx()) { |
| 3518 | cpu_mask = RATE_IN_34XX; | 3518 | cpu_mask = RATE_IN_34XX; |
| 3519 | cpu_clkflg = CK_AM35XX; | 3519 | cpu_clkflg = CK_AM35XX; |
| 3520 | } else if (cpu_is_omap3630()) { | 3520 | } else if (cpu_is_omap3630()) { |
| @@ -84,6 +84,7 @@ static struct clk slimbus_clk = { · 83 unmodified lines | |||
| 84 | 84 | ||
| 85 | static struct clk sys_32k_ck = { | 85 | static struct clk sys_32k_ck = { |
| 86 | .name = "sys_32k_ck", | 86 | .name = "sys_32k_ck", |
| 87 | .clkdm_name = "prm_clkdm", | ||
| 87 | .rate = 32768, | 88 | .rate = 32768, |
| 88 | .ops = &clkops_null, | 89 | .ops = &clkops_null, |
| 89 | }; | 90 | }; |
| @@ -512,6 +513,7 @@ static struct clk ddrphy_ck = { · 422 unmodified lines | |||
| 512 | .name = "ddrphy_ck", | 513 | .name = "ddrphy_ck", |
| 513 | .parent = &dpll_core_m2_ck, | 514 | .parent = &dpll_core_m2_ck, |
| 514 | .ops = &clkops_null, | 515 | .ops = &clkops_null, |
| 516 | .clkdm_name = "l3_emif_clkdm", | ||
| 515 | .fixed_div = 2, | 517 | .fixed_div = 2, |
| 516 | .recalc = &omap_fixed_divisor_recalc, | 518 | .recalc = &omap_fixed_divisor_recalc, |
| 517 | }; | 519 | }; |
| @@ -769,6 +771,7 @@ static const struct clksel dpll_mpu_m2_div[] = { · 251 unmodified lines | |||
| 769 | static struct clk dpll_mpu_m2_ck = { | 771 | static struct clk dpll_mpu_m2_ck = { |
| 770 | .name = "dpll_mpu_m2_ck", | 772 | .name = "dpll_mpu_m2_ck", |
| 771 | .parent = &dpll_mpu_ck, | 773 | .parent = &dpll_mpu_ck, |
| 774 | .clkdm_name = "cm_clkdm", | ||
| 772 | .clksel = dpll_mpu_m2_div, | 775 | .clksel = dpll_mpu_m2_div, |
| 773 | .clksel_reg = OMAP4430_CM_DIV_M2_DPLL_MPU, | 776 | .clksel_reg = OMAP4430_CM_DIV_M2_DPLL_MPU, |
| 774 | .clksel_mask = OMAP4430_DPLL_CLKOUT_DIV_MASK, | 777 | .clksel_mask = OMAP4430_DPLL_CLKOUT_DIV_MASK, |
| @@ -1149,6 +1152,7 @@ static const struct clksel l3_div_div[] = { · 374 unmodified lines | |||
| 1149 | static struct clk l3_div_ck = { | 1152 | static struct clk l3_div_ck = { |
| 1150 | .name = "l3_div_ck", | 1153 | .name = "l3_div_ck", |
| 1151 | .parent = &div_core_ck, | 1154 | .parent = &div_core_ck, |
| 1155 | .clkdm_name = "cm_clkdm", | ||
| 1152 | .clksel = l3_div_div, | 1156 | .clksel = l3_div_div, |
| 1153 | .clksel_reg = OMAP4430_CM_CLKSEL_CORE, | 1157 | .clksel_reg = OMAP4430_CM_CLKSEL_CORE, |
| 1154 | .clksel_mask = OMAP4430_CLKSEL_L3_MASK, | 1158 | .clksel_mask = OMAP4430_CLKSEL_L3_MASK, |
| @@ -2824,6 +2828,7 @@ static const struct clksel trace_clk_div_div[] = { · 1669 unmodified lines | |||
| 2824 | static struct clk trace_clk_div_ck = { | 2828 | static struct clk trace_clk_div_ck = { |
| 2825 | .name = "trace_clk_div_ck", | 2829 | .name = "trace_clk_div_ck", |
| 2826 | .parent = &pmd_trace_clk_mux_ck, | 2830 | .parent = &pmd_trace_clk_mux_ck, |
| 2831 | .clkdm_name = "emu_sys_clkdm", | ||
| 2827 | .clksel = trace_clk_div_div, | 2832 | .clksel = trace_clk_div_div, |
| 2828 | .clksel_reg = OMAP4430_CM_EMU_DEBUGSS_CLKCTRL, | 2833 | .clksel_reg = OMAP4430_CM_EMU_DEBUGSS_CLKCTRL, |
| 2829 | .clksel_mask = OMAP4430_CLKSEL_PMD_TRACE_CLK_MASK, | 2834 | .clksel_mask = OMAP4430_CLKSEL_PMD_TRACE_CLK_MASK, |
| @@ -22,4 +22,15 @@ · 21 unmodified lines | |||
| 22 | */ | 22 | */ |
| 23 | #define MAX_MODULE_READY_TIME 2000 | 23 | #define MAX_MODULE_READY_TIME 2000 |
| 24 | 24 | ||
| 25 | /* | ||
| 26 | * MAX_MODULE_DISABLE_TIME: max duration in microseconds to wait for | ||
| 27 | * the PRCM to request that a module enter the inactive state in the | ||
| 28 | * case of OMAP2 & 3. In the case of OMAP4 this is the max duration | ||
| 29 | * in microseconds for the module to reach the inactive state from | ||
| 30 | * a functional state. | ||
| 31 | * XXX FSUSB on OMAP4430 takes ~4ms to idle after reset during | ||
| 32 | * kernel init. | ||
| 33 | */ | ||
| 34 | #define MAX_MODULE_DISABLE_TIME 5000 | ||
| 35 | |||
| 25 | #endif | 36 | #endif |
| @@ -313,9 +313,9 @@ int omap4_cminst_wait_module_idle(u8 part, u16 inst, s16 cdoffs, u16 clkctrl_off · 312 unmodified lines | |||
| 313 | 313 | ||
| 314 | omap_test_timeout((_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) == | 314 | omap_test_timeout((_clkctrl_idlest(part, inst, cdoffs, clkctrl_offs) == |
| 315 | CLKCTRL_IDLEST_DISABLED), | 315 | CLKCTRL_IDLEST_DISABLED), |
| 316 | MAX_MODULE_READY_TIME, i); | 316 | MAX_MODULE_DISABLE_TIME, i); |
| 317 | 317 | ||
| 318 | return (i < MAX_MODULE_READY_TIME) ? 0 : -EBUSY; | 318 | return (i < MAX_MODULE_DISABLE_TIME) ? 0 : -EBUSY; |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | /** | 321 | /** |
| @@ -20,6 +20,9 @@ · 19 unmodified lines | |||
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | |||
| 24 | #include <asm/memblock.h> | ||
| 25 | |||
| 23 | #include "cm2xxx_3xxx.h" | 26 | #include "cm2xxx_3xxx.h" |
| 24 | #include "prm2xxx_3xxx.h" | 27 | #include "prm2xxx_3xxx.h" |
| 25 | #ifdef CONFIG_BRIDGE_DVFS | 28 | #ifdef CONFIG_BRIDGE_DVFS |
| @@ -246,6 +246,17 @@ void __init omap3xxx_check_features(void) · 245 unmodified lines | |||
| 246 | 246 | ||
| 247 | omap_features |= OMAP3_HAS_SDRC; | 247 | omap_features |= OMAP3_HAS_SDRC; |
| 248 | 248 | ||
| 249 | /* | ||
| 250 | * am35x fixups: | ||
| 251 | * - The am35x Chip ID register has bits 12, 7:5, and 3:2 marked as | ||
| 252 | * reserved and therefore return 0 when read. Unfortunately, | ||
| 253 | * OMAP3_CHECK_FEATURE() will interpret some of those zeroes to | ||
| 254 | * mean that a feature is present even though it isn't so clear | ||
| 255 | * the incorrectly set feature bits. | ||
| 256 | */ | ||
| 257 | if (soc_is_am35xx()) | ||
| 258 | omap_features &= ~(OMAP3_HAS_IVA | OMAP3_HAS_ISP); | ||
| 259 | |||
| 249 | /* | 260 | /* |
| 250 | * TODO: Get additional info (where applicable) | 261 | * TODO: Get additional info (where applicable) |
| 251 | * e.g. Size of L2 cache. | 262 | * e.g. Size of L2 cache. |
| @@ -149,6 +149,7 @@ omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) · 148 unmodified lines | |||
| 149 | ct->chip.irq_ack = omap_mask_ack_irq; | 149 | ct->chip.irq_ack = omap_mask_ack_irq; |
| 150 | ct->chip.irq_mask = irq_gc_mask_disable_reg; | 150 | ct->chip.irq_mask = irq_gc_mask_disable_reg; |
| 151 | ct->chip.irq_unmask = irq_gc_unmask_enable_reg; | 151 | ct->chip.irq_unmask = irq_gc_unmask_enable_reg; |
| 152 | ct->chip.flags |= IRQCHIP_SKIP_SET_WAKE; | ||
| 152 | 153 | ||
| 153 | ct->regs.enable = INTC_MIR_CLEAR0; | 154 | ct->regs.enable = INTC_MIR_CLEAR0; |
| 154 | ct->regs.disable = INTC_MIR_SET0; | 155 | ct->regs.disable = INTC_MIR_SET0; |
| @@ -41,6 +41,7 @@ · 40 unmodified lines | |||
| 41 | #include "control.h" | 41 | #include "control.h" |
| 42 | #include "mux.h" | 42 | #include "mux.h" |
| 43 | #include "prm.h" | 43 | #include "prm.h" |
| 44 | #include "common.h" | ||
| 44 | 45 | ||
| 45 | #define OMAP_MUX_BASE_OFFSET 0x30 /* Offset from CTRL_BASE */ | 46 | #define OMAP_MUX_BASE_OFFSET 0x30 /* Offset from CTRL_BASE */ |
| 46 | #define OMAP_MUX_BASE_SZ 0x5ca | 47 | #define OMAP_MUX_BASE_SZ 0x5ca |
| @@ -217,8 +218,7 @@ static int __init _omap_mux_get_by_name(struct omap_mux_partition *partition, · 170 unmodified lines | |||
| 217 | return -ENODEV; | 218 | return -ENODEV; |
| 218 | } | 219 | } |
| 219 | 220 | ||
| 220 | static int __init | 221 | int __init omap_mux_get_by_name(const char *muxname, |
| 221 | omap_mux_get_by_name(const char *muxname, | ||
| 222 | struct omap_mux_partition **found_partition, | 222 | struct omap_mux_partition **found_partition, |
| 223 | struct omap_mux **found_mux) | 223 | struct omap_mux **found_mux) |
| 224 | { | 224 | { |
| @@ -59,6 +59,7 @@ · 58 unmodified lines | |||
| 59 | #define OMAP_PIN_OFF_WAKEUPENABLE OMAP_WAKEUP_EN | 59 | #define OMAP_PIN_OFF_WAKEUPENABLE OMAP_WAKEUP_EN |
| 60 | 60 | ||
| 61 | #define OMAP_MODE_GPIO(x) (((x) & OMAP_MUX_MODE7) == OMAP_MUX_MODE4) | 61 | #define OMAP_MODE_GPIO(x) (((x) & OMAP_MUX_MODE7) == OMAP_MUX_MODE4) |
| 62 | #define OMAP_MODE_UART(x) (((x) & OMAP_MUX_MODE7) == OMAP_MUX_MODE0) | ||
| 62 | 63 | ||
| 63 | /* Flags for omapX_mux_init */ | 64 | /* Flags for omapX_mux_init */ |
| 64 | #define OMAP_PACKAGE_MASK 0xffff | 65 | #define OMAP_PACKAGE_MASK 0xffff |
| @@ -225,8 +226,18 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads); · 160 unmodified lines | |||
| 225 | */ | 226 | */ |
| 226 | void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state); | 227 | void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state); |
| 227 | 228 | ||
| 229 | int omap_mux_get_by_name(const char *muxname, | ||
| 230 | struct omap_mux_partition **found_partition, | ||
| 231 | struct omap_mux **found_mux); | ||
| 228 | #else | 232 | #else |
| 229 | 233 | ||
| 234 | static inline int omap_mux_get_by_name(const char *muxname, | ||
| 235 | struct omap_mux_partition **found_partition, | ||
| 236 | struct omap_mux **found_mux) | ||
| 237 | { | ||
| 238 | return 0; | ||
| 239 | } | ||
| 240 | |||
| 230 | static inline int omap_mux_init_gpio(int gpio, int val) | 241 | static inline int omap_mux_init_gpio(int gpio, int val) |
| 231 | { | 242 | { |
| 232 | return 0; | 243 | return 0; |
| @@ -530,7 +530,7 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v) · 529 unmodified lines | |||
| 530 | if (oh->class->sysc->idlemodes & SIDLE_SMART_WKUP) | 530 | if (oh->class->sysc->idlemodes & SIDLE_SMART_WKUP) |
| 531 | _set_slave_idlemode(oh, HWMOD_IDLEMODE_SMART, v); | 531 | _set_slave_idlemode(oh, HWMOD_IDLEMODE_SMART, v); |
| 532 | if (oh->class->sysc->idlemodes & MSTANDBY_SMART_WKUP) | 532 | if (oh->class->sysc->idlemodes & MSTANDBY_SMART_WKUP) |
| 533 | _set_master_standbymode(oh, HWMOD_IDLEMODE_SMART_WKUP, v); | 533 | _set_master_standbymode(oh, HWMOD_IDLEMODE_SMART, v); |
| 534 | 534 | ||
| 535 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ | 535 | /* XXX test pwrdm_get_wken for this hwmod's subsystem */ |
| 536 | 536 | ||
| @@ -393,8 +393,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_counter_sysc = { · 392 unmodified lines | |||
| 393 | .rev_offs = 0x0000, | 393 | .rev_offs = 0x0000, |
| 394 | .sysc_offs = 0x0004, | 394 | .sysc_offs = 0x0004, |
| 395 | .sysc_flags = SYSC_HAS_SIDLEMODE, | 395 | .sysc_flags = SYSC_HAS_SIDLEMODE, |
| 396 | .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | | 396 | .idlemodes = (SIDLE_FORCE | SIDLE_NO), |
| 397 | SIDLE_SMART_WKUP), | ||
| 398 | .sysc_fields = &omap_hwmod_sysc_type1, | 397 | .sysc_fields = &omap_hwmod_sysc_type1, |
| 399 | }; | 398 | }; |
| 400 | 399 | ||
| @@ -854,6 +853,11 @@ static struct omap_hwmod omap44xx_dss_hdmi_hwmod = { · 453 unmodified lines | |||
| 854 | .name = "dss_hdmi", | 853 | .name = "dss_hdmi", |
| 855 | .class = &omap44xx_hdmi_hwmod_class, | 854 | .class = &omap44xx_hdmi_hwmod_class, |
| 856 | .clkdm_name = "l3_dss_clkdm", | 855 | .clkdm_name = "l3_dss_clkdm", |
| 856 | /* | ||
| 857 | * HDMI audio requires to use no-idle mode. Hence, | ||
| 858 | * set idle mode by software. | ||
| 859 | */ | ||
| 860 | .flags = HWMOD_SWSUP_SIDLE, | ||
| 857 | .mpu_irqs = omap44xx_dss_hdmi_irqs, | 861 | .mpu_irqs = omap44xx_dss_hdmi_irqs, |
| 858 | .sdma_reqs = omap44xx_dss_hdmi_sdma_reqs, | 862 | .sdma_reqs = omap44xx_dss_hdmi_sdma_reqs, |
| 859 | .main_clk = "dss_48mhz_clk", | 863 | .main_clk = "dss_48mhz_clk", |
| @@ -155,10 +155,11 @@ static irqreturn_t omap3_l3_block_irq(struct omap3_l3 *l3, · 154 unmodified lines | |||
| 155 | u8 multi = error & L3_ERROR_LOG_MULTI; | 155 | u8 multi = error & L3_ERROR_LOG_MULTI; |
| 156 | u32 address = omap3_l3_decode_addr(error_addr); | 156 | u32 address = omap3_l3_decode_addr(error_addr); |
| 157 | 157 | ||
| 158 | WARN(true, "%s seen by %s %s at address %x\n", | 158 | pr_err("%s seen by %s %s at address %x\n", |
| 159 | omap3_l3_code_string(code), | 159 | omap3_l3_code_string(code), |
| 160 | omap3_l3_initiator_string(initid), | 160 | omap3_l3_initiator_string(initid), |
| 161 | multi ? "Multiple Errors" : "", address); | 161 | multi ? "Multiple Errors" : "", address); |
| 162 | WARN_ON(1); | ||
| 162 | 163 | ||
| 163 | return IRQ_HANDLED; | 164 | return IRQ_HANDLED; |
| 164 | } | 165 | } |
| @@ -239,21 +239,15 @@ void am35x_set_mode(u8 musb_mode) · 238 unmodified lines | |||
| 239 | 239 | ||
| 240 | devconf2 &= ~CONF2_OTGMODE; | 240 | devconf2 &= ~CONF2_OTGMODE; |
| 241 | switch (musb_mode) { | 241 | switch (musb_mode) { |
| 242 | #ifdef CONFIG_USB_MUSB_HDRC_HCD | ||
| 243 | case MUSB_HOST: /* Force VBUS valid, ID = 0 */ | 242 | case MUSB_HOST: /* Force VBUS valid, ID = 0 */ |
| 244 | devconf2 |= CONF2_FORCE_HOST; | 243 | devconf2 |= CONF2_FORCE_HOST; |
| 245 | break; | 244 | break; |
| 246 | #endif | ||
| 247 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC | ||
| 248 | case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */ | 245 | case MUSB_PERIPHERAL: /* Force VBUS valid, ID = 1 */ |
| 249 | devconf2 |= CONF2_FORCE_DEVICE; | 246 | devconf2 |= CONF2_FORCE_DEVICE; |
| 250 | break; | 247 | break; |
| 251 | #endif | ||
| 252 | #ifdef CONFIG_USB_MUSB_OTG | ||
| 253 | case MUSB_OTG: /* Don't override the VBUS/ID comparators */ | 248 | case MUSB_OTG: /* Don't override the VBUS/ID comparators */ |
| 254 | devconf2 |= CONF2_NO_OVERRIDE; | 249 | devconf2 |= CONF2_NO_OVERRIDE; |
| 255 | break; | 250 | break; |
| 256 | #endif | ||
| 257 | default: | 251 | default: |
| 258 | pr_info(KERN_INFO "Unsupported mode %u\n", musb_mode); | 252 | pr_info(KERN_INFO "Unsupported mode %u\n", musb_mode); |
| 259 | } | 253 | } |
| @@ -724,6 +724,7 @@ int __init omap3_pm_init(void) · 723 unmodified lines | |||
| 724 | ret = request_irq(omap_prcm_event_to_irq("io"), | 724 | ret = request_irq(omap_prcm_event_to_irq("io"), |
| 725 | _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io", | 725 | _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io", |
| 726 | omap3_pm_init); | 726 | omap3_pm_init); |
| 727 | enable_irq(omap_prcm_event_to_irq("io")); | ||
| 727 | 728 | ||
| 728 | if (ret) { | 729 | if (ret) { |
| 729 | pr_err("pm: Failed to request pm_io irq\n"); | 730 | pr_err("pm: Failed to request pm_io irq\n"); |
| @@ -15,6 +15,7 @@ · 14 unmodified lines | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/irq.h> | ||
| 18 | 19 | ||
| 19 | #include "common.h" | 20 | #include "common.h" |
| 20 | #include <plat/cpu.h> | 21 | #include <plat/cpu.h> |
| @@ -303,8 +304,15 @@ void omap3xxx_prm_restore_irqen(u32 *saved_mask) · 282 unmodified lines | |||
| 303 | 304 | ||
| 304 | static int __init omap3xxx_prcm_init(void) | 305 | static int __init omap3xxx_prcm_init(void) |
| 305 | { | 306 | { |
| 306 | if (cpu_is_omap34xx()) | 307 | int ret = 0; |
| 307 | return omap_prcm_register_chain_handler(&omap3_prcm_irq_setup); | 308 | |
| 308 | return 0; | 309 | if (cpu_is_omap34xx()) { |
| 310 | ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup); | ||
| 311 | if (!ret) | ||
| 312 | irq_set_status_flags(omap_prcm_event_to_irq("io"), | ||
| 313 | IRQ_NOAUTOEN); | ||
| 314 | } | ||
| 315 | |||
| 316 | return ret; | ||
| 309 | } | 317 | } |
| 310 | subsys_initcall(omap3xxx_prcm_init); | 318 | subsys_initcall(omap3xxx_prcm_init); |
| @@ -57,6 +57,7 @@ struct omap_uart_state { · 56 unmodified lines | |||
| 57 | 57 | ||
| 58 | struct list_head node; | 58 | struct list_head node; |
| 59 | struct omap_hwmod *oh; | 59 | struct omap_hwmod *oh; |
| 60 | struct omap_device_pad default_omap_uart_pads[2]; | ||
| 60 | }; | 61 | }; |
| 61 | 62 | ||
| 62 | static LIST_HEAD(uart_list); | 63 | static LIST_HEAD(uart_list); |
| @@ -126,11 +127,70 @@ static void omap_uart_set_smartidle(struct platform_device *pdev) {} · 63 unmodified lines | |||
| 126 | #endif /* CONFIG_PM */ | 127 | #endif /* CONFIG_PM */ |
| 127 | 128 | ||
| 128 | #ifdef CONFIG_OMAP_MUX | 129 | #ifdef CONFIG_OMAP_MUX |
| 129 | static void omap_serial_fill_default_pads(struct omap_board_data *bdata) | 130 | |
| 131 | #define OMAP_UART_DEFAULT_PAD_NAME_LEN 28 | ||
| 132 | static char rx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN], | ||
| 133 | tx_pad_name[OMAP_UART_DEFAULT_PAD_NAME_LEN] __initdata; | ||
| 134 | |||
| 135 | static void __init | ||
| 136 | omap_serial_fill_uart_tx_rx_pads(struct omap_board_data *bdata, | ||
| 137 | struct omap_uart_state *uart) | ||
| 138 | { | ||
| 139 | uart->default_omap_uart_pads[0].name = rx_pad_name; | ||
| 140 | uart->default_omap_uart_pads[0].flags = OMAP_DEVICE_PAD_REMUX | | ||
| 141 | OMAP_DEVICE_PAD_WAKEUP; | ||
| 142 | uart->default_omap_uart_pads[0].enable = OMAP_PIN_INPUT | | ||
| 143 | OMAP_MUX_MODE0; | ||
| 144 | uart->default_omap_uart_pads[0].idle = OMAP_PIN_INPUT | OMAP_MUX_MODE0; | ||
| 145 | uart->default_omap_uart_pads[1].name = tx_pad_name; | ||
| 146 | uart->default_omap_uart_pads[1].enable = OMAP_PIN_OUTPUT | | ||
| 147 | OMAP_MUX_MODE0; | ||
| 148 | bdata->pads = uart->default_omap_uart_pads; | ||
| 149 | bdata->pads_cnt = ARRAY_SIZE(uart->default_omap_uart_pads); | ||
| 150 | } | ||
| 151 | |||
| 152 | static void __init omap_serial_check_wakeup(struct omap_board_data *bdata, | ||
| 153 | struct omap_uart_state *uart) | ||
| 130 | { | 154 | { |
| 155 | struct omap_mux_partition *tx_partition = NULL, *rx_partition = NULL; | ||
| 156 | struct omap_mux *rx_mux = NULL, *tx_mux = NULL; | ||
| 157 | char *rx_fmt, *tx_fmt; | ||
| 158 | int uart_nr = bdata->id + 1; | ||
| 159 | |||
| 160 | if (bdata->id != 2) { | ||
| 161 | rx_fmt = "uart%d_rx.uart%d_rx"; | ||
| 162 | tx_fmt = "uart%d_tx.uart%d_tx"; | ||
| 163 | } else { | ||
| 164 | rx_fmt = "uart%d_rx_irrx.uart%d_rx_irrx"; | ||
| 165 | tx_fmt = "uart%d_tx_irtx.uart%d_tx_irtx"; | ||
| 166 | } | ||
| 167 | |||
| 168 | snprintf(rx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, rx_fmt, | ||
| 169 | uart_nr, uart_nr); | ||
| 170 | snprintf(tx_pad_name, OMAP_UART_DEFAULT_PAD_NAME_LEN, tx_fmt, | ||
| 171 | uart_nr, uart_nr); | ||
| 172 | |||
| 173 | if (omap_mux_get_by_name(rx_pad_name, &rx_partition, &rx_mux) >= 0 && | ||
| 174 | omap_mux_get_by_name | ||
| 175 | (tx_pad_name, &tx_partition, &tx_mux) >= 0) { | ||
| 176 | u16 tx_mode, rx_mode; | ||
| 177 | |||
| 178 | tx_mode = omap_mux_read(tx_partition, tx_mux->reg_offset); | ||
| 179 | rx_mode = omap_mux_read(rx_partition, rx_mux->reg_offset); | ||
| 180 | |||
| 181 | /* | ||
| 182 | * Check if uart is used in default tx/rx mode i.e. in mux mode0 | ||
| 183 | * if yes then configure rx pin for wake up capability | ||
| 184 | */ | ||
| 185 | if (OMAP_MODE_UART(rx_mode) && OMAP_MODE_UART(tx_mode)) | ||
| 186 | omap_serial_fill_uart_tx_rx_pads(bdata, uart); | ||
| 187 | } | ||
| 131 | } | 188 | } |
| 132 | #else | 189 | #else |
| 133 | static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {} | 190 | static void __init omap_serial_check_wakeup(struct omap_board_data *bdata, |
| 191 | struct omap_uart_state *uart) | ||
| 192 | { | ||
| 193 | } | ||
| 134 | #endif | 194 | #endif |
| 135 | 195 | ||
| 136 | static char *cmdline_find_option(char *str) | 196 | static char *cmdline_find_option(char *str) |
| @@ -287,8 +347,7 @@ void __init omap_serial_board_init(struct omap_uart_port_info *info) · 150 unmodified lines | |||
| 287 | bdata.pads = NULL; | 347 | bdata.pads = NULL; |
| 288 | bdata.pads_cnt = 0; | 348 | bdata.pads_cnt = 0; |
| 289 | 349 | ||
| 290 | if (cpu_is_omap44xx() || cpu_is_omap34xx()) | 350 | omap_serial_check_wakeup(&bdata, uart); |
| 291 | omap_serial_fill_default_pads(&bdata); | ||
| 292 | 351 | ||
| 293 | if (!info) | 352 | if (!info) |
| 294 | omap_serial_init_port(&bdata, NULL); | 353 | omap_serial_init_port(&bdata, NULL); |
| @@ -41,12 +41,10 @@ static struct musb_hdrc_config musb_config = { · 40 unmodified lines | |||
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | static struct musb_hdrc_platform_data musb_plat = { | 43 | static struct musb_hdrc_platform_data musb_plat = { |
| 44 | #ifdef CONFIG_USB_MUSB_OTG | 44 | #ifdef CONFIG_USB_GADGET_MUSB_HDRC |
| 45 | .mode = MUSB_OTG, | 45 | .mode = MUSB_OTG, |
| 46 | #elif defined(CONFIG_USB_MUSB_HDRC_HCD) | 46 | #else |
| 47 | .mode = MUSB_HOST, | 47 | .mode = MUSB_HOST, |
| 48 | #elif defined(CONFIG_USB_GADGET_MUSB_HDRC) | ||
| 49 | .mode = MUSB_PERIPHERAL, | ||
| 50 | #endif | 48 | #endif |
| 51 | /* .clock is set dynamically */ | 49 | /* .clock is set dynamically */ |
| 52 | .config = &musb_config, | 50 | .config = &musb_config, |
| @@ -300,7 +300,7 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, · 299 unmodified lines | |||
| 300 | printk(error, 3, status); | 300 | printk(error, 3, status); |
| 301 | return status; | 301 | return status; |
| 302 | } | 302 | } |
| 303 | tusb_resources[2].start = irq + IH_GPIO_BASE; | 303 | tusb_resources[2].start = gpio_to_irq(irq); |
| 304 | 304 | ||
| 305 | /* set up memory timings ... can speed them up later */ | 305 | /* set up memory timings ... can speed them up later */ |
| 306 | if (!ps_refclk) { | 306 | if (!ps_refclk) { |
| @@ -35,5 +35,5 @@ · 34 unmodified lines | |||
| 35 | #define MAIN_IRQ_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x204) | 35 | #define MAIN_IRQ_MASK (ORION5X_BRIDGE_VIRT_BASE | 0x204) |
| 36 | 36 | ||
| 37 | #define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300) | 37 | #define TIMER_VIRT_BASE (ORION5X_BRIDGE_VIRT_BASE | 0x300) |
| 38 | 38 | #define TIMER_PHYS_BASE (ORION5X_BRIDGE_PHYS_BASE | 0x300) | |
| 39 | #endif | 39 | #endif |
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/include/mach/io.h | ||
| 3 | * | ||
| 4 | * This file is licensed under the terms of the GNU General Public | ||
| 5 | * License version 2. This program is licensed "as is" without any | ||
| 6 | * warranty of any kind, whether express or implied. | ||
| 7 | */ | ||
| 8 | |||
| 9 | #ifndef __ASM_ARCH_IO_H | ||
| 10 | #define __ASM_ARCH_IO_H | ||
| 11 | |||
| 12 | #include <mach/orion5x.h> | ||
| 13 | #include <asm/sizes.h> | ||
| 14 | |||
| 15 | #define IO_SPACE_LIMIT SZ_2M | ||
| 16 | static inline void __iomem *__io(unsigned long addr) | ||
| 17 | { | ||
| 18 | return (void __iomem *)(addr + ORION5X_PCIE_IO_VIRT_BASE); | ||
| 19 | } | ||
| 20 | |||
| 21 | #define __io(a) __io(a) | ||
| 22 | #endif | ||
| @@ -82,6 +82,7 @@ · 81 unmodified lines | |||
| 82 | #define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100) | 82 | #define UART1_VIRT_BASE (ORION5X_DEV_BUS_VIRT_BASE | 0x2100) |
| 83 | 83 | ||
| 84 | #define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000) | 84 | #define ORION5X_BRIDGE_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x20000) |
| 85 | #define ORION5X_BRIDGE_PHYS_BASE (ORION5X_REGS_PHYS_BASE | 0x20000) | ||
| 85 | 86 | ||
| 86 | #define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000) | 87 | #define ORION5X_PCI_VIRT_BASE (ORION5X_REGS_VIRT_BASE | 0x30000) |
| 87 | 88 | ||
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Debugging macro include header spear13xx machine family | 4 | * Debugging macro include header spear13xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * DMA information for SPEAr13xx machine family | 4 | * DMA information for SPEAr13xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * spear13xx machine family generic header file | 4 | * spear13xx machine family generic header file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * GPIO macros for SPEAr13xx machine family | 4 | * GPIO macros for SPEAr13xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * IRQ helper macros for spear13xx machine family | 4 | * IRQ helper macros for spear13xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * spear13xx Machine family specific definition | 4 | * spear13xx Machine family specific definition |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr3XX machine family specific timex definitions | 4 | * SPEAr3XX machine family specific timex definitions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Serial port stubs for kernel decompress status messages | 4 | * Serial port stubs for kernel decompress status messages |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr1310 machine source file | 4 | * SPEAr1310 machine source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr1340 machine source file | 4 | * SPEAr1340 machine source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr13XX machines common source file | 4 | * SPEAr13XX machines common source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Debugging macro include header spear3xx machine family | 4 | * Debugging macro include header spear3xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar<viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr3XX machine family generic header file | 4 | * SPEAr3XX machine family generic header file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar<viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * GPIO macros for SPEAr3xx machine family | 4 | * GPIO macros for SPEAr3xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar<viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * IRQ helper macros for SPEAr3xx machine family | 4 | * IRQ helper macros for SPEAr3xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Miscellaneous registers definitions for SPEAr3xx machine family | 4 | * Miscellaneous registers definitions for SPEAr3xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr3xx Machine family specific definition | 4 | * SPEAr3xx Machine family specific definition |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr3XX machine family specific timex definitions | 4 | * SPEAr3XX machine family specific timex definitions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Serial port stubs for kernel decompress status messages | 4 | * Serial port stubs for kernel decompress status messages |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr300 machine source file | 4 | * SPEAr300 machine source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009-2012 ST Microelectronics | 6 | * Copyright (C) 2009-2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr310 machine source file | 4 | * SPEAr310 machine source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009-2012 ST Microelectronics | 6 | * Copyright (C) 2009-2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr320 machine source file | 4 | * SPEAr320 machine source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009-2012 ST Microelectronics | 6 | * Copyright (C) 2009-2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr3XX machines common source file | 4 | * SPEAr3XX machines common source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009-2012 ST Microelectronics | 6 | * Copyright (C) 2009-2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * GPIO macros for SPEAr6xx machine family | 4 | * GPIO macros for SPEAr6xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Miscellaneous registers definitions for SPEAr6xx machine family | 4 | * Miscellaneous registers definitions for SPEAr6xx machine family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | static bool is_enabled; | 34 | static bool is_enabled; |
| 35 | 35 | ||
| 36 | static void tegra_cpu_reset_handler_enable(void) | 36 | static void __init tegra_cpu_reset_handler_enable(void) |
| 37 | { | 37 | { |
| 38 | void __iomem *iram_base = IO_ADDRESS(TEGRA_IRAM_RESET_BASE); | 38 | void __iomem *iram_base = IO_ADDRESS(TEGRA_IRAM_RESET_BASE); |
| 39 | void __iomem *evp_cpu_reset = | 39 | void __iomem *evp_cpu_reset = |
| @@ -580,43 +580,12 @@ static void ux500_uart0_reset(void) · 579 unmodified lines | |||
| 580 | udelay(1); | 580 | udelay(1); |
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | /* This needs to be referenced by callbacks */ | ||
| 584 | struct pinctrl *u0_p; | ||
| 585 | struct pinctrl_state *u0_def; | ||
| 586 | struct pinctrl_state *u0_sleep; | ||
| 587 | |||
| 588 | static void ux500_uart0_init(void) | ||
| 589 | { | ||
| 590 | int ret; | ||
| 591 | |||
| 592 | if (IS_ERR(u0_p) || IS_ERR(u0_def)) | ||
| 593 | return; | ||
| 594 | |||
| 595 | ret = pinctrl_select_state(u0_p, u0_def); | ||
| 596 | if (ret) | ||
| 597 | pr_err("could not set UART0 defstate\n"); | ||
| 598 | } | ||
| 599 | |||
| 600 | static void ux500_uart0_exit(void) | ||
| 601 | { | ||
| 602 | int ret; | ||
| 603 | |||
| 604 | if (IS_ERR(u0_p) || IS_ERR(u0_sleep)) | ||
| 605 | return; | ||
| 606 | |||
| 607 | ret = pinctrl_select_state(u0_p, u0_sleep); | ||
| 608 | if (ret) | ||
| 609 | pr_err("could not set UART0 idlestate\n"); | ||
| 610 | } | ||
| 611 | |||
| 612 | static struct amba_pl011_data uart0_plat = { | 583 | static struct amba_pl011_data uart0_plat = { |
| 613 | #ifdef CONFIG_STE_DMA40 | 584 | #ifdef CONFIG_STE_DMA40 |
| 614 | .dma_filter = stedma40_filter, | 585 | .dma_filter = stedma40_filter, |
| 615 | .dma_rx_param = &uart0_dma_cfg_rx, | 586 | .dma_rx_param = &uart0_dma_cfg_rx, |
| 616 | .dma_tx_param = &uart0_dma_cfg_tx, | 587 | .dma_tx_param = &uart0_dma_cfg_tx, |
| 617 | #endif | 588 | #endif |
| 618 | .init = ux500_uart0_init, | ||
| 619 | .exit = ux500_uart0_exit, | ||
| 620 | .reset = ux500_uart0_reset, | 589 | .reset = ux500_uart0_reset, |
| 621 | }; | 590 | }; |
| 622 | 591 | ||
| @@ -638,28 +607,7 @@ static struct amba_pl011_data uart2_plat = { · 15 unmodified lines | |||
| 638 | 607 | ||
| 639 | static void __init mop500_uart_init(struct device *parent) | 608 | static void __init mop500_uart_init(struct device *parent) |
| 640 | { | 609 | { |
| 641 | struct amba_device *uart0_device; | 610 | db8500_add_uart0(parent, &uart0_plat); |
| 642 | |||
| 643 | uart0_device = db8500_add_uart0(parent, &uart0_plat); | ||
| 644 | if (uart0_device) { | ||
| 645 | u0_p = pinctrl_get(&uart0_device->dev); | ||
| 646 | if (IS_ERR(u0_p)) | ||
| 647 | dev_err(&uart0_device->dev, | ||
| 648 | "could not get UART0 pinctrl\n"); | ||
| 649 | else { | ||
| 650 | u0_def = pinctrl_lookup_state(u0_p, | ||
| 651 | PINCTRL_STATE_DEFAULT); | ||
| 652 | if (IS_ERR(u0_def)) { | ||
| 653 | dev_err(&uart0_device->dev, | ||
| 654 | "could not get UART0 defstate\n"); | ||
| 655 | } | ||
| 656 | u0_sleep = pinctrl_lookup_state(u0_p, | ||
| 657 | PINCTRL_STATE_SLEEP); | ||
| 658 | if (IS_ERR(u0_sleep)) | ||
| 659 | dev_err(&uart0_device->dev, | ||
| 660 | "could not get UART0 idlestate\n"); | ||
| 661 | } | ||
| 662 | } | ||
| 663 | db8500_add_uart1(parent, &uart1_plat); | 611 | db8500_add_uart1(parent, &uart1_plat); |
| 664 | db8500_add_uart2(parent, &uart2_plat); | 612 | db8500_add_uart2(parent, &uart2_plat); |
| 665 | } | 613 | } |
| @@ -169,26 +169,13 @@ static struct map_desc versatile_io_desc[] __initdata = { · 168 unmodified lines | |||
| 169 | .pfn = __phys_to_pfn(VERSATILE_PCI_CFG_BASE), | 169 | .pfn = __phys_to_pfn(VERSATILE_PCI_CFG_BASE), |
| 170 | .length = VERSATILE_PCI_CFG_BASE_SIZE, | 170 | .length = VERSATILE_PCI_CFG_BASE_SIZE, |
| 171 | .type = MT_DEVICE | 171 | .type = MT_DEVICE |
| 172 | }, | ||
| 173 | #if 0 | ||
| 174 | { | ||
| 175 | .virtual = VERSATILE_PCI_VIRT_MEM_BASE0, | ||
| 176 | .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE0), | ||
| 177 | .length = SZ_16M, | ||
| 178 | .type = MT_DEVICE | ||
| 179 | }, { | 172 | }, { |
| 180 | .virtual = VERSATILE_PCI_VIRT_MEM_BASE1, | 173 | .virtual = (unsigned long)VERSATILE_PCI_VIRT_MEM_BASE0, |
| 181 | .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE1), | 174 | .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE0), |
| 182 | .length = SZ_16M, | 175 | .length = IO_SPACE_LIMIT, |
| 183 | .type = MT_DEVICE | ||
| 184 | }, { | ||
| 185 | .virtual = VERSATILE_PCI_VIRT_MEM_BASE2, | ||
| 186 | .pfn = __phys_to_pfn(VERSATILE_PCI_MEM_BASE2), | ||
| 187 | .length = SZ_16M, | ||
| 188 | .type = MT_DEVICE | 176 | .type = MT_DEVICE |
| 189 | }, | 177 | }, |
| 190 | #endif | 178 | #endif |
| 191 | #endif | ||
| 192 | }; | 179 | }; |
| 193 | 180 | ||
| 194 | void __init versatile_map_io(void) | 181 | void __init versatile_map_io(void) |
| @@ -29,8 +29,9 @@ · 28 unmodified lines | |||
| 29 | */ | 29 | */ |
| 30 | #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul | 30 | #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul |
| 31 | #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul | 31 | #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul |
| 32 | #define VERSATILE_PCI_VIRT_MEM_BASE0 (void __iomem *)PCIO_BASE | ||
| 32 | 33 | ||
| 33 | /* macro to get at IO space when running virtually */ | 34 | /* macro to get at MMIO space when running virtually */ |
| 34 | #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) | 35 | #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) |
| 35 | 36 | ||
| 36 | #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) | 37 | #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) |
| @@ -0,0 +1,27 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-versatile/include/mach/io.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2003 ARM Limited | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; either version 2 of the License, or | ||
| 9 | * (at your option) any later version. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 14 | * GNU General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License | ||
| 17 | * along with this program; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 19 | */ | ||
| 20 | #ifndef __ASM_ARM_ARCH_IO_H | ||
| 21 | #define __ASM_ARM_ARCH_IO_H | ||
| 22 | |||
| 23 | #define PCIO_BASE 0xeb000000ul | ||
| 24 | |||
| 25 | #define __io(a) ((a) + PCIO_BASE) | ||
| 26 | |||
| 27 | #endif | ||
| @@ -169,11 +169,18 @@ static struct pci_ops pci_versatile_ops = { · 168 unmodified lines | |||
| 169 | .write = versatile_write_config, | 169 | .write = versatile_write_config, |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | static struct resource io_port = { | ||
| 173 | .name = "PCI", | ||
| 174 | .start = 0, | ||
| 175 | .end = IO_SPACE_LIMIT, | ||
| 176 | .flags = IORESOURCE_IO, | ||
| 177 | }; | ||
| 178 | |||
| 172 | static struct resource io_mem = { | 179 | static struct resource io_mem = { |
| 173 | .name = "PCI I/O space", | 180 | .name = "PCI I/O space", |
| 174 | .start = VERSATILE_PCI_MEM_BASE0, | 181 | .start = VERSATILE_PCI_MEM_BASE0, |
| 175 | .end = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1, | 182 | .end = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1, |
| 176 | .flags = IORESOURCE_IO, | 183 | .flags = IORESOURCE_MEM, |
| 177 | }; | 184 | }; |
| 178 | 185 | ||
| 179 | static struct resource non_mem = { | 186 | static struct resource non_mem = { |
| @@ -200,6 +207,12 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys) · 20 unmodified lines | |||
| 200 | "memory region (%d)\n", ret); | 207 | "memory region (%d)\n", ret); |
| 201 | goto out; | 208 | goto out; |
| 202 | } | 209 | } |
| 210 | ret = request_resource(&ioport_resource, &io_port); | ||
| 211 | if (ret) { | ||
| 212 | printk(KERN_ERR "PCI: unable to allocate I/O " | ||
| 213 | "port region (%d)\n", ret); | ||
| 214 | goto out; | ||
| 215 | } | ||
| 203 | ret = request_resource(&iomem_resource, &non_mem); | 216 | ret = request_resource(&iomem_resource, &non_mem); |
| 204 | if (ret) { | 217 | if (ret) { |
| 205 | printk(KERN_ERR "PCI: unable to allocate non-prefetchable " | 218 | printk(KERN_ERR "PCI: unable to allocate non-prefetchable " |
| @@ -218,7 +231,7 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys) · 12 unmodified lines | |||
| 218 | * the mem resource for this bus | 231 | * the mem resource for this bus |
| 219 | * the prefetch mem resource for this bus | 232 | * the prefetch mem resource for this bus |
| 220 | */ | 233 | */ |
| 221 | pci_add_resource_offset(&sys->resources, &io_mem, sys->io_offset); | 234 | pci_add_resource_offset(&sys->resources, &io_port, sys->io_offset); |
| 222 | pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset); | 235 | pci_add_resource_offset(&sys->resources, &non_mem, sys->mem_offset); |
| 223 | pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset); | 236 | pci_add_resource_offset(&sys->resources, &pre_mem, sys->mem_offset); |
| 224 | 237 | ||
| @@ -249,6 +262,7 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys) · 24 unmodified lines | |||
| 249 | 262 | ||
| 250 | if (nr == 0) { | 263 | if (nr == 0) { |
| 251 | sys->mem_offset = 0; | 264 | sys->mem_offset = 0; |
| 265 | sys->io_offset = 0; | ||
| 252 | ret = pci_versatile_setup_resources(sys); | 266 | ret = pci_versatile_setup_resources(sys); |
| 253 | if (ret < 0) { | 267 | if (ret < 0) { |
| 254 | printk("pci_versatile_setup: resources... oops?\n"); | 268 | printk("pci_versatile_setup: resources... oops?\n"); |
| @@ -762,6 +762,11 @@ b_epilogue: · 761 unmodified lines | |||
| 762 | update_on_xread(ctx); | 762 | update_on_xread(ctx); |
| 763 | emit(ARM_MOV_R(r_A, r_X), ctx); | 763 | emit(ARM_MOV_R(r_A, r_X), ctx); |
| 764 | break; | 764 | break; |
| 765 | case BPF_S_ANC_ALU_XOR_X: | ||
| 766 | /* A ^= X */ | ||
| 767 | update_on_xread(ctx); | ||
| 768 | emit(ARM_EOR_R(r_A, r_A, r_X), ctx); | ||
| 769 | break; | ||
| 765 | case BPF_S_ANC_PROTOCOL: | 770 | case BPF_S_ANC_PROTOCOL: |
| 766 | /* A = ntohs(skb->protocol) */ | 771 | /* A = ntohs(skb->protocol) */ |
| 767 | ctx->seen |= SEEN_SKB; | 772 | ctx->seen |= SEEN_SKB; |
| @@ -68,6 +68,8 @@ · 67 unmodified lines | |||
| 68 | #define ARM_INST_CMP_R 0x01500000 | 68 | #define ARM_INST_CMP_R 0x01500000 |
| 69 | #define ARM_INST_CMP_I 0x03500000 | 69 | #define ARM_INST_CMP_I 0x03500000 |
| 70 | 70 | ||
| 71 | #define ARM_INST_EOR_R 0x00200000 | ||
| 72 | |||
| 71 | #define ARM_INST_LDRB_I 0x05d00000 | 73 | #define ARM_INST_LDRB_I 0x05d00000 |
| 72 | #define ARM_INST_LDRB_R 0x07d00000 | 74 | #define ARM_INST_LDRB_R 0x07d00000 |
| 73 | #define ARM_INST_LDRH_I 0x01d000b0 | 75 | #define ARM_INST_LDRH_I 0x01d000b0 |
| @@ -132,6 +134,8 @@ · 58 unmodified lines | |||
| 132 | #define ARM_CMP_R(rn, rm) _AL3_R(ARM_INST_CMP, 0, rn, rm) | 134 | #define ARM_CMP_R(rn, rm) _AL3_R(ARM_INST_CMP, 0, rn, rm) |
| 133 | #define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm) | 135 | #define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm) |
| 134 | 136 | ||
| 137 | #define ARM_EOR_R(rd, rn, rm) _AL3_R(ARM_INST_EOR, rd, rn, rm) | ||
| 138 | |||
| 135 | #define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \ | 139 | #define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \ |
| 136 | | (off)) | 140 | | (off)) |
| 137 | #define ARM_LDRB_I(rt, rn, off) (ARM_INST_LDRB_I | (rt) << 12 | (rn) << 16 \ | 141 | #define ARM_LDRB_I(rt, rn, off) (ARM_INST_LDRB_I | (rt) << 12 | (rn) << 16 \ |
| @@ -50,6 +50,7 @@ · 49 unmodified lines | |||
| 50 | #include <linux/irq.h> | 50 | #include <linux/irq.h> |
| 51 | #include <linux/clockchips.h> | 51 | #include <linux/clockchips.h> |
| 52 | #include <linux/clk.h> | 52 | #include <linux/clk.h> |
| 53 | #include <linux/err.h> | ||
| 53 | 54 | ||
| 54 | #include <mach/hardware.h> | 55 | #include <mach/hardware.h> |
| 55 | #include <asm/mach/time.h> | 56 | #include <asm/mach/time.h> |
| @@ -201,8 +202,16 @@ static int __init epit_clockevent_init(struct clk *timer_clk) · 145 unmodified lines | |||
| 201 | return 0; | 202 | return 0; |
| 202 | } | 203 | } |
| 203 | 204 | ||
| 204 | void __init epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq) | 205 | void __init epit_timer_init(void __iomem *base, int irq) |
| 205 | { | 206 | { |
| 207 | struct clk *timer_clk; | ||
| 208 | |||
| 209 | timer_clk = clk_get_sys("imx-epit.0", NULL); | ||
| 210 | if (IS_ERR(timer_clk)) { | ||
| 211 | pr_err("i.MX epit: unable to get clk\n"); | ||
| 212 | return; | ||
| 213 | } | ||
| 214 | |||
| 206 | clk_prepare_enable(timer_clk); | 215 | clk_prepare_enable(timer_clk); |
| 207 | 216 | ||
| 208 | timer_base = base; | 217 | timer_base = base; |
| @@ -54,8 +54,8 @@ extern void imx50_soc_init(void); · 53 unmodified lines | |||
| 54 | extern void imx51_soc_init(void); | 54 | extern void imx51_soc_init(void); |
| 55 | extern void imx53_soc_init(void); | 55 | extern void imx53_soc_init(void); |
| 56 | extern void imx51_init_late(void); | 56 | extern void imx51_init_late(void); |
| 57 | extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq); | 57 | extern void epit_timer_init(void __iomem *base, int irq); |
| 58 | extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int); | 58 | extern void mxc_timer_init(void __iomem *, int); |
| 59 | extern int mx1_clocks_init(unsigned long fref); | 59 | extern int mx1_clocks_init(unsigned long fref); |
| 60 | extern int mx21_clocks_init(unsigned long lref, unsigned long fref); | 60 | extern int mx21_clocks_init(unsigned long lref, unsigned long fref); |
| 61 | extern int mx25_clocks_init(void); | 61 | extern int mx25_clocks_init(void); |
| @@ -58,6 +58,7 @@ · 57 unmodified lines | |||
| 58 | /* MX31, MX35, MX25, MX5 */ | 58 | /* MX31, MX35, MX25, MX5 */ |
| 59 | #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */ | 59 | #define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */ |
| 60 | #define V2_TCTL_CLK_IPG (1 << 6) | 60 | #define V2_TCTL_CLK_IPG (1 << 6) |
| 61 | #define V2_TCTL_CLK_PER (2 << 6) | ||
| 61 | #define V2_TCTL_FRR (1 << 9) | 62 | #define V2_TCTL_FRR (1 << 9) |
| 62 | #define V2_IR 0x0c | 63 | #define V2_IR 0x0c |
| 63 | #define V2_TSTAT 0x08 | 64 | #define V2_TSTAT 0x08 |
| @@ -280,23 +281,22 @@ static int __init mxc_clockevent_init(struct clk *timer_clk) · 216 unmodified lines | |||
| 280 | return 0; | 281 | return 0; |
| 281 | } | 282 | } |
| 282 | 283 | ||
| 283 | void __init mxc_timer_init(struct clk *timer_clk, void __iomem *base, int irq) | 284 | void __init mxc_timer_init(void __iomem *base, int irq) |
| 284 | { | 285 | { |
| 285 | uint32_t tctl_val; | 286 | uint32_t tctl_val; |
| 287 | struct clk *timer_clk; | ||
| 286 | struct clk *timer_ipg_clk; | 288 | struct clk *timer_ipg_clk; |
| 287 | 289 | ||
| 288 | if (!timer_clk) { | 290 | timer_clk = clk_get_sys("imx-gpt.0", "per"); |
| 289 | timer_clk = clk_get_sys("imx-gpt.0", "per"); | 291 | if (IS_ERR(timer_clk)) { |
| 290 | if (IS_ERR(timer_clk)) { | 292 | pr_err("i.MX timer: unable to get clk\n"); |
| 291 | pr_err("i.MX timer: unable to get clk\n"); | 293 | return; |
| 292 | return; | ||
| 293 | } | ||
| 294 | |||
| 295 | timer_ipg_clk = clk_get_sys("imx-gpt.0", "ipg"); | ||
| 296 | if (!IS_ERR(timer_ipg_clk)) | ||
| 297 | clk_prepare_enable(timer_ipg_clk); | ||
| 298 | } | 294 | } |
| 299 | 295 | ||
| 296 | timer_ipg_clk = clk_get_sys("imx-gpt.0", "ipg"); | ||
| 297 | if (!IS_ERR(timer_ipg_clk)) | ||
| 298 | clk_prepare_enable(timer_ipg_clk); | ||
| 299 | |||
| 300 | clk_prepare_enable(timer_clk); | 300 | clk_prepare_enable(timer_clk); |
| 301 | 301 | ||
| 302 | timer_base = base; | 302 | timer_base = base; |
| @@ -309,7 +309,7 @@ void __init mxc_timer_init(struct clk *timer_clk, void __iomem *base, int irq) · 6 unmodified lines | |||
| 309 | __raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */ | 309 | __raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */ |
| 310 | 310 | ||
| 311 | if (timer_is_v2()) | 311 | if (timer_is_v2()) |
| 312 | tctl_val = V2_TCTL_CLK_IPG | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN; | 312 | tctl_val = V2_TCTL_CLK_PER | V2_TCTL_FRR | V2_TCTL_WAITEN | MXC_TCTL_TEN; |
| 313 | else | 313 | else |
| 314 | tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN; | 314 | tctl_val = MX1_2_TCTL_FRR | MX1_2_TCTL_CLK_PCLK1 | MXC_TCTL_TEN; |
| 315 | 315 | ||
| @@ -461,6 +461,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) · 460 unmodified lines | |||
| 461 | struct clk *c; | 461 | struct clk *c; |
| 462 | struct clk *pa; | 462 | struct clk *pa; |
| 463 | 463 | ||
| 464 | mutex_lock(&clocks_mutex); | ||
| 464 | seq_printf(s, "%-30s %-30s %-10s %s\n", | 465 | seq_printf(s, "%-30s %-30s %-10s %s\n", |
| 465 | "clock-name", "parent-name", "rate", "use-count"); | 466 | "clock-name", "parent-name", "rate", "use-count"); |
| 466 | 467 | ||
| @@ -469,6 +470,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) · 2 unmodified lines | |||
| 469 | seq_printf(s, "%-30s %-30s %-10lu %d\n", | 470 | seq_printf(s, "%-30s %-30s %-10lu %d\n", |
| 470 | c->name, pa ? pa->name : "none", c->rate, c->usecount); | 471 | c->name, pa ? pa->name : "none", c->rate, c->usecount); |
| 471 | } | 472 | } |
| 473 | mutex_unlock(&clocks_mutex); | ||
| 472 | 474 | ||
| 473 | return 0; | 475 | return 0; |
| 474 | } | 476 | } |
| @@ -252,8 +252,6 @@ IS_AM_SUBCLASS(335x, 0x335) · 251 unmodified lines | |||
| 252 | * cpu_is_omap2423(): True for OMAP2423 | 252 | * cpu_is_omap2423(): True for OMAP2423 |
| 253 | * cpu_is_omap2430(): True for OMAP2430 | 253 | * cpu_is_omap2430(): True for OMAP2430 |
| 254 | * cpu_is_omap3430(): True for OMAP3430 | 254 | * cpu_is_omap3430(): True for OMAP3430 |
| 255 | * cpu_is_omap3505(): True for OMAP3505 | ||
| 256 | * cpu_is_omap3517(): True for OMAP3517 | ||
| 257 | */ | 255 | */ |
| 258 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) | 256 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) |
| 259 | 257 | ||
| @@ -277,8 +275,6 @@ IS_OMAP_TYPE(2422, 0x2422) · 17 unmodified lines | |||
| 277 | IS_OMAP_TYPE(2423, 0x2423) | 275 | IS_OMAP_TYPE(2423, 0x2423) |
| 278 | IS_OMAP_TYPE(2430, 0x2430) | 276 | IS_OMAP_TYPE(2430, 0x2430) |
| 279 | IS_OMAP_TYPE(3430, 0x3430) | 277 | IS_OMAP_TYPE(3430, 0x3430) |
| 280 | IS_OMAP_TYPE(3505, 0x3517) | ||
| 281 | IS_OMAP_TYPE(3517, 0x3517) | ||
| 282 | 278 | ||
| 283 | #define cpu_is_omap310() 0 | 279 | #define cpu_is_omap310() 0 |
| 284 | #define cpu_is_omap730() 0 | 280 | #define cpu_is_omap730() 0 |
| @@ -293,12 +289,6 @@ IS_OMAP_TYPE(3517, 0x3517) · 8 unmodified lines | |||
| 293 | #define cpu_is_omap2422() 0 | 289 | #define cpu_is_omap2422() 0 |
| 294 | #define cpu_is_omap2423() 0 | 290 | #define cpu_is_omap2423() 0 |
| 295 | #define cpu_is_omap2430() 0 | 291 | #define cpu_is_omap2430() 0 |
| 296 | #define cpu_is_omap3503() 0 | ||
| 297 | #define cpu_is_omap3515() 0 | ||
| 298 | #define cpu_is_omap3525() 0 | ||
| 299 | #define cpu_is_omap3530() 0 | ||
| 300 | #define cpu_is_omap3505() 0 | ||
| 301 | #define cpu_is_omap3517() 0 | ||
| 302 | #define cpu_is_omap3430() 0 | 292 | #define cpu_is_omap3430() 0 |
| 303 | #define cpu_is_omap3630() 0 | 293 | #define cpu_is_omap3630() 0 |
| 304 | 294 | ||
| @@ -350,12 +340,6 @@ IS_OMAP_TYPE(3517, 0x3517) · 45 unmodified lines | |||
| 350 | 340 | ||
| 351 | #if defined(CONFIG_ARCH_OMAP3) | 341 | #if defined(CONFIG_ARCH_OMAP3) |
| 352 | # undef cpu_is_omap3430 | 342 | # undef cpu_is_omap3430 |
| 353 | # undef cpu_is_omap3503 | ||
| 354 | # undef cpu_is_omap3515 | ||
| 355 | # undef cpu_is_omap3525 | ||
| 356 | # undef cpu_is_omap3530 | ||
| 357 | # undef cpu_is_omap3505 | ||
| 358 | # undef cpu_is_omap3517 | ||
| 359 | # undef cpu_is_ti81xx | 343 | # undef cpu_is_ti81xx |
| 360 | # undef cpu_is_ti816x | 344 | # undef cpu_is_ti816x |
| 361 | # undef cpu_is_ti814x | 345 | # undef cpu_is_ti814x |
| @@ -363,19 +347,6 @@ IS_OMAP_TYPE(3517, 0x3517) · 1 unmodified line | |||
| 363 | # undef cpu_is_am33xx | 347 | # undef cpu_is_am33xx |
| 364 | # undef cpu_is_am335x | 348 | # undef cpu_is_am335x |
| 365 | # define cpu_is_omap3430() is_omap3430() | 349 | # define cpu_is_omap3430() is_omap3430() |
| 366 | # define cpu_is_omap3503() (cpu_is_omap3430() && \ | ||
| 367 | (!omap3_has_iva()) && \ | ||
| 368 | (!omap3_has_sgx())) | ||
| 369 | # define cpu_is_omap3515() (cpu_is_omap3430() && \ | ||
| 370 | (!omap3_has_iva()) && \ | ||
| 371 | (omap3_has_sgx())) | ||
| 372 | # define cpu_is_omap3525() (cpu_is_omap3430() && \ | ||
| 373 | (!omap3_has_sgx()) && \ | ||
| 374 | (omap3_has_iva())) | ||
| 375 | # define cpu_is_omap3530() (cpu_is_omap3430()) | ||
| 376 | # define cpu_is_omap3517() is_omap3517() | ||
| 377 | # define cpu_is_omap3505() (cpu_is_omap3517() && \ | ||
| 378 | !omap3_has_sgx()) | ||
| 379 | # undef cpu_is_omap3630 | 350 | # undef cpu_is_omap3630 |
| 380 | # define cpu_is_omap3630() is_omap363x() | 351 | # define cpu_is_omap3630() is_omap363x() |
| 381 | # define cpu_is_ti81xx() is_ti81xx() | 352 | # define cpu_is_ti81xx() is_ti81xx() |
| @@ -424,10 +395,6 @@ IS_OMAP_TYPE(3517, 0x3517) · 42 unmodified lines | |||
| 424 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) | 395 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) |
| 425 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) | 396 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) |
| 426 | 397 | ||
| 427 | #define OMAP3517_CLASS 0x35170034 | ||
| 428 | #define OMAP3517_REV_ES1_0 OMAP3517_CLASS | ||
| 429 | #define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (0x1 << 8)) | ||
| 430 | |||
| 431 | #define TI816X_CLASS 0x81600034 | 398 | #define TI816X_CLASS 0x81600034 |
| 432 | #define TI8168_REV_ES1_0 TI816X_CLASS | 399 | #define TI8168_REV_ES1_0 TI816X_CLASS |
| 433 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) | 400 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) |
| @@ -172,8 +172,7 @@ struct omap_mmc_platform_data { · 171 unmodified lines | |||
| 172 | extern void omap_mmc_notify_cover_event(struct device *dev, int slot, | 172 | extern void omap_mmc_notify_cover_event(struct device *dev, int slot, |
| 173 | int is_closed); | 173 | int is_closed); |
| 174 | 174 | ||
| 175 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ | 175 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) |
| 176 | defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) | ||
| 177 | void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | 176 | void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, |
| 178 | int nr_controllers); | 177 | int nr_controllers); |
| 179 | void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); | 178 | void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); |
| @@ -185,7 +184,6 @@ static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, · 5 unmodified lines | |||
| 185 | static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) | 184 | static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) |
| 186 | { | 185 | { |
| 187 | } | 186 | } |
| 188 | |||
| 189 | #endif | 187 | #endif |
| 190 | 188 | ||
| 191 | extern int omap_msdi_reset(struct omap_hwmod *oh); | 189 | extern int omap_msdi_reset(struct omap_hwmod *oh); |
| @@ -582,7 +582,7 @@ void __init orion_spi_1_init(unsigned long mapbase) · 581 unmodified lines | |||
| 582 | * Watchdog | 582 | * Watchdog |
| 583 | ****************************************************************************/ | 583 | ****************************************************************************/ |
| 584 | static struct resource orion_wdt_resource = | 584 | static struct resource orion_wdt_resource = |
| 585 | DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28); | 585 | DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x28); |
| 586 | 586 | ||
| 587 | static struct platform_device orion_wdt_device = { | 587 | static struct platform_device orion_wdt_device = { |
| 588 | .name = "orion_wdt", | 588 | .name = "orion_wdt", |
| @@ -193,6 +193,7 @@ static const struct platform_device_id ssp_id_table[] = { · 192 unmodified lines | |||
| 193 | { "pxa25x-nssp", PXA25x_NSSP }, | 193 | { "pxa25x-nssp", PXA25x_NSSP }, |
| 194 | { "pxa27x-ssp", PXA27x_SSP }, | 194 | { "pxa27x-ssp", PXA27x_SSP }, |
| 195 | { "pxa168-ssp", PXA168_SSP }, | 195 | { "pxa168-ssp", PXA168_SSP }, |
| 196 | { "pxa910-ssp", PXA910_SSP }, | ||
| 196 | { }, | 197 | { }, |
| 197 | }; | 198 | }; |
| 198 | 199 | ||
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Debugging macro include header for spear platform | 4 | * Debugging macro include header for spear platform |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * DMAC pl080 definitions for SPEAr platform | 4 | * DMAC pl080 definitions for SPEAr platform |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr platform shared irq layer header file | 4 | * SPEAr platform shared irq layer header file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr platform specific timex definitions | 4 | * SPEAr platform specific timex definitions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Serial port stubs for kernel decompress status messages | 4 | * Serial port stubs for kernel decompress status messages |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * DMAC pl080 definitions for SPEAr platform | 4 | * DMAC pl080 definitions for SPEAr platform |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr platform specific restart functions | 4 | * SPEAr platform specific restart functions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr platform shared irq layer source file | 4 | * SPEAr platform shared irq layer source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | |||
| 35 | #include <asm/setup.h> | 35 | #include <asm/setup.h> |
| 36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/sections.h> | ||
| 38 | 39 | ||
| 39 | #if defined(__H8300H__) | 40 | #if defined(__H8300H__) |
| 40 | #define CPU "H8/300H" | 41 | #define CPU "H8/300H" |
| @@ -54,7 +55,6 @@ unsigned long memory_end; · 13 unmodified lines | |||
| 54 | 55 | ||
| 55 | char __initdata command_line[COMMAND_LINE_SIZE]; | 56 | char __initdata command_line[COMMAND_LINE_SIZE]; |
| 56 | 57 | ||
| 57 | extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end; | ||
| 58 | extern int _ramstart, _ramend; | 58 | extern int _ramstart, _ramend; |
| 59 | extern char _target_name[]; | 59 | extern char _target_name[]; |
| 60 | extern void h8300_gpio_init(void); | 60 | extern void h8300_gpio_init(void); |
| @@ -119,9 +119,9 @@ void __init setup_arch(char **cmdline_p) · 58 unmodified lines | |||
| 119 | memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; | 119 | memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS; |
| 120 | #endif | 120 | #endif |
| 121 | 121 | ||
| 122 | init_mm.start_code = (unsigned long) &_stext; | 122 | init_mm.start_code = (unsigned long) _stext; |
| 123 | init_mm.end_code = (unsigned long) &_etext; | 123 | init_mm.end_code = (unsigned long) _etext; |
| 124 | init_mm.end_data = (unsigned long) &_edata; | 124 | init_mm.end_data = (unsigned long) _edata; |
| 125 | init_mm.brk = (unsigned long) 0; | 125 | init_mm.brk = (unsigned long) 0; |
| 126 | 126 | ||
| 127 | #if (defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)) && defined(CONFIG_GDB_MAGICPRINT) | 127 | #if (defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)) && defined(CONFIG_GDB_MAGICPRINT) |
| @@ -134,15 +134,12 @@ void __init setup_arch(char **cmdline_p) · 6 unmodified lines | |||
| 134 | printk(KERN_INFO "H8/300 series support by Yoshinori Sato <ysato@users.sourceforge.jp>\n"); | 134 | printk(KERN_INFO "H8/300 series support by Yoshinori Sato <ysato@users.sourceforge.jp>\n"); |
| 135 | 135 | ||
| 136 | #ifdef DEBUG | 136 | #ifdef DEBUG |
| 137 | printk(KERN_DEBUG "KERNEL -> TEXT=0x%06x-0x%06x DATA=0x%06x-0x%06x " | 137 | printk(KERN_DEBUG "KERNEL -> TEXT=0x%p-0x%p DATA=0x%p-0x%p " |
| 138 | "BSS=0x%06x-0x%06x\n", (int) &_stext, (int) &_etext, | 138 | "BSS=0x%p-0x%p\n", _stext, _etext, _sdata, _edata, __bss_start, |
| 139 | (int) &_sdata, (int) &_edata, | 139 | __bss_stop); |
| 140 | (int) &_sbss, (int) &_ebss); | 140 | printk(KERN_DEBUG "KERNEL -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx " |
| 141 | printk(KERN_DEBUG "KERNEL -> ROMFS=0x%06x-0x%06x MEM=0x%06x-0x%06x " | 141 | "STACK=0x%06lx-0x%p\n", __bss_stop, memory_start, memory_start, |
| 142 | "STACK=0x%06x-0x%06x\n", | 142 | memory_end, memory_end, &_ramend); |
| 143 | (int) &_ebss, (int) memory_start, | ||
| 144 | (int) memory_start, (int) memory_end, | ||
| 145 | (int) memory_end, (int) &_ramend); | ||
| 146 | #endif | 143 | #endif |
| 147 | 144 | ||
| 148 | #ifdef CONFIG_DEFAULT_CMDLINE | 145 | #ifdef CONFIG_DEFAULT_CMDLINE |
| @@ -36,6 +36,7 @@ · 35 unmodified lines | |||
| 36 | #include <asm/segment.h> | 36 | #include <asm/segment.h> |
| 37 | #include <asm/page.h> | 37 | #include <asm/page.h> |
| 38 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
| 39 | #include <asm/sections.h> | ||
| 39 | 40 | ||
| 40 | #undef DEBUG | 41 | #undef DEBUG |
| 41 | 42 | ||
| @@ -123,7 +124,6 @@ void __init mem_init(void) · 81 unmodified lines | |||
| 123 | int codek = 0, datak = 0, initk = 0; | 124 | int codek = 0, datak = 0, initk = 0; |
| 124 | /* DAVIDM look at setup memory map generically with reserved area */ | 125 | /* DAVIDM look at setup memory map generically with reserved area */ |
| 125 | unsigned long tmp; | 126 | unsigned long tmp; |
| 126 | extern char _etext, _stext, _sdata, _ebss, __init_begin, __init_end; | ||
| 127 | extern unsigned long _ramend, _ramstart; | 127 | extern unsigned long _ramend, _ramstart; |
| 128 | unsigned long len = &_ramend - &_ramstart; | 128 | unsigned long len = &_ramend - &_ramstart; |
| 129 | unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */ | 129 | unsigned long start_mem = memory_start; /* DAVIDM - these must start at end of kernel */ |
| @@ -142,9 +142,9 @@ void __init mem_init(void) · 12 unmodified lines | |||
| 142 | /* this will put all memory onto the freelists */ | 142 | /* this will put all memory onto the freelists */ |
| 143 | totalram_pages = free_all_bootmem(); | 143 | totalram_pages = free_all_bootmem(); |
| 144 | 144 | ||
| 145 | codek = (&_etext - &_stext) >> 10; | 145 | codek = (_etext - _stext) >> 10; |
| 146 | datak = (&_ebss - &_sdata) >> 10; | 146 | datak = (__bss_stop - _sdata) >> 10; |
| 147 | initk = (&__init_begin - &__init_end) >> 10; | 147 | initk = (__init_begin - __init_end) >> 10; |
| 148 | 148 | ||
| 149 | tmp = nr_free_pages() << PAGE_SHIFT; | 149 | tmp = nr_free_pages() << PAGE_SHIFT; |
| 150 | printk(KERN_INFO "Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n", | 150 | printk(KERN_INFO "Memory available: %luk/%luk RAM, %luk/%luk ROM (%dk kernel code, %dk data)\n", |
| @@ -178,22 +178,21 @@ free_initmem(void) · 27 unmodified lines | |||
| 178 | { | 178 | { |
| 179 | #ifdef CONFIG_RAMKERNEL | 179 | #ifdef CONFIG_RAMKERNEL |
| 180 | unsigned long addr; | 180 | unsigned long addr; |
| 181 | extern char __init_begin, __init_end; | ||
| 182 | /* | 181 | /* |
| 183 | * the following code should be cool even if these sections | 182 | * the following code should be cool even if these sections |
| 184 | * are not page aligned. | 183 | * are not page aligned. |
| 185 | */ | 184 | */ |
| 186 | addr = PAGE_ALIGN((unsigned long)(&__init_begin)); | 185 | addr = PAGE_ALIGN((unsigned long)(__init_begin)); |
| 187 | /* next to check that the page we free is not a partial page */ | 186 | /* next to check that the page we free is not a partial page */ |
| 188 | for (; addr + PAGE_SIZE < (unsigned long)(&__init_end); addr +=PAGE_SIZE) { | 187 | for (; addr + PAGE_SIZE < (unsigned long)__init_end; addr +=PAGE_SIZE) { |
| 189 | ClearPageReserved(virt_to_page(addr)); | 188 | ClearPageReserved(virt_to_page(addr)); |
| 190 | init_page_count(virt_to_page(addr)); | 189 | init_page_count(virt_to_page(addr)); |
| 191 | free_page(addr); | 190 | free_page(addr); |
| 192 | totalram_pages++; | 191 | totalram_pages++; |
| 193 | } | 192 | } |
| 194 | printk(KERN_INFO "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n", | 193 | printk(KERN_INFO "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n", |
| 195 | (addr - PAGE_ALIGN((long) &__init_begin)) >> 10, | 194 | (addr - PAGE_ALIGN((long) __init_begin)) >> 10, |
| 196 | (int)(PAGE_ALIGN((unsigned long)(&__init_begin))), | 195 | (int)(PAGE_ALIGN((unsigned long)__init_begin)), |
| 197 | (int)(addr - PAGE_SIZE)); | 196 | (int)(addr - PAGE_SIZE)); |
| 198 | #endif | 197 | #endif |
| 199 | } | 198 | } |
| @@ -268,24 +268,45 @@ static unsigned long do_h_register_vpa(struct kvm_vcpu *vcpu, · 267 unmodified lines | |||
| 268 | return err; | 268 | return err; |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | static void kvmppc_update_vpa(struct kvm *kvm, struct kvmppc_vpa *vpap) | 271 | static void kvmppc_update_vpa(struct kvm_vcpu *vcpu, struct kvmppc_vpa *vpap) |
| 272 | { | 272 | { |
| 273 | struct kvm *kvm = vcpu->kvm; | ||
| 273 | void *va; | 274 | void *va; |
| 274 | unsigned long nb; | 275 | unsigned long nb; |
| 276 | unsigned long gpa; | ||
| 275 | 277 | ||
| 276 | vpap->update_pending = 0; | 278 | /* |
| 277 | va = NULL; | 279 | * We need to pin the page pointed to by vpap->next_gpa, |
| 278 | if (vpap->next_gpa) { | 280 | * but we can't call kvmppc_pin_guest_page under the lock |
| 279 | va = kvmppc_pin_guest_page(kvm, vpap->next_gpa, &nb); | 281 | * as it does get_user_pages() and down_read(). So we |
| 280 | if (nb < vpap->len) { | 282 | * have to drop the lock, pin the page, then get the lock |
| 281 | /* | 283 | * again and check that a new area didn't get registered |
| 282 | * If it's now too short, it must be that userspace | 284 | * in the meantime. |
| 283 | * has changed the mappings underlying guest memory, | 285 | */ |
| 284 | * so unregister the region. | 286 | for (;;) { |
| 285 | */ | 287 | gpa = vpap->next_gpa; |
| 288 | spin_unlock(&vcpu->arch.vpa_update_lock); | ||
| 289 | va = NULL; | ||
| 290 | nb = 0; | ||
| 291 | if (gpa) | ||
| 292 | va = kvmppc_pin_guest_page(kvm, vpap->next_gpa, &nb); | ||
| 293 | spin_lock(&vcpu->arch.vpa_update_lock); | ||
| 294 | if (gpa == vpap->next_gpa) | ||
| 295 | break; | ||
| 296 | /* sigh... unpin that one and try again */ | ||
| 297 | if (va) | ||
| 286 | kvmppc_unpin_guest_page(kvm, va); | 298 | kvmppc_unpin_guest_page(kvm, va); |
| 287 | va = NULL; | 299 | } |
| 288 | } | 300 | |
| 301 | vpap->update_pending = 0; | ||
| 302 | if (va && nb < vpap->len) { | ||
| 303 | /* | ||
| 304 | * If it's now too short, it must be that userspace | ||
| 305 | * has changed the mappings underlying guest memory, | ||
| 306 | * so unregister the region. | ||
| 307 | */ | ||
| 308 | kvmppc_unpin_guest_page(kvm, va); | ||
| 309 | va = NULL; | ||
| 289 | } | 310 | } |
| 290 | if (vpap->pinned_addr) | 311 | if (vpap->pinned_addr) |
| 291 | kvmppc_unpin_guest_page(kvm, vpap->pinned_addr); | 312 | kvmppc_unpin_guest_page(kvm, vpap->pinned_addr); |
| @@ -296,20 +317,18 @@ static void kvmppc_update_vpa(struct kvm *kvm, struct kvmppc_vpa *vpap) · 4 unmodified lines | |||
| 296 | 317 | ||
| 297 | static void kvmppc_update_vpas(struct kvm_vcpu *vcpu) | 318 | static void kvmppc_update_vpas(struct kvm_vcpu *vcpu) |
| 298 | { | 319 | { |
| 299 | struct kvm *kvm = vcpu->kvm; | ||
| 300 | |||
| 301 | spin_lock(&vcpu->arch.vpa_update_lock); | 320 | spin_lock(&vcpu->arch.vpa_update_lock); |
| 302 | if (vcpu->arch.vpa.update_pending) { | 321 | if (vcpu->arch.vpa.update_pending) { |
| 303 | kvmppc_update_vpa(kvm, &vcpu->arch.vpa); | 322 | kvmppc_update_vpa(vcpu, &vcpu->arch.vpa); |
| 304 | init_vpa(vcpu, vcpu->arch.vpa.pinned_addr); | 323 | init_vpa(vcpu, vcpu->arch.vpa.pinned_addr); |
| 305 | } | 324 | } |
| 306 | if (vcpu->arch.dtl.update_pending) { | 325 | if (vcpu->arch.dtl.update_pending) { |
| 307 | kvmppc_update_vpa(kvm, &vcpu->arch.dtl); | 326 | kvmppc_update_vpa(vcpu, &vcpu->arch.dtl); |
| 308 | vcpu->arch.dtl_ptr = vcpu->arch.dtl.pinned_addr; | 327 | vcpu->arch.dtl_ptr = vcpu->arch.dtl.pinned_addr; |
| 309 | vcpu->arch.dtl_index = 0; | 328 | vcpu->arch.dtl_index = 0; |
| 310 | } | 329 | } |
| 311 | if (vcpu->arch.slb_shadow.update_pending) | 330 | if (vcpu->arch.slb_shadow.update_pending) |
| 312 | kvmppc_update_vpa(kvm, &vcpu->arch.slb_shadow); | 331 | kvmppc_update_vpa(vcpu, &vcpu->arch.slb_shadow); |
| 313 | spin_unlock(&vcpu->arch.vpa_update_lock); | 332 | spin_unlock(&vcpu->arch.vpa_update_lock); |
| 314 | } | 333 | } |
| 315 | 334 | ||
| @@ -800,12 +819,39 @@ static int kvmppc_run_core(struct kvmppc_vcore *vc) · 484 unmodified lines | |||
| 800 | struct kvm_vcpu *vcpu, *vcpu0, *vnext; | 819 | struct kvm_vcpu *vcpu, *vcpu0, *vnext; |
| 801 | long ret; | 820 | long ret; |
| 802 | u64 now; | 821 | u64 now; |
| 803 | int ptid, i; | 822 | int ptid, i, need_vpa_update; |
| 804 | 823 | ||
| 805 | /* don't start if any threads have a signal pending */ | 824 | /* don't start if any threads have a signal pending */ |
| 806 | list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list) | 825 | need_vpa_update = 0; |
| 826 | list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list) { | ||
| 807 | if (signal_pending(vcpu->arch.run_task)) | 827 | if (signal_pending(vcpu->arch.run_task)) |
| 808 | return 0; | 828 | return 0; |
| 829 | need_vpa_update |= vcpu->arch.vpa.update_pending | | ||
| 830 | vcpu->arch.slb_shadow.update_pending | | ||
| 831 | vcpu->arch.dtl.update_pending; | ||
| 832 | } | ||
| 833 | |||
| 834 | /* | ||
| 835 | * Initialize *vc, in particular vc->vcore_state, so we can | ||
| 836 | * drop the vcore lock if necessary. | ||
| 837 | */ | ||
| 838 | vc->n_woken = 0; | ||
| 839 | vc->nap_count = 0; | ||
| 840 | vc->entry_exit_count = 0; | ||
| 841 | vc->vcore_state = VCORE_RUNNING; | ||
| 842 | vc->in_guest = 0; | ||
| 843 | vc->napping_threads = 0; | ||
| 844 | |||
| 845 | /* | ||
| 846 | * Updating any of the vpas requires calling kvmppc_pin_guest_page, | ||
| 847 | * which can't be called with any spinlocks held. | ||
| 848 | */ | ||
| 849 | if (need_vpa_update) { | ||
| 850 | spin_unlock(&vc->lock); | ||
| 851 | list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list) | ||
| 852 | kvmppc_update_vpas(vcpu); | ||
| 853 | spin_lock(&vc->lock); | ||
| 854 | } | ||
| 809 | 855 | ||
| 810 | /* | 856 | /* |
| 811 | * Make sure we are running on thread 0, and that | 857 | * Make sure we are running on thread 0, and that |
| @@ -838,20 +884,10 @@ static int kvmppc_run_core(struct kvmppc_vcore *vc) · 26 unmodified lines | |||
| 838 | if (vcpu->arch.ceded) | 884 | if (vcpu->arch.ceded) |
| 839 | vcpu->arch.ptid = ptid++; | 885 | vcpu->arch.ptid = ptid++; |
| 840 | 886 | ||
| 841 | vc->n_woken = 0; | ||
| 842 | vc->nap_count = 0; | ||
| 843 | vc->entry_exit_count = 0; | ||
| 844 | vc->vcore_state = VCORE_RUNNING; | ||
| 845 | vc->stolen_tb += mftb() - vc->preempt_tb; | 887 | vc->stolen_tb += mftb() - vc->preempt_tb; |
| 846 | vc->in_guest = 0; | ||
| 847 | vc->pcpu = smp_processor_id(); | 888 | vc->pcpu = smp_processor_id(); |
| 848 | vc->napping_threads = 0; | ||
| 849 | list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list) { | 889 | list_for_each_entry(vcpu, &vc->runnable_threads, arch.run_list) { |
| 850 | kvmppc_start_thread(vcpu); | 890 | kvmppc_start_thread(vcpu); |
| 851 | if (vcpu->arch.vpa.update_pending || | ||
| 852 | vcpu->arch.slb_shadow.update_pending || | ||
| 853 | vcpu->arch.dtl.update_pending) | ||
| 854 | kvmppc_update_vpas(vcpu); | ||
| 855 | kvmppc_create_dtl_entry(vcpu, vc); | 891 | kvmppc_create_dtl_entry(vcpu, vc); |
| 856 | } | 892 | } |
| 857 | /* Grab any remaining hw threads so they can't go into the kernel */ | 893 | /* Grab any remaining hw threads so they can't go into the kernel */ |
| @@ -68,9 +68,7 @@ static const char *pseries_nvram_os_partitions[] = { · 67 unmodified lines | |||
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | static void oops_to_nvram(struct kmsg_dumper *dumper, | 70 | static void oops_to_nvram(struct kmsg_dumper *dumper, |
| 71 | enum kmsg_dump_reason reason, | 71 | enum kmsg_dump_reason reason); |
| 72 | const char *old_msgs, unsigned long old_len, | ||
| 73 | const char *new_msgs, unsigned long new_len); | ||
| 74 | 72 | ||
| 75 | static struct kmsg_dumper nvram_kmsg_dumper = { | 73 | static struct kmsg_dumper nvram_kmsg_dumper = { |
| 76 | .dump = oops_to_nvram | 74 | .dump = oops_to_nvram |
| @@ -503,28 +501,6 @@ int __init pSeries_nvram_init(void) · 426 unmodified lines | |||
| 503 | return 0; | 501 | return 0; |
| 504 | } | 502 | } |
| 505 | 503 | ||
| 506 | /* | ||
| 507 | * Try to capture the last capture_len bytes of the printk buffer. Return | ||
| 508 | * the amount actually captured. | ||
| 509 | */ | ||
| 510 | static size_t capture_last_msgs(const char *old_msgs, size_t old_len, | ||
| 511 | const char *new_msgs, size_t new_len, | ||
| 512 | char *captured, size_t capture_len) | ||
| 513 | { | ||
| 514 | if (new_len >= capture_len) { | ||
| 515 | memcpy(captured, new_msgs + (new_len - capture_len), | ||
| 516 | capture_len); | ||
| 517 | return capture_len; | ||
| 518 | } else { | ||
| 519 | /* Grab the end of old_msgs. */ | ||
| 520 | size_t old_tail_len = min(old_len, capture_len - new_len); | ||
| 521 | memcpy(captured, old_msgs + (old_len - old_tail_len), | ||
| 522 | old_tail_len); | ||
| 523 | memcpy(captured + old_tail_len, new_msgs, new_len); | ||
| 524 | return old_tail_len + new_len; | ||
| 525 | } | ||
| 526 | } | ||
| 527 | |||
| 528 | /* | 504 | /* |
| 529 | * Are we using the ibm,rtas-log for oops/panic reports? And if so, | 505 | * Are we using the ibm,rtas-log for oops/panic reports? And if so, |
| 530 | * would logging this oops/panic overwrite an RTAS event that rtas_errd | 506 | * would logging this oops/panic overwrite an RTAS event that rtas_errd |
| @@ -541,27 +517,6 @@ static int clobbering_unread_rtas_event(void) · 10 unmodified lines | |||
| 541 | NVRAM_RTAS_READ_TIMEOUT); | 517 | NVRAM_RTAS_READ_TIMEOUT); |
| 542 | } | 518 | } |
| 543 | 519 | ||
| 544 | /* Squeeze out each line's <n> severity prefix. */ | ||
| 545 | static size_t elide_severities(char *buf, size_t len) | ||
| 546 | { | ||
| 547 | char *in, *out, *buf_end = buf + len; | ||
| 548 | /* Assume a <n> at the very beginning marks the start of a line. */ | ||
| 549 | int newline = 1; | ||
| 550 | |||
| 551 | in = out = buf; | ||
| 552 | while (in < buf_end) { | ||
| 553 | if (newline && in+3 <= buf_end && | ||
| 554 | *in == '<' && isdigit(in[1]) && in[2] == '>') { | ||
| 555 | in += 3; | ||
| 556 | newline = 0; | ||
| 557 | } else { | ||
| 558 | newline = (*in == '\n'); | ||
| 559 | *out++ = *in++; | ||
| 560 | } | ||
| 561 | } | ||
| 562 | return out - buf; | ||
| 563 | } | ||
| 564 | |||
| 565 | /* Derived from logfs_compress() */ | 520 | /* Derived from logfs_compress() */ |
| 566 | static int nvram_compress(const void *in, void *out, size_t inlen, | 521 | static int nvram_compress(const void *in, void *out, size_t inlen, |
| 567 | size_t outlen) | 522 | size_t outlen) |
| @@ -619,9 +574,7 @@ static int zip_oops(size_t text_len) · 51 unmodified lines | |||
| 619 | * partition. If that's too much, go back and capture uncompressed text. | 574 | * partition. If that's too much, go back and capture uncompressed text. |
| 620 | */ | 575 | */ |
| 621 | static void oops_to_nvram(struct kmsg_dumper *dumper, | 576 | static void oops_to_nvram(struct kmsg_dumper *dumper, |
| 622 | enum kmsg_dump_reason reason, | 577 | enum kmsg_dump_reason reason) |
| 623 | const char *old_msgs, unsigned long old_len, | ||
| 624 | const char *new_msgs, unsigned long new_len) | ||
| 625 | { | 578 | { |
| 626 | static unsigned int oops_count = 0; | 579 | static unsigned int oops_count = 0; |
| 627 | static bool panicking = false; | 580 | static bool panicking = false; |
| @@ -660,14 +613,14 @@ static void oops_to_nvram(struct kmsg_dumper *dumper, · 32 unmodified lines | |||
| 660 | return; | 613 | return; |
| 661 | 614 | ||
| 662 | if (big_oops_buf) { | 615 | if (big_oops_buf) { |
| 663 | text_len = capture_last_msgs(old_msgs, old_len, | 616 | kmsg_dump_get_buffer(dumper, false, |
| 664 | new_msgs, new_len, big_oops_buf, big_oops_buf_sz); | 617 | big_oops_buf, big_oops_buf_sz, &text_len); |
| 665 | text_len = elide_severities(big_oops_buf, text_len); | ||
| 666 | rc = zip_oops(text_len); | 618 | rc = zip_oops(text_len); |
| 667 | } | 619 | } |
| 668 | if (rc != 0) { | 620 | if (rc != 0) { |
| 669 | text_len = capture_last_msgs(old_msgs, old_len, | 621 | kmsg_dump_rewind(dumper); |
| 670 | new_msgs, new_len, oops_data, oops_data_sz); | 622 | kmsg_dump_get_buffer(dumper, true, |
| 623 | oops_data, oops_data_sz, &text_len); | ||
| 671 | err_type = ERR_TYPE_KERNEL_PANIC; | 624 | err_type = ERR_TYPE_KERNEL_PANIC; |
| 672 | *oops_len = (u16) text_len; | 625 | *oops_len = (u16) text_len; |
| 673 | } | 626 | } |
| @@ -443,7 +443,7 @@ static int __init vio_init(void) · 442 unmodified lines | |||
| 443 | root_vdev = vio_create_one(hp, root, NULL); | 443 | root_vdev = vio_create_one(hp, root, NULL); |
| 444 | err = -ENODEV; | 444 | err = -ENODEV; |
| 445 | if (!root_vdev) { | 445 | if (!root_vdev) { |
| 446 | printk(KERN_ERR "VIO: Coult not create root device.\n"); | 446 | printk(KERN_ERR "VIO: Could not create root device.\n"); |
| 447 | goto out_release; | 447 | goto out_release; |
| 448 | } | 448 | } |
| 449 | 449 | ||
| @@ -47,16 +47,26 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte) · 46 unmodified lines | |||
| 47 | * they can run pmd_offset_map_lock or pmd_trans_huge or other pmd | 47 | * they can run pmd_offset_map_lock or pmd_trans_huge or other pmd |
| 48 | * operations. | 48 | * operations. |
| 49 | * | 49 | * |
| 50 | * Without THP if the mmap_sem is hold for reading, the | 50 | * Without THP if the mmap_sem is hold for reading, the pmd can only |
| 51 | * pmd can only transition from null to not null while pmd_read_atomic runs. | 51 | * transition from null to not null while pmd_read_atomic runs. So |
| 52 | * So there's no need of literally reading it atomically. | 52 | * we can always return atomic pmd values with this function. |
| 53 | * | 53 | * |
| 54 | * With THP if the mmap_sem is hold for reading, the pmd can become | 54 | * With THP if the mmap_sem is hold for reading, the pmd can become |
| 55 | * THP or null or point to a pte (and in turn become "stable") at any | 55 | * trans_huge or none or point to a pte (and in turn become "stable") |
| 56 | * time under pmd_read_atomic, so it's mandatory to read it atomically | 56 | * at any time under pmd_read_atomic. We could read it really |
| 57 | * with cmpxchg8b. | 57 | * atomically here with a atomic64_read for the THP enabled case (and |
| 58 | * it would be a whole lot simpler), but to avoid using cmpxchg8b we | ||
| 59 | * only return an atomic pmdval if the low part of the pmdval is later | ||
| 60 | * found stable (i.e. pointing to a pte). And we're returning a none | ||
| 61 | * pmdval if the low part of the pmd is none. In some cases the high | ||
| 62 | * and low part of the pmdval returned may not be consistent if THP is | ||
| 63 | * enabled (the low part may point to previously mapped hugepage, | ||
| 64 | * while the high part may point to a more recently mapped hugepage), | ||
| 65 | * but pmd_none_or_trans_huge_or_clear_bad() only needs the low part | ||
| 66 | * of the pmd to be read atomically to decide if the pmd is unstable | ||
| 67 | * or not, with the only exception of when the low part of the pmd is | ||
| 68 | * zero in which case we return a none pmd. | ||
| 58 | */ | 69 | */ |
| 59 | #ifndef CONFIG_TRANSPARENT_HUGEPAGE | ||
| 60 | static inline pmd_t pmd_read_atomic(pmd_t *pmdp) | 70 | static inline pmd_t pmd_read_atomic(pmd_t *pmdp) |
| 61 | { | 71 | { |
| 62 | pmdval_t ret; | 72 | pmdval_t ret; |
| @@ -74,12 +84,6 @@ static inline pmd_t pmd_read_atomic(pmd_t *pmdp) · 11 unmodified lines | |||
| 74 | 84 | ||
| 75 | return (pmd_t) { ret }; | 85 | return (pmd_t) { ret }; |
| 76 | } | 86 | } |
| 77 | #else /* CONFIG_TRANSPARENT_HUGEPAGE */ | ||
| 78 | static inline pmd_t pmd_read_atomic(pmd_t *pmdp) | ||
| 79 | { | ||
| 80 | return (pmd_t) { atomic64_read((atomic64_t *)pmdp) }; | ||
| 81 | } | ||
| 82 | #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ | ||
| 83 | 87 | ||
| 84 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) | 88 | static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) |
| 85 | { | 89 | { |
| @@ -110,19 +110,16 @@ static struct kmsg_dumper dw_dumper; · 109 unmodified lines | |||
| 110 | static int dumper_registered; | 110 | static int dumper_registered; |
| 111 | 111 | ||
| 112 | static void dw_kmsg_dump(struct kmsg_dumper *dumper, | 112 | static void dw_kmsg_dump(struct kmsg_dumper *dumper, |
| 113 | enum kmsg_dump_reason reason, | 113 | enum kmsg_dump_reason reason) |
| 114 | const char *s1, unsigned long l1, | ||
| 115 | const char *s2, unsigned long l2) | ||
| 116 | { | 114 | { |
| 117 | int i; | 115 | static char line[1024]; |
| 116 | size_t len; | ||
| 118 | 117 | ||
| 119 | /* When run to this, we'd better re-init the HW */ | 118 | /* When run to this, we'd better re-init the HW */ |
| 120 | mrst_early_console_init(); | 119 | mrst_early_console_init(); |
| 121 | 120 | ||
| 122 | for (i = 0; i < l1; i++) | 121 | while (kmsg_dump_get_line(dumper, true, line, sizeof(line), &len)) |
| 123 | early_mrst_console.write(&early_mrst_console, s1 + i, 1); | 122 | early_mrst_console.write(&early_mrst_console, line, len); |
| 124 | for (i = 0; i < l2; i++) | ||
| 125 | early_mrst_console.write(&early_mrst_console, s2 + i, 1); | ||
| 126 | } | 123 | } |
| 127 | 124 | ||
| 128 | /* Set the ratio rate to 115200, 8n1, IRQ disabled */ | 125 | /* Set the ratio rate to 115200, 8n1, IRQ disabled */ |
| @@ -68,8 +68,8 @@ endif · 67 unmodified lines | |||
| 68 | 68 | ||
| 69 | # Only build variant and/or platform if it includes a Makefile | 69 | # Only build variant and/or platform if it includes a Makefile |
| 70 | 70 | ||
| 71 | buildvar := $(shell test -a $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/) | 71 | buildvar := $(shell test -e $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/) |
| 72 | buildplf := $(shell test -a $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/) | 72 | buildplf := $(shell test -e $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/) |
| 73 | 73 | ||
| 74 | # Find libgcc.a | 74 | # Find libgcc.a |
| 75 | 75 | ||
| @@ -83,7 +83,6 @@ SECTIONS · 82 unmodified lines | |||
| 83 | 83 | ||
| 84 | _text = .; | 84 | _text = .; |
| 85 | _stext = .; | 85 | _stext = .; |
| 86 | _ftext = .; | ||
| 87 | 86 | ||
| 88 | .text : | 87 | .text : |
| 89 | { | 88 | { |
| @@ -112,7 +111,7 @@ SECTIONS · 22 unmodified lines | |||
| 112 | EXCEPTION_TABLE(16) | 111 | EXCEPTION_TABLE(16) |
| 113 | /* Data section */ | 112 | /* Data section */ |
| 114 | 113 | ||
| 115 | _fdata = .; | 114 | _sdata = .; |
| 116 | RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) | 115 | RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE) |
| 117 | _edata = .; | 116 | _edata = .; |
| 118 | 117 | ||
| @@ -26,11 +26,7 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <asm/bootparam.h> | 27 | #include <asm/bootparam.h> |
| 28 | #include <asm/page.h> | 28 | #include <asm/page.h> |
| 29 | 29 | #include <asm/sections.h> | |
| 30 | /* References to section boundaries */ | ||
| 31 | |||
| 32 | extern char _ftext, _etext, _fdata, _edata, _rodata_end; | ||
| 33 | extern char __init_begin, __init_end; | ||
| 34 | 30 | ||
| 35 | /* | 31 | /* |
| 36 | * mem_reserve(start, end, must_exist) | 32 | * mem_reserve(start, end, must_exist) |
| @@ -197,9 +193,9 @@ void __init mem_init(void) · 160 unmodified lines | |||
| 197 | reservedpages++; | 193 | reservedpages++; |
| 198 | } | 194 | } |
| 199 | 195 | ||
| 200 | codesize = (unsigned long) &_etext - (unsigned long) &_ftext; | 196 | codesize = (unsigned long) _etext - (unsigned long) _stext; |
| 201 | datasize = (unsigned long) &_edata - (unsigned long) &_fdata; | 197 | datasize = (unsigned long) _edata - (unsigned long) _sdata; |
| 202 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | 198 | initsize = (unsigned long) __init_end - (unsigned long) __init_begin; |
| 203 | 199 | ||
| 204 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " | 200 | printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " |
| 205 | "%ldk data, %ldk init %ldk highmem)\n", | 201 | "%ldk data, %ldk init %ldk highmem)\n", |
| @@ -237,7 +233,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) · 31 unmodified lines | |||
| 237 | 233 | ||
| 238 | void free_initmem(void) | 234 | void free_initmem(void) |
| 239 | { | 235 | { |
| 240 | free_reserved_mem(&__init_begin, &__init_end); | 236 | free_reserved_mem(__init_begin, __init_end); |
| 241 | printk("Freeing unused kernel memory: %dk freed\n", | 237 | printk("Freeing unused kernel memory: %zuk freed\n", |
| 242 | (&__init_end - &__init_begin) >> 10); | 238 | (__init_end - __init_begin) >> 10); |
| 243 | } | 239 | } |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Arasan Compact Flash host controller source file | 4 | * Arasan Compact Flash host controller source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2011 ST Microelectronics | 6 | * Copyright (C) 2011 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -959,7 +959,7 @@ static struct platform_driver arasan_cf_driver = { · 948 unmodified lines | |||
| 959 | 959 | ||
| 960 | module_platform_driver(arasan_cf_driver); | 960 | module_platform_driver(arasan_cf_driver); |
| 961 | 961 | ||
| 962 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 962 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 963 | MODULE_DESCRIPTION("Arasan ATA Compact Flash driver"); | 963 | MODULE_DESCRIPTION("Arasan ATA Compact Flash driver"); |
| 964 | MODULE_LICENSE("GPL"); | 964 | MODULE_LICENSE("GPL"); |
| 965 | MODULE_ALIAS("platform:" DRIVER_NAME); | 965 | MODULE_ALIAS("platform:" DRIVER_NAME); |
| @@ -100,7 +100,7 @@ static void driver_deferred_probe_add(struct device *dev) · 99 unmodified lines | |||
| 100 | mutex_lock(&deferred_probe_mutex); | 100 | mutex_lock(&deferred_probe_mutex); |
| 101 | if (list_empty(&dev->p->deferred_probe)) { | 101 | if (list_empty(&dev->p->deferred_probe)) { |
| 102 | dev_dbg(dev, "Added to deferred list\n"); | 102 | dev_dbg(dev, "Added to deferred list\n"); |
| 103 | list_add(&dev->p->deferred_probe, &deferred_probe_pending_list); | 103 | list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list); |
| 104 | } | 104 | } |
| 105 | mutex_unlock(&deferred_probe_mutex); | 105 | mutex_unlock(&deferred_probe_mutex); |
| 106 | } | 106 | } |
| @@ -34,7 +34,7 @@ static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max, · 33 unmodified lines | |||
| 34 | u32 *data = buf; | 34 | u32 *data = buf; |
| 35 | 35 | ||
| 36 | /* data ready? */ | 36 | /* data ready? */ |
| 37 | if (readl(trng->base + TRNG_ODATA) & 1) { | 37 | if (readl(trng->base + TRNG_ISR) & 1) { |
| 38 | *data = readl(trng->base + TRNG_ODATA); | 38 | *data = readl(trng->base + TRNG_ODATA); |
| 39 | /* | 39 | /* |
| 40 | ensure data ready is only set again AFTER the next data | 40 | ensure data ready is only set again AFTER the next data |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2012 ST Microelectronics | 2 | * Copyright (C) 2012 ST Microelectronics |
| 3 | * Viresh Kumar <viresh.kumar@st.com> | 3 | * Viresh Kumar <viresh.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2012 ST Microelectronics | 2 | * Copyright (C) 2012 ST Microelectronics |
| 3 | * Viresh Kumar <viresh.kumar@st.com> | 3 | * Viresh Kumar <viresh.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2012 ST Microelectronics | 2 | * Copyright (C) 2012 ST Microelectronics |
| 3 | * Viresh Kumar <viresh.kumar@st.com> | 3 | * Viresh Kumar <viresh.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2012 ST Microelectronics | 2 | * Copyright (C) 2012 ST Microelectronics |
| 3 | * Viresh Kumar <viresh.kumar@st.com> | 3 | * Viresh Kumar <viresh.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2012 ST Microelectronics | 2 | * Copyright (C) 2012 ST Microelectronics |
| 3 | * Viresh Kumar <viresh.kumar@st.com> | 3 | * Viresh Kumar <viresh.linux@gmail.com> |
| 4 | * | 4 | * |
| 5 | * This file is licensed under the terms of the GNU General Public | 5 | * This file is licensed under the terms of the GNU General Public |
| 6 | * License version 2. This program is licensed "as is" without any | 6 | * License version 2. This program is licensed "as is" without any |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Clock framework definitions for SPEAr platform | 2 | * Clock framework definitions for SPEAr platform |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr1310 machine clock framework source file | 4 | * SPEAr1310 machine clock framework source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SPEAr1340 machine clock framework source file | 4 | * SPEAr1340 machine clock framework source file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2012 ST Microelectronics | 6 | * Copyright (C) 2012 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * SPEAr3xx machines clock framework source file | 2 | * SPEAr3xx machines clock framework source file |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * SPEAr6xx machines clock framework source file | 2 | * SPEAr6xx machines clock framework source file |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -1626,4 +1626,4 @@ module_exit(dw_exit); · 1625 unmodified lines | |||
| 1626 | MODULE_LICENSE("GPL v2"); | 1626 | MODULE_LICENSE("GPL v2"); |
| 1627 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); | 1627 | MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); |
| 1628 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); | 1628 | MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); |
| 1629 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 1629 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| @@ -815,8 +815,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac) · 814 unmodified lines | |||
| 815 | 815 | ||
| 816 | init_completion(&sdmac->done); | 816 | init_completion(&sdmac->done); |
| 817 | 817 | ||
| 818 | sdmac->buf_tail = 0; | ||
| 819 | |||
| 820 | return 0; | 818 | return 0; |
| 821 | out: | 819 | out: |
| 822 | 820 | ||
| @@ -927,6 +925,8 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg( · 104 unmodified lines | |||
| 927 | 925 | ||
| 928 | sdmac->flags = 0; | 926 | sdmac->flags = 0; |
| 929 | 927 | ||
| 928 | sdmac->buf_tail = 0; | ||
| 929 | |||
| 930 | dev_dbg(sdma->dev, "setting up %d entries for channel %d.\n", | 930 | dev_dbg(sdma->dev, "setting up %d entries for channel %d.\n", |
| 931 | sg_len, channel); | 931 | sg_len, channel); |
| 932 | 932 | ||
| @@ -1027,6 +1027,8 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic( · 94 unmodified lines | |||
| 1027 | 1027 | ||
| 1028 | sdmac->status = DMA_IN_PROGRESS; | 1028 | sdmac->status = DMA_IN_PROGRESS; |
| 1029 | 1029 | ||
| 1030 | sdmac->buf_tail = 0; | ||
| 1031 | |||
| 1030 | sdmac->flags |= IMX_DMA_SG_LOOP; | 1032 | sdmac->flags |= IMX_DMA_SG_LOOP; |
| 1031 | sdmac->direction = direction; | 1033 | sdmac->direction = direction; |
| 1032 | ret = sdma_load_context(sdmac); | 1034 | ret = sdma_load_context(sdmac); |
| @@ -392,6 +392,8 @@ struct pl330_req { · 391 unmodified lines | |||
| 392 | struct pl330_reqcfg *cfg; | 392 | struct pl330_reqcfg *cfg; |
| 393 | /* Pointer to first xfer in the request. */ | 393 | /* Pointer to first xfer in the request. */ |
| 394 | struct pl330_xfer *x; | 394 | struct pl330_xfer *x; |
| 395 | /* Hook to attach to DMAC's list of reqs with due callback */ | ||
| 396 | struct list_head rqd; | ||
| 395 | }; | 397 | }; |
| 396 | 398 | ||
| 397 | /* | 399 | /* |
| @@ -461,8 +463,6 @@ struct _pl330_req { · 63 unmodified lines | |||
| 461 | /* Number of bytes taken to setup MC for the req */ | 463 | /* Number of bytes taken to setup MC for the req */ |
| 462 | u32 mc_len; | 464 | u32 mc_len; |
| 463 | struct pl330_req *r; | 465 | struct pl330_req *r; |
| 464 | /* Hook to attach to DMAC's list of reqs with due callback */ | ||
| 465 | struct list_head rqd; | ||
| 466 | }; | 466 | }; |
| 467 | 467 | ||
| 468 | /* ToBeDone for tasklet */ | 468 | /* ToBeDone for tasklet */ |
| @@ -1683,7 +1683,7 @@ static void pl330_dotask(unsigned long data) · 1214 unmodified lines | |||
| 1683 | /* Returns 1 if state was updated, 0 otherwise */ | 1683 | /* Returns 1 if state was updated, 0 otherwise */ |
| 1684 | static int pl330_update(const struct pl330_info *pi) | 1684 | static int pl330_update(const struct pl330_info *pi) |
| 1685 | { | 1685 | { |
| 1686 | struct _pl330_req *rqdone; | 1686 | struct pl330_req *rqdone, *tmp; |
| 1687 | struct pl330_dmac *pl330; | 1687 | struct pl330_dmac *pl330; |
| 1688 | unsigned long flags; | 1688 | unsigned long flags; |
| 1689 | void __iomem *regs; | 1689 | void __iomem *regs; |
| @@ -1750,7 +1750,10 @@ static int pl330_update(const struct pl330_info *pi) · 60 unmodified lines | |||
| 1750 | if (active == -1) /* Aborted */ | 1750 | if (active == -1) /* Aborted */ |
| 1751 | continue; | 1751 | continue; |
| 1752 | 1752 | ||
| 1753 | rqdone = &thrd->req[active]; | 1753 | /* Detach the req */ |
| 1754 | rqdone = thrd->req[active].r; | ||
| 1755 | thrd->req[active].r = NULL; | ||
| 1756 | |||
| 1754 | mark_free(thrd, active); | 1757 | mark_free(thrd, active); |
| 1755 | 1758 | ||
| 1756 | /* Get going again ASAP */ | 1759 | /* Get going again ASAP */ |
| @@ -1762,20 +1765,11 @@ static int pl330_update(const struct pl330_info *pi) · 5 unmodified lines | |||
| 1762 | } | 1765 | } |
| 1763 | 1766 | ||
| 1764 | /* Now that we are in no hurry, do the callbacks */ | 1767 | /* Now that we are in no hurry, do the callbacks */ |
| 1765 | while (!list_empty(&pl330->req_done)) { | 1768 | list_for_each_entry_safe(rqdone, tmp, &pl330->req_done, rqd) { |
| 1766 | struct pl330_req *r; | 1769 | list_del(&rqdone->rqd); |
| 1767 | |||
| 1768 | rqdone = container_of(pl330->req_done.next, | ||
| 1769 | struct _pl330_req, rqd); | ||
| 1770 | |||
| 1771 | list_del_init(&rqdone->rqd); | ||
| 1772 | |||
| 1773 | /* Detach the req */ | ||
| 1774 | r = rqdone->r; | ||
| 1775 | rqdone->r = NULL; | ||
| 1776 | 1770 | ||
| 1777 | spin_unlock_irqrestore(&pl330->lock, flags); | 1771 | spin_unlock_irqrestore(&pl330->lock, flags); |
| 1778 | _callback(r, PL330_ERR_NONE); | 1772 | _callback(rqdone, PL330_ERR_NONE); |
| 1779 | spin_lock_irqsave(&pl330->lock, flags); | 1773 | spin_lock_irqsave(&pl330->lock, flags); |
| 1780 | } | 1774 | } |
| 1781 | 1775 | ||
| @@ -2321,7 +2315,7 @@ static void pl330_tasklet(unsigned long data) · 539 unmodified lines | |||
| 2321 | /* Pick up ripe tomatoes */ | 2315 | /* Pick up ripe tomatoes */ |
| 2322 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) | 2316 | list_for_each_entry_safe(desc, _dt, &pch->work_list, node) |
| 2323 | if (desc->status == DONE) { | 2317 | if (desc->status == DONE) { |
| 2324 | if (pch->cyclic) | 2318 | if (!pch->cyclic) |
| 2325 | dma_cookie_complete(&desc->txd); | 2319 | dma_cookie_complete(&desc->txd); |
| 2326 | list_move_tail(&desc->node, &list); | 2320 | list_move_tail(&desc->node, &list); |
| 2327 | } | 2321 | } |
| @@ -2539,7 +2533,7 @@ static inline void _init_desc(struct dma_pl330_desc *desc) · 211 unmodified lines | |||
| 2539 | } | 2533 | } |
| 2540 | 2534 | ||
| 2541 | /* Returns the number of descriptors added to the DMAC pool */ | 2535 | /* Returns the number of descriptors added to the DMAC pool */ |
| 2542 | int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count) | 2536 | static int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count) |
| 2543 | { | 2537 | { |
| 2544 | struct dma_pl330_desc *desc; | 2538 | struct dma_pl330_desc *desc; |
| 2545 | unsigned long flags; | 2539 | unsigned long flags; |
| @@ -164,7 +164,7 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems) · 163 unmodified lines | |||
| 164 | else | 164 | else |
| 165 | return (char *)ptr; | 165 | return (char *)ptr; |
| 166 | 166 | ||
| 167 | r = size % align; | 167 | r = (unsigned long)p % align; |
| 168 | 168 | ||
| 169 | if (r == 0) | 169 | if (r == 0) |
| 170 | return (char *)ptr; | 170 | return (char *)ptr; |
| @@ -1814,12 +1814,6 @@ static int i7core_mce_check_error(struct notifier_block *nb, unsigned long val, · 1813 unmodified lines | |||
| 1814 | if (mce->bank != 8) | 1814 | if (mce->bank != 8) |
| 1815 | return NOTIFY_DONE; | 1815 | return NOTIFY_DONE; |
| 1816 | 1816 | ||
| 1817 | #ifdef CONFIG_SMP | ||
| 1818 | /* Only handle if it is the right mc controller */ | ||
| 1819 | if (mce->socketid != pvt->i7core_dev->socket) | ||
| 1820 | return NOTIFY_DONE; | ||
| 1821 | #endif | ||
| 1822 | |||
| 1823 | smp_rmb(); | 1817 | smp_rmb(); |
| 1824 | if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) { | 1818 | if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) { |
| 1825 | smp_wmb(); | 1819 | smp_wmb(); |
| @@ -2116,8 +2110,6 @@ static void i7core_unregister_mci(struct i7core_dev *i7core_dev) · 290 unmodified lines | |||
| 2116 | if (pvt->enable_scrub) | 2110 | if (pvt->enable_scrub) |
| 2117 | disable_sdram_scrub_setting(mci); | 2111 | disable_sdram_scrub_setting(mci); |
| 2118 | 2112 | ||
| 2119 | mce_unregister_decode_chain(&i7_mce_dec); | ||
| 2120 | |||
| 2121 | /* Disable EDAC polling */ | 2113 | /* Disable EDAC polling */ |
| 2122 | i7core_pci_ctl_release(pvt); | 2114 | i7core_pci_ctl_release(pvt); |
| 2123 | 2115 | ||
| @@ -2222,8 +2214,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) · 98 unmodified lines | |||
| 2222 | /* DCLK for scrub rate setting */ | 2214 | /* DCLK for scrub rate setting */ |
| 2223 | pvt->dclk_freq = get_dclk_freq(); | 2215 | pvt->dclk_freq = get_dclk_freq(); |
| 2224 | 2216 | ||
| 2225 | mce_register_decode_chain(&i7_mce_dec); | ||
| 2226 | |||
| 2227 | return 0; | 2217 | return 0; |
| 2228 | 2218 | ||
| 2229 | fail0: | 2219 | fail0: |
| @@ -2367,8 +2357,10 @@ static int __init i7core_init(void) · 137 unmodified lines | |||
| 2367 | 2357 | ||
| 2368 | pci_rc = pci_register_driver(&i7core_driver); | 2358 | pci_rc = pci_register_driver(&i7core_driver); |
| 2369 | 2359 | ||
| 2370 | if (pci_rc >= 0) | 2360 | if (pci_rc >= 0) { |
| 2361 | mce_register_decode_chain(&i7_mce_dec); | ||
| 2371 | return 0; | 2362 | return 0; |
| 2363 | } | ||
| 2372 | 2364 | ||
| 2373 | i7core_printk(KERN_ERR, "Failed to register device with error %d.\n", | 2365 | i7core_printk(KERN_ERR, "Failed to register device with error %d.\n", |
| 2374 | pci_rc); | 2366 | pci_rc); |
| @@ -2384,6 +2376,7 @@ static void __exit i7core_exit(void) · 9 unmodified lines | |||
| 2384 | { | 2376 | { |
| 2385 | debugf2("MC: " __FILE__ ": %s()\n", __func__); | 2377 | debugf2("MC: " __FILE__ ": %s()\n", __func__); |
| 2386 | pci_unregister_driver(&i7core_driver); | 2378 | pci_unregister_driver(&i7core_driver); |
| 2379 | mce_unregister_decode_chain(&i7_mce_dec); | ||
| 2387 | } | 2380 | } |
| 2388 | 2381 | ||
| 2389 | module_init(i7core_init); | 2382 | module_init(i7core_init); |
| @@ -980,7 +980,8 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) · 979 unmodified lines | |||
| 980 | layers[1].type = EDAC_MC_LAYER_CHANNEL; | 980 | layers[1].type = EDAC_MC_LAYER_CHANNEL; |
| 981 | layers[1].size = 1; | 981 | layers[1].size = 1; |
| 982 | layers[1].is_virt_csrow = false; | 982 | layers[1].is_virt_csrow = false; |
| 983 | mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), sizeof(*pdata)); | 983 | mci = edac_mc_alloc(edac_mc_idx, ARRAY_SIZE(layers), layers, |
| 984 | sizeof(*pdata)); | ||
| 984 | if (!mci) { | 985 | if (!mci) { |
| 985 | devres_release_group(&op->dev, mpc85xx_mc_err_probe); | 986 | devres_release_group(&op->dev, mpc85xx_mc_err_probe); |
| 986 | return -ENOMEM; | 987 | return -ENOMEM; |
| @@ -555,7 +555,7 @@ static int get_dimm_config(struct mem_ctl_info *mci) · 554 unmodified lines | |||
| 555 | pvt->is_close_pg = false; | 555 | pvt->is_close_pg = false; |
| 556 | } | 556 | } |
| 557 | 557 | ||
| 558 | pci_read_config_dword(pvt->pci_ta, RANK_CFG_A, ®); | 558 | pci_read_config_dword(pvt->pci_ddrio, RANK_CFG_A, ®); |
| 559 | if (IS_RDIMM_ENABLED(reg)) { | 559 | if (IS_RDIMM_ENABLED(reg)) { |
| 560 | /* FIXME: Can also be LRDIMM */ | 560 | /* FIXME: Can also be LRDIMM */ |
| 561 | debugf0("Memory is registered\n"); | 561 | debugf0("Memory is registered\n"); |
| @@ -1604,8 +1604,6 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev) · 1042 unmodified lines | |||
| 1604 | debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", | 1604 | debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", |
| 1605 | __func__, mci, &sbridge_dev->pdev[0]->dev); | 1605 | __func__, mci, &sbridge_dev->pdev[0]->dev); |
| 1606 | 1606 | ||
| 1607 | mce_unregister_decode_chain(&sbridge_mce_dec); | ||
| 1608 | |||
| 1609 | /* Remove MC sysfs nodes */ | 1607 | /* Remove MC sysfs nodes */ |
| 1610 | edac_mc_del_mc(mci->dev); | 1608 | edac_mc_del_mc(mci->dev); |
| 1611 | 1609 | ||
| @@ -1682,7 +1680,6 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev) · 70 unmodified lines | |||
| 1682 | goto fail0; | 1680 | goto fail0; |
| 1683 | } | 1681 | } |
| 1684 | 1682 | ||
| 1685 | mce_register_decode_chain(&sbridge_mce_dec); | ||
| 1686 | return 0; | 1683 | return 0; |
| 1687 | 1684 | ||
| 1688 | fail0: | 1685 | fail0: |
| @@ -1811,8 +1808,10 @@ static int __init sbridge_init(void) · 122 unmodified lines | |||
| 1811 | 1808 | ||
| 1812 | pci_rc = pci_register_driver(&sbridge_driver); | 1809 | pci_rc = pci_register_driver(&sbridge_driver); |
| 1813 | 1810 | ||
| 1814 | if (pci_rc >= 0) | 1811 | if (pci_rc >= 0) { |
| 1812 | mce_register_decode_chain(&sbridge_mce_dec); | ||
| 1815 | return 0; | 1813 | return 0; |
| 1814 | } | ||
| 1816 | 1815 | ||
| 1817 | sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n", | 1816 | sbridge_printk(KERN_ERR, "Failed to register device with error %d.\n", |
| 1818 | pci_rc); | 1817 | pci_rc); |
| @@ -1828,6 +1827,7 @@ static void __exit sbridge_exit(void) · 9 unmodified lines | |||
| 1828 | { | 1827 | { |
| 1829 | debugf2("MC: " __FILE__ ": %s()\n", __func__); | 1828 | debugf2("MC: " __FILE__ ": %s()\n", __func__); |
| 1830 | pci_unregister_driver(&sbridge_driver); | 1829 | pci_unregister_driver(&sbridge_driver); |
| 1830 | mce_unregister_decode_chain(&sbridge_mce_dec); | ||
| 1831 | } | 1831 | } |
| 1832 | 1832 | ||
| 1833 | module_init(sbridge_init); | 1833 | module_init(sbridge_init); |
| @@ -116,8 +116,8 @@ const char *max8997_extcon_cable[] = { · 115 unmodified lines | |||
| 116 | [5] = "Charge-downstream", | 116 | [5] = "Charge-downstream", |
| 117 | [6] = "MHL", | 117 | [6] = "MHL", |
| 118 | [7] = "Dock-desk", | 118 | [7] = "Dock-desk", |
| 119 | [7] = "Dock-card", | 119 | [8] = "Dock-card", |
| 120 | [8] = "JIG", | 120 | [9] = "JIG", |
| 121 | 121 | ||
| 122 | NULL, | 122 | NULL, |
| 123 | }; | 123 | }; |
| @@ -514,6 +514,7 @@ static int __devexit max8997_muic_remove(struct platform_device *pdev) · 390 unmodified lines | |||
| 514 | 514 | ||
| 515 | extcon_dev_unregister(info->edev); | 515 | extcon_dev_unregister(info->edev); |
| 516 | 516 | ||
| 517 | kfree(info->edev); | ||
| 517 | kfree(info); | 518 | kfree(info); |
| 518 | 519 | ||
| 519 | return 0; | 520 | return 0; |
| @@ -762,7 +762,7 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev) · 761 unmodified lines | |||
| 762 | #if defined(CONFIG_ANDROID) | 762 | #if defined(CONFIG_ANDROID) |
| 763 | if (switch_class) | 763 | if (switch_class) |
| 764 | ret = class_compat_create_link(switch_class, edev->dev, | 764 | ret = class_compat_create_link(switch_class, edev->dev, |
| 765 | dev); | 765 | NULL); |
| 766 | #endif /* CONFIG_ANDROID */ | 766 | #endif /* CONFIG_ANDROID */ |
| 767 | 767 | ||
| 768 | spin_lock_init(&edev->lock); | 768 | spin_lock_init(&edev->lock); |
| @@ -125,6 +125,7 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev) · 124 unmodified lines | |||
| 125 | if (ret < 0) | 125 | if (ret < 0) |
| 126 | goto err_request_irq; | 126 | goto err_request_irq; |
| 127 | 127 | ||
| 128 | platform_set_drvdata(pdev, extcon_data); | ||
| 128 | /* Perform initial detection */ | 129 | /* Perform initial detection */ |
| 129 | gpio_extcon_work(&extcon_data->work.work); | 130 | gpio_extcon_work(&extcon_data->work.work); |
| 130 | 131 | ||
| @@ -146,6 +147,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev) · 15 unmodified lines | |||
| 146 | struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev); | 147 | struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev); |
| 147 | 148 | ||
| 148 | cancel_delayed_work_sync(&extcon_data->work); | 149 | cancel_delayed_work_sync(&extcon_data->work); |
| 150 | free_irq(extcon_data->irq, extcon_data); | ||
| 149 | gpio_free(extcon_data->gpio); | 151 | gpio_free(extcon_data->gpio); |
| 150 | extcon_dev_unregister(&extcon_data->edev); | 152 | extcon_dev_unregister(&extcon_data->edev); |
| 151 | devm_kfree(&pdev->dev, extcon_data); | 153 | devm_kfree(&pdev->dev, extcon_data); |
| @@ -610,7 +610,7 @@ static bool · 609 unmodified lines | |||
| 610 | drm_monitor_supports_rb(struct edid *edid) | 610 | drm_monitor_supports_rb(struct edid *edid) |
| 611 | { | 611 | { |
| 612 | if (edid->revision >= 4) { | 612 | if (edid->revision >= 4) { |
| 613 | bool ret; | 613 | bool ret = false; |
| 614 | drm_for_each_detailed_block((u8 *)edid, is_rb, &ret); | 614 | drm_for_each_detailed_block((u8 *)edid, is_rb, &ret); |
| 615 | return ret; | 615 | return ret; |
| 616 | } | 616 | } |
| @@ -6558,7 +6558,7 @@ static void intel_setup_outputs(struct drm_device *dev) · 6557 unmodified lines | |||
| 6558 | if (I915_READ(HDMIC) & PORT_DETECTED) | 6558 | if (I915_READ(HDMIC) & PORT_DETECTED) |
| 6559 | intel_hdmi_init(dev, HDMIC); | 6559 | intel_hdmi_init(dev, HDMIC); |
| 6560 | 6560 | ||
| 6561 | if (I915_READ(HDMID) & PORT_DETECTED) | 6561 | if (!dpd_is_edp && I915_READ(HDMID) & PORT_DETECTED) |
| 6562 | intel_hdmi_init(dev, HDMID); | 6562 | intel_hdmi_init(dev, HDMID); |
| 6563 | 6563 | ||
| 6564 | if (I915_READ(PCH_DP_C) & DP_DETECTED) | 6564 | if (I915_READ(PCH_DP_C) & DP_DETECTED) |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | |||
| 32 | #include "drm.h" | 32 | #include "drm.h" |
| 33 | #include "drm_crtc.h" | 33 | #include "drm_crtc.h" |
| 34 | #include "drm_crtc_helper.h" | 34 | #include "drm_crtc_helper.h" |
| 35 | #include "drm_edid.h" | ||
| 35 | #include "intel_drv.h" | 36 | #include "intel_drv.h" |
| 36 | #include "i915_drm.h" | 37 | #include "i915_drm.h" |
| 37 | #include "i915_drv.h" | 38 | #include "i915_drv.h" |
| @@ -67,6 +68,8 @@ struct intel_dp { · 29 unmodified lines | |||
| 67 | struct drm_display_mode *panel_fixed_mode; /* for eDP */ | 68 | struct drm_display_mode *panel_fixed_mode; /* for eDP */ |
| 68 | struct delayed_work panel_vdd_work; | 69 | struct delayed_work panel_vdd_work; |
| 69 | bool want_panel_vdd; | 70 | bool want_panel_vdd; |
| 71 | struct edid *edid; /* cached EDID for eDP */ | ||
| 72 | int edid_mode_count; | ||
| 70 | }; | 73 | }; |
| 71 | 74 | ||
| 72 | /** | 75 | /** |
| @@ -371,7 +374,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, · 298 unmodified lines | |||
| 371 | int recv_bytes; | 374 | int recv_bytes; |
| 372 | uint32_t status; | 375 | uint32_t status; |
| 373 | uint32_t aux_clock_divider; | 376 | uint32_t aux_clock_divider; |
| 374 | int try, precharge = 5; | 377 | int try, precharge; |
| 375 | 378 | ||
| 376 | intel_dp_check_edp(intel_dp); | 379 | intel_dp_check_edp(intel_dp); |
| 377 | /* The clock divider is based off the hrawclk, | 380 | /* The clock divider is based off the hrawclk, |
| @@ -391,6 +394,11 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, · 13 unmodified lines | |||
| 391 | else | 394 | else |
| 392 | aux_clock_divider = intel_hrawclk(dev) / 2; | 395 | aux_clock_divider = intel_hrawclk(dev) / 2; |
| 393 | 396 | ||
| 397 | if (IS_GEN6(dev)) | ||
| 398 | precharge = 3; | ||
| 399 | else | ||
| 400 | precharge = 5; | ||
| 401 | |||
| 394 | /* Try to wait for any previous AUX channel activity */ | 402 | /* Try to wait for any previous AUX channel activity */ |
| 395 | for (try = 0; try < 3; try++) { | 403 | for (try = 0; try < 3; try++) { |
| 396 | status = I915_READ(ch_ctl); | 404 | status = I915_READ(ch_ctl); |
| @@ -1973,6 +1981,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) · 1576 unmodified lines | |||
| 1973 | if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) | 1981 | if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) |
| 1974 | return; | 1982 | return; |
| 1975 | 1983 | ||
| 1984 | ironlake_edp_panel_vdd_on(intel_dp); | ||
| 1985 | |||
| 1976 | if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3)) | 1986 | if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3)) |
| 1977 | DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", | 1987 | DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", |
| 1978 | buf[0], buf[1], buf[2]); | 1988 | buf[0], buf[1], buf[2]); |
| @@ -1980,6 +1990,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) · 1 unmodified line | |||
| 1980 | if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3)) | 1990 | if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3)) |
| 1981 | DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", | 1991 | DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", |
| 1982 | buf[0], buf[1], buf[2]); | 1992 | buf[0], buf[1], buf[2]); |
| 1993 | |||
| 1994 | ironlake_edp_panel_vdd_off(intel_dp, false); | ||
| 1983 | } | 1995 | } |
| 1984 | 1996 | ||
| 1985 | static bool | 1997 | static bool |
| @@ -2116,10 +2128,22 @@ intel_dp_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) · 130 unmodified lines | |||
| 2116 | { | 2128 | { |
| 2117 | struct intel_dp *intel_dp = intel_attached_dp(connector); | 2129 | struct intel_dp *intel_dp = intel_attached_dp(connector); |
| 2118 | struct edid *edid; | 2130 | struct edid *edid; |
| 2131 | int size; | ||
| 2132 | |||
| 2133 | if (is_edp(intel_dp)) { | ||
| 2134 | if (!intel_dp->edid) | ||
| 2135 | return NULL; | ||
| 2136 | |||
| 2137 | size = (intel_dp->edid->extensions + 1) * EDID_LENGTH; | ||
| 2138 | edid = kmalloc(size, GFP_KERNEL); | ||
| 2139 | if (!edid) | ||
| 2140 | return NULL; | ||
| 2141 | |||
| 2142 | memcpy(edid, intel_dp->edid, size); | ||
| 2143 | return edid; | ||
| 2144 | } | ||
| 2119 | 2145 | ||
| 2120 | ironlake_edp_panel_vdd_on(intel_dp); | ||
| 2121 | edid = drm_get_edid(connector, adapter); | 2146 | edid = drm_get_edid(connector, adapter); |
| 2122 | ironlake_edp_panel_vdd_off(intel_dp, false); | ||
| 2123 | return edid; | 2147 | return edid; |
| 2124 | } | 2148 | } |
| 2125 | 2149 | ||
| @@ -2129,9 +2153,17 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada · 3 unmodified lines | |||
| 2129 | struct intel_dp *intel_dp = intel_attached_dp(connector); | 2153 | struct intel_dp *intel_dp = intel_attached_dp(connector); |
| 2130 | int ret; | 2154 | int ret; |
| 2131 | 2155 | ||
| 2132 | ironlake_edp_panel_vdd_on(intel_dp); | 2156 | if (is_edp(intel_dp)) { |
| 2157 | drm_mode_connector_update_edid_property(connector, | ||
| 2158 | intel_dp->edid); | ||
| 2159 | ret = drm_add_edid_modes(connector, intel_dp->edid); | ||
| 2160 | drm_edid_to_eld(connector, | ||
| 2161 | intel_dp->edid); | ||
| 2162 | connector->display_info.raw_edid = NULL; | ||
| 2163 | return intel_dp->edid_mode_count; | ||
| 2164 | } | ||
| 2165 | |||
| 2133 | ret = intel_ddc_get_modes(connector, adapter); | 2166 | ret = intel_ddc_get_modes(connector, adapter); |
| 2134 | ironlake_edp_panel_vdd_off(intel_dp, false); | ||
| 2135 | return ret; | 2167 | return ret; |
| 2136 | } | 2168 | } |
| 2137 | 2169 | ||
| @@ -2321,6 +2353,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder) · 183 unmodified lines | |||
| 2321 | i2c_del_adapter(&intel_dp->adapter); | 2353 | i2c_del_adapter(&intel_dp->adapter); |
| 2322 | drm_encoder_cleanup(encoder); | 2354 | drm_encoder_cleanup(encoder); |
| 2323 | if (is_edp(intel_dp)) { | 2355 | if (is_edp(intel_dp)) { |
| 2356 | kfree(intel_dp->edid); | ||
| 2324 | cancel_delayed_work_sync(&intel_dp->panel_vdd_work); | 2357 | cancel_delayed_work_sync(&intel_dp->panel_vdd_work); |
| 2325 | ironlake_panel_vdd_off_sync(intel_dp); | 2358 | ironlake_panel_vdd_off_sync(intel_dp); |
| 2326 | } | 2359 | } |
| @@ -2504,11 +2537,14 @@ intel_dp_init(struct drm_device *dev, int output_reg) · 177 unmodified lines | |||
| 2504 | break; | 2537 | break; |
| 2505 | } | 2538 | } |
| 2506 | 2539 | ||
| 2540 | intel_dp_i2c_init(intel_dp, intel_connector, name); | ||
| 2541 | |||
| 2507 | /* Cache some DPCD data in the eDP case */ | 2542 | /* Cache some DPCD data in the eDP case */ |
| 2508 | if (is_edp(intel_dp)) { | 2543 | if (is_edp(intel_dp)) { |
| 2509 | bool ret; | 2544 | bool ret; |
| 2510 | struct edp_power_seq cur, vbt; | 2545 | struct edp_power_seq cur, vbt; |
| 2511 | u32 pp_on, pp_off, pp_div; | 2546 | u32 pp_on, pp_off, pp_div; |
| 2547 | struct edid *edid; | ||
| 2512 | 2548 | ||
| 2513 | pp_on = I915_READ(PCH_PP_ON_DELAYS); | 2549 | pp_on = I915_READ(PCH_PP_ON_DELAYS); |
| 2514 | pp_off = I915_READ(PCH_PP_OFF_DELAYS); | 2550 | pp_off = I915_READ(PCH_PP_OFF_DELAYS); |
| @@ -2576,9 +2612,19 @@ intel_dp_init(struct drm_device *dev, int output_reg) · 61 unmodified lines | |||
| 2576 | intel_dp_destroy(&intel_connector->base); | 2612 | intel_dp_destroy(&intel_connector->base); |
| 2577 | return; | 2613 | return; |
| 2578 | } | 2614 | } |
| 2579 | } | ||
| 2580 | 2615 | ||
| 2581 | intel_dp_i2c_init(intel_dp, intel_connector, name); | 2616 | ironlake_edp_panel_vdd_on(intel_dp); |
| 2617 | edid = drm_get_edid(connector, &intel_dp->adapter); | ||
| 2618 | if (edid) { | ||
| 2619 | drm_mode_connector_update_edid_property(connector, | ||
| 2620 | edid); | ||
| 2621 | intel_dp->edid_mode_count = | ||
| 2622 | drm_add_edid_modes(connector, edid); | ||
| 2623 | drm_edid_to_eld(connector, edid); | ||
| 2624 | intel_dp->edid = edid; | ||
| 2625 | } | ||
| 2626 | ironlake_edp_panel_vdd_off(intel_dp, false); | ||
| 2627 | } | ||
| 2582 | 2628 | ||
| 2583 | intel_encoder->hot_plug = intel_dp_hot_plug; | 2629 | intel_encoder->hot_plug = intel_dp_hot_plug; |
| 2584 | 2630 | ||
| @@ -1149,7 +1149,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, · 1148 unmodified lines | |||
| 1149 | } | 1149 | } |
| 1150 | 1150 | ||
| 1151 | if (tiling_flags & RADEON_TILING_MACRO) { | 1151 | if (tiling_flags & RADEON_TILING_MACRO) { |
| 1152 | if (rdev->family >= CHIP_CAYMAN) | 1152 | if (rdev->family >= CHIP_TAHITI) |
| 1153 | tmp = rdev->config.si.tile_config; | ||
| 1154 | else if (rdev->family >= CHIP_CAYMAN) | ||
| 1153 | tmp = rdev->config.cayman.tile_config; | 1155 | tmp = rdev->config.cayman.tile_config; |
| 1154 | else | 1156 | else |
| 1155 | tmp = rdev->config.evergreen.tile_config; | 1157 | tmp = rdev->config.evergreen.tile_config; |
| @@ -1177,6 +1179,12 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, · 21 unmodified lines | |||
| 1177 | } else if (tiling_flags & RADEON_TILING_MICRO) | 1179 | } else if (tiling_flags & RADEON_TILING_MICRO) |
| 1178 | fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1); | 1180 | fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1); |
| 1179 | 1181 | ||
| 1182 | if ((rdev->family == CHIP_TAHITI) || | ||
| 1183 | (rdev->family == CHIP_PITCAIRN)) | ||
| 1184 | fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16); | ||
| 1185 | else if (rdev->family == CHIP_VERDE) | ||
| 1186 | fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P4_8x16); | ||
| 1187 | |||
| 1180 | switch (radeon_crtc->crtc_id) { | 1188 | switch (radeon_crtc->crtc_id) { |
| 1181 | case 0: | 1189 | case 0: |
| 1182 | WREG32(AVIVO_D1VGA_CONTROL, 0); | 1190 | WREG32(AVIVO_D1VGA_CONTROL, 0); |
| @@ -1926,7 +1926,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, · 1925 unmodified lines | |||
| 1926 | 1926 | ||
| 1927 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) { | 1927 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) { |
| 1928 | r600_hdmi_enable(encoder); | 1928 | r600_hdmi_enable(encoder); |
| 1929 | if (ASIC_IS_DCE4(rdev)) | 1929 | if (ASIC_IS_DCE6(rdev)) |
| 1930 | ; /* TODO (use pointers instead of if-s?) */ | ||
| 1931 | else if (ASIC_IS_DCE4(rdev)) | ||
| 1930 | evergreen_hdmi_setmode(encoder, adjusted_mode); | 1932 | evergreen_hdmi_setmode(encoder, adjusted_mode); |
| 1931 | else | 1933 | else |
| 1932 | r600_hdmi_setmode(encoder, adjusted_mode); | 1934 | r600_hdmi_setmode(encoder, adjusted_mode); |
| @@ -1932,6 +1932,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev) · 1931 unmodified lines | |||
| 1932 | smx_dc_ctl0 |= NUMBER_OF_SETS(rdev->config.evergreen.sx_num_of_sets); | 1932 | smx_dc_ctl0 |= NUMBER_OF_SETS(rdev->config.evergreen.sx_num_of_sets); |
| 1933 | WREG32(SMX_DC_CTL0, smx_dc_ctl0); | 1933 | WREG32(SMX_DC_CTL0, smx_dc_ctl0); |
| 1934 | 1934 | ||
| 1935 | if (rdev->family <= CHIP_SUMO2) | ||
| 1936 | WREG32(SMX_SAR_CTL0, 0x00010000); | ||
| 1937 | |||
| 1935 | WREG32(SX_EXPORT_BUFFER_SIZES, (COLOR_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_size / 4) - 1) | | 1938 | WREG32(SX_EXPORT_BUFFER_SIZES, (COLOR_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_size / 4) - 1) | |
| 1936 | POSITION_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_pos_size / 4) - 1) | | 1939 | POSITION_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_pos_size / 4) - 1) | |
| 1937 | SMX_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_smx_size / 4) - 1))); | 1940 | SMX_BUFFER_SIZE((rdev->config.evergreen.sx_max_export_smx_size / 4) - 1))); |
| @@ -156,9 +156,6 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode · 155 unmodified lines | |||
| 156 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | 156 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
| 157 | uint32_t offset; | 157 | uint32_t offset; |
| 158 | 158 | ||
| 159 | if (ASIC_IS_DCE5(rdev)) | ||
| 160 | return; | ||
| 161 | |||
| 162 | /* Silent, r600_hdmi_enable will raise WARN for us */ | 159 | /* Silent, r600_hdmi_enable will raise WARN for us */ |
| 163 | if (!dig->afmt->enabled) | 160 | if (!dig->afmt->enabled) |
| 164 | return; | 161 | return; |
| @@ -503,6 +503,7 @@ · 502 unmodified lines | |||
| 503 | #define SCRATCH_UMSK 0x8540 | 503 | #define SCRATCH_UMSK 0x8540 |
| 504 | #define SCRATCH_ADDR 0x8544 | 504 | #define SCRATCH_ADDR 0x8544 |
| 505 | 505 | ||
| 506 | #define SMX_SAR_CTL0 0xA008 | ||
| 506 | #define SMX_DC_CTL0 0xA020 | 507 | #define SMX_DC_CTL0 0xA020 |
| 507 | #define USE_HASH_FUNCTION (1 << 0) | 508 | #define USE_HASH_FUNCTION (1 << 0) |
| 508 | #define NUMBER_OF_SETS(x) ((x) << 1) | 509 | #define NUMBER_OF_SETS(x) ((x) << 1) |
| @@ -1303,6 +1303,10 @@ static int cayman_startup(struct radeon_device *rdev) · 1302 unmodified lines | |||
| 1303 | if (r) | 1303 | if (r) |
| 1304 | return r; | 1304 | return r; |
| 1305 | 1305 | ||
| 1306 | r = r600_audio_init(rdev); | ||
| 1307 | if (r) | ||
| 1308 | return r; | ||
| 1309 | |||
| 1306 | return 0; | 1310 | return 0; |
| 1307 | } | 1311 | } |
| 1308 | 1312 | ||
| @@ -1329,6 +1333,7 @@ int cayman_resume(struct radeon_device *rdev) · 20 unmodified lines | |||
| 1329 | 1333 | ||
| 1330 | int cayman_suspend(struct radeon_device *rdev) | 1334 | int cayman_suspend(struct radeon_device *rdev) |
| 1331 | { | 1335 | { |
| 1336 | r600_audio_fini(rdev); | ||
| 1332 | /* FIXME: we should wait for ring to be empty */ | 1337 | /* FIXME: we should wait for ring to be empty */ |
| 1333 | radeon_ib_pool_suspend(rdev); | 1338 | radeon_ib_pool_suspend(rdev); |
| 1334 | radeon_vm_manager_suspend(rdev); | 1339 | radeon_vm_manager_suspend(rdev); |
| @@ -1839,6 +1839,7 @@ void r600_gpu_init(struct radeon_device *rdev) · 1838 unmodified lines | |||
| 1839 | WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA | | 1839 | WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA | |
| 1840 | NUM_CLIP_SEQ(3))); | 1840 | NUM_CLIP_SEQ(3))); |
| 1841 | WREG32(PA_SC_ENHANCE, FORCE_EOV_MAX_CLK_CNT(4095)); | 1841 | WREG32(PA_SC_ENHANCE, FORCE_EOV_MAX_CLK_CNT(4095)); |
| 1842 | WREG32(VC_ENHANCE, 0); | ||
| 1842 | } | 1843 | } |
| 1843 | 1844 | ||
| 1844 | 1845 | ||
| @@ -57,7 +57,7 @@ static bool radeon_dig_encoder(struct drm_encoder *encoder) · 56 unmodified lines | |||
| 57 | */ | 57 | */ |
| 58 | static int r600_audio_chipset_supported(struct radeon_device *rdev) | 58 | static int r600_audio_chipset_supported(struct radeon_device *rdev) |
| 59 | { | 59 | { |
| 60 | return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE5(rdev)) | 60 | return (rdev->family >= CHIP_R600 && !ASIC_IS_DCE6(rdev)) |
| 61 | || rdev->family == CHIP_RS600 | 61 | || rdev->family == CHIP_RS600 |
| 62 | || rdev->family == CHIP_RS690 | 62 | || rdev->family == CHIP_RS690 |
| 63 | || rdev->family == CHIP_RS740; | 63 | || rdev->family == CHIP_RS740; |
| @@ -2079,6 +2079,48 @@ static int r600_packet3_check(struct radeon_cs_parser *p, · 2078 unmodified lines | |||
| 2079 | return -EINVAL; | 2079 | return -EINVAL; |
| 2080 | } | 2080 | } |
| 2081 | break; | 2081 | break; |
| 2082 | case PACKET3_STRMOUT_BASE_UPDATE: | ||
| 2083 | if (p->family < CHIP_RV770) { | ||
| 2084 | DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); | ||
| 2085 | return -EINVAL; | ||
| 2086 | } | ||
| 2087 | if (pkt->count != 1) { | ||
| 2088 | DRM_ERROR("bad STRMOUT_BASE_UPDATE packet count\n"); | ||
| 2089 | return -EINVAL; | ||
| 2090 | } | ||
| 2091 | if (idx_value > 3) { | ||
| 2092 | DRM_ERROR("bad STRMOUT_BASE_UPDATE index\n"); | ||
| 2093 | return -EINVAL; | ||
| 2094 | } | ||
| 2095 | { | ||
| 2096 | u64 offset; | ||
| 2097 | |||
| 2098 | r = r600_cs_packet_next_reloc(p, &reloc); | ||
| 2099 | if (r) { | ||
| 2100 | DRM_ERROR("bad STRMOUT_BASE_UPDATE reloc\n"); | ||
| 2101 | return -EINVAL; | ||
| 2102 | } | ||
| 2103 | |||
| 2104 | if (reloc->robj != track->vgt_strmout_bo[idx_value]) { | ||
| 2105 | DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo does not match\n"); | ||
| 2106 | return -EINVAL; | ||
| 2107 | } | ||
| 2108 | |||
| 2109 | offset = radeon_get_ib_value(p, idx+1) << 8; | ||
| 2110 | if (offset != track->vgt_strmout_bo_offset[idx_value]) { | ||
| 2111 | DRM_ERROR("bad STRMOUT_BASE_UPDATE, bo offset does not match: 0x%llx, 0x%x\n", | ||
| 2112 | offset, track->vgt_strmout_bo_offset[idx_value]); | ||
| 2113 | return -EINVAL; | ||
| 2114 | } | ||
| 2115 | |||
| 2116 | if ((offset + 4) > radeon_bo_size(reloc->robj)) { | ||
| 2117 | DRM_ERROR("bad STRMOUT_BASE_UPDATE bo too small: 0x%llx, 0x%lx\n", | ||
| 2118 | offset + 4, radeon_bo_size(reloc->robj)); | ||
| 2119 | return -EINVAL; | ||
| 2120 | } | ||
| 2121 | ib[idx+1] += (u32)((reloc->lobj.gpu_offset >> 8) & 0xffffffff); | ||
| 2122 | } | ||
| 2123 | break; | ||
| 2082 | case PACKET3_SURFACE_BASE_UPDATE: | 2124 | case PACKET3_SURFACE_BASE_UPDATE: |
| 2083 | if (p->family >= CHIP_RV770 || p->family == CHIP_R600) { | 2125 | if (p->family >= CHIP_RV770 || p->family == CHIP_R600) { |
| 2084 | DRM_ERROR("bad SURFACE_BASE_UPDATE\n"); | 2126 | DRM_ERROR("bad SURFACE_BASE_UPDATE\n"); |
| @@ -322,9 +322,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod · 321 unmodified lines | |||
| 322 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | 322 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
| 323 | uint32_t offset; | 323 | uint32_t offset; |
| 324 | 324 | ||
| 325 | if (ASIC_IS_DCE5(rdev)) | ||
| 326 | return; | ||
| 327 | |||
| 328 | /* Silent, r600_hdmi_enable will raise WARN for us */ | 325 | /* Silent, r600_hdmi_enable will raise WARN for us */ |
| 329 | if (!dig->afmt->enabled) | 326 | if (!dig->afmt->enabled) |
| 330 | return; | 327 | return; |
| @@ -483,7 +480,7 @@ void r600_hdmi_enable(struct drm_encoder *encoder) · 152 unmodified lines | |||
| 483 | uint32_t offset; | 480 | uint32_t offset; |
| 484 | u32 hdmi; | 481 | u32 hdmi; |
| 485 | 482 | ||
| 486 | if (ASIC_IS_DCE5(rdev)) | 483 | if (ASIC_IS_DCE6(rdev)) |
| 487 | return; | 484 | return; |
| 488 | 485 | ||
| 489 | /* Silent, r600_hdmi_enable will raise WARN for us */ | 486 | /* Silent, r600_hdmi_enable will raise WARN for us */ |
| @@ -543,7 +540,7 @@ void r600_hdmi_disable(struct drm_encoder *encoder) · 53 unmodified lines | |||
| 543 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | 540 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
| 544 | uint32_t offset; | 541 | uint32_t offset; |
| 545 | 542 | ||
| 546 | if (ASIC_IS_DCE5(rdev)) | 543 | if (ASIC_IS_DCE6(rdev)) |
| 547 | return; | 544 | return; |
| 548 | 545 | ||
| 549 | /* Called for ATOM_ENCODER_MODE_HDMI only */ | 546 | /* Called for ATOM_ENCODER_MODE_HDMI only */ |
| @@ -485,6 +485,7 @@ · 484 unmodified lines | |||
| 485 | #define TC_L2_SIZE(x) ((x)<<5) | 485 | #define TC_L2_SIZE(x) ((x)<<5) |
| 486 | #define L2_DISABLE_LATE_HIT (1<<9) | 486 | #define L2_DISABLE_LATE_HIT (1<<9) |
| 487 | 487 | ||
| 488 | #define VC_ENHANCE 0x9714 | ||
| 488 | 489 | ||
| 489 | #define VGT_CACHE_INVALIDATION 0x88C4 | 490 | #define VGT_CACHE_INVALIDATION 0x88C4 |
| 490 | #define CACHE_INVALIDATION(x) ((x)<<0) | 491 | #define CACHE_INVALIDATION(x) ((x)<<0) |
| @@ -1163,6 +1164,7 @@ · 672 unmodified lines | |||
| 1163 | #define PACKET3_SET_CTL_CONST 0x6F | 1164 | #define PACKET3_SET_CTL_CONST 0x6F |
| 1164 | #define PACKET3_SET_CTL_CONST_OFFSET 0x0003cff0 | 1165 | #define PACKET3_SET_CTL_CONST_OFFSET 0x0003cff0 |
| 1165 | #define PACKET3_SET_CTL_CONST_END 0x0003e200 | 1166 | #define PACKET3_SET_CTL_CONST_END 0x0003e200 |
| 1167 | #define PACKET3_STRMOUT_BASE_UPDATE 0x72 /* r7xx */ | ||
| 1166 | #define PACKET3_SURFACE_BASE_UPDATE 0x73 | 1168 | #define PACKET3_SURFACE_BASE_UPDATE 0x73 |
| 1167 | 1169 | ||
| 1168 | 1170 | ||
| @@ -58,9 +58,10 @@ · 57 unmodified lines | |||
| 58 | * 2.14.0 - add evergreen tiling informations | 58 | * 2.14.0 - add evergreen tiling informations |
| 59 | * 2.15.0 - add max_pipes query | 59 | * 2.15.0 - add max_pipes query |
| 60 | * 2.16.0 - fix evergreen 2D tiled surface calculation | 60 | * 2.16.0 - fix evergreen 2D tiled surface calculation |
| 61 | * 2.17.0 - add STRMOUT_BASE_UPDATE for r7xx | ||
| 61 | */ | 62 | */ |
| 62 | #define KMS_DRIVER_MAJOR 2 | 63 | #define KMS_DRIVER_MAJOR 2 |
| 63 | #define KMS_DRIVER_MINOR 16 | 64 | #define KMS_DRIVER_MINOR 17 |
| 64 | #define KMS_DRIVER_PATCHLEVEL 0 | 65 | #define KMS_DRIVER_PATCHLEVEL 0 |
| 65 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | 66 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); |
| 66 | int radeon_driver_unload_kms(struct drm_device *dev); | 67 | int radeon_driver_unload_kms(struct drm_device *dev); |
| @@ -801,9 +801,13 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work) · 800 unmodified lines | |||
| 801 | int i; | 801 | int i; |
| 802 | 802 | ||
| 803 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { | 803 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { |
| 804 | not_processed += radeon_fence_count_emitted(rdev, i); | 804 | struct radeon_ring *ring = &rdev->ring[i]; |
| 805 | if (not_processed >= 3) | 805 | |
| 806 | break; | 806 | if (ring->ready) { |
| 807 | not_processed += radeon_fence_count_emitted(rdev, i); | ||
| 808 | if (not_processed >= 3) | ||
| 809 | break; | ||
| 810 | } | ||
| 807 | } | 811 | } |
| 808 | 812 | ||
| 809 | if (not_processed >= 3) { /* should upclock */ | 813 | if (not_processed >= 3) { /* should upclock */ |
| @@ -169,11 +169,17 @@ struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, · 168 unmodified lines | |||
| 169 | struct radeon_bo *bo = gem_to_radeon_bo(obj); | 169 | struct radeon_bo *bo = gem_to_radeon_bo(obj); |
| 170 | int ret = 0; | 170 | int ret = 0; |
| 171 | 171 | ||
| 172 | ret = radeon_bo_reserve(bo, false); | ||
| 173 | if (unlikely(ret != 0)) | ||
| 174 | return ERR_PTR(ret); | ||
| 175 | |||
| 172 | /* pin buffer into GTT */ | 176 | /* pin buffer into GTT */ |
| 173 | ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL); | 177 | ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL); |
| 174 | if (ret) | 178 | if (ret) { |
| 179 | radeon_bo_unreserve(bo); | ||
| 175 | return ERR_PTR(ret); | 180 | return ERR_PTR(ret); |
| 176 | 181 | } | |
| 182 | radeon_bo_unreserve(bo); | ||
| 177 | return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags); | 183 | return dma_buf_export(bo, &radeon_dmabuf_ops, obj->size, flags); |
| 178 | } | 184 | } |
| 179 | 185 | ||
| @@ -616,6 +616,9 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 615 unmodified lines | |||
| 616 | ACK_FLUSH_CTL(3) | | 616 | ACK_FLUSH_CTL(3) | |
| 617 | SYNC_FLUSH_CTL)); | 617 | SYNC_FLUSH_CTL)); |
| 618 | 618 | ||
| 619 | if (rdev->family != CHIP_RV770) | ||
| 620 | WREG32(SMX_SAR_CTL0, 0x00003f3f); | ||
| 621 | |||
| 619 | db_debug3 = RREG32(DB_DEBUG3); | 622 | db_debug3 = RREG32(DB_DEBUG3); |
| 620 | db_debug3 &= ~DB_CLK_OFF_DELAY(0x1f); | 623 | db_debug3 &= ~DB_CLK_OFF_DELAY(0x1f); |
| 621 | switch (rdev->family) { | 624 | switch (rdev->family) { |
| @@ -792,7 +795,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) · 170 unmodified lines | |||
| 792 | 795 | ||
| 793 | WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA | | 796 | WREG32(PA_CL_ENHANCE, (CLIP_VTX_REORDER_ENA | |
| 794 | NUM_CLIP_SEQ(3))); | 797 | NUM_CLIP_SEQ(3))); |
| 795 | 798 | WREG32(VC_ENHANCE, 0); | |
| 796 | } | 799 | } |
| 797 | 800 | ||
| 798 | void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) | 801 | void r700_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) |
| @@ -211,6 +211,7 @@ · 210 unmodified lines | |||
| 211 | #define SCRATCH_UMSK 0x8540 | 211 | #define SCRATCH_UMSK 0x8540 |
| 212 | #define SCRATCH_ADDR 0x8544 | 212 | #define SCRATCH_ADDR 0x8544 |
| 213 | 213 | ||
| 214 | #define SMX_SAR_CTL0 0xA008 | ||
| 214 | #define SMX_DC_CTL0 0xA020 | 215 | #define SMX_DC_CTL0 0xA020 |
| 215 | #define USE_HASH_FUNCTION (1 << 0) | 216 | #define USE_HASH_FUNCTION (1 << 0) |
| 216 | #define CACHE_DEPTH(x) ((x) << 1) | 217 | #define CACHE_DEPTH(x) ((x) << 1) |
| @@ -310,6 +311,8 @@ · 93 unmodified lines | |||
| 310 | #define TCP_CNTL 0x9610 | 311 | #define TCP_CNTL 0x9610 |
| 311 | #define TCP_CHAN_STEER 0x9614 | 312 | #define TCP_CHAN_STEER 0x9614 |
| 312 | 313 | ||
| 314 | #define VC_ENHANCE 0x9714 | ||
| 315 | |||
| 313 | #define VGT_CACHE_INVALIDATION 0x88C4 | 316 | #define VGT_CACHE_INVALIDATION 0x88C4 |
| 314 | #define CACHE_INVALIDATION(x) ((x)<<0) | 317 | #define CACHE_INVALIDATION(x) ((x)<<0) |
| 315 | #define VC_ONLY 0 | 318 | #define VC_ONLY 0 |
| @@ -30,4 +30,76 @@ · 29 unmodified lines | |||
| 30 | #define SI_DC_GPIO_HPD_EN 0x65b8 | 30 | #define SI_DC_GPIO_HPD_EN 0x65b8 |
| 31 | #define SI_DC_GPIO_HPD_Y 0x65bc | 31 | #define SI_DC_GPIO_HPD_Y 0x65bc |
| 32 | 32 | ||
| 33 | #define SI_GRPH_CONTROL 0x6804 | ||
| 34 | # define SI_GRPH_DEPTH(x) (((x) & 0x3) << 0) | ||
| 35 | # define SI_GRPH_DEPTH_8BPP 0 | ||
| 36 | # define SI_GRPH_DEPTH_16BPP 1 | ||
| 37 | # define SI_GRPH_DEPTH_32BPP 2 | ||
| 38 | # define SI_GRPH_NUM_BANKS(x) (((x) & 0x3) << 2) | ||
| 39 | # define SI_ADDR_SURF_2_BANK 0 | ||
| 40 | # define SI_ADDR_SURF_4_BANK 1 | ||
| 41 | # define SI_ADDR_SURF_8_BANK 2 | ||
| 42 | # define SI_ADDR_SURF_16_BANK 3 | ||
| 43 | # define SI_GRPH_Z(x) (((x) & 0x3) << 4) | ||
| 44 | # define SI_GRPH_BANK_WIDTH(x) (((x) & 0x3) << 6) | ||
| 45 | # define SI_ADDR_SURF_BANK_WIDTH_1 0 | ||
| 46 | # define SI_ADDR_SURF_BANK_WIDTH_2 1 | ||
| 47 | # define SI_ADDR_SURF_BANK_WIDTH_4 2 | ||
| 48 | # define SI_ADDR_SURF_BANK_WIDTH_8 3 | ||
| 49 | # define SI_GRPH_FORMAT(x) (((x) & 0x7) << 8) | ||
| 50 | /* 8 BPP */ | ||
| 51 | # define SI_GRPH_FORMAT_INDEXED 0 | ||
| 52 | /* 16 BPP */ | ||
| 53 | # define SI_GRPH_FORMAT_ARGB1555 0 | ||
| 54 | # define SI_GRPH_FORMAT_ARGB565 1 | ||
| 55 | # define SI_GRPH_FORMAT_ARGB4444 2 | ||
| 56 | # define SI_GRPH_FORMAT_AI88 3 | ||
| 57 | # define SI_GRPH_FORMAT_MONO16 4 | ||
| 58 | # define SI_GRPH_FORMAT_BGRA5551 5 | ||
| 59 | /* 32 BPP */ | ||
| 60 | # define SI_GRPH_FORMAT_ARGB8888 0 | ||
| 61 | # define SI_GRPH_FORMAT_ARGB2101010 1 | ||
| 62 | # define SI_GRPH_FORMAT_32BPP_DIG 2 | ||
| 63 | # define SI_GRPH_FORMAT_8B_ARGB2101010 3 | ||
| 64 | # define SI_GRPH_FORMAT_BGRA1010102 4 | ||
| 65 | # define SI_GRPH_FORMAT_8B_BGRA1010102 5 | ||
| 66 | # define SI_GRPH_FORMAT_RGB111110 6 | ||
| 67 | # define SI_GRPH_FORMAT_BGR101111 7 | ||
| 68 | # define SI_GRPH_BANK_HEIGHT(x) (((x) & 0x3) << 11) | ||
| 69 | # define SI_ADDR_SURF_BANK_HEIGHT_1 0 | ||
| 70 | # define SI_ADDR_SURF_BANK_HEIGHT_2 1 | ||
| 71 | # define SI_ADDR_SURF_BANK_HEIGHT_4 2 | ||
| 72 | # define SI_ADDR_SURF_BANK_HEIGHT_8 3 | ||
| 73 | # define SI_GRPH_TILE_SPLIT(x) (((x) & 0x7) << 13) | ||
| 74 | # define SI_ADDR_SURF_TILE_SPLIT_64B 0 | ||
| 75 | # define SI_ADDR_SURF_TILE_SPLIT_128B 1 | ||
| 76 | # define SI_ADDR_SURF_TILE_SPLIT_256B 2 | ||
| 77 | # define SI_ADDR_SURF_TILE_SPLIT_512B 3 | ||
| 78 | # define SI_ADDR_SURF_TILE_SPLIT_1KB 4 | ||
| 79 | # define SI_ADDR_SURF_TILE_SPLIT_2KB 5 | ||
| 80 | # define SI_ADDR_SURF_TILE_SPLIT_4KB 6 | ||
| 81 | # define SI_GRPH_MACRO_TILE_ASPECT(x) (((x) & 0x3) << 18) | ||
| 82 | # define SI_ADDR_SURF_MACRO_TILE_ASPECT_1 0 | ||
| 83 | # define SI_ADDR_SURF_MACRO_TILE_ASPECT_2 1 | ||
| 84 | # define SI_ADDR_SURF_MACRO_TILE_ASPECT_4 2 | ||
| 85 | # define SI_ADDR_SURF_MACRO_TILE_ASPECT_8 3 | ||
| 86 | # define SI_GRPH_ARRAY_MODE(x) (((x) & 0x7) << 20) | ||
| 87 | # define SI_GRPH_ARRAY_LINEAR_GENERAL 0 | ||
| 88 | # define SI_GRPH_ARRAY_LINEAR_ALIGNED 1 | ||
| 89 | # define SI_GRPH_ARRAY_1D_TILED_THIN1 2 | ||
| 90 | # define SI_GRPH_ARRAY_2D_TILED_THIN1 4 | ||
| 91 | # define SI_GRPH_PIPE_CONFIG(x) (((x) & 0x1f) << 24) | ||
| 92 | # define SI_ADDR_SURF_P2 0 | ||
| 93 | # define SI_ADDR_SURF_P4_8x16 4 | ||
| 94 | # define SI_ADDR_SURF_P4_16x16 5 | ||
| 95 | # define SI_ADDR_SURF_P4_16x32 6 | ||
| 96 | # define SI_ADDR_SURF_P4_32x32 7 | ||
| 97 | # define SI_ADDR_SURF_P8_16x16_8x16 8 | ||
| 98 | # define SI_ADDR_SURF_P8_16x32_8x16 9 | ||
| 99 | # define SI_ADDR_SURF_P8_32x32_8x16 10 | ||
| 100 | # define SI_ADDR_SURF_P8_16x32_16x16 11 | ||
| 101 | # define SI_ADDR_SURF_P8_32x32_16x16 12 | ||
| 102 | # define SI_ADDR_SURF_P8_32x32_16x32 13 | ||
| 103 | # define SI_ADDR_SURF_P8_32x64_32x32 14 | ||
| 104 | |||
| 33 | #endif | 105 | #endif |
| @@ -47,9 +47,9 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset) · 46 unmodified lines | |||
| 47 | if (dev_priv == NULL) | 47 | if (dev_priv == NULL) |
| 48 | return -ENOMEM; | 48 | return -ENOMEM; |
| 49 | 49 | ||
| 50 | idr_init(&dev_priv->object_idr); | ||
| 50 | dev->dev_private = (void *)dev_priv; | 51 | dev->dev_private = (void *)dev_priv; |
| 51 | dev_priv->chipset = chipset; | 52 | dev_priv->chipset = chipset; |
| 52 | idr_init(&dev->object_name_idr); | ||
| 53 | 53 | ||
| 54 | return 0; | 54 | return 0; |
| 55 | } | 55 | } |
| @@ -13,8 +13,21 @@ · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | static struct drm_driver driver; | 14 | static struct drm_driver driver; |
| 15 | 15 | ||
| 16 | /* | ||
| 17 | * There are many DisplayLink-based graphics products, all with unique PIDs. | ||
| 18 | * So we match on DisplayLink's VID + Vendor-Defined Interface Class (0xff) | ||
| 19 | * We also require a match on SubClass (0x00) and Protocol (0x00), | ||
| 20 | * which is compatible with all known USB 2.0 era graphics chips and firmware, | ||
| 21 | * but allows DisplayLink to increment those for any future incompatible chips | ||
| 22 | */ | ||
| 16 | static struct usb_device_id id_table[] = { | 23 | static struct usb_device_id id_table[] = { |
| 17 | {.idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR,}, | 24 | {.idVendor = 0x17e9, .bInterfaceClass = 0xff, |
| 25 | .bInterfaceSubClass = 0x00, | ||
| 26 | .bInterfaceProtocol = 0x00, | ||
| 27 | .match_flags = USB_DEVICE_ID_MATCH_VENDOR | | ||
| 28 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
| 29 | USB_DEVICE_ID_MATCH_INT_SUBCLASS | | ||
| 30 | USB_DEVICE_ID_MATCH_INT_PROTOCOL,}, | ||
| 18 | {}, | 31 | {}, |
| 19 | }; | 32 | }; |
| 20 | MODULE_DEVICE_TABLE(usb, id_table); | 33 | MODULE_DEVICE_TABLE(usb, id_table); |
| @@ -100,12 +100,11 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset) · 99 unmodified lines | |||
| 100 | if (dev_priv == NULL) | 100 | if (dev_priv == NULL) |
| 101 | return -ENOMEM; | 101 | return -ENOMEM; |
| 102 | 102 | ||
| 103 | idr_init(&dev_priv->object_idr); | ||
| 103 | dev->dev_private = (void *)dev_priv; | 104 | dev->dev_private = (void *)dev_priv; |
| 104 | 105 | ||
| 105 | dev_priv->chipset = chipset; | 106 | dev_priv->chipset = chipset; |
| 106 | 107 | ||
| 107 | idr_init(&dev->object_name_idr); | ||
| 108 | |||
| 109 | pci_set_master(dev->pdev); | 108 | pci_set_master(dev->pdev); |
| 110 | 109 | ||
| 111 | ret = drm_vblank_init(dev, 1); | 110 | ret = drm_vblank_init(dev, 1); |
| @@ -215,7 +215,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) · 214 unmodified lines | |||
| 215 | int i; | 215 | int i; |
| 216 | 216 | ||
| 217 | if (send_command(cmd) || send_argument(key)) { | 217 | if (send_command(cmd) || send_argument(key)) { |
| 218 | pr_warn("%s: read arg fail\n", key); | 218 | pr_warn("%.4s: read arg fail\n", key); |
| 219 | return -EIO; | 219 | return -EIO; |
| 220 | } | 220 | } |
| 221 | 221 | ||
| @@ -223,7 +223,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) · 1 unmodified line | |||
| 223 | 223 | ||
| 224 | for (i = 0; i < len; i++) { | 224 | for (i = 0; i < len; i++) { |
| 225 | if (__wait_status(0x05)) { | 225 | if (__wait_status(0x05)) { |
| 226 | pr_warn("%s: read data fail\n", key); | 226 | pr_warn("%.4s: read data fail\n", key); |
| 227 | return -EIO; | 227 | return -EIO; |
| 228 | } | 228 | } |
| 229 | buffer[i] = inb(APPLESMC_DATA_PORT); | 229 | buffer[i] = inb(APPLESMC_DATA_PORT); |
| @@ -191,6 +191,24 @@ static ssize_t show_temp(struct device *dev, · 190 unmodified lines | |||
| 191 | return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN; | 191 | return tdata->valid ? sprintf(buf, "%d\n", tdata->temp) : -EAGAIN; |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | struct tjmax { | ||
| 195 | char const *id; | ||
| 196 | int tjmax; | ||
| 197 | }; | ||
| 198 | |||
| 199 | static struct tjmax __cpuinitconst tjmax_table[] = { | ||
| 200 | { "CPU D410", 100000 }, | ||
| 201 | { "CPU D425", 100000 }, | ||
| 202 | { "CPU D510", 100000 }, | ||
| 203 | { "CPU D525", 100000 }, | ||
| 204 | { "CPU N450", 100000 }, | ||
| 205 | { "CPU N455", 100000 }, | ||
| 206 | { "CPU N470", 100000 }, | ||
| 207 | { "CPU N475", 100000 }, | ||
| 208 | { "CPU 230", 100000 }, | ||
| 209 | { "CPU 330", 125000 }, | ||
| 210 | }; | ||
| 211 | |||
| 194 | static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, | 212 | static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, |
| 195 | struct device *dev) | 213 | struct device *dev) |
| 196 | { | 214 | { |
| @@ -202,6 +220,13 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, · 5 unmodified lines | |||
| 202 | int err; | 220 | int err; |
| 203 | u32 eax, edx; | 221 | u32 eax, edx; |
| 204 | struct pci_dev *host_bridge; | 222 | struct pci_dev *host_bridge; |
| 223 | int i; | ||
| 224 | |||
| 225 | /* explicit tjmax table entries override heuristics */ | ||
| 226 | for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) { | ||
| 227 | if (strstr(c->x86_model_id, tjmax_table[i].id)) | ||
| 228 | return tjmax_table[i].tjmax; | ||
| 229 | } | ||
| 205 | 230 | ||
| 206 | /* Early chips have no MSR for TjMax */ | 231 | /* Early chips have no MSR for TjMax */ |
| 207 | 232 | ||
| @@ -210,7 +235,8 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, · 2 unmodified lines | |||
| 210 | 235 | ||
| 211 | /* Atom CPUs */ | 236 | /* Atom CPUs */ |
| 212 | 237 | ||
| 213 | if (c->x86_model == 0x1c) { | 238 | if (c->x86_model == 0x1c || c->x86_model == 0x26 |
| 239 | || c->x86_model == 0x27) { | ||
| 214 | usemsr_ee = 0; | 240 | usemsr_ee = 0; |
| 215 | 241 | ||
| 216 | host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); | 242 | host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); |
| @@ -223,6 +249,9 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, · 6 unmodified lines | |||
| 223 | tjmax = 90000; | 249 | tjmax = 90000; |
| 224 | 250 | ||
| 225 | pci_dev_put(host_bridge); | 251 | pci_dev_put(host_bridge); |
| 252 | } else if (c->x86_model == 0x36) { | ||
| 253 | usemsr_ee = 0; | ||
| 254 | tjmax = 100000; | ||
| 226 | } | 255 | } |
| 227 | 256 | ||
| 228 | if (c->x86_model > 0xe && usemsr_ee) { | 257 | if (c->x86_model > 0xe && usemsr_ee) { |
| @@ -772,7 +801,7 @@ MODULE_DEVICE_TABLE(x86cpu, coretemp_ids); · 543 unmodified lines | |||
| 772 | 801 | ||
| 773 | static int __init coretemp_init(void) | 802 | static int __init coretemp_init(void) |
| 774 | { | 803 | { |
| 775 | int i, err = -ENODEV; | 804 | int i, err; |
| 776 | 805 | ||
| 777 | /* | 806 | /* |
| 778 | * CPUID.06H.EAX[0] indicates whether the CPU has thermal | 807 | * CPUID.06H.EAX[0] indicates whether the CPU has thermal |
| @@ -451,11 +451,15 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, · 450 unmodified lines | |||
| 451 | data->fan_rpm_control = true; | 451 | data->fan_rpm_control = true; |
| 452 | break; | 452 | break; |
| 453 | default: | 453 | default: |
| 454 | mutex_unlock(&data->update_lock); | 454 | count = -EINVAL; |
| 455 | return -EINVAL; | 455 | goto err; |
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); | 458 | result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); |
| 459 | if (result) { | ||
| 460 | count = result; | ||
| 461 | goto err; | ||
| 462 | } | ||
| 459 | 463 | ||
| 460 | if (data->fan_rpm_control) | 464 | if (data->fan_rpm_control) |
| 461 | conf_reg |= 0x80; | 465 | conf_reg |= 0x80; |
| @@ -463,7 +467,7 @@ static ssize_t set_pwm_enable(struct device *dev, struct device_attribute *da, · 1 unmodified line | |||
| 463 | conf_reg &= ~0x80; | 467 | conf_reg &= ~0x80; |
| 464 | 468 | ||
| 465 | i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg); | 469 | i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg); |
| 466 | 470 | err: | |
| 467 | mutex_unlock(&data->update_lock); | 471 | mutex_unlock(&data->update_lock); |
| 468 | return count; | 472 | return count; |
| 469 | } | 473 | } |
| @@ -8,8 +8,7 @@ menuconfig IIO · 7 unmodified lines | |||
| 8 | help | 8 | help |
| 9 | The industrial I/O subsystem provides a unified framework for | 9 | The industrial I/O subsystem provides a unified framework for |
| 10 | drivers for many different types of embedded sensors using a | 10 | drivers for many different types of embedded sensors using a |
| 11 | number of different physical interfaces (i2c, spi, etc). See | 11 | number of different physical interfaces (i2c, spi, etc). |
| 12 | Documentation/iio for more information. | ||
| 13 | 12 | ||
| 14 | if IIO | 13 | if IIO |
| 15 | 14 | ||
| @@ -661,7 +661,6 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev) · 660 unmodified lines | |||
| 661 | * New channel registration method - relies on the fact a group does | 661 | * New channel registration method - relies on the fact a group does |
| 662 | * not need to be initialized if it is name is NULL. | 662 | * not need to be initialized if it is name is NULL. |
| 663 | */ | 663 | */ |
| 664 | INIT_LIST_HEAD(&indio_dev->channel_attr_list); | ||
| 665 | if (indio_dev->channels) | 664 | if (indio_dev->channels) |
| 666 | for (i = 0; i < indio_dev->num_channels; i++) { | 665 | for (i = 0; i < indio_dev->num_channels; i++) { |
| 667 | ret = iio_device_add_channel_sysfs(indio_dev, | 666 | ret = iio_device_add_channel_sysfs(indio_dev, |
| @@ -725,12 +724,16 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev) · 57 unmodified lines | |||
| 725 | static void iio_dev_release(struct device *device) | 724 | static void iio_dev_release(struct device *device) |
| 726 | { | 725 | { |
| 727 | struct iio_dev *indio_dev = dev_to_iio_dev(device); | 726 | struct iio_dev *indio_dev = dev_to_iio_dev(device); |
| 728 | cdev_del(&indio_dev->chrdev); | 727 | if (indio_dev->chrdev.dev) |
| 728 | cdev_del(&indio_dev->chrdev); | ||
| 729 | if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) | 729 | if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) |
| 730 | iio_device_unregister_trigger_consumer(indio_dev); | 730 | iio_device_unregister_trigger_consumer(indio_dev); |
| 731 | iio_device_unregister_eventset(indio_dev); | 731 | iio_device_unregister_eventset(indio_dev); |
| 732 | iio_device_unregister_sysfs(indio_dev); | 732 | iio_device_unregister_sysfs(indio_dev); |
| 733 | iio_device_unregister_debugfs(indio_dev); | 733 | iio_device_unregister_debugfs(indio_dev); |
| 734 | |||
| 735 | ida_simple_remove(&iio_ida, indio_dev->id); | ||
| 736 | kfree(indio_dev); | ||
| 734 | } | 737 | } |
| 735 | 738 | ||
| 736 | static struct device_type iio_dev_type = { | 739 | static struct device_type iio_dev_type = { |
| @@ -761,6 +764,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv) · 24 unmodified lines | |||
| 761 | dev_set_drvdata(&dev->dev, (void *)dev); | 764 | dev_set_drvdata(&dev->dev, (void *)dev); |
| 762 | mutex_init(&dev->mlock); | 765 | mutex_init(&dev->mlock); |
| 763 | mutex_init(&dev->info_exist_lock); | 766 | mutex_init(&dev->info_exist_lock); |
| 767 | INIT_LIST_HEAD(&dev->channel_attr_list); | ||
| 764 | 768 | ||
| 765 | dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL); | 769 | dev->id = ida_simple_get(&iio_ida, 0, 0, GFP_KERNEL); |
| 766 | if (dev->id < 0) { | 770 | if (dev->id < 0) { |
| @@ -778,10 +782,8 @@ EXPORT_SYMBOL(iio_device_alloc); · 11 unmodified lines | |||
| 778 | 782 | ||
| 779 | void iio_device_free(struct iio_dev *dev) | 783 | void iio_device_free(struct iio_dev *dev) |
| 780 | { | 784 | { |
| 781 | if (dev) { | 785 | if (dev) |
| 782 | ida_simple_remove(&iio_ida, dev->id); | 786 | put_device(&dev->dev); |
| 783 | kfree(dev); | ||
| 784 | } | ||
| 785 | } | 787 | } |
| 786 | EXPORT_SYMBOL(iio_device_free); | 788 | EXPORT_SYMBOL(iio_device_free); |
| 787 | 789 | ||
| @@ -902,7 +904,7 @@ void iio_device_unregister(struct iio_dev *indio_dev) · 114 unmodified lines | |||
| 902 | mutex_lock(&indio_dev->info_exist_lock); | 904 | mutex_lock(&indio_dev->info_exist_lock); |
| 903 | indio_dev->info = NULL; | 905 | indio_dev->info = NULL; |
| 904 | mutex_unlock(&indio_dev->info_exist_lock); | 906 | mutex_unlock(&indio_dev->info_exist_lock); |
| 905 | device_unregister(&indio_dev->dev); | 907 | device_del(&indio_dev->dev); |
| 906 | } | 908 | } |
| 907 | EXPORT_SYMBOL(iio_device_unregister); | 909 | EXPORT_SYMBOL(iio_device_unregister); |
| 908 | subsys_initcall(iio_init); | 910 | subsys_initcall(iio_init); |
| @@ -1184,7 +1184,7 @@ static void cma_set_req_event_data(struct rdma_cm_event *event, · 1183 unmodified lines | |||
| 1184 | 1184 | ||
| 1185 | static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_event) | 1185 | static int cma_check_req_qp_type(struct rdma_cm_id *id, struct ib_cm_event *ib_event) |
| 1186 | { | 1186 | { |
| 1187 | return (((ib_event->event == IB_CM_REQ_RECEIVED) || | 1187 | return (((ib_event->event == IB_CM_REQ_RECEIVED) && |
| 1188 | (ib_event->param.req_rcvd.qp_type == id->qp_type)) || | 1188 | (ib_event->param.req_rcvd.qp_type == id->qp_type)) || |
| 1189 | ((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) && | 1189 | ((ib_event->event == IB_CM_SIDR_REQ_RECEIVED) && |
| 1190 | (id->qp_type == IB_QPT_UD)) || | 1190 | (id->qp_type == IB_QPT_UD)) || |
| @@ -61,6 +61,7 @@ struct ocrdma_dev_attr { · 60 unmodified lines | |||
| 61 | u32 max_inline_data; | 61 | u32 max_inline_data; |
| 62 | int max_send_sge; | 62 | int max_send_sge; |
| 63 | int max_recv_sge; | 63 | int max_recv_sge; |
| 64 | int max_srq_sge; | ||
| 64 | int max_mr; | 65 | int max_mr; |
| 65 | u64 max_mr_size; | 66 | u64 max_mr_size; |
| 66 | u32 max_num_mr_pbl; | 67 | u32 max_num_mr_pbl; |
| @@ -990,8 +990,6 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, · 989 unmodified lines | |||
| 990 | struct ocrdma_dev_attr *attr, | 990 | struct ocrdma_dev_attr *attr, |
| 991 | struct ocrdma_mbx_query_config *rsp) | 991 | struct ocrdma_mbx_query_config *rsp) |
| 992 | { | 992 | { |
| 993 | int max_q_mem; | ||
| 994 | |||
| 995 | attr->max_pd = | 993 | attr->max_pd = |
| 996 | (rsp->max_pd_ca_ack_delay & OCRDMA_MBX_QUERY_CFG_MAX_PD_MASK) >> | 994 | (rsp->max_pd_ca_ack_delay & OCRDMA_MBX_QUERY_CFG_MAX_PD_MASK) >> |
| 997 | OCRDMA_MBX_QUERY_CFG_MAX_PD_SHIFT; | 995 | OCRDMA_MBX_QUERY_CFG_MAX_PD_SHIFT; |
| @@ -1004,6 +1002,9 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, · 6 unmodified lines | |||
| 1004 | attr->max_recv_sge = (rsp->max_write_send_sge & | 1002 | attr->max_recv_sge = (rsp->max_write_send_sge & |
| 1005 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >> | 1003 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >> |
| 1006 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT; | 1004 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT; |
| 1005 | attr->max_srq_sge = (rsp->max_srq_rqe_sge & | ||
| 1006 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK) >> | ||
| 1007 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET; | ||
| 1007 | attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp & | 1008 | attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp & |
| 1008 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >> | 1009 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >> |
| 1009 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT; | 1010 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT; |
| @@ -1037,18 +1038,15 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, · 27 unmodified lines | |||
| 1037 | attr->max_inline_data = | 1038 | attr->max_inline_data = |
| 1038 | attr->wqe_size - (sizeof(struct ocrdma_hdr_wqe) + | 1039 | attr->wqe_size - (sizeof(struct ocrdma_hdr_wqe) + |
| 1039 | sizeof(struct ocrdma_sge)); | 1040 | sizeof(struct ocrdma_sge)); |
| 1040 | max_q_mem = OCRDMA_Q_PAGE_BASE_SIZE << (OCRDMA_MAX_Q_PAGE_SIZE_CNT - 1); | ||
| 1041 | /* hw can queue one less then the configured size, | ||
| 1042 | * so publish less by one to stack. | ||
| 1043 | */ | ||
| 1044 | if (dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) { | 1041 | if (dev->nic_info.dev_family == OCRDMA_GEN2_FAMILY) { |
| 1045 | dev->attr.max_wqe = max_q_mem / dev->attr.wqe_size; | ||
| 1046 | attr->ird = 1; | 1042 | attr->ird = 1; |
| 1047 | attr->ird_page_size = OCRDMA_MIN_Q_PAGE_SIZE; | 1043 | attr->ird_page_size = OCRDMA_MIN_Q_PAGE_SIZE; |
| 1048 | attr->num_ird_pages = MAX_OCRDMA_IRD_PAGES; | 1044 | attr->num_ird_pages = MAX_OCRDMA_IRD_PAGES; |
| 1049 | } else | 1045 | } |
| 1050 | dev->attr.max_wqe = (max_q_mem / dev->attr.wqe_size) - 1; | 1046 | dev->attr.max_wqe = rsp->max_wqes_rqes_per_q >> |
| 1051 | dev->attr.max_rqe = (max_q_mem / dev->attr.rqe_size) - 1; | 1047 | OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET; |
| 1048 | dev->attr.max_rqe = rsp->max_wqes_rqes_per_q & | ||
| 1049 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK; | ||
| 1052 | } | 1050 | } |
| 1053 | 1051 | ||
| 1054 | static int ocrdma_check_fw_config(struct ocrdma_dev *dev, | 1052 | static int ocrdma_check_fw_config(struct ocrdma_dev *dev, |
| @@ -97,13 +97,11 @@ static void ocrdma_build_sgid_mac(union ib_gid *sgid, unsigned char *mac_addr, · 96 unmodified lines | |||
| 97 | sgid->raw[15] = mac_addr[5]; | 97 | sgid->raw[15] = mac_addr[5]; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr, | 100 | static bool ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr, |
| 101 | bool is_vlan, u16 vlan_id) | 101 | bool is_vlan, u16 vlan_id) |
| 102 | { | 102 | { |
| 103 | int i; | 103 | int i; |
| 104 | bool found = false; | ||
| 105 | union ib_gid new_sgid; | 104 | union ib_gid new_sgid; |
| 106 | int free_idx = OCRDMA_MAX_SGID; | ||
| 107 | unsigned long flags; | 105 | unsigned long flags; |
| 108 | 106 | ||
| 109 | memset(&ocrdma_zero_sgid, 0, sizeof(union ib_gid)); | 107 | memset(&ocrdma_zero_sgid, 0, sizeof(union ib_gid)); |
| @@ -115,23 +113,19 @@ static void ocrdma_add_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr, · 5 unmodified lines | |||
| 115 | if (!memcmp(&dev->sgid_tbl[i], &ocrdma_zero_sgid, | 113 | if (!memcmp(&dev->sgid_tbl[i], &ocrdma_zero_sgid, |
| 116 | sizeof(union ib_gid))) { | 114 | sizeof(union ib_gid))) { |
| 117 | /* found free entry */ | 115 | /* found free entry */ |
| 118 | if (!found) { | 116 | memcpy(&dev->sgid_tbl[i], &new_sgid, |
| 119 | free_idx = i; | 117 | sizeof(union ib_gid)); |
| 120 | found = true; | 118 | spin_unlock_irqrestore(&dev->sgid_lock, flags); |
| 121 | break; | 119 | return true; |
| 122 | } | ||
| 123 | } else if (!memcmp(&dev->sgid_tbl[i], &new_sgid, | 120 | } else if (!memcmp(&dev->sgid_tbl[i], &new_sgid, |
| 124 | sizeof(union ib_gid))) { | 121 | sizeof(union ib_gid))) { |
| 125 | /* entry already present, no addition is required. */ | 122 | /* entry already present, no addition is required. */ |
| 126 | spin_unlock_irqrestore(&dev->sgid_lock, flags); | 123 | spin_unlock_irqrestore(&dev->sgid_lock, flags); |
| 127 | return; | 124 | return false; |
| 128 | } | 125 | } |
| 129 | } | 126 | } |
| 130 | /* if entry doesn't exist and if table has some space, add entry */ | ||
| 131 | if (found) | ||
| 132 | memcpy(&dev->sgid_tbl[free_idx], &new_sgid, | ||
| 133 | sizeof(union ib_gid)); | ||
| 134 | spin_unlock_irqrestore(&dev->sgid_lock, flags); | 127 | spin_unlock_irqrestore(&dev->sgid_lock, flags); |
| 128 | return false; | ||
| 135 | } | 129 | } |
| 136 | 130 | ||
| 137 | static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr, | 131 | static bool ocrdma_del_sgid(struct ocrdma_dev *dev, unsigned char *mac_addr, |
| @@ -167,7 +161,8 @@ static void ocrdma_add_default_sgid(struct ocrdma_dev *dev) · 29 unmodified lines | |||
| 167 | ocrdma_get_guid(dev, &sgid->raw[8]); | 161 | ocrdma_get_guid(dev, &sgid->raw[8]); |
| 168 | } | 162 | } |
| 169 | 163 | ||
| 170 | static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev) | 164 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
| 165 | static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev) | ||
| 171 | { | 166 | { |
| 172 | struct net_device *netdev, *tmp; | 167 | struct net_device *netdev, *tmp; |
| 173 | u16 vlan_id; | 168 | u16 vlan_id; |
| @@ -175,8 +170,6 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev) · 1 unmodified line | |||
| 175 | 170 | ||
| 176 | netdev = dev->nic_info.netdev; | 171 | netdev = dev->nic_info.netdev; |
| 177 | 172 | ||
| 178 | ocrdma_add_default_sgid(dev); | ||
| 179 | |||
| 180 | rcu_read_lock(); | 173 | rcu_read_lock(); |
| 181 | for_each_netdev_rcu(&init_net, tmp) { | 174 | for_each_netdev_rcu(&init_net, tmp) { |
| 182 | if (netdev == tmp || vlan_dev_real_dev(tmp) == netdev) { | 175 | if (netdev == tmp || vlan_dev_real_dev(tmp) == netdev) { |
| @@ -194,10 +187,23 @@ static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev) · 11 unmodified lines | |||
| 194 | } | 187 | } |
| 195 | } | 188 | } |
| 196 | rcu_read_unlock(); | 189 | rcu_read_unlock(); |
| 190 | } | ||
| 191 | #else | ||
| 192 | static void ocrdma_add_vlan_sgids(struct ocrdma_dev *dev) | ||
| 193 | { | ||
| 194 | |||
| 195 | } | ||
| 196 | #endif /* VLAN */ | ||
| 197 | |||
| 198 | static int ocrdma_build_sgid_tbl(struct ocrdma_dev *dev) | ||
| 199 | { | ||
| 200 | ocrdma_add_default_sgid(dev); | ||
| 201 | ocrdma_add_vlan_sgids(dev); | ||
| 197 | return 0; | 202 | return 0; |
| 198 | } | 203 | } |
| 199 | 204 | ||
| 200 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) | 205 | #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \ |
| 206 | defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | ||
| 201 | 207 | ||
| 202 | static int ocrdma_inet6addr_event(struct notifier_block *notifier, | 208 | static int ocrdma_inet6addr_event(struct notifier_block *notifier, |
| 203 | unsigned long event, void *ptr) | 209 | unsigned long event, void *ptr) |
| @@ -208,6 +214,7 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier, · 4 unmodified lines | |||
| 208 | struct ib_event gid_event; | 214 | struct ib_event gid_event; |
| 209 | struct ocrdma_dev *dev; | 215 | struct ocrdma_dev *dev; |
| 210 | bool found = false; | 216 | bool found = false; |
| 217 | bool updated = false; | ||
| 211 | bool is_vlan = false; | 218 | bool is_vlan = false; |
| 212 | u16 vid = 0; | 219 | u16 vid = 0; |
| 213 | 220 | ||
| @@ -233,23 +240,21 @@ static int ocrdma_inet6addr_event(struct notifier_block *notifier, · 19 unmodified lines | |||
| 233 | mutex_lock(&dev->dev_lock); | 240 | mutex_lock(&dev->dev_lock); |
| 234 | switch (event) { | 241 | switch (event) { |
| 235 | case NETDEV_UP: | 242 | case NETDEV_UP: |
| 236 | ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid); | 243 | updated = ocrdma_add_sgid(dev, netdev->dev_addr, is_vlan, vid); |
| 237 | break; | 244 | break; |
| 238 | case NETDEV_DOWN: | 245 | case NETDEV_DOWN: |
| 239 | found = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid); | 246 | updated = ocrdma_del_sgid(dev, netdev->dev_addr, is_vlan, vid); |
| 240 | if (found) { | ||
| 241 | /* found the matching entry, notify | ||
| 242 | * the consumers about it | ||
| 243 | */ | ||
| 244 | gid_event.device = &dev->ibdev; | ||
| 245 | gid_event.element.port_num = 1; | ||
| 246 | gid_event.event = IB_EVENT_GID_CHANGE; | ||
| 247 | ib_dispatch_event(&gid_event); | ||
| 248 | } | ||
| 249 | break; | 247 | break; |
| 250 | default: | 248 | default: |
| 251 | break; | 249 | break; |
| 252 | } | 250 | } |
| 251 | if (updated) { | ||
| 252 | /* GID table updated, notify the consumers about it */ | ||
| 253 | gid_event.device = &dev->ibdev; | ||
| 254 | gid_event.element.port_num = 1; | ||
| 255 | gid_event.event = IB_EVENT_GID_CHANGE; | ||
| 256 | ib_dispatch_event(&gid_event); | ||
| 257 | } | ||
| 253 | mutex_unlock(&dev->dev_lock); | 258 | mutex_unlock(&dev->dev_lock); |
| 254 | return NOTIFY_OK; | 259 | return NOTIFY_OK; |
| 255 | } | 260 | } |
| @@ -258,7 +263,7 @@ static struct notifier_block ocrdma_inet6addr_notifier = { · 2 unmodified lines | |||
| 258 | .notifier_call = ocrdma_inet6addr_event | 263 | .notifier_call = ocrdma_inet6addr_event |
| 259 | }; | 264 | }; |
| 260 | 265 | ||
| 261 | #endif /* IPV6 */ | 266 | #endif /* IPV6 and VLAN */ |
| 262 | 267 | ||
| 263 | static enum rdma_link_layer ocrdma_link_layer(struct ib_device *device, | 268 | static enum rdma_link_layer ocrdma_link_layer(struct ib_device *device, |
| 264 | u8 port_num) | 269 | u8 port_num) |
| @@ -418,6 +418,9 @@ enum { · 417 unmodified lines | |||
| 418 | 418 | ||
| 419 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT = 0, | 419 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT = 0, |
| 420 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK = 0xFFFF, | 420 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK = 0xFFFF, |
| 421 | OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT = 16, | ||
| 422 | OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK = 0xFFFF << | ||
| 423 | OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT, | ||
| 421 | 424 | ||
| 422 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT = 0, | 425 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT = 0, |
| 423 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK = 0xFFFF, | 426 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK = 0xFFFF, |
| @@ -458,7 +461,7 @@ enum { · 34 unmodified lines | |||
| 458 | OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET, | 461 | OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET, |
| 459 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET = 0, | 462 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET = 0, |
| 460 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK = 0xFFFF << | 463 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_MASK = 0xFFFF << |
| 461 | OCRDMA_MBX_QUERY_CFG_MAX_WQES_PER_WQ_OFFSET, | 464 | OCRDMA_MBX_QUERY_CFG_MAX_RQES_PER_RQ_OFFSET, |
| 462 | 465 | ||
| 463 | OCRDMA_MBX_QUERY_CFG_MAX_CQ_OFFSET = 16, | 466 | OCRDMA_MBX_QUERY_CFG_MAX_CQ_OFFSET = 16, |
| 464 | OCRDMA_MBX_QUERY_CFG_MAX_CQ_MASK = 0xFFFF << | 467 | OCRDMA_MBX_QUERY_CFG_MAX_CQ_MASK = 0xFFFF << |
| @@ -53,7 +53,7 @@ int ocrdma_query_gid(struct ib_device *ibdev, u8 port, · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | dev = get_ocrdma_dev(ibdev); | 54 | dev = get_ocrdma_dev(ibdev); |
| 55 | memset(sgid, 0, sizeof(*sgid)); | 55 | memset(sgid, 0, sizeof(*sgid)); |
| 56 | if (index > OCRDMA_MAX_SGID) | 56 | if (index >= OCRDMA_MAX_SGID) |
| 57 | return -EINVAL; | 57 | return -EINVAL; |
| 58 | 58 | ||
| 59 | memcpy(sgid, &dev->sgid_tbl[index], sizeof(*sgid)); | 59 | memcpy(sgid, &dev->sgid_tbl[index], sizeof(*sgid)); |
| @@ -83,8 +83,8 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr) · 23 unmodified lines | |||
| 83 | IB_DEVICE_SHUTDOWN_PORT | | 83 | IB_DEVICE_SHUTDOWN_PORT | |
| 84 | IB_DEVICE_SYS_IMAGE_GUID | | 84 | IB_DEVICE_SYS_IMAGE_GUID | |
| 85 | IB_DEVICE_LOCAL_DMA_LKEY; | 85 | IB_DEVICE_LOCAL_DMA_LKEY; |
| 86 | attr->max_sge = dev->attr.max_send_sge; | 86 | attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge); |
| 87 | attr->max_sge_rd = dev->attr.max_send_sge; | 87 | attr->max_sge_rd = 0; |
| 88 | attr->max_cq = dev->attr.max_cq; | 88 | attr->max_cq = dev->attr.max_cq; |
| 89 | attr->max_cqe = dev->attr.max_cqe; | 89 | attr->max_cqe = dev->attr.max_cqe; |
| 90 | attr->max_mr = dev->attr.max_mr; | 90 | attr->max_mr = dev->attr.max_mr; |
| @@ -97,7 +97,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr) · 6 unmodified lines | |||
| 97 | min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp); | 97 | min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp); |
| 98 | attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp; | 98 | attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp; |
| 99 | attr->max_srq = (dev->attr.max_qp - 1); | 99 | attr->max_srq = (dev->attr.max_qp - 1); |
| 100 | attr->max_srq_sge = attr->max_sge; | 100 | attr->max_srq_sge = attr->max_srq_sge; |
| 101 | attr->max_srq_wr = dev->attr.max_rqe; | 101 | attr->max_srq_wr = dev->attr.max_rqe; |
| 102 | attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay; | 102 | attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay; |
| 103 | attr->max_fast_reg_page_list_len = 0; | 103 | attr->max_fast_reg_page_list_len = 0; |
| @@ -2301,8 +2301,10 @@ static bool ocrdma_poll_err_rcqe(struct ocrdma_qp *qp, struct ocrdma_cqe *cqe, · 2197 unmodified lines | |||
| 2301 | *stop = true; | 2301 | *stop = true; |
| 2302 | expand = false; | 2302 | expand = false; |
| 2303 | } | 2303 | } |
| 2304 | } else | 2304 | } else { |
| 2305 | *polled = true; | ||
| 2305 | expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status); | 2306 | expand = ocrdma_update_err_rcqe(ibwc, cqe, qp, status); |
| 2307 | } | ||
| 2306 | return expand; | 2308 | return expand; |
| 2307 | } | 2309 | } |
| 2308 | 2310 | ||
| @@ -29,6 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
| 33 | #include <linux/isa.h> | 34 | #include <linux/isa.h> |
| 34 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| @@ -6,7 +6,7 @@ · 5 unmodified lines | |||
| 6 | * | 6 | * |
| 7 | * License Terms: GNU General Public License, version 2 | 7 | * License Terms: GNU General Public License, version 2 |
| 8 | * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson | 8 | * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson |
| 9 | * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics | 9 | * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/i2c.h> | 12 | #include <linux/i2c.h> |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Copyright (C) ST Microelectronics SA 2011 | 4 | * Copyright (C) ST Microelectronics SA 2011 |
| 5 | * | 5 | * |
| 6 | * License Terms: GNU General Public License, version 2 | 6 | * License Terms: GNU General Public License, version 2 |
| 7 | * Author: Viresh Kumar <viresh.kumar@st.com> for ST Microelectronics | 7 | * Author: Viresh Kumar <viresh.linux@gmail.com> for ST Microelectronics |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/spi/spi.h> | 10 | #include <linux/spi/spi.h> |
| @@ -146,4 +146,4 @@ module_exit(stmpe_exit); · 135 unmodified lines | |||
| 146 | 146 | ||
| 147 | MODULE_LICENSE("GPL v2"); | 147 | MODULE_LICENSE("GPL v2"); |
| 148 | MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver"); | 148 | MODULE_DESCRIPTION("STMPE MFD SPI Interface Driver"); |
| 149 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 149 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| @@ -835,7 +835,7 @@ static int _mei_irq_thread_read(struct mei_device *dev, s32 *slots, · 834 unmodified lines | |||
| 835 | struct mei_cl *cl, | 835 | struct mei_cl *cl, |
| 836 | struct mei_io_list *cmpl_list) | 836 | struct mei_io_list *cmpl_list) |
| 837 | { | 837 | { |
| 838 | if ((*slots * sizeof(u32)) >= (sizeof(struct mei_msg_hdr) + | 838 | if ((*slots * sizeof(u32)) < (sizeof(struct mei_msg_hdr) + |
| 839 | sizeof(struct hbm_flow_control))) { | 839 | sizeof(struct hbm_flow_control))) { |
| 840 | /* return the cancel routine */ | 840 | /* return the cancel routine */ |
| 841 | list_del(&cb_pos->cb_list); | 841 | list_del(&cb_pos->cb_list); |
| @@ -982,7 +982,7 @@ static int __devinit mei_probe(struct pci_dev *pdev, · 981 unmodified lines | |||
| 982 | err = request_threaded_irq(pdev->irq, | 982 | err = request_threaded_irq(pdev->irq, |
| 983 | NULL, | 983 | NULL, |
| 984 | mei_interrupt_thread_handler, | 984 | mei_interrupt_thread_handler, |
| 985 | 0, mei_driver_name, dev); | 985 | IRQF_ONESHOT, mei_driver_name, dev); |
| 986 | else | 986 | else |
| 987 | err = request_threaded_irq(pdev->irq, | 987 | err = request_threaded_irq(pdev->irq, |
| 988 | mei_interrupt_quick_handler, | 988 | mei_interrupt_quick_handler, |
| @@ -992,7 +992,7 @@ static int __devinit mei_probe(struct pci_dev *pdev, · 3 unmodified lines | |||
| 992 | if (err) { | 992 | if (err) { |
| 993 | dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n", | 993 | dev_err(&pdev->dev, "request_threaded_irq failure. irq = %d\n", |
| 994 | pdev->irq); | 994 | pdev->irq); |
| 995 | goto unmap_memory; | 995 | goto disable_msi; |
| 996 | } | 996 | } |
| 997 | INIT_DELAYED_WORK(&dev->timer_work, mei_timer); | 997 | INIT_DELAYED_WORK(&dev->timer_work, mei_timer); |
| 998 | if (mei_hw_init(dev)) { | 998 | if (mei_hw_init(dev)) { |
| @@ -1023,8 +1023,8 @@ release_irq: · 24 unmodified lines | |||
| 1023 | mei_disable_interrupts(dev); | 1023 | mei_disable_interrupts(dev); |
| 1024 | flush_scheduled_work(); | 1024 | flush_scheduled_work(); |
| 1025 | free_irq(pdev->irq, dev); | 1025 | free_irq(pdev->irq, dev); |
| 1026 | disable_msi: | ||
| 1026 | pci_disable_msi(pdev); | 1027 | pci_disable_msi(pdev); |
| 1027 | unmap_memory: | ||
| 1028 | pci_iounmap(pdev, dev->mem_addr); | 1028 | pci_iounmap(pdev, dev->mem_addr); |
| 1029 | free_device: | 1029 | free_device: |
| 1030 | kfree(dev); | 1030 | kfree(dev); |
| @@ -1101,6 +1101,8 @@ static void __devexit mei_remove(struct pci_dev *pdev) · 70 unmodified lines | |||
| 1101 | 1101 | ||
| 1102 | pci_release_regions(pdev); | 1102 | pci_release_regions(pdev); |
| 1103 | pci_disable_device(pdev); | 1103 | pci_disable_device(pdev); |
| 1104 | |||
| 1105 | misc_deregister(&mei_misc_device); | ||
| 1104 | } | 1106 | } |
| 1105 | #ifdef CONFIG_PM | 1107 | #ifdef CONFIG_PM |
| 1106 | static int mei_pci_suspend(struct device *device) | 1108 | static int mei_pci_suspend(struct device *device) |
| @@ -1216,7 +1218,6 @@ module_init(mei_init_module); · 109 unmodified lines | |||
| 1216 | */ | 1218 | */ |
| 1217 | static void __exit mei_exit_module(void) | 1219 | static void __exit mei_exit_module(void) |
| 1218 | { | 1220 | { |
| 1219 | misc_deregister(&mei_misc_device); | ||
| 1220 | pci_unregister_driver(&mei_driver); | 1221 | pci_unregister_driver(&mei_driver); |
| 1221 | 1222 | ||
| 1222 | pr_debug("unloaded successfully.\n"); | 1223 | pr_debug("unloaded successfully.\n"); |
| @@ -341,7 +341,7 @@ static const struct watchdog_ops wd_ops = { · 340 unmodified lines | |||
| 341 | }; | 341 | }; |
| 342 | static const struct watchdog_info wd_info = { | 342 | static const struct watchdog_info wd_info = { |
| 343 | .identity = INTEL_AMT_WATCHDOG_ID, | 343 | .identity = INTEL_AMT_WATCHDOG_ID, |
| 344 | .options = WDIOF_KEEPALIVEPING, | 344 | .options = WDIOF_KEEPALIVEPING | WDIOF_ALARMONLY, |
| 345 | }; | 345 | }; |
| 346 | 346 | ||
| 347 | static struct watchdog_device amt_wd_dev = { | 347 | static struct watchdog_device amt_wd_dev = { |
| @@ -1326,7 +1326,7 @@ static int mmc_suspend(struct mmc_host *host) · 1325 unmodified lines | |||
| 1326 | if (!err) | 1326 | if (!err) |
| 1327 | mmc_card_set_sleep(host->card); | 1327 | mmc_card_set_sleep(host->card); |
| 1328 | } else if (!mmc_host_is_spi(host)) | 1328 | } else if (!mmc_host_is_spi(host)) |
| 1329 | mmc_deselect_cards(host); | 1329 | err = mmc_deselect_cards(host); |
| 1330 | host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200); | 1330 | host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200); |
| 1331 | mmc_release_host(host); | 1331 | mmc_release_host(host); |
| 1332 | 1332 | ||
| @@ -1075,16 +1075,18 @@ static void mmc_sd_detect(struct mmc_host *host) · 1074 unmodified lines | |||
| 1075 | */ | 1075 | */ |
| 1076 | static int mmc_sd_suspend(struct mmc_host *host) | 1076 | static int mmc_sd_suspend(struct mmc_host *host) |
| 1077 | { | 1077 | { |
| 1078 | int err = 0; | ||
| 1079 | |||
| 1078 | BUG_ON(!host); | 1080 | BUG_ON(!host); |
| 1079 | BUG_ON(!host->card); | 1081 | BUG_ON(!host->card); |
| 1080 | 1082 | ||
| 1081 | mmc_claim_host(host); | 1083 | mmc_claim_host(host); |
| 1082 | if (!mmc_host_is_spi(host)) | 1084 | if (!mmc_host_is_spi(host)) |
| 1083 | mmc_deselect_cards(host); | 1085 | err = mmc_deselect_cards(host); |
| 1084 | host->card->state &= ~MMC_STATE_HIGHSPEED; | 1086 | host->card->state &= ~MMC_STATE_HIGHSPEED; |
| 1085 | mmc_release_host(host); | 1087 | mmc_release_host(host); |
| 1086 | 1088 | ||
| 1087 | return 0; | 1089 | return err; |
| 1088 | } | 1090 | } |
| 1089 | 1091 | ||
| 1090 | /* | 1092 | /* |
| @@ -218,6 +218,12 @@ static int sdio_enable_wide(struct mmc_card *card) · 217 unmodified lines | |||
| 218 | if (ret) | 218 | if (ret) |
| 219 | return ret; | 219 | return ret; |
| 220 | 220 | ||
| 221 | if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED) | ||
| 222 | pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n", | ||
| 223 | mmc_hostname(card->host), ctrl); | ||
| 224 | |||
| 225 | /* set as 4-bit bus width */ | ||
| 226 | ctrl &= ~SDIO_BUS_WIDTH_MASK; | ||
| 221 | ctrl |= SDIO_BUS_WIDTH_4BIT; | 227 | ctrl |= SDIO_BUS_WIDTH_4BIT; |
| 222 | 228 | ||
| 223 | ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL); | 229 | ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL); |
| @@ -140,4 +140,18 @@ · 139 unmodified lines | |||
| 140 | #define atmci_writel(port,reg,value) \ | 140 | #define atmci_writel(port,reg,value) \ |
| 141 | __raw_writel((value), (port)->regs + reg) | 141 | __raw_writel((value), (port)->regs + reg) |
| 142 | 142 | ||
| 143 | /* | ||
| 144 | * Fix sconfig's burst size according to atmel MCI. We need to convert them as: | ||
| 145 | * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3. | ||
| 146 | * | ||
| 147 | * This can be done by finding most significant bit set. | ||
| 148 | */ | ||
| 149 | static inline unsigned int atmci_convert_chksize(unsigned int maxburst) | ||
| 150 | { | ||
| 151 | if (maxburst > 1) | ||
| 152 | return fls(maxburst) - 2; | ||
| 153 | else | ||
| 154 | return 0; | ||
| 155 | } | ||
| 156 | |||
| 143 | #endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */ | 157 | #endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */ |
| @@ -910,6 +910,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) · 909 unmodified lines | |||
| 910 | enum dma_data_direction direction; | 910 | enum dma_data_direction direction; |
| 911 | enum dma_transfer_direction slave_dirn; | 911 | enum dma_transfer_direction slave_dirn; |
| 912 | unsigned int sglen; | 912 | unsigned int sglen; |
| 913 | u32 maxburst; | ||
| 913 | u32 iflags; | 914 | u32 iflags; |
| 914 | 915 | ||
| 915 | data->error = -EINPROGRESS; | 916 | data->error = -EINPROGRESS; |
| @@ -943,17 +944,18 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) · 27 unmodified lines | |||
| 943 | if (!chan) | 944 | if (!chan) |
| 944 | return -ENODEV; | 945 | return -ENODEV; |
| 945 | 946 | ||
| 946 | if (host->caps.has_dma) | ||
| 947 | atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN); | ||
| 948 | |||
| 949 | if (data->flags & MMC_DATA_READ) { | 947 | if (data->flags & MMC_DATA_READ) { |
| 950 | direction = DMA_FROM_DEVICE; | 948 | direction = DMA_FROM_DEVICE; |
| 951 | host->dma_conf.direction = slave_dirn = DMA_DEV_TO_MEM; | 949 | host->dma_conf.direction = slave_dirn = DMA_DEV_TO_MEM; |
| 950 | maxburst = atmci_convert_chksize(host->dma_conf.src_maxburst); | ||
| 952 | } else { | 951 | } else { |
| 953 | direction = DMA_TO_DEVICE; | 952 | direction = DMA_TO_DEVICE; |
| 954 | host->dma_conf.direction = slave_dirn = DMA_MEM_TO_DEV; | 953 | host->dma_conf.direction = slave_dirn = DMA_MEM_TO_DEV; |
| 954 | maxburst = atmci_convert_chksize(host->dma_conf.dst_maxburst); | ||
| 955 | } | 955 | } |
| 956 | 956 | ||
| 957 | atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(maxburst) | ATMCI_DMAEN); | ||
| 958 | |||
| 957 | sglen = dma_map_sg(chan->device->dev, data->sg, | 959 | sglen = dma_map_sg(chan->device->dev, data->sg, |
| 958 | data->sg_len, direction); | 960 | data->sg_len, direction); |
| 959 | 961 | ||
| @@ -2314,6 +2316,8 @@ static int __init atmci_probe(struct platform_device *pdev) · 1354 unmodified lines | |||
| 2314 | 2316 | ||
| 2315 | platform_set_drvdata(pdev, host); | 2317 | platform_set_drvdata(pdev, host); |
| 2316 | 2318 | ||
| 2319 | setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host); | ||
| 2320 | |||
| 2317 | /* We need at least one slot to succeed */ | 2321 | /* We need at least one slot to succeed */ |
| 2318 | nr_slots = 0; | 2322 | nr_slots = 0; |
| 2319 | ret = -ENODEV; | 2323 | ret = -ENODEV; |
| @@ -2352,8 +2356,6 @@ static int __init atmci_probe(struct platform_device *pdev) · 32 unmodified lines | |||
| 2352 | } | 2356 | } |
| 2353 | } | 2357 | } |
| 2354 | 2358 | ||
| 2355 | setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host); | ||
| 2356 | |||
| 2357 | dev_info(&pdev->dev, | 2359 | dev_info(&pdev->dev, |
| 2358 | "Atmel MCI controller at 0x%08lx irq %d, %u slots\n", | 2360 | "Atmel MCI controller at 0x%08lx irq %d, %u slots\n", |
| 2359 | host->mapbase, irq, nr_slots); | 2361 | host->mapbase, irq, nr_slots); |
| @@ -418,6 +418,8 @@ static int dw_mci_idmac_init(struct dw_mci *host) · 417 unmodified lines | |||
| 418 | p->des3 = host->sg_dma; | 418 | p->des3 = host->sg_dma; |
| 419 | p->des0 = IDMAC_DES0_ER; | 419 | p->des0 = IDMAC_DES0_ER; |
| 420 | 420 | ||
| 421 | mci_writel(host, BMOD, SDMMC_IDMAC_SWRESET); | ||
| 422 | |||
| 421 | /* Mask out interrupts - get Tx & Rx complete only */ | 423 | /* Mask out interrupts - get Tx & Rx complete only */ |
| 422 | mci_writel(host, IDINTEN, SDMMC_IDMAC_INT_NI | SDMMC_IDMAC_INT_RI | | 424 | mci_writel(host, IDINTEN, SDMMC_IDMAC_INT_NI | SDMMC_IDMAC_INT_RI | |
| 423 | SDMMC_IDMAC_INT_TI); | 425 | SDMMC_IDMAC_INT_TI); |
| @@ -615,14 +617,15 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot) · 191 unmodified lines | |||
| 615 | u32 div; | 617 | u32 div; |
| 616 | 618 | ||
| 617 | if (slot->clock != host->current_speed) { | 619 | if (slot->clock != host->current_speed) { |
| 618 | if (host->bus_hz % slot->clock) | 620 | div = host->bus_hz / slot->clock; |
| 621 | if (host->bus_hz % slot->clock && host->bus_hz > slot->clock) | ||
| 619 | /* | 622 | /* |
| 620 | * move the + 1 after the divide to prevent | 623 | * move the + 1 after the divide to prevent |
| 621 | * over-clocking the card. | 624 | * over-clocking the card. |
| 622 | */ | 625 | */ |
| 623 | div = ((host->bus_hz / slot->clock) >> 1) + 1; | 626 | div += 1; |
| 624 | else | 627 | |
| 625 | div = (host->bus_hz / slot->clock) >> 1; | 628 | div = (host->bus_hz != slot->clock) ? DIV_ROUND_UP(div, 2) : 0; |
| 626 | 629 | ||
| 627 | dev_info(&slot->mmc->class_dev, | 630 | dev_info(&slot->mmc->class_dev, |
| 628 | "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ" | 631 | "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ" |
| @@ -939,8 +942,8 @@ static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd · 310 unmodified lines | |||
| 939 | mdelay(20); | 942 | mdelay(20); |
| 940 | 943 | ||
| 941 | if (cmd->data) { | 944 | if (cmd->data) { |
| 942 | host->data = NULL; | ||
| 943 | dw_mci_stop_dma(host); | 945 | dw_mci_stop_dma(host); |
| 946 | host->data = NULL; | ||
| 944 | } | 947 | } |
| 945 | } | 948 | } |
| 946 | } | 949 | } |
| @@ -1623,7 +1626,6 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) · 676 unmodified lines | |||
| 1623 | if (pending & (SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI)) { | 1626 | if (pending & (SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI)) { |
| 1624 | mci_writel(host, IDSTS, SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI); | 1627 | mci_writel(host, IDSTS, SDMMC_IDMAC_INT_TI | SDMMC_IDMAC_INT_RI); |
| 1625 | mci_writel(host, IDSTS, SDMMC_IDMAC_INT_NI); | 1628 | mci_writel(host, IDSTS, SDMMC_IDMAC_INT_NI); |
| 1626 | set_bit(EVENT_DATA_COMPLETE, &host->pending_events); | ||
| 1627 | host->dma_ops->complete(host); | 1629 | host->dma_ops->complete(host); |
| 1628 | } | 1630 | } |
| 1629 | #endif | 1631 | #endif |
| @@ -1725,7 +1727,8 @@ static void dw_mci_work_routine_card(struct work_struct *work) · 95 unmodified lines | |||
| 1725 | 1727 | ||
| 1726 | #ifdef CONFIG_MMC_DW_IDMAC | 1728 | #ifdef CONFIG_MMC_DW_IDMAC |
| 1727 | ctrl = mci_readl(host, BMOD); | 1729 | ctrl = mci_readl(host, BMOD); |
| 1728 | ctrl |= 0x01; /* Software reset of DMA */ | 1730 | /* Software reset of DMA */ |
| 1731 | ctrl |= SDMMC_IDMAC_SWRESET; | ||
| 1729 | mci_writel(host, BMOD, ctrl); | 1732 | mci_writel(host, BMOD, ctrl); |
| 1730 | #endif | 1733 | #endif |
| 1731 | 1734 | ||
| @@ -1950,10 +1953,6 @@ int dw_mci_probe(struct dw_mci *host) · 218 unmodified lines | |||
| 1950 | spin_lock_init(&host->lock); | 1953 | spin_lock_init(&host->lock); |
| 1951 | INIT_LIST_HEAD(&host->queue); | 1954 | INIT_LIST_HEAD(&host->queue); |
| 1952 | 1955 | ||
| 1953 | |||
| 1954 | host->dma_ops = host->pdata->dma_ops; | ||
| 1955 | dw_mci_init_dma(host); | ||
| 1956 | |||
| 1957 | /* | 1956 | /* |
| 1958 | * Get the host data width - this assumes that HCON has been set with | 1957 | * Get the host data width - this assumes that HCON has been set with |
| 1959 | * the correct values. | 1958 | * the correct values. |
| @@ -1981,10 +1980,11 @@ int dw_mci_probe(struct dw_mci *host) · 21 unmodified lines | |||
| 1981 | } | 1980 | } |
| 1982 | 1981 | ||
| 1983 | /* Reset all blocks */ | 1982 | /* Reset all blocks */ |
| 1984 | if (!mci_wait_reset(&host->dev, host)) { | 1983 | if (!mci_wait_reset(&host->dev, host)) |
| 1985 | ret = -ENODEV; | 1984 | return -ENODEV; |
| 1986 | goto err_dmaunmap; | 1985 | |
| 1987 | } | 1986 | host->dma_ops = host->pdata->dma_ops; |
| 1987 | dw_mci_init_dma(host); | ||
| 1988 | 1988 | ||
| 1989 | /* Clear the interrupts for the host controller */ | 1989 | /* Clear the interrupts for the host controller */ |
| 1990 | mci_writel(host, RINTSTS, 0xFFFFFFFF); | 1990 | mci_writel(host, RINTSTS, 0xFFFFFFFF); |
| @@ -2170,14 +2170,14 @@ int dw_mci_resume(struct dw_mci *host) · 179 unmodified lines | |||
| 2170 | if (host->vmmc) | 2170 | if (host->vmmc) |
| 2171 | regulator_enable(host->vmmc); | 2171 | regulator_enable(host->vmmc); |
| 2172 | 2172 | ||
| 2173 | if (host->dma_ops->init) | ||
| 2174 | host->dma_ops->init(host); | ||
| 2175 | |||
| 2176 | if (!mci_wait_reset(&host->dev, host)) { | 2173 | if (!mci_wait_reset(&host->dev, host)) { |
| 2177 | ret = -ENODEV; | 2174 | ret = -ENODEV; |
| 2178 | return ret; | 2175 | return ret; |
| 2179 | } | 2176 | } |
| 2180 | 2177 | ||
| 2178 | if (host->dma_ops->init) | ||
| 2179 | host->dma_ops->init(host); | ||
| 2180 | |||
| 2181 | /* Restore the old value at FIFOTH register */ | 2181 | /* Restore the old value at FIFOTH register */ |
| 2182 | mci_writel(host, FIFOTH, host->fifoth_val); | 2182 | mci_writel(host, FIFOTH, host->fifoth_val); |
| 2183 | 2183 | ||
| @@ -1216,12 +1216,7 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, · 1215 unmodified lines | |||
| 1216 | int bus_width = 0; | 1216 | int bus_width = 0; |
| 1217 | 1217 | ||
| 1218 | pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0); | 1218 | pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0); |
| 1219 | if (!pdata->gpio_wp) | ||
| 1220 | pdata->gpio_wp = -1; | ||
| 1221 | |||
| 1222 | pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0); | 1219 | pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0); |
| 1223 | if (!pdata->gpio_cd) | ||
| 1224 | pdata->gpio_cd = -1; | ||
| 1225 | 1220 | ||
| 1226 | if (of_get_property(np, "cd-inverted", NULL)) | 1221 | if (of_get_property(np, "cd-inverted", NULL)) |
| 1227 | pdata->cd_invert = true; | 1222 | pdata->cd_invert = true; |
| @@ -1276,6 +1271,12 @@ static int __devinit mmci_probe(struct amba_device *dev, · 48 unmodified lines | |||
| 1276 | return -EINVAL; | 1271 | return -EINVAL; |
| 1277 | } | 1272 | } |
| 1278 | 1273 | ||
| 1274 | if (!plat) { | ||
| 1275 | plat = devm_kzalloc(&dev->dev, sizeof(*plat), GFP_KERNEL); | ||
| 1276 | if (!plat) | ||
| 1277 | return -ENOMEM; | ||
| 1278 | } | ||
| 1279 | |||
| 1279 | if (np) | 1280 | if (np) |
| 1280 | mmci_dt_populate_generic_pdata(np, plat); | 1281 | mmci_dt_populate_generic_pdata(np, plat); |
| 1281 | 1282 | ||
| @@ -1424,6 +1425,10 @@ static int __devinit mmci_probe(struct amba_device *dev, · 142 unmodified lines | |||
| 1424 | writel(0, host->base + MMCIMASK1); | 1425 | writel(0, host->base + MMCIMASK1); |
| 1425 | writel(0xfff, host->base + MMCICLEAR); | 1426 | writel(0xfff, host->base + MMCICLEAR); |
| 1426 | 1427 | ||
| 1428 | if (plat->gpio_cd == -EPROBE_DEFER) { | ||
| 1429 | ret = -EPROBE_DEFER; | ||
| 1430 | goto err_gpio_cd; | ||
| 1431 | } | ||
| 1427 | if (gpio_is_valid(plat->gpio_cd)) { | 1432 | if (gpio_is_valid(plat->gpio_cd)) { |
| 1428 | ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); | 1433 | ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); |
| 1429 | if (ret == 0) | 1434 | if (ret == 0) |
| @@ -1447,6 +1452,10 @@ static int __devinit mmci_probe(struct amba_device *dev, · 17 unmodified lines | |||
| 1447 | if (ret >= 0) | 1452 | if (ret >= 0) |
| 1448 | host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd); | 1453 | host->gpio_cd_irq = gpio_to_irq(plat->gpio_cd); |
| 1449 | } | 1454 | } |
| 1455 | if (plat->gpio_wp == -EPROBE_DEFER) { | ||
| 1456 | ret = -EPROBE_DEFER; | ||
| 1457 | goto err_gpio_wp; | ||
| 1458 | } | ||
| 1450 | if (gpio_is_valid(plat->gpio_wp)) { | 1459 | if (gpio_is_valid(plat->gpio_wp)) { |
| 1451 | ret = gpio_request(plat->gpio_wp, DRIVER_NAME " (wp)"); | 1460 | ret = gpio_request(plat->gpio_wp, DRIVER_NAME " (wp)"); |
| 1452 | if (ret == 0) | 1461 | if (ret == 0) |
| @@ -894,8 +894,8 @@ static struct platform_driver mxs_mmc_driver = { · 893 unmodified lines | |||
| 894 | .owner = THIS_MODULE, | 894 | .owner = THIS_MODULE, |
| 895 | #ifdef CONFIG_PM | 895 | #ifdef CONFIG_PM |
| 896 | .pm = &mxs_mmc_pm_ops, | 896 | .pm = &mxs_mmc_pm_ops, |
| 897 | .of_match_table = mxs_mmc_dt_ids, | ||
| 898 | #endif | 897 | #endif |
| 898 | .of_match_table = mxs_mmc_dt_ids, | ||
| 899 | }, | 899 | }, |
| 900 | }; | 900 | }; |
| 901 | 901 | ||
| @@ -1300,7 +1300,7 @@ static const struct mmc_host_ops mmc_omap_ops = { · 1299 unmodified lines | |||
| 1300 | .set_ios = mmc_omap_set_ios, | 1300 | .set_ios = mmc_omap_set_ios, |
| 1301 | }; | 1301 | }; |
| 1302 | 1302 | ||
| 1303 | static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id) | 1303 | static int __devinit mmc_omap_new_slot(struct mmc_omap_host *host, int id) |
| 1304 | { | 1304 | { |
| 1305 | struct mmc_omap_slot *slot = NULL; | 1305 | struct mmc_omap_slot *slot = NULL; |
| 1306 | struct mmc_host *mmc; | 1306 | struct mmc_host *mmc; |
| @@ -1485,24 +1485,26 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev) · 178 unmodified lines | |||
| 1485 | } | 1485 | } |
| 1486 | 1486 | ||
| 1487 | host->nr_slots = pdata->nr_slots; | 1487 | host->nr_slots = pdata->nr_slots; |
| 1488 | host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); | ||
| 1489 | |||
| 1490 | host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0); | ||
| 1491 | if (!host->mmc_omap_wq) | ||
| 1492 | goto err_plat_cleanup; | ||
| 1493 | |||
| 1488 | for (i = 0; i < pdata->nr_slots; i++) { | 1494 | for (i = 0; i < pdata->nr_slots; i++) { |
| 1489 | ret = mmc_omap_new_slot(host, i); | 1495 | ret = mmc_omap_new_slot(host, i); |
| 1490 | if (ret < 0) { | 1496 | if (ret < 0) { |
| 1491 | while (--i >= 0) | 1497 | while (--i >= 0) |
| 1492 | mmc_omap_remove_slot(host->slots[i]); | 1498 | mmc_omap_remove_slot(host->slots[i]); |
| 1493 | 1499 | ||
| 1494 | goto err_plat_cleanup; | 1500 | goto err_destroy_wq; |
| 1495 | } | 1501 | } |
| 1496 | } | 1502 | } |
| 1497 | 1503 | ||
| 1498 | host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); | ||
| 1499 | |||
| 1500 | host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0); | ||
| 1501 | if (!host->mmc_omap_wq) | ||
| 1502 | goto err_plat_cleanup; | ||
| 1503 | |||
| 1504 | return 0; | 1504 | return 0; |
| 1505 | 1505 | ||
| 1506 | err_destroy_wq: | ||
| 1507 | destroy_workqueue(host->mmc_omap_wq); | ||
| 1506 | err_plat_cleanup: | 1508 | err_plat_cleanup: |
| 1507 | if (pdata->cleanup) | 1509 | if (pdata->cleanup) |
| 1508 | pdata->cleanup(&pdev->dev); | 1510 | pdata->cleanup(&pdev->dev); |
| @@ -404,7 +404,7 @@ static void sdhci_s3c_setup_card_detect_gpio(struct sdhci_s3c *sc) · 403 unmodified lines | |||
| 404 | if (sc->ext_cd_irq && | 404 | if (sc->ext_cd_irq && |
| 405 | request_threaded_irq(sc->ext_cd_irq, NULL, | 405 | request_threaded_irq(sc->ext_cd_irq, NULL, |
| 406 | sdhci_s3c_gpio_card_detect_thread, | 406 | sdhci_s3c_gpio_card_detect_thread, |
| 407 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, | 407 | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 408 | dev_name(dev), sc) == 0) { | 408 | dev_name(dev), sc) == 0) { |
| 409 | int status = gpio_get_value(sc->ext_cd_gpio); | 409 | int status = gpio_get_value(sc->ext_cd_gpio); |
| 410 | if (pdata->ext_cd_gpio_invert) | 410 | if (pdata->ext_cd_gpio_invert) |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Support of SDHCI platform devices for spear soc family | 4 | * Support of SDHCI platform devices for spear soc family |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2010 ST Microelectronics | 6 | * Copyright (C) 2010 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * Inspired by sdhci-pltfm.c | 9 | * Inspired by sdhci-pltfm.c |
| 10 | * | 10 | * |
| @@ -289,5 +289,5 @@ static struct platform_driver sdhci_driver = { · 278 unmodified lines | |||
| 289 | module_platform_driver(sdhci_driver); | 289 | module_platform_driver(sdhci_driver); |
| 290 | 290 | ||
| 291 | MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver"); | 291 | MODULE_DESCRIPTION("SPEAr Secure Digital Host Controller Interface driver"); |
| 292 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 292 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 293 | MODULE_LICENSE("GPL v2"); | 293 | MODULE_LICENSE("GPL v2"); |
| @@ -680,8 +680,8 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) · 679 unmodified lines | |||
| 680 | } | 680 | } |
| 681 | 681 | ||
| 682 | if (count >= 0xF) { | 682 | if (count >= 0xF) { |
| 683 | pr_warning("%s: Too large timeout 0x%x requested for CMD%d!\n", | 683 | DBG("%s: Too large timeout 0x%x requested for CMD%d!\n", |
| 684 | mmc_hostname(host->mmc), count, cmd->opcode); | 684 | mmc_hostname(host->mmc), count, cmd->opcode); |
| 685 | count = 0xE; | 685 | count = 0xE; |
| 686 | } | 686 | } |
| 687 | 687 | ||
| @@ -304,32 +304,17 @@ static void find_next_position(struct mtdoops_context *cxt) · 303 unmodified lines | |||
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | static void mtdoops_do_dump(struct kmsg_dumper *dumper, | 306 | static void mtdoops_do_dump(struct kmsg_dumper *dumper, |
| 307 | enum kmsg_dump_reason reason, const char *s1, unsigned long l1, | 307 | enum kmsg_dump_reason reason) |
| 308 | const char *s2, unsigned long l2) | ||
| 309 | { | 308 | { |
| 310 | struct mtdoops_context *cxt = container_of(dumper, | 309 | struct mtdoops_context *cxt = container_of(dumper, |
| 311 | struct mtdoops_context, dump); | 310 | struct mtdoops_context, dump); |
| 312 | unsigned long s1_start, s2_start; | ||
| 313 | unsigned long l1_cpy, l2_cpy; | ||
| 314 | char *dst; | ||
| 315 | |||
| 316 | if (reason != KMSG_DUMP_OOPS && | ||
| 317 | reason != KMSG_DUMP_PANIC) | ||
| 318 | return; | ||
| 319 | 311 | ||
| 320 | /* Only dump oopses if dump_oops is set */ | 312 | /* Only dump oopses if dump_oops is set */ |
| 321 | if (reason == KMSG_DUMP_OOPS && !dump_oops) | 313 | if (reason == KMSG_DUMP_OOPS && !dump_oops) |
| 322 | return; | 314 | return; |
| 323 | 315 | ||
| 324 | dst = cxt->oops_buf + MTDOOPS_HEADER_SIZE; /* Skip the header */ | 316 | kmsg_dump_get_buffer(dumper, true, cxt->oops_buf + MTDOOPS_HEADER_SIZE, |
| 325 | l2_cpy = min(l2, record_size - MTDOOPS_HEADER_SIZE); | 317 | record_size - MTDOOPS_HEADER_SIZE, NULL); |
| 326 | l1_cpy = min(l1, record_size - MTDOOPS_HEADER_SIZE - l2_cpy); | ||
| 327 | |||
| 328 | s2_start = l2 - l2_cpy; | ||
| 329 | s1_start = l1 - l1_cpy; | ||
| 330 | |||
| 331 | memcpy(dst, s1 + s1_start, l1_cpy); | ||
| 332 | memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); | ||
| 333 | 318 | ||
| 334 | /* Panics must be written immediately */ | 319 | /* Panics must be written immediately */ |
| 335 | if (reason != KMSG_DUMP_OOPS) | 320 | if (reason != KMSG_DUMP_OOPS) |
| @@ -375,6 +360,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd) · 39 unmodified lines | |||
| 375 | return; | 360 | return; |
| 376 | } | 361 | } |
| 377 | 362 | ||
| 363 | cxt->dump.max_reason = KMSG_DUMP_OOPS; | ||
| 378 | cxt->dump.dump = mtdoops_do_dump; | 364 | cxt->dump.dump = mtdoops_do_dump; |
| 379 | err = kmsg_dump_register(&cxt->dump); | 365 | err = kmsg_dump_register(&cxt->dump); |
| 380 | if (err) { | 366 | if (err) { |
| @@ -3767,7 +3767,7 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) · 3766 unmodified lines | |||
| 3767 | if (prev_status >= B43_STAT_STARTED) { | 3767 | if (prev_status >= B43_STAT_STARTED) { |
| 3768 | err = b43_wireless_core_start(up_dev); | 3768 | err = b43_wireless_core_start(up_dev); |
| 3769 | if (err) { | 3769 | if (err) { |
| 3770 | b43err(wl, "Fatal: Coult not start device for " | 3770 | b43err(wl, "Fatal: Could not start device for " |
| 3771 | "selected %s-GHz band\n", | 3771 | "selected %s-GHz band\n", |
| 3772 | band_to_string(chan->band)); | 3772 | band_to_string(chan->band)); |
| 3773 | b43_wireless_core_exit(up_dev); | 3773 | b43_wireless_core_exit(up_dev); |
| @@ -2633,7 +2633,7 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl, · 2632 unmodified lines | |||
| 2633 | if (prev_status >= B43legacy_STAT_STARTED) { | 2633 | if (prev_status >= B43legacy_STAT_STARTED) { |
| 2634 | err = b43legacy_wireless_core_start(up_dev); | 2634 | err = b43legacy_wireless_core_start(up_dev); |
| 2635 | if (err) { | 2635 | if (err) { |
| 2636 | b43legacyerr(wl, "Fatal: Coult not start device for " | 2636 | b43legacyerr(wl, "Fatal: Could not start device for " |
| 2637 | "newly selected %s-PHY mode\n", | 2637 | "newly selected %s-PHY mode\n", |
| 2638 | phymode_to_string(new_mode)); | 2638 | phymode_to_string(new_mode)); |
| 2639 | b43legacy_wireless_core_exit(up_dev); | 2639 | b43legacy_wireless_core_exit(up_dev); |
| @@ -137,7 +137,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev, · 136 unmodified lines | |||
| 137 | 137 | ||
| 138 | free_group: | 138 | free_group: |
| 139 | if (!purecfg) | 139 | if (!purecfg) |
| 140 | free(group); | 140 | kfree(group); |
| 141 | free: | 141 | free: |
| 142 | kfree(new_map); | 142 | kfree(new_map); |
| 143 | return ret; | 143 | return ret; |
| @@ -1438,7 +1438,27 @@ static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function, · 1437 unmodified lines | |||
| 1438 | 1438 | ||
| 1439 | dev_dbg(npct->dev, "enable group %s, %u pins\n", g->name, g->npins); | 1439 | dev_dbg(npct->dev, "enable group %s, %u pins\n", g->name, g->npins); |
| 1440 | 1440 | ||
| 1441 | /* Handle this special glitch on altfunction C */ | 1441 | /* |
| 1442 | * If we're setting altfunc C by setting both AFSLA and AFSLB to 1, | ||
| 1443 | * we may pass through an undesired state. In this case we take | ||
| 1444 | * some extra care. | ||
| 1445 | * | ||
| 1446 | * Safe sequence used to switch IOs between GPIO and Alternate-C mode: | ||
| 1447 | * - Save SLPM registers (since we have a shadow register in the | ||
| 1448 | * nmk_chip we're using that as backup) | ||
| 1449 | * - Set SLPM=0 for the IOs you want to switch and others to 1 | ||
| 1450 | * - Configure the GPIO registers for the IOs that are being switched | ||
| 1451 | * - Set IOFORCE=1 | ||
| 1452 | * - Modify the AFLSA/B registers for the IOs that are being switched | ||
| 1453 | * - Set IOFORCE=0 | ||
| 1454 | * - Restore SLPM registers | ||
| 1455 | * - Any spurious wake up event during switch sequence to be ignored | ||
| 1456 | * and cleared | ||
| 1457 | * | ||
| 1458 | * We REALLY need to save ALL slpm registers, because the external | ||
| 1459 | * IOFORCE will switch *all* ports to their sleepmode setting to as | ||
| 1460 | * to avoid glitches. (Not just one port!) | ||
| 1461 | */ | ||
| 1442 | glitch = (g->altsetting == NMK_GPIO_ALT_C); | 1462 | glitch = (g->altsetting == NMK_GPIO_ALT_C); |
| 1443 | 1463 | ||
| 1444 | if (glitch) { | 1464 | if (glitch) { |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr pinmux | 2 | * Driver for the ST Microelectronics SPEAr pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * Inspired from: | 7 | * Inspired from: |
| 8 | * - U300 Pinctl drivers | 8 | * - U300 Pinctl drivers |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver header file for the ST Microelectronics SPEAr pinmux | 2 | * Driver header file for the ST Microelectronics SPEAr pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr1310 pinmux | 2 | * Driver for the ST Microelectronics SPEAr1310 pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -2192,7 +2192,7 @@ static void __exit spear1310_pinctrl_exit(void) · 2183 unmodified lines | |||
| 2192 | } | 2192 | } |
| 2193 | module_exit(spear1310_pinctrl_exit); | 2193 | module_exit(spear1310_pinctrl_exit); |
| 2194 | 2194 | ||
| 2195 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 2195 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 2196 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1310 pinctrl driver"); | 2196 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1310 pinctrl driver"); |
| 2197 | MODULE_LICENSE("GPL v2"); | 2197 | MODULE_LICENSE("GPL v2"); |
| 2198 | MODULE_DEVICE_TABLE(of, spear1310_pinctrl_of_match); | 2198 | MODULE_DEVICE_TABLE(of, spear1310_pinctrl_of_match); |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr1340 pinmux | 2 | * Driver for the ST Microelectronics SPEAr1340 pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -1983,7 +1983,7 @@ static void __exit spear1340_pinctrl_exit(void) · 1974 unmodified lines | |||
| 1983 | } | 1983 | } |
| 1984 | module_exit(spear1340_pinctrl_exit); | 1984 | module_exit(spear1340_pinctrl_exit); |
| 1985 | 1985 | ||
| 1986 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 1986 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 1987 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1340 pinctrl driver"); | 1987 | MODULE_DESCRIPTION("ST Microelectronics SPEAr1340 pinctrl driver"); |
| 1988 | MODULE_LICENSE("GPL v2"); | 1988 | MODULE_LICENSE("GPL v2"); |
| 1989 | MODULE_DEVICE_TABLE(of, spear1340_pinctrl_of_match); | 1989 | MODULE_DEVICE_TABLE(of, spear1340_pinctrl_of_match); |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr300 pinmux | 2 | * Driver for the ST Microelectronics SPEAr300 pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -702,7 +702,7 @@ static void __exit spear300_pinctrl_exit(void) · 693 unmodified lines | |||
| 702 | } | 702 | } |
| 703 | module_exit(spear300_pinctrl_exit); | 703 | module_exit(spear300_pinctrl_exit); |
| 704 | 704 | ||
| 705 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 705 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 706 | MODULE_DESCRIPTION("ST Microelectronics SPEAr300 pinctrl driver"); | 706 | MODULE_DESCRIPTION("ST Microelectronics SPEAr300 pinctrl driver"); |
| 707 | MODULE_LICENSE("GPL v2"); | 707 | MODULE_LICENSE("GPL v2"); |
| 708 | MODULE_DEVICE_TABLE(of, spear300_pinctrl_of_match); | 708 | MODULE_DEVICE_TABLE(of, spear300_pinctrl_of_match); |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr310 pinmux | 2 | * Driver for the ST Microelectronics SPEAr310 pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -425,7 +425,7 @@ static void __exit spear310_pinctrl_exit(void) · 416 unmodified lines | |||
| 425 | } | 425 | } |
| 426 | module_exit(spear310_pinctrl_exit); | 426 | module_exit(spear310_pinctrl_exit); |
| 427 | 427 | ||
| 428 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 428 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 429 | MODULE_DESCRIPTION("ST Microelectronics SPEAr310 pinctrl driver"); | 429 | MODULE_DESCRIPTION("ST Microelectronics SPEAr310 pinctrl driver"); |
| 430 | MODULE_LICENSE("GPL v2"); | 430 | MODULE_LICENSE("GPL v2"); |
| 431 | MODULE_DEVICE_TABLE(of, SPEAr310_pinctrl_of_match); | 431 | MODULE_DEVICE_TABLE(of, SPEAr310_pinctrl_of_match); |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr320 pinmux | 2 | * Driver for the ST Microelectronics SPEAr320 pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -3462,7 +3462,7 @@ static void __exit spear320_pinctrl_exit(void) · 3453 unmodified lines | |||
| 3462 | } | 3462 | } |
| 3463 | module_exit(spear320_pinctrl_exit); | 3463 | module_exit(spear320_pinctrl_exit); |
| 3464 | 3464 | ||
| 3465 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 3465 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 3466 | MODULE_DESCRIPTION("ST Microelectronics SPEAr320 pinctrl driver"); | 3466 | MODULE_DESCRIPTION("ST Microelectronics SPEAr320 pinctrl driver"); |
| 3467 | MODULE_LICENSE("GPL v2"); | 3467 | MODULE_LICENSE("GPL v2"); |
| 3468 | MODULE_DEVICE_TABLE(of, spear320_pinctrl_of_match); | 3468 | MODULE_DEVICE_TABLE(of, spear320_pinctrl_of_match); |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Driver for the ST Microelectronics SPEAr3xx pinmux | 2 | * Driver for the ST Microelectronics SPEAr3xx pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | * Header file for the ST Microelectronics SPEAr3xx pinmux | 2 | * Header file for the ST Microelectronics SPEAr3xx pinmux |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2012 ST Microelectronics | 4 | * Copyright (C) 2012 ST Microelectronics |
| 5 | * Viresh Kumar <viresh.kumar@st.com> | 5 | * Viresh Kumar <viresh.linux@gmail.com> |
| 6 | * | 6 | * |
| 7 | * This file is licensed under the terms of the GNU General Public | 7 | * This file is licensed under the terms of the GNU General Public |
| 8 | * License version 2. This program is licensed "as is" without any | 8 | * License version 2. This program is licensed "as is" without any |
| @@ -794,17 +794,17 @@ static __devinit int ab8500_regulator_register(struct platform_device *pdev, · 793 unmodified lines | |||
| 794 | } | 794 | } |
| 795 | 795 | ||
| 796 | static struct of_regulator_match ab8500_regulator_matches[] = { | 796 | static struct of_regulator_match ab8500_regulator_matches[] = { |
| 797 | { .name = "LDO-AUX1", .driver_data = (void *) AB8500_LDO_AUX1, }, | 797 | { .name = "ab8500_ldo_aux1", .driver_data = (void *) AB8500_LDO_AUX1, }, |
| 798 | { .name = "LDO-AUX2", .driver_data = (void *) AB8500_LDO_AUX2, }, | 798 | { .name = "ab8500_ldo_aux2", .driver_data = (void *) AB8500_LDO_AUX2, }, |
| 799 | { .name = "LDO-AUX3", .driver_data = (void *) AB8500_LDO_AUX3, }, | 799 | { .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, }, |
| 800 | { .name = "LDO-INTCORE", .driver_data = (void *) AB8500_LDO_INTCORE, }, | 800 | { .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, }, |
| 801 | { .name = "LDO-TVOUT", .driver_data = (void *) AB8500_LDO_TVOUT, }, | 801 | { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, |
| 802 | { .name = "LDO-USB", .driver_data = (void *) AB8500_LDO_USB, }, | 802 | { .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, }, |
| 803 | { .name = "LDO-AUDIO", .driver_data = (void *) AB8500_LDO_AUDIO, }, | 803 | { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, |
| 804 | { .name = "LDO-ANAMIC1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, | 804 | { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, |
| 805 | { .name = "LDO-ANAMIC2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, | 805 | { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, |
| 806 | { .name = "LDO-DMIC", .driver_data = (void *) AB8500_LDO_DMIC, }, | 806 | { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, |
| 807 | { .name = "LDO-ANA", .driver_data = (void *) AB8500_LDO_ANA, }, | 807 | { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, |
| 808 | }; | 808 | }; |
| 809 | 809 | ||
| 810 | static __devinit int | 810 | static __devinit int |
| @@ -452,26 +452,26 @@ static __devinit int db8500_regulator_register(struct platform_device *pdev, · 451 unmodified lines | |||
| 452 | } | 452 | } |
| 453 | 453 | ||
| 454 | static struct of_regulator_match db8500_regulator_matches[] = { | 454 | static struct of_regulator_match db8500_regulator_matches[] = { |
| 455 | { .name = "db8500-vape", .driver_data = (void *) DB8500_REGULATOR_VAPE, }, | 455 | { .name = "db8500_vape", .driver_data = (void *) DB8500_REGULATOR_VAPE, }, |
| 456 | { .name = "db8500-varm", .driver_data = (void *) DB8500_REGULATOR_VARM, }, | 456 | { .name = "db8500_varm", .driver_data = (void *) DB8500_REGULATOR_VARM, }, |
| 457 | { .name = "db8500-vmodem", .driver_data = (void *) DB8500_REGULATOR_VMODEM, }, | 457 | { .name = "db8500_vmodem", .driver_data = (void *) DB8500_REGULATOR_VMODEM, }, |
| 458 | { .name = "db8500-vpll", .driver_data = (void *) DB8500_REGULATOR_VPLL, }, | 458 | { .name = "db8500_vpll", .driver_data = (void *) DB8500_REGULATOR_VPLL, }, |
| 459 | { .name = "db8500-vsmps1", .driver_data = (void *) DB8500_REGULATOR_VSMPS1, }, | 459 | { .name = "db8500_vsmps1", .driver_data = (void *) DB8500_REGULATOR_VSMPS1, }, |
| 460 | { .name = "db8500-vsmps2", .driver_data = (void *) DB8500_REGULATOR_VSMPS2, }, | 460 | { .name = "db8500_vsmps2", .driver_data = (void *) DB8500_REGULATOR_VSMPS2, }, |
| 461 | { .name = "db8500-vsmps3", .driver_data = (void *) DB8500_REGULATOR_VSMPS3, }, | 461 | { .name = "db8500_vsmps3", .driver_data = (void *) DB8500_REGULATOR_VSMPS3, }, |
| 462 | { .name = "db8500-vrf1", .driver_data = (void *) DB8500_REGULATOR_VRF1, }, | 462 | { .name = "db8500_vrf1", .driver_data = (void *) DB8500_REGULATOR_VRF1, }, |
| 463 | { .name = "db8500-sva-mmdsp", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, }, | 463 | { .name = "db8500_sva_mmdsp", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSP, }, |
| 464 | { .name = "db8500-sva-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, }, | 464 | { .name = "db8500_sva_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAMMDSPRET, }, |
| 465 | { .name = "db8500-sva-pipe", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, }, | 465 | { .name = "db8500_sva_pipe", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SVAPIPE, }, |
| 466 | { .name = "db8500-sia-mmdsp", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, }, | 466 | { .name = "db8500_sia_mmdsp", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSP, }, |
| 467 | { .name = "db8500-sia-mmdsp-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, }, | 467 | { .name = "db8500_sia_mmdsp_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAMMDSPRET, }, |
| 468 | { .name = "db8500-sia-pipe", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, }, | 468 | { .name = "db8500_sia_pipe", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SIAPIPE, }, |
| 469 | { .name = "db8500-sga", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, }, | 469 | { .name = "db8500_sga", .driver_data = (void *) DB8500_REGULATOR_SWITCH_SGA, }, |
| 470 | { .name = "db8500-b2r2-mcde", .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, }, | 470 | { .name = "db8500_b2r2_mcde", .driver_data = (void *) DB8500_REGULATOR_SWITCH_B2R2_MCDE, }, |
| 471 | { .name = "db8500-esram12", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, }, | 471 | { .name = "db8500_esram12", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12, }, |
| 472 | { .name = "db8500-esram12-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, }, | 472 | { .name = "db8500_esram12_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM12RET, }, |
| 473 | { .name = "db8500-esram34", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, }, | 473 | { .name = "db8500_esram34", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34, }, |
| 474 | { .name = "db8500-esram34-ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, }, | 474 | { .name = "db8500_esram34_ret", .driver_data = (void *) DB8500_REGULATOR_SWITCH_ESRAM34RET, }, |
| 475 | }; | 475 | }; |
| 476 | 476 | ||
| 477 | static __devinit int | 477 | static __devinit int |
| @@ -451,7 +451,7 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev, · 450 unmodified lines | |||
| 451 | 451 | ||
| 452 | desc = reg_voltage_map[reg_id]; | 452 | desc = reg_voltage_map[reg_id]; |
| 453 | 453 | ||
| 454 | if (old_sel < new_sel) | 454 | if ((old_sel < new_sel) && s5m8767->ramp_delay) |
| 455 | return DIV_ROUND_UP(desc->step * (new_sel - old_sel), | 455 | return DIV_ROUND_UP(desc->step * (new_sel - old_sel), |
| 456 | s5m8767->ramp_delay * 1000); | 456 | s5m8767->ramp_delay * 1000); |
| 457 | return 0; | 457 | return 0; |
| @@ -182,7 +182,7 @@ static int __devinit omap_rproc_probe(struct platform_device *pdev) · 181 unmodified lines | |||
| 182 | 182 | ||
| 183 | ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | 183 | ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
| 184 | if (ret) { | 184 | if (ret) { |
| 185 | dev_err(pdev->dev.parent, "dma_set_coherent_mask: %d\n", ret); | 185 | dev_err(&pdev->dev, "dma_set_coherent_mask: %d\n", ret); |
| 186 | return ret; | 186 | return ret; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| @@ -247,7 +247,7 @@ rproc_load_segments(struct rproc *rproc, const u8 *elf_data, size_t len) · 246 unmodified lines | |||
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | if (offset + filesz > len) { | 249 | if (offset + filesz > len) { |
| 250 | dev_err(dev, "truncated fw: need 0x%x avail 0x%x\n", | 250 | dev_err(dev, "truncated fw: need 0x%x avail 0x%zx\n", |
| 251 | offset + filesz, len); | 251 | offset + filesz, len); |
| 252 | ret = -EINVAL; | 252 | ret = -EINVAL; |
| 253 | break; | 253 | break; |
| @@ -934,7 +934,7 @@ static void rproc_resource_cleanup(struct rproc *rproc) · 680 unmodified lines | |||
| 934 | unmapped = iommu_unmap(rproc->domain, entry->da, entry->len); | 934 | unmapped = iommu_unmap(rproc->domain, entry->da, entry->len); |
| 935 | if (unmapped != entry->len) { | 935 | if (unmapped != entry->len) { |
| 936 | /* nothing much to do besides complaining */ | 936 | /* nothing much to do besides complaining */ |
| 937 | dev_err(dev, "failed to unmap %u/%u\n", entry->len, | 937 | dev_err(dev, "failed to unmap %u/%zu\n", entry->len, |
| 938 | unmapped); | 938 | unmapped); |
| 939 | } | 939 | } |
| 940 | 940 | ||
| @@ -1020,7 +1020,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) · 79 unmodified lines | |||
| 1020 | 1020 | ||
| 1021 | ehdr = (struct elf32_hdr *)fw->data; | 1021 | ehdr = (struct elf32_hdr *)fw->data; |
| 1022 | 1022 | ||
| 1023 | dev_info(dev, "Booting fw image %s, size %d\n", name, fw->size); | 1023 | dev_info(dev, "Booting fw image %s, size %zd\n", name, fw->size); |
| 1024 | 1024 | ||
| 1025 | /* | 1025 | /* |
| 1026 | * if enabling an IOMMU isn't relevant for this rproc, this is | 1026 | * if enabling an IOMMU isn't relevant for this rproc, this is |
| @@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) · 14 unmodified lines | |||
| 1041 | 1041 | ||
| 1042 | /* look for the resource table */ | 1042 | /* look for the resource table */ |
| 1043 | table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz); | 1043 | table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz); |
| 1044 | if (!table) | 1044 | if (!table) { |
| 1045 | ret = -EINVAL; | ||
| 1045 | goto clean_up; | 1046 | goto clean_up; |
| 1047 | } | ||
| 1046 | 1048 | ||
| 1047 | /* handle fw resources which are required to boot rproc */ | 1049 | /* handle fw resources which are required to boot rproc */ |
| 1048 | ret = rproc_handle_boot_rsc(rproc, table, tablesz); | 1050 | ret = rproc_handle_boot_rsc(rproc, table, tablesz); |
| @@ -801,7 +801,7 @@ static int omap2_mcspi_setup(struct spi_device *spi) · 800 unmodified lines | |||
| 801 | mcspi_dma = &mcspi->dma_channels[spi->chip_select]; | 801 | mcspi_dma = &mcspi->dma_channels[spi->chip_select]; |
| 802 | 802 | ||
| 803 | if (!cs) { | 803 | if (!cs) { |
| 804 | cs = devm_kzalloc(&spi->dev , sizeof *cs, GFP_KERNEL); | 804 | cs = kzalloc(sizeof *cs, GFP_KERNEL); |
| 805 | if (!cs) | 805 | if (!cs) |
| 806 | return -ENOMEM; | 806 | return -ENOMEM; |
| 807 | cs->base = mcspi->base + spi->chip_select * 0x14; | 807 | cs->base = mcspi->base + spi->chip_select * 0x14; |
| @@ -842,6 +842,7 @@ static void omap2_mcspi_cleanup(struct spi_device *spi) · 34 unmodified lines | |||
| 842 | cs = spi->controller_state; | 842 | cs = spi->controller_state; |
| 843 | list_del(&cs->node); | 843 | list_del(&cs->node); |
| 844 | 844 | ||
| 845 | kfree(cs); | ||
| 845 | } | 846 | } |
| 846 | 847 | ||
| 847 | if (spi->chip_select < spi->master->num_chipselect) { | 848 | if (spi->chip_select < spi->master->num_chipselect) { |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/usb.h> | 31 | #include <linux/usb.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/kconfig.h> | ||
| 33 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 34 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 35 | #include <linux/fcntl.h> | 36 | #include <linux/fcntl.h> |
| @@ -981,6 +982,8 @@ void comedi_pci_driver_unregister(struct comedi_driver *comedi_driver, · 945 unmodified lines | |||
| 981 | } | 982 | } |
| 982 | EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); | 983 | EXPORT_SYMBOL_GPL(comedi_pci_driver_unregister); |
| 983 | 984 | ||
| 985 | #if IS_ENABLED(CONFIG_USB) | ||
| 986 | |||
| 984 | static int comedi_old_usb_auto_config(struct usb_interface *intf, | 987 | static int comedi_old_usb_auto_config(struct usb_interface *intf, |
| 985 | struct comedi_driver *driver) | 988 | struct comedi_driver *driver) |
| 986 | { | 989 | { |
| @@ -1043,3 +1046,5 @@ void comedi_usb_driver_unregister(struct comedi_driver *comedi_driver, · 56 unmodified lines | |||
| 1043 | comedi_driver_unregister(comedi_driver); | 1046 | comedi_driver_unregister(comedi_driver); |
| 1044 | } | 1047 | } |
| 1045 | EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister); | 1048 | EXPORT_SYMBOL_GPL(comedi_usb_driver_unregister); |
| 1049 | |||
| 1050 | #endif | ||
| @@ -104,7 +104,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type, · 103 unmodified lines | |||
| 104 | 104 | ||
| 105 | void netlink_exit(struct sock *sock) | 105 | void netlink_exit(struct sock *sock) |
| 106 | { | 106 | { |
| 107 | sock_release(sock->sk_socket); | 107 | netlink_kernel_release(sock); |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) | 110 | int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) |
| @@ -29,8 +29,6 @@ Then fill in the following: · 28 unmodified lines | |||
| 29 | * info->driver_module: | 29 | * info->driver_module: |
| 30 | Set to THIS_MODULE. Used to ensure correct ownership | 30 | Set to THIS_MODULE. Used to ensure correct ownership |
| 31 | of various resources allocate by the core. | 31 | of various resources allocate by the core. |
| 32 | * info->num_interrupt_lines: | ||
| 33 | Number of event triggering hardware lines the device has. | ||
| 34 | * info->event_attrs: | 32 | * info->event_attrs: |
| 35 | Attributes used to enable / disable hardware events. | 33 | Attributes used to enable / disable hardware events. |
| 36 | * info->attrs: | 34 | * info->attrs: |
| @@ -13,6 +13,7 @@ config AD7291 · 12 unmodified lines | |||
| 13 | config AD7298 | 13 | config AD7298 |
| 14 | tristate "Analog Devices AD7298 ADC driver" | 14 | tristate "Analog Devices AD7298 ADC driver" |
| 15 | depends on SPI | 15 | depends on SPI |
| 16 | select IIO_KFIFO_BUF if IIO_BUFFER | ||
| 16 | help | 17 | help |
| 17 | Say yes here to build support for Analog Devices AD7298 | 18 | Say yes here to build support for Analog Devices AD7298 |
| 18 | 8 Channel ADC with temperature sensor. | 19 | 8 Channel ADC with temperature sensor. |
| @@ -235,7 +235,8 @@ static const struct attribute_group ad7606_attribute_group_range = { · 234 unmodified lines | |||
| 235 | .indexed = 1, \ | 235 | .indexed = 1, \ |
| 236 | .channel = num, \ | 236 | .channel = num, \ |
| 237 | .address = num, \ | 237 | .address = num, \ |
| 238 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, \ | 238 | .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \ |
| 239 | IIO_CHAN_INFO_SCALE_SHARED_BIT, \ | ||
| 239 | .scan_index = num, \ | 240 | .scan_index = num, \ |
| 240 | .scan_type = IIO_ST('s', 16, 16, 0), \ | 241 | .scan_type = IIO_ST('s', 16, 16, 0), \ |
| 241 | } | 242 | } |
| @@ -208,7 +208,8 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, · 207 unmodified lines | |||
| 208 | */ | 208 | */ |
| 209 | ret = omap_gem_get_paddr(fbdev->bo, &paddr, true); | 209 | ret = omap_gem_get_paddr(fbdev->bo, &paddr, true); |
| 210 | if (ret) { | 210 | if (ret) { |
| 211 | dev_err(dev->dev, "could not map (paddr)!\n"); | 211 | dev_err(dev->dev, |
| 212 | "could not map (paddr)! Skipping framebuffer alloc\n"); | ||
| 212 | ret = -ENOMEM; | 213 | ret = -ENOMEM; |
| 213 | goto fail; | 214 | goto fail; |
| 214 | } | 215 | } |
| @@ -388,8 +389,11 @@ void omap_fbdev_free(struct drm_device *dev) · 173 unmodified lines | |||
| 388 | 389 | ||
| 389 | fbi = helper->fbdev; | 390 | fbi = helper->fbdev; |
| 390 | 391 | ||
| 391 | unregister_framebuffer(fbi); | 392 | /* only cleanup framebuffer if it is present */ |
| 392 | framebuffer_release(fbi); | 393 | if (fbi) { |
| 394 | unregister_framebuffer(fbi); | ||
| 395 | framebuffer_release(fbi); | ||
| 396 | } | ||
| 393 | 397 | ||
| 394 | drm_fb_helper_fini(helper); | 398 | drm_fb_helper_fini(helper); |
| 395 | 399 | ||
| @@ -102,6 +102,8 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = { · 101 unmodified lines | |||
| 102 | /* - */ | 102 | /* - */ |
| 103 | {USB_DEVICE(0x20F4, 0x646B)}, | 103 | {USB_DEVICE(0x20F4, 0x646B)}, |
| 104 | {USB_DEVICE(0x083A, 0xC512)}, | 104 | {USB_DEVICE(0x083A, 0xC512)}, |
| 105 | {USB_DEVICE(0x25D4, 0x4CA1)}, | ||
| 106 | {USB_DEVICE(0x25D4, 0x4CAB)}, | ||
| 105 | 107 | ||
| 106 | /* RTL8191SU */ | 108 | /* RTL8191SU */ |
| 107 | /* Realtek */ | 109 | /* Realtek */ |
| @@ -3113,7 +3113,7 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port * · 3112 unmodified lines | |||
| 3113 | 3113 | ||
| 3114 | /** | 3114 | /** |
| 3115 | * serial8250_register_8250_port - register a serial port | 3115 | * serial8250_register_8250_port - register a serial port |
| 3116 | * @port: serial port template | 3116 | * @up: serial port template |
| 3117 | * | 3117 | * |
| 3118 | * Configure the serial port specified by the request. If the | 3118 | * Configure the serial port specified by the request. If the |
| 3119 | * port exists and is in use, it is hung up and unregistered | 3119 | * port exists and is in use, it is hung up and unregistered |
| @@ -133,6 +133,10 @@ struct pl011_dmatx_data { · 132 unmodified lines | |||
| 133 | struct uart_amba_port { | 133 | struct uart_amba_port { |
| 134 | struct uart_port port; | 134 | struct uart_port port; |
| 135 | struct clk *clk; | 135 | struct clk *clk; |
| 136 | /* Two optional pin states - default & sleep */ | ||
| 137 | struct pinctrl *pinctrl; | ||
| 138 | struct pinctrl_state *pins_default; | ||
| 139 | struct pinctrl_state *pins_sleep; | ||
| 136 | const struct vendor_data *vendor; | 140 | const struct vendor_data *vendor; |
| 137 | unsigned int dmacr; /* dma control reg */ | 141 | unsigned int dmacr; /* dma control reg */ |
| 138 | unsigned int im; /* interrupt mask */ | 142 | unsigned int im; /* interrupt mask */ |
| @@ -1312,6 +1316,14 @@ static int pl011_startup(struct uart_port *port) · 1173 unmodified lines | |||
| 1312 | unsigned int cr; | 1316 | unsigned int cr; |
| 1313 | int retval; | 1317 | int retval; |
| 1314 | 1318 | ||
| 1319 | /* Optionaly enable pins to be muxed in and configured */ | ||
| 1320 | if (!IS_ERR(uap->pins_default)) { | ||
| 1321 | retval = pinctrl_select_state(uap->pinctrl, uap->pins_default); | ||
| 1322 | if (retval) | ||
| 1323 | dev_err(port->dev, | ||
| 1324 | "could not set default pins\n"); | ||
| 1325 | } | ||
| 1326 | |||
| 1315 | retval = clk_prepare(uap->clk); | 1327 | retval = clk_prepare(uap->clk); |
| 1316 | if (retval) | 1328 | if (retval) |
| 1317 | goto out; | 1329 | goto out; |
| @@ -1420,6 +1432,7 @@ static void pl011_shutdown(struct uart_port *port) · 102 unmodified lines | |||
| 1420 | { | 1432 | { |
| 1421 | struct uart_amba_port *uap = (struct uart_amba_port *)port; | 1433 | struct uart_amba_port *uap = (struct uart_amba_port *)port; |
| 1422 | unsigned int cr; | 1434 | unsigned int cr; |
| 1435 | int retval; | ||
| 1423 | 1436 | ||
| 1424 | /* | 1437 | /* |
| 1425 | * disable all interrupts | 1438 | * disable all interrupts |
| @@ -1462,6 +1475,14 @@ static void pl011_shutdown(struct uart_port *port) · 36 unmodified lines | |||
| 1462 | */ | 1475 | */ |
| 1463 | clk_disable(uap->clk); | 1476 | clk_disable(uap->clk); |
| 1464 | clk_unprepare(uap->clk); | 1477 | clk_unprepare(uap->clk); |
| 1478 | /* Optionally let pins go into sleep states */ | ||
| 1479 | if (!IS_ERR(uap->pins_sleep)) { | ||
| 1480 | retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep); | ||
| 1481 | if (retval) | ||
| 1482 | dev_err(port->dev, | ||
| 1483 | "could not set pins to sleep state\n"); | ||
| 1484 | } | ||
| 1485 | |||
| 1465 | 1486 | ||
| 1466 | if (uap->port.dev->platform_data) { | 1487 | if (uap->port.dev->platform_data) { |
| 1467 | struct amba_pl011_data *plat; | 1488 | struct amba_pl011_data *plat; |
| @@ -1792,6 +1813,14 @@ static int __init pl011_console_setup(struct console *co, char *options) · 324 unmodified lines | |||
| 1792 | if (!uap) | 1813 | if (!uap) |
| 1793 | return -ENODEV; | 1814 | return -ENODEV; |
| 1794 | 1815 | ||
| 1816 | /* Allow pins to be muxed in and configured */ | ||
| 1817 | if (!IS_ERR(uap->pins_default)) { | ||
| 1818 | ret = pinctrl_select_state(uap->pinctrl, uap->pins_default); | ||
| 1819 | if (ret) | ||
| 1820 | dev_err(uap->port.dev, | ||
| 1821 | "could not set default pins\n"); | ||
| 1822 | } | ||
| 1823 | |||
| 1795 | ret = clk_prepare(uap->clk); | 1824 | ret = clk_prepare(uap->clk); |
| 1796 | if (ret) | 1825 | if (ret) |
| 1797 | return ret; | 1826 | return ret; |
| @@ -1844,7 +1873,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) · 46 unmodified lines | |||
| 1844 | { | 1873 | { |
| 1845 | struct uart_amba_port *uap; | 1874 | struct uart_amba_port *uap; |
| 1846 | struct vendor_data *vendor = id->data; | 1875 | struct vendor_data *vendor = id->data; |
| 1847 | struct pinctrl *pinctrl; | ||
| 1848 | void __iomem *base; | 1876 | void __iomem *base; |
| 1849 | int i, ret; | 1877 | int i, ret; |
| 1850 | 1878 | ||
| @@ -1869,11 +1897,20 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) · 18 unmodified lines | |||
| 1869 | goto free; | 1897 | goto free; |
| 1870 | } | 1898 | } |
| 1871 | 1899 | ||
| 1872 | pinctrl = devm_pinctrl_get_select_default(&dev->dev); | 1900 | uap->pinctrl = devm_pinctrl_get(&dev->dev); |
| 1873 | if (IS_ERR(pinctrl)) { | 1901 | if (IS_ERR(uap->pinctrl)) { |
| 1874 | ret = PTR_ERR(pinctrl); | 1902 | ret = PTR_ERR(uap->pinctrl); |
| 1875 | goto unmap; | 1903 | goto unmap; |
| 1876 | } | 1904 | } |
| 1905 | uap->pins_default = pinctrl_lookup_state(uap->pinctrl, | ||
| 1906 | PINCTRL_STATE_DEFAULT); | ||
| 1907 | if (IS_ERR(uap->pins_default)) | ||
| 1908 | dev_err(&dev->dev, "could not get default pinstate\n"); | ||
| 1909 | |||
| 1910 | uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl, | ||
| 1911 | PINCTRL_STATE_SLEEP); | ||
| 1912 | if (IS_ERR(uap->pins_sleep)) | ||
| 1913 | dev_dbg(&dev->dev, "could not get sleep pinstate\n"); | ||
| 1877 | 1914 | ||
| 1878 | uap->clk = clk_get(&dev->dev, NULL); | 1915 | uap->clk = clk_get(&dev->dev, NULL); |
| 1879 | if (IS_ERR(uap->clk)) { | 1916 | if (IS_ERR(uap->clk)) { |
| @@ -466,7 +466,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state) · 465 unmodified lines | |||
| 466 | spin_unlock_irqrestore(&up->port.lock, flags); | 466 | spin_unlock_irqrestore(&up->port.lock, flags); |
| 467 | } | 467 | } |
| 468 | 468 | ||
| 469 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL) | 469 | #if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL) |
| 470 | /* | 470 | /* |
| 471 | * Wait for transmitter & holding register to empty | 471 | * Wait for transmitter & holding register to empty |
| 472 | */ | 472 | */ |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Watchdog driver for ARM SP805 watchdog module | 4 | * Watchdog driver for ARM SP805 watchdog module |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2010 ST Microelectronics | 6 | * Copyright (C) 2010 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2 or later. This program is licensed "as is" without any | 10 | * License version 2 or later. This program is licensed "as is" without any |
| @@ -331,6 +331,6 @@ static struct amba_driver sp805_wdt_driver = { · 320 unmodified lines | |||
| 331 | 331 | ||
| 332 | module_amba_driver(sp805_wdt_driver); | 332 | module_amba_driver(sp805_wdt_driver); |
| 333 | 333 | ||
| 334 | MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>"); | 334 | MODULE_AUTHOR("Viresh Kumar <viresh.linux@gmail.com>"); |
| 335 | MODULE_DESCRIPTION("ARM SP805 Watchdog Driver"); | 335 | MODULE_DESCRIPTION("ARM SP805 Watchdog Driver"); |
| 336 | MODULE_LICENSE("GPL"); | 336 | MODULE_LICENSE("GPL"); |
| @@ -179,61 +179,74 @@ static int __add_prelim_ref(struct list_head *head, u64 root_id, · 178 unmodified lines | |||
| 179 | 179 | ||
| 180 | static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, | 180 | static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, |
| 181 | struct ulist *parents, int level, | 181 | struct ulist *parents, int level, |
| 182 | struct btrfs_key *key, u64 time_seq, | 182 | struct btrfs_key *key_for_search, u64 time_seq, |
| 183 | u64 wanted_disk_byte, | 183 | u64 wanted_disk_byte, |
| 184 | const u64 *extent_item_pos) | 184 | const u64 *extent_item_pos) |
| 185 | { | 185 | { |
| 186 | int ret; | 186 | int ret = 0; |
| 187 | int slot = path->slots[level]; | 187 | int slot; |
| 188 | struct extent_buffer *eb = path->nodes[level]; | 188 | struct extent_buffer *eb; |
| 189 | struct btrfs_key key; | ||
| 189 | struct btrfs_file_extent_item *fi; | 190 | struct btrfs_file_extent_item *fi; |
| 190 | struct extent_inode_elem *eie = NULL; | 191 | struct extent_inode_elem *eie = NULL; |
| 191 | u64 disk_byte; | 192 | u64 disk_byte; |
| 192 | u64 wanted_objectid = key->objectid; | ||
| 193 | 193 | ||
| 194 | add_parent: | 194 | if (level != 0) { |
| 195 | if (level == 0 && extent_item_pos) { | 195 | eb = path->nodes[level]; |
| 196 | fi = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item); | 196 | ret = ulist_add(parents, eb->start, 0, GFP_NOFS); |
| 197 | ret = check_extent_in_eb(key, eb, fi, *extent_item_pos, &eie); | ||
| 198 | if (ret < 0) | 197 | if (ret < 0) |
| 199 | return ret; | 198 | return ret; |
| 200 | } | ||
| 201 | ret = ulist_add(parents, eb->start, (unsigned long)eie, GFP_NOFS); | ||
| 202 | if (ret < 0) | ||
| 203 | return ret; | ||
| 204 | |||
| 205 | if (level != 0) | ||
| 206 | return 0; | 199 | return 0; |
| 200 | } | ||
| 207 | 201 | ||
| 208 | /* | 202 | /* |
| 209 | * if the current leaf is full with EXTENT_DATA items, we must | 203 | * We normally enter this function with the path already pointing to |
| 210 | * check the next one if that holds a reference as well. | 204 | * the first item to check. But sometimes, we may enter it with |
| 211 | * ref->count cannot be used to skip this check. | 205 | * slot==nritems. In that case, go to the next leaf before we continue. |
| 212 | * repeat this until we don't find any additional EXTENT_DATA items. | ||
| 213 | */ | 206 | */ |
| 214 | while (1) { | 207 | if (path->slots[0] >= btrfs_header_nritems(path->nodes[0])) |
| 215 | eie = NULL; | ||
| 216 | ret = btrfs_next_old_leaf(root, path, time_seq); | 208 | ret = btrfs_next_old_leaf(root, path, time_seq); |
| 217 | if (ret < 0) | ||
| 218 | return ret; | ||
| 219 | if (ret) | ||
| 220 | return 0; | ||
| 221 | 209 | ||
| 210 | while (!ret) { | ||
| 222 | eb = path->nodes[0]; | 211 | eb = path->nodes[0]; |
| 223 | for (slot = 0; slot < btrfs_header_nritems(eb); ++slot) { | 212 | slot = path->slots[0]; |
| 224 | btrfs_item_key_to_cpu(eb, key, slot); | 213 | |
| 225 | if (key->objectid != wanted_objectid || | 214 | btrfs_item_key_to_cpu(eb, &key, slot); |
| 226 | key->type != BTRFS_EXTENT_DATA_KEY) | 215 | |
| 227 | return 0; | 216 | if (key.objectid != key_for_search->objectid || |
| 228 | fi = btrfs_item_ptr(eb, slot, | 217 | key.type != BTRFS_EXTENT_DATA_KEY) |
| 229 | struct btrfs_file_extent_item); | 218 | break; |
| 230 | disk_byte = btrfs_file_extent_disk_bytenr(eb, fi); | 219 | |
| 231 | if (disk_byte == wanted_disk_byte) | 220 | fi = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item); |
| 232 | goto add_parent; | 221 | disk_byte = btrfs_file_extent_disk_bytenr(eb, fi); |
| 222 | |||
| 223 | if (disk_byte == wanted_disk_byte) { | ||
| 224 | eie = NULL; | ||
| 225 | if (extent_item_pos) { | ||
| 226 | ret = check_extent_in_eb(&key, eb, fi, | ||
| 227 | *extent_item_pos, | ||
| 228 | &eie); | ||
| 229 | if (ret < 0) | ||
| 230 | break; | ||
| 231 | } | ||
| 232 | if (!ret) { | ||
| 233 | ret = ulist_add(parents, eb->start, | ||
| 234 | (unsigned long)eie, GFP_NOFS); | ||
| 235 | if (ret < 0) | ||
| 236 | break; | ||
| 237 | if (!extent_item_pos) { | ||
| 238 | ret = btrfs_next_old_leaf(root, path, | ||
| 239 | time_seq); | ||
| 240 | continue; | ||
| 241 | } | ||
| 242 | } | ||
| 233 | } | 243 | } |
| 244 | ret = btrfs_next_old_item(root, path, time_seq); | ||
| 234 | } | 245 | } |
| 235 | 246 | ||
| 236 | return 0; | 247 | if (ret > 0) |
| 248 | ret = 0; | ||
| 249 | return ret; | ||
| 237 | } | 250 | } |
| 238 | 251 | ||
| 239 | /* | 252 | /* |
| @@ -250,7 +263,6 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, · 10 unmodified lines | |||
| 250 | struct btrfs_path *path; | 263 | struct btrfs_path *path; |
| 251 | struct btrfs_root *root; | 264 | struct btrfs_root *root; |
| 252 | struct btrfs_key root_key; | 265 | struct btrfs_key root_key; |
| 253 | struct btrfs_key key = {0}; | ||
| 254 | struct extent_buffer *eb; | 266 | struct extent_buffer *eb; |
| 255 | int ret = 0; | 267 | int ret = 0; |
| 256 | int root_level; | 268 | int root_level; |
| @@ -295,11 +307,9 @@ static int __resolve_indirect_ref(struct btrfs_fs_info *fs_info, · 38 unmodified lines | |||
| 295 | goto out; | 307 | goto out; |
| 296 | } | 308 | } |
| 297 | 309 | ||
| 298 | if (level == 0) | 310 | ret = add_all_parents(root, path, parents, level, &ref->key_for_search, |
| 299 | btrfs_item_key_to_cpu(eb, &key, path->slots[0]); | 311 | time_seq, ref->wanted_disk_byte, |
| 300 | 312 | extent_item_pos); | |
| 301 | ret = add_all_parents(root, path, parents, level, &key, time_seq, | ||
| 302 | ref->wanted_disk_byte, extent_item_pos); | ||
| 303 | out: | 313 | out: |
| 304 | btrfs_free_path(path); | 314 | btrfs_free_path(path); |
| 305 | return ret; | 315 | return ret; |
| @@ -2755,13 +2755,18 @@ static inline int btrfs_insert_empty_item(struct btrfs_trans_handle *trans, · 2754 unmodified lines | |||
| 2755 | int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path); | 2755 | int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path); |
| 2756 | int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, | 2756 | int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, |
| 2757 | u64 time_seq); | 2757 | u64 time_seq); |
| 2758 | static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) | 2758 | static inline int btrfs_next_old_item(struct btrfs_root *root, |
| 2759 | struct btrfs_path *p, u64 time_seq) | ||
| 2759 | { | 2760 | { |
| 2760 | ++p->slots[0]; | 2761 | ++p->slots[0]; |
| 2761 | if (p->slots[0] >= btrfs_header_nritems(p->nodes[0])) | 2762 | if (p->slots[0] >= btrfs_header_nritems(p->nodes[0])) |
| 2762 | return btrfs_next_leaf(root, p); | 2763 | return btrfs_next_old_leaf(root, p, time_seq); |
| 2763 | return 0; | 2764 | return 0; |
| 2764 | } | 2765 | } |
| 2766 | static inline int btrfs_next_item(struct btrfs_root *root, struct btrfs_path *p) | ||
| 2767 | { | ||
| 2768 | return btrfs_next_old_item(root, p, 0); | ||
| 2769 | } | ||
| 2765 | int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path); | 2770 | int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path); |
| 2766 | int btrfs_leaf_free_space(struct btrfs_root *root, struct extent_buffer *leaf); | 2771 | int btrfs_leaf_free_space(struct btrfs_root *root, struct extent_buffer *leaf); |
| 2767 | int __must_check btrfs_drop_snapshot(struct btrfs_root *root, | 2772 | int __must_check btrfs_drop_snapshot(struct btrfs_root *root, |
| @@ -3426,6 +3426,7 @@ int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans, · 3425 unmodified lines | |||
| 3426 | mutex_unlock(&head->mutex); | 3426 | mutex_unlock(&head->mutex); |
| 3427 | btrfs_put_delayed_ref(ref); | 3427 | btrfs_put_delayed_ref(ref); |
| 3428 | 3428 | ||
| 3429 | spin_lock(&delayed_refs->lock); | ||
| 3429 | continue; | 3430 | continue; |
| 3430 | } | 3431 | } |
| 3431 | 3432 | ||
| @@ -987,7 +987,7 @@ static noinline void async_cow_start(struct btrfs_work *work) · 986 unmodified lines | |||
| 987 | async_cow->start, async_cow->end, async_cow, | 987 | async_cow->start, async_cow->end, async_cow, |
| 988 | &num_added); | 988 | &num_added); |
| 989 | if (num_added == 0) { | 989 | if (num_added == 0) { |
| 990 | iput(async_cow->inode); | 990 | btrfs_add_delayed_iput(async_cow->inode); |
| 991 | async_cow->inode = NULL; | 991 | async_cow->inode = NULL; |
| 992 | } | 992 | } |
| 993 | } | 993 | } |
| @@ -1023,7 +1023,7 @@ static noinline void async_cow_free(struct btrfs_work *work) · 29 unmodified lines | |||
| 1023 | struct async_cow *async_cow; | 1023 | struct async_cow *async_cow; |
| 1024 | async_cow = container_of(work, struct async_cow, work); | 1024 | async_cow = container_of(work, struct async_cow, work); |
| 1025 | if (async_cow->inode) | 1025 | if (async_cow->inode) |
| 1026 | iput(async_cow->inode); | 1026 | btrfs_add_delayed_iput(async_cow->inode); |
| 1027 | kfree(async_cow); | 1027 | kfree(async_cow); |
| 1028 | } | 1028 | } |
| 1029 | 1029 | ||
| @@ -54,7 +54,12 @@ · 53 unmodified lines | |||
| 54 | (CONGESTION_ON_THRESH(congestion_kb) - \ | 54 | (CONGESTION_ON_THRESH(congestion_kb) - \ |
| 55 | (CONGESTION_ON_THRESH(congestion_kb) >> 2)) | 55 | (CONGESTION_ON_THRESH(congestion_kb) >> 2)) |
| 56 | 56 | ||
| 57 | 57 | static inline struct ceph_snap_context *page_snap_context(struct page *page) | |
| 58 | { | ||
| 59 | if (PagePrivate(page)) | ||
| 60 | return (void *)page->private; | ||
| 61 | return NULL; | ||
| 62 | } | ||
| 58 | 63 | ||
| 59 | /* | 64 | /* |
| 60 | * Dirty a page. Optimistically adjust accounting, on the assumption | 65 | * Dirty a page. Optimistically adjust accounting, on the assumption |
| @@ -142,10 +147,9 @@ static void ceph_invalidatepage(struct page *page, unsigned long offset) · 81 unmodified lines | |||
| 142 | { | 147 | { |
| 143 | struct inode *inode; | 148 | struct inode *inode; |
| 144 | struct ceph_inode_info *ci; | 149 | struct ceph_inode_info *ci; |
| 145 | struct ceph_snap_context *snapc = (void *)page->private; | 150 | struct ceph_snap_context *snapc = page_snap_context(page); |
| 146 | 151 | ||
| 147 | BUG_ON(!PageLocked(page)); | 152 | BUG_ON(!PageLocked(page)); |
| 148 | BUG_ON(!page->private); | ||
| 149 | BUG_ON(!PagePrivate(page)); | 153 | BUG_ON(!PagePrivate(page)); |
| 150 | BUG_ON(!page->mapping); | 154 | BUG_ON(!page->mapping); |
| 151 | 155 | ||
| @@ -182,7 +186,6 @@ static int ceph_releasepage(struct page *page, gfp_t g) · 30 unmodified lines | |||
| 182 | struct inode *inode = page->mapping ? page->mapping->host : NULL; | 186 | struct inode *inode = page->mapping ? page->mapping->host : NULL; |
| 183 | dout("%p releasepage %p idx %lu\n", inode, page, page->index); | 187 | dout("%p releasepage %p idx %lu\n", inode, page, page->index); |
| 184 | WARN_ON(PageDirty(page)); | 188 | WARN_ON(PageDirty(page)); |
| 185 | WARN_ON(page->private); | ||
| 186 | WARN_ON(PagePrivate(page)); | 189 | WARN_ON(PagePrivate(page)); |
| 187 | return 0; | 190 | return 0; |
| 188 | } | 191 | } |
| @@ -443,7 +446,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) · 254 unmodified lines | |||
| 443 | osdc = &fsc->client->osdc; | 446 | osdc = &fsc->client->osdc; |
| 444 | 447 | ||
| 445 | /* verify this is a writeable snap context */ | 448 | /* verify this is a writeable snap context */ |
| 446 | snapc = (void *)page->private; | 449 | snapc = page_snap_context(page); |
| 447 | if (snapc == NULL) { | 450 | if (snapc == NULL) { |
| 448 | dout("writepage %p page %p not dirty?\n", inode, page); | 451 | dout("writepage %p page %p not dirty?\n", inode, page); |
| 449 | goto out; | 452 | goto out; |
| @@ -451,7 +454,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) · 1 unmodified line | |||
| 451 | oldest = get_oldest_context(inode, &snap_size); | 454 | oldest = get_oldest_context(inode, &snap_size); |
| 452 | if (snapc->seq > oldest->seq) { | 455 | if (snapc->seq > oldest->seq) { |
| 453 | dout("writepage %p page %p snapc %p not writeable - noop\n", | 456 | dout("writepage %p page %p snapc %p not writeable - noop\n", |
| 454 | inode, page, (void *)page->private); | 457 | inode, page, snapc); |
| 455 | /* we should only noop if called by kswapd */ | 458 | /* we should only noop if called by kswapd */ |
| 456 | WARN_ON((current->flags & PF_MEMALLOC) == 0); | 459 | WARN_ON((current->flags & PF_MEMALLOC) == 0); |
| 457 | ceph_put_snap_context(oldest); | 460 | ceph_put_snap_context(oldest); |
| @@ -591,7 +594,7 @@ static void writepages_finish(struct ceph_osd_request *req, · 133 unmodified lines | |||
| 591 | clear_bdi_congested(&fsc->backing_dev_info, | 594 | clear_bdi_congested(&fsc->backing_dev_info, |
| 592 | BLK_RW_ASYNC); | 595 | BLK_RW_ASYNC); |
| 593 | 596 | ||
| 594 | ceph_put_snap_context((void *)page->private); | 597 | ceph_put_snap_context(page_snap_context(page)); |
| 595 | page->private = 0; | 598 | page->private = 0; |
| 596 | ClearPagePrivate(page); | 599 | ClearPagePrivate(page); |
| 597 | dout("unlocking %d %p\n", i, page); | 600 | dout("unlocking %d %p\n", i, page); |
| @@ -795,7 +798,7 @@ get_more_pages: · 197 unmodified lines | |||
| 795 | } | 798 | } |
| 796 | 799 | ||
| 797 | /* only if matching snap context */ | 800 | /* only if matching snap context */ |
| 798 | pgsnapc = (void *)page->private; | 801 | pgsnapc = page_snap_context(page); |
| 799 | if (pgsnapc->seq > snapc->seq) { | 802 | if (pgsnapc->seq > snapc->seq) { |
| 800 | dout("page snapc %p %lld > oldest %p %lld\n", | 803 | dout("page snapc %p %lld > oldest %p %lld\n", |
| 801 | pgsnapc, pgsnapc->seq, snapc, snapc->seq); | 804 | pgsnapc, pgsnapc->seq, snapc, snapc->seq); |
| @@ -984,7 +987,7 @@ retry_locked: · 182 unmodified lines | |||
| 984 | BUG_ON(!ci->i_snap_realm); | 987 | BUG_ON(!ci->i_snap_realm); |
| 985 | down_read(&mdsc->snap_rwsem); | 988 | down_read(&mdsc->snap_rwsem); |
| 986 | BUG_ON(!ci->i_snap_realm->cached_context); | 989 | BUG_ON(!ci->i_snap_realm->cached_context); |
| 987 | snapc = (void *)page->private; | 990 | snapc = page_snap_context(page); |
| 988 | if (snapc && snapc != ci->i_head_snapc) { | 991 | if (snapc && snapc != ci->i_head_snapc) { |
| 989 | /* | 992 | /* |
| 990 | * this page is already dirty in another (older) snap | 993 | * this page is already dirty in another (older) snap |
| @@ -819,10 +819,10 @@ static int exec_mmap(struct mm_struct *mm) · 818 unmodified lines | |||
| 819 | /* Notify parent that we're no longer interested in the old VM */ | 819 | /* Notify parent that we're no longer interested in the old VM */ |
| 820 | tsk = current; | 820 | tsk = current; |
| 821 | old_mm = current->mm; | 821 | old_mm = current->mm; |
| 822 | sync_mm_rss(old_mm); | ||
| 823 | mm_release(tsk, old_mm); | 822 | mm_release(tsk, old_mm); |
| 824 | 823 | ||
| 825 | if (old_mm) { | 824 | if (old_mm) { |
| 825 | sync_mm_rss(old_mm); | ||
| 826 | /* | 826 | /* |
| 827 | * Make sure that if there is a core dump in progress | 827 | * Make sure that if there is a core dump in progress |
| 828 | * for the old mm, we get out and die instead of going | 828 | * for the old mm, we get out and die instead of going |
| @@ -31,6 +31,7 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags) · 30 unmodified lines | |||
| 31 | struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb); | 31 | struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb); |
| 32 | struct hfsplus_vh *vh = sbi->s_vhdr; | 32 | struct hfsplus_vh *vh = sbi->s_vhdr; |
| 33 | struct hfsplus_vh *bvh = sbi->s_backup_vhdr; | 33 | struct hfsplus_vh *bvh = sbi->s_backup_vhdr; |
| 34 | u32 cnid = (unsigned long)dentry->d_fsdata; | ||
| 34 | 35 | ||
| 35 | if (!capable(CAP_SYS_ADMIN)) | 36 | if (!capable(CAP_SYS_ADMIN)) |
| 36 | return -EPERM; | 37 | return -EPERM; |
| @@ -41,8 +42,12 @@ static int hfsplus_ioctl_bless(struct file *file, int __user *user_flags) · 4 unmodified lines | |||
| 41 | vh->finder_info[0] = bvh->finder_info[0] = | 42 | vh->finder_info[0] = bvh->finder_info[0] = |
| 42 | cpu_to_be32(parent_ino(dentry)); | 43 | cpu_to_be32(parent_ino(dentry)); |
| 43 | 44 | ||
| 44 | /* Bootloader */ | 45 | /* |
| 45 | vh->finder_info[1] = bvh->finder_info[1] = cpu_to_be32(inode->i_ino); | 46 | * Bootloader. Just using the inode here breaks in the case of |
| 47 | * hard links - the firmware wants the ID of the hard link file, | ||
| 48 | * but the inode points at the indirect inode | ||
| 49 | */ | ||
| 50 | vh->finder_info[1] = bvh->finder_info[1] = cpu_to_be32(cnid); | ||
| 46 | 51 | ||
| 47 | /* Per spec, the OS X system folder - same as finder_info[0] here */ | 52 | /* Per spec, the OS X system folder - same as finder_info[0] here */ |
| 48 | vh->finder_info[5] = bvh->finder_info[5] = | 53 | vh->finder_info[5] = bvh->finder_info[5] = |
| @@ -56,7 +56,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, · 55 unmodified lines | |||
| 56 | DECLARE_COMPLETION_ONSTACK(wait); | 56 | DECLARE_COMPLETION_ONSTACK(wait); |
| 57 | struct bio *bio; | 57 | struct bio *bio; |
| 58 | int ret = 0; | 58 | int ret = 0; |
| 59 | unsigned int io_size; | 59 | u64 io_size; |
| 60 | loff_t start; | 60 | loff_t start; |
| 61 | int offset; | 61 | int offset; |
| 62 | 62 | ||
| @@ -207,7 +207,6 @@ error_0: · 206 unmodified lines | |||
| 207 | static void nfs4_shutdown_session(struct nfs_client *clp) | 207 | static void nfs4_shutdown_session(struct nfs_client *clp) |
| 208 | { | 208 | { |
| 209 | if (nfs4_has_session(clp)) { | 209 | if (nfs4_has_session(clp)) { |
| 210 | nfs4_deviceid_purge_client(clp); | ||
| 211 | nfs4_destroy_session(clp->cl_session); | 210 | nfs4_destroy_session(clp->cl_session); |
| 212 | nfs4_destroy_clientid(clp); | 211 | nfs4_destroy_clientid(clp); |
| 213 | } | 212 | } |
| @@ -490,6 +490,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) · 489 unmodified lines | |||
| 490 | dreq->error = -EIO; | 490 | dreq->error = -EIO; |
| 491 | spin_unlock(cinfo.lock); | 491 | spin_unlock(cinfo.lock); |
| 492 | } | 492 | } |
| 493 | nfs_release_request(req); | ||
| 493 | } | 494 | } |
| 494 | nfs_pageio_complete(&desc); | 495 | nfs_pageio_complete(&desc); |
| 495 | 496 | ||
| @@ -57,6 +57,11 @@ unsigned int nfs_idmap_cache_timeout = 600; · 56 unmodified lines | |||
| 57 | static const struct cred *id_resolver_cache; | 57 | static const struct cred *id_resolver_cache; |
| 58 | static struct key_type key_type_id_resolver_legacy; | 58 | static struct key_type key_type_id_resolver_legacy; |
| 59 | 59 | ||
| 60 | struct idmap { | ||
| 61 | struct rpc_pipe *idmap_pipe; | ||
| 62 | struct key_construction *idmap_key_cons; | ||
| 63 | struct mutex idmap_mutex; | ||
| 64 | }; | ||
| 60 | 65 | ||
| 61 | /** | 66 | /** |
| 62 | * nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields | 67 | * nfs_fattr_init_names - initialise the nfs_fattr owner_name/group_name fields |
| @@ -310,9 +315,11 @@ static ssize_t nfs_idmap_get_key(const char *name, size_t namelen, · 247 unmodified lines | |||
| 310 | name, namelen, type, data, | 315 | name, namelen, type, data, |
| 311 | data_size, NULL); | 316 | data_size, NULL); |
| 312 | if (ret < 0) { | 317 | if (ret < 0) { |
| 318 | mutex_lock(&idmap->idmap_mutex); | ||
| 313 | ret = nfs_idmap_request_key(&key_type_id_resolver_legacy, | 319 | ret = nfs_idmap_request_key(&key_type_id_resolver_legacy, |
| 314 | name, namelen, type, data, | 320 | name, namelen, type, data, |
| 315 | data_size, idmap); | 321 | data_size, idmap); |
| 322 | mutex_unlock(&idmap->idmap_mutex); | ||
| 316 | } | 323 | } |
| 317 | return ret; | 324 | return ret; |
| 318 | } | 325 | } |
| @@ -354,11 +361,6 @@ static int nfs_idmap_lookup_id(const char *name, size_t namelen, const char *typ · 35 unmodified lines | |||
| 354 | /* idmap classic begins here */ | 361 | /* idmap classic begins here */ |
| 355 | module_param(nfs_idmap_cache_timeout, int, 0644); | 362 | module_param(nfs_idmap_cache_timeout, int, 0644); |
| 356 | 363 | ||
| 357 | struct idmap { | ||
| 358 | struct rpc_pipe *idmap_pipe; | ||
| 359 | struct key_construction *idmap_key_cons; | ||
| 360 | }; | ||
| 361 | |||
| 362 | enum { | 364 | enum { |
| 363 | Opt_find_uid, Opt_find_gid, Opt_find_user, Opt_find_group, Opt_find_err | 365 | Opt_find_uid, Opt_find_gid, Opt_find_user, Opt_find_group, Opt_find_err |
| 364 | }; | 366 | }; |
| @@ -469,6 +471,7 @@ nfs_idmap_new(struct nfs_client *clp) · 104 unmodified lines | |||
| 469 | return error; | 471 | return error; |
| 470 | } | 472 | } |
| 471 | idmap->idmap_pipe = pipe; | 473 | idmap->idmap_pipe = pipe; |
| 474 | mutex_init(&idmap->idmap_mutex); | ||
| 472 | 475 | ||
| 473 | clp->cl_idmap = idmap; | 476 | clp->cl_idmap = idmap; |
| 474 | return 0; | 477 | return 0; |
| @@ -1530,7 +1530,6 @@ static inline void nfs4_init_once(struct nfs_inode *nfsi) · 1529 unmodified lines | |||
| 1530 | nfsi->delegation_state = 0; | 1530 | nfsi->delegation_state = 0; |
| 1531 | init_rwsem(&nfsi->rwsem); | 1531 | init_rwsem(&nfsi->rwsem); |
| 1532 | nfsi->layout = NULL; | 1532 | nfsi->layout = NULL; |
| 1533 | atomic_set(&nfsi->commit_info.rpcs_out, 0); | ||
| 1534 | #endif | 1533 | #endif |
| 1535 | } | 1534 | } |
| 1536 | 1535 | ||
| @@ -1545,6 +1544,7 @@ static void init_once(void *foo) · 8 unmodified lines | |||
| 1545 | INIT_LIST_HEAD(&nfsi->commit_info.list); | 1544 | INIT_LIST_HEAD(&nfsi->commit_info.list); |
| 1546 | nfsi->npages = 0; | 1545 | nfsi->npages = 0; |
| 1547 | nfsi->commit_info.ncommit = 0; | 1546 | nfsi->commit_info.ncommit = 0; |
| 1547 | atomic_set(&nfsi->commit_info.rpcs_out, 0); | ||
| 1548 | atomic_set(&nfsi->silly_count, 1); | 1548 | atomic_set(&nfsi->silly_count, 1); |
| 1549 | INIT_HLIST_HEAD(&nfsi->silly_list); | 1549 | INIT_HLIST_HEAD(&nfsi->silly_list); |
| 1550 | init_waitqueue_head(&nfsi->waitqueue); | 1550 | init_waitqueue_head(&nfsi->waitqueue); |
| @@ -70,6 +70,10 @@ find_pnfs_driver(u32 id) · 69 unmodified lines | |||
| 70 | 70 | ||
| 71 | spin_lock(&pnfs_spinlock); | 71 | spin_lock(&pnfs_spinlock); |
| 72 | local = find_pnfs_driver_locked(id); | 72 | local = find_pnfs_driver_locked(id); |
| 73 | if (local != NULL && !try_module_get(local->owner)) { | ||
| 74 | dprintk("%s: Could not grab reference on module\n", __func__); | ||
| 75 | local = NULL; | ||
| 76 | } | ||
| 73 | spin_unlock(&pnfs_spinlock); | 77 | spin_unlock(&pnfs_spinlock); |
| 74 | return local; | 78 | return local; |
| 75 | } | 79 | } |
| @@ -80,6 +84,9 @@ unset_pnfs_layoutdriver(struct nfs_server *nfss) · 4 unmodified lines | |||
| 80 | if (nfss->pnfs_curr_ld) { | 84 | if (nfss->pnfs_curr_ld) { |
| 81 | if (nfss->pnfs_curr_ld->clear_layoutdriver) | 85 | if (nfss->pnfs_curr_ld->clear_layoutdriver) |
| 82 | nfss->pnfs_curr_ld->clear_layoutdriver(nfss); | 86 | nfss->pnfs_curr_ld->clear_layoutdriver(nfss); |
| 87 | /* Decrement the MDS count. Purge the deviceid cache if zero */ | ||
| 88 | if (atomic_dec_and_test(&nfss->nfs_client->cl_mds_count)) | ||
| 89 | nfs4_deviceid_purge_client(nfss->nfs_client); | ||
| 83 | module_put(nfss->pnfs_curr_ld->owner); | 90 | module_put(nfss->pnfs_curr_ld->owner); |
| 84 | } | 91 | } |
| 85 | nfss->pnfs_curr_ld = NULL; | 92 | nfss->pnfs_curr_ld = NULL; |
| @@ -115,10 +122,6 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh, · 29 unmodified lines | |||
| 115 | goto out_no_driver; | 122 | goto out_no_driver; |
| 116 | } | 123 | } |
| 117 | } | 124 | } |
| 118 | if (!try_module_get(ld_type->owner)) { | ||
| 119 | dprintk("%s: Could not grab reference on module\n", __func__); | ||
| 120 | goto out_no_driver; | ||
| 121 | } | ||
| 122 | server->pnfs_curr_ld = ld_type; | 125 | server->pnfs_curr_ld = ld_type; |
| 123 | if (ld_type->set_layoutdriver | 126 | if (ld_type->set_layoutdriver |
| 124 | && ld_type->set_layoutdriver(server, mntfh)) { | 127 | && ld_type->set_layoutdriver(server, mntfh)) { |
| @@ -127,6 +130,8 @@ set_pnfs_layoutdriver(struct nfs_server *server, const struct nfs_fh *mntfh, · 2 unmodified lines | |||
| 127 | module_put(ld_type->owner); | 130 | module_put(ld_type->owner); |
| 128 | goto out_no_driver; | 131 | goto out_no_driver; |
| 129 | } | 132 | } |
| 133 | /* Bump the MDS count */ | ||
| 134 | atomic_inc(&server->nfs_client->cl_mds_count); | ||
| 130 | 135 | ||
| 131 | dprintk("%s: pNFS module for %u set\n", __func__, id); | 136 | dprintk("%s: pNFS module for %u set\n", __func__, id); |
| 132 | return; | 137 | return; |
| @@ -191,6 +191,8 @@ void nilfs_remove_all_gcinodes(struct the_nilfs *nilfs) · 190 unmodified lines | |||
| 191 | while (!list_empty(head)) { | 191 | while (!list_empty(head)) { |
| 192 | ii = list_first_entry(head, struct nilfs_inode_info, i_dirty); | 192 | ii = list_first_entry(head, struct nilfs_inode_info, i_dirty); |
| 193 | list_del_init(&ii->i_dirty); | 193 | list_del_init(&ii->i_dirty); |
| 194 | truncate_inode_pages(&ii->vfs_inode.i_data, 0); | ||
| 195 | nilfs_btnode_cache_clear(&ii->i_btnode_cache); | ||
| 194 | iput(&ii->vfs_inode); | 196 | iput(&ii->vfs_inode); |
| 195 | } | 197 | } |
| 196 | } | 198 | } |
| @@ -2309,6 +2309,8 @@ nilfs_remove_written_gcinodes(struct the_nilfs *nilfs, struct list_head *head) · 2308 unmodified lines | |||
| 2309 | if (!test_bit(NILFS_I_UPDATED, &ii->i_state)) | 2309 | if (!test_bit(NILFS_I_UPDATED, &ii->i_state)) |
| 2310 | continue; | 2310 | continue; |
| 2311 | list_del_init(&ii->i_dirty); | 2311 | list_del_init(&ii->i_dirty); |
| 2312 | truncate_inode_pages(&ii->vfs_inode.i_data, 0); | ||
| 2313 | nilfs_btnode_cache_clear(&ii->i_btnode_cache); | ||
| 2312 | iput(&ii->vfs_inode); | 2314 | iput(&ii->vfs_inode); |
| 2313 | } | 2315 | } |
| 2314 | } | 2316 | } |
| @@ -258,7 +258,7 @@ fail: · 257 unmodified lines | |||
| 258 | return rc; | 258 | return rc; |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | int pstore_fill_super(struct super_block *sb, void *data, int silent) | 261 | static int pstore_fill_super(struct super_block *sb, void *data, int silent) |
| 262 | { | 262 | { |
| 263 | struct inode *inode; | 263 | struct inode *inode; |
| 264 | 264 | ||
| @@ -94,20 +94,15 @@ static const char *get_reason_str(enum kmsg_dump_reason reason) · 93 unmodified lines | |||
| 94 | * as we can from the end of the buffer. | 94 | * as we can from the end of the buffer. |
| 95 | */ | 95 | */ |
| 96 | static void pstore_dump(struct kmsg_dumper *dumper, | 96 | static void pstore_dump(struct kmsg_dumper *dumper, |
| 97 | enum kmsg_dump_reason reason, | 97 | enum kmsg_dump_reason reason) |
| 98 | const char *s1, unsigned long l1, | ||
| 99 | const char *s2, unsigned long l2) | ||
| 100 | { | 98 | { |
| 101 | unsigned long s1_start, s2_start; | 99 | unsigned long total = 0; |
| 102 | unsigned long l1_cpy, l2_cpy; | ||
| 103 | unsigned long size, total = 0; | ||
| 104 | char *dst; | ||
| 105 | const char *why; | 100 | const char *why; |
| 106 | u64 id; | 101 | u64 id; |
| 107 | int hsize, ret; | ||
| 108 | unsigned int part = 1; | 102 | unsigned int part = 1; |
| 109 | unsigned long flags = 0; | 103 | unsigned long flags = 0; |
| 110 | int is_locked = 0; | 104 | int is_locked = 0; |
| 105 | int ret; | ||
| 111 | 106 | ||
| 112 | why = get_reason_str(reason); | 107 | why = get_reason_str(reason); |
| 113 | 108 | ||
| @@ -119,30 +114,25 @@ static void pstore_dump(struct kmsg_dumper *dumper, · 5 unmodified lines | |||
| 119 | spin_lock_irqsave(&psinfo->buf_lock, flags); | 114 | spin_lock_irqsave(&psinfo->buf_lock, flags); |
| 120 | oopscount++; | 115 | oopscount++; |
| 121 | while (total < kmsg_bytes) { | 116 | while (total < kmsg_bytes) { |
| 117 | char *dst; | ||
| 118 | unsigned long size; | ||
| 119 | int hsize; | ||
| 120 | size_t len; | ||
| 121 | |||
| 122 | dst = psinfo->buf; | 122 | dst = psinfo->buf; |
| 123 | hsize = sprintf(dst, "%s#%d Part%d\n", why, oopscount, part); | 123 | hsize = sprintf(dst, "%s#%d Part%d\n", why, oopscount, part); |
| 124 | size = psinfo->bufsize - hsize; | 124 | size = psinfo->bufsize - hsize; |
| 125 | dst += hsize; | 125 | dst += hsize; |
| 126 | 126 | ||
| 127 | l2_cpy = min(l2, size); | 127 | if (!kmsg_dump_get_buffer(dumper, true, dst, size, &len)) |
| 128 | l1_cpy = min(l1, size - l2_cpy); | ||
| 129 | |||
| 130 | if (l1_cpy + l2_cpy == 0) | ||
| 131 | break; | 128 | break; |
| 132 | 129 | ||
| 133 | s2_start = l2 - l2_cpy; | ||
| 134 | s1_start = l1 - l1_cpy; | ||
| 135 | |||
| 136 | memcpy(dst, s1 + s1_start, l1_cpy); | ||
| 137 | memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); | ||
| 138 | |||
| 139 | ret = psinfo->write(PSTORE_TYPE_DMESG, reason, &id, part, | 130 | ret = psinfo->write(PSTORE_TYPE_DMESG, reason, &id, part, |
| 140 | hsize + l1_cpy + l2_cpy, psinfo); | 131 | hsize + len, psinfo); |
| 141 | if (ret == 0 && reason == KMSG_DUMP_OOPS && pstore_is_mounted()) | 132 | if (ret == 0 && reason == KMSG_DUMP_OOPS && pstore_is_mounted()) |
| 142 | pstore_new_entry = 1; | 133 | pstore_new_entry = 1; |
| 143 | l1 -= l1_cpy; | 134 | |
| 144 | l2 -= l2_cpy; | 135 | total += hsize + len; |
| 145 | total += l1_cpy + l2_cpy; | ||
| 146 | part++; | 136 | part++; |
| 147 | } | 137 | } |
| 148 | if (in_nmi()) { | 138 | if (in_nmi()) { |
| @@ -106,6 +106,8 @@ static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type, · 105 unmodified lines | |||
| 106 | time->tv_sec = 0; | 106 | time->tv_sec = 0; |
| 107 | time->tv_nsec = 0; | 107 | time->tv_nsec = 0; |
| 108 | 108 | ||
| 109 | /* Update old/shadowed buffer. */ | ||
| 110 | persistent_ram_save_old(prz); | ||
| 109 | size = persistent_ram_old_size(prz); | 111 | size = persistent_ram_old_size(prz); |
| 110 | *buf = kmalloc(size, GFP_KERNEL); | 112 | *buf = kmalloc(size, GFP_KERNEL); |
| 111 | if (*buf == NULL) | 113 | if (*buf == NULL) |
| @@ -184,6 +186,7 @@ static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, · 72 unmodified lines | |||
| 184 | return -EINVAL; | 186 | return -EINVAL; |
| 185 | 187 | ||
| 186 | persistent_ram_free_old(cxt->przs[id]); | 188 | persistent_ram_free_old(cxt->przs[id]); |
| 189 | persistent_ram_zap(cxt->przs[id]); | ||
| 187 | 190 | ||
| 188 | return 0; | 191 | return 0; |
| 189 | } | 192 | } |
| @@ -250,23 +250,24 @@ static void notrace persistent_ram_update(struct persistent_ram_zone *prz, · 249 unmodified lines | |||
| 250 | persistent_ram_update_ecc(prz, start, count); | 250 | persistent_ram_update_ecc(prz, start, count); |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | static void __init | 253 | void persistent_ram_save_old(struct persistent_ram_zone *prz) |
| 254 | persistent_ram_save_old(struct persistent_ram_zone *prz) | ||
| 255 | { | 254 | { |
| 256 | struct persistent_ram_buffer *buffer = prz->buffer; | 255 | struct persistent_ram_buffer *buffer = prz->buffer; |
| 257 | size_t size = buffer_size(prz); | 256 | size_t size = buffer_size(prz); |
| 258 | size_t start = buffer_start(prz); | 257 | size_t start = buffer_start(prz); |
| 259 | char *dest; | ||
| 260 | 258 | ||
| 261 | persistent_ram_ecc_old(prz); | 259 | if (!size) |
| 260 | return; | ||
| 262 | 261 | ||
| 263 | dest = kmalloc(size, GFP_KERNEL); | 262 | if (!prz->old_log) { |
| 264 | if (dest == NULL) { | 263 | persistent_ram_ecc_old(prz); |
| 264 | prz->old_log = kmalloc(size, GFP_KERNEL); | ||
| 265 | } | ||
| 266 | if (!prz->old_log) { | ||
| 265 | pr_err("persistent_ram: failed to allocate buffer\n"); | 267 | pr_err("persistent_ram: failed to allocate buffer\n"); |
| 266 | return; | 268 | return; |
| 267 | } | 269 | } |
| 268 | 270 | ||
| 269 | prz->old_log = dest; | ||
| 270 | prz->old_log_size = size; | 271 | prz->old_log_size = size; |
| 271 | memcpy(prz->old_log, &buffer->data[start], size - start); | 272 | memcpy(prz->old_log, &buffer->data[start], size - start); |
| 272 | memcpy(prz->old_log + size - start, &buffer->data[0], start); | 273 | memcpy(prz->old_log + size - start, &buffer->data[0], start); |
| @@ -319,6 +320,13 @@ void persistent_ram_free_old(struct persistent_ram_zone *prz) · 46 unmodified lines | |||
| 319 | prz->old_log_size = 0; | 320 | prz->old_log_size = 0; |
| 320 | } | 321 | } |
| 321 | 322 | ||
| 323 | void persistent_ram_zap(struct persistent_ram_zone *prz) | ||
| 324 | { | ||
| 325 | atomic_set(&prz->buffer->start, 0); | ||
| 326 | atomic_set(&prz->buffer->size, 0); | ||
| 327 | persistent_ram_update_header_ecc(prz); | ||
| 328 | } | ||
| 329 | |||
| 322 | static void *persistent_ram_vmap(phys_addr_t start, size_t size) | 330 | static void *persistent_ram_vmap(phys_addr_t start, size_t size) |
| 323 | { | 331 | { |
| 324 | struct page **pages; | 332 | struct page **pages; |
| @@ -405,6 +413,7 @@ static int __init persistent_ram_post_init(struct persistent_ram_zone *prz, bool · 80 unmodified lines | |||
| 405 | " size %zu, start %zu\n", | 413 | " size %zu, start %zu\n", |
| 406 | buffer_size(prz), buffer_start(prz)); | 414 | buffer_size(prz), buffer_start(prz)); |
| 407 | persistent_ram_save_old(prz); | 415 | persistent_ram_save_old(prz); |
| 416 | return 0; | ||
| 408 | } | 417 | } |
| 409 | } else { | 418 | } else { |
| 410 | pr_info("persistent_ram: no valid data in buffer" | 419 | pr_info("persistent_ram: no valid data in buffer" |
| @@ -412,8 +421,7 @@ static int __init persistent_ram_post_init(struct persistent_ram_zone *prz, bool · 1 unmodified line | |||
| 412 | } | 421 | } |
| 413 | 422 | ||
| 414 | prz->buffer->sig = PERSISTENT_RAM_SIG; | 423 | prz->buffer->sig = PERSISTENT_RAM_SIG; |
| 415 | atomic_set(&prz->buffer->start, 0); | 424 | persistent_ram_zap(prz); |
| 416 | atomic_set(&prz->buffer->size, 0); | ||
| 417 | 425 | ||
| 418 | return 0; | 426 | return 0; |
| 419 | } | 427 | } |
| @@ -448,7 +456,6 @@ struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start, · 28 unmodified lines | |||
| 448 | goto err; | 456 | goto err; |
| 449 | 457 | ||
| 450 | persistent_ram_post_init(prz, ecc); | 458 | persistent_ram_post_init(prz, ecc); |
| 451 | persistent_ram_update_header_ecc(prz); | ||
| 452 | 459 | ||
| 453 | return prz; | 460 | return prz; |
| 454 | err: | 461 | err: |
| @@ -1080,6 +1080,7 @@ restart: · 1079 unmodified lines | |||
| 1080 | goto restart; | 1080 | goto restart; |
| 1081 | } | 1081 | } |
| 1082 | 1082 | ||
| 1083 | xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR); | ||
| 1083 | trace_xfs_alloc_size_neither(args); | 1084 | trace_xfs_alloc_size_neither(args); |
| 1084 | args->agbno = NULLAGBLOCK; | 1085 | args->agbno = NULLAGBLOCK; |
| 1085 | return 0; | 1086 | return 0; |
| @@ -2441,7 +2442,7 @@ xfs_alloc_vextent( · 1355 unmodified lines | |||
| 2441 | DECLARE_COMPLETION_ONSTACK(done); | 2442 | DECLARE_COMPLETION_ONSTACK(done); |
| 2442 | 2443 | ||
| 2443 | args->done = &done; | 2444 | args->done = &done; |
| 2444 | INIT_WORK(&args->work, xfs_alloc_vextent_worker); | 2445 | INIT_WORK_ONSTACK(&args->work, xfs_alloc_vextent_worker); |
| 2445 | queue_work(xfs_alloc_wq, &args->work); | 2446 | queue_work(xfs_alloc_wq, &args->work); |
| 2446 | wait_for_completion(&done); | 2447 | wait_for_completion(&done); |
| 2447 | return args->result; | 2448 | return args->result; |
| @@ -981,10 +981,15 @@ xfs_vm_writepage( · 980 unmodified lines | |||
| 981 | imap_valid = 0; | 981 | imap_valid = 0; |
| 982 | } | 982 | } |
| 983 | } else { | 983 | } else { |
| 984 | if (PageUptodate(page)) { | 984 | if (PageUptodate(page)) |
| 985 | ASSERT(buffer_mapped(bh)); | 985 | ASSERT(buffer_mapped(bh)); |
| 986 | imap_valid = 0; | 986 | /* |
| 987 | } | 987 | * This buffer is not uptodate and will not be |
| 988 | * written to disk. Ensure that we will put any | ||
| 989 | * subsequent writeable buffers into a new | ||
| 990 | * ioend. | ||
| 991 | */ | ||
| 992 | imap_valid = 0; | ||
| 988 | continue; | 993 | continue; |
| 989 | } | 994 | } |
| 990 | 995 | ||
| @@ -201,14 +201,7 @@ xfs_buf_alloc( · 200 unmodified lines | |||
| 201 | bp->b_length = numblks; | 201 | bp->b_length = numblks; |
| 202 | bp->b_io_length = numblks; | 202 | bp->b_io_length = numblks; |
| 203 | bp->b_flags = flags; | 203 | bp->b_flags = flags; |
| 204 | 204 | bp->b_bn = blkno; | |
| 205 | /* | ||
| 206 | * We do not set the block number here in the buffer because we have not | ||
| 207 | * finished initialising the buffer. We insert the buffer into the cache | ||
| 208 | * in this state, so this ensures that we are unable to do IO on a | ||
| 209 | * buffer that hasn't been fully initialised. | ||
| 210 | */ | ||
| 211 | bp->b_bn = XFS_BUF_DADDR_NULL; | ||
| 212 | atomic_set(&bp->b_pin_count, 0); | 205 | atomic_set(&bp->b_pin_count, 0); |
| 213 | init_waitqueue_head(&bp->b_waiters); | 206 | init_waitqueue_head(&bp->b_waiters); |
| 214 | 207 | ||
| @@ -567,11 +560,6 @@ xfs_buf_get( · 352 unmodified lines | |||
| 567 | if (bp != new_bp) | 560 | if (bp != new_bp) |
| 568 | xfs_buf_free(new_bp); | 561 | xfs_buf_free(new_bp); |
| 569 | 562 | ||
| 570 | /* | ||
| 571 | * Now we have a workable buffer, fill in the block number so | ||
| 572 | * that we can do IO on it. | ||
| 573 | */ | ||
| 574 | bp->b_bn = blkno; | ||
| 575 | bp->b_io_length = bp->b_length; | 563 | bp->b_io_length = bp->b_length; |
| 576 | 564 | ||
| 577 | found: | 565 | found: |
| @@ -772,7 +760,7 @@ xfs_buf_get_uncached( · 194 unmodified lines | |||
| 772 | int error, i; | 760 | int error, i; |
| 773 | xfs_buf_t *bp; | 761 | xfs_buf_t *bp; |
| 774 | 762 | ||
| 775 | bp = xfs_buf_alloc(target, 0, numblks, 0); | 763 | bp = xfs_buf_alloc(target, XFS_BUF_DADDR_NULL, numblks, 0); |
| 776 | if (unlikely(bp == NULL)) | 764 | if (unlikely(bp == NULL)) |
| 777 | goto fail; | 765 | goto fail; |
| 778 | 766 | ||
| @@ -504,6 +504,14 @@ xfs_inode_item_push( · 503 unmodified lines | |||
| 504 | goto out_unlock; | 504 | goto out_unlock; |
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | /* | ||
| 508 | * Stale inode items should force out the iclog. | ||
| 509 | */ | ||
| 510 | if (ip->i_flags & XFS_ISTALE) { | ||
| 511 | rval = XFS_ITEM_PINNED; | ||
| 512 | goto out_unlock; | ||
| 513 | } | ||
| 514 | |||
| 507 | /* | 515 | /* |
| 508 | * Someone else is already flushing the inode. Nothing we can do | 516 | * Someone else is already flushing the inode. Nothing we can do |
| 509 | * here but wait for the flush to finish and remove the item from | 517 | * here but wait for the flush to finish and remove the item from |
| @@ -514,15 +522,6 @@ xfs_inode_item_push( · 4 unmodified lines | |||
| 514 | goto out_unlock; | 522 | goto out_unlock; |
| 515 | } | 523 | } |
| 516 | 524 | ||
| 517 | /* | ||
| 518 | * Stale inode items should force out the iclog. | ||
| 519 | */ | ||
| 520 | if (ip->i_flags & XFS_ISTALE) { | ||
| 521 | xfs_ifunlock(ip); | ||
| 522 | xfs_iunlock(ip, XFS_ILOCK_SHARED); | ||
| 523 | return XFS_ITEM_PINNED; | ||
| 524 | } | ||
| 525 | |||
| 526 | ASSERT(iip->ili_fields != 0 || XFS_FORCED_SHUTDOWN(ip->i_mount)); | 525 | ASSERT(iip->ili_fields != 0 || XFS_FORCED_SHUTDOWN(ip->i_mount)); |
| 527 | ASSERT(iip->ili_logged == 0 || XFS_FORCED_SHUTDOWN(ip->i_mount)); | 526 | ASSERT(iip->ili_logged == 0 || XFS_FORCED_SHUTDOWN(ip->i_mount)); |
| 528 | 527 | ||
| @@ -38,13 +38,21 @@ · 37 unmodified lines | |||
| 38 | kmem_zone_t *xfs_log_ticket_zone; | 38 | kmem_zone_t *xfs_log_ticket_zone; |
| 39 | 39 | ||
| 40 | /* Local miscellaneous function prototypes */ | 40 | /* Local miscellaneous function prototypes */ |
| 41 | STATIC int xlog_commit_record(struct log *log, struct xlog_ticket *ticket, | 41 | STATIC int |
| 42 | xlog_in_core_t **, xfs_lsn_t *); | 42 | xlog_commit_record( |
| 43 | struct xlog *log, | ||
| 44 | struct xlog_ticket *ticket, | ||
| 45 | struct xlog_in_core **iclog, | ||
| 46 | xfs_lsn_t *commitlsnp); | ||
| 47 | |||
| 43 | STATIC xlog_t * xlog_alloc_log(xfs_mount_t *mp, | 48 | STATIC xlog_t * xlog_alloc_log(xfs_mount_t *mp, |
| 44 | xfs_buftarg_t *log_target, | 49 | xfs_buftarg_t *log_target, |
| 45 | xfs_daddr_t blk_offset, | 50 | xfs_daddr_t blk_offset, |
| 46 | int num_bblks); | 51 | int num_bblks); |
| 47 | STATIC int xlog_space_left(struct log *log, atomic64_t *head); | 52 | STATIC int |
| 53 | xlog_space_left( | ||
| 54 | struct xlog *log, | ||
| 55 | atomic64_t *head); | ||
| 48 | STATIC int xlog_sync(xlog_t *log, xlog_in_core_t *iclog); | 56 | STATIC int xlog_sync(xlog_t *log, xlog_in_core_t *iclog); |
| 49 | STATIC void xlog_dealloc_log(xlog_t *log); | 57 | STATIC void xlog_dealloc_log(xlog_t *log); |
| 50 | 58 | ||
| @@ -64,8 +72,10 @@ STATIC void xlog_state_switch_iclogs(xlog_t *log, · 13 unmodified lines | |||
| 64 | int eventual_size); | 72 | int eventual_size); |
| 65 | STATIC void xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog); | 73 | STATIC void xlog_state_want_sync(xlog_t *log, xlog_in_core_t *iclog); |
| 66 | 74 | ||
| 67 | STATIC void xlog_grant_push_ail(struct log *log, | 75 | STATIC void |
| 68 | int need_bytes); | 76 | xlog_grant_push_ail( |
| 77 | struct xlog *log, | ||
| 78 | int need_bytes); | ||
| 69 | STATIC void xlog_regrant_reserve_log_space(xlog_t *log, | 79 | STATIC void xlog_regrant_reserve_log_space(xlog_t *log, |
| 70 | xlog_ticket_t *ticket); | 80 | xlog_ticket_t *ticket); |
| 71 | STATIC void xlog_ungrant_log_space(xlog_t *log, | 81 | STATIC void xlog_ungrant_log_space(xlog_t *log, |
| @@ -73,7 +83,9 @@ STATIC void xlog_ungrant_log_space(xlog_t *log, · 1 unmodified line | |||
| 73 | 83 | ||
| 74 | #if defined(DEBUG) | 84 | #if defined(DEBUG) |
| 75 | STATIC void xlog_verify_dest_ptr(xlog_t *log, char *ptr); | 85 | STATIC void xlog_verify_dest_ptr(xlog_t *log, char *ptr); |
| 76 | STATIC void xlog_verify_grant_tail(struct log *log); | 86 | STATIC void |
| 87 | xlog_verify_grant_tail( | ||
| 88 | struct xlog *log); | ||
| 77 | STATIC void xlog_verify_iclog(xlog_t *log, xlog_in_core_t *iclog, | 89 | STATIC void xlog_verify_iclog(xlog_t *log, xlog_in_core_t *iclog, |
| 78 | int count, boolean_t syncing); | 90 | int count, boolean_t syncing); |
| 79 | STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog, | 91 | STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog, |
| @@ -89,9 +101,9 @@ STATIC int xlog_iclogs_empty(xlog_t *log); · 9 unmodified lines | |||
| 89 | 101 | ||
| 90 | static void | 102 | static void |
| 91 | xlog_grant_sub_space( | 103 | xlog_grant_sub_space( |
| 92 | struct log *log, | 104 | struct xlog *log, |
| 93 | atomic64_t *head, | 105 | atomic64_t *head, |
| 94 | int bytes) | 106 | int bytes) |
| 95 | { | 107 | { |
| 96 | int64_t head_val = atomic64_read(head); | 108 | int64_t head_val = atomic64_read(head); |
| 97 | int64_t new, old; | 109 | int64_t new, old; |
| @@ -115,9 +127,9 @@ xlog_grant_sub_space( · 17 unmodified lines | |||
| 115 | 127 | ||
| 116 | static void | 128 | static void |
| 117 | xlog_grant_add_space( | 129 | xlog_grant_add_space( |
| 118 | struct log *log, | 130 | struct xlog *log, |
| 119 | atomic64_t *head, | 131 | atomic64_t *head, |
| 120 | int bytes) | 132 | int bytes) |
| 121 | { | 133 | { |
| 122 | int64_t head_val = atomic64_read(head); | 134 | int64_t head_val = atomic64_read(head); |
| 123 | int64_t new, old; | 135 | int64_t new, old; |
| @@ -165,7 +177,7 @@ xlog_grant_head_wake_all( · 41 unmodified lines | |||
| 165 | 177 | ||
| 166 | static inline int | 178 | static inline int |
| 167 | xlog_ticket_reservation( | 179 | xlog_ticket_reservation( |
| 168 | struct log *log, | 180 | struct xlog *log, |
| 169 | struct xlog_grant_head *head, | 181 | struct xlog_grant_head *head, |
| 170 | struct xlog_ticket *tic) | 182 | struct xlog_ticket *tic) |
| 171 | { | 183 | { |
| @@ -182,7 +194,7 @@ xlog_ticket_reservation( · 10 unmodified lines | |||
| 182 | 194 | ||
| 183 | STATIC bool | 195 | STATIC bool |
| 184 | xlog_grant_head_wake( | 196 | xlog_grant_head_wake( |
| 185 | struct log *log, | 197 | struct xlog *log, |
| 186 | struct xlog_grant_head *head, | 198 | struct xlog_grant_head *head, |
| 187 | int *free_bytes) | 199 | int *free_bytes) |
| 188 | { | 200 | { |
| @@ -204,7 +216,7 @@ xlog_grant_head_wake( · 15 unmodified lines | |||
| 204 | 216 | ||
| 205 | STATIC int | 217 | STATIC int |
| 206 | xlog_grant_head_wait( | 218 | xlog_grant_head_wait( |
| 207 | struct log *log, | 219 | struct xlog *log, |
| 208 | struct xlog_grant_head *head, | 220 | struct xlog_grant_head *head, |
| 209 | struct xlog_ticket *tic, | 221 | struct xlog_ticket *tic, |
| 210 | int need_bytes) | 222 | int need_bytes) |
| @@ -256,7 +268,7 @@ shutdown: · 45 unmodified lines | |||
| 256 | */ | 268 | */ |
| 257 | STATIC int | 269 | STATIC int |
| 258 | xlog_grant_head_check( | 270 | xlog_grant_head_check( |
| 259 | struct log *log, | 271 | struct xlog *log, |
| 260 | struct xlog_grant_head *head, | 272 | struct xlog_grant_head *head, |
| 261 | struct xlog_ticket *tic, | 273 | struct xlog_ticket *tic, |
| 262 | int *need_bytes) | 274 | int *need_bytes) |
| @@ -323,7 +335,7 @@ xfs_log_regrant( · 60 unmodified lines | |||
| 323 | struct xfs_mount *mp, | 335 | struct xfs_mount *mp, |
| 324 | struct xlog_ticket *tic) | 336 | struct xlog_ticket *tic) |
| 325 | { | 337 | { |
| 326 | struct log *log = mp->m_log; | 338 | struct xlog *log = mp->m_log; |
| 327 | int need_bytes; | 339 | int need_bytes; |
| 328 | int error = 0; | 340 | int error = 0; |
| 329 | 341 | ||
| @@ -389,7 +401,7 @@ xfs_log_reserve( · 59 unmodified lines | |||
| 389 | bool permanent, | 401 | bool permanent, |
| 390 | uint t_type) | 402 | uint t_type) |
| 391 | { | 403 | { |
| 392 | struct log *log = mp->m_log; | 404 | struct xlog *log = mp->m_log; |
| 393 | struct xlog_ticket *tic; | 405 | struct xlog_ticket *tic; |
| 394 | int need_bytes; | 406 | int need_bytes; |
| 395 | int error = 0; | 407 | int error = 0; |
| @@ -465,7 +477,7 @@ xfs_log_done( · 69 unmodified lines | |||
| 465 | struct xlog_in_core **iclog, | 477 | struct xlog_in_core **iclog, |
| 466 | uint flags) | 478 | uint flags) |
| 467 | { | 479 | { |
| 468 | struct log *log = mp->m_log; | 480 | struct xlog *log = mp->m_log; |
| 469 | xfs_lsn_t lsn = 0; | 481 | xfs_lsn_t lsn = 0; |
| 470 | 482 | ||
| 471 | if (XLOG_FORCED_SHUTDOWN(log) || | 483 | if (XLOG_FORCED_SHUTDOWN(log) || |
| @@ -810,6 +822,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) · 338 unmodified lines | |||
| 810 | void | 822 | void |
| 811 | xfs_log_unmount(xfs_mount_t *mp) | 823 | xfs_log_unmount(xfs_mount_t *mp) |
| 812 | { | 824 | { |
| 825 | cancel_delayed_work_sync(&mp->m_sync_work); | ||
| 813 | xfs_trans_ail_destroy(mp); | 826 | xfs_trans_ail_destroy(mp); |
| 814 | xlog_dealloc_log(mp->m_log); | 827 | xlog_dealloc_log(mp->m_log); |
| 815 | } | 828 | } |
| @@ -838,7 +851,7 @@ void · 22 unmodified lines | |||
| 838 | xfs_log_space_wake( | 851 | xfs_log_space_wake( |
| 839 | struct xfs_mount *mp) | 852 | struct xfs_mount *mp) |
| 840 | { | 853 | { |
| 841 | struct log *log = mp->m_log; | 854 | struct xlog *log = mp->m_log; |
| 842 | int free_bytes; | 855 | int free_bytes; |
| 843 | 856 | ||
| 844 | if (XLOG_FORCED_SHUTDOWN(log)) | 857 | if (XLOG_FORCED_SHUTDOWN(log)) |
| @@ -916,7 +929,7 @@ xfs_lsn_t · 71 unmodified lines | |||
| 916 | xlog_assign_tail_lsn_locked( | 929 | xlog_assign_tail_lsn_locked( |
| 917 | struct xfs_mount *mp) | 930 | struct xfs_mount *mp) |
| 918 | { | 931 | { |
| 919 | struct log *log = mp->m_log; | 932 | struct xlog *log = mp->m_log; |
| 920 | struct xfs_log_item *lip; | 933 | struct xfs_log_item *lip; |
| 921 | xfs_lsn_t tail_lsn; | 934 | xfs_lsn_t tail_lsn; |
| 922 | 935 | ||
| @@ -965,7 +978,7 @@ xlog_assign_tail_lsn( · 42 unmodified lines | |||
| 965 | */ | 978 | */ |
| 966 | STATIC int | 979 | STATIC int |
| 967 | xlog_space_left( | 980 | xlog_space_left( |
| 968 | struct log *log, | 981 | struct xlog *log, |
| 969 | atomic64_t *head) | 982 | atomic64_t *head) |
| 970 | { | 983 | { |
| 971 | int free_bytes; | 984 | int free_bytes; |
| @@ -1277,7 +1290,7 @@ out: · 305 unmodified lines | |||
| 1277 | */ | 1290 | */ |
| 1278 | STATIC int | 1291 | STATIC int |
| 1279 | xlog_commit_record( | 1292 | xlog_commit_record( |
| 1280 | struct log *log, | 1293 | struct xlog *log, |
| 1281 | struct xlog_ticket *ticket, | 1294 | struct xlog_ticket *ticket, |
| 1282 | struct xlog_in_core **iclog, | 1295 | struct xlog_in_core **iclog, |
| 1283 | xfs_lsn_t *commitlsnp) | 1296 | xfs_lsn_t *commitlsnp) |
| @@ -1311,7 +1324,7 @@ xlog_commit_record( · 27 unmodified lines | |||
| 1311 | */ | 1324 | */ |
| 1312 | STATIC void | 1325 | STATIC void |
| 1313 | xlog_grant_push_ail( | 1326 | xlog_grant_push_ail( |
| 1314 | struct log *log, | 1327 | struct xlog *log, |
| 1315 | int need_bytes) | 1328 | int need_bytes) |
| 1316 | { | 1329 | { |
| 1317 | xfs_lsn_t threshold_lsn = 0; | 1330 | xfs_lsn_t threshold_lsn = 0; |
| @@ -1790,7 +1803,7 @@ xlog_write_start_rec( · 472 unmodified lines | |||
| 1790 | 1803 | ||
| 1791 | static xlog_op_header_t * | 1804 | static xlog_op_header_t * |
| 1792 | xlog_write_setup_ophdr( | 1805 | xlog_write_setup_ophdr( |
| 1793 | struct log *log, | 1806 | struct xlog *log, |
| 1794 | struct xlog_op_header *ophdr, | 1807 | struct xlog_op_header *ophdr, |
| 1795 | struct xlog_ticket *ticket, | 1808 | struct xlog_ticket *ticket, |
| 1796 | uint flags) | 1809 | uint flags) |
| @@ -1873,7 +1886,7 @@ xlog_write_setup_copy( · 76 unmodified lines | |||
| 1873 | 1886 | ||
| 1874 | static int | 1887 | static int |
| 1875 | xlog_write_copy_finish( | 1888 | xlog_write_copy_finish( |
| 1876 | struct log *log, | 1889 | struct xlog *log, |
| 1877 | struct xlog_in_core *iclog, | 1890 | struct xlog_in_core *iclog, |
| 1878 | uint flags, | 1891 | uint flags, |
| 1879 | int *record_cnt, | 1892 | int *record_cnt, |
| @@ -1958,7 +1971,7 @@ xlog_write_copy_finish( · 78 unmodified lines | |||
| 1958 | */ | 1971 | */ |
| 1959 | int | 1972 | int |
| 1960 | xlog_write( | 1973 | xlog_write( |
| 1961 | struct log *log, | 1974 | struct xlog *log, |
| 1962 | struct xfs_log_vec *log_vector, | 1975 | struct xfs_log_vec *log_vector, |
| 1963 | struct xlog_ticket *ticket, | 1976 | struct xlog_ticket *ticket, |
| 1964 | xfs_lsn_t *start_lsn, | 1977 | xfs_lsn_t *start_lsn, |
| @@ -2821,7 +2834,7 @@ _xfs_log_force( · 856 unmodified lines | |||
| 2821 | uint flags, | 2834 | uint flags, |
| 2822 | int *log_flushed) | 2835 | int *log_flushed) |
| 2823 | { | 2836 | { |
| 2824 | struct log *log = mp->m_log; | 2837 | struct xlog *log = mp->m_log; |
| 2825 | struct xlog_in_core *iclog; | 2838 | struct xlog_in_core *iclog; |
| 2826 | xfs_lsn_t lsn; | 2839 | xfs_lsn_t lsn; |
| 2827 | 2840 | ||
| @@ -2969,7 +2982,7 @@ _xfs_log_force_lsn( · 141 unmodified lines | |||
| 2969 | uint flags, | 2982 | uint flags, |
| 2970 | int *log_flushed) | 2983 | int *log_flushed) |
| 2971 | { | 2984 | { |
| 2972 | struct log *log = mp->m_log; | 2985 | struct xlog *log = mp->m_log; |
| 2973 | struct xlog_in_core *iclog; | 2986 | struct xlog_in_core *iclog; |
| 2974 | int already_slept = 0; | 2987 | int already_slept = 0; |
| 2975 | 2988 | ||
| @@ -3147,7 +3160,7 @@ xfs_log_ticket_get( · 171 unmodified lines | |||
| 3147 | */ | 3160 | */ |
| 3148 | xlog_ticket_t * | 3161 | xlog_ticket_t * |
| 3149 | xlog_ticket_alloc( | 3162 | xlog_ticket_alloc( |
| 3150 | struct log *log, | 3163 | struct xlog *log, |
| 3151 | int unit_bytes, | 3164 | int unit_bytes, |
| 3152 | int cnt, | 3165 | int cnt, |
| 3153 | char client, | 3166 | char client, |
| @@ -3278,7 +3291,7 @@ xlog_ticket_alloc( · 124 unmodified lines | |||
| 3278 | */ | 3291 | */ |
| 3279 | void | 3292 | void |
| 3280 | xlog_verify_dest_ptr( | 3293 | xlog_verify_dest_ptr( |
| 3281 | struct log *log, | 3294 | struct xlog *log, |
| 3282 | char *ptr) | 3295 | char *ptr) |
| 3283 | { | 3296 | { |
| 3284 | int i; | 3297 | int i; |
| @@ -3307,7 +3320,7 @@ xlog_verify_dest_ptr( · 22 unmodified lines | |||
| 3307 | */ | 3320 | */ |
| 3308 | STATIC void | 3321 | STATIC void |
| 3309 | xlog_verify_grant_tail( | 3322 | xlog_verify_grant_tail( |
| 3310 | struct log *log) | 3323 | struct xlog *log) |
| 3311 | { | 3324 | { |
| 3312 | int tail_cycle, tail_blocks; | 3325 | int tail_cycle, tail_blocks; |
| 3313 | int cycle, space; | 3326 | int cycle, space; |
| @@ -44,7 +44,7 @@ · 43 unmodified lines | |||
| 44 | */ | 44 | */ |
| 45 | static struct xlog_ticket * | 45 | static struct xlog_ticket * |
| 46 | xlog_cil_ticket_alloc( | 46 | xlog_cil_ticket_alloc( |
| 47 | struct log *log) | 47 | struct xlog *log) |
| 48 | { | 48 | { |
| 49 | struct xlog_ticket *tic; | 49 | struct xlog_ticket *tic; |
| 50 | 50 | ||
| @@ -72,7 +72,7 @@ xlog_cil_ticket_alloc( · 21 unmodified lines | |||
| 72 | */ | 72 | */ |
| 73 | void | 73 | void |
| 74 | xlog_cil_init_post_recovery( | 74 | xlog_cil_init_post_recovery( |
| 75 | struct log *log) | 75 | struct xlog *log) |
| 76 | { | 76 | { |
| 77 | log->l_cilp->xc_ctx->ticket = xlog_cil_ticket_alloc(log); | 77 | log->l_cilp->xc_ctx->ticket = xlog_cil_ticket_alloc(log); |
| 78 | log->l_cilp->xc_ctx->sequence = 1; | 78 | log->l_cilp->xc_ctx->sequence = 1; |
| @@ -182,7 +182,7 @@ xlog_cil_prepare_log_vecs( · 103 unmodified lines | |||
| 182 | */ | 182 | */ |
| 183 | STATIC void | 183 | STATIC void |
| 184 | xfs_cil_prepare_item( | 184 | xfs_cil_prepare_item( |
| 185 | struct log *log, | 185 | struct xlog *log, |
| 186 | struct xfs_log_vec *lv, | 186 | struct xfs_log_vec *lv, |
| 187 | int *len, | 187 | int *len, |
| 188 | int *diff_iovecs) | 188 | int *diff_iovecs) |
| @@ -231,7 +231,7 @@ xfs_cil_prepare_item( · 42 unmodified lines | |||
| 231 | */ | 231 | */ |
| 232 | static void | 232 | static void |
| 233 | xlog_cil_insert_items( | 233 | xlog_cil_insert_items( |
| 234 | struct log *log, | 234 | struct xlog *log, |
| 235 | struct xfs_log_vec *log_vector, | 235 | struct xfs_log_vec *log_vector, |
| 236 | struct xlog_ticket *ticket) | 236 | struct xlog_ticket *ticket) |
| 237 | { | 237 | { |
| @@ -373,7 +373,7 @@ xlog_cil_committed( · 135 unmodified lines | |||
| 373 | */ | 373 | */ |
| 374 | STATIC int | 374 | STATIC int |
| 375 | xlog_cil_push( | 375 | xlog_cil_push( |
| 376 | struct log *log) | 376 | struct xlog *log) |
| 377 | { | 377 | { |
| 378 | struct xfs_cil *cil = log->l_cilp; | 378 | struct xfs_cil *cil = log->l_cilp; |
| 379 | struct xfs_log_vec *lv; | 379 | struct xfs_log_vec *lv; |
| @@ -601,7 +601,7 @@ xlog_cil_push_work( · 221 unmodified lines | |||
| 601 | */ | 601 | */ |
| 602 | static void | 602 | static void |
| 603 | xlog_cil_push_background( | 603 | xlog_cil_push_background( |
| 604 | struct log *log) | 604 | struct xlog *log) |
| 605 | { | 605 | { |
| 606 | struct xfs_cil *cil = log->l_cilp; | 606 | struct xfs_cil *cil = log->l_cilp; |
| 607 | 607 | ||
| @@ -629,7 +629,7 @@ xlog_cil_push_background( · 21 unmodified lines | |||
| 629 | 629 | ||
| 630 | static void | 630 | static void |
| 631 | xlog_cil_push_foreground( | 631 | xlog_cil_push_foreground( |
| 632 | struct log *log, | 632 | struct xlog *log, |
| 633 | xfs_lsn_t push_seq) | 633 | xfs_lsn_t push_seq) |
| 634 | { | 634 | { |
| 635 | struct xfs_cil *cil = log->l_cilp; | 635 | struct xfs_cil *cil = log->l_cilp; |
| @@ -683,7 +683,7 @@ xfs_log_commit_cil( · 47 unmodified lines | |||
| 683 | xfs_lsn_t *commit_lsn, | 683 | xfs_lsn_t *commit_lsn, |
| 684 | int flags) | 684 | int flags) |
| 685 | { | 685 | { |
| 686 | struct log *log = mp->m_log; | 686 | struct xlog *log = mp->m_log; |
| 687 | int log_flags = 0; | 687 | int log_flags = 0; |
| 688 | struct xfs_log_vec *log_vector; | 688 | struct xfs_log_vec *log_vector; |
| 689 | 689 | ||
| @@ -754,7 +754,7 @@ xfs_log_commit_cil( · 64 unmodified lines | |||
| 754 | */ | 754 | */ |
| 755 | xfs_lsn_t | 755 | xfs_lsn_t |
| 756 | xlog_cil_force_lsn( | 756 | xlog_cil_force_lsn( |
| 757 | struct log *log, | 757 | struct xlog *log, |
| 758 | xfs_lsn_t sequence) | 758 | xfs_lsn_t sequence) |
| 759 | { | 759 | { |
| 760 | struct xfs_cil *cil = log->l_cilp; | 760 | struct xfs_cil *cil = log->l_cilp; |
| @@ -833,7 +833,7 @@ xfs_log_item_in_current_chkpt( · 72 unmodified lines | |||
| 833 | */ | 833 | */ |
| 834 | int | 834 | int |
| 835 | xlog_cil_init( | 835 | xlog_cil_init( |
| 836 | struct log *log) | 836 | struct xlog *log) |
| 837 | { | 837 | { |
| 838 | struct xfs_cil *cil; | 838 | struct xfs_cil *cil; |
| 839 | struct xfs_cil_ctx *ctx; | 839 | struct xfs_cil_ctx *ctx; |
| @@ -869,7 +869,7 @@ xlog_cil_init( · 29 unmodified lines | |||
| 869 | 869 | ||
| 870 | void | 870 | void |
| 871 | xlog_cil_destroy( | 871 | xlog_cil_destroy( |
| 872 | struct log *log) | 872 | struct xlog *log) |
| 873 | { | 873 | { |
| 874 | if (log->l_cilp->xc_ctx) { | 874 | if (log->l_cilp->xc_ctx) { |
| 875 | if (log->l_cilp->xc_ctx->ticket) | 875 | if (log->l_cilp->xc_ctx->ticket) |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | |||
| 19 | #define __XFS_LOG_PRIV_H__ | 19 | #define __XFS_LOG_PRIV_H__ |
| 20 | 20 | ||
| 21 | struct xfs_buf; | 21 | struct xfs_buf; |
| 22 | struct log; | 22 | struct xlog; |
| 23 | struct xlog_ticket; | 23 | struct xlog_ticket; |
| 24 | struct xfs_mount; | 24 | struct xfs_mount; |
| 25 | 25 | ||
| @@ -352,7 +352,7 @@ typedef struct xlog_in_core { · 326 unmodified lines | |||
| 352 | struct xlog_in_core *ic_next; | 352 | struct xlog_in_core *ic_next; |
| 353 | struct xlog_in_core *ic_prev; | 353 | struct xlog_in_core *ic_prev; |
| 354 | struct xfs_buf *ic_bp; | 354 | struct xfs_buf *ic_bp; |
| 355 | struct log *ic_log; | 355 | struct xlog *ic_log; |
| 356 | int ic_size; | 356 | int ic_size; |
| 357 | int ic_offset; | 357 | int ic_offset; |
| 358 | int ic_bwritecnt; | 358 | int ic_bwritecnt; |
| @@ -409,7 +409,7 @@ struct xfs_cil_ctx { · 50 unmodified lines | |||
| 409 | * operations almost as efficient as the old logging methods. | 409 | * operations almost as efficient as the old logging methods. |
| 410 | */ | 410 | */ |
| 411 | struct xfs_cil { | 411 | struct xfs_cil { |
| 412 | struct log *xc_log; | 412 | struct xlog *xc_log; |
| 413 | struct list_head xc_cil; | 413 | struct list_head xc_cil; |
| 414 | spinlock_t xc_cil_lock; | 414 | spinlock_t xc_cil_lock; |
| 415 | struct xfs_cil_ctx *xc_ctx; | 415 | struct xfs_cil_ctx *xc_ctx; |
| @@ -487,7 +487,7 @@ struct xlog_grant_head { · 71 unmodified lines | |||
| 487 | * overflow 31 bits worth of byte offset, so using a byte number will mean | 487 | * overflow 31 bits worth of byte offset, so using a byte number will mean |
| 488 | * that round off problems won't occur when releasing partial reservations. | 488 | * that round off problems won't occur when releasing partial reservations. |
| 489 | */ | 489 | */ |
| 490 | typedef struct log { | 490 | typedef struct xlog { |
| 491 | /* The following fields don't need locking */ | 491 | /* The following fields don't need locking */ |
| 492 | struct xfs_mount *l_mp; /* mount point */ | 492 | struct xfs_mount *l_mp; /* mount point */ |
| 493 | struct xfs_ail *l_ailp; /* AIL log is working with */ | 493 | struct xfs_ail *l_ailp; /* AIL log is working with */ |
| @@ -553,9 +553,14 @@ extern int xlog_recover_finish(xlog_t *log); · 59 unmodified lines | |||
| 553 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); | 553 | extern void xlog_pack_data(xlog_t *log, xlog_in_core_t *iclog, int); |
| 554 | 554 | ||
| 555 | extern kmem_zone_t *xfs_log_ticket_zone; | 555 | extern kmem_zone_t *xfs_log_ticket_zone; |
| 556 | struct xlog_ticket *xlog_ticket_alloc(struct log *log, int unit_bytes, | 556 | struct xlog_ticket * |
| 557 | int count, char client, bool permanent, | 557 | xlog_ticket_alloc( |
| 558 | xfs_km_flags_t alloc_flags); | 558 | struct xlog *log, |
| 559 | int unit_bytes, | ||
| 560 | int count, | ||
| 561 | char client, | ||
| 562 | bool permanent, | ||
| 563 | xfs_km_flags_t alloc_flags); | ||
| 559 | 564 | ||
| 560 | 565 | ||
| 561 | static inline void | 566 | static inline void |
| @@ -567,9 +572,14 @@ xlog_write_adv_cnt(void **ptr, int *len, int *off, size_t bytes) · 5 unmodified lines | |||
| 567 | } | 572 | } |
| 568 | 573 | ||
| 569 | void xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket); | 574 | void xlog_print_tic_res(struct xfs_mount *mp, struct xlog_ticket *ticket); |
| 570 | int xlog_write(struct log *log, struct xfs_log_vec *log_vector, | 575 | int |
| 571 | struct xlog_ticket *tic, xfs_lsn_t *start_lsn, | 576 | xlog_write( |
| 572 | xlog_in_core_t **commit_iclog, uint flags); | 577 | struct xlog *log, |
| 578 | struct xfs_log_vec *log_vector, | ||
| 579 | struct xlog_ticket *tic, | ||
| 580 | xfs_lsn_t *start_lsn, | ||
| 581 | struct xlog_in_core **commit_iclog, | ||
| 582 | uint flags); | ||
| 573 | 583 | ||
| 574 | /* | 584 | /* |
| 575 | * When we crack an atomic LSN, we sample it first so that the value will not | 585 | * When we crack an atomic LSN, we sample it first so that the value will not |
| @@ -629,17 +639,23 @@ xlog_assign_grant_head(atomic64_t *head, int cycle, int space) · 53 unmodified lines | |||
| 629 | /* | 639 | /* |
| 630 | * Committed Item List interfaces | 640 | * Committed Item List interfaces |
| 631 | */ | 641 | */ |
| 632 | int xlog_cil_init(struct log *log); | 642 | int |
| 633 | void xlog_cil_init_post_recovery(struct log *log); | 643 | xlog_cil_init(struct xlog *log); |
| 634 | void xlog_cil_destroy(struct log *log); | 644 | void |
| 645 | xlog_cil_init_post_recovery(struct xlog *log); | ||
| 646 | void | ||
| 647 | xlog_cil_destroy(struct xlog *log); | ||
| 635 | 648 | ||
| 636 | /* | 649 | /* |
| 637 | * CIL force routines | 650 | * CIL force routines |
| 638 | */ | 651 | */ |
| 639 | xfs_lsn_t xlog_cil_force_lsn(struct log *log, xfs_lsn_t sequence); | 652 | xfs_lsn_t |
| 653 | xlog_cil_force_lsn( | ||
| 654 | struct xlog *log, | ||
| 655 | xfs_lsn_t sequence); | ||
| 640 | 656 | ||
| 641 | static inline void | 657 | static inline void |
| 642 | xlog_cil_force(struct log *log) | 658 | xlog_cil_force(struct xlog *log) |
| 643 | { | 659 | { |
| 644 | xlog_cil_force_lsn(log, log->l_cilp->xc_current_sequence); | 660 | xlog_cil_force_lsn(log, log->l_cilp->xc_current_sequence); |
| 645 | } | 661 | } |
| @@ -1471,8 +1471,8 @@ xlog_recover_add_item( · 1470 unmodified lines | |||
| 1471 | 1471 | ||
| 1472 | STATIC int | 1472 | STATIC int |
| 1473 | xlog_recover_add_to_cont_trans( | 1473 | xlog_recover_add_to_cont_trans( |
| 1474 | struct log *log, | 1474 | struct xlog *log, |
| 1475 | xlog_recover_t *trans, | 1475 | struct xlog_recover *trans, |
| 1476 | xfs_caddr_t dp, | 1476 | xfs_caddr_t dp, |
| 1477 | int len) | 1477 | int len) |
| 1478 | { | 1478 | { |
| @@ -1517,8 +1517,8 @@ xlog_recover_add_to_cont_trans( · 38 unmodified lines | |||
| 1517 | */ | 1517 | */ |
| 1518 | STATIC int | 1518 | STATIC int |
| 1519 | xlog_recover_add_to_trans( | 1519 | xlog_recover_add_to_trans( |
| 1520 | struct log *log, | 1520 | struct xlog *log, |
| 1521 | xlog_recover_t *trans, | 1521 | struct xlog_recover *trans, |
| 1522 | xfs_caddr_t dp, | 1522 | xfs_caddr_t dp, |
| 1523 | int len) | 1523 | int len) |
| 1524 | { | 1524 | { |
| @@ -1588,8 +1588,8 @@ xlog_recover_add_to_trans( · 63 unmodified lines | |||
| 1588 | */ | 1588 | */ |
| 1589 | STATIC int | 1589 | STATIC int |
| 1590 | xlog_recover_reorder_trans( | 1590 | xlog_recover_reorder_trans( |
| 1591 | struct log *log, | 1591 | struct xlog *log, |
| 1592 | xlog_recover_t *trans, | 1592 | struct xlog_recover *trans, |
| 1593 | int pass) | 1593 | int pass) |
| 1594 | { | 1594 | { |
| 1595 | xlog_recover_item_t *item, *n; | 1595 | xlog_recover_item_t *item, *n; |
| @@ -1642,8 +1642,8 @@ xlog_recover_reorder_trans( · 46 unmodified lines | |||
| 1642 | */ | 1642 | */ |
| 1643 | STATIC int | 1643 | STATIC int |
| 1644 | xlog_recover_buffer_pass1( | 1644 | xlog_recover_buffer_pass1( |
| 1645 | struct log *log, | 1645 | struct xlog *log, |
| 1646 | xlog_recover_item_t *item) | 1646 | struct xlog_recover_item *item) |
| 1647 | { | 1647 | { |
| 1648 | xfs_buf_log_format_t *buf_f = item->ri_buf[0].i_addr; | 1648 | xfs_buf_log_format_t *buf_f = item->ri_buf[0].i_addr; |
| 1649 | struct list_head *bucket; | 1649 | struct list_head *bucket; |
| @@ -1696,7 +1696,7 @@ xlog_recover_buffer_pass1( · 46 unmodified lines | |||
| 1696 | */ | 1696 | */ |
| 1697 | STATIC int | 1697 | STATIC int |
| 1698 | xlog_check_buffer_cancelled( | 1698 | xlog_check_buffer_cancelled( |
| 1699 | struct log *log, | 1699 | struct xlog *log, |
| 1700 | xfs_daddr_t blkno, | 1700 | xfs_daddr_t blkno, |
| 1701 | uint len, | 1701 | uint len, |
| 1702 | ushort flags) | 1702 | ushort flags) |
| @@ -2689,9 +2689,9 @@ xlog_recover_free_trans( · 986 unmodified lines | |||
| 2689 | 2689 | ||
| 2690 | STATIC int | 2690 | STATIC int |
| 2691 | xlog_recover_commit_pass1( | 2691 | xlog_recover_commit_pass1( |
| 2692 | struct log *log, | 2692 | struct xlog *log, |
| 2693 | struct xlog_recover *trans, | 2693 | struct xlog_recover *trans, |
| 2694 | xlog_recover_item_t *item) | 2694 | struct xlog_recover_item *item) |
| 2695 | { | 2695 | { |
| 2696 | trace_xfs_log_recover_item_recover(log, trans, item, XLOG_RECOVER_PASS1); | 2696 | trace_xfs_log_recover_item_recover(log, trans, item, XLOG_RECOVER_PASS1); |
| 2697 | 2697 | ||
| @@ -2716,10 +2716,10 @@ xlog_recover_commit_pass1( · 18 unmodified lines | |||
| 2716 | 2716 | ||
| 2717 | STATIC int | 2717 | STATIC int |
| 2718 | xlog_recover_commit_pass2( | 2718 | xlog_recover_commit_pass2( |
| 2719 | struct log *log, | 2719 | struct xlog *log, |
| 2720 | struct xlog_recover *trans, | 2720 | struct xlog_recover *trans, |
| 2721 | struct list_head *buffer_list, | 2721 | struct list_head *buffer_list, |
| 2722 | xlog_recover_item_t *item) | 2722 | struct xlog_recover_item *item) |
| 2723 | { | 2723 | { |
| 2724 | trace_xfs_log_recover_item_recover(log, trans, item, XLOG_RECOVER_PASS2); | 2724 | trace_xfs_log_recover_item_recover(log, trans, item, XLOG_RECOVER_PASS2); |
| 2725 | 2725 | ||
| @@ -2753,7 +2753,7 @@ xlog_recover_commit_pass2( · 27 unmodified lines | |||
| 2753 | */ | 2753 | */ |
| 2754 | STATIC int | 2754 | STATIC int |
| 2755 | xlog_recover_commit_trans( | 2755 | xlog_recover_commit_trans( |
| 2756 | struct log *log, | 2756 | struct xlog *log, |
| 2757 | struct xlog_recover *trans, | 2757 | struct xlog_recover *trans, |
| 2758 | int pass) | 2758 | int pass) |
| 2759 | { | 2759 | { |
| @@ -2793,8 +2793,8 @@ out: · 33 unmodified lines | |||
| 2793 | 2793 | ||
| 2794 | STATIC int | 2794 | STATIC int |
| 2795 | xlog_recover_unmount_trans( | 2795 | xlog_recover_unmount_trans( |
| 2796 | struct log *log, | 2796 | struct xlog *log, |
| 2797 | xlog_recover_t *trans) | 2797 | struct xlog_recover *trans) |
| 2798 | { | 2798 | { |
| 2799 | /* Do nothing now */ | 2799 | /* Do nothing now */ |
| 2800 | xfs_warn(log->l_mp, "%s: Unmount LR", __func__); | 2800 | xfs_warn(log->l_mp, "%s: Unmount LR", __func__); |
| @@ -53,7 +53,7 @@ typedef struct xfs_trans_reservations { · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | #include "xfs_sync.h" | 54 | #include "xfs_sync.h" |
| 55 | 55 | ||
| 56 | struct log; | 56 | struct xlog; |
| 57 | struct xfs_mount_args; | 57 | struct xfs_mount_args; |
| 58 | struct xfs_inode; | 58 | struct xfs_inode; |
| 59 | struct xfs_bmbt_irec; | 59 | struct xfs_bmbt_irec; |
| @@ -133,7 +133,7 @@ typedef struct xfs_mount { · 73 unmodified lines | |||
| 133 | uint m_readio_blocks; /* min read size blocks */ | 133 | uint m_readio_blocks; /* min read size blocks */ |
| 134 | uint m_writeio_log; /* min write size log bytes */ | 134 | uint m_writeio_log; /* min write size log bytes */ |
| 135 | uint m_writeio_blocks; /* min write size blocks */ | 135 | uint m_writeio_blocks; /* min write size blocks */ |
| 136 | struct log *m_log; /* log specific stuff */ | 136 | struct xlog *m_log; /* log specific stuff */ |
| 137 | int m_logbufs; /* number of log buffers */ | 137 | int m_logbufs; /* number of log buffers */ |
| 138 | int m_logbsize; /* size of each log buffer */ | 138 | int m_logbsize; /* size of each log buffer */ |
| 139 | uint m_rsumlevels; /* rt summary levels */ | 139 | uint m_rsumlevels; /* rt summary levels */ |
| @@ -386,23 +386,23 @@ xfs_sync_worker( · 385 unmodified lines | |||
| 386 | * We shouldn't write/force the log if we are in the mount/unmount | 386 | * We shouldn't write/force the log if we are in the mount/unmount |
| 387 | * process or on a read only filesystem. The workqueue still needs to be | 387 | * process or on a read only filesystem. The workqueue still needs to be |
| 388 | * active in both cases, however, because it is used for inode reclaim | 388 | * active in both cases, however, because it is used for inode reclaim |
| 389 | * during these times. Use the s_umount semaphore to provide exclusion | 389 | * during these times. Use the MS_ACTIVE flag to avoid doing anything |
| 390 | * with unmount. | 390 | * during mount. Doing work during unmount is avoided by calling |
| 391 | * cancel_delayed_work_sync on this work queue before tearing down | ||
| 392 | * the ail and the log in xfs_log_unmount. | ||
| 391 | */ | 393 | */ |
| 392 | if (down_read_trylock(&mp->m_super->s_umount)) { | 394 | if (!(mp->m_super->s_flags & MS_ACTIVE) && |
| 393 | if (!(mp->m_flags & XFS_MOUNT_RDONLY)) { | 395 | !(mp->m_flags & XFS_MOUNT_RDONLY)) { |
| 394 | /* dgc: errors ignored here */ | 396 | /* dgc: errors ignored here */ |
| 395 | if (mp->m_super->s_frozen == SB_UNFROZEN && | 397 | if (mp->m_super->s_frozen == SB_UNFROZEN && |
| 396 | xfs_log_need_covered(mp)) | 398 | xfs_log_need_covered(mp)) |
| 397 | error = xfs_fs_log_dummy(mp); | 399 | error = xfs_fs_log_dummy(mp); |
| 398 | else | 400 | else |
| 399 | xfs_log_force(mp, 0); | 401 | xfs_log_force(mp, 0); |
| 400 | 402 | ||
| 401 | /* start pushing all the metadata that is currently | 403 | /* start pushing all the metadata that is currently |
| 402 | * dirty */ | 404 | * dirty */ |
| 403 | xfs_ail_push_all(mp->m_ail); | 405 | xfs_ail_push_all(mp->m_ail); |
| 404 | } | ||
| 405 | up_read(&mp->m_super->s_umount); | ||
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | /* queue us up again */ | 408 | /* queue us up again */ |
| @@ -32,7 +32,7 @@ struct xfs_da_node_entry; · 31 unmodified lines | |||
| 32 | struct xfs_dquot; | 32 | struct xfs_dquot; |
| 33 | struct xfs_log_item; | 33 | struct xfs_log_item; |
| 34 | struct xlog_ticket; | 34 | struct xlog_ticket; |
| 35 | struct log; | 35 | struct xlog; |
| 36 | struct xlog_recover; | 36 | struct xlog_recover; |
| 37 | struct xlog_recover_item; | 37 | struct xlog_recover_item; |
| 38 | struct xfs_buf_log_format; | 38 | struct xfs_buf_log_format; |
| @@ -762,7 +762,7 @@ DEFINE_DQUOT_EVENT(xfs_dqflush_force); · 723 unmodified lines | |||
| 762 | DEFINE_DQUOT_EVENT(xfs_dqflush_done); | 762 | DEFINE_DQUOT_EVENT(xfs_dqflush_done); |
| 763 | 763 | ||
| 764 | DECLARE_EVENT_CLASS(xfs_loggrant_class, | 764 | DECLARE_EVENT_CLASS(xfs_loggrant_class, |
| 765 | TP_PROTO(struct log *log, struct xlog_ticket *tic), | 765 | TP_PROTO(struct xlog *log, struct xlog_ticket *tic), |
| 766 | TP_ARGS(log, tic), | 766 | TP_ARGS(log, tic), |
| 767 | TP_STRUCT__entry( | 767 | TP_STRUCT__entry( |
| 768 | __field(dev_t, dev) | 768 | __field(dev_t, dev) |
| @@ -830,7 +830,7 @@ DECLARE_EVENT_CLASS(xfs_loggrant_class, · 61 unmodified lines | |||
| 830 | 830 | ||
| 831 | #define DEFINE_LOGGRANT_EVENT(name) \ | 831 | #define DEFINE_LOGGRANT_EVENT(name) \ |
| 832 | DEFINE_EVENT(xfs_loggrant_class, name, \ | 832 | DEFINE_EVENT(xfs_loggrant_class, name, \ |
| 833 | TP_PROTO(struct log *log, struct xlog_ticket *tic), \ | 833 | TP_PROTO(struct xlog *log, struct xlog_ticket *tic), \ |
| 834 | TP_ARGS(log, tic)) | 834 | TP_ARGS(log, tic)) |
| 835 | DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm); | 835 | DEFINE_LOGGRANT_EVENT(xfs_log_done_nonperm); |
| 836 | DEFINE_LOGGRANT_EVENT(xfs_log_done_perm); | 836 | DEFINE_LOGGRANT_EVENT(xfs_log_done_perm); |
| @@ -1664,7 +1664,7 @@ DEFINE_SWAPEXT_EVENT(xfs_swap_extent_before); · 827 unmodified lines | |||
| 1664 | DEFINE_SWAPEXT_EVENT(xfs_swap_extent_after); | 1664 | DEFINE_SWAPEXT_EVENT(xfs_swap_extent_after); |
| 1665 | 1665 | ||
| 1666 | DECLARE_EVENT_CLASS(xfs_log_recover_item_class, | 1666 | DECLARE_EVENT_CLASS(xfs_log_recover_item_class, |
| 1667 | TP_PROTO(struct log *log, struct xlog_recover *trans, | 1667 | TP_PROTO(struct xlog *log, struct xlog_recover *trans, |
| 1668 | struct xlog_recover_item *item, int pass), | 1668 | struct xlog_recover_item *item, int pass), |
| 1669 | TP_ARGS(log, trans, item, pass), | 1669 | TP_ARGS(log, trans, item, pass), |
| 1670 | TP_STRUCT__entry( | 1670 | TP_STRUCT__entry( |
| @@ -1698,7 +1698,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_item_class, · 27 unmodified lines | |||
| 1698 | 1698 | ||
| 1699 | #define DEFINE_LOG_RECOVER_ITEM(name) \ | 1699 | #define DEFINE_LOG_RECOVER_ITEM(name) \ |
| 1700 | DEFINE_EVENT(xfs_log_recover_item_class, name, \ | 1700 | DEFINE_EVENT(xfs_log_recover_item_class, name, \ |
| 1701 | TP_PROTO(struct log *log, struct xlog_recover *trans, \ | 1701 | TP_PROTO(struct xlog *log, struct xlog_recover *trans, \ |
| 1702 | struct xlog_recover_item *item, int pass), \ | 1702 | struct xlog_recover_item *item, int pass), \ |
| 1703 | TP_ARGS(log, trans, item, pass)) | 1703 | TP_ARGS(log, trans, item, pass)) |
| 1704 | 1704 | ||
| @@ -1709,7 +1709,7 @@ DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_reorder_tail); · 4 unmodified lines | |||
| 1709 | DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_recover); | 1709 | DEFINE_LOG_RECOVER_ITEM(xfs_log_recover_item_recover); |
| 1710 | 1710 | ||
| 1711 | DECLARE_EVENT_CLASS(xfs_log_recover_buf_item_class, | 1711 | DECLARE_EVENT_CLASS(xfs_log_recover_buf_item_class, |
| 1712 | TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f), | 1712 | TP_PROTO(struct xlog *log, struct xfs_buf_log_format *buf_f), |
| 1713 | TP_ARGS(log, buf_f), | 1713 | TP_ARGS(log, buf_f), |
| 1714 | TP_STRUCT__entry( | 1714 | TP_STRUCT__entry( |
| 1715 | __field(dev_t, dev) | 1715 | __field(dev_t, dev) |
| @@ -1739,7 +1739,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_buf_item_class, · 23 unmodified lines | |||
| 1739 | 1739 | ||
| 1740 | #define DEFINE_LOG_RECOVER_BUF_ITEM(name) \ | 1740 | #define DEFINE_LOG_RECOVER_BUF_ITEM(name) \ |
| 1741 | DEFINE_EVENT(xfs_log_recover_buf_item_class, name, \ | 1741 | DEFINE_EVENT(xfs_log_recover_buf_item_class, name, \ |
| 1742 | TP_PROTO(struct log *log, struct xfs_buf_log_format *buf_f), \ | 1742 | TP_PROTO(struct xlog *log, struct xfs_buf_log_format *buf_f), \ |
| 1743 | TP_ARGS(log, buf_f)) | 1743 | TP_ARGS(log, buf_f)) |
| 1744 | 1744 | ||
| 1745 | DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel); | 1745 | DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_not_cancel); |
| @@ -1752,7 +1752,7 @@ DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_reg_buf); · 6 unmodified lines | |||
| 1752 | DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_dquot_buf); | 1752 | DEFINE_LOG_RECOVER_BUF_ITEM(xfs_log_recover_buf_dquot_buf); |
| 1753 | 1753 | ||
| 1754 | DECLARE_EVENT_CLASS(xfs_log_recover_ino_item_class, | 1754 | DECLARE_EVENT_CLASS(xfs_log_recover_ino_item_class, |
| 1755 | TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f), | 1755 | TP_PROTO(struct xlog *log, struct xfs_inode_log_format *in_f), |
| 1756 | TP_ARGS(log, in_f), | 1756 | TP_ARGS(log, in_f), |
| 1757 | TP_STRUCT__entry( | 1757 | TP_STRUCT__entry( |
| 1758 | __field(dev_t, dev) | 1758 | __field(dev_t, dev) |
| @@ -1790,7 +1790,7 @@ DECLARE_EVENT_CLASS(xfs_log_recover_ino_item_class, · 31 unmodified lines | |||
| 1790 | ) | 1790 | ) |
| 1791 | #define DEFINE_LOG_RECOVER_INO_ITEM(name) \ | 1791 | #define DEFINE_LOG_RECOVER_INO_ITEM(name) \ |
| 1792 | DEFINE_EVENT(xfs_log_recover_ino_item_class, name, \ | 1792 | DEFINE_EVENT(xfs_log_recover_ino_item_class, name, \ |
| 1793 | TP_PROTO(struct log *log, struct xfs_inode_log_format *in_f), \ | 1793 | TP_PROTO(struct xlog *log, struct xfs_inode_log_format *in_f), \ |
| 1794 | TP_ARGS(log, in_f)) | 1794 | TP_ARGS(log, in_f)) |
| 1795 | 1795 | ||
| 1796 | DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover); | 1796 | DEFINE_LOG_RECOVER_INO_ITEM(xfs_log_recover_inode_recover); |
| @@ -2,7 +2,6 @@ · 1 unmodified line | |||
| 2 | #define _ASM_GENERIC_BUG_H | 2 | #define _ASM_GENERIC_BUG_H |
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 5 | #include <linux/kernel.h> | ||
| 6 | 5 | ||
| 7 | #ifdef CONFIG_BUG | 6 | #ifdef CONFIG_BUG |
| 8 | 7 | ||
| @@ -32,6 +31,9 @@ struct bug_entry { · 23 unmodified lines | |||
| 32 | 31 | ||
| 33 | #endif /* CONFIG_GENERIC_BUG */ | 32 | #endif /* CONFIG_GENERIC_BUG */ |
| 34 | 33 | ||
| 34 | #ifndef __ASSEMBLY__ | ||
| 35 | #include <linux/kernel.h> | ||
| 36 | |||
| 35 | /* | 37 | /* |
| 36 | * Don't use BUG() or BUG_ON() unless there's really no way out; one | 38 | * Don't use BUG() or BUG_ON() unless there's really no way out; one |
| 37 | * example might be detecting data structure corruption in the middle | 39 | * example might be detecting data structure corruption in the middle |
| @@ -61,7 +63,6 @@ struct bug_entry { · 23 unmodified lines | |||
| 61 | * to provide better diagnostics. | 63 | * to provide better diagnostics. |
| 62 | */ | 64 | */ |
| 63 | #ifndef __WARN_TAINT | 65 | #ifndef __WARN_TAINT |
| 64 | #ifndef __ASSEMBLY__ | ||
| 65 | extern __printf(3, 4) | 66 | extern __printf(3, 4) |
| 66 | void warn_slowpath_fmt(const char *file, const int line, | 67 | void warn_slowpath_fmt(const char *file, const int line, |
| 67 | const char *fmt, ...); | 68 | const char *fmt, ...); |
| @@ -70,7 +71,6 @@ void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint, · 2 unmodified lines | |||
| 70 | const char *fmt, ...); | 71 | const char *fmt, ...); |
| 71 | extern void warn_slowpath_null(const char *file, const int line); | 72 | extern void warn_slowpath_null(const char *file, const int line); |
| 72 | #define WANT_WARN_ON_SLOWPATH | 73 | #define WANT_WARN_ON_SLOWPATH |
| 73 | #endif | ||
| 74 | #define __WARN() warn_slowpath_null(__FILE__, __LINE__) | 74 | #define __WARN() warn_slowpath_null(__FILE__, __LINE__) |
| 75 | #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg) | 75 | #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg) |
| 76 | #define __WARN_printf_taint(taint, arg...) \ | 76 | #define __WARN_printf_taint(taint, arg...) \ |
| @@ -203,4 +203,6 @@ extern void warn_slowpath_null(const char *file, const int line); · 126 unmodified lines | |||
| 203 | # define WARN_ON_SMP(x) ({0;}) | 203 | # define WARN_ON_SMP(x) ({0;}) |
| 204 | #endif | 204 | #endif |
| 205 | 205 | ||
| 206 | #endif /* __ASSEMBLY__ */ | ||
| 207 | |||
| 206 | #endif | 208 | #endif |
| @@ -484,6 +484,16 @@ static inline int pmd_none_or_trans_huge_or_clear_bad(pmd_t *pmd) · 483 unmodified lines | |||
| 484 | /* | 484 | /* |
| 485 | * The barrier will stabilize the pmdval in a register or on | 485 | * The barrier will stabilize the pmdval in a register or on |
| 486 | * the stack so that it will stop changing under the code. | 486 | * the stack so that it will stop changing under the code. |
| 487 | * | ||
| 488 | * When CONFIG_TRANSPARENT_HUGEPAGE=y on x86 32bit PAE, | ||
| 489 | * pmd_read_atomic is allowed to return a not atomic pmdval | ||
| 490 | * (for example pointing to an hugepage that has never been | ||
| 491 | * mapped in the pmd). The below checks will only care about | ||
| 492 | * the low part of the pmd with 32bit PAE x86 anyway, with the | ||
| 493 | * exception of pmd_none(). So the important thing is that if | ||
| 494 | * the low part of the pmd is found null, the high part will | ||
| 495 | * be also null or the pmd_none() check below would be | ||
| 496 | * confused. | ||
| 487 | */ | 497 | */ |
| 488 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 498 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
| 489 | barrier(); | 499 | barrier(); |
| @@ -1,7 +1,3 @@ | |||
| 1 | /* | ||
| 2 | This file is auto-generated from the drm_pciids.txt in the DRM CVS | ||
| 3 | Please contact dri-devel@lists.sf.net to add new cards to this list | ||
| 4 | */ | ||
| 5 | #define radeon_PCI_IDS \ | 1 | #define radeon_PCI_IDS \ |
| 6 | {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ | 2 | {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ |
| 7 | {0x1002, 0x3151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 3 | {0x1002, 0x3151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| @@ -47,9 +47,9 @@ · 46 unmodified lines | |||
| 47 | */ | 47 | */ |
| 48 | #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ | 48 | #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ |
| 49 | !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) | 49 | !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) |
| 50 | # define inline inline __attribute__((always_inline)) | 50 | # define inline inline __attribute__((always_inline)) notrace |
| 51 | # define __inline__ __inline__ __attribute__((always_inline)) | 51 | # define __inline__ __inline__ __attribute__((always_inline)) notrace |
| 52 | # define __inline __inline __attribute__((always_inline)) | 52 | # define __inline __inline __attribute__((always_inline)) notrace |
| 53 | #else | 53 | #else |
| 54 | /* A lot of inline functions can cause havoc with function tracing */ | 54 | /* A lot of inline functions can cause havoc with function tracing */ |
| 55 | # define inline inline notrace | 55 | # define inline inline notrace |
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | * is passed to the kernel. | 21 | * is passed to the kernel. |
| 22 | */ | 22 | */ |
| 23 | enum kmsg_dump_reason { | 23 | enum kmsg_dump_reason { |
| 24 | KMSG_DUMP_UNDEF, | ||
| 24 | KMSG_DUMP_PANIC, | 25 | KMSG_DUMP_PANIC, |
| 25 | KMSG_DUMP_OOPS, | 26 | KMSG_DUMP_OOPS, |
| 26 | KMSG_DUMP_EMERG, | 27 | KMSG_DUMP_EMERG, |
| @@ -31,23 +32,37 @@ enum kmsg_dump_reason { · 4 unmodified lines | |||
| 31 | 32 | ||
| 32 | /** | 33 | /** |
| 33 | * struct kmsg_dumper - kernel crash message dumper structure | 34 | * struct kmsg_dumper - kernel crash message dumper structure |
| 34 | * @dump: The callback which gets called on crashes. The buffer is passed | ||
| 35 | * as two sections, where s1 (length l1) contains the older | ||
| 36 | * messages and s2 (length l2) contains the newer. | ||
| 37 | * @list: Entry in the dumper list (private) | 35 | * @list: Entry in the dumper list (private) |
| 36 | * @dump: Call into dumping code which will retrieve the data with | ||
| 37 | * through the record iterator | ||
| 38 | * @max_reason: filter for highest reason number that should be dumped | ||
| 38 | * @registered: Flag that specifies if this is already registered | 39 | * @registered: Flag that specifies if this is already registered |
| 39 | */ | 40 | */ |
| 40 | struct kmsg_dumper { | 41 | struct kmsg_dumper { |
| 41 | void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason, | ||
| 42 | const char *s1, unsigned long l1, | ||
| 43 | const char *s2, unsigned long l2); | ||
| 44 | struct list_head list; | 42 | struct list_head list; |
| 45 | int registered; | 43 | void (*dump)(struct kmsg_dumper *dumper, enum kmsg_dump_reason reason); |
| 44 | enum kmsg_dump_reason max_reason; | ||
| 45 | bool active; | ||
| 46 | bool registered; | ||
| 47 | |||
| 48 | /* private state of the kmsg iterator */ | ||
| 49 | u32 cur_idx; | ||
| 50 | u32 next_idx; | ||
| 51 | u64 cur_seq; | ||
| 52 | u64 next_seq; | ||
| 46 | }; | 53 | }; |
| 47 | 54 | ||
| 48 | #ifdef CONFIG_PRINTK | 55 | #ifdef CONFIG_PRINTK |
| 49 | void kmsg_dump(enum kmsg_dump_reason reason); | 56 | void kmsg_dump(enum kmsg_dump_reason reason); |
| 50 | 57 | ||
| 58 | bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog, | ||
| 59 | char *line, size_t size, size_t *len); | ||
| 60 | |||
| 61 | bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, | ||
| 62 | char *buf, size_t size, size_t *len); | ||
| 63 | |||
| 64 | void kmsg_dump_rewind(struct kmsg_dumper *dumper); | ||
| 65 | |||
| 51 | int kmsg_dump_register(struct kmsg_dumper *dumper); | 66 | int kmsg_dump_register(struct kmsg_dumper *dumper); |
| 52 | 67 | ||
| 53 | int kmsg_dump_unregister(struct kmsg_dumper *dumper); | 68 | int kmsg_dump_unregister(struct kmsg_dumper *dumper); |
| @@ -56,6 +71,22 @@ static inline void kmsg_dump(enum kmsg_dump_reason reason) · 2 unmodified lines | |||
| 56 | { | 71 | { |
| 57 | } | 72 | } |
| 58 | 73 | ||
| 74 | static inline bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog, | ||
| 75 | const char *line, size_t size, size_t *len) | ||
| 76 | { | ||
| 77 | return false; | ||
| 78 | } | ||
| 79 | |||
| 80 | static inline bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, | ||
| 81 | char *buf, size_t size, size_t *len) | ||
| 82 | { | ||
| 83 | return false; | ||
| 84 | } | ||
| 85 | |||
| 86 | static inline void kmsg_dump_rewind(struct kmsg_dumper *dumper) | ||
| 87 | { | ||
| 88 | } | ||
| 89 | |||
| 59 | static inline int kmsg_dump_register(struct kmsg_dumper *dumper) | 90 | static inline int kmsg_dump_register(struct kmsg_dumper *dumper) |
| 60 | { | 91 | { |
| 61 | return -EINVAL; | 92 | return -EINVAL; |
| @@ -57,8 +57,18 @@ struct page { · 56 unmodified lines | |||
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | union { | 59 | union { |
| 60 | #if defined(CONFIG_HAVE_CMPXCHG_DOUBLE) && \ | ||
| 61 | defined(CONFIG_HAVE_ALIGNED_STRUCT_PAGE) | ||
| 60 | /* Used for cmpxchg_double in slub */ | 62 | /* Used for cmpxchg_double in slub */ |
| 61 | unsigned long counters; | 63 | unsigned long counters; |
| 64 | #else | ||
| 65 | /* | ||
| 66 | * Keep _count separate from slub cmpxchg_double data. | ||
| 67 | * As the rest of the double word is protected by | ||
| 68 | * slab_lock but _count is not. | ||
| 69 | */ | ||
| 70 | unsigned counters; | ||
| 71 | #endif | ||
| 62 | 72 | ||
| 63 | struct { | 73 | struct { |
| 64 | 74 | ||
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * SDHCI declarations specific to ST SPEAr platform | 4 | * SDHCI declarations specific to ST SPEAr platform |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2010 ST Microelectronics | 6 | * Copyright (C) 2010 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -98,7 +98,9 @@ · 97 unmodified lines | |||
| 98 | 98 | ||
| 99 | #define SDIO_CCCR_IF 0x07 /* bus interface controls */ | 99 | #define SDIO_CCCR_IF 0x07 /* bus interface controls */ |
| 100 | 100 | ||
| 101 | #define SDIO_BUS_WIDTH_MASK 0x03 /* data bus width setting */ | ||
| 101 | #define SDIO_BUS_WIDTH_1BIT 0x00 | 102 | #define SDIO_BUS_WIDTH_1BIT 0x00 |
| 103 | #define SDIO_BUS_WIDTH_RESERVED 0x01 | ||
| 102 | #define SDIO_BUS_WIDTH_4BIT 0x02 | 104 | #define SDIO_BUS_WIDTH_4BIT 0x02 |
| 103 | #define SDIO_BUS_ECSI 0x20 /* Enable continuous SPI interrupt */ | 105 | #define SDIO_BUS_ECSI 0x20 /* Enable continuous SPI interrupt */ |
| 104 | #define SDIO_BUS_SCSI 0x40 /* Support continuous SPI interrupt */ | 106 | #define SDIO_BUS_SCSI 0x40 /* Support continuous SPI interrupt */ |
| @@ -25,6 +25,7 @@ struct nfs41_impl_id; · 24 unmodified lines | |||
| 25 | */ | 25 | */ |
| 26 | struct nfs_client { | 26 | struct nfs_client { |
| 27 | atomic_t cl_count; | 27 | atomic_t cl_count; |
| 28 | atomic_t cl_mds_count; | ||
| 28 | int cl_cons_state; /* current construction state (-ve: init error) */ | 29 | int cl_cons_state; /* current construction state (-ve: init error) */ |
| 29 | #define NFS_CS_READY 0 /* ready to be used */ | 30 | #define NFS_CS_READY 0 /* ready to be used */ |
| 30 | #define NFS_CS_INITING 1 /* busy initialising */ | 31 | #define NFS_CS_INITING 1 /* busy initialising */ |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | |||
| 4 | * Arasan Compact Flash host controller platform data header file | 4 | * Arasan Compact Flash host controller platform data header file |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2011 ST Microelectronics | 6 | * Copyright (C) 2011 ST Microelectronics |
| 7 | * Viresh Kumar <viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |
| @@ -69,12 +69,14 @@ struct persistent_ram_zone * __init persistent_ram_new(phys_addr_t start, · 68 unmodified lines | |||
| 69 | size_t size, | 69 | size_t size, |
| 70 | bool ecc); | 70 | bool ecc); |
| 71 | void persistent_ram_free(struct persistent_ram_zone *prz); | 71 | void persistent_ram_free(struct persistent_ram_zone *prz); |
| 72 | void persistent_ram_zap(struct persistent_ram_zone *prz); | ||
| 72 | struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev, | 73 | struct persistent_ram_zone *persistent_ram_init_ringbuffer(struct device *dev, |
| 73 | bool ecc); | 74 | bool ecc); |
| 74 | 75 | ||
| 75 | int persistent_ram_write(struct persistent_ram_zone *prz, const void *s, | 76 | int persistent_ram_write(struct persistent_ram_zone *prz, const void *s, |
| 76 | unsigned int count); | 77 | unsigned int count); |
| 77 | 78 | ||
| 79 | void persistent_ram_save_old(struct persistent_ram_zone *prz); | ||
| 78 | size_t persistent_ram_old_size(struct persistent_ram_zone *prz); | 80 | size_t persistent_ram_old_size(struct persistent_ram_zone *prz); |
| 79 | void *persistent_ram_old(struct persistent_ram_zone *prz); | 81 | void *persistent_ram_old(struct persistent_ram_zone *prz); |
| 80 | void persistent_ram_free_old(struct persistent_ram_zone *prz); | 82 | void persistent_ram_free_old(struct persistent_ram_zone *prz); |
| @@ -160,7 +160,9 @@ enum pxa_ssp_type { · 159 unmodified lines | |||
| 160 | PXA25x_SSP, /* pxa 210, 250, 255, 26x */ | 160 | PXA25x_SSP, /* pxa 210, 250, 255, 26x */ |
| 161 | PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ | 161 | PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ |
| 162 | PXA27x_SSP, | 162 | PXA27x_SSP, |
| 163 | PXA3xx_SSP, | ||
| 163 | PXA168_SSP, | 164 | PXA168_SSP, |
| 165 | PXA910_SSP, | ||
| 164 | CE4100_SSP, | 166 | CE4100_SSP, |
| 165 | }; | 167 | }; |
| 166 | 168 | ||
| @@ -43,7 +43,7 @@ struct pxa2xx_spi_chip { · 42 unmodified lines | |||
| 43 | void (*cs_control)(u32 command); | 43 | void (*cs_control)(u32 command); |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_ARCH_PXA | 46 | #if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP) |
| 47 | 47 | ||
| 48 | #include <linux/clk.h> | 48 | #include <linux/clk.h> |
| 49 | #include <mach/dma.h> | 49 | #include <mach/dma.h> |
| @@ -7,8 +7,13 @@ · 6 unmodified lines | |||
| 7 | * vga_switcheroo.h - Support for laptop with dual GPU using one set of outputs | 7 | * vga_switcheroo.h - Support for laptop with dual GPU using one set of outputs |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #ifndef _LINUX_VGA_SWITCHEROO_H_ | ||
| 11 | #define _LINUX_VGA_SWITCHEROO_H_ | ||
| 12 | |||
| 10 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
| 11 | 14 | ||
| 15 | struct pci_dev; | ||
| 16 | |||
| 12 | enum vga_switcheroo_state { | 17 | enum vga_switcheroo_state { |
| 13 | VGA_SWITCHEROO_OFF, | 18 | VGA_SWITCHEROO_OFF, |
| 14 | VGA_SWITCHEROO_ON, | 19 | VGA_SWITCHEROO_ON, |
| @@ -71,3 +76,4 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return · 56 unmodified lines | |||
| 71 | 76 | ||
| 72 | 77 | ||
| 73 | #endif | 78 | #endif |
| 79 | #endif /* _LINUX_VGA_SWITCHEROO_H_ */ | ||
| @@ -255,12 +255,17 @@ int cgroup_lock_is_held(void) · 254 unmodified lines | |||
| 255 | 255 | ||
| 256 | EXPORT_SYMBOL_GPL(cgroup_lock_is_held); | 256 | EXPORT_SYMBOL_GPL(cgroup_lock_is_held); |
| 257 | 257 | ||
| 258 | static int css_unbias_refcnt(int refcnt) | ||
| 259 | { | ||
| 260 | return refcnt >= 0 ? refcnt : refcnt - CSS_DEACT_BIAS; | ||
| 261 | } | ||
| 262 | |||
| 258 | /* the current nr of refs, always >= 0 whether @css is deactivated or not */ | 263 | /* the current nr of refs, always >= 0 whether @css is deactivated or not */ |
| 259 | static int css_refcnt(struct cgroup_subsys_state *css) | 264 | static int css_refcnt(struct cgroup_subsys_state *css) |
| 260 | { | 265 | { |
| 261 | int v = atomic_read(&css->refcnt); | 266 | int v = atomic_read(&css->refcnt); |
| 262 | 267 | ||
| 263 | return v >= 0 ? v : v - CSS_DEACT_BIAS; | 268 | return css_unbias_refcnt(v); |
| 264 | } | 269 | } |
| 265 | 270 | ||
| 266 | /* convenient tests for these bits */ | 271 | /* convenient tests for these bits */ |
| @@ -4982,10 +4987,12 @@ EXPORT_SYMBOL_GPL(__css_tryget); · 4715 unmodified lines | |||
| 4982 | void __css_put(struct cgroup_subsys_state *css) | 4987 | void __css_put(struct cgroup_subsys_state *css) |
| 4983 | { | 4988 | { |
| 4984 | struct cgroup *cgrp = css->cgroup; | 4989 | struct cgroup *cgrp = css->cgroup; |
| 4990 | int v; | ||
| 4985 | 4991 | ||
| 4986 | rcu_read_lock(); | 4992 | rcu_read_lock(); |
| 4987 | atomic_dec(&css->refcnt); | 4993 | v = css_unbias_refcnt(atomic_dec_return(&css->refcnt)); |
| 4988 | switch (css_refcnt(css)) { | 4994 | |
| 4995 | switch (v) { | ||
| 4989 | case 1: | 4996 | case 1: |
| 4990 | if (notify_on_release(cgrp)) { | 4997 | if (notify_on_release(cgrp)) { |
| 4991 | set_bit(CGRP_RELEASABLE, &cgrp->flags); | 4998 | set_bit(CGRP_RELEASABLE, &cgrp->flags); |
| @@ -253,9 +253,9 @@ perf_cgroup_match(struct perf_event *event) · 252 unmodified lines | |||
| 253 | return !event->cgrp || event->cgrp == cpuctx->cgrp; | 253 | return !event->cgrp || event->cgrp == cpuctx->cgrp; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | static inline void perf_get_cgroup(struct perf_event *event) | 256 | static inline bool perf_tryget_cgroup(struct perf_event *event) |
| 257 | { | 257 | { |
| 258 | css_get(&event->cgrp->css); | 258 | return css_tryget(&event->cgrp->css); |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | static inline void perf_put_cgroup(struct perf_event *event) | 261 | static inline void perf_put_cgroup(struct perf_event *event) |
| @@ -484,7 +484,11 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, · 222 unmodified lines | |||
| 484 | event->cgrp = cgrp; | 484 | event->cgrp = cgrp; |
| 485 | 485 | ||
| 486 | /* must be done before we fput() the file */ | 486 | /* must be done before we fput() the file */ |
| 487 | perf_get_cgroup(event); | 487 | if (!perf_tryget_cgroup(event)) { |
| 488 | event->cgrp = NULL; | ||
| 489 | ret = -ENOENT; | ||
| 490 | goto out; | ||
| 491 | } | ||
| 488 | 492 | ||
| 489 | /* | 493 | /* |
| 490 | * all events in a group must monitor | 494 | * all events in a group must monitor |
| @@ -72,6 +72,18 @@ static void __unhash_process(struct task_struct *p, bool group_dead) · 71 unmodified lines | |||
| 72 | list_del_rcu(&p->tasks); | 72 | list_del_rcu(&p->tasks); |
| 73 | list_del_init(&p->sibling); | 73 | list_del_init(&p->sibling); |
| 74 | __this_cpu_dec(process_counts); | 74 | __this_cpu_dec(process_counts); |
| 75 | /* | ||
| 76 | * If we are the last child process in a pid namespace to be | ||
| 77 | * reaped, notify the reaper sleeping zap_pid_ns_processes(). | ||
| 78 | */ | ||
| 79 | if (IS_ENABLED(CONFIG_PID_NS)) { | ||
| 80 | struct task_struct *parent = p->real_parent; | ||
| 81 | |||
| 82 | if ((task_active_pid_ns(parent)->child_reaper == parent) && | ||
| 83 | list_empty(&parent->children) && | ||
| 84 | (parent->flags & PF_EXITING)) | ||
| 85 | wake_up_process(parent); | ||
| 86 | } | ||
| 75 | } | 87 | } |
| 76 | list_del_rcu(&p->thread_group); | 88 | list_del_rcu(&p->thread_group); |
| 77 | } | 89 | } |
| @@ -643,6 +655,7 @@ static void exit_mm(struct task_struct * tsk) · 565 unmodified lines | |||
| 643 | mm_release(tsk, mm); | 655 | mm_release(tsk, mm); |
| 644 | if (!mm) | 656 | if (!mm) |
| 645 | return; | 657 | return; |
| 658 | sync_mm_rss(mm); | ||
| 646 | /* | 659 | /* |
| 647 | * Serialize with any possible pending coredump. | 660 | * Serialize with any possible pending coredump. |
| 648 | * We must hold mmap_sem around checking core_state | 661 | * We must hold mmap_sem around checking core_state |
| @@ -719,12 +732,6 @@ static struct task_struct *find_new_reaper(struct task_struct *father) · 70 unmodified lines | |||
| 719 | 732 | ||
| 720 | zap_pid_ns_processes(pid_ns); | 733 | zap_pid_ns_processes(pid_ns); |
| 721 | write_lock_irq(&tasklist_lock); | 734 | write_lock_irq(&tasklist_lock); |
| 722 | /* | ||
| 723 | * We can not clear ->child_reaper or leave it alone. | ||
| 724 | * There may by stealth EXIT_DEAD tasks on ->children, | ||
| 725 | * forget_original_parent() must move them somewhere. | ||
| 726 | */ | ||
| 727 | pid_ns->child_reaper = init_pid_ns.child_reaper; | ||
| 728 | } else if (father->signal->has_child_subreaper) { | 735 | } else if (father->signal->has_child_subreaper) { |
| 729 | struct task_struct *reaper; | 736 | struct task_struct *reaper; |
| 730 | 737 | ||
| @@ -184,11 +184,31 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) · 183 unmodified lines | |||
| 184 | } | 184 | } |
| 185 | read_unlock(&tasklist_lock); | 185 | read_unlock(&tasklist_lock); |
| 186 | 186 | ||
| 187 | /* Firstly reap the EXIT_ZOMBIE children we may have. */ | ||
| 187 | do { | 188 | do { |
| 188 | clear_thread_flag(TIF_SIGPENDING); | 189 | clear_thread_flag(TIF_SIGPENDING); |
| 189 | rc = sys_wait4(-1, NULL, __WALL, NULL); | 190 | rc = sys_wait4(-1, NULL, __WALL, NULL); |
| 190 | } while (rc != -ECHILD); | 191 | } while (rc != -ECHILD); |
| 191 | 192 | ||
| 193 | /* | ||
| 194 | * sys_wait4() above can't reap the TASK_DEAD children. | ||
| 195 | * Make sure they all go away, see __unhash_process(). | ||
| 196 | */ | ||
| 197 | for (;;) { | ||
| 198 | bool need_wait = false; | ||
| 199 | |||
| 200 | read_lock(&tasklist_lock); | ||
| 201 | if (!list_empty(¤t->children)) { | ||
| 202 | __set_current_state(TASK_UNINTERRUPTIBLE); | ||
| 203 | need_wait = true; | ||
| 204 | } | ||
| 205 | read_unlock(&tasklist_lock); | ||
| 206 | |||
| 207 | if (!need_wait) | ||
| 208 | break; | ||
| 209 | schedule(); | ||
| 210 | } | ||
| 211 | |||
| 192 | if (pid_ns->reboot) | 212 | if (pid_ns->reboot) |
| 193 | current->signal->group_exit_code = pid_ns->reboot; | 213 | current->signal->group_exit_code = pid_ns->reboot; |
| 194 | 214 | ||
| @@ -227,10 +227,10 @@ static u32 clear_idx; · 226 unmodified lines | |||
| 227 | #define LOG_LINE_MAX 1024 | 227 | #define LOG_LINE_MAX 1024 |
| 228 | 228 | ||
| 229 | /* record buffer */ | 229 | /* record buffer */ |
| 230 | #if !defined(CONFIG_64BIT) || defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) | 230 | #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) |
| 231 | #define LOG_ALIGN 4 | 231 | #define LOG_ALIGN 4 |
| 232 | #else | 232 | #else |
| 233 | #define LOG_ALIGN 8 | 233 | #define LOG_ALIGN __alignof__(struct log) |
| 234 | #endif | 234 | #endif |
| 235 | #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) | 235 | #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT) |
| 236 | static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); | 236 | static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); |
| @@ -414,7 +414,9 @@ static ssize_t devkmsg_read(struct file *file, char __user *buf, · 177 unmodified lines | |||
| 414 | if (!user) | 414 | if (!user) |
| 415 | return -EBADF; | 415 | return -EBADF; |
| 416 | 416 | ||
| 417 | mutex_lock(&user->lock); | 417 | ret = mutex_lock_interruptible(&user->lock); |
| 418 | if (ret) | ||
| 419 | return ret; | ||
| 418 | raw_spin_lock(&logbuf_lock); | 420 | raw_spin_lock(&logbuf_lock); |
| 419 | while (user->seq == log_next_seq) { | 421 | while (user->seq == log_next_seq) { |
| 420 | if (file->f_flags & O_NONBLOCK) { | 422 | if (file->f_flags & O_NONBLOCK) { |
| @@ -878,7 +880,9 @@ static int syslog_print(char __user *buf, int size) · 457 unmodified lines | |||
| 878 | syslog_seq++; | 880 | syslog_seq++; |
| 879 | raw_spin_unlock_irq(&logbuf_lock); | 881 | raw_spin_unlock_irq(&logbuf_lock); |
| 880 | 882 | ||
| 881 | if (len > 0 && copy_to_user(buf, text, len)) | 883 | if (len > size) |
| 884 | len = -EINVAL; | ||
| 885 | else if (len > 0 && copy_to_user(buf, text, len)) | ||
| 882 | len = -EFAULT; | 886 | len = -EFAULT; |
| 883 | 887 | ||
| 884 | kfree(text); | 888 | kfree(text); |
| @@ -909,7 +913,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) · 24 unmodified lines | |||
| 909 | /* | 913 | /* |
| 910 | * Find first record that fits, including all following records, | 914 | * Find first record that fits, including all following records, |
| 911 | * into the user-provided buffer for this dump. | 915 | * into the user-provided buffer for this dump. |
| 912 | */ | 916 | */ |
| 913 | seq = clear_seq; | 917 | seq = clear_seq; |
| 914 | idx = clear_idx; | 918 | idx = clear_idx; |
| 915 | while (seq < log_next_seq) { | 919 | while (seq < log_next_seq) { |
| @@ -919,6 +923,8 @@ static int syslog_print_all(char __user *buf, int size, bool clear) · 3 unmodified lines | |||
| 919 | idx = log_next(idx); | 923 | idx = log_next(idx); |
| 920 | seq++; | 924 | seq++; |
| 921 | } | 925 | } |
| 926 | |||
| 927 | /* move first record forward until length fits into the buffer */ | ||
| 922 | seq = clear_seq; | 928 | seq = clear_seq; |
| 923 | idx = clear_idx; | 929 | idx = clear_idx; |
| 924 | while (len > size && seq < log_next_seq) { | 930 | while (len > size && seq < log_next_seq) { |
| @@ -929,7 +935,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) · 4 unmodified lines | |||
| 929 | seq++; | 935 | seq++; |
| 930 | } | 936 | } |
| 931 | 937 | ||
| 932 | /* last message in this dump */ | 938 | /* last message fitting into this dump */ |
| 933 | next_seq = log_next_seq; | 939 | next_seq = log_next_seq; |
| 934 | 940 | ||
| 935 | len = 0; | 941 | len = 0; |
| @@ -974,6 +980,7 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) · 38 unmodified lines | |||
| 974 | { | 980 | { |
| 975 | bool clear = false; | 981 | bool clear = false; |
| 976 | static int saved_console_loglevel = -1; | 982 | static int saved_console_loglevel = -1; |
| 983 | static DEFINE_MUTEX(syslog_mutex); | ||
| 977 | int error; | 984 | int error; |
| 978 | 985 | ||
| 979 | error = check_syslog_permissions(type, from_file); | 986 | error = check_syslog_permissions(type, from_file); |
| @@ -1000,11 +1007,17 @@ int do_syslog(int type, char __user *buf, int len, bool from_file) · 20 unmodified lines | |||
| 1000 | error = -EFAULT; | 1007 | error = -EFAULT; |
| 1001 | goto out; | 1008 | goto out; |
| 1002 | } | 1009 | } |
| 1010 | error = mutex_lock_interruptible(&syslog_mutex); | ||
| 1011 | if (error) | ||
| 1012 | goto out; | ||
| 1003 | error = wait_event_interruptible(log_wait, | 1013 | error = wait_event_interruptible(log_wait, |
| 1004 | syslog_seq != log_next_seq); | 1014 | syslog_seq != log_next_seq); |
| 1005 | if (error) | 1015 | if (error) { |
| 1016 | mutex_unlock(&syslog_mutex); | ||
| 1006 | goto out; | 1017 | goto out; |
| 1018 | } | ||
| 1007 | error = syslog_print(buf, len); | 1019 | error = syslog_print(buf, len); |
| 1020 | mutex_unlock(&syslog_mutex); | ||
| 1008 | break; | 1021 | break; |
| 1009 | /* Read/clear last kernel messages */ | 1022 | /* Read/clear last kernel messages */ |
| 1010 | case SYSLOG_ACTION_READ_CLEAR: | 1023 | case SYSLOG_ACTION_READ_CLEAR: |
| @@ -2300,48 +2313,210 @@ module_param_named(always_kmsg_dump, always_kmsg_dump, bool, S_IRUGO | S_IWUSR); · 1289 unmodified lines | |||
| 2300 | * kmsg_dump - dump kernel log to kernel message dumpers. | 2313 | * kmsg_dump - dump kernel log to kernel message dumpers. |
| 2301 | * @reason: the reason (oops, panic etc) for dumping | 2314 | * @reason: the reason (oops, panic etc) for dumping |
| 2302 | * | 2315 | * |
| 2303 | * Iterate through each of the dump devices and call the oops/panic | 2316 | * Call each of the registered dumper's dump() callback, which can |
| 2304 | * callbacks with the log buffer. | 2317 | * retrieve the kmsg records with kmsg_dump_get_line() or |
| 2318 | * kmsg_dump_get_buffer(). | ||
| 2305 | */ | 2319 | */ |
| 2306 | void kmsg_dump(enum kmsg_dump_reason reason) | 2320 | void kmsg_dump(enum kmsg_dump_reason reason) |
| 2307 | { | 2321 | { |
| 2308 | u64 idx; | ||
| 2309 | struct kmsg_dumper *dumper; | 2322 | struct kmsg_dumper *dumper; |
| 2310 | const char *s1, *s2; | ||
| 2311 | unsigned long l1, l2; | ||
| 2312 | unsigned long flags; | 2323 | unsigned long flags; |
| 2313 | 2324 | ||
| 2314 | if ((reason > KMSG_DUMP_OOPS) && !always_kmsg_dump) | 2325 | if ((reason > KMSG_DUMP_OOPS) && !always_kmsg_dump) |
| 2315 | return; | 2326 | return; |
| 2316 | 2327 | ||
| 2317 | /* Theoretically, the log could move on after we do this, but | 2328 | rcu_read_lock(); |
| 2318 | there's not a lot we can do about that. The new messages | 2329 | list_for_each_entry_rcu(dumper, &dump_list, list) { |
| 2319 | will overwrite the start of what we dump. */ | 2330 | if (dumper->max_reason && reason > dumper->max_reason) |
| 2331 | continue; | ||
| 2332 | |||
| 2333 | /* initialize iterator with data about the stored records */ | ||
| 2334 | dumper->active = true; | ||
| 2335 | |||
| 2336 | raw_spin_lock_irqsave(&logbuf_lock, flags); | ||
| 2337 | dumper->cur_seq = clear_seq; | ||
| 2338 | dumper->cur_idx = clear_idx; | ||
| 2339 | dumper->next_seq = log_next_seq; | ||
| 2340 | dumper->next_idx = log_next_idx; | ||
| 2341 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); | ||
| 2342 | |||
| 2343 | /* invoke dumper which will iterate over records */ | ||
| 2344 | dumper->dump(dumper, reason); | ||
| 2345 | |||
| 2346 | /* reset iterator */ | ||
| 2347 | dumper->active = false; | ||
| 2348 | } | ||
| 2349 | rcu_read_unlock(); | ||
| 2350 | } | ||
| 2351 | |||
| 2352 | /** | ||
| 2353 | * kmsg_dump_get_line - retrieve one kmsg log line | ||
| 2354 | * @dumper: registered kmsg dumper | ||
| 2355 | * @syslog: include the "<4>" prefixes | ||
| 2356 | * @line: buffer to copy the line to | ||
| 2357 | * @size: maximum size of the buffer | ||
| 2358 | * @len: length of line placed into buffer | ||
| 2359 | * | ||
| 2360 | * Start at the beginning of the kmsg buffer, with the oldest kmsg | ||
| 2361 | * record, and copy one record into the provided buffer. | ||
| 2362 | * | ||
| 2363 | * Consecutive calls will return the next available record moving | ||
| 2364 | * towards the end of the buffer with the youngest messages. | ||
| 2365 | * | ||
| 2366 | * A return value of FALSE indicates that there are no more records to | ||
| 2367 | * read. | ||
| 2368 | */ | ||
| 2369 | bool kmsg_dump_get_line(struct kmsg_dumper *dumper, bool syslog, | ||
| 2370 | char *line, size_t size, size_t *len) | ||
| 2371 | { | ||
| 2372 | unsigned long flags; | ||
| 2373 | struct log *msg; | ||
| 2374 | size_t l = 0; | ||
| 2375 | bool ret = false; | ||
| 2376 | |||
| 2377 | if (!dumper->active) | ||
| 2378 | goto out; | ||
| 2320 | 2379 | ||
| 2321 | raw_spin_lock_irqsave(&logbuf_lock, flags); | 2380 | raw_spin_lock_irqsave(&logbuf_lock, flags); |
| 2322 | if (syslog_seq < log_first_seq) | 2381 | if (dumper->cur_seq < log_first_seq) { |
| 2323 | idx = syslog_idx; | 2382 | /* messages are gone, move to first available one */ |
| 2324 | else | 2383 | dumper->cur_seq = log_first_seq; |
| 2325 | idx = log_first_idx; | 2384 | dumper->cur_idx = log_first_idx; |
| 2385 | } | ||
| 2386 | |||
| 2387 | /* last entry */ | ||
| 2388 | if (dumper->cur_seq >= log_next_seq) { | ||
| 2389 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); | ||
| 2390 | goto out; | ||
| 2391 | } | ||
| 2326 | 2392 | ||
| 2327 | if (idx > log_next_idx) { | 2393 | msg = log_from_idx(dumper->cur_idx); |
| 2328 | s1 = log_buf; | 2394 | l = msg_print_text(msg, syslog, |
| 2329 | l1 = log_next_idx; | 2395 | line, size); |
| 2330 | 2396 | ||
| 2331 | s2 = log_buf + idx; | 2397 | dumper->cur_idx = log_next(dumper->cur_idx); |
| 2332 | l2 = log_buf_len - idx; | 2398 | dumper->cur_seq++; |
| 2333 | } else { | 2399 | ret = true; |
| 2334 | s1 = ""; | 2400 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); |
| 2335 | l1 = 0; | 2401 | out: |
| 2402 | if (len) | ||
| 2403 | *len = l; | ||
| 2404 | return ret; | ||
| 2405 | } | ||
| 2406 | EXPORT_SYMBOL_GPL(kmsg_dump_get_line); | ||
| 2407 | |||
| 2408 | /** | ||
| 2409 | * kmsg_dump_get_buffer - copy kmsg log lines | ||
| 2410 | * @dumper: registered kmsg dumper | ||
| 2411 | * @syslog: include the "<4>" prefixes | ||
| 2412 | * @line: buffer to copy the line to | ||
| 2413 | * @size: maximum size of the buffer | ||
| 2414 | * @len: length of line placed into buffer | ||
| 2415 | * | ||
| 2416 | * Start at the end of the kmsg buffer and fill the provided buffer | ||
| 2417 | * with as many of the the *youngest* kmsg records that fit into it. | ||
| 2418 | * If the buffer is large enough, all available kmsg records will be | ||
| 2419 | * copied with a single call. | ||
| 2420 | * | ||
| 2421 | * Consecutive calls will fill the buffer with the next block of | ||
| 2422 | * available older records, not including the earlier retrieved ones. | ||
| 2423 | * | ||
| 2424 | * A return value of FALSE indicates that there are no more records to | ||
| 2425 | * read. | ||
| 2426 | */ | ||
| 2427 | bool kmsg_dump_get_buffer(struct kmsg_dumper *dumper, bool syslog, | ||
| 2428 | char *buf, size_t size, size_t *len) | ||
| 2429 | { | ||
| 2430 | unsigned long flags; | ||
| 2431 | u64 seq; | ||
| 2432 | u32 idx; | ||
| 2433 | u64 next_seq; | ||
| 2434 | u32 next_idx; | ||
| 2435 | size_t l = 0; | ||
| 2436 | bool ret = false; | ||
| 2437 | |||
| 2438 | if (!dumper->active) | ||
| 2439 | goto out; | ||
| 2440 | |||
| 2441 | raw_spin_lock_irqsave(&logbuf_lock, flags); | ||
| 2442 | if (dumper->cur_seq < log_first_seq) { | ||
| 2443 | /* messages are gone, move to first available one */ | ||
| 2444 | dumper->cur_seq = log_first_seq; | ||
| 2445 | dumper->cur_idx = log_first_idx; | ||
| 2446 | } | ||
| 2447 | |||
| 2448 | /* last entry */ | ||
| 2449 | if (dumper->cur_seq >= dumper->next_seq) { | ||
| 2450 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); | ||
| 2451 | goto out; | ||
| 2452 | } | ||
| 2453 | |||
| 2454 | /* calculate length of entire buffer */ | ||
| 2455 | seq = dumper->cur_seq; | ||
| 2456 | idx = dumper->cur_idx; | ||
| 2457 | while (seq < dumper->next_seq) { | ||
| 2458 | struct log *msg = log_from_idx(idx); | ||
| 2459 | |||
| 2460 | l += msg_print_text(msg, true, NULL, 0); | ||
| 2461 | idx = log_next(idx); | ||
| 2462 | seq++; | ||
| 2463 | } | ||
| 2336 | 2464 | ||
| 2337 | s2 = log_buf + idx; | 2465 | /* move first record forward until length fits into the buffer */ |
| 2338 | l2 = log_next_idx - idx; | 2466 | seq = dumper->cur_seq; |
| 2467 | idx = dumper->cur_idx; | ||
| 2468 | while (l > size && seq < dumper->next_seq) { | ||
| 2469 | struct log *msg = log_from_idx(idx); | ||
| 2470 | |||
| 2471 | l -= msg_print_text(msg, true, NULL, 0); | ||
| 2472 | idx = log_next(idx); | ||
| 2473 | seq++; | ||
| 2474 | } | ||
| 2475 | |||
| 2476 | /* last message in next interation */ | ||
| 2477 | next_seq = seq; | ||
| 2478 | next_idx = idx; | ||
| 2479 | |||
| 2480 | l = 0; | ||
| 2481 | while (seq < dumper->next_seq) { | ||
| 2482 | struct log *msg = log_from_idx(idx); | ||
| 2483 | |||
| 2484 | l += msg_print_text(msg, syslog, | ||
| 2485 | buf + l, size - l); | ||
| 2486 | |||
| 2487 | idx = log_next(idx); | ||
| 2488 | seq++; | ||
| 2339 | } | 2489 | } |
| 2490 | |||
| 2491 | dumper->next_seq = next_seq; | ||
| 2492 | dumper->next_idx = next_idx; | ||
| 2493 | ret = true; | ||
| 2340 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); | 2494 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); |
| 2495 | out: | ||
| 2496 | if (len) | ||
| 2497 | *len = l; | ||
| 2498 | return ret; | ||
| 2499 | } | ||
| 2500 | EXPORT_SYMBOL_GPL(kmsg_dump_get_buffer); | ||
| 2341 | 2501 | ||
| 2342 | rcu_read_lock(); | 2502 | /** |
| 2343 | list_for_each_entry_rcu(dumper, &dump_list, list) | 2503 | * kmsg_dump_rewind - reset the interator |
| 2344 | dumper->dump(dumper, reason, s1, l1, s2, l2); | 2504 | * @dumper: registered kmsg dumper |
| 2345 | rcu_read_unlock(); | 2505 | * |
| 2506 | * Reset the dumper's iterator so that kmsg_dump_get_line() and | ||
| 2507 | * kmsg_dump_get_buffer() can be called again and used multiple | ||
| 2508 | * times within the same dumper.dump() callback. | ||
| 2509 | */ | ||
| 2510 | void kmsg_dump_rewind(struct kmsg_dumper *dumper) | ||
| 2511 | { | ||
| 2512 | unsigned long flags; | ||
| 2513 | |||
| 2514 | raw_spin_lock_irqsave(&logbuf_lock, flags); | ||
| 2515 | dumper->cur_seq = clear_seq; | ||
| 2516 | dumper->cur_idx = clear_idx; | ||
| 2517 | dumper->next_seq = log_next_seq; | ||
| 2518 | dumper->next_idx = log_next_idx; | ||
| 2519 | raw_spin_unlock_irqrestore(&logbuf_lock, flags); | ||
| 2346 | } | 2520 | } |
| 2521 | EXPORT_SYMBOL_GPL(kmsg_dump_rewind); | ||
| 2347 | #endif | 2522 | #endif |
| @@ -2127,9 +2127,6 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, · 2126 unmodified lines | |||
| 2127 | else | 2127 | else |
| 2128 | return -EINVAL; | 2128 | return -EINVAL; |
| 2129 | break; | 2129 | break; |
| 2130 | case PR_GET_TID_ADDRESS: | ||
| 2131 | error = prctl_get_tid_address(me, (int __user **)arg2); | ||
| 2132 | break; | ||
| 2133 | default: | 2130 | default: |
| 2134 | return -EINVAL; | 2131 | return -EINVAL; |
| 2135 | } | 2132 | } |
| @@ -2147,6 +2144,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, · 11 unmodified lines | |||
| 2147 | case PR_SET_MM: | 2144 | case PR_SET_MM: |
| 2148 | error = prctl_set_mm(arg2, arg3, arg4, arg5); | 2145 | error = prctl_set_mm(arg2, arg3, arg4, arg5); |
| 2149 | break; | 2146 | break; |
| 2147 | case PR_GET_TID_ADDRESS: | ||
| 2148 | error = prctl_get_tid_address(me, (int __user **)arg2); | ||
| 2149 | break; | ||
| 2150 | case PR_SET_CHILD_SUBREAPER: | 2150 | case PR_SET_CHILD_SUBREAPER: |
| 2151 | me->signal->is_child_subreaper = !!arg2; | 2151 | me->signal->is_child_subreaper = !!arg2; |
| 2152 | error = 0; | 2152 | error = 0; |
| @@ -101,6 +101,10 @@ static inline bool fail_stacktrace(struct fault_attr *attr) · 100 unmodified lines | |||
| 101 | 101 | ||
| 102 | bool should_fail(struct fault_attr *attr, ssize_t size) | 102 | bool should_fail(struct fault_attr *attr, ssize_t size) |
| 103 | { | 103 | { |
| 104 | /* No need to check any other properties if the probability is 0 */ | ||
| 105 | if (attr->probability == 0) | ||
| 106 | return false; | ||
| 107 | |||
| 104 | if (attr->task_filter && !fail_task(attr, current)) | 108 | if (attr->task_filter && !fail_task(attr, current)) |
| 105 | return false; | 109 | return false; |
| 106 | 110 | ||
| @@ -184,7 +184,24 @@ static void __init_memblock memblock_remove_region(struct memblock_type *type, u · 183 unmodified lines | |||
| 184 | } | 184 | } |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static int __init_memblock memblock_double_array(struct memblock_type *type) | 187 | /** |
| 188 | * memblock_double_array - double the size of the memblock regions array | ||
| 189 | * @type: memblock type of the regions array being doubled | ||
| 190 | * @new_area_start: starting address of memory range to avoid overlap with | ||
| 191 | * @new_area_size: size of memory range to avoid overlap with | ||
| 192 | * | ||
| 193 | * Double the size of the @type regions array. If memblock is being used to | ||
| 194 | * allocate memory for a new reserved regions array and there is a previously | ||
| 195 | * allocated memory range [@new_area_start,@new_area_start+@new_area_size] | ||
| 196 | * waiting to be reserved, ensure the memory used by the new array does | ||
| 197 | * not overlap. | ||
| 198 | * | ||
| 199 | * RETURNS: | ||
| 200 | * 0 on success, -1 on failure. | ||
| 201 | */ | ||
| 202 | static int __init_memblock memblock_double_array(struct memblock_type *type, | ||
| 203 | phys_addr_t new_area_start, | ||
| 204 | phys_addr_t new_area_size) | ||
| 188 | { | 205 | { |
| 189 | struct memblock_region *new_array, *old_array; | 206 | struct memblock_region *new_array, *old_array; |
| 190 | phys_addr_t old_size, new_size, addr; | 207 | phys_addr_t old_size, new_size, addr; |
| @@ -222,7 +239,18 @@ static int __init_memblock memblock_double_array(struct memblock_type *type) · 31 unmodified lines | |||
| 222 | new_array = kmalloc(new_size, GFP_KERNEL); | 239 | new_array = kmalloc(new_size, GFP_KERNEL); |
| 223 | addr = new_array ? __pa(new_array) : 0; | 240 | addr = new_array ? __pa(new_array) : 0; |
| 224 | } else { | 241 | } else { |
| 225 | addr = memblock_find_in_range(0, MEMBLOCK_ALLOC_ACCESSIBLE, new_size, sizeof(phys_addr_t)); | 242 | /* only exclude range when trying to double reserved.regions */ |
| 243 | if (type != &memblock.reserved) | ||
| 244 | new_area_start = new_area_size = 0; | ||
| 245 | |||
| 246 | addr = memblock_find_in_range(new_area_start + new_area_size, | ||
| 247 | memblock.current_limit, | ||
| 248 | new_size, sizeof(phys_addr_t)); | ||
| 249 | if (!addr && new_area_size) | ||
| 250 | addr = memblock_find_in_range(0, | ||
| 251 | min(new_area_start, memblock.current_limit), | ||
| 252 | new_size, sizeof(phys_addr_t)); | ||
| 253 | |||
| 226 | new_array = addr ? __va(addr) : 0; | 254 | new_array = addr ? __va(addr) : 0; |
| 227 | } | 255 | } |
| 228 | if (!addr) { | 256 | if (!addr) { |
| @@ -399,7 +427,7 @@ repeat: · 170 unmodified lines | |||
| 399 | */ | 427 | */ |
| 400 | if (!insert) { | 428 | if (!insert) { |
| 401 | while (type->cnt + nr_new > type->max) | 429 | while (type->cnt + nr_new > type->max) |
| 402 | if (memblock_double_array(type) < 0) | 430 | if (memblock_double_array(type, obase, size) < 0) |
| 403 | return -ENOMEM; | 431 | return -ENOMEM; |
| 404 | insert = true; | 432 | insert = true; |
| 405 | goto repeat; | 433 | goto repeat; |
| @@ -450,7 +478,7 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type, · 44 unmodified lines | |||
| 450 | 478 | ||
| 451 | /* we'll create at most two more regions */ | 479 | /* we'll create at most two more regions */ |
| 452 | while (type->cnt + 2 > type->max) | 480 | while (type->cnt + 2 > type->max) |
| 453 | if (memblock_double_array(type) < 0) | 481 | if (memblock_double_array(type, base, size) < 0) |
| 454 | return -ENOMEM; | 482 | return -ENOMEM; |
| 455 | 483 | ||
| 456 | for (i = 0; i < type->cnt; i++) { | 484 | for (i = 0; i < type->cnt; i++) { |
| @@ -540,9 +568,9 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) · 83 unmodified lines | |||
| 540 | * __next_free_mem_range - next function for for_each_free_mem_range() | 568 | * __next_free_mem_range - next function for for_each_free_mem_range() |
| 541 | * @idx: pointer to u64 loop variable | 569 | * @idx: pointer to u64 loop variable |
| 542 | * @nid: nid: node selector, %MAX_NUMNODES for all nodes | 570 | * @nid: nid: node selector, %MAX_NUMNODES for all nodes |
| 543 | * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL | 571 | * @out_start: ptr to phys_addr_t for start address of the range, can be %NULL |
| 544 | * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL | 572 | * @out_end: ptr to phys_addr_t for end address of the range, can be %NULL |
| 545 | * @p_nid: ptr to int for nid of the range, can be %NULL | 573 | * @out_nid: ptr to int for nid of the range, can be %NULL |
| 546 | * | 574 | * |
| 547 | * Find the first free area from *@idx which matches @nid, fill the out | 575 | * Find the first free area from *@idx which matches @nid, fill the out |
| 548 | * parameters, and update *@idx for the next iteration. The lower 32bit of | 576 | * parameters, and update *@idx for the next iteration. The lower 32bit of |
| @@ -616,9 +644,9 @@ void __init_memblock __next_free_mem_range(u64 *idx, int nid, · 67 unmodified lines | |||
| 616 | * __next_free_mem_range_rev - next function for for_each_free_mem_range_reverse() | 644 | * __next_free_mem_range_rev - next function for for_each_free_mem_range_reverse() |
| 617 | * @idx: pointer to u64 loop variable | 645 | * @idx: pointer to u64 loop variable |
| 618 | * @nid: nid: node selector, %MAX_NUMNODES for all nodes | 646 | * @nid: nid: node selector, %MAX_NUMNODES for all nodes |
| 619 | * @p_start: ptr to phys_addr_t for start address of the range, can be %NULL | 647 | * @out_start: ptr to phys_addr_t for start address of the range, can be %NULL |
| 620 | * @p_end: ptr to phys_addr_t for end address of the range, can be %NULL | 648 | * @out_end: ptr to phys_addr_t for end address of the range, can be %NULL |
| 621 | * @p_nid: ptr to int for nid of the range, can be %NULL | 649 | * @out_nid: ptr to int for nid of the range, can be %NULL |
| 622 | * | 650 | * |
| 623 | * Reverse of __next_free_mem_range(). | 651 | * Reverse of __next_free_mem_range(). |
| 624 | */ | 652 | */ |
| @@ -1148,7 +1148,7 @@ bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg, · 1147 unmodified lines | |||
| 1148 | { | 1148 | { |
| 1149 | if (root_memcg == memcg) | 1149 | if (root_memcg == memcg) |
| 1150 | return true; | 1150 | return true; |
| 1151 | if (!root_memcg->use_hierarchy) | 1151 | if (!root_memcg->use_hierarchy || !memcg) |
| 1152 | return false; | 1152 | return false; |
| 1153 | return css_is_ancestor(&memcg->css, &root_memcg->css); | 1153 | return css_is_ancestor(&memcg->css, &root_memcg->css); |
| 1154 | } | 1154 | } |
| @@ -1234,7 +1234,7 @@ int mem_cgroup_inactive_file_is_low(struct lruvec *lruvec) · 79 unmodified lines | |||
| 1234 | 1234 | ||
| 1235 | /** | 1235 | /** |
| 1236 | * mem_cgroup_margin - calculate chargeable space of a memory cgroup | 1236 | * mem_cgroup_margin - calculate chargeable space of a memory cgroup |
| 1237 | * @mem: the memory cgroup | 1237 | * @memcg: the memory cgroup |
| 1238 | * | 1238 | * |
| 1239 | * Returns the maximum amount of memory @mem can be charged with, in | 1239 | * Returns the maximum amount of memory @mem can be charged with, in |
| 1240 | * pages. | 1240 | * pages. |
| @@ -1508,7 +1508,7 @@ static unsigned long mem_cgroup_reclaim(struct mem_cgroup *memcg, · 267 unmodified lines | |||
| 1508 | 1508 | ||
| 1509 | /** | 1509 | /** |
| 1510 | * test_mem_cgroup_node_reclaimable | 1510 | * test_mem_cgroup_node_reclaimable |
| 1511 | * @mem: the target memcg | 1511 | * @memcg: the target memcg |
| 1512 | * @nid: the node ID to be checked. | 1512 | * @nid: the node ID to be checked. |
| 1513 | * @noswap : specify true here if the user wants flle only information. | 1513 | * @noswap : specify true here if the user wants flle only information. |
| 1514 | * | 1514 | * |
| @@ -1225,7 +1225,15 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb, · 1224 unmodified lines | |||
| 1225 | next = pmd_addr_end(addr, end); | 1225 | next = pmd_addr_end(addr, end); |
| 1226 | if (pmd_trans_huge(*pmd)) { | 1226 | if (pmd_trans_huge(*pmd)) { |
| 1227 | if (next - addr != HPAGE_PMD_SIZE) { | 1227 | if (next - addr != HPAGE_PMD_SIZE) { |
| 1228 | VM_BUG_ON(!rwsem_is_locked(&tlb->mm->mmap_sem)); | 1228 | #ifdef CONFIG_DEBUG_VM |
| 1229 | if (!rwsem_is_locked(&tlb->mm->mmap_sem)) { | ||
| 1230 | pr_err("%s: mmap_sem is unlocked! addr=0x%lx end=0x%lx vma->vm_start=0x%lx vma->vm_end=0x%lx\n", | ||
| 1231 | __func__, addr, end, | ||
| 1232 | vma->vm_start, | ||
| 1233 | vma->vm_end); | ||
| 1234 | BUG(); | ||
| 1235 | } | ||
| 1236 | #endif | ||
| 1229 | split_huge_page_pmd(vma->vm_mm, pmd); | 1237 | split_huge_page_pmd(vma->vm_mm, pmd); |
| 1230 | } else if (zap_huge_pmd(tlb, vma, pmd, addr)) | 1238 | } else if (zap_huge_pmd(tlb, vma, pmd, addr)) |
| 1231 | goto next; | 1239 | goto next; |
| @@ -1366,7 +1374,7 @@ void unmap_vmas(struct mmu_gather *tlb, · 134 unmodified lines | |||
| 1366 | /** | 1374 | /** |
| 1367 | * zap_page_range - remove user pages in a given range | 1375 | * zap_page_range - remove user pages in a given range |
| 1368 | * @vma: vm_area_struct holding the applicable pages | 1376 | * @vma: vm_area_struct holding the applicable pages |
| 1369 | * @address: starting address of pages to zap | 1377 | * @start: starting address of pages to zap |
| 1370 | * @size: number of bytes to zap | 1378 | * @size: number of bytes to zap |
| 1371 | * @details: details of nonlinear truncation or shared cache invalidation | 1379 | * @details: details of nonlinear truncation or shared cache invalidation |
| 1372 | * | 1380 | * |
| @@ -1177,7 +1177,7 @@ static long do_mbind(unsigned long start, unsigned long len, · 1176 unmodified lines | |||
| 1177 | if (!list_empty(&pagelist)) { | 1177 | if (!list_empty(&pagelist)) { |
| 1178 | nr_failed = migrate_pages(&pagelist, new_vma_page, | 1178 | nr_failed = migrate_pages(&pagelist, new_vma_page, |
| 1179 | (unsigned long)vma, | 1179 | (unsigned long)vma, |
| 1180 | false, true); | 1180 | false, MIGRATE_SYNC); |
| 1181 | if (nr_failed) | 1181 | if (nr_failed) |
| 1182 | putback_lru_pages(&pagelist); | 1182 | putback_lru_pages(&pagelist); |
| 1183 | } | 1183 | } |
| @@ -184,6 +184,7 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, · 183 unmodified lines | |||
| 184 | const nodemask_t *nodemask, unsigned long totalpages) | 184 | const nodemask_t *nodemask, unsigned long totalpages) |
| 185 | { | 185 | { |
| 186 | long points; | 186 | long points; |
| 187 | long adj; | ||
| 187 | 188 | ||
| 188 | if (oom_unkillable_task(p, memcg, nodemask)) | 189 | if (oom_unkillable_task(p, memcg, nodemask)) |
| 189 | return 0; | 190 | return 0; |
| @@ -192,7 +193,8 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, · 2 unmodified lines | |||
| 192 | if (!p) | 193 | if (!p) |
| 193 | return 0; | 194 | return 0; |
| 194 | 195 | ||
| 195 | if (p->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) { | 196 | adj = p->signal->oom_score_adj; |
| 197 | if (adj == OOM_SCORE_ADJ_MIN) { | ||
| 196 | task_unlock(p); | 198 | task_unlock(p); |
| 197 | return 0; | 199 | return 0; |
| 198 | } | 200 | } |
| @@ -210,14 +212,11 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, · 11 unmodified lines | |||
| 210 | * implementation used by LSMs. | 212 | * implementation used by LSMs. |
| 211 | */ | 213 | */ |
| 212 | if (has_capability_noaudit(p, CAP_SYS_ADMIN)) | 214 | if (has_capability_noaudit(p, CAP_SYS_ADMIN)) |
| 213 | points -= 30 * totalpages / 1000; | 215 | adj -= 30; |
| 214 | 216 | ||
| 215 | /* | 217 | /* Normalize to oom_score_adj units */ |
| 216 | * /proc/pid/oom_score_adj ranges from -1000 to +1000 such that it may | 218 | adj *= totalpages / 1000; |
| 217 | * either completely disable oom killing or always prefer a certain | 219 | points += adj; |
| 218 | * task. | ||
| 219 | */ | ||
| 220 | points += p->signal->oom_score_adj * totalpages / 1000; | ||
| 221 | 220 | ||
| 222 | /* | 221 | /* |
| 223 | * Never return 0 for an eligible task regardless of the root bonus and | 222 | * Never return 0 for an eligible task regardless of the root bonus and |
| @@ -366,7 +365,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints, · 142 unmodified lines | |||
| 366 | 365 | ||
| 367 | /** | 366 | /** |
| 368 | * dump_tasks - dump current memory state of all system tasks | 367 | * dump_tasks - dump current memory state of all system tasks |
| 369 | * @mem: current's memory controller, if constrained | 368 | * @memcg: current's memory controller, if constrained |
| 370 | * @nodemask: nodemask passed to page allocator for mempolicy ooms | 369 | * @nodemask: nodemask passed to page allocator for mempolicy ooms |
| 371 | * | 370 | * |
| 372 | * Dumps the current memory state of all eligible tasks. Tasks not in the same | 371 | * Dumps the current memory state of all eligible tasks. Tasks not in the same |
| @@ -392,7 +392,7 @@ static struct swap_cgroup *lookup_swap_cgroup(swp_entry_t ent, · 391 unmodified lines | |||
| 392 | 392 | ||
| 393 | /** | 393 | /** |
| 394 | * swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. | 394 | * swap_cgroup_cmpxchg - cmpxchg mem_cgroup's id for this swp_entry. |
| 395 | * @end: swap entry to be cmpxchged | 395 | * @ent: swap entry to be cmpxchged |
| 396 | * @old: old id | 396 | * @old: old id |
| 397 | * @new: new id | 397 | * @new: new id |
| 398 | * | 398 | * |
| @@ -422,7 +422,7 @@ unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, · 23 unmodified lines | |||
| 422 | /** | 422 | /** |
| 423 | * swap_cgroup_record - record mem_cgroup for this swp_entry. | 423 | * swap_cgroup_record - record mem_cgroup for this swp_entry. |
| 424 | * @ent: swap entry to be recorded into | 424 | * @ent: swap entry to be recorded into |
| 425 | * @mem: mem_cgroup to be recorded | 425 | * @id: mem_cgroup to be recorded |
| 426 | * | 426 | * |
| 427 | * Returns old value at success, 0 at failure. | 427 | * Returns old value at success, 0 at failure. |
| 428 | * (Of course, old value can be 0.) | 428 | * (Of course, old value can be 0.) |
| @@ -162,7 +162,6 @@ static int walk_hugetlb_range(struct vm_area_struct *vma, · 161 unmodified lines | |||
| 162 | 162 | ||
| 163 | /** | 163 | /** |
| 164 | * walk_page_range - walk a memory map's page tables with a callback | 164 | * walk_page_range - walk a memory map's page tables with a callback |
| 165 | * @mm: memory map to walk | ||
| 166 | * @addr: starting address | 165 | * @addr: starting address |
| 167 | * @end: ending address | 166 | * @end: ending address |
| 168 | * @walk: set of callbacks to invoke for each level of the tree | 167 | * @walk: set of callbacks to invoke for each level of the tree |
| @@ -360,7 +360,6 @@ err_free: · 359 unmodified lines | |||
| 360 | * @chunk: chunk to depopulate | 360 | * @chunk: chunk to depopulate |
| 361 | * @off: offset to the area to depopulate | 361 | * @off: offset to the area to depopulate |
| 362 | * @size: size of the area to depopulate in bytes | 362 | * @size: size of the area to depopulate in bytes |
| 363 | * @flush: whether to flush cache and tlb or not | ||
| 364 | * | 363 | * |
| 365 | * For each cpu, depopulate and unmap pages [@page_start,@page_end) | 364 | * For each cpu, depopulate and unmap pages [@page_start,@page_end) |
| 366 | * from @chunk. If @flush is true, vcache is flushed before unmapping | 365 | * from @chunk. If @flush is true, vcache is flushed before unmapping |
| @@ -192,10 +192,10 @@ static int pack_sg_list(struct scatterlist *sg, int start, · 191 unmodified lines | |||
| 192 | s = rest_of_page(data); | 192 | s = rest_of_page(data); |
| 193 | if (s > count) | 193 | if (s > count) |
| 194 | s = count; | 194 | s = count; |
| 195 | BUG_ON(index > limit); | ||
| 195 | sg_set_buf(&sg[index++], data, s); | 196 | sg_set_buf(&sg[index++], data, s); |
| 196 | count -= s; | 197 | count -= s; |
| 197 | data += s; | 198 | data += s; |
| 198 | BUG_ON(index > limit); | ||
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | return index-start; | 201 | return index-start; |
| @@ -504,13 +504,6 @@ void ceph_destroy_client(struct ceph_client *client) · 503 unmodified lines | |||
| 504 | /* unmount */ | 504 | /* unmount */ |
| 505 | ceph_osdc_stop(&client->osdc); | 505 | ceph_osdc_stop(&client->osdc); |
| 506 | 506 | ||
| 507 | /* | ||
| 508 | * make sure osd connections close out before destroying the | ||
| 509 | * auth module, which is needed to free those connections' | ||
| 510 | * ceph_authorizers. | ||
| 511 | */ | ||
| 512 | ceph_msgr_flush(); | ||
| 513 | |||
| 514 | ceph_monc_stop(&client->monc); | 507 | ceph_monc_stop(&client->monc); |
| 515 | 508 | ||
| 516 | ceph_debugfs_client_cleanup(client); | 509 | ceph_debugfs_client_cleanup(client); |
| @@ -563,6 +563,10 @@ static void prepare_write_message(struct ceph_connection *con) · 562 unmodified lines | |||
| 563 | m->hdr.seq = cpu_to_le64(++con->out_seq); | 563 | m->hdr.seq = cpu_to_le64(++con->out_seq); |
| 564 | m->needs_out_seq = false; | 564 | m->needs_out_seq = false; |
| 565 | } | 565 | } |
| 566 | #ifdef CONFIG_BLOCK | ||
| 567 | else | ||
| 568 | m->bio_iter = NULL; | ||
| 569 | #endif | ||
| 566 | 570 | ||
| 567 | dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", | 571 | dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", |
| 568 | m, con->out_seq, le16_to_cpu(m->hdr.type), | 572 | m, con->out_seq, le16_to_cpu(m->hdr.type), |
| @@ -847,6 +847,14 @@ void ceph_monc_stop(struct ceph_mon_client *monc) · 846 unmodified lines | |||
| 847 | 847 | ||
| 848 | mutex_unlock(&monc->mutex); | 848 | mutex_unlock(&monc->mutex); |
| 849 | 849 | ||
| 850 | /* | ||
| 851 | * flush msgr queue before we destroy ourselves to ensure that: | ||
| 852 | * - any work that references our embedded con is finished. | ||
| 853 | * - any osd_client or other work that may reference an authorizer | ||
| 854 | * finishes before we shut down the auth subsystem. | ||
| 855 | */ | ||
| 856 | ceph_msgr_flush(); | ||
| 857 | |||
| 850 | ceph_auth_destroy(monc->auth); | 858 | ceph_auth_destroy(monc->auth); |
| 851 | 859 | ||
| 852 | ceph_msg_put(monc->m_auth); | 860 | ceph_msg_put(monc->m_auth); |
| @@ -139,15 +139,15 @@ void ceph_osdc_release_request(struct kref *kref) · 138 unmodified lines | |||
| 139 | 139 | ||
| 140 | if (req->r_request) | 140 | if (req->r_request) |
| 141 | ceph_msg_put(req->r_request); | 141 | ceph_msg_put(req->r_request); |
| 142 | if (req->r_reply) | ||
| 143 | ceph_msg_put(req->r_reply); | ||
| 144 | if (req->r_con_filling_msg) { | 142 | if (req->r_con_filling_msg) { |
| 145 | dout("release_request revoking pages %p from con %p\n", | 143 | dout("release_request revoking pages %p from con %p\n", |
| 146 | req->r_pages, req->r_con_filling_msg); | 144 | req->r_pages, req->r_con_filling_msg); |
| 147 | ceph_con_revoke_message(req->r_con_filling_msg, | 145 | ceph_con_revoke_message(req->r_con_filling_msg, |
| 148 | req->r_reply); | 146 | req->r_reply); |
| 149 | ceph_con_put(req->r_con_filling_msg); | 147 | req->r_con_filling_msg->ops->put(req->r_con_filling_msg); |
| 150 | } | 148 | } |
| 149 | if (req->r_reply) | ||
| 150 | ceph_msg_put(req->r_reply); | ||
| 151 | if (req->r_own_pages) | 151 | if (req->r_own_pages) |
| 152 | ceph_release_page_vector(req->r_pages, | 152 | ceph_release_page_vector(req->r_pages, |
| 153 | req->r_num_pages); | 153 | req->r_num_pages); |
| @@ -1216,7 +1216,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, · 1062 unmodified lines | |||
| 1216 | if (req->r_con_filling_msg == con && req->r_reply == msg) { | 1216 | if (req->r_con_filling_msg == con && req->r_reply == msg) { |
| 1217 | dout(" dropping con_filling_msg ref %p\n", con); | 1217 | dout(" dropping con_filling_msg ref %p\n", con); |
| 1218 | req->r_con_filling_msg = NULL; | 1218 | req->r_con_filling_msg = NULL; |
| 1219 | ceph_con_put(con); | 1219 | con->ops->put(con); |
| 1220 | } | 1220 | } |
| 1221 | 1221 | ||
| 1222 | if (!req->r_got_reply) { | 1222 | if (!req->r_got_reply) { |
| @@ -2028,7 +2028,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, · 805 unmodified lines | |||
| 2028 | dout("get_reply revoking msg %p from old con %p\n", | 2028 | dout("get_reply revoking msg %p from old con %p\n", |
| 2029 | req->r_reply, req->r_con_filling_msg); | 2029 | req->r_reply, req->r_con_filling_msg); |
| 2030 | ceph_con_revoke_message(req->r_con_filling_msg, req->r_reply); | 2030 | ceph_con_revoke_message(req->r_con_filling_msg, req->r_reply); |
| 2031 | ceph_con_put(req->r_con_filling_msg); | 2031 | req->r_con_filling_msg->ops->put(req->r_con_filling_msg); |
| 2032 | req->r_con_filling_msg = NULL; | 2032 | req->r_con_filling_msg = NULL; |
| 2033 | } | 2033 | } |
| 2034 | 2034 | ||
| @@ -2063,7 +2063,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, · 28 unmodified lines | |||
| 2063 | #endif | 2063 | #endif |
| 2064 | } | 2064 | } |
| 2065 | *skip = 0; | 2065 | *skip = 0; |
| 2066 | req->r_con_filling_msg = ceph_con_get(con); | 2066 | req->r_con_filling_msg = con->ops->get(con); |
| 2067 | dout("get_reply tid %lld %p\n", tid, m); | 2067 | dout("get_reply tid %lld %p\n", tid, m); |
| 2068 | 2068 | ||
| 2069 | out: | 2069 | out: |
| @@ -83,6 +83,8 @@ push(@signature_tags, "Signed-off-by:"); · 82 unmodified lines | |||
| 83 | push(@signature_tags, "Reviewed-by:"); | 83 | push(@signature_tags, "Reviewed-by:"); |
| 84 | push(@signature_tags, "Acked-by:"); | 84 | push(@signature_tags, "Acked-by:"); |
| 85 | 85 | ||
| 86 | my $signature_pattern = "\(" . join("|", @signature_tags) . "\)"; | ||
| 87 | |||
| 86 | # rfc822 email address - preloaded methods go here. | 88 | # rfc822 email address - preloaded methods go here. |
| 87 | my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; | 89 | my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; |
| 88 | my $rfc822_char = '[\\000-\\377]'; | 90 | my $rfc822_char = '[\\000-\\377]'; |
| @@ -473,7 +475,6 @@ my @subsystem = (); · 384 unmodified lines | |||
| 473 | my @status = (); | 475 | my @status = (); |
| 474 | my %deduplicate_name_hash = (); | 476 | my %deduplicate_name_hash = (); |
| 475 | my %deduplicate_address_hash = (); | 477 | my %deduplicate_address_hash = (); |
| 476 | my $signature_pattern; | ||
| 477 | 478 | ||
| 478 | my @maintainers = get_maintainers(); | 479 | my @maintainers = get_maintainers(); |
| 479 | 480 | ||
| @@ -4393,20 +4393,19 @@ void snd_hda_update_power_acct(struct hda_codec *codec) · 4392 unmodified lines | |||
| 4393 | codec->power_jiffies += delta; | 4393 | codec->power_jiffies += delta; |
| 4394 | } | 4394 | } |
| 4395 | 4395 | ||
| 4396 | /** | 4396 | /* Transition to powered up, if wait_power_down then wait for a pending |
| 4397 | * snd_hda_power_up - Power-up the codec | 4397 | * transition to D3 to complete. A pending D3 transition is indicated |
| 4398 | * @codec: HD-audio codec | 4398 | * with power_transition == -1. */ |
| 4399 | * | 4399 | static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) |
| 4400 | * Increment the power-up counter and power up the hardware really when | ||
| 4401 | * not turned on yet. | ||
| 4402 | */ | ||
| 4403 | void snd_hda_power_up(struct hda_codec *codec) | ||
| 4404 | { | 4400 | { |
| 4405 | struct hda_bus *bus = codec->bus; | 4401 | struct hda_bus *bus = codec->bus; |
| 4406 | 4402 | ||
| 4407 | spin_lock(&codec->power_lock); | 4403 | spin_lock(&codec->power_lock); |
| 4408 | codec->power_count++; | 4404 | codec->power_count++; |
| 4409 | if (codec->power_on || codec->power_transition > 0) { | 4405 | /* Return if power_on or transitioning to power_on, unless currently |
| 4406 | * powering down. */ | ||
| 4407 | if ((codec->power_on || codec->power_transition > 0) && | ||
| 4408 | !(wait_power_down && codec->power_transition < 0)) { | ||
| 4410 | spin_unlock(&codec->power_lock); | 4409 | spin_unlock(&codec->power_lock); |
| 4411 | return; | 4410 | return; |
| 4412 | } | 4411 | } |
| @@ -4430,8 +4429,37 @@ void snd_hda_power_up(struct hda_codec *codec) · 17 unmodified lines | |||
| 4430 | codec->power_transition = 0; | 4429 | codec->power_transition = 0; |
| 4431 | spin_unlock(&codec->power_lock); | 4430 | spin_unlock(&codec->power_lock); |
| 4432 | } | 4431 | } |
| 4432 | |||
| 4433 | /** | ||
| 4434 | * snd_hda_power_up - Power-up the codec | ||
| 4435 | * @codec: HD-audio codec | ||
| 4436 | * | ||
| 4437 | * Increment the power-up counter and power up the hardware really when | ||
| 4438 | * not turned on yet. | ||
| 4439 | */ | ||
| 4440 | void snd_hda_power_up(struct hda_codec *codec) | ||
| 4441 | { | ||
| 4442 | __snd_hda_power_up(codec, false); | ||
| 4443 | } | ||
| 4433 | EXPORT_SYMBOL_HDA(snd_hda_power_up); | 4444 | EXPORT_SYMBOL_HDA(snd_hda_power_up); |
| 4434 | 4445 | ||
| 4446 | /** | ||
| 4447 | * snd_hda_power_up_d3wait - Power-up the codec after waiting for any pending | ||
| 4448 | * D3 transition to complete. This differs from snd_hda_power_up() when | ||
| 4449 | * power_transition == -1. snd_hda_power_up sees this case as a nop, | ||
| 4450 | * snd_hda_power_up_d3wait waits for the D3 transition to complete then powers | ||
| 4451 | * back up. | ||
| 4452 | * @codec: HD-audio codec | ||
| 4453 | * | ||
| 4454 | * Cancel any power down operation hapenning on the work queue, then power up. | ||
| 4455 | */ | ||
| 4456 | void snd_hda_power_up_d3wait(struct hda_codec *codec) | ||
| 4457 | { | ||
| 4458 | /* This will cancel and wait for pending power_work to complete. */ | ||
| 4459 | __snd_hda_power_up(codec, true); | ||
| 4460 | } | ||
| 4461 | EXPORT_SYMBOL_HDA(snd_hda_power_up_d3wait); | ||
| 4462 | |||
| 4435 | #define power_save(codec) \ | 4463 | #define power_save(codec) \ |
| 4436 | ((codec)->bus->power_save ? *(codec)->bus->power_save : 0) | 4464 | ((codec)->bus->power_save ? *(codec)->bus->power_save : 0) |
| 4437 | 4465 | ||
| @@ -1056,10 +1056,12 @@ const char *snd_hda_get_jack_location(u32 cfg); · 1055 unmodified lines | |||
| 1056 | */ | 1056 | */ |
| 1057 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 1057 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
| 1058 | void snd_hda_power_up(struct hda_codec *codec); | 1058 | void snd_hda_power_up(struct hda_codec *codec); |
| 1059 | void snd_hda_power_up_d3wait(struct hda_codec *codec); | ||
| 1059 | void snd_hda_power_down(struct hda_codec *codec); | 1060 | void snd_hda_power_down(struct hda_codec *codec); |
| 1060 | void snd_hda_update_power_acct(struct hda_codec *codec); | 1061 | void snd_hda_update_power_acct(struct hda_codec *codec); |
| 1061 | #else | 1062 | #else |
| 1062 | static inline void snd_hda_power_up(struct hda_codec *codec) {} | 1063 | static inline void snd_hda_power_up(struct hda_codec *codec) {} |
| 1064 | static inline void snd_hda_power_up_d3wait(struct hda_codec *codec) {} | ||
| 1063 | static inline void snd_hda_power_down(struct hda_codec *codec) {} | 1065 | static inline void snd_hda_power_down(struct hda_codec *codec) {} |
| 1064 | #endif | 1066 | #endif |
| 1065 | 1067 | ||
| @@ -1766,7 +1766,7 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) · 1765 unmodified lines | |||
| 1766 | buff_step); | 1766 | buff_step); |
| 1767 | snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, | 1767 | snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, |
| 1768 | buff_step); | 1768 | buff_step); |
| 1769 | snd_hda_power_up(apcm->codec); | 1769 | snd_hda_power_up_d3wait(apcm->codec); |
| 1770 | err = hinfo->ops.open(hinfo, apcm->codec, substream); | 1770 | err = hinfo->ops.open(hinfo, apcm->codec, substream); |
| 1771 | if (err < 0) { | 1771 | if (err < 0) { |
| 1772 | azx_release_device(azx_dev); | 1772 | azx_release_device(azx_dev); |
| @@ -1863,6 +1863,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec, · 1862 unmodified lines | |||
| 1863 | return ret; | 1863 | return ret; |
| 1864 | } | 1864 | } |
| 1865 | 1865 | ||
| 1866 | regcache_cache_only(wm8904->regmap, false); | ||
| 1866 | regcache_sync(wm8904->regmap); | 1867 | regcache_sync(wm8904->regmap); |
| 1867 | 1868 | ||
| 1868 | /* Enable bias */ | 1869 | /* Enable bias */ |
| @@ -1899,14 +1900,8 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec, · 30 unmodified lines | |||
| 1899 | snd_soc_update_bits(codec, WM8904_BIAS_CONTROL_0, | 1900 | snd_soc_update_bits(codec, WM8904_BIAS_CONTROL_0, |
| 1900 | WM8904_BIAS_ENA, 0); | 1901 | WM8904_BIAS_ENA, 0); |
| 1901 | 1902 | ||
| 1902 | #ifdef CONFIG_REGULATOR | 1903 | regcache_cache_only(wm8904->regmap, true); |
| 1903 | /* Post 2.6.34 we will be able to get a callback when | 1904 | regcache_mark_dirty(wm8904->regmap); |
| 1904 | * the regulators are disabled which we can use but | ||
| 1905 | * for now just assume that the power will be cut if | ||
| 1906 | * the regulator API is in use. | ||
| 1907 | */ | ||
| 1908 | codec->cache_sync = 1; | ||
| 1909 | #endif | ||
| 1910 | 1905 | ||
| 1911 | regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), | 1906 | regulator_bulk_disable(ARRAY_SIZE(wm8904->supplies), |
| 1912 | wm8904->supplies); | 1907 | wm8904->supplies); |
| @@ -2084,10 +2079,8 @@ static int wm8904_probe(struct snd_soc_codec *codec) · 171 unmodified lines | |||
| 2084 | { | 2079 | { |
| 2085 | struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); | 2080 | struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); |
| 2086 | struct wm8904_pdata *pdata = wm8904->pdata; | 2081 | struct wm8904_pdata *pdata = wm8904->pdata; |
| 2087 | u16 *reg_cache = codec->reg_cache; | ||
| 2088 | int ret, i; | 2082 | int ret, i; |
| 2089 | 2083 | ||
| 2090 | codec->cache_sync = 1; | ||
| 2091 | codec->control_data = wm8904->regmap; | 2084 | codec->control_data = wm8904->regmap; |
| 2092 | 2085 | ||
| 2093 | switch (wm8904->devtype) { | 2086 | switch (wm8904->devtype) { |
| @@ -2150,6 +2143,7 @@ static int wm8904_probe(struct snd_soc_codec *codec) · 56 unmodified lines | |||
| 2150 | goto err_enable; | 2143 | goto err_enable; |
| 2151 | } | 2144 | } |
| 2152 | 2145 | ||
| 2146 | regcache_cache_only(wm8904->regmap, true); | ||
| 2153 | /* Change some default settings - latch VU and enable ZC */ | 2147 | /* Change some default settings - latch VU and enable ZC */ |
| 2154 | snd_soc_update_bits(codec, WM8904_ADC_DIGITAL_VOLUME_LEFT, | 2148 | snd_soc_update_bits(codec, WM8904_ADC_DIGITAL_VOLUME_LEFT, |
| 2155 | WM8904_ADC_VU, WM8904_ADC_VU); | 2149 | WM8904_ADC_VU, WM8904_ADC_VU); |
| @@ -2180,14 +2174,18 @@ static int wm8904_probe(struct snd_soc_codec *codec) · 24 unmodified lines | |||
| 2180 | if (!pdata->gpio_cfg[i]) | 2174 | if (!pdata->gpio_cfg[i]) |
| 2181 | continue; | 2175 | continue; |
| 2182 | 2176 | ||
| 2183 | reg_cache[WM8904_GPIO_CONTROL_1 + i] | 2177 | regmap_update_bits(wm8904->regmap, |
| 2184 | = pdata->gpio_cfg[i] & 0xffff; | 2178 | WM8904_GPIO_CONTROL_1 + i, |
| 2179 | 0xffff, | ||
| 2180 | pdata->gpio_cfg[i]); | ||
| 2185 | } | 2181 | } |
| 2186 | 2182 | ||
| 2187 | /* Zero is the default value for these anyway */ | 2183 | /* Zero is the default value for these anyway */ |
| 2188 | for (i = 0; i < WM8904_MIC_REGS; i++) | 2184 | for (i = 0; i < WM8904_MIC_REGS; i++) |
| 2189 | reg_cache[WM8904_MIC_BIAS_CONTROL_0 + i] | 2185 | regmap_update_bits(wm8904->regmap, |
| 2190 | = pdata->mic_cfg[i]; | 2186 | WM8904_MIC_BIAS_CONTROL_0 + i, |
| 2187 | 0xffff, | ||
| 2188 | pdata->mic_cfg[i]); | ||
| 2191 | } | 2189 | } |
| 2192 | 2190 | ||
| 2193 | /* Set Class W by default - this will be managed by the Class | 2191 | /* Set Class W by default - this will be managed by the Class |
| @@ -2837,8 +2837,6 @@ static int wm8996_probe(struct snd_soc_codec *codec) · 2836 unmodified lines | |||
| 2837 | } | 2837 | } |
| 2838 | } | 2838 | } |
| 2839 | 2839 | ||
| 2840 | regcache_cache_only(codec->control_data, true); | ||
| 2841 | |||
| 2842 | /* Apply platform data settings */ | 2840 | /* Apply platform data settings */ |
| 2843 | snd_soc_update_bits(codec, WM8996_LINE_INPUT_CONTROL, | 2841 | snd_soc_update_bits(codec, WM8996_LINE_INPUT_CONTROL, |
| 2844 | WM8996_INL_MODE_MASK | WM8996_INR_MODE_MASK, | 2842 | WM8996_INL_MODE_MASK | WM8996_INR_MODE_MASK, |
| @@ -3051,7 +3049,6 @@ static int wm8996_remove(struct snd_soc_codec *codec) · 206 unmodified lines | |||
| 3051 | for (i = 0; i < ARRAY_SIZE(wm8996->supplies); i++) | 3049 | for (i = 0; i < ARRAY_SIZE(wm8996->supplies); i++) |
| 3052 | regulator_unregister_notifier(wm8996->supplies[i].consumer, | 3050 | regulator_unregister_notifier(wm8996->supplies[i].consumer, |
| 3053 | &wm8996->disable_nb[i]); | 3051 | &wm8996->disable_nb[i]); |
| 3054 | regulator_bulk_free(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); | ||
| 3055 | 3052 | ||
| 3056 | return 0; | 3053 | return 0; |
| 3057 | } | 3054 | } |
| @@ -3206,14 +3203,15 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, · 148 unmodified lines | |||
| 3206 | dev_info(&i2c->dev, "revision %c\n", | 3203 | dev_info(&i2c->dev, "revision %c\n", |
| 3207 | (reg & WM8996_CHIP_REV_MASK) + 'A'); | 3204 | (reg & WM8996_CHIP_REV_MASK) + 'A'); |
| 3208 | 3205 | ||
| 3209 | regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); | ||
| 3210 | |||
| 3211 | ret = wm8996_reset(wm8996); | 3206 | ret = wm8996_reset(wm8996); |
| 3212 | if (ret < 0) { | 3207 | if (ret < 0) { |
| 3213 | dev_err(&i2c->dev, "Failed to issue reset\n"); | 3208 | dev_err(&i2c->dev, "Failed to issue reset\n"); |
| 3214 | goto err_regmap; | 3209 | goto err_regmap; |
| 3215 | } | 3210 | } |
| 3216 | 3211 | ||
| 3212 | regcache_cache_only(wm8996->regmap, true); | ||
| 3213 | regulator_bulk_disable(ARRAY_SIZE(wm8996->supplies), wm8996->supplies); | ||
| 3214 | |||
| 3217 | wm8996_init_gpio(wm8996); | 3215 | wm8996_init_gpio(wm8996); |
| 3218 | 3216 | ||
| 3219 | ret = snd_soc_register_codec(&i2c->dev, | 3217 | ret = snd_soc_register_codec(&i2c->dev, |
| @@ -33,7 +33,6 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 35 | #include <mach/dma.h> | 35 | #include <mach/dma.h> |
| 36 | #include <mach/audio.h> | ||
| 37 | 36 | ||
| 38 | #include "../../arm/pxa2xx-pcm.h" | 37 | #include "../../arm/pxa2xx-pcm.h" |
| 39 | #include "pxa-ssp.h" | 38 | #include "pxa-ssp.h" |
| @@ -194,7 +193,7 @@ static void pxa_ssp_set_scr(struct ssp_device *ssp, u32 div) · 154 unmodified lines | |||
| 194 | { | 193 | { |
| 195 | u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0); | 194 | u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0); |
| 196 | 195 | ||
| 197 | if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) { | 196 | if (ssp->type == PXA25x_SSP) { |
| 198 | sscr0 &= ~0x0000ff00; | 197 | sscr0 &= ~0x0000ff00; |
| 199 | sscr0 |= ((div - 2)/2) << 8; /* 2..512 */ | 198 | sscr0 |= ((div - 2)/2) << 8; /* 2..512 */ |
| 200 | } else { | 199 | } else { |
| @@ -212,7 +211,7 @@ static u32 pxa_ssp_get_scr(struct ssp_device *ssp) · 11 unmodified lines | |||
| 212 | u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0); | 211 | u32 sscr0 = pxa_ssp_read_reg(ssp, SSCR0); |
| 213 | u32 div; | 212 | u32 div; |
| 214 | 213 | ||
| 215 | if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) | 214 | if (ssp->type == PXA25x_SSP) |
| 216 | div = ((sscr0 >> 8) & 0xff) * 2 + 2; | 215 | div = ((sscr0 >> 8) & 0xff) * 2 + 2; |
| 217 | else | 216 | else |
| 218 | div = ((sscr0 >> 8) & 0xfff) + 1; | 217 | div = ((sscr0 >> 8) & 0xfff) + 1; |
| @@ -242,7 +241,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, · 23 unmodified lines | |||
| 242 | break; | 241 | break; |
| 243 | case PXA_SSP_CLK_PLL: | 242 | case PXA_SSP_CLK_PLL: |
| 244 | /* Internal PLL is fixed */ | 243 | /* Internal PLL is fixed */ |
| 245 | if (cpu_is_pxa25x()) | 244 | if (ssp->type == PXA25x_SSP) |
| 246 | priv->sysclk = 1843200; | 245 | priv->sysclk = 1843200; |
| 247 | else | 246 | else |
| 248 | priv->sysclk = 13000000; | 247 | priv->sysclk = 13000000; |
| @@ -266,11 +265,11 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, · 17 unmodified lines | |||
| 266 | 265 | ||
| 267 | /* The SSP clock must be disabled when changing SSP clock mode | 266 | /* The SSP clock must be disabled when changing SSP clock mode |
| 268 | * on PXA2xx. On PXA3xx it must be enabled when doing so. */ | 267 | * on PXA2xx. On PXA3xx it must be enabled when doing so. */ |
| 269 | if (!cpu_is_pxa3xx()) | 268 | if (ssp->type != PXA3xx_SSP) |
| 270 | clk_disable(ssp->clk); | 269 | clk_disable(ssp->clk); |
| 271 | val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0; | 270 | val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0; |
| 272 | pxa_ssp_write_reg(ssp, SSCR0, val); | 271 | pxa_ssp_write_reg(ssp, SSCR0, val); |
| 273 | if (!cpu_is_pxa3xx()) | 272 | if (ssp->type != PXA3xx_SSP) |
| 274 | clk_enable(ssp->clk); | 273 | clk_enable(ssp->clk); |
| 275 | 274 | ||
| 276 | return 0; | 275 | return 0; |
| @@ -294,24 +293,20 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai, · 17 unmodified lines | |||
| 294 | case PXA_SSP_AUDIO_DIV_SCDB: | 293 | case PXA_SSP_AUDIO_DIV_SCDB: |
| 295 | val = pxa_ssp_read_reg(ssp, SSACD); | 294 | val = pxa_ssp_read_reg(ssp, SSACD); |
| 296 | val &= ~SSACD_SCDB; | 295 | val &= ~SSACD_SCDB; |
| 297 | #if defined(CONFIG_PXA3xx) | 296 | if (ssp->type == PXA3xx_SSP) |
| 298 | if (cpu_is_pxa3xx()) | ||
| 299 | val &= ~SSACD_SCDX8; | 297 | val &= ~SSACD_SCDX8; |
| 300 | #endif | ||
| 301 | switch (div) { | 298 | switch (div) { |
| 302 | case PXA_SSP_CLK_SCDB_1: | 299 | case PXA_SSP_CLK_SCDB_1: |
| 303 | val |= SSACD_SCDB; | 300 | val |= SSACD_SCDB; |
| 304 | break; | 301 | break; |
| 305 | case PXA_SSP_CLK_SCDB_4: | 302 | case PXA_SSP_CLK_SCDB_4: |
| 306 | break; | 303 | break; |
| 307 | #if defined(CONFIG_PXA3xx) | ||
| 308 | case PXA_SSP_CLK_SCDB_8: | 304 | case PXA_SSP_CLK_SCDB_8: |
| 309 | if (cpu_is_pxa3xx()) | 305 | if (ssp->type == PXA3xx_SSP) |
| 310 | val |= SSACD_SCDX8; | 306 | val |= SSACD_SCDX8; |
| 311 | else | 307 | else |
| 312 | return -EINVAL; | 308 | return -EINVAL; |
| 313 | break; | 309 | break; |
| 314 | #endif | ||
| 315 | default: | 310 | default: |
| 316 | return -EINVAL; | 311 | return -EINVAL; |
| 317 | } | 312 | } |
| @@ -337,10 +332,8 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id, · 19 unmodified lines | |||
| 337 | struct ssp_device *ssp = priv->ssp; | 332 | struct ssp_device *ssp = priv->ssp; |
| 338 | u32 ssacd = pxa_ssp_read_reg(ssp, SSACD) & ~0x70; | 333 | u32 ssacd = pxa_ssp_read_reg(ssp, SSACD) & ~0x70; |
| 339 | 334 | ||
| 340 | #if defined(CONFIG_PXA3xx) | 335 | if (ssp->type == PXA3xx_SSP) |
| 341 | if (cpu_is_pxa3xx()) | ||
| 342 | pxa_ssp_write_reg(ssp, SSACDD, 0); | 336 | pxa_ssp_write_reg(ssp, SSACDD, 0); |
| 343 | #endif | ||
| 344 | 337 | ||
| 345 | switch (freq_out) { | 338 | switch (freq_out) { |
| 346 | case 5622000: | 339 | case 5622000: |
| @@ -365,11 +358,10 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id, · 18 unmodified lines | |||
| 365 | break; | 358 | break; |
| 366 | 359 | ||
| 367 | default: | 360 | default: |
| 368 | #ifdef CONFIG_PXA3xx | ||
| 369 | /* PXA3xx has a clock ditherer which can be used to generate | 361 | /* PXA3xx has a clock ditherer which can be used to generate |
| 370 | * a wider range of frequencies - calculate a value for it. | 362 | * a wider range of frequencies - calculate a value for it. |
| 371 | */ | 363 | */ |
| 372 | if (cpu_is_pxa3xx()) { | 364 | if (ssp->type == PXA3xx_SSP) { |
| 373 | u32 val; | 365 | u32 val; |
| 374 | u64 tmp = 19968; | 366 | u64 tmp = 19968; |
| 375 | tmp *= 1000000; | 367 | tmp *= 1000000; |
| @@ -386,7 +378,6 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id, · 10 unmodified lines | |||
| 386 | val, freq_out); | 378 | val, freq_out); |
| 387 | break; | 379 | break; |
| 388 | } | 380 | } |
| 389 | #endif | ||
| 390 | 381 | ||
| 391 | return -EINVAL; | 382 | return -EINVAL; |
| 392 | } | 383 | } |
| @@ -590,10 +581,8 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, · 197 unmodified lines | |||
| 590 | /* bit size */ | 581 | /* bit size */ |
| 591 | switch (params_format(params)) { | 582 | switch (params_format(params)) { |
| 592 | case SNDRV_PCM_FORMAT_S16_LE: | 583 | case SNDRV_PCM_FORMAT_S16_LE: |
| 593 | #ifdef CONFIG_PXA3xx | 584 | if (ssp->type == PXA3xx_SSP) |
| 594 | if (cpu_is_pxa3xx()) | ||
| 595 | sscr0 |= SSCR0_FPCKE; | 585 | sscr0 |= SSCR0_FPCKE; |
| 596 | #endif | ||
| 597 | sscr0 |= SSCR0_DataSize(16); | 586 | sscr0 |= SSCR0_DataSize(16); |
| 598 | break; | 587 | break; |
| 599 | case SNDRV_PCM_FORMAT_S24_LE: | 588 | case SNDRV_PCM_FORMAT_S24_LE: |
| @@ -618,9 +607,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, · 18 unmodified lines | |||
| 618 | * trying and failing a lot; some of the registers | 607 | * trying and failing a lot; some of the registers |
| 619 | * needed for that mode are only available on PXA3xx. | 608 | * needed for that mode are only available on PXA3xx. |
| 620 | */ | 609 | */ |
| 621 | 610 | if (ssp->type != PXA3xx_SSP) | |
| 622 | #ifdef CONFIG_PXA3xx | ||
| 623 | if (!cpu_is_pxa3xx()) | ||
| 624 | return -EINVAL; | 611 | return -EINVAL; |
| 625 | 612 | ||
| 626 | sspsp |= SSPSP_SFRMWDTH(width * 2); | 613 | sspsp |= SSPSP_SFRMWDTH(width * 2); |
| @@ -628,9 +615,6 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, · 1 unmodified line | |||
| 628 | sspsp |= SSPSP_EDMYSTOP(3); | 615 | sspsp |= SSPSP_EDMYSTOP(3); |
| 629 | sspsp |= SSPSP_DMYSTOP(3); | 616 | sspsp |= SSPSP_DMYSTOP(3); |
| 630 | sspsp |= SSPSP_DMYSTRT(1); | 617 | sspsp |= SSPSP_DMYSTRT(1); |
| 631 | #else | ||
| 632 | return -EINVAL; | ||
| 633 | #endif | ||
| 634 | } else { | 618 | } else { |
| 635 | /* The frame width is the width the LRCLK is | 619 | /* The frame width is the width the LRCLK is |
| 636 | * asserted for; the delay is expressed in | 620 | * asserted for; the delay is expressed in |
| @@ -346,6 +346,17 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) · 345 unmodified lines | |||
| 346 | return 0; | 346 | return 0; |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | static int tegra_wm8903_remove(struct snd_soc_card *card) | ||
| 350 | { | ||
| 351 | struct snd_soc_pcm_runtime *rtd = &(card->rtd[0]); | ||
| 352 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | ||
| 353 | struct snd_soc_codec *codec = codec_dai->codec; | ||
| 354 | |||
| 355 | wm8903_mic_detect(codec, NULL, 0, 0); | ||
| 356 | |||
| 357 | return 0; | ||
| 358 | } | ||
| 359 | |||
| 349 | static struct snd_soc_dai_link tegra_wm8903_dai = { | 360 | static struct snd_soc_dai_link tegra_wm8903_dai = { |
| 350 | .name = "WM8903", | 361 | .name = "WM8903", |
| 351 | .stream_name = "WM8903 PCM", | 362 | .stream_name = "WM8903 PCM", |
| @@ -363,6 +374,8 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = { · 11 unmodified lines | |||
| 363 | .dai_link = &tegra_wm8903_dai, | 374 | .dai_link = &tegra_wm8903_dai, |
| 364 | .num_links = 1, | 375 | .num_links = 1, |
| 365 | 376 | ||
| 377 | .remove = tegra_wm8903_remove, | ||
| 378 | |||
| 366 | .controls = tegra_wm8903_controls, | 379 | .controls = tegra_wm8903_controls, |
| 367 | .num_controls = ARRAY_SIZE(tegra_wm8903_controls), | 380 | .num_controls = ARRAY_SIZE(tegra_wm8903_controls), |
| 368 | .dapm_widgets = tegra_wm8903_dapm_widgets, | 381 | .dapm_widgets = tegra_wm8903_dapm_widgets, |
| @@ -209,7 +209,7 @@ static int usb6fire_fw_ezusb_upload( · 208 unmodified lines | |||
| 209 | int ret; | 209 | int ret; |
| 210 | u8 data; | 210 | u8 data; |
| 211 | struct usb_device *device = interface_to_usbdev(intf); | 211 | struct usb_device *device = interface_to_usbdev(intf); |
| 212 | const struct firmware *fw = 0; | 212 | const struct firmware *fw = NULL; |
| 213 | struct ihex_record *rec = kmalloc(sizeof(struct ihex_record), | 213 | struct ihex_record *rec = kmalloc(sizeof(struct ihex_record), |
| 214 | GFP_KERNEL); | 214 | GFP_KERNEL); |
| 215 | 215 | ||
| @@ -354,17 +354,21 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt) · 353 unmodified lines | |||
| 354 | (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && | 354 | (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && |
| 355 | get_endpoint(alts, 1)->bSynchAddress != 0 && | 355 | get_endpoint(alts, 1)->bSynchAddress != 0 && |
| 356 | !implicit_fb)) { | 356 | !implicit_fb)) { |
| 357 | snd_printk(KERN_ERR "%d:%d:%d : invalid synch pipe\n", | 357 | snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. bmAttributes %02x, bLength %d, bSynchAddress %02x\n", |
| 358 | dev->devnum, fmt->iface, fmt->altsetting); | 358 | dev->devnum, fmt->iface, fmt->altsetting, |
| 359 | get_endpoint(alts, 1)->bmAttributes, | ||
| 360 | get_endpoint(alts, 1)->bLength, | ||
| 361 | get_endpoint(alts, 1)->bSynchAddress); | ||
| 359 | return -EINVAL; | 362 | return -EINVAL; |
| 360 | } | 363 | } |
| 361 | ep = get_endpoint(alts, 1)->bEndpointAddress; | 364 | ep = get_endpoint(alts, 1)->bEndpointAddress; |
| 362 | if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && | 365 | if (!implicit_fb && |
| 366 | get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE && | ||
| 363 | (( is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) || | 367 | (( is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) || |
| 364 | (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)) || | 368 | (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) { |
| 365 | ( is_playback && !implicit_fb))) { | 369 | snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n", |
| 366 | snd_printk(KERN_ERR "%d:%d:%d : invalid synch pipe\n", | 370 | dev->devnum, fmt->iface, fmt->altsetting, |
| 367 | dev->devnum, fmt->iface, fmt->altsetting); | 371 | is_playback, ep, get_endpoint(alts, 0)->bSynchAddress); |
| 368 | return -EINVAL; | 372 | return -EINVAL; |
| 369 | } | 373 | } |
| 370 | 374 | ||
| @@ -1147,7 +1151,8 @@ static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substrea · 776 unmodified lines | |||
| 1147 | return -EINVAL; | 1151 | return -EINVAL; |
| 1148 | } | 1152 | } |
| 1149 | 1153 | ||
| 1150 | int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, int cmd) | 1154 | static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream, |
| 1155 | int cmd) | ||
| 1151 | { | 1156 | { |
| 1152 | int err; | 1157 | int err; |
| 1153 | struct snd_usb_substream *subs = substream->runtime->private_data; | 1158 | struct snd_usb_substream *subs = substream->runtime->private_data; |
| @@ -701,14 +701,18 @@ int main(void) · 700 unmodified lines | |||
| 701 | pfd.fd = fd; | 701 | pfd.fd = fd; |
| 702 | 702 | ||
| 703 | while (1) { | 703 | while (1) { |
| 704 | struct sockaddr *addr_p = (struct sockaddr *) &addr; | ||
| 705 | socklen_t addr_l = sizeof(addr); | ||
| 704 | pfd.events = POLLIN; | 706 | pfd.events = POLLIN; |
| 705 | pfd.revents = 0; | 707 | pfd.revents = 0; |
| 706 | poll(&pfd, 1, -1); | 708 | poll(&pfd, 1, -1); |
| 707 | 709 | ||
| 708 | len = recv(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0); | 710 | len = recvfrom(fd, kvp_recv_buffer, sizeof(kvp_recv_buffer), 0, |
| 711 | addr_p, &addr_l); | ||
| 709 | 712 | ||
| 710 | if (len < 0) { | 713 | if (len < 0 || addr.nl_pid) { |
| 711 | syslog(LOG_ERR, "recv failed; error:%d", len); | 714 | syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s", |
| 715 | addr.nl_pid, errno, strerror(errno)); | ||
| 712 | close(fd); | 716 | close(fd); |
| 713 | return -1; | 717 | return -1; |
| 714 | } | 718 | } |
| @@ -1179,6 +1179,12 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used) · 1178 unmodified lines | |||
| 1179 | fprintf(stderr, "cannot use both --output and --log-fd\n"); | 1179 | fprintf(stderr, "cannot use both --output and --log-fd\n"); |
| 1180 | usage_with_options(stat_usage, options); | 1180 | usage_with_options(stat_usage, options); |
| 1181 | } | 1181 | } |
| 1182 | |||
| 1183 | if (output_fd < 0) { | ||
| 1184 | fprintf(stderr, "argument to --log-fd must be a > 0\n"); | ||
| 1185 | usage_with_options(stat_usage, options); | ||
| 1186 | } | ||
| 1187 | |||
| 1182 | if (!output) { | 1188 | if (!output) { |
| 1183 | struct timespec tm; | 1189 | struct timespec tm; |
| 1184 | mode = append_file ? "a" : "w"; | 1190 | mode = append_file ? "a" : "w"; |
| @@ -1190,7 +1196,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used) · 5 unmodified lines | |||
| 1190 | } | 1196 | } |
| 1191 | clock_gettime(CLOCK_REALTIME, &tm); | 1197 | clock_gettime(CLOCK_REALTIME, &tm); |
| 1192 | fprintf(output, "# started on %s\n", ctime(&tm.tv_sec)); | 1198 | fprintf(output, "# started on %s\n", ctime(&tm.tv_sec)); |
| 1193 | } else if (output_fd != 2) { | 1199 | } else if (output_fd > 0) { |
| 1194 | mode = append_file ? "a" : "w"; | 1200 | mode = append_file ? "a" : "w"; |
| 1195 | output = fdopen(output_fd, mode); | 1201 | output = fdopen(output_fd, mode); |
| 1196 | if (!output) { | 1202 | if (!output) { |
| @@ -1942,7 +1942,6 @@ int perf_file_header__read(struct perf_file_header *header, · 1941 unmodified lines | |||
| 1942 | else | 1942 | else |
| 1943 | return -1; | 1943 | return -1; |
| 1944 | } else if (ph->needs_swap) { | 1944 | } else if (ph->needs_swap) { |
| 1945 | unsigned int i; | ||
| 1946 | /* | 1945 | /* |
| 1947 | * feature bitmap is declared as an array of unsigned longs -- | 1946 | * feature bitmap is declared as an array of unsigned longs -- |
| 1948 | * not good since its size can differ between the host that | 1947 | * not good since its size can differ between the host that |
| @@ -1958,14 +1957,17 @@ int perf_file_header__read(struct perf_file_header *header, · 9 unmodified lines | |||
| 1958 | * file), punt and fallback to the original behavior -- | 1957 | * file), punt and fallback to the original behavior -- |
| 1959 | * clearing all feature bits and setting buildid. | 1958 | * clearing all feature bits and setting buildid. |
| 1960 | */ | 1959 | */ |
| 1961 | for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i) | 1960 | mem_bswap_64(&header->adds_features, |
| 1962 | header->adds_features[i] = bswap_64(header->adds_features[i]); | 1961 | BITS_TO_U64(HEADER_FEAT_BITS)); |
| 1963 | 1962 | ||
| 1964 | if (!test_bit(HEADER_HOSTNAME, header->adds_features)) { | 1963 | if (!test_bit(HEADER_HOSTNAME, header->adds_features)) { |
| 1965 | for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i) { | 1964 | /* unswap as u64 */ |
| 1966 | header->adds_features[i] = bswap_64(header->adds_features[i]); | 1965 | mem_bswap_64(&header->adds_features, |
| 1967 | header->adds_features[i] = bswap_32(header->adds_features[i]); | 1966 | BITS_TO_U64(HEADER_FEAT_BITS)); |
| 1968 | } | 1967 | |
| 1968 | /* unswap as u32 */ | ||
| 1969 | mem_bswap_32(&header->adds_features, | ||
| 1970 | BITS_TO_U32(HEADER_FEAT_BITS)); | ||
| 1969 | } | 1971 | } |
| 1970 | 1972 | ||
| 1971 | if (!test_bit(HEADER_HOSTNAME, header->adds_features)) { | 1973 | if (!test_bit(HEADER_HOSTNAME, header->adds_features)) { |
| @@ -2091,6 +2093,35 @@ static int read_attr(int fd, struct perf_header *ph, · 119 unmodified lines | |||
| 2091 | return ret <= 0 ? -1 : 0; | 2093 | return ret <= 0 ? -1 : 0; |
| 2092 | } | 2094 | } |
| 2093 | 2095 | ||
| 2096 | static int perf_evsel__set_tracepoint_name(struct perf_evsel *evsel) | ||
| 2097 | { | ||
| 2098 | struct event_format *event = trace_find_event(evsel->attr.config); | ||
| 2099 | char bf[128]; | ||
| 2100 | |||
| 2101 | if (event == NULL) | ||
| 2102 | return -1; | ||
| 2103 | |||
| 2104 | snprintf(bf, sizeof(bf), "%s:%s", event->system, event->name); | ||
| 2105 | evsel->name = strdup(bf); | ||
| 2106 | if (event->name == NULL) | ||
| 2107 | return -1; | ||
| 2108 | |||
| 2109 | return 0; | ||
| 2110 | } | ||
| 2111 | |||
| 2112 | static int perf_evlist__set_tracepoint_names(struct perf_evlist *evlist) | ||
| 2113 | { | ||
| 2114 | struct perf_evsel *pos; | ||
| 2115 | |||
| 2116 | list_for_each_entry(pos, &evlist->entries, node) { | ||
| 2117 | if (pos->attr.type == PERF_TYPE_TRACEPOINT && | ||
| 2118 | perf_evsel__set_tracepoint_name(pos)) | ||
| 2119 | return -1; | ||
| 2120 | } | ||
| 2121 | |||
| 2122 | return 0; | ||
| 2123 | } | ||
| 2124 | |||
| 2094 | int perf_session__read_header(struct perf_session *session, int fd) | 2125 | int perf_session__read_header(struct perf_session *session, int fd) |
| 2095 | { | 2126 | { |
| 2096 | struct perf_header *header = &session->header; | 2127 | struct perf_header *header = &session->header; |
| @@ -2172,6 +2203,9 @@ int perf_session__read_header(struct perf_session *session, int fd) · 75 unmodified lines | |||
| 2172 | 2203 | ||
| 2173 | lseek(fd, header->data_offset, SEEK_SET); | 2204 | lseek(fd, header->data_offset, SEEK_SET); |
| 2174 | 2205 | ||
| 2206 | if (perf_evlist__set_tracepoint_names(session->evlist)) | ||
| 2207 | goto out_delete_evlist; | ||
| 2208 | |||
| 2175 | header->frozen = 1; | 2209 | header->frozen = 1; |
| 2176 | return 0; | 2210 | return 0; |
| 2177 | out_errno: | 2211 | out_errno: |
| @@ -8,6 +8,8 @@ · 7 unmodified lines | |||
| 8 | #define BITS_PER_LONG __WORDSIZE | 8 | #define BITS_PER_LONG __WORDSIZE |
| 9 | #define BITS_PER_BYTE 8 | 9 | #define BITS_PER_BYTE 8 |
| 10 | #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) | 10 | #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) |
| 11 | #define BITS_TO_U64(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64)) | ||
| 12 | #define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) | ||
| 11 | 13 | ||
| 12 | #define for_each_set_bit(bit, addr, size) \ | 14 | #define for_each_set_bit(bit, addr, size) \ |
| 13 | for ((bit) = find_first_bit((addr), (size)); \ | 15 | for ((bit) = find_first_bit((addr), (size)); \ |
| @@ -442,6 +442,16 @@ static void perf_tool__fill_defaults(struct perf_tool *tool) · 441 unmodified lines | |||
| 442 | tool->finished_round = process_finished_round_stub; | 442 | tool->finished_round = process_finished_round_stub; |
| 443 | } | 443 | } |
| 444 | } | 444 | } |
| 445 | |||
| 446 | void mem_bswap_32(void *src, int byte_size) | ||
| 447 | { | ||
| 448 | u32 *m = src; | ||
| 449 | while (byte_size > 0) { | ||
| 450 | *m = bswap_32(*m); | ||
| 451 | byte_size -= sizeof(u32); | ||
| 452 | ++m; | ||
| 453 | } | ||
| 454 | } | ||
| 445 | 455 | ||
| 446 | void mem_bswap_64(void *src, int byte_size) | 456 | void mem_bswap_64(void *src, int byte_size) |
| 447 | { | 457 | { |
| @@ -80,6 +80,7 @@ struct branch_info *machine__resolve_bstack(struct machine *self, · 79 unmodified lines | |||
| 80 | bool perf_session__has_traces(struct perf_session *self, const char *msg); | 80 | bool perf_session__has_traces(struct perf_session *self, const char *msg); |
| 81 | 81 | ||
| 82 | void mem_bswap_64(void *src, int byte_size); | 82 | void mem_bswap_64(void *src, int byte_size); |
| 83 | void mem_bswap_32(void *src, int byte_size); | ||
| 83 | void perf_event__attr_swap(struct perf_event_attr *attr); | 84 | void perf_event__attr_swap(struct perf_event_attr *attr); |
| 84 | 85 | ||
| 85 | int perf_session__create_kernel_maps(struct perf_session *self); | 86 | int perf_session__create_kernel_maps(struct perf_session *self); |
| @@ -635,7 +635,6 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, · 634 unmodified lines | |||
| 635 | int r = 0, idx; | 635 | int r = 0, idx; |
| 636 | struct kvm_assigned_dev_kernel *match; | 636 | struct kvm_assigned_dev_kernel *match; |
| 637 | struct pci_dev *dev; | 637 | struct pci_dev *dev; |
| 638 | u8 header_type; | ||
| 639 | 638 | ||
| 640 | if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU)) | 639 | if (!(assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU)) |
| 641 | return -EINVAL; | 640 | return -EINVAL; |
| @@ -668,8 +667,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, · 26 unmodified lines | |||
| 668 | } | 667 | } |
| 669 | 668 | ||
| 670 | /* Don't allow bridges to be assigned */ | 669 | /* Don't allow bridges to be assigned */ |
| 671 | pci_read_config_byte(dev, PCI_HEADER_TYPE, &header_type); | 670 | if (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) { |
| 672 | if ((header_type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL) { | ||
| 673 | r = -EPERM; | 671 | r = -EPERM; |
| 674 | goto out_put; | 672 | goto out_put; |
| 675 | } | 673 | } |