diff options
465 files changed, 4026 insertions, 2319 deletions
diff --git a/Documentation/device-mapper/dm-raid.txt b/Documentation/device-mapper/dm-raid.txt index 728c38c242d6..56fb62b09fc5 100644 --- a/Documentation/device-mapper/dm-raid.txt +++ b/Documentation/device-mapper/dm-raid.txt | |||
| @@ -141,3 +141,4 @@ Version History | |||
| 141 | 1.2.0 Handle creation of arrays that contain failed devices. | 141 | 1.2.0 Handle creation of arrays that contain failed devices. |
| 142 | 1.3.0 Added support for RAID 10 | 142 | 1.3.0 Added support for RAID 10 |
| 143 | 1.3.1 Allow device replacement/rebuild for RAID 10 | 143 | 1.3.1 Allow device replacement/rebuild for RAID 10 |
| 144 | 1.3.2 Fix/improve redundancy checking for RAID10 | ||
diff --git a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt index 3a268127b054..bc50899e0c81 100644 --- a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt | |||
| @@ -81,7 +81,8 @@ PA31 TXD4 | |||
| 81 | Required properties for pin configuration node: | 81 | Required properties for pin configuration node: |
| 82 | - atmel,pins: 4 integers array, represents a group of pins mux and config | 82 | - atmel,pins: 4 integers array, represents a group of pins mux and config |
| 83 | setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. | 83 | setting. The format is atmel,pins = <PIN_BANK PIN_BANK_NUM PERIPH CONFIG>. |
| 84 | The PERIPH 0 means gpio. | 84 | The PERIPH 0 means gpio, PERIPH 1 is periph A, PERIPH 2 is periph B... |
| 85 | PIN_BANK 0 is pioA, PIN_BANK 1 is pioB... | ||
| 85 | 86 | ||
| 86 | Bits used for CONFIG: | 87 | Bits used for CONFIG: |
| 87 | PULL_UP (1 << 0): indicate this pin need a pull up. | 88 | PULL_UP (1 << 0): indicate this pin need a pull up. |
| @@ -126,7 +127,7 @@ pinctrl@fffff400 { | |||
| 126 | pinctrl_dbgu: dbgu-0 { | 127 | pinctrl_dbgu: dbgu-0 { |
| 127 | atmel,pins = | 128 | atmel,pins = |
| 128 | <1 14 0x1 0x0 /* PB14 periph A */ | 129 | <1 14 0x1 0x0 /* PB14 periph A */ |
| 129 | 1 15 0x1 0x1>; /* PB15 periph with pullup */ | 130 | 1 15 0x1 0x1>; /* PB15 periph A with pullup */ |
| 130 | }; | 131 | }; |
| 131 | }; | 132 | }; |
| 132 | }; | 133 | }; |
diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt index 8fbd8b46ee34..dcf338e62b71 100644 --- a/Documentation/filesystems/f2fs.txt +++ b/Documentation/filesystems/f2fs.txt | |||
| @@ -175,9 +175,9 @@ consists of multiple segments as described below. | |||
| 175 | align with the zone size <-| | 175 | align with the zone size <-| |
| 176 | |-> align with the segment size | 176 | |-> align with the segment size |
| 177 | _________________________________________________________________________ | 177 | _________________________________________________________________________ |
| 178 | | | | Node | Segment | Segment | | | 178 | | | | Segment | Node | Segment | | |
| 179 | | Superblock | Checkpoint | Address | Info. | Summary | Main | | 179 | | Superblock | Checkpoint | Info. | Address | Summary | Main | |
| 180 | | (SB) | (CP) | Table (NAT) | Table (SIT) | Area (SSA) | | | 180 | | (SB) | (CP) | Table (SIT) | Table (NAT) | Area (SSA) | | |
| 181 | |____________|_____2______|______N______|______N______|______N_____|__N___| | 181 | |____________|_____2______|______N______|______N______|______N_____|__N___| |
| 182 | . . | 182 | . . |
| 183 | . . | 183 | . . |
| @@ -200,14 +200,14 @@ consists of multiple segments as described below. | |||
| 200 | : It contains file system information, bitmaps for valid NAT/SIT sets, orphan | 200 | : It contains file system information, bitmaps for valid NAT/SIT sets, orphan |
| 201 | inode lists, and summary entries of current active segments. | 201 | inode lists, and summary entries of current active segments. |
| 202 | 202 | ||
| 203 | - Node Address Table (NAT) | ||
| 204 | : It is composed of a block address table for all the node blocks stored in | ||
| 205 | Main area. | ||
| 206 | |||
| 207 | - Segment Information Table (SIT) | 203 | - Segment Information Table (SIT) |
| 208 | : It contains segment information such as valid block count and bitmap for the | 204 | : It contains segment information such as valid block count and bitmap for the |
| 209 | validity of all the blocks. | 205 | validity of all the blocks. |
| 210 | 206 | ||
| 207 | - Node Address Table (NAT) | ||
| 208 | : It is composed of a block address table for all the node blocks stored in | ||
| 209 | Main area. | ||
| 210 | |||
| 211 | - Segment Summary Area (SSA) | 211 | - Segment Summary Area (SSA) |
| 212 | : It contains summary entries which contains the owner information of all the | 212 | : It contains summary entries which contains the owner information of all the |
| 213 | data and node blocks stored in Main area. | 213 | data and node blocks stored in Main area. |
| @@ -236,13 +236,13 @@ For file system consistency, each CP points to which NAT and SIT copies are | |||
| 236 | valid, as shown as below. | 236 | valid, as shown as below. |
| 237 | 237 | ||
| 238 | +--------+----------+---------+ | 238 | +--------+----------+---------+ |
| 239 | | CP | NAT | SIT | | 239 | | CP | SIT | NAT | |
| 240 | +--------+----------+---------+ | 240 | +--------+----------+---------+ |
| 241 | . . . . | 241 | . . . . |
| 242 | . . . . | 242 | . . . . |
| 243 | . . . . | 243 | . . . . |
| 244 | +-------+-------+--------+--------+--------+--------+ | 244 | +-------+-------+--------+--------+--------+--------+ |
| 245 | | CP #0 | CP #1 | NAT #0 | NAT #1 | SIT #0 | SIT #1 | | 245 | | CP #0 | CP #1 | SIT #0 | SIT #1 | NAT #0 | NAT #1 | |
| 246 | +-------+-------+--------+--------+--------+--------+ | 246 | +-------+-------+--------+--------+--------+--------+ |
| 247 | | ^ ^ | 247 | | ^ ^ |
| 248 | | | | | 248 | | | | |
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 406d82d5d2bb..3edb4c2887a1 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
| @@ -57,6 +57,10 @@ Protocol 2.10: (Kernel 2.6.31) Added a protocol for relaxed alignment | |||
| 57 | Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover | 57 | Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover |
| 58 | protocol entry point. | 58 | protocol entry point. |
| 59 | 59 | ||
| 60 | Protocol 2.12: (Kernel 3.9) Added the xloadflags field and extension fields | ||
| 61 | to struct boot_params for for loading bzImage and ramdisk | ||
| 62 | above 4G in 64bit. | ||
| 63 | |||
| 60 | **** MEMORY LAYOUT | 64 | **** MEMORY LAYOUT |
| 61 | 65 | ||
| 62 | The traditional memory map for the kernel loader, used for Image or | 66 | The traditional memory map for the kernel loader, used for Image or |
| @@ -182,7 +186,7 @@ Offset Proto Name Meaning | |||
| 182 | 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel | 186 | 0230/4 2.05+ kernel_alignment Physical addr alignment required for kernel |
| 183 | 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not | 187 | 0234/1 2.05+ relocatable_kernel Whether kernel is relocatable or not |
| 184 | 0235/1 2.10+ min_alignment Minimum alignment, as a power of two | 188 | 0235/1 2.10+ min_alignment Minimum alignment, as a power of two |
| 185 | 0236/2 N/A pad3 Unused | 189 | 0236/2 2.12+ xloadflags Boot protocol option flags |
| 186 | 0238/4 2.06+ cmdline_size Maximum size of the kernel command line | 190 | 0238/4 2.06+ cmdline_size Maximum size of the kernel command line |
| 187 | 023C/4 2.07+ hardware_subarch Hardware subarchitecture | 191 | 023C/4 2.07+ hardware_subarch Hardware subarchitecture |
| 188 | 0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data | 192 | 0240/8 2.07+ hardware_subarch_data Subarchitecture-specific data |
| @@ -582,6 +586,27 @@ Protocol: 2.10+ | |||
| 582 | misaligned kernel. Therefore, a loader should typically try each | 586 | misaligned kernel. Therefore, a loader should typically try each |
| 583 | power-of-two alignment from kernel_alignment down to this alignment. | 587 | power-of-two alignment from kernel_alignment down to this alignment. |
| 584 | 588 | ||
| 589 | Field name: xloadflags | ||
| 590 | Type: read | ||
| 591 | Offset/size: 0x236/2 | ||
| 592 | Protocol: 2.12+ | ||
| 593 | |||
| 594 | This field is a bitmask. | ||
| 595 | |||
| 596 | Bit 0 (read): XLF_KERNEL_64 | ||
| 597 | - If 1, this kernel has the legacy 64-bit entry point at 0x200. | ||
| 598 | |||
| 599 | Bit 1 (read): XLF_CAN_BE_LOADED_ABOVE_4G | ||
| 600 | - If 1, kernel/boot_params/cmdline/ramdisk can be above 4G. | ||
| 601 | |||
| 602 | Bit 2 (read): XLF_EFI_HANDOVER_32 | ||
| 603 | - If 1, the kernel supports the 32-bit EFI handoff entry point | ||
| 604 | given at handover_offset. | ||
| 605 | |||
| 606 | Bit 3 (read): XLF_EFI_HANDOVER_64 | ||
| 607 | - If 1, the kernel supports the 64-bit EFI handoff entry point | ||
| 608 | given at handover_offset + 0x200. | ||
| 609 | |||
| 585 | Field name: cmdline_size | 610 | Field name: cmdline_size |
| 586 | Type: read | 611 | Type: read |
| 587 | Offset/size: 0x238/4 | 612 | Offset/size: 0x238/4 |
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt index cf5437deda81..199f453cb4de 100644 --- a/Documentation/x86/zero-page.txt +++ b/Documentation/x86/zero-page.txt | |||
| @@ -19,6 +19,9 @@ Offset Proto Name Meaning | |||
| 19 | 090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!! | 19 | 090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!! |
| 20 | 0A0/010 ALL sys_desc_table System description table (struct sys_desc_table) | 20 | 0A0/010 ALL sys_desc_table System description table (struct sys_desc_table) |
| 21 | 0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends | 21 | 0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends |
| 22 | 0C0/004 ALL ext_ramdisk_image ramdisk_image high 32bits | ||
| 23 | 0C4/004 ALL ext_ramdisk_size ramdisk_size high 32bits | ||
| 24 | 0C8/004 ALL ext_cmd_line_ptr cmd_line_ptr high 32bits | ||
| 22 | 140/080 ALL edid_info Video mode setup (struct edid_info) | 25 | 140/080 ALL edid_info Video mode setup (struct edid_info) |
| 23 | 1C0/020 ALL efi_info EFI 32 information (struct efi_info) | 26 | 1C0/020 ALL efi_info EFI 32 information (struct efi_info) |
| 24 | 1E0/004 ALL alk_mem_k Alternative mem check, in KB | 27 | 1E0/004 ALL alk_mem_k Alternative mem check, in KB |
| @@ -27,6 +30,7 @@ Offset Proto Name Meaning | |||
| 27 | 1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below) | 30 | 1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below) |
| 28 | 1EA/001 ALL edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer | 31 | 1EA/001 ALL edd_mbr_sig_buf_entries Number of entries in edd_mbr_sig_buffer |
| 29 | (below) | 32 | (below) |
| 33 | 1EF/001 ALL sentinel Used to detect broken bootloaders | ||
| 30 | 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures | 34 | 290/040 ALL edd_mbr_sig_buffer EDD MBR signatures |
| 31 | 2D0/A00 ALL e820_map E820 memory map table | 35 | 2D0/A00 ALL e820_map E820 memory map table |
| 32 | (array of struct e820entry) | 36 | (array of struct e820entry) |
diff --git a/MAINTAINERS b/MAINTAINERS index 845becb8d6ef..38fe0ffc5f16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2966,7 +2966,7 @@ S: Maintained | |||
| 2966 | F: drivers/net/ethernet/i825xx/eexpress.* | 2966 | F: drivers/net/ethernet/i825xx/eexpress.* |
| 2967 | 2967 | ||
| 2968 | ETHERNET BRIDGE | 2968 | ETHERNET BRIDGE |
| 2969 | M: Stephen Hemminger <shemminger@vyatta.com> | 2969 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 2970 | L: bridge@lists.linux-foundation.org | 2970 | L: bridge@lists.linux-foundation.org |
| 2971 | L: netdev@vger.kernel.org | 2971 | L: netdev@vger.kernel.org |
| 2972 | W: http://www.linuxfoundation.org/en/Net:Bridge | 2972 | W: http://www.linuxfoundation.org/en/Net:Bridge |
| @@ -4914,7 +4914,7 @@ S: Maintained | |||
| 4914 | 4914 | ||
| 4915 | MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) | 4915 | MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) |
| 4916 | M: Mirko Lindner <mlindner@marvell.com> | 4916 | M: Mirko Lindner <mlindner@marvell.com> |
| 4917 | M: Stephen Hemminger <shemminger@vyatta.com> | 4917 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 4918 | L: netdev@vger.kernel.org | 4918 | L: netdev@vger.kernel.org |
| 4919 | S: Maintained | 4919 | S: Maintained |
| 4920 | F: drivers/net/ethernet/marvell/sk* | 4920 | F: drivers/net/ethernet/marvell/sk* |
| @@ -5189,7 +5189,7 @@ S: Supported | |||
| 5189 | F: drivers/infiniband/hw/nes/ | 5189 | F: drivers/infiniband/hw/nes/ |
| 5190 | 5190 | ||
| 5191 | NETEM NETWORK EMULATOR | 5191 | NETEM NETWORK EMULATOR |
| 5192 | M: Stephen Hemminger <shemminger@vyatta.com> | 5192 | M: Stephen Hemminger <stephen@networkplumber.org> |
| 5193 | L: netem@lists.linux-foundation.org | 5193 | L: netem@lists.linux-foundation.org |
| 5194 | S: Maintained | 5194 | S: Maintained |
| 5195 | F: net/sched/sch_netem.c | 5195 | F: net/sched/sch_netem.c |
| @@ -6594,7 +6594,7 @@ F: drivers/media/platform/s3c-camif/ | |||
| 6594 | F: include/media/s3c_camif.h | 6594 | F: include/media/s3c_camif.h |
| 6595 | 6595 | ||
| 6596 | SERIAL DRIVERS | 6596 | SERIAL DRIVERS |
| 6597 | M: Alan Cox <alan@linux.intel.com> | 6597 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 6598 | L: linux-serial@vger.kernel.org | 6598 | L: linux-serial@vger.kernel.org |
| 6599 | S: Maintained | 6599 | S: Maintained |
| 6600 | F: drivers/tty/serial | 6600 | F: drivers/tty/serial |
| @@ -7097,7 +7097,7 @@ F: include/uapi/sound/ | |||
| 7097 | F: sound/ | 7097 | F: sound/ |
| 7098 | 7098 | ||
| 7099 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) | 7099 | SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) |
| 7100 | M: Liam Girdwood <lrg@ti.com> | 7100 | M: Liam Girdwood <lgirdwood@gmail.com> |
| 7101 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> | 7101 | M: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| 7102 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git | 7102 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git |
| 7103 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) | 7103 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 3 | 1 | VERSION = 3 |
| 2 | PATCHLEVEL = 8 | 2 | PATCHLEVEL = 8 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc5 |
| 5 | NAME = Terrified Chipmunk | 5 | NAME = Terrified Chipmunk |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -169,7 +169,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |||
| 169 | -e s/arm.*/arm/ -e s/sa110/arm/ \ | 169 | -e s/arm.*/arm/ -e s/sa110/arm/ \ |
| 170 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ | 170 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ |
| 171 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ | 171 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ |
| 172 | -e s/sh[234].*/sh/ ) | 172 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) |
| 173 | 173 | ||
| 174 | # Cross compiling and selecting different set of gcc/bin-utils | 174 | # Cross compiling and selecting different set of gcc/bin-utils |
| 175 | # --------------------------------------------------------------------------- | 175 | # --------------------------------------------------------------------------- |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2daf6c06beb9..56e1b06aff2b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -4,6 +4,7 @@ config ARM | |||
| 4 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 4 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
| 5 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 5 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 6 | select ARCH_HAVE_CUSTOM_GPIO_H | 6 | select ARCH_HAVE_CUSTOM_GPIO_H |
| 7 | select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST | ||
| 7 | select ARCH_WANT_IPC_PARSE_VERSION | 8 | select ARCH_WANT_IPC_PARSE_VERSION |
| 8 | select BUILDTIME_EXTABLE_SORT if MMU | 9 | select BUILDTIME_EXTABLE_SORT if MMU |
| 9 | select CPU_PM if (SUSPEND || CPU_IDLE) | 10 | select CPU_PM if (SUSPEND || CPU_IDLE) |
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index 00044026ef1f..9b82facb2561 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | memory { | 27 | memory { |
| 28 | device_type = "memory"; | 28 | device_type = "memory"; |
| 29 | reg = <0x00000000 0x20000000>; /* 512 MB */ | 29 | reg = <0x00000000 0x40000000>; /* 1 GB */ |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | soc { | 32 | soc { |
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 271855a6e224..e041f42ed711 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi | |||
| @@ -50,27 +50,25 @@ | |||
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | gpio0: gpio@d0018100 { | 52 | gpio0: gpio@d0018100 { |
| 53 | compatible = "marvell,armadaxp-gpio"; | 53 | compatible = "marvell,orion-gpio"; |
| 54 | reg = <0xd0018100 0x40>, | 54 | reg = <0xd0018100 0x40>; |
| 55 | <0xd0018800 0x30>; | ||
| 56 | ngpios = <32>; | 55 | ngpios = <32>; |
| 57 | gpio-controller; | 56 | gpio-controller; |
| 58 | #gpio-cells = <2>; | 57 | #gpio-cells = <2>; |
| 59 | interrupt-controller; | 58 | interrupt-controller; |
| 60 | #interrupts-cells = <2>; | 59 | #interrupts-cells = <2>; |
| 61 | interrupts = <16>, <17>, <18>, <19>; | 60 | interrupts = <82>, <83>, <84>, <85>; |
| 62 | }; | 61 | }; |
| 63 | 62 | ||
| 64 | gpio1: gpio@d0018140 { | 63 | gpio1: gpio@d0018140 { |
| 65 | compatible = "marvell,armadaxp-gpio"; | 64 | compatible = "marvell,orion-gpio"; |
| 66 | reg = <0xd0018140 0x40>, | 65 | reg = <0xd0018140 0x40>; |
| 67 | <0xd0018840 0x30>; | ||
| 68 | ngpios = <17>; | 66 | ngpios = <17>; |
| 69 | gpio-controller; | 67 | gpio-controller; |
| 70 | #gpio-cells = <2>; | 68 | #gpio-cells = <2>; |
| 71 | interrupt-controller; | 69 | interrupt-controller; |
| 72 | #interrupts-cells = <2>; | 70 | #interrupts-cells = <2>; |
| 73 | interrupts = <20>, <21>, <22>; | 71 | interrupts = <87>, <88>, <89>; |
| 74 | }; | 72 | }; |
| 75 | }; | 73 | }; |
| 76 | }; | 74 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 1c1937dbce73..9e23bd8c9536 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
| @@ -51,39 +51,36 @@ | |||
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | gpio0: gpio@d0018100 { | 53 | gpio0: gpio@d0018100 { |
| 54 | compatible = "marvell,armadaxp-gpio"; | 54 | compatible = "marvell,orion-gpio"; |
| 55 | reg = <0xd0018100 0x40>, | 55 | reg = <0xd0018100 0x40>; |
| 56 | <0xd0018800 0x30>; | ||
| 57 | ngpios = <32>; | 56 | ngpios = <32>; |
| 58 | gpio-controller; | 57 | gpio-controller; |
| 59 | #gpio-cells = <2>; | 58 | #gpio-cells = <2>; |
| 60 | interrupt-controller; | 59 | interrupt-controller; |
| 61 | #interrupts-cells = <2>; | 60 | #interrupts-cells = <2>; |
| 62 | interrupts = <16>, <17>, <18>, <19>; | 61 | interrupts = <82>, <83>, <84>, <85>; |
| 63 | }; | 62 | }; |
| 64 | 63 | ||
| 65 | gpio1: gpio@d0018140 { | 64 | gpio1: gpio@d0018140 { |
| 66 | compatible = "marvell,armadaxp-gpio"; | 65 | compatible = "marvell,orion-gpio"; |
| 67 | reg = <0xd0018140 0x40>, | 66 | reg = <0xd0018140 0x40>; |
| 68 | <0xd0018840 0x30>; | ||
| 69 | ngpios = <32>; | 67 | ngpios = <32>; |
| 70 | gpio-controller; | 68 | gpio-controller; |
| 71 | #gpio-cells = <2>; | 69 | #gpio-cells = <2>; |
| 72 | interrupt-controller; | 70 | interrupt-controller; |
| 73 | #interrupts-cells = <2>; | 71 | #interrupts-cells = <2>; |
| 74 | interrupts = <20>, <21>, <22>, <23>; | 72 | interrupts = <87>, <88>, <89>, <90>; |
| 75 | }; | 73 | }; |
| 76 | 74 | ||
| 77 | gpio2: gpio@d0018180 { | 75 | gpio2: gpio@d0018180 { |
| 78 | compatible = "marvell,armadaxp-gpio"; | 76 | compatible = "marvell,orion-gpio"; |
| 79 | reg = <0xd0018180 0x40>, | 77 | reg = <0xd0018180 0x40>; |
| 80 | <0xd0018870 0x30>; | ||
| 81 | ngpios = <3>; | 78 | ngpios = <3>; |
| 82 | gpio-controller; | 79 | gpio-controller; |
| 83 | #gpio-cells = <2>; | 80 | #gpio-cells = <2>; |
| 84 | interrupt-controller; | 81 | interrupt-controller; |
| 85 | #interrupts-cells = <2>; | 82 | #interrupts-cells = <2>; |
| 86 | interrupts = <24>; | 83 | interrupts = <91>; |
| 87 | }; | 84 | }; |
| 88 | 85 | ||
| 89 | ethernet@d0034000 { | 86 | ethernet@d0034000 { |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 4905cf3a5ef8..965966110e38 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
| @@ -66,39 +66,36 @@ | |||
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | gpio0: gpio@d0018100 { | 68 | gpio0: gpio@d0018100 { |
| 69 | compatible = "marvell,armadaxp-gpio"; | 69 | compatible = "marvell,orion-gpio"; |
| 70 | reg = <0xd0018100 0x40>, | 70 | reg = <0xd0018100 0x40>; |
| 71 | <0xd0018800 0x30>; | ||
| 72 | ngpios = <32>; | 71 | ngpios = <32>; |
| 73 | gpio-controller; | 72 | gpio-controller; |
| 74 | #gpio-cells = <2>; | 73 | #gpio-cells = <2>; |
| 75 | interrupt-controller; | 74 | interrupt-controller; |
| 76 | #interrupts-cells = <2>; | 75 | #interrupts-cells = <2>; |
| 77 | interrupts = <16>, <17>, <18>, <19>; | 76 | interrupts = <82>, <83>, <84>, <85>; |
| 78 | }; | 77 | }; |
| 79 | 78 | ||
| 80 | gpio1: gpio@d0018140 { | 79 | gpio1: gpio@d0018140 { |
| 81 | compatible = "marvell,armadaxp-gpio"; | 80 | compatible = "marvell,orion-gpio"; |
| 82 | reg = <0xd0018140 0x40>, | 81 | reg = <0xd0018140 0x40>; |
| 83 | <0xd0018840 0x30>; | ||
| 84 | ngpios = <32>; | 82 | ngpios = <32>; |
| 85 | gpio-controller; | 83 | gpio-controller; |
| 86 | #gpio-cells = <2>; | 84 | #gpio-cells = <2>; |
| 87 | interrupt-controller; | 85 | interrupt-controller; |
| 88 | #interrupts-cells = <2>; | 86 | #interrupts-cells = <2>; |
| 89 | interrupts = <20>, <21>, <22>, <23>; | 87 | interrupts = <87>, <88>, <89>, <90>; |
| 90 | }; | 88 | }; |
| 91 | 89 | ||
| 92 | gpio2: gpio@d0018180 { | 90 | gpio2: gpio@d0018180 { |
| 93 | compatible = "marvell,armadaxp-gpio"; | 91 | compatible = "marvell,orion-gpio"; |
| 94 | reg = <0xd0018180 0x40>, | 92 | reg = <0xd0018180 0x40>; |
| 95 | <0xd0018870 0x30>; | ||
| 96 | ngpios = <3>; | 93 | ngpios = <3>; |
| 97 | gpio-controller; | 94 | gpio-controller; |
| 98 | #gpio-cells = <2>; | 95 | #gpio-cells = <2>; |
| 99 | interrupt-controller; | 96 | interrupt-controller; |
| 100 | #interrupts-cells = <2>; | 97 | #interrupts-cells = <2>; |
| 101 | interrupts = <24>; | 98 | interrupts = <91>; |
| 102 | }; | 99 | }; |
| 103 | 100 | ||
| 104 | ethernet@d0034000 { | 101 | ethernet@d0034000 { |
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi index e154f242c680..222047f1ece9 100644 --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi | |||
| @@ -336,8 +336,8 @@ | |||
| 336 | 336 | ||
| 337 | i2c@0 { | 337 | i2c@0 { |
| 338 | compatible = "i2c-gpio"; | 338 | compatible = "i2c-gpio"; |
| 339 | gpios = <&pioA 23 0 /* sda */ | 339 | gpios = <&pioA 25 0 /* sda */ |
| 340 | &pioA 24 0 /* scl */ | 340 | &pioA 26 0 /* scl */ |
| 341 | >; | 341 | >; |
| 342 | i2c-gpio,sda-open-drain; | 342 | i2c-gpio,sda-open-drain; |
| 343 | i2c-gpio,scl-open-drain; | 343 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 3a47cf952146..8ecca6948d81 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
| @@ -143,6 +143,11 @@ | |||
| 143 | atmel,pins = | 143 | atmel,pins = |
| 144 | <0 3 0x1 0x0>; /* PA3 periph A */ | 144 | <0 3 0x1 0x0>; /* PA3 periph A */ |
| 145 | }; | 145 | }; |
| 146 | |||
| 147 | pinctrl_usart0_sck: usart0_sck-0 { | ||
| 148 | atmel,pins = | ||
| 149 | <0 4 0x1 0x0>; /* PA4 periph A */ | ||
| 150 | }; | ||
| 146 | }; | 151 | }; |
| 147 | 152 | ||
| 148 | usart1 { | 153 | usart1 { |
| @@ -154,12 +159,17 @@ | |||
| 154 | 159 | ||
| 155 | pinctrl_usart1_rts: usart1_rts-0 { | 160 | pinctrl_usart1_rts: usart1_rts-0 { |
| 156 | atmel,pins = | 161 | atmel,pins = |
| 157 | <3 27 0x3 0x0>; /* PC27 periph C */ | 162 | <2 27 0x3 0x0>; /* PC27 periph C */ |
| 158 | }; | 163 | }; |
| 159 | 164 | ||
| 160 | pinctrl_usart1_cts: usart1_cts-0 { | 165 | pinctrl_usart1_cts: usart1_cts-0 { |
| 161 | atmel,pins = | 166 | atmel,pins = |
| 162 | <3 28 0x3 0x0>; /* PC28 periph C */ | 167 | <2 28 0x3 0x0>; /* PC28 periph C */ |
| 168 | }; | ||
| 169 | |||
| 170 | pinctrl_usart1_sck: usart1_sck-0 { | ||
| 171 | atmel,pins = | ||
| 172 | <2 28 0x3 0x0>; /* PC29 periph C */ | ||
| 163 | }; | 173 | }; |
| 164 | }; | 174 | }; |
| 165 | 175 | ||
| @@ -172,46 +182,56 @@ | |||
| 172 | 182 | ||
| 173 | pinctrl_uart2_rts: uart2_rts-0 { | 183 | pinctrl_uart2_rts: uart2_rts-0 { |
| 174 | atmel,pins = | 184 | atmel,pins = |
| 175 | <0 0 0x2 0x0>; /* PB0 periph B */ | 185 | <1 0 0x2 0x0>; /* PB0 periph B */ |
| 176 | }; | 186 | }; |
| 177 | 187 | ||
| 178 | pinctrl_uart2_cts: uart2_cts-0 { | 188 | pinctrl_uart2_cts: uart2_cts-0 { |
| 179 | atmel,pins = | 189 | atmel,pins = |
| 180 | <0 1 0x2 0x0>; /* PB1 periph B */ | 190 | <1 1 0x2 0x0>; /* PB1 periph B */ |
| 191 | }; | ||
| 192 | |||
| 193 | pinctrl_usart2_sck: usart2_sck-0 { | ||
| 194 | atmel,pins = | ||
| 195 | <1 2 0x2 0x0>; /* PB2 periph B */ | ||
| 181 | }; | 196 | }; |
| 182 | }; | 197 | }; |
| 183 | 198 | ||
| 184 | usart3 { | 199 | usart3 { |
| 185 | pinctrl_uart3: usart3-0 { | 200 | pinctrl_uart3: usart3-0 { |
| 186 | atmel,pins = | 201 | atmel,pins = |
| 187 | <3 23 0x2 0x1 /* PC22 periph B with pullup */ | 202 | <2 23 0x2 0x1 /* PC22 periph B with pullup */ |
| 188 | 3 23 0x2 0x0>; /* PC23 periph B */ | 203 | 2 23 0x2 0x0>; /* PC23 periph B */ |
| 189 | }; | 204 | }; |
| 190 | 205 | ||
| 191 | pinctrl_usart3_rts: usart3_rts-0 { | 206 | pinctrl_usart3_rts: usart3_rts-0 { |
| 192 | atmel,pins = | 207 | atmel,pins = |
| 193 | <3 24 0x2 0x0>; /* PC24 periph B */ | 208 | <2 24 0x2 0x0>; /* PC24 periph B */ |
| 194 | }; | 209 | }; |
| 195 | 210 | ||
| 196 | pinctrl_usart3_cts: usart3_cts-0 { | 211 | pinctrl_usart3_cts: usart3_cts-0 { |
| 197 | atmel,pins = | 212 | atmel,pins = |
| 198 | <3 25 0x2 0x0>; /* PC25 periph B */ | 213 | <2 25 0x2 0x0>; /* PC25 periph B */ |
| 214 | }; | ||
| 215 | |||
| 216 | pinctrl_usart3_sck: usart3_sck-0 { | ||
| 217 | atmel,pins = | ||
| 218 | <2 26 0x2 0x0>; /* PC26 periph B */ | ||
| 199 | }; | 219 | }; |
| 200 | }; | 220 | }; |
| 201 | 221 | ||
| 202 | uart0 { | 222 | uart0 { |
| 203 | pinctrl_uart0: uart0-0 { | 223 | pinctrl_uart0: uart0-0 { |
| 204 | atmel,pins = | 224 | atmel,pins = |
| 205 | <3 8 0x3 0x0 /* PC8 periph C */ | 225 | <2 8 0x3 0x0 /* PC8 periph C */ |
| 206 | 3 9 0x3 0x1>; /* PC9 periph C with pullup */ | 226 | 2 9 0x3 0x1>; /* PC9 periph C with pullup */ |
| 207 | }; | 227 | }; |
| 208 | }; | 228 | }; |
| 209 | 229 | ||
| 210 | uart1 { | 230 | uart1 { |
| 211 | pinctrl_uart1: uart1-0 { | 231 | pinctrl_uart1: uart1-0 { |
| 212 | atmel,pins = | 232 | atmel,pins = |
| 213 | <3 16 0x3 0x0 /* PC16 periph C */ | 233 | <2 16 0x3 0x0 /* PC16 periph C */ |
| 214 | 3 17 0x3 0x1>; /* PC17 periph C with pullup */ | 234 | 2 17 0x3 0x1>; /* PC17 periph C with pullup */ |
| 215 | }; | 235 | }; |
| 216 | }; | 236 | }; |
| 217 | 237 | ||
| @@ -240,14 +260,14 @@ | |||
| 240 | 260 | ||
| 241 | pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 { | 261 | pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 { |
| 242 | atmel,pins = | 262 | atmel,pins = |
| 243 | <1 8 0x1 0x0 /* PA8 periph A */ | 263 | <1 8 0x1 0x0 /* PB8 periph A */ |
| 244 | 1 11 0x1 0x0 /* PA11 periph A */ | 264 | 1 11 0x1 0x0 /* PB11 periph A */ |
| 245 | 1 12 0x1 0x0 /* PA12 periph A */ | 265 | 1 12 0x1 0x0 /* PB12 periph A */ |
| 246 | 1 13 0x1 0x0 /* PA13 periph A */ | 266 | 1 13 0x1 0x0 /* PB13 periph A */ |
| 247 | 1 14 0x1 0x0 /* PA14 periph A */ | 267 | 1 14 0x1 0x0 /* PB14 periph A */ |
| 248 | 1 15 0x1 0x0 /* PA15 periph A */ | 268 | 1 15 0x1 0x0 /* PB15 periph A */ |
| 249 | 1 16 0x1 0x0 /* PA16 periph A */ | 269 | 1 16 0x1 0x0 /* PB16 periph A */ |
| 250 | 1 17 0x1 0x0>; /* PA17 periph A */ | 270 | 1 17 0x1 0x0>; /* PB17 periph A */ |
| 251 | }; | 271 | }; |
| 252 | }; | 272 | }; |
| 253 | 273 | ||
diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index fddd17417433..46c098017036 100644 --- a/arch/arm/boot/dts/cros5250-common.dtsi +++ b/arch/arm/boot/dts/cros5250-common.dtsi | |||
| @@ -96,8 +96,8 @@ | |||
| 96 | fifo-depth = <0x80>; | 96 | fifo-depth = <0x80>; |
| 97 | card-detect-delay = <200>; | 97 | card-detect-delay = <200>; |
| 98 | samsung,dw-mshc-ciu-div = <3>; | 98 | samsung,dw-mshc-ciu-div = <3>; |
| 99 | samsung,dw-mshc-sdr-timing = <2 3 3>; | 99 | samsung,dw-mshc-sdr-timing = <2 3>; |
| 100 | samsung,dw-mshc-ddr-timing = <1 2 3>; | 100 | samsung,dw-mshc-ddr-timing = <1 2>; |
| 101 | 101 | ||
| 102 | slot@0 { | 102 | slot@0 { |
| 103 | reg = <0>; | 103 | reg = <0>; |
| @@ -120,8 +120,8 @@ | |||
| 120 | fifo-depth = <0x80>; | 120 | fifo-depth = <0x80>; |
| 121 | card-detect-delay = <200>; | 121 | card-detect-delay = <200>; |
| 122 | samsung,dw-mshc-ciu-div = <3>; | 122 | samsung,dw-mshc-ciu-div = <3>; |
| 123 | samsung,dw-mshc-sdr-timing = <2 3 3>; | 123 | samsung,dw-mshc-sdr-timing = <2 3>; |
| 124 | samsung,dw-mshc-ddr-timing = <1 2 3>; | 124 | samsung,dw-mshc-ddr-timing = <1 2>; |
| 125 | 125 | ||
| 126 | slot@0 { | 126 | slot@0 { |
| 127 | reg = <0>; | 127 | reg = <0>; |
| @@ -141,8 +141,8 @@ | |||
| 141 | fifo-depth = <0x80>; | 141 | fifo-depth = <0x80>; |
| 142 | card-detect-delay = <200>; | 142 | card-detect-delay = <200>; |
| 143 | samsung,dw-mshc-ciu-div = <3>; | 143 | samsung,dw-mshc-ciu-div = <3>; |
| 144 | samsung,dw-mshc-sdr-timing = <2 3 3>; | 144 | samsung,dw-mshc-sdr-timing = <2 3>; |
| 145 | samsung,dw-mshc-ddr-timing = <1 2 3>; | 145 | samsung,dw-mshc-ddr-timing = <1 2>; |
| 146 | 146 | ||
| 147 | slot@0 { | 147 | slot@0 { |
| 148 | reg = <0>; | 148 | reg = <0>; |
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index fed7d3f9f431..cdee96fca6e2 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts | |||
| @@ -26,10 +26,15 @@ | |||
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | &uart0 { status = "okay"; }; | 28 | &uart0 { status = "okay"; }; |
| 29 | &sdio0 { status = "okay"; }; | ||
| 30 | &sata0 { status = "okay"; }; | 29 | &sata0 { status = "okay"; }; |
| 31 | &i2c0 { status = "okay"; }; | 30 | &i2c0 { status = "okay"; }; |
| 32 | 31 | ||
| 32 | &sdio0 { | ||
| 33 | status = "okay"; | ||
| 34 | /* sdio0 card detect is connected to wrong pin on CuBox */ | ||
| 35 | cd-gpios = <&gpio0 12 1>; | ||
| 36 | }; | ||
| 37 | |||
| 33 | &spi0 { | 38 | &spi0 { |
| 34 | status = "okay"; | 39 | status = "okay"; |
| 35 | 40 | ||
| @@ -42,9 +47,14 @@ | |||
| 42 | }; | 47 | }; |
| 43 | 48 | ||
| 44 | &pinctrl { | 49 | &pinctrl { |
| 45 | pinctrl-0 = <&pmx_gpio_18>; | 50 | pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>; |
| 46 | pinctrl-names = "default"; | 51 | pinctrl-names = "default"; |
| 47 | 52 | ||
| 53 | pmx_gpio_12: pmx-gpio-12 { | ||
| 54 | marvell,pins = "mpp12"; | ||
| 55 | marvell,function = "gpio"; | ||
| 56 | }; | ||
| 57 | |||
| 48 | pmx_gpio_18: pmx-gpio-18 { | 58 | pmx_gpio_18: pmx-gpio-18 { |
| 49 | marvell,pins = "mpp18"; | 59 | marvell,pins = "mpp18"; |
| 50 | marvell,function = "gpio"; | 60 | marvell,function = "gpio"; |
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 942d5761ca97..e05b18f3c33d 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
| @@ -115,8 +115,8 @@ | |||
| 115 | fifo-depth = <0x80>; | 115 | fifo-depth = <0x80>; |
| 116 | card-detect-delay = <200>; | 116 | card-detect-delay = <200>; |
| 117 | samsung,dw-mshc-ciu-div = <3>; | 117 | samsung,dw-mshc-ciu-div = <3>; |
| 118 | samsung,dw-mshc-sdr-timing = <2 3 3>; | 118 | samsung,dw-mshc-sdr-timing = <2 3>; |
| 119 | samsung,dw-mshc-ddr-timing = <1 2 3>; | 119 | samsung,dw-mshc-ddr-timing = <1 2>; |
| 120 | 120 | ||
| 121 | slot@0 { | 121 | slot@0 { |
| 122 | reg = <0>; | 122 | reg = <0>; |
| @@ -139,8 +139,8 @@ | |||
| 139 | fifo-depth = <0x80>; | 139 | fifo-depth = <0x80>; |
| 140 | card-detect-delay = <200>; | 140 | card-detect-delay = <200>; |
| 141 | samsung,dw-mshc-ciu-div = <3>; | 141 | samsung,dw-mshc-ciu-div = <3>; |
| 142 | samsung,dw-mshc-sdr-timing = <2 3 3>; | 142 | samsung,dw-mshc-sdr-timing = <2 3>; |
| 143 | samsung,dw-mshc-ddr-timing = <1 2 3>; | 143 | samsung,dw-mshc-ddr-timing = <1 2>; |
| 144 | 144 | ||
| 145 | slot@0 { | 145 | slot@0 { |
| 146 | reg = <0>; | 146 | reg = <0>; |
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 9bc6785ad228..77d21abfcdf7 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /include/ "kirkwood.dtsi" | 1 | /include/ "kirkwood.dtsi" |
| 2 | /include/ "kirkwood-6281.dtsi" | ||
| 2 | 3 | ||
| 3 | / { | 4 | / { |
| 4 | chosen { | 5 | chosen { |
| @@ -6,6 +7,21 @@ | |||
| 6 | }; | 7 | }; |
| 7 | 8 | ||
| 8 | ocp@f1000000 { | 9 | ocp@f1000000 { |
| 10 | pinctrl: pinctrl@10000 { | ||
| 11 | pinctrl-0 = < &pmx_spi &pmx_twsi0 &pmx_uart0 | ||
| 12 | &pmx_ns2_sata0 &pmx_ns2_sata1>; | ||
| 13 | pinctrl-names = "default"; | ||
| 14 | |||
| 15 | pmx_ns2_sata0: pmx-ns2-sata0 { | ||
| 16 | marvell,pins = "mpp21"; | ||
| 17 | marvell,function = "sata0"; | ||
| 18 | }; | ||
| 19 | pmx_ns2_sata1: pmx-ns2-sata1 { | ||
| 20 | marvell,pins = "mpp20"; | ||
| 21 | marvell,function = "sata1"; | ||
| 22 | }; | ||
| 23 | }; | ||
| 24 | |||
| 9 | serial@12000 { | 25 | serial@12000 { |
| 10 | clock-frequency = <166666667>; | 26 | clock-frequency = <166666667>; |
| 11 | status = "okay"; | 27 | status = "okay"; |
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 110d6cbb795b..d6ab442b7011 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | reg = <0x10100 0x40>; | 36 | reg = <0x10100 0x40>; |
| 37 | ngpios = <32>; | 37 | ngpios = <32>; |
| 38 | interrupt-controller; | 38 | interrupt-controller; |
| 39 | #interrupt-cells = <2>; | ||
| 39 | interrupts = <35>, <36>, <37>, <38>; | 40 | interrupts = <35>, <36>, <37>, <38>; |
| 40 | }; | 41 | }; |
| 41 | 42 | ||
| @@ -46,6 +47,7 @@ | |||
| 46 | reg = <0x10140 0x40>; | 47 | reg = <0x10140 0x40>; |
| 47 | ngpios = <18>; | 48 | ngpios = <18>; |
| 48 | interrupt-controller; | 49 | interrupt-controller; |
| 50 | #interrupt-cells = <2>; | ||
| 49 | interrupts = <39>, <40>, <41>; | 51 | interrupts = <39>, <40>, <41>; |
| 50 | }; | 52 | }; |
| 51 | 53 | ||
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts index e8814fe0e277..b4dc3ed9a3ec 100644 --- a/arch/arm/boot/dts/kizbox.dts +++ b/arch/arm/boot/dts/kizbox.dts | |||
| @@ -48,6 +48,8 @@ | |||
| 48 | 48 | ||
| 49 | macb0: ethernet@fffc4000 { | 49 | macb0: ethernet@fffc4000 { |
| 50 | phy-mode = "mii"; | 50 | phy-mode = "mii"; |
| 51 | pinctrl-0 = <&pinctrl_macb_rmii | ||
| 52 | &pinctrl_macb_rmii_mii_alt>; | ||
| 51 | status = "okay"; | 53 | status = "okay"; |
| 52 | }; | 54 | }; |
| 53 | 55 | ||
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi index 8bbc2bfef221..8b36abea9f2e 100644 --- a/arch/arm/boot/dts/sunxi.dtsi +++ b/arch/arm/boot/dts/sunxi.dtsi | |||
| @@ -60,19 +60,21 @@ | |||
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | uart0: uart@01c28000 { | 62 | uart0: uart@01c28000 { |
| 63 | compatible = "ns8250"; | 63 | compatible = "snps,dw-apb-uart"; |
| 64 | reg = <0x01c28000 0x400>; | 64 | reg = <0x01c28000 0x400>; |
| 65 | interrupts = <1>; | 65 | interrupts = <1>; |
| 66 | reg-shift = <2>; | 66 | reg-shift = <2>; |
| 67 | reg-io-width = <4>; | ||
| 67 | clock-frequency = <24000000>; | 68 | clock-frequency = <24000000>; |
| 68 | status = "disabled"; | 69 | status = "disabled"; |
| 69 | }; | 70 | }; |
| 70 | 71 | ||
| 71 | uart1: uart@01c28400 { | 72 | uart1: uart@01c28400 { |
| 72 | compatible = "ns8250"; | 73 | compatible = "snps,dw-apb-uart"; |
| 73 | reg = <0x01c28400 0x400>; | 74 | reg = <0x01c28400 0x400>; |
| 74 | interrupts = <2>; | 75 | interrupts = <2>; |
| 75 | reg-shift = <2>; | 76 | reg-shift = <2>; |
| 77 | reg-io-width = <4>; | ||
| 76 | clock-frequency = <24000000>; | 78 | clock-frequency = <24000000>; |
| 77 | status = "disabled"; | 79 | status = "disabled"; |
| 78 | }; | 80 | }; |
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts index 1fc405a9ecfb..cf8071ad22d5 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | reg = <1>; | 45 | reg = <1>; |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | /* A7s disabled till big.LITTLE patches are available... | ||
| 49 | cpu2: cpu@2 { | 48 | cpu2: cpu@2 { |
| 50 | device_type = "cpu"; | 49 | device_type = "cpu"; |
| 51 | compatible = "arm,cortex-a7"; | 50 | compatible = "arm,cortex-a7"; |
| @@ -63,7 +62,6 @@ | |||
| 63 | compatible = "arm,cortex-a7"; | 62 | compatible = "arm,cortex-a7"; |
| 64 | reg = <0x102>; | 63 | reg = <0x102>; |
| 65 | }; | 64 | }; |
| 66 | */ | ||
| 67 | }; | 65 | }; |
| 68 | 66 | ||
| 69 | memory@80000000 { | 67 | memory@80000000 { |
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index b175577d7abb..1ea959019fcd 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig | |||
| @@ -19,6 +19,7 @@ CONFIG_SOC_AT91SAM9260=y | |||
| 19 | CONFIG_SOC_AT91SAM9263=y | 19 | CONFIG_SOC_AT91SAM9263=y |
| 20 | CONFIG_SOC_AT91SAM9G45=y | 20 | CONFIG_SOC_AT91SAM9G45=y |
| 21 | CONFIG_SOC_AT91SAM9X5=y | 21 | CONFIG_SOC_AT91SAM9X5=y |
| 22 | CONFIG_SOC_AT91SAM9N12=y | ||
| 22 | CONFIG_MACH_AT91SAM_DT=y | 23 | CONFIG_MACH_AT91SAM_DT=y |
| 23 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | 24 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y |
| 24 | CONFIG_AT91_TIMER_HZ=128 | 25 | CONFIG_AT91_TIMER_HZ=128 |
| @@ -31,7 +32,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
| 31 | CONFIG_ZBOOT_ROM_BSS=0x0 | 32 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 32 | CONFIG_ARM_APPENDED_DTB=y | 33 | CONFIG_ARM_APPENDED_DTB=y |
| 33 | CONFIG_ARM_ATAG_DTB_COMPAT=y | 34 | CONFIG_ARM_ATAG_DTB_COMPAT=y |
| 34 | CONFIG_CMDLINE="mem=128M console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" | 35 | CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" |
| 35 | CONFIG_KEXEC=y | 36 | CONFIG_KEXEC=y |
| 36 | CONFIG_AUTO_ZRELADDR=y | 37 | CONFIG_AUTO_ZRELADDR=y |
| 37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 38 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 6809200c31fb..14f7c3b14632 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -100,12 +100,14 @@ ENTRY(printch) | |||
| 100 | b 1b | 100 | b 1b |
| 101 | ENDPROC(printch) | 101 | ENDPROC(printch) |
| 102 | 102 | ||
| 103 | #ifdef CONFIG_MMU | ||
| 103 | ENTRY(debug_ll_addr) | 104 | ENTRY(debug_ll_addr) |
| 104 | addruart r2, r3, ip | 105 | addruart r2, r3, ip |
| 105 | str r2, [r0] | 106 | str r2, [r0] |
| 106 | str r3, [r1] | 107 | str r3, [r1] |
| 107 | mov pc, lr | 108 | mov pc, lr |
| 108 | ENDPROC(debug_ll_addr) | 109 | ENDPROC(debug_ll_addr) |
| 110 | #endif | ||
| 109 | 111 | ||
| 110 | #else | 112 | #else |
| 111 | 113 | ||
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 4eee351f4668..486a15ae9011 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -246,6 +246,7 @@ __create_page_tables: | |||
| 246 | 246 | ||
| 247 | /* | 247 | /* |
| 248 | * Then map boot params address in r2 if specified. | 248 | * Then map boot params address in r2 if specified. |
| 249 | * We map 2 sections in case the ATAGs/DTB crosses a section boundary. | ||
| 249 | */ | 250 | */ |
| 250 | mov r0, r2, lsr #SECTION_SHIFT | 251 | mov r0, r2, lsr #SECTION_SHIFT |
| 251 | movs r0, r0, lsl #SECTION_SHIFT | 252 | movs r0, r0, lsl #SECTION_SHIFT |
| @@ -253,6 +254,8 @@ __create_page_tables: | |||
| 253 | addne r3, r3, #PAGE_OFFSET | 254 | addne r3, r3, #PAGE_OFFSET |
| 254 | addne r3, r4, r3, lsr #(SECTION_SHIFT - PMD_ORDER) | 255 | addne r3, r4, r3, lsr #(SECTION_SHIFT - PMD_ORDER) |
| 255 | orrne r6, r7, r0 | 256 | orrne r6, r7, r0 |
| 257 | strne r6, [r3], #1 << PMD_ORDER | ||
| 258 | addne r6, r6, #1 << SECTION_SHIFT | ||
| 256 | strne r6, [r3] | 259 | strne r6, [r3] |
| 257 | 260 | ||
| 258 | #ifdef CONFIG_DEBUG_LL | 261 | #ifdef CONFIG_DEBUG_LL |
| @@ -331,7 +334,7 @@ ENTRY(secondary_startup) | |||
| 331 | * as it has already been validated by the primary processor. | 334 | * as it has already been validated by the primary processor. |
| 332 | */ | 335 | */ |
| 333 | #ifdef CONFIG_ARM_VIRT_EXT | 336 | #ifdef CONFIG_ARM_VIRT_EXT |
| 334 | bl __hyp_stub_install | 337 | bl __hyp_stub_install_secondary |
| 335 | #endif | 338 | #endif |
| 336 | safe_svcmode_maskall r9 | 339 | safe_svcmode_maskall r9 |
| 337 | 340 | ||
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 65b2417aebce..1315c4ccfa56 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S | |||
| @@ -99,7 +99,7 @@ ENTRY(__hyp_stub_install_secondary) | |||
| 99 | * immediately. | 99 | * immediately. |
| 100 | */ | 100 | */ |
| 101 | compare_cpu_mode_with_primary r4, r5, r6, r7 | 101 | compare_cpu_mode_with_primary r4, r5, r6, r7 |
| 102 | bxne lr | 102 | movne pc, lr |
| 103 | 103 | ||
| 104 | /* | 104 | /* |
| 105 | * Once we have given up on one CPU, we do not try to install the | 105 | * Once we have given up on one CPU, we do not try to install the |
| @@ -111,7 +111,7 @@ ENTRY(__hyp_stub_install_secondary) | |||
| 111 | */ | 111 | */ |
| 112 | 112 | ||
| 113 | cmp r4, #HYP_MODE | 113 | cmp r4, #HYP_MODE |
| 114 | bxne lr @ give up if the CPU is not in HYP mode | 114 | movne pc, lr @ give up if the CPU is not in HYP mode |
| 115 | 115 | ||
| 116 | /* | 116 | /* |
| 117 | * Configure HSCTLR to set correct exception endianness/instruction set | 117 | * Configure HSCTLR to set correct exception endianness/instruction set |
| @@ -120,7 +120,8 @@ ENTRY(__hyp_stub_install_secondary) | |||
| 120 | * Eventually, CPU-specific code might be needed -- assume not for now | 120 | * Eventually, CPU-specific code might be needed -- assume not for now |
| 121 | * | 121 | * |
| 122 | * This code relies on the "eret" instruction to synchronize the | 122 | * This code relies on the "eret" instruction to synchronize the |
| 123 | * various coprocessor accesses. | 123 | * various coprocessor accesses. This is done when we switch to SVC |
| 124 | * (see safe_svcmode_maskall). | ||
| 124 | */ | 125 | */ |
| 125 | @ Now install the hypervisor stub: | 126 | @ Now install the hypervisor stub: |
| 126 | adr r7, __hyp_stub_vectors | 127 | adr r7, __hyp_stub_vectors |
| @@ -155,14 +156,7 @@ THUMB( orr r7, #(1 << 30) ) @ HSCTLR.TE | |||
| 155 | 1: | 156 | 1: |
| 156 | #endif | 157 | #endif |
| 157 | 158 | ||
| 158 | bic r7, r4, #MODE_MASK | 159 | bx lr @ The boot CPU mode is left in r4. |
| 159 | orr r7, r7, #SVC_MODE | ||
| 160 | THUMB( orr r7, r7, #PSR_T_BIT ) | ||
| 161 | msr spsr_cxsf, r7 @ This is SPSR_hyp. | ||
| 162 | |||
| 163 | __MSR_ELR_HYP(14) @ msr elr_hyp, lr | ||
| 164 | __ERET @ return, switching to SVC mode | ||
| 165 | @ The boot CPU mode is left in r4. | ||
| 166 | ENDPROC(__hyp_stub_install_secondary) | 160 | ENDPROC(__hyp_stub_install_secondary) |
| 167 | 161 | ||
| 168 | __hyp_stub_do_trap: | 162 | __hyp_stub_do_trap: |
| @@ -200,7 +194,7 @@ ENDPROC(__hyp_get_vectors) | |||
| 200 | @ fall through | 194 | @ fall through |
| 201 | ENTRY(__hyp_set_vectors) | 195 | ENTRY(__hyp_set_vectors) |
| 202 | __HVC(0) | 196 | __HVC(0) |
| 203 | bx lr | 197 | mov pc, lr |
| 204 | ENDPROC(__hyp_set_vectors) | 198 | ENDPROC(__hyp_set_vectors) |
| 205 | 199 | ||
| 206 | #ifndef ZIMAGE | 200 | #ifndef ZIMAGE |
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 84f4cbf652e5..b7e3b506219b 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
| @@ -475,14 +475,8 @@ u64 smp_irq_stat_cpu(unsigned int cpu) | |||
| 475 | */ | 475 | */ |
| 476 | static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent); | 476 | static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent); |
| 477 | 477 | ||
| 478 | static void ipi_timer(void) | ||
| 479 | { | ||
| 480 | struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent); | ||
| 481 | evt->event_handler(evt); | ||
| 482 | } | ||
| 483 | |||
| 484 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | 478 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST |
| 485 | static void smp_timer_broadcast(const struct cpumask *mask) | 479 | void tick_broadcast(const struct cpumask *mask) |
| 486 | { | 480 | { |
| 487 | smp_cross_call(mask, IPI_TIMER); | 481 | smp_cross_call(mask, IPI_TIMER); |
| 488 | } | 482 | } |
| @@ -530,7 +524,6 @@ static void __cpuinit percpu_timer_setup(void) | |||
| 530 | struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu); | 524 | struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu); |
| 531 | 525 | ||
| 532 | evt->cpumask = cpumask_of(cpu); | 526 | evt->cpumask = cpumask_of(cpu); |
| 533 | evt->broadcast = smp_timer_broadcast; | ||
| 534 | 527 | ||
| 535 | if (!lt_ops || lt_ops->setup(evt)) | 528 | if (!lt_ops || lt_ops->setup(evt)) |
| 536 | broadcast_timer_setup(evt); | 529 | broadcast_timer_setup(evt); |
| @@ -596,11 +589,13 @@ void handle_IPI(int ipinr, struct pt_regs *regs) | |||
| 596 | case IPI_WAKEUP: | 589 | case IPI_WAKEUP: |
| 597 | break; | 590 | break; |
| 598 | 591 | ||
| 592 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
| 599 | case IPI_TIMER: | 593 | case IPI_TIMER: |
| 600 | irq_enter(); | 594 | irq_enter(); |
| 601 | ipi_timer(); | 595 | tick_receive_broadcast(); |
| 602 | irq_exit(); | 596 | irq_exit(); |
| 603 | break; | 597 | break; |
| 598 | #endif | ||
| 604 | 599 | ||
| 605 | case IPI_RESCHEDULE: | 600 | case IPI_RESCHEDULE: |
| 606 | scheduler_ipi(); | 601 | scheduler_ipi(); |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 9ee866ce0478..4b678478cf95 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
| @@ -105,6 +105,8 @@ static void __init soc_detect(u32 dbgu_base) | |||
| 105 | switch (socid) { | 105 | switch (socid) { |
| 106 | case ARCH_ID_AT91RM9200: | 106 | case ARCH_ID_AT91RM9200: |
| 107 | at91_soc_initdata.type = AT91_SOC_RM9200; | 107 | at91_soc_initdata.type = AT91_SOC_RM9200; |
| 108 | if (at91_soc_initdata.subtype == AT91_SOC_SUBTYPE_NONE) | ||
| 109 | at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA; | ||
| 108 | at91_boot_soc = at91rm9200_soc; | 110 | at91_boot_soc = at91rm9200_soc; |
| 109 | break; | 111 | break; |
| 110 | 112 | ||
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 3e628fd7a674..0a2349dc7018 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -851,6 +851,7 @@ config SOC_IMX6Q | |||
| 851 | select HAVE_CAN_FLEXCAN if CAN | 851 | select HAVE_CAN_FLEXCAN if CAN |
| 852 | select HAVE_IMX_GPC | 852 | select HAVE_IMX_GPC |
| 853 | select HAVE_IMX_MMDC | 853 | select HAVE_IMX_MMDC |
| 854 | select HAVE_IMX_SRC | ||
| 854 | select HAVE_SMP | 855 | select HAVE_SMP |
| 855 | select MFD_SYSCON | 856 | select MFD_SYSCON |
| 856 | select PINCTRL | 857 | select PINCTRL |
diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c index b197aa73dc4b..2c570cdaae7b 100644 --- a/arch/arm/mach-imx/clk-imx25.c +++ b/arch/arm/mach-imx/clk-imx25.c | |||
| @@ -254,9 +254,9 @@ int __init mx25_clocks_init(void) | |||
| 254 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); | 254 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); |
| 255 | clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.2"); | 255 | clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.2"); |
| 256 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2"); | 256 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2"); |
| 257 | clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc"); | 257 | clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27"); |
| 258 | clk_register_clkdev(clk[usbotg_ahb], "ahb", "fsl-usb2-udc"); | 258 | clk_register_clkdev(clk[usbotg_ahb], "ahb", "imx-udc-mx27"); |
| 259 | clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); | 259 | clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27"); |
| 260 | clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0"); | 260 | clk_register_clkdev(clk[nfc_ipg_per], NULL, "imx25-nand.0"); |
| 261 | /* i.mx25 has the i.mx35 type cspi */ | 261 | /* i.mx25 has the i.mx35 type cspi */ |
| 262 | clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0"); | 262 | clk_register_clkdev(clk[cspi1_ipg], NULL, "imx35-cspi.0"); |
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index 4c1d1e4efc74..1ffe3b534e51 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c | |||
| @@ -236,9 +236,9 @@ int __init mx27_clocks_init(unsigned long fref) | |||
| 236 | clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0"); | 236 | clk_register_clkdev(clk[lcdc_ahb_gate], "ahb", "imx21-fb.0"); |
| 237 | clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0"); | 237 | clk_register_clkdev(clk[csi_ahb_gate], "ahb", "imx27-camera.0"); |
| 238 | clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0"); | 238 | clk_register_clkdev(clk[per4_gate], "per", "imx27-camera.0"); |
| 239 | clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); | 239 | clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27"); |
| 240 | clk_register_clkdev(clk[usb_ipg_gate], "ipg", "fsl-usb2-udc"); | 240 | clk_register_clkdev(clk[usb_ipg_gate], "ipg", "imx-udc-mx27"); |
| 241 | clk_register_clkdev(clk[usb_ahb_gate], "ahb", "fsl-usb2-udc"); | 241 | clk_register_clkdev(clk[usb_ahb_gate], "ahb", "imx-udc-mx27"); |
| 242 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0"); | 242 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0"); |
| 243 | clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.0"); | 243 | clk_register_clkdev(clk[usb_ipg_gate], "ipg", "mxc-ehci.0"); |
| 244 | clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.0"); | 244 | clk_register_clkdev(clk[usb_ahb_gate], "ahb", "mxc-ehci.0"); |
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index 8be64e0a4ace..16ccbd41dea9 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c | |||
| @@ -139,9 +139,9 @@ int __init mx31_clocks_init(unsigned long fref) | |||
| 139 | clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.2"); | 139 | clk_register_clkdev(clk[usb_div_post], "per", "mxc-ehci.2"); |
| 140 | clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.2"); | 140 | clk_register_clkdev(clk[usb_gate], "ahb", "mxc-ehci.2"); |
| 141 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); | 141 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); |
| 142 | clk_register_clkdev(clk[usb_div_post], "per", "fsl-usb2-udc"); | 142 | clk_register_clkdev(clk[usb_div_post], "per", "imx-udc-mx27"); |
| 143 | clk_register_clkdev(clk[usb_gate], "ahb", "fsl-usb2-udc"); | 143 | clk_register_clkdev(clk[usb_gate], "ahb", "imx-udc-mx27"); |
| 144 | clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc"); | 144 | clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27"); |
| 145 | clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); | 145 | clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); |
| 146 | /* i.mx31 has the i.mx21 type uart */ | 146 | /* i.mx31 has the i.mx21 type uart */ |
| 147 | clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0"); | 147 | clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0"); |
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index 66f3d65ea275..f0727e80815d 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c | |||
| @@ -251,9 +251,9 @@ int __init mx35_clocks_init() | |||
| 251 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2"); | 251 | clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.2"); |
| 252 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); | 252 | clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.2"); |
| 253 | clk_register_clkdev(clk[usbotg_gate], "ahb", "mxc-ehci.2"); | 253 | clk_register_clkdev(clk[usbotg_gate], "ahb", "mxc-ehci.2"); |
| 254 | clk_register_clkdev(clk[usb_div], "per", "fsl-usb2-udc"); | 254 | clk_register_clkdev(clk[usb_div], "per", "imx-udc-mx27"); |
| 255 | clk_register_clkdev(clk[ipg], "ipg", "fsl-usb2-udc"); | 255 | clk_register_clkdev(clk[ipg], "ipg", "imx-udc-mx27"); |
| 256 | clk_register_clkdev(clk[usbotg_gate], "ahb", "fsl-usb2-udc"); | 256 | clk_register_clkdev(clk[usbotg_gate], "ahb", "imx-udc-mx27"); |
| 257 | clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); | 257 | clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); |
| 258 | clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0"); | 258 | clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0"); |
| 259 | clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); | 259 | clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); |
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index 579023f59dc1..fb7cb841b64c 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c | |||
| @@ -269,9 +269,9 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil, | |||
| 269 | clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2"); | 269 | clk_register_clkdev(clk[usboh3_per_gate], "per", "mxc-ehci.2"); |
| 270 | clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2"); | 270 | clk_register_clkdev(clk[usboh3_gate], "ipg", "mxc-ehci.2"); |
| 271 | clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2"); | 271 | clk_register_clkdev(clk[usboh3_gate], "ahb", "mxc-ehci.2"); |
| 272 | clk_register_clkdev(clk[usboh3_per_gate], "per", "fsl-usb2-udc"); | 272 | clk_register_clkdev(clk[usboh3_per_gate], "per", "imx-udc-mx51"); |
| 273 | clk_register_clkdev(clk[usboh3_gate], "ipg", "fsl-usb2-udc"); | 273 | clk_register_clkdev(clk[usboh3_gate], "ipg", "imx-udc-mx51"); |
| 274 | clk_register_clkdev(clk[usboh3_gate], "ahb", "fsl-usb2-udc"); | 274 | clk_register_clkdev(clk[usboh3_gate], "ahb", "imx-udc-mx51"); |
| 275 | clk_register_clkdev(clk[nfc_gate], NULL, "imx51-nand"); | 275 | clk_register_clkdev(clk[nfc_gate], NULL, "imx51-nand"); |
| 276 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0"); | 276 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "imx-ssi.0"); |
| 277 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1"); | 277 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1"); |
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index 7f2c10c7413a..c0c4e723b7f5 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c | |||
| @@ -436,6 +436,9 @@ int __init mx6q_clocks_init(void) | |||
| 436 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) | 436 | for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) |
| 437 | clk_prepare_enable(clk[clks_init_on[i]]); | 437 | clk_prepare_enable(clk[clks_init_on[i]]); |
| 438 | 438 | ||
| 439 | /* Set initial power mode */ | ||
| 440 | imx6q_set_lpm(WAIT_CLOCKED); | ||
| 441 | |||
| 439 | np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); | 442 | np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt"); |
| 440 | base = of_iomap(np, 0); | 443 | base = of_iomap(np, 0); |
| 441 | WARN_ON(!base); | 444 | WARN_ON(!base); |
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 7191ab4434e5..fa36fb84ab19 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
| @@ -142,6 +142,7 @@ extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); | |||
| 142 | extern void imx6q_clock_map_io(void); | 142 | extern void imx6q_clock_map_io(void); |
| 143 | 143 | ||
| 144 | extern void imx_cpu_die(unsigned int cpu); | 144 | extern void imx_cpu_die(unsigned int cpu); |
| 145 | extern int imx_cpu_kill(unsigned int cpu); | ||
| 145 | 146 | ||
| 146 | #ifdef CONFIG_PM | 147 | #ifdef CONFIG_PM |
| 147 | extern void imx6q_pm_init(void); | 148 | extern void imx6q_pm_init(void); |
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 6277baf1b7be..9bd5777ff0e7 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h | |||
| @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( | |||
| 63 | 63 | ||
| 64 | #include <linux/fsl_devices.h> | 64 | #include <linux/fsl_devices.h> |
| 65 | struct imx_fsl_usb2_udc_data { | 65 | struct imx_fsl_usb2_udc_data { |
| 66 | const char *devid; | ||
| 66 | resource_size_t iobase; | 67 | resource_size_t iobase; |
| 67 | resource_size_t irq; | 68 | resource_size_t irq; |
| 68 | }; | 69 | }; |
diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c index 37e44398197b..3c06bd96e9cc 100644 --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | |||
| @@ -11,35 +11,36 @@ | |||
| 11 | #include "../hardware.h" | 11 | #include "../hardware.h" |
| 12 | #include "devices-common.h" | 12 | #include "devices-common.h" |
| 13 | 13 | ||
| 14 | #define imx_fsl_usb2_udc_data_entry_single(soc) \ | 14 | #define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ |
| 15 | { \ | 15 | { \ |
| 16 | .devid = _devid, \ | ||
| 16 | .iobase = soc ## _USB_OTG_BASE_ADDR, \ | 17 | .iobase = soc ## _USB_OTG_BASE_ADDR, \ |
| 17 | .irq = soc ## _INT_USB_OTG, \ | 18 | .irq = soc ## _INT_USB_OTG, \ |
| 18 | } | 19 | } |
| 19 | 20 | ||
| 20 | #ifdef CONFIG_SOC_IMX25 | 21 | #ifdef CONFIG_SOC_IMX25 |
| 21 | const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = | 22 | const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = |
| 22 | imx_fsl_usb2_udc_data_entry_single(MX25); | 23 | imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); |
| 23 | #endif /* ifdef CONFIG_SOC_IMX25 */ | 24 | #endif /* ifdef CONFIG_SOC_IMX25 */ |
| 24 | 25 | ||
| 25 | #ifdef CONFIG_SOC_IMX27 | 26 | #ifdef CONFIG_SOC_IMX27 |
| 26 | const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = | 27 | const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = |
| 27 | imx_fsl_usb2_udc_data_entry_single(MX27); | 28 | imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); |
| 28 | #endif /* ifdef CONFIG_SOC_IMX27 */ | 29 | #endif /* ifdef CONFIG_SOC_IMX27 */ |
| 29 | 30 | ||
| 30 | #ifdef CONFIG_SOC_IMX31 | 31 | #ifdef CONFIG_SOC_IMX31 |
| 31 | const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = | 32 | const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = |
| 32 | imx_fsl_usb2_udc_data_entry_single(MX31); | 33 | imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); |
| 33 | #endif /* ifdef CONFIG_SOC_IMX31 */ | 34 | #endif /* ifdef CONFIG_SOC_IMX31 */ |
| 34 | 35 | ||
| 35 | #ifdef CONFIG_SOC_IMX35 | 36 | #ifdef CONFIG_SOC_IMX35 |
| 36 | const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = | 37 | const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = |
| 37 | imx_fsl_usb2_udc_data_entry_single(MX35); | 38 | imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); |
| 38 | #endif /* ifdef CONFIG_SOC_IMX35 */ | 39 | #endif /* ifdef CONFIG_SOC_IMX35 */ |
| 39 | 40 | ||
| 40 | #ifdef CONFIG_SOC_IMX51 | 41 | #ifdef CONFIG_SOC_IMX51 |
| 41 | const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = | 42 | const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = |
| 42 | imx_fsl_usb2_udc_data_entry_single(MX51); | 43 | imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); |
| 43 | #endif | 44 | #endif |
| 44 | 45 | ||
| 45 | struct platform_device *__init imx_add_fsl_usb2_udc( | 46 | struct platform_device *__init imx_add_fsl_usb2_udc( |
| @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( | |||
| 57 | .flags = IORESOURCE_IRQ, | 58 | .flags = IORESOURCE_IRQ, |
| 58 | }, | 59 | }, |
| 59 | }; | 60 | }; |
| 60 | return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, | 61 | return imx_add_platform_device_dmamask(data->devid, -1, |
| 61 | res, ARRAY_SIZE(res), | 62 | res, ARRAY_SIZE(res), |
| 62 | pdata, sizeof(*pdata), DMA_BIT_MASK(32)); | 63 | pdata, sizeof(*pdata), DMA_BIT_MASK(32)); |
| 63 | } | 64 | } |
diff --git a/arch/arm/mach-imx/devices/platform-imx-fb.c b/arch/arm/mach-imx/devices/platform-imx-fb.c index 10b0ed39f07f..25a47c616b2d 100644 --- a/arch/arm/mach-imx/devices/platform-imx-fb.c +++ b/arch/arm/mach-imx/devices/platform-imx-fb.c | |||
| @@ -54,7 +54,7 @@ struct platform_device *__init imx_add_imx_fb( | |||
| 54 | .flags = IORESOURCE_IRQ, | 54 | .flags = IORESOURCE_IRQ, |
| 55 | }, | 55 | }, |
| 56 | }; | 56 | }; |
| 57 | return imx_add_platform_device_dmamask("imx-fb", 0, | 57 | return imx_add_platform_device_dmamask(data->devid, 0, |
| 58 | res, ARRAY_SIZE(res), | 58 | res, ARRAY_SIZE(res), |
| 59 | pdata, sizeof(*pdata), DMA_BIT_MASK(32)); | 59 | pdata, sizeof(*pdata), DMA_BIT_MASK(32)); |
| 60 | } | 60 | } |
diff --git a/arch/arm/mach-imx/hotplug.c b/arch/arm/mach-imx/hotplug.c index 3dec962b0770..7bc5fe15dda2 100644 --- a/arch/arm/mach-imx/hotplug.c +++ b/arch/arm/mach-imx/hotplug.c | |||
| @@ -46,9 +46,11 @@ static inline void cpu_enter_lowpower(void) | |||
| 46 | void imx_cpu_die(unsigned int cpu) | 46 | void imx_cpu_die(unsigned int cpu) |
| 47 | { | 47 | { |
| 48 | cpu_enter_lowpower(); | 48 | cpu_enter_lowpower(); |
| 49 | imx_enable_cpu(cpu, false); | 49 | cpu_do_idle(); |
| 50 | } | ||
| 50 | 51 | ||
| 51 | /* spin here until hardware takes it down */ | 52 | int imx_cpu_kill(unsigned int cpu) |
| 52 | while (1) | 53 | { |
| 53 | ; | 54 | imx_enable_cpu(cpu, false); |
| 55 | return 1; | ||
| 54 | } | 56 | } |
diff --git a/arch/arm/mach-imx/iram_alloc.c b/arch/arm/mach-imx/iram_alloc.c index 6c80424f678e..e05cf407db65 100644 --- a/arch/arm/mach-imx/iram_alloc.c +++ b/arch/arm/mach-imx/iram_alloc.c | |||
| @@ -22,8 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
| 24 | #include <linux/genalloc.h> | 24 | #include <linux/genalloc.h> |
| 25 | 25 | #include "linux/platform_data/imx-iram.h" | |
| 26 | #include "iram.h" | ||
| 27 | 26 | ||
| 28 | static unsigned long iram_phys_base; | 27 | static unsigned long iram_phys_base; |
| 29 | static void __iomem *iram_virt_base; | 28 | static void __iomem *iram_virt_base; |
diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c index 3777b805b76b..66fae885c842 100644 --- a/arch/arm/mach-imx/platsmp.c +++ b/arch/arm/mach-imx/platsmp.c | |||
| @@ -92,5 +92,6 @@ struct smp_operations imx_smp_ops __initdata = { | |||
| 92 | .smp_boot_secondary = imx_boot_secondary, | 92 | .smp_boot_secondary = imx_boot_secondary, |
| 93 | #ifdef CONFIG_HOTPLUG_CPU | 93 | #ifdef CONFIG_HOTPLUG_CPU |
| 94 | .cpu_die = imx_cpu_die, | 94 | .cpu_die = imx_cpu_die, |
| 95 | .cpu_kill = imx_cpu_kill, | ||
| 95 | #endif | 96 | #endif |
| 96 | }; | 97 | }; |
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index a17543da602d..ee42d20cba19 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c | |||
| @@ -41,6 +41,7 @@ static int imx6q_pm_enter(suspend_state_t state) | |||
| 41 | cpu_suspend(0, imx6q_suspend_finish); | 41 | cpu_suspend(0, imx6q_suspend_finish); |
| 42 | imx_smp_prepare(); | 42 | imx_smp_prepare(); |
| 43 | imx_gpc_post_resume(); | 43 | imx_gpc_post_resume(); |
| 44 | imx6q_set_lpm(WAIT_CLOCKED); | ||
| 44 | break; | 45 | break; |
| 45 | default: | 46 | default: |
| 46 | return -EINVAL; | 47 | return -EINVAL; |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index be50e795536d..e7fcea7f3300 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
| @@ -475,13 +475,12 @@ int __init pci_v3_setup(int nr, struct pci_sys_data *sys) | |||
| 475 | { | 475 | { |
| 476 | int ret = 0; | 476 | int ret = 0; |
| 477 | 477 | ||
| 478 | if (!ap_syscon_base) | ||
| 479 | return -EINVAL; | ||
| 480 | |||
| 478 | if (nr == 0) { | 481 | if (nr == 0) { |
| 479 | sys->mem_offset = PHYS_PCI_MEM_BASE; | 482 | sys->mem_offset = PHYS_PCI_MEM_BASE; |
| 480 | ret = pci_v3_setup_resources(sys); | 483 | ret = pci_v3_setup_resources(sys); |
| 481 | /* Remap the Integrator system controller */ | ||
| 482 | ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); | ||
| 483 | if (!ap_syscon_base) | ||
| 484 | return -EINVAL; | ||
| 485 | } | 484 | } |
| 486 | 485 | ||
| 487 | return ret; | 486 | return ret; |
| @@ -497,6 +496,13 @@ void __init pci_v3_preinit(void) | |||
| 497 | unsigned int temp; | 496 | unsigned int temp; |
| 498 | int ret; | 497 | int ret; |
| 499 | 498 | ||
| 499 | /* Remap the Integrator system controller */ | ||
| 500 | ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); | ||
| 501 | if (!ap_syscon_base) { | ||
| 502 | pr_err("unable to remap the AP syscon for PCIv3\n"); | ||
| 503 | return; | ||
| 504 | } | ||
| 505 | |||
| 500 | pcibios_min_mem = 0x00100000; | 506 | pcibios_min_mem = 0x00100000; |
| 501 | 507 | ||
| 502 | /* | 508 | /* |
diff --git a/arch/arm/mach-kirkwood/board-ns2.c b/arch/arm/mach-kirkwood/board-ns2.c index 8821720ab5a4..f4632a809f68 100644 --- a/arch/arm/mach-kirkwood/board-ns2.c +++ b/arch/arm/mach-kirkwood/board-ns2.c | |||
| @@ -18,47 +18,11 @@ | |||
| 18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 20 | #include "common.h" | 20 | #include "common.h" |
| 21 | #include "mpp.h" | ||
| 22 | 21 | ||
| 23 | static struct mv643xx_eth_platform_data ns2_ge00_data = { | 22 | static struct mv643xx_eth_platform_data ns2_ge00_data = { |
| 24 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), | 23 | .phy_addr = MV643XX_ETH_PHY_ADDR(8), |
| 25 | }; | 24 | }; |
| 26 | 25 | ||
| 27 | static unsigned int ns2_mpp_config[] __initdata = { | ||
| 28 | MPP0_SPI_SCn, | ||
| 29 | MPP1_SPI_MOSI, | ||
| 30 | MPP2_SPI_SCK, | ||
| 31 | MPP3_SPI_MISO, | ||
| 32 | MPP4_NF_IO6, | ||
| 33 | MPP5_NF_IO7, | ||
| 34 | MPP6_SYSRST_OUTn, | ||
| 35 | MPP7_GPO, /* Fan speed (bit 1) */ | ||
| 36 | MPP8_TW0_SDA, | ||
| 37 | MPP9_TW0_SCK, | ||
| 38 | MPP10_UART0_TXD, | ||
| 39 | MPP11_UART0_RXD, | ||
| 40 | MPP12_GPO, /* Red led */ | ||
| 41 | MPP14_GPIO, /* USB fuse */ | ||
| 42 | MPP16_GPIO, /* SATA 0 power */ | ||
| 43 | MPP17_GPIO, /* SATA 1 power */ | ||
| 44 | MPP18_NF_IO0, | ||
| 45 | MPP19_NF_IO1, | ||
| 46 | MPP20_SATA1_ACTn, | ||
| 47 | MPP21_SATA0_ACTn, | ||
| 48 | MPP22_GPIO, /* Fan speed (bit 0) */ | ||
| 49 | MPP23_GPIO, /* Fan power */ | ||
| 50 | MPP24_GPIO, /* USB mode select */ | ||
| 51 | MPP25_GPIO, /* Fan rotation fail */ | ||
| 52 | MPP26_GPIO, /* USB device vbus */ | ||
| 53 | MPP28_GPIO, /* USB enable host vbus */ | ||
| 54 | MPP29_GPIO, /* Blue led (slow register) */ | ||
| 55 | MPP30_GPIO, /* Blue led (command register) */ | ||
| 56 | MPP31_GPIO, /* Board power off */ | ||
| 57 | MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */ | ||
| 58 | MPP33_GPO, /* Fan speed (bit 2) */ | ||
| 59 | 0 | ||
| 60 | }; | ||
| 61 | |||
| 62 | #define NS2_GPIO_POWER_OFF 31 | 26 | #define NS2_GPIO_POWER_OFF 31 |
| 63 | 27 | ||
| 64 | static void ns2_power_off(void) | 28 | static void ns2_power_off(void) |
| @@ -71,8 +35,6 @@ void __init ns2_init(void) | |||
| 71 | /* | 35 | /* |
| 72 | * Basic setup. Needs to be called early. | 36 | * Basic setup. Needs to be called early. |
| 73 | */ | 37 | */ |
| 74 | kirkwood_mpp_conf(ns2_mpp_config); | ||
| 75 | |||
| 76 | if (of_machine_is_compatible("lacie,netspace_lite_v2") || | 38 | if (of_machine_is_compatible("lacie,netspace_lite_v2") || |
| 77 | of_machine_is_compatible("lacie,netspace_mini_v2")) | 39 | of_machine_is_compatible("lacie,netspace_mini_v2")) |
| 78 | ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); | 40 | ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); |
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 5dcb369b58aa..99df4df680fd 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ | 1 | ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ |
| 2 | -I$(srctree)/arch/arm/plat-orion/include | 2 | -I$(srctree)/arch/arm/plat-orion/include |
| 3 | 3 | ||
| 4 | AFLAGS_coherency_ll.o := -Wa,-march=armv7-a | ||
| 5 | |||
| 4 | obj-y += system-controller.o | 6 | obj-y += system-controller.o |
| 5 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o | 7 | obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o |
| 6 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | 8 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 5c8e9cee2c2e..769c1feee1c4 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
| @@ -397,6 +397,12 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
| 397 | OMAP_PULL_ENA), | 397 | OMAP_PULL_ENA), |
| 398 | OMAP4_MUX(ABE_MCBSP1_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), | 398 | OMAP4_MUX(ABE_MCBSP1_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), |
| 399 | 399 | ||
| 400 | /* UART2 - BT/FM/GPS shared transport */ | ||
| 401 | OMAP4_MUX(UART2_CTS, OMAP_PIN_INPUT | OMAP_MUX_MODE0), | ||
| 402 | OMAP4_MUX(UART2_RTS, OMAP_PIN_OUTPUT | OMAP_MUX_MODE0), | ||
| 403 | OMAP4_MUX(UART2_RX, OMAP_PIN_INPUT | OMAP_MUX_MODE0), | ||
| 404 | OMAP4_MUX(UART2_TX, OMAP_PIN_OUTPUT | OMAP_MUX_MODE0), | ||
| 405 | |||
| 400 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 406 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
| 401 | }; | 407 | }; |
| 402 | 408 | ||
diff --git a/arch/arm/mach-omap2/cclock2420_data.c b/arch/arm/mach-omap2/cclock2420_data.c index 7e5febe456d9..ab7e952d2070 100644 --- a/arch/arm/mach-omap2/cclock2420_data.c +++ b/arch/arm/mach-omap2/cclock2420_data.c | |||
| @@ -1935,6 +1935,8 @@ int __init omap2420_clk_init(void) | |||
| 1935 | omap2_init_clk_hw_omap_clocks(c->lk.clk); | 1935 | omap2_init_clk_hw_omap_clocks(c->lk.clk); |
| 1936 | } | 1936 | } |
| 1937 | 1937 | ||
| 1938 | omap2xxx_clkt_vps_late_init(); | ||
| 1939 | |||
| 1938 | omap2_clk_disable_autoidle_all(); | 1940 | omap2_clk_disable_autoidle_all(); |
| 1939 | 1941 | ||
| 1940 | omap2_clk_enable_init_clocks(enable_init_clks, | 1942 | omap2_clk_enable_init_clocks(enable_init_clks, |
diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c index eda079b96c6a..eb3dab68d536 100644 --- a/arch/arm/mach-omap2/cclock2430_data.c +++ b/arch/arm/mach-omap2/cclock2430_data.c | |||
| @@ -2050,6 +2050,8 @@ int __init omap2430_clk_init(void) | |||
| 2050 | omap2_init_clk_hw_omap_clocks(c->lk.clk); | 2050 | omap2_init_clk_hw_omap_clocks(c->lk.clk); |
| 2051 | } | 2051 | } |
| 2052 | 2052 | ||
| 2053 | omap2xxx_clkt_vps_late_init(); | ||
| 2054 | |||
| 2053 | omap2_clk_disable_autoidle_all(); | 2055 | omap2_clk_disable_autoidle_all(); |
| 2054 | 2056 | ||
| 2055 | omap2_clk_enable_init_clocks(enable_init_clks, | 2057 | omap2_clk_enable_init_clocks(enable_init_clks, |
diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c index 5789a5e25563..a2cc046b47f4 100644 --- a/arch/arm/mach-omap2/cclock44xx_data.c +++ b/arch/arm/mach-omap2/cclock44xx_data.c | |||
| @@ -2026,14 +2026,13 @@ int __init omap4xxx_clk_init(void) | |||
| 2026 | * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power | 2026 | * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power |
| 2027 | * state when turning the ABE clock domain. Workaround this by | 2027 | * state when turning the ABE clock domain. Workaround this by |
| 2028 | * locking the ABE DPLL on boot. | 2028 | * locking the ABE DPLL on boot. |
| 2029 | * Lock the ABE DPLL in any case to avoid issues with audio. | ||
| 2029 | */ | 2030 | */ |
| 2030 | if (cpu_is_omap446x()) { | 2031 | rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck); |
| 2031 | rc = clk_set_parent(&abe_dpll_refclk_mux_ck, &sys_32k_ck); | 2032 | if (!rc) |
| 2032 | if (!rc) | 2033 | rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ); |
| 2033 | rc = clk_set_rate(&dpll_abe_ck, OMAP4_DPLL_ABE_DEFFREQ); | 2034 | if (rc) |
| 2034 | if (rc) | 2035 | pr_err("%s: failed to configure ABE DPLL!\n", __func__); |
| 2035 | pr_err("%s: failed to configure ABE DPLL!\n", __func__); | ||
| 2036 | } | ||
| 2037 | 2036 | ||
| 2038 | return 0; | 2037 | return 0; |
| 2039 | } | 2038 | } |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 5e304d0719a2..626f3ea3142f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -639,7 +639,7 @@ static int count_ocp2scp_devices(struct omap_ocp2scp_dev *ocp2scp_dev) | |||
| 639 | return cnt; | 639 | return cnt; |
| 640 | } | 640 | } |
| 641 | 641 | ||
| 642 | static void omap_init_ocp2scp(void) | 642 | static void __init omap_init_ocp2scp(void) |
| 643 | { | 643 | { |
| 644 | struct omap_hwmod *oh; | 644 | struct omap_hwmod *oh; |
| 645 | struct platform_device *pdev; | 645 | struct platform_device *pdev; |
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 4c7566c7e24a..2a2cfa88ddbf 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/platform_data/omap_drm.h> | 26 | #include <linux/platform_data/omap_drm.h> |
| 27 | 27 | ||
| 28 | #include "soc.h" | ||
| 28 | #include "omap_device.h" | 29 | #include "omap_device.h" |
| 29 | #include "omap_hwmod.h" | 30 | #include "omap_hwmod.h" |
| 30 | 31 | ||
| @@ -56,7 +57,7 @@ static int __init omap_init_drm(void) | |||
| 56 | oh->name); | 57 | oh->name); |
| 57 | } | 58 | } |
| 58 | 59 | ||
| 59 | platform_data.omaprev = GET_OMAP_REVISION(); | 60 | platform_data.omaprev = GET_OMAP_TYPE; |
| 60 | 61 | ||
| 61 | return platform_device_register(&omap_drm_device); | 62 | return platform_device_register(&omap_drm_device); |
| 62 | 63 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 129d5081ed15..793f54ac7d14 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
| @@ -2132,8 +2132,12 @@ static struct omap_hwmod omap44xx_mcpdm_hwmod = { | |||
| 2132 | * currently reset very early during boot, before I2C is | 2132 | * currently reset very early during boot, before I2C is |
| 2133 | * available, so it doesn't seem that we have any choice in | 2133 | * available, so it doesn't seem that we have any choice in |
| 2134 | * the kernel other than to avoid resetting it. | 2134 | * the kernel other than to avoid resetting it. |
| 2135 | * | ||
| 2136 | * Also, McPDM needs to be configured to NO_IDLE mode when it | ||
| 2137 | * is in used otherwise vital clocks will be gated which | ||
| 2138 | * results 'slow motion' audio playback. | ||
| 2135 | */ | 2139 | */ |
| 2136 | .flags = HWMOD_EXT_OPT_MAIN_CLK, | 2140 | .flags = HWMOD_EXT_OPT_MAIN_CLK | HWMOD_SWSUP_SIDLE, |
| 2137 | .mpu_irqs = omap44xx_mcpdm_irqs, | 2141 | .mpu_irqs = omap44xx_mcpdm_irqs, |
| 2138 | .sdma_reqs = omap44xx_mcpdm_sdma_reqs, | 2142 | .sdma_reqs = omap44xx_mcpdm_sdma_reqs, |
| 2139 | .main_clk = "mcpdm_fck", | 2143 | .main_clk = "mcpdm_fck", |
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 691aa674665a..b8ad6e632bb8 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -165,15 +165,11 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, | |||
| 165 | struct device_node *np; | 165 | struct device_node *np; |
| 166 | 166 | ||
| 167 | for_each_matching_node(np, match) { | 167 | for_each_matching_node(np, match) { |
| 168 | if (!of_device_is_available(np)) { | 168 | if (!of_device_is_available(np)) |
| 169 | of_node_put(np); | ||
| 170 | continue; | 169 | continue; |
| 171 | } | ||
| 172 | 170 | ||
| 173 | if (property && !of_get_property(np, property, NULL)) { | 171 | if (property && !of_get_property(np, property, NULL)) |
| 174 | of_node_put(np); | ||
| 175 | continue; | 172 | continue; |
| 176 | } | ||
| 177 | 173 | ||
| 178 | of_add_property(np, &device_disabled); | 174 | of_add_property(np, &device_disabled); |
| 179 | return np; | 175 | return np; |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index 553059f51841..755c0bb119f4 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c | |||
| @@ -47,7 +47,7 @@ static struct spi_board_info wm1253_devs[] = { | |||
| 47 | .bus_num = 0, | 47 | .bus_num = 0, |
| 48 | .chip_select = 0, | 48 | .chip_select = 0, |
| 49 | .mode = SPI_MODE_0, | 49 | .mode = SPI_MODE_0, |
| 50 | .irq = S3C_EINT(5), | 50 | .irq = S3C_EINT(4), |
| 51 | .controller_data = &wm0010_spi_csinfo, | 51 | .controller_data = &wm0010_spi_csinfo, |
| 52 | .platform_data = &wm0010_pdata, | 52 | .platform_data = &wm0010_pdata, |
| 53 | }, | 53 | }, |
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 7feb426fc202..d2e1a16690bd 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c | |||
| @@ -338,8 +338,10 @@ int __init s3c64xx_pm_init(void) | |||
| 338 | for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++) | 338 | for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++) |
| 339 | pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false); | 339 | pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false); |
| 340 | 340 | ||
| 341 | #ifdef CONFIG_S3C_DEV_FB | ||
| 341 | if (dev_get_platdata(&s3c_device_fb.dev)) | 342 | if (dev_get_platdata(&s3c_device_fb.dev)) |
| 342 | pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev); | 343 | pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev); |
| 344 | #endif | ||
| 343 | 345 | ||
| 344 | return 0; | 346 | return 0; |
| 345 | } | 347 | } |
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b2fb87c8698..076c26d43864 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
| @@ -774,25 +774,27 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, | |||
| 774 | size_t size, enum dma_data_direction dir, | 774 | size_t size, enum dma_data_direction dir, |
| 775 | void (*op)(const void *, size_t, int)) | 775 | void (*op)(const void *, size_t, int)) |
| 776 | { | 776 | { |
| 777 | unsigned long pfn; | ||
| 778 | size_t left = size; | ||
| 779 | |||
| 780 | pfn = page_to_pfn(page) + offset / PAGE_SIZE; | ||
| 781 | offset %= PAGE_SIZE; | ||
| 782 | |||
| 777 | /* | 783 | /* |
| 778 | * A single sg entry may refer to multiple physically contiguous | 784 | * A single sg entry may refer to multiple physically contiguous |
| 779 | * pages. But we still need to process highmem pages individually. | 785 | * pages. But we still need to process highmem pages individually. |
| 780 | * If highmem is not configured then the bulk of this loop gets | 786 | * If highmem is not configured then the bulk of this loop gets |
| 781 | * optimized out. | 787 | * optimized out. |
| 782 | */ | 788 | */ |
| 783 | size_t left = size; | ||
| 784 | do { | 789 | do { |
| 785 | size_t len = left; | 790 | size_t len = left; |
| 786 | void *vaddr; | 791 | void *vaddr; |
| 787 | 792 | ||
| 793 | page = pfn_to_page(pfn); | ||
| 794 | |||
| 788 | if (PageHighMem(page)) { | 795 | if (PageHighMem(page)) { |
| 789 | if (len + offset > PAGE_SIZE) { | 796 | if (len + offset > PAGE_SIZE) |
| 790 | if (offset >= PAGE_SIZE) { | ||
| 791 | page += offset / PAGE_SIZE; | ||
| 792 | offset %= PAGE_SIZE; | ||
| 793 | } | ||
| 794 | len = PAGE_SIZE - offset; | 797 | len = PAGE_SIZE - offset; |
| 795 | } | ||
| 796 | vaddr = kmap_high_get(page); | 798 | vaddr = kmap_high_get(page); |
| 797 | if (vaddr) { | 799 | if (vaddr) { |
| 798 | vaddr += offset; | 800 | vaddr += offset; |
| @@ -809,7 +811,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, | |||
| 809 | op(vaddr, len, dir); | 811 | op(vaddr, len, dir); |
| 810 | } | 812 | } |
| 811 | offset = 0; | 813 | offset = 0; |
| 812 | page++; | 814 | pfn++; |
| 813 | left -= len; | 815 | left -= len; |
| 814 | } while (left); | 816 | } while (left); |
| 815 | } | 817 | } |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 1f51d712b55a..8fcf8bd3ee49 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
| @@ -298,7 +298,7 @@ static struct mem_type mem_types[] = { | |||
| 298 | }, | 298 | }, |
| 299 | [MT_MEMORY_SO] = { | 299 | [MT_MEMORY_SO] = { |
| 300 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | | 300 | .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | |
| 301 | L_PTE_MT_UNCACHED, | 301 | L_PTE_MT_UNCACHED | L_PTE_XN, |
| 302 | .prot_l1 = PMD_TYPE_TABLE, | 302 | .prot_l1 = PMD_TYPE_TABLE, |
| 303 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S | | 303 | .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S | |
| 304 | PMD_SECT_UNCACHED | PMD_SECT_XN, | 304 | PMD_SECT_UNCACHED | PMD_SECT_XN, |
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index dd703ef09b8d..b178d44e9eaa 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | ENTRY(versatile_secondary_startup) | 21 | ENTRY(versatile_secondary_startup) |
| 22 | mrc p15, 0, r0, c0, c0, 5 | 22 | mrc p15, 0, r0, c0, c0, 5 |
| 23 | and r0, r0, #15 | 23 | bic r0, #0xff000000 |
| 24 | adr r4, 1f | 24 | adr r4, 1f |
| 25 | ldmia r4, {r5, r6} | 25 | ldmia r4, {r5, r6} |
| 26 | sub r4, r4, r5 | 26 | sub r4, r4, r5 |
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index cc926c985981..323ce1a62bbf 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | @ IRQs disabled. | 22 | @ IRQs disabled. |
| 23 | @ | 23 | @ |
| 24 | ENTRY(do_vfp) | 24 | ENTRY(do_vfp) |
| 25 | #ifdef CONFIG_PREEMPT | 25 | #ifdef CONFIG_PREEMPT_COUNT |
| 26 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 26 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 27 | add r11, r4, #1 @ increment it | 27 | add r11, r4, #1 @ increment it |
| 28 | str r11, [r10, #TI_PREEMPT] | 28 | str r11, [r10, #TI_PREEMPT] |
| @@ -35,7 +35,7 @@ ENTRY(do_vfp) | |||
| 35 | ENDPROC(do_vfp) | 35 | ENDPROC(do_vfp) |
| 36 | 36 | ||
| 37 | ENTRY(vfp_null_entry) | 37 | ENTRY(vfp_null_entry) |
| 38 | #ifdef CONFIG_PREEMPT | 38 | #ifdef CONFIG_PREEMPT_COUNT |
| 39 | get_thread_info r10 | 39 | get_thread_info r10 |
| 40 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 40 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 41 | sub r11, r4, #1 @ decrement it | 41 | sub r11, r4, #1 @ decrement it |
| @@ -53,7 +53,7 @@ ENDPROC(vfp_null_entry) | |||
| 53 | 53 | ||
| 54 | __INIT | 54 | __INIT |
| 55 | ENTRY(vfp_testing_entry) | 55 | ENTRY(vfp_testing_entry) |
| 56 | #ifdef CONFIG_PREEMPT | 56 | #ifdef CONFIG_PREEMPT_COUNT |
| 57 | get_thread_info r10 | 57 | get_thread_info r10 |
| 58 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 58 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 59 | sub r11, r4, #1 @ decrement it | 59 | sub r11, r4, #1 @ decrement it |
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S index ea0349f63586..dd5e56f95f3f 100644 --- a/arch/arm/vfp/vfphw.S +++ b/arch/arm/vfp/vfphw.S | |||
| @@ -168,7 +168,7 @@ vfp_hw_state_valid: | |||
| 168 | @ else it's one 32-bit instruction, so | 168 | @ else it's one 32-bit instruction, so |
| 169 | @ always subtract 4 from the following | 169 | @ always subtract 4 from the following |
| 170 | @ instruction address. | 170 | @ instruction address. |
| 171 | #ifdef CONFIG_PREEMPT | 171 | #ifdef CONFIG_PREEMPT_COUNT |
| 172 | get_thread_info r10 | 172 | get_thread_info r10 |
| 173 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 173 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 174 | sub r11, r4, #1 @ decrement it | 174 | sub r11, r4, #1 @ decrement it |
| @@ -192,7 +192,7 @@ look_for_VFP_exceptions: | |||
| 192 | @ not recognised by VFP | 192 | @ not recognised by VFP |
| 193 | 193 | ||
| 194 | DBGSTR "not VFP" | 194 | DBGSTR "not VFP" |
| 195 | #ifdef CONFIG_PREEMPT | 195 | #ifdef CONFIG_PREEMPT_COUNT |
| 196 | get_thread_info r10 | 196 | get_thread_info r10 |
| 197 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count | 197 | ldr r4, [r10, #TI_PREEMPT] @ get preempt count |
| 198 | sub r11, r4, #1 @ decrement it | 198 | sub r11, r4, #1 @ decrement it |
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 07fea290d7c1..fe32c0e4ac01 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h | |||
| @@ -26,7 +26,10 @@ | |||
| 26 | 26 | ||
| 27 | typedef unsigned long elf_greg_t; | 27 | typedef unsigned long elf_greg_t; |
| 28 | 28 | ||
| 29 | #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) | 29 | #define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t)) |
| 30 | #define ELF_CORE_COPY_REGS(dest, regs) \ | ||
| 31 | *(struct user_pt_regs *)&(dest) = (regs)->user_regs; | ||
| 32 | |||
| 30 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | 33 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; |
| 31 | typedef struct user_fpsimd_state elf_fpregset_t; | 34 | typedef struct user_fpsimd_state elf_fpregset_t; |
| 32 | 35 | ||
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 4265ff64219b..b7a5fffe0924 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
| @@ -672,33 +672,6 @@ ptrace_attach_sync_user_rbs (struct task_struct *child) | |||
| 672 | read_unlock(&tasklist_lock); | 672 | read_unlock(&tasklist_lock); |
| 673 | } | 673 | } |
| 674 | 674 | ||
| 675 | static inline int | ||
| 676 | thread_matches (struct task_struct *thread, unsigned long addr) | ||
| 677 | { | ||
| 678 | unsigned long thread_rbs_end; | ||
| 679 | struct pt_regs *thread_regs; | ||
| 680 | |||
| 681 | if (ptrace_check_attach(thread, 0) < 0) | ||
| 682 | /* | ||
| 683 | * If the thread is not in an attachable state, we'll | ||
| 684 | * ignore it. The net effect is that if ADDR happens | ||
| 685 | * to overlap with the portion of the thread's | ||
| 686 | * register backing store that is currently residing | ||
| 687 | * on the thread's kernel stack, then ptrace() may end | ||
| 688 | * up accessing a stale value. But if the thread | ||
| 689 | * isn't stopped, that's a problem anyhow, so we're | ||
| 690 | * doing as well as we can... | ||
| 691 | */ | ||
| 692 | return 0; | ||
| 693 | |||
| 694 | thread_regs = task_pt_regs(thread); | ||
| 695 | thread_rbs_end = ia64_get_user_rbs_end(thread, thread_regs, NULL); | ||
| 696 | if (!on_kernel_rbs(addr, thread_regs->ar_bspstore, thread_rbs_end)) | ||
| 697 | return 0; | ||
| 698 | |||
| 699 | return 1; /* looks like we've got a winner */ | ||
| 700 | } | ||
| 701 | |||
| 702 | /* | 675 | /* |
| 703 | * Write f32-f127 back to task->thread.fph if it has been modified. | 676 | * Write f32-f127 back to task->thread.fph if it has been modified. |
| 704 | */ | 677 | */ |
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h index 17f7a45948ea..3e6b8445af6a 100644 --- a/arch/m68k/include/asm/dma-mapping.h +++ b/arch/m68k/include/asm/dma-mapping.h | |||
| @@ -21,6 +21,22 @@ extern void *dma_alloc_coherent(struct device *, size_t, | |||
| 21 | extern void dma_free_coherent(struct device *, size_t, | 21 | extern void dma_free_coherent(struct device *, size_t, |
| 22 | void *, dma_addr_t); | 22 | void *, dma_addr_t); |
| 23 | 23 | ||
| 24 | static inline void *dma_alloc_attrs(struct device *dev, size_t size, | ||
| 25 | dma_addr_t *dma_handle, gfp_t flag, | ||
| 26 | struct dma_attrs *attrs) | ||
| 27 | { | ||
| 28 | /* attrs is not supported and ignored */ | ||
| 29 | return dma_alloc_coherent(dev, size, dma_handle, flag); | ||
| 30 | } | ||
| 31 | |||
| 32 | static inline void dma_free_attrs(struct device *dev, size_t size, | ||
| 33 | void *cpu_addr, dma_addr_t dma_handle, | ||
| 34 | struct dma_attrs *attrs) | ||
| 35 | { | ||
| 36 | /* attrs is not supported and ignored */ | ||
| 37 | dma_free_coherent(dev, size, cpu_addr, dma_handle); | ||
| 38 | } | ||
| 39 | |||
| 24 | static inline void *dma_alloc_noncoherent(struct device *dev, size_t size, | 40 | static inline void *dma_alloc_noncoherent(struct device *dev, size_t size, |
| 25 | dma_addr_t *handle, gfp_t flag) | 41 | dma_addr_t *handle, gfp_t flag) |
| 26 | { | 42 | { |
diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h index bf86b29fe64a..037028f4ab70 100644 --- a/arch/m68k/include/asm/pgtable_no.h +++ b/arch/m68k/include/asm/pgtable_no.h | |||
| @@ -64,6 +64,8 @@ extern unsigned int kobjsize(const void *objp); | |||
| 64 | */ | 64 | */ |
| 65 | #define VMALLOC_START 0 | 65 | #define VMALLOC_START 0 |
| 66 | #define VMALLOC_END 0xffffffff | 66 | #define VMALLOC_END 0xffffffff |
| 67 | #define KMAP_START 0 | ||
| 68 | #define KMAP_END 0xffffffff | ||
| 67 | 69 | ||
| 68 | #include <asm-generic/pgtable.h> | 70 | #include <asm-generic/pgtable.h> |
| 69 | 71 | ||
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 847994ce6804..f9337f614660 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <uapi/asm/unistd.h> | 4 | #include <uapi/asm/unistd.h> |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | #define NR_syscalls 348 | 7 | #define NR_syscalls 349 |
| 8 | 8 | ||
| 9 | #define __ARCH_WANT_OLD_READDIR | 9 | #define __ARCH_WANT_OLD_READDIR |
| 10 | #define __ARCH_WANT_OLD_STAT | 10 | #define __ARCH_WANT_OLD_STAT |
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h index b94bfbf90705..625f321001dc 100644 --- a/arch/m68k/include/uapi/asm/unistd.h +++ b/arch/m68k/include/uapi/asm/unistd.h | |||
| @@ -353,5 +353,6 @@ | |||
| 353 | #define __NR_process_vm_readv 345 | 353 | #define __NR_process_vm_readv 345 |
| 354 | #define __NR_process_vm_writev 346 | 354 | #define __NR_process_vm_writev 346 |
| 355 | #define __NR_kcmp 347 | 355 | #define __NR_kcmp 347 |
| 356 | #define __NR_finit_module 348 | ||
| 356 | 357 | ||
| 357 | #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ | 358 | #endif /* _UAPI_ASM_M68K_UNISTD_H_ */ |
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S index c30da5b3f2db..3f04ea0ab802 100644 --- a/arch/m68k/kernel/syscalltable.S +++ b/arch/m68k/kernel/syscalltable.S | |||
| @@ -368,4 +368,5 @@ ENTRY(sys_call_table) | |||
| 368 | .long sys_process_vm_readv /* 345 */ | 368 | .long sys_process_vm_readv /* 345 */ |
| 369 | .long sys_process_vm_writev | 369 | .long sys_process_vm_writev |
| 370 | .long sys_kcmp | 370 | .long sys_kcmp |
| 371 | .long sys_finit_module | ||
| 371 | 372 | ||
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index f0e05bce92f2..afd8106fd83b 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c | |||
| @@ -39,6 +39,11 @@ | |||
| 39 | void *empty_zero_page; | 39 | void *empty_zero_page; |
| 40 | EXPORT_SYMBOL(empty_zero_page); | 40 | EXPORT_SYMBOL(empty_zero_page); |
| 41 | 41 | ||
| 42 | #if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE) | ||
| 43 | extern void init_pointer_table(unsigned long ptable); | ||
| 44 | extern pmd_t *zero_pgtable; | ||
| 45 | #endif | ||
| 46 | |||
| 42 | #ifdef CONFIG_MMU | 47 | #ifdef CONFIG_MMU |
| 43 | 48 | ||
| 44 | pg_data_t pg_data_map[MAX_NUMNODES]; | 49 | pg_data_t pg_data_map[MAX_NUMNODES]; |
| @@ -69,9 +74,6 @@ void __init m68k_setup_node(int node) | |||
| 69 | node_set_online(node); | 74 | node_set_online(node); |
| 70 | } | 75 | } |
| 71 | 76 | ||
| 72 | extern void init_pointer_table(unsigned long ptable); | ||
| 73 | extern pmd_t *zero_pgtable; | ||
| 74 | |||
| 75 | #else /* CONFIG_MMU */ | 77 | #else /* CONFIG_MMU */ |
| 76 | 78 | ||
| 77 | /* | 79 | /* |
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index bfb44247d7a7..eb7850b46c25 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S | |||
| @@ -1865,7 +1865,7 @@ syscall_restore: | |||
| 1865 | 1865 | ||
| 1866 | /* Are we being ptraced? */ | 1866 | /* Are we being ptraced? */ |
| 1867 | ldw TASK_FLAGS(%r1),%r19 | 1867 | ldw TASK_FLAGS(%r1),%r19 |
| 1868 | ldi (_TIF_SINGLESTEP|_TIF_BLOCKSTEP),%r2 | 1868 | ldi _TIF_SYSCALL_TRACE_MASK,%r2 |
| 1869 | and,COND(=) %r19,%r2,%r0 | 1869 | and,COND(=) %r19,%r2,%r0 |
| 1870 | b,n syscall_restore_rfi | 1870 | b,n syscall_restore_rfi |
| 1871 | 1871 | ||
| @@ -1978,15 +1978,23 @@ syscall_restore_rfi: | |||
| 1978 | /* sr2 should be set to zero for userspace syscalls */ | 1978 | /* sr2 should be set to zero for userspace syscalls */ |
| 1979 | STREG %r0,TASK_PT_SR2(%r1) | 1979 | STREG %r0,TASK_PT_SR2(%r1) |
| 1980 | 1980 | ||
| 1981 | pt_regs_ok: | ||
| 1982 | LDREG TASK_PT_GR31(%r1),%r2 | 1981 | LDREG TASK_PT_GR31(%r1),%r2 |
| 1983 | depi 3,31,2,%r2 /* ensure return to user mode. */ | 1982 | depi 3,31,2,%r2 /* ensure return to user mode. */ |
| 1984 | STREG %r2,TASK_PT_IAOQ0(%r1) | 1983 | STREG %r2,TASK_PT_IAOQ0(%r1) |
| 1985 | ldo 4(%r2),%r2 | 1984 | ldo 4(%r2),%r2 |
| 1986 | STREG %r2,TASK_PT_IAOQ1(%r1) | 1985 | STREG %r2,TASK_PT_IAOQ1(%r1) |
| 1986 | b intr_restore | ||
| 1987 | copy %r25,%r16 | 1987 | copy %r25,%r16 |
| 1988 | |||
| 1989 | pt_regs_ok: | ||
| 1990 | LDREG TASK_PT_IAOQ0(%r1),%r2 | ||
| 1991 | depi 3,31,2,%r2 /* ensure return to user mode. */ | ||
| 1992 | STREG %r2,TASK_PT_IAOQ0(%r1) | ||
| 1993 | LDREG TASK_PT_IAOQ1(%r1),%r2 | ||
| 1994 | depi 3,31,2,%r2 | ||
| 1995 | STREG %r2,TASK_PT_IAOQ1(%r1) | ||
| 1988 | b intr_restore | 1996 | b intr_restore |
| 1989 | nop | 1997 | copy %r25,%r16 |
| 1990 | 1998 | ||
| 1991 | .import schedule,code | 1999 | .import schedule,code |
| 1992 | syscall_do_resched: | 2000 | syscall_do_resched: |
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index c0b1affc06a8..0299d63cd112 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
| @@ -410,11 +410,13 @@ void __init init_IRQ(void) | |||
| 410 | { | 410 | { |
| 411 | local_irq_disable(); /* PARANOID - should already be disabled */ | 411 | local_irq_disable(); /* PARANOID - should already be disabled */ |
| 412 | mtctl(~0UL, 23); /* EIRR : clear all pending external intr */ | 412 | mtctl(~0UL, 23); /* EIRR : clear all pending external intr */ |
| 413 | claim_cpu_irqs(); | ||
| 414 | #ifdef CONFIG_SMP | 413 | #ifdef CONFIG_SMP |
| 415 | if (!cpu_eiem) | 414 | if (!cpu_eiem) { |
| 415 | claim_cpu_irqs(); | ||
| 416 | cpu_eiem = EIEM_MASK(IPI_IRQ) | EIEM_MASK(TIMER_IRQ); | 416 | cpu_eiem = EIEM_MASK(IPI_IRQ) | EIEM_MASK(TIMER_IRQ); |
| 417 | } | ||
| 417 | #else | 418 | #else |
| 419 | claim_cpu_irqs(); | ||
| 418 | cpu_eiem = EIEM_MASK(TIMER_IRQ); | 420 | cpu_eiem = EIEM_MASK(TIMER_IRQ); |
| 419 | #endif | 421 | #endif |
| 420 | set_eiem(cpu_eiem); /* EIEM : enable all external intr */ | 422 | set_eiem(cpu_eiem); /* EIEM : enable all external intr */ |
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index 857c2f545470..534abd4936e1 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <asm/asm-offsets.h> | 26 | #include <asm/asm-offsets.h> |
| 27 | 27 | ||
| 28 | /* PSW bits we allow the debugger to modify */ | 28 | /* PSW bits we allow the debugger to modify */ |
| 29 | #define USER_PSW_BITS (PSW_N | PSW_V | PSW_CB) | 29 | #define USER_PSW_BITS (PSW_N | PSW_B | PSW_V | PSW_CB) |
| 30 | 30 | ||
| 31 | /* | 31 | /* |
| 32 | * Called by kernel/ptrace.c when detaching.. | 32 | * Called by kernel/ptrace.c when detaching.. |
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 537996955998..fd051705a407 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
| @@ -190,8 +190,10 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size) | |||
| 190 | DBG(1,"get_sigframe: ka = %#lx, sp = %#lx, frame_size = %#lx\n", | 190 | DBG(1,"get_sigframe: ka = %#lx, sp = %#lx, frame_size = %#lx\n", |
| 191 | (unsigned long)ka, sp, frame_size); | 191 | (unsigned long)ka, sp, frame_size); |
| 192 | 192 | ||
| 193 | /* Align alternate stack and reserve 64 bytes for the signal | ||
| 194 | handler's frame marker. */ | ||
| 193 | if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp)) | 195 | if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp)) |
| 194 | sp = current->sas_ss_sp; /* Stacks grow up! */ | 196 | sp = (current->sas_ss_sp + 0x7f) & ~0x3f; /* Stacks grow up! */ |
| 195 | 197 | ||
| 196 | DBG(1,"get_sigframe: Returning sp = %#lx\n", (unsigned long)sp); | 198 | DBG(1,"get_sigframe: Returning sp = %#lx\n", (unsigned long)sp); |
| 197 | return (void __user *) sp; /* Stacks grow up. Fun. */ | 199 | return (void __user *) sp; /* Stacks grow up. Fun. */ |
diff --git a/arch/parisc/math-emu/cnv_float.h b/arch/parisc/math-emu/cnv_float.h index 9071e093164a..933423fa5144 100644 --- a/arch/parisc/math-emu/cnv_float.h +++ b/arch/parisc/math-emu/cnv_float.h | |||
| @@ -347,16 +347,15 @@ | |||
| 347 | Sgl_isinexact_to_fix(sgl_value,exponent) | 347 | Sgl_isinexact_to_fix(sgl_value,exponent) |
| 348 | 348 | ||
| 349 | #define Duint_from_sgl_mantissa(sgl_value,exponent,dresultA,dresultB) \ | 349 | #define Duint_from_sgl_mantissa(sgl_value,exponent,dresultA,dresultB) \ |
| 350 | {Sall(sgl_value) <<= SGL_EXP_LENGTH; /* left-justify */ \ | 350 | {unsigned int val = Sall(sgl_value) << SGL_EXP_LENGTH; \ |
| 351 | if (exponent <= 31) { \ | 351 | if (exponent <= 31) { \ |
| 352 | Dintp1(dresultA) = 0; \ | 352 | Dintp1(dresultA) = 0; \ |
| 353 | Dintp2(dresultB) = (unsigned)Sall(sgl_value) >> (31 - exponent); \ | 353 | Dintp2(dresultB) = val >> (31 - exponent); \ |
| 354 | } \ | 354 | } \ |
| 355 | else { \ | 355 | else { \ |
| 356 | Dintp1(dresultA) = Sall(sgl_value) >> (63 - exponent); \ | 356 | Dintp1(dresultA) = val >> (63 - exponent); \ |
| 357 | Dintp2(dresultB) = Sall(sgl_value) << (exponent - 31); \ | 357 | Dintp2(dresultB) = exponent <= 62 ? val << (exponent - 31) : 0; \ |
| 358 | } \ | 358 | } \ |
| 359 | Sall(sgl_value) >>= SGL_EXP_LENGTH; /* return to original */ \ | ||
| 360 | } | 359 | } |
| 361 | 360 | ||
| 362 | #define Duint_setzero(dresultA,dresultB) \ | 361 | #define Duint_setzero(dresultA,dresultB) \ |
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index d22e73e4618b..e514de57a125 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
| @@ -439,6 +439,8 @@ ret_from_fork: | |||
| 439 | ret_from_kernel_thread: | 439 | ret_from_kernel_thread: |
| 440 | REST_NVGPRS(r1) | 440 | REST_NVGPRS(r1) |
| 441 | bl schedule_tail | 441 | bl schedule_tail |
| 442 | li r3,0 | ||
| 443 | stw r3,0(r1) | ||
| 442 | mtlr r14 | 444 | mtlr r14 |
| 443 | mr r3,r15 | 445 | mr r3,r15 |
| 444 | PPC440EP_ERR42 | 446 | PPC440EP_ERR42 |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index b310a0573625..3d990d3bd8ba 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -664,6 +664,19 @@ resume_kernel: | |||
| 664 | ld r4,TI_FLAGS(r9) | 664 | ld r4,TI_FLAGS(r9) |
| 665 | andi. r0,r4,_TIF_NEED_RESCHED | 665 | andi. r0,r4,_TIF_NEED_RESCHED |
| 666 | bne 1b | 666 | bne 1b |
| 667 | |||
| 668 | /* | ||
| 669 | * arch_local_irq_restore() from preempt_schedule_irq above may | ||
| 670 | * enable hard interrupt but we really should disable interrupts | ||
| 671 | * when we return from the interrupt, and so that we don't get | ||
| 672 | * interrupted after loading SRR0/1. | ||
| 673 | */ | ||
| 674 | #ifdef CONFIG_PPC_BOOK3E | ||
| 675 | wrteei 0 | ||
| 676 | #else | ||
| 677 | ld r10,PACAKMSR(r13) /* Get kernel MSR without EE */ | ||
| 678 | mtmsrd r10,1 /* Update machine state */ | ||
| 679 | #endif /* CONFIG_PPC_BOOK3E */ | ||
| 667 | #endif /* CONFIG_PREEMPT */ | 680 | #endif /* CONFIG_PREEMPT */ |
| 668 | 681 | ||
| 669 | .globl fast_exc_return_irq | 682 | .globl fast_exc_return_irq |
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index c470a40b29f5..a7bc7521c064 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c | |||
| @@ -154,12 +154,12 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs) | |||
| 154 | static int kgdb_singlestep(struct pt_regs *regs) | 154 | static int kgdb_singlestep(struct pt_regs *regs) |
| 155 | { | 155 | { |
| 156 | struct thread_info *thread_info, *exception_thread_info; | 156 | struct thread_info *thread_info, *exception_thread_info; |
| 157 | struct thread_info *backup_current_thread_info = \ | 157 | struct thread_info *backup_current_thread_info; |
| 158 | (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL); | ||
| 159 | 158 | ||
| 160 | if (user_mode(regs)) | 159 | if (user_mode(regs)) |
| 161 | return 0; | 160 | return 0; |
| 162 | 161 | ||
| 162 | backup_current_thread_info = (struct thread_info *)kmalloc(sizeof(struct thread_info), GFP_KERNEL); | ||
| 163 | /* | 163 | /* |
| 164 | * On Book E and perhaps other processors, singlestep is handled on | 164 | * On Book E and perhaps other processors, singlestep is handled on |
| 165 | * the critical exception stack. This causes current_thread_info() | 165 | * the critical exception stack. This causes current_thread_info() |
| @@ -185,6 +185,7 @@ static int kgdb_singlestep(struct pt_regs *regs) | |||
| 185 | /* Restore current_thread_info lastly. */ | 185 | /* Restore current_thread_info lastly. */ |
| 186 | memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info); | 186 | memcpy(exception_thread_info, backup_current_thread_info, sizeof *thread_info); |
| 187 | 187 | ||
| 188 | kfree(backup_current_thread_info); | ||
| 188 | return 1; | 189 | return 1; |
| 189 | } | 190 | } |
| 190 | 191 | ||
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 6f6b1cccc916..127361e093f4 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -494,10 +494,15 @@ void timer_interrupt(struct pt_regs * regs) | |||
| 494 | set_dec(DECREMENTER_MAX); | 494 | set_dec(DECREMENTER_MAX); |
| 495 | 495 | ||
| 496 | /* Some implementations of hotplug will get timer interrupts while | 496 | /* Some implementations of hotplug will get timer interrupts while |
| 497 | * offline, just ignore these | 497 | * offline, just ignore these and we also need to set |
| 498 | * decrementers_next_tb as MAX to make sure __check_irq_replay | ||
| 499 | * don't replay timer interrupt when return, otherwise we'll trap | ||
| 500 | * here infinitely :( | ||
| 498 | */ | 501 | */ |
| 499 | if (!cpu_online(smp_processor_id())) | 502 | if (!cpu_online(smp_processor_id())) { |
| 503 | *next_tb = ~(u64)0; | ||
| 500 | return; | 504 | return; |
| 505 | } | ||
| 501 | 506 | ||
| 502 | /* Conditionally hard-enable interrupts now that the DEC has been | 507 | /* Conditionally hard-enable interrupts now that the DEC has been |
| 503 | * bumped to its maximum value | 508 | * bumped to its maximum value |
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index b0855e5d8905..9d9cddc5b346 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #define OP_31_XOP_TRAP 4 | 39 | #define OP_31_XOP_TRAP 4 |
| 40 | #define OP_31_XOP_LWZX 23 | 40 | #define OP_31_XOP_LWZX 23 |
| 41 | #define OP_31_XOP_TRAP_64 68 | 41 | #define OP_31_XOP_TRAP_64 68 |
| 42 | #define OP_31_XOP_DCBF 86 | ||
| 42 | #define OP_31_XOP_LBZX 87 | 43 | #define OP_31_XOP_LBZX 87 |
| 43 | #define OP_31_XOP_STWX 151 | 44 | #define OP_31_XOP_STWX 151 |
| 44 | #define OP_31_XOP_STBX 215 | 45 | #define OP_31_XOP_STBX 215 |
| @@ -374,6 +375,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
| 374 | emulated = kvmppc_emulate_mtspr(vcpu, sprn, rs); | 375 | emulated = kvmppc_emulate_mtspr(vcpu, sprn, rs); |
| 375 | break; | 376 | break; |
| 376 | 377 | ||
| 378 | case OP_31_XOP_DCBF: | ||
| 377 | case OP_31_XOP_DCBI: | 379 | case OP_31_XOP_DCBI: |
| 378 | /* Do nothing. The guest is performing dcbi because | 380 | /* Do nothing. The guest is performing dcbi because |
| 379 | * hardware DMA is not snooped by the dcache, but | 381 | * hardware DMA is not snooped by the dcache, but |
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 315f9495e9b2..f444b94935f5 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c | |||
| @@ -52,7 +52,7 @@ static int power7_marked_instr_event(u64 mmcr1) | |||
| 52 | for (pmc = 0; pmc < 4; pmc++) { | 52 | for (pmc = 0; pmc < 4; pmc++) { |
| 53 | psel = mmcr1 & (OPROFILE_PM_PMCSEL_MSK | 53 | psel = mmcr1 & (OPROFILE_PM_PMCSEL_MSK |
| 54 | << (OPROFILE_MAX_PMC_NUM - pmc) | 54 | << (OPROFILE_MAX_PMC_NUM - pmc) |
| 55 | * OPROFILE_MAX_PMC_NUM); | 55 | * OPROFILE_PMSEL_FIELD_WIDTH); |
| 56 | psel = (psel >> ((OPROFILE_MAX_PMC_NUM - pmc) | 56 | psel = (psel >> ((OPROFILE_MAX_PMC_NUM - pmc) |
| 57 | * OPROFILE_PMSEL_FIELD_WIDTH)) & ~1ULL; | 57 | * OPROFILE_PMSEL_FIELD_WIDTH)) & ~1ULL; |
| 58 | unit = mmcr1 & (OPROFILE_PM_UNIT_MSK | 58 | unit = mmcr1 & (OPROFILE_PM_UNIT_MSK |
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c index 95d00173029f..890f30e70f98 100644 --- a/arch/powerpc/platforms/pasemi/cpufreq.c +++ b/arch/powerpc/platforms/pasemi/cpufreq.c | |||
| @@ -236,6 +236,13 @@ out: | |||
| 236 | 236 | ||
| 237 | static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) | 237 | static int pas_cpufreq_cpu_exit(struct cpufreq_policy *policy) |
| 238 | { | 238 | { |
| 239 | /* | ||
| 240 | * We don't support CPU hotplug. Don't unmap after the system | ||
| 241 | * has already made it to a running state. | ||
| 242 | */ | ||
| 243 | if (system_state != SYSTEM_BOOTING) | ||
| 244 | return 0; | ||
| 245 | |||
| 239 | if (sdcasr_mapbase) | 246 | if (sdcasr_mapbase) |
| 240 | iounmap(sdcasr_mapbase); | 247 | iounmap(sdcasr_mapbase); |
| 241 | if (sdcpwr_mapbase) | 248 | if (sdcpwr_mapbase) |
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index c1d7930a82f4..098adbb62660 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h | |||
| @@ -1365,6 +1365,18 @@ static inline void pmdp_invalidate(struct vm_area_struct *vma, | |||
| 1365 | __pmd_idte(address, pmdp); | 1365 | __pmd_idte(address, pmdp); |
| 1366 | } | 1366 | } |
| 1367 | 1367 | ||
| 1368 | #define __HAVE_ARCH_PMDP_SET_WRPROTECT | ||
| 1369 | static inline void pmdp_set_wrprotect(struct mm_struct *mm, | ||
| 1370 | unsigned long address, pmd_t *pmdp) | ||
| 1371 | { | ||
| 1372 | pmd_t pmd = *pmdp; | ||
| 1373 | |||
| 1374 | if (pmd_write(pmd)) { | ||
| 1375 | __pmd_idte(address, pmdp); | ||
| 1376 | set_pmd_at(mm, address, pmdp, pmd_wrprotect(pmd)); | ||
| 1377 | } | ||
| 1378 | } | ||
| 1379 | |||
| 1368 | static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot) | 1380 | static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot) |
| 1369 | { | 1381 | { |
| 1370 | pmd_t __pmd; | 1382 | pmd_t __pmd; |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 79795af59810..225543bf45a5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -2138,6 +2138,7 @@ config OLPC_XO1_RTC | |||
| 2138 | config OLPC_XO1_SCI | 2138 | config OLPC_XO1_SCI |
| 2139 | bool "OLPC XO-1 SCI extras" | 2139 | bool "OLPC XO-1 SCI extras" |
| 2140 | depends on OLPC && OLPC_XO1_PM | 2140 | depends on OLPC && OLPC_XO1_PM |
| 2141 | depends on INPUT=y | ||
| 2141 | select POWER_SUPPLY | 2142 | select POWER_SUPPLY |
| 2142 | select GPIO_CS5535 | 2143 | select GPIO_CS5535 |
| 2143 | select MFD_CORE | 2144 | select MFD_CORE |
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index ccce0ed67dde..379814bc41e3 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile | |||
| @@ -71,7 +71,7 @@ GCOV_PROFILE := n | |||
| 71 | $(obj)/bzImage: asflags-y := $(SVGA_MODE) | 71 | $(obj)/bzImage: asflags-y := $(SVGA_MODE) |
| 72 | 72 | ||
| 73 | quiet_cmd_image = BUILD $@ | 73 | quiet_cmd_image = BUILD $@ |
| 74 | cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin > $@ | 74 | cmd_image = $(obj)/tools/build $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/zoffset.h > $@ |
| 75 | 75 | ||
| 76 | $(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE | 76 | $(obj)/bzImage: $(obj)/setup.bin $(obj)/vmlinux.bin $(obj)/tools/build FORCE |
| 77 | $(call if_changed,image) | 77 | $(call if_changed,image) |
| @@ -92,7 +92,7 @@ targets += voffset.h | |||
| 92 | $(obj)/voffset.h: vmlinux FORCE | 92 | $(obj)/voffset.h: vmlinux FORCE |
| 93 | $(call if_changed,voffset) | 93 | $(call if_changed,voffset) |
| 94 | 94 | ||
| 95 | sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p' | 95 | sed-zoffset := -e 's/^\([0-9a-fA-F]*\) . \(startup_32\|startup_64\|efi_pe_entry\|efi_stub_entry\|input_data\|_end\|z_.*\)$$/\#define ZO_\2 0x\1/p' |
| 96 | 96 | ||
| 97 | quiet_cmd_zoffset = ZOFFSET $@ | 97 | quiet_cmd_zoffset = ZOFFSET $@ |
| 98 | cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@ | 98 | cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@ |
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index 18e329ca108e..f8fa41190c35 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c | |||
| @@ -256,10 +256,10 @@ static efi_status_t setup_efi_pci(struct boot_params *params) | |||
| 256 | int i; | 256 | int i; |
| 257 | struct setup_data *data; | 257 | struct setup_data *data; |
| 258 | 258 | ||
| 259 | data = (struct setup_data *)params->hdr.setup_data; | 259 | data = (struct setup_data *)(unsigned long)params->hdr.setup_data; |
| 260 | 260 | ||
| 261 | while (data && data->next) | 261 | while (data && data->next) |
| 262 | data = (struct setup_data *)data->next; | 262 | data = (struct setup_data *)(unsigned long)data->next; |
| 263 | 263 | ||
| 264 | status = efi_call_phys5(sys_table->boottime->locate_handle, | 264 | status = efi_call_phys5(sys_table->boottime->locate_handle, |
| 265 | EFI_LOCATE_BY_PROTOCOL, &pci_proto, | 265 | EFI_LOCATE_BY_PROTOCOL, &pci_proto, |
| @@ -295,16 +295,18 @@ static efi_status_t setup_efi_pci(struct boot_params *params) | |||
| 295 | if (!pci) | 295 | if (!pci) |
| 296 | continue; | 296 | continue; |
| 297 | 297 | ||
| 298 | #ifdef CONFIG_X86_64 | ||
| 298 | status = efi_call_phys4(pci->attributes, pci, | 299 | status = efi_call_phys4(pci->attributes, pci, |
| 299 | EfiPciIoAttributeOperationGet, 0, | 300 | EfiPciIoAttributeOperationGet, 0, |
| 300 | &attributes); | 301 | &attributes); |
| 301 | 302 | #else | |
| 303 | status = efi_call_phys5(pci->attributes, pci, | ||
| 304 | EfiPciIoAttributeOperationGet, 0, 0, | ||
| 305 | &attributes); | ||
| 306 | #endif | ||
| 302 | if (status != EFI_SUCCESS) | 307 | if (status != EFI_SUCCESS) |
| 303 | continue; | 308 | continue; |
| 304 | 309 | ||
| 305 | if (!(attributes & EFI_PCI_IO_ATTRIBUTE_EMBEDDED_ROM)) | ||
| 306 | continue; | ||
| 307 | |||
| 308 | if (!pci->romimage || !pci->romsize) | 310 | if (!pci->romimage || !pci->romsize) |
| 309 | continue; | 311 | continue; |
| 310 | 312 | ||
| @@ -345,9 +347,9 @@ static efi_status_t setup_efi_pci(struct boot_params *params) | |||
| 345 | memcpy(rom->romdata, pci->romimage, pci->romsize); | 347 | memcpy(rom->romdata, pci->romimage, pci->romsize); |
| 346 | 348 | ||
| 347 | if (data) | 349 | if (data) |
| 348 | data->next = (uint64_t)rom; | 350 | data->next = (unsigned long)rom; |
| 349 | else | 351 | else |
| 350 | params->hdr.setup_data = (uint64_t)rom; | 352 | params->hdr.setup_data = (unsigned long)rom; |
| 351 | 353 | ||
| 352 | data = (struct setup_data *)rom; | 354 | data = (struct setup_data *)rom; |
| 353 | 355 | ||
| @@ -432,10 +434,9 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, | |||
| 432 | * Once we've found a GOP supporting ConOut, | 434 | * Once we've found a GOP supporting ConOut, |
| 433 | * don't bother looking any further. | 435 | * don't bother looking any further. |
| 434 | */ | 436 | */ |
| 437 | first_gop = gop; | ||
| 435 | if (conout_found) | 438 | if (conout_found) |
| 436 | break; | 439 | break; |
| 437 | |||
| 438 | first_gop = gop; | ||
| 439 | } | 440 | } |
| 440 | } | 441 | } |
| 441 | 442 | ||
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S index aa4aaf1b2380..1e3184f6072f 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S | |||
| @@ -35,11 +35,11 @@ ENTRY(startup_32) | |||
| 35 | #ifdef CONFIG_EFI_STUB | 35 | #ifdef CONFIG_EFI_STUB |
| 36 | jmp preferred_addr | 36 | jmp preferred_addr |
| 37 | 37 | ||
| 38 | .balign 0x10 | ||
| 39 | /* | 38 | /* |
| 40 | * We don't need the return address, so set up the stack so | 39 | * We don't need the return address, so set up the stack so |
| 41 | * efi_main() can find its arugments. | 40 | * efi_main() can find its arguments. |
| 42 | */ | 41 | */ |
| 42 | ENTRY(efi_pe_entry) | ||
| 43 | add $0x4, %esp | 43 | add $0x4, %esp |
| 44 | 44 | ||
| 45 | call make_boot_params | 45 | call make_boot_params |
| @@ -50,8 +50,10 @@ ENTRY(startup_32) | |||
| 50 | pushl %eax | 50 | pushl %eax |
| 51 | pushl %esi | 51 | pushl %esi |
| 52 | pushl %ecx | 52 | pushl %ecx |
| 53 | sub $0x4, %esp | ||
| 53 | 54 | ||
| 54 | .org 0x30,0x90 | 55 | ENTRY(efi_stub_entry) |
| 56 | add $0x4, %esp | ||
| 55 | call efi_main | 57 | call efi_main |
| 56 | cmpl $0, %eax | 58 | cmpl $0, %eax |
| 57 | movl %eax, %esi | 59 | movl %eax, %esi |
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 2c4b171eec33..f5d1aaa0dec8 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -201,12 +201,12 @@ ENTRY(startup_64) | |||
| 201 | */ | 201 | */ |
| 202 | #ifdef CONFIG_EFI_STUB | 202 | #ifdef CONFIG_EFI_STUB |
| 203 | /* | 203 | /* |
| 204 | * The entry point for the PE/COFF executable is 0x210, so only | 204 | * The entry point for the PE/COFF executable is efi_pe_entry, so |
| 205 | * legacy boot loaders will execute this jmp. | 205 | * only legacy boot loaders will execute this jmp. |
| 206 | */ | 206 | */ |
| 207 | jmp preferred_addr | 207 | jmp preferred_addr |
| 208 | 208 | ||
| 209 | .org 0x210 | 209 | ENTRY(efi_pe_entry) |
| 210 | mov %rcx, %rdi | 210 | mov %rcx, %rdi |
| 211 | mov %rdx, %rsi | 211 | mov %rdx, %rsi |
| 212 | pushq %rdi | 212 | pushq %rdi |
| @@ -218,7 +218,7 @@ ENTRY(startup_64) | |||
| 218 | popq %rsi | 218 | popq %rsi |
| 219 | popq %rdi | 219 | popq %rdi |
| 220 | 220 | ||
| 221 | .org 0x230,0x90 | 221 | ENTRY(efi_stub_entry) |
| 222 | call efi_main | 222 | call efi_main |
| 223 | movq %rax,%rsi | 223 | movq %rax,%rsi |
| 224 | cmpq $0,%rax | 224 | cmpq $0,%rax |
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 8c132a625b94..944ce595f767 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <asm/e820.h> | 21 | #include <asm/e820.h> |
| 22 | #include <asm/page_types.h> | 22 | #include <asm/page_types.h> |
| 23 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
| 24 | #include <asm/bootparam.h> | ||
| 24 | #include "boot.h" | 25 | #include "boot.h" |
| 25 | #include "voffset.h" | 26 | #include "voffset.h" |
| 26 | #include "zoffset.h" | 27 | #include "zoffset.h" |
| @@ -255,6 +256,9 @@ section_table: | |||
| 255 | # header, from the old boot sector. | 256 | # header, from the old boot sector. |
| 256 | 257 | ||
| 257 | .section ".header", "a" | 258 | .section ".header", "a" |
| 259 | .globl sentinel | ||
| 260 | sentinel: .byte 0xff, 0xff /* Used to detect broken loaders */ | ||
| 261 | |||
| 258 | .globl hdr | 262 | .globl hdr |
| 259 | hdr: | 263 | hdr: |
| 260 | setup_sects: .byte 0 /* Filled in by build.c */ | 264 | setup_sects: .byte 0 /* Filled in by build.c */ |
| @@ -279,7 +283,7 @@ _start: | |||
| 279 | # Part 2 of the header, from the old setup.S | 283 | # Part 2 of the header, from the old setup.S |
| 280 | 284 | ||
| 281 | .ascii "HdrS" # header signature | 285 | .ascii "HdrS" # header signature |
| 282 | .word 0x020b # header version number (>= 0x0105) | 286 | .word 0x020c # header version number (>= 0x0105) |
| 283 | # or else old loadlin-1.5 will fail) | 287 | # or else old loadlin-1.5 will fail) |
| 284 | .globl realmode_swtch | 288 | .globl realmode_swtch |
| 285 | realmode_swtch: .word 0, 0 # default_switch, SETUPSEG | 289 | realmode_swtch: .word 0, 0 # default_switch, SETUPSEG |
| @@ -297,13 +301,7 @@ type_of_loader: .byte 0 # 0 means ancient bootloader, newer | |||
| 297 | 301 | ||
| 298 | # flags, unused bits must be zero (RFU) bit within loadflags | 302 | # flags, unused bits must be zero (RFU) bit within loadflags |
| 299 | loadflags: | 303 | loadflags: |
| 300 | LOADED_HIGH = 1 # If set, the kernel is loaded high | 304 | .byte LOADED_HIGH # The kernel is to be loaded high |
| 301 | CAN_USE_HEAP = 0x80 # If set, the loader also has set | ||
| 302 | # heap_end_ptr to tell how much | ||
| 303 | # space behind setup.S can be used for | ||
| 304 | # heap purposes. | ||
| 305 | # Only the loader knows what is free | ||
| 306 | .byte LOADED_HIGH | ||
| 307 | 305 | ||
| 308 | setup_move_size: .word 0x8000 # size to move, when setup is not | 306 | setup_move_size: .word 0x8000 # size to move, when setup is not |
| 309 | # loaded at 0x90000. We will move setup | 307 | # loaded at 0x90000. We will move setup |
| @@ -369,7 +367,23 @@ relocatable_kernel: .byte 1 | |||
| 369 | relocatable_kernel: .byte 0 | 367 | relocatable_kernel: .byte 0 |
| 370 | #endif | 368 | #endif |
| 371 | min_alignment: .byte MIN_KERNEL_ALIGN_LG2 # minimum alignment | 369 | min_alignment: .byte MIN_KERNEL_ALIGN_LG2 # minimum alignment |
| 372 | pad3: .word 0 | 370 | |
| 371 | xloadflags: | ||
| 372 | #ifdef CONFIG_X86_64 | ||
| 373 | # define XLF0 XLF_KERNEL_64 /* 64-bit kernel */ | ||
| 374 | #else | ||
| 375 | # define XLF0 0 | ||
| 376 | #endif | ||
| 377 | #ifdef CONFIG_EFI_STUB | ||
| 378 | # ifdef CONFIG_X86_64 | ||
| 379 | # define XLF23 XLF_EFI_HANDOVER_64 /* 64-bit EFI handover ok */ | ||
| 380 | # else | ||
| 381 | # define XLF23 XLF_EFI_HANDOVER_32 /* 32-bit EFI handover ok */ | ||
| 382 | # endif | ||
| 383 | #else | ||
| 384 | # define XLF23 0 | ||
| 385 | #endif | ||
| 386 | .word XLF0 | XLF23 | ||
| 373 | 387 | ||
| 374 | cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line, | 388 | cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line, |
| 375 | #added with boot protocol | 389 | #added with boot protocol |
| @@ -397,8 +411,13 @@ pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr | |||
| 397 | #define INIT_SIZE VO_INIT_SIZE | 411 | #define INIT_SIZE VO_INIT_SIZE |
| 398 | #endif | 412 | #endif |
| 399 | init_size: .long INIT_SIZE # kernel initialization size | 413 | init_size: .long INIT_SIZE # kernel initialization size |
| 400 | handover_offset: .long 0x30 # offset to the handover | 414 | handover_offset: |
| 415 | #ifdef CONFIG_EFI_STUB | ||
| 416 | .long 0x30 # offset to the handover | ||
| 401 | # protocol entry point | 417 | # protocol entry point |
| 418 | #else | ||
| 419 | .long 0 | ||
| 420 | #endif | ||
| 402 | 421 | ||
| 403 | # End of setup header ##################################################### | 422 | # End of setup header ##################################################### |
| 404 | 423 | ||
diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld index 03c0683636b6..96a6c7563538 100644 --- a/arch/x86/boot/setup.ld +++ b/arch/x86/boot/setup.ld | |||
| @@ -13,7 +13,7 @@ SECTIONS | |||
| 13 | .bstext : { *(.bstext) } | 13 | .bstext : { *(.bstext) } |
| 14 | .bsdata : { *(.bsdata) } | 14 | .bsdata : { *(.bsdata) } |
| 15 | 15 | ||
| 16 | . = 497; | 16 | . = 495; |
| 17 | .header : { *(.header) } | 17 | .header : { *(.header) } |
| 18 | .entrytext : { *(.entrytext) } | 18 | .entrytext : { *(.entrytext) } |
| 19 | .inittext : { *(.inittext) } | 19 | .inittext : { *(.inittext) } |
diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c index 4b8e165ee572..94c544650020 100644 --- a/arch/x86/boot/tools/build.c +++ b/arch/x86/boot/tools/build.c | |||
| @@ -52,6 +52,10 @@ int is_big_kernel; | |||
| 52 | 52 | ||
| 53 | #define PECOFF_RELOC_RESERVE 0x20 | 53 | #define PECOFF_RELOC_RESERVE 0x20 |
| 54 | 54 | ||
| 55 | unsigned long efi_stub_entry; | ||
| 56 | unsigned long efi_pe_entry; | ||
| 57 | unsigned long startup_64; | ||
| 58 | |||
| 55 | /*----------------------------------------------------------------------*/ | 59 | /*----------------------------------------------------------------------*/ |
| 56 | 60 | ||
| 57 | static const u32 crctab32[] = { | 61 | static const u32 crctab32[] = { |
| @@ -132,7 +136,7 @@ static void die(const char * str, ...) | |||
| 132 | 136 | ||
| 133 | static void usage(void) | 137 | static void usage(void) |
| 134 | { | 138 | { |
| 135 | die("Usage: build setup system [> image]"); | 139 | die("Usage: build setup system [zoffset.h] [> image]"); |
| 136 | } | 140 | } |
| 137 | 141 | ||
| 138 | #ifdef CONFIG_EFI_STUB | 142 | #ifdef CONFIG_EFI_STUB |
| @@ -206,30 +210,54 @@ static void update_pecoff_text(unsigned int text_start, unsigned int file_sz) | |||
| 206 | */ | 210 | */ |
| 207 | put_unaligned_le32(file_sz - 512, &buf[pe_header + 0x1c]); | 211 | put_unaligned_le32(file_sz - 512, &buf[pe_header + 0x1c]); |
| 208 | 212 | ||
| 209 | #ifdef CONFIG_X86_32 | ||
| 210 | /* | 213 | /* |
| 211 | * Address of entry point. | 214 | * Address of entry point for PE/COFF executable |
| 212 | * | ||
| 213 | * The EFI stub entry point is +16 bytes from the start of | ||
| 214 | * the .text section. | ||
| 215 | */ | 215 | */ |
| 216 | put_unaligned_le32(text_start + 16, &buf[pe_header + 0x28]); | 216 | put_unaligned_le32(text_start + efi_pe_entry, &buf[pe_header + 0x28]); |
| 217 | #else | ||
| 218 | /* | ||
| 219 | * Address of entry point. startup_32 is at the beginning and | ||
| 220 | * the 64-bit entry point (startup_64) is always 512 bytes | ||
| 221 | * after. The EFI stub entry point is 16 bytes after that, as | ||
| 222 | * the first instruction allows legacy loaders to jump over | ||
| 223 | * the EFI stub initialisation | ||
| 224 | */ | ||
| 225 | put_unaligned_le32(text_start + 528, &buf[pe_header + 0x28]); | ||
| 226 | #endif /* CONFIG_X86_32 */ | ||
| 227 | 217 | ||
| 228 | update_pecoff_section_header(".text", text_start, text_sz); | 218 | update_pecoff_section_header(".text", text_start, text_sz); |
| 229 | } | 219 | } |
| 230 | 220 | ||
| 231 | #endif /* CONFIG_EFI_STUB */ | 221 | #endif /* CONFIG_EFI_STUB */ |
| 232 | 222 | ||
| 223 | |||
| 224 | /* | ||
| 225 | * Parse zoffset.h and find the entry points. We could just #include zoffset.h | ||
| 226 | * but that would mean tools/build would have to be rebuilt every time. It's | ||
| 227 | * not as if parsing it is hard... | ||
| 228 | */ | ||
| 229 | #define PARSE_ZOFS(p, sym) do { \ | ||
| 230 | if (!strncmp(p, "#define ZO_" #sym " ", 11+sizeof(#sym))) \ | ||
| 231 | sym = strtoul(p + 11 + sizeof(#sym), NULL, 16); \ | ||
| 232 | } while (0) | ||
| 233 | |||
| 234 | static void parse_zoffset(char *fname) | ||
| 235 | { | ||
| 236 | FILE *file; | ||
| 237 | char *p; | ||
| 238 | int c; | ||
| 239 | |||
| 240 | file = fopen(fname, "r"); | ||
| 241 | if (!file) | ||
| 242 | die("Unable to open `%s': %m", fname); | ||
| 243 | c = fread(buf, 1, sizeof(buf) - 1, file); | ||
| 244 | if (ferror(file)) | ||
| 245 | die("read-error on `zoffset.h'"); | ||
| 246 | buf[c] = 0; | ||
| 247 | |||
| 248 | p = (char *)buf; | ||
| 249 | |||
| 250 | while (p && *p) { | ||
| 251 | PARSE_ZOFS(p, efi_stub_entry); | ||
| 252 | PARSE_ZOFS(p, efi_pe_entry); | ||
| 253 | PARSE_ZOFS(p, startup_64); | ||
| 254 | |||
| 255 | p = strchr(p, '\n'); | ||
| 256 | while (p && (*p == '\r' || *p == '\n')) | ||
| 257 | p++; | ||
| 258 | } | ||
| 259 | } | ||
| 260 | |||
| 233 | int main(int argc, char ** argv) | 261 | int main(int argc, char ** argv) |
| 234 | { | 262 | { |
| 235 | unsigned int i, sz, setup_sectors; | 263 | unsigned int i, sz, setup_sectors; |
| @@ -241,7 +269,19 @@ int main(int argc, char ** argv) | |||
| 241 | void *kernel; | 269 | void *kernel; |
| 242 | u32 crc = 0xffffffffUL; | 270 | u32 crc = 0xffffffffUL; |
| 243 | 271 | ||
| 244 | if (argc != 3) | 272 | /* Defaults for old kernel */ |
| 273 | #ifdef CONFIG_X86_32 | ||
| 274 | efi_pe_entry = 0x10; | ||
| 275 | efi_stub_entry = 0x30; | ||
| 276 | #else | ||
| 277 | efi_pe_entry = 0x210; | ||
| 278 | efi_stub_entry = 0x230; | ||
| 279 | startup_64 = 0x200; | ||
| 280 | #endif | ||
| 281 | |||
| 282 | if (argc == 4) | ||
| 283 | parse_zoffset(argv[3]); | ||
| 284 | else if (argc != 3) | ||
| 245 | usage(); | 285 | usage(); |
| 246 | 286 | ||
| 247 | /* Copy the setup code */ | 287 | /* Copy the setup code */ |
| @@ -299,6 +339,11 @@ int main(int argc, char ** argv) | |||
| 299 | 339 | ||
| 300 | #ifdef CONFIG_EFI_STUB | 340 | #ifdef CONFIG_EFI_STUB |
| 301 | update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); | 341 | update_pecoff_text(setup_sectors * 512, sz + i + ((sys_size * 16) - sz)); |
| 342 | |||
| 343 | #ifdef CONFIG_X86_64 /* Yes, this is really how we defined it :( */ | ||
| 344 | efi_stub_entry -= 0x200; | ||
| 345 | #endif | ||
| 346 | put_unaligned_le32(efi_stub_entry, &buf[0x264]); | ||
| 302 | #endif | 347 | #endif |
| 303 | 348 | ||
| 304 | crc = partial_crc32(buf, i, crc); | 349 | crc = partial_crc32(buf, i, crc); |
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 6e8fdf5ad113..28677c55113f 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h | |||
| @@ -94,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, | |||
| 94 | #endif /* CONFIG_X86_32 */ | 94 | #endif /* CONFIG_X86_32 */ |
| 95 | 95 | ||
| 96 | extern int add_efi_memmap; | 96 | extern int add_efi_memmap; |
| 97 | extern unsigned long x86_efi_facility; | ||
| 97 | extern void efi_set_executable(efi_memory_desc_t *md, bool executable); | 98 | extern void efi_set_executable(efi_memory_desc_t *md, bool executable); |
| 98 | extern int efi_memblock_x86_reserve_range(void); | 99 | extern int efi_memblock_x86_reserve_range(void); |
| 99 | extern void efi_call_phys_prelog(void); | 100 | extern void efi_call_phys_prelog(void); |
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h index b47c2a82ff15..062921ef34e9 100644 --- a/arch/x86/include/asm/uv/uv.h +++ b/arch/x86/include/asm/uv/uv.h | |||
| @@ -16,7 +16,7 @@ extern void uv_system_init(void); | |||
| 16 | extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, | 16 | extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, |
| 17 | struct mm_struct *mm, | 17 | struct mm_struct *mm, |
| 18 | unsigned long start, | 18 | unsigned long start, |
| 19 | unsigned end, | 19 | unsigned long end, |
| 20 | unsigned int cpu); | 20 | unsigned int cpu); |
| 21 | 21 | ||
| 22 | #else /* X86_UV */ | 22 | #else /* X86_UV */ |
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 92862cd90201..c15ddaf90710 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h | |||
| @@ -1,6 +1,31 @@ | |||
| 1 | #ifndef _ASM_X86_BOOTPARAM_H | 1 | #ifndef _ASM_X86_BOOTPARAM_H |
| 2 | #define _ASM_X86_BOOTPARAM_H | 2 | #define _ASM_X86_BOOTPARAM_H |
| 3 | 3 | ||
| 4 | /* setup_data types */ | ||
| 5 | #define SETUP_NONE 0 | ||
| 6 | #define SETUP_E820_EXT 1 | ||
| 7 | #define SETUP_DTB 2 | ||
| 8 | #define SETUP_PCI 3 | ||
| 9 | |||
| 10 | /* ram_size flags */ | ||
| 11 | #define RAMDISK_IMAGE_START_MASK 0x07FF | ||
| 12 | #define RAMDISK_PROMPT_FLAG 0x8000 | ||
| 13 | #define RAMDISK_LOAD_FLAG 0x4000 | ||
| 14 | |||
| 15 | /* loadflags */ | ||
| 16 | #define LOADED_HIGH (1<<0) | ||
| 17 | #define QUIET_FLAG (1<<5) | ||
| 18 | #define KEEP_SEGMENTS (1<<6) | ||
| 19 | #define CAN_USE_HEAP (1<<7) | ||
| 20 | |||
| 21 | /* xloadflags */ | ||
| 22 | #define XLF_KERNEL_64 (1<<0) | ||
| 23 | #define XLF_CAN_BE_LOADED_ABOVE_4G (1<<1) | ||
| 24 | #define XLF_EFI_HANDOVER_32 (1<<2) | ||
| 25 | #define XLF_EFI_HANDOVER_64 (1<<3) | ||
| 26 | |||
| 27 | #ifndef __ASSEMBLY__ | ||
| 28 | |||
| 4 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 5 | #include <linux/screen_info.h> | 30 | #include <linux/screen_info.h> |
| 6 | #include <linux/apm_bios.h> | 31 | #include <linux/apm_bios.h> |
| @@ -9,12 +34,6 @@ | |||
| 9 | #include <asm/ist.h> | 34 | #include <asm/ist.h> |
| 10 | #include <video/edid.h> | 35 | #include <video/edid.h> |
| 11 | 36 | ||
| 12 | /* setup data types */ | ||
| 13 | #define SETUP_NONE 0 | ||
| 14 | #define SETUP_E820_EXT 1 | ||
| 15 | #define SETUP_DTB 2 | ||
| 16 | #define SETUP_PCI 3 | ||
| 17 | |||
| 18 | /* extensible setup data list node */ | 37 | /* extensible setup data list node */ |
| 19 | struct setup_data { | 38 | struct setup_data { |
| 20 | __u64 next; | 39 | __u64 next; |
| @@ -28,9 +47,6 @@ struct setup_header { | |||
| 28 | __u16 root_flags; | 47 | __u16 root_flags; |
| 29 | __u32 syssize; | 48 | __u32 syssize; |
| 30 | __u16 ram_size; | 49 | __u16 ram_size; |
| 31 | #define RAMDISK_IMAGE_START_MASK 0x07FF | ||
| 32 | #define RAMDISK_PROMPT_FLAG 0x8000 | ||
| 33 | #define RAMDISK_LOAD_FLAG 0x4000 | ||
| 34 | __u16 vid_mode; | 50 | __u16 vid_mode; |
| 35 | __u16 root_dev; | 51 | __u16 root_dev; |
| 36 | __u16 boot_flag; | 52 | __u16 boot_flag; |
| @@ -42,10 +58,6 @@ struct setup_header { | |||
| 42 | __u16 kernel_version; | 58 | __u16 kernel_version; |
| 43 | __u8 type_of_loader; | 59 | __u8 type_of_loader; |
| 44 | __u8 loadflags; | 60 | __u8 loadflags; |
| 45 | #define LOADED_HIGH (1<<0) | ||
| 46 | #define QUIET_FLAG (1<<5) | ||
| 47 | #define KEEP_SEGMENTS (1<<6) | ||
| 48 | #define CAN_USE_HEAP (1<<7) | ||
| 49 | __u16 setup_move_size; | 61 | __u16 setup_move_size; |
| 50 | __u32 code32_start; | 62 | __u32 code32_start; |
| 51 | __u32 ramdisk_image; | 63 | __u32 ramdisk_image; |
| @@ -58,7 +70,8 @@ struct setup_header { | |||
| 58 | __u32 initrd_addr_max; | 70 | __u32 initrd_addr_max; |
| 59 | __u32 kernel_alignment; | 71 | __u32 kernel_alignment; |
| 60 | __u8 relocatable_kernel; | 72 | __u8 relocatable_kernel; |
| 61 | __u8 _pad2[3]; | 73 | __u8 min_alignment; |
| 74 | __u16 xloadflags; | ||
| 62 | __u32 cmdline_size; | 75 | __u32 cmdline_size; |
| 63 | __u32 hardware_subarch; | 76 | __u32 hardware_subarch; |
| 64 | __u64 hardware_subarch_data; | 77 | __u64 hardware_subarch_data; |
| @@ -106,7 +119,10 @@ struct boot_params { | |||
| 106 | __u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ | 119 | __u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ |
| 107 | struct sys_desc_table sys_desc_table; /* 0x0a0 */ | 120 | struct sys_desc_table sys_desc_table; /* 0x0a0 */ |
| 108 | struct olpc_ofw_header olpc_ofw_header; /* 0x0b0 */ | 121 | struct olpc_ofw_header olpc_ofw_header; /* 0x0b0 */ |
| 109 | __u8 _pad4[128]; /* 0x0c0 */ | 122 | __u32 ext_ramdisk_image; /* 0x0c0 */ |
| 123 | __u32 ext_ramdisk_size; /* 0x0c4 */ | ||
| 124 | __u32 ext_cmd_line_ptr; /* 0x0c8 */ | ||
| 125 | __u8 _pad4[116]; /* 0x0cc */ | ||
| 110 | struct edid_info edid_info; /* 0x140 */ | 126 | struct edid_info edid_info; /* 0x140 */ |
| 111 | struct efi_info efi_info; /* 0x1c0 */ | 127 | struct efi_info efi_info; /* 0x1c0 */ |
| 112 | __u32 alt_mem_k; /* 0x1e0 */ | 128 | __u32 alt_mem_k; /* 0x1e0 */ |
| @@ -115,7 +131,20 @@ struct boot_params { | |||
| 115 | __u8 eddbuf_entries; /* 0x1e9 */ | 131 | __u8 eddbuf_entries; /* 0x1e9 */ |
| 116 | __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ | 132 | __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ |
| 117 | __u8 kbd_status; /* 0x1eb */ | 133 | __u8 kbd_status; /* 0x1eb */ |
| 118 | __u8 _pad6[5]; /* 0x1ec */ | 134 | __u8 _pad5[3]; /* 0x1ec */ |
| 135 | /* | ||
| 136 | * The sentinel is set to a nonzero value (0xff) in header.S. | ||
| 137 | * | ||
| 138 | * A bootloader is supposed to only take setup_header and put | ||
| 139 | * it into a clean boot_params buffer. If it turns out that | ||
| 140 | * it is clumsy or too generous with the buffer, it most | ||
| 141 | * probably will pick up the sentinel variable too. The fact | ||
| 142 | * that this variable then is still 0xff will let kernel | ||
| 143 | * know that some variables in boot_params are invalid and | ||
| 144 | * kernel should zero out certain portions of boot_params. | ||
| 145 | */ | ||
| 146 | __u8 sentinel; /* 0x1ef */ | ||
| 147 | __u8 _pad6[1]; /* 0x1f0 */ | ||
| 119 | struct setup_header hdr; /* setup header */ /* 0x1f1 */ | 148 | struct setup_header hdr; /* setup header */ /* 0x1f1 */ |
| 120 | __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; | 149 | __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; |
| 121 | __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ | 150 | __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ |
| @@ -134,6 +163,6 @@ enum { | |||
| 134 | X86_NR_SUBARCHS, | 163 | X86_NR_SUBARCHS, |
| 135 | }; | 164 | }; |
| 136 | 165 | ||
| 137 | 166 | #endif /* __ASSEMBLY__ */ | |
| 138 | 167 | ||
| 139 | #endif /* _ASM_X86_BOOTPARAM_H */ | 168 | #endif /* _ASM_X86_BOOTPARAM_H */ |
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 4428fd178bce..6774c17a5576 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -340,9 +340,6 @@ int x86_setup_perfctr(struct perf_event *event) | |||
| 340 | /* BTS is currently only allowed for user-mode. */ | 340 | /* BTS is currently only allowed for user-mode. */ |
| 341 | if (!attr->exclude_kernel) | 341 | if (!attr->exclude_kernel) |
| 342 | return -EOPNOTSUPP; | 342 | return -EOPNOTSUPP; |
| 343 | |||
| 344 | if (!attr->exclude_guest) | ||
| 345 | return -EOPNOTSUPP; | ||
| 346 | } | 343 | } |
| 347 | 344 | ||
| 348 | hwc->config |= config; | 345 | hwc->config |= config; |
| @@ -385,9 +382,6 @@ int x86_pmu_hw_config(struct perf_event *event) | |||
| 385 | if (event->attr.precise_ip) { | 382 | if (event->attr.precise_ip) { |
| 386 | int precise = 0; | 383 | int precise = 0; |
| 387 | 384 | ||
| 388 | if (!event->attr.exclude_guest) | ||
| 389 | return -EOPNOTSUPP; | ||
| 390 | |||
| 391 | /* Support for constant skid */ | 385 | /* Support for constant skid */ |
| 392 | if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) { | 386 | if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) { |
| 393 | precise++; | 387 | precise++; |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index ff84d5469d77..6ed91d9980e2 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -1065,7 +1065,6 @@ ENTRY(xen_failsafe_callback) | |||
| 1065 | lea 16(%esp),%esp | 1065 | lea 16(%esp),%esp |
| 1066 | CFI_ADJUST_CFA_OFFSET -16 | 1066 | CFI_ADJUST_CFA_OFFSET -16 |
| 1067 | jz 5f | 1067 | jz 5f |
| 1068 | addl $16,%esp | ||
| 1069 | jmp iret_exc | 1068 | jmp iret_exc |
| 1070 | 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ | 1069 | 5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ |
| 1071 | SAVE_ALL | 1070 | SAVE_ALL |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 07a7a04529bc..cb3c591339aa 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -1781,6 +1781,7 @@ first_nmi: | |||
| 1781 | * Leave room for the "copied" frame | 1781 | * Leave room for the "copied" frame |
| 1782 | */ | 1782 | */ |
| 1783 | subq $(5*8), %rsp | 1783 | subq $(5*8), %rsp |
| 1784 | CFI_ADJUST_CFA_OFFSET 5*8 | ||
| 1784 | 1785 | ||
| 1785 | /* Copy the stack frame to the Saved frame */ | 1786 | /* Copy the stack frame to the Saved frame */ |
| 1786 | .rept 5 | 1787 | .rept 5 |
| @@ -1863,10 +1864,8 @@ end_repeat_nmi: | |||
| 1863 | nmi_swapgs: | 1864 | nmi_swapgs: |
| 1864 | SWAPGS_UNSAFE_STACK | 1865 | SWAPGS_UNSAFE_STACK |
| 1865 | nmi_restore: | 1866 | nmi_restore: |
| 1866 | RESTORE_ALL 8 | 1867 | /* Pop the extra iret frame at once */ |
| 1867 | 1868 | RESTORE_ALL 6*8 | |
| 1868 | /* Pop the extra iret frame */ | ||
| 1869 | addq $(5*8), %rsp | ||
| 1870 | 1869 | ||
| 1871 | /* Clear the NMI executing stack variable */ | 1870 | /* Clear the NMI executing stack variable */ |
| 1872 | movq $0, 5*8(%rsp) | 1871 | movq $0, 5*8(%rsp) |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 8e7f6556028f..c8932c79e78b 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
| @@ -300,6 +300,12 @@ ENTRY(startup_32_smp) | |||
| 300 | leal -__PAGE_OFFSET(%ecx),%esp | 300 | leal -__PAGE_OFFSET(%ecx),%esp |
| 301 | 301 | ||
| 302 | default_entry: | 302 | default_entry: |
| 303 | #define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ | ||
| 304 | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ | ||
| 305 | X86_CR0_PG) | ||
| 306 | movl $(CR0_STATE & ~X86_CR0_PG),%eax | ||
| 307 | movl %eax,%cr0 | ||
| 308 | |||
| 303 | /* | 309 | /* |
| 304 | * New page tables may be in 4Mbyte page mode and may | 310 | * New page tables may be in 4Mbyte page mode and may |
| 305 | * be using the global pages. | 311 | * be using the global pages. |
| @@ -364,8 +370,7 @@ default_entry: | |||
| 364 | */ | 370 | */ |
| 365 | movl $pa(initial_page_table), %eax | 371 | movl $pa(initial_page_table), %eax |
| 366 | movl %eax,%cr3 /* set the page table pointer.. */ | 372 | movl %eax,%cr3 /* set the page table pointer.. */ |
| 367 | movl %cr0,%eax | 373 | movl $CR0_STATE,%eax |
| 368 | orl $X86_CR0_PG,%eax | ||
| 369 | movl %eax,%cr0 /* ..and set paging (PG) bit */ | 374 | movl %eax,%cr0 /* ..and set paging (PG) bit */ |
| 370 | ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */ | 375 | ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */ |
| 371 | 1: | 376 | 1: |
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index a7c5661f8496..4929502c1372 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
| @@ -174,6 +174,9 @@ static int msr_open(struct inode *inode, struct file *file) | |||
| 174 | unsigned int cpu; | 174 | unsigned int cpu; |
| 175 | struct cpuinfo_x86 *c; | 175 | struct cpuinfo_x86 *c; |
| 176 | 176 | ||
| 177 | if (!capable(CAP_SYS_RAWIO)) | ||
| 178 | return -EPERM; | ||
| 179 | |||
| 177 | cpu = iminor(file->f_path.dentry->d_inode); | 180 | cpu = iminor(file->f_path.dentry->d_inode); |
| 178 | if (cpu >= nr_cpu_ids || !cpu_online(cpu)) | 181 | if (cpu >= nr_cpu_ids || !cpu_online(cpu)) |
| 179 | return -ENXIO; /* No such CPU */ | 182 | return -ENXIO; /* No such CPU */ |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 0f5dec5c80e0..872079a67e4d 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -56,7 +56,7 @@ struct device x86_dma_fallback_dev = { | |||
| 56 | EXPORT_SYMBOL(x86_dma_fallback_dev); | 56 | EXPORT_SYMBOL(x86_dma_fallback_dev); |
| 57 | 57 | ||
| 58 | /* Number of entries preallocated for DMA-API debugging */ | 58 | /* Number of entries preallocated for DMA-API debugging */ |
| 59 | #define PREALLOC_DMA_DEBUG_ENTRIES 32768 | 59 | #define PREALLOC_DMA_DEBUG_ENTRIES 65536 |
| 60 | 60 | ||
| 61 | int dma_set_mask(struct device *dev, u64 mask) | 61 | int dma_set_mask(struct device *dev, u64 mask) |
| 62 | { | 62 | { |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 4e8ba39eaf0f..76fa1e9a2b39 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -584,7 +584,7 @@ static void native_machine_emergency_restart(void) | |||
| 584 | break; | 584 | break; |
| 585 | 585 | ||
| 586 | case BOOT_EFI: | 586 | case BOOT_EFI: |
| 587 | if (efi_enabled) | 587 | if (efi_enabled(EFI_RUNTIME_SERVICES)) |
| 588 | efi.reset_system(reboot_mode ? | 588 | efi.reset_system(reboot_mode ? |
| 589 | EFI_RESET_WARM : | 589 | EFI_RESET_WARM : |
| 590 | EFI_RESET_COLD, | 590 | EFI_RESET_COLD, |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 00f6c1472b85..8b24289cc10c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -807,15 +807,15 @@ void __init setup_arch(char **cmdline_p) | |||
| 807 | #ifdef CONFIG_EFI | 807 | #ifdef CONFIG_EFI |
| 808 | if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, | 808 | if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, |
| 809 | "EL32", 4)) { | 809 | "EL32", 4)) { |
| 810 | efi_enabled = 1; | 810 | set_bit(EFI_BOOT, &x86_efi_facility); |
| 811 | efi_64bit = false; | ||
| 812 | } else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, | 811 | } else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, |
| 813 | "EL64", 4)) { | 812 | "EL64", 4)) { |
| 814 | efi_enabled = 1; | 813 | set_bit(EFI_BOOT, &x86_efi_facility); |
| 815 | efi_64bit = true; | 814 | set_bit(EFI_64BIT, &x86_efi_facility); |
| 816 | } | 815 | } |
| 817 | if (efi_enabled && efi_memblock_x86_reserve_range()) | 816 | |
| 818 | efi_enabled = 0; | 817 | if (efi_enabled(EFI_BOOT)) |
| 818 | efi_memblock_x86_reserve_range(); | ||
| 819 | #endif | 819 | #endif |
| 820 | 820 | ||
| 821 | x86_init.oem.arch_setup(); | 821 | x86_init.oem.arch_setup(); |
| @@ -888,7 +888,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 888 | 888 | ||
| 889 | finish_e820_parsing(); | 889 | finish_e820_parsing(); |
| 890 | 890 | ||
| 891 | if (efi_enabled) | 891 | if (efi_enabled(EFI_BOOT)) |
| 892 | efi_init(); | 892 | efi_init(); |
| 893 | 893 | ||
| 894 | dmi_scan_machine(); | 894 | dmi_scan_machine(); |
| @@ -971,7 +971,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 971 | * The EFI specification says that boot service code won't be called | 971 | * The EFI specification says that boot service code won't be called |
| 972 | * after ExitBootServices(). This is, in fact, a lie. | 972 | * after ExitBootServices(). This is, in fact, a lie. |
| 973 | */ | 973 | */ |
| 974 | if (efi_enabled) | 974 | if (efi_enabled(EFI_MEMMAP)) |
| 975 | efi_reserve_boot_services(); | 975 | efi_reserve_boot_services(); |
| 976 | 976 | ||
| 977 | /* preallocate 4k for mptable mpc */ | 977 | /* preallocate 4k for mptable mpc */ |
| @@ -1114,7 +1114,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 1114 | 1114 | ||
| 1115 | #ifdef CONFIG_VT | 1115 | #ifdef CONFIG_VT |
| 1116 | #if defined(CONFIG_VGA_CONSOLE) | 1116 | #if defined(CONFIG_VGA_CONSOLE) |
| 1117 | if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY)) | 1117 | if (!efi_enabled(EFI_BOOT) || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY)) |
| 1118 | conswitchp = &vga_con; | 1118 | conswitchp = &vga_con; |
| 1119 | #elif defined(CONFIG_DUMMY_CONSOLE) | 1119 | #elif defined(CONFIG_DUMMY_CONSOLE) |
| 1120 | conswitchp = &dummy_con; | 1120 | conswitchp = &dummy_con; |
| @@ -1131,14 +1131,14 @@ void __init setup_arch(char **cmdline_p) | |||
| 1131 | register_refined_jiffies(CLOCK_TICK_RATE); | 1131 | register_refined_jiffies(CLOCK_TICK_RATE); |
| 1132 | 1132 | ||
| 1133 | #ifdef CONFIG_EFI | 1133 | #ifdef CONFIG_EFI |
| 1134 | /* Once setup is done above, disable efi_enabled on mismatched | 1134 | /* Once setup is done above, unmap the EFI memory map on |
| 1135 | * firmware/kernel archtectures since there is no support for | 1135 | * mismatched firmware/kernel archtectures since there is no |
| 1136 | * runtime services. | 1136 | * support for runtime services. |
| 1137 | */ | 1137 | */ |
| 1138 | if (efi_enabled && IS_ENABLED(CONFIG_X86_64) != efi_64bit) { | 1138 | if (efi_enabled(EFI_BOOT) && |
| 1139 | IS_ENABLED(CONFIG_X86_64) != efi_enabled(EFI_64BIT)) { | ||
| 1139 | pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n"); | 1140 | pr_info("efi: Setup done, disabling due to 32/64-bit mismatch\n"); |
| 1140 | efi_unmap_memmap(); | 1141 | efi_unmap_memmap(); |
| 1141 | efi_enabled = 0; | ||
| 1142 | } | 1142 | } |
| 1143 | #endif | 1143 | #endif |
| 1144 | } | 1144 | } |
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c index cd3b2438a980..9b4d51d0c0d0 100644 --- a/arch/x86/kernel/step.c +++ b/arch/x86/kernel/step.c | |||
| @@ -165,10 +165,11 @@ void set_task_blockstep(struct task_struct *task, bool on) | |||
| 165 | * Ensure irq/preemption can't change debugctl in between. | 165 | * Ensure irq/preemption can't change debugctl in between. |
| 166 | * Note also that both TIF_BLOCKSTEP and debugctl should | 166 | * Note also that both TIF_BLOCKSTEP and debugctl should |
| 167 | * be changed atomically wrt preemption. | 167 | * be changed atomically wrt preemption. |
| 168 | * FIXME: this means that set/clear TIF_BLOCKSTEP is simply | 168 | * |
| 169 | * wrong if task != current, SIGKILL can wakeup the stopped | 169 | * NOTE: this means that set/clear TIF_BLOCKSTEP is only safe if |
| 170 | * tracee and set/clear can play with the running task, this | 170 | * task is current or it can't be running, otherwise we can race |
| 171 | * can confuse the next __switch_to_xtra(). | 171 | * with __switch_to_xtra(). We rely on ptrace_freeze_traced() but |
| 172 | * PTRACE_KILL is not safe. | ||
| 172 | */ | 173 | */ |
| 173 | local_irq_disable(); | 174 | local_irq_disable(); |
| 174 | debugctl = get_debugctlmsr(); | 175 | debugctl = get_debugctlmsr(); |
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index ad4439145f85..77cf0090c0a3 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
| @@ -51,9 +51,6 @@ | |||
| 51 | 51 | ||
| 52 | #define EFI_DEBUG 1 | 52 | #define EFI_DEBUG 1 |
| 53 | 53 | ||
| 54 | int efi_enabled; | ||
| 55 | EXPORT_SYMBOL(efi_enabled); | ||
| 56 | |||
| 57 | struct efi __read_mostly efi = { | 54 | struct efi __read_mostly efi = { |
| 58 | .mps = EFI_INVALID_TABLE_ADDR, | 55 | .mps = EFI_INVALID_TABLE_ADDR, |
| 59 | .acpi = EFI_INVALID_TABLE_ADDR, | 56 | .acpi = EFI_INVALID_TABLE_ADDR, |
| @@ -69,19 +66,28 @@ EXPORT_SYMBOL(efi); | |||
| 69 | 66 | ||
| 70 | struct efi_memory_map memmap; | 67 | struct efi_memory_map memmap; |
| 71 | 68 | ||
| 72 | bool efi_64bit; | ||
| 73 | |||
| 74 | static struct efi efi_phys __initdata; | 69 | static struct efi efi_phys __initdata; |
| 75 | static efi_system_table_t efi_systab __initdata; | 70 | static efi_system_table_t efi_systab __initdata; |
| 76 | 71 | ||
| 77 | static inline bool efi_is_native(void) | 72 | static inline bool efi_is_native(void) |
| 78 | { | 73 | { |
| 79 | return IS_ENABLED(CONFIG_X86_64) == efi_64bit; | 74 | return IS_ENABLED(CONFIG_X86_64) == efi_enabled(EFI_64BIT); |
| 75 | } | ||
| 76 | |||
| 77 | unsigned long x86_efi_facility; | ||
| 78 | |||
| 79 | /* | ||
| 80 | * Returns 1 if 'facility' is enabled, 0 otherwise. | ||
| 81 | */ | ||
| 82 | int efi_enabled(int facility) | ||
| 83 | { | ||
| 84 | return test_bit(facility, &x86_efi_facility) != 0; | ||
| 80 | } | 85 | } |
| 86 | EXPORT_SYMBOL(efi_enabled); | ||
| 81 | 87 | ||
| 82 | static int __init setup_noefi(char *arg) | 88 | static int __init setup_noefi(char *arg) |
| 83 | { | 89 | { |
| 84 | efi_enabled = 0; | 90 | clear_bit(EFI_BOOT, &x86_efi_facility); |
| 85 | return 0; | 91 | return 0; |
| 86 | } | 92 | } |
| 87 | early_param("noefi", setup_noefi); | 93 | early_param("noefi", setup_noefi); |
| @@ -426,6 +432,7 @@ void __init efi_reserve_boot_services(void) | |||
| 426 | 432 | ||
| 427 | void __init efi_unmap_memmap(void) | 433 | void __init efi_unmap_memmap(void) |
| 428 | { | 434 | { |
| 435 | clear_bit(EFI_MEMMAP, &x86_efi_facility); | ||
| 429 | if (memmap.map) { | 436 | if (memmap.map) { |
| 430 | early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size); | 437 | early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size); |
| 431 | memmap.map = NULL; | 438 | memmap.map = NULL; |
| @@ -460,7 +467,7 @@ void __init efi_free_boot_services(void) | |||
| 460 | 467 | ||
| 461 | static int __init efi_systab_init(void *phys) | 468 | static int __init efi_systab_init(void *phys) |
| 462 | { | 469 | { |
| 463 | if (efi_64bit) { | 470 | if (efi_enabled(EFI_64BIT)) { |
| 464 | efi_system_table_64_t *systab64; | 471 | efi_system_table_64_t *systab64; |
| 465 | u64 tmp = 0; | 472 | u64 tmp = 0; |
| 466 | 473 | ||
| @@ -552,7 +559,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) | |||
| 552 | void *config_tables, *tablep; | 559 | void *config_tables, *tablep; |
| 553 | int i, sz; | 560 | int i, sz; |
| 554 | 561 | ||
| 555 | if (efi_64bit) | 562 | if (efi_enabled(EFI_64BIT)) |
| 556 | sz = sizeof(efi_config_table_64_t); | 563 | sz = sizeof(efi_config_table_64_t); |
| 557 | else | 564 | else |
| 558 | sz = sizeof(efi_config_table_32_t); | 565 | sz = sizeof(efi_config_table_32_t); |
| @@ -572,7 +579,7 @@ static int __init efi_config_init(u64 tables, int nr_tables) | |||
| 572 | efi_guid_t guid; | 579 | efi_guid_t guid; |
| 573 | unsigned long table; | 580 | unsigned long table; |
| 574 | 581 | ||
| 575 | if (efi_64bit) { | 582 | if (efi_enabled(EFI_64BIT)) { |
| 576 | u64 table64; | 583 | u64 table64; |
| 577 | guid = ((efi_config_table_64_t *)tablep)->guid; | 584 | guid = ((efi_config_table_64_t *)tablep)->guid; |
| 578 | table64 = ((efi_config_table_64_t *)tablep)->table; | 585 | table64 = ((efi_config_table_64_t *)tablep)->table; |
| @@ -684,7 +691,6 @@ void __init efi_init(void) | |||
| 684 | if (boot_params.efi_info.efi_systab_hi || | 691 | if (boot_params.efi_info.efi_systab_hi || |
| 685 | boot_params.efi_info.efi_memmap_hi) { | 692 | boot_params.efi_info.efi_memmap_hi) { |
| 686 | pr_info("Table located above 4GB, disabling EFI.\n"); | 693 | pr_info("Table located above 4GB, disabling EFI.\n"); |
| 687 | efi_enabled = 0; | ||
| 688 | return; | 694 | return; |
| 689 | } | 695 | } |
| 690 | efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab; | 696 | efi_phys.systab = (efi_system_table_t *)boot_params.efi_info.efi_systab; |
| @@ -694,10 +700,10 @@ void __init efi_init(void) | |||
| 694 | ((__u64)boot_params.efi_info.efi_systab_hi<<32)); | 700 | ((__u64)boot_params.efi_info.efi_systab_hi<<32)); |
| 695 | #endif | 701 | #endif |
| 696 | 702 | ||
| 697 | if (efi_systab_init(efi_phys.systab)) { | 703 | if (efi_systab_init(efi_phys.systab)) |
| 698 | efi_enabled = 0; | ||
| 699 | return; | 704 | return; |
| 700 | } | 705 | |
| 706 | set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility); | ||
| 701 | 707 | ||
| 702 | /* | 708 | /* |
| 703 | * Show what we know for posterity | 709 | * Show what we know for posterity |
| @@ -715,10 +721,10 @@ void __init efi_init(void) | |||
| 715 | efi.systab->hdr.revision >> 16, | 721 | efi.systab->hdr.revision >> 16, |
| 716 | efi.systab->hdr.revision & 0xffff, vendor); | 722 | efi.systab->hdr.revision & 0xffff, vendor); |
| 717 | 723 | ||
| 718 | if (efi_config_init(efi.systab->tables, efi.systab->nr_tables)) { | 724 | if (efi_config_init(efi.systab->tables, efi.systab->nr_tables)) |
| 719 | efi_enabled = 0; | ||
| 720 | return; | 725 | return; |
| 721 | } | 726 | |
| 727 | set_bit(EFI_CONFIG_TABLES, &x86_efi_facility); | ||
| 722 | 728 | ||
| 723 | /* | 729 | /* |
| 724 | * Note: We currently don't support runtime services on an EFI | 730 | * Note: We currently don't support runtime services on an EFI |
| @@ -727,15 +733,17 @@ void __init efi_init(void) | |||
| 727 | 733 | ||
| 728 | if (!efi_is_native()) | 734 | if (!efi_is_native()) |
| 729 | pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); | 735 | pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); |
| 730 | else if (efi_runtime_init()) { | 736 | else { |
| 731 | efi_enabled = 0; | 737 | if (efi_runtime_init()) |
| 732 | return; | 738 | return; |
| 739 | set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility); | ||
| 733 | } | 740 | } |
| 734 | 741 | ||
| 735 | if (efi_memmap_init()) { | 742 | if (efi_memmap_init()) |
| 736 | efi_enabled = 0; | ||
| 737 | return; | 743 | return; |
| 738 | } | 744 | |
| 745 | set_bit(EFI_MEMMAP, &x86_efi_facility); | ||
| 746 | |||
| 739 | #ifdef CONFIG_X86_32 | 747 | #ifdef CONFIG_X86_32 |
| 740 | if (efi_is_native()) { | 748 | if (efi_is_native()) { |
| 741 | x86_platform.get_wallclock = efi_get_time; | 749 | x86_platform.get_wallclock = efi_get_time; |
| @@ -941,7 +949,7 @@ void __init efi_enter_virtual_mode(void) | |||
| 941 | * | 949 | * |
| 942 | * Call EFI services through wrapper functions. | 950 | * Call EFI services through wrapper functions. |
| 943 | */ | 951 | */ |
| 944 | efi.runtime_version = efi_systab.fw_revision; | 952 | efi.runtime_version = efi_systab.hdr.revision; |
| 945 | efi.get_time = virt_efi_get_time; | 953 | efi.get_time = virt_efi_get_time; |
| 946 | efi.set_time = virt_efi_set_time; | 954 | efi.set_time = virt_efi_set_time; |
| 947 | efi.get_wakeup_time = virt_efi_get_wakeup_time; | 955 | efi.get_wakeup_time = virt_efi_get_wakeup_time; |
| @@ -969,6 +977,9 @@ u32 efi_mem_type(unsigned long phys_addr) | |||
| 969 | efi_memory_desc_t *md; | 977 | efi_memory_desc_t *md; |
| 970 | void *p; | 978 | void *p; |
| 971 | 979 | ||
| 980 | if (!efi_enabled(EFI_MEMMAP)) | ||
| 981 | return 0; | ||
| 982 | |||
| 972 | for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { | 983 | for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { |
| 973 | md = p; | 984 | md = p; |
| 974 | if ((md->phys_addr <= phys_addr) && | 985 | if ((md->phys_addr <= phys_addr) && |
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 95fd505dfeb6..2b2003860615 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
| 39 | #include <asm/fixmap.h> | 39 | #include <asm/fixmap.h> |
| 40 | 40 | ||
| 41 | static pgd_t save_pgd __initdata; | 41 | static pgd_t *save_pgd __initdata; |
| 42 | static unsigned long efi_flags __initdata; | 42 | static unsigned long efi_flags __initdata; |
| 43 | 43 | ||
| 44 | static void __init early_code_mapping_set_exec(int executable) | 44 | static void __init early_code_mapping_set_exec(int executable) |
| @@ -61,12 +61,20 @@ static void __init early_code_mapping_set_exec(int executable) | |||
| 61 | void __init efi_call_phys_prelog(void) | 61 | void __init efi_call_phys_prelog(void) |
| 62 | { | 62 | { |
| 63 | unsigned long vaddress; | 63 | unsigned long vaddress; |
| 64 | int pgd; | ||
| 65 | int n_pgds; | ||
| 64 | 66 | ||
| 65 | early_code_mapping_set_exec(1); | 67 | early_code_mapping_set_exec(1); |
| 66 | local_irq_save(efi_flags); | 68 | local_irq_save(efi_flags); |
| 67 | vaddress = (unsigned long)__va(0x0UL); | 69 | |
| 68 | save_pgd = *pgd_offset_k(0x0UL); | 70 | n_pgds = DIV_ROUND_UP((max_pfn << PAGE_SHIFT), PGDIR_SIZE); |
| 69 | set_pgd(pgd_offset_k(0x0UL), *pgd_offset_k(vaddress)); | 71 | save_pgd = kmalloc(n_pgds * sizeof(pgd_t), GFP_KERNEL); |
| 72 | |||
| 73 | for (pgd = 0; pgd < n_pgds; pgd++) { | ||
| 74 | save_pgd[pgd] = *pgd_offset_k(pgd * PGDIR_SIZE); | ||
| 75 | vaddress = (unsigned long)__va(pgd * PGDIR_SIZE); | ||
| 76 | set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress)); | ||
| 77 | } | ||
| 70 | __flush_tlb_all(); | 78 | __flush_tlb_all(); |
| 71 | } | 79 | } |
| 72 | 80 | ||
| @@ -75,7 +83,11 @@ void __init efi_call_phys_epilog(void) | |||
| 75 | /* | 83 | /* |
| 76 | * After the lock is released, the original page table is restored. | 84 | * After the lock is released, the original page table is restored. |
| 77 | */ | 85 | */ |
| 78 | set_pgd(pgd_offset_k(0x0UL), save_pgd); | 86 | int pgd; |
| 87 | int n_pgds = DIV_ROUND_UP((max_pfn << PAGE_SHIFT) , PGDIR_SIZE); | ||
| 88 | for (pgd = 0; pgd < n_pgds; pgd++) | ||
| 89 | set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]); | ||
| 90 | kfree(save_pgd); | ||
| 79 | __flush_tlb_all(); | 91 | __flush_tlb_all(); |
| 80 | local_irq_restore(efi_flags); | 92 | local_irq_restore(efi_flags); |
| 81 | early_code_mapping_set_exec(0); | 93 | early_code_mapping_set_exec(0); |
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index b8b3a37c80cd..dbbdca5f508c 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c | |||
| @@ -1034,7 +1034,8 @@ static int set_distrib_bits(struct cpumask *flush_mask, struct bau_control *bcp, | |||
| 1034 | * globally purge translation cache of a virtual address or all TLB's | 1034 | * globally purge translation cache of a virtual address or all TLB's |
| 1035 | * @cpumask: mask of all cpu's in which the address is to be removed | 1035 | * @cpumask: mask of all cpu's in which the address is to be removed |
| 1036 | * @mm: mm_struct containing virtual address range | 1036 | * @mm: mm_struct containing virtual address range |
| 1037 | * @va: virtual address to be removed (or TLB_FLUSH_ALL for all TLB's on cpu) | 1037 | * @start: start virtual address to be removed from TLB |
| 1038 | * @end: end virtual address to be remove from TLB | ||
| 1038 | * @cpu: the current cpu | 1039 | * @cpu: the current cpu |
| 1039 | * | 1040 | * |
| 1040 | * This is the entry point for initiating any UV global TLB shootdown. | 1041 | * This is the entry point for initiating any UV global TLB shootdown. |
| @@ -1056,7 +1057,7 @@ static int set_distrib_bits(struct cpumask *flush_mask, struct bau_control *bcp, | |||
| 1056 | */ | 1057 | */ |
| 1057 | const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, | 1058 | const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, |
| 1058 | struct mm_struct *mm, unsigned long start, | 1059 | struct mm_struct *mm, unsigned long start, |
| 1059 | unsigned end, unsigned int cpu) | 1060 | unsigned long end, unsigned int cpu) |
| 1060 | { | 1061 | { |
| 1061 | int locals = 0; | 1062 | int locals = 0; |
| 1062 | int remotes = 0; | 1063 | int remotes = 0; |
| @@ -1113,7 +1114,10 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, | |||
| 1113 | 1114 | ||
| 1114 | record_send_statistics(stat, locals, hubs, remotes, bau_desc); | 1115 | record_send_statistics(stat, locals, hubs, remotes, bau_desc); |
| 1115 | 1116 | ||
| 1116 | bau_desc->payload.address = start; | 1117 | if (!end || (end - start) <= PAGE_SIZE) |
| 1118 | bau_desc->payload.address = start; | ||
| 1119 | else | ||
| 1120 | bau_desc->payload.address = TLB_FLUSH_ALL; | ||
| 1117 | bau_desc->payload.sending_cpu = cpu; | 1121 | bau_desc->payload.sending_cpu = cpu; |
| 1118 | /* | 1122 | /* |
| 1119 | * uv_flush_send_and_wait returns 0 if all cpu's were messaged, | 1123 | * uv_flush_send_and_wait returns 0 if all cpu's were messaged, |
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 5a1847d61930..79d67bd507fa 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c | |||
| @@ -814,12 +814,14 @@ int main(int argc, char **argv) | |||
| 814 | read_relocs(fp); | 814 | read_relocs(fp); |
| 815 | if (show_absolute_syms) { | 815 | if (show_absolute_syms) { |
| 816 | print_absolute_symbols(); | 816 | print_absolute_symbols(); |
| 817 | return 0; | 817 | goto out; |
| 818 | } | 818 | } |
| 819 | if (show_absolute_relocs) { | 819 | if (show_absolute_relocs) { |
| 820 | print_absolute_relocs(); | 820 | print_absolute_relocs(); |
| 821 | return 0; | 821 | goto out; |
| 822 | } | 822 | } |
| 823 | emit_relocs(as_text, use_real_mode); | 823 | emit_relocs(as_text, use_real_mode); |
| 824 | out: | ||
| 825 | fclose(fp); | ||
| 824 | return 0; | 826 | return 0; |
| 825 | } | 827 | } |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 4f7d2599b484..34bc4cee8887 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -432,13 +432,6 @@ static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */ | |||
| 432 | play_dead_common(); | 432 | play_dead_common(); |
| 433 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); | 433 | HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); |
| 434 | cpu_bringup(); | 434 | cpu_bringup(); |
| 435 | /* | ||
| 436 | * Balance out the preempt calls - as we are running in cpu_idle | ||
| 437 | * loop which has been called at bootup from cpu_bringup_and_idle. | ||
| 438 | * The cpucpu_bringup_and_idle called cpu_bringup which made a | ||
| 439 | * preempt_disable() So this preempt_enable will balance it out. | ||
| 440 | */ | ||
| 441 | preempt_enable(); | ||
| 442 | } | 435 | } |
| 443 | 436 | ||
| 444 | #else /* !CONFIG_HOTPLUG_CPU */ | 437 | #else /* !CONFIG_HOTPLUG_CPU */ |
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index 00a783661d0b..46f80e2c92f7 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c | |||
| @@ -590,6 +590,9 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr, | |||
| 590 | if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 && | 590 | if (bit_width == 32 && bit_offset == 0 && (*paddr & 0x03) == 0 && |
| 591 | *access_bit_width < 32) | 591 | *access_bit_width < 32) |
| 592 | *access_bit_width = 32; | 592 | *access_bit_width = 32; |
| 593 | else if (bit_width == 64 && bit_offset == 0 && (*paddr & 0x07) == 0 && | ||
| 594 | *access_bit_width < 64) | ||
| 595 | *access_bit_width = 64; | ||
| 593 | 596 | ||
| 594 | if ((bit_width + bit_offset) > *access_bit_width) { | 597 | if ((bit_width + bit_offset) > *access_bit_width) { |
| 595 | pr_warning(FW_BUG APEI_PFX | 598 | pr_warning(FW_BUG APEI_PFX |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 3ff267861541..bd22f8667eed 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -250,7 +250,7 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) | |||
| 250 | return acpi_rsdp; | 250 | return acpi_rsdp; |
| 251 | #endif | 251 | #endif |
| 252 | 252 | ||
| 253 | if (efi_enabled) { | 253 | if (efi_enabled(EFI_CONFIG_TABLES)) { |
| 254 | if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) | 254 | if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) |
| 255 | return efi.acpi20; | 255 | return efi.acpi20; |
| 256 | else if (efi.acpi != EFI_INVALID_TABLE_ADDR) | 256 | else if (efi.acpi != EFI_INVALID_TABLE_ADDR) |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f1a5da44591d..ed9a1cc690be 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -958,6 +958,9 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr) | |||
| 958 | return -EINVAL; | 958 | return -EINVAL; |
| 959 | } | 959 | } |
| 960 | 960 | ||
| 961 | if (!dev) | ||
| 962 | return -EINVAL; | ||
| 963 | |||
| 961 | dev->cpu = pr->id; | 964 | dev->cpu = pr->id; |
| 962 | 965 | ||
| 963 | if (max_cstate == 0) | 966 | if (max_cstate == 0) |
| @@ -1149,6 +1152,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
| 1149 | } | 1152 | } |
| 1150 | 1153 | ||
| 1151 | /* Populate Updated C-state information */ | 1154 | /* Populate Updated C-state information */ |
| 1155 | acpi_processor_get_power_info(pr); | ||
| 1152 | acpi_processor_setup_cpuidle_states(pr); | 1156 | acpi_processor_setup_cpuidle_states(pr); |
| 1153 | 1157 | ||
| 1154 | /* Enable all cpuidle devices */ | 1158 | /* Enable all cpuidle devices */ |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 836bfe069042..53e7ac9403a7 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -340,6 +340,13 @@ static void amd_fixup_frequency(struct acpi_processor_px *px, int i) | |||
| 340 | if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10) | 340 | if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10) |
| 341 | || boot_cpu_data.x86 == 0x11) { | 341 | || boot_cpu_data.x86 == 0x11) { |
| 342 | rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi); | 342 | rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi); |
| 343 | /* | ||
| 344 | * MSR C001_0064+: | ||
| 345 | * Bit 63: PstateEn. Read-write. If set, the P-state is valid. | ||
| 346 | */ | ||
| 347 | if (!(hi & BIT(31))) | ||
| 348 | return; | ||
| 349 | |||
| 343 | fid = lo & 0x3f; | 350 | fid = lo & 0x3f; |
| 344 | did = (lo >> 6) & 7; | 351 | did = (lo >> 6) & 7; |
| 345 | if (boot_cpu_data.x86 == 0x10) | 352 | if (boot_cpu_data.x86 == 0x10) |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 7862d17976b7..497912732566 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | enum { | 54 | enum { |
| 55 | AHCI_PCI_BAR_STA2X11 = 0, | 55 | AHCI_PCI_BAR_STA2X11 = 0, |
| 56 | AHCI_PCI_BAR_ENMOTUS = 2, | ||
| 56 | AHCI_PCI_BAR_STANDARD = 5, | 57 | AHCI_PCI_BAR_STANDARD = 5, |
| 57 | }; | 58 | }; |
| 58 | 59 | ||
| @@ -410,6 +411,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { | |||
| 410 | { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */ | 411 | { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */ |
| 411 | { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */ | 412 | { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */ |
| 412 | 413 | ||
| 414 | /* Enmotus */ | ||
| 415 | { PCI_DEVICE(0x1c44, 0x8000), board_ahci }, | ||
| 416 | |||
| 413 | /* Generic, PCI class code for AHCI */ | 417 | /* Generic, PCI class code for AHCI */ |
| 414 | { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, | 418 | { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, |
| 415 | PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, | 419 | PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, |
| @@ -1098,9 +1102,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1098 | dev_info(&pdev->dev, | 1102 | dev_info(&pdev->dev, |
| 1099 | "PDC42819 can only drive SATA devices with this driver\n"); | 1103 | "PDC42819 can only drive SATA devices with this driver\n"); |
| 1100 | 1104 | ||
| 1101 | /* The Connext uses non-standard BAR */ | 1105 | /* Both Connext and Enmotus devices use non-standard BARs */ |
| 1102 | if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06) | 1106 | if (pdev->vendor == PCI_VENDOR_ID_STMICRO && pdev->device == 0xCC06) |
| 1103 | ahci_pci_bar = AHCI_PCI_BAR_STA2X11; | 1107 | ahci_pci_bar = AHCI_PCI_BAR_STA2X11; |
| 1108 | else if (pdev->vendor == 0x1c44 && pdev->device == 0x8000) | ||
| 1109 | ahci_pci_bar = AHCI_PCI_BAR_ENMOTUS; | ||
| 1104 | 1110 | ||
| 1105 | /* acquire resources */ | 1111 | /* acquire resources */ |
| 1106 | rc = pcim_enable_device(pdev); | 1112 | rc = pcim_enable_device(pdev); |
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 320712a7b9ea..6cd7805e47ca 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c | |||
| @@ -1951,13 +1951,13 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) | |||
| 1951 | /* Use the nominal value 10 ms if the read MDAT is zero, | 1951 | /* Use the nominal value 10 ms if the read MDAT is zero, |
| 1952 | * the nominal value of DETO is 20 ms. | 1952 | * the nominal value of DETO is 20 ms. |
| 1953 | */ | 1953 | */ |
| 1954 | if (dev->sata_settings[ATA_LOG_DEVSLP_VALID] & | 1954 | if (dev->devslp_timing[ATA_LOG_DEVSLP_VALID] & |
| 1955 | ATA_LOG_DEVSLP_VALID_MASK) { | 1955 | ATA_LOG_DEVSLP_VALID_MASK) { |
| 1956 | mdat = dev->sata_settings[ATA_LOG_DEVSLP_MDAT] & | 1956 | mdat = dev->devslp_timing[ATA_LOG_DEVSLP_MDAT] & |
| 1957 | ATA_LOG_DEVSLP_MDAT_MASK; | 1957 | ATA_LOG_DEVSLP_MDAT_MASK; |
| 1958 | if (!mdat) | 1958 | if (!mdat) |
| 1959 | mdat = 10; | 1959 | mdat = 10; |
| 1960 | deto = dev->sata_settings[ATA_LOG_DEVSLP_DETO]; | 1960 | deto = dev->devslp_timing[ATA_LOG_DEVSLP_DETO]; |
| 1961 | if (!deto) | 1961 | if (!deto) |
| 1962 | deto = 20; | 1962 | deto = 20; |
| 1963 | } else { | 1963 | } else { |
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 9e8b99af400d..46cd3f4c6aaa 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -2325,24 +2325,28 @@ int ata_dev_configure(struct ata_device *dev) | |||
| 2325 | } | 2325 | } |
| 2326 | } | 2326 | } |
| 2327 | 2327 | ||
| 2328 | /* check and mark DevSlp capability */ | 2328 | /* Check and mark DevSlp capability. Get DevSlp timing variables |
| 2329 | if (ata_id_has_devslp(dev->id)) | 2329 | * from SATA Settings page of Identify Device Data Log. |
| 2330 | dev->flags |= ATA_DFLAG_DEVSLP; | ||
| 2331 | |||
| 2332 | /* Obtain SATA Settings page from Identify Device Data Log, | ||
| 2333 | * which contains DevSlp timing variables etc. | ||
| 2334 | * Exclude old devices with ata_id_has_ncq() | ||
| 2335 | */ | 2330 | */ |
| 2336 | if (ata_id_has_ncq(dev->id)) { | 2331 | if (ata_id_has_devslp(dev->id)) { |
| 2332 | u8 sata_setting[ATA_SECT_SIZE]; | ||
| 2333 | int i, j; | ||
| 2334 | |||
| 2335 | dev->flags |= ATA_DFLAG_DEVSLP; | ||
| 2337 | err_mask = ata_read_log_page(dev, | 2336 | err_mask = ata_read_log_page(dev, |
| 2338 | ATA_LOG_SATA_ID_DEV_DATA, | 2337 | ATA_LOG_SATA_ID_DEV_DATA, |
| 2339 | ATA_LOG_SATA_SETTINGS, | 2338 | ATA_LOG_SATA_SETTINGS, |
| 2340 | dev->sata_settings, | 2339 | sata_setting, |
| 2341 | 1); | 2340 | 1); |
| 2342 | if (err_mask) | 2341 | if (err_mask) |
| 2343 | ata_dev_dbg(dev, | 2342 | ata_dev_dbg(dev, |
| 2344 | "failed to get Identify Device Data, Emask 0x%x\n", | 2343 | "failed to get Identify Device Data, Emask 0x%x\n", |
| 2345 | err_mask); | 2344 | err_mask); |
| 2345 | else | ||
| 2346 | for (i = 0; i < ATA_LOG_DEVSLP_SIZE; i++) { | ||
| 2347 | j = ATA_LOG_DEVSLP_OFFSET + i; | ||
| 2348 | dev->devslp_timing[i] = sata_setting[j]; | ||
| 2349 | } | ||
| 2346 | } | 2350 | } |
| 2347 | 2351 | ||
| 2348 | dev->cdb_len = 16; | 2352 | dev->cdb_len = 16; |
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index bf039b0e97b7..bcf4437214f5 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
| @@ -2094,7 +2094,7 @@ static unsigned int ata_eh_speed_down(struct ata_device *dev, | |||
| 2094 | */ | 2094 | */ |
| 2095 | static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc) | 2095 | static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc) |
| 2096 | { | 2096 | { |
| 2097 | if (qc->flags & AC_ERR_MEDIA) | 2097 | if (qc->err_mask & AC_ERR_MEDIA) |
| 2098 | return 0; /* don't retry media errors */ | 2098 | return 0; /* don't retry media errors */ |
| 2099 | if (qc->flags & ATA_QCFLAG_IO) | 2099 | if (qc->flags & ATA_QCFLAG_IO) |
| 2100 | return 1; /* otherwise retry anything from fs stack */ | 2100 | return 1; /* otherwise retry anything from fs stack */ |
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 46a213a596e2..d9a6c94ce423 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c | |||
| @@ -121,8 +121,6 @@ static unsigned int regmap_debugfs_get_dump_start(struct regmap *map, | |||
| 121 | c->max = p - 1; | 121 | c->max = p - 1; |
| 122 | list_add_tail(&c->list, | 122 | list_add_tail(&c->list, |
| 123 | &map->debugfs_off_cache); | 123 | &map->debugfs_off_cache); |
| 124 | } else { | ||
| 125 | return base; | ||
| 126 | } | 124 | } |
| 127 | 125 | ||
| 128 | /* | 126 | /* |
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 42d5cb0f503f..f00b059c057a 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
| @@ -1106,7 +1106,7 @@ EXPORT_SYMBOL_GPL(regmap_raw_write); | |||
| 1106 | * @val_count: Number of registers to write | 1106 | * @val_count: Number of registers to write |
| 1107 | * | 1107 | * |
| 1108 | * This function is intended to be used for writing a large block of | 1108 | * This function is intended to be used for writing a large block of |
| 1109 | * data to be device either in single transfer or multiple transfer. | 1109 | * data to the device either in single transfer or multiple transfer. |
| 1110 | * | 1110 | * |
| 1111 | * A value of zero will be returned on success, a negative errno will | 1111 | * A value of zero will be returned on success, a negative errno will |
| 1112 | * be returned in error cases. | 1112 | * be returned in error cases. |
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 9d8409c02082..8ad21a25bc0d 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
| @@ -889,6 +889,7 @@ static void virtblk_remove(struct virtio_device *vdev) | |||
| 889 | { | 889 | { |
| 890 | struct virtio_blk *vblk = vdev->priv; | 890 | struct virtio_blk *vblk = vdev->priv; |
| 891 | int index = vblk->index; | 891 | int index = vblk->index; |
| 892 | int refc; | ||
| 892 | 893 | ||
| 893 | /* Prevent config work handler from accessing the device. */ | 894 | /* Prevent config work handler from accessing the device. */ |
| 894 | mutex_lock(&vblk->config_lock); | 895 | mutex_lock(&vblk->config_lock); |
| @@ -903,11 +904,15 @@ static void virtblk_remove(struct virtio_device *vdev) | |||
| 903 | 904 | ||
| 904 | flush_work(&vblk->config_work); | 905 | flush_work(&vblk->config_work); |
| 905 | 906 | ||
| 907 | refc = atomic_read(&disk_to_dev(vblk->disk)->kobj.kref.refcount); | ||
| 906 | put_disk(vblk->disk); | 908 | put_disk(vblk->disk); |
| 907 | mempool_destroy(vblk->pool); | 909 | mempool_destroy(vblk->pool); |
| 908 | vdev->config->del_vqs(vdev); | 910 | vdev->config->del_vqs(vdev); |
| 909 | kfree(vblk); | 911 | kfree(vblk); |
| 910 | ida_simple_remove(&vd_index_ida, index); | 912 | |
| 913 | /* Only free device id if we don't have any users */ | ||
| 914 | if (refc == 1) | ||
| 915 | ida_simple_remove(&vd_index_ida, index); | ||
| 911 | } | 916 | } |
| 912 | 917 | ||
| 913 | #ifdef CONFIG_PM | 918 | #ifdef CONFIG_PM |
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index b00000e8aef6..33c9a44a9678 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c | |||
| @@ -77,10 +77,15 @@ static struct usb_device_id ath3k_table[] = { | |||
| 77 | { USB_DEVICE(0x0CF3, 0x311D) }, | 77 | { USB_DEVICE(0x0CF3, 0x311D) }, |
| 78 | { USB_DEVICE(0x13d3, 0x3375) }, | 78 | { USB_DEVICE(0x13d3, 0x3375) }, |
| 79 | { USB_DEVICE(0x04CA, 0x3005) }, | 79 | { USB_DEVICE(0x04CA, 0x3005) }, |
| 80 | { USB_DEVICE(0x04CA, 0x3006) }, | ||
| 81 | { USB_DEVICE(0x04CA, 0x3008) }, | ||
| 80 | { USB_DEVICE(0x13d3, 0x3362) }, | 82 | { USB_DEVICE(0x13d3, 0x3362) }, |
| 81 | { USB_DEVICE(0x0CF3, 0xE004) }, | 83 | { USB_DEVICE(0x0CF3, 0xE004) }, |
| 82 | { USB_DEVICE(0x0930, 0x0219) }, | 84 | { USB_DEVICE(0x0930, 0x0219) }, |
| 83 | { USB_DEVICE(0x0489, 0xe057) }, | 85 | { USB_DEVICE(0x0489, 0xe057) }, |
| 86 | { USB_DEVICE(0x13d3, 0x3393) }, | ||
| 87 | { USB_DEVICE(0x0489, 0xe04e) }, | ||
| 88 | { USB_DEVICE(0x0489, 0xe056) }, | ||
| 84 | 89 | ||
| 85 | /* Atheros AR5BBU12 with sflash firmware */ | 90 | /* Atheros AR5BBU12 with sflash firmware */ |
| 86 | { USB_DEVICE(0x0489, 0xE02C) }, | 91 | { USB_DEVICE(0x0489, 0xE02C) }, |
| @@ -104,10 +109,15 @@ static struct usb_device_id ath3k_blist_tbl[] = { | |||
| 104 | { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, | 109 | { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 }, |
| 105 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | 110 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, |
| 106 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, | 111 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, |
| 112 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, | ||
| 113 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | ||
| 107 | { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, | 114 | { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, |
| 108 | { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, | 115 | { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, |
| 109 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, | 116 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, |
| 110 | { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, | 117 | { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, |
| 118 | { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, | ||
| 119 | { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, | ||
| 120 | { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, | ||
| 111 | 121 | ||
| 112 | /* Atheros AR5BBU22 with sflash firmware */ | 122 | /* Atheros AR5BBU22 with sflash firmware */ |
| 113 | { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, | 123 | { USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 }, |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index a1d4ede5b892..7e351e345476 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
| @@ -135,10 +135,15 @@ static struct usb_device_id blacklist_table[] = { | |||
| 135 | { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, | 135 | { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, |
| 136 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, | 136 | { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, |
| 137 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, | 137 | { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, |
| 138 | { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, | ||
| 139 | { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, | ||
| 138 | { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, | 140 | { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, |
| 139 | { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, | 141 | { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, |
| 140 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, | 142 | { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, |
| 141 | { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, | 143 | { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, |
| 144 | { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, | ||
| 145 | { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, | ||
| 146 | { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, | ||
| 142 | 147 | ||
| 143 | /* Atheros AR5BBU12 with sflash firmware */ | 148 | /* Atheros AR5BBU12 with sflash firmware */ |
| 144 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, | 149 | { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, |
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c index ff004578a119..9dd2551a0a41 100644 --- a/drivers/clk/mvebu/clk-cpu.c +++ b/drivers/clk/mvebu/clk-cpu.c | |||
| @@ -124,7 +124,7 @@ void __init of_cpu_clk_setup(struct device_node *node) | |||
| 124 | 124 | ||
| 125 | clks = kzalloc(ncpus * sizeof(*clks), GFP_KERNEL); | 125 | clks = kzalloc(ncpus * sizeof(*clks), GFP_KERNEL); |
| 126 | if (WARN_ON(!clks)) | 126 | if (WARN_ON(!clks)) |
| 127 | return; | 127 | goto clks_out; |
| 128 | 128 | ||
| 129 | for_each_node_by_type(dn, "cpu") { | 129 | for_each_node_by_type(dn, "cpu") { |
| 130 | struct clk_init_data init; | 130 | struct clk_init_data init; |
| @@ -134,11 +134,11 @@ void __init of_cpu_clk_setup(struct device_node *node) | |||
| 134 | int cpu, err; | 134 | int cpu, err; |
| 135 | 135 | ||
| 136 | if (WARN_ON(!clk_name)) | 136 | if (WARN_ON(!clk_name)) |
| 137 | return; | 137 | goto bail_out; |
| 138 | 138 | ||
| 139 | err = of_property_read_u32(dn, "reg", &cpu); | 139 | err = of_property_read_u32(dn, "reg", &cpu); |
| 140 | if (WARN_ON(err)) | 140 | if (WARN_ON(err)) |
| 141 | return; | 141 | goto bail_out; |
| 142 | 142 | ||
| 143 | sprintf(clk_name, "cpu%d", cpu); | 143 | sprintf(clk_name, "cpu%d", cpu); |
| 144 | parent_clk = of_clk_get(node, 0); | 144 | parent_clk = of_clk_get(node, 0); |
| @@ -167,6 +167,9 @@ void __init of_cpu_clk_setup(struct device_node *node) | |||
| 167 | return; | 167 | return; |
| 168 | bail_out: | 168 | bail_out: |
| 169 | kfree(clks); | 169 | kfree(clks); |
| 170 | while(ncpus--) | ||
| 171 | kfree(cpuclk[ncpus].clk_name); | ||
| 172 | clks_out: | ||
| 170 | kfree(cpuclk); | 173 | kfree(cpuclk); |
| 171 | } | 174 | } |
| 172 | 175 | ||
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index 934854ae5eb4..7227cd734042 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 | |||
| @@ -106,7 +106,7 @@ config X86_POWERNOW_K7_ACPI | |||
| 106 | config X86_POWERNOW_K8 | 106 | config X86_POWERNOW_K8 |
| 107 | tristate "AMD Opteron/Athlon64 PowerNow!" | 107 | tristate "AMD Opteron/Athlon64 PowerNow!" |
| 108 | select CPU_FREQ_TABLE | 108 | select CPU_FREQ_TABLE |
| 109 | depends on ACPI && ACPI_PROCESSOR | 109 | depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ |
| 110 | help | 110 | help |
| 111 | This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. | 111 | This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. |
| 112 | Support for K10 and newer processors is now in acpi-cpufreq. | 112 | Support for K10 and newer processors is now in acpi-cpufreq. |
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 0d048f6a2b23..7b0d49d78c61 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c | |||
| @@ -1030,4 +1030,11 @@ MODULE_PARM_DESC(acpi_pstate_strict, | |||
| 1030 | late_initcall(acpi_cpufreq_init); | 1030 | late_initcall(acpi_cpufreq_init); |
| 1031 | module_exit(acpi_cpufreq_exit); | 1031 | module_exit(acpi_cpufreq_exit); |
| 1032 | 1032 | ||
| 1033 | static const struct x86_cpu_id acpi_cpufreq_ids[] = { | ||
| 1034 | X86_FEATURE_MATCH(X86_FEATURE_ACPI), | ||
| 1035 | X86_FEATURE_MATCH(X86_FEATURE_HW_PSTATE), | ||
| 1036 | {} | ||
| 1037 | }; | ||
| 1038 | MODULE_DEVICE_TABLE(x86cpu, acpi_cpufreq_ids); | ||
| 1039 | |||
| 1033 | MODULE_ALIAS("acpi"); | 1040 | MODULE_ALIAS("acpi"); |
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index 52bf36d599f5..debc5a7c8db6 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c | |||
| @@ -71,12 +71,15 @@ static int cpu0_set_target(struct cpufreq_policy *policy, | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | if (cpu_reg) { | 73 | if (cpu_reg) { |
| 74 | rcu_read_lock(); | ||
| 74 | opp = opp_find_freq_ceil(cpu_dev, &freq_Hz); | 75 | opp = opp_find_freq_ceil(cpu_dev, &freq_Hz); |
| 75 | if (IS_ERR(opp)) { | 76 | if (IS_ERR(opp)) { |
| 77 | rcu_read_unlock(); | ||
| 76 | pr_err("failed to find OPP for %ld\n", freq_Hz); | 78 | pr_err("failed to find OPP for %ld\n", freq_Hz); |
| 77 | return PTR_ERR(opp); | 79 | return PTR_ERR(opp); |
| 78 | } | 80 | } |
| 79 | volt = opp_get_voltage(opp); | 81 | volt = opp_get_voltage(opp); |
| 82 | rcu_read_unlock(); | ||
| 80 | tol = volt * voltage_tolerance / 100; | 83 | tol = volt * voltage_tolerance / 100; |
| 81 | volt_old = regulator_get_voltage(cpu_reg); | 84 | volt_old = regulator_get_voltage(cpu_reg); |
| 82 | } | 85 | } |
| @@ -236,12 +239,14 @@ static int cpu0_cpufreq_driver_init(void) | |||
| 236 | */ | 239 | */ |
| 237 | for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) | 240 | for (i = 0; freq_table[i].frequency != CPUFREQ_TABLE_END; i++) |
| 238 | ; | 241 | ; |
| 242 | rcu_read_lock(); | ||
| 239 | opp = opp_find_freq_exact(cpu_dev, | 243 | opp = opp_find_freq_exact(cpu_dev, |
| 240 | freq_table[0].frequency * 1000, true); | 244 | freq_table[0].frequency * 1000, true); |
| 241 | min_uV = opp_get_voltage(opp); | 245 | min_uV = opp_get_voltage(opp); |
| 242 | opp = opp_find_freq_exact(cpu_dev, | 246 | opp = opp_find_freq_exact(cpu_dev, |
| 243 | freq_table[i-1].frequency * 1000, true); | 247 | freq_table[i-1].frequency * 1000, true); |
| 244 | max_uV = opp_get_voltage(opp); | 248 | max_uV = opp_get_voltage(opp); |
| 249 | rcu_read_unlock(); | ||
| 245 | ret = regulator_set_voltage_time(cpu_reg, min_uV, max_uV); | 250 | ret = regulator_set_voltage_time(cpu_reg, min_uV, max_uV); |
| 246 | if (ret > 0) | 251 | if (ret > 0) |
| 247 | transition_latency += ret * 1000; | 252 | transition_latency += ret * 1000; |
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index 1f3417a8322d..97102b05843f 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c | |||
| @@ -110,13 +110,16 @@ static int omap_target(struct cpufreq_policy *policy, | |||
| 110 | freq = ret; | 110 | freq = ret; |
| 111 | 111 | ||
| 112 | if (mpu_reg) { | 112 | if (mpu_reg) { |
| 113 | rcu_read_lock(); | ||
| 113 | opp = opp_find_freq_ceil(mpu_dev, &freq); | 114 | opp = opp_find_freq_ceil(mpu_dev, &freq); |
| 114 | if (IS_ERR(opp)) { | 115 | if (IS_ERR(opp)) { |
| 116 | rcu_read_unlock(); | ||
| 115 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", | 117 | dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", |
| 116 | __func__, freqs.new); | 118 | __func__, freqs.new); |
| 117 | return -EINVAL; | 119 | return -EINVAL; |
| 118 | } | 120 | } |
| 119 | volt = opp_get_voltage(opp); | 121 | volt = opp_get_voltage(opp); |
| 122 | rcu_read_unlock(); | ||
| 120 | tol = volt * OPP_TOLERANCE / 100; | 123 | tol = volt * OPP_TOLERANCE / 100; |
| 121 | volt_old = regulator_get_voltage(mpu_reg); | 124 | volt_old = regulator_get_voltage(mpu_reg); |
| 122 | } | 125 | } |
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 53766f39aadd..3b367973a802 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c | |||
| @@ -994,6 +994,11 @@ module_exit(devfreq_exit); | |||
| 994 | * @freq: The frequency given to target function | 994 | * @freq: The frequency given to target function |
| 995 | * @flags: Flags handed from devfreq framework. | 995 | * @flags: Flags handed from devfreq framework. |
| 996 | * | 996 | * |
| 997 | * Locking: This function must be called under rcu_read_lock(). opp is a rcu | ||
| 998 | * protected pointer. The reason for the same is that the opp pointer which is | ||
| 999 | * returned will remain valid for use with opp_get_{voltage, freq} only while | ||
| 1000 | * under the locked area. The pointer returned must be used prior to unlocking | ||
| 1001 | * with rcu_read_unlock() to maintain the integrity of the pointer. | ||
| 997 | */ | 1002 | */ |
| 998 | struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, | 1003 | struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, |
| 999 | u32 flags) | 1004 | u32 flags) |
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c index 80c745e83082..46d94e9e95b5 100644 --- a/drivers/devfreq/exynos4_bus.c +++ b/drivers/devfreq/exynos4_bus.c | |||
| @@ -73,6 +73,16 @@ enum busclk_level_idx { | |||
| 73 | #define EX4210_LV_NUM (LV_2 + 1) | 73 | #define EX4210_LV_NUM (LV_2 + 1) |
| 74 | #define EX4x12_LV_NUM (LV_4 + 1) | 74 | #define EX4x12_LV_NUM (LV_4 + 1) |
| 75 | 75 | ||
| 76 | /** | ||
| 77 | * struct busfreq_opp_info - opp information for bus | ||
| 78 | * @rate: Frequency in hertz | ||
| 79 | * @volt: Voltage in microvolts corresponding to this OPP | ||
| 80 | */ | ||
| 81 | struct busfreq_opp_info { | ||
| 82 | unsigned long rate; | ||
| 83 | unsigned long volt; | ||
| 84 | }; | ||
| 85 | |||
| 76 | struct busfreq_data { | 86 | struct busfreq_data { |
| 77 | enum exynos4_busf_type type; | 87 | enum exynos4_busf_type type; |
| 78 | struct device *dev; | 88 | struct device *dev; |
| @@ -80,7 +90,7 @@ struct busfreq_data { | |||
| 80 | bool disabled; | 90 | bool disabled; |
| 81 | struct regulator *vdd_int; | 91 | struct regulator *vdd_int; |
| 82 | struct regulator *vdd_mif; /* Exynos4412/4212 only */ | 92 | struct regulator *vdd_mif; /* Exynos4412/4212 only */ |
| 83 | struct opp *curr_opp; | 93 | struct busfreq_opp_info curr_oppinfo; |
| 84 | struct exynos4_ppmu dmc[2]; | 94 | struct exynos4_ppmu dmc[2]; |
| 85 | 95 | ||
| 86 | struct notifier_block pm_notifier; | 96 | struct notifier_block pm_notifier; |
| @@ -296,13 +306,14 @@ static unsigned int exynos4x12_clkdiv_sclkip[][3] = { | |||
| 296 | }; | 306 | }; |
| 297 | 307 | ||
| 298 | 308 | ||
| 299 | static int exynos4210_set_busclk(struct busfreq_data *data, struct opp *opp) | 309 | static int exynos4210_set_busclk(struct busfreq_data *data, |
| 310 | struct busfreq_opp_info *oppi) | ||
| 300 | { | 311 | { |
| 301 | unsigned int index; | 312 | unsigned int index; |
| 302 | unsigned int tmp; | 313 | unsigned int tmp; |
| 303 | 314 | ||
| 304 | for (index = LV_0; index < EX4210_LV_NUM; index++) | 315 | for (index = LV_0; index < EX4210_LV_NUM; index++) |
| 305 | if (opp_get_freq(opp) == exynos4210_busclk_table[index].clk) | 316 | if (oppi->rate == exynos4210_busclk_table[index].clk) |
| 306 | break; | 317 | break; |
| 307 | 318 | ||
| 308 | if (index == EX4210_LV_NUM) | 319 | if (index == EX4210_LV_NUM) |
| @@ -361,13 +372,14 @@ static int exynos4210_set_busclk(struct busfreq_data *data, struct opp *opp) | |||
| 361 | return 0; | 372 | return 0; |
| 362 | } | 373 | } |
| 363 | 374 | ||
| 364 | static int exynos4x12_set_busclk(struct busfreq_data *data, struct opp *opp) | 375 | static int exynos4x12_set_busclk(struct busfreq_data *data, |
| 376 | struct busfreq_opp_info *oppi) | ||
| 365 | { | 377 | { |
| 366 | unsigned int index; | 378 | unsigned int index; |
| 367 | unsigned int tmp; | 379 | unsigned int tmp; |
| 368 | 380 | ||
| 369 | for (index = LV_0; index < EX4x12_LV_NUM; index++) | 381 | for (index = LV_0; index < EX4x12_LV_NUM; index++) |
| 370 | if (opp_get_freq(opp) == exynos4x12_mifclk_table[index].clk) | 382 | if (oppi->rate == exynos4x12_mifclk_table[index].clk) |
| 371 | break; | 383 | break; |
| 372 | 384 | ||
| 373 | if (index == EX4x12_LV_NUM) | 385 | if (index == EX4x12_LV_NUM) |
| @@ -576,11 +588,12 @@ static int exynos4x12_get_intspec(unsigned long mifclk) | |||
| 576 | return -EINVAL; | 588 | return -EINVAL; |
| 577 | } | 589 | } |
| 578 | 590 | ||
| 579 | static int exynos4_bus_setvolt(struct busfreq_data *data, struct opp *opp, | 591 | static int exynos4_bus_setvolt(struct busfreq_data *data, |
| 580 | struct opp *oldopp) | 592 | struct busfreq_opp_info *oppi, |
| 593 | struct busfreq_opp_info *oldoppi) | ||
| 581 | { | 594 | { |
| 582 | int err = 0, tmp; | 595 | int err = 0, tmp; |
| 583 | unsigned long volt = opp_get_voltage(opp); | 596 | unsigned long volt = oppi->volt; |
| 584 | 597 | ||
| 585 | switch (data->type) { | 598 | switch (data->type) { |
| 586 | case TYPE_BUSF_EXYNOS4210: | 599 | case TYPE_BUSF_EXYNOS4210: |
| @@ -595,11 +608,11 @@ static int exynos4_bus_setvolt(struct busfreq_data *data, struct opp *opp, | |||
| 595 | if (err) | 608 | if (err) |
| 596 | break; | 609 | break; |
| 597 | 610 | ||
| 598 | tmp = exynos4x12_get_intspec(opp_get_freq(opp)); | 611 | tmp = exynos4x12_get_intspec(oppi->rate); |
| 599 | if (tmp < 0) { | 612 | if (tmp < 0) { |
| 600 | err = tmp; | 613 | err = tmp; |
| 601 | regulator_set_voltage(data->vdd_mif, | 614 | regulator_set_voltage(data->vdd_mif, |
| 602 | opp_get_voltage(oldopp), | 615 | oldoppi->volt, |
| 603 | MAX_SAFEVOLT); | 616 | MAX_SAFEVOLT); |
| 604 | break; | 617 | break; |
| 605 | } | 618 | } |
| @@ -609,7 +622,7 @@ static int exynos4_bus_setvolt(struct busfreq_data *data, struct opp *opp, | |||
| 609 | /* Try to recover */ | 622 | /* Try to recover */ |
| 610 | if (err) | 623 | if (err) |
| 611 | regulator_set_voltage(data->vdd_mif, | 624 | regulator_set_voltage(data->vdd_mif, |
| 612 | opp_get_voltage(oldopp), | 625 | oldoppi->volt, |
| 613 | MAX_SAFEVOLT); | 626 | MAX_SAFEVOLT); |
| 614 | break; | 627 | break; |
| 615 | default: | 628 | default: |
| @@ -626,17 +639,26 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
| 626 | struct platform_device *pdev = container_of(dev, struct platform_device, | 639 | struct platform_device *pdev = container_of(dev, struct platform_device, |
| 627 | dev); | 640 | dev); |
| 628 | struct busfreq_data *data = platform_get_drvdata(pdev); | 641 | struct busfreq_data *data = platform_get_drvdata(pdev); |
| 629 | struct opp *opp = devfreq_recommended_opp(dev, _freq, flags); | 642 | struct opp *opp; |
| 630 | unsigned long freq = opp_get_freq(opp); | 643 | unsigned long freq; |
| 631 | unsigned long old_freq = opp_get_freq(data->curr_opp); | 644 | unsigned long old_freq = data->curr_oppinfo.rate; |
| 645 | struct busfreq_opp_info new_oppinfo; | ||
| 632 | 646 | ||
| 633 | if (IS_ERR(opp)) | 647 | rcu_read_lock(); |
| 648 | opp = devfreq_recommended_opp(dev, _freq, flags); | ||
| 649 | if (IS_ERR(opp)) { | ||
| 650 | rcu_read_unlock(); | ||
| 634 | return PTR_ERR(opp); | 651 | return PTR_ERR(opp); |
| 652 | } | ||
| 653 | new_oppinfo.rate = opp_get_freq(opp); | ||
| 654 | new_oppinfo.volt = opp_get_voltage(opp); | ||
| 655 | rcu_read_unlock(); | ||
| 656 | freq = new_oppinfo.rate; | ||
| 635 | 657 | ||
| 636 | if (old_freq == freq) | 658 | if (old_freq == freq) |
| 637 | return 0; | 659 | return 0; |
| 638 | 660 | ||
| 639 | dev_dbg(dev, "targetting %lukHz %luuV\n", freq, opp_get_voltage(opp)); | 661 | dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt); |
| 640 | 662 | ||
| 641 | mutex_lock(&data->lock); | 663 | mutex_lock(&data->lock); |
| 642 | 664 | ||
| @@ -644,17 +666,18 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
| 644 | goto out; | 666 | goto out; |
| 645 | 667 | ||
| 646 | if (old_freq < freq) | 668 | if (old_freq < freq) |
| 647 | err = exynos4_bus_setvolt(data, opp, data->curr_opp); | 669 | err = exynos4_bus_setvolt(data, &new_oppinfo, |
| 670 | &data->curr_oppinfo); | ||
| 648 | if (err) | 671 | if (err) |
| 649 | goto out; | 672 | goto out; |
| 650 | 673 | ||
| 651 | if (old_freq != freq) { | 674 | if (old_freq != freq) { |
| 652 | switch (data->type) { | 675 | switch (data->type) { |
| 653 | case TYPE_BUSF_EXYNOS4210: | 676 | case TYPE_BUSF_EXYNOS4210: |
| 654 | err = exynos4210_set_busclk(data, opp); | 677 | err = exynos4210_set_busclk(data, &new_oppinfo); |
| 655 | break; | 678 | break; |
| 656 | case TYPE_BUSF_EXYNOS4x12: | 679 | case TYPE_BUSF_EXYNOS4x12: |
| 657 | err = exynos4x12_set_busclk(data, opp); | 680 | err = exynos4x12_set_busclk(data, &new_oppinfo); |
| 658 | break; | 681 | break; |
| 659 | default: | 682 | default: |
| 660 | err = -EINVAL; | 683 | err = -EINVAL; |
| @@ -664,11 +687,12 @@ static int exynos4_bus_target(struct device *dev, unsigned long *_freq, | |||
| 664 | goto out; | 687 | goto out; |
| 665 | 688 | ||
| 666 | if (old_freq > freq) | 689 | if (old_freq > freq) |
| 667 | err = exynos4_bus_setvolt(data, opp, data->curr_opp); | 690 | err = exynos4_bus_setvolt(data, &new_oppinfo, |
| 691 | &data->curr_oppinfo); | ||
| 668 | if (err) | 692 | if (err) |
| 669 | goto out; | 693 | goto out; |
| 670 | 694 | ||
| 671 | data->curr_opp = opp; | 695 | data->curr_oppinfo = new_oppinfo; |
| 672 | out: | 696 | out: |
| 673 | mutex_unlock(&data->lock); | 697 | mutex_unlock(&data->lock); |
| 674 | return err; | 698 | return err; |
| @@ -702,7 +726,7 @@ static int exynos4_bus_get_dev_status(struct device *dev, | |||
| 702 | 726 | ||
| 703 | exynos4_read_ppmu(data); | 727 | exynos4_read_ppmu(data); |
| 704 | busier_dmc = exynos4_get_busier_dmc(data); | 728 | busier_dmc = exynos4_get_busier_dmc(data); |
| 705 | stat->current_frequency = opp_get_freq(data->curr_opp); | 729 | stat->current_frequency = data->curr_oppinfo.rate; |
| 706 | 730 | ||
| 707 | if (busier_dmc) | 731 | if (busier_dmc) |
| 708 | addr = S5P_VA_DMC1; | 732 | addr = S5P_VA_DMC1; |
| @@ -933,6 +957,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 933 | struct busfreq_data *data = container_of(this, struct busfreq_data, | 957 | struct busfreq_data *data = container_of(this, struct busfreq_data, |
| 934 | pm_notifier); | 958 | pm_notifier); |
| 935 | struct opp *opp; | 959 | struct opp *opp; |
| 960 | struct busfreq_opp_info new_oppinfo; | ||
| 936 | unsigned long maxfreq = ULONG_MAX; | 961 | unsigned long maxfreq = ULONG_MAX; |
| 937 | int err = 0; | 962 | int err = 0; |
| 938 | 963 | ||
| @@ -943,18 +968,29 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 943 | 968 | ||
| 944 | data->disabled = true; | 969 | data->disabled = true; |
| 945 | 970 | ||
| 971 | rcu_read_lock(); | ||
| 946 | opp = opp_find_freq_floor(data->dev, &maxfreq); | 972 | opp = opp_find_freq_floor(data->dev, &maxfreq); |
| 973 | if (IS_ERR(opp)) { | ||
| 974 | rcu_read_unlock(); | ||
| 975 | dev_err(data->dev, "%s: unable to find a min freq\n", | ||
| 976 | __func__); | ||
| 977 | return PTR_ERR(opp); | ||
| 978 | } | ||
| 979 | new_oppinfo.rate = opp_get_freq(opp); | ||
| 980 | new_oppinfo.volt = opp_get_voltage(opp); | ||
| 981 | rcu_read_unlock(); | ||
| 947 | 982 | ||
| 948 | err = exynos4_bus_setvolt(data, opp, data->curr_opp); | 983 | err = exynos4_bus_setvolt(data, &new_oppinfo, |
| 984 | &data->curr_oppinfo); | ||
| 949 | if (err) | 985 | if (err) |
| 950 | goto unlock; | 986 | goto unlock; |
| 951 | 987 | ||
| 952 | switch (data->type) { | 988 | switch (data->type) { |
| 953 | case TYPE_BUSF_EXYNOS4210: | 989 | case TYPE_BUSF_EXYNOS4210: |
| 954 | err = exynos4210_set_busclk(data, opp); | 990 | err = exynos4210_set_busclk(data, &new_oppinfo); |
| 955 | break; | 991 | break; |
| 956 | case TYPE_BUSF_EXYNOS4x12: | 992 | case TYPE_BUSF_EXYNOS4x12: |
| 957 | err = exynos4x12_set_busclk(data, opp); | 993 | err = exynos4x12_set_busclk(data, &new_oppinfo); |
| 958 | break; | 994 | break; |
| 959 | default: | 995 | default: |
| 960 | err = -EINVAL; | 996 | err = -EINVAL; |
| @@ -962,7 +998,7 @@ static int exynos4_busfreq_pm_notifier_event(struct notifier_block *this, | |||
| 962 | if (err) | 998 | if (err) |
| 963 | goto unlock; | 999 | goto unlock; |
| 964 | 1000 | ||
| 965 | data->curr_opp = opp; | 1001 | data->curr_oppinfo = new_oppinfo; |
| 966 | unlock: | 1002 | unlock: |
| 967 | mutex_unlock(&data->lock); | 1003 | mutex_unlock(&data->lock); |
| 968 | if (err) | 1004 | if (err) |
| @@ -1027,13 +1063,17 @@ static int exynos4_busfreq_probe(struct platform_device *pdev) | |||
| 1027 | } | 1063 | } |
| 1028 | } | 1064 | } |
| 1029 | 1065 | ||
| 1066 | rcu_read_lock(); | ||
| 1030 | opp = opp_find_freq_floor(dev, &exynos4_devfreq_profile.initial_freq); | 1067 | opp = opp_find_freq_floor(dev, &exynos4_devfreq_profile.initial_freq); |
| 1031 | if (IS_ERR(opp)) { | 1068 | if (IS_ERR(opp)) { |
| 1069 | rcu_read_unlock(); | ||
| 1032 | dev_err(dev, "Invalid initial frequency %lu kHz.\n", | 1070 | dev_err(dev, "Invalid initial frequency %lu kHz.\n", |
| 1033 | exynos4_devfreq_profile.initial_freq); | 1071 | exynos4_devfreq_profile.initial_freq); |
| 1034 | return PTR_ERR(opp); | 1072 | return PTR_ERR(opp); |
| 1035 | } | 1073 | } |
| 1036 | data->curr_opp = opp; | 1074 | data->curr_oppinfo.rate = opp_get_freq(opp); |
| 1075 | data->curr_oppinfo.volt = opp_get_voltage(opp); | ||
| 1076 | rcu_read_unlock(); | ||
| 1037 | 1077 | ||
| 1038 | platform_set_drvdata(pdev, data); | 1078 | platform_set_drvdata(pdev, data); |
| 1039 | 1079 | ||
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index dbf0e6f8de8a..a7dcf78b1ff8 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
| @@ -684,9 +684,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, | |||
| 684 | break; | 684 | break; |
| 685 | } | 685 | } |
| 686 | 686 | ||
| 687 | imxdmac->hw_chaining = 1; | 687 | imxdmac->hw_chaining = 0; |
| 688 | if (!imxdma_hw_chain(imxdmac)) | 688 | |
| 689 | return -EINVAL; | ||
| 690 | imxdmac->ccr_from_device = (mode | IMX_DMA_TYPE_FIFO) | | 689 | imxdmac->ccr_from_device = (mode | IMX_DMA_TYPE_FIFO) | |
| 691 | ((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) | | 690 | ((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) | |
| 692 | CCR_REN; | 691 | CCR_REN; |
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index e5fc944de1f0..3e9d66920eb3 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c | |||
| @@ -951,7 +951,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) | |||
| 951 | goto free_resources; | 951 | goto free_resources; |
| 952 | } | 952 | } |
| 953 | } | 953 | } |
| 954 | dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_TO_DEVICE); | 954 | dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_FROM_DEVICE); |
| 955 | 955 | ||
| 956 | /* skip validate if the capability is not present */ | 956 | /* skip validate if the capability is not present */ |
| 957 | if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask)) | 957 | if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask)) |
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index c39e61bc8172..3cad856fe67f 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c | |||
| @@ -266,6 +266,7 @@ static struct tegra_dma_desc *tegra_dma_desc_get( | |||
| 266 | if (async_tx_test_ack(&dma_desc->txd)) { | 266 | if (async_tx_test_ack(&dma_desc->txd)) { |
| 267 | list_del(&dma_desc->node); | 267 | list_del(&dma_desc->node); |
| 268 | spin_unlock_irqrestore(&tdc->lock, flags); | 268 | spin_unlock_irqrestore(&tdc->lock, flags); |
| 269 | dma_desc->txd.flags = 0; | ||
| 269 | return dma_desc; | 270 | return dma_desc; |
| 270 | } | 271 | } |
| 271 | } | 272 | } |
| @@ -1050,7 +1051,9 @@ struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( | |||
| 1050 | TEGRA_APBDMA_AHBSEQ_WRAP_SHIFT; | 1051 | TEGRA_APBDMA_AHBSEQ_WRAP_SHIFT; |
| 1051 | ahb_seq |= TEGRA_APBDMA_AHBSEQ_BUS_WIDTH_32; | 1052 | ahb_seq |= TEGRA_APBDMA_AHBSEQ_BUS_WIDTH_32; |
| 1052 | 1053 | ||
| 1053 | csr |= TEGRA_APBDMA_CSR_FLOW | TEGRA_APBDMA_CSR_IE_EOC; | 1054 | csr |= TEGRA_APBDMA_CSR_FLOW; |
| 1055 | if (flags & DMA_PREP_INTERRUPT) | ||
| 1056 | csr |= TEGRA_APBDMA_CSR_IE_EOC; | ||
| 1054 | csr |= tdc->dma_sconfig.slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; | 1057 | csr |= tdc->dma_sconfig.slave_id << TEGRA_APBDMA_CSR_REQ_SEL_SHIFT; |
| 1055 | 1058 | ||
| 1056 | apb_seq |= TEGRA_APBDMA_APBSEQ_WRAP_WORD_1; | 1059 | apb_seq |= TEGRA_APBDMA_APBSEQ_WRAP_WORD_1; |
| @@ -1095,7 +1098,8 @@ struct dma_async_tx_descriptor *tegra_dma_prep_dma_cyclic( | |||
| 1095 | mem += len; | 1098 | mem += len; |
| 1096 | } | 1099 | } |
| 1097 | sg_req->last_sg = true; | 1100 | sg_req->last_sg = true; |
| 1098 | dma_desc->txd.flags = 0; | 1101 | if (flags & DMA_CTRL_ACK) |
| 1102 | dma_desc->txd.flags = DMA_CTRL_ACK; | ||
| 1099 | 1103 | ||
| 1100 | /* | 1104 | /* |
| 1101 | * Make sure that mode should not be conflicting with currently | 1105 | * Make sure that mode should not be conflicting with currently |
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 281f566a5513..d1e9eb191f2b 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c | |||
| @@ -340,7 +340,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num, | |||
| 340 | /* | 340 | /* |
| 341 | * Alocate and fill the csrow/channels structs | 341 | * Alocate and fill the csrow/channels structs |
| 342 | */ | 342 | */ |
| 343 | mci->csrows = kcalloc(sizeof(*mci->csrows), tot_csrows, GFP_KERNEL); | 343 | mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL); |
| 344 | if (!mci->csrows) | 344 | if (!mci->csrows) |
| 345 | goto error; | 345 | goto error; |
| 346 | for (row = 0; row < tot_csrows; row++) { | 346 | for (row = 0; row < tot_csrows; row++) { |
| @@ -351,7 +351,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num, | |||
| 351 | csr->csrow_idx = row; | 351 | csr->csrow_idx = row; |
| 352 | csr->mci = mci; | 352 | csr->mci = mci; |
| 353 | csr->nr_channels = tot_channels; | 353 | csr->nr_channels = tot_channels; |
| 354 | csr->channels = kcalloc(sizeof(*csr->channels), tot_channels, | 354 | csr->channels = kcalloc(tot_channels, sizeof(*csr->channels), |
| 355 | GFP_KERNEL); | 355 | GFP_KERNEL); |
| 356 | if (!csr->channels) | 356 | if (!csr->channels) |
| 357 | goto error; | 357 | goto error; |
| @@ -369,7 +369,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num, | |||
| 369 | /* | 369 | /* |
| 370 | * Allocate and fill the dimm structs | 370 | * Allocate and fill the dimm structs |
| 371 | */ | 371 | */ |
| 372 | mci->dimms = kcalloc(sizeof(*mci->dimms), tot_dimms, GFP_KERNEL); | 372 | mci->dimms = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL); |
| 373 | if (!mci->dimms) | 373 | if (!mci->dimms) |
| 374 | goto error; | 374 | goto error; |
| 375 | 375 | ||
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index dc6e905ee1a5..0056c4dae9d5 100644 --- a/drivers/edac/edac_pci_sysfs.c +++ b/drivers/edac/edac_pci_sysfs.c | |||
| @@ -256,7 +256,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj, | |||
| 256 | struct edac_pci_dev_attribute *edac_pci_dev; | 256 | struct edac_pci_dev_attribute *edac_pci_dev; |
| 257 | edac_pci_dev = (struct edac_pci_dev_attribute *)attr; | 257 | edac_pci_dev = (struct edac_pci_dev_attribute *)attr; |
| 258 | 258 | ||
| 259 | if (edac_pci_dev->show) | 259 | if (edac_pci_dev->store) |
| 260 | return edac_pci_dev->store(edac_pci_dev->value, buffer, count); | 260 | return edac_pci_dev->store(edac_pci_dev->value, buffer, count); |
| 261 | return -EIO; | 261 | return -EIO; |
| 262 | } | 262 | } |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index fd3ae6290d71..982f1f5f5742 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
| @@ -471,7 +471,7 @@ void __init dmi_scan_machine(void) | |||
| 471 | char __iomem *p, *q; | 471 | char __iomem *p, *q; |
| 472 | int rc; | 472 | int rc; |
| 473 | 473 | ||
| 474 | if (efi_enabled) { | 474 | if (efi_enabled(EFI_CONFIG_TABLES)) { |
| 475 | if (efi.smbios == EFI_INVALID_TABLE_ADDR) | 475 | if (efi.smbios == EFI_INVALID_TABLE_ADDR) |
| 476 | goto error; | 476 | goto error; |
| 477 | 477 | ||
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 7b1c37497c9a..f5596db0cf58 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -674,7 +674,7 @@ static int efi_status_to_err(efi_status_t status) | |||
| 674 | err = -EACCES; | 674 | err = -EACCES; |
| 675 | break; | 675 | break; |
| 676 | case EFI_NOT_FOUND: | 676 | case EFI_NOT_FOUND: |
| 677 | err = -ENOENT; | 677 | err = -EIO; |
| 678 | break; | 678 | break; |
| 679 | default: | 679 | default: |
| 680 | err = -EINVAL; | 680 | err = -EINVAL; |
| @@ -793,6 +793,7 @@ static ssize_t efivarfs_file_write(struct file *file, | |||
| 793 | spin_unlock(&efivars->lock); | 793 | spin_unlock(&efivars->lock); |
| 794 | efivar_unregister(var); | 794 | efivar_unregister(var); |
| 795 | drop_nlink(inode); | 795 | drop_nlink(inode); |
| 796 | d_delete(file->f_dentry); | ||
| 796 | dput(file->f_dentry); | 797 | dput(file->f_dentry); |
| 797 | 798 | ||
| 798 | } else { | 799 | } else { |
| @@ -994,7 +995,7 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry) | |||
| 994 | list_del(&var->list); | 995 | list_del(&var->list); |
| 995 | spin_unlock(&efivars->lock); | 996 | spin_unlock(&efivars->lock); |
| 996 | efivar_unregister(var); | 997 | efivar_unregister(var); |
| 997 | drop_nlink(dir); | 998 | drop_nlink(dentry->d_inode); |
| 998 | dput(dentry); | 999 | dput(dentry); |
| 999 | return 0; | 1000 | return 0; |
| 1000 | } | 1001 | } |
| @@ -1782,7 +1783,7 @@ efivars_init(void) | |||
| 1782 | printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION, | 1783 | printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION, |
| 1783 | EFIVARS_DATE); | 1784 | EFIVARS_DATE); |
| 1784 | 1785 | ||
| 1785 | if (!efi_enabled) | 1786 | if (!efi_enabled(EFI_RUNTIME_SERVICES)) |
| 1786 | return 0; | 1787 | return 0; |
| 1787 | 1788 | ||
| 1788 | /* For now we'll register the efi directory at /sys/firmware/efi */ | 1789 | /* For now we'll register the efi directory at /sys/firmware/efi */ |
| @@ -1822,7 +1823,7 @@ err_put: | |||
| 1822 | static void __exit | 1823 | static void __exit |
| 1823 | efivars_exit(void) | 1824 | efivars_exit(void) |
| 1824 | { | 1825 | { |
| 1825 | if (efi_enabled) { | 1826 | if (efi_enabled(EFI_RUNTIME_SERVICES)) { |
| 1826 | unregister_efivars(&__efivars); | 1827 | unregister_efivars(&__efivars); |
| 1827 | kobject_put(efi_kobj); | 1828 | kobject_put(efi_kobj); |
| 1828 | } | 1829 | } |
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c index 4da4eb9ae926..2224f1dc074b 100644 --- a/drivers/firmware/iscsi_ibft_find.c +++ b/drivers/firmware/iscsi_ibft_find.c | |||
| @@ -99,7 +99,7 @@ unsigned long __init find_ibft_region(unsigned long *sizep) | |||
| 99 | /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will | 99 | /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will |
| 100 | * only use ACPI for this */ | 100 | * only use ACPI for this */ |
| 101 | 101 | ||
| 102 | if (!efi_enabled) | 102 | if (!efi_enabled(EFI_BOOT)) |
| 103 | find_ibft_in_mem(); | 103 | find_ibft_in_mem(); |
| 104 | 104 | ||
| 105 | if (ibft_addr) { | 105 | if (ibft_addr) { |
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 7d9bd94be8d2..6819d63cb167 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c | |||
| @@ -547,7 +547,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
| 547 | mvchip->membase = devm_request_and_ioremap(&pdev->dev, res); | 547 | mvchip->membase = devm_request_and_ioremap(&pdev->dev, res); |
| 548 | if (! mvchip->membase) { | 548 | if (! mvchip->membase) { |
| 549 | dev_err(&pdev->dev, "Cannot ioremap\n"); | 549 | dev_err(&pdev->dev, "Cannot ioremap\n"); |
| 550 | kfree(mvchip->chip.label); | ||
| 551 | return -ENOMEM; | 550 | return -ENOMEM; |
| 552 | } | 551 | } |
| 553 | 552 | ||
| @@ -557,14 +556,12 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
| 557 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 556 | res = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
| 558 | if (! res) { | 557 | if (! res) { |
| 559 | dev_err(&pdev->dev, "Cannot get memory resource\n"); | 558 | dev_err(&pdev->dev, "Cannot get memory resource\n"); |
| 560 | kfree(mvchip->chip.label); | ||
| 561 | return -ENODEV; | 559 | return -ENODEV; |
| 562 | } | 560 | } |
| 563 | 561 | ||
| 564 | mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res); | 562 | mvchip->percpu_membase = devm_request_and_ioremap(&pdev->dev, res); |
| 565 | if (! mvchip->percpu_membase) { | 563 | if (! mvchip->percpu_membase) { |
| 566 | dev_err(&pdev->dev, "Cannot ioremap\n"); | 564 | dev_err(&pdev->dev, "Cannot ioremap\n"); |
| 567 | kfree(mvchip->chip.label); | ||
| 568 | return -ENOMEM; | 565 | return -ENOMEM; |
| 569 | } | 566 | } |
| 570 | } | 567 | } |
| @@ -625,7 +622,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
| 625 | mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1); | 622 | mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1); |
| 626 | if (mvchip->irqbase < 0) { | 623 | if (mvchip->irqbase < 0) { |
| 627 | dev_err(&pdev->dev, "no irqs\n"); | 624 | dev_err(&pdev->dev, "no irqs\n"); |
| 628 | kfree(mvchip->chip.label); | ||
| 629 | return -ENOMEM; | 625 | return -ENOMEM; |
| 630 | } | 626 | } |
| 631 | 627 | ||
| @@ -633,7 +629,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
| 633 | mvchip->membase, handle_level_irq); | 629 | mvchip->membase, handle_level_irq); |
| 634 | if (! gc) { | 630 | if (! gc) { |
| 635 | dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n"); | 631 | dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n"); |
| 636 | kfree(mvchip->chip.label); | ||
| 637 | return -ENOMEM; | 632 | return -ENOMEM; |
| 638 | } | 633 | } |
| 639 | 634 | ||
| @@ -668,7 +663,6 @@ static int mvebu_gpio_probe(struct platform_device *pdev) | |||
| 668 | irq_remove_generic_chip(gc, IRQ_MSK(ngpios), IRQ_NOREQUEST, | 663 | irq_remove_generic_chip(gc, IRQ_MSK(ngpios), IRQ_NOREQUEST, |
| 669 | IRQ_LEVEL | IRQ_NOPROBE); | 664 | IRQ_LEVEL | IRQ_NOPROBE); |
| 670 | kfree(gc); | 665 | kfree(gc); |
| 671 | kfree(mvchip->chip.label); | ||
| 672 | return -ENODEV; | 666 | return -ENODEV; |
| 673 | } | 667 | } |
| 674 | 668 | ||
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 01f7fe955590..76be7eed79de 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 34 | #include <mach/map.h> | 34 | #include <mach/map.h> |
| 35 | #include <mach/regs-clock.h> | ||
| 36 | #include <mach/regs-gpio.h> | 35 | #include <mach/regs-gpio.h> |
| 37 | 36 | ||
| 38 | #include <plat/cpu.h> | 37 | #include <plat/cpu.h> |
| @@ -446,7 +445,7 @@ static struct samsung_gpio_cfg s3c24xx_gpiocfg_banka = { | |||
| 446 | }; | 445 | }; |
| 447 | #endif | 446 | #endif |
| 448 | 447 | ||
| 449 | #if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_ARCH_EXYNOS5) | 448 | #if defined(CONFIG_ARCH_EXYNOS4) || defined(CONFIG_SOC_EXYNOS5250) |
| 450 | static struct samsung_gpio_cfg exynos_gpio_cfg = { | 449 | static struct samsung_gpio_cfg exynos_gpio_cfg = { |
| 451 | .set_pull = exynos_gpio_setpull, | 450 | .set_pull = exynos_gpio_setpull, |
| 452 | .get_pull = exynos_gpio_getpull, | 451 | .get_pull = exynos_gpio_getpull, |
| @@ -2446,7 +2445,7 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = { | |||
| 2446 | }; | 2445 | }; |
| 2447 | #endif | 2446 | #endif |
| 2448 | 2447 | ||
| 2449 | #ifdef CONFIG_ARCH_EXYNOS5 | 2448 | #ifdef CONFIG_SOC_EXYNOS5250 |
| 2450 | static struct samsung_gpio_chip exynos5_gpios_1[] = { | 2449 | static struct samsung_gpio_chip exynos5_gpios_1[] = { |
| 2451 | { | 2450 | { |
| 2452 | .chip = { | 2451 | .chip = { |
| @@ -2614,7 +2613,7 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = { | |||
| 2614 | }; | 2613 | }; |
| 2615 | #endif | 2614 | #endif |
| 2616 | 2615 | ||
| 2617 | #ifdef CONFIG_ARCH_EXYNOS5 | 2616 | #ifdef CONFIG_SOC_EXYNOS5250 |
| 2618 | static struct samsung_gpio_chip exynos5_gpios_2[] = { | 2617 | static struct samsung_gpio_chip exynos5_gpios_2[] = { |
| 2619 | { | 2618 | { |
| 2620 | .chip = { | 2619 | .chip = { |
| @@ -2675,7 +2674,7 @@ static struct samsung_gpio_chip exynos5_gpios_2[] = { | |||
| 2675 | }; | 2674 | }; |
| 2676 | #endif | 2675 | #endif |
| 2677 | 2676 | ||
| 2678 | #ifdef CONFIG_ARCH_EXYNOS5 | 2677 | #ifdef CONFIG_SOC_EXYNOS5250 |
| 2679 | static struct samsung_gpio_chip exynos5_gpios_3[] = { | 2678 | static struct samsung_gpio_chip exynos5_gpios_3[] = { |
| 2680 | { | 2679 | { |
| 2681 | .chip = { | 2680 | .chip = { |
| @@ -2711,7 +2710,7 @@ static struct samsung_gpio_chip exynos5_gpios_3[] = { | |||
| 2711 | }; | 2710 | }; |
| 2712 | #endif | 2711 | #endif |
| 2713 | 2712 | ||
| 2714 | #ifdef CONFIG_ARCH_EXYNOS5 | 2713 | #ifdef CONFIG_SOC_EXYNOS5250 |
| 2715 | static struct samsung_gpio_chip exynos5_gpios_4[] = { | 2714 | static struct samsung_gpio_chip exynos5_gpios_4[] = { |
| 2716 | { | 2715 | { |
| 2717 | .chip = { | 2716 | .chip = { |
| @@ -3010,7 +3009,7 @@ static __init int samsung_gpiolib_init(void) | |||
| 3010 | int i, nr_chips; | 3009 | int i, nr_chips; |
| 3011 | int group = 0; | 3010 | int group = 0; |
| 3012 | 3011 | ||
| 3013 | #ifdef CONFIG_PINCTRL_SAMSUNG | 3012 | #if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) |
| 3014 | /* | 3013 | /* |
| 3015 | * This gpio driver includes support for device tree support and there | 3014 | * This gpio driver includes support for device tree support and there |
| 3016 | * are platforms using it. In order to maintain compatibility with those | 3015 | * are platforms using it. In order to maintain compatibility with those |
| @@ -3026,6 +3025,7 @@ static __init int samsung_gpiolib_init(void) | |||
| 3026 | static const struct of_device_id exynos_pinctrl_ids[] = { | 3025 | static const struct of_device_id exynos_pinctrl_ids[] = { |
| 3027 | { .compatible = "samsung,pinctrl-exynos4210", }, | 3026 | { .compatible = "samsung,pinctrl-exynos4210", }, |
| 3028 | { .compatible = "samsung,pinctrl-exynos4x12", }, | 3027 | { .compatible = "samsung,pinctrl-exynos4x12", }, |
| 3028 | { .compatible = "samsung,pinctrl-exynos5440", }, | ||
| 3029 | }; | 3029 | }; |
| 3030 | for_each_matching_node(pctrl_np, exynos_pinctrl_ids) | 3030 | for_each_matching_node(pctrl_np, exynos_pinctrl_ids) |
| 3031 | if (pctrl_np && of_device_is_available(pctrl_np)) | 3031 | if (pctrl_np && of_device_is_available(pctrl_np)) |
diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index 1d1f1e5e33f0..046bcda36abe 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig | |||
| @@ -24,7 +24,7 @@ config DRM_EXYNOS_DMABUF | |||
| 24 | 24 | ||
| 25 | config DRM_EXYNOS_FIMD | 25 | config DRM_EXYNOS_FIMD |
| 26 | bool "Exynos DRM FIMD" | 26 | bool "Exynos DRM FIMD" |
| 27 | depends on DRM_EXYNOS && !FB_S3C | 27 | depends on DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM |
| 28 | help | 28 | help |
| 29 | Choose this option if you want to use Exynos FIMD for DRM. | 29 | Choose this option if you want to use Exynos FIMD for DRM. |
| 30 | 30 | ||
| @@ -48,7 +48,7 @@ config DRM_EXYNOS_G2D | |||
| 48 | 48 | ||
| 49 | config DRM_EXYNOS_IPP | 49 | config DRM_EXYNOS_IPP |
| 50 | bool "Exynos DRM IPP" | 50 | bool "Exynos DRM IPP" |
| 51 | depends on DRM_EXYNOS | 51 | depends on DRM_EXYNOS && !ARCH_MULTIPLATFORM |
| 52 | help | 52 | help |
| 53 | Choose this option if you want to use IPP feature for DRM. | 53 | Choose this option if you want to use IPP feature for DRM. |
| 54 | 54 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index ab37437bad8a..4c5b6859c9ea 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "exynos_drm_drv.h" | 18 | #include "exynos_drm_drv.h" |
| 19 | #include "exynos_drm_encoder.h" | 19 | #include "exynos_drm_encoder.h" |
| 20 | 20 | ||
| 21 | #define MAX_EDID 256 | ||
| 22 | #define to_exynos_connector(x) container_of(x, struct exynos_drm_connector,\ | 21 | #define to_exynos_connector(x) container_of(x, struct exynos_drm_connector,\ |
| 23 | drm_connector) | 22 | drm_connector) |
| 24 | 23 | ||
| @@ -96,7 +95,9 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) | |||
| 96 | to_exynos_connector(connector); | 95 | to_exynos_connector(connector); |
| 97 | struct exynos_drm_manager *manager = exynos_connector->manager; | 96 | struct exynos_drm_manager *manager = exynos_connector->manager; |
| 98 | struct exynos_drm_display_ops *display_ops = manager->display_ops; | 97 | struct exynos_drm_display_ops *display_ops = manager->display_ops; |
| 99 | unsigned int count; | 98 | struct edid *edid = NULL; |
| 99 | unsigned int count = 0; | ||
| 100 | int ret; | ||
| 100 | 101 | ||
| 101 | DRM_DEBUG_KMS("%s\n", __FILE__); | 102 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 102 | 103 | ||
| @@ -114,27 +115,21 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) | |||
| 114 | * because lcd panel has only one mode. | 115 | * because lcd panel has only one mode. |
| 115 | */ | 116 | */ |
| 116 | if (display_ops->get_edid) { | 117 | if (display_ops->get_edid) { |
| 117 | int ret; | 118 | edid = display_ops->get_edid(manager->dev, connector); |
| 118 | void *edid; | 119 | if (IS_ERR_OR_NULL(edid)) { |
| 119 | 120 | ret = PTR_ERR(edid); | |
| 120 | edid = kzalloc(MAX_EDID, GFP_KERNEL); | 121 | edid = NULL; |
| 121 | if (!edid) { | 122 | DRM_ERROR("Panel operation get_edid failed %d\n", ret); |
| 122 | DRM_ERROR("failed to allocate edid\n"); | 123 | goto out; |
| 123 | return 0; | ||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | ret = display_ops->get_edid(manager->dev, connector, | 126 | count = drm_add_edid_modes(connector, edid); |
| 127 | edid, MAX_EDID); | 127 | if (count < 0) { |
| 128 | if (ret < 0) { | 128 | DRM_ERROR("Add edid modes failed %d\n", count); |
| 129 | DRM_ERROR("failed to get edid data.\n"); | 129 | goto out; |
| 130 | kfree(edid); | ||
| 131 | edid = NULL; | ||
| 132 | return 0; | ||
| 133 | } | 130 | } |
| 134 | 131 | ||
| 135 | drm_mode_connector_update_edid_property(connector, edid); | 132 | drm_mode_connector_update_edid_property(connector, edid); |
| 136 | count = drm_add_edid_modes(connector, edid); | ||
| 137 | kfree(edid); | ||
| 138 | } else { | 133 | } else { |
| 139 | struct exynos_drm_panel_info *panel; | 134 | struct exynos_drm_panel_info *panel; |
| 140 | struct drm_display_mode *mode = drm_mode_create(connector->dev); | 135 | struct drm_display_mode *mode = drm_mode_create(connector->dev); |
| @@ -161,6 +156,8 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) | |||
| 161 | count = 1; | 156 | count = 1; |
| 162 | } | 157 | } |
| 163 | 158 | ||
| 159 | out: | ||
| 160 | kfree(edid); | ||
| 164 | return count; | 161 | return count; |
| 165 | } | 162 | } |
| 166 | 163 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c index 9df97714b6c0..ba0a3aa78547 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | struct exynos_drm_dmabuf_attachment { | 19 | struct exynos_drm_dmabuf_attachment { |
| 20 | struct sg_table sgt; | 20 | struct sg_table sgt; |
| 21 | enum dma_data_direction dir; | 21 | enum dma_data_direction dir; |
| 22 | bool is_mapped; | ||
| 22 | }; | 23 | }; |
| 23 | 24 | ||
| 24 | static int exynos_gem_attach_dma_buf(struct dma_buf *dmabuf, | 25 | static int exynos_gem_attach_dma_buf(struct dma_buf *dmabuf, |
| @@ -72,17 +73,10 @@ static struct sg_table * | |||
| 72 | 73 | ||
| 73 | DRM_DEBUG_PRIME("%s\n", __FILE__); | 74 | DRM_DEBUG_PRIME("%s\n", __FILE__); |
| 74 | 75 | ||
| 75 | if (WARN_ON(dir == DMA_NONE)) | ||
| 76 | return ERR_PTR(-EINVAL); | ||
| 77 | |||
| 78 | /* just return current sgt if already requested. */ | 76 | /* just return current sgt if already requested. */ |
| 79 | if (exynos_attach->dir == dir) | 77 | if (exynos_attach->dir == dir && exynos_attach->is_mapped) |
| 80 | return &exynos_attach->sgt; | 78 | return &exynos_attach->sgt; |
| 81 | 79 | ||
| 82 | /* reattaching is not allowed. */ | ||
| 83 | if (WARN_ON(exynos_attach->dir != DMA_NONE)) | ||
| 84 | return ERR_PTR(-EBUSY); | ||
| 85 | |||
| 86 | buf = gem_obj->buffer; | 80 | buf = gem_obj->buffer; |
| 87 | if (!buf) { | 81 | if (!buf) { |
| 88 | DRM_ERROR("buffer is null.\n"); | 82 | DRM_ERROR("buffer is null.\n"); |
| @@ -107,13 +101,17 @@ static struct sg_table * | |||
| 107 | wr = sg_next(wr); | 101 | wr = sg_next(wr); |
| 108 | } | 102 | } |
| 109 | 103 | ||
| 110 | nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir); | 104 | if (dir != DMA_NONE) { |
| 111 | if (!nents) { | 105 | nents = dma_map_sg(attach->dev, sgt->sgl, sgt->orig_nents, dir); |
| 112 | DRM_ERROR("failed to map sgl with iommu.\n"); | 106 | if (!nents) { |
| 113 | sgt = ERR_PTR(-EIO); | 107 | DRM_ERROR("failed to map sgl with iommu.\n"); |
| 114 | goto err_unlock; | 108 | sg_free_table(sgt); |
| 109 | sgt = ERR_PTR(-EIO); | ||
| 110 | goto err_unlock; | ||
| 111 | } | ||
| 115 | } | 112 | } |
| 116 | 113 | ||
| 114 | exynos_attach->is_mapped = true; | ||
| 117 | exynos_attach->dir = dir; | 115 | exynos_attach->dir = dir; |
| 118 | attach->priv = exynos_attach; | 116 | attach->priv = exynos_attach; |
| 119 | 117 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index b9e51bc09e81..4606fac7241a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h | |||
| @@ -148,8 +148,8 @@ struct exynos_drm_overlay { | |||
| 148 | struct exynos_drm_display_ops { | 148 | struct exynos_drm_display_ops { |
| 149 | enum exynos_drm_output_type type; | 149 | enum exynos_drm_output_type type; |
| 150 | bool (*is_connected)(struct device *dev); | 150 | bool (*is_connected)(struct device *dev); |
| 151 | int (*get_edid)(struct device *dev, struct drm_connector *connector, | 151 | struct edid *(*get_edid)(struct device *dev, |
| 152 | u8 *edid, int len); | 152 | struct drm_connector *connector); |
| 153 | void *(*get_panel)(struct device *dev); | 153 | void *(*get_panel)(struct device *dev); |
| 154 | int (*check_timing)(struct device *dev, void *timing); | 154 | int (*check_timing)(struct device *dev, void *timing); |
| 155 | int (*power_on)(struct device *dev, int mode); | 155 | int (*power_on)(struct device *dev, int mode); |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 36c3905536a6..9a4c08e7453c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c | |||
| @@ -324,7 +324,7 @@ out: | |||
| 324 | g2d_userptr = NULL; | 324 | g2d_userptr = NULL; |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, | 327 | static dma_addr_t *g2d_userptr_get_dma_addr(struct drm_device *drm_dev, |
| 328 | unsigned long userptr, | 328 | unsigned long userptr, |
| 329 | unsigned long size, | 329 | unsigned long size, |
| 330 | struct drm_file *filp, | 330 | struct drm_file *filp, |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c index 850e9950b7da..28644539b305 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c | |||
| @@ -108,18 +108,17 @@ static bool drm_hdmi_is_connected(struct device *dev) | |||
| 108 | return false; | 108 | return false; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static int drm_hdmi_get_edid(struct device *dev, | 111 | static struct edid *drm_hdmi_get_edid(struct device *dev, |
| 112 | struct drm_connector *connector, u8 *edid, int len) | 112 | struct drm_connector *connector) |
| 113 | { | 113 | { |
| 114 | struct drm_hdmi_context *ctx = to_context(dev); | 114 | struct drm_hdmi_context *ctx = to_context(dev); |
| 115 | 115 | ||
| 116 | DRM_DEBUG_KMS("%s\n", __FILE__); | 116 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 117 | 117 | ||
| 118 | if (hdmi_ops && hdmi_ops->get_edid) | 118 | if (hdmi_ops && hdmi_ops->get_edid) |
| 119 | return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector, edid, | 119 | return hdmi_ops->get_edid(ctx->hdmi_ctx->ctx, connector); |
| 120 | len); | ||
| 121 | 120 | ||
| 122 | return 0; | 121 | return NULL; |
| 123 | } | 122 | } |
| 124 | 123 | ||
| 125 | static int drm_hdmi_check_timing(struct device *dev, void *timing) | 124 | static int drm_hdmi_check_timing(struct device *dev, void *timing) |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h index 784a7e9a766c..d80516fc9ed7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h | |||
| @@ -30,8 +30,8 @@ struct exynos_drm_hdmi_context { | |||
| 30 | struct exynos_hdmi_ops { | 30 | struct exynos_hdmi_ops { |
| 31 | /* display */ | 31 | /* display */ |
| 32 | bool (*is_connected)(void *ctx); | 32 | bool (*is_connected)(void *ctx); |
| 33 | int (*get_edid)(void *ctx, struct drm_connector *connector, | 33 | struct edid *(*get_edid)(void *ctx, |
| 34 | u8 *edid, int len); | 34 | struct drm_connector *connector); |
| 35 | int (*check_timing)(void *ctx, void *timing); | 35 | int (*check_timing)(void *ctx, void *timing); |
| 36 | int (*power_on)(void *ctx, int mode); | 36 | int (*power_on)(void *ctx, int mode); |
| 37 | 37 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 0bda96454a02..1a556354e92f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c | |||
| @@ -869,7 +869,7 @@ static void ipp_put_event(struct drm_exynos_ipp_cmd_node *c_node, | |||
| 869 | } | 869 | } |
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | void ipp_handle_cmd_work(struct device *dev, | 872 | static void ipp_handle_cmd_work(struct device *dev, |
| 873 | struct exynos_drm_ippdrv *ippdrv, | 873 | struct exynos_drm_ippdrv *ippdrv, |
| 874 | struct drm_exynos_ipp_cmd_work *cmd_work, | 874 | struct drm_exynos_ipp_cmd_work *cmd_work, |
| 875 | struct drm_exynos_ipp_cmd_node *c_node) | 875 | struct drm_exynos_ipp_cmd_node *c_node) |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index e9e83ef688f0..f976e29def6e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c | |||
| @@ -734,7 +734,7 @@ static int rotator_remove(struct platform_device *pdev) | |||
| 734 | return 0; | 734 | return 0; |
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | struct rot_limit_table rot_limit_tbl = { | 737 | static struct rot_limit_table rot_limit_tbl = { |
| 738 | .ycbcr420_2p = { | 738 | .ycbcr420_2p = { |
| 739 | .min_w = 32, | 739 | .min_w = 32, |
| 740 | .min_h = 32, | 740 | .min_h = 32, |
| @@ -751,7 +751,7 @@ struct rot_limit_table rot_limit_tbl = { | |||
| 751 | }, | 751 | }, |
| 752 | }; | 752 | }; |
| 753 | 753 | ||
| 754 | struct platform_device_id rotator_driver_ids[] = { | 754 | static struct platform_device_id rotator_driver_ids[] = { |
| 755 | { | 755 | { |
| 756 | .name = "exynos-rot", | 756 | .name = "exynos-rot", |
| 757 | .driver_data = (unsigned long)&rot_limit_tbl, | 757 | .driver_data = (unsigned long)&rot_limit_tbl, |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index d0ca3c4e06c6..13ccbd4bcfaa 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c | |||
| @@ -98,10 +98,12 @@ static bool vidi_display_is_connected(struct device *dev) | |||
| 98 | return ctx->connected ? true : false; | 98 | return ctx->connected ? true : false; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static int vidi_get_edid(struct device *dev, struct drm_connector *connector, | 101 | static struct edid *vidi_get_edid(struct device *dev, |
| 102 | u8 *edid, int len) | 102 | struct drm_connector *connector) |
| 103 | { | 103 | { |
| 104 | struct vidi_context *ctx = get_vidi_context(dev); | 104 | struct vidi_context *ctx = get_vidi_context(dev); |
| 105 | struct edid *edid; | ||
| 106 | int edid_len; | ||
| 105 | 107 | ||
| 106 | DRM_DEBUG_KMS("%s\n", __FILE__); | 108 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| 107 | 109 | ||
| @@ -111,13 +113,18 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector, | |||
| 111 | */ | 113 | */ |
| 112 | if (!ctx->raw_edid) { | 114 | if (!ctx->raw_edid) { |
| 113 | DRM_DEBUG_KMS("raw_edid is null.\n"); | 115 | DRM_DEBUG_KMS("raw_edid is null.\n"); |
| 114 | return -EFAULT; | 116 | return ERR_PTR(-EFAULT); |
| 115 | } | 117 | } |
| 116 | 118 | ||
| 117 | memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions) | 119 | edid_len = (1 + ctx->raw_edid->extensions) * EDID_LENGTH; |
| 118 | * EDID_LENGTH, len)); | 120 | edid = kzalloc(edid_len, GFP_KERNEL); |
| 121 | if (!edid) { | ||
| 122 | DRM_DEBUG_KMS("failed to allocate edid\n"); | ||
| 123 | return ERR_PTR(-ENOMEM); | ||
| 124 | } | ||
| 119 | 125 | ||
| 120 | return 0; | 126 | memcpy(edid, ctx->raw_edid, edid_len); |
| 127 | return edid; | ||
| 121 | } | 128 | } |
| 122 | 129 | ||
| 123 | static void *vidi_get_panel(struct device *dev) | 130 | static void *vidi_get_panel(struct device *dev) |
| @@ -514,7 +521,6 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data, | |||
| 514 | struct exynos_drm_manager *manager; | 521 | struct exynos_drm_manager *manager; |
| 515 | struct exynos_drm_display_ops *display_ops; | 522 | struct exynos_drm_display_ops *display_ops; |
| 516 | struct drm_exynos_vidi_connection *vidi = data; | 523 | struct drm_exynos_vidi_connection *vidi = data; |
| 517 | struct edid *raw_edid; | ||
| 518 | int edid_len; | 524 | int edid_len; |
| 519 | 525 | ||
| 520 | DRM_DEBUG_KMS("%s\n", __FILE__); | 526 | DRM_DEBUG_KMS("%s\n", __FILE__); |
| @@ -551,11 +557,11 @@ int vidi_connection_ioctl(struct drm_device *drm_dev, void *data, | |||
| 551 | } | 557 | } |
| 552 | 558 | ||
| 553 | if (vidi->connection) { | 559 | if (vidi->connection) { |
| 554 | if (!vidi->edid) { | 560 | struct edid *raw_edid = (struct edid *)(uint32_t)vidi->edid; |
| 555 | DRM_DEBUG_KMS("edid data is null.\n"); | 561 | if (!drm_edid_is_valid(raw_edid)) { |
| 562 | DRM_DEBUG_KMS("edid data is invalid.\n"); | ||
| 556 | return -EINVAL; | 563 | return -EINVAL; |
| 557 | } | 564 | } |
| 558 | raw_edid = (struct edid *)(uint32_t)vidi->edid; | ||
| 559 | edid_len = (1 + raw_edid->extensions) * EDID_LENGTH; | 565 | edid_len = (1 + raw_edid->extensions) * EDID_LENGTH; |
| 560 | ctx->raw_edid = kzalloc(edid_len, GFP_KERNEL); | 566 | ctx->raw_edid = kzalloc(edid_len, GFP_KERNEL); |
| 561 | if (!ctx->raw_edid) { | 567 | if (!ctx->raw_edid) { |
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 41ff79d8ac8e..fbab3c468603 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/regulator/consumer.h> | 34 | #include <linux/regulator/consumer.h> |
| 35 | #include <linux/io.h> | 35 | #include <linux/io.h> |
| 36 | #include <linux/of_gpio.h> | 36 | #include <linux/of_gpio.h> |
| 37 | #include <plat/gpio-cfg.h> | ||
| 38 | 37 | ||
| 39 | #include <drm/exynos_drm.h> | 38 | #include <drm/exynos_drm.h> |
| 40 | 39 | ||
| @@ -98,8 +97,7 @@ struct hdmi_context { | |||
| 98 | 97 | ||
| 99 | void __iomem *regs; | 98 | void __iomem *regs; |
| 100 | void *parent_ctx; | 99 | void *parent_ctx; |
| 101 | int external_irq; | 100 | int irq; |
| 102 | int internal_irq; | ||
| 103 | 101 | ||
| 104 | struct i2c_client *ddc_port; | 102 | struct i2c_client *ddc_port; |
| 105 | struct i2c_client *hdmiphy_port; | 103 | struct i2c_client *hdmiphy_port; |
| @@ -1391,8 +1389,7 @@ static bool hdmi_is_connected(void *ctx) | |||
| 1391 | return hdata->hpd; | 1389 | return hdata->hpd; |
| 1392 | } | 1390 | } |
| 1393 | 1391 | ||
| 1394 | static int hdmi_get_edid(void *ctx, struct drm_connector *connector, | 1392 | static struct edid *hdmi_get_edid(void *ctx, struct drm_connector *connector) |
| 1395 | u8 *edid, int len) | ||
| 1396 | { | 1393 | { |
| 1397 | struct edid *raw_edid; | 1394 | struct edid *raw_edid; |
| 1398 | struct hdmi_context *hdata = ctx; | 1395 | struct hdmi_context *hdata = ctx; |
| @@ -1400,22 +1397,18 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector, | |||
| 1400 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); | 1397 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); |
| 1401 | 1398 | ||
| 1402 | if (!hdata->ddc_port) | 1399 | if (!hdata->ddc_port) |
| 1403 | return -ENODEV; | 1400 | return ERR_PTR(-ENODEV); |
| 1404 | 1401 | ||
| 1405 | raw_edid = drm_get_edid(connector, hdata->ddc_port->adapter); | 1402 | raw_edid = drm_get_edid(connector, hdata->ddc_port->adapter); |
| 1406 | if (raw_edid) { | 1403 | if (!raw_edid) |
| 1407 | hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid); | 1404 | return ERR_PTR(-ENODEV); |
| 1408 | memcpy(edid, raw_edid, min((1 + raw_edid->extensions) | ||
| 1409 | * EDID_LENGTH, len)); | ||
| 1410 | DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", | ||
| 1411 | (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), | ||
| 1412 | raw_edid->width_cm, raw_edid->height_cm); | ||
| 1413 | kfree(raw_edid); | ||
| 1414 | } else { | ||
| 1415 | return -ENODEV; | ||
| 1416 | } | ||
| 1417 | 1405 | ||
| 1418 | return 0; | 1406 | hdata->dvi_mode = !drm_detect_hdmi_monitor(raw_edid); |
| 1407 | DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n", | ||
| 1408 | (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), | ||
| 1409 | raw_edid->width_cm, raw_edid->height_cm); | ||
| 1410 | |||
| 1411 | return raw_edid; | ||
| 1419 | } | 1412 | } |
| 1420 | 1413 | ||
| 1421 | static int hdmi_v13_check_timing(struct fb_videomode *check_timing) | 1414 | static int hdmi_v13_check_timing(struct fb_videomode *check_timing) |
| @@ -1652,16 +1645,16 @@ static void hdmi_conf_reset(struct hdmi_context *hdata) | |||
| 1652 | 1645 | ||
| 1653 | /* resetting HDMI core */ | 1646 | /* resetting HDMI core */ |
| 1654 | hdmi_reg_writemask(hdata, reg, 0, HDMI_CORE_SW_RSTOUT); | 1647 | hdmi_reg_writemask(hdata, reg, 0, HDMI_CORE_SW_RSTOUT); |
| 1655 | mdelay(10); | 1648 | usleep_range(10000, 12000); |
| 1656 | hdmi_reg_writemask(hdata, reg, ~0, HDMI_CORE_SW_RSTOUT); | 1649 | hdmi_reg_writemask(hdata, reg, ~0, HDMI_CORE_SW_RSTOUT); |
| 1657 | mdelay(10); | 1650 | usleep_range(10000, 12000); |
| 1658 | } | 1651 | } |
| 1659 | 1652 | ||
| 1660 | static void hdmi_conf_init(struct hdmi_context *hdata) | 1653 | static void hdmi_conf_init(struct hdmi_context *hdata) |
| 1661 | { | 1654 | { |
| 1662 | struct hdmi_infoframe infoframe; | 1655 | struct hdmi_infoframe infoframe; |
| 1663 | 1656 | ||
| 1664 | /* disable HPD interrupts */ | 1657 | /* disable HPD interrupts from HDMI IP block, use GPIO instead */ |
| 1665 | hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL | | 1658 | hdmi_reg_writemask(hdata, HDMI_INTC_CON, 0, HDMI_INTC_EN_GLOBAL | |
| 1666 | HDMI_INTC_EN_HPD_PLUG | HDMI_INTC_EN_HPD_UNPLUG); | 1659 | HDMI_INTC_EN_HPD_PLUG | HDMI_INTC_EN_HPD_UNPLUG); |
| 1667 | 1660 | ||
| @@ -1779,7 +1772,7 @@ static void hdmi_v13_timing_apply(struct hdmi_context *hdata) | |||
| 1779 | u32 val = hdmi_reg_read(hdata, HDMI_V13_PHY_STATUS); | 1772 | u32 val = hdmi_reg_read(hdata, HDMI_V13_PHY_STATUS); |
| 1780 | if (val & HDMI_PHY_STATUS_READY) | 1773 | if (val & HDMI_PHY_STATUS_READY) |
| 1781 | break; | 1774 | break; |
| 1782 | mdelay(1); | 1775 | usleep_range(1000, 2000); |
| 1783 | } | 1776 | } |
| 1784 | /* steady state not achieved */ | 1777 | /* steady state not achieved */ |
| 1785 | if (tries == 0) { | 1778 | if (tries == 0) { |
| @@ -1946,7 +1939,7 @@ static void hdmi_v14_timing_apply(struct hdmi_context *hdata) | |||
| 1946 | u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS_0); | 1939 | u32 val = hdmi_reg_read(hdata, HDMI_PHY_STATUS_0); |
| 1947 | if (val & HDMI_PHY_STATUS_READY) | 1940 | if (val & HDMI_PHY_STATUS_READY) |
| 1948 | break; | 1941 | break; |
| 1949 | mdelay(1); | 1942 | usleep_range(1000, 2000); |
| 1950 | } | 1943 | } |
| 1951 | /* steady state not achieved */ | 1944 | /* steady state not achieved */ |
| 1952 | if (tries == 0) { | 1945 | if (tries == 0) { |
| @@ -1998,9 +1991,9 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata) | |||
| 1998 | 1991 | ||
| 1999 | /* reset hdmiphy */ | 1992 | /* reset hdmiphy */ |
| 2000 | hdmi_reg_writemask(hdata, reg, ~0, HDMI_PHY_SW_RSTOUT); | 1993 | hdmi_reg_writemask(hdata, reg, ~0, HDMI_PHY_SW_RSTOUT); |
| 2001 | mdelay(10); | 1994 | usleep_range(10000, 12000); |
| 2002 | hdmi_reg_writemask(hdata, reg, 0, HDMI_PHY_SW_RSTOUT); | 1995 | hdmi_reg_writemask(hdata, reg, 0, HDMI_PHY_SW_RSTOUT); |
| 2003 | mdelay(10); | 1996 | usleep_range(10000, 12000); |
| 2004 | } | 1997 | } |
| 2005 | 1998 | ||
| 2006 | static void hdmiphy_poweron(struct hdmi_context *hdata) | 1999 | static void hdmiphy_poweron(struct hdmi_context *hdata) |
| @@ -2048,7 +2041,7 @@ static void hdmiphy_conf_apply(struct hdmi_context *hdata) | |||
| 2048 | return; | 2041 | return; |
| 2049 | } | 2042 | } |
| 2050 | 2043 | ||
| 2051 | mdelay(10); | 2044 | usleep_range(10000, 12000); |
| 2052 | 2045 | ||
| 2053 | /* operation mode */ | 2046 | /* operation mode */ |
| 2054 | operation[0] = 0x1f; | 2047 | operation[0] = 0x1f; |
| @@ -2170,6 +2163,13 @@ static void hdmi_commit(void *ctx) | |||
| 2170 | 2163 | ||
| 2171 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); | 2164 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); |
| 2172 | 2165 | ||
| 2166 | mutex_lock(&hdata->hdmi_mutex); | ||
| 2167 | if (!hdata->powered) { | ||
| 2168 | mutex_unlock(&hdata->hdmi_mutex); | ||
| 2169 | return; | ||
| 2170 | } | ||
| 2171 | mutex_unlock(&hdata->hdmi_mutex); | ||
| 2172 | |||
| 2173 | hdmi_conf_apply(hdata); | 2173 | hdmi_conf_apply(hdata); |
| 2174 | } | 2174 | } |
| 2175 | 2175 | ||
| @@ -2265,7 +2265,7 @@ static struct exynos_hdmi_ops hdmi_ops = { | |||
| 2265 | .dpms = hdmi_dpms, | 2265 | .dpms = hdmi_dpms, |
| 2266 | }; | 2266 | }; |
| 2267 | 2267 | ||
| 2268 | static irqreturn_t hdmi_external_irq_thread(int irq, void *arg) | 2268 | static irqreturn_t hdmi_irq_thread(int irq, void *arg) |
| 2269 | { | 2269 | { |
| 2270 | struct exynos_drm_hdmi_context *ctx = arg; | 2270 | struct exynos_drm_hdmi_context *ctx = arg; |
| 2271 | struct hdmi_context *hdata = ctx->ctx; | 2271 | struct hdmi_context *hdata = ctx->ctx; |
| @@ -2280,31 +2280,6 @@ static irqreturn_t hdmi_external_irq_thread(int irq, void *arg) | |||
| 2280 | return IRQ_HANDLED; | 2280 | return IRQ_HANDLED; |
| 2281 | } | 2281 | } |
| 2282 | 2282 | ||
| 2283 | static irqreturn_t hdmi_internal_irq_thread(int irq, void *arg) | ||
| 2284 | { | ||
| 2285 | struct exynos_drm_hdmi_context *ctx = arg; | ||
| 2286 | struct hdmi_context *hdata = ctx->ctx; | ||
| 2287 | u32 intc_flag; | ||
| 2288 | |||
| 2289 | intc_flag = hdmi_reg_read(hdata, HDMI_INTC_FLAG); | ||
| 2290 | /* clearing flags for HPD plug/unplug */ | ||
| 2291 | if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) { | ||
| 2292 | DRM_DEBUG_KMS("unplugged\n"); | ||
| 2293 | hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0, | ||
| 2294 | HDMI_INTC_FLAG_HPD_UNPLUG); | ||
| 2295 | } | ||
| 2296 | if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) { | ||
| 2297 | DRM_DEBUG_KMS("plugged\n"); | ||
| 2298 | hdmi_reg_writemask(hdata, HDMI_INTC_FLAG, ~0, | ||
| 2299 | HDMI_INTC_FLAG_HPD_PLUG); | ||
| 2300 | } | ||
| 2301 | |||
| 2302 | if (ctx->drm_dev) | ||
| 2303 | drm_helper_hpd_irq_event(ctx->drm_dev); | ||
| 2304 | |||
| 2305 | return IRQ_HANDLED; | ||
| 2306 | } | ||
| 2307 | |||
| 2308 | static int hdmi_resources_init(struct hdmi_context *hdata) | 2283 | static int hdmi_resources_init(struct hdmi_context *hdata) |
| 2309 | { | 2284 | { |
| 2310 | struct device *dev = hdata->dev; | 2285 | struct device *dev = hdata->dev; |
| @@ -2555,39 +2530,24 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 2555 | 2530 | ||
| 2556 | hdata->hdmiphy_port = hdmi_hdmiphy; | 2531 | hdata->hdmiphy_port = hdmi_hdmiphy; |
| 2557 | 2532 | ||
| 2558 | hdata->external_irq = gpio_to_irq(hdata->hpd_gpio); | 2533 | hdata->irq = gpio_to_irq(hdata->hpd_gpio); |
| 2559 | if (hdata->external_irq < 0) { | 2534 | if (hdata->irq < 0) { |
| 2560 | DRM_ERROR("failed to get GPIO external irq\n"); | 2535 | DRM_ERROR("failed to get GPIO irq\n"); |
| 2561 | ret = hdata->external_irq; | 2536 | ret = hdata->irq; |
| 2562 | goto err_hdmiphy; | ||
| 2563 | } | ||
| 2564 | |||
| 2565 | hdata->internal_irq = platform_get_irq(pdev, 0); | ||
| 2566 | if (hdata->internal_irq < 0) { | ||
| 2567 | DRM_ERROR("failed to get platform internal irq\n"); | ||
| 2568 | ret = hdata->internal_irq; | ||
| 2569 | goto err_hdmiphy; | 2537 | goto err_hdmiphy; |
| 2570 | } | 2538 | } |
| 2571 | 2539 | ||
| 2572 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); | 2540 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); |
| 2573 | 2541 | ||
| 2574 | ret = request_threaded_irq(hdata->external_irq, NULL, | 2542 | ret = request_threaded_irq(hdata->irq, NULL, |
| 2575 | hdmi_external_irq_thread, IRQF_TRIGGER_RISING | | 2543 | hdmi_irq_thread, IRQF_TRIGGER_RISING | |
| 2576 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, | 2544 | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, |
| 2577 | "hdmi_external", drm_hdmi_ctx); | 2545 | "hdmi", drm_hdmi_ctx); |
| 2578 | if (ret) { | 2546 | if (ret) { |
| 2579 | DRM_ERROR("failed to register hdmi external interrupt\n"); | 2547 | DRM_ERROR("failed to register hdmi interrupt\n"); |
| 2580 | goto err_hdmiphy; | 2548 | goto err_hdmiphy; |
| 2581 | } | 2549 | } |
| 2582 | 2550 | ||
| 2583 | ret = request_threaded_irq(hdata->internal_irq, NULL, | ||
| 2584 | hdmi_internal_irq_thread, IRQF_ONESHOT, | ||
| 2585 | "hdmi_internal", drm_hdmi_ctx); | ||
| 2586 | if (ret) { | ||
| 2587 | DRM_ERROR("failed to register hdmi internal interrupt\n"); | ||
| 2588 | goto err_free_irq; | ||
| 2589 | } | ||
| 2590 | |||
| 2591 | /* Attach HDMI Driver to common hdmi. */ | 2551 | /* Attach HDMI Driver to common hdmi. */ |
| 2592 | exynos_hdmi_drv_attach(drm_hdmi_ctx); | 2552 | exynos_hdmi_drv_attach(drm_hdmi_ctx); |
| 2593 | 2553 | ||
| @@ -2598,8 +2558,6 @@ static int hdmi_probe(struct platform_device *pdev) | |||
| 2598 | 2558 | ||
| 2599 | return 0; | 2559 | return 0; |
| 2600 | 2560 | ||
| 2601 | err_free_irq: | ||
| 2602 | free_irq(hdata->external_irq, drm_hdmi_ctx); | ||
| 2603 | err_hdmiphy: | 2561 | err_hdmiphy: |
| 2604 | i2c_del_driver(&hdmiphy_driver); | 2562 | i2c_del_driver(&hdmiphy_driver); |
| 2605 | err_ddc: | 2563 | err_ddc: |
| @@ -2617,8 +2575,7 @@ static int hdmi_remove(struct platform_device *pdev) | |||
| 2617 | 2575 | ||
| 2618 | pm_runtime_disable(dev); | 2576 | pm_runtime_disable(dev); |
| 2619 | 2577 | ||
| 2620 | free_irq(hdata->internal_irq, hdata); | 2578 | free_irq(hdata->irq, hdata); |
| 2621 | free_irq(hdata->external_irq, hdata); | ||
| 2622 | 2579 | ||
| 2623 | 2580 | ||
| 2624 | /* hdmiphy i2c driver */ | 2581 | /* hdmiphy i2c driver */ |
| @@ -2637,8 +2594,7 @@ static int hdmi_suspend(struct device *dev) | |||
| 2637 | 2594 | ||
| 2638 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); | 2595 | DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); |
| 2639 | 2596 | ||
| 2640 | disable_irq(hdata->internal_irq); | 2597 | disable_irq(hdata->irq); |
| 2641 | disable_irq(hdata->external_irq); | ||
| 2642 | 2598 | ||
| 2643 | hdata->hpd = false; | 2599 | hdata->hpd = false; |
| 2644 | if (ctx->drm_dev) | 2600 | if (ctx->drm_dev) |
| @@ -2663,8 +2619,7 @@ static int hdmi_resume(struct device *dev) | |||
| 2663 | 2619 | ||
| 2664 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); | 2620 | hdata->hpd = gpio_get_value(hdata->hpd_gpio); |
| 2665 | 2621 | ||
| 2666 | enable_irq(hdata->external_irq); | 2622 | enable_irq(hdata->irq); |
| 2667 | enable_irq(hdata->internal_irq); | ||
| 2668 | 2623 | ||
| 2669 | if (!pm_runtime_suspended(dev)) { | 2624 | if (!pm_runtime_suspended(dev)) { |
| 2670 | DRM_DEBUG_KMS("%s : Already resumed\n", __func__); | 2625 | DRM_DEBUG_KMS("%s : Already resumed\n", __func__); |
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index c187ea33b748..c414584bfbae 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
| @@ -600,7 +600,7 @@ static void vp_win_reset(struct mixer_context *ctx) | |||
| 600 | /* waiting until VP_SRESET_PROCESSING is 0 */ | 600 | /* waiting until VP_SRESET_PROCESSING is 0 */ |
| 601 | if (~vp_reg_read(res, VP_SRESET) & VP_SRESET_PROCESSING) | 601 | if (~vp_reg_read(res, VP_SRESET) & VP_SRESET_PROCESSING) |
| 602 | break; | 602 | break; |
| 603 | mdelay(10); | 603 | usleep_range(10000, 12000); |
| 604 | } | 604 | } |
| 605 | WARN(tries == 0, "failed to reset Video Processor\n"); | 605 | WARN(tries == 0, "failed to reset Video Processor\n"); |
| 606 | } | 606 | } |
| @@ -776,6 +776,13 @@ static void mixer_win_commit(void *ctx, int win) | |||
| 776 | 776 | ||
| 777 | DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); | 777 | DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); |
| 778 | 778 | ||
| 779 | mutex_lock(&mixer_ctx->mixer_mutex); | ||
| 780 | if (!mixer_ctx->powered) { | ||
| 781 | mutex_unlock(&mixer_ctx->mixer_mutex); | ||
| 782 | return; | ||
| 783 | } | ||
| 784 | mutex_unlock(&mixer_ctx->mixer_mutex); | ||
| 785 | |||
| 779 | if (win > 1 && mixer_ctx->vp_enabled) | 786 | if (win > 1 && mixer_ctx->vp_enabled) |
| 780 | vp_video_buffer(mixer_ctx, win); | 787 | vp_video_buffer(mixer_ctx, win); |
| 781 | else | 788 | else |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index e6a11ca85eaf..9d4a2c2adf0e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/export.h> | 32 | #include <linux/export.h> |
| 33 | #include <generated/utsrelease.h> | ||
| 33 | #include <drm/drmP.h> | 34 | #include <drm/drmP.h> |
| 34 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
| 35 | #include "intel_ringbuffer.h" | 36 | #include "intel_ringbuffer.h" |
| @@ -641,6 +642,7 @@ static void i915_ring_error_state(struct seq_file *m, | |||
| 641 | seq_printf(m, "%s command stream:\n", ring_str(ring)); | 642 | seq_printf(m, "%s command stream:\n", ring_str(ring)); |
| 642 | seq_printf(m, " HEAD: 0x%08x\n", error->head[ring]); | 643 | seq_printf(m, " HEAD: 0x%08x\n", error->head[ring]); |
| 643 | seq_printf(m, " TAIL: 0x%08x\n", error->tail[ring]); | 644 | seq_printf(m, " TAIL: 0x%08x\n", error->tail[ring]); |
| 645 | seq_printf(m, " CTL: 0x%08x\n", error->ctl[ring]); | ||
| 644 | seq_printf(m, " ACTHD: 0x%08x\n", error->acthd[ring]); | 646 | seq_printf(m, " ACTHD: 0x%08x\n", error->acthd[ring]); |
| 645 | seq_printf(m, " IPEIR: 0x%08x\n", error->ipeir[ring]); | 647 | seq_printf(m, " IPEIR: 0x%08x\n", error->ipeir[ring]); |
| 646 | seq_printf(m, " IPEHR: 0x%08x\n", error->ipehr[ring]); | 648 | seq_printf(m, " IPEHR: 0x%08x\n", error->ipehr[ring]); |
| @@ -689,10 +691,13 @@ static int i915_error_state(struct seq_file *m, void *unused) | |||
| 689 | 691 | ||
| 690 | seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec, | 692 | seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec, |
| 691 | error->time.tv_usec); | 693 | error->time.tv_usec); |
| 694 | seq_printf(m, "Kernel: " UTS_RELEASE); | ||
| 692 | seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device); | 695 | seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device); |
| 693 | seq_printf(m, "EIR: 0x%08x\n", error->eir); | 696 | seq_printf(m, "EIR: 0x%08x\n", error->eir); |
| 694 | seq_printf(m, "IER: 0x%08x\n", error->ier); | 697 | seq_printf(m, "IER: 0x%08x\n", error->ier); |
| 695 | seq_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er); | 698 | seq_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er); |
| 699 | seq_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake); | ||
| 700 | seq_printf(m, "DERRMR: 0x%08x\n", error->derrmr); | ||
| 696 | seq_printf(m, "CCID: 0x%08x\n", error->ccid); | 701 | seq_printf(m, "CCID: 0x%08x\n", error->ccid); |
| 697 | 702 | ||
| 698 | for (i = 0; i < dev_priv->num_fence_regs; i++) | 703 | for (i = 0; i < dev_priv->num_fence_regs; i++) |
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ed3059575576..12ab3bdea54d 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
| @@ -188,10 +188,13 @@ struct drm_i915_error_state { | |||
| 188 | u32 pgtbl_er; | 188 | u32 pgtbl_er; |
| 189 | u32 ier; | 189 | u32 ier; |
| 190 | u32 ccid; | 190 | u32 ccid; |
| 191 | u32 derrmr; | ||
| 192 | u32 forcewake; | ||
| 191 | bool waiting[I915_NUM_RINGS]; | 193 | bool waiting[I915_NUM_RINGS]; |
| 192 | u32 pipestat[I915_MAX_PIPES]; | 194 | u32 pipestat[I915_MAX_PIPES]; |
| 193 | u32 tail[I915_NUM_RINGS]; | 195 | u32 tail[I915_NUM_RINGS]; |
| 194 | u32 head[I915_NUM_RINGS]; | 196 | u32 head[I915_NUM_RINGS]; |
| 197 | u32 ctl[I915_NUM_RINGS]; | ||
| 195 | u32 ipeir[I915_NUM_RINGS]; | 198 | u32 ipeir[I915_NUM_RINGS]; |
| 196 | u32 ipehr[I915_NUM_RINGS]; | 199 | u32 ipehr[I915_NUM_RINGS]; |
| 197 | u32 instdone[I915_NUM_RINGS]; | 200 | u32 instdone[I915_NUM_RINGS]; |
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index d6a994a07393..26d08bb58218 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -539,6 +539,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, | |||
| 539 | total = 0; | 539 | total = 0; |
| 540 | for (i = 0; i < count; i++) { | 540 | for (i = 0; i < count; i++) { |
| 541 | struct drm_i915_gem_relocation_entry __user *user_relocs; | 541 | struct drm_i915_gem_relocation_entry __user *user_relocs; |
| 542 | u64 invalid_offset = (u64)-1; | ||
| 543 | int j; | ||
| 542 | 544 | ||
| 543 | user_relocs = (void __user *)(uintptr_t)exec[i].relocs_ptr; | 545 | user_relocs = (void __user *)(uintptr_t)exec[i].relocs_ptr; |
| 544 | 546 | ||
| @@ -549,6 +551,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, | |||
| 549 | goto err; | 551 | goto err; |
| 550 | } | 552 | } |
| 551 | 553 | ||
| 554 | /* As we do not update the known relocation offsets after | ||
| 555 | * relocating (due to the complexities in lock handling), | ||
| 556 | * we need to mark them as invalid now so that we force the | ||
| 557 | * relocation processing next time. Just in case the target | ||
| 558 | * object is evicted and then rebound into its old | ||
| 559 | * presumed_offset before the next execbuffer - if that | ||
| 560 | * happened we would make the mistake of assuming that the | ||
| 561 | * relocations were valid. | ||
| 562 | */ | ||
| 563 | for (j = 0; j < exec[i].relocation_count; j++) { | ||
| 564 | if (copy_to_user(&user_relocs[j].presumed_offset, | ||
| 565 | &invalid_offset, | ||
| 566 | sizeof(invalid_offset))) { | ||
| 567 | ret = -EFAULT; | ||
| 568 | mutex_lock(&dev->struct_mutex); | ||
| 569 | goto err; | ||
| 570 | } | ||
| 571 | } | ||
| 572 | |||
| 552 | reloc_offset[i] = total; | 573 | reloc_offset[i] = total; |
| 553 | total += exec[i].relocation_count; | 574 | total += exec[i].relocation_count; |
| 554 | } | 575 | } |
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2220dec3e5d9..fe843389c7b4 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -1157,6 +1157,7 @@ static void i915_record_ring_state(struct drm_device *dev, | |||
| 1157 | error->acthd[ring->id] = intel_ring_get_active_head(ring); | 1157 | error->acthd[ring->id] = intel_ring_get_active_head(ring); |
| 1158 | error->head[ring->id] = I915_READ_HEAD(ring); | 1158 | error->head[ring->id] = I915_READ_HEAD(ring); |
| 1159 | error->tail[ring->id] = I915_READ_TAIL(ring); | 1159 | error->tail[ring->id] = I915_READ_TAIL(ring); |
| 1160 | error->ctl[ring->id] = I915_READ_CTL(ring); | ||
| 1160 | 1161 | ||
| 1161 | error->cpu_ring_head[ring->id] = ring->head; | 1162 | error->cpu_ring_head[ring->id] = ring->head; |
| 1162 | error->cpu_ring_tail[ring->id] = ring->tail; | 1163 | error->cpu_ring_tail[ring->id] = ring->tail; |
| @@ -1251,6 +1252,16 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
| 1251 | else | 1252 | else |
| 1252 | error->ier = I915_READ(IER); | 1253 | error->ier = I915_READ(IER); |
| 1253 | 1254 | ||
| 1255 | if (INTEL_INFO(dev)->gen >= 6) | ||
| 1256 | error->derrmr = I915_READ(DERRMR); | ||
| 1257 | |||
| 1258 | if (IS_VALLEYVIEW(dev)) | ||
| 1259 | error->forcewake = I915_READ(FORCEWAKE_VLV); | ||
| 1260 | else if (INTEL_INFO(dev)->gen >= 7) | ||
| 1261 | error->forcewake = I915_READ(FORCEWAKE_MT); | ||
| 1262 | else if (INTEL_INFO(dev)->gen == 6) | ||
| 1263 | error->forcewake = I915_READ(FORCEWAKE); | ||
| 1264 | |||
| 1254 | for_each_pipe(pipe) | 1265 | for_each_pipe(pipe) |
| 1255 | error->pipestat[pipe] = I915_READ(PIPESTAT(pipe)); | 1266 | error->pipestat[pipe] = I915_READ(PIPESTAT(pipe)); |
| 1256 | 1267 | ||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 186ee5c85b51..59afb7eb6db6 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -512,6 +512,8 @@ | |||
| 512 | #define GEN7_ERR_INT 0x44040 | 512 | #define GEN7_ERR_INT 0x44040 |
| 513 | #define ERR_INT_MMIO_UNCLAIMED (1<<13) | 513 | #define ERR_INT_MMIO_UNCLAIMED (1<<13) |
| 514 | 514 | ||
| 515 | #define DERRMR 0x44050 | ||
| 516 | |||
| 515 | /* GM45+ chicken bits -- debug workaround bits that may be required | 517 | /* GM45+ chicken bits -- debug workaround bits that may be required |
| 516 | * for various sorts of correct behavior. The top 16 bits of each are | 518 | * for various sorts of correct behavior. The top 16 bits of each are |
| 517 | * the enables for writing to the corresponding low bit. | 519 | * the enables for writing to the corresponding low bit. |
| @@ -531,6 +533,7 @@ | |||
| 531 | #define MI_MODE 0x0209c | 533 | #define MI_MODE 0x0209c |
| 532 | # define VS_TIMER_DISPATCH (1 << 6) | 534 | # define VS_TIMER_DISPATCH (1 << 6) |
| 533 | # define MI_FLUSH_ENABLE (1 << 12) | 535 | # define MI_FLUSH_ENABLE (1 << 12) |
| 536 | # define ASYNC_FLIP_PERF_DISABLE (1 << 14) | ||
| 534 | 537 | ||
| 535 | #define GEN6_GT_MODE 0x20d0 | 538 | #define GEN6_GT_MODE 0x20d0 |
| 536 | #define GEN6_GT_MODE_HI (1 << 9) | 539 | #define GEN6_GT_MODE_HI (1 << 9) |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 1b63d55318a0..fb3715b4b09d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -2579,7 +2579,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect | |||
| 2579 | 2579 | ||
| 2580 | static void | 2580 | static void |
| 2581 | intel_dp_init_panel_power_sequencer(struct drm_device *dev, | 2581 | intel_dp_init_panel_power_sequencer(struct drm_device *dev, |
| 2582 | struct intel_dp *intel_dp) | 2582 | struct intel_dp *intel_dp, |
| 2583 | struct edp_power_seq *out) | ||
| 2583 | { | 2584 | { |
| 2584 | struct drm_i915_private *dev_priv = dev->dev_private; | 2585 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 2585 | struct edp_power_seq cur, vbt, spec, final; | 2586 | struct edp_power_seq cur, vbt, spec, final; |
| @@ -2650,16 +2651,35 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev, | |||
| 2650 | intel_dp->panel_power_cycle_delay = get_delay(t11_t12); | 2651 | intel_dp->panel_power_cycle_delay = get_delay(t11_t12); |
| 2651 | #undef get_delay | 2652 | #undef get_delay |
| 2652 | 2653 | ||
| 2654 | DRM_DEBUG_KMS("panel power up delay %d, power down delay %d, power cycle delay %d\n", | ||
| 2655 | intel_dp->panel_power_up_delay, intel_dp->panel_power_down_delay, | ||
| 2656 | intel_dp->panel_power_cycle_delay); | ||
| 2657 | |||
| 2658 | DRM_DEBUG_KMS("backlight on delay %d, off delay %d\n", | ||
| 2659 | intel_dp->backlight_on_delay, intel_dp->backlight_off_delay); | ||
| 2660 | |||
| 2661 | if (out) | ||
| 2662 | *out = final; | ||
| 2663 | } | ||
| 2664 | |||
| 2665 | static void | ||
| 2666 | intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev, | ||
| 2667 | struct intel_dp *intel_dp, | ||
| 2668 | struct edp_power_seq *seq) | ||
| 2669 | { | ||
| 2670 | struct drm_i915_private *dev_priv = dev->dev_private; | ||
| 2671 | u32 pp_on, pp_off, pp_div; | ||
| 2672 | |||
| 2653 | /* And finally store the new values in the power sequencer. */ | 2673 | /* And finally store the new values in the power sequencer. */ |
| 2654 | pp_on = (final.t1_t3 << PANEL_POWER_UP_DELAY_SHIFT) | | 2674 | pp_on = (seq->t1_t3 << PANEL_POWER_UP_DELAY_SHIFT) | |
| 2655 | (final.t8 << PANEL_LIGHT_ON_DELAY_SHIFT); | 2675 | (seq->t8 << PANEL_LIGHT_ON_DELAY_SHIFT); |
| 2656 | pp_off = (final.t9 << PANEL_LIGHT_OFF_DELAY_SHIFT) | | 2676 | pp_off = (seq->t9 << PANEL_LIGHT_OFF_DELAY_SHIFT) | |
| 2657 | (final.t10 << PANEL_POWER_DOWN_DELAY_SHIFT); | 2677 | (seq->t10 << PANEL_POWER_DOWN_DELAY_SHIFT); |
| 2658 | /* Compute the divisor for the pp clock, simply match the Bspec | 2678 | /* Compute the divisor for the pp clock, simply match the Bspec |
| 2659 | * formula. */ | 2679 | * formula. */ |
| 2660 | pp_div = ((100 * intel_pch_rawclk(dev))/2 - 1) | 2680 | pp_div = ((100 * intel_pch_rawclk(dev))/2 - 1) |
| 2661 | << PP_REFERENCE_DIVIDER_SHIFT; | 2681 | << PP_REFERENCE_DIVIDER_SHIFT; |
| 2662 | pp_div |= (DIV_ROUND_UP(final.t11_t12, 1000) | 2682 | pp_div |= (DIV_ROUND_UP(seq->t11_t12, 1000) |
| 2663 | << PANEL_POWER_CYCLE_DELAY_SHIFT); | 2683 | << PANEL_POWER_CYCLE_DELAY_SHIFT); |
| 2664 | 2684 | ||
| 2665 | /* Haswell doesn't have any port selection bits for the panel | 2685 | /* Haswell doesn't have any port selection bits for the panel |
| @@ -2675,14 +2695,6 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev, | |||
| 2675 | I915_WRITE(PCH_PP_OFF_DELAYS, pp_off); | 2695 | I915_WRITE(PCH_PP_OFF_DELAYS, pp_off); |
| 2676 | I915_WRITE(PCH_PP_DIVISOR, pp_div); | 2696 | I915_WRITE(PCH_PP_DIVISOR, pp_div); |
| 2677 | 2697 | ||
| 2678 | |||
| 2679 | DRM_DEBUG_KMS("panel power up delay %d, power down delay %d, power cycle delay %d\n", | ||
| 2680 | intel_dp->panel_power_up_delay, intel_dp->panel_power_down_delay, | ||
| 2681 | intel_dp->panel_power_cycle_delay); | ||
| 2682 | |||
| 2683 | DRM_DEBUG_KMS("backlight on delay %d, off delay %d\n", | ||
| 2684 | intel_dp->backlight_on_delay, intel_dp->backlight_off_delay); | ||
| 2685 | |||
| 2686 | DRM_DEBUG_KMS("panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n", | 2698 | DRM_DEBUG_KMS("panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n", |
| 2687 | I915_READ(PCH_PP_ON_DELAYS), | 2699 | I915_READ(PCH_PP_ON_DELAYS), |
| 2688 | I915_READ(PCH_PP_OFF_DELAYS), | 2700 | I915_READ(PCH_PP_OFF_DELAYS), |
| @@ -2699,6 +2711,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
| 2699 | struct drm_device *dev = intel_encoder->base.dev; | 2711 | struct drm_device *dev = intel_encoder->base.dev; |
| 2700 | struct drm_i915_private *dev_priv = dev->dev_private; | 2712 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 2701 | struct drm_display_mode *fixed_mode = NULL; | 2713 | struct drm_display_mode *fixed_mode = NULL; |
| 2714 | struct edp_power_seq power_seq = { 0 }; | ||
| 2702 | enum port port = intel_dig_port->port; | 2715 | enum port port = intel_dig_port->port; |
| 2703 | const char *name = NULL; | 2716 | const char *name = NULL; |
| 2704 | int type; | 2717 | int type; |
| @@ -2771,7 +2784,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
| 2771 | } | 2784 | } |
| 2772 | 2785 | ||
| 2773 | if (is_edp(intel_dp)) | 2786 | if (is_edp(intel_dp)) |
| 2774 | intel_dp_init_panel_power_sequencer(dev, intel_dp); | 2787 | intel_dp_init_panel_power_sequencer(dev, intel_dp, &power_seq); |
| 2775 | 2788 | ||
| 2776 | intel_dp_i2c_init(intel_dp, intel_connector, name); | 2789 | intel_dp_i2c_init(intel_dp, intel_connector, name); |
| 2777 | 2790 | ||
| @@ -2798,6 +2811,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, | |||
| 2798 | return; | 2811 | return; |
| 2799 | } | 2812 | } |
| 2800 | 2813 | ||
| 2814 | /* We now know it's not a ghost, init power sequence regs. */ | ||
| 2815 | intel_dp_init_panel_power_sequencer_registers(dev, intel_dp, | ||
| 2816 | &power_seq); | ||
| 2817 | |||
| 2801 | ironlake_edp_panel_vdd_on(intel_dp); | 2818 | ironlake_edp_panel_vdd_on(intel_dp); |
| 2802 | edid = drm_get_edid(connector, &intel_dp->adapter); | 2819 | edid = drm_get_edid(connector, &intel_dp->adapter); |
| 2803 | if (edid) { | 2820 | if (edid) { |
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index e83a11794172..3280cffe50f4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -4250,7 +4250,8 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) | |||
| 4250 | static void __gen6_gt_force_wake_mt_reset(struct drm_i915_private *dev_priv) | 4250 | static void __gen6_gt_force_wake_mt_reset(struct drm_i915_private *dev_priv) |
| 4251 | { | 4251 | { |
| 4252 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_DISABLE(0xffff)); | 4252 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_DISABLE(0xffff)); |
| 4253 | POSTING_READ(ECOBUS); /* something from same cacheline, but !FORCEWAKE */ | 4253 | /* something from same cacheline, but !FORCEWAKE_MT */ |
| 4254 | POSTING_READ(ECOBUS); | ||
| 4254 | } | 4255 | } |
| 4255 | 4256 | ||
| 4256 | static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) | 4257 | static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) |
| @@ -4267,7 +4268,8 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) | |||
| 4267 | DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n"); | 4268 | DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n"); |
| 4268 | 4269 | ||
| 4269 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL)); | 4270 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL)); |
| 4270 | POSTING_READ(ECOBUS); /* something from same cacheline, but !FORCEWAKE */ | 4271 | /* something from same cacheline, but !FORCEWAKE_MT */ |
| 4272 | POSTING_READ(ECOBUS); | ||
| 4271 | 4273 | ||
| 4272 | if (wait_for_atomic((I915_READ_NOTRACE(forcewake_ack) & 1), | 4274 | if (wait_for_atomic((I915_READ_NOTRACE(forcewake_ack) & 1), |
| 4273 | FORCEWAKE_ACK_TIMEOUT_MS)) | 4275 | FORCEWAKE_ACK_TIMEOUT_MS)) |
| @@ -4304,14 +4306,16 @@ void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv) | |||
| 4304 | static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) | 4306 | static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) |
| 4305 | { | 4307 | { |
| 4306 | I915_WRITE_NOTRACE(FORCEWAKE, 0); | 4308 | I915_WRITE_NOTRACE(FORCEWAKE, 0); |
| 4307 | /* gen6_gt_check_fifodbg doubles as the POSTING_READ */ | 4309 | /* something from same cacheline, but !FORCEWAKE */ |
| 4310 | POSTING_READ(ECOBUS); | ||
| 4308 | gen6_gt_check_fifodbg(dev_priv); | 4311 | gen6_gt_check_fifodbg(dev_priv); |
| 4309 | } | 4312 | } |
| 4310 | 4313 | ||
| 4311 | static void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv) | 4314 | static void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv) |
| 4312 | { | 4315 | { |
| 4313 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); | 4316 | I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); |
| 4314 | /* gen6_gt_check_fifodbg doubles as the POSTING_READ */ | 4317 | /* something from same cacheline, but !FORCEWAKE_MT */ |
| 4318 | POSTING_READ(ECOBUS); | ||
| 4315 | gen6_gt_check_fifodbg(dev_priv); | 4319 | gen6_gt_check_fifodbg(dev_priv); |
| 4316 | } | 4320 | } |
| 4317 | 4321 | ||
| @@ -4351,6 +4355,8 @@ int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv) | |||
| 4351 | static void vlv_force_wake_reset(struct drm_i915_private *dev_priv) | 4355 | static void vlv_force_wake_reset(struct drm_i915_private *dev_priv) |
| 4352 | { | 4356 | { |
| 4353 | I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_DISABLE(0xffff)); | 4357 | I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_DISABLE(0xffff)); |
| 4358 | /* something from same cacheline, but !FORCEWAKE_VLV */ | ||
| 4359 | POSTING_READ(FORCEWAKE_ACK_VLV); | ||
| 4354 | } | 4360 | } |
| 4355 | 4361 | ||
| 4356 | static void vlv_force_wake_get(struct drm_i915_private *dev_priv) | 4362 | static void vlv_force_wake_get(struct drm_i915_private *dev_priv) |
| @@ -4371,7 +4377,8 @@ static void vlv_force_wake_get(struct drm_i915_private *dev_priv) | |||
| 4371 | static void vlv_force_wake_put(struct drm_i915_private *dev_priv) | 4377 | static void vlv_force_wake_put(struct drm_i915_private *dev_priv) |
| 4372 | { | 4378 | { |
| 4373 | I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); | 4379 | I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_DISABLE(FORCEWAKE_KERNEL)); |
| 4374 | /* The below doubles as a POSTING_READ */ | 4380 | /* something from same cacheline, but !FORCEWAKE_VLV */ |
| 4381 | POSTING_READ(FORCEWAKE_ACK_VLV); | ||
| 4375 | gen6_gt_check_fifodbg(dev_priv); | 4382 | gen6_gt_check_fifodbg(dev_priv); |
| 4376 | } | 4383 | } |
| 4377 | 4384 | ||
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index ae253e04c391..42ff97d667d2 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
| @@ -505,13 +505,25 @@ static int init_render_ring(struct intel_ring_buffer *ring) | |||
| 505 | struct drm_i915_private *dev_priv = dev->dev_private; | 505 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 506 | int ret = init_ring_common(ring); | 506 | int ret = init_ring_common(ring); |
| 507 | 507 | ||
| 508 | if (INTEL_INFO(dev)->gen > 3) { | 508 | if (INTEL_INFO(dev)->gen > 3) |
| 509 | I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH)); | 509 | I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH)); |
| 510 | if (IS_GEN7(dev)) | 510 | |
| 511 | I915_WRITE(GFX_MODE_GEN7, | 511 | /* We need to disable the AsyncFlip performance optimisations in order |
| 512 | _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) | | 512 | * to use MI_WAIT_FOR_EVENT within the CS. It should already be |
| 513 | _MASKED_BIT_ENABLE(GFX_REPLAY_MODE)); | 513 | * programmed to '1' on all products. |
| 514 | } | 514 | */ |
| 515 | if (INTEL_INFO(dev)->gen >= 6) | ||
| 516 | I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE)); | ||
| 517 | |||
| 518 | /* Required for the hardware to program scanline values for waiting */ | ||
| 519 | if (INTEL_INFO(dev)->gen == 6) | ||
| 520 | I915_WRITE(GFX_MODE, | ||
| 521 | _MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_ALWAYS)); | ||
| 522 | |||
| 523 | if (IS_GEN7(dev)) | ||
| 524 | I915_WRITE(GFX_MODE_GEN7, | ||
| 525 | _MASKED_BIT_DISABLE(GFX_TLB_INVALIDATE_ALWAYS) | | ||
| 526 | _MASKED_BIT_ENABLE(GFX_REPLAY_MODE)); | ||
| 515 | 527 | ||
| 516 | if (INTEL_INFO(dev)->gen >= 5) { | 528 | if (INTEL_INFO(dev)->gen >= 5) { |
| 517 | ret = init_pipe_control(ring); | 529 | ret = init_pipe_control(ring); |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 061fa0a28900..4d0e60adbc6d 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -2401,6 +2401,12 @@ static int evergreen_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 2401 | { | 2401 | { |
| 2402 | struct evergreen_mc_save save; | 2402 | struct evergreen_mc_save save; |
| 2403 | 2403 | ||
| 2404 | if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) | ||
| 2405 | reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE); | ||
| 2406 | |||
| 2407 | if (RREG32(DMA_STATUS_REG) & DMA_IDLE) | ||
| 2408 | reset_mask &= ~RADEON_RESET_DMA; | ||
| 2409 | |||
| 2404 | if (reset_mask == 0) | 2410 | if (reset_mask == 0) |
| 2405 | return 0; | 2411 | return 0; |
| 2406 | 2412 | ||
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 896f1cbc58a5..835992d8d067 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
| @@ -1216,7 +1216,7 @@ void cayman_dma_stop(struct radeon_device *rdev) | |||
| 1216 | int cayman_dma_resume(struct radeon_device *rdev) | 1216 | int cayman_dma_resume(struct radeon_device *rdev) |
| 1217 | { | 1217 | { |
| 1218 | struct radeon_ring *ring; | 1218 | struct radeon_ring *ring; |
| 1219 | u32 rb_cntl, dma_cntl; | 1219 | u32 rb_cntl, dma_cntl, ib_cntl; |
| 1220 | u32 rb_bufsz; | 1220 | u32 rb_bufsz; |
| 1221 | u32 reg_offset, wb_offset; | 1221 | u32 reg_offset, wb_offset; |
| 1222 | int i, r; | 1222 | int i, r; |
| @@ -1265,7 +1265,11 @@ int cayman_dma_resume(struct radeon_device *rdev) | |||
| 1265 | WREG32(DMA_RB_BASE + reg_offset, ring->gpu_addr >> 8); | 1265 | WREG32(DMA_RB_BASE + reg_offset, ring->gpu_addr >> 8); |
| 1266 | 1266 | ||
| 1267 | /* enable DMA IBs */ | 1267 | /* enable DMA IBs */ |
| 1268 | WREG32(DMA_IB_CNTL + reg_offset, DMA_IB_ENABLE | CMD_VMID_FORCE); | 1268 | ib_cntl = DMA_IB_ENABLE | CMD_VMID_FORCE; |
| 1269 | #ifdef __BIG_ENDIAN | ||
| 1270 | ib_cntl |= DMA_IB_SWAP_ENABLE; | ||
| 1271 | #endif | ||
| 1272 | WREG32(DMA_IB_CNTL + reg_offset, ib_cntl); | ||
| 1269 | 1273 | ||
| 1270 | dma_cntl = RREG32(DMA_CNTL + reg_offset); | 1274 | dma_cntl = RREG32(DMA_CNTL + reg_offset); |
| 1271 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; | 1275 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; |
| @@ -1409,6 +1413,12 @@ static int cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 1409 | { | 1413 | { |
| 1410 | struct evergreen_mc_save save; | 1414 | struct evergreen_mc_save save; |
| 1411 | 1415 | ||
| 1416 | if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) | ||
| 1417 | reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE); | ||
| 1418 | |||
| 1419 | if (RREG32(DMA_STATUS_REG) & DMA_IDLE) | ||
| 1420 | reset_mask &= ~RADEON_RESET_DMA; | ||
| 1421 | |||
| 1412 | if (reset_mask == 0) | 1422 | if (reset_mask == 0) |
| 1413 | return 0; | 1423 | return 0; |
| 1414 | 1424 | ||
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 537e259b3837..bc2540b17c5e 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -1378,6 +1378,12 @@ static int r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 1378 | { | 1378 | { |
| 1379 | struct rv515_mc_save save; | 1379 | struct rv515_mc_save save; |
| 1380 | 1380 | ||
| 1381 | if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) | ||
| 1382 | reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE); | ||
| 1383 | |||
| 1384 | if (RREG32(DMA_STATUS_REG) & DMA_IDLE) | ||
| 1385 | reset_mask &= ~RADEON_RESET_DMA; | ||
| 1386 | |||
| 1381 | if (reset_mask == 0) | 1387 | if (reset_mask == 0) |
| 1382 | return 0; | 1388 | return 0; |
| 1383 | 1389 | ||
| @@ -2307,7 +2313,7 @@ void r600_dma_stop(struct radeon_device *rdev) | |||
| 2307 | int r600_dma_resume(struct radeon_device *rdev) | 2313 | int r600_dma_resume(struct radeon_device *rdev) |
| 2308 | { | 2314 | { |
| 2309 | struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; | 2315 | struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX]; |
| 2310 | u32 rb_cntl, dma_cntl; | 2316 | u32 rb_cntl, dma_cntl, ib_cntl; |
| 2311 | u32 rb_bufsz; | 2317 | u32 rb_bufsz; |
| 2312 | int r; | 2318 | int r; |
| 2313 | 2319 | ||
| @@ -2347,7 +2353,11 @@ int r600_dma_resume(struct radeon_device *rdev) | |||
| 2347 | WREG32(DMA_RB_BASE, ring->gpu_addr >> 8); | 2353 | WREG32(DMA_RB_BASE, ring->gpu_addr >> 8); |
| 2348 | 2354 | ||
| 2349 | /* enable DMA IBs */ | 2355 | /* enable DMA IBs */ |
| 2350 | WREG32(DMA_IB_CNTL, DMA_IB_ENABLE); | 2356 | ib_cntl = DMA_IB_ENABLE; |
| 2357 | #ifdef __BIG_ENDIAN | ||
| 2358 | ib_cntl |= DMA_IB_SWAP_ENABLE; | ||
| 2359 | #endif | ||
| 2360 | WREG32(DMA_IB_CNTL, ib_cntl); | ||
| 2351 | 2361 | ||
| 2352 | dma_cntl = RREG32(DMA_CNTL); | 2362 | dma_cntl = RREG32(DMA_CNTL); |
| 2353 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; | 2363 | dma_cntl &= ~CTXEMPTY_INT_ENABLE; |
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 34e52304a525..a08f657329a0 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
| @@ -324,7 +324,6 @@ struct radeon_bo { | |||
| 324 | struct list_head list; | 324 | struct list_head list; |
| 325 | /* Protected by tbo.reserved */ | 325 | /* Protected by tbo.reserved */ |
| 326 | u32 placements[3]; | 326 | u32 placements[3]; |
| 327 | u32 busy_placements[3]; | ||
| 328 | struct ttm_placement placement; | 327 | struct ttm_placement placement; |
| 329 | struct ttm_buffer_object tbo; | 328 | struct ttm_buffer_object tbo; |
| 330 | struct ttm_bo_kmap_obj kmap; | 329 | struct ttm_bo_kmap_obj kmap; |
| @@ -654,6 +653,8 @@ struct radeon_ring { | |||
| 654 | u32 ptr_reg_mask; | 653 | u32 ptr_reg_mask; |
| 655 | u32 nop; | 654 | u32 nop; |
| 656 | u32 idx; | 655 | u32 idx; |
| 656 | u64 last_semaphore_signal_addr; | ||
| 657 | u64 last_semaphore_wait_addr; | ||
| 657 | }; | 658 | }; |
| 658 | 659 | ||
| 659 | /* | 660 | /* |
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 469661fd1903..5407459e56d2 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
| @@ -286,6 +286,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) | |||
| 286 | p->chunks[p->chunk_ib_idx].kpage[1] == NULL) { | 286 | p->chunks[p->chunk_ib_idx].kpage[1] == NULL) { |
| 287 | kfree(p->chunks[p->chunk_ib_idx].kpage[0]); | 287 | kfree(p->chunks[p->chunk_ib_idx].kpage[0]); |
| 288 | kfree(p->chunks[p->chunk_ib_idx].kpage[1]); | 288 | kfree(p->chunks[p->chunk_ib_idx].kpage[1]); |
| 289 | p->chunks[p->chunk_ib_idx].kpage[0] = NULL; | ||
| 290 | p->chunks[p->chunk_ib_idx].kpage[1] = NULL; | ||
| 289 | return -ENOMEM; | 291 | return -ENOMEM; |
| 290 | } | 292 | } |
| 291 | } | 293 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index ad6df625e8b8..0d67674b64b1 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c | |||
| @@ -241,7 +241,8 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc, | |||
| 241 | y = 0; | 241 | y = 0; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | if (ASIC_IS_AVIVO(rdev)) { | 244 | /* fixed on DCE6 and newer */ |
| 245 | if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE6(rdev)) { | ||
| 245 | int i = 0; | 246 | int i = 0; |
| 246 | struct drm_crtc *crtc_p; | 247 | struct drm_crtc *crtc_p; |
| 247 | 248 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index edfc54e41842..0d6562bb0c93 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -429,7 +429,8 @@ bool radeon_card_posted(struct radeon_device *rdev) | |||
| 429 | { | 429 | { |
| 430 | uint32_t reg; | 430 | uint32_t reg; |
| 431 | 431 | ||
| 432 | if (efi_enabled && rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) | 432 | if (efi_enabled(EFI_BOOT) && |
| 433 | rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) | ||
| 433 | return false; | 434 | return false; |
| 434 | 435 | ||
| 435 | /* first check CRTCs */ | 436 | /* first check CRTCs */ |
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 1da2386d7cf7..ff3def784619 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c | |||
| @@ -1122,7 +1122,7 @@ radeon_user_framebuffer_create(struct drm_device *dev, | |||
| 1122 | if (ret) { | 1122 | if (ret) { |
| 1123 | kfree(radeon_fb); | 1123 | kfree(radeon_fb); |
| 1124 | drm_gem_object_unreference_unlocked(obj); | 1124 | drm_gem_object_unreference_unlocked(obj); |
| 1125 | return NULL; | 1125 | return ERR_PTR(ret); |
| 1126 | } | 1126 | } |
| 1127 | 1127 | ||
| 1128 | return &radeon_fb->base; | 1128 | return &radeon_fb->base; |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index dff6cf77f953..d9bf96ee299a 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
| @@ -69,9 +69,10 @@ | |||
| 69 | * 2.26.0 - r600-eg: fix htile size computation | 69 | * 2.26.0 - r600-eg: fix htile size computation |
| 70 | * 2.27.0 - r600-SI: Add CS ioctl support for async DMA | 70 | * 2.27.0 - r600-SI: Add CS ioctl support for async DMA |
| 71 | * 2.28.0 - r600-eg: Add MEM_WRITE packet support | 71 | * 2.28.0 - r600-eg: Add MEM_WRITE packet support |
| 72 | * 2.29.0 - R500 FP16 color clear registers | ||
| 72 | */ | 73 | */ |
| 73 | #define KMS_DRIVER_MAJOR 2 | 74 | #define KMS_DRIVER_MAJOR 2 |
| 74 | #define KMS_DRIVER_MINOR 28 | 75 | #define KMS_DRIVER_MINOR 29 |
| 75 | #define KMS_DRIVER_PATCHLEVEL 0 | 76 | #define KMS_DRIVER_PATCHLEVEL 0 |
| 76 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | 77 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); |
| 77 | int radeon_driver_unload_kms(struct drm_device *dev); | 78 | int radeon_driver_unload_kms(struct drm_device *dev); |
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 883c95d8d90f..d3aface2d12d 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
| @@ -84,6 +84,7 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) | |||
| 84 | rbo->placement.fpfn = 0; | 84 | rbo->placement.fpfn = 0; |
| 85 | rbo->placement.lpfn = 0; | 85 | rbo->placement.lpfn = 0; |
| 86 | rbo->placement.placement = rbo->placements; | 86 | rbo->placement.placement = rbo->placements; |
| 87 | rbo->placement.busy_placement = rbo->placements; | ||
| 87 | if (domain & RADEON_GEM_DOMAIN_VRAM) | 88 | if (domain & RADEON_GEM_DOMAIN_VRAM) |
| 88 | rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | | 89 | rbo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | |
| 89 | TTM_PL_FLAG_VRAM; | 90 | TTM_PL_FLAG_VRAM; |
| @@ -104,14 +105,6 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) | |||
| 104 | if (!c) | 105 | if (!c) |
| 105 | rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; | 106 | rbo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM; |
| 106 | rbo->placement.num_placement = c; | 107 | rbo->placement.num_placement = c; |
| 107 | |||
| 108 | c = 0; | ||
| 109 | rbo->placement.busy_placement = rbo->busy_placements; | ||
| 110 | if (rbo->rdev->flags & RADEON_IS_AGP) { | ||
| 111 | rbo->busy_placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_TT; | ||
| 112 | } else { | ||
| 113 | rbo->busy_placements[c++] = TTM_PL_FLAG_CACHED | TTM_PL_FLAG_TT; | ||
| 114 | } | ||
| 115 | rbo->placement.num_busy_placement = c; | 108 | rbo->placement.num_busy_placement = c; |
| 116 | } | 109 | } |
| 117 | 110 | ||
| @@ -357,6 +350,7 @@ int radeon_bo_list_validate(struct list_head *head) | |||
| 357 | { | 350 | { |
| 358 | struct radeon_bo_list *lobj; | 351 | struct radeon_bo_list *lobj; |
| 359 | struct radeon_bo *bo; | 352 | struct radeon_bo *bo; |
| 353 | u32 domain; | ||
| 360 | int r; | 354 | int r; |
| 361 | 355 | ||
| 362 | r = ttm_eu_reserve_buffers(head); | 356 | r = ttm_eu_reserve_buffers(head); |
| @@ -366,9 +360,17 @@ int radeon_bo_list_validate(struct list_head *head) | |||
| 366 | list_for_each_entry(lobj, head, tv.head) { | 360 | list_for_each_entry(lobj, head, tv.head) { |
| 367 | bo = lobj->bo; | 361 | bo = lobj->bo; |
| 368 | if (!bo->pin_count) { | 362 | if (!bo->pin_count) { |
| 363 | domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain; | ||
| 364 | |||
| 365 | retry: | ||
| 366 | radeon_ttm_placement_from_domain(bo, domain); | ||
| 369 | r = ttm_bo_validate(&bo->tbo, &bo->placement, | 367 | r = ttm_bo_validate(&bo->tbo, &bo->placement, |
| 370 | true, false); | 368 | true, false); |
| 371 | if (unlikely(r)) { | 369 | if (unlikely(r)) { |
| 370 | if (r != -ERESTARTSYS && domain == RADEON_GEM_DOMAIN_VRAM) { | ||
| 371 | domain |= RADEON_GEM_DOMAIN_GTT; | ||
| 372 | goto retry; | ||
| 373 | } | ||
| 372 | return r; | 374 | return r; |
| 373 | } | 375 | } |
| 374 | } | 376 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 141f2b6a9cf2..2430d80b1871 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
| @@ -784,6 +784,8 @@ static int radeon_debugfs_ring_info(struct seq_file *m, void *data) | |||
| 784 | } | 784 | } |
| 785 | seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n", ring->wptr, ring->wptr); | 785 | seq_printf(m, "driver's copy of the wptr: 0x%08x [%5d]\n", ring->wptr, ring->wptr); |
| 786 | seq_printf(m, "driver's copy of the rptr: 0x%08x [%5d]\n", ring->rptr, ring->rptr); | 786 | seq_printf(m, "driver's copy of the rptr: 0x%08x [%5d]\n", ring->rptr, ring->rptr); |
| 787 | seq_printf(m, "last semaphore signal addr : 0x%016llx\n", ring->last_semaphore_signal_addr); | ||
| 788 | seq_printf(m, "last semaphore wait addr : 0x%016llx\n", ring->last_semaphore_wait_addr); | ||
| 787 | seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw); | 789 | seq_printf(m, "%u free dwords in ring\n", ring->ring_free_dw); |
| 788 | seq_printf(m, "%u dwords in ring\n", count); | 790 | seq_printf(m, "%u dwords in ring\n", count); |
| 789 | /* print 8 dw before current rptr as often it's the last executed | 791 | /* print 8 dw before current rptr as often it's the last executed |
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c index 97f3ece81cd2..8dcc20f53d73 100644 --- a/drivers/gpu/drm/radeon/radeon_semaphore.c +++ b/drivers/gpu/drm/radeon/radeon_semaphore.c | |||
| @@ -95,6 +95,10 @@ int radeon_semaphore_sync_rings(struct radeon_device *rdev, | |||
| 95 | /* we assume caller has already allocated space on waiters ring */ | 95 | /* we assume caller has already allocated space on waiters ring */ |
| 96 | radeon_semaphore_emit_wait(rdev, waiter, semaphore); | 96 | radeon_semaphore_emit_wait(rdev, waiter, semaphore); |
| 97 | 97 | ||
| 98 | /* for debugging lockup only, used by sysfs debug files */ | ||
| 99 | rdev->ring[signaler].last_semaphore_signal_addr = semaphore->gpu_addr; | ||
| 100 | rdev->ring[waiter].last_semaphore_wait_addr = semaphore->gpu_addr; | ||
| 101 | |||
| 98 | return 0; | 102 | return 0; |
| 99 | } | 103 | } |
| 100 | 104 | ||
diff --git a/drivers/gpu/drm/radeon/reg_srcs/rv515 b/drivers/gpu/drm/radeon/reg_srcs/rv515 index 911a8fbd32bb..78d5e99d759d 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/rv515 +++ b/drivers/gpu/drm/radeon/reg_srcs/rv515 | |||
| @@ -324,6 +324,8 @@ rv515 0x6d40 | |||
| 324 | 0x46AC US_OUT_FMT_2 | 324 | 0x46AC US_OUT_FMT_2 |
| 325 | 0x46B0 US_OUT_FMT_3 | 325 | 0x46B0 US_OUT_FMT_3 |
| 326 | 0x46B4 US_W_FMT | 326 | 0x46B4 US_W_FMT |
| 327 | 0x46C0 RB3D_COLOR_CLEAR_VALUE_AR | ||
| 328 | 0x46C4 RB3D_COLOR_CLEAR_VALUE_GB | ||
| 327 | 0x4BC0 FG_FOG_BLEND | 329 | 0x4BC0 FG_FOG_BLEND |
| 328 | 0x4BC4 FG_FOG_FACTOR | 330 | 0x4BC4 FG_FOG_FACTOR |
| 329 | 0x4BC8 FG_FOG_COLOR_R | 331 | 0x4BC8 FG_FOG_COLOR_R |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 3240a3d64f30..ae8b48205a6c 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
| @@ -2215,6 +2215,12 @@ static int si_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) | |||
| 2215 | { | 2215 | { |
| 2216 | struct evergreen_mc_save save; | 2216 | struct evergreen_mc_save save; |
| 2217 | 2217 | ||
| 2218 | if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) | ||
| 2219 | reset_mask &= ~(RADEON_RESET_GFX | RADEON_RESET_COMPUTE); | ||
| 2220 | |||
| 2221 | if (RREG32(DMA_STATUS_REG) & DMA_IDLE) | ||
| 2222 | reset_mask &= ~RADEON_RESET_DMA; | ||
| 2223 | |||
| 2218 | if (reset_mask == 0) | 2224 | if (reset_mask == 0) |
| 2219 | return 0; | 2225 | return 0; |
| 2220 | 2226 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 33d20be87db5..52b20b12c83a 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
| @@ -434,6 +434,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, | |||
| 434 | bo->mem = tmp_mem; | 434 | bo->mem = tmp_mem; |
| 435 | bdev->driver->move_notify(bo, mem); | 435 | bdev->driver->move_notify(bo, mem); |
| 436 | bo->mem = *mem; | 436 | bo->mem = *mem; |
| 437 | *mem = tmp_mem; | ||
| 437 | } | 438 | } |
| 438 | 439 | ||
| 439 | goto out_err; | 440 | goto out_err; |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index d73d6e3e17b2..44420fca7dfa 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
| @@ -344,8 +344,12 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, | |||
| 344 | 344 | ||
| 345 | if (ttm->state == tt_unpopulated) { | 345 | if (ttm->state == tt_unpopulated) { |
| 346 | ret = ttm->bdev->driver->ttm_tt_populate(ttm); | 346 | ret = ttm->bdev->driver->ttm_tt_populate(ttm); |
| 347 | if (ret) | 347 | if (ret) { |
| 348 | /* if we fail here don't nuke the mm node | ||
| 349 | * as the bo still owns it */ | ||
| 350 | old_copy.mm_node = NULL; | ||
| 348 | goto out1; | 351 | goto out1; |
| 352 | } | ||
| 349 | } | 353 | } |
| 350 | 354 | ||
| 351 | add = 0; | 355 | add = 0; |
| @@ -371,8 +375,11 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo, | |||
| 371 | prot); | 375 | prot); |
| 372 | } else | 376 | } else |
| 373 | ret = ttm_copy_io_page(new_iomap, old_iomap, page); | 377 | ret = ttm_copy_io_page(new_iomap, old_iomap, page); |
| 374 | if (ret) | 378 | if (ret) { |
| 379 | /* failing here, means keep old copy as-is */ | ||
| 380 | old_copy.mm_node = NULL; | ||
| 375 | goto out1; | 381 | goto out1; |
| 382 | } | ||
| 376 | } | 383 | } |
| 377 | mb(); | 384 | mb(); |
| 378 | out2: | 385 | out2: |
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index f6c0011a0337..dd289fd179ca 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c | |||
| @@ -403,7 +403,7 @@ struct dm_info_header { | |||
| 403 | */ | 403 | */ |
| 404 | 404 | ||
| 405 | struct dm_info_msg { | 405 | struct dm_info_msg { |
| 406 | struct dm_info_header header; | 406 | struct dm_header hdr; |
| 407 | __u32 reserved; | 407 | __u32 reserved; |
| 408 | __u32 info_size; | 408 | __u32 info_size; |
| 409 | __u8 info[]; | 409 | __u8 info[]; |
| @@ -503,13 +503,17 @@ static void hot_add_req(struct hv_dynmem_device *dm, struct dm_hot_add *msg) | |||
| 503 | 503 | ||
| 504 | static void process_info(struct hv_dynmem_device *dm, struct dm_info_msg *msg) | 504 | static void process_info(struct hv_dynmem_device *dm, struct dm_info_msg *msg) |
| 505 | { | 505 | { |
| 506 | switch (msg->header.type) { | 506 | struct dm_info_header *info_hdr; |
| 507 | |||
| 508 | info_hdr = (struct dm_info_header *)msg->info; | ||
| 509 | |||
| 510 | switch (info_hdr->type) { | ||
| 507 | case INFO_TYPE_MAX_PAGE_CNT: | 511 | case INFO_TYPE_MAX_PAGE_CNT: |
| 508 | pr_info("Received INFO_TYPE_MAX_PAGE_CNT\n"); | 512 | pr_info("Received INFO_TYPE_MAX_PAGE_CNT\n"); |
| 509 | pr_info("Data Size is %d\n", msg->header.data_size); | 513 | pr_info("Data Size is %d\n", info_hdr->data_size); |
| 510 | break; | 514 | break; |
| 511 | default: | 515 | default: |
| 512 | pr_info("Received Unknown type: %d\n", msg->header.type); | 516 | pr_info("Received Unknown type: %d\n", info_hdr->type); |
| 513 | } | 517 | } |
| 514 | } | 518 | } |
| 515 | 519 | ||
| @@ -879,7 +883,7 @@ static int balloon_probe(struct hv_device *dev, | |||
| 879 | balloon_onchannelcallback, dev); | 883 | balloon_onchannelcallback, dev); |
| 880 | 884 | ||
| 881 | if (ret) | 885 | if (ret) |
| 882 | return ret; | 886 | goto probe_error0; |
| 883 | 887 | ||
| 884 | dm_device.dev = dev; | 888 | dm_device.dev = dev; |
| 885 | dm_device.state = DM_INITIALIZING; | 889 | dm_device.state = DM_INITIALIZING; |
| @@ -891,7 +895,7 @@ static int balloon_probe(struct hv_device *dev, | |||
| 891 | kthread_run(dm_thread_func, &dm_device, "hv_balloon"); | 895 | kthread_run(dm_thread_func, &dm_device, "hv_balloon"); |
| 892 | if (IS_ERR(dm_device.thread)) { | 896 | if (IS_ERR(dm_device.thread)) { |
| 893 | ret = PTR_ERR(dm_device.thread); | 897 | ret = PTR_ERR(dm_device.thread); |
| 894 | goto probe_error0; | 898 | goto probe_error1; |
| 895 | } | 899 | } |
| 896 | 900 | ||
| 897 | hv_set_drvdata(dev, &dm_device); | 901 | hv_set_drvdata(dev, &dm_device); |
| @@ -914,12 +918,12 @@ static int balloon_probe(struct hv_device *dev, | |||
| 914 | VM_PKT_DATA_INBAND, | 918 | VM_PKT_DATA_INBAND, |
| 915 | VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); | 919 | VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); |
| 916 | if (ret) | 920 | if (ret) |
| 917 | goto probe_error1; | 921 | goto probe_error2; |
| 918 | 922 | ||
| 919 | t = wait_for_completion_timeout(&dm_device.host_event, 5*HZ); | 923 | t = wait_for_completion_timeout(&dm_device.host_event, 5*HZ); |
| 920 | if (t == 0) { | 924 | if (t == 0) { |
| 921 | ret = -ETIMEDOUT; | 925 | ret = -ETIMEDOUT; |
| 922 | goto probe_error1; | 926 | goto probe_error2; |
| 923 | } | 927 | } |
| 924 | 928 | ||
| 925 | /* | 929 | /* |
| @@ -928,7 +932,7 @@ static int balloon_probe(struct hv_device *dev, | |||
| 928 | */ | 932 | */ |
| 929 | if (dm_device.state == DM_INIT_ERROR) { | 933 | if (dm_device.state == DM_INIT_ERROR) { |
| 930 | ret = -ETIMEDOUT; | 934 | ret = -ETIMEDOUT; |
| 931 | goto probe_error1; | 935 | goto probe_error2; |
| 932 | } | 936 | } |
| 933 | /* | 937 | /* |
| 934 | * Now submit our capabilities to the host. | 938 | * Now submit our capabilities to the host. |
| @@ -961,12 +965,12 @@ static int balloon_probe(struct hv_device *dev, | |||
| 961 | VM_PKT_DATA_INBAND, | 965 | VM_PKT_DATA_INBAND, |
| 962 | VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); | 966 | VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); |
| 963 | if (ret) | 967 | if (ret) |
| 964 | goto probe_error1; | 968 | goto probe_error2; |
| 965 | 969 | ||
| 966 | t = wait_for_completion_timeout(&dm_device.host_event, 5*HZ); | 970 | t = wait_for_completion_timeout(&dm_device.host_event, 5*HZ); |
| 967 | if (t == 0) { | 971 | if (t == 0) { |
| 968 | ret = -ETIMEDOUT; | 972 | ret = -ETIMEDOUT; |
| 969 | goto probe_error1; | 973 | goto probe_error2; |
| 970 | } | 974 | } |
| 971 | 975 | ||
| 972 | /* | 976 | /* |
| @@ -975,18 +979,20 @@ static int balloon_probe(struct hv_device *dev, | |||
| 975 | */ | 979 | */ |
| 976 | if (dm_device.state == DM_INIT_ERROR) { | 980 | if (dm_device.state == DM_INIT_ERROR) { |
| 977 | ret = -ETIMEDOUT; | 981 | ret = -ETIMEDOUT; |
| 978 | goto probe_error1; | 982 | goto probe_error2; |
| 979 | } | 983 | } |
| 980 | 984 | ||
| 981 | dm_device.state = DM_INITIALIZED; | 985 | dm_device.state = DM_INITIALIZED; |
| 982 | 986 | ||
| 983 | return 0; | 987 | return 0; |
| 984 | 988 | ||
| 985 | probe_error1: | 989 | probe_error2: |
| 986 | kthread_stop(dm_device.thread); | 990 | kthread_stop(dm_device.thread); |
| 987 | 991 | ||
| 988 | probe_error0: | 992 | probe_error1: |
| 989 | vmbus_close(dev->channel); | 993 | vmbus_close(dev->channel); |
| 994 | probe_error0: | ||
| 995 | kfree(send_buffer); | ||
| 990 | return ret; | 996 | return ret; |
| 991 | } | 997 | } |
| 992 | 998 | ||
| @@ -999,6 +1005,7 @@ static int balloon_remove(struct hv_device *dev) | |||
| 999 | 1005 | ||
| 1000 | vmbus_close(dev->channel); | 1006 | vmbus_close(dev->channel); |
| 1001 | kthread_stop(dm->thread); | 1007 | kthread_stop(dm->thread); |
| 1008 | kfree(send_buffer); | ||
| 1002 | 1009 | ||
| 1003 | return 0; | 1010 | return 0; |
| 1004 | } | 1011 | } |
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index cbba7db9ad59..f5258c205de5 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/pm_runtime.h> | 35 | #include <linux/pm_runtime.h> |
| 36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 37 | #include <linux/module.h> | ||
| 37 | #include "i2c-designware-core.h" | 38 | #include "i2c-designware-core.h" |
| 38 | 39 | ||
| 39 | /* | 40 | /* |
| @@ -725,3 +726,6 @@ u32 i2c_dw_read_comp_param(struct dw_i2c_dev *dev) | |||
| 725 | return dw_readl(dev, DW_IC_COMP_PARAM_1); | 726 | return dw_readl(dev, DW_IC_COMP_PARAM_1); |
| 726 | } | 727 | } |
| 727 | EXPORT_SYMBOL_GPL(i2c_dw_read_comp_param); | 728 | EXPORT_SYMBOL_GPL(i2c_dw_read_comp_param); |
| 729 | |||
| 730 | MODULE_DESCRIPTION("Synopsys DesignWare I2C bus adapter core"); | ||
| 731 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 1b1a936eccc9..d6abaf2cf2e3 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c | |||
| @@ -127,7 +127,7 @@ struct mxs_i2c_dev { | |||
| 127 | struct device *dev; | 127 | struct device *dev; |
| 128 | void __iomem *regs; | 128 | void __iomem *regs; |
| 129 | struct completion cmd_complete; | 129 | struct completion cmd_complete; |
| 130 | u32 cmd_err; | 130 | int cmd_err; |
| 131 | struct i2c_adapter adapter; | 131 | struct i2c_adapter adapter; |
| 132 | const struct mxs_i2c_speed_config *speed; | 132 | const struct mxs_i2c_speed_config *speed; |
| 133 | 133 | ||
| @@ -316,7 +316,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, | |||
| 316 | if (msg->len == 0) | 316 | if (msg->len == 0) |
| 317 | return -EINVAL; | 317 | return -EINVAL; |
| 318 | 318 | ||
| 319 | init_completion(&i2c->cmd_complete); | 319 | INIT_COMPLETION(i2c->cmd_complete); |
| 320 | i2c->cmd_err = 0; | 320 | i2c->cmd_err = 0; |
| 321 | 321 | ||
| 322 | ret = mxs_i2c_dma_setup_xfer(adap, msg, flags); | 322 | ret = mxs_i2c_dma_setup_xfer(adap, msg, flags); |
| @@ -473,6 +473,8 @@ static int mxs_i2c_probe(struct platform_device *pdev) | |||
| 473 | i2c->dev = dev; | 473 | i2c->dev = dev; |
| 474 | i2c->speed = &mxs_i2c_95kHz_config; | 474 | i2c->speed = &mxs_i2c_95kHz_config; |
| 475 | 475 | ||
| 476 | init_completion(&i2c->cmd_complete); | ||
| 477 | |||
| 476 | if (dev->of_node) { | 478 | if (dev->of_node) { |
| 477 | err = mxs_i2c_get_ofdata(i2c); | 479 | err = mxs_i2c_get_ofdata(i2c); |
| 478 | if (err) | 480 | if (err) |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 20d41bfa7c19..4cc2f0528c88 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -803,7 +803,7 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev) | |||
| 803 | if (stat & OMAP_I2C_STAT_AL) { | 803 | if (stat & OMAP_I2C_STAT_AL) { |
| 804 | dev_err(dev->dev, "Arbitration lost\n"); | 804 | dev_err(dev->dev, "Arbitration lost\n"); |
| 805 | dev->cmd_err |= OMAP_I2C_STAT_AL; | 805 | dev->cmd_err |= OMAP_I2C_STAT_AL; |
| 806 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK); | 806 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL); |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | return -EIO; | 809 | return -EIO; |
| @@ -963,7 +963,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) | |||
| 963 | i2c_omap_errata_i207(dev, stat); | 963 | i2c_omap_errata_i207(dev, stat); |
| 964 | 964 | ||
| 965 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); | 965 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR); |
| 966 | break; | 966 | continue; |
| 967 | } | 967 | } |
| 968 | 968 | ||
| 969 | if (stat & OMAP_I2C_STAT_RRDY) { | 969 | if (stat & OMAP_I2C_STAT_RRDY) { |
| @@ -989,7 +989,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id) | |||
| 989 | break; | 989 | break; |
| 990 | 990 | ||
| 991 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); | 991 | omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR); |
| 992 | break; | 992 | continue; |
| 993 | } | 993 | } |
| 994 | 994 | ||
| 995 | if (stat & OMAP_I2C_STAT_XRDY) { | 995 | if (stat & OMAP_I2C_STAT_XRDY) { |
diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c index 3f1818b87974..e03381aee34f 100644 --- a/drivers/i2c/busses/i2c-sirf.c +++ b/drivers/i2c/busses/i2c-sirf.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/of_i2c.h> | ||
| 15 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
| 16 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 17 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| @@ -328,6 +329,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev) | |||
| 328 | adap->algo = &i2c_sirfsoc_algo; | 329 | adap->algo = &i2c_sirfsoc_algo; |
| 329 | adap->algo_data = siic; | 330 | adap->algo_data = siic; |
| 330 | 331 | ||
| 332 | adap->dev.of_node = pdev->dev.of_node; | ||
| 331 | adap->dev.parent = &pdev->dev; | 333 | adap->dev.parent = &pdev->dev; |
| 332 | adap->nr = pdev->id; | 334 | adap->nr = pdev->id; |
| 333 | 335 | ||
| @@ -371,6 +373,8 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev) | |||
| 371 | 373 | ||
| 372 | clk_disable(clk); | 374 | clk_disable(clk); |
| 373 | 375 | ||
| 376 | of_i2c_register_devices(adap); | ||
| 377 | |||
| 374 | dev_info(&pdev->dev, " I2C adapter ready to operate\n"); | 378 | dev_info(&pdev->dev, " I2C adapter ready to operate\n"); |
| 375 | 379 | ||
| 376 | return 0; | 380 | return 0; |
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c index 1e44d04d1b22..a43c0ce5e3d8 100644 --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c | |||
| @@ -167,7 +167,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev) | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | mux->busses = devm_kzalloc(&pdev->dev, | 169 | mux->busses = devm_kzalloc(&pdev->dev, |
| 170 | sizeof(mux->busses) * mux->pdata->bus_count, | 170 | sizeof(*mux->busses) * mux->pdata->bus_count, |
| 171 | GFP_KERNEL); | 171 | GFP_KERNEL); |
| 172 | if (!mux->busses) { | 172 | if (!mux->busses) { |
| 173 | dev_err(&pdev->dev, "Cannot allocate busses\n"); | 173 | dev_err(&pdev->dev, "Cannot allocate busses\n"); |
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 4ba384f1ab54..2df9414a72f7 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
| @@ -448,8 +448,6 @@ static int intel_idle_probe(void) | |||
| 448 | else | 448 | else |
| 449 | on_each_cpu(__setup_broadcast_timer, (void *)true, 1); | 449 | on_each_cpu(__setup_broadcast_timer, (void *)true, 1); |
| 450 | 450 | ||
| 451 | register_cpu_notifier(&cpu_hotplug_notifier); | ||
| 452 | |||
| 453 | pr_debug(PREFIX "v" INTEL_IDLE_VERSION | 451 | pr_debug(PREFIX "v" INTEL_IDLE_VERSION |
| 454 | " model 0x%X\n", boot_cpu_data.x86_model); | 452 | " model 0x%X\n", boot_cpu_data.x86_model); |
| 455 | 453 | ||
| @@ -612,6 +610,7 @@ static int __init intel_idle_init(void) | |||
| 612 | return retval; | 610 | return retval; |
| 613 | } | 611 | } |
| 614 | } | 612 | } |
| 613 | register_cpu_notifier(&cpu_hotplug_notifier); | ||
| 615 | 614 | ||
| 616 | return 0; | 615 | return 0; |
| 617 | } | 616 | } |
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 81837b0710a9..faf10ba1ed9a 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c | |||
| @@ -975,6 +975,38 @@ static void __init free_iommu_all(void) | |||
| 975 | } | 975 | } |
| 976 | 976 | ||
| 977 | /* | 977 | /* |
| 978 | * Family15h Model 10h-1fh erratum 746 (IOMMU Logging May Stall Translations) | ||
| 979 | * Workaround: | ||
| 980 | * BIOS should disable L2B micellaneous clock gating by setting | ||
| 981 | * L2_L2B_CK_GATE_CONTROL[CKGateL2BMiscDisable](D0F2xF4_x90[2]) = 1b | ||
| 982 | */ | ||
| 983 | static void __init amd_iommu_erratum_746_workaround(struct amd_iommu *iommu) | ||
| 984 | { | ||
| 985 | u32 value; | ||
| 986 | |||
| 987 | if ((boot_cpu_data.x86 != 0x15) || | ||
| 988 | (boot_cpu_data.x86_model < 0x10) || | ||
| 989 | (boot_cpu_data.x86_model > 0x1f)) | ||
| 990 | return; | ||
| 991 | |||
| 992 | pci_write_config_dword(iommu->dev, 0xf0, 0x90); | ||
| 993 | pci_read_config_dword(iommu->dev, 0xf4, &value); | ||
| 994 | |||
| 995 | if (value & BIT(2)) | ||
| 996 | return; | ||
| 997 | |||
| 998 | /* Select NB indirect register 0x90 and enable writing */ | ||
| 999 | pci_write_config_dword(iommu->dev, 0xf0, 0x90 | (1 << 8)); | ||
| 1000 | |||
| 1001 | pci_write_config_dword(iommu->dev, 0xf4, value | 0x4); | ||
| 1002 | pr_info("AMD-Vi: Applying erratum 746 workaround for IOMMU at %s\n", | ||
| 1003 | dev_name(&iommu->dev->dev)); | ||
| 1004 | |||
| 1005 | /* Clear the enable writing bit */ | ||
| 1006 | pci_write_config_dword(iommu->dev, 0xf0, 0x90); | ||
| 1007 | } | ||
| 1008 | |||
| 1009 | /* | ||
| 978 | * This function clues the initialization function for one IOMMU | 1010 | * This function clues the initialization function for one IOMMU |
| 979 | * together and also allocates the command buffer and programs the | 1011 | * together and also allocates the command buffer and programs the |
| 980 | * hardware. It does NOT enable the IOMMU. This is done afterwards. | 1012 | * hardware. It does NOT enable the IOMMU. This is done afterwards. |
| @@ -1172,6 +1204,8 @@ static int iommu_init_pci(struct amd_iommu *iommu) | |||
| 1172 | iommu->stored_l2[i] = iommu_read_l2(iommu, i); | 1204 | iommu->stored_l2[i] = iommu_read_l2(iommu, i); |
| 1173 | } | 1205 | } |
| 1174 | 1206 | ||
| 1207 | amd_iommu_erratum_746_workaround(iommu); | ||
| 1208 | |||
| 1175 | return pci_enable_device(iommu->dev); | 1209 | return pci_enable_device(iommu->dev); |
| 1176 | } | 1210 | } |
| 1177 | 1211 | ||
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index b9d091157884..eca28014ef3e 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c | |||
| @@ -4234,6 +4234,21 @@ static struct iommu_ops intel_iommu_ops = { | |||
| 4234 | .pgsize_bitmap = INTEL_IOMMU_PGSIZES, | 4234 | .pgsize_bitmap = INTEL_IOMMU_PGSIZES, |
| 4235 | }; | 4235 | }; |
| 4236 | 4236 | ||
| 4237 | static void quirk_iommu_g4x_gfx(struct pci_dev *dev) | ||
| 4238 | { | ||
| 4239 | /* G4x/GM45 integrated gfx dmar support is totally busted. */ | ||
| 4240 | printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n"); | ||
| 4241 | dmar_map_gfx = 0; | ||
| 4242 | } | ||
| 4243 | |||
| 4244 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_g4x_gfx); | ||
| 4245 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_g4x_gfx); | ||
| 4246 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e10, quirk_iommu_g4x_gfx); | ||
| 4247 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e20, quirk_iommu_g4x_gfx); | ||
| 4248 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e30, quirk_iommu_g4x_gfx); | ||
| 4249 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e40, quirk_iommu_g4x_gfx); | ||
| 4250 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e90, quirk_iommu_g4x_gfx); | ||
| 4251 | |||
| 4237 | static void quirk_iommu_rwbf(struct pci_dev *dev) | 4252 | static void quirk_iommu_rwbf(struct pci_dev *dev) |
| 4238 | { | 4253 | { |
| 4239 | /* | 4254 | /* |
| @@ -4242,12 +4257,6 @@ static void quirk_iommu_rwbf(struct pci_dev *dev) | |||
| 4242 | */ | 4257 | */ |
| 4243 | printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n"); | 4258 | printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n"); |
| 4244 | rwbf_quirk = 1; | 4259 | rwbf_quirk = 1; |
| 4245 | |||
| 4246 | /* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */ | ||
| 4247 | if (dev->revision == 0x07) { | ||
| 4248 | printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n"); | ||
| 4249 | dmar_map_gfx = 0; | ||
| 4250 | } | ||
| 4251 | } | 4260 | } |
| 4252 | 4261 | ||
| 4253 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf); | 4262 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf); |
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 68452b768da2..03a0a01a4054 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
| @@ -248,6 +248,8 @@ static inline void dump_rawmsg(enum debuglevel level, const char *tag, | |||
| 248 | CAPIMSG_APPID(data), CAPIMSG_MSGID(data), l, | 248 | CAPIMSG_APPID(data), CAPIMSG_MSGID(data), l, |
| 249 | CAPIMSG_CONTROL(data)); | 249 | CAPIMSG_CONTROL(data)); |
| 250 | l -= 12; | 250 | l -= 12; |
| 251 | if (l <= 0) | ||
| 252 | return; | ||
| 251 | dbgline = kmalloc(3 * l, GFP_ATOMIC); | 253 | dbgline = kmalloc(3 * l, GFP_ATOMIC); |
| 252 | if (!dbgline) | 254 | if (!dbgline) |
| 253 | return; | 255 | return; |
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 3d8984edeff7..9e58dbd8d8cb 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c | |||
| @@ -340,24 +340,22 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size) | |||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | /* | 342 | /* |
| 343 | * validate_rebuild_devices | 343 | * validate_raid_redundancy |
| 344 | * @rs | 344 | * @rs |
| 345 | * | 345 | * |
| 346 | * Determine if the devices specified for rebuild can result in a valid | 346 | * Determine if there are enough devices in the array that haven't |
| 347 | * usable array that is capable of rebuilding the given devices. | 347 | * failed (or are being rebuilt) to form a usable array. |
| 348 | * | 348 | * |
| 349 | * Returns: 0 on success, -EINVAL on failure. | 349 | * Returns: 0 on success, -EINVAL on failure. |
| 350 | */ | 350 | */ |
| 351 | static int validate_rebuild_devices(struct raid_set *rs) | 351 | static int validate_raid_redundancy(struct raid_set *rs) |
| 352 | { | 352 | { |
| 353 | unsigned i, rebuild_cnt = 0; | 353 | unsigned i, rebuild_cnt = 0; |
| 354 | unsigned rebuilds_per_group, copies, d; | 354 | unsigned rebuilds_per_group, copies, d; |
| 355 | 355 | ||
| 356 | if (!(rs->print_flags & DMPF_REBUILD)) | ||
| 357 | return 0; | ||
| 358 | |||
| 359 | for (i = 0; i < rs->md.raid_disks; i++) | 356 | for (i = 0; i < rs->md.raid_disks; i++) |
| 360 | if (!test_bit(In_sync, &rs->dev[i].rdev.flags)) | 357 | if (!test_bit(In_sync, &rs->dev[i].rdev.flags) || |
| 358 | !rs->dev[i].rdev.sb_page) | ||
| 361 | rebuild_cnt++; | 359 | rebuild_cnt++; |
| 362 | 360 | ||
| 363 | switch (rs->raid_type->level) { | 361 | switch (rs->raid_type->level) { |
| @@ -393,27 +391,24 @@ static int validate_rebuild_devices(struct raid_set *rs) | |||
| 393 | * A A B B C | 391 | * A A B B C |
| 394 | * C D D E E | 392 | * C D D E E |
| 395 | */ | 393 | */ |
| 396 | rebuilds_per_group = 0; | ||
| 397 | for (i = 0; i < rs->md.raid_disks * copies; i++) { | 394 | for (i = 0; i < rs->md.raid_disks * copies; i++) { |
| 395 | if (!(i % copies)) | ||
| 396 | rebuilds_per_group = 0; | ||
| 398 | d = i % rs->md.raid_disks; | 397 | d = i % rs->md.raid_disks; |
| 399 | if (!test_bit(In_sync, &rs->dev[d].rdev.flags) && | 398 | if ((!rs->dev[d].rdev.sb_page || |
| 399 | !test_bit(In_sync, &rs->dev[d].rdev.flags)) && | ||
| 400 | (++rebuilds_per_group >= copies)) | 400 | (++rebuilds_per_group >= copies)) |
| 401 | goto too_many; | 401 | goto too_many; |
| 402 | if (!((i + 1) % copies)) | ||
| 403 | rebuilds_per_group = 0; | ||
| 404 | } | 402 | } |
| 405 | break; | 403 | break; |
| 406 | default: | 404 | default: |
| 407 | DMERR("The rebuild parameter is not supported for %s", | 405 | if (rebuild_cnt) |
| 408 | rs->raid_type->name); | 406 | return -EINVAL; |
| 409 | rs->ti->error = "Rebuild not supported for this RAID type"; | ||
| 410 | return -EINVAL; | ||
| 411 | } | 407 | } |
| 412 | 408 | ||
| 413 | return 0; | 409 | return 0; |
| 414 | 410 | ||
| 415 | too_many: | 411 | too_many: |
| 416 | rs->ti->error = "Too many rebuild devices specified"; | ||
| 417 | return -EINVAL; | 412 | return -EINVAL; |
| 418 | } | 413 | } |
| 419 | 414 | ||
| @@ -664,9 +659,6 @@ static int parse_raid_params(struct raid_set *rs, char **argv, | |||
| 664 | } | 659 | } |
| 665 | rs->md.dev_sectors = sectors_per_dev; | 660 | rs->md.dev_sectors = sectors_per_dev; |
| 666 | 661 | ||
| 667 | if (validate_rebuild_devices(rs)) | ||
| 668 | return -EINVAL; | ||
| 669 | |||
| 670 | /* Assume there are no metadata devices until the drives are parsed */ | 662 | /* Assume there are no metadata devices until the drives are parsed */ |
| 671 | rs->md.persistent = 0; | 663 | rs->md.persistent = 0; |
| 672 | rs->md.external = 1; | 664 | rs->md.external = 1; |
| @@ -995,28 +987,10 @@ static int super_validate(struct mddev *mddev, struct md_rdev *rdev) | |||
| 995 | static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) | 987 | static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) |
| 996 | { | 988 | { |
| 997 | int ret; | 989 | int ret; |
| 998 | unsigned redundancy = 0; | ||
| 999 | struct raid_dev *dev; | 990 | struct raid_dev *dev; |
| 1000 | struct md_rdev *rdev, *tmp, *freshest; | 991 | struct md_rdev *rdev, *tmp, *freshest; |
| 1001 | struct mddev *mddev = &rs->md; | 992 | struct mddev *mddev = &rs->md; |
| 1002 | 993 | ||
| 1003 | switch (rs->raid_type->level) { | ||
| 1004 | case 1: | ||
| 1005 | redundancy = rs->md.raid_disks - 1; | ||
| 1006 | break; | ||
| 1007 | case 4: | ||
| 1008 | case 5: | ||
| 1009 | case 6: | ||
| 1010 | redundancy = rs->raid_type->parity_devs; | ||
| 1011 | break; | ||
| 1012 | case 10: | ||
| 1013 | redundancy = raid10_md_layout_to_copies(mddev->layout) - 1; | ||
| 1014 | break; | ||
| 1015 | default: | ||
| 1016 | ti->error = "Unknown RAID type"; | ||
| 1017 | return -EINVAL; | ||
| 1018 | } | ||
| 1019 | |||
| 1020 | freshest = NULL; | 994 | freshest = NULL; |
| 1021 | rdev_for_each_safe(rdev, tmp, mddev) { | 995 | rdev_for_each_safe(rdev, tmp, mddev) { |
| 1022 | /* | 996 | /* |
| @@ -1045,44 +1019,43 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) | |||
| 1045 | break; | 1019 | break; |
| 1046 | default: | 1020 | default: |
| 1047 | dev = container_of(rdev, struct raid_dev, rdev); | 1021 | dev = container_of(rdev, struct raid_dev, rdev); |
| 1048 | if (redundancy--) { | 1022 | if (dev->meta_dev) |
| 1049 | if (dev->meta_dev) | 1023 | dm_put_device(ti, dev->meta_dev); |
| 1050 | dm_put_device(ti, dev->meta_dev); | ||
| 1051 | |||
| 1052 | dev->meta_dev = NULL; | ||
| 1053 | rdev->meta_bdev = NULL; | ||
| 1054 | 1024 | ||
| 1055 | if (rdev->sb_page) | 1025 | dev->meta_dev = NULL; |
| 1056 | put_page(rdev->sb_page); | 1026 | rdev->meta_bdev = NULL; |
| 1057 | 1027 | ||
| 1058 | rdev->sb_page = NULL; | 1028 | if (rdev->sb_page) |
| 1029 | put_page(rdev->sb_page); | ||
| 1059 | 1030 | ||
| 1060 | rdev->sb_loaded = 0; | 1031 | rdev->sb_page = NULL; |
| 1061 | 1032 | ||
| 1062 | /* | 1033 | rdev->sb_loaded = 0; |
| 1063 | * We might be able to salvage the data device | ||
| 1064 | * even though the meta device has failed. For | ||
| 1065 | * now, we behave as though '- -' had been | ||
| 1066 | * set for this device in the table. | ||
| 1067 | */ | ||
| 1068 | if (dev->data_dev) | ||
| 1069 | dm_put_device(ti, dev->data_dev); | ||
| 1070 | 1034 | ||
| 1071 | dev->data_dev = NULL; | 1035 | /* |
| 1072 | rdev->bdev = NULL; | 1036 | * We might be able to salvage the data device |
| 1037 | * even though the meta device has failed. For | ||
| 1038 | * now, we behave as though '- -' had been | ||
| 1039 | * set for this device in the table. | ||
| 1040 | */ | ||
| 1041 | if (dev->data_dev) | ||
| 1042 | dm_put_device(ti, dev->data_dev); | ||
| 1073 | 1043 | ||
| 1074 | list_del(&rdev->same_set); | 1044 | dev->data_dev = NULL; |
| 1045 | rdev->bdev = NULL; | ||
| 1075 | 1046 | ||
| 1076 | continue; | 1047 | list_del(&rdev->same_set); |
| 1077 | } | ||
| 1078 | ti->error = "Failed to load superblock"; | ||
| 1079 | return ret; | ||
| 1080 | } | 1048 | } |
| 1081 | } | 1049 | } |
| 1082 | 1050 | ||
| 1083 | if (!freshest) | 1051 | if (!freshest) |
| 1084 | return 0; | 1052 | return 0; |
| 1085 | 1053 | ||
| 1054 | if (validate_raid_redundancy(rs)) { | ||
| 1055 | rs->ti->error = "Insufficient redundancy to activate array"; | ||
| 1056 | return -EINVAL; | ||
| 1057 | } | ||
| 1058 | |||
| 1086 | /* | 1059 | /* |
| 1087 | * Validation of the freshest device provides the source of | 1060 | * Validation of the freshest device provides the source of |
| 1088 | * validation for the remaining devices. | 1061 | * validation for the remaining devices. |
| @@ -1432,7 +1405,7 @@ static void raid_resume(struct dm_target *ti) | |||
| 1432 | 1405 | ||
| 1433 | static struct target_type raid_target = { | 1406 | static struct target_type raid_target = { |
| 1434 | .name = "raid", | 1407 | .name = "raid", |
| 1435 | .version = {1, 4, 0}, | 1408 | .version = {1, 4, 1}, |
| 1436 | .module = THIS_MODULE, | 1409 | .module = THIS_MODULE, |
| 1437 | .ctr = raid_ctr, | 1410 | .ctr = raid_ctr, |
| 1438 | .dtr = raid_dtr, | 1411 | .dtr = raid_dtr, |
diff --git a/drivers/media/i2c/m5mols/m5mols_core.c b/drivers/media/i2c/m5mols/m5mols_core.c index 8a8d42fe2633..d4e7567b367c 100644 --- a/drivers/media/i2c/m5mols/m5mols_core.c +++ b/drivers/media/i2c/m5mols/m5mols_core.c | |||
| @@ -556,7 +556,7 @@ static int m5mols_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, | |||
| 556 | mutex_lock(&info->lock); | 556 | mutex_lock(&info->lock); |
| 557 | 557 | ||
| 558 | format = __find_format(info, fh, fmt->which, info->res_type); | 558 | format = __find_format(info, fh, fmt->which, info->res_type); |
| 559 | if (!format) | 559 | if (format) |
| 560 | fmt->format = *format; | 560 | fmt->format = *format; |
| 561 | else | 561 | else |
| 562 | ret = -EINVAL; | 562 | ret = -EINVAL; |
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 1cf8293c0fb0..4a980e029ca7 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c | |||
| @@ -23,8 +23,8 @@ | |||
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
| 25 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 26 | #include <linux/platform_data/imx-iram.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/iram.h> | ||
| 28 | #include <media/v4l2-ctrls.h> | 28 | #include <media/v4l2-ctrls.h> |
| 29 | #include <media/v4l2-device.h> | 29 | #include <media/v4l2-device.h> |
| 30 | #include <media/v4l2-ioctl.h> | 30 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index e0d73a642186..8dac17511e61 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
| @@ -35,9 +35,6 @@ | |||
| 35 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 36 | #include <media/v4l2-dev.h> | 36 | #include <media/v4l2-dev.h> |
| 37 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
| 38 | #include <plat/iommu.h> | ||
| 39 | #include <plat/iovmm.h> | ||
| 40 | #include <plat/omap-pm.h> | ||
| 41 | 38 | ||
| 42 | #include "ispvideo.h" | 39 | #include "ispvideo.h" |
| 43 | #include "isp.h" | 40 | #include "isp.h" |
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c index 4ab99f3a7b09..b4a68ecf0ca7 100644 --- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c | |||
| @@ -593,7 +593,7 @@ static int __fimc_md_create_flite_source_links(struct fimc_md *fmd) | |||
| 593 | { | 593 | { |
| 594 | struct media_entity *source, *sink; | 594 | struct media_entity *source, *sink; |
| 595 | unsigned int flags = MEDIA_LNK_FL_ENABLED; | 595 | unsigned int flags = MEDIA_LNK_FL_ENABLED; |
| 596 | int i, ret; | 596 | int i, ret = 0; |
| 597 | 597 | ||
| 598 | for (i = 0; i < FIMC_LITE_MAX_DEVS; i++) { | 598 | for (i = 0; i < FIMC_LITE_MAX_DEVS; i++) { |
| 599 | struct fimc_lite *fimc = fmd->fimc_lite[i]; | 599 | struct fimc_lite *fimc = fmd->fimc_lite[i]; |
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 379f57433711..681bc6ba149d 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c | |||
| @@ -412,62 +412,48 @@ leave_handle_frame: | |||
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | /* Error handling for interrupt */ | 414 | /* Error handling for interrupt */ |
| 415 | static void s5p_mfc_handle_error(struct s5p_mfc_ctx *ctx, | 415 | static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev, |
| 416 | unsigned int reason, unsigned int err) | 416 | struct s5p_mfc_ctx *ctx, unsigned int reason, unsigned int err) |
| 417 | { | 417 | { |
| 418 | struct s5p_mfc_dev *dev; | ||
| 419 | unsigned long flags; | 418 | unsigned long flags; |
| 420 | 419 | ||
| 421 | /* If no context is available then all necessary | ||
| 422 | * processing has been done. */ | ||
| 423 | if (ctx == NULL) | ||
| 424 | return; | ||
| 425 | |||
| 426 | dev = ctx->dev; | ||
| 427 | mfc_err("Interrupt Error: %08x\n", err); | 420 | mfc_err("Interrupt Error: %08x\n", err); |
| 428 | s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev); | ||
| 429 | wake_up_dev(dev, reason, err); | ||
| 430 | 421 | ||
| 431 | /* Error recovery is dependent on the state of context */ | 422 | if (ctx != NULL) { |
| 432 | switch (ctx->state) { | 423 | /* Error recovery is dependent on the state of context */ |
| 433 | case MFCINST_INIT: | 424 | switch (ctx->state) { |
| 434 | /* This error had to happen while acquireing instance */ | 425 | case MFCINST_RES_CHANGE_INIT: |
| 435 | case MFCINST_GOT_INST: | 426 | case MFCINST_RES_CHANGE_FLUSH: |
| 436 | /* This error had to happen while parsing the header */ | 427 | case MFCINST_RES_CHANGE_END: |
| 437 | case MFCINST_HEAD_PARSED: | 428 | case MFCINST_FINISHING: |
| 438 | /* This error had to happen while setting dst buffers */ | 429 | case MFCINST_FINISHED: |
| 439 | case MFCINST_RETURN_INST: | 430 | case MFCINST_RUNNING: |
| 440 | /* This error had to happen while releasing instance */ | 431 | /* It is higly probable that an error occured |
| 441 | clear_work_bit(ctx); | 432 | * while decoding a frame */ |
| 442 | wake_up_ctx(ctx, reason, err); | 433 | clear_work_bit(ctx); |
| 443 | if (test_and_clear_bit(0, &dev->hw_lock) == 0) | 434 | ctx->state = MFCINST_ERROR; |
| 444 | BUG(); | 435 | /* Mark all dst buffers as having an error */ |
| 445 | s5p_mfc_clock_off(); | 436 | spin_lock_irqsave(&dev->irqlock, flags); |
| 446 | ctx->state = MFCINST_ERROR; | 437 | s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, |
| 447 | break; | 438 | &ctx->dst_queue, &ctx->vq_dst); |
| 448 | case MFCINST_FINISHING: | 439 | /* Mark all src buffers as having an error */ |
| 449 | case MFCINST_FINISHED: | 440 | s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, |
| 450 | case MFCINST_RUNNING: | 441 | &ctx->src_queue, &ctx->vq_src); |
| 451 | /* It is higly probable that an error occured | 442 | spin_unlock_irqrestore(&dev->irqlock, flags); |
| 452 | * while decoding a frame */ | 443 | wake_up_ctx(ctx, reason, err); |
| 453 | clear_work_bit(ctx); | 444 | break; |
| 454 | ctx->state = MFCINST_ERROR; | 445 | default: |
| 455 | /* Mark all dst buffers as having an error */ | 446 | clear_work_bit(ctx); |
| 456 | spin_lock_irqsave(&dev->irqlock, flags); | 447 | ctx->state = MFCINST_ERROR; |
| 457 | s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->dst_queue, | 448 | wake_up_ctx(ctx, reason, err); |
| 458 | &ctx->vq_dst); | 449 | break; |
| 459 | /* Mark all src buffers as having an error */ | 450 | } |
| 460 | s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->src_queue, | ||
| 461 | &ctx->vq_src); | ||
| 462 | spin_unlock_irqrestore(&dev->irqlock, flags); | ||
| 463 | if (test_and_clear_bit(0, &dev->hw_lock) == 0) | ||
| 464 | BUG(); | ||
| 465 | s5p_mfc_clock_off(); | ||
| 466 | break; | ||
| 467 | default: | ||
| 468 | mfc_err("Encountered an error interrupt which had not been handled\n"); | ||
| 469 | break; | ||
| 470 | } | 451 | } |
| 452 | if (test_and_clear_bit(0, &dev->hw_lock) == 0) | ||
| 453 | BUG(); | ||
| 454 | s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev); | ||
| 455 | s5p_mfc_clock_off(); | ||
| 456 | wake_up_dev(dev, reason, err); | ||
| 471 | return; | 457 | return; |
| 472 | } | 458 | } |
| 473 | 459 | ||
| @@ -632,7 +618,7 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv) | |||
| 632 | dev->warn_start) | 618 | dev->warn_start) |
| 633 | s5p_mfc_handle_frame(ctx, reason, err); | 619 | s5p_mfc_handle_frame(ctx, reason, err); |
| 634 | else | 620 | else |
| 635 | s5p_mfc_handle_error(ctx, reason, err); | 621 | s5p_mfc_handle_error(dev, ctx, reason, err); |
| 636 | clear_bit(0, &dev->enter_suspend); | 622 | clear_bit(0, &dev->enter_suspend); |
| 637 | break; | 623 | break; |
| 638 | 624 | ||
diff --git a/drivers/media/usb/gspca/kinect.c b/drivers/media/usb/gspca/kinect.c index 40ad6687ee5d..3773a8a745df 100644 --- a/drivers/media/usb/gspca/kinect.c +++ b/drivers/media/usb/gspca/kinect.c | |||
| @@ -381,6 +381,7 @@ static const struct sd_desc sd_desc = { | |||
| 381 | /* -- module initialisation -- */ | 381 | /* -- module initialisation -- */ |
| 382 | static const struct usb_device_id device_table[] = { | 382 | static const struct usb_device_id device_table[] = { |
| 383 | {USB_DEVICE(0x045e, 0x02ae)}, | 383 | {USB_DEVICE(0x045e, 0x02ae)}, |
| 384 | {USB_DEVICE(0x045e, 0x02bf)}, | ||
| 384 | {} | 385 | {} |
| 385 | }; | 386 | }; |
| 386 | 387 | ||
diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c index 70511d5f9538..1220340e7602 100644 --- a/drivers/media/usb/gspca/sonixb.c +++ b/drivers/media/usb/gspca/sonixb.c | |||
| @@ -496,7 +496,7 @@ static void reg_w(struct gspca_dev *gspca_dev, | |||
| 496 | } | 496 | } |
| 497 | } | 497 | } |
| 498 | 498 | ||
| 499 | static void i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer) | 499 | static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buf) |
| 500 | { | 500 | { |
| 501 | int retry = 60; | 501 | int retry = 60; |
| 502 | 502 | ||
| @@ -504,16 +504,19 @@ static void i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer) | |||
| 504 | return; | 504 | return; |
| 505 | 505 | ||
| 506 | /* is i2c ready */ | 506 | /* is i2c ready */ |
| 507 | reg_w(gspca_dev, 0x08, buffer, 8); | 507 | reg_w(gspca_dev, 0x08, buf, 8); |
| 508 | while (retry--) { | 508 | while (retry--) { |
| 509 | if (gspca_dev->usb_err < 0) | 509 | if (gspca_dev->usb_err < 0) |
| 510 | return; | 510 | return; |
| 511 | msleep(10); | 511 | msleep(1); |
| 512 | reg_r(gspca_dev, 0x08); | 512 | reg_r(gspca_dev, 0x08); |
| 513 | if (gspca_dev->usb_buf[0] & 0x04) { | 513 | if (gspca_dev->usb_buf[0] & 0x04) { |
| 514 | if (gspca_dev->usb_buf[0] & 0x08) { | 514 | if (gspca_dev->usb_buf[0] & 0x08) { |
| 515 | dev_err(gspca_dev->v4l2_dev.dev, | 515 | dev_err(gspca_dev->v4l2_dev.dev, |
| 516 | "i2c write error\n"); | 516 | "i2c error writing %02x %02x %02x %02x" |
| 517 | " %02x %02x %02x %02x\n", | ||
| 518 | buf[0], buf[1], buf[2], buf[3], | ||
| 519 | buf[4], buf[5], buf[6], buf[7]); | ||
| 517 | gspca_dev->usb_err = -EIO; | 520 | gspca_dev->usb_err = -EIO; |
| 518 | } | 521 | } |
| 519 | return; | 522 | return; |
| @@ -530,7 +533,7 @@ static void i2c_w_vector(struct gspca_dev *gspca_dev, | |||
| 530 | for (;;) { | 533 | for (;;) { |
| 531 | if (gspca_dev->usb_err < 0) | 534 | if (gspca_dev->usb_err < 0) |
| 532 | return; | 535 | return; |
| 533 | reg_w(gspca_dev, 0x08, *buffer, 8); | 536 | i2c_w(gspca_dev, *buffer); |
| 534 | len -= 8; | 537 | len -= 8; |
| 535 | if (len <= 0) | 538 | if (len <= 0) |
| 536 | break; | 539 | break; |
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c index 5a86047b846f..36307a9028a9 100644 --- a/drivers/media/usb/gspca/sonixj.c +++ b/drivers/media/usb/gspca/sonixj.c | |||
| @@ -1550,6 +1550,7 @@ static void i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val) | |||
| 1550 | 0, | 1550 | 0, |
| 1551 | gspca_dev->usb_buf, 8, | 1551 | gspca_dev->usb_buf, 8, |
| 1552 | 500); | 1552 | 500); |
| 1553 | msleep(2); | ||
| 1553 | if (ret < 0) { | 1554 | if (ret < 0) { |
| 1554 | pr_err("i2c_w1 err %d\n", ret); | 1555 | pr_err("i2c_w1 err %d\n", ret); |
| 1555 | gspca_dev->usb_err = ret; | 1556 | gspca_dev->usb_err = ret; |
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 2bb7613ddebb..d5baab17a5ef 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c | |||
| @@ -1431,8 +1431,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, | |||
| 1431 | int ret; | 1431 | int ret; |
| 1432 | 1432 | ||
| 1433 | ctrl = uvc_find_control(chain, xctrl->id, &mapping); | 1433 | ctrl = uvc_find_control(chain, xctrl->id, &mapping); |
| 1434 | if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0) | 1434 | if (ctrl == NULL) |
| 1435 | return -EINVAL; | 1435 | return -EINVAL; |
| 1436 | if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) | ||
| 1437 | return -EACCES; | ||
| 1436 | 1438 | ||
| 1437 | /* Clamp out of range values. */ | 1439 | /* Clamp out of range values. */ |
| 1438 | switch (mapping->v4l2_type) { | 1440 | switch (mapping->v4l2_type) { |
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index f2ee8c6b0d8d..68d59b527492 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c | |||
| @@ -657,8 +657,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
| 657 | ret = uvc_ctrl_get(chain, ctrl); | 657 | ret = uvc_ctrl_get(chain, ctrl); |
| 658 | if (ret < 0) { | 658 | if (ret < 0) { |
| 659 | uvc_ctrl_rollback(handle); | 659 | uvc_ctrl_rollback(handle); |
| 660 | ctrls->error_idx = ret == -ENOENT | 660 | ctrls->error_idx = i; |
| 661 | ? ctrls->count : i; | ||
| 662 | return ret; | 661 | return ret; |
| 663 | } | 662 | } |
| 664 | } | 663 | } |
| @@ -686,8 +685,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
| 686 | ret = uvc_ctrl_set(chain, ctrl); | 685 | ret = uvc_ctrl_set(chain, ctrl); |
| 687 | if (ret < 0) { | 686 | if (ret < 0) { |
| 688 | uvc_ctrl_rollback(handle); | 687 | uvc_ctrl_rollback(handle); |
| 689 | ctrls->error_idx = (ret == -ENOENT && | 688 | ctrls->error_idx = cmd == VIDIOC_S_EXT_CTRLS |
| 690 | cmd == VIDIOC_S_EXT_CTRLS) | ||
| 691 | ? ctrls->count : i; | 689 | ? ctrls->count : i; |
| 692 | return ret; | 690 | return ret; |
| 693 | } | 691 | } |
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 9f81be23a81f..e02c4797b1c6 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c | |||
| @@ -921,8 +921,10 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b | |||
| 921 | * In videobuf we use our internal V4l2_planes struct for | 921 | * In videobuf we use our internal V4l2_planes struct for |
| 922 | * single-planar buffers as well, for simplicity. | 922 | * single-planar buffers as well, for simplicity. |
| 923 | */ | 923 | */ |
| 924 | if (V4L2_TYPE_IS_OUTPUT(b->type)) | 924 | if (V4L2_TYPE_IS_OUTPUT(b->type)) { |
| 925 | v4l2_planes[0].bytesused = b->bytesused; | 925 | v4l2_planes[0].bytesused = b->bytesused; |
| 926 | v4l2_planes[0].data_offset = 0; | ||
| 927 | } | ||
| 926 | 928 | ||
| 927 | if (b->memory == V4L2_MEMORY_USERPTR) { | 929 | if (b->memory == V4L2_MEMORY_USERPTR) { |
| 928 | v4l2_planes[0].m.userptr = b->m.userptr; | 930 | v4l2_planes[0].m.userptr = b->m.userptr; |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 47ad4e270877..ff553babf455 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
| @@ -237,6 +237,7 @@ config MFD_TPS65910 | |||
| 237 | depends on I2C=y && GPIOLIB | 237 | depends on I2C=y && GPIOLIB |
| 238 | select MFD_CORE | 238 | select MFD_CORE |
| 239 | select REGMAP_I2C | 239 | select REGMAP_I2C |
| 240 | select REGMAP_IRQ | ||
| 240 | select IRQ_DOMAIN | 241 | select IRQ_DOMAIN |
| 241 | help | 242 | help |
| 242 | if you say yes here you get support for the TPS65910 series of | 243 | if you say yes here you get support for the TPS65910 series of |
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index e1650badd106..4778bb124efe 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mfd/core.h> | 19 | #include <linux/mfd/core.h> |
| 20 | #include <linux/mfd/abx500.h> | 20 | #include <linux/mfd/abx500.h> |
| 21 | #include <linux/mfd/abx500/ab8500.h> | 21 | #include <linux/mfd/abx500/ab8500.h> |
| 22 | #include <linux/mfd/abx500/ab8500-bm.h> | ||
| 22 | #include <linux/mfd/dbx500-prcmu.h> | 23 | #include <linux/mfd/dbx500-prcmu.h> |
| 23 | #include <linux/regulator/ab8500.h> | 24 | #include <linux/regulator/ab8500.h> |
| 24 | #include <linux/of.h> | 25 | #include <linux/of.h> |
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index bc8a3edb6bbf..222c03a5ddc0 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c | |||
| @@ -239,7 +239,12 @@ static int arizona_runtime_resume(struct device *dev) | |||
| 239 | return ret; | 239 | return ret; |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | regcache_sync(arizona->regmap); | 242 | ret = regcache_sync(arizona->regmap); |
| 243 | if (ret != 0) { | ||
| 244 | dev_err(arizona->dev, "Failed to restore register cache\n"); | ||
| 245 | regulator_disable(arizona->dcvdd); | ||
| 246 | return ret; | ||
| 247 | } | ||
| 243 | 248 | ||
| 244 | return 0; | 249 | return 0; |
| 245 | } | 250 | } |
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 74713bf5371f..2bec5f0db3ee 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c | |||
| @@ -176,14 +176,7 @@ int arizona_irq_init(struct arizona *arizona) | |||
| 176 | aod = &wm5102_aod; | 176 | aod = &wm5102_aod; |
| 177 | irq = &wm5102_irq; | 177 | irq = &wm5102_irq; |
| 178 | 178 | ||
| 179 | switch (arizona->rev) { | 179 | ctrlif_error = false; |
| 180 | case 0: | ||
| 181 | case 1: | ||
| 182 | ctrlif_error = false; | ||
| 183 | break; | ||
| 184 | default: | ||
| 185 | break; | ||
| 186 | } | ||
| 187 | break; | 180 | break; |
| 188 | #endif | 181 | #endif |
| 189 | #ifdef CONFIG_MFD_WM5110 | 182 | #ifdef CONFIG_MFD_WM5110 |
| @@ -191,14 +184,7 @@ int arizona_irq_init(struct arizona *arizona) | |||
| 191 | aod = &wm5110_aod; | 184 | aod = &wm5110_aod; |
| 192 | irq = &wm5110_irq; | 185 | irq = &wm5110_irq; |
| 193 | 186 | ||
| 194 | switch (arizona->rev) { | 187 | ctrlif_error = false; |
| 195 | case 0: | ||
| 196 | case 1: | ||
| 197 | ctrlif_error = false; | ||
| 198 | break; | ||
| 199 | default: | ||
| 200 | break; | ||
| 201 | } | ||
| 202 | break; | 188 | break; |
| 203 | #endif | 189 | #endif |
| 204 | default: | 190 | default: |
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c index ac74a4d1daea..885e56780358 100644 --- a/drivers/mfd/da9052-i2c.c +++ b/drivers/mfd/da9052-i2c.c | |||
| @@ -27,6 +27,66 @@ | |||
| 27 | #include <linux/of_device.h> | 27 | #include <linux/of_device.h> |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | /* I2C safe register check */ | ||
| 31 | static inline bool i2c_safe_reg(unsigned char reg) | ||
| 32 | { | ||
| 33 | switch (reg) { | ||
| 34 | case DA9052_STATUS_A_REG: | ||
| 35 | case DA9052_STATUS_B_REG: | ||
| 36 | case DA9052_STATUS_C_REG: | ||
| 37 | case DA9052_STATUS_D_REG: | ||
| 38 | case DA9052_ADC_RES_L_REG: | ||
| 39 | case DA9052_ADC_RES_H_REG: | ||
| 40 | case DA9052_VDD_RES_REG: | ||
| 41 | case DA9052_ICHG_AV_REG: | ||
| 42 | case DA9052_TBAT_RES_REG: | ||
| 43 | case DA9052_ADCIN4_RES_REG: | ||
| 44 | case DA9052_ADCIN5_RES_REG: | ||
| 45 | case DA9052_ADCIN6_RES_REG: | ||
| 46 | case DA9052_TJUNC_RES_REG: | ||
| 47 | case DA9052_TSI_X_MSB_REG: | ||
| 48 | case DA9052_TSI_Y_MSB_REG: | ||
| 49 | case DA9052_TSI_LSB_REG: | ||
| 50 | case DA9052_TSI_Z_MSB_REG: | ||
| 51 | return true; | ||
| 52 | default: | ||
| 53 | return false; | ||
| 54 | } | ||
| 55 | } | ||
| 56 | |||
| 57 | /* | ||
| 58 | * There is an issue with DA9052 and DA9053_AA/BA/BB PMIC where the PMIC | ||
| 59 | * gets lockup up or fails to respond following a system reset. | ||
| 60 | * This fix is to follow any read or write with a dummy read to a safe | ||
| 61 | * register. | ||
| 62 | */ | ||
| 63 | int da9052_i2c_fix(struct da9052 *da9052, unsigned char reg) | ||
| 64 | { | ||
| 65 | int val; | ||
| 66 | |||
| 67 | switch (da9052->chip_id) { | ||
| 68 | case DA9052: | ||
| 69 | case DA9053_AA: | ||
| 70 | case DA9053_BA: | ||
| 71 | case DA9053_BB: | ||
| 72 | /* A dummy read to a safe register address. */ | ||
| 73 | if (!i2c_safe_reg(reg)) | ||
| 74 | return regmap_read(da9052->regmap, | ||
| 75 | DA9052_PARK_REGISTER, | ||
| 76 | &val); | ||
| 77 | break; | ||
| 78 | default: | ||
| 79 | /* | ||
| 80 | * For other chips parking of I2C register | ||
| 81 | * to a safe place is not required. | ||
| 82 | */ | ||
| 83 | break; | ||
| 84 | } | ||
| 85 | |||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | EXPORT_SYMBOL(da9052_i2c_fix); | ||
| 89 | |||
| 30 | static int da9052_i2c_enable_multiwrite(struct da9052 *da9052) | 90 | static int da9052_i2c_enable_multiwrite(struct da9052 *da9052) |
| 31 | { | 91 | { |
| 32 | int reg_val, ret; | 92 | int reg_val, ret; |
| @@ -83,6 +143,7 @@ static int da9052_i2c_probe(struct i2c_client *client, | |||
| 83 | 143 | ||
| 84 | da9052->dev = &client->dev; | 144 | da9052->dev = &client->dev; |
| 85 | da9052->chip_irq = client->irq; | 145 | da9052->chip_irq = client->irq; |
| 146 | da9052->fix_io = da9052_i2c_fix; | ||
| 86 | 147 | ||
| 87 | i2c_set_clientdata(client, da9052); | 148 | i2c_set_clientdata(client, da9052); |
| 88 | 149 | ||
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index dc8826d8d69d..268f45d42394 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c | |||
| @@ -2524,7 +2524,7 @@ static bool read_mailbox_0(void) | |||
| 2524 | 2524 | ||
| 2525 | for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) { | 2525 | for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) { |
| 2526 | if (ev & prcmu_irq_bit[n]) | 2526 | if (ev & prcmu_irq_bit[n]) |
| 2527 | generic_handle_irq(IRQ_PRCMU_BASE + n); | 2527 | generic_handle_irq(irq_find_mapping(db8500_irq_domain, n)); |
| 2528 | } | 2528 | } |
| 2529 | r = true; | 2529 | r = true; |
| 2530 | break; | 2530 | break; |
| @@ -2737,13 +2737,14 @@ static int db8500_irq_map(struct irq_domain *d, unsigned int virq, | |||
| 2737 | } | 2737 | } |
| 2738 | 2738 | ||
| 2739 | static struct irq_domain_ops db8500_irq_ops = { | 2739 | static struct irq_domain_ops db8500_irq_ops = { |
| 2740 | .map = db8500_irq_map, | 2740 | .map = db8500_irq_map, |
| 2741 | .xlate = irq_domain_xlate_twocell, | 2741 | .xlate = irq_domain_xlate_twocell, |
| 2742 | }; | 2742 | }; |
| 2743 | 2743 | ||
| 2744 | static int db8500_irq_init(struct device_node *np) | 2744 | static int db8500_irq_init(struct device_node *np) |
| 2745 | { | 2745 | { |
| 2746 | int irq_base = -1; | 2746 | int irq_base = 0; |
| 2747 | int i; | ||
| 2747 | 2748 | ||
| 2748 | /* In the device tree case, just take some IRQs */ | 2749 | /* In the device tree case, just take some IRQs */ |
| 2749 | if (!np) | 2750 | if (!np) |
| @@ -2758,6 +2759,10 @@ static int db8500_irq_init(struct device_node *np) | |||
| 2758 | return -ENOSYS; | 2759 | return -ENOSYS; |
| 2759 | } | 2760 | } |
| 2760 | 2761 | ||
| 2762 | /* All wakeups will be used, so create mappings for all */ | ||
| 2763 | for (i = 0; i < NUM_PRCMU_WAKEUPS; i++) | ||
| 2764 | irq_create_mapping(db8500_irq_domain, i); | ||
| 2765 | |||
| 2761 | return 0; | 2766 | return 0; |
| 2762 | } | 2767 | } |
| 2763 | 2768 | ||
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index f6878f8db57d..4d73963cd8f0 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c | |||
| @@ -93,15 +93,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c, | |||
| 93 | if (max77686 == NULL) | 93 | if (max77686 == NULL) |
| 94 | return -ENOMEM; | 94 | return -ENOMEM; |
| 95 | 95 | ||
| 96 | max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config); | ||
| 97 | if (IS_ERR(max77686->regmap)) { | ||
| 98 | ret = PTR_ERR(max77686->regmap); | ||
| 99 | dev_err(max77686->dev, "Failed to allocate register map: %d\n", | ||
| 100 | ret); | ||
| 101 | kfree(max77686); | ||
| 102 | return ret; | ||
| 103 | } | ||
| 104 | |||
| 105 | i2c_set_clientdata(i2c, max77686); | 96 | i2c_set_clientdata(i2c, max77686); |
| 106 | max77686->dev = &i2c->dev; | 97 | max77686->dev = &i2c->dev; |
| 107 | max77686->i2c = i2c; | 98 | max77686->i2c = i2c; |
| @@ -111,6 +102,15 @@ static int max77686_i2c_probe(struct i2c_client *i2c, | |||
| 111 | max77686->irq_gpio = pdata->irq_gpio; | 102 | max77686->irq_gpio = pdata->irq_gpio; |
| 112 | max77686->irq = i2c->irq; | 103 | max77686->irq = i2c->irq; |
| 113 | 104 | ||
| 105 | max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config); | ||
| 106 | if (IS_ERR(max77686->regmap)) { | ||
| 107 | ret = PTR_ERR(max77686->regmap); | ||
| 108 | dev_err(max77686->dev, "Failed to allocate register map: %d\n", | ||
| 109 | ret); | ||
| 110 | kfree(max77686); | ||
| 111 | return ret; | ||
| 112 | } | ||
| 113 | |||
| 114 | if (regmap_read(max77686->regmap, | 114 | if (regmap_read(max77686->regmap, |
| 115 | MAX77686_REG_DEVICE_ID, &data) < 0) { | 115 | MAX77686_REG_DEVICE_ID, &data) < 0) { |
| 116 | dev_err(max77686->dev, | 116 | dev_err(max77686->dev, |
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c index cc5155e20494..9e60fed5ff82 100644 --- a/drivers/mfd/max77693.c +++ b/drivers/mfd/max77693.c | |||
| @@ -114,35 +114,37 @@ static int max77693_i2c_probe(struct i2c_client *i2c, | |||
| 114 | u8 reg_data; | 114 | u8 reg_data; |
| 115 | int ret = 0; | 115 | int ret = 0; |
| 116 | 116 | ||
| 117 | if (!pdata) { | ||
| 118 | dev_err(&i2c->dev, "No platform data found.\n"); | ||
| 119 | return -EINVAL; | ||
| 120 | } | ||
| 121 | |||
| 117 | max77693 = devm_kzalloc(&i2c->dev, | 122 | max77693 = devm_kzalloc(&i2c->dev, |
| 118 | sizeof(struct max77693_dev), GFP_KERNEL); | 123 | sizeof(struct max77693_dev), GFP_KERNEL); |
| 119 | if (max77693 == NULL) | 124 | if (max77693 == NULL) |
| 120 | return -ENOMEM; | 125 | return -ENOMEM; |
| 121 | 126 | ||
| 122 | max77693->regmap = devm_regmap_init_i2c(i2c, &max77693_regmap_config); | ||
| 123 | if (IS_ERR(max77693->regmap)) { | ||
| 124 | ret = PTR_ERR(max77693->regmap); | ||
| 125 | dev_err(max77693->dev,"failed to allocate register map: %d\n", | ||
| 126 | ret); | ||
| 127 | goto err_regmap; | ||
| 128 | } | ||
| 129 | |||
| 130 | i2c_set_clientdata(i2c, max77693); | 127 | i2c_set_clientdata(i2c, max77693); |
| 131 | max77693->dev = &i2c->dev; | 128 | max77693->dev = &i2c->dev; |
| 132 | max77693->i2c = i2c; | 129 | max77693->i2c = i2c; |
| 133 | max77693->irq = i2c->irq; | 130 | max77693->irq = i2c->irq; |
| 134 | max77693->type = id->driver_data; | 131 | max77693->type = id->driver_data; |
| 135 | 132 | ||
| 136 | if (!pdata) | 133 | max77693->regmap = devm_regmap_init_i2c(i2c, &max77693_regmap_config); |
| 137 | goto err_regmap; | 134 | if (IS_ERR(max77693->regmap)) { |
| 135 | ret = PTR_ERR(max77693->regmap); | ||
| 136 | dev_err(max77693->dev, "failed to allocate register map: %d\n", | ||
| 137 | ret); | ||
| 138 | return ret; | ||
| 139 | } | ||
| 138 | 140 | ||
| 139 | max77693->wakeup = pdata->wakeup; | 141 | max77693->wakeup = pdata->wakeup; |
| 140 | 142 | ||
| 141 | if (max77693_read_reg(max77693->regmap, | 143 | ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, |
| 142 | MAX77693_PMIC_REG_PMIC_ID2, ®_data) < 0) { | 144 | ®_data); |
| 145 | if (ret < 0) { | ||
| 143 | dev_err(max77693->dev, "device not found on this channel\n"); | 146 | dev_err(max77693->dev, "device not found on this channel\n"); |
| 144 | ret = -ENODEV; | 147 | return ret; |
| 145 | goto err_regmap; | ||
| 146 | } else | 148 | } else |
| 147 | dev_info(max77693->dev, "device ID: 0x%x\n", reg_data); | 149 | dev_info(max77693->dev, "device ID: 0x%x\n", reg_data); |
| 148 | 150 | ||
| @@ -163,7 +165,7 @@ static int max77693_i2c_probe(struct i2c_client *i2c, | |||
| 163 | ret = PTR_ERR(max77693->regmap_muic); | 165 | ret = PTR_ERR(max77693->regmap_muic); |
| 164 | dev_err(max77693->dev, | 166 | dev_err(max77693->dev, |
| 165 | "failed to allocate register map: %d\n", ret); | 167 | "failed to allocate register map: %d\n", ret); |
| 166 | goto err_regmap; | 168 | goto err_regmap_muic; |
| 167 | } | 169 | } |
| 168 | 170 | ||
| 169 | ret = max77693_irq_init(max77693); | 171 | ret = max77693_irq_init(max77693); |
| @@ -184,9 +186,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c, | |||
| 184 | err_mfd: | 186 | err_mfd: |
| 185 | max77693_irq_exit(max77693); | 187 | max77693_irq_exit(max77693); |
| 186 | err_irq: | 188 | err_irq: |
| 189 | err_regmap_muic: | ||
| 187 | i2c_unregister_device(max77693->muic); | 190 | i2c_unregister_device(max77693->muic); |
| 188 | i2c_unregister_device(max77693->haptic); | 191 | i2c_unregister_device(max77693->haptic); |
| 189 | err_regmap: | ||
| 190 | return ret; | 192 | return ret; |
| 191 | } | 193 | } |
| 192 | 194 | ||
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 64803f13bcec..d11567307fbe 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c | |||
| @@ -208,6 +208,8 @@ static int pcf50633_probe(struct i2c_client *client, | |||
| 208 | if (!pcf) | 208 | if (!pcf) |
| 209 | return -ENOMEM; | 209 | return -ENOMEM; |
| 210 | 210 | ||
| 211 | i2c_set_clientdata(client, pcf); | ||
| 212 | pcf->dev = &client->dev; | ||
| 211 | pcf->pdata = pdata; | 213 | pcf->pdata = pdata; |
| 212 | 214 | ||
| 213 | mutex_init(&pcf->lock); | 215 | mutex_init(&pcf->lock); |
| @@ -219,9 +221,6 @@ static int pcf50633_probe(struct i2c_client *client, | |||
| 219 | return ret; | 221 | return ret; |
| 220 | } | 222 | } |
| 221 | 223 | ||
| 222 | i2c_set_clientdata(client, pcf); | ||
| 223 | pcf->dev = &client->dev; | ||
| 224 | |||
| 225 | version = pcf50633_reg_read(pcf, 0); | 224 | version = pcf50633_reg_read(pcf, 0); |
| 226 | variant = pcf50633_reg_read(pcf, 1); | 225 | variant = pcf50633_reg_read(pcf, 1); |
| 227 | if (version < 0 || variant < 0) { | 226 | if (version < 0 || variant < 0) { |
diff --git a/drivers/mfd/rtl8411.c b/drivers/mfd/rtl8411.c index 89f046ca9e41..3d3b4addf81a 100644 --- a/drivers/mfd/rtl8411.c +++ b/drivers/mfd/rtl8411.c | |||
| @@ -112,6 +112,21 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card) | |||
| 112 | BPP_LDO_POWB, BPP_LDO_SUSPEND); | 112 | BPP_LDO_POWB, BPP_LDO_SUSPEND); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) | ||
| 116 | { | ||
| 117 | u8 mask, val; | ||
| 118 | |||
| 119 | mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK; | ||
| 120 | if (voltage == OUTPUT_3V3) | ||
| 121 | val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3; | ||
| 122 | else if (voltage == OUTPUT_1V8) | ||
| 123 | val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8; | ||
| 124 | else | ||
| 125 | return -EINVAL; | ||
| 126 | |||
| 127 | return rtsx_pci_write_register(pcr, LDO_CTL, mask, val); | ||
| 128 | } | ||
| 129 | |||
| 115 | static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr) | 130 | static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr) |
| 116 | { | 131 | { |
| 117 | unsigned int card_exist; | 132 | unsigned int card_exist; |
| @@ -163,6 +178,18 @@ static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr) | |||
| 163 | return card_exist; | 178 | return card_exist; |
| 164 | } | 179 | } |
| 165 | 180 | ||
| 181 | static int rtl8411_conv_clk_and_div_n(int input, int dir) | ||
| 182 | { | ||
| 183 | int output; | ||
| 184 | |||
| 185 | if (dir == CLK_TO_DIV_N) | ||
| 186 | output = input * 4 / 5 - 2; | ||
| 187 | else | ||
| 188 | output = (input + 2) * 5 / 4; | ||
| 189 | |||
| 190 | return output; | ||
| 191 | } | ||
| 192 | |||
| 166 | static const struct pcr_ops rtl8411_pcr_ops = { | 193 | static const struct pcr_ops rtl8411_pcr_ops = { |
| 167 | .extra_init_hw = rtl8411_extra_init_hw, | 194 | .extra_init_hw = rtl8411_extra_init_hw, |
| 168 | .optimize_phy = NULL, | 195 | .optimize_phy = NULL, |
| @@ -172,7 +199,9 @@ static const struct pcr_ops rtl8411_pcr_ops = { | |||
| 172 | .disable_auto_blink = rtl8411_disable_auto_blink, | 199 | .disable_auto_blink = rtl8411_disable_auto_blink, |
| 173 | .card_power_on = rtl8411_card_power_on, | 200 | .card_power_on = rtl8411_card_power_on, |
| 174 | .card_power_off = rtl8411_card_power_off, | 201 | .card_power_off = rtl8411_card_power_off, |
| 202 | .switch_output_voltage = rtl8411_switch_output_voltage, | ||
| 175 | .cd_deglitch = rtl8411_cd_deglitch, | 203 | .cd_deglitch = rtl8411_cd_deglitch, |
| 204 | .conv_clk_and_div_n = rtl8411_conv_clk_and_div_n, | ||
| 176 | }; | 205 | }; |
| 177 | 206 | ||
| 178 | /* SD Pull Control Enable: | 207 | /* SD Pull Control Enable: |
diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c index 283a4f148084..98fe0f39463e 100644 --- a/drivers/mfd/rts5209.c +++ b/drivers/mfd/rts5209.c | |||
| @@ -144,6 +144,25 @@ static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card) | |||
| 144 | return rtsx_pci_send_cmd(pcr, 100); | 144 | return rtsx_pci_send_cmd(pcr, 100); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) | ||
| 148 | { | ||
| 149 | int err; | ||
| 150 | |||
| 151 | if (voltage == OUTPUT_3V3) { | ||
| 152 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24); | ||
| 153 | if (err < 0) | ||
| 154 | return err; | ||
| 155 | } else if (voltage == OUTPUT_1V8) { | ||
| 156 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24); | ||
| 157 | if (err < 0) | ||
| 158 | return err; | ||
| 159 | } else { | ||
| 160 | return -EINVAL; | ||
| 161 | } | ||
| 162 | |||
| 163 | return 0; | ||
| 164 | } | ||
| 165 | |||
| 147 | static const struct pcr_ops rts5209_pcr_ops = { | 166 | static const struct pcr_ops rts5209_pcr_ops = { |
| 148 | .extra_init_hw = rts5209_extra_init_hw, | 167 | .extra_init_hw = rts5209_extra_init_hw, |
| 149 | .optimize_phy = rts5209_optimize_phy, | 168 | .optimize_phy = rts5209_optimize_phy, |
| @@ -153,7 +172,9 @@ static const struct pcr_ops rts5209_pcr_ops = { | |||
| 153 | .disable_auto_blink = rts5209_disable_auto_blink, | 172 | .disable_auto_blink = rts5209_disable_auto_blink, |
| 154 | .card_power_on = rts5209_card_power_on, | 173 | .card_power_on = rts5209_card_power_on, |
| 155 | .card_power_off = rts5209_card_power_off, | 174 | .card_power_off = rts5209_card_power_off, |
| 175 | .switch_output_voltage = rts5209_switch_output_voltage, | ||
| 156 | .cd_deglitch = NULL, | 176 | .cd_deglitch = NULL, |
| 177 | .conv_clk_and_div_n = NULL, | ||
| 157 | }; | 178 | }; |
| 158 | 179 | ||
| 159 | /* SD Pull Control Enable: | 180 | /* SD Pull Control Enable: |
diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c index b9dbab266fda..29d889cbb9c5 100644 --- a/drivers/mfd/rts5229.c +++ b/drivers/mfd/rts5229.c | |||
| @@ -114,6 +114,25 @@ static int rts5229_card_power_off(struct rtsx_pcr *pcr, int card) | |||
| 114 | return rtsx_pci_send_cmd(pcr, 100); | 114 | return rtsx_pci_send_cmd(pcr, 100); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static int rts5229_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) | ||
| 118 | { | ||
| 119 | int err; | ||
| 120 | |||
| 121 | if (voltage == OUTPUT_3V3) { | ||
| 122 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24); | ||
| 123 | if (err < 0) | ||
| 124 | return err; | ||
| 125 | } else if (voltage == OUTPUT_1V8) { | ||
| 126 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24); | ||
| 127 | if (err < 0) | ||
| 128 | return err; | ||
| 129 | } else { | ||
| 130 | return -EINVAL; | ||
| 131 | } | ||
| 132 | |||
| 133 | return 0; | ||
| 134 | } | ||
| 135 | |||
| 117 | static const struct pcr_ops rts5229_pcr_ops = { | 136 | static const struct pcr_ops rts5229_pcr_ops = { |
| 118 | .extra_init_hw = rts5229_extra_init_hw, | 137 | .extra_init_hw = rts5229_extra_init_hw, |
| 119 | .optimize_phy = rts5229_optimize_phy, | 138 | .optimize_phy = rts5229_optimize_phy, |
| @@ -123,7 +142,9 @@ static const struct pcr_ops rts5229_pcr_ops = { | |||
| 123 | .disable_auto_blink = rts5229_disable_auto_blink, | 142 | .disable_auto_blink = rts5229_disable_auto_blink, |
| 124 | .card_power_on = rts5229_card_power_on, | 143 | .card_power_on = rts5229_card_power_on, |
| 125 | .card_power_off = rts5229_card_power_off, | 144 | .card_power_off = rts5229_card_power_off, |
| 145 | .switch_output_voltage = rts5229_switch_output_voltage, | ||
| 126 | .cd_deglitch = NULL, | 146 | .cd_deglitch = NULL, |
| 147 | .conv_clk_and_div_n = NULL, | ||
| 127 | }; | 148 | }; |
| 128 | 149 | ||
| 129 | /* SD Pull Control Enable: | 150 | /* SD Pull Control Enable: |
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c index 7a7b0bda4618..9fc57009e228 100644 --- a/drivers/mfd/rtsx_pcr.c +++ b/drivers/mfd/rtsx_pcr.c | |||
| @@ -630,7 +630,10 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock, | |||
| 630 | if (clk == pcr->cur_clock) | 630 | if (clk == pcr->cur_clock) |
| 631 | return 0; | 631 | return 0; |
| 632 | 632 | ||
| 633 | N = (u8)(clk - 2); | 633 | if (pcr->ops->conv_clk_and_div_n) |
| 634 | N = (u8)pcr->ops->conv_clk_and_div_n(clk, CLK_TO_DIV_N); | ||
| 635 | else | ||
| 636 | N = (u8)(clk - 2); | ||
| 634 | if ((clk <= 2) || (N > max_N)) | 637 | if ((clk <= 2) || (N > max_N)) |
| 635 | return -EINVAL; | 638 | return -EINVAL; |
| 636 | 639 | ||
| @@ -641,7 +644,14 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock, | |||
| 641 | /* Make sure that the SSC clock div_n is equal or greater than min_N */ | 644 | /* Make sure that the SSC clock div_n is equal or greater than min_N */ |
| 642 | div = CLK_DIV_1; | 645 | div = CLK_DIV_1; |
| 643 | while ((N < min_N) && (div < max_div)) { | 646 | while ((N < min_N) && (div < max_div)) { |
| 644 | N = (N + 2) * 2 - 2; | 647 | if (pcr->ops->conv_clk_and_div_n) { |
| 648 | int dbl_clk = pcr->ops->conv_clk_and_div_n(N, | ||
| 649 | DIV_N_TO_CLK) * 2; | ||
| 650 | N = (u8)pcr->ops->conv_clk_and_div_n(dbl_clk, | ||
| 651 | CLK_TO_DIV_N); | ||
| 652 | } else { | ||
| 653 | N = (N + 2) * 2 - 2; | ||
| 654 | } | ||
| 645 | div++; | 655 | div++; |
| 646 | } | 656 | } |
| 647 | dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div); | 657 | dev_dbg(&(pcr->pci->dev), "N = %d, div = %d\n", N, div); |
| @@ -703,6 +713,15 @@ int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card) | |||
| 703 | } | 713 | } |
| 704 | EXPORT_SYMBOL_GPL(rtsx_pci_card_power_off); | 714 | EXPORT_SYMBOL_GPL(rtsx_pci_card_power_off); |
| 705 | 715 | ||
| 716 | int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) | ||
| 717 | { | ||
| 718 | if (pcr->ops->switch_output_voltage) | ||
| 719 | return pcr->ops->switch_output_voltage(pcr, voltage); | ||
| 720 | |||
| 721 | return 0; | ||
| 722 | } | ||
| 723 | EXPORT_SYMBOL_GPL(rtsx_pci_switch_output_voltage); | ||
| 724 | |||
| 706 | unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr) | 725 | unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr) |
| 707 | { | 726 | { |
| 708 | unsigned int val; | 727 | unsigned int val; |
| @@ -767,10 +786,10 @@ static void rtsx_pci_card_detect(struct work_struct *work) | |||
| 767 | 786 | ||
| 768 | spin_unlock_irqrestore(&pcr->lock, flags); | 787 | spin_unlock_irqrestore(&pcr->lock, flags); |
| 769 | 788 | ||
| 770 | if (card_detect & SD_EXIST) | 789 | if ((card_detect & SD_EXIST) && pcr->slots[RTSX_SD_CARD].card_event) |
| 771 | pcr->slots[RTSX_SD_CARD].card_event( | 790 | pcr->slots[RTSX_SD_CARD].card_event( |
| 772 | pcr->slots[RTSX_SD_CARD].p_dev); | 791 | pcr->slots[RTSX_SD_CARD].p_dev); |
| 773 | if (card_detect & MS_EXIST) | 792 | if ((card_detect & MS_EXIST) && pcr->slots[RTSX_MS_CARD].card_event) |
| 774 | pcr->slots[RTSX_MS_CARD].card_event( | 793 | pcr->slots[RTSX_MS_CARD].card_event( |
| 775 | pcr->slots[RTSX_MS_CARD].p_dev); | 794 | pcr->slots[RTSX_MS_CARD].p_dev); |
| 776 | } | 795 | } |
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index a06d66b929b1..ecc092c7f745 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c | |||
| @@ -219,25 +219,18 @@ static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq) | |||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static struct irq_domain_ops tc3589x_irq_ops = { | 221 | static struct irq_domain_ops tc3589x_irq_ops = { |
| 222 | .map = tc3589x_irq_map, | 222 | .map = tc3589x_irq_map, |
| 223 | .unmap = tc3589x_irq_unmap, | 223 | .unmap = tc3589x_irq_unmap, |
| 224 | .xlate = irq_domain_xlate_twocell, | 224 | .xlate = irq_domain_xlate_twocell, |
| 225 | }; | 225 | }; |
| 226 | 226 | ||
| 227 | static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np) | 227 | static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np) |
| 228 | { | 228 | { |
| 229 | int base = tc3589x->irq_base; | 229 | int base = tc3589x->irq_base; |
| 230 | 230 | ||
| 231 | if (base) { | 231 | tc3589x->domain = irq_domain_add_simple( |
| 232 | tc3589x->domain = irq_domain_add_legacy( | 232 | np, TC3589x_NR_INTERNAL_IRQS, base, |
| 233 | NULL, TC3589x_NR_INTERNAL_IRQS, base, | 233 | &tc3589x_irq_ops, tc3589x); |
| 234 | 0, &tc3589x_irq_ops, tc3589x); | ||
| 235 | } | ||
| 236 | else { | ||
| 237 | tc3589x->domain = irq_domain_add_linear( | ||
| 238 | np, TC3589x_NR_INTERNAL_IRQS, | ||
| 239 | &tc3589x_irq_ops, tc3589x); | ||
| 240 | } | ||
| 241 | 234 | ||
| 242 | if (!tc3589x->domain) { | 235 | if (!tc3589x->domain) { |
| 243 | dev_err(tc3589x->dev, "Failed to create irqdomain\n"); | 236 | dev_err(tc3589x->dev, "Failed to create irqdomain\n"); |
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c index 4dae241e5017..dd362c1078e1 100644 --- a/drivers/mfd/twl4030-power.c +++ b/drivers/mfd/twl4030-power.c | |||
| @@ -159,7 +159,7 @@ out: | |||
| 159 | static int twl4030_write_script(u8 address, struct twl4030_ins *script, | 159 | static int twl4030_write_script(u8 address, struct twl4030_ins *script, |
| 160 | int len) | 160 | int len) |
| 161 | { | 161 | { |
| 162 | int err; | 162 | int err = -EINVAL; |
| 163 | 163 | ||
| 164 | for (; len; len--, address++, script++) { | 164 | for (; len; len--, address++, script++) { |
| 165 | if (len == 1) { | 165 | if (len == 1) { |
diff --git a/drivers/mfd/vexpress-config.c b/drivers/mfd/vexpress-config.c index fae15d880758..3c1723aa6225 100644 --- a/drivers/mfd/vexpress-config.c +++ b/drivers/mfd/vexpress-config.c | |||
| @@ -67,6 +67,7 @@ struct vexpress_config_bridge *vexpress_config_bridge_register( | |||
| 67 | 67 | ||
| 68 | return bridge; | 68 | return bridge; |
| 69 | } | 69 | } |
| 70 | EXPORT_SYMBOL(vexpress_config_bridge_register); | ||
| 70 | 71 | ||
| 71 | void vexpress_config_bridge_unregister(struct vexpress_config_bridge *bridge) | 72 | void vexpress_config_bridge_unregister(struct vexpress_config_bridge *bridge) |
| 72 | { | 73 | { |
| @@ -83,6 +84,7 @@ void vexpress_config_bridge_unregister(struct vexpress_config_bridge *bridge) | |||
| 83 | while (!list_empty(&__bridge.transactions)) | 84 | while (!list_empty(&__bridge.transactions)) |
| 84 | cpu_relax(); | 85 | cpu_relax(); |
| 85 | } | 86 | } |
| 87 | EXPORT_SYMBOL(vexpress_config_bridge_unregister); | ||
| 86 | 88 | ||
| 87 | 89 | ||
| 88 | struct vexpress_config_func { | 90 | struct vexpress_config_func { |
| @@ -142,6 +144,7 @@ struct vexpress_config_func *__vexpress_config_func_get(struct device *dev, | |||
| 142 | 144 | ||
| 143 | return func; | 145 | return func; |
| 144 | } | 146 | } |
| 147 | EXPORT_SYMBOL(__vexpress_config_func_get); | ||
| 145 | 148 | ||
| 146 | void vexpress_config_func_put(struct vexpress_config_func *func) | 149 | void vexpress_config_func_put(struct vexpress_config_func *func) |
| 147 | { | 150 | { |
| @@ -149,7 +152,7 @@ void vexpress_config_func_put(struct vexpress_config_func *func) | |||
| 149 | of_node_put(func->bridge->node); | 152 | of_node_put(func->bridge->node); |
| 150 | kfree(func); | 153 | kfree(func); |
| 151 | } | 154 | } |
| 152 | 155 | EXPORT_SYMBOL(vexpress_config_func_put); | |
| 153 | 156 | ||
| 154 | struct vexpress_config_trans { | 157 | struct vexpress_config_trans { |
| 155 | struct vexpress_config_func *func; | 158 | struct vexpress_config_func *func; |
| @@ -229,6 +232,7 @@ void vexpress_config_complete(struct vexpress_config_bridge *bridge, | |||
| 229 | 232 | ||
| 230 | complete(&trans->completion); | 233 | complete(&trans->completion); |
| 231 | } | 234 | } |
| 235 | EXPORT_SYMBOL(vexpress_config_complete); | ||
| 232 | 236 | ||
| 233 | int vexpress_config_wait(struct vexpress_config_trans *trans) | 237 | int vexpress_config_wait(struct vexpress_config_trans *trans) |
| 234 | { | 238 | { |
| @@ -236,7 +240,7 @@ int vexpress_config_wait(struct vexpress_config_trans *trans) | |||
| 236 | 240 | ||
| 237 | return trans->status; | 241 | return trans->status; |
| 238 | } | 242 | } |
| 239 | 243 | EXPORT_SYMBOL(vexpress_config_wait); | |
| 240 | 244 | ||
| 241 | int vexpress_config_read(struct vexpress_config_func *func, int offset, | 245 | int vexpress_config_read(struct vexpress_config_func *func, int offset, |
| 242 | u32 *data) | 246 | u32 *data) |
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index e5d8f63b252a..77048b18439e 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c | |||
| @@ -313,19 +313,11 @@ static void vexpress_sysreg_config_complete(unsigned long data) | |||
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | 315 | ||
| 316 | void __init vexpress_sysreg_early_init(void __iomem *base) | 316 | void __init vexpress_sysreg_setup(struct device_node *node) |
| 317 | { | 317 | { |
| 318 | struct device_node *node = of_find_compatible_node(NULL, NULL, | 318 | if (WARN_ON(!vexpress_sysreg_base)) |
| 319 | "arm,vexpress-sysreg"); | ||
| 320 | |||
| 321 | if (node) | ||
| 322 | base = of_iomap(node, 0); | ||
| 323 | |||
| 324 | if (WARN_ON(!base)) | ||
| 325 | return; | 319 | return; |
| 326 | 320 | ||
| 327 | vexpress_sysreg_base = base; | ||
| 328 | |||
| 329 | if (readl(vexpress_sysreg_base + SYS_MISC) & SYS_MISC_MASTERSITE) | 321 | if (readl(vexpress_sysreg_base + SYS_MISC) & SYS_MISC_MASTERSITE) |
| 330 | vexpress_master_site = VEXPRESS_SITE_DB2; | 322 | vexpress_master_site = VEXPRESS_SITE_DB2; |
| 331 | else | 323 | else |
| @@ -336,9 +328,23 @@ void __init vexpress_sysreg_early_init(void __iomem *base) | |||
| 336 | WARN_ON(!vexpress_sysreg_config_bridge); | 328 | WARN_ON(!vexpress_sysreg_config_bridge); |
| 337 | } | 329 | } |
| 338 | 330 | ||
| 331 | void __init vexpress_sysreg_early_init(void __iomem *base) | ||
| 332 | { | ||
| 333 | vexpress_sysreg_base = base; | ||
| 334 | vexpress_sysreg_setup(NULL); | ||
| 335 | } | ||
| 336 | |||
| 339 | void __init vexpress_sysreg_of_early_init(void) | 337 | void __init vexpress_sysreg_of_early_init(void) |
| 340 | { | 338 | { |
| 341 | vexpress_sysreg_early_init(NULL); | 339 | struct device_node *node = of_find_compatible_node(NULL, NULL, |
| 340 | "arm,vexpress-sysreg"); | ||
| 341 | |||
| 342 | if (node) { | ||
| 343 | vexpress_sysreg_base = of_iomap(node, 0); | ||
| 344 | vexpress_sysreg_setup(node); | ||
| 345 | } else { | ||
| 346 | pr_info("vexpress-sysreg: No Device Tree node found."); | ||
| 347 | } | ||
| 342 | } | 348 | } |
| 343 | 349 | ||
| 344 | 350 | ||
| @@ -426,9 +432,11 @@ static int vexpress_sysreg_probe(struct platform_device *pdev) | |||
| 426 | return -EBUSY; | 432 | return -EBUSY; |
| 427 | } | 433 | } |
| 428 | 434 | ||
| 429 | if (!vexpress_sysreg_base) | 435 | if (!vexpress_sysreg_base) { |
| 430 | vexpress_sysreg_base = devm_ioremap(&pdev->dev, res->start, | 436 | vexpress_sysreg_base = devm_ioremap(&pdev->dev, res->start, |
| 431 | resource_size(res)); | 437 | resource_size(res)); |
| 438 | vexpress_sysreg_setup(pdev->dev.of_node); | ||
| 439 | } | ||
| 432 | 440 | ||
| 433 | if (!vexpress_sysreg_base) { | 441 | if (!vexpress_sysreg_base) { |
| 434 | dev_err(&pdev->dev, "Failed to obtain base address!\n"); | 442 | dev_err(&pdev->dev, "Failed to obtain base address!\n"); |
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c index 088872ab6338..1133a64c2dc9 100644 --- a/drivers/mfd/wm5102-tables.c +++ b/drivers/mfd/wm5102-tables.c | |||
| @@ -1882,7 +1882,7 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg) | |||
| 1882 | } | 1882 | } |
| 1883 | } | 1883 | } |
| 1884 | 1884 | ||
| 1885 | #define WM5102_MAX_REGISTER 0x1a8fff | 1885 | #define WM5102_MAX_REGISTER 0x1a9800 |
| 1886 | 1886 | ||
| 1887 | const struct regmap_config wm5102_spi_regmap = { | 1887 | const struct regmap_config wm5102_spi_regmap = { |
| 1888 | .reg_bits = 32, | 1888 | .reg_bits = 32, |
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 9ff942a346ed..83269f1d16e3 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c | |||
| @@ -468,6 +468,11 @@ long st_kim_start(void *kim_data) | |||
| 468 | if (pdata->chip_enable) | 468 | if (pdata->chip_enable) |
| 469 | pdata->chip_enable(kim_gdata); | 469 | pdata->chip_enable(kim_gdata); |
| 470 | 470 | ||
| 471 | /* Configure BT nShutdown to HIGH state */ | ||
| 472 | gpio_set_value(kim_gdata->nshutdown, GPIO_LOW); | ||
| 473 | mdelay(5); /* FIXME: a proper toggle */ | ||
| 474 | gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH); | ||
| 475 | mdelay(100); | ||
| 471 | /* re-initialize the completion */ | 476 | /* re-initialize the completion */ |
| 472 | INIT_COMPLETION(kim_gdata->ldisc_installed); | 477 | INIT_COMPLETION(kim_gdata->ldisc_installed); |
| 473 | /* send notification to UIM */ | 478 | /* send notification to UIM */ |
| @@ -509,7 +514,8 @@ long st_kim_start(void *kim_data) | |||
| 509 | * (b) upon failure to either install ldisc or download firmware. | 514 | * (b) upon failure to either install ldisc or download firmware. |
| 510 | * The function is responsible to (a) notify UIM about un-installation, | 515 | * The function is responsible to (a) notify UIM about un-installation, |
| 511 | * (b) flush UART if the ldisc was installed. | 516 | * (b) flush UART if the ldisc was installed. |
| 512 | * (c) invoke platform's chip disabling routine. | 517 | * (c) reset BT_EN - pull down nshutdown at the end. |
| 518 | * (d) invoke platform's chip disabling routine. | ||
| 513 | */ | 519 | */ |
| 514 | long st_kim_stop(void *kim_data) | 520 | long st_kim_stop(void *kim_data) |
| 515 | { | 521 | { |
| @@ -541,6 +547,13 @@ long st_kim_stop(void *kim_data) | |||
| 541 | err = -ETIMEDOUT; | 547 | err = -ETIMEDOUT; |
| 542 | } | 548 | } |
| 543 | 549 | ||
| 550 | /* By default configure BT nShutdown to LOW state */ | ||
| 551 | gpio_set_value(kim_gdata->nshutdown, GPIO_LOW); | ||
| 552 | mdelay(1); | ||
| 553 | gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH); | ||
| 554 | mdelay(1); | ||
| 555 | gpio_set_value(kim_gdata->nshutdown, GPIO_LOW); | ||
| 556 | |||
| 544 | /* platform specific disable */ | 557 | /* platform specific disable */ |
| 545 | if (pdata->chip_disable) | 558 | if (pdata->chip_disable) |
| 546 | pdata->chip_disable(kim_gdata); | 559 | pdata->chip_disable(kim_gdata); |
| @@ -733,6 +746,20 @@ static int kim_probe(struct platform_device *pdev) | |||
| 733 | /* refer to itself */ | 746 | /* refer to itself */ |
| 734 | kim_gdata->core_data->kim_data = kim_gdata; | 747 | kim_gdata->core_data->kim_data = kim_gdata; |
| 735 | 748 | ||
| 749 | /* Claim the chip enable nShutdown gpio from the system */ | ||
| 750 | kim_gdata->nshutdown = pdata->nshutdown_gpio; | ||
| 751 | err = gpio_request(kim_gdata->nshutdown, "kim"); | ||
| 752 | if (unlikely(err)) { | ||
| 753 | pr_err(" gpio %ld request failed ", kim_gdata->nshutdown); | ||
| 754 | return err; | ||
| 755 | } | ||
| 756 | |||
| 757 | /* Configure nShutdown GPIO as output=0 */ | ||
| 758 | err = gpio_direction_output(kim_gdata->nshutdown, 0); | ||
| 759 | if (unlikely(err)) { | ||
| 760 | pr_err(" unable to configure gpio %ld", kim_gdata->nshutdown); | ||
| 761 | return err; | ||
| 762 | } | ||
| 736 | /* get reference of pdev for request_firmware | 763 | /* get reference of pdev for request_firmware |
| 737 | */ | 764 | */ |
| 738 | kim_gdata->kim_pdev = pdev; | 765 | kim_gdata->kim_pdev = pdev; |
| @@ -779,10 +806,18 @@ err_core_init: | |||
| 779 | 806 | ||
| 780 | static int kim_remove(struct platform_device *pdev) | 807 | static int kim_remove(struct platform_device *pdev) |
| 781 | { | 808 | { |
| 809 | /* free the GPIOs requested */ | ||
| 810 | struct ti_st_plat_data *pdata = pdev->dev.platform_data; | ||
| 782 | struct kim_data_s *kim_gdata; | 811 | struct kim_data_s *kim_gdata; |
| 783 | 812 | ||
| 784 | kim_gdata = dev_get_drvdata(&pdev->dev); | 813 | kim_gdata = dev_get_drvdata(&pdev->dev); |
| 785 | 814 | ||
| 815 | /* Free the Bluetooth/FM/GPIO | ||
| 816 | * nShutdown gpio from the system | ||
| 817 | */ | ||
| 818 | gpio_free(pdata->nshutdown_gpio); | ||
| 819 | pr_info("nshutdown GPIO Freed"); | ||
| 820 | |||
| 786 | debugfs_remove_recursive(kim_debugfs_dir); | 821 | debugfs_remove_recursive(kim_debugfs_dir); |
| 787 | sysfs_remove_group(&pdev->dev.kobj, &uim_attr_grp); | 822 | sysfs_remove_group(&pdev->dev.kobj, &uim_attr_grp); |
| 788 | pr_info("sysfs entries removed"); | 823 | pr_info("sysfs entries removed"); |
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index de4c20b3936c..f8dd36102949 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c | |||
| @@ -50,8 +50,6 @@ struct mvsd_host { | |||
| 50 | struct timer_list timer; | 50 | struct timer_list timer; |
| 51 | struct mmc_host *mmc; | 51 | struct mmc_host *mmc; |
| 52 | struct device *dev; | 52 | struct device *dev; |
| 53 | struct resource *res; | ||
| 54 | int irq; | ||
| 55 | struct clk *clk; | 53 | struct clk *clk; |
| 56 | int gpio_card_detect; | 54 | int gpio_card_detect; |
| 57 | int gpio_write_protect; | 55 | int gpio_write_protect; |
| @@ -718,10 +716,6 @@ static int __init mvsd_probe(struct platform_device *pdev) | |||
| 718 | if (!r || irq < 0 || !mvsd_data) | 716 | if (!r || irq < 0 || !mvsd_data) |
| 719 | return -ENXIO; | 717 | return -ENXIO; |
| 720 | 718 | ||
| 721 | r = request_mem_region(r->start, SZ_1K, DRIVER_NAME); | ||
| 722 | if (!r) | ||
| 723 | return -EBUSY; | ||
| 724 | |||
| 725 | mmc = mmc_alloc_host(sizeof(struct mvsd_host), &pdev->dev); | 719 | mmc = mmc_alloc_host(sizeof(struct mvsd_host), &pdev->dev); |
| 726 | if (!mmc) { | 720 | if (!mmc) { |
| 727 | ret = -ENOMEM; | 721 | ret = -ENOMEM; |
| @@ -731,8 +725,8 @@ static int __init mvsd_probe(struct platform_device *pdev) | |||
| 731 | host = mmc_priv(mmc); | 725 | host = mmc_priv(mmc); |
| 732 | host->mmc = mmc; | 726 | host->mmc = mmc; |
| 733 | host->dev = &pdev->dev; | 727 | host->dev = &pdev->dev; |
| 734 | host->res = r; | ||
| 735 | host->base_clock = mvsd_data->clock / 2; | 728 | host->base_clock = mvsd_data->clock / 2; |
| 729 | host->clk = ERR_PTR(-EINVAL); | ||
| 736 | 730 | ||
| 737 | mmc->ops = &mvsd_ops; | 731 | mmc->ops = &mvsd_ops; |
| 738 | 732 | ||
| @@ -752,7 +746,7 @@ static int __init mvsd_probe(struct platform_device *pdev) | |||
| 752 | 746 | ||
| 753 | spin_lock_init(&host->lock); | 747 | spin_lock_init(&host->lock); |
| 754 | 748 | ||
| 755 | host->base = ioremap(r->start, SZ_4K); | 749 | host->base = devm_request_and_ioremap(&pdev->dev, r); |
| 756 | if (!host->base) { | 750 | if (!host->base) { |
| 757 | ret = -ENOMEM; | 751 | ret = -ENOMEM; |
| 758 | goto out; | 752 | goto out; |
| @@ -765,44 +759,45 @@ static int __init mvsd_probe(struct platform_device *pdev) | |||
| 765 | 759 | ||
| 766 | mvsd_power_down(host); | 760 | mvsd_power_down(host); |
| 767 | 761 | ||
| 768 | ret = request_irq(irq, mvsd_irq, 0, DRIVER_NAME, host); | 762 | ret = devm_request_irq(&pdev->dev, irq, mvsd_irq, 0, DRIVER_NAME, host); |
| 769 | if (ret) { | 763 | if (ret) { |
| 770 | pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq); | 764 | pr_err("%s: cannot assign irq %d\n", DRIVER_NAME, irq); |
| 771 | goto out; | 765 | goto out; |
| 772 | } else | 766 | } |
| 773 | host->irq = irq; | ||
| 774 | 767 | ||
| 775 | /* Not all platforms can gate the clock, so it is not | 768 | /* Not all platforms can gate the clock, so it is not |
| 776 | an error if the clock does not exists. */ | 769 | an error if the clock does not exists. */ |
| 777 | host->clk = clk_get(&pdev->dev, NULL); | 770 | host->clk = devm_clk_get(&pdev->dev, NULL); |
| 778 | if (!IS_ERR(host->clk)) { | 771 | if (!IS_ERR(host->clk)) |
| 779 | clk_prepare_enable(host->clk); | 772 | clk_prepare_enable(host->clk); |
| 780 | } | ||
| 781 | 773 | ||
| 782 | if (mvsd_data->gpio_card_detect) { | 774 | if (mvsd_data->gpio_card_detect) { |
| 783 | ret = gpio_request(mvsd_data->gpio_card_detect, | 775 | ret = devm_gpio_request_one(&pdev->dev, |
| 784 | DRIVER_NAME " cd"); | 776 | mvsd_data->gpio_card_detect, |
| 777 | GPIOF_IN, DRIVER_NAME " cd"); | ||
| 785 | if (ret == 0) { | 778 | if (ret == 0) { |
| 786 | gpio_direction_input(mvsd_data->gpio_card_detect); | ||
| 787 | irq = gpio_to_irq(mvsd_data->gpio_card_detect); | 779 | irq = gpio_to_irq(mvsd_data->gpio_card_detect); |
| 788 | ret = request_irq(irq, mvsd_card_detect_irq, | 780 | ret = devm_request_irq(&pdev->dev, irq, |
| 789 | IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING, | 781 | mvsd_card_detect_irq, |
| 790 | DRIVER_NAME " cd", host); | 782 | IRQ_TYPE_EDGE_RISING | |
| 783 | IRQ_TYPE_EDGE_FALLING, | ||
| 784 | DRIVER_NAME " cd", host); | ||
| 791 | if (ret == 0) | 785 | if (ret == 0) |
| 792 | host->gpio_card_detect = | 786 | host->gpio_card_detect = |
| 793 | mvsd_data->gpio_card_detect; | 787 | mvsd_data->gpio_card_detect; |
| 794 | else | 788 | else |
| 795 | gpio_free(mvsd_data->gpio_card_detect); | 789 | devm_gpio_free(&pdev->dev, |
| 790 | mvsd_data->gpio_card_detect); | ||
| 796 | } | 791 | } |
| 797 | } | 792 | } |
| 798 | if (!host->gpio_card_detect) | 793 | if (!host->gpio_card_detect) |
| 799 | mmc->caps |= MMC_CAP_NEEDS_POLL; | 794 | mmc->caps |= MMC_CAP_NEEDS_POLL; |
| 800 | 795 | ||
| 801 | if (mvsd_data->gpio_write_protect) { | 796 | if (mvsd_data->gpio_write_protect) { |
| 802 | ret = gpio_request(mvsd_data->gpio_write_protect, | 797 | ret = devm_gpio_request_one(&pdev->dev, |
| 803 | DRIVER_NAME " wp"); | 798 | mvsd_data->gpio_write_protect, |
| 799 | GPIOF_IN, DRIVER_NAME " wp"); | ||
| 804 | if (ret == 0) { | 800 | if (ret == 0) { |
| 805 | gpio_direction_input(mvsd_data->gpio_write_protect); | ||
| 806 | host->gpio_write_protect = | 801 | host->gpio_write_protect = |
| 807 | mvsd_data->gpio_write_protect; | 802 | mvsd_data->gpio_write_protect; |
| 808 | } | 803 | } |
| @@ -824,26 +819,11 @@ static int __init mvsd_probe(struct platform_device *pdev) | |||
| 824 | return 0; | 819 | return 0; |
| 825 | 820 | ||
| 826 | out: | 821 | out: |
| 827 | if (host) { | 822 | if (mmc) { |
| 828 | if (host->irq) | 823 | if (!IS_ERR(host->clk)) |
| 829 | free_irq(host->irq, host); | ||
| 830 | if (host->gpio_card_detect) { | ||
| 831 | free_irq(gpio_to_irq(host->gpio_card_detect), host); | ||
| 832 | gpio_free(host->gpio_card_detect); | ||
| 833 | } | ||
| 834 | if (host->gpio_write_protect) | ||
| 835 | gpio_free(host->gpio_write_protect); | ||
| 836 | if (host->base) | ||
| 837 | iounmap(host->base); | ||
| 838 | } | ||
| 839 | if (r) | ||
| 840 | release_resource(r); | ||
| 841 | if (mmc) | ||
| 842 | if (!IS_ERR_OR_NULL(host->clk)) { | ||
| 843 | clk_disable_unprepare(host->clk); | 824 | clk_disable_unprepare(host->clk); |
| 844 | clk_put(host->clk); | ||
| 845 | } | ||
| 846 | mmc_free_host(mmc); | 825 | mmc_free_host(mmc); |
| 826 | } | ||
| 847 | 827 | ||
| 848 | return ret; | 828 | return ret; |
| 849 | } | 829 | } |
| @@ -852,28 +832,16 @@ static int __exit mvsd_remove(struct platform_device *pdev) | |||
| 852 | { | 832 | { |
| 853 | struct mmc_host *mmc = platform_get_drvdata(pdev); | 833 | struct mmc_host *mmc = platform_get_drvdata(pdev); |
| 854 | 834 | ||
| 855 | if (mmc) { | 835 | struct mvsd_host *host = mmc_priv(mmc); |
| 856 | struct mvsd_host *host = mmc_priv(mmc); | ||
| 857 | 836 | ||
| 858 | if (host->gpio_card_detect) { | 837 | mmc_remove_host(mmc); |
| 859 | free_irq(gpio_to_irq(host->gpio_card_detect), host); | 838 | del_timer_sync(&host->timer); |
| 860 | gpio_free(host->gpio_card_detect); | 839 | mvsd_power_down(host); |
| 861 | } | 840 | |
| 862 | mmc_remove_host(mmc); | 841 | if (!IS_ERR(host->clk)) |
| 863 | free_irq(host->irq, host); | 842 | clk_disable_unprepare(host->clk); |
| 864 | if (host->gpio_write_protect) | 843 | mmc_free_host(mmc); |
| 865 | gpio_free(host->gpio_write_protect); | ||
| 866 | del_timer_sync(&host->timer); | ||
| 867 | mvsd_power_down(host); | ||
| 868 | iounmap(host->base); | ||
| 869 | release_resource(host->res); | ||
| 870 | 844 | ||
| 871 | if (!IS_ERR(host->clk)) { | ||
| 872 | clk_disable_unprepare(host->clk); | ||
| 873 | clk_put(host->clk); | ||
| 874 | } | ||
| 875 | mmc_free_host(mmc); | ||
| 876 | } | ||
| 877 | platform_set_drvdata(pdev, NULL); | 845 | platform_set_drvdata(pdev, NULL); |
| 878 | return 0; | 846 | return 0; |
| 879 | } | 847 | } |
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index 571915dfb218..f74b5adca642 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c | |||
| @@ -1060,26 +1060,6 @@ static int sd_wait_voltage_stable_2(struct realtek_pci_sdmmc *host) | |||
| 1060 | return 0; | 1060 | return 0; |
| 1061 | } | 1061 | } |
| 1062 | 1062 | ||
| 1063 | static int sd_change_bank_voltage(struct realtek_pci_sdmmc *host, u8 voltage) | ||
| 1064 | { | ||
| 1065 | struct rtsx_pcr *pcr = host->pcr; | ||
| 1066 | int err; | ||
| 1067 | |||
| 1068 | if (voltage == SD_IO_3V3) { | ||
| 1069 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24); | ||
| 1070 | if (err < 0) | ||
| 1071 | return err; | ||
| 1072 | } else if (voltage == SD_IO_1V8) { | ||
| 1073 | err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24); | ||
| 1074 | if (err < 0) | ||
| 1075 | return err; | ||
| 1076 | } else { | ||
| 1077 | return -EINVAL; | ||
| 1078 | } | ||
| 1079 | |||
| 1080 | return 0; | ||
| 1081 | } | ||
| 1082 | |||
| 1083 | static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) | 1063 | static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) |
| 1084 | { | 1064 | { |
| 1085 | struct realtek_pci_sdmmc *host = mmc_priv(mmc); | 1065 | struct realtek_pci_sdmmc *host = mmc_priv(mmc); |
| @@ -1098,11 +1078,11 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 1098 | rtsx_pci_start_run(pcr); | 1078 | rtsx_pci_start_run(pcr); |
| 1099 | 1079 | ||
| 1100 | if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) | 1080 | if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) |
| 1101 | voltage = SD_IO_3V3; | 1081 | voltage = OUTPUT_3V3; |
| 1102 | else | 1082 | else |
| 1103 | voltage = SD_IO_1V8; | 1083 | voltage = OUTPUT_1V8; |
| 1104 | 1084 | ||
| 1105 | if (voltage == SD_IO_1V8) { | 1085 | if (voltage == OUTPUT_1V8) { |
| 1106 | err = rtsx_pci_write_register(pcr, | 1086 | err = rtsx_pci_write_register(pcr, |
| 1107 | SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B); | 1087 | SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B); |
| 1108 | if (err < 0) | 1088 | if (err < 0) |
| @@ -1113,11 +1093,11 @@ static int sdmmc_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios) | |||
| 1113 | goto out; | 1093 | goto out; |
| 1114 | } | 1094 | } |
| 1115 | 1095 | ||
| 1116 | err = sd_change_bank_voltage(host, voltage); | 1096 | err = rtsx_pci_switch_output_voltage(pcr, voltage); |
| 1117 | if (err < 0) | 1097 | if (err < 0) |
| 1118 | goto out; | 1098 | goto out; |
| 1119 | 1099 | ||
| 1120 | if (voltage == SD_IO_1V8) { | 1100 | if (voltage == OUTPUT_1V8) { |
| 1121 | err = sd_wait_voltage_stable_2(host); | 1101 | err = sd_wait_voltage_stable_2(host); |
| 1122 | if (err < 0) | 1102 | if (err < 0) |
| 1123 | goto out; | 1103 | goto out; |
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 5233b8f58d77..58607f196c9e 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c | |||
| @@ -960,7 +960,7 @@ static int c_can_handle_bus_err(struct net_device *dev, | |||
| 960 | break; | 960 | break; |
| 961 | case LEC_ACK_ERROR: | 961 | case LEC_ACK_ERROR: |
| 962 | netdev_dbg(dev, "ack error\n"); | 962 | netdev_dbg(dev, "ack error\n"); |
| 963 | cf->data[2] |= (CAN_ERR_PROT_LOC_ACK | | 963 | cf->data[3] |= (CAN_ERR_PROT_LOC_ACK | |
| 964 | CAN_ERR_PROT_LOC_ACK_DEL); | 964 | CAN_ERR_PROT_LOC_ACK_DEL); |
| 965 | break; | 965 | break; |
| 966 | case LEC_BIT1_ERROR: | 966 | case LEC_BIT1_ERROR: |
| @@ -973,7 +973,7 @@ static int c_can_handle_bus_err(struct net_device *dev, | |||
| 973 | break; | 973 | break; |
| 974 | case LEC_CRC_ERROR: | 974 | case LEC_CRC_ERROR: |
| 975 | netdev_dbg(dev, "CRC error\n"); | 975 | netdev_dbg(dev, "CRC error\n"); |
| 976 | cf->data[2] |= (CAN_ERR_PROT_LOC_CRC_SEQ | | 976 | cf->data[3] |= (CAN_ERR_PROT_LOC_CRC_SEQ | |
| 977 | CAN_ERR_PROT_LOC_CRC_DEL); | 977 | CAN_ERR_PROT_LOC_CRC_DEL); |
| 978 | break; | 978 | break; |
| 979 | default: | 979 | default: |
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index 7d1748575b1f..5c314a961970 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c | |||
| @@ -560,7 +560,7 @@ static void pch_can_error(struct net_device *ndev, u32 status) | |||
| 560 | stats->rx_errors++; | 560 | stats->rx_errors++; |
| 561 | break; | 561 | break; |
| 562 | case PCH_CRC_ERR: | 562 | case PCH_CRC_ERR: |
| 563 | cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ | | 563 | cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ | |
| 564 | CAN_ERR_PROT_LOC_CRC_DEL; | 564 | CAN_ERR_PROT_LOC_CRC_DEL; |
| 565 | priv->can.can_stats.bus_error++; | 565 | priv->can.can_stats.bus_error++; |
| 566 | stats->rx_errors++; | 566 | stats->rx_errors++; |
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index f898c6363729..300581b24ff3 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c | |||
| @@ -746,12 +746,12 @@ static int ti_hecc_error(struct net_device *ndev, int int_status, | |||
| 746 | } | 746 | } |
| 747 | if (err_status & HECC_CANES_CRCE) { | 747 | if (err_status & HECC_CANES_CRCE) { |
| 748 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE); | 748 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE); |
| 749 | cf->data[2] |= CAN_ERR_PROT_LOC_CRC_SEQ | | 749 | cf->data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ | |
| 750 | CAN_ERR_PROT_LOC_CRC_DEL; | 750 | CAN_ERR_PROT_LOC_CRC_DEL; |
| 751 | } | 751 | } |
| 752 | if (err_status & HECC_CANES_ACKE) { | 752 | if (err_status & HECC_CANES_ACKE) { |
| 753 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE); | 753 | hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE); |
| 754 | cf->data[2] |= CAN_ERR_PROT_LOC_ACK | | 754 | cf->data[3] |= CAN_ERR_PROT_LOC_ACK | |
| 755 | CAN_ERR_PROT_LOC_ACK_DEL; | 755 | CAN_ERR_PROT_LOC_ACK_DEL; |
| 756 | } | 756 | } |
| 757 | } | 757 | } |
diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c index 66df93638085..ffd8de28a76a 100644 --- a/drivers/net/ethernet/3com/3c574_cs.c +++ b/drivers/net/ethernet/3com/3c574_cs.c | |||
| @@ -432,7 +432,7 @@ static int tc574_config(struct pcmcia_device *link) | |||
| 432 | netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n", | 432 | netdev_info(dev, "%s at io %#3lx, irq %d, hw_addr %pM\n", |
| 433 | cardname, dev->base_addr, dev->irq, dev->dev_addr); | 433 | cardname, dev->base_addr, dev->irq, dev->dev_addr); |
| 434 | netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n", | 434 | netdev_info(dev, " %dK FIFO split %s Rx:Tx, %sMII interface.\n", |
| 435 | 8 << config & Ram_size, | 435 | 8 << (config & Ram_size), |
| 436 | ram_split[(config & Ram_split) >> Ram_split_shift], | 436 | ram_split[(config & Ram_split) >> Ram_split_shift], |
| 437 | config & Autoselect ? "autoselect " : ""); | 437 | config & Autoselect ? "autoselect " : ""); |
| 438 | 438 | ||
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 78ea90c40e19..bdb086934cd9 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
| @@ -1283,14 +1283,26 @@ static int tg3_phy_auxctl_write(struct tg3 *tp, int reg, u32 set) | |||
| 1283 | return tg3_writephy(tp, MII_TG3_AUX_CTRL, set | reg); | 1283 | return tg3_writephy(tp, MII_TG3_AUX_CTRL, set | reg); |
| 1284 | } | 1284 | } |
| 1285 | 1285 | ||
| 1286 | #define TG3_PHY_AUXCTL_SMDSP_ENABLE(tp) \ | 1286 | static int tg3_phy_toggle_auxctl_smdsp(struct tg3 *tp, bool enable) |
| 1287 | tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \ | 1287 | { |
| 1288 | MII_TG3_AUXCTL_ACTL_SMDSP_ENA | \ | 1288 | u32 val; |
| 1289 | MII_TG3_AUXCTL_ACTL_TX_6DB) | 1289 | int err; |
| 1290 | 1290 | ||
| 1291 | #define TG3_PHY_AUXCTL_SMDSP_DISABLE(tp) \ | 1291 | err = tg3_phy_auxctl_read(tp, MII_TG3_AUXCTL_SHDWSEL_AUXCTL, &val); |
| 1292 | tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, \ | 1292 | |
| 1293 | MII_TG3_AUXCTL_ACTL_TX_6DB); | 1293 | if (err) |
| 1294 | return err; | ||
| 1295 | if (enable) | ||
| 1296 | |||
| 1297 | val |= MII_TG3_AUXCTL_ACTL_SMDSP_ENA; | ||
| 1298 | else | ||
| 1299 | val &= ~MII_TG3_AUXCTL_ACTL_SMDSP_ENA; | ||
| 1300 | |||
| 1301 | err = tg3_phy_auxctl_write((tp), MII_TG3_AUXCTL_SHDWSEL_AUXCTL, | ||
| 1302 | val | MII_TG3_AUXCTL_ACTL_TX_6DB); | ||
| 1303 | |||
| 1304 | return err; | ||
| 1305 | } | ||
| 1294 | 1306 | ||
| 1295 | static int tg3_bmcr_reset(struct tg3 *tp) | 1307 | static int tg3_bmcr_reset(struct tg3 *tp) |
| 1296 | { | 1308 | { |
| @@ -2223,7 +2235,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp) | |||
| 2223 | 2235 | ||
| 2224 | otp = tp->phy_otp; | 2236 | otp = tp->phy_otp; |
| 2225 | 2237 | ||
| 2226 | if (TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) | 2238 | if (tg3_phy_toggle_auxctl_smdsp(tp, true)) |
| 2227 | return; | 2239 | return; |
| 2228 | 2240 | ||
| 2229 | phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT); | 2241 | phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT); |
| @@ -2248,7 +2260,7 @@ static void tg3_phy_apply_otp(struct tg3 *tp) | |||
| 2248 | ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT); | 2260 | ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT); |
| 2249 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy); | 2261 | tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy); |
| 2250 | 2262 | ||
| 2251 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2263 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2252 | } | 2264 | } |
| 2253 | 2265 | ||
| 2254 | static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up) | 2266 | static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up) |
| @@ -2284,9 +2296,9 @@ static void tg3_phy_eee_adjust(struct tg3 *tp, u32 current_link_up) | |||
| 2284 | 2296 | ||
| 2285 | if (!tp->setlpicnt) { | 2297 | if (!tp->setlpicnt) { |
| 2286 | if (current_link_up == 1 && | 2298 | if (current_link_up == 1 && |
| 2287 | !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { | 2299 | !tg3_phy_toggle_auxctl_smdsp(tp, true)) { |
| 2288 | tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000); | 2300 | tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, 0x0000); |
| 2289 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2301 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2290 | } | 2302 | } |
| 2291 | 2303 | ||
| 2292 | val = tr32(TG3_CPMU_EEE_MODE); | 2304 | val = tr32(TG3_CPMU_EEE_MODE); |
| @@ -2302,11 +2314,11 @@ static void tg3_phy_eee_enable(struct tg3 *tp) | |||
| 2302 | (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || | 2314 | (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || |
| 2303 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || | 2315 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || |
| 2304 | tg3_flag(tp, 57765_CLASS)) && | 2316 | tg3_flag(tp, 57765_CLASS)) && |
| 2305 | !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { | 2317 | !tg3_phy_toggle_auxctl_smdsp(tp, true)) { |
| 2306 | val = MII_TG3_DSP_TAP26_ALNOKO | | 2318 | val = MII_TG3_DSP_TAP26_ALNOKO | |
| 2307 | MII_TG3_DSP_TAP26_RMRXSTO; | 2319 | MII_TG3_DSP_TAP26_RMRXSTO; |
| 2308 | tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val); | 2320 | tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val); |
| 2309 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2321 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2310 | } | 2322 | } |
| 2311 | 2323 | ||
| 2312 | val = tr32(TG3_CPMU_EEE_MODE); | 2324 | val = tr32(TG3_CPMU_EEE_MODE); |
| @@ -2450,7 +2462,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) | |||
| 2450 | tg3_writephy(tp, MII_CTRL1000, | 2462 | tg3_writephy(tp, MII_CTRL1000, |
| 2451 | CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER); | 2463 | CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER); |
| 2452 | 2464 | ||
| 2453 | err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp); | 2465 | err = tg3_phy_toggle_auxctl_smdsp(tp, true); |
| 2454 | if (err) | 2466 | if (err) |
| 2455 | return err; | 2467 | return err; |
| 2456 | 2468 | ||
| @@ -2471,7 +2483,7 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp) | |||
| 2471 | tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200); | 2483 | tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200); |
| 2472 | tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000); | 2484 | tg3_writephy(tp, MII_TG3_DSP_CONTROL, 0x0000); |
| 2473 | 2485 | ||
| 2474 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2486 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2475 | 2487 | ||
| 2476 | tg3_writephy(tp, MII_CTRL1000, phy9_orig); | 2488 | tg3_writephy(tp, MII_CTRL1000, phy9_orig); |
| 2477 | 2489 | ||
| @@ -2572,10 +2584,10 @@ static int tg3_phy_reset(struct tg3 *tp) | |||
| 2572 | 2584 | ||
| 2573 | out: | 2585 | out: |
| 2574 | if ((tp->phy_flags & TG3_PHYFLG_ADC_BUG) && | 2586 | if ((tp->phy_flags & TG3_PHYFLG_ADC_BUG) && |
| 2575 | !TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { | 2587 | !tg3_phy_toggle_auxctl_smdsp(tp, true)) { |
| 2576 | tg3_phydsp_write(tp, 0x201f, 0x2aaa); | 2588 | tg3_phydsp_write(tp, 0x201f, 0x2aaa); |
| 2577 | tg3_phydsp_write(tp, 0x000a, 0x0323); | 2589 | tg3_phydsp_write(tp, 0x000a, 0x0323); |
| 2578 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2590 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2579 | } | 2591 | } |
| 2580 | 2592 | ||
| 2581 | if (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) { | 2593 | if (tp->phy_flags & TG3_PHYFLG_5704_A0_BUG) { |
| @@ -2584,14 +2596,14 @@ out: | |||
| 2584 | } | 2596 | } |
| 2585 | 2597 | ||
| 2586 | if (tp->phy_flags & TG3_PHYFLG_BER_BUG) { | 2598 | if (tp->phy_flags & TG3_PHYFLG_BER_BUG) { |
| 2587 | if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { | 2599 | if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) { |
| 2588 | tg3_phydsp_write(tp, 0x000a, 0x310b); | 2600 | tg3_phydsp_write(tp, 0x000a, 0x310b); |
| 2589 | tg3_phydsp_write(tp, 0x201f, 0x9506); | 2601 | tg3_phydsp_write(tp, 0x201f, 0x9506); |
| 2590 | tg3_phydsp_write(tp, 0x401f, 0x14e2); | 2602 | tg3_phydsp_write(tp, 0x401f, 0x14e2); |
| 2591 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2603 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2592 | } | 2604 | } |
| 2593 | } else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) { | 2605 | } else if (tp->phy_flags & TG3_PHYFLG_JITTER_BUG) { |
| 2594 | if (!TG3_PHY_AUXCTL_SMDSP_ENABLE(tp)) { | 2606 | if (!tg3_phy_toggle_auxctl_smdsp(tp, true)) { |
| 2595 | tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a); | 2607 | tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000a); |
| 2596 | if (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) { | 2608 | if (tp->phy_flags & TG3_PHYFLG_ADJUST_TRIM) { |
| 2597 | tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b); | 2609 | tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x110b); |
| @@ -2600,7 +2612,7 @@ out: | |||
| 2600 | } else | 2612 | } else |
| 2601 | tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b); | 2613 | tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x010b); |
| 2602 | 2614 | ||
| 2603 | TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 2615 | tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 2604 | } | 2616 | } |
| 2605 | } | 2617 | } |
| 2606 | 2618 | ||
| @@ -4009,7 +4021,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) | |||
| 4009 | tw32(TG3_CPMU_EEE_MODE, | 4021 | tw32(TG3_CPMU_EEE_MODE, |
| 4010 | tr32(TG3_CPMU_EEE_MODE) & ~TG3_CPMU_EEEMD_LPI_ENABLE); | 4022 | tr32(TG3_CPMU_EEE_MODE) & ~TG3_CPMU_EEEMD_LPI_ENABLE); |
| 4011 | 4023 | ||
| 4012 | err = TG3_PHY_AUXCTL_SMDSP_ENABLE(tp); | 4024 | err = tg3_phy_toggle_auxctl_smdsp(tp, true); |
| 4013 | if (!err) { | 4025 | if (!err) { |
| 4014 | u32 err2; | 4026 | u32 err2; |
| 4015 | 4027 | ||
| @@ -4042,7 +4054,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl) | |||
| 4042 | MII_TG3_DSP_CH34TP2_HIBW01); | 4054 | MII_TG3_DSP_CH34TP2_HIBW01); |
| 4043 | } | 4055 | } |
| 4044 | 4056 | ||
| 4045 | err2 = TG3_PHY_AUXCTL_SMDSP_DISABLE(tp); | 4057 | err2 = tg3_phy_toggle_auxctl_smdsp(tp, false); |
| 4046 | if (!err) | 4058 | if (!err) |
| 4047 | err = err2; | 4059 | err = err2; |
| 4048 | } | 4060 | } |
| @@ -6950,6 +6962,9 @@ static void tg3_poll_controller(struct net_device *dev) | |||
| 6950 | int i; | 6962 | int i; |
| 6951 | struct tg3 *tp = netdev_priv(dev); | 6963 | struct tg3 *tp = netdev_priv(dev); |
| 6952 | 6964 | ||
| 6965 | if (tg3_irq_sync(tp)) | ||
| 6966 | return; | ||
| 6967 | |||
| 6953 | for (i = 0; i < tp->irq_cnt; i++) | 6968 | for (i = 0; i < tp->irq_cnt; i++) |
| 6954 | tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); | 6969 | tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); |
| 6955 | } | 6970 | } |
| @@ -16367,6 +16382,7 @@ static int tg3_init_one(struct pci_dev *pdev, | |||
| 16367 | tp->pm_cap = pm_cap; | 16382 | tp->pm_cap = pm_cap; |
| 16368 | tp->rx_mode = TG3_DEF_RX_MODE; | 16383 | tp->rx_mode = TG3_DEF_RX_MODE; |
| 16369 | tp->tx_mode = TG3_DEF_TX_MODE; | 16384 | tp->tx_mode = TG3_DEF_TX_MODE; |
| 16385 | tp->irq_sync = 1; | ||
| 16370 | 16386 | ||
| 16371 | if (tg3_debug > 0) | 16387 | if (tg3_debug > 0) |
| 16372 | tp->msg_enable = tg3_debug; | 16388 | tp->msg_enable = tg3_debug; |
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index b407043ce9b0..f7f02900f650 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c | |||
| @@ -548,6 +548,10 @@ static int desc_get_rx_status(struct xgmac_priv *priv, struct xgmac_dma_desc *p) | |||
| 548 | return -1; | 548 | return -1; |
| 549 | } | 549 | } |
| 550 | 550 | ||
| 551 | /* All frames should fit into a single buffer */ | ||
| 552 | if (!(status & RXDESC_FIRST_SEG) || !(status & RXDESC_LAST_SEG)) | ||
| 553 | return -1; | ||
| 554 | |||
| 551 | /* Check if packet has checksum already */ | 555 | /* Check if packet has checksum already */ |
| 552 | if ((status & RXDESC_FRAME_TYPE) && (status & RXDESC_EXT_STATUS) && | 556 | if ((status & RXDESC_FRAME_TYPE) && (status & RXDESC_EXT_STATUS) && |
| 553 | !(ext_status & RXDESC_IP_PAYLOAD_MASK)) | 557 | !(ext_status & RXDESC_IP_PAYLOAD_MASK)) |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index f0718e1a8369..c306df7d4568 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
| @@ -1994,9 +1994,20 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | |||
| 1994 | { | 1994 | { |
| 1995 | const struct port_info *pi = netdev_priv(dev); | 1995 | const struct port_info *pi = netdev_priv(dev); |
| 1996 | struct adapter *adap = pi->adapter; | 1996 | struct adapter *adap = pi->adapter; |
| 1997 | 1997 | struct sge_rspq *q; | |
| 1998 | return set_rxq_intr_params(adap, &adap->sge.ethrxq[pi->first_qset].rspq, | 1998 | int i; |
| 1999 | c->rx_coalesce_usecs, c->rx_max_coalesced_frames); | 1999 | int r = 0; |
| 2000 | |||
| 2001 | for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++) { | ||
| 2002 | q = &adap->sge.ethrxq[i].rspq; | ||
| 2003 | r = set_rxq_intr_params(adap, q, c->rx_coalesce_usecs, | ||
| 2004 | c->rx_max_coalesced_frames); | ||
| 2005 | if (r) { | ||
| 2006 | dev_err(&dev->dev, "failed to set coalesce %d\n", r); | ||
| 2007 | break; | ||
| 2008 | } | ||
| 2009 | } | ||
| 2010 | return r; | ||
| 2000 | } | 2011 | } |
| 2001 | 2012 | ||
| 2002 | static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) | 2013 | static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c) |
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile index f3a632bf8d96..687c83d1bdab 100644 --- a/drivers/net/ethernet/intel/ixgbe/Makefile +++ b/drivers/net/ethernet/intel/ixgbe/Makefile | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | obj-$(CONFIG_IXGBE) += ixgbe.o | 33 | obj-$(CONFIG_IXGBE) += ixgbe.o |
| 34 | 34 | ||
| 35 | ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o ixgbe_debugfs.o\ | 35 | ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \ |
| 36 | ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \ | 36 | ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \ |
| 37 | ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o | 37 | ixgbe_mbx.o ixgbe_x540.o ixgbe_lib.o ixgbe_ptp.o |
| 38 | 38 | ||
| @@ -40,4 +40,5 @@ ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \ | |||
| 40 | ixgbe_dcb_82599.o ixgbe_dcb_nl.o | 40 | ixgbe_dcb_82599.o ixgbe_dcb_nl.o |
| 41 | 41 | ||
| 42 | ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o | 42 | ixgbe-$(CONFIG_IXGBE_HWMON) += ixgbe_sysfs.o |
| 43 | ixgbe-$(CONFIG_DEBUG_FS) += ixgbe_debugfs.o | ||
| 43 | ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o | 44 | ixgbe-$(CONFIG_FCOE:m=y) += ixgbe_fcoe.o |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c index 50aa546b8c7a..3504686d3af5 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | |||
| @@ -24,9 +24,6 @@ | |||
| 24 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 24 | Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
| 25 | 25 | ||
| 26 | *******************************************************************************/ | 26 | *******************************************************************************/ |
| 27 | |||
| 28 | #ifdef CONFIG_DEBUG_FS | ||
| 29 | |||
| 30 | #include <linux/debugfs.h> | 27 | #include <linux/debugfs.h> |
| 31 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 32 | 29 | ||
| @@ -277,5 +274,3 @@ void ixgbe_dbg_exit(void) | |||
| 277 | { | 274 | { |
| 278 | debugfs_remove_recursive(ixgbe_dbg_root); | 275 | debugfs_remove_recursive(ixgbe_dbg_root); |
| 279 | } | 276 | } |
| 280 | |||
| 281 | #endif /* CONFIG_DEBUG_FS */ | ||
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 1a751c9d09c4..bb9256a1b0a9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | |||
| @@ -660,11 +660,11 @@ int ixgbe_ptp_hwtstamp_ioctl(struct ixgbe_adapter *adapter, | |||
| 660 | break; | 660 | break; |
| 661 | case HWTSTAMP_FILTER_PTP_V1_L4_SYNC: | 661 | case HWTSTAMP_FILTER_PTP_V1_L4_SYNC: |
| 662 | tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1; | 662 | tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1; |
| 663 | tsync_rx_mtrl = IXGBE_RXMTRL_V1_SYNC_MSG; | 663 | tsync_rx_mtrl |= IXGBE_RXMTRL_V1_SYNC_MSG; |
| 664 | break; | 664 | break; |
| 665 | case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ: | 665 | case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ: |
| 666 | tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1; | 666 | tsync_rx_ctl |= IXGBE_TSYNCRXCTL_TYPE_L4_V1; |
| 667 | tsync_rx_mtrl = IXGBE_RXMTRL_V1_DELAY_REQ_MSG; | 667 | tsync_rx_mtrl |= IXGBE_RXMTRL_V1_DELAY_REQ_MSG; |
| 668 | break; | 668 | break; |
| 669 | case HWTSTAMP_FILTER_PTP_V2_EVENT: | 669 | case HWTSTAMP_FILTER_PTP_V2_EVENT: |
| 670 | case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: | 670 | case HWTSTAMP_FILTER_PTP_V2_L2_EVENT: |
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 2b799f4f1c37..6771b69f40d5 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c | |||
| @@ -630,10 +630,15 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 630 | ring->tx_csum++; | 630 | ring->tx_csum++; |
| 631 | } | 631 | } |
| 632 | 632 | ||
| 633 | /* Copy dst mac address to wqe */ | 633 | if (mlx4_is_mfunc(mdev->dev) || priv->validate_loopback) { |
| 634 | ethh = (struct ethhdr *)skb->data; | 634 | /* Copy dst mac address to wqe. This allows loopback in eSwitch, |
| 635 | tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest); | 635 | * so that VFs and PF can communicate with each other |
| 636 | tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2)); | 636 | */ |
| 637 | ethh = (struct ethhdr *)skb->data; | ||
| 638 | tx_desc->ctrl.srcrb_flags16[0] = get_unaligned((__be16 *)ethh->h_dest); | ||
| 639 | tx_desc->ctrl.imm = get_unaligned((__be32 *)(ethh->h_dest + 2)); | ||
| 640 | } | ||
| 641 | |||
| 637 | /* Handle LSO (TSO) packets */ | 642 | /* Handle LSO (TSO) packets */ |
| 638 | if (lso_header_size) { | 643 | if (lso_header_size) { |
| 639 | /* Mark opcode as LSO */ | 644 | /* Mark opcode as LSO */ |
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index e1bafffbc3b1..a6542d75374c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
| @@ -1790,15 +1790,8 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) | |||
| 1790 | int i; | 1790 | int i; |
| 1791 | 1791 | ||
| 1792 | if (msi_x) { | 1792 | if (msi_x) { |
| 1793 | /* In multifunction mode each function gets 2 msi-X vectors | 1793 | nreq = min_t(int, dev->caps.num_eqs - dev->caps.reserved_eqs, |
| 1794 | * one for data path completions anf the other for asynch events | 1794 | nreq); |
| 1795 | * or command completions */ | ||
| 1796 | if (mlx4_is_mfunc(dev)) { | ||
| 1797 | nreq = 2; | ||
| 1798 | } else { | ||
| 1799 | nreq = min_t(int, dev->caps.num_eqs - | ||
| 1800 | dev->caps.reserved_eqs, nreq); | ||
| 1801 | } | ||
| 1802 | 1795 | ||
| 1803 | entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); | 1796 | entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL); |
| 1804 | if (!entries) | 1797 | if (!entries) |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c index bc165f4d0f65..695667d471a1 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | |||
| @@ -144,7 +144,7 @@ void netxen_release_tx_buffers(struct netxen_adapter *adapter) | |||
| 144 | buffrag->length, PCI_DMA_TODEVICE); | 144 | buffrag->length, PCI_DMA_TODEVICE); |
| 145 | buffrag->dma = 0ULL; | 145 | buffrag->dma = 0ULL; |
| 146 | } | 146 | } |
| 147 | for (j = 0; j < cmd_buf->frag_count; j++) { | 147 | for (j = 1; j < cmd_buf->frag_count; j++) { |
| 148 | buffrag++; | 148 | buffrag++; |
| 149 | if (buffrag->dma) { | 149 | if (buffrag->dma) { |
| 150 | pci_unmap_page(adapter->pdev, buffrag->dma, | 150 | pci_unmap_page(adapter->pdev, buffrag->dma, |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 6098fd4adfeb..69e321a65077 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
| @@ -1963,10 +1963,12 @@ unwind: | |||
| 1963 | while (--i >= 0) { | 1963 | while (--i >= 0) { |
| 1964 | nf = &pbuf->frag_array[i+1]; | 1964 | nf = &pbuf->frag_array[i+1]; |
| 1965 | pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE); | 1965 | pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE); |
| 1966 | nf->dma = 0ULL; | ||
| 1966 | } | 1967 | } |
| 1967 | 1968 | ||
| 1968 | nf = &pbuf->frag_array[0]; | 1969 | nf = &pbuf->frag_array[0]; |
| 1969 | pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE); | 1970 | pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE); |
| 1971 | nf->dma = 0ULL; | ||
| 1970 | 1972 | ||
| 1971 | out_err: | 1973 | out_err: |
| 1972 | return -ENOMEM; | 1974 | return -ENOMEM; |
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ed96f309bca8..11702324a071 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c | |||
| @@ -1826,8 +1826,6 @@ static void rtl8169_rx_vlan_tag(struct RxDesc *desc, struct sk_buff *skb) | |||
| 1826 | 1826 | ||
| 1827 | if (opts2 & RxVlanTag) | 1827 | if (opts2 & RxVlanTag) |
| 1828 | __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); | 1828 | __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff)); |
| 1829 | |||
| 1830 | desc->opts2 = 0; | ||
| 1831 | } | 1829 | } |
| 1832 | 1830 | ||
| 1833 | static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd) | 1831 | static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd) |
| @@ -6064,8 +6062,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget | |||
| 6064 | !(status & (RxRWT | RxFOVF)) && | 6062 | !(status & (RxRWT | RxFOVF)) && |
| 6065 | (dev->features & NETIF_F_RXALL)) | 6063 | (dev->features & NETIF_F_RXALL)) |
| 6066 | goto process_pkt; | 6064 | goto process_pkt; |
| 6067 | |||
| 6068 | rtl8169_mark_to_asic(desc, rx_buf_sz); | ||
| 6069 | } else { | 6065 | } else { |
| 6070 | struct sk_buff *skb; | 6066 | struct sk_buff *skb; |
| 6071 | dma_addr_t addr; | 6067 | dma_addr_t addr; |
| @@ -6086,16 +6082,14 @@ process_pkt: | |||
| 6086 | if (unlikely(rtl8169_fragmented_frame(status))) { | 6082 | if (unlikely(rtl8169_fragmented_frame(status))) { |
| 6087 | dev->stats.rx_dropped++; | 6083 | dev->stats.rx_dropped++; |
| 6088 | dev->stats.rx_length_errors++; | 6084 | dev->stats.rx_length_errors++; |
| 6089 | rtl8169_mark_to_asic(desc, rx_buf_sz); | 6085 | goto release_descriptor; |
| 6090 | continue; | ||
| 6091 | } | 6086 | } |
| 6092 | 6087 | ||
| 6093 | skb = rtl8169_try_rx_copy(tp->Rx_databuff[entry], | 6088 | skb = rtl8169_try_rx_copy(tp->Rx_databuff[entry], |
| 6094 | tp, pkt_size, addr); | 6089 | tp, pkt_size, addr); |
| 6095 | rtl8169_mark_to_asic(desc, rx_buf_sz); | ||
| 6096 | if (!skb) { | 6090 | if (!skb) { |
| 6097 | dev->stats.rx_dropped++; | 6091 | dev->stats.rx_dropped++; |
| 6098 | continue; | 6092 | goto release_descriptor; |
| 6099 | } | 6093 | } |
| 6100 | 6094 | ||
| 6101 | rtl8169_rx_csum(skb, status); | 6095 | rtl8169_rx_csum(skb, status); |
| @@ -6111,13 +6105,10 @@ process_pkt: | |||
| 6111 | tp->rx_stats.bytes += pkt_size; | 6105 | tp->rx_stats.bytes += pkt_size; |
| 6112 | u64_stats_update_end(&tp->rx_stats.syncp); | 6106 | u64_stats_update_end(&tp->rx_stats.syncp); |
| 6113 | } | 6107 | } |
| 6114 | 6108 | release_descriptor: | |
| 6115 | /* Work around for AMD plateform. */ | 6109 | desc->opts2 = 0; |
| 6116 | if ((desc->opts2 & cpu_to_le32(0xfffe000)) && | 6110 | wmb(); |
| 6117 | (tp->mac_version == RTL_GIGA_MAC_VER_05)) { | 6111 | rtl8169_mark_to_asic(desc, rx_buf_sz); |
| 6118 | desc->opts2 = 0; | ||
| 6119 | cur_rx++; | ||
| 6120 | } | ||
| 6121 | } | 6112 | } |
| 6122 | 6113 | ||
| 6123 | count = cur_rx - tp->cur_rx; | 6114 | count = cur_rx - tp->cur_rx; |
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 5fd6f4674326..e6fe0d80d612 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h | |||
| @@ -84,7 +84,7 @@ struct hv_netvsc_packet { | |||
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | struct netvsc_device_info { | 86 | struct netvsc_device_info { |
| 87 | unsigned char mac_adr[6]; | 87 | unsigned char mac_adr[ETH_ALEN]; |
| 88 | bool link_state; /* 0 - link up, 1 - link down */ | 88 | bool link_state; /* 0 - link up, 1 - link down */ |
| 89 | int ring_size; | 89 | int ring_size; |
| 90 | }; | 90 | }; |
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index f825a629a699..8264f0ef7692 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c | |||
| @@ -349,7 +349,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p) | |||
| 349 | struct net_device_context *ndevctx = netdev_priv(ndev); | 349 | struct net_device_context *ndevctx = netdev_priv(ndev); |
| 350 | struct hv_device *hdev = ndevctx->device_ctx; | 350 | struct hv_device *hdev = ndevctx->device_ctx; |
| 351 | struct sockaddr *addr = p; | 351 | struct sockaddr *addr = p; |
| 352 | char save_adr[14]; | 352 | char save_adr[ETH_ALEN]; |
| 353 | unsigned char save_aatype; | 353 | unsigned char save_aatype; |
| 354 | int err; | 354 | int err; |
| 355 | 355 | ||
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 81f8f9e31db5..fcbf680c3e62 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
| @@ -77,6 +77,11 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, | |||
| 77 | 77 | ||
| 78 | skb_orphan(skb); | 78 | skb_orphan(skb); |
| 79 | 79 | ||
| 80 | /* Before queueing this packet to netif_rx(), | ||
| 81 | * make sure dst is refcounted. | ||
| 82 | */ | ||
| 83 | skb_dst_force(skb); | ||
| 84 | |||
| 80 | skb->protocol = eth_type_trans(skb, dev); | 85 | skb->protocol = eth_type_trans(skb, dev); |
| 81 | 86 | ||
| 82 | /* it's OK to use per_cpu_ptr() because BHs are off */ | 87 | /* it's OK to use per_cpu_ptr() because BHs are off */ |
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 68a43fe602e7..d3fb97d97cbc 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -822,7 +822,10 @@ static int macvlan_changelink(struct net_device *dev, | |||
| 822 | 822 | ||
| 823 | static size_t macvlan_get_size(const struct net_device *dev) | 823 | static size_t macvlan_get_size(const struct net_device *dev) |
| 824 | { | 824 | { |
| 825 | return nla_total_size(4); | 825 | return (0 |
| 826 | + nla_total_size(4) /* IFLA_MACVLAN_MODE */ | ||
| 827 | + nla_total_size(2) /* IFLA_MACVLAN_FLAGS */ | ||
| 828 | ); | ||
| 826 | } | 829 | } |
| 827 | 830 | ||
| 828 | static int macvlan_fill_info(struct sk_buff *skb, | 831 | static int macvlan_fill_info(struct sk_buff *skb, |
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index d5199cb4caec..b5ddd5077a80 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c | |||
| @@ -36,8 +36,9 @@ MODULE_LICENSE("GPL"); | |||
| 36 | 36 | ||
| 37 | /* IP101A/G - IP1001 */ | 37 | /* IP101A/G - IP1001 */ |
| 38 | #define IP10XX_SPEC_CTRL_STATUS 16 /* Spec. Control Register */ | 38 | #define IP10XX_SPEC_CTRL_STATUS 16 /* Spec. Control Register */ |
| 39 | #define IP1001_RXPHASE_SEL (1<<0) /* Add delay on RX_CLK */ | ||
| 40 | #define IP1001_TXPHASE_SEL (1<<1) /* Add delay on TX_CLK */ | ||
| 39 | #define IP1001_SPEC_CTRL_STATUS_2 20 /* IP1001 Spec. Control Reg 2 */ | 41 | #define IP1001_SPEC_CTRL_STATUS_2 20 /* IP1001 Spec. Control Reg 2 */ |
| 40 | #define IP1001_PHASE_SEL_MASK 3 /* IP1001 RX/TXPHASE_SEL */ | ||
| 41 | #define IP1001_APS_ON 11 /* IP1001 APS Mode bit */ | 42 | #define IP1001_APS_ON 11 /* IP1001 APS Mode bit */ |
| 42 | #define IP101A_G_APS_ON 2 /* IP101A/G APS Mode bit */ | 43 | #define IP101A_G_APS_ON 2 /* IP101A/G APS Mode bit */ |
| 43 | #define IP101A_G_IRQ_CONF_STATUS 0x11 /* Conf Info IRQ & Status Reg */ | 44 | #define IP101A_G_IRQ_CONF_STATUS 0x11 /* Conf Info IRQ & Status Reg */ |
| @@ -138,19 +139,24 @@ static int ip1001_config_init(struct phy_device *phydev) | |||
| 138 | if (c < 0) | 139 | if (c < 0) |
| 139 | return c; | 140 | return c; |
| 140 | 141 | ||
| 141 | /* INTR pin used: speed/link/duplex will cause an interrupt */ | 142 | if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || |
| 142 | c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT); | 143 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || |
| 143 | if (c < 0) | 144 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || |
| 144 | return c; | 145 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) { |
| 145 | 146 | ||
| 146 | if (phydev->interface == PHY_INTERFACE_MODE_RGMII) { | ||
| 147 | /* Additional delay (2ns) used to adjust RX clock phase | ||
| 148 | * at RGMII interface */ | ||
| 149 | c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); | 147 | c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); |
| 150 | if (c < 0) | 148 | if (c < 0) |
| 151 | return c; | 149 | return c; |
| 152 | 150 | ||
| 153 | c |= IP1001_PHASE_SEL_MASK; | 151 | c &= ~(IP1001_RXPHASE_SEL | IP1001_TXPHASE_SEL); |
| 152 | |||
| 153 | if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) | ||
| 154 | c |= (IP1001_RXPHASE_SEL | IP1001_TXPHASE_SEL); | ||
| 155 | else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) | ||
| 156 | c |= IP1001_RXPHASE_SEL; | ||
| 157 | else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) | ||
| 158 | c |= IP1001_TXPHASE_SEL; | ||
| 159 | |||
| 154 | c = phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); | 160 | c = phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); |
| 155 | if (c < 0) | 161 | if (c < 0) |
| 156 | return c; | 162 | return c; |
| @@ -167,6 +173,11 @@ static int ip101a_g_config_init(struct phy_device *phydev) | |||
| 167 | if (c < 0) | 173 | if (c < 0) |
| 168 | return c; | 174 | return c; |
| 169 | 175 | ||
| 176 | /* INTR pin used: speed/link/duplex will cause an interrupt */ | ||
| 177 | c = phy_write(phydev, IP101A_G_IRQ_CONF_STATUS, IP101A_G_IRQ_DEFAULT); | ||
| 178 | if (c < 0) | ||
| 179 | return c; | ||
| 180 | |||
| 170 | /* Enable Auto Power Saving mode */ | 181 | /* Enable Auto Power Saving mode */ |
| 171 | c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); | 182 | c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); |
| 172 | c |= IP101A_G_APS_ON; | 183 | c |= IP101A_G_APS_ON; |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 5d2a3f215887..22dec9c7ef05 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -353,15 +353,6 @@ static int m88e1111_config_init(struct phy_device *phydev) | |||
| 353 | int err; | 353 | int err; |
| 354 | int temp; | 354 | int temp; |
| 355 | 355 | ||
| 356 | /* Enable Fiber/Copper auto selection */ | ||
| 357 | temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); | ||
| 358 | temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO; | ||
| 359 | phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); | ||
| 360 | |||
| 361 | temp = phy_read(phydev, MII_BMCR); | ||
| 362 | temp |= BMCR_RESET; | ||
| 363 | phy_write(phydev, MII_BMCR, temp); | ||
| 364 | |||
| 365 | if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || | 356 | if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) || |
| 366 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || | 357 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) || |
| 367 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || | 358 | (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) || |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index af372d0957fe..cc09b67c23bc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -109,11 +109,11 @@ struct tap_filter { | |||
| 109 | unsigned char addr[FLT_EXACT_COUNT][ETH_ALEN]; | 109 | unsigned char addr[FLT_EXACT_COUNT][ETH_ALEN]; |
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | /* 1024 is probably a high enough limit: modern hypervisors seem to support on | 112 | /* DEFAULT_MAX_NUM_RSS_QUEUES were choosed to let the rx/tx queues allocated for |
| 113 | * the order of 100-200 CPUs so this leaves us some breathing space if we want | 113 | * the netdevice to be fit in one page. So we can make sure the success of |
| 114 | * to match a queue per guest CPU. | 114 | * memory allocation. TODO: increase the limit. */ |
| 115 | */ | 115 | #define MAX_TAP_QUEUES DEFAULT_MAX_NUM_RSS_QUEUES |
| 116 | #define MAX_TAP_QUEUES 1024 | 116 | #define MAX_TAP_FLOWS 4096 |
| 117 | 117 | ||
| 118 | #define TUN_FLOW_EXPIRE (3 * HZ) | 118 | #define TUN_FLOW_EXPIRE (3 * HZ) |
| 119 | 119 | ||
| @@ -185,6 +185,8 @@ struct tun_struct { | |||
| 185 | unsigned long ageing_time; | 185 | unsigned long ageing_time; |
| 186 | unsigned int numdisabled; | 186 | unsigned int numdisabled; |
| 187 | struct list_head disabled; | 187 | struct list_head disabled; |
| 188 | void *security; | ||
| 189 | u32 flow_count; | ||
| 188 | }; | 190 | }; |
| 189 | 191 | ||
| 190 | static inline u32 tun_hashfn(u32 rxhash) | 192 | static inline u32 tun_hashfn(u32 rxhash) |
| @@ -218,6 +220,7 @@ static struct tun_flow_entry *tun_flow_create(struct tun_struct *tun, | |||
| 218 | e->queue_index = queue_index; | 220 | e->queue_index = queue_index; |
| 219 | e->tun = tun; | 221 | e->tun = tun; |
| 220 | hlist_add_head_rcu(&e->hash_link, head); | 222 | hlist_add_head_rcu(&e->hash_link, head); |
| 223 | ++tun->flow_count; | ||
| 221 | } | 224 | } |
| 222 | return e; | 225 | return e; |
| 223 | } | 226 | } |
| @@ -228,6 +231,7 @@ static void tun_flow_delete(struct tun_struct *tun, struct tun_flow_entry *e) | |||
| 228 | e->rxhash, e->queue_index); | 231 | e->rxhash, e->queue_index); |
| 229 | hlist_del_rcu(&e->hash_link); | 232 | hlist_del_rcu(&e->hash_link); |
| 230 | kfree_rcu(e, rcu); | 233 | kfree_rcu(e, rcu); |
| 234 | --tun->flow_count; | ||
| 231 | } | 235 | } |
| 232 | 236 | ||
| 233 | static void tun_flow_flush(struct tun_struct *tun) | 237 | static void tun_flow_flush(struct tun_struct *tun) |
| @@ -317,7 +321,8 @@ static void tun_flow_update(struct tun_struct *tun, u32 rxhash, | |||
| 317 | e->updated = jiffies; | 321 | e->updated = jiffies; |
| 318 | } else { | 322 | } else { |
| 319 | spin_lock_bh(&tun->lock); | 323 | spin_lock_bh(&tun->lock); |
| 320 | if (!tun_flow_find(head, rxhash)) | 324 | if (!tun_flow_find(head, rxhash) && |
| 325 | tun->flow_count < MAX_TAP_FLOWS) | ||
| 321 | tun_flow_create(tun, head, rxhash, queue_index); | 326 | tun_flow_create(tun, head, rxhash, queue_index); |
| 322 | 327 | ||
| 323 | if (!timer_pending(&tun->flow_gc_timer)) | 328 | if (!timer_pending(&tun->flow_gc_timer)) |
| @@ -490,6 +495,10 @@ static int tun_attach(struct tun_struct *tun, struct file *file) | |||
| 490 | struct tun_file *tfile = file->private_data; | 495 | struct tun_file *tfile = file->private_data; |
| 491 | int err; | 496 | int err; |
| 492 | 497 | ||
| 498 | err = security_tun_dev_attach(tfile->socket.sk, tun->security); | ||
| 499 | if (err < 0) | ||
| 500 | goto out; | ||
| 501 | |||
| 493 | err = -EINVAL; | 502 | err = -EINVAL; |
| 494 | if (rtnl_dereference(tfile->tun)) | 503 | if (rtnl_dereference(tfile->tun)) |
| 495 | goto out; | 504 | goto out; |
| @@ -1373,6 +1382,7 @@ static void tun_free_netdev(struct net_device *dev) | |||
| 1373 | 1382 | ||
| 1374 | BUG_ON(!(list_empty(&tun->disabled))); | 1383 | BUG_ON(!(list_empty(&tun->disabled))); |
| 1375 | tun_flow_uninit(tun); | 1384 | tun_flow_uninit(tun); |
| 1385 | security_tun_dev_free_security(tun->security); | ||
| 1376 | free_netdev(dev); | 1386 | free_netdev(dev); |
| 1377 | } | 1387 | } |
| 1378 | 1388 | ||
| @@ -1562,7 +1572,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 1562 | 1572 | ||
| 1563 | if (tun_not_capable(tun)) | 1573 | if (tun_not_capable(tun)) |
| 1564 | return -EPERM; | 1574 | return -EPERM; |
| 1565 | err = security_tun_dev_attach(tfile->socket.sk); | 1575 | err = security_tun_dev_open(tun->security); |
| 1566 | if (err < 0) | 1576 | if (err < 0) |
| 1567 | return err; | 1577 | return err; |
| 1568 | 1578 | ||
| @@ -1577,6 +1587,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 1577 | else { | 1587 | else { |
| 1578 | char *name; | 1588 | char *name; |
| 1579 | unsigned long flags = 0; | 1589 | unsigned long flags = 0; |
| 1590 | int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ? | ||
| 1591 | MAX_TAP_QUEUES : 1; | ||
| 1580 | 1592 | ||
| 1581 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) | 1593 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) |
| 1582 | return -EPERM; | 1594 | return -EPERM; |
| @@ -1600,8 +1612,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 1600 | name = ifr->ifr_name; | 1612 | name = ifr->ifr_name; |
| 1601 | 1613 | ||
| 1602 | dev = alloc_netdev_mqs(sizeof(struct tun_struct), name, | 1614 | dev = alloc_netdev_mqs(sizeof(struct tun_struct), name, |
| 1603 | tun_setup, | 1615 | tun_setup, queues, queues); |
| 1604 | MAX_TAP_QUEUES, MAX_TAP_QUEUES); | 1616 | |
| 1605 | if (!dev) | 1617 | if (!dev) |
| 1606 | return -ENOMEM; | 1618 | return -ENOMEM; |
| 1607 | 1619 | ||
| @@ -1619,7 +1631,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
| 1619 | 1631 | ||
| 1620 | spin_lock_init(&tun->lock); | 1632 | spin_lock_init(&tun->lock); |
| 1621 | 1633 | ||
| 1622 | security_tun_dev_post_create(&tfile->sk); | 1634 | err = security_tun_dev_alloc_security(&tun->security); |
| 1635 | if (err < 0) | ||
| 1636 | goto err_free_dev; | ||
| 1623 | 1637 | ||
| 1624 | tun_net_init(dev); | 1638 | tun_net_init(dev); |
| 1625 | 1639 | ||
| @@ -1789,10 +1803,14 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) | |||
| 1789 | 1803 | ||
| 1790 | if (ifr->ifr_flags & IFF_ATTACH_QUEUE) { | 1804 | if (ifr->ifr_flags & IFF_ATTACH_QUEUE) { |
| 1791 | tun = tfile->detached; | 1805 | tun = tfile->detached; |
| 1792 | if (!tun) | 1806 | if (!tun) { |
| 1793 | ret = -EINVAL; | 1807 | ret = -EINVAL; |
| 1794 | else | 1808 | goto unlock; |
| 1795 | ret = tun_attach(tun, file); | 1809 | } |
| 1810 | ret = security_tun_dev_attach_queue(tun->security); | ||
| 1811 | if (ret < 0) | ||
| 1812 | goto unlock; | ||
| 1813 | ret = tun_attach(tun, file); | ||
| 1796 | } else if (ifr->ifr_flags & IFF_DETACH_QUEUE) { | 1814 | } else if (ifr->ifr_flags & IFF_DETACH_QUEUE) { |
| 1797 | tun = rtnl_dereference(tfile->tun); | 1815 | tun = rtnl_dereference(tfile->tun); |
| 1798 | if (!tun || !(tun->flags & TUN_TAP_MQ)) | 1816 | if (!tun || !(tun->flags & TUN_TAP_MQ)) |
| @@ -1802,6 +1820,7 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr) | |||
| 1802 | } else | 1820 | } else |
| 1803 | ret = -EINVAL; | 1821 | ret = -EINVAL; |
| 1804 | 1822 | ||
| 1823 | unlock: | ||
| 1805 | rtnl_unlock(); | 1824 | rtnl_unlock(); |
| 1806 | return ret; | 1825 | return ret; |
| 1807 | } | 1826 | } |
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 42f51c71ec1f..248d2dc765a5 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c | |||
| @@ -374,6 +374,21 @@ static const struct driver_info cdc_mbim_info = { | |||
| 374 | .tx_fixup = cdc_mbim_tx_fixup, | 374 | .tx_fixup = cdc_mbim_tx_fixup, |
| 375 | }; | 375 | }; |
| 376 | 376 | ||
| 377 | /* MBIM and NCM devices should not need a ZLP after NTBs with | ||
| 378 | * dwNtbOutMaxSize length. This driver_info is for the exceptional | ||
| 379 | * devices requiring it anyway, allowing them to be supported without | ||
| 380 | * forcing the performance penalty on all the sane devices. | ||
| 381 | */ | ||
| 382 | static const struct driver_info cdc_mbim_info_zlp = { | ||
| 383 | .description = "CDC MBIM", | ||
| 384 | .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN | FLAG_SEND_ZLP, | ||
| 385 | .bind = cdc_mbim_bind, | ||
| 386 | .unbind = cdc_mbim_unbind, | ||
| 387 | .manage_power = cdc_mbim_manage_power, | ||
| 388 | .rx_fixup = cdc_mbim_rx_fixup, | ||
| 389 | .tx_fixup = cdc_mbim_tx_fixup, | ||
| 390 | }; | ||
| 391 | |||
| 377 | static const struct usb_device_id mbim_devs[] = { | 392 | static const struct usb_device_id mbim_devs[] = { |
| 378 | /* This duplicate NCM entry is intentional. MBIM devices can | 393 | /* This duplicate NCM entry is intentional. MBIM devices can |
| 379 | * be disguised as NCM by default, and this is necessary to | 394 | * be disguised as NCM by default, and this is necessary to |
| @@ -385,6 +400,10 @@ static const struct usb_device_id mbim_devs[] = { | |||
| 385 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), | 400 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), |
| 386 | .driver_info = (unsigned long)&cdc_mbim_info, | 401 | .driver_info = (unsigned long)&cdc_mbim_info, |
| 387 | }, | 402 | }, |
| 403 | /* Sierra Wireless MC7710 need ZLPs */ | ||
| 404 | { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68a2, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), | ||
| 405 | .driver_info = (unsigned long)&cdc_mbim_info_zlp, | ||
| 406 | }, | ||
| 388 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), | 407 | { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), |
| 389 | .driver_info = (unsigned long)&cdc_mbim_info, | 408 | .driver_info = (unsigned long)&cdc_mbim_info, |
| 390 | }, | 409 | }, |
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 71b6e92b8e9b..9197b2c72ca3 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c | |||
| @@ -435,6 +435,13 @@ advance: | |||
| 435 | len -= temp; | 435 | len -= temp; |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | /* some buggy devices have an IAD but no CDC Union */ | ||
| 439 | if (!ctx->union_desc && intf->intf_assoc && intf->intf_assoc->bInterfaceCount == 2) { | ||
| 440 | ctx->control = intf; | ||
| 441 | ctx->data = usb_ifnum_to_if(dev->udev, intf->cur_altsetting->desc.bInterfaceNumber + 1); | ||
| 442 | dev_dbg(&intf->dev, "CDC Union missing - got slave from IAD\n"); | ||
| 443 | } | ||
| 444 | |||
| 438 | /* check if we got everything */ | 445 | /* check if we got everything */ |
| 439 | if ((ctx->control == NULL) || (ctx->data == NULL) || | 446 | if ((ctx->control == NULL) || (ctx->data == NULL) || |
| 440 | ((!ctx->mbim_desc) && ((ctx->ether_desc == NULL) || (ctx->control != intf)))) | 447 | ((!ctx->mbim_desc) && ((ctx->ether_desc == NULL) || (ctx->control != intf)))) |
| @@ -497,7 +504,8 @@ advance: | |||
| 497 | error2: | 504 | error2: |
| 498 | usb_set_intfdata(ctx->control, NULL); | 505 | usb_set_intfdata(ctx->control, NULL); |
| 499 | usb_set_intfdata(ctx->data, NULL); | 506 | usb_set_intfdata(ctx->data, NULL); |
| 500 | usb_driver_release_interface(driver, ctx->data); | 507 | if (ctx->data != ctx->control) |
| 508 | usb_driver_release_interface(driver, ctx->data); | ||
| 501 | error: | 509 | error: |
| 502 | cdc_ncm_free((struct cdc_ncm_ctx *)dev->data[0]); | 510 | cdc_ncm_free((struct cdc_ncm_ctx *)dev->data[0]); |
| 503 | dev->data[0] = 0; | 511 | dev->data[0] = 0; |
| @@ -1155,6 +1163,20 @@ static const struct driver_info wwan_info = { | |||
| 1155 | .tx_fixup = cdc_ncm_tx_fixup, | 1163 | .tx_fixup = cdc_ncm_tx_fixup, |
| 1156 | }; | 1164 | }; |
| 1157 | 1165 | ||
| 1166 | /* Same as wwan_info, but with FLAG_NOARP */ | ||
| 1167 | static const struct driver_info wwan_noarp_info = { | ||
| 1168 | .description = "Mobile Broadband Network Device (NO ARP)", | ||
| 1169 | .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET | ||
| 1170 | | FLAG_WWAN | FLAG_NOARP, | ||
| 1171 | .bind = cdc_ncm_bind, | ||
| 1172 | .unbind = cdc_ncm_unbind, | ||
| 1173 | .check_connect = cdc_ncm_check_connect, | ||
| 1174 | .manage_power = usbnet_manage_power, | ||
| 1175 | .status = cdc_ncm_status, | ||
| 1176 | .rx_fixup = cdc_ncm_rx_fixup, | ||
| 1177 | .tx_fixup = cdc_ncm_tx_fixup, | ||
| 1178 | }; | ||
| 1179 | |||
| 1158 | static const struct usb_device_id cdc_devs[] = { | 1180 | static const struct usb_device_id cdc_devs[] = { |
| 1159 | /* Ericsson MBM devices like F5521gw */ | 1181 | /* Ericsson MBM devices like F5521gw */ |
| 1160 | { .match_flags = USB_DEVICE_ID_MATCH_INT_INFO | 1182 | { .match_flags = USB_DEVICE_ID_MATCH_INT_INFO |
| @@ -1194,6 +1216,13 @@ static const struct usb_device_id cdc_devs[] = { | |||
| 1194 | .driver_info = (unsigned long)&wwan_info, | 1216 | .driver_info = (unsigned long)&wwan_info, |
| 1195 | }, | 1217 | }, |
| 1196 | 1218 | ||
| 1219 | /* Infineon(now Intel) HSPA Modem platform */ | ||
| 1220 | { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443, | ||
| 1221 | USB_CLASS_COMM, | ||
| 1222 | USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), | ||
| 1223 | .driver_info = (unsigned long)&wwan_noarp_info, | ||
| 1224 | }, | ||
| 1225 | |||
| 1197 | /* Generic CDC-NCM devices */ | 1226 | /* Generic CDC-NCM devices */ |
| 1198 | { USB_INTERFACE_INFO(USB_CLASS_COMM, | 1227 | { USB_INTERFACE_INFO(USB_CLASS_COMM, |
| 1199 | USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), | 1228 | USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), |
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 3f554c1149f3..d7e99445518e 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
| @@ -45,6 +45,12 @@ | |||
| 45 | #define DM_MCAST_ADDR 0x16 /* 8 bytes */ | 45 | #define DM_MCAST_ADDR 0x16 /* 8 bytes */ |
| 46 | #define DM_GPR_CTRL 0x1e | 46 | #define DM_GPR_CTRL 0x1e |
| 47 | #define DM_GPR_DATA 0x1f | 47 | #define DM_GPR_DATA 0x1f |
| 48 | #define DM_CHIP_ID 0x2c | ||
| 49 | #define DM_MODE_CTRL 0x91 /* only on dm9620 */ | ||
| 50 | |||
| 51 | /* chip id values */ | ||
| 52 | #define ID_DM9601 0 | ||
| 53 | #define ID_DM9620 1 | ||
| 48 | 54 | ||
| 49 | #define DM_MAX_MCAST 64 | 55 | #define DM_MAX_MCAST 64 |
| 50 | #define DM_MCAST_SIZE 8 | 56 | #define DM_MCAST_SIZE 8 |
| @@ -53,7 +59,6 @@ | |||
| 53 | #define DM_RX_OVERHEAD 7 /* 3 byte header + 4 byte crc tail */ | 59 | #define DM_RX_OVERHEAD 7 /* 3 byte header + 4 byte crc tail */ |
| 54 | #define DM_TIMEOUT 1000 | 60 | #define DM_TIMEOUT 1000 |
| 55 | 61 | ||
| 56 | |||
| 57 | static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data) | 62 | static int dm_read(struct usbnet *dev, u8 reg, u16 length, void *data) |
| 58 | { | 63 | { |
| 59 | int err; | 64 | int err; |
| @@ -84,32 +89,23 @@ static int dm_write(struct usbnet *dev, u8 reg, u16 length, void *data) | |||
| 84 | 89 | ||
| 85 | static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value) | 90 | static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value) |
| 86 | { | 91 | { |
| 87 | return usbnet_write_cmd(dev, DM_WRITE_REGS, | 92 | return usbnet_write_cmd(dev, DM_WRITE_REG, |
| 88 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 93 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 89 | value, reg, NULL, 0); | 94 | value, reg, NULL, 0); |
| 90 | } | 95 | } |
| 91 | 96 | ||
| 92 | static void dm_write_async_helper(struct usbnet *dev, u8 reg, u8 value, | 97 | static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data) |
| 93 | u16 length, void *data) | ||
| 94 | { | 98 | { |
| 95 | usbnet_write_cmd_async(dev, DM_WRITE_REGS, | 99 | usbnet_write_cmd_async(dev, DM_WRITE_REGS, |
| 96 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, | 100 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 97 | value, reg, data, length); | 101 | 0, reg, data, length); |
| 98 | } | ||
| 99 | |||
| 100 | static void dm_write_async(struct usbnet *dev, u8 reg, u16 length, void *data) | ||
| 101 | { | ||
| 102 | netdev_dbg(dev->net, "dm_write_async() reg=0x%02x length=%d\n", reg, length); | ||
| 103 | |||
| 104 | dm_write_async_helper(dev, reg, 0, length, data); | ||
| 105 | } | 102 | } |
| 106 | 103 | ||
| 107 | static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value) | 104 | static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value) |
| 108 | { | 105 | { |
| 109 | netdev_dbg(dev->net, "dm_write_reg_async() reg=0x%02x value=0x%02x\n", | 106 | usbnet_write_cmd_async(dev, DM_WRITE_REG, |
| 110 | reg, value); | 107 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, |
| 111 | 108 | value, reg, NULL, 0); | |
| 112 | dm_write_async_helper(dev, reg, value, 0, NULL); | ||
| 113 | } | 109 | } |
| 114 | 110 | ||
| 115 | static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value) | 111 | static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value) |
| @@ -358,7 +354,7 @@ static const struct net_device_ops dm9601_netdev_ops = { | |||
| 358 | static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) | 354 | static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) |
| 359 | { | 355 | { |
| 360 | int ret; | 356 | int ret; |
| 361 | u8 mac[ETH_ALEN]; | 357 | u8 mac[ETH_ALEN], id; |
| 362 | 358 | ||
| 363 | ret = usbnet_get_endpoints(dev, intf); | 359 | ret = usbnet_get_endpoints(dev, intf); |
| 364 | if (ret) | 360 | if (ret) |
| @@ -399,6 +395,24 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf) | |||
| 399 | __dm9601_set_mac_address(dev); | 395 | __dm9601_set_mac_address(dev); |
| 400 | } | 396 | } |
| 401 | 397 | ||
| 398 | if (dm_read_reg(dev, DM_CHIP_ID, &id) < 0) { | ||
| 399 | netdev_err(dev->net, "Error reading chip ID\n"); | ||
| 400 | ret = -ENODEV; | ||
| 401 | goto out; | ||
| 402 | } | ||
| 403 | |||
| 404 | /* put dm9620 devices in dm9601 mode */ | ||
| 405 | if (id == ID_DM9620) { | ||
| 406 | u8 mode; | ||
| 407 | |||
| 408 | if (dm_read_reg(dev, DM_MODE_CTRL, &mode) < 0) { | ||
| 409 | netdev_err(dev->net, "Error reading MODE_CTRL\n"); | ||
| 410 | ret = -ENODEV; | ||
| 411 | goto out; | ||
| 412 | } | ||
| 413 | dm_write_reg(dev, DM_MODE_CTRL, mode & 0x7f); | ||
| 414 | } | ||
| 415 | |||
| 402 | /* power up phy */ | 416 | /* power up phy */ |
| 403 | dm_write_reg(dev, DM_GPR_CTRL, 1); | 417 | dm_write_reg(dev, DM_GPR_CTRL, 1); |
| 404 | dm_write_reg(dev, DM_GPR_DATA, 0); | 418 | dm_write_reg(dev, DM_GPR_DATA, 0); |
| @@ -581,6 +595,10 @@ static const struct usb_device_id products[] = { | |||
| 581 | USB_DEVICE(0x0a46, 0x9000), /* DM9000E */ | 595 | USB_DEVICE(0x0a46, 0x9000), /* DM9000E */ |
| 582 | .driver_info = (unsigned long)&dm9601_info, | 596 | .driver_info = (unsigned long)&dm9601_info, |
| 583 | }, | 597 | }, |
| 598 | { | ||
| 599 | USB_DEVICE(0x0a46, 0x9620), /* DM9620 USB to Fast Ethernet Adapter */ | ||
| 600 | .driver_info = (unsigned long)&dm9601_info, | ||
| 601 | }, | ||
| 584 | {}, // END | 602 | {}, // END |
| 585 | }; | 603 | }; |
| 586 | 604 | ||
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 6a1ca500e612..575a5839ee34 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c | |||
| @@ -433,6 +433,7 @@ static const struct usb_device_id products[] = { | |||
| 433 | {QMI_FIXED_INTF(0x19d2, 0x0199, 1)}, /* ZTE MF820S */ | 433 | {QMI_FIXED_INTF(0x19d2, 0x0199, 1)}, /* ZTE MF820S */ |
| 434 | {QMI_FIXED_INTF(0x19d2, 0x0200, 1)}, | 434 | {QMI_FIXED_INTF(0x19d2, 0x0200, 1)}, |
| 435 | {QMI_FIXED_INTF(0x19d2, 0x0257, 3)}, /* ZTE MF821 */ | 435 | {QMI_FIXED_INTF(0x19d2, 0x0257, 3)}, /* ZTE MF821 */ |
| 436 | {QMI_FIXED_INTF(0x19d2, 0x0265, 4)}, /* ONDA MT8205 4G LTE */ | ||
| 436 | {QMI_FIXED_INTF(0x19d2, 0x0284, 4)}, /* ZTE MF880 */ | 437 | {QMI_FIXED_INTF(0x19d2, 0x0284, 4)}, /* ZTE MF880 */ |
| 437 | {QMI_FIXED_INTF(0x19d2, 0x0326, 4)}, /* ZTE MF821D */ | 438 | {QMI_FIXED_INTF(0x19d2, 0x0326, 4)}, /* ZTE MF821D */ |
| 438 | {QMI_FIXED_INTF(0x19d2, 0x1008, 4)}, /* ZTE (Vodafone) K3570-Z */ | 439 | {QMI_FIXED_INTF(0x19d2, 0x1008, 4)}, /* ZTE (Vodafone) K3570-Z */ |
| @@ -459,6 +460,7 @@ static const struct usb_device_id products[] = { | |||
| 459 | {QMI_FIXED_INTF(0x1199, 0x68a2, 19)}, /* Sierra Wireless MC7710 in QMI mode */ | 460 | {QMI_FIXED_INTF(0x1199, 0x68a2, 19)}, /* Sierra Wireless MC7710 in QMI mode */ |
| 460 | {QMI_FIXED_INTF(0x1199, 0x901c, 8)}, /* Sierra Wireless EM7700 */ | 461 | {QMI_FIXED_INTF(0x1199, 0x901c, 8)}, /* Sierra Wireless EM7700 */ |
| 461 | {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ | 462 | {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ |
| 463 | {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ | ||
| 462 | 464 | ||
| 463 | /* 4. Gobi 1000 devices */ | 465 | /* 4. Gobi 1000 devices */ |
| 464 | {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ | 466 | {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 3d4bf01641b4..f34b2ebee815 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -1448,6 +1448,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
| 1448 | if ((dev->driver_info->flags & FLAG_WWAN) != 0) | 1448 | if ((dev->driver_info->flags & FLAG_WWAN) != 0) |
| 1449 | strcpy(net->name, "wwan%d"); | 1449 | strcpy(net->name, "wwan%d"); |
| 1450 | 1450 | ||
| 1451 | /* devices that cannot do ARP */ | ||
| 1452 | if ((dev->driver_info->flags & FLAG_NOARP) != 0) | ||
| 1453 | net->flags |= IFF_NOARP; | ||
| 1454 | |||
| 1451 | /* maybe the remote can't receive an Ethernet MTU */ | 1455 | /* maybe the remote can't receive an Ethernet MTU */ |
| 1452 | if (net->mtu > (dev->hard_mtu - net->hard_header_len)) | 1456 | if (net->mtu > (dev->hard_mtu - net->hard_header_len)) |
| 1453 | net->mtu = dev->hard_mtu - net->hard_header_len; | 1457 | net->mtu = dev->hard_mtu - net->hard_header_len; |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a6fcf15adc4f..35c00c5ea02a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/scatterlist.h> | 26 | #include <linux/scatterlist.h> |
| 27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
| 28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 29 | #include <linux/cpu.h> | ||
| 29 | 30 | ||
| 30 | static int napi_weight = 128; | 31 | static int napi_weight = 128; |
| 31 | module_param(napi_weight, int, 0444); | 32 | module_param(napi_weight, int, 0444); |
| @@ -123,6 +124,12 @@ struct virtnet_info { | |||
| 123 | 124 | ||
| 124 | /* Does the affinity hint is set for virtqueues? */ | 125 | /* Does the affinity hint is set for virtqueues? */ |
| 125 | bool affinity_hint_set; | 126 | bool affinity_hint_set; |
| 127 | |||
| 128 | /* Per-cpu variable to show the mapping from CPU to virtqueue */ | ||
| 129 | int __percpu *vq_index; | ||
| 130 | |||
| 131 | /* CPU hot plug notifier */ | ||
| 132 | struct notifier_block nb; | ||
| 126 | }; | 133 | }; |
| 127 | 134 | ||
| 128 | struct skb_vnet_hdr { | 135 | struct skb_vnet_hdr { |
| @@ -1013,32 +1020,75 @@ static int virtnet_vlan_rx_kill_vid(struct net_device *dev, u16 vid) | |||
| 1013 | return 0; | 1020 | return 0; |
| 1014 | } | 1021 | } |
| 1015 | 1022 | ||
| 1016 | static void virtnet_set_affinity(struct virtnet_info *vi, bool set) | 1023 | static void virtnet_clean_affinity(struct virtnet_info *vi, long hcpu) |
| 1017 | { | 1024 | { |
| 1018 | int i; | 1025 | int i; |
| 1026 | int cpu; | ||
| 1027 | |||
| 1028 | if (vi->affinity_hint_set) { | ||
| 1029 | for (i = 0; i < vi->max_queue_pairs; i++) { | ||
| 1030 | virtqueue_set_affinity(vi->rq[i].vq, -1); | ||
| 1031 | virtqueue_set_affinity(vi->sq[i].vq, -1); | ||
| 1032 | } | ||
| 1033 | |||
| 1034 | vi->affinity_hint_set = false; | ||
| 1035 | } | ||
| 1036 | |||
| 1037 | i = 0; | ||
| 1038 | for_each_online_cpu(cpu) { | ||
| 1039 | if (cpu == hcpu) { | ||
| 1040 | *per_cpu_ptr(vi->vq_index, cpu) = -1; | ||
| 1041 | } else { | ||
| 1042 | *per_cpu_ptr(vi->vq_index, cpu) = | ||
| 1043 | ++i % vi->curr_queue_pairs; | ||
| 1044 | } | ||
| 1045 | } | ||
| 1046 | } | ||
| 1047 | |||
| 1048 | static void virtnet_set_affinity(struct virtnet_info *vi) | ||
| 1049 | { | ||
| 1050 | int i; | ||
| 1051 | int cpu; | ||
| 1019 | 1052 | ||
| 1020 | /* In multiqueue mode, when the number of cpu is equal to the number of | 1053 | /* In multiqueue mode, when the number of cpu is equal to the number of |
| 1021 | * queue pairs, we let the queue pairs to be private to one cpu by | 1054 | * queue pairs, we let the queue pairs to be private to one cpu by |
| 1022 | * setting the affinity hint to eliminate the contention. | 1055 | * setting the affinity hint to eliminate the contention. |
| 1023 | */ | 1056 | */ |
| 1024 | if ((vi->curr_queue_pairs == 1 || | 1057 | if (vi->curr_queue_pairs == 1 || |
| 1025 | vi->max_queue_pairs != num_online_cpus()) && set) { | 1058 | vi->max_queue_pairs != num_online_cpus()) { |
| 1026 | if (vi->affinity_hint_set) | 1059 | virtnet_clean_affinity(vi, -1); |
| 1027 | set = false; | 1060 | return; |
| 1028 | else | ||
| 1029 | return; | ||
| 1030 | } | 1061 | } |
| 1031 | 1062 | ||
| 1032 | for (i = 0; i < vi->max_queue_pairs; i++) { | 1063 | i = 0; |
| 1033 | int cpu = set ? i : -1; | 1064 | for_each_online_cpu(cpu) { |
| 1034 | virtqueue_set_affinity(vi->rq[i].vq, cpu); | 1065 | virtqueue_set_affinity(vi->rq[i].vq, cpu); |
| 1035 | virtqueue_set_affinity(vi->sq[i].vq, cpu); | 1066 | virtqueue_set_affinity(vi->sq[i].vq, cpu); |
| 1067 | *per_cpu_ptr(vi->vq_index, cpu) = i; | ||
| 1068 | i++; | ||
| 1036 | } | 1069 | } |
| 1037 | 1070 | ||
| 1038 | if (set) | 1071 | vi->affinity_hint_set = true; |
| 1039 | vi->affinity_hint_set = true; | 1072 | } |
| 1040 | else | 1073 | |
| 1041 | vi->affinity_hint_set = false; | 1074 | static int virtnet_cpu_callback(struct notifier_block *nfb, |
| 1075 | unsigned long action, void *hcpu) | ||
| 1076 | { | ||
| 1077 | struct virtnet_info *vi = container_of(nfb, struct virtnet_info, nb); | ||
| 1078 | |||
| 1079 | switch(action & ~CPU_TASKS_FROZEN) { | ||
| 1080 | case CPU_ONLINE: | ||
| 1081 | case CPU_DOWN_FAILED: | ||
| 1082 | case CPU_DEAD: | ||
| 1083 | virtnet_set_affinity(vi); | ||
| 1084 | break; | ||
| 1085 | case CPU_DOWN_PREPARE: | ||
| 1086 | virtnet_clean_affinity(vi, (long)hcpu); | ||
| 1087 | break; | ||
| 1088 | default: | ||
| 1089 | break; | ||
| 1090 | } | ||
| 1091 | return NOTIFY_OK; | ||
| 1042 | } | 1092 | } |
| 1043 | 1093 | ||
| 1044 | static void virtnet_get_ringparam(struct net_device *dev, | 1094 | static void virtnet_get_ringparam(struct net_device *dev, |
| @@ -1082,13 +1132,15 @@ static int virtnet_set_channels(struct net_device *dev, | |||
| 1082 | if (queue_pairs > vi->max_queue_pairs) | 1132 | if (queue_pairs > vi->max_queue_pairs) |
| 1083 | return -EINVAL; | 1133 | return -EINVAL; |
| 1084 | 1134 | ||
| 1135 | get_online_cpus(); | ||
| 1085 | err = virtnet_set_queues(vi, queue_pairs); | 1136 | err = virtnet_set_queues(vi, queue_pairs); |
| 1086 | if (!err) { | 1137 | if (!err) { |
| 1087 | netif_set_real_num_tx_queues(dev, queue_pairs); | 1138 | netif_set_real_num_tx_queues(dev, queue_pairs); |
| 1088 | netif_set_real_num_rx_queues(dev, queue_pairs); | 1139 | netif_set_real_num_rx_queues(dev, queue_pairs); |
| 1089 | 1140 | ||
| 1090 | virtnet_set_affinity(vi, true); | 1141 | virtnet_set_affinity(vi); |
| 1091 | } | 1142 | } |
| 1143 | put_online_cpus(); | ||
| 1092 | 1144 | ||
| 1093 | return err; | 1145 | return err; |
| 1094 | } | 1146 | } |
| @@ -1127,12 +1179,19 @@ static int virtnet_change_mtu(struct net_device *dev, int new_mtu) | |||
| 1127 | 1179 | ||
| 1128 | /* To avoid contending a lock hold by a vcpu who would exit to host, select the | 1180 | /* To avoid contending a lock hold by a vcpu who would exit to host, select the |
| 1129 | * txq based on the processor id. | 1181 | * txq based on the processor id. |
| 1130 | * TODO: handle cpu hotplug. | ||
| 1131 | */ | 1182 | */ |
| 1132 | static u16 virtnet_select_queue(struct net_device *dev, struct sk_buff *skb) | 1183 | static u16 virtnet_select_queue(struct net_device *dev, struct sk_buff *skb) |
| 1133 | { | 1184 | { |
| 1134 | int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : | 1185 | int txq; |
| 1135 | smp_processor_id(); | 1186 | struct virtnet_info *vi = netdev_priv(dev); |
| 1187 | |||
| 1188 | if (skb_rx_queue_recorded(skb)) { | ||
| 1189 | txq = skb_get_rx_queue(skb); | ||
| 1190 | } else { | ||
| 1191 | txq = *__this_cpu_ptr(vi->vq_index); | ||
| 1192 | if (txq == -1) | ||
| 1193 | txq = 0; | ||
| 1194 | } | ||
| 1136 | 1195 | ||
| 1137 | while (unlikely(txq >= dev->real_num_tx_queues)) | 1196 | while (unlikely(txq >= dev->real_num_tx_queues)) |
| 1138 | txq -= dev->real_num_tx_queues; | 1197 | txq -= dev->real_num_tx_queues; |
| @@ -1248,7 +1307,7 @@ static void virtnet_del_vqs(struct virtnet_info *vi) | |||
| 1248 | { | 1307 | { |
| 1249 | struct virtio_device *vdev = vi->vdev; | 1308 | struct virtio_device *vdev = vi->vdev; |
| 1250 | 1309 | ||
| 1251 | virtnet_set_affinity(vi, false); | 1310 | virtnet_clean_affinity(vi, -1); |
| 1252 | 1311 | ||
| 1253 | vdev->config->del_vqs(vdev); | 1312 | vdev->config->del_vqs(vdev); |
| 1254 | 1313 | ||
| @@ -1371,7 +1430,10 @@ static int init_vqs(struct virtnet_info *vi) | |||
| 1371 | if (ret) | 1430 | if (ret) |
| 1372 | goto err_free; | 1431 | goto err_free; |
| 1373 | 1432 | ||
| 1374 | virtnet_set_affinity(vi, true); | 1433 | get_online_cpus(); |
| 1434 | virtnet_set_affinity(vi); | ||
| 1435 | put_online_cpus(); | ||
| 1436 | |||
| 1375 | return 0; | 1437 | return 0; |
| 1376 | 1438 | ||
| 1377 | err_free: | 1439 | err_free: |
| @@ -1453,6 +1515,10 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 1453 | if (vi->stats == NULL) | 1515 | if (vi->stats == NULL) |
| 1454 | goto free; | 1516 | goto free; |
| 1455 | 1517 | ||
| 1518 | vi->vq_index = alloc_percpu(int); | ||
| 1519 | if (vi->vq_index == NULL) | ||
| 1520 | goto free_stats; | ||
| 1521 | |||
| 1456 | mutex_init(&vi->config_lock); | 1522 | mutex_init(&vi->config_lock); |
| 1457 | vi->config_enable = true; | 1523 | vi->config_enable = true; |
| 1458 | INIT_WORK(&vi->config_work, virtnet_config_changed_work); | 1524 | INIT_WORK(&vi->config_work, virtnet_config_changed_work); |
| @@ -1476,7 +1542,7 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 1476 | /* Allocate/initialize the rx/tx queues, and invoke find_vqs */ | 1542 | /* Allocate/initialize the rx/tx queues, and invoke find_vqs */ |
| 1477 | err = init_vqs(vi); | 1543 | err = init_vqs(vi); |
| 1478 | if (err) | 1544 | if (err) |
| 1479 | goto free_stats; | 1545 | goto free_index; |
| 1480 | 1546 | ||
| 1481 | netif_set_real_num_tx_queues(dev, 1); | 1547 | netif_set_real_num_tx_queues(dev, 1); |
| 1482 | netif_set_real_num_rx_queues(dev, 1); | 1548 | netif_set_real_num_rx_queues(dev, 1); |
| @@ -1499,6 +1565,13 @@ static int virtnet_probe(struct virtio_device *vdev) | |||
| 1499 | } | 1565 | } |
| 1500 | } | 1566 | } |
| 1501 | 1567 | ||
| 1568 | vi->nb.notifier_call = &virtnet_cpu_callback; | ||
| 1569 | err = register_hotcpu_notifier(&vi->nb); | ||
| 1570 | if (err) { | ||
| 1571 | pr_debug("virtio_net: registering cpu notifier failed\n"); | ||
| 1572 | goto free_recv_bufs; | ||
| 1573 | } | ||
| 1574 | |||
| 1502 | /* Assume link up if device can't report link status, | 1575 | /* Assume link up if device can't report link status, |
| 1503 | otherwise get link status from config. */ | 1576 | otherwise get link status from config. */ |
| 1504 | if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { | 1577 | if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_STATUS)) { |
| @@ -1520,6 +1593,8 @@ free_recv_bufs: | |||
| 1520 | free_vqs: | 1593 | free_vqs: |
| 1521 | cancel_delayed_work_sync(&vi->refill); | 1594 | cancel_delayed_work_sync(&vi->refill); |
| 1522 | virtnet_del_vqs(vi); | 1595 | virtnet_del_vqs(vi); |
| 1596 | free_index: | ||
| 1597 | free_percpu(vi->vq_index); | ||
| 1523 | free_stats: | 1598 | free_stats: |
| 1524 | free_percpu(vi->stats); | 1599 | free_percpu(vi->stats); |
| 1525 | free: | 1600 | free: |
| @@ -1543,6 +1618,8 @@ static void virtnet_remove(struct virtio_device *vdev) | |||
| 1543 | { | 1618 | { |
| 1544 | struct virtnet_info *vi = vdev->priv; | 1619 | struct virtnet_info *vi = vdev->priv; |
| 1545 | 1620 | ||
| 1621 | unregister_hotcpu_notifier(&vi->nb); | ||
| 1622 | |||
| 1546 | /* Prevent config work handler from accessing the device. */ | 1623 | /* Prevent config work handler from accessing the device. */ |
| 1547 | mutex_lock(&vi->config_lock); | 1624 | mutex_lock(&vi->config_lock); |
| 1548 | vi->config_enable = false; | 1625 | vi->config_enable = false; |
| @@ -1554,6 +1631,7 @@ static void virtnet_remove(struct virtio_device *vdev) | |||
| 1554 | 1631 | ||
| 1555 | flush_work(&vi->config_work); | 1632 | flush_work(&vi->config_work); |
| 1556 | 1633 | ||
| 1634 | free_percpu(vi->vq_index); | ||
| 1557 | free_percpu(vi->stats); | 1635 | free_percpu(vi->stats); |
| 1558 | free_netdev(vi->dev); | 1636 | free_netdev(vi->dev); |
| 1559 | } | 1637 | } |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c index 8b0d8dcd7625..56317b0fb6b6 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c | |||
| @@ -976,6 +976,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, | |||
| 976 | AR_PHY_CL_TAB_1, | 976 | AR_PHY_CL_TAB_1, |
| 977 | AR_PHY_CL_TAB_2 }; | 977 | AR_PHY_CL_TAB_2 }; |
| 978 | 978 | ||
| 979 | ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask); | ||
| 980 | |||
| 979 | if (rtt) { | 981 | if (rtt) { |
| 980 | if (!ar9003_hw_rtt_restore(ah, chan)) | 982 | if (!ar9003_hw_rtt_restore(ah, chan)) |
| 981 | run_rtt_cal = true; | 983 | run_rtt_cal = true; |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c index ce19c09fa8e8..3afc24bde6d6 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c | |||
| @@ -586,32 +586,19 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, | |||
| 586 | ath9k_hw_synth_delay(ah, chan, synthDelay); | 586 | ath9k_hw_synth_delay(ah, chan, synthDelay); |
| 587 | } | 587 | } |
| 588 | 588 | ||
| 589 | static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) | 589 | void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx) |
| 590 | { | 590 | { |
| 591 | switch (rx) { | 591 | if (ah->caps.tx_chainmask == 5 || ah->caps.rx_chainmask == 5) |
| 592 | case 0x5: | ||
| 593 | REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP, | 592 | REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP, |
| 594 | AR_PHY_SWAP_ALT_CHAIN); | 593 | AR_PHY_SWAP_ALT_CHAIN); |
| 595 | case 0x3: | 594 | |
| 596 | case 0x1: | 595 | REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx); |
| 597 | case 0x2: | 596 | REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx); |
| 598 | case 0x7: | ||
| 599 | REG_WRITE(ah, AR_PHY_RX_CHAINMASK, rx); | ||
| 600 | REG_WRITE(ah, AR_PHY_CAL_CHAINMASK, rx); | ||
| 601 | break; | ||
| 602 | default: | ||
| 603 | break; | ||
| 604 | } | ||
| 605 | 597 | ||
| 606 | if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && (tx == 0x7)) | 598 | if ((ah->caps.hw_caps & ATH9K_HW_CAP_APM) && (tx == 0x7)) |
| 607 | REG_WRITE(ah, AR_SELFGEN_MASK, 0x3); | 599 | tx = 3; |
| 608 | else | ||
| 609 | REG_WRITE(ah, AR_SELFGEN_MASK, tx); | ||
| 610 | 600 | ||
| 611 | if (tx == 0x5) { | 601 | REG_WRITE(ah, AR_SELFGEN_MASK, tx); |
| 612 | REG_SET_BIT(ah, AR_PHY_ANALOG_SWAP, | ||
| 613 | AR_PHY_SWAP_ALT_CHAIN); | ||
| 614 | } | ||
| 615 | } | 602 | } |
| 616 | 603 | ||
| 617 | /* | 604 | /* |
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 86e26a19efda..42794c546a40 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -317,7 +317,6 @@ struct ath_rx { | |||
| 317 | u32 *rxlink; | 317 | u32 *rxlink; |
| 318 | u32 num_pkts; | 318 | u32 num_pkts; |
| 319 | unsigned int rxfilter; | 319 | unsigned int rxfilter; |
| 320 | spinlock_t rxbuflock; | ||
| 321 | struct list_head rxbuf; | 320 | struct list_head rxbuf; |
| 322 | struct ath_descdma rxdma; | 321 | struct ath_descdma rxdma; |
| 323 | struct ath_buf *rx_bufptr; | 322 | struct ath_buf *rx_bufptr; |
| @@ -328,7 +327,6 @@ struct ath_rx { | |||
| 328 | 327 | ||
| 329 | int ath_startrecv(struct ath_softc *sc); | 328 | int ath_startrecv(struct ath_softc *sc); |
| 330 | bool ath_stoprecv(struct ath_softc *sc); | 329 | bool ath_stoprecv(struct ath_softc *sc); |
| 331 | void ath_flushrecv(struct ath_softc *sc); | ||
| 332 | u32 ath_calcrxfilter(struct ath_softc *sc); | 330 | u32 ath_calcrxfilter(struct ath_softc *sc); |
| 333 | int ath_rx_init(struct ath_softc *sc, int nbufs); | 331 | int ath_rx_init(struct ath_softc *sc, int nbufs); |
| 334 | void ath_rx_cleanup(struct ath_softc *sc); | 332 | void ath_rx_cleanup(struct ath_softc *sc); |
| @@ -646,7 +644,6 @@ void ath_ant_comb_update(struct ath_softc *sc); | |||
| 646 | enum sc_op_flags { | 644 | enum sc_op_flags { |
| 647 | SC_OP_INVALID, | 645 | SC_OP_INVALID, |
| 648 | SC_OP_BEACONS, | 646 | SC_OP_BEACONS, |
| 649 | SC_OP_RXFLUSH, | ||
| 650 | SC_OP_ANI_RUN, | 647 | SC_OP_ANI_RUN, |
| 651 | SC_OP_PRIM_STA_VIF, | 648 | SC_OP_PRIM_STA_VIF, |
| 652 | SC_OP_HW_RESET, | 649 | SC_OP_HW_RESET, |
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index 531fffd801a3..2ca355e94da6 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c | |||
| @@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, | |||
| 147 | skb->len, DMA_TO_DEVICE); | 147 | skb->len, DMA_TO_DEVICE); |
| 148 | dev_kfree_skb_any(skb); | 148 | dev_kfree_skb_any(skb); |
| 149 | bf->bf_buf_addr = 0; | 149 | bf->bf_buf_addr = 0; |
| 150 | bf->bf_mpdu = NULL; | ||
| 150 | } | 151 | } |
| 151 | 152 | ||
| 152 | skb = ieee80211_beacon_get(hw, vif); | 153 | skb = ieee80211_beacon_get(hw, vif); |
| @@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long data) | |||
| 359 | return; | 360 | return; |
| 360 | 361 | ||
| 361 | bf = ath9k_beacon_generate(sc->hw, vif); | 362 | bf = ath9k_beacon_generate(sc->hw, vif); |
| 362 | WARN_ON(!bf); | ||
| 363 | 363 | ||
| 364 | if (sc->beacon.bmisscnt != 0) { | 364 | if (sc->beacon.bmisscnt != 0) { |
| 365 | ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n", | 365 | ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n", |
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 13ff9edc2401..e585fc827c50 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
| @@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, | |||
| 861 | RXS_ERR("RX-LENGTH-ERR", rx_len_err); | 861 | RXS_ERR("RX-LENGTH-ERR", rx_len_err); |
| 862 | RXS_ERR("RX-OOM-ERR", rx_oom_err); | 862 | RXS_ERR("RX-OOM-ERR", rx_oom_err); |
| 863 | RXS_ERR("RX-RATE-ERR", rx_rate_err); | 863 | RXS_ERR("RX-RATE-ERR", rx_rate_err); |
| 864 | RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush); | ||
| 865 | RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err); | 864 | RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err); |
| 866 | 865 | ||
| 867 | PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN); | 866 | PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN); |
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h index 375c3b46411e..6df2ab62dcb7 100644 --- a/drivers/net/wireless/ath/ath9k/debug.h +++ b/drivers/net/wireless/ath/ath9k/debug.h | |||
| @@ -216,7 +216,6 @@ struct ath_tx_stats { | |||
| 216 | * @rx_oom_err: No. of frames dropped due to OOM issues. | 216 | * @rx_oom_err: No. of frames dropped due to OOM issues. |
| 217 | * @rx_rate_err: No. of frames dropped due to rate errors. | 217 | * @rx_rate_err: No. of frames dropped due to rate errors. |
| 218 | * @rx_too_many_frags_err: Frames dropped due to too-many-frags received. | 218 | * @rx_too_many_frags_err: Frames dropped due to too-many-frags received. |
| 219 | * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH. | ||
| 220 | * @rx_beacons: No. of beacons received. | 219 | * @rx_beacons: No. of beacons received. |
| 221 | * @rx_frags: No. of rx-fragements received. | 220 | * @rx_frags: No. of rx-fragements received. |
| 222 | */ | 221 | */ |
| @@ -235,7 +234,6 @@ struct ath_rx_stats { | |||
| 235 | u32 rx_oom_err; | 234 | u32 rx_oom_err; |
| 236 | u32 rx_rate_err; | 235 | u32 rx_rate_err; |
| 237 | u32 rx_too_many_frags_err; | 236 | u32 rx_too_many_frags_err; |
| 238 | u32 rx_drop_rxflush; | ||
| 239 | u32 rx_beacons; | 237 | u32 rx_beacons; |
| 240 | u32 rx_frags; | 238 | u32 rx_frags; |
| 241 | }; | 239 | }; |
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c index 4a9570dfba72..aac4a406a513 100644 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c | |||
| @@ -344,6 +344,8 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle, | |||
| 344 | endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv, | 344 | endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv, |
| 345 | skb, htc_hdr->endpoint_id, | 345 | skb, htc_hdr->endpoint_id, |
| 346 | txok); | 346 | txok); |
| 347 | } else { | ||
| 348 | kfree_skb(skb); | ||
| 347 | } | 349 | } |
| 348 | } | 350 | } |
| 349 | 351 | ||
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 7f1a8e91c908..9d26fc56ca56 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
| @@ -1066,6 +1066,7 @@ void ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain); | |||
| 1066 | int ar9003_paprd_init_table(struct ath_hw *ah); | 1066 | int ar9003_paprd_init_table(struct ath_hw *ah); |
| 1067 | bool ar9003_paprd_is_done(struct ath_hw *ah); | 1067 | bool ar9003_paprd_is_done(struct ath_hw *ah); |
| 1068 | bool ar9003_is_paprd_enabled(struct ath_hw *ah); | 1068 | bool ar9003_is_paprd_enabled(struct ath_hw *ah); |
| 1069 | void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx); | ||
| 1069 | 1070 | ||
| 1070 | /* Hardware family op attach helpers */ | 1071 | /* Hardware family op attach helpers */ |
| 1071 | void ar5008_hw_attach_phy_ops(struct ath_hw *ah); | 1072 | void ar5008_hw_attach_phy_ops(struct ath_hw *ah); |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index be30a9af1528..dd91f8fdc01c 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
| @@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_softc *sc) | |||
| 182 | ath_start_ani(sc); | 182 | ath_start_ani(sc); |
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush) | 185 | static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx) |
| 186 | { | 186 | { |
| 187 | struct ath_hw *ah = sc->sc_ah; | 187 | struct ath_hw *ah = sc->sc_ah; |
| 188 | bool ret = true; | 188 | bool ret = true; |
| @@ -202,14 +202,6 @@ static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush) | |||
| 202 | if (!ath_drain_all_txq(sc, retry_tx)) | 202 | if (!ath_drain_all_txq(sc, retry_tx)) |
| 203 | ret = false; | 203 | ret = false; |
| 204 | 204 | ||
| 205 | if (!flush) { | ||
| 206 | if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) | ||
| 207 | ath_rx_tasklet(sc, 1, true); | ||
| 208 | ath_rx_tasklet(sc, 1, false); | ||
| 209 | } else { | ||
| 210 | ath_flushrecv(sc); | ||
| 211 | } | ||
| 212 | |||
| 213 | return ret; | 205 | return ret; |
| 214 | } | 206 | } |
| 215 | 207 | ||
| @@ -262,11 +254,11 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, | |||
| 262 | struct ath_common *common = ath9k_hw_common(ah); | 254 | struct ath_common *common = ath9k_hw_common(ah); |
| 263 | struct ath9k_hw_cal_data *caldata = NULL; | 255 | struct ath9k_hw_cal_data *caldata = NULL; |
| 264 | bool fastcc = true; | 256 | bool fastcc = true; |
| 265 | bool flush = false; | ||
| 266 | int r; | 257 | int r; |
| 267 | 258 | ||
| 268 | __ath_cancel_work(sc); | 259 | __ath_cancel_work(sc); |
| 269 | 260 | ||
| 261 | tasklet_disable(&sc->intr_tq); | ||
| 270 | spin_lock_bh(&sc->sc_pcu_lock); | 262 | spin_lock_bh(&sc->sc_pcu_lock); |
| 271 | 263 | ||
| 272 | if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) { | 264 | if (!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) { |
| @@ -276,11 +268,10 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, | |||
| 276 | 268 | ||
| 277 | if (!hchan) { | 269 | if (!hchan) { |
| 278 | fastcc = false; | 270 | fastcc = false; |
| 279 | flush = true; | ||
| 280 | hchan = ah->curchan; | 271 | hchan = ah->curchan; |
| 281 | } | 272 | } |
| 282 | 273 | ||
| 283 | if (!ath_prepare_reset(sc, retry_tx, flush)) | 274 | if (!ath_prepare_reset(sc, retry_tx)) |
| 284 | fastcc = false; | 275 | fastcc = false; |
| 285 | 276 | ||
| 286 | ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n", | 277 | ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n", |
| @@ -302,6 +293,8 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan, | |||
| 302 | 293 | ||
| 303 | out: | 294 | out: |
| 304 | spin_unlock_bh(&sc->sc_pcu_lock); | 295 | spin_unlock_bh(&sc->sc_pcu_lock); |
| 296 | tasklet_enable(&sc->intr_tq); | ||
| 297 | |||
| 305 | return r; | 298 | return r; |
| 306 | } | 299 | } |
| 307 | 300 | ||
| @@ -804,7 +797,7 @@ static void ath9k_stop(struct ieee80211_hw *hw) | |||
| 804 | ath9k_hw_cfg_gpio_input(ah, ah->led_pin); | 797 | ath9k_hw_cfg_gpio_input(ah, ah->led_pin); |
| 805 | } | 798 | } |
| 806 | 799 | ||
| 807 | ath_prepare_reset(sc, false, true); | 800 | ath_prepare_reset(sc, false); |
| 808 | 801 | ||
| 809 | if (sc->rx.frag) { | 802 | if (sc->rx.frag) { |
| 810 | dev_kfree_skb_any(sc->rx.frag); | 803 | dev_kfree_skb_any(sc->rx.frag); |
| @@ -1833,6 +1826,9 @@ static u32 fill_chainmask(u32 cap, u32 new) | |||
| 1833 | 1826 | ||
| 1834 | static bool validate_antenna_mask(struct ath_hw *ah, u32 val) | 1827 | static bool validate_antenna_mask(struct ath_hw *ah, u32 val) |
| 1835 | { | 1828 | { |
| 1829 | if (AR_SREV_9300_20_OR_LATER(ah)) | ||
| 1830 | return true; | ||
| 1831 | |||
| 1836 | switch (val & 0x7) { | 1832 | switch (val & 0x7) { |
| 1837 | case 0x1: | 1833 | case 0x1: |
| 1838 | case 0x3: | 1834 | case 0x3: |
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index d4df98a938bf..90752f246970 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
| @@ -254,8 +254,6 @@ rx_init_fail: | |||
| 254 | 254 | ||
| 255 | static void ath_edma_start_recv(struct ath_softc *sc) | 255 | static void ath_edma_start_recv(struct ath_softc *sc) |
| 256 | { | 256 | { |
| 257 | spin_lock_bh(&sc->rx.rxbuflock); | ||
| 258 | |||
| 259 | ath9k_hw_rxena(sc->sc_ah); | 257 | ath9k_hw_rxena(sc->sc_ah); |
| 260 | 258 | ||
| 261 | ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP, | 259 | ath_rx_addbuffer_edma(sc, ATH9K_RX_QUEUE_HP, |
| @@ -267,8 +265,6 @@ static void ath_edma_start_recv(struct ath_softc *sc) | |||
| 267 | ath_opmode_init(sc); | 265 | ath_opmode_init(sc); |
| 268 | 266 | ||
| 269 | ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)); | 267 | ath9k_hw_startpcureceive(sc->sc_ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)); |
| 270 | |||
| 271 | spin_unlock_bh(&sc->rx.rxbuflock); | ||
| 272 | } | 268 | } |
| 273 | 269 | ||
| 274 | static void ath_edma_stop_recv(struct ath_softc *sc) | 270 | static void ath_edma_stop_recv(struct ath_softc *sc) |
| @@ -285,8 +281,6 @@ int ath_rx_init(struct ath_softc *sc, int nbufs) | |||
| 285 | int error = 0; | 281 | int error = 0; |
| 286 | 282 | ||
| 287 | spin_lock_init(&sc->sc_pcu_lock); | 283 | spin_lock_init(&sc->sc_pcu_lock); |
| 288 | spin_lock_init(&sc->rx.rxbuflock); | ||
| 289 | clear_bit(SC_OP_RXFLUSH, &sc->sc_flags); | ||
| 290 | 284 | ||
| 291 | common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 + | 285 | common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 + |
| 292 | sc->sc_ah->caps.rx_status_len; | 286 | sc->sc_ah->caps.rx_status_len; |
| @@ -447,7 +441,6 @@ int ath_startrecv(struct ath_softc *sc) | |||
| 447 | return 0; | 441 | return 0; |
| 448 | } | 442 | } |
| 449 | 443 | ||
| 450 | spin_lock_bh(&sc->rx.rxbuflock); | ||
| 451 | if (list_empty(&sc->rx.rxbuf)) | 444 | if (list_empty(&sc->rx.rxbuf)) |
| 452 | goto start_recv; | 445 | goto start_recv; |
| 453 | 446 | ||
| @@ -468,26 +461,31 @@ start_recv: | |||
| 468 | ath_opmode_init(sc); | 461 | ath_opmode_init(sc); |
| 469 | ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)); | 462 | ath9k_hw_startpcureceive(ah, !!(sc->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)); |
| 470 | 463 | ||
| 471 | spin_unlock_bh(&sc->rx.rxbuflock); | ||
| 472 | |||
| 473 | return 0; | 464 | return 0; |
| 474 | } | 465 | } |
| 475 | 466 | ||
| 467 | static void ath_flushrecv(struct ath_softc *sc) | ||
| 468 | { | ||
| 469 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) | ||
| 470 | ath_rx_tasklet(sc, 1, true); | ||
| 471 | ath_rx_tasklet(sc, 1, false); | ||
| 472 | } | ||
| 473 | |||
| 476 | bool ath_stoprecv(struct ath_softc *sc) | 474 | bool ath_stoprecv(struct ath_softc *sc) |
| 477 | { | 475 | { |
| 478 | struct ath_hw *ah = sc->sc_ah; | 476 | struct ath_hw *ah = sc->sc_ah; |
| 479 | bool stopped, reset = false; | 477 | bool stopped, reset = false; |
| 480 | 478 | ||
| 481 | spin_lock_bh(&sc->rx.rxbuflock); | ||
| 482 | ath9k_hw_abortpcurecv(ah); | 479 | ath9k_hw_abortpcurecv(ah); |
| 483 | ath9k_hw_setrxfilter(ah, 0); | 480 | ath9k_hw_setrxfilter(ah, 0); |
| 484 | stopped = ath9k_hw_stopdmarecv(ah, &reset); | 481 | stopped = ath9k_hw_stopdmarecv(ah, &reset); |
| 485 | 482 | ||
| 483 | ath_flushrecv(sc); | ||
| 484 | |||
| 486 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) | 485 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) |
| 487 | ath_edma_stop_recv(sc); | 486 | ath_edma_stop_recv(sc); |
| 488 | else | 487 | else |
| 489 | sc->rx.rxlink = NULL; | 488 | sc->rx.rxlink = NULL; |
| 490 | spin_unlock_bh(&sc->rx.rxbuflock); | ||
| 491 | 489 | ||
| 492 | if (!(ah->ah_flags & AH_UNPLUGGED) && | 490 | if (!(ah->ah_flags & AH_UNPLUGGED) && |
| 493 | unlikely(!stopped)) { | 491 | unlikely(!stopped)) { |
| @@ -499,15 +497,6 @@ bool ath_stoprecv(struct ath_softc *sc) | |||
| 499 | return stopped && !reset; | 497 | return stopped && !reset; |
| 500 | } | 498 | } |
| 501 | 499 | ||
| 502 | void ath_flushrecv(struct ath_softc *sc) | ||
| 503 | { | ||
| 504 | set_bit(SC_OP_RXFLUSH, &sc->sc_flags); | ||
| 505 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) | ||
| 506 | ath_rx_tasklet(sc, 1, true); | ||
| 507 | ath_rx_tasklet(sc, 1, false); | ||
| 508 | clear_bit(SC_OP_RXFLUSH, &sc->sc_flags); | ||
| 509 | } | ||
| 510 | |||
| 511 | static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb) | 500 | static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb) |
| 512 | { | 501 | { |
| 513 | /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */ | 502 | /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */ |
| @@ -744,6 +733,7 @@ static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc, | |||
| 744 | return NULL; | 733 | return NULL; |
| 745 | } | 734 | } |
| 746 | 735 | ||
| 736 | list_del(&bf->list); | ||
| 747 | if (!bf->bf_mpdu) | 737 | if (!bf->bf_mpdu) |
| 748 | return bf; | 738 | return bf; |
| 749 | 739 | ||
| @@ -1059,16 +1049,12 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
| 1059 | dma_type = DMA_FROM_DEVICE; | 1049 | dma_type = DMA_FROM_DEVICE; |
| 1060 | 1050 | ||
| 1061 | qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP; | 1051 | qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP; |
| 1062 | spin_lock_bh(&sc->rx.rxbuflock); | ||
| 1063 | 1052 | ||
| 1064 | tsf = ath9k_hw_gettsf64(ah); | 1053 | tsf = ath9k_hw_gettsf64(ah); |
| 1065 | tsf_lower = tsf & 0xffffffff; | 1054 | tsf_lower = tsf & 0xffffffff; |
| 1066 | 1055 | ||
| 1067 | do { | 1056 | do { |
| 1068 | bool decrypt_error = false; | 1057 | bool decrypt_error = false; |
| 1069 | /* If handling rx interrupt and flush is in progress => exit */ | ||
| 1070 | if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0)) | ||
| 1071 | break; | ||
| 1072 | 1058 | ||
| 1073 | memset(&rs, 0, sizeof(rs)); | 1059 | memset(&rs, 0, sizeof(rs)); |
| 1074 | if (edma) | 1060 | if (edma) |
| @@ -1111,15 +1097,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
| 1111 | 1097 | ||
| 1112 | ath_debug_stat_rx(sc, &rs); | 1098 | ath_debug_stat_rx(sc, &rs); |
| 1113 | 1099 | ||
| 1114 | /* | ||
| 1115 | * If we're asked to flush receive queue, directly | ||
| 1116 | * chain it back at the queue without processing it. | ||
| 1117 | */ | ||
| 1118 | if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) { | ||
| 1119 | RX_STAT_INC(rx_drop_rxflush); | ||
| 1120 | goto requeue_drop_frag; | ||
| 1121 | } | ||
| 1122 | |||
| 1123 | memset(rxs, 0, sizeof(struct ieee80211_rx_status)); | 1100 | memset(rxs, 0, sizeof(struct ieee80211_rx_status)); |
| 1124 | 1101 | ||
| 1125 | rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; | 1102 | rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; |
| @@ -1254,19 +1231,18 @@ requeue_drop_frag: | |||
| 1254 | sc->rx.frag = NULL; | 1231 | sc->rx.frag = NULL; |
| 1255 | } | 1232 | } |
| 1256 | requeue: | 1233 | requeue: |
| 1234 | list_add_tail(&bf->list, &sc->rx.rxbuf); | ||
| 1235 | if (flush) | ||
| 1236 | continue; | ||
| 1237 | |||
| 1257 | if (edma) { | 1238 | if (edma) { |
| 1258 | list_add_tail(&bf->list, &sc->rx.rxbuf); | ||
| 1259 | ath_rx_edma_buf_link(sc, qtype); | 1239 | ath_rx_edma_buf_link(sc, qtype); |
| 1260 | } else { | 1240 | } else { |
| 1261 | list_move_tail(&bf->list, &sc->rx.rxbuf); | ||
| 1262 | ath_rx_buf_link(sc, bf); | 1241 | ath_rx_buf_link(sc, bf); |
| 1263 | if (!flush) | 1242 | ath9k_hw_rxena(ah); |
| 1264 | ath9k_hw_rxena(ah); | ||
| 1265 | } | 1243 | } |
| 1266 | } while (1); | 1244 | } while (1); |
| 1267 | 1245 | ||
| 1268 | spin_unlock_bh(&sc->rx.rxbuflock); | ||
| 1269 | |||
| 1270 | if (!(ah->imask & ATH9K_INT_RXEOL)) { | 1246 | if (!(ah->imask & ATH9K_INT_RXEOL)) { |
| 1271 | ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN); | 1247 | ah->imask |= (ATH9K_INT_RXEOL | ATH9K_INT_RXORN); |
| 1272 | ath9k_hw_set_interrupts(ah); | 1248 | ath9k_hw_set_interrupts(ah); |
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 1fbd8ecbe2ea..0f71d1d4339d 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | |||
| @@ -1407,9 +1407,10 @@ void brcms_add_timer(struct brcms_timer *t, uint ms, int periodic) | |||
| 1407 | #endif | 1407 | #endif |
| 1408 | t->ms = ms; | 1408 | t->ms = ms; |
| 1409 | t->periodic = (bool) periodic; | 1409 | t->periodic = (bool) periodic; |
| 1410 | t->set = true; | 1410 | if (!t->set) { |
| 1411 | 1411 | t->set = true; | |
| 1412 | atomic_inc(&t->wl->callbacks); | 1412 | atomic_inc(&t->wl->callbacks); |
| 1413 | } | ||
| 1413 | 1414 | ||
| 1414 | ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms)); | 1415 | ieee80211_queue_delayed_work(hw, &t->dly_wrk, msecs_to_jiffies(ms)); |
| 1415 | } | 1416 | } |
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 7e16d10a7f14..90b8970eadf0 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
| @@ -3958,17 +3958,21 @@ il_connection_init_rx_config(struct il_priv *il) | |||
| 3958 | 3958 | ||
| 3959 | memset(&il->staging, 0, sizeof(il->staging)); | 3959 | memset(&il->staging, 0, sizeof(il->staging)); |
| 3960 | 3960 | ||
| 3961 | if (!il->vif) { | 3961 | switch (il->iw_mode) { |
| 3962 | case NL80211_IFTYPE_UNSPECIFIED: | ||
| 3962 | il->staging.dev_type = RXON_DEV_TYPE_ESS; | 3963 | il->staging.dev_type = RXON_DEV_TYPE_ESS; |
| 3963 | } else if (il->vif->type == NL80211_IFTYPE_STATION) { | 3964 | break; |
| 3965 | case NL80211_IFTYPE_STATION: | ||
| 3964 | il->staging.dev_type = RXON_DEV_TYPE_ESS; | 3966 | il->staging.dev_type = RXON_DEV_TYPE_ESS; |
| 3965 | il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK; | 3967 | il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK; |
| 3966 | } else if (il->vif->type == NL80211_IFTYPE_ADHOC) { | 3968 | break; |
| 3969 | case NL80211_IFTYPE_ADHOC: | ||
| 3967 | il->staging.dev_type = RXON_DEV_TYPE_IBSS; | 3970 | il->staging.dev_type = RXON_DEV_TYPE_IBSS; |
| 3968 | il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK; | 3971 | il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK; |
| 3969 | il->staging.filter_flags = | 3972 | il->staging.filter_flags = |
| 3970 | RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_ACCEPT_GRP_MSK; | 3973 | RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_ACCEPT_GRP_MSK; |
| 3971 | } else { | 3974 | break; |
| 3975 | default: | ||
| 3972 | IL_ERR("Unsupported interface type %d\n", il->vif->type); | 3976 | IL_ERR("Unsupported interface type %d\n", il->vif->type); |
| 3973 | return; | 3977 | return; |
| 3974 | } | 3978 | } |
| @@ -4550,8 +4554,7 @@ out: | |||
| 4550 | EXPORT_SYMBOL(il_mac_add_interface); | 4554 | EXPORT_SYMBOL(il_mac_add_interface); |
| 4551 | 4555 | ||
| 4552 | static void | 4556 | static void |
| 4553 | il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif, | 4557 | il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif) |
| 4554 | bool mode_change) | ||
| 4555 | { | 4558 | { |
| 4556 | lockdep_assert_held(&il->mutex); | 4559 | lockdep_assert_held(&il->mutex); |
| 4557 | 4560 | ||
| @@ -4560,9 +4563,7 @@ il_teardown_interface(struct il_priv *il, struct ieee80211_vif *vif, | |||
| 4560 | il_force_scan_end(il); | 4563 | il_force_scan_end(il); |
| 4561 | } | 4564 | } |
| 4562 | 4565 | ||
| 4563 | if (!mode_change) | 4566 | il_set_mode(il); |
| 4564 | il_set_mode(il); | ||
| 4565 | |||
| 4566 | } | 4567 | } |
| 4567 | 4568 | ||
| 4568 | void | 4569 | void |
| @@ -4575,8 +4576,8 @@ il_mac_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) | |||
| 4575 | 4576 | ||
| 4576 | WARN_ON(il->vif != vif); | 4577 | WARN_ON(il->vif != vif); |
| 4577 | il->vif = NULL; | 4578 | il->vif = NULL; |
| 4578 | 4579 | il->iw_mode = NL80211_IFTYPE_UNSPECIFIED; | |
| 4579 | il_teardown_interface(il, vif, false); | 4580 | il_teardown_interface(il, vif); |
| 4580 | memset(il->bssid, 0, ETH_ALEN); | 4581 | memset(il->bssid, 0, ETH_ALEN); |
| 4581 | 4582 | ||
| 4582 | D_MAC80211("leave\n"); | 4583 | D_MAC80211("leave\n"); |
| @@ -4685,18 +4686,10 @@ il_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
| 4685 | } | 4686 | } |
| 4686 | 4687 | ||
| 4687 | /* success */ | 4688 | /* success */ |
| 4688 | il_teardown_interface(il, vif, true); | ||
| 4689 | vif->type = newtype; | 4689 | vif->type = newtype; |
| 4690 | vif->p2p = false; | 4690 | vif->p2p = false; |
| 4691 | err = il_set_mode(il); | 4691 | il->iw_mode = newtype; |
| 4692 | WARN_ON(err); | 4692 | il_teardown_interface(il, vif); |
| 4693 | /* | ||
| 4694 | * We've switched internally, but submitting to the | ||
| 4695 | * device may have failed for some reason. Mask this | ||
| 4696 | * error, because otherwise mac80211 will not switch | ||
| 4697 | * (and set the interface type back) and we'll be | ||
| 4698 | * out of sync with it. | ||
| 4699 | */ | ||
| 4700 | err = 0; | 4693 | err = 0; |
| 4701 | 4694 | ||
| 4702 | out: | 4695 | out: |
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index a790599fe2c2..31534f7c0548 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c | |||
| @@ -1079,6 +1079,8 @@ static void iwlagn_set_tx_status(struct iwl_priv *priv, | |||
| 1079 | { | 1079 | { |
| 1080 | u16 status = le16_to_cpu(tx_resp->status.status); | 1080 | u16 status = le16_to_cpu(tx_resp->status.status); |
| 1081 | 1081 | ||
| 1082 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | ||
| 1083 | |||
| 1082 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 1084 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
| 1083 | info->flags |= iwl_tx_status_to_mac80211(status); | 1085 | info->flags |= iwl_tx_status_to_mac80211(status); |
| 1084 | iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags), | 1086 | iwlagn_hwrate_to_tx_control(priv, le32_to_cpu(tx_resp->rate_n_flags), |
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index efe525be27dd..cdb11b3964e2 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
| @@ -1459,7 +1459,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, | |||
| 1459 | struct cfg80211_ssid req_ssid; | 1459 | struct cfg80211_ssid req_ssid; |
| 1460 | int ret, auth_type = 0; | 1460 | int ret, auth_type = 0; |
| 1461 | struct cfg80211_bss *bss = NULL; | 1461 | struct cfg80211_bss *bss = NULL; |
| 1462 | u8 is_scanning_required = 0, config_bands = 0; | 1462 | u8 is_scanning_required = 0; |
| 1463 | 1463 | ||
| 1464 | memset(&req_ssid, 0, sizeof(struct cfg80211_ssid)); | 1464 | memset(&req_ssid, 0, sizeof(struct cfg80211_ssid)); |
| 1465 | 1465 | ||
| @@ -1478,19 +1478,6 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, | |||
| 1478 | /* disconnect before try to associate */ | 1478 | /* disconnect before try to associate */ |
| 1479 | mwifiex_deauthenticate(priv, NULL); | 1479 | mwifiex_deauthenticate(priv, NULL); |
| 1480 | 1480 | ||
| 1481 | if (channel) { | ||
| 1482 | if (mode == NL80211_IFTYPE_STATION) { | ||
| 1483 | if (channel->band == IEEE80211_BAND_2GHZ) | ||
| 1484 | config_bands = BAND_B | BAND_G | BAND_GN; | ||
| 1485 | else | ||
| 1486 | config_bands = BAND_A | BAND_AN; | ||
| 1487 | |||
| 1488 | if (!((config_bands | priv->adapter->fw_bands) & | ||
| 1489 | ~priv->adapter->fw_bands)) | ||
| 1490 | priv->adapter->config_bands = config_bands; | ||
| 1491 | } | ||
| 1492 | } | ||
| 1493 | |||
| 1494 | /* As this is new association, clear locally stored | 1481 | /* As this is new association, clear locally stored |
| 1495 | * keys and security related flags */ | 1482 | * keys and security related flags */ |
| 1496 | priv->sec_info.wpa_enabled = false; | 1483 | priv->sec_info.wpa_enabled = false; |
| @@ -1707,7 +1694,7 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv, | |||
| 1707 | 1694 | ||
| 1708 | if (cfg80211_get_chandef_type(¶ms->chandef) != | 1695 | if (cfg80211_get_chandef_type(¶ms->chandef) != |
| 1709 | NL80211_CHAN_NO_HT) | 1696 | NL80211_CHAN_NO_HT) |
| 1710 | config_bands |= BAND_GN; | 1697 | config_bands |= BAND_G | BAND_GN; |
| 1711 | } else { | 1698 | } else { |
| 1712 | if (cfg80211_get_chandef_type(¶ms->chandef) == | 1699 | if (cfg80211_get_chandef_type(¶ms->chandef) == |
| 1713 | NL80211_CHAN_NO_HT) | 1700 | NL80211_CHAN_NO_HT) |
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 13fbc4eb1595..b879e1338a54 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c | |||
| @@ -161,7 +161,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state) | |||
| 161 | 161 | ||
| 162 | if (pdev) { | 162 | if (pdev) { |
| 163 | card = (struct pcie_service_card *) pci_get_drvdata(pdev); | 163 | card = (struct pcie_service_card *) pci_get_drvdata(pdev); |
| 164 | if (!card || card->adapter) { | 164 | if (!card || !card->adapter) { |
| 165 | pr_err("Card or adapter structure is not valid\n"); | 165 | pr_err("Card or adapter structure is not valid\n"); |
| 166 | return 0; | 166 | return 0; |
| 167 | } | 167 | } |
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c index 60e88b58039d..f542bb8ccbc8 100644 --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c | |||
| @@ -283,6 +283,20 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, | |||
| 283 | if (ret) | 283 | if (ret) |
| 284 | goto done; | 284 | goto done; |
| 285 | 285 | ||
| 286 | if (bss_desc) { | ||
| 287 | u8 config_bands = 0; | ||
| 288 | |||
| 289 | if (mwifiex_band_to_radio_type((u8) bss_desc->bss_band) | ||
| 290 | == HostCmd_SCAN_RADIO_TYPE_BG) | ||
| 291 | config_bands = BAND_B | BAND_G | BAND_GN; | ||
| 292 | else | ||
| 293 | config_bands = BAND_A | BAND_AN; | ||
| 294 | |||
| 295 | if (!((config_bands | adapter->fw_bands) & | ||
| 296 | ~adapter->fw_bands)) | ||
| 297 | adapter->config_bands = config_bands; | ||
| 298 | } | ||
| 299 | |||
| 286 | ret = mwifiex_check_network_compatibility(priv, bss_desc); | 300 | ret = mwifiex_check_network_compatibility(priv, bss_desc); |
| 287 | if (ret) | 301 | if (ret) |
| 288 | goto done; | 302 | goto done; |
diff --git a/drivers/net/wireless/rtlwifi/Kconfig b/drivers/net/wireless/rtlwifi/Kconfig index 21b1bbb93a7e..b80bc4612581 100644 --- a/drivers/net/wireless/rtlwifi/Kconfig +++ b/drivers/net/wireless/rtlwifi/Kconfig | |||
| @@ -57,12 +57,12 @@ config RTL8192CU | |||
| 57 | 57 | ||
| 58 | config RTLWIFI | 58 | config RTLWIFI |
| 59 | tristate | 59 | tristate |
| 60 | depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE | 60 | depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE |
| 61 | default m | 61 | default m |
| 62 | 62 | ||
| 63 | config RTLWIFI_DEBUG | 63 | config RTLWIFI_DEBUG |
| 64 | bool "Additional debugging output" | 64 | bool "Additional debugging output" |
| 65 | depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE | 65 | depends on RTL8192CE || RTL8192CU || RTL8192SE || RTL8192DE || RTL8723AE |
| 66 | default y | 66 | default y |
| 67 | 67 | ||
| 68 | config RTL8192C_COMMON | 68 | config RTL8192C_COMMON |
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 26ffd3e3fb74..2c113de94323 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
| @@ -44,7 +44,6 @@ extern bool pciehp_poll_mode; | |||
| 44 | extern int pciehp_poll_time; | 44 | extern int pciehp_poll_time; |
| 45 | extern bool pciehp_debug; | 45 | extern bool pciehp_debug; |
| 46 | extern bool pciehp_force; | 46 | extern bool pciehp_force; |
| 47 | extern struct workqueue_struct *pciehp_wq; | ||
| 48 | 47 | ||
| 49 | #define dbg(format, arg...) \ | 48 | #define dbg(format, arg...) \ |
| 50 | do { \ | 49 | do { \ |
| @@ -78,6 +77,7 @@ struct slot { | |||
| 78 | struct hotplug_slot *hotplug_slot; | 77 | struct hotplug_slot *hotplug_slot; |
| 79 | struct delayed_work work; /* work for button event */ | 78 | struct delayed_work work; /* work for button event */ |
| 80 | struct mutex lock; | 79 | struct mutex lock; |
| 80 | struct workqueue_struct *wq; | ||
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | struct event_info { | 83 | struct event_info { |
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 916bf4f53aba..939bd1d4b5b1 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
| @@ -42,7 +42,6 @@ bool pciehp_debug; | |||
| 42 | bool pciehp_poll_mode; | 42 | bool pciehp_poll_mode; |
| 43 | int pciehp_poll_time; | 43 | int pciehp_poll_time; |
| 44 | bool pciehp_force; | 44 | bool pciehp_force; |
| 45 | struct workqueue_struct *pciehp_wq; | ||
| 46 | 45 | ||
| 47 | #define DRIVER_VERSION "0.4" | 46 | #define DRIVER_VERSION "0.4" |
| 48 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" | 47 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" |
| @@ -340,18 +339,13 @@ static int __init pcied_init(void) | |||
| 340 | { | 339 | { |
| 341 | int retval = 0; | 340 | int retval = 0; |
| 342 | 341 | ||
| 343 | pciehp_wq = alloc_workqueue("pciehp", 0, 0); | ||
| 344 | if (!pciehp_wq) | ||
| 345 | return -ENOMEM; | ||
| 346 | |||
| 347 | pciehp_firmware_init(); | 342 | pciehp_firmware_init(); |
| 348 | retval = pcie_port_service_register(&hpdriver_portdrv); | 343 | retval = pcie_port_service_register(&hpdriver_portdrv); |
| 349 | dbg("pcie_port_service_register = %d\n", retval); | 344 | dbg("pcie_port_service_register = %d\n", retval); |
| 350 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); | 345 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); |
| 351 | if (retval) { | 346 | if (retval) |
| 352 | destroy_workqueue(pciehp_wq); | ||
| 353 | dbg("Failure to register service\n"); | 347 | dbg("Failure to register service\n"); |
| 354 | } | 348 | |
| 355 | return retval; | 349 | return retval; |
| 356 | } | 350 | } |
| 357 | 351 | ||
| @@ -359,7 +353,6 @@ static void __exit pcied_cleanup(void) | |||
| 359 | { | 353 | { |
| 360 | dbg("unload_pciehpd()\n"); | 354 | dbg("unload_pciehpd()\n"); |
| 361 | pcie_port_service_unregister(&hpdriver_portdrv); | 355 | pcie_port_service_unregister(&hpdriver_portdrv); |
| 362 | destroy_workqueue(pciehp_wq); | ||
| 363 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); | 356 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); |
| 364 | } | 357 | } |
| 365 | 358 | ||
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 27f44295a657..38f018679175 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
| @@ -49,7 +49,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type) | |||
| 49 | info->p_slot = p_slot; | 49 | info->p_slot = p_slot; |
| 50 | INIT_WORK(&info->work, interrupt_event_handler); | 50 | INIT_WORK(&info->work, interrupt_event_handler); |
| 51 | 51 | ||
| 52 | queue_work(pciehp_wq, &info->work); | 52 | queue_work(p_slot->wq, &info->work); |
| 53 | 53 | ||
| 54 | return 0; | 54 | return 0; |
| 55 | } | 55 | } |
| @@ -344,7 +344,7 @@ void pciehp_queue_pushbutton_work(struct work_struct *work) | |||
| 344 | kfree(info); | 344 | kfree(info); |
| 345 | goto out; | 345 | goto out; |
| 346 | } | 346 | } |
| 347 | queue_work(pciehp_wq, &info->work); | 347 | queue_work(p_slot->wq, &info->work); |
| 348 | out: | 348 | out: |
| 349 | mutex_unlock(&p_slot->lock); | 349 | mutex_unlock(&p_slot->lock); |
| 350 | } | 350 | } |
| @@ -377,7 +377,7 @@ static void handle_button_press_event(struct slot *p_slot) | |||
| 377 | if (ATTN_LED(ctrl)) | 377 | if (ATTN_LED(ctrl)) |
| 378 | pciehp_set_attention_status(p_slot, 0); | 378 | pciehp_set_attention_status(p_slot, 0); |
| 379 | 379 | ||
| 380 | queue_delayed_work(pciehp_wq, &p_slot->work, 5*HZ); | 380 | queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ); |
| 381 | break; | 381 | break; |
| 382 | case BLINKINGOFF_STATE: | 382 | case BLINKINGOFF_STATE: |
| 383 | case BLINKINGON_STATE: | 383 | case BLINKINGON_STATE: |
| @@ -439,7 +439,7 @@ static void handle_surprise_event(struct slot *p_slot) | |||
| 439 | else | 439 | else |
| 440 | p_slot->state = POWERON_STATE; | 440 | p_slot->state = POWERON_STATE; |
| 441 | 441 | ||
| 442 | queue_work(pciehp_wq, &info->work); | 442 | queue_work(p_slot->wq, &info->work); |
| 443 | } | 443 | } |
| 444 | 444 | ||
| 445 | static void interrupt_event_handler(struct work_struct *work) | 445 | static void interrupt_event_handler(struct work_struct *work) |
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 13b2eaf7ba43..5127f3f41821 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
| @@ -773,23 +773,32 @@ static void pcie_shutdown_notification(struct controller *ctrl) | |||
| 773 | static int pcie_init_slot(struct controller *ctrl) | 773 | static int pcie_init_slot(struct controller *ctrl) |
| 774 | { | 774 | { |
| 775 | struct slot *slot; | 775 | struct slot *slot; |
| 776 | char name[32]; | ||
| 776 | 777 | ||
| 777 | slot = kzalloc(sizeof(*slot), GFP_KERNEL); | 778 | slot = kzalloc(sizeof(*slot), GFP_KERNEL); |
| 778 | if (!slot) | 779 | if (!slot) |
| 779 | return -ENOMEM; | 780 | return -ENOMEM; |
| 780 | 781 | ||
| 782 | snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl)); | ||
| 783 | slot->wq = alloc_workqueue(name, 0, 0); | ||
| 784 | if (!slot->wq) | ||
| 785 | goto abort; | ||
| 786 | |||
| 781 | slot->ctrl = ctrl; | 787 | slot->ctrl = ctrl; |
| 782 | mutex_init(&slot->lock); | 788 | mutex_init(&slot->lock); |
| 783 | INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work); | 789 | INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work); |
| 784 | ctrl->slot = slot; | 790 | ctrl->slot = slot; |
| 785 | return 0; | 791 | return 0; |
| 792 | abort: | ||
| 793 | kfree(slot); | ||
| 794 | return -ENOMEM; | ||
| 786 | } | 795 | } |
| 787 | 796 | ||
| 788 | static void pcie_cleanup_slot(struct controller *ctrl) | 797 | static void pcie_cleanup_slot(struct controller *ctrl) |
| 789 | { | 798 | { |
| 790 | struct slot *slot = ctrl->slot; | 799 | struct slot *slot = ctrl->slot; |
| 791 | cancel_delayed_work(&slot->work); | 800 | cancel_delayed_work(&slot->work); |
| 792 | flush_workqueue(pciehp_wq); | 801 | destroy_workqueue(slot->wq); |
| 793 | kfree(slot); | 802 | kfree(slot); |
| 794 | } | 803 | } |
| 795 | 804 | ||
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index ca64932e658b..b849f995075a 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h | |||
| @@ -46,8 +46,6 @@ | |||
| 46 | extern bool shpchp_poll_mode; | 46 | extern bool shpchp_poll_mode; |
| 47 | extern int shpchp_poll_time; | 47 | extern int shpchp_poll_time; |
| 48 | extern bool shpchp_debug; | 48 | extern bool shpchp_debug; |
| 49 | extern struct workqueue_struct *shpchp_wq; | ||
| 50 | extern struct workqueue_struct *shpchp_ordered_wq; | ||
| 51 | 49 | ||
| 52 | #define dbg(format, arg...) \ | 50 | #define dbg(format, arg...) \ |
| 53 | do { \ | 51 | do { \ |
| @@ -91,6 +89,7 @@ struct slot { | |||
| 91 | struct list_head slot_list; | 89 | struct list_head slot_list; |
| 92 | struct delayed_work work; /* work for button event */ | 90 | struct delayed_work work; /* work for button event */ |
| 93 | struct mutex lock; | 91 | struct mutex lock; |
| 92 | struct workqueue_struct *wq; | ||
| 94 | u8 hp_slot; | 93 | u8 hp_slot; |
| 95 | }; | 94 | }; |
| 96 | 95 | ||
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index b6de307248e4..3100c52c837c 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c | |||
| @@ -39,8 +39,6 @@ | |||
| 39 | bool shpchp_debug; | 39 | bool shpchp_debug; |
| 40 | bool shpchp_poll_mode; | 40 | bool shpchp_poll_mode; |
| 41 | int shpchp_poll_time; | 41 | int shpchp_poll_time; |
| 42 | struct workqueue_struct *shpchp_wq; | ||
| 43 | struct workqueue_struct *shpchp_ordered_wq; | ||
| 44 | 42 | ||
| 45 | #define DRIVER_VERSION "0.4" | 43 | #define DRIVER_VERSION "0.4" |
| 46 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" | 44 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" |
| @@ -129,6 +127,14 @@ static int init_slots(struct controller *ctrl) | |||
| 129 | slot->device = ctrl->slot_device_offset + i; | 127 | slot->device = ctrl->slot_device_offset + i; |
| 130 | slot->hpc_ops = ctrl->hpc_ops; | 128 | slot->hpc_ops = ctrl->hpc_ops; |
| 131 | slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i); | 129 | slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i); |
| 130 | |||
| 131 | snprintf(name, sizeof(name), "shpchp-%d", slot->number); | ||
| 132 | slot->wq = alloc_workqueue(name, 0, 0); | ||
| 133 | if (!slot->wq) { | ||
| 134 | retval = -ENOMEM; | ||
| 135 | goto error_info; | ||
| 136 | } | ||
| 137 | |||
| 132 | mutex_init(&slot->lock); | 138 | mutex_init(&slot->lock); |
| 133 | INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work); | 139 | INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work); |
| 134 | 140 | ||
| @@ -148,7 +154,7 @@ static int init_slots(struct controller *ctrl) | |||
| 148 | if (retval) { | 154 | if (retval) { |
| 149 | ctrl_err(ctrl, "pci_hp_register failed with error %d\n", | 155 | ctrl_err(ctrl, "pci_hp_register failed with error %d\n", |
| 150 | retval); | 156 | retval); |
| 151 | goto error_info; | 157 | goto error_slotwq; |
| 152 | } | 158 | } |
| 153 | 159 | ||
| 154 | get_power_status(hotplug_slot, &info->power_status); | 160 | get_power_status(hotplug_slot, &info->power_status); |
| @@ -160,6 +166,8 @@ static int init_slots(struct controller *ctrl) | |||
| 160 | } | 166 | } |
| 161 | 167 | ||
| 162 | return 0; | 168 | return 0; |
| 169 | error_slotwq: | ||
| 170 | destroy_workqueue(slot->wq); | ||
| 163 | error_info: | 171 | error_info: |
| 164 | kfree(info); | 172 | kfree(info); |
| 165 | error_hpslot: | 173 | error_hpslot: |
| @@ -180,8 +188,7 @@ void cleanup_slots(struct controller *ctrl) | |||
| 180 | slot = list_entry(tmp, struct slot, slot_list); | 188 | slot = list_entry(tmp, struct slot, slot_list); |
| 181 | list_del(&slot->slot_list); | 189 | list_del(&slot->slot_list); |
| 182 | cancel_delayed_work(&slot->work); | 190 | cancel_delayed_work(&slot->work); |
| 183 | flush_workqueue(shpchp_wq); | 191 | destroy_workqueue(slot->wq); |
| 184 | flush_workqueue(shpchp_ordered_wq); | ||
| 185 | pci_hp_deregister(slot->hotplug_slot); | 192 | pci_hp_deregister(slot->hotplug_slot); |
| 186 | } | 193 | } |
| 187 | } | 194 | } |
| @@ -364,25 +371,12 @@ static struct pci_driver shpc_driver = { | |||
| 364 | 371 | ||
| 365 | static int __init shpcd_init(void) | 372 | static int __init shpcd_init(void) |
| 366 | { | 373 | { |
| 367 | int retval = 0; | 374 | int retval; |
| 368 | |||
| 369 | shpchp_wq = alloc_ordered_workqueue("shpchp", 0); | ||
| 370 | if (!shpchp_wq) | ||
| 371 | return -ENOMEM; | ||
| 372 | |||
| 373 | shpchp_ordered_wq = alloc_ordered_workqueue("shpchp_ordered", 0); | ||
| 374 | if (!shpchp_ordered_wq) { | ||
| 375 | destroy_workqueue(shpchp_wq); | ||
| 376 | return -ENOMEM; | ||
| 377 | } | ||
| 378 | 375 | ||
| 379 | retval = pci_register_driver(&shpc_driver); | 376 | retval = pci_register_driver(&shpc_driver); |
| 380 | dbg("%s: pci_register_driver = %d\n", __func__, retval); | 377 | dbg("%s: pci_register_driver = %d\n", __func__, retval); |
| 381 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); | 378 | info(DRIVER_DESC " version: " DRIVER_VERSION "\n"); |
| 382 | if (retval) { | 379 | |
| 383 | destroy_workqueue(shpchp_ordered_wq); | ||
| 384 | destroy_workqueue(shpchp_wq); | ||
| 385 | } | ||
| 386 | return retval; | 380 | return retval; |
| 387 | } | 381 | } |
| 388 | 382 | ||
| @@ -390,8 +384,6 @@ static void __exit shpcd_cleanup(void) | |||
| 390 | { | 384 | { |
| 391 | dbg("unload_shpchpd()\n"); | 385 | dbg("unload_shpchpd()\n"); |
| 392 | pci_unregister_driver(&shpc_driver); | 386 | pci_unregister_driver(&shpc_driver); |
| 393 | destroy_workqueue(shpchp_ordered_wq); | ||
| 394 | destroy_workqueue(shpchp_wq); | ||
| 395 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); | 387 | info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n"); |
| 396 | } | 388 | } |
| 397 | 389 | ||
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c index f9b5a52e4115..58499277903a 100644 --- a/drivers/pci/hotplug/shpchp_ctrl.c +++ b/drivers/pci/hotplug/shpchp_ctrl.c | |||
| @@ -51,7 +51,7 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type) | |||
| 51 | info->p_slot = p_slot; | 51 | info->p_slot = p_slot; |
| 52 | INIT_WORK(&info->work, interrupt_event_handler); | 52 | INIT_WORK(&info->work, interrupt_event_handler); |
| 53 | 53 | ||
| 54 | queue_work(shpchp_wq, &info->work); | 54 | queue_work(p_slot->wq, &info->work); |
| 55 | 55 | ||
| 56 | return 0; | 56 | return 0; |
| 57 | } | 57 | } |
| @@ -453,7 +453,7 @@ void shpchp_queue_pushbutton_work(struct work_struct *work) | |||
| 453 | kfree(info); | 453 | kfree(info); |
| 454 | goto out; | 454 | goto out; |
| 455 | } | 455 | } |
| 456 | queue_work(shpchp_ordered_wq, &info->work); | 456 | queue_work(p_slot->wq, &info->work); |
| 457 | out: | 457 | out: |
| 458 | mutex_unlock(&p_slot->lock); | 458 | mutex_unlock(&p_slot->lock); |
| 459 | } | 459 | } |
| @@ -501,7 +501,7 @@ static void handle_button_press_event(struct slot *p_slot) | |||
| 501 | p_slot->hpc_ops->green_led_blink(p_slot); | 501 | p_slot->hpc_ops->green_led_blink(p_slot); |
| 502 | p_slot->hpc_ops->set_attention_status(p_slot, 0); | 502 | p_slot->hpc_ops->set_attention_status(p_slot, 0); |
| 503 | 503 | ||
| 504 | queue_delayed_work(shpchp_wq, &p_slot->work, 5*HZ); | 504 | queue_delayed_work(p_slot->wq, &p_slot->work, 5*HZ); |
| 505 | break; | 505 | break; |
| 506 | case BLINKINGOFF_STATE: | 506 | case BLINKINGOFF_STATE: |
| 507 | case BLINKINGON_STATE: | 507 | case BLINKINGON_STATE: |
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig index 6c8bc5809787..fde4a32a0295 100644 --- a/drivers/pci/pcie/Kconfig +++ b/drivers/pci/pcie/Kconfig | |||
| @@ -82,4 +82,4 @@ endchoice | |||
| 82 | 82 | ||
| 83 | config PCIE_PME | 83 | config PCIE_PME |
| 84 | def_bool y | 84 | def_bool y |
| 85 | depends on PCIEPORTBUS && PM_RUNTIME && EXPERIMENTAL && ACPI | 85 | depends on PCIEPORTBUS && PM_RUNTIME && ACPI |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 421bbc5fee32..564d97f94b6c 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
| @@ -630,6 +630,7 @@ static void aer_recover_work_func(struct work_struct *work) | |||
| 630 | continue; | 630 | continue; |
| 631 | } | 631 | } |
| 632 | do_recovery(pdev, entry.severity); | 632 | do_recovery(pdev, entry.severity); |
| 633 | pci_dev_put(pdev); | ||
| 633 | } | 634 | } |
| 634 | } | 635 | } |
| 635 | #endif | 636 | #endif |
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index b52630b8eada..8474b6a4fc9b 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c | |||
| @@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus) | |||
| 771 | { | 771 | { |
| 772 | struct pci_dev *child; | 772 | struct pci_dev *child; |
| 773 | 773 | ||
| 774 | if (aspm_force) | ||
| 775 | return; | ||
| 776 | |||
| 774 | /* | 777 | /* |
| 775 | * Clear any ASPM setup that the firmware has carried out on this bus | 778 | * Clear any ASPM setup that the firmware has carried out on this bus |
| 776 | */ | 779 | */ |
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c31aeb01bb00..efaecefe3f8c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig | |||
| @@ -181,7 +181,6 @@ config PINCTRL_COH901 | |||
| 181 | 181 | ||
| 182 | config PINCTRL_SAMSUNG | 182 | config PINCTRL_SAMSUNG |
| 183 | bool | 183 | bool |
| 184 | depends on OF && GPIOLIB | ||
| 185 | select PINMUX | 184 | select PINMUX |
| 186 | select PINCONF | 185 | select PINCONF |
| 187 | 186 | ||
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c index 69aba3697287..428ea96a94d3 100644 --- a/drivers/pinctrl/mvebu/pinctrl-dove.c +++ b/drivers/pinctrl/mvebu/pinctrl-dove.c | |||
| @@ -588,7 +588,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) | |||
| 588 | { | 588 | { |
| 589 | const struct of_device_id *match = | 589 | const struct of_device_id *match = |
| 590 | of_match_device(dove_pinctrl_of_match, &pdev->dev); | 590 | of_match_device(dove_pinctrl_of_match, &pdev->dev); |
| 591 | pdev->dev.platform_data = match->data; | 591 | pdev->dev.platform_data = (void *)match->data; |
| 592 | 592 | ||
| 593 | /* | 593 | /* |
| 594 | * General MPP Configuration Register is part of pdma registers. | 594 | * General MPP Configuration Register is part of pdma registers. |
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c index f12084e18057..cdd483df673e 100644 --- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c +++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c | |||
| @@ -66,9 +66,9 @@ static struct mvebu_mpp_mode mv88f6xxx_mpp_modes[] = { | |||
| 66 | MPP_VAR_FUNCTION(0x5, "sata0", "act", V(0, 1, 1, 1, 1, 0)), | 66 | MPP_VAR_FUNCTION(0x5, "sata0", "act", V(0, 1, 1, 1, 1, 0)), |
| 67 | MPP_VAR_FUNCTION(0xb, "lcd", "vsync", V(0, 0, 0, 0, 1, 0))), | 67 | MPP_VAR_FUNCTION(0xb, "lcd", "vsync", V(0, 0, 0, 0, 1, 0))), |
| 68 | MPP_MODE(6, | 68 | MPP_MODE(6, |
| 69 | MPP_VAR_FUNCTION(0x0, "sysrst", "out", V(1, 1, 1, 1, 1, 1)), | 69 | MPP_VAR_FUNCTION(0x1, "sysrst", "out", V(1, 1, 1, 1, 1, 1)), |
| 70 | MPP_VAR_FUNCTION(0x1, "spi", "mosi", V(1, 1, 1, 1, 1, 1)), | 70 | MPP_VAR_FUNCTION(0x2, "spi", "mosi", V(1, 1, 1, 1, 1, 1)), |
| 71 | MPP_VAR_FUNCTION(0x2, "ptp", "trig", V(1, 1, 1, 1, 0, 0))), | 71 | MPP_VAR_FUNCTION(0x3, "ptp", "trig", V(1, 1, 1, 1, 0, 0))), |
| 72 | MPP_MODE(7, | 72 | MPP_MODE(7, |
| 73 | MPP_VAR_FUNCTION(0x0, "gpo", NULL, V(1, 1, 1, 1, 1, 1)), | 73 | MPP_VAR_FUNCTION(0x0, "gpo", NULL, V(1, 1, 1, 1, 1, 1)), |
| 74 | MPP_VAR_FUNCTION(0x1, "pex", "rsto", V(1, 1, 1, 1, 0, 1)), | 74 | MPP_VAR_FUNCTION(0x1, "pex", "rsto", V(1, 1, 1, 1, 0, 1)), |
| @@ -458,7 +458,7 @@ static int kirkwood_pinctrl_probe(struct platform_device *pdev) | |||
| 458 | { | 458 | { |
| 459 | const struct of_device_id *match = | 459 | const struct of_device_id *match = |
| 460 | of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); | 460 | of_match_device(kirkwood_pinctrl_of_match, &pdev->dev); |
| 461 | pdev->dev.platform_data = match->data; | 461 | pdev->dev.platform_data = (void *)match->data; |
| 462 | return mvebu_pinctrl_probe(pdev); | 462 | return mvebu_pinctrl_probe(pdev); |
| 463 | } | 463 | } |
| 464 | 464 | ||
diff --git a/drivers/pinctrl/pinctrl-exynos5440.c b/drivers/pinctrl/pinctrl-exynos5440.c index de05b64f0da6..142729914c34 100644 --- a/drivers/pinctrl/pinctrl-exynos5440.c +++ b/drivers/pinctrl/pinctrl-exynos5440.c | |||
| @@ -599,7 +599,7 @@ static int exynos5440_gpio_direction_output(struct gpio_chip *gc, unsigned offse | |||
| 599 | } | 599 | } |
| 600 | 600 | ||
| 601 | /* parse the pin numbers listed in the 'samsung,exynos5440-pins' property */ | 601 | /* parse the pin numbers listed in the 'samsung,exynos5440-pins' property */ |
| 602 | static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev, | 602 | static int exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev, |
| 603 | struct device_node *cfg_np, unsigned int **pin_list, | 603 | struct device_node *cfg_np, unsigned int **pin_list, |
| 604 | unsigned int *npins) | 604 | unsigned int *npins) |
| 605 | { | 605 | { |
| @@ -630,7 +630,7 @@ static int __init exynos5440_pinctrl_parse_dt_pins(struct platform_device *pdev, | |||
| 630 | * Parse the information about all the available pin groups and pin functions | 630 | * Parse the information about all the available pin groups and pin functions |
| 631 | * from device node of the pin-controller. | 631 | * from device node of the pin-controller. |
| 632 | */ | 632 | */ |
| 633 | static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev, | 633 | static int exynos5440_pinctrl_parse_dt(struct platform_device *pdev, |
| 634 | struct exynos5440_pinctrl_priv_data *priv) | 634 | struct exynos5440_pinctrl_priv_data *priv) |
| 635 | { | 635 | { |
| 636 | struct device *dev = &pdev->dev; | 636 | struct device *dev = &pdev->dev; |
| @@ -723,7 +723,7 @@ static int __init exynos5440_pinctrl_parse_dt(struct platform_device *pdev, | |||
| 723 | } | 723 | } |
| 724 | 724 | ||
| 725 | /* register the pinctrl interface with the pinctrl subsystem */ | 725 | /* register the pinctrl interface with the pinctrl subsystem */ |
| 726 | static int __init exynos5440_pinctrl_register(struct platform_device *pdev, | 726 | static int exynos5440_pinctrl_register(struct platform_device *pdev, |
| 727 | struct exynos5440_pinctrl_priv_data *priv) | 727 | struct exynos5440_pinctrl_priv_data *priv) |
| 728 | { | 728 | { |
| 729 | struct device *dev = &pdev->dev; | 729 | struct device *dev = &pdev->dev; |
| @@ -798,7 +798,7 @@ static int __init exynos5440_pinctrl_register(struct platform_device *pdev, | |||
| 798 | } | 798 | } |
| 799 | 799 | ||
| 800 | /* register the gpiolib interface with the gpiolib subsystem */ | 800 | /* register the gpiolib interface with the gpiolib subsystem */ |
| 801 | static int __init exynos5440_gpiolib_register(struct platform_device *pdev, | 801 | static int exynos5440_gpiolib_register(struct platform_device *pdev, |
| 802 | struct exynos5440_pinctrl_priv_data *priv) | 802 | struct exynos5440_pinctrl_priv_data *priv) |
| 803 | { | 803 | { |
| 804 | struct gpio_chip *gc; | 804 | struct gpio_chip *gc; |
| @@ -831,7 +831,7 @@ static int __init exynos5440_gpiolib_register(struct platform_device *pdev, | |||
| 831 | } | 831 | } |
| 832 | 832 | ||
| 833 | /* unregister the gpiolib interface with the gpiolib subsystem */ | 833 | /* unregister the gpiolib interface with the gpiolib subsystem */ |
| 834 | static int __init exynos5440_gpiolib_unregister(struct platform_device *pdev, | 834 | static int exynos5440_gpiolib_unregister(struct platform_device *pdev, |
| 835 | struct exynos5440_pinctrl_priv_data *priv) | 835 | struct exynos5440_pinctrl_priv_data *priv) |
| 836 | { | 836 | { |
| 837 | int ret = gpiochip_remove(priv->gc); | 837 | int ret = gpiochip_remove(priv->gc); |
diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/pinctrl-mxs.c index dd227d21dcf2..23af9f1f9c35 100644 --- a/drivers/pinctrl/pinctrl-mxs.c +++ b/drivers/pinctrl/pinctrl-mxs.c | |||
| @@ -146,7 +146,7 @@ free: | |||
| 146 | static void mxs_dt_free_map(struct pinctrl_dev *pctldev, | 146 | static void mxs_dt_free_map(struct pinctrl_dev *pctldev, |
| 147 | struct pinctrl_map *map, unsigned num_maps) | 147 | struct pinctrl_map *map, unsigned num_maps) |
| 148 | { | 148 | { |
| 149 | int i; | 149 | u32 i; |
| 150 | 150 | ||
| 151 | for (i = 0; i < num_maps; i++) { | 151 | for (i = 0; i < num_maps; i++) { |
| 152 | if (map[i].type == PIN_MAP_TYPE_MUX_GROUP) | 152 | if (map[i].type == PIN_MAP_TYPE_MUX_GROUP) |
| @@ -203,7 +203,7 @@ static int mxs_pinctrl_enable(struct pinctrl_dev *pctldev, unsigned selector, | |||
| 203 | void __iomem *reg; | 203 | void __iomem *reg; |
| 204 | u8 bank, shift; | 204 | u8 bank, shift; |
| 205 | u16 pin; | 205 | u16 pin; |
| 206 | int i; | 206 | u32 i; |
| 207 | 207 | ||
| 208 | for (i = 0; i < g->npins; i++) { | 208 | for (i = 0; i < g->npins; i++) { |
| 209 | bank = PINID_TO_BANK(g->pins[i]); | 209 | bank = PINID_TO_BANK(g->pins[i]); |
| @@ -256,7 +256,7 @@ static int mxs_pinconf_group_set(struct pinctrl_dev *pctldev, | |||
| 256 | void __iomem *reg; | 256 | void __iomem *reg; |
| 257 | u8 ma, vol, pull, bank, shift; | 257 | u8 ma, vol, pull, bank, shift; |
| 258 | u16 pin; | 258 | u16 pin; |
| 259 | int i; | 259 | u32 i; |
| 260 | 260 | ||
| 261 | ma = CONFIG_TO_MA(config); | 261 | ma = CONFIG_TO_MA(config); |
| 262 | vol = CONFIG_TO_VOL(config); | 262 | vol = CONFIG_TO_VOL(config); |
| @@ -345,8 +345,7 @@ static int mxs_pinctrl_parse_group(struct platform_device *pdev, | |||
| 345 | const char *propname = "fsl,pinmux-ids"; | 345 | const char *propname = "fsl,pinmux-ids"; |
| 346 | char *group; | 346 | char *group; |
| 347 | int length = strlen(np->name) + SUFFIX_LEN; | 347 | int length = strlen(np->name) + SUFFIX_LEN; |
| 348 | int i; | 348 | u32 val, i; |
| 349 | u32 val; | ||
| 350 | 349 | ||
| 351 | group = devm_kzalloc(&pdev->dev, length, GFP_KERNEL); | 350 | group = devm_kzalloc(&pdev->dev, length, GFP_KERNEL); |
| 352 | if (!group) | 351 | if (!group) |
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 1bb16ffb4e41..5767b18ebdff 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c | |||
| @@ -676,7 +676,7 @@ int nmk_gpio_set_mode(int gpio, int gpio_mode) | |||
| 676 | } | 676 | } |
| 677 | EXPORT_SYMBOL(nmk_gpio_set_mode); | 677 | EXPORT_SYMBOL(nmk_gpio_set_mode); |
| 678 | 678 | ||
| 679 | static int nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio) | 679 | static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev, int gpio) |
| 680 | { | 680 | { |
| 681 | int i; | 681 | int i; |
| 682 | u16 reg; | 682 | u16 reg; |
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index f6a360b86eb6..5c32e880bcb2 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #define PCS_MUX_BITS_NAME "pinctrl-single,bits" | 30 | #define PCS_MUX_BITS_NAME "pinctrl-single,bits" |
| 31 | #define PCS_REG_NAME_LEN ((sizeof(unsigned long) * 2) + 1) | 31 | #define PCS_REG_NAME_LEN ((sizeof(unsigned long) * 2) + 1) |
| 32 | #define PCS_OFF_DISABLED ~0U | 32 | #define PCS_OFF_DISABLED ~0U |
| 33 | #define PCS_MAX_GPIO_VALUES 2 | ||
| 34 | 33 | ||
| 35 | /** | 34 | /** |
| 36 | * struct pcs_pingroup - pingroups for a function | 35 | * struct pcs_pingroup - pingroups for a function |
| @@ -78,16 +77,6 @@ struct pcs_function { | |||
| 78 | }; | 77 | }; |
| 79 | 78 | ||
| 80 | /** | 79 | /** |
| 81 | * struct pcs_gpio_range - pinctrl gpio range | ||
| 82 | * @range: subrange of the GPIO number space | ||
| 83 | * @gpio_func: gpio function value in the pinmux register | ||
| 84 | */ | ||
| 85 | struct pcs_gpio_range { | ||
| 86 | struct pinctrl_gpio_range range; | ||
| 87 | int gpio_func; | ||
| 88 | }; | ||
| 89 | |||
| 90 | /** | ||
| 91 | * struct pcs_data - wrapper for data needed by pinctrl framework | 80 | * struct pcs_data - wrapper for data needed by pinctrl framework |
| 92 | * @pa: pindesc array | 81 | * @pa: pindesc array |
| 93 | * @cur: index to current element | 82 | * @cur: index to current element |
| @@ -414,26 +403,9 @@ static void pcs_disable(struct pinctrl_dev *pctldev, unsigned fselector, | |||
| 414 | } | 403 | } |
| 415 | 404 | ||
| 416 | static int pcs_request_gpio(struct pinctrl_dev *pctldev, | 405 | static int pcs_request_gpio(struct pinctrl_dev *pctldev, |
| 417 | struct pinctrl_gpio_range *range, unsigned pin) | 406 | struct pinctrl_gpio_range *range, unsigned offset) |
| 418 | { | 407 | { |
| 419 | struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev); | 408 | return -ENOTSUPP; |
| 420 | struct pcs_gpio_range *gpio = NULL; | ||
| 421 | int end, mux_bytes; | ||
| 422 | unsigned data; | ||
| 423 | |||
| 424 | gpio = container_of(range, struct pcs_gpio_range, range); | ||
| 425 | end = range->pin_base + range->npins - 1; | ||
| 426 | if (pin < range->pin_base || pin > end) { | ||
| 427 | dev_err(pctldev->dev, | ||
| 428 | "pin %d isn't in the range of %d to %d\n", | ||
| 429 | pin, range->pin_base, end); | ||
| 430 | return -EINVAL; | ||
| 431 | } | ||
| 432 | mux_bytes = pcs->width / BITS_PER_BYTE; | ||
| 433 | data = pcs->read(pcs->base + pin * mux_bytes) & ~pcs->fmask; | ||
| 434 | data |= gpio->gpio_func; | ||
| 435 | pcs->write(data, pcs->base + pin * mux_bytes); | ||
| 436 | return 0; | ||
| 437 | } | 409 | } |
| 438 | 410 | ||
| 439 | static struct pinmux_ops pcs_pinmux_ops = { | 411 | static struct pinmux_ops pcs_pinmux_ops = { |
| @@ -907,49 +879,6 @@ static void pcs_free_resources(struct pcs_device *pcs) | |||
| 907 | 879 | ||
| 908 | static struct of_device_id pcs_of_match[]; | 880 | static struct of_device_id pcs_of_match[]; |
| 909 | 881 | ||
| 910 | static int pcs_add_gpio_range(struct device_node *node, struct pcs_device *pcs) | ||
| 911 | { | ||
| 912 | struct pcs_gpio_range *gpio; | ||
| 913 | struct device_node *child; | ||
| 914 | struct resource r; | ||
| 915 | const char name[] = "pinctrl-single"; | ||
| 916 | u32 gpiores[PCS_MAX_GPIO_VALUES]; | ||
| 917 | int ret, i = 0, mux_bytes = 0; | ||
| 918 | |||
| 919 | for_each_child_of_node(node, child) { | ||
| 920 | ret = of_address_to_resource(child, 0, &r); | ||
| 921 | if (ret < 0) | ||
| 922 | continue; | ||
| 923 | memset(gpiores, 0, sizeof(u32) * PCS_MAX_GPIO_VALUES); | ||
| 924 | ret = of_property_read_u32_array(child, "pinctrl-single,gpio", | ||
| 925 | gpiores, PCS_MAX_GPIO_VALUES); | ||
| 926 | if (ret < 0) | ||
| 927 | continue; | ||
| 928 | gpio = devm_kzalloc(pcs->dev, sizeof(*gpio), GFP_KERNEL); | ||
| 929 | if (!gpio) { | ||
| 930 | dev_err(pcs->dev, "failed to allocate pcs gpio\n"); | ||
| 931 | return -ENOMEM; | ||
| 932 | } | ||
| 933 | gpio->range.name = devm_kzalloc(pcs->dev, sizeof(name), | ||
| 934 | GFP_KERNEL); | ||
| 935 | if (!gpio->range.name) { | ||
| 936 | dev_err(pcs->dev, "failed to allocate range name\n"); | ||
| 937 | return -ENOMEM; | ||
| 938 | } | ||
| 939 | memcpy((char *)gpio->range.name, name, sizeof(name)); | ||
| 940 | |||
| 941 | gpio->range.id = i++; | ||
| 942 | gpio->range.base = gpiores[0]; | ||
| 943 | gpio->gpio_func = gpiores[1]; | ||
| 944 | mux_bytes = pcs->width / BITS_PER_BYTE; | ||
| 945 | gpio->range.pin_base = (r.start - pcs->res->start) / mux_bytes; | ||
| 946 | gpio->range.npins = (r.end - r.start) / mux_bytes + 1; | ||
| 947 | |||
| 948 | pinctrl_add_gpio_range(pcs->pctl, &gpio->range); | ||
| 949 | } | ||
| 950 | return 0; | ||
| 951 | } | ||
| 952 | |||
| 953 | static int pcs_probe(struct platform_device *pdev) | 882 | static int pcs_probe(struct platform_device *pdev) |
| 954 | { | 883 | { |
| 955 | struct device_node *np = pdev->dev.of_node; | 884 | struct device_node *np = pdev->dev.of_node; |
| @@ -1046,10 +975,6 @@ static int pcs_probe(struct platform_device *pdev) | |||
| 1046 | goto free; | 975 | goto free; |
| 1047 | } | 976 | } |
| 1048 | 977 | ||
| 1049 | ret = pcs_add_gpio_range(np, pcs); | ||
| 1050 | if (ret < 0) | ||
| 1051 | goto free; | ||
| 1052 | |||
| 1053 | dev_info(pcs->dev, "%i pins at pa %p size %u\n", | 978 | dev_info(pcs->dev, "%i pins at pa %p size %u\n", |
| 1054 | pcs->desc.npins, pcs->base, pcs->size); | 979 | pcs->desc.npins, pcs->base, pcs->size); |
| 1055 | 980 | ||
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c index 7481146a5b47..97c2be195efc 100644 --- a/drivers/platform/x86/ibm_rtl.c +++ b/drivers/platform/x86/ibm_rtl.c | |||
| @@ -244,7 +244,7 @@ static int __init ibm_rtl_init(void) { | |||
| 244 | if (force) | 244 | if (force) |
| 245 | pr_warn("module loaded by force\n"); | 245 | pr_warn("module loaded by force\n"); |
| 246 | /* first ensure that we are running on IBM HW */ | 246 | /* first ensure that we are running on IBM HW */ |
| 247 | else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table)) | 247 | else if (efi_enabled(EFI_BOOT) || !dmi_check_system(ibm_rtl_dmi_table)) |
| 248 | return -ENODEV; | 248 | return -ENODEV; |
| 249 | 249 | ||
| 250 | /* Get the address for the Extended BIOS Data Area */ | 250 | /* Get the address for the Extended BIOS Data Area */ |
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index 71623a2ff3e8..d1f030053176 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
| 27 | #include <linux/debugfs.h> | 27 | #include <linux/debugfs.h> |
| 28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
| 29 | #include <linux/efi.h> | ||
| 29 | #include <acpi/video.h> | 30 | #include <acpi/video.h> |
| 30 | 31 | ||
| 31 | /* | 32 | /* |
| @@ -1544,6 +1545,9 @@ static int __init samsung_init(void) | |||
| 1544 | struct samsung_laptop *samsung; | 1545 | struct samsung_laptop *samsung; |
| 1545 | int ret; | 1546 | int ret; |
| 1546 | 1547 | ||
| 1548 | if (efi_enabled(EFI_BOOT)) | ||
| 1549 | return -ENODEV; | ||
| 1550 | |||
| 1547 | quirks = &samsung_unknown; | 1551 | quirks = &samsung_unknown; |
| 1548 | if (!force && !dmi_check_system(samsung_dmi_table)) | 1552 | if (!force && !dmi_check_system(samsung_dmi_table)) |
| 1549 | return -ENODEV; | 1553 | return -ENODEV; |
diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c index 261f3d2299bc..89bd2faaef8c 100644 --- a/drivers/regulator/dbx500-prcmu.c +++ b/drivers/regulator/dbx500-prcmu.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/debugfs.h> | 14 | #include <linux/debugfs.h> |
| 15 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/module.h> | ||
| 17 | 18 | ||
| 18 | #include "dbx500-prcmu.h" | 19 | #include "dbx500-prcmu.h" |
| 19 | 20 | ||
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c index b15d711bc8c6..9019d0e7ecb6 100644 --- a/drivers/regulator/tps80031-regulator.c +++ b/drivers/regulator/tps80031-regulator.c | |||
| @@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev) | |||
| 728 | } | 728 | } |
| 729 | } | 729 | } |
| 730 | rdev = regulator_register(&ri->rinfo->desc, &config); | 730 | rdev = regulator_register(&ri->rinfo->desc, &config); |
| 731 | if (IS_ERR_OR_NULL(rdev)) { | 731 | if (IS_ERR(rdev)) { |
| 732 | dev_err(&pdev->dev, | 732 | dev_err(&pdev->dev, |
| 733 | "register regulator failed %s\n", | 733 | "register regulator failed %s\n", |
| 734 | ri->rinfo->desc.name); | 734 | ri->rinfo->desc.name); |
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index d73fdcfeb45a..2839baa82a5a 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
| @@ -633,7 +633,7 @@ static int isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 633 | return -ENOMEM; | 633 | return -ENOMEM; |
| 634 | pci_set_drvdata(pdev, pci_info); | 634 | pci_set_drvdata(pdev, pci_info); |
| 635 | 635 | ||
| 636 | if (efi_enabled) | 636 | if (efi_enabled(EFI_RUNTIME_SERVICES)) |
| 637 | orom = isci_get_efi_var(pdev); | 637 | orom = isci_get_efi_var(pdev); |
| 638 | 638 | ||
| 639 | if (!orom) | 639 | if (!orom) |
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c index fb31b457a56a..c5ceb9d90ea8 100644 --- a/drivers/staging/iio/adc/mxs-lradc.c +++ b/drivers/staging/iio/adc/mxs-lradc.c | |||
| @@ -239,7 +239,7 @@ static irqreturn_t mxs_lradc_trigger_handler(int irq, void *p) | |||
| 239 | struct mxs_lradc *lradc = iio_priv(iio); | 239 | struct mxs_lradc *lradc = iio_priv(iio); |
| 240 | const uint32_t chan_value = LRADC_CH_ACCUMULATE | | 240 | const uint32_t chan_value = LRADC_CH_ACCUMULATE | |
| 241 | ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); | 241 | ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); |
| 242 | int i, j = 0; | 242 | unsigned int i, j = 0; |
| 243 | 243 | ||
| 244 | for_each_set_bit(i, iio->active_scan_mask, iio->masklength) { | 244 | for_each_set_bit(i, iio->active_scan_mask, iio->masklength) { |
| 245 | lradc->buffer[j] = readl(lradc->base + LRADC_CH(j)); | 245 | lradc->buffer[j] = readl(lradc->base + LRADC_CH(j)); |
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c index 3525a68d6a75..41d7350d030f 100644 --- a/drivers/staging/iio/gyro/adis16080_core.c +++ b/drivers/staging/iio/gyro/adis16080_core.c | |||
| @@ -69,7 +69,7 @@ static int adis16080_spi_read(struct iio_dev *indio_dev, | |||
| 69 | ret = spi_read(st->us, st->buf, 2); | 69 | ret = spi_read(st->us, st->buf, 2); |
| 70 | 70 | ||
| 71 | if (ret == 0) | 71 | if (ret == 0) |
| 72 | *val = ((st->buf[0] & 0xF) << 8) | st->buf[1]; | 72 | *val = sign_extend32(((st->buf[0] & 0xF) << 8) | st->buf[1], 11); |
| 73 | mutex_unlock(&st->buf_lock); | 73 | mutex_unlock(&st->buf_lock); |
| 74 | 74 | ||
| 75 | return ret; | 75 | return ret; |
diff --git a/drivers/staging/sb105x/sb_pci_mp.c b/drivers/staging/sb105x/sb_pci_mp.c index 131afd0c460c..9464f3874346 100644 --- a/drivers/staging/sb105x/sb_pci_mp.c +++ b/drivers/staging/sb105x/sb_pci_mp.c | |||
| @@ -3054,7 +3054,7 @@ static int init_mp_dev(struct pci_dev *pcidev, mppcibrd_t brd) | |||
| 3054 | sbdev->nr_ports = ((portnum_hex/16)*10) + (portnum_hex % 16); | 3054 | sbdev->nr_ports = ((portnum_hex/16)*10) + (portnum_hex % 16); |
| 3055 | } | 3055 | } |
| 3056 | break; | 3056 | break; |
| 3057 | #ifdef CONFIG_PARPORT | 3057 | #ifdef CONFIG_PARPORT_PC |
| 3058 | case PCI_DEVICE_ID_MP2S1P : | 3058 | case PCI_DEVICE_ID_MP2S1P : |
| 3059 | sbdev->nr_ports = 2; | 3059 | sbdev->nr_ports = 2; |
| 3060 | 3060 | ||
diff --git a/drivers/staging/vt6656/bssdb.h b/drivers/staging/vt6656/bssdb.h index 6b2ec390e775..806cbf72fb59 100644 --- a/drivers/staging/vt6656/bssdb.h +++ b/drivers/staging/vt6656/bssdb.h | |||
| @@ -90,7 +90,6 @@ typedef struct tagSRSNCapObject { | |||
| 90 | } SRSNCapObject, *PSRSNCapObject; | 90 | } SRSNCapObject, *PSRSNCapObject; |
| 91 | 91 | ||
| 92 | // BSS info(AP) | 92 | // BSS info(AP) |
| 93 | #pragma pack(1) | ||
| 94 | typedef struct tagKnownBSS { | 93 | typedef struct tagKnownBSS { |
| 95 | // BSS info | 94 | // BSS info |
| 96 | BOOL bActive; | 95 | BOOL bActive; |
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index 5d8faf9f96ec..e0d2b07ba608 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include "device.h" | 34 | #include "device.h" |
| 35 | 35 | ||
| 36 | /*--------------------- Export Definitions -------------------------*/ | 36 | /*--------------------- Export Definitions -------------------------*/ |
| 37 | #pragma pack(1) | ||
| 38 | typedef struct tagSINTData { | 37 | typedef struct tagSINTData { |
| 39 | BYTE byTSR0; | 38 | BYTE byTSR0; |
| 40 | BYTE byPkt0; | 39 | BYTE byPkt0; |
diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index 22710cef751d..ae6e2d237b20 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h | |||
| @@ -95,13 +95,12 @@ typedef enum tagWZONETYPE { | |||
| 95 | // Ioctl interface structure | 95 | // Ioctl interface structure |
| 96 | // Command structure | 96 | // Command structure |
| 97 | // | 97 | // |
| 98 | #pragma pack(1) | ||
| 99 | typedef struct tagSCmdRequest { | 98 | typedef struct tagSCmdRequest { |
| 100 | u8 name[16]; | 99 | u8 name[16]; |
| 101 | void *data; | 100 | void *data; |
| 102 | u16 wResult; | 101 | u16 wResult; |
| 103 | u16 wCmdCode; | 102 | u16 wCmdCode; |
| 104 | } SCmdRequest, *PSCmdRequest; | 103 | } __packed SCmdRequest, *PSCmdRequest; |
| 105 | 104 | ||
| 106 | // | 105 | // |
| 107 | // Scan | 106 | // Scan |
| @@ -111,7 +110,7 @@ typedef struct tagSCmdScan { | |||
| 111 | 110 | ||
| 112 | u8 ssid[SSID_MAXLEN + 2]; | 111 | u8 ssid[SSID_MAXLEN + 2]; |
| 113 | 112 | ||
| 114 | } SCmdScan, *PSCmdScan; | 113 | } __packed SCmdScan, *PSCmdScan; |
| 115 | 114 | ||
| 116 | // | 115 | // |
| 117 | // BSS Join | 116 | // BSS Join |
| @@ -126,7 +125,7 @@ typedef struct tagSCmdBSSJoin { | |||
| 126 | BOOL bPSEnable; | 125 | BOOL bPSEnable; |
| 127 | BOOL bShareKeyAuth; | 126 | BOOL bShareKeyAuth; |
| 128 | 127 | ||
| 129 | } SCmdBSSJoin, *PSCmdBSSJoin; | 128 | } __packed SCmdBSSJoin, *PSCmdBSSJoin; |
| 130 | 129 | ||
| 131 | // | 130 | // |
| 132 | // Zonetype Setting | 131 | // Zonetype Setting |
| @@ -137,7 +136,7 @@ typedef struct tagSCmdZoneTypeSet { | |||
| 137 | BOOL bWrite; | 136 | BOOL bWrite; |
| 138 | WZONETYPE ZoneType; | 137 | WZONETYPE ZoneType; |
| 139 | 138 | ||
| 140 | } SCmdZoneTypeSet, *PSCmdZoneTypeSet; | 139 | } __packed SCmdZoneTypeSet, *PSCmdZoneTypeSet; |
| 141 | 140 | ||
| 142 | typedef struct tagSWPAResult { | 141 | typedef struct tagSWPAResult { |
| 143 | char ifname[100]; | 142 | char ifname[100]; |
| @@ -145,7 +144,7 @@ typedef struct tagSWPAResult { | |||
| 145 | u8 key_mgmt; | 144 | u8 key_mgmt; |
| 146 | u8 eap_type; | 145 | u8 eap_type; |
| 147 | BOOL authenticated; | 146 | BOOL authenticated; |
| 148 | } SWPAResult, *PSWPAResult; | 147 | } __packed SWPAResult, *PSWPAResult; |
| 149 | 148 | ||
| 150 | typedef struct tagSCmdStartAP { | 149 | typedef struct tagSCmdStartAP { |
| 151 | 150 | ||
| @@ -157,7 +156,7 @@ typedef struct tagSCmdStartAP { | |||
| 157 | BOOL bShareKeyAuth; | 156 | BOOL bShareKeyAuth; |
| 158 | u8 byBasicRate; | 157 | u8 byBasicRate; |
| 159 | 158 | ||
| 160 | } SCmdStartAP, *PSCmdStartAP; | 159 | } __packed SCmdStartAP, *PSCmdStartAP; |
| 161 | 160 | ||
| 162 | typedef struct tagSCmdSetWEP { | 161 | typedef struct tagSCmdSetWEP { |
| 163 | 162 | ||
| @@ -167,7 +166,7 @@ typedef struct tagSCmdSetWEP { | |||
| 167 | BOOL bWepKeyAvailable[WEP_NKEYS]; | 166 | BOOL bWepKeyAvailable[WEP_NKEYS]; |
| 168 | u32 auWepKeyLength[WEP_NKEYS]; | 167 | u32 auWepKeyLength[WEP_NKEYS]; |
| 169 | 168 | ||
| 170 | } SCmdSetWEP, *PSCmdSetWEP; | 169 | } __packed SCmdSetWEP, *PSCmdSetWEP; |
| 171 | 170 | ||
| 172 | typedef struct tagSBSSIDItem { | 171 | typedef struct tagSBSSIDItem { |
| 173 | 172 | ||
| @@ -180,14 +179,14 @@ typedef struct tagSBSSIDItem { | |||
| 180 | BOOL bWEPOn; | 179 | BOOL bWEPOn; |
| 181 | u32 uRSSI; | 180 | u32 uRSSI; |
| 182 | 181 | ||
| 183 | } SBSSIDItem; | 182 | } __packed SBSSIDItem; |
| 184 | 183 | ||
| 185 | 184 | ||
| 186 | typedef struct tagSBSSIDList { | 185 | typedef struct tagSBSSIDList { |
| 187 | 186 | ||
| 188 | u32 uItem; | 187 | u32 uItem; |
| 189 | SBSSIDItem sBSSIDList[0]; | 188 | SBSSIDItem sBSSIDList[0]; |
| 190 | } SBSSIDList, *PSBSSIDList; | 189 | } __packed SBSSIDList, *PSBSSIDList; |
| 191 | 190 | ||
| 192 | 191 | ||
| 193 | typedef struct tagSNodeItem { | 192 | typedef struct tagSNodeItem { |
| @@ -208,7 +207,7 @@ typedef struct tagSNodeItem { | |||
| 208 | u32 uTxAttempts; | 207 | u32 uTxAttempts; |
| 209 | u16 wFailureRatio; | 208 | u16 wFailureRatio; |
| 210 | 209 | ||
| 211 | } SNodeItem; | 210 | } __packed SNodeItem; |
| 212 | 211 | ||
| 213 | 212 | ||
| 214 | typedef struct tagSNodeList { | 213 | typedef struct tagSNodeList { |
| @@ -216,7 +215,7 @@ typedef struct tagSNodeList { | |||
| 216 | u32 uItem; | 215 | u32 uItem; |
| 217 | SNodeItem sNodeList[0]; | 216 | SNodeItem sNodeList[0]; |
| 218 | 217 | ||
| 219 | } SNodeList, *PSNodeList; | 218 | } __packed SNodeList, *PSNodeList; |
| 220 | 219 | ||
| 221 | 220 | ||
| 222 | typedef struct tagSCmdLinkStatus { | 221 | typedef struct tagSCmdLinkStatus { |
| @@ -229,7 +228,7 @@ typedef struct tagSCmdLinkStatus { | |||
| 229 | u32 uChannel; | 228 | u32 uChannel; |
| 230 | u32 uLinkRate; | 229 | u32 uLinkRate; |
| 231 | 230 | ||
| 232 | } SCmdLinkStatus, *PSCmdLinkStatus; | 231 | } __packed SCmdLinkStatus, *PSCmdLinkStatus; |
| 233 | 232 | ||
| 234 | // | 233 | // |
| 235 | // 802.11 counter | 234 | // 802.11 counter |
| @@ -247,7 +246,7 @@ typedef struct tagSDot11MIBCount { | |||
| 247 | u32 ReceivedFragmentCount; | 246 | u32 ReceivedFragmentCount; |
| 248 | u32 MulticastReceivedFrameCount; | 247 | u32 MulticastReceivedFrameCount; |
| 249 | u32 FCSErrorCount; | 248 | u32 FCSErrorCount; |
| 250 | } SDot11MIBCount, *PSDot11MIBCount; | 249 | } __packed SDot11MIBCount, *PSDot11MIBCount; |
| 251 | 250 | ||
| 252 | 251 | ||
| 253 | 252 | ||
| @@ -355,13 +354,13 @@ typedef struct tagSStatMIBCount { | |||
| 355 | u32 ullTxBroadcastBytes[2]; | 354 | u32 ullTxBroadcastBytes[2]; |
| 356 | u32 ullTxMulticastBytes[2]; | 355 | u32 ullTxMulticastBytes[2]; |
| 357 | u32 ullTxDirectedBytes[2]; | 356 | u32 ullTxDirectedBytes[2]; |
| 358 | } SStatMIBCount, *PSStatMIBCount; | 357 | } __packed SStatMIBCount, *PSStatMIBCount; |
| 359 | 358 | ||
| 360 | typedef struct tagSCmdValue { | 359 | typedef struct tagSCmdValue { |
| 361 | 360 | ||
| 362 | u32 dwValue; | 361 | u32 dwValue; |
| 363 | 362 | ||
| 364 | } SCmdValue, *PSCmdValue; | 363 | } __packed SCmdValue, *PSCmdValue; |
| 365 | 364 | ||
| 366 | // | 365 | // |
| 367 | // hostapd & viawget ioctl related | 366 | // hostapd & viawget ioctl related |
| @@ -431,7 +430,7 @@ struct viawget_hostapd_param { | |||
| 431 | u8 ssid[32]; | 430 | u8 ssid[32]; |
| 432 | } scan_req; | 431 | } scan_req; |
| 433 | } u; | 432 | } u; |
| 434 | }; | 433 | } __packed; |
| 435 | 434 | ||
| 436 | /*--------------------- Export Classes ----------------------------*/ | 435 | /*--------------------- Export Classes ----------------------------*/ |
| 437 | 436 | ||
diff --git a/drivers/staging/vt6656/iowpa.h b/drivers/staging/vt6656/iowpa.h index 959c8868f6e2..2522ddec718d 100644 --- a/drivers/staging/vt6656/iowpa.h +++ b/drivers/staging/vt6656/iowpa.h | |||
| @@ -67,12 +67,11 @@ enum { | |||
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | #pragma pack(1) | ||
| 71 | typedef struct viawget_wpa_header { | 70 | typedef struct viawget_wpa_header { |
| 72 | u8 type; | 71 | u8 type; |
| 73 | u16 req_ie_len; | 72 | u16 req_ie_len; |
| 74 | u16 resp_ie_len; | 73 | u16 resp_ie_len; |
| 75 | } viawget_wpa_header; | 74 | } __packed viawget_wpa_header; |
| 76 | 75 | ||
| 77 | struct viawget_wpa_param { | 76 | struct viawget_wpa_param { |
| 78 | u32 cmd; | 77 | u32 cmd; |
| @@ -113,9 +112,8 @@ struct viawget_wpa_param { | |||
| 113 | u8 *buf; | 112 | u8 *buf; |
| 114 | } scan_results; | 113 | } scan_results; |
| 115 | } u; | 114 | } u; |
| 116 | }; | 115 | } __packed; |
| 117 | 116 | ||
| 118 | #pragma pack(1) | ||
| 119 | struct viawget_scan_result { | 117 | struct viawget_scan_result { |
| 120 | u8 bssid[6]; | 118 | u8 bssid[6]; |
| 121 | u8 ssid[32]; | 119 | u8 ssid[32]; |
| @@ -130,7 +128,7 @@ struct viawget_scan_result { | |||
| 130 | int noise; | 128 | int noise; |
| 131 | int level; | 129 | int level; |
| 132 | int maxrate; | 130 | int maxrate; |
| 133 | }; | 131 | } __packed; |
| 134 | 132 | ||
| 135 | /*--------------------- Export Classes ----------------------------*/ | 133 | /*--------------------- Export Classes ----------------------------*/ |
| 136 | 134 | ||
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c index 4efa9bc0fcf0..89bfd858bb28 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.c +++ b/drivers/staging/wlan-ng/prism2mgmt.c | |||
| @@ -406,7 +406,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) | |||
| 406 | /* SSID */ | 406 | /* SSID */ |
| 407 | req->ssid.status = P80211ENUM_msgitem_status_data_ok; | 407 | req->ssid.status = P80211ENUM_msgitem_status_data_ok; |
| 408 | req->ssid.data.len = le16_to_cpu(item->ssid.len); | 408 | req->ssid.data.len = le16_to_cpu(item->ssid.len); |
| 409 | req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_BSSID_LEN); | 409 | req->ssid.data.len = min_t(u16, req->ssid.data.len, WLAN_SSID_MAXLEN); |
| 410 | memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len); | 410 | memcpy(req->ssid.data.data, item->ssid.data, req->ssid.data.len); |
| 411 | 411 | ||
| 412 | /* supported rates */ | 412 | /* supported rates */ |
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index be6a373601b7..79ff3a5e925d 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
| @@ -441,6 +441,8 @@ static int pty_bsd_ioctl(struct tty_struct *tty, | |||
| 441 | return pty_get_pktmode(tty, (int __user *)arg); | 441 | return pty_get_pktmode(tty, (int __user *)arg); |
| 442 | case TIOCSIG: /* Send signal to other side of pty */ | 442 | case TIOCSIG: /* Send signal to other side of pty */ |
| 443 | return pty_signal(tty, (int) arg); | 443 | return pty_signal(tty, (int) arg); |
| 444 | case TIOCGPTN: /* TTY returns ENOTTY, but glibc expects EINVAL here */ | ||
| 445 | return -EINVAL; | ||
| 444 | } | 446 | } |
| 445 | return -ENOIOCTLCMD; | 447 | return -ENOIOCTLCMD; |
| 446 | } | 448 | } |
diff --git a/drivers/tty/serial/8250/8250.c b/drivers/tty/serial/8250/8250.c index d085e3a8ec06..f9320437a649 100644 --- a/drivers/tty/serial/8250/8250.c +++ b/drivers/tty/serial/8250/8250.c | |||
| @@ -300,6 +300,12 @@ static const struct serial8250_config uart_config[] = { | |||
| 300 | UART_FCR_R_TRIG_00 | UART_FCR_T_TRIG_00, | 300 | UART_FCR_R_TRIG_00 | UART_FCR_T_TRIG_00, |
| 301 | .flags = UART_CAP_FIFO, | 301 | .flags = UART_CAP_FIFO, |
| 302 | }, | 302 | }, |
| 303 | [PORT_BRCM_TRUMANAGE] = { | ||
| 304 | .name = "TruManage", | ||
| 305 | .fifo_size = 1, | ||
| 306 | .tx_loadsz = 1024, | ||
| 307 | .flags = UART_CAP_HFIFO, | ||
| 308 | }, | ||
| 303 | [PORT_8250_CIR] = { | 309 | [PORT_8250_CIR] = { |
| 304 | .name = "CIR port" | 310 | .name = "CIR port" |
| 305 | } | 311 | } |
| @@ -1490,6 +1496,11 @@ void serial8250_tx_chars(struct uart_8250_port *up) | |||
| 1490 | port->icount.tx++; | 1496 | port->icount.tx++; |
| 1491 | if (uart_circ_empty(xmit)) | 1497 | if (uart_circ_empty(xmit)) |
| 1492 | break; | 1498 | break; |
| 1499 | if (up->capabilities & UART_CAP_HFIFO) { | ||
| 1500 | if ((serial_port_in(port, UART_LSR) & BOTH_EMPTY) != | ||
| 1501 | BOTH_EMPTY) | ||
| 1502 | break; | ||
| 1503 | } | ||
| 1493 | } while (--count > 0); | 1504 | } while (--count > 0); |
| 1494 | 1505 | ||
| 1495 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 1506 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h index 3b4ea84898c2..12caa1292b75 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h | |||
| @@ -40,6 +40,7 @@ struct serial8250_config { | |||
| 40 | #define UART_CAP_AFE (1 << 11) /* MCR-based hw flow control */ | 40 | #define UART_CAP_AFE (1 << 11) /* MCR-based hw flow control */ |
| 41 | #define UART_CAP_UUE (1 << 12) /* UART needs IER bit 6 set (Xscale) */ | 41 | #define UART_CAP_UUE (1 << 12) /* UART needs IER bit 6 set (Xscale) */ |
| 42 | #define UART_CAP_RTOIE (1 << 13) /* UART needs IER bit 4 set (Xscale, Tegra) */ | 42 | #define UART_CAP_RTOIE (1 << 13) /* UART needs IER bit 4 set (Xscale, Tegra) */ |
| 43 | #define UART_CAP_HFIFO (1 << 14) /* UART has a "hidden" FIFO */ | ||
| 43 | 44 | ||
| 44 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ | 45 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ |
| 45 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ | 46 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ |
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 1d0dba2d562d..096d2ef48b32 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c | |||
| @@ -79,7 +79,7 @@ static int dw8250_handle_irq(struct uart_port *p) | |||
| 79 | } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) { | 79 | } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) { |
| 80 | /* Clear the USR and write the LCR again. */ | 80 | /* Clear the USR and write the LCR again. */ |
| 81 | (void)p->serial_in(p, UART_USR); | 81 | (void)p->serial_in(p, UART_USR); |
| 82 | p->serial_out(p, d->last_lcr, UART_LCR); | 82 | p->serial_out(p, UART_LCR, d->last_lcr); |
| 83 | 83 | ||
| 84 | return 1; | 84 | return 1; |
| 85 | } | 85 | } |
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 26b9dc012ed0..a27a98e1b066 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c | |||
| @@ -1085,6 +1085,18 @@ pci_omegapci_setup(struct serial_private *priv, | |||
| 1085 | return setup_port(priv, port, 2, idx * 8, 0); | 1085 | return setup_port(priv, port, 2, idx * 8, 0); |
| 1086 | } | 1086 | } |
| 1087 | 1087 | ||
| 1088 | static int | ||
| 1089 | pci_brcm_trumanage_setup(struct serial_private *priv, | ||
| 1090 | const struct pciserial_board *board, | ||
| 1091 | struct uart_8250_port *port, int idx) | ||
| 1092 | { | ||
| 1093 | int ret = pci_default_setup(priv, board, port, idx); | ||
| 1094 | |||
| 1095 | port->port.type = PORT_BRCM_TRUMANAGE; | ||
| 1096 | port->port.flags = (port->port.flags | UPF_FIXED_PORT | UPF_FIXED_TYPE); | ||
| 1097 | return ret; | ||
| 1098 | } | ||
| 1099 | |||
| 1088 | static int skip_tx_en_setup(struct serial_private *priv, | 1100 | static int skip_tx_en_setup(struct serial_private *priv, |
| 1089 | const struct pciserial_board *board, | 1101 | const struct pciserial_board *board, |
| 1090 | struct uart_8250_port *port, int idx) | 1102 | struct uart_8250_port *port, int idx) |
| @@ -1301,9 +1313,10 @@ pci_wch_ch353_setup(struct serial_private *priv, | |||
| 1301 | #define PCI_VENDOR_ID_AGESTAR 0x5372 | 1313 | #define PCI_VENDOR_ID_AGESTAR 0x5372 |
| 1302 | #define PCI_DEVICE_ID_AGESTAR_9375 0x6872 | 1314 | #define PCI_DEVICE_ID_AGESTAR_9375 0x6872 |
| 1303 | #define PCI_VENDOR_ID_ASIX 0x9710 | 1315 | #define PCI_VENDOR_ID_ASIX 0x9710 |
| 1304 | #define PCI_DEVICE_ID_COMMTECH_4222PCIE 0x0019 | ||
| 1305 | #define PCI_DEVICE_ID_COMMTECH_4224PCIE 0x0020 | 1316 | #define PCI_DEVICE_ID_COMMTECH_4224PCIE 0x0020 |
| 1306 | #define PCI_DEVICE_ID_COMMTECH_4228PCIE 0x0021 | 1317 | #define PCI_DEVICE_ID_COMMTECH_4228PCIE 0x0021 |
| 1318 | #define PCI_DEVICE_ID_COMMTECH_4222PCIE 0x0022 | ||
| 1319 | #define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a | ||
| 1307 | 1320 | ||
| 1308 | 1321 | ||
| 1309 | /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ | 1322 | /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ |
| @@ -1954,6 +1967,17 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { | |||
| 1954 | .setup = pci_xr17v35x_setup, | 1967 | .setup = pci_xr17v35x_setup, |
| 1955 | }, | 1968 | }, |
| 1956 | /* | 1969 | /* |
| 1970 | * Broadcom TruManage (NetXtreme) | ||
| 1971 | */ | ||
| 1972 | { | ||
| 1973 | .vendor = PCI_VENDOR_ID_BROADCOM, | ||
| 1974 | .device = PCI_DEVICE_ID_BROADCOM_TRUMANAGE, | ||
| 1975 | .subvendor = PCI_ANY_ID, | ||
| 1976 | .subdevice = PCI_ANY_ID, | ||
| 1977 | .setup = pci_brcm_trumanage_setup, | ||
| 1978 | }, | ||
| 1979 | |||
| 1980 | /* | ||
| 1957 | * Default "match everything" terminator entry | 1981 | * Default "match everything" terminator entry |
| 1958 | */ | 1982 | */ |
| 1959 | { | 1983 | { |
| @@ -2148,6 +2172,7 @@ enum pci_board_num_t { | |||
| 2148 | pbn_ce4100_1_115200, | 2172 | pbn_ce4100_1_115200, |
| 2149 | pbn_omegapci, | 2173 | pbn_omegapci, |
| 2150 | pbn_NETMOS9900_2s_115200, | 2174 | pbn_NETMOS9900_2s_115200, |
| 2175 | pbn_brcm_trumanage, | ||
| 2151 | }; | 2176 | }; |
| 2152 | 2177 | ||
| 2153 | /* | 2178 | /* |
| @@ -2246,7 +2271,7 @@ static struct pciserial_board pci_boards[] = { | |||
| 2246 | 2271 | ||
| 2247 | [pbn_b0_8_1152000_200] = { | 2272 | [pbn_b0_8_1152000_200] = { |
| 2248 | .flags = FL_BASE0, | 2273 | .flags = FL_BASE0, |
| 2249 | .num_ports = 2, | 2274 | .num_ports = 8, |
| 2250 | .base_baud = 1152000, | 2275 | .base_baud = 1152000, |
| 2251 | .uart_offset = 0x200, | 2276 | .uart_offset = 0x200, |
| 2252 | }, | 2277 | }, |
| @@ -2892,6 +2917,12 @@ static struct pciserial_board pci_boards[] = { | |||
| 2892 | .num_ports = 2, | 2917 | .num_ports = 2, |
| 2893 | .base_baud = 115200, | 2918 | .base_baud = 115200, |
| 2894 | }, | 2919 | }, |
| 2920 | [pbn_brcm_trumanage] = { | ||
| 2921 | .flags = FL_BASE0, | ||
| 2922 | .num_ports = 1, | ||
| 2923 | .reg_shift = 2, | ||
| 2924 | .base_baud = 115200, | ||
| 2925 | }, | ||
| 2895 | }; | 2926 | }; |
| 2896 | 2927 | ||
| 2897 | static const struct pci_device_id blacklist[] = { | 2928 | static const struct pci_device_id blacklist[] = { |
| @@ -4471,6 +4502,13 @@ static struct pci_device_id serial_pci_tbl[] = { | |||
| 4471 | pbn_omegapci }, | 4502 | pbn_omegapci }, |
| 4472 | 4503 | ||
| 4473 | /* | 4504 | /* |
| 4505 | * Broadcom TruManage | ||
| 4506 | */ | ||
| 4507 | { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_BROADCOM_TRUMANAGE, | ||
| 4508 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | ||
| 4509 | pbn_brcm_trumanage }, | ||
| 4510 | |||
| 4511 | /* | ||
| 4474 | * AgeStar as-prs2-009 | 4512 | * AgeStar as-prs2-009 |
| 4475 | */ | 4513 | */ |
| 4476 | { PCI_VENDOR_ID_AGESTAR, PCI_DEVICE_ID_AGESTAR_9375, | 4514 | { PCI_VENDOR_ID_AGESTAR, PCI_DEVICE_ID_AGESTAR_9375, |
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 675d94ab0aff..8cb6d8d66a13 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
| @@ -637,6 +637,7 @@ static void ifx_port_shutdown(struct tty_port *port) | |||
| 637 | 637 | ||
| 638 | clear_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags); | 638 | clear_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags); |
| 639 | mrdy_set_low(ifx_dev); | 639 | mrdy_set_low(ifx_dev); |
| 640 | del_timer(&ifx_dev->spi_timer); | ||
| 640 | clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags); | 641 | clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags); |
| 641 | tasklet_kill(&ifx_dev->io_work_tasklet); | 642 | tasklet_kill(&ifx_dev->io_work_tasklet); |
| 642 | } | 643 | } |
| @@ -810,7 +811,8 @@ static void ifx_spi_io(unsigned long data) | |||
| 810 | ifx_dev->spi_xfer.cs_change = 0; | 811 | ifx_dev->spi_xfer.cs_change = 0; |
| 811 | ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz; | 812 | ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz; |
| 812 | /* ifx_dev->spi_xfer.speed_hz = 390625; */ | 813 | /* ifx_dev->spi_xfer.speed_hz = 390625; */ |
| 813 | ifx_dev->spi_xfer.bits_per_word = spi_bpw; | 814 | ifx_dev->spi_xfer.bits_per_word = |
| 815 | ifx_dev->spi_dev->bits_per_word; | ||
| 814 | 816 | ||
| 815 | ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer; | 817 | ifx_dev->spi_xfer.tx_buf = ifx_dev->tx_buffer; |
| 816 | ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer; | 818 | ifx_dev->spi_xfer.rx_buf = ifx_dev->rx_buffer; |
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 6db23b035efe..e55615eb34ad 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
| @@ -253,7 +253,7 @@ static void mxs_auart_tx_chars(struct mxs_auart_port *s) | |||
| 253 | struct circ_buf *xmit = &s->port.state->xmit; | 253 | struct circ_buf *xmit = &s->port.state->xmit; |
| 254 | 254 | ||
| 255 | if (auart_dma_enabled(s)) { | 255 | if (auart_dma_enabled(s)) { |
| 256 | int i = 0; | 256 | u32 i = 0; |
| 257 | int size; | 257 | int size; |
| 258 | void *buffer = s->tx_dma_buf; | 258 | void *buffer = s->tx_dma_buf; |
| 259 | 259 | ||
| @@ -412,10 +412,12 @@ static void mxs_auart_set_mctrl(struct uart_port *u, unsigned mctrl) | |||
| 412 | 412 | ||
| 413 | u32 ctrl = readl(u->membase + AUART_CTRL2); | 413 | u32 ctrl = readl(u->membase + AUART_CTRL2); |
| 414 | 414 | ||
| 415 | ctrl &= ~AUART_CTRL2_RTSEN; | 415 | ctrl &= ~(AUART_CTRL2_RTSEN | AUART_CTRL2_RTS); |
| 416 | if (mctrl & TIOCM_RTS) { | 416 | if (mctrl & TIOCM_RTS) { |
| 417 | if (tty_port_cts_enabled(&u->state->port)) | 417 | if (tty_port_cts_enabled(&u->state->port)) |
| 418 | ctrl |= AUART_CTRL2_RTSEN; | 418 | ctrl |= AUART_CTRL2_RTSEN; |
| 419 | else | ||
| 420 | ctrl |= AUART_CTRL2_RTS; | ||
| 419 | } | 421 | } |
| 420 | 422 | ||
| 421 | s->ctrl = mctrl; | 423 | s->ctrl = mctrl; |
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 12e5249d053e..e514b3a4dc57 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c | |||
| @@ -1006,7 +1006,6 @@ static void s3c24xx_serial_resetport(struct uart_port *port, | |||
| 1006 | 1006 | ||
| 1007 | ucon &= ucon_mask; | 1007 | ucon &= ucon_mask; |
| 1008 | wr_regl(port, S3C2410_UCON, ucon | cfg->ucon); | 1008 | wr_regl(port, S3C2410_UCON, ucon | cfg->ucon); |
| 1009 | wr_regl(port, S3C2410_ULCON, cfg->ulcon); | ||
| 1010 | 1009 | ||
| 1011 | /* reset both fifos */ | 1010 | /* reset both fifos */ |
| 1012 | wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH); | 1011 | wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH); |
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c index 8fd181436a6b..d5ed9f613005 100644 --- a/drivers/tty/serial/vt8500_serial.c +++ b/drivers/tty/serial/vt8500_serial.c | |||
| @@ -604,7 +604,7 @@ static int vt8500_serial_probe(struct platform_device *pdev) | |||
| 604 | vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; | 604 | vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; |
| 605 | 605 | ||
| 606 | vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); | 606 | vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); |
| 607 | if (vt8500_port->clk) { | 607 | if (!IS_ERR(vt8500_port->clk)) { |
| 608 | vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); | 608 | vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); |
| 609 | } else { | 609 | } else { |
| 610 | /* use the default of 24Mhz if not specified and warn */ | 610 | /* use the default of 24Mhz if not specified and warn */ |
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 2e43b332aae8..2fdd767f8fe8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c | |||
| @@ -1605,6 +1605,7 @@ static int dwc3_gadget_init_endpoints(struct dwc3 *dwc) | |||
| 1605 | 1605 | ||
| 1606 | if (epnum == 0 || epnum == 1) { | 1606 | if (epnum == 0 || epnum == 1) { |
| 1607 | dep->endpoint.maxpacket = 512; | 1607 | dep->endpoint.maxpacket = 512; |
| 1608 | dep->endpoint.maxburst = 1; | ||
| 1608 | dep->endpoint.ops = &dwc3_gadget_ep0_ops; | 1609 | dep->endpoint.ops = &dwc3_gadget_ep0_ops; |
| 1609 | if (!epnum) | 1610 | if (!epnum) |
| 1610 | dwc->gadget.ep0 = &dep->endpoint; | 1611 | dwc->gadget.ep0 = &dep->endpoint; |
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 4a6961c517f2..8c2f25121149 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c | |||
| @@ -1153,15 +1153,15 @@ static int ffs_fs_parse_opts(struct ffs_sb_fill_data *data, char *opts) | |||
| 1153 | pr_err("%s: unmapped value: %lu\n", opts, value); | 1153 | pr_err("%s: unmapped value: %lu\n", opts, value); |
| 1154 | return -EINVAL; | 1154 | return -EINVAL; |
| 1155 | } | 1155 | } |
| 1156 | } | 1156 | } else if (!memcmp(opts, "gid", 3)) { |
| 1157 | else if (!memcmp(opts, "gid", 3)) | ||
| 1158 | data->perms.gid = make_kgid(current_user_ns(), value); | 1157 | data->perms.gid = make_kgid(current_user_ns(), value); |
| 1159 | if (!gid_valid(data->perms.gid)) { | 1158 | if (!gid_valid(data->perms.gid)) { |
| 1160 | pr_err("%s: unmapped value: %lu\n", opts, value); | 1159 | pr_err("%s: unmapped value: %lu\n", opts, value); |
| 1161 | return -EINVAL; | 1160 | return -EINVAL; |
| 1162 | } | 1161 | } |
| 1163 | else | 1162 | } else { |
| 1164 | goto invalid; | 1163 | goto invalid; |
| 1164 | } | ||
| 1165 | break; | 1165 | break; |
| 1166 | 1166 | ||
| 1167 | default: | 1167 | default: |
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c index 1b0f086426bd..d3bd7b095ba3 100644 --- a/drivers/usb/gadget/fsl_mxc_udc.c +++ b/drivers/usb/gadget/fsl_mxc_udc.c | |||
| @@ -18,14 +18,13 @@ | |||
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <mach/hardware.h> | ||
| 22 | |||
| 23 | static struct clk *mxc_ahb_clk; | 21 | static struct clk *mxc_ahb_clk; |
| 24 | static struct clk *mxc_per_clk; | 22 | static struct clk *mxc_per_clk; |
| 25 | static struct clk *mxc_ipg_clk; | 23 | static struct clk *mxc_ipg_clk; |
| 26 | 24 | ||
| 27 | /* workaround ENGcm09152 for i.MX35 */ | 25 | /* workaround ENGcm09152 for i.MX35 */ |
| 28 | #define USBPHYCTRL_OTGBASE_OFFSET 0x608 | 26 | #define MX35_USBPHYCTRL_OFFSET 0x600 |
| 27 | #define USBPHYCTRL_OTGBASE_OFFSET 0x8 | ||
| 29 | #define USBPHYCTRL_EVDO (1 << 23) | 28 | #define USBPHYCTRL_EVDO (1 << 23) |
| 30 | 29 | ||
| 31 | int fsl_udc_clk_init(struct platform_device *pdev) | 30 | int fsl_udc_clk_init(struct platform_device *pdev) |
| @@ -59,7 +58,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) | |||
| 59 | clk_prepare_enable(mxc_per_clk); | 58 | clk_prepare_enable(mxc_per_clk); |
| 60 | 59 | ||
| 61 | /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ | 60 | /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ |
| 62 | if (!cpu_is_mx51()) { | 61 | if (!strcmp(pdev->id_entry->name, "imx-udc-mx27")) { |
| 63 | freq = clk_get_rate(mxc_per_clk); | 62 | freq = clk_get_rate(mxc_per_clk); |
| 64 | if (pdata->phy_mode != FSL_USB2_PHY_ULPI && | 63 | if (pdata->phy_mode != FSL_USB2_PHY_ULPI && |
| 65 | (freq < 59999000 || freq > 60001000)) { | 64 | (freq < 59999000 || freq > 60001000)) { |
| @@ -79,27 +78,40 @@ eclkrate: | |||
| 79 | return ret; | 78 | return ret; |
| 80 | } | 79 | } |
| 81 | 80 | ||
| 82 | void fsl_udc_clk_finalize(struct platform_device *pdev) | 81 | int fsl_udc_clk_finalize(struct platform_device *pdev) |
| 83 | { | 82 | { |
| 84 | struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; | 83 | struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; |
| 85 | if (cpu_is_mx35()) { | 84 | int ret = 0; |
| 86 | unsigned int v; | ||
| 87 | 85 | ||
| 88 | /* workaround ENGcm09152 for i.MX35 */ | 86 | /* workaround ENGcm09152 for i.MX35 */ |
| 89 | if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { | 87 | if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { |
| 90 | v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + | 88 | unsigned int v; |
| 91 | USBPHYCTRL_OTGBASE_OFFSET)); | 89 | struct resource *res = platform_get_resource |
| 92 | writel(v | USBPHYCTRL_EVDO, | 90 | (pdev, IORESOURCE_MEM, 0); |
| 93 | MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + | 91 | void __iomem *phy_regs = ioremap(res->start + |
| 94 | USBPHYCTRL_OTGBASE_OFFSET)); | 92 | MX35_USBPHYCTRL_OFFSET, 512); |
| 93 | if (!phy_regs) { | ||
| 94 | dev_err(&pdev->dev, "ioremap for phy address fails\n"); | ||
| 95 | ret = -EINVAL; | ||
| 96 | goto ioremap_err; | ||
| 95 | } | 97 | } |
| 98 | |||
| 99 | v = readl(phy_regs + USBPHYCTRL_OTGBASE_OFFSET); | ||
| 100 | writel(v | USBPHYCTRL_EVDO, | ||
| 101 | phy_regs + USBPHYCTRL_OTGBASE_OFFSET); | ||
| 102 | |||
| 103 | iounmap(phy_regs); | ||
| 96 | } | 104 | } |
| 97 | 105 | ||
| 106 | |||
| 107 | ioremap_err: | ||
| 98 | /* ULPI transceivers don't need usbpll */ | 108 | /* ULPI transceivers don't need usbpll */ |
| 99 | if (pdata->phy_mode == FSL_USB2_PHY_ULPI) { | 109 | if (pdata->phy_mode == FSL_USB2_PHY_ULPI) { |
| 100 | clk_disable_unprepare(mxc_per_clk); | 110 | clk_disable_unprepare(mxc_per_clk); |
| 101 | mxc_per_clk = NULL; | 111 | mxc_per_clk = NULL; |
| 102 | } | 112 | } |
| 113 | |||
| 114 | return ret; | ||
| 103 | } | 115 | } |
| 104 | 116 | ||
| 105 | void fsl_udc_clk_release(void) | 117 | void fsl_udc_clk_release(void) |
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index c19f7f13790b..667275cb7bad 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/fsl_devices.h> | 41 | #include <linux/fsl_devices.h> |
| 42 | #include <linux/dmapool.h> | 42 | #include <linux/dmapool.h> |
| 43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 44 | #include <linux/of_device.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
| 46 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| @@ -2438,11 +2439,6 @@ static int __init fsl_udc_probe(struct platform_device *pdev) | |||
| 2438 | unsigned int i; | 2439 | unsigned int i; |
| 2439 | u32 dccparams; | 2440 | u32 dccparams; |
| 2440 | 2441 | ||
| 2441 | if (strcmp(pdev->name, driver_name)) { | ||
| 2442 | VDBG("Wrong device"); | ||
| 2443 | return -ENODEV; | ||
| 2444 | } | ||
| 2445 | |||
| 2446 | udc_controller = kzalloc(sizeof(struct fsl_udc), GFP_KERNEL); | 2442 | udc_controller = kzalloc(sizeof(struct fsl_udc), GFP_KERNEL); |
| 2447 | if (udc_controller == NULL) { | 2443 | if (udc_controller == NULL) { |
| 2448 | ERR("malloc udc failed\n"); | 2444 | ERR("malloc udc failed\n"); |
| @@ -2547,7 +2543,9 @@ static int __init fsl_udc_probe(struct platform_device *pdev) | |||
| 2547 | dr_controller_setup(udc_controller); | 2543 | dr_controller_setup(udc_controller); |
| 2548 | } | 2544 | } |
| 2549 | 2545 | ||
| 2550 | fsl_udc_clk_finalize(pdev); | 2546 | ret = fsl_udc_clk_finalize(pdev); |
| 2547 | if (ret) | ||
| 2548 | goto err_free_irq; | ||
| 2551 | 2549 | ||
| 2552 | /* Setup gadget structure */ | 2550 | /* Setup gadget structure */ |
| 2553 | udc_controller->gadget.ops = &fsl_gadget_ops; | 2551 | udc_controller->gadget.ops = &fsl_gadget_ops; |
| @@ -2756,22 +2754,32 @@ static int fsl_udc_otg_resume(struct device *dev) | |||
| 2756 | 2754 | ||
| 2757 | return fsl_udc_resume(NULL); | 2755 | return fsl_udc_resume(NULL); |
| 2758 | } | 2756 | } |
| 2759 | |||
| 2760 | /*------------------------------------------------------------------------- | 2757 | /*------------------------------------------------------------------------- |
| 2761 | Register entry point for the peripheral controller driver | 2758 | Register entry point for the peripheral controller driver |
| 2762 | --------------------------------------------------------------------------*/ | 2759 | --------------------------------------------------------------------------*/ |
| 2763 | 2760 | static const struct platform_device_id fsl_udc_devtype[] = { | |
| 2761 | { | ||
| 2762 | .name = "imx-udc-mx27", | ||
| 2763 | }, { | ||
| 2764 | .name = "imx-udc-mx51", | ||
| 2765 | }, { | ||
| 2766 | /* sentinel */ | ||
| 2767 | } | ||
| 2768 | }; | ||
| 2769 | MODULE_DEVICE_TABLE(platform, fsl_udc_devtype); | ||
| 2764 | static struct platform_driver udc_driver = { | 2770 | static struct platform_driver udc_driver = { |
| 2765 | .remove = __exit_p(fsl_udc_remove), | 2771 | .remove = __exit_p(fsl_udc_remove), |
| 2772 | /* Just for FSL i.mx SoC currently */ | ||
| 2773 | .id_table = fsl_udc_devtype, | ||
| 2766 | /* these suspend and resume are not usb suspend and resume */ | 2774 | /* these suspend and resume are not usb suspend and resume */ |
| 2767 | .suspend = fsl_udc_suspend, | 2775 | .suspend = fsl_udc_suspend, |
| 2768 | .resume = fsl_udc_resume, | 2776 | .resume = fsl_udc_resume, |
| 2769 | .driver = { | 2777 | .driver = { |
| 2770 | .name = (char *)driver_name, | 2778 | .name = (char *)driver_name, |
| 2771 | .owner = THIS_MODULE, | 2779 | .owner = THIS_MODULE, |
| 2772 | /* udc suspend/resume called from OTG driver */ | 2780 | /* udc suspend/resume called from OTG driver */ |
| 2773 | .suspend = fsl_udc_otg_suspend, | 2781 | .suspend = fsl_udc_otg_suspend, |
| 2774 | .resume = fsl_udc_otg_resume, | 2782 | .resume = fsl_udc_otg_resume, |
| 2775 | }, | 2783 | }, |
| 2776 | }; | 2784 | }; |
| 2777 | 2785 | ||
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h index f61a967f7082..c6703bb07b23 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.h +++ b/drivers/usb/gadget/fsl_usb2_udc.h | |||
| @@ -592,15 +592,16 @@ static inline struct ep_queue_head *get_qh_by_ep(struct fsl_ep *ep) | |||
| 592 | struct platform_device; | 592 | struct platform_device; |
| 593 | #ifdef CONFIG_ARCH_MXC | 593 | #ifdef CONFIG_ARCH_MXC |
| 594 | int fsl_udc_clk_init(struct platform_device *pdev); | 594 | int fsl_udc_clk_init(struct platform_device *pdev); |
| 595 | void fsl_udc_clk_finalize(struct platform_device *pdev); | 595 | int fsl_udc_clk_finalize(struct platform_device *pdev); |
| 596 | void fsl_udc_clk_release(void); | 596 | void fsl_udc_clk_release(void); |
| 597 | #else | 597 | #else |
| 598 | static inline int fsl_udc_clk_init(struct platform_device *pdev) | 598 | static inline int fsl_udc_clk_init(struct platform_device *pdev) |
| 599 | { | 599 | { |
| 600 | return 0; | 600 | return 0; |
| 601 | } | 601 | } |
| 602 | static inline void fsl_udc_clk_finalize(struct platform_device *pdev) | 602 | static inline int fsl_udc_clk_finalize(struct platform_device *pdev) |
| 603 | { | 603 | { |
| 604 | return 0; | ||
| 604 | } | 605 | } |
| 605 | static inline void fsl_udc_clk_release(void) | 606 | static inline void fsl_udc_clk_release(void) |
| 606 | { | 607 | { |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index d6bb128ce21e..3a21c5d683c0 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
| @@ -148,7 +148,7 @@ config USB_EHCI_FSL | |||
| 148 | Variation of ARC USB block used in some Freescale chips. | 148 | Variation of ARC USB block used in some Freescale chips. |
| 149 | 149 | ||
| 150 | config USB_EHCI_MXC | 150 | config USB_EHCI_MXC |
| 151 | bool "Support for Freescale i.MX on-chip EHCI USB controller" | 151 | tristate "Support for Freescale i.MX on-chip EHCI USB controller" |
| 152 | depends on USB_EHCI_HCD && ARCH_MXC | 152 | depends on USB_EHCI_HCD && ARCH_MXC |
| 153 | select USB_EHCI_ROOT_HUB_TT | 153 | select USB_EHCI_ROOT_HUB_TT |
| 154 | ---help--- | 154 | ---help--- |
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 1eb4c3006e9e..001fbff2fdef 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_PCI) += pci-quirks.o | |||
| 26 | obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o | 26 | obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o |
| 27 | obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o | 27 | obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o |
| 28 | obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o | 28 | obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o |
| 29 | obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o | ||
| 29 | 30 | ||
| 30 | obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o | 31 | obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o |
| 31 | obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o | 32 | obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o |
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index c97503bb0b0e..09537b2f1002 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -74,10 +74,6 @@ static const char hcd_name [] = "ehci_hcd"; | |||
| 74 | #undef VERBOSE_DEBUG | 74 | #undef VERBOSE_DEBUG |
| 75 | #undef EHCI_URB_TRACE | 75 | #undef EHCI_URB_TRACE |
| 76 | 76 | ||
| 77 | #ifdef DEBUG | ||
| 78 | #define EHCI_STATS | ||
| 79 | #endif | ||
| 80 | |||
| 81 | /* magic numbers that can affect system performance */ | 77 | /* magic numbers that can affect system performance */ |
| 82 | #define EHCI_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */ | 78 | #define EHCI_TUNE_CERR 3 /* 0-3 qtd retries; 0 == don't stop */ |
| 83 | #define EHCI_TUNE_RL_HS 4 /* nak throttle; see 4.9 */ | 79 | #define EHCI_TUNE_RL_HS 4 /* nak throttle; see 4.9 */ |
| @@ -1250,11 +1246,6 @@ MODULE_LICENSE ("GPL"); | |||
| 1250 | #define PLATFORM_DRIVER ehci_fsl_driver | 1246 | #define PLATFORM_DRIVER ehci_fsl_driver |
| 1251 | #endif | 1247 | #endif |
| 1252 | 1248 | ||
| 1253 | #ifdef CONFIG_USB_EHCI_MXC | ||
| 1254 | #include "ehci-mxc.c" | ||
| 1255 | #define PLATFORM_DRIVER ehci_mxc_driver | ||
| 1256 | #endif | ||
| 1257 | |||
| 1258 | #ifdef CONFIG_USB_EHCI_SH | 1249 | #ifdef CONFIG_USB_EHCI_SH |
| 1259 | #include "ehci-sh.c" | 1250 | #include "ehci-sh.c" |
| 1260 | #define PLATFORM_DRIVER ehci_hcd_sh_driver | 1251 | #define PLATFORM_DRIVER ehci_hcd_sh_driver |
| @@ -1352,7 +1343,8 @@ MODULE_LICENSE ("GPL"); | |||
| 1352 | 1343 | ||
| 1353 | #if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \ | 1344 | #if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \ |
| 1354 | !IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \ | 1345 | !IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \ |
| 1355 | !defined(CONFIG_USB_CHIPIDEA_HOST) && \ | 1346 | !IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \ |
| 1347 | !IS_ENABLED(CONFIG_USB_EHCI_MXC) && \ | ||
| 1356 | !defined(PLATFORM_DRIVER) && \ | 1348 | !defined(PLATFORM_DRIVER) && \ |
| 1357 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ | 1349 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ |
| 1358 | !defined(OF_PLATFORM_DRIVER) && \ | 1350 | !defined(OF_PLATFORM_DRIVER) && \ |
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index ec7f5d2c90de..dedb80bb8d40 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
| @@ -17,75 +17,38 @@ | |||
| 17 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 17 | * Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/kernel.h> | ||
| 21 | #include <linux/module.h> | ||
| 22 | #include <linux/io.h> | ||
| 20 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 21 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
| 22 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 23 | #include <linux/usb/otg.h> | 26 | #include <linux/usb/otg.h> |
| 24 | #include <linux/usb/ulpi.h> | 27 | #include <linux/usb/ulpi.h> |
| 25 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 29 | #include <linux/usb.h> | ||
| 30 | #include <linux/usb/hcd.h> | ||
| 26 | 31 | ||
| 27 | #include <linux/platform_data/usb-ehci-mxc.h> | 32 | #include <linux/platform_data/usb-ehci-mxc.h> |
| 28 | 33 | ||
| 29 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
| 30 | 35 | ||
| 36 | #include "ehci.h" | ||
| 37 | |||
| 38 | #define DRIVER_DESC "Freescale On-Chip EHCI Host driver" | ||
| 39 | |||
| 40 | static const char hcd_name[] = "ehci-mxc"; | ||
| 41 | |||
| 31 | #define ULPI_VIEWPORT_OFFSET 0x170 | 42 | #define ULPI_VIEWPORT_OFFSET 0x170 |
| 32 | 43 | ||
| 33 | struct ehci_mxc_priv { | 44 | struct ehci_mxc_priv { |
| 34 | struct clk *usbclk, *ahbclk, *phyclk; | 45 | struct clk *usbclk, *ahbclk, *phyclk; |
| 35 | struct usb_hcd *hcd; | ||
| 36 | }; | 46 | }; |
| 37 | 47 | ||
| 38 | /* called during probe() after chip reset completes */ | 48 | static struct hc_driver __read_mostly ehci_mxc_hc_driver; |
| 39 | static int ehci_mxc_setup(struct usb_hcd *hcd) | ||
| 40 | { | ||
| 41 | hcd->has_tt = 1; | ||
| 42 | |||
| 43 | return ehci_setup(hcd); | ||
| 44 | } | ||
| 45 | 49 | ||
| 46 | static const struct hc_driver ehci_mxc_hc_driver = { | 50 | static const struct ehci_driver_overrides ehci_mxc_overrides __initdata = { |
| 47 | .description = hcd_name, | 51 | .extra_priv_size = sizeof(struct ehci_mxc_priv), |
| 48 | .product_desc = "Freescale On-Chip EHCI Host Controller", | ||
| 49 | .hcd_priv_size = sizeof(struct ehci_hcd), | ||
| 50 | |||
| 51 | /* | ||
| 52 | * generic hardware linkage | ||
| 53 | */ | ||
| 54 | .irq = ehci_irq, | ||
| 55 | .flags = HCD_USB2 | HCD_MEMORY, | ||
| 56 | |||
| 57 | /* | ||
| 58 | * basic lifecycle operations | ||
| 59 | */ | ||
| 60 | .reset = ehci_mxc_setup, | ||
| 61 | .start = ehci_run, | ||
| 62 | .stop = ehci_stop, | ||
| 63 | .shutdown = ehci_shutdown, | ||
| 64 | |||
| 65 | /* | ||
| 66 | * managing i/o requests and associated device resources | ||
| 67 | */ | ||
| 68 | .urb_enqueue = ehci_urb_enqueue, | ||
| 69 | .urb_dequeue = ehci_urb_dequeue, | ||
| 70 | .endpoint_disable = ehci_endpoint_disable, | ||
| 71 | .endpoint_reset = ehci_endpoint_reset, | ||
| 72 | |||
| 73 | /* | ||
| 74 | * scheduling support | ||
| 75 | */ | ||
| 76 | .get_frame_number = ehci_get_frame, | ||
| 77 | |||
| 78 | /* | ||
| 79 | * root hub support | ||
| 80 | */ | ||
| 81 | .hub_status_data = ehci_hub_status_data, | ||
| 82 | .hub_control = ehci_hub_control, | ||
| 83 | .bus_suspend = ehci_bus_suspend, | ||
| 84 | .bus_resume = ehci_bus_resume, | ||
| 85 | .relinquish_port = ehci_relinquish_port, | ||
| 86 | .port_handed_over = ehci_port_handed_over, | ||
| 87 | |||
| 88 | .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, | ||
| 89 | }; | 52 | }; |
| 90 | 53 | ||
| 91 | static int ehci_mxc_drv_probe(struct platform_device *pdev) | 54 | static int ehci_mxc_drv_probe(struct platform_device *pdev) |
| @@ -112,12 +75,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
| 112 | if (!hcd) | 75 | if (!hcd) |
| 113 | return -ENOMEM; | 76 | return -ENOMEM; |
| 114 | 77 | ||
| 115 | priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); | ||
| 116 | if (!priv) { | ||
| 117 | ret = -ENOMEM; | ||
| 118 | goto err_alloc; | ||
| 119 | } | ||
| 120 | |||
| 121 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 78 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 122 | if (!res) { | 79 | if (!res) { |
| 123 | dev_err(dev, "Found HC with no register addr. Check setup!\n"); | 80 | dev_err(dev, "Found HC with no register addr. Check setup!\n"); |
| @@ -135,6 +92,10 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
| 135 | goto err_alloc; | 92 | goto err_alloc; |
| 136 | } | 93 | } |
| 137 | 94 | ||
| 95 | hcd->has_tt = 1; | ||
| 96 | ehci = hcd_to_ehci(hcd); | ||
| 97 | priv = (struct ehci_mxc_priv *) ehci->priv; | ||
| 98 | |||
| 138 | /* enable clocks */ | 99 | /* enable clocks */ |
| 139 | priv->usbclk = devm_clk_get(&pdev->dev, "ipg"); | 100 | priv->usbclk = devm_clk_get(&pdev->dev, "ipg"); |
| 140 | if (IS_ERR(priv->usbclk)) { | 101 | if (IS_ERR(priv->usbclk)) { |
| @@ -169,8 +130,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
| 169 | mdelay(10); | 130 | mdelay(10); |
| 170 | } | 131 | } |
| 171 | 132 | ||
| 172 | ehci = hcd_to_ehci(hcd); | ||
| 173 | |||
| 174 | /* EHCI registers start at offset 0x100 */ | 133 | /* EHCI registers start at offset 0x100 */ |
| 175 | ehci->caps = hcd->regs + 0x100; | 134 | ehci->caps = hcd->regs + 0x100; |
| 176 | ehci->regs = hcd->regs + 0x100 + | 135 | ehci->regs = hcd->regs + 0x100 + |
| @@ -198,8 +157,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) | |||
| 198 | } | 157 | } |
| 199 | } | 158 | } |
| 200 | 159 | ||
| 201 | priv->hcd = hcd; | 160 | platform_set_drvdata(pdev, hcd); |
| 202 | platform_set_drvdata(pdev, priv); | ||
| 203 | 161 | ||
| 204 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); | 162 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
| 205 | if (ret) | 163 | if (ret) |
| @@ -244,8 +202,11 @@ err_alloc: | |||
| 244 | static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) | 202 | static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) |
| 245 | { | 203 | { |
| 246 | struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data; | 204 | struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data; |
| 247 | struct ehci_mxc_priv *priv = platform_get_drvdata(pdev); | 205 | struct usb_hcd *hcd = platform_get_drvdata(pdev); |
| 248 | struct usb_hcd *hcd = priv->hcd; | 206 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
| 207 | struct ehci_mxc_priv *priv = (struct ehci_mxc_priv *) ehci->priv; | ||
| 208 | |||
| 209 | usb_remove_hcd(hcd); | ||
| 249 | 210 | ||
| 250 | if (pdata && pdata->exit) | 211 | if (pdata && pdata->exit) |
| 251 | pdata->exit(pdev); | 212 | pdata->exit(pdev); |
| @@ -253,23 +214,20 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) | |||
| 253 | if (pdata->otg) | 214 | if (pdata->otg) |
| 254 | usb_phy_shutdown(pdata->otg); | 215 | usb_phy_shutdown(pdata->otg); |
| 255 | 216 | ||
| 256 | usb_remove_hcd(hcd); | ||
| 257 | usb_put_hcd(hcd); | ||
| 258 | platform_set_drvdata(pdev, NULL); | ||
| 259 | |||
| 260 | clk_disable_unprepare(priv->usbclk); | 217 | clk_disable_unprepare(priv->usbclk); |
| 261 | clk_disable_unprepare(priv->ahbclk); | 218 | clk_disable_unprepare(priv->ahbclk); |
| 262 | 219 | ||
| 263 | if (priv->phyclk) | 220 | if (priv->phyclk) |
| 264 | clk_disable_unprepare(priv->phyclk); | 221 | clk_disable_unprepare(priv->phyclk); |
| 265 | 222 | ||
| 223 | usb_put_hcd(hcd); | ||
| 224 | platform_set_drvdata(pdev, NULL); | ||
| 266 | return 0; | 225 | return 0; |
| 267 | } | 226 | } |
| 268 | 227 | ||
| 269 | static void ehci_mxc_drv_shutdown(struct platform_device *pdev) | 228 | static void ehci_mxc_drv_shutdown(struct platform_device *pdev) |
| 270 | { | 229 | { |
| 271 | struct ehci_mxc_priv *priv = platform_get_drvdata(pdev); | 230 | struct usb_hcd *hcd = platform_get_drvdata(pdev); |
| 272 | struct usb_hcd *hcd = priv->hcd; | ||
| 273 | 231 | ||
| 274 | if (hcd->driver->shutdown) | 232 | if (hcd->driver->shutdown) |
| 275 | hcd->driver->shutdown(hcd); | 233 | hcd->driver->shutdown(hcd); |
| @@ -279,9 +237,31 @@ MODULE_ALIAS("platform:mxc-ehci"); | |||
| 279 | 237 | ||
| 280 | static struct platform_driver ehci_mxc_driver = { | 238 | static struct platform_driver ehci_mxc_driver = { |
| 281 | .probe = ehci_mxc_drv_probe, | 239 | .probe = ehci_mxc_drv_probe, |
| 282 | .remove = __exit_p(ehci_mxc_drv_remove), | 240 | .remove = ehci_mxc_drv_remove, |
| 283 | .shutdown = ehci_mxc_drv_shutdown, | 241 | .shutdown = ehci_mxc_drv_shutdown, |
| 284 | .driver = { | 242 | .driver = { |
| 285 | .name = "mxc-ehci", | 243 | .name = "mxc-ehci", |
| 286 | }, | 244 | }, |
| 287 | }; | 245 | }; |
| 246 | |||
| 247 | static int __init ehci_mxc_init(void) | ||
| 248 | { | ||
| 249 | if (usb_disabled()) | ||
| 250 | return -ENODEV; | ||
| 251 | |||
| 252 | pr_info("%s: " DRIVER_DESC "\n", hcd_name); | ||
| 253 | |||
| 254 | ehci_init_driver(&ehci_mxc_hc_driver, &ehci_mxc_overrides); | ||
| 255 | return platform_driver_register(&ehci_mxc_driver); | ||
| 256 | } | ||
| 257 | module_init(ehci_mxc_init); | ||
| 258 | |||
| 259 | static void __exit ehci_mxc_cleanup(void) | ||
| 260 | { | ||
| 261 | platform_driver_unregister(&ehci_mxc_driver); | ||
| 262 | } | ||
| 263 | module_exit(ehci_mxc_cleanup); | ||
| 264 | |||
| 265 | MODULE_DESCRIPTION(DRIVER_DESC); | ||
| 266 | MODULE_AUTHOR("Sascha Hauer"); | ||
| 267 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h index 9dadc7118d68..36c3a8210595 100644 --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h | |||
| @@ -38,6 +38,10 @@ typedef __u16 __bitwise __hc16; | |||
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | /* statistics can be kept for tuning/monitoring */ | 40 | /* statistics can be kept for tuning/monitoring */ |
| 41 | #ifdef DEBUG | ||
| 42 | #define EHCI_STATS | ||
| 43 | #endif | ||
| 44 | |||
| 41 | struct ehci_stats { | 45 | struct ehci_stats { |
| 42 | /* irq usage */ | 46 | /* irq usage */ |
| 43 | unsigned long normal; | 47 | unsigned long normal; |
| @@ -221,6 +225,9 @@ struct ehci_hcd { /* one per controller */ | |||
| 221 | #ifdef DEBUG | 225 | #ifdef DEBUG |
| 222 | struct dentry *debug_dir; | 226 | struct dentry *debug_dir; |
| 223 | #endif | 227 | #endif |
| 228 | |||
| 229 | /* platform-specific data -- must come last */ | ||
| 230 | unsigned long priv[0] __aligned(sizeof(s64)); | ||
| 224 | }; | 231 | }; |
| 225 | 232 | ||
| 226 | /* convert between an HCD pointer and the corresponding EHCI_HCD */ | 233 | /* convert between an HCD pointer and the corresponding EHCI_HCD */ |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 4b9e9aba2665..4f64d24eebc8 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
| @@ -447,6 +447,10 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd) | |||
| 447 | return IRQ_NONE; | 447 | return IRQ_NONE; |
| 448 | uhci_writew(uhci, status, USBSTS); /* Clear it */ | 448 | uhci_writew(uhci, status, USBSTS); /* Clear it */ |
| 449 | 449 | ||
| 450 | spin_lock(&uhci->lock); | ||
| 451 | if (unlikely(!uhci->is_initialized)) /* not yet configured */ | ||
| 452 | goto done; | ||
| 453 | |||
| 450 | if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) { | 454 | if (status & ~(USBSTS_USBINT | USBSTS_ERROR | USBSTS_RD)) { |
| 451 | if (status & USBSTS_HSE) | 455 | if (status & USBSTS_HSE) |
| 452 | dev_err(uhci_dev(uhci), "host system error, " | 456 | dev_err(uhci_dev(uhci), "host system error, " |
| @@ -455,7 +459,6 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd) | |||
| 455 | dev_err(uhci_dev(uhci), "host controller process " | 459 | dev_err(uhci_dev(uhci), "host controller process " |
| 456 | "error, something bad happened!\n"); | 460 | "error, something bad happened!\n"); |
| 457 | if (status & USBSTS_HCH) { | 461 | if (status & USBSTS_HCH) { |
| 458 | spin_lock(&uhci->lock); | ||
| 459 | if (uhci->rh_state >= UHCI_RH_RUNNING) { | 462 | if (uhci->rh_state >= UHCI_RH_RUNNING) { |
| 460 | dev_err(uhci_dev(uhci), | 463 | dev_err(uhci_dev(uhci), |
| 461 | "host controller halted, " | 464 | "host controller halted, " |
| @@ -473,15 +476,15 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd) | |||
| 473 | * pending unlinks */ | 476 | * pending unlinks */ |
| 474 | mod_timer(&hcd->rh_timer, jiffies); | 477 | mod_timer(&hcd->rh_timer, jiffies); |
| 475 | } | 478 | } |
| 476 | spin_unlock(&uhci->lock); | ||
| 477 | } | 479 | } |
| 478 | } | 480 | } |
| 479 | 481 | ||
| 480 | if (status & USBSTS_RD) | 482 | if (status & USBSTS_RD) { |
| 483 | spin_unlock(&uhci->lock); | ||
| 481 | usb_hcd_poll_rh_status(hcd); | 484 | usb_hcd_poll_rh_status(hcd); |
| 482 | else { | 485 | } else { |
| 483 | spin_lock(&uhci->lock); | ||
| 484 | uhci_scan_schedule(uhci); | 486 | uhci_scan_schedule(uhci); |
| 487 | done: | ||
| 485 | spin_unlock(&uhci->lock); | 488 | spin_unlock(&uhci->lock); |
| 486 | } | 489 | } |
| 487 | 490 | ||
| @@ -662,9 +665,9 @@ static int uhci_start(struct usb_hcd *hcd) | |||
| 662 | */ | 665 | */ |
| 663 | mb(); | 666 | mb(); |
| 664 | 667 | ||
| 668 | spin_lock_irq(&uhci->lock); | ||
| 665 | configure_hc(uhci); | 669 | configure_hc(uhci); |
| 666 | uhci->is_initialized = 1; | 670 | uhci->is_initialized = 1; |
| 667 | spin_lock_irq(&uhci->lock); | ||
| 668 | start_rh(uhci); | 671 | start_rh(uhci); |
| 669 | spin_unlock_irq(&uhci->lock); | 672 | spin_unlock_irq(&uhci->lock); |
| 670 | return 0; | 673 | return 0; |
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 0968dd7a859d..f522000e8f06 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
| @@ -105,7 +105,7 @@ static void cppi_reset_tx(struct cppi_tx_stateram __iomem *tx, u32 ptr) | |||
| 105 | musb_writel(&tx->tx_complete, 0, ptr); | 105 | musb_writel(&tx->tx_complete, 0, ptr); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | static void __init cppi_pool_init(struct cppi *cppi, struct cppi_channel *c) | 108 | static void cppi_pool_init(struct cppi *cppi, struct cppi_channel *c) |
| 109 | { | 109 | { |
| 110 | int j; | 110 | int j; |
| 111 | 111 | ||
| @@ -150,7 +150,7 @@ static void cppi_pool_free(struct cppi_channel *c) | |||
| 150 | c->last_processed = NULL; | 150 | c->last_processed = NULL; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static int __init cppi_controller_start(struct dma_controller *c) | 153 | static int cppi_controller_start(struct dma_controller *c) |
| 154 | { | 154 | { |
| 155 | struct cppi *controller; | 155 | struct cppi *controller; |
| 156 | void __iomem *tibase; | 156 | void __iomem *tibase; |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 58184f3de686..82afc4d6a327 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -530,6 +530,9 @@ static void chase_port(struct edgeport_port *port, unsigned long timeout, | |||
| 530 | wait_queue_t wait; | 530 | wait_queue_t wait; |
| 531 | unsigned long flags; | 531 | unsigned long flags; |
| 532 | 532 | ||
| 533 | if (!tty) | ||
| 534 | return; | ||
| 535 | |||
| 533 | if (!timeout) | 536 | if (!timeout) |
| 534 | timeout = (HZ * EDGE_CLOSING_WAIT)/100; | 537 | timeout = (HZ * EDGE_CLOSING_WAIT)/100; |
| 535 | 538 | ||
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 478adcfcdf26..0d9dac9e7f93 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -449,6 +449,10 @@ static void option_instat_callback(struct urb *urb); | |||
| 449 | #define PETATEL_VENDOR_ID 0x1ff4 | 449 | #define PETATEL_VENDOR_ID 0x1ff4 |
| 450 | #define PETATEL_PRODUCT_NP10T 0x600e | 450 | #define PETATEL_PRODUCT_NP10T 0x600e |
| 451 | 451 | ||
| 452 | /* TP-LINK Incorporated products */ | ||
| 453 | #define TPLINK_VENDOR_ID 0x2357 | ||
| 454 | #define TPLINK_PRODUCT_MA180 0x0201 | ||
| 455 | |||
| 452 | /* some devices interfaces need special handling due to a number of reasons */ | 456 | /* some devices interfaces need special handling due to a number of reasons */ |
| 453 | enum option_blacklist_reason { | 457 | enum option_blacklist_reason { |
| 454 | OPTION_BLACKLIST_NONE = 0, | 458 | OPTION_BLACKLIST_NONE = 0, |
| @@ -930,7 +934,8 @@ static const struct usb_device_id option_ids[] = { | |||
| 930 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) }, | 934 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) }, |
| 931 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ | 935 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ |
| 932 | .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, | 936 | .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, |
| 933 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) }, | 937 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff), /* ONDA MT8205 */ |
| 938 | .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
| 934 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */ | 939 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */ |
| 935 | .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | 940 | .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, |
| 936 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, | 941 | { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, |
| @@ -1311,6 +1316,8 @@ static const struct usb_device_id option_ids[] = { | |||
| 1311 | { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) }, | 1316 | { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) }, |
| 1312 | { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, | 1317 | { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) }, |
| 1313 | { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, | 1318 | { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, |
| 1319 | { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), | ||
| 1320 | .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, | ||
| 1314 | { } /* Terminating entry */ | 1321 | { } /* Terminating entry */ |
| 1315 | }; | 1322 | }; |
| 1316 | MODULE_DEVICE_TABLE(usb, option_ids); | 1323 | MODULE_DEVICE_TABLE(usb, option_ids); |
diff --git a/drivers/vfio/pci/vfio_pci_rdwr.c b/drivers/vfio/pci/vfio_pci_rdwr.c index 4362d9e7baa3..f72323ef618f 100644 --- a/drivers/vfio/pci/vfio_pci_rdwr.c +++ b/drivers/vfio/pci/vfio_pci_rdwr.c | |||
| @@ -240,17 +240,17 @@ ssize_t vfio_pci_mem_readwrite(struct vfio_pci_device *vdev, char __user *buf, | |||
| 240 | filled = 1; | 240 | filled = 1; |
| 241 | } else { | 241 | } else { |
| 242 | /* Drop writes, fill reads with FF */ | 242 | /* Drop writes, fill reads with FF */ |
| 243 | filled = min((size_t)(x_end - pos), count); | ||
| 243 | if (!iswrite) { | 244 | if (!iswrite) { |
| 244 | char val = 0xFF; | 245 | char val = 0xFF; |
| 245 | size_t i; | 246 | size_t i; |
| 246 | 247 | ||
| 247 | for (i = 0; i < x_end - pos; i++) { | 248 | for (i = 0; i < filled; i++) { |
| 248 | if (put_user(val, buf + i)) | 249 | if (put_user(val, buf + i)) |
| 249 | goto out; | 250 | goto out; |
| 250 | } | 251 | } |
| 251 | } | 252 | } |
| 252 | 253 | ||
| 253 | filled = x_end - pos; | ||
| 254 | } | 254 | } |
| 255 | 255 | ||
| 256 | count -= filled; | 256 | count -= filled; |
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 12526787a7c7..0abf2bf20836 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c | |||
| @@ -139,6 +139,7 @@ struct imxfb_info { | |||
| 139 | struct clk *clk_ahb; | 139 | struct clk *clk_ahb; |
| 140 | struct clk *clk_per; | 140 | struct clk *clk_per; |
| 141 | enum imxfb_type devtype; | 141 | enum imxfb_type devtype; |
| 142 | bool enabled; | ||
| 142 | 143 | ||
| 143 | /* | 144 | /* |
| 144 | * These are the addresses we mapped | 145 | * These are the addresses we mapped |
| @@ -536,6 +537,10 @@ static void imxfb_exit_backlight(struct imxfb_info *fbi) | |||
| 536 | 537 | ||
| 537 | static void imxfb_enable_controller(struct imxfb_info *fbi) | 538 | static void imxfb_enable_controller(struct imxfb_info *fbi) |
| 538 | { | 539 | { |
| 540 | |||
| 541 | if (fbi->enabled) | ||
| 542 | return; | ||
| 543 | |||
| 539 | pr_debug("Enabling LCD controller\n"); | 544 | pr_debug("Enabling LCD controller\n"); |
| 540 | 545 | ||
| 541 | writel(fbi->screen_dma, fbi->regs + LCDC_SSA); | 546 | writel(fbi->screen_dma, fbi->regs + LCDC_SSA); |
| @@ -556,6 +561,7 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) | |||
| 556 | clk_prepare_enable(fbi->clk_ipg); | 561 | clk_prepare_enable(fbi->clk_ipg); |
| 557 | clk_prepare_enable(fbi->clk_ahb); | 562 | clk_prepare_enable(fbi->clk_ahb); |
| 558 | clk_prepare_enable(fbi->clk_per); | 563 | clk_prepare_enable(fbi->clk_per); |
| 564 | fbi->enabled = true; | ||
| 559 | 565 | ||
| 560 | if (fbi->backlight_power) | 566 | if (fbi->backlight_power) |
| 561 | fbi->backlight_power(1); | 567 | fbi->backlight_power(1); |
| @@ -565,6 +571,9 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) | |||
| 565 | 571 | ||
| 566 | static void imxfb_disable_controller(struct imxfb_info *fbi) | 572 | static void imxfb_disable_controller(struct imxfb_info *fbi) |
| 567 | { | 573 | { |
| 574 | if (!fbi->enabled) | ||
| 575 | return; | ||
| 576 | |||
| 568 | pr_debug("Disabling LCD controller\n"); | 577 | pr_debug("Disabling LCD controller\n"); |
| 569 | 578 | ||
| 570 | if (fbi->backlight_power) | 579 | if (fbi->backlight_power) |
| @@ -575,6 +584,7 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) | |||
| 575 | clk_disable_unprepare(fbi->clk_per); | 584 | clk_disable_unprepare(fbi->clk_per); |
| 576 | clk_disable_unprepare(fbi->clk_ipg); | 585 | clk_disable_unprepare(fbi->clk_ipg); |
| 577 | clk_disable_unprepare(fbi->clk_ahb); | 586 | clk_disable_unprepare(fbi->clk_ahb); |
| 587 | fbi->enabled = false; | ||
| 578 | 588 | ||
| 579 | writel(0, fbi->regs + LCDC_RMCR); | 589 | writel(0, fbi->regs + LCDC_RMCR); |
| 580 | } | 590 | } |
| @@ -729,6 +739,8 @@ static int __init imxfb_init_fbinfo(struct platform_device *pdev) | |||
| 729 | 739 | ||
| 730 | memset(fbi, 0, sizeof(struct imxfb_info)); | 740 | memset(fbi, 0, sizeof(struct imxfb_info)); |
| 731 | 741 | ||
| 742 | fbi->devtype = pdev->id_entry->driver_data; | ||
| 743 | |||
| 732 | strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id)); | 744 | strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id)); |
| 733 | 745 | ||
| 734 | info->fix.type = FB_TYPE_PACKED_PIXELS; | 746 | info->fix.type = FB_TYPE_PACKED_PIXELS; |
| @@ -789,7 +801,6 @@ static int __init imxfb_probe(struct platform_device *pdev) | |||
| 789 | return -ENOMEM; | 801 | return -ENOMEM; |
| 790 | 802 | ||
| 791 | fbi = info->par; | 803 | fbi = info->par; |
| 792 | fbi->devtype = pdev->id_entry->driver_data; | ||
| 793 | 804 | ||
| 794 | if (!fb_mode) | 805 | if (!fb_mode) |
| 795 | fb_mode = pdata->mode[0].mode.name; | 806 | fb_mode = pdata->mode[0].mode.name; |
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c index 4dcfced107f5..084041d42c9a 100644 --- a/drivers/xen/cpu_hotplug.c +++ b/drivers/xen/cpu_hotplug.c | |||
| @@ -25,10 +25,10 @@ static void disable_hotplug_cpu(int cpu) | |||
| 25 | static int vcpu_online(unsigned int cpu) | 25 | static int vcpu_online(unsigned int cpu) |
| 26 | { | 26 | { |
| 27 | int err; | 27 | int err; |
| 28 | char dir[32], state[32]; | 28 | char dir[16], state[16]; |
| 29 | 29 | ||
| 30 | sprintf(dir, "cpu/%u", cpu); | 30 | sprintf(dir, "cpu/%u", cpu); |
| 31 | err = xenbus_scanf(XBT_NIL, dir, "availability", "%s", state); | 31 | err = xenbus_scanf(XBT_NIL, dir, "availability", "%15s", state); |
| 32 | if (err != 1) { | 32 | if (err != 1) { |
| 33 | if (!xen_initial_domain()) | 33 | if (!xen_initial_domain()) |
| 34 | printk(KERN_ERR "XENBUS: Unable to read cpu state\n"); | 34 | printk(KERN_ERR "XENBUS: Unable to read cpu state\n"); |
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 2e22df2f7a3f..3c8803feba26 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c | |||
| @@ -56,10 +56,15 @@ MODULE_PARM_DESC(limit, "Maximum number of grants that may be mapped by " | |||
| 56 | static atomic_t pages_mapped = ATOMIC_INIT(0); | 56 | static atomic_t pages_mapped = ATOMIC_INIT(0); |
| 57 | 57 | ||
| 58 | static int use_ptemod; | 58 | static int use_ptemod; |
| 59 | #define populate_freeable_maps use_ptemod | ||
| 59 | 60 | ||
| 60 | struct gntdev_priv { | 61 | struct gntdev_priv { |
| 62 | /* maps with visible offsets in the file descriptor */ | ||
| 61 | struct list_head maps; | 63 | struct list_head maps; |
| 62 | /* lock protects maps from concurrent changes */ | 64 | /* maps that are not visible; will be freed on munmap. |
| 65 | * Only populated if populate_freeable_maps == 1 */ | ||
| 66 | struct list_head freeable_maps; | ||
| 67 | /* lock protects maps and freeable_maps */ | ||
| 63 | spinlock_t lock; | 68 | spinlock_t lock; |
| 64 | struct mm_struct *mm; | 69 | struct mm_struct *mm; |
| 65 | struct mmu_notifier mn; | 70 | struct mmu_notifier mn; |
| @@ -193,7 +198,7 @@ static struct grant_map *gntdev_find_map_index(struct gntdev_priv *priv, | |||
| 193 | return NULL; | 198 | return NULL; |
| 194 | } | 199 | } |
| 195 | 200 | ||
| 196 | static void gntdev_put_map(struct grant_map *map) | 201 | static void gntdev_put_map(struct gntdev_priv *priv, struct grant_map *map) |
| 197 | { | 202 | { |
| 198 | if (!map) | 203 | if (!map) |
| 199 | return; | 204 | return; |
| @@ -208,6 +213,12 @@ static void gntdev_put_map(struct grant_map *map) | |||
| 208 | evtchn_put(map->notify.event); | 213 | evtchn_put(map->notify.event); |
| 209 | } | 214 | } |
| 210 | 215 | ||
| 216 | if (populate_freeable_maps && priv) { | ||
| 217 | spin_lock(&priv->lock); | ||
| 218 | list_del(&map->next); | ||
| 219 | spin_unlock(&priv->lock); | ||
| 220 | } | ||
| 221 | |||
| 211 | if (map->pages && !use_ptemod) | 222 | if (map->pages && !use_ptemod) |
| 212 | unmap_grant_pages(map, 0, map->count); | 223 | unmap_grant_pages(map, 0, map->count); |
| 213 | gntdev_free_map(map); | 224 | gntdev_free_map(map); |
| @@ -301,17 +312,10 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages) | |||
| 301 | 312 | ||
| 302 | if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) { | 313 | if (map->notify.flags & UNMAP_NOTIFY_CLEAR_BYTE) { |
| 303 | int pgno = (map->notify.addr >> PAGE_SHIFT); | 314 | int pgno = (map->notify.addr >> PAGE_SHIFT); |
| 304 | if (pgno >= offset && pgno < offset + pages && use_ptemod) { | 315 | if (pgno >= offset && pgno < offset + pages) { |
| 305 | void __user *tmp = (void __user *) | 316 | /* No need for kmap, pages are in lowmem */ |
| 306 | map->vma->vm_start + map->notify.addr; | 317 | uint8_t *tmp = pfn_to_kaddr(page_to_pfn(map->pages[pgno])); |
| 307 | err = copy_to_user(tmp, &err, 1); | ||
| 308 | if (err) | ||
| 309 | return -EFAULT; | ||
| 310 | map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE; | ||
| 311 | } else if (pgno >= offset && pgno < offset + pages) { | ||
| 312 | uint8_t *tmp = kmap(map->pages[pgno]); | ||
| 313 | tmp[map->notify.addr & (PAGE_SIZE-1)] = 0; | 318 | tmp[map->notify.addr & (PAGE_SIZE-1)] = 0; |
| 314 | kunmap(map->pages[pgno]); | ||
| 315 | map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE; | 319 | map->notify.flags &= ~UNMAP_NOTIFY_CLEAR_BYTE; |
| 316 | } | 320 | } |
| 317 | } | 321 | } |
| @@ -376,11 +380,24 @@ static void gntdev_vma_open(struct vm_area_struct *vma) | |||
| 376 | static void gntdev_vma_close(struct vm_area_struct *vma) | 380 | static void gntdev_vma_close(struct vm_area_struct *vma) |
| 377 | { | 381 | { |
| 378 | struct grant_map *map = vma->vm_private_data; | 382 | struct grant_map *map = vma->vm_private_data; |
| 383 | struct file *file = vma->vm_file; | ||
| 384 | struct gntdev_priv *priv = file->private_data; | ||
| 379 | 385 | ||
| 380 | pr_debug("gntdev_vma_close %p\n", vma); | 386 | pr_debug("gntdev_vma_close %p\n", vma); |
| 381 | map->vma = NULL; | 387 | if (use_ptemod) { |
| 388 | /* It is possible that an mmu notifier could be running | ||
| 389 | * concurrently, so take priv->lock to ensure that the vma won't | ||
| 390 | * vanishing during the unmap_grant_pages call, since we will | ||
| 391 | * spin here until that completes. Such a concurrent call will | ||
| 392 | * not do any unmapping, since that has been done prior to | ||
| 393 | * closing the vma, but it may still iterate the unmap_ops list. | ||
| 394 | */ | ||
| 395 | spin_lock(&priv->lock); | ||
| 396 | map->vma = NULL; | ||
| 397 | spin_unlock(&priv->lock); | ||
| 398 | } | ||
| 382 | vma->vm_private_data = NULL; | 399 | vma->vm_private_data = NULL; |
| 383 | gntdev_put_map(map); | 400 | gntdev_put_map(priv, map); |
| 384 | } | 401 | } |
| 385 | 402 | ||
| 386 | static struct vm_operations_struct gntdev_vmops = { | 403 | static struct vm_operations_struct gntdev_vmops = { |
| @@ -390,33 +407,43 @@ static struct vm_operations_struct gntdev_vmops = { | |||
| 390 | 407 | ||
| 391 | /* ------------------------------------------------------------------ */ | 408 | /* ------------------------------------------------------------------ */ |
| 392 | 409 | ||
| 410 | static void unmap_if_in_range(struct grant_map *map, | ||
| 411 | unsigned long start, unsigned long end) | ||
| 412 | { | ||
| 413 | unsigned long mstart, mend; | ||
| 414 | int err; | ||
| 415 | |||
| 416 | if (!map->vma) | ||
| 417 | return; | ||
| 418 | if (map->vma->vm_start >= end) | ||
| 419 | return; | ||
| 420 | if (map->vma->vm_end <= start) | ||
| 421 | return; | ||
| 422 | mstart = max(start, map->vma->vm_start); | ||
| 423 | mend = min(end, map->vma->vm_end); | ||
| 424 | pr_debug("map %d+%d (%lx %lx), range %lx %lx, mrange %lx %lx\n", | ||
| 425 | map->index, map->count, | ||
| 426 | map->vma->vm_start, map->vma->vm_end, | ||
| 427 | start, end, mstart, mend); | ||
| 428 | err = unmap_grant_pages(map, | ||
| 429 | (mstart - map->vma->vm_start) >> PAGE_SHIFT, | ||
| 430 | (mend - mstart) >> PAGE_SHIFT); | ||
| 431 | WARN_ON(err); | ||
| 432 | } | ||
| 433 | |||
| 393 | static void mn_invl_range_start(struct mmu_notifier *mn, | 434 | static void mn_invl_range_start(struct mmu_notifier *mn, |
| 394 | struct mm_struct *mm, | 435 | struct mm_struct *mm, |
| 395 | unsigned long start, unsigned long end) | 436 | unsigned long start, unsigned long end) |
| 396 | { | 437 | { |
| 397 | struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn); | 438 | struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn); |
| 398 | struct grant_map *map; | 439 | struct grant_map *map; |
| 399 | unsigned long mstart, mend; | ||
| 400 | int err; | ||
| 401 | 440 | ||
| 402 | spin_lock(&priv->lock); | 441 | spin_lock(&priv->lock); |
| 403 | list_for_each_entry(map, &priv->maps, next) { | 442 | list_for_each_entry(map, &priv->maps, next) { |
| 404 | if (!map->vma) | 443 | unmap_if_in_range(map, start, end); |
| 405 | continue; | 444 | } |
| 406 | if (map->vma->vm_start >= end) | 445 | list_for_each_entry(map, &priv->freeable_maps, next) { |
| 407 | continue; | 446 | unmap_if_in_range(map, start, end); |
| 408 | if (map->vma->vm_end <= start) | ||
| 409 | continue; | ||
| 410 | mstart = max(start, map->vma->vm_start); | ||
| 411 | mend = min(end, map->vma->vm_end); | ||
| 412 | pr_debug("map %d+%d (%lx %lx), range %lx %lx, mrange %lx %lx\n", | ||
| 413 | map->index, map->count, | ||
| 414 | map->vma->vm_start, map->vma->vm_end, | ||
| 415 | start, end, mstart, mend); | ||
| 416 | err = unmap_grant_pages(map, | ||
| 417 | (mstart - map->vma->vm_start) >> PAGE_SHIFT, | ||
| 418 | (mend - mstart) >> PAGE_SHIFT); | ||
| 419 | WARN_ON(err); | ||
| 420 | } | 447 | } |
| 421 | spin_unlock(&priv->lock); | 448 | spin_unlock(&priv->lock); |
| 422 | } | 449 | } |
| @@ -445,6 +472,15 @@ static void mn_release(struct mmu_notifier *mn, | |||
| 445 | err = unmap_grant_pages(map, /* offset */ 0, map->count); | 472 | err = unmap_grant_pages(map, /* offset */ 0, map->count); |
| 446 | WARN_ON(err); | 473 | WARN_ON(err); |
| 447 | } | 474 | } |
| 475 | list_for_each_entry(map, &priv->freeable_maps, next) { | ||
| 476 | if (!map->vma) | ||
| 477 | continue; | ||
| 478 | pr_debug("map %d+%d (%lx %lx)\n", | ||
| 479 | map->index, map->count, | ||
| 480 | map->vma->vm_start, map->vma->vm_end); | ||
| 481 | err = unmap_grant_pages(map, /* offset */ 0, map->count); | ||
| 482 | WARN_ON(err); | ||
| 483 | } | ||
| 448 | spin_unlock(&priv->lock); | 484 | spin_unlock(&priv->lock); |
| 449 | } | 485 | } |
| 450 | 486 | ||
| @@ -466,6 +502,7 @@ static int gntdev_open(struct inode *inode, struct file *flip) | |||
| 466 | return -ENOMEM; | 502 | return -ENOMEM; |
| 467 | 503 | ||
| 468 | INIT_LIST_HEAD(&priv->maps); | 504 | INIT_LIST_HEAD(&priv->maps); |
| 505 | INIT_LIST_HEAD(&priv->freeable_maps); | ||
| 469 | spin_lock_init(&priv->lock); | 506 | spin_lock_init(&priv->lock); |
| 470 | 507 | ||
| 471 | if (use_ptemod) { | 508 | if (use_ptemod) { |
| @@ -500,8 +537,9 @@ static int gntdev_release(struct inode *inode, struct file *flip) | |||
| 500 | while (!list_empty(&priv->maps)) { | 537 | while (!list_empty(&priv->maps)) { |
| 501 | map = list_entry(priv->maps.next, struct grant_map, next); | 538 | map = list_entry(priv->maps.next, struct grant_map, next); |
| 502 | list_del(&map->next); | 539 | list_del(&map->next); |
| 503 | gntdev_put_map(map); | 540 | gntdev_put_map(NULL /* already removed */, map); |
| 504 | } | 541 | } |
| 542 | WARN_ON(!list_empty(&priv->freeable_maps)); | ||
| 505 | 543 | ||
| 506 | if (use_ptemod) | 544 | if (use_ptemod) |
| 507 | mmu_notifier_unregister(&priv->mn, priv->mm); | 545 | mmu_notifier_unregister(&priv->mn, priv->mm); |
| @@ -529,14 +567,14 @@ static long gntdev_ioctl_map_grant_ref(struct gntdev_priv *priv, | |||
| 529 | 567 | ||
| 530 | if (unlikely(atomic_add_return(op.count, &pages_mapped) > limit)) { | 568 | if (unlikely(atomic_add_return(op.count, &pages_mapped) > limit)) { |
| 531 | pr_debug("can't map: over limit\n"); | 569 | pr_debug("can't map: over limit\n"); |
| 532 | gntdev_put_map(map); | 570 | gntdev_put_map(NULL, map); |
| 533 | return err; | 571 | return err; |
| 534 | } | 572 | } |
| 535 | 573 | ||
| 536 | if (copy_from_user(map->grants, &u->refs, | 574 | if (copy_from_user(map->grants, &u->refs, |
| 537 | sizeof(map->grants[0]) * op.count) != 0) { | 575 | sizeof(map->grants[0]) * op.count) != 0) { |
| 538 | gntdev_put_map(map); | 576 | gntdev_put_map(NULL, map); |
| 539 | return err; | 577 | return -EFAULT; |
| 540 | } | 578 | } |
| 541 | 579 | ||
| 542 | spin_lock(&priv->lock); | 580 | spin_lock(&priv->lock); |
| @@ -565,11 +603,13 @@ static long gntdev_ioctl_unmap_grant_ref(struct gntdev_priv *priv, | |||
| 565 | map = gntdev_find_map_index(priv, op.index >> PAGE_SHIFT, op.count); | 603 | map = gntdev_find_map_index(priv, op.index >> PAGE_SHIFT, op.count); |
| 566 | if (map) { | 604 | if (map) { |
| 567 | list_del(&map->next); | 605 | list_del(&map->next); |
| 606 | if (populate_freeable_maps) | ||
| 607 | list_add_tail(&map->next, &priv->freeable_maps); | ||
| 568 | err = 0; | 608 | err = 0; |
| 569 | } | 609 | } |
| 570 | spin_unlock(&priv->lock); | 610 | spin_unlock(&priv->lock); |
| 571 | if (map) | 611 | if (map) |
| 572 | gntdev_put_map(map); | 612 | gntdev_put_map(priv, map); |
| 573 | return err; | 613 | return err; |
| 574 | } | 614 | } |
| 575 | 615 | ||
| @@ -579,25 +619,31 @@ static long gntdev_ioctl_get_offset_for_vaddr(struct gntdev_priv *priv, | |||
| 579 | struct ioctl_gntdev_get_offset_for_vaddr op; | 619 | struct ioctl_gntdev_get_offset_for_vaddr op; |
| 580 | struct vm_area_struct *vma; | 620 | struct vm_area_struct *vma; |
| 581 | struct grant_map *map; | 621 | struct grant_map *map; |
| 622 | int rv = -EINVAL; | ||
| 582 | 623 | ||
| 583 | if (copy_from_user(&op, u, sizeof(op)) != 0) | 624 | if (copy_from_user(&op, u, sizeof(op)) != 0) |
| 584 | return -EFAULT; | 625 | return -EFAULT; |
| 585 | pr_debug("priv %p, offset for vaddr %lx\n", priv, (unsigned long)op.vaddr); | 626 | pr_debug("priv %p, offset for vaddr %lx\n", priv, (unsigned long)op.vaddr); |
| 586 | 627 | ||
| 628 | down_read(¤t->mm->mmap_sem); | ||
| 587 | vma = find_vma(current->mm, op.vaddr); | 629 | vma = find_vma(current->mm, op.vaddr); |
| 588 | if (!vma || vma->vm_ops != &gntdev_vmops) | 630 | if (!vma || vma->vm_ops != &gntdev_vmops) |
| 589 | return -EINVAL; | 631 | goto out_unlock; |
| 590 | 632 | ||
| 591 | map = vma->vm_private_data; | 633 | map = vma->vm_private_data; |
| 592 | if (!map) | 634 | if (!map) |
| 593 | return -EINVAL; | 635 | goto out_unlock; |
| 594 | 636 | ||
| 595 | op.offset = map->index << PAGE_SHIFT; | 637 | op.offset = map->index << PAGE_SHIFT; |
| 596 | op.count = map->count; | 638 | op.count = map->count; |
| 639 | rv = 0; | ||
| 597 | 640 | ||
| 598 | if (copy_to_user(u, &op, sizeof(op)) != 0) | 641 | out_unlock: |
| 642 | up_read(¤t->mm->mmap_sem); | ||
| 643 | |||
| 644 | if (rv == 0 && copy_to_user(u, &op, sizeof(op)) != 0) | ||
| 599 | return -EFAULT; | 645 | return -EFAULT; |
| 600 | return 0; | 646 | return rv; |
| 601 | } | 647 | } |
| 602 | 648 | ||
| 603 | static long gntdev_ioctl_notify(struct gntdev_priv *priv, void __user *u) | 649 | static long gntdev_ioctl_notify(struct gntdev_priv *priv, void __user *u) |
| @@ -778,7 +824,7 @@ out_unlock_put: | |||
| 778 | out_put_map: | 824 | out_put_map: |
| 779 | if (use_ptemod) | 825 | if (use_ptemod) |
| 780 | map->vma = NULL; | 826 | map->vma = NULL; |
| 781 | gntdev_put_map(map); | 827 | gntdev_put_map(priv, map); |
| 782 | return err; | 828 | return err; |
| 783 | } | 829 | } |
| 784 | 830 | ||
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 7038de53652b..157c0ccda3ef 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -56,10 +56,6 @@ | |||
| 56 | /* External tools reserve first few grant table entries. */ | 56 | /* External tools reserve first few grant table entries. */ |
| 57 | #define NR_RESERVED_ENTRIES 8 | 57 | #define NR_RESERVED_ENTRIES 8 |
| 58 | #define GNTTAB_LIST_END 0xffffffff | 58 | #define GNTTAB_LIST_END 0xffffffff |
| 59 | #define GREFS_PER_GRANT_FRAME \ | ||
| 60 | (grant_table_version == 1 ? \ | ||
| 61 | (PAGE_SIZE / sizeof(struct grant_entry_v1)) : \ | ||
| 62 | (PAGE_SIZE / sizeof(union grant_entry_v2))) | ||
| 63 | 59 | ||
| 64 | static grant_ref_t **gnttab_list; | 60 | static grant_ref_t **gnttab_list; |
| 65 | static unsigned int nr_grant_frames; | 61 | static unsigned int nr_grant_frames; |
| @@ -154,6 +150,7 @@ static struct gnttab_ops *gnttab_interface; | |||
| 154 | static grant_status_t *grstatus; | 150 | static grant_status_t *grstatus; |
| 155 | 151 | ||
| 156 | static int grant_table_version; | 152 | static int grant_table_version; |
| 153 | static int grefs_per_grant_frame; | ||
| 157 | 154 | ||
| 158 | static struct gnttab_free_callback *gnttab_free_callback_list; | 155 | static struct gnttab_free_callback *gnttab_free_callback_list; |
| 159 | 156 | ||
| @@ -767,12 +764,14 @@ static int grow_gnttab_list(unsigned int more_frames) | |||
| 767 | unsigned int new_nr_grant_frames, extra_entries, i; | 764 | unsigned int new_nr_grant_frames, extra_entries, i; |
| 768 | unsigned int nr_glist_frames, new_nr_glist_frames; | 765 | unsigned int nr_glist_frames, new_nr_glist_frames; |
| 769 | 766 | ||
| 767 | BUG_ON(grefs_per_grant_frame == 0); | ||
| 768 | |||
| 770 | new_nr_grant_frames = nr_grant_frames + more_frames; | 769 | new_nr_grant_frames = nr_grant_frames + more_frames; |
| 771 | extra_entries = more_frames * GREFS_PER_GRANT_FRAME; | 770 | extra_entries = more_frames * grefs_per_grant_frame; |
| 772 | 771 | ||
| 773 | nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; | 772 | nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP; |
| 774 | new_nr_glist_frames = | 773 | new_nr_glist_frames = |
| 775 | (new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; | 774 | (new_nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP; |
| 776 | for (i = nr_glist_frames; i < new_nr_glist_frames; i++) { | 775 | for (i = nr_glist_frames; i < new_nr_glist_frames; i++) { |
| 777 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC); | 776 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC); |
| 778 | if (!gnttab_list[i]) | 777 | if (!gnttab_list[i]) |
| @@ -780,12 +779,12 @@ static int grow_gnttab_list(unsigned int more_frames) | |||
| 780 | } | 779 | } |
| 781 | 780 | ||
| 782 | 781 | ||
| 783 | for (i = GREFS_PER_GRANT_FRAME * nr_grant_frames; | 782 | for (i = grefs_per_grant_frame * nr_grant_frames; |
| 784 | i < GREFS_PER_GRANT_FRAME * new_nr_grant_frames - 1; i++) | 783 | i < grefs_per_grant_frame * new_nr_grant_frames - 1; i++) |
| 785 | gnttab_entry(i) = i + 1; | 784 | gnttab_entry(i) = i + 1; |
| 786 | 785 | ||
| 787 | gnttab_entry(i) = gnttab_free_head; | 786 | gnttab_entry(i) = gnttab_free_head; |
| 788 | gnttab_free_head = GREFS_PER_GRANT_FRAME * nr_grant_frames; | 787 | gnttab_free_head = grefs_per_grant_frame * nr_grant_frames; |
| 789 | gnttab_free_count += extra_entries; | 788 | gnttab_free_count += extra_entries; |
| 790 | 789 | ||
| 791 | nr_grant_frames = new_nr_grant_frames; | 790 | nr_grant_frames = new_nr_grant_frames; |
| @@ -957,7 +956,8 @@ EXPORT_SYMBOL_GPL(gnttab_unmap_refs); | |||
| 957 | 956 | ||
| 958 | static unsigned nr_status_frames(unsigned nr_grant_frames) | 957 | static unsigned nr_status_frames(unsigned nr_grant_frames) |
| 959 | { | 958 | { |
| 960 | return (nr_grant_frames * GREFS_PER_GRANT_FRAME + SPP - 1) / SPP; | 959 | BUG_ON(grefs_per_grant_frame == 0); |
| 960 | return (nr_grant_frames * grefs_per_grant_frame + SPP - 1) / SPP; | ||
| 961 | } | 961 | } |
| 962 | 962 | ||
| 963 | static int gnttab_map_frames_v1(xen_pfn_t *frames, unsigned int nr_gframes) | 963 | static int gnttab_map_frames_v1(xen_pfn_t *frames, unsigned int nr_gframes) |
| @@ -1115,6 +1115,7 @@ static void gnttab_request_version(void) | |||
| 1115 | rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); | 1115 | rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); |
| 1116 | if (rc == 0 && gsv.version == 2) { | 1116 | if (rc == 0 && gsv.version == 2) { |
| 1117 | grant_table_version = 2; | 1117 | grant_table_version = 2; |
| 1118 | grefs_per_grant_frame = PAGE_SIZE / sizeof(union grant_entry_v2); | ||
| 1118 | gnttab_interface = &gnttab_v2_ops; | 1119 | gnttab_interface = &gnttab_v2_ops; |
| 1119 | } else if (grant_table_version == 2) { | 1120 | } else if (grant_table_version == 2) { |
| 1120 | /* | 1121 | /* |
| @@ -1127,17 +1128,17 @@ static void gnttab_request_version(void) | |||
| 1127 | panic("we need grant tables version 2, but only version 1 is available"); | 1128 | panic("we need grant tables version 2, but only version 1 is available"); |
| 1128 | } else { | 1129 | } else { |
| 1129 | grant_table_version = 1; | 1130 | grant_table_version = 1; |
| 1131 | grefs_per_grant_frame = PAGE_SIZE / sizeof(struct grant_entry_v1); | ||
| 1130 | gnttab_interface = &gnttab_v1_ops; | 1132 | gnttab_interface = &gnttab_v1_ops; |
| 1131 | } | 1133 | } |
| 1132 | printk(KERN_INFO "Grant tables using version %d layout.\n", | 1134 | printk(KERN_INFO "Grant tables using version %d layout.\n", |
| 1133 | grant_table_version); | 1135 | grant_table_version); |
| 1134 | } | 1136 | } |
| 1135 | 1137 | ||
| 1136 | int gnttab_resume(void) | 1138 | static int gnttab_setup(void) |
| 1137 | { | 1139 | { |
| 1138 | unsigned int max_nr_gframes; | 1140 | unsigned int max_nr_gframes; |
| 1139 | 1141 | ||
| 1140 | gnttab_request_version(); | ||
| 1141 | max_nr_gframes = gnttab_max_grant_frames(); | 1142 | max_nr_gframes = gnttab_max_grant_frames(); |
| 1142 | if (max_nr_gframes < nr_grant_frames) | 1143 | if (max_nr_gframes < nr_grant_frames) |
| 1143 | return -ENOSYS; | 1144 | return -ENOSYS; |
| @@ -1160,6 +1161,12 @@ int gnttab_resume(void) | |||
| 1160 | return 0; | 1161 | return 0; |
| 1161 | } | 1162 | } |
| 1162 | 1163 | ||
| 1164 | int gnttab_resume(void) | ||
| 1165 | { | ||
| 1166 | gnttab_request_version(); | ||
| 1167 | return gnttab_setup(); | ||
| 1168 | } | ||
| 1169 | |||
| 1163 | int gnttab_suspend(void) | 1170 | int gnttab_suspend(void) |
| 1164 | { | 1171 | { |
| 1165 | gnttab_interface->unmap_frames(); | 1172 | gnttab_interface->unmap_frames(); |
| @@ -1171,9 +1178,10 @@ static int gnttab_expand(unsigned int req_entries) | |||
| 1171 | int rc; | 1178 | int rc; |
| 1172 | unsigned int cur, extra; | 1179 | unsigned int cur, extra; |
| 1173 | 1180 | ||
| 1181 | BUG_ON(grefs_per_grant_frame == 0); | ||
| 1174 | cur = nr_grant_frames; | 1182 | cur = nr_grant_frames; |
| 1175 | extra = ((req_entries + (GREFS_PER_GRANT_FRAME-1)) / | 1183 | extra = ((req_entries + (grefs_per_grant_frame-1)) / |
| 1176 | GREFS_PER_GRANT_FRAME); | 1184 | grefs_per_grant_frame); |
| 1177 | if (cur + extra > gnttab_max_grant_frames()) | 1185 | if (cur + extra > gnttab_max_grant_frames()) |
| 1178 | return -ENOSPC; | 1186 | return -ENOSPC; |
| 1179 | 1187 | ||
| @@ -1191,21 +1199,23 @@ int gnttab_init(void) | |||
| 1191 | unsigned int nr_init_grefs; | 1199 | unsigned int nr_init_grefs; |
| 1192 | int ret; | 1200 | int ret; |
| 1193 | 1201 | ||
| 1202 | gnttab_request_version(); | ||
| 1194 | nr_grant_frames = 1; | 1203 | nr_grant_frames = 1; |
| 1195 | boot_max_nr_grant_frames = __max_nr_grant_frames(); | 1204 | boot_max_nr_grant_frames = __max_nr_grant_frames(); |
| 1196 | 1205 | ||
| 1197 | /* Determine the maximum number of frames required for the | 1206 | /* Determine the maximum number of frames required for the |
| 1198 | * grant reference free list on the current hypervisor. | 1207 | * grant reference free list on the current hypervisor. |
| 1199 | */ | 1208 | */ |
| 1209 | BUG_ON(grefs_per_grant_frame == 0); | ||
| 1200 | max_nr_glist_frames = (boot_max_nr_grant_frames * | 1210 | max_nr_glist_frames = (boot_max_nr_grant_frames * |
| 1201 | GREFS_PER_GRANT_FRAME / RPP); | 1211 | grefs_per_grant_frame / RPP); |
| 1202 | 1212 | ||
| 1203 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), | 1213 | gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *), |
| 1204 | GFP_KERNEL); | 1214 | GFP_KERNEL); |
| 1205 | if (gnttab_list == NULL) | 1215 | if (gnttab_list == NULL) |
| 1206 | return -ENOMEM; | 1216 | return -ENOMEM; |
| 1207 | 1217 | ||
| 1208 | nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP; | 1218 | nr_glist_frames = (nr_grant_frames * grefs_per_grant_frame + RPP - 1) / RPP; |
| 1209 | for (i = 0; i < nr_glist_frames; i++) { | 1219 | for (i = 0; i < nr_glist_frames; i++) { |
| 1210 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); | 1220 | gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL); |
| 1211 | if (gnttab_list[i] == NULL) { | 1221 | if (gnttab_list[i] == NULL) { |
| @@ -1214,12 +1224,12 @@ int gnttab_init(void) | |||
| 1214 | } | 1224 | } |
| 1215 | } | 1225 | } |
| 1216 | 1226 | ||
| 1217 | if (gnttab_resume() < 0) { | 1227 | if (gnttab_setup() < 0) { |
| 1218 | ret = -ENODEV; | 1228 | ret = -ENODEV; |
| 1219 | goto ini_nomem; | 1229 | goto ini_nomem; |
| 1220 | } | 1230 | } |
| 1221 | 1231 | ||
| 1222 | nr_init_grefs = nr_grant_frames * GREFS_PER_GRANT_FRAME; | 1232 | nr_init_grefs = nr_grant_frames * grefs_per_grant_frame; |
| 1223 | 1233 | ||
| 1224 | for (i = NR_RESERVED_ENTRIES; i < nr_init_grefs - 1; i++) | 1234 | for (i = NR_RESERVED_ENTRIES; i < nr_init_grefs - 1; i++) |
| 1225 | gnttab_entry(i) = i + 1; | 1235 | gnttab_entry(i) = i + 1; |
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 0bbbccbb1f12..ca2b00e9d558 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c | |||
| @@ -199,9 +199,6 @@ static long privcmd_ioctl_mmap(void __user *udata) | |||
| 199 | LIST_HEAD(pagelist); | 199 | LIST_HEAD(pagelist); |
| 200 | struct mmap_mfn_state state; | 200 | struct mmap_mfn_state state; |
| 201 | 201 | ||
| 202 | if (!xen_initial_domain()) | ||
| 203 | return -EPERM; | ||
| 204 | |||
| 205 | /* We only support privcmd_ioctl_mmap_batch for auto translated. */ | 202 | /* We only support privcmd_ioctl_mmap_batch for auto translated. */ |
| 206 | if (xen_feature(XENFEAT_auto_translated_physmap)) | 203 | if (xen_feature(XENFEAT_auto_translated_physmap)) |
| 207 | return -ENOSYS; | 204 | return -ENOSYS; |
| @@ -261,11 +258,12 @@ struct mmap_batch_state { | |||
| 261 | * -ENOENT if at least 1 -ENOENT has happened. | 258 | * -ENOENT if at least 1 -ENOENT has happened. |
| 262 | */ | 259 | */ |
| 263 | int global_error; | 260 | int global_error; |
| 264 | /* An array for individual errors */ | 261 | int version; |
| 265 | int *err; | ||
| 266 | 262 | ||
| 267 | /* User-space mfn array to store errors in the second pass for V1. */ | 263 | /* User-space mfn array to store errors in the second pass for V1. */ |
| 268 | xen_pfn_t __user *user_mfn; | 264 | xen_pfn_t __user *user_mfn; |
| 265 | /* User-space int array to store errors in the second pass for V2. */ | ||
| 266 | int __user *user_err; | ||
| 269 | }; | 267 | }; |
| 270 | 268 | ||
| 271 | /* auto translated dom0 note: if domU being created is PV, then mfn is | 269 | /* auto translated dom0 note: if domU being created is PV, then mfn is |
| @@ -288,7 +286,19 @@ static int mmap_batch_fn(void *data, void *state) | |||
| 288 | &cur_page); | 286 | &cur_page); |
| 289 | 287 | ||
| 290 | /* Store error code for second pass. */ | 288 | /* Store error code for second pass. */ |
| 291 | *(st->err++) = ret; | 289 | if (st->version == 1) { |
| 290 | if (ret < 0) { | ||
| 291 | /* | ||
| 292 | * V1 encodes the error codes in the 32bit top nibble of the | ||
| 293 | * mfn (with its known limitations vis-a-vis 64 bit callers). | ||
| 294 | */ | ||
| 295 | *mfnp |= (ret == -ENOENT) ? | ||
| 296 | PRIVCMD_MMAPBATCH_PAGED_ERROR : | ||
| 297 | PRIVCMD_MMAPBATCH_MFN_ERROR; | ||
| 298 | } | ||
| 299 | } else { /* st->version == 2 */ | ||
| 300 | *((int *) mfnp) = ret; | ||
| 301 | } | ||
| 292 | 302 | ||
| 293 | /* And see if it affects the global_error. */ | 303 | /* And see if it affects the global_error. */ |
| 294 | if (ret < 0) { | 304 | if (ret < 0) { |
| @@ -305,20 +315,25 @@ static int mmap_batch_fn(void *data, void *state) | |||
| 305 | return 0; | 315 | return 0; |
| 306 | } | 316 | } |
| 307 | 317 | ||
| 308 | static int mmap_return_errors_v1(void *data, void *state) | 318 | static int mmap_return_errors(void *data, void *state) |
| 309 | { | 319 | { |
| 310 | xen_pfn_t *mfnp = data; | ||
| 311 | struct mmap_batch_state *st = state; | 320 | struct mmap_batch_state *st = state; |
| 312 | int err = *(st->err++); | ||
| 313 | 321 | ||
| 314 | /* | 322 | if (st->version == 1) { |
| 315 | * V1 encodes the error codes in the 32bit top nibble of the | 323 | xen_pfn_t mfnp = *((xen_pfn_t *) data); |
| 316 | * mfn (with its known limitations vis-a-vis 64 bit callers). | 324 | if (mfnp & PRIVCMD_MMAPBATCH_MFN_ERROR) |
| 317 | */ | 325 | return __put_user(mfnp, st->user_mfn++); |
| 318 | *mfnp |= (err == -ENOENT) ? | 326 | else |
| 319 | PRIVCMD_MMAPBATCH_PAGED_ERROR : | 327 | st->user_mfn++; |
| 320 | PRIVCMD_MMAPBATCH_MFN_ERROR; | 328 | } else { /* st->version == 2 */ |
| 321 | return __put_user(*mfnp, st->user_mfn++); | 329 | int err = *((int *) data); |
| 330 | if (err) | ||
| 331 | return __put_user(err, st->user_err++); | ||
| 332 | else | ||
| 333 | st->user_err++; | ||
| 334 | } | ||
| 335 | |||
| 336 | return 0; | ||
| 322 | } | 337 | } |
| 323 | 338 | ||
| 324 | /* Allocate pfns that are then mapped with gmfns from foreign domid. Update | 339 | /* Allocate pfns that are then mapped with gmfns from foreign domid. Update |
| @@ -357,12 +372,8 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) | |||
| 357 | struct vm_area_struct *vma; | 372 | struct vm_area_struct *vma; |
| 358 | unsigned long nr_pages; | 373 | unsigned long nr_pages; |
| 359 | LIST_HEAD(pagelist); | 374 | LIST_HEAD(pagelist); |
| 360 | int *err_array = NULL; | ||
| 361 | struct mmap_batch_state state; | 375 | struct mmap_batch_state state; |
| 362 | 376 | ||
| 363 | if (!xen_initial_domain()) | ||
| 364 | return -EPERM; | ||
| 365 | |||
| 366 | switch (version) { | 377 | switch (version) { |
| 367 | case 1: | 378 | case 1: |
| 368 | if (copy_from_user(&m, udata, sizeof(struct privcmd_mmapbatch))) | 379 | if (copy_from_user(&m, udata, sizeof(struct privcmd_mmapbatch))) |
| @@ -396,10 +407,12 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) | |||
| 396 | goto out; | 407 | goto out; |
| 397 | } | 408 | } |
| 398 | 409 | ||
| 399 | err_array = kcalloc(m.num, sizeof(int), GFP_KERNEL); | 410 | if (version == 2) { |
| 400 | if (err_array == NULL) { | 411 | /* Zero error array now to only copy back actual errors. */ |
| 401 | ret = -ENOMEM; | 412 | if (clear_user(m.err, sizeof(int) * m.num)) { |
| 402 | goto out; | 413 | ret = -EFAULT; |
| 414 | goto out; | ||
| 415 | } | ||
| 403 | } | 416 | } |
| 404 | 417 | ||
| 405 | down_write(&mm->mmap_sem); | 418 | down_write(&mm->mmap_sem); |
| @@ -427,7 +440,7 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) | |||
| 427 | state.va = m.addr; | 440 | state.va = m.addr; |
| 428 | state.index = 0; | 441 | state.index = 0; |
| 429 | state.global_error = 0; | 442 | state.global_error = 0; |
| 430 | state.err = err_array; | 443 | state.version = version; |
| 431 | 444 | ||
| 432 | /* mmap_batch_fn guarantees ret == 0 */ | 445 | /* mmap_batch_fn guarantees ret == 0 */ |
| 433 | BUG_ON(traverse_pages(m.num, sizeof(xen_pfn_t), | 446 | BUG_ON(traverse_pages(m.num, sizeof(xen_pfn_t), |
| @@ -435,21 +448,14 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) | |||
| 435 | 448 | ||
| 436 | up_write(&mm->mmap_sem); | 449 | up_write(&mm->mmap_sem); |
| 437 | 450 | ||
| 438 | if (version == 1) { | 451 | if (state.global_error) { |
| 439 | if (state.global_error) { | 452 | /* Write back errors in second pass. */ |
| 440 | /* Write back errors in second pass. */ | 453 | state.user_mfn = (xen_pfn_t *)m.arr; |
| 441 | state.user_mfn = (xen_pfn_t *)m.arr; | 454 | state.user_err = m.err; |
| 442 | state.err = err_array; | 455 | ret = traverse_pages(m.num, sizeof(xen_pfn_t), |
| 443 | ret = traverse_pages(m.num, sizeof(xen_pfn_t), | 456 | &pagelist, mmap_return_errors, &state); |
| 444 | &pagelist, mmap_return_errors_v1, &state); | 457 | } else |
| 445 | } else | 458 | ret = 0; |
| 446 | ret = 0; | ||
| 447 | |||
| 448 | } else if (version == 2) { | ||
| 449 | ret = __copy_to_user(m.err, err_array, m.num * sizeof(int)); | ||
| 450 | if (ret) | ||
| 451 | ret = -EFAULT; | ||
| 452 | } | ||
| 453 | 459 | ||
| 454 | /* If we have not had any EFAULT-like global errors then set the global | 460 | /* If we have not had any EFAULT-like global errors then set the global |
| 455 | * error to -ENOENT if necessary. */ | 461 | * error to -ENOENT if necessary. */ |
| @@ -457,7 +463,6 @@ static long privcmd_ioctl_mmap_batch(void __user *udata, int version) | |||
| 457 | ret = -ENOENT; | 463 | ret = -ENOENT; |
| 458 | 464 | ||
| 459 | out: | 465 | out: |
| 460 | kfree(err_array); | ||
| 461 | free_page_list(&pagelist); | 466 | free_page_list(&pagelist); |
| 462 | 467 | ||
| 463 | return ret; | 468 | return ret; |
diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h index a7def010eba3..f72af87640e0 100644 --- a/drivers/xen/xen-pciback/pciback.h +++ b/drivers/xen/xen-pciback/pciback.h | |||
| @@ -124,7 +124,7 @@ static inline int xen_pcibk_add_pci_dev(struct xen_pcibk_device *pdev, | |||
| 124 | static inline void xen_pcibk_release_pci_dev(struct xen_pcibk_device *pdev, | 124 | static inline void xen_pcibk_release_pci_dev(struct xen_pcibk_device *pdev, |
| 125 | struct pci_dev *dev) | 125 | struct pci_dev *dev) |
| 126 | { | 126 | { |
| 127 | if (xen_pcibk_backend && xen_pcibk_backend->free) | 127 | if (xen_pcibk_backend && xen_pcibk_backend->release) |
| 128 | return xen_pcibk_backend->release(pdev, dev); | 128 | return xen_pcibk_backend->release(pdev, dev); |
| 129 | } | 129 | } |
| 130 | 130 | ||
diff --git a/fs/Kconfig b/fs/Kconfig index cfe512fd1caf..780725a463b1 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -68,16 +68,6 @@ source "fs/quota/Kconfig" | |||
| 68 | source "fs/autofs4/Kconfig" | 68 | source "fs/autofs4/Kconfig" |
| 69 | source "fs/fuse/Kconfig" | 69 | source "fs/fuse/Kconfig" |
| 70 | 70 | ||
| 71 | config CUSE | ||
| 72 | tristate "Character device in Userspace support" | ||
| 73 | depends on FUSE_FS | ||
| 74 | help | ||
| 75 | This FUSE extension allows character devices to be | ||
| 76 | implemented in userspace. | ||
| 77 | |||
| 78 | If you want to develop or use userspace character device | ||
| 79 | based on CUSE, answer Y or M. | ||
| 80 | |||
| 81 | config GENERIC_ACL | 71 | config GENERIC_ACL |
| 82 | bool | 72 | bool |
| 83 | select FS_POSIX_ACL | 73 | select FS_POSIX_ACL |
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 521e9d4424f6..a8b8adc05070 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
| @@ -3997,7 +3997,7 @@ again: | |||
| 3997 | * We make the other tasks wait for the flush only when we can flush | 3997 | * We make the other tasks wait for the flush only when we can flush |
| 3998 | * all things. | 3998 | * all things. |
| 3999 | */ | 3999 | */ |
| 4000 | if (ret && flush == BTRFS_RESERVE_FLUSH_ALL) { | 4000 | if (ret && flush != BTRFS_RESERVE_NO_FLUSH) { |
| 4001 | flushing = true; | 4001 | flushing = true; |
| 4002 | space_info->flush = 1; | 4002 | space_info->flush = 1; |
| 4003 | } | 4003 | } |
| @@ -5560,7 +5560,7 @@ static noinline int find_free_extent(struct btrfs_trans_handle *trans, | |||
| 5560 | int empty_cluster = 2 * 1024 * 1024; | 5560 | int empty_cluster = 2 * 1024 * 1024; |
| 5561 | struct btrfs_space_info *space_info; | 5561 | struct btrfs_space_info *space_info; |
| 5562 | int loop = 0; | 5562 | int loop = 0; |
| 5563 | int index = 0; | 5563 | int index = __get_raid_index(data); |
| 5564 | int alloc_type = (data & BTRFS_BLOCK_GROUP_DATA) ? | 5564 | int alloc_type = (data & BTRFS_BLOCK_GROUP_DATA) ? |
| 5565 | RESERVE_ALLOC_NO_ACCOUNT : RESERVE_ALLOC; | 5565 | RESERVE_ALLOC_NO_ACCOUNT : RESERVE_ALLOC; |
| 5566 | bool found_uncached_bg = false; | 5566 | bool found_uncached_bg = false; |
| @@ -6788,11 +6788,13 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, | |||
| 6788 | &wc->flags[level]); | 6788 | &wc->flags[level]); |
| 6789 | if (ret < 0) { | 6789 | if (ret < 0) { |
| 6790 | btrfs_tree_unlock_rw(eb, path->locks[level]); | 6790 | btrfs_tree_unlock_rw(eb, path->locks[level]); |
| 6791 | path->locks[level] = 0; | ||
| 6791 | return ret; | 6792 | return ret; |
| 6792 | } | 6793 | } |
| 6793 | BUG_ON(wc->refs[level] == 0); | 6794 | BUG_ON(wc->refs[level] == 0); |
| 6794 | if (wc->refs[level] == 1) { | 6795 | if (wc->refs[level] == 1) { |
| 6795 | btrfs_tree_unlock_rw(eb, path->locks[level]); | 6796 | btrfs_tree_unlock_rw(eb, path->locks[level]); |
| 6797 | path->locks[level] = 0; | ||
| 6796 | return 1; | 6798 | return 1; |
| 6797 | } | 6799 | } |
| 6798 | } | 6800 | } |
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index f169d6b11d7f..2e8cae63d247 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c | |||
| @@ -171,6 +171,10 @@ static int mergable_maps(struct extent_map *prev, struct extent_map *next) | |||
| 171 | if (test_bit(EXTENT_FLAG_COMPRESSED, &prev->flags)) | 171 | if (test_bit(EXTENT_FLAG_COMPRESSED, &prev->flags)) |
| 172 | return 0; | 172 | return 0; |
| 173 | 173 | ||
| 174 | if (test_bit(EXTENT_FLAG_LOGGING, &prev->flags) || | ||
| 175 | test_bit(EXTENT_FLAG_LOGGING, &next->flags)) | ||
| 176 | return 0; | ||
| 177 | |||
| 174 | if (extent_map_end(prev) == next->start && | 178 | if (extent_map_end(prev) == next->start && |
| 175 | prev->flags == next->flags && | 179 | prev->flags == next->flags && |
| 176 | prev->bdev == next->bdev && | 180 | prev->bdev == next->bdev && |
| @@ -255,7 +259,8 @@ int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, | |||
| 255 | if (!em) | 259 | if (!em) |
| 256 | goto out; | 260 | goto out; |
| 257 | 261 | ||
| 258 | list_move(&em->list, &tree->modified_extents); | 262 | if (!test_bit(EXTENT_FLAG_LOGGING, &em->flags)) |
| 263 | list_move(&em->list, &tree->modified_extents); | ||
| 259 | em->generation = gen; | 264 | em->generation = gen; |
| 260 | clear_bit(EXTENT_FLAG_PINNED, &em->flags); | 265 | clear_bit(EXTENT_FLAG_PINNED, &em->flags); |
| 261 | em->mod_start = em->start; | 266 | em->mod_start = em->start; |
| @@ -280,6 +285,12 @@ out: | |||
| 280 | 285 | ||
| 281 | } | 286 | } |
| 282 | 287 | ||
| 288 | void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em) | ||
| 289 | { | ||
| 290 | clear_bit(EXTENT_FLAG_LOGGING, &em->flags); | ||
| 291 | try_merge_map(tree, em); | ||
| 292 | } | ||
| 293 | |||
| 283 | /** | 294 | /** |
| 284 | * add_extent_mapping - add new extent map to the extent tree | 295 | * add_extent_mapping - add new extent map to the extent tree |
| 285 | * @tree: tree to insert new map in | 296 | * @tree: tree to insert new map in |
diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index 922943ce29e8..c6598c89cff8 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h | |||
| @@ -69,6 +69,7 @@ void free_extent_map(struct extent_map *em); | |||
| 69 | int __init extent_map_init(void); | 69 | int __init extent_map_init(void); |
| 70 | void extent_map_exit(void); | 70 | void extent_map_exit(void); |
| 71 | int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen); | 71 | int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen); |
| 72 | void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em); | ||
| 72 | struct extent_map *search_extent_mapping(struct extent_map_tree *tree, | 73 | struct extent_map *search_extent_mapping(struct extent_map_tree *tree, |
| 73 | u64 start, u64 len); | 74 | u64 start, u64 len); |
| 74 | #endif | 75 | #endif |
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index bd38cef42358..94aa53b38721 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c | |||
| @@ -460,8 +460,8 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode, | |||
| 460 | if (!contig) | 460 | if (!contig) |
| 461 | offset = page_offset(bvec->bv_page) + bvec->bv_offset; | 461 | offset = page_offset(bvec->bv_page) + bvec->bv_offset; |
| 462 | 462 | ||
| 463 | if (!contig && (offset >= ordered->file_offset + ordered->len || | 463 | if (offset >= ordered->file_offset + ordered->len || |
| 464 | offset < ordered->file_offset)) { | 464 | offset < ordered->file_offset) { |
| 465 | unsigned long bytes_left; | 465 | unsigned long bytes_left; |
| 466 | sums->len = this_sum_bytes; | 466 | sums->len = this_sum_bytes; |
| 467 | this_sum_bytes = 0; | 467 | this_sum_bytes = 0; |
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 77061bf43edb..f76b1fd160d4 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
| @@ -2241,6 +2241,7 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) | |||
| 2241 | if (lockend <= lockstart) | 2241 | if (lockend <= lockstart) |
| 2242 | lockend = lockstart + root->sectorsize; | 2242 | lockend = lockstart + root->sectorsize; |
| 2243 | 2243 | ||
| 2244 | lockend--; | ||
| 2244 | len = lockend - lockstart + 1; | 2245 | len = lockend - lockstart + 1; |
| 2245 | 2246 | ||
| 2246 | len = max_t(u64, len, root->sectorsize); | 2247 | len = max_t(u64, len, root->sectorsize); |
| @@ -2307,9 +2308,12 @@ static int find_desired_extent(struct inode *inode, loff_t *offset, int whence) | |||
| 2307 | } | 2308 | } |
| 2308 | } | 2309 | } |
| 2309 | 2310 | ||
| 2310 | *offset = start; | 2311 | if (!test_bit(EXTENT_FLAG_PREALLOC, |
| 2311 | free_extent_map(em); | 2312 | &em->flags)) { |
| 2312 | break; | 2313 | *offset = start; |
| 2314 | free_extent_map(em); | ||
| 2315 | break; | ||
| 2316 | } | ||
| 2313 | } | 2317 | } |
| 2314 | } | 2318 | } |
| 2315 | 2319 | ||
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 59ea2e4349c9..0be7a8742a43 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c | |||
| @@ -1862,11 +1862,13 @@ int btrfs_remove_free_space(struct btrfs_block_group_cache *block_group, | |||
| 1862 | { | 1862 | { |
| 1863 | struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl; | 1863 | struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl; |
| 1864 | struct btrfs_free_space *info; | 1864 | struct btrfs_free_space *info; |
| 1865 | int ret = 0; | 1865 | int ret; |
| 1866 | bool re_search = false; | ||
| 1866 | 1867 | ||
| 1867 | spin_lock(&ctl->tree_lock); | 1868 | spin_lock(&ctl->tree_lock); |
| 1868 | 1869 | ||
| 1869 | again: | 1870 | again: |
| 1871 | ret = 0; | ||
| 1870 | if (!bytes) | 1872 | if (!bytes) |
| 1871 | goto out_lock; | 1873 | goto out_lock; |
| 1872 | 1874 | ||
| @@ -1879,17 +1881,17 @@ again: | |||
| 1879 | info = tree_search_offset(ctl, offset_to_bitmap(ctl, offset), | 1881 | info = tree_search_offset(ctl, offset_to_bitmap(ctl, offset), |
| 1880 | 1, 0); | 1882 | 1, 0); |
| 1881 | if (!info) { | 1883 | if (!info) { |
| 1882 | /* the tree logging code might be calling us before we | 1884 | /* |
| 1883 | * have fully loaded the free space rbtree for this | 1885 | * If we found a partial bit of our free space in a |
| 1884 | * block group. So it is possible the entry won't | 1886 | * bitmap but then couldn't find the other part this may |
| 1885 | * be in the rbtree yet at all. The caching code | 1887 | * be a problem, so WARN about it. |
| 1886 | * will make sure not to put it in the rbtree if | ||
| 1887 | * the logging code has pinned it. | ||
| 1888 | */ | 1888 | */ |
| 1889 | WARN_ON(re_search); | ||
| 1889 | goto out_lock; | 1890 | goto out_lock; |
| 1890 | } | 1891 | } |
| 1891 | } | 1892 | } |
| 1892 | 1893 | ||
| 1894 | re_search = false; | ||
| 1893 | if (!info->bitmap) { | 1895 | if (!info->bitmap) { |
| 1894 | unlink_free_space(ctl, info); | 1896 | unlink_free_space(ctl, info); |
| 1895 | if (offset == info->offset) { | 1897 | if (offset == info->offset) { |
| @@ -1935,8 +1937,10 @@ again: | |||
| 1935 | } | 1937 | } |
| 1936 | 1938 | ||
| 1937 | ret = remove_from_bitmap(ctl, info, &offset, &bytes); | 1939 | ret = remove_from_bitmap(ctl, info, &offset, &bytes); |
| 1938 | if (ret == -EAGAIN) | 1940 | if (ret == -EAGAIN) { |
| 1941 | re_search = true; | ||
| 1939 | goto again; | 1942 | goto again; |
| 1943 | } | ||
| 1940 | BUG_ON(ret); /* logic error */ | 1944 | BUG_ON(ret); /* logic error */ |
| 1941 | out_lock: | 1945 | out_lock: |
| 1942 | spin_unlock(&ctl->tree_lock); | 1946 | spin_unlock(&ctl->tree_lock); |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 16d9e8e191e6..cc93b23ca352 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -88,7 +88,7 @@ static unsigned char btrfs_type_by_mode[S_IFMT >> S_SHIFT] = { | |||
| 88 | [S_IFLNK >> S_SHIFT] = BTRFS_FT_SYMLINK, | 88 | [S_IFLNK >> S_SHIFT] = BTRFS_FT_SYMLINK, |
| 89 | }; | 89 | }; |
| 90 | 90 | ||
| 91 | static int btrfs_setsize(struct inode *inode, loff_t newsize); | 91 | static int btrfs_setsize(struct inode *inode, struct iattr *attr); |
| 92 | static int btrfs_truncate(struct inode *inode); | 92 | static int btrfs_truncate(struct inode *inode); |
| 93 | static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent); | 93 | static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent); |
| 94 | static noinline int cow_file_range(struct inode *inode, | 94 | static noinline int cow_file_range(struct inode *inode, |
| @@ -2478,6 +2478,18 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) | |||
| 2478 | continue; | 2478 | continue; |
| 2479 | } | 2479 | } |
| 2480 | nr_truncate++; | 2480 | nr_truncate++; |
| 2481 | |||
| 2482 | /* 1 for the orphan item deletion. */ | ||
| 2483 | trans = btrfs_start_transaction(root, 1); | ||
| 2484 | if (IS_ERR(trans)) { | ||
| 2485 | ret = PTR_ERR(trans); | ||
| 2486 | goto out; | ||
| 2487 | } | ||
| 2488 | ret = btrfs_orphan_add(trans, inode); | ||
| 2489 | btrfs_end_transaction(trans, root); | ||
| 2490 | if (ret) | ||
| 2491 | goto out; | ||
| 2492 | |||
| 2481 | ret = btrfs_truncate(inode); | 2493 | ret = btrfs_truncate(inode); |
| 2482 | } else { | 2494 | } else { |
| 2483 | nr_unlink++; | 2495 | nr_unlink++; |
| @@ -3665,6 +3677,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size) | |||
| 3665 | block_end - cur_offset, 0); | 3677 | block_end - cur_offset, 0); |
| 3666 | if (IS_ERR(em)) { | 3678 | if (IS_ERR(em)) { |
| 3667 | err = PTR_ERR(em); | 3679 | err = PTR_ERR(em); |
| 3680 | em = NULL; | ||
| 3668 | break; | 3681 | break; |
| 3669 | } | 3682 | } |
| 3670 | last_byte = min(extent_map_end(em), block_end); | 3683 | last_byte = min(extent_map_end(em), block_end); |
| @@ -3748,16 +3761,27 @@ next: | |||
| 3748 | return err; | 3761 | return err; |
| 3749 | } | 3762 | } |
| 3750 | 3763 | ||
| 3751 | static int btrfs_setsize(struct inode *inode, loff_t newsize) | 3764 | static int btrfs_setsize(struct inode *inode, struct iattr *attr) |
| 3752 | { | 3765 | { |
| 3753 | struct btrfs_root *root = BTRFS_I(inode)->root; | 3766 | struct btrfs_root *root = BTRFS_I(inode)->root; |
| 3754 | struct btrfs_trans_handle *trans; | 3767 | struct btrfs_trans_handle *trans; |
| 3755 | loff_t oldsize = i_size_read(inode); | 3768 | loff_t oldsize = i_size_read(inode); |
| 3769 | loff_t newsize = attr->ia_size; | ||
| 3770 | int mask = attr->ia_valid; | ||
| 3756 | int ret; | 3771 | int ret; |
| 3757 | 3772 | ||
| 3758 | if (newsize == oldsize) | 3773 | if (newsize == oldsize) |
| 3759 | return 0; | 3774 | return 0; |
| 3760 | 3775 | ||
| 3776 | /* | ||
| 3777 | * The regular truncate() case without ATTR_CTIME and ATTR_MTIME is a | ||
| 3778 | * special case where we need to update the times despite not having | ||
| 3779 | * these flags set. For all other operations the VFS set these flags | ||
| 3780 | * explicitly if it wants a timestamp update. | ||
| 3781 | */ | ||
| 3782 | if (newsize != oldsize && (!(mask & (ATTR_CTIME | ATTR_MTIME)))) | ||
| 3783 | inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb); | ||
| 3784 | |||
| 3761 | if (newsize > oldsize) { | 3785 | if (newsize > oldsize) { |
| 3762 | truncate_pagecache(inode, oldsize, newsize); | 3786 | truncate_pagecache(inode, oldsize, newsize); |
| 3763 | ret = btrfs_cont_expand(inode, oldsize, newsize); | 3787 | ret = btrfs_cont_expand(inode, oldsize, newsize); |
| @@ -3783,9 +3807,34 @@ static int btrfs_setsize(struct inode *inode, loff_t newsize) | |||
| 3783 | set_bit(BTRFS_INODE_ORDERED_DATA_CLOSE, | 3807 | set_bit(BTRFS_INODE_ORDERED_DATA_CLOSE, |
| 3784 | &BTRFS_I(inode)->runtime_flags); | 3808 | &BTRFS_I(inode)->runtime_flags); |
| 3785 | 3809 | ||
| 3810 | /* | ||
| 3811 | * 1 for the orphan item we're going to add | ||
| 3812 | * 1 for the orphan item deletion. | ||
| 3813 | */ | ||
| 3814 | trans = btrfs_start_transaction(root, 2); | ||
| 3815 | if (IS_ERR(trans)) | ||
| 3816 | return PTR_ERR(trans); | ||
| 3817 | |||
| 3818 | /* | ||
| 3819 | * We need to do this in case we fail at _any_ point during the | ||
| 3820 | * actual truncate. Once we do the truncate_setsize we could | ||
| 3821 | * invalidate pages which forces any outstanding ordered io to | ||
| 3822 | * be instantly completed which will give us extents that need | ||
| 3823 | * to be truncated. If we fail to get an orphan inode down we | ||
| 3824 | * could have left over extents that were never meant to live, | ||
| 3825 | * so we need to garuntee from this point on that everything | ||
| 3826 | * will be consistent. | ||
| 3827 | */ | ||
| 3828 | ret = btrfs_orphan_add(trans, inode); | ||
| 3829 | btrfs_end_transaction(trans, root); | ||
| 3830 | if (ret) | ||
| 3831 | return ret; | ||
| 3832 | |||
| 3786 | /* we don't support swapfiles, so vmtruncate shouldn't fail */ | 3833 | /* we don't support swapfiles, so vmtruncate shouldn't fail */ |
| 3787 | truncate_setsize(inode, newsize); | 3834 | truncate_setsize(inode, newsize); |
| 3788 | ret = btrfs_truncate(inode); | 3835 | ret = btrfs_truncate(inode); |
| 3836 | if (ret && inode->i_nlink) | ||
| 3837 | btrfs_orphan_del(NULL, inode); | ||
| 3789 | } | 3838 | } |
| 3790 | 3839 | ||
| 3791 | return ret; | 3840 | return ret; |
| @@ -3805,7 +3854,7 @@ static int btrfs_setattr(struct dentry *dentry, struct iattr *attr) | |||
| 3805 | return err; | 3854 | return err; |
| 3806 | 3855 | ||
| 3807 | if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { | 3856 | if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { |
| 3808 | err = btrfs_setsize(inode, attr->ia_size); | 3857 | err = btrfs_setsize(inode, attr); |
| 3809 | if (err) | 3858 | if (err) |
| 3810 | return err; | 3859 | return err; |
| 3811 | } | 3860 | } |
| @@ -5572,10 +5621,13 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag | |||
| 5572 | return em; | 5621 | return em; |
| 5573 | if (em) { | 5622 | if (em) { |
| 5574 | /* | 5623 | /* |
| 5575 | * if our em maps to a hole, there might | 5624 | * if our em maps to |
| 5576 | * actually be delalloc bytes behind it | 5625 | * - a hole or |
| 5626 | * - a pre-alloc extent, | ||
| 5627 | * there might actually be delalloc bytes behind it. | ||
| 5577 | */ | 5628 | */ |
| 5578 | if (em->block_start != EXTENT_MAP_HOLE) | 5629 | if (em->block_start != EXTENT_MAP_HOLE && |
| 5630 | !test_bit(EXTENT_FLAG_PREALLOC, &em->flags)) | ||
| 5579 | return em; | 5631 | return em; |
| 5580 | else | 5632 | else |
| 5581 | hole_em = em; | 5633 | hole_em = em; |
| @@ -5657,6 +5709,8 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag | |||
| 5657 | */ | 5709 | */ |
| 5658 | em->block_start = hole_em->block_start; | 5710 | em->block_start = hole_em->block_start; |
| 5659 | em->block_len = hole_len; | 5711 | em->block_len = hole_len; |
| 5712 | if (test_bit(EXTENT_FLAG_PREALLOC, &hole_em->flags)) | ||
| 5713 | set_bit(EXTENT_FLAG_PREALLOC, &em->flags); | ||
| 5660 | } else { | 5714 | } else { |
| 5661 | em->start = range_start; | 5715 | em->start = range_start; |
| 5662 | em->len = found; | 5716 | em->len = found; |
| @@ -6915,11 +6969,9 @@ static int btrfs_truncate(struct inode *inode) | |||
| 6915 | 6969 | ||
| 6916 | /* | 6970 | /* |
| 6917 | * 1 for the truncate slack space | 6971 | * 1 for the truncate slack space |
| 6918 | * 1 for the orphan item we're going to add | ||
| 6919 | * 1 for the orphan item deletion | ||
| 6920 | * 1 for updating the inode. | 6972 | * 1 for updating the inode. |
| 6921 | */ | 6973 | */ |
| 6922 | trans = btrfs_start_transaction(root, 4); | 6974 | trans = btrfs_start_transaction(root, 2); |
| 6923 | if (IS_ERR(trans)) { | 6975 | if (IS_ERR(trans)) { |
| 6924 | err = PTR_ERR(trans); | 6976 | err = PTR_ERR(trans); |
| 6925 | goto out; | 6977 | goto out; |
| @@ -6930,12 +6982,6 @@ static int btrfs_truncate(struct inode *inode) | |||
| 6930 | min_size); | 6982 | min_size); |
| 6931 | BUG_ON(ret); | 6983 | BUG_ON(ret); |
| 6932 | 6984 | ||
| 6933 | ret = btrfs_orphan_add(trans, inode); | ||
| 6934 | if (ret) { | ||
| 6935 | btrfs_end_transaction(trans, root); | ||
| 6936 | goto out; | ||
| 6937 | } | ||
| 6938 | |||
| 6939 | /* | 6985 | /* |
| 6940 | * setattr is responsible for setting the ordered_data_close flag, | 6986 | * setattr is responsible for setting the ordered_data_close flag, |
| 6941 | * but that is only tested during the last file release. That | 6987 | * but that is only tested during the last file release. That |
| @@ -7004,12 +7050,6 @@ static int btrfs_truncate(struct inode *inode) | |||
| 7004 | ret = btrfs_orphan_del(trans, inode); | 7050 | ret = btrfs_orphan_del(trans, inode); |
| 7005 | if (ret) | 7051 | if (ret) |
| 7006 | err = ret; | 7052 | err = ret; |
| 7007 | } else if (ret && inode->i_nlink > 0) { | ||
| 7008 | /* | ||
| 7009 | * Failed to do the truncate, remove us from the in memory | ||
| 7010 | * orphan list. | ||
| 7011 | */ | ||
| 7012 | ret = btrfs_orphan_del(NULL, inode); | ||
| 7013 | } | 7053 | } |
| 7014 | 7054 | ||
| 7015 | if (trans) { | 7055 | if (trans) { |
| @@ -7531,41 +7571,61 @@ void btrfs_wait_and_free_delalloc_work(struct btrfs_delalloc_work *work) | |||
| 7531 | */ | 7571 | */ |
| 7532 | int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput) | 7572 | int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput) |
| 7533 | { | 7573 | { |
| 7534 | struct list_head *head = &root->fs_info->delalloc_inodes; | ||
| 7535 | struct btrfs_inode *binode; | 7574 | struct btrfs_inode *binode; |
| 7536 | struct inode *inode; | 7575 | struct inode *inode; |
| 7537 | struct btrfs_delalloc_work *work, *next; | 7576 | struct btrfs_delalloc_work *work, *next; |
| 7538 | struct list_head works; | 7577 | struct list_head works; |
| 7578 | struct list_head splice; | ||
| 7539 | int ret = 0; | 7579 | int ret = 0; |
| 7540 | 7580 | ||
| 7541 | if (root->fs_info->sb->s_flags & MS_RDONLY) | 7581 | if (root->fs_info->sb->s_flags & MS_RDONLY) |
| 7542 | return -EROFS; | 7582 | return -EROFS; |
| 7543 | 7583 | ||
| 7544 | INIT_LIST_HEAD(&works); | 7584 | INIT_LIST_HEAD(&works); |
| 7545 | 7585 | INIT_LIST_HEAD(&splice); | |
| 7586 | again: | ||
| 7546 | spin_lock(&root->fs_info->delalloc_lock); | 7587 | spin_lock(&root->fs_info->delalloc_lock); |
| 7547 | while (!list_empty(head)) { | 7588 | list_splice_init(&root->fs_info->delalloc_inodes, &splice); |
| 7548 | binode = list_entry(head->next, struct btrfs_inode, | 7589 | while (!list_empty(&splice)) { |
| 7590 | binode = list_entry(splice.next, struct btrfs_inode, | ||
| 7549 | delalloc_inodes); | 7591 | delalloc_inodes); |
| 7592 | |||
| 7593 | list_del_init(&binode->delalloc_inodes); | ||
| 7594 | |||
| 7550 | inode = igrab(&binode->vfs_inode); | 7595 | inode = igrab(&binode->vfs_inode); |
| 7551 | if (!inode) | 7596 | if (!inode) |
| 7552 | list_del_init(&binode->delalloc_inodes); | 7597 | continue; |
| 7598 | |||
| 7599 | list_add_tail(&binode->delalloc_inodes, | ||
| 7600 | &root->fs_info->delalloc_inodes); | ||
| 7553 | spin_unlock(&root->fs_info->delalloc_lock); | 7601 | spin_unlock(&root->fs_info->delalloc_lock); |
| 7554 | if (inode) { | 7602 | |
| 7555 | work = btrfs_alloc_delalloc_work(inode, 0, delay_iput); | 7603 | work = btrfs_alloc_delalloc_work(inode, 0, delay_iput); |
| 7556 | if (!work) { | 7604 | if (unlikely(!work)) { |
| 7557 | ret = -ENOMEM; | 7605 | ret = -ENOMEM; |
| 7558 | goto out; | 7606 | goto out; |
| 7559 | } | ||
| 7560 | list_add_tail(&work->list, &works); | ||
| 7561 | btrfs_queue_worker(&root->fs_info->flush_workers, | ||
| 7562 | &work->work); | ||
| 7563 | } | 7607 | } |
| 7608 | list_add_tail(&work->list, &works); | ||
| 7609 | btrfs_queue_worker(&root->fs_info->flush_workers, | ||
| 7610 | &work->work); | ||
| 7611 | |||
| 7564 | cond_resched(); | 7612 | cond_resched(); |
| 7565 | spin_lock(&root->fs_info->delalloc_lock); | 7613 | spin_lock(&root->fs_info->delalloc_lock); |
| 7566 | } | 7614 | } |
| 7567 | spin_unlock(&root->fs_info->delalloc_lock); | 7615 | spin_unlock(&root->fs_info->delalloc_lock); |
| 7568 | 7616 | ||
| 7617 | list_for_each_entry_safe(work, next, &works, list) { | ||
| 7618 | list_del_init(&work->list); | ||
| 7619 | btrfs_wait_and_free_delalloc_work(work); | ||
| 7620 | } | ||
| 7621 | |||
| 7622 | spin_lock(&root->fs_info->delalloc_lock); | ||
| 7623 | if (!list_empty(&root->fs_info->delalloc_inodes)) { | ||
| 7624 | spin_unlock(&root->fs_info->delalloc_lock); | ||
| 7625 | goto again; | ||
| 7626 | } | ||
| 7627 | spin_unlock(&root->fs_info->delalloc_lock); | ||
| 7628 | |||
| 7569 | /* the filemap_flush will queue IO into the worker threads, but | 7629 | /* the filemap_flush will queue IO into the worker threads, but |
| 7570 | * we have to make sure the IO is actually started and that | 7630 | * we have to make sure the IO is actually started and that |
| 7571 | * ordered extents get created before we return | 7631 | * ordered extents get created before we return |
| @@ -7578,11 +7638,18 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput) | |||
| 7578 | atomic_read(&root->fs_info->async_delalloc_pages) == 0)); | 7638 | atomic_read(&root->fs_info->async_delalloc_pages) == 0)); |
| 7579 | } | 7639 | } |
| 7580 | atomic_dec(&root->fs_info->async_submit_draining); | 7640 | atomic_dec(&root->fs_info->async_submit_draining); |
| 7641 | return 0; | ||
| 7581 | out: | 7642 | out: |
| 7582 | list_for_each_entry_safe(work, next, &works, list) { | 7643 | list_for_each_entry_safe(work, next, &works, list) { |
| 7583 | list_del_init(&work->list); | 7644 | list_del_init(&work->list); |
| 7584 | btrfs_wait_and_free_delalloc_work(work); | 7645 | btrfs_wait_and_free_delalloc_work(work); |
| 7585 | } | 7646 | } |
| 7647 | |||
| 7648 | if (!list_empty_careful(&splice)) { | ||
| 7649 | spin_lock(&root->fs_info->delalloc_lock); | ||
| 7650 | list_splice_tail(&splice, &root->fs_info->delalloc_inodes); | ||
| 7651 | spin_unlock(&root->fs_info->delalloc_lock); | ||
| 7652 | } | ||
| 7586 | return ret; | 7653 | return ret; |
| 7587 | } | 7654 | } |
| 7588 | 7655 | ||
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 4b4516770f05..5b22d45d3c6a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
| @@ -1339,7 +1339,8 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
| 1339 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, | 1339 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, |
| 1340 | 1)) { | 1340 | 1)) { |
| 1341 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | 1341 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); |
| 1342 | return -EINPROGRESS; | 1342 | mnt_drop_write_file(file); |
| 1343 | return -EINVAL; | ||
| 1343 | } | 1344 | } |
| 1344 | 1345 | ||
| 1345 | mutex_lock(&root->fs_info->volume_mutex); | 1346 | mutex_lock(&root->fs_info->volume_mutex); |
| @@ -1362,6 +1363,7 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
| 1362 | printk(KERN_INFO "btrfs: resizing devid %llu\n", | 1363 | printk(KERN_INFO "btrfs: resizing devid %llu\n", |
| 1363 | (unsigned long long)devid); | 1364 | (unsigned long long)devid); |
| 1364 | } | 1365 | } |
| 1366 | |||
| 1365 | device = btrfs_find_device(root->fs_info, devid, NULL, NULL); | 1367 | device = btrfs_find_device(root->fs_info, devid, NULL, NULL); |
| 1366 | if (!device) { | 1368 | if (!device) { |
| 1367 | printk(KERN_INFO "btrfs: resizer unable to find device %llu\n", | 1369 | printk(KERN_INFO "btrfs: resizer unable to find device %llu\n", |
| @@ -1369,9 +1371,10 @@ static noinline int btrfs_ioctl_resize(struct file *file, | |||
| 1369 | ret = -EINVAL; | 1371 | ret = -EINVAL; |
| 1370 | goto out_free; | 1372 | goto out_free; |
| 1371 | } | 1373 | } |
| 1372 | if (device->fs_devices && device->fs_devices->seeding) { | 1374 | |
| 1375 | if (!device->writeable) { | ||
| 1373 | printk(KERN_INFO "btrfs: resizer unable to apply on " | 1376 | printk(KERN_INFO "btrfs: resizer unable to apply on " |
| 1374 | "seeding device %llu\n", | 1377 | "readonly device %llu\n", |
| 1375 | (unsigned long long)devid); | 1378 | (unsigned long long)devid); |
| 1376 | ret = -EINVAL; | 1379 | ret = -EINVAL; |
| 1377 | goto out_free; | 1380 | goto out_free; |
| @@ -1443,8 +1446,8 @@ out_free: | |||
| 1443 | kfree(vol_args); | 1446 | kfree(vol_args); |
| 1444 | out: | 1447 | out: |
| 1445 | mutex_unlock(&root->fs_info->volume_mutex); | 1448 | mutex_unlock(&root->fs_info->volume_mutex); |
| 1446 | mnt_drop_write_file(file); | ||
| 1447 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); | 1449 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); |
| 1450 | mnt_drop_write_file(file); | ||
| 1448 | return ret; | 1451 | return ret; |
| 1449 | } | 1452 | } |
| 1450 | 1453 | ||
| @@ -2095,13 +2098,13 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, | |||
| 2095 | err = inode_permission(inode, MAY_WRITE | MAY_EXEC); | 2098 | err = inode_permission(inode, MAY_WRITE | MAY_EXEC); |
| 2096 | if (err) | 2099 | if (err) |
| 2097 | goto out_dput; | 2100 | goto out_dput; |
| 2098 | |||
| 2099 | /* check if subvolume may be deleted by a non-root user */ | ||
| 2100 | err = btrfs_may_delete(dir, dentry, 1); | ||
| 2101 | if (err) | ||
| 2102 | goto out_dput; | ||
| 2103 | } | 2101 | } |
| 2104 | 2102 | ||
| 2103 | /* check if subvolume may be deleted by a user */ | ||
| 2104 | err = btrfs_may_delete(dir, dentry, 1); | ||
| 2105 | if (err) | ||
| 2106 | goto out_dput; | ||
| 2107 | |||
| 2105 | if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) { | 2108 | if (btrfs_ino(inode) != BTRFS_FIRST_FREE_OBJECTID) { |
| 2106 | err = -EINVAL; | 2109 | err = -EINVAL; |
| 2107 | goto out_dput; | 2110 | goto out_dput; |
| @@ -2183,19 +2186,20 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
| 2183 | struct btrfs_ioctl_defrag_range_args *range; | 2186 | struct btrfs_ioctl_defrag_range_args *range; |
| 2184 | int ret; | 2187 | int ret; |
| 2185 | 2188 | ||
| 2186 | if (btrfs_root_readonly(root)) | 2189 | ret = mnt_want_write_file(file); |
| 2187 | return -EROFS; | 2190 | if (ret) |
| 2191 | return ret; | ||
| 2188 | 2192 | ||
| 2189 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, | 2193 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, |
| 2190 | 1)) { | 2194 | 1)) { |
| 2191 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | 2195 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); |
| 2192 | return -EINPROGRESS; | 2196 | mnt_drop_write_file(file); |
| 2197 | return -EINVAL; | ||
| 2193 | } | 2198 | } |
| 2194 | ret = mnt_want_write_file(file); | 2199 | |
| 2195 | if (ret) { | 2200 | if (btrfs_root_readonly(root)) { |
| 2196 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, | 2201 | ret = -EROFS; |
| 2197 | 0); | 2202 | goto out; |
| 2198 | return ret; | ||
| 2199 | } | 2203 | } |
| 2200 | 2204 | ||
| 2201 | switch (inode->i_mode & S_IFMT) { | 2205 | switch (inode->i_mode & S_IFMT) { |
| @@ -2247,8 +2251,8 @@ static int btrfs_ioctl_defrag(struct file *file, void __user *argp) | |||
| 2247 | ret = -EINVAL; | 2251 | ret = -EINVAL; |
| 2248 | } | 2252 | } |
| 2249 | out: | 2253 | out: |
| 2250 | mnt_drop_write_file(file); | ||
| 2251 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); | 2254 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); |
| 2255 | mnt_drop_write_file(file); | ||
| 2252 | return ret; | 2256 | return ret; |
| 2253 | } | 2257 | } |
| 2254 | 2258 | ||
| @@ -2263,7 +2267,7 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg) | |||
| 2263 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, | 2267 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, |
| 2264 | 1)) { | 2268 | 1)) { |
| 2265 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | 2269 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); |
| 2266 | return -EINPROGRESS; | 2270 | return -EINVAL; |
| 2267 | } | 2271 | } |
| 2268 | 2272 | ||
| 2269 | mutex_lock(&root->fs_info->volume_mutex); | 2273 | mutex_lock(&root->fs_info->volume_mutex); |
| @@ -2300,7 +2304,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) | |||
| 2300 | 1)) { | 2304 | 1)) { |
| 2301 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | 2305 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); |
| 2302 | mnt_drop_write_file(file); | 2306 | mnt_drop_write_file(file); |
| 2303 | return -EINPROGRESS; | 2307 | return -EINVAL; |
| 2304 | } | 2308 | } |
| 2305 | 2309 | ||
| 2306 | mutex_lock(&root->fs_info->volume_mutex); | 2310 | mutex_lock(&root->fs_info->volume_mutex); |
| @@ -2316,8 +2320,8 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) | |||
| 2316 | kfree(vol_args); | 2320 | kfree(vol_args); |
| 2317 | out: | 2321 | out: |
| 2318 | mutex_unlock(&root->fs_info->volume_mutex); | 2322 | mutex_unlock(&root->fs_info->volume_mutex); |
| 2319 | mnt_drop_write_file(file); | ||
| 2320 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); | 2323 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, 0); |
| 2324 | mnt_drop_write_file(file); | ||
| 2321 | return ret; | 2325 | return ret; |
| 2322 | } | 2326 | } |
| 2323 | 2327 | ||
| @@ -3437,8 +3441,8 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg) | |||
| 3437 | struct btrfs_fs_info *fs_info = root->fs_info; | 3441 | struct btrfs_fs_info *fs_info = root->fs_info; |
| 3438 | struct btrfs_ioctl_balance_args *bargs; | 3442 | struct btrfs_ioctl_balance_args *bargs; |
| 3439 | struct btrfs_balance_control *bctl; | 3443 | struct btrfs_balance_control *bctl; |
| 3444 | bool need_unlock; /* for mut. excl. ops lock */ | ||
| 3440 | int ret; | 3445 | int ret; |
| 3441 | int need_to_clear_lock = 0; | ||
| 3442 | 3446 | ||
| 3443 | if (!capable(CAP_SYS_ADMIN)) | 3447 | if (!capable(CAP_SYS_ADMIN)) |
| 3444 | return -EPERM; | 3448 | return -EPERM; |
| @@ -3447,14 +3451,61 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg) | |||
| 3447 | if (ret) | 3451 | if (ret) |
| 3448 | return ret; | 3452 | return ret; |
| 3449 | 3453 | ||
| 3450 | mutex_lock(&fs_info->volume_mutex); | 3454 | again: |
| 3455 | if (!atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)) { | ||
| 3456 | mutex_lock(&fs_info->volume_mutex); | ||
| 3457 | mutex_lock(&fs_info->balance_mutex); | ||
| 3458 | need_unlock = true; | ||
| 3459 | goto locked; | ||
| 3460 | } | ||
| 3461 | |||
| 3462 | /* | ||
| 3463 | * mut. excl. ops lock is locked. Three possibilites: | ||
| 3464 | * (1) some other op is running | ||
| 3465 | * (2) balance is running | ||
| 3466 | * (3) balance is paused -- special case (think resume) | ||
| 3467 | */ | ||
| 3451 | mutex_lock(&fs_info->balance_mutex); | 3468 | mutex_lock(&fs_info->balance_mutex); |
| 3469 | if (fs_info->balance_ctl) { | ||
| 3470 | /* this is either (2) or (3) */ | ||
| 3471 | if (!atomic_read(&fs_info->balance_running)) { | ||
| 3472 | mutex_unlock(&fs_info->balance_mutex); | ||
| 3473 | if (!mutex_trylock(&fs_info->volume_mutex)) | ||
| 3474 | goto again; | ||
| 3475 | mutex_lock(&fs_info->balance_mutex); | ||
| 3476 | |||
| 3477 | if (fs_info->balance_ctl && | ||
| 3478 | !atomic_read(&fs_info->balance_running)) { | ||
| 3479 | /* this is (3) */ | ||
| 3480 | need_unlock = false; | ||
| 3481 | goto locked; | ||
| 3482 | } | ||
| 3483 | |||
| 3484 | mutex_unlock(&fs_info->balance_mutex); | ||
| 3485 | mutex_unlock(&fs_info->volume_mutex); | ||
| 3486 | goto again; | ||
| 3487 | } else { | ||
| 3488 | /* this is (2) */ | ||
| 3489 | mutex_unlock(&fs_info->balance_mutex); | ||
| 3490 | ret = -EINPROGRESS; | ||
| 3491 | goto out; | ||
| 3492 | } | ||
| 3493 | } else { | ||
| 3494 | /* this is (1) */ | ||
| 3495 | mutex_unlock(&fs_info->balance_mutex); | ||
| 3496 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | ||
| 3497 | ret = -EINVAL; | ||
| 3498 | goto out; | ||
| 3499 | } | ||
| 3500 | |||
| 3501 | locked: | ||
| 3502 | BUG_ON(!atomic_read(&fs_info->mutually_exclusive_operation_running)); | ||
| 3452 | 3503 | ||
| 3453 | if (arg) { | 3504 | if (arg) { |
| 3454 | bargs = memdup_user(arg, sizeof(*bargs)); | 3505 | bargs = memdup_user(arg, sizeof(*bargs)); |
| 3455 | if (IS_ERR(bargs)) { | 3506 | if (IS_ERR(bargs)) { |
| 3456 | ret = PTR_ERR(bargs); | 3507 | ret = PTR_ERR(bargs); |
| 3457 | goto out; | 3508 | goto out_unlock; |
| 3458 | } | 3509 | } |
| 3459 | 3510 | ||
| 3460 | if (bargs->flags & BTRFS_BALANCE_RESUME) { | 3511 | if (bargs->flags & BTRFS_BALANCE_RESUME) { |
| @@ -3474,13 +3525,10 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg) | |||
| 3474 | bargs = NULL; | 3525 | bargs = NULL; |
| 3475 | } | 3526 | } |
| 3476 | 3527 | ||
| 3477 | if (atomic_xchg(&root->fs_info->mutually_exclusive_operation_running, | 3528 | if (fs_info->balance_ctl) { |
| 3478 | 1)) { | ||
| 3479 | pr_info("btrfs: dev add/delete/balance/replace/resize operation in progress\n"); | ||
| 3480 | ret = -EINPROGRESS; | 3529 | ret = -EINPROGRESS; |
| 3481 | goto out_bargs; | 3530 | goto out_bargs; |
| 3482 | } | 3531 | } |
| 3483 | need_to_clear_lock = 1; | ||
| 3484 | 3532 | ||
| 3485 | bctl = kzalloc(sizeof(*bctl), GFP_NOFS); | 3533 | bctl = kzalloc(sizeof(*bctl), GFP_NOFS); |
| 3486 | if (!bctl) { | 3534 | if (!bctl) { |
| @@ -3501,11 +3549,17 @@ static long btrfs_ioctl_balance(struct file *file, void __user *arg) | |||
| 3501 | } | 3549 | } |
| 3502 | 3550 | ||
| 3503 | do_balance: | 3551 | do_balance: |
| 3504 | ret = btrfs_balance(bctl, bargs); | ||
| 3505 | /* | 3552 | /* |
| 3506 | * bctl is freed in __cancel_balance or in free_fs_info if | 3553 | * Ownership of bctl and mutually_exclusive_operation_running |
| 3507 | * restriper was paused all the way until unmount | 3554 | * goes to to btrfs_balance. bctl is freed in __cancel_balance, |
| 3555 | * or, if restriper was paused all the way until unmount, in | ||
| 3556 | * free_fs_info. mutually_exclusive_operation_running is | ||
| 3557 | * cleared in __cancel_balance. | ||
| 3508 | */ | 3558 | */ |
| 3559 | need_unlock = false; | ||
| 3560 | |||
| 3561 | ret = btrfs_balance(bctl, bargs); | ||
| 3562 | |||
| 3509 | if (arg) { | 3563 | if (arg) { |
| 3510 | if (copy_to_user(arg, bargs, sizeof(*bargs))) | 3564 | if (copy_to_user(arg, bargs, sizeof(*bargs))) |
| 3511 | ret = -EFAULT; | 3565 | ret = -EFAULT; |
| @@ -3513,12 +3567,12 @@ do_balance: | |||
| 3513 | 3567 | ||
| 3514 | out_bargs: | 3568 | out_bargs: |
| 3515 | kfree(bargs); | 3569 | kfree(bargs); |
| 3516 | out: | 3570 | out_unlock: |
| 3517 | if (need_to_clear_lock) | ||
| 3518 | atomic_set(&root->fs_info->mutually_exclusive_operation_running, | ||
| 3519 | 0); | ||
| 3520 | mutex_unlock(&fs_info->balance_mutex); | 3571 | mutex_unlock(&fs_info->balance_mutex); |
| 3521 | mutex_unlock(&fs_info->volume_mutex); | 3572 | mutex_unlock(&fs_info->volume_mutex); |
| 3573 | if (need_unlock) | ||
| 3574 | atomic_set(&fs_info->mutually_exclusive_operation_running, 0); | ||
| 3575 | out: | ||
| 3522 | mnt_drop_write_file(file); | 3576 | mnt_drop_write_file(file); |
| 3523 | return ret; | 3577 | return ret; |
| 3524 | } | 3578 | } |
| @@ -3698,6 +3752,11 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg) | |||
| 3698 | goto drop_write; | 3752 | goto drop_write; |
| 3699 | } | 3753 | } |
| 3700 | 3754 | ||
| 3755 | if (!sa->qgroupid) { | ||
| 3756 | ret = -EINVAL; | ||
| 3757 | goto out; | ||
| 3758 | } | ||
| 3759 | |||
| 3701 | trans = btrfs_join_transaction(root); | 3760 | trans = btrfs_join_transaction(root); |
| 3702 | if (IS_ERR(trans)) { | 3761 | if (IS_ERR(trans)) { |
| 3703 | ret = PTR_ERR(trans); | 3762 | ret = PTR_ERR(trans); |
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index fe9d02c45f8e..a5c856234323 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
| @@ -379,6 +379,13 @@ next1: | |||
| 379 | 379 | ||
| 380 | ret = add_relation_rb(fs_info, found_key.objectid, | 380 | ret = add_relation_rb(fs_info, found_key.objectid, |
| 381 | found_key.offset); | 381 | found_key.offset); |
| 382 | if (ret == -ENOENT) { | ||
| 383 | printk(KERN_WARNING | ||
| 384 | "btrfs: orphan qgroup relation 0x%llx->0x%llx\n", | ||
| 385 | (unsigned long long)found_key.objectid, | ||
| 386 | (unsigned long long)found_key.offset); | ||
| 387 | ret = 0; /* ignore the error */ | ||
| 388 | } | ||
| 382 | if (ret) | 389 | if (ret) |
| 383 | goto out; | 390 | goto out; |
| 384 | next2: | 391 | next2: |
| @@ -956,17 +963,28 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, | |||
| 956 | struct btrfs_fs_info *fs_info, u64 qgroupid) | 963 | struct btrfs_fs_info *fs_info, u64 qgroupid) |
| 957 | { | 964 | { |
| 958 | struct btrfs_root *quota_root; | 965 | struct btrfs_root *quota_root; |
| 966 | struct btrfs_qgroup *qgroup; | ||
| 959 | int ret = 0; | 967 | int ret = 0; |
| 960 | 968 | ||
| 961 | quota_root = fs_info->quota_root; | 969 | quota_root = fs_info->quota_root; |
| 962 | if (!quota_root) | 970 | if (!quota_root) |
| 963 | return -EINVAL; | 971 | return -EINVAL; |
| 964 | 972 | ||
| 973 | /* check if there are no relations to this qgroup */ | ||
| 974 | spin_lock(&fs_info->qgroup_lock); | ||
| 975 | qgroup = find_qgroup_rb(fs_info, qgroupid); | ||
| 976 | if (qgroup) { | ||
| 977 | if (!list_empty(&qgroup->groups) || !list_empty(&qgroup->members)) { | ||
| 978 | spin_unlock(&fs_info->qgroup_lock); | ||
| 979 | return -EBUSY; | ||
| 980 | } | ||
| 981 | } | ||
| 982 | spin_unlock(&fs_info->qgroup_lock); | ||
| 983 | |||
| 965 | ret = del_qgroup_item(trans, quota_root, qgroupid); | 984 | ret = del_qgroup_item(trans, quota_root, qgroupid); |
| 966 | 985 | ||
| 967 | spin_lock(&fs_info->qgroup_lock); | 986 | spin_lock(&fs_info->qgroup_lock); |
| 968 | del_qgroup_rb(quota_root->fs_info, qgroupid); | 987 | del_qgroup_rb(quota_root->fs_info, qgroupid); |
| 969 | |||
| 970 | spin_unlock(&fs_info->qgroup_lock); | 988 | spin_unlock(&fs_info->qgroup_lock); |
| 971 | 989 | ||
| 972 | return ret; | 990 | return ret; |
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 54454542ad40..321b7fb4e441 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
| @@ -1814,8 +1814,10 @@ static int name_cache_insert(struct send_ctx *sctx, | |||
| 1814 | (unsigned long)nce->ino); | 1814 | (unsigned long)nce->ino); |
| 1815 | if (!nce_head) { | 1815 | if (!nce_head) { |
| 1816 | nce_head = kmalloc(sizeof(*nce_head), GFP_NOFS); | 1816 | nce_head = kmalloc(sizeof(*nce_head), GFP_NOFS); |
| 1817 | if (!nce_head) | 1817 | if (!nce_head) { |
| 1818 | kfree(nce); | ||
| 1818 | return -ENOMEM; | 1819 | return -ENOMEM; |
| 1820 | } | ||
| 1819 | INIT_LIST_HEAD(nce_head); | 1821 | INIT_LIST_HEAD(nce_head); |
| 1820 | 1822 | ||
| 1821 | ret = radix_tree_insert(&sctx->name_cache, nce->ino, nce_head); | 1823 | ret = radix_tree_insert(&sctx->name_cache, nce->ino, nce_head); |
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 99545df1b86c..d8982e9601d3 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -267,7 +267,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, | |||
| 267 | function, line, errstr); | 267 | function, line, errstr); |
| 268 | return; | 268 | return; |
| 269 | } | 269 | } |
| 270 | trans->transaction->aborted = errno; | 270 | ACCESS_ONCE(trans->transaction->aborted) = errno; |
| 271 | __btrfs_std_error(root->fs_info, function, line, errno, NULL); | 271 | __btrfs_std_error(root->fs_info, function, line, errno, NULL); |
| 272 | } | 272 | } |
| 273 | /* | 273 | /* |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 87fac9a21ea5..f15494699f3b 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
| @@ -1468,7 +1468,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | |||
| 1468 | goto cleanup_transaction; | 1468 | goto cleanup_transaction; |
| 1469 | } | 1469 | } |
| 1470 | 1470 | ||
| 1471 | if (cur_trans->aborted) { | 1471 | /* Stop the commit early if ->aborted is set */ |
| 1472 | if (unlikely(ACCESS_ONCE(cur_trans->aborted))) { | ||
| 1472 | ret = cur_trans->aborted; | 1473 | ret = cur_trans->aborted; |
| 1473 | goto cleanup_transaction; | 1474 | goto cleanup_transaction; |
| 1474 | } | 1475 | } |
| @@ -1574,6 +1575,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | |||
| 1574 | wait_event(cur_trans->writer_wait, | 1575 | wait_event(cur_trans->writer_wait, |
| 1575 | atomic_read(&cur_trans->num_writers) == 1); | 1576 | atomic_read(&cur_trans->num_writers) == 1); |
| 1576 | 1577 | ||
| 1578 | /* ->aborted might be set after the previous check, so check it */ | ||
| 1579 | if (unlikely(ACCESS_ONCE(cur_trans->aborted))) { | ||
| 1580 | ret = cur_trans->aborted; | ||
| 1581 | goto cleanup_transaction; | ||
| 1582 | } | ||
| 1577 | /* | 1583 | /* |
| 1578 | * the reloc mutex makes sure that we stop | 1584 | * the reloc mutex makes sure that we stop |
| 1579 | * the balancing code from coming in and moving | 1585 | * the balancing code from coming in and moving |
| @@ -1657,6 +1663,17 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | |||
| 1657 | goto cleanup_transaction; | 1663 | goto cleanup_transaction; |
| 1658 | } | 1664 | } |
| 1659 | 1665 | ||
| 1666 | /* | ||
| 1667 | * The tasks which save the space cache and inode cache may also | ||
| 1668 | * update ->aborted, check it. | ||
| 1669 | */ | ||
| 1670 | if (unlikely(ACCESS_ONCE(cur_trans->aborted))) { | ||
| 1671 | ret = cur_trans->aborted; | ||
| 1672 | mutex_unlock(&root->fs_info->tree_log_mutex); | ||
| 1673 | mutex_unlock(&root->fs_info->reloc_mutex); | ||
| 1674 | goto cleanup_transaction; | ||
| 1675 | } | ||
| 1676 | |||
| 1660 | btrfs_prepare_extent_commit(trans, root); | 1677 | btrfs_prepare_extent_commit(trans, root); |
| 1661 | 1678 | ||
| 1662 | cur_trans = root->fs_info->running_transaction; | 1679 | cur_trans = root->fs_info->running_transaction; |
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 83186c7e45d4..9027bb1e7466 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -3357,6 +3357,11 @@ static int log_one_extent(struct btrfs_trans_handle *trans, | |||
| 3357 | if (skip_csum) | 3357 | if (skip_csum) |
| 3358 | return 0; | 3358 | return 0; |
| 3359 | 3359 | ||
| 3360 | if (em->compress_type) { | ||
| 3361 | csum_offset = 0; | ||
| 3362 | csum_len = block_len; | ||
| 3363 | } | ||
| 3364 | |||
| 3360 | /* block start is already adjusted for the file extent offset. */ | 3365 | /* block start is already adjusted for the file extent offset. */ |
| 3361 | ret = btrfs_lookup_csums_range(log->fs_info->csum_root, | 3366 | ret = btrfs_lookup_csums_range(log->fs_info->csum_root, |
| 3362 | em->block_start + csum_offset, | 3367 | em->block_start + csum_offset, |
| @@ -3410,13 +3415,13 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, | |||
| 3410 | em = list_entry(extents.next, struct extent_map, list); | 3415 | em = list_entry(extents.next, struct extent_map, list); |
| 3411 | 3416 | ||
| 3412 | list_del_init(&em->list); | 3417 | list_del_init(&em->list); |
| 3413 | clear_bit(EXTENT_FLAG_LOGGING, &em->flags); | ||
| 3414 | 3418 | ||
| 3415 | /* | 3419 | /* |
| 3416 | * If we had an error we just need to delete everybody from our | 3420 | * If we had an error we just need to delete everybody from our |
| 3417 | * private list. | 3421 | * private list. |
| 3418 | */ | 3422 | */ |
| 3419 | if (ret) { | 3423 | if (ret) { |
| 3424 | clear_em_logging(tree, em); | ||
| 3420 | free_extent_map(em); | 3425 | free_extent_map(em); |
| 3421 | continue; | 3426 | continue; |
| 3422 | } | 3427 | } |
| @@ -3424,8 +3429,9 @@ static int btrfs_log_changed_extents(struct btrfs_trans_handle *trans, | |||
| 3424 | write_unlock(&tree->lock); | 3429 | write_unlock(&tree->lock); |
| 3425 | 3430 | ||
| 3426 | ret = log_one_extent(trans, inode, root, em, path); | 3431 | ret = log_one_extent(trans, inode, root, em, path); |
| 3427 | free_extent_map(em); | ||
| 3428 | write_lock(&tree->lock); | 3432 | write_lock(&tree->lock); |
| 3433 | clear_em_logging(tree, em); | ||
| 3434 | free_extent_map(em); | ||
| 3429 | } | 3435 | } |
| 3430 | WARN_ON(!list_empty(&extents)); | 3436 | WARN_ON(!list_empty(&extents)); |
| 3431 | write_unlock(&tree->lock); | 3437 | write_unlock(&tree->lock); |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5cce6aa74012..15f6efdf6463 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
| @@ -1431,7 +1431,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path) | |||
| 1431 | } | 1431 | } |
| 1432 | } else { | 1432 | } else { |
| 1433 | ret = btrfs_get_bdev_and_sb(device_path, | 1433 | ret = btrfs_get_bdev_and_sb(device_path, |
| 1434 | FMODE_READ | FMODE_EXCL, | 1434 | FMODE_WRITE | FMODE_EXCL, |
| 1435 | root->fs_info->bdev_holder, 0, | 1435 | root->fs_info->bdev_holder, 0, |
| 1436 | &bdev, &bh); | 1436 | &bdev, &bh); |
| 1437 | if (ret) | 1437 | if (ret) |
| @@ -2614,7 +2614,14 @@ static int chunk_usage_filter(struct btrfs_fs_info *fs_info, u64 chunk_offset, | |||
| 2614 | cache = btrfs_lookup_block_group(fs_info, chunk_offset); | 2614 | cache = btrfs_lookup_block_group(fs_info, chunk_offset); |
| 2615 | chunk_used = btrfs_block_group_used(&cache->item); | 2615 | chunk_used = btrfs_block_group_used(&cache->item); |
| 2616 | 2616 | ||
| 2617 | user_thresh = div_factor_fine(cache->key.offset, bargs->usage); | 2617 | if (bargs->usage == 0) |
| 2618 | user_thresh = 0; | ||
| 2619 | else if (bargs->usage > 100) | ||
| 2620 | user_thresh = cache->key.offset; | ||
| 2621 | else | ||
| 2622 | user_thresh = div_factor_fine(cache->key.offset, | ||
| 2623 | bargs->usage); | ||
| 2624 | |||
| 2618 | if (chunk_used < user_thresh) | 2625 | if (chunk_used < user_thresh) |
| 2619 | ret = 0; | 2626 | ret = 0; |
| 2620 | 2627 | ||
| @@ -2959,6 +2966,8 @@ static void __cancel_balance(struct btrfs_fs_info *fs_info) | |||
| 2959 | unset_balance_control(fs_info); | 2966 | unset_balance_control(fs_info); |
| 2960 | ret = del_balance_item(fs_info->tree_root); | 2967 | ret = del_balance_item(fs_info->tree_root); |
| 2961 | BUG_ON(ret); | 2968 | BUG_ON(ret); |
| 2969 | |||
| 2970 | atomic_set(&fs_info->mutually_exclusive_operation_running, 0); | ||
| 2962 | } | 2971 | } |
| 2963 | 2972 | ||
| 2964 | void update_ioctl_balance_args(struct btrfs_fs_info *fs_info, int lock, | 2973 | void update_ioctl_balance_args(struct btrfs_fs_info *fs_info, int lock, |
| @@ -3138,8 +3147,10 @@ int btrfs_balance(struct btrfs_balance_control *bctl, | |||
| 3138 | out: | 3147 | out: |
| 3139 | if (bctl->flags & BTRFS_BALANCE_RESUME) | 3148 | if (bctl->flags & BTRFS_BALANCE_RESUME) |
| 3140 | __cancel_balance(fs_info); | 3149 | __cancel_balance(fs_info); |
| 3141 | else | 3150 | else { |
| 3142 | kfree(bctl); | 3151 | kfree(bctl); |
| 3152 | atomic_set(&fs_info->mutually_exclusive_operation_running, 0); | ||
| 3153 | } | ||
| 3143 | return ret; | 3154 | return ret; |
| 3144 | } | 3155 | } |
| 3145 | 3156 | ||
| @@ -3156,7 +3167,6 @@ static int balance_kthread(void *data) | |||
| 3156 | ret = btrfs_balance(fs_info->balance_ctl, NULL); | 3167 | ret = btrfs_balance(fs_info->balance_ctl, NULL); |
| 3157 | } | 3168 | } |
| 3158 | 3169 | ||
| 3159 | atomic_set(&fs_info->mutually_exclusive_operation_running, 0); | ||
| 3160 | mutex_unlock(&fs_info->balance_mutex); | 3170 | mutex_unlock(&fs_info->balance_mutex); |
| 3161 | mutex_unlock(&fs_info->volume_mutex); | 3171 | mutex_unlock(&fs_info->volume_mutex); |
| 3162 | 3172 | ||
| @@ -3179,7 +3189,6 @@ int btrfs_resume_balance_async(struct btrfs_fs_info *fs_info) | |||
| 3179 | return 0; | 3189 | return 0; |
| 3180 | } | 3190 | } |
| 3181 | 3191 | ||
| 3182 | WARN_ON(atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)); | ||
| 3183 | tsk = kthread_run(balance_kthread, fs_info, "btrfs-balance"); | 3192 | tsk = kthread_run(balance_kthread, fs_info, "btrfs-balance"); |
| 3184 | if (IS_ERR(tsk)) | 3193 | if (IS_ERR(tsk)) |
| 3185 | return PTR_ERR(tsk); | 3194 | return PTR_ERR(tsk); |
| @@ -3233,6 +3242,8 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info) | |||
| 3233 | btrfs_balance_sys(leaf, item, &disk_bargs); | 3242 | btrfs_balance_sys(leaf, item, &disk_bargs); |
| 3234 | btrfs_disk_balance_args_to_cpu(&bctl->sys, &disk_bargs); | 3243 | btrfs_disk_balance_args_to_cpu(&bctl->sys, &disk_bargs); |
| 3235 | 3244 | ||
| 3245 | WARN_ON(atomic_xchg(&fs_info->mutually_exclusive_operation_running, 1)); | ||
| 3246 | |||
| 3236 | mutex_lock(&fs_info->volume_mutex); | 3247 | mutex_lock(&fs_info->volume_mutex); |
| 3237 | mutex_lock(&fs_info->balance_mutex); | 3248 | mutex_lock(&fs_info->balance_mutex); |
| 3238 | 3249 | ||
| @@ -3496,7 +3507,7 @@ struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = { | |||
| 3496 | { 1, 1, 2, 2, 2, 2 /* raid1 */ }, | 3507 | { 1, 1, 2, 2, 2, 2 /* raid1 */ }, |
| 3497 | { 1, 2, 1, 1, 1, 2 /* dup */ }, | 3508 | { 1, 2, 1, 1, 1, 2 /* dup */ }, |
| 3498 | { 1, 1, 0, 2, 1, 1 /* raid0 */ }, | 3509 | { 1, 1, 0, 2, 1, 1 /* raid0 */ }, |
| 3499 | { 1, 1, 0, 1, 1, 1 /* single */ }, | 3510 | { 1, 1, 1, 1, 1, 1 /* single */ }, |
| 3500 | }; | 3511 | }; |
| 3501 | 3512 | ||
| 3502 | static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, | 3513 | static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index ce5cbd717bfc..210fce2df308 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
| @@ -226,6 +226,8 @@ compose_mount_options_out: | |||
| 226 | compose_mount_options_err: | 226 | compose_mount_options_err: |
| 227 | kfree(mountdata); | 227 | kfree(mountdata); |
| 228 | mountdata = ERR_PTR(rc); | 228 | mountdata = ERR_PTR(rc); |
| 229 | kfree(*devname); | ||
| 230 | *devname = NULL; | ||
| 229 | goto compose_mount_options_out; | 231 | goto compose_mount_options_out; |
| 230 | } | 232 | } |
| 231 | 233 | ||
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 17c3643e5950..12b3da39733b 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -1917,7 +1917,7 @@ srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs) | |||
| 1917 | } | 1917 | } |
| 1918 | case AF_INET6: { | 1918 | case AF_INET6: { |
| 1919 | struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; | 1919 | struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; |
| 1920 | struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)&rhs; | 1920 | struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs; |
| 1921 | return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); | 1921 | return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); |
| 1922 | } | 1922 | } |
| 1923 | default: | 1923 | default: |
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c index e95b94945d5f..137af4255da6 100644 --- a/fs/f2fs/acl.c +++ b/fs/f2fs/acl.c | |||
| @@ -191,15 +191,14 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type) | |||
| 191 | retval = f2fs_getxattr(inode, name_index, "", value, retval); | 191 | retval = f2fs_getxattr(inode, name_index, "", value, retval); |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | if (retval < 0) { | 194 | if (retval > 0) |
| 195 | if (retval == -ENODATA) | ||
| 196 | acl = NULL; | ||
| 197 | else | ||
| 198 | acl = ERR_PTR(retval); | ||
| 199 | } else { | ||
| 200 | acl = f2fs_acl_from_disk(value, retval); | 195 | acl = f2fs_acl_from_disk(value, retval); |
| 201 | } | 196 | else if (retval == -ENODATA) |
| 197 | acl = NULL; | ||
| 198 | else | ||
| 199 | acl = ERR_PTR(retval); | ||
| 202 | kfree(value); | 200 | kfree(value); |
| 201 | |||
| 203 | if (!IS_ERR(acl)) | 202 | if (!IS_ERR(acl)) |
| 204 | set_cached_acl(inode, type, acl); | 203 | set_cached_acl(inode, type, acl); |
| 205 | 204 | ||
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 6ef36c37e2be..ff3c8439af87 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c | |||
| @@ -214,7 +214,6 @@ retry: | |||
| 214 | goto retry; | 214 | goto retry; |
| 215 | } | 215 | } |
| 216 | new->ino = ino; | 216 | new->ino = ino; |
| 217 | INIT_LIST_HEAD(&new->list); | ||
| 218 | 217 | ||
| 219 | /* add new_oentry into list which is sorted by inode number */ | 218 | /* add new_oentry into list which is sorted by inode number */ |
| 220 | if (orphan) { | 219 | if (orphan) { |
| @@ -772,7 +771,7 @@ void init_orphan_info(struct f2fs_sb_info *sbi) | |||
| 772 | sbi->n_orphans = 0; | 771 | sbi->n_orphans = 0; |
| 773 | } | 772 | } |
| 774 | 773 | ||
| 775 | int create_checkpoint_caches(void) | 774 | int __init create_checkpoint_caches(void) |
| 776 | { | 775 | { |
| 777 | orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry", | 776 | orphan_entry_slab = f2fs_kmem_cache_create("f2fs_orphan_entry", |
| 778 | sizeof(struct orphan_inode_entry), NULL); | 777 | sizeof(struct orphan_inode_entry), NULL); |
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 3aa5ce7cab83..7bd22a201125 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c | |||
| @@ -547,6 +547,15 @@ redirty_out: | |||
| 547 | 547 | ||
| 548 | #define MAX_DESIRED_PAGES_WP 4096 | 548 | #define MAX_DESIRED_PAGES_WP 4096 |
| 549 | 549 | ||
| 550 | static int __f2fs_writepage(struct page *page, struct writeback_control *wbc, | ||
| 551 | void *data) | ||
| 552 | { | ||
| 553 | struct address_space *mapping = data; | ||
| 554 | int ret = mapping->a_ops->writepage(page, wbc); | ||
| 555 | mapping_set_error(mapping, ret); | ||
| 556 | return ret; | ||
| 557 | } | ||
| 558 | |||
| 550 | static int f2fs_write_data_pages(struct address_space *mapping, | 559 | static int f2fs_write_data_pages(struct address_space *mapping, |
| 551 | struct writeback_control *wbc) | 560 | struct writeback_control *wbc) |
| 552 | { | 561 | { |
| @@ -563,7 +572,7 @@ static int f2fs_write_data_pages(struct address_space *mapping, | |||
| 563 | 572 | ||
| 564 | if (!S_ISDIR(inode->i_mode)) | 573 | if (!S_ISDIR(inode->i_mode)) |
| 565 | mutex_lock(&sbi->writepages); | 574 | mutex_lock(&sbi->writepages); |
| 566 | ret = generic_writepages(mapping, wbc); | 575 | ret = write_cache_pages(mapping, wbc, __f2fs_writepage, mapping); |
| 567 | if (!S_ISDIR(inode->i_mode)) | 576 | if (!S_ISDIR(inode->i_mode)) |
| 568 | mutex_unlock(&sbi->writepages); | 577 | mutex_unlock(&sbi->writepages); |
| 569 | f2fs_submit_bio(sbi, DATA, (wbc->sync_mode == WB_SYNC_ALL)); | 578 | f2fs_submit_bio(sbi, DATA, (wbc->sync_mode == WB_SYNC_ALL)); |
| @@ -689,6 +698,11 @@ static int f2fs_set_data_page_dirty(struct page *page) | |||
| 689 | return 0; | 698 | return 0; |
| 690 | } | 699 | } |
| 691 | 700 | ||
| 701 | static sector_t f2fs_bmap(struct address_space *mapping, sector_t block) | ||
| 702 | { | ||
| 703 | return generic_block_bmap(mapping, block, get_data_block_ro); | ||
| 704 | } | ||
| 705 | |||
| 692 | const struct address_space_operations f2fs_dblock_aops = { | 706 | const struct address_space_operations f2fs_dblock_aops = { |
| 693 | .readpage = f2fs_read_data_page, | 707 | .readpage = f2fs_read_data_page, |
| 694 | .readpages = f2fs_read_data_pages, | 708 | .readpages = f2fs_read_data_pages, |
| @@ -700,4 +714,5 @@ const struct address_space_operations f2fs_dblock_aops = { | |||
| 700 | .invalidatepage = f2fs_invalidate_data_page, | 714 | .invalidatepage = f2fs_invalidate_data_page, |
| 701 | .releasepage = f2fs_release_data_page, | 715 | .releasepage = f2fs_release_data_page, |
| 702 | .direct_IO = f2fs_direct_IO, | 716 | .direct_IO = f2fs_direct_IO, |
| 717 | .bmap = f2fs_bmap, | ||
| 703 | }; | 718 | }; |
diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index 0e0380a588ad..c8c37307b326 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | static LIST_HEAD(f2fs_stat_list); | 27 | static LIST_HEAD(f2fs_stat_list); |
| 28 | static struct dentry *debugfs_root; | 28 | static struct dentry *debugfs_root; |
| 29 | static DEFINE_MUTEX(f2fs_stat_mutex); | ||
| 29 | 30 | ||
| 30 | static void update_general_status(struct f2fs_sb_info *sbi) | 31 | static void update_general_status(struct f2fs_sb_info *sbi) |
| 31 | { | 32 | { |
| @@ -180,18 +181,14 @@ static int stat_show(struct seq_file *s, void *v) | |||
| 180 | int i = 0; | 181 | int i = 0; |
| 181 | int j; | 182 | int j; |
| 182 | 183 | ||
| 184 | mutex_lock(&f2fs_stat_mutex); | ||
| 183 | list_for_each_entry_safe(si, next, &f2fs_stat_list, stat_list) { | 185 | list_for_each_entry_safe(si, next, &f2fs_stat_list, stat_list) { |
| 184 | 186 | ||
| 185 | mutex_lock(&si->stat_lock); | ||
| 186 | if (!si->sbi) { | ||
| 187 | mutex_unlock(&si->stat_lock); | ||
| 188 | continue; | ||
| 189 | } | ||
| 190 | update_general_status(si->sbi); | 187 | update_general_status(si->sbi); |
| 191 | 188 | ||
| 192 | seq_printf(s, "\n=====[ partition info. #%d ]=====\n", i++); | 189 | seq_printf(s, "\n=====[ partition info. #%d ]=====\n", i++); |
| 193 | seq_printf(s, "[SB: 1] [CP: 2] [NAT: %d] [SIT: %d] ", | 190 | seq_printf(s, "[SB: 1] [CP: 2] [SIT: %d] [NAT: %d] ", |
| 194 | si->nat_area_segs, si->sit_area_segs); | 191 | si->sit_area_segs, si->nat_area_segs); |
| 195 | seq_printf(s, "[SSA: %d] [MAIN: %d", | 192 | seq_printf(s, "[SSA: %d] [MAIN: %d", |
| 196 | si->ssa_area_segs, si->main_area_segs); | 193 | si->ssa_area_segs, si->main_area_segs); |
| 197 | seq_printf(s, "(OverProv:%d Resv:%d)]\n\n", | 194 | seq_printf(s, "(OverProv:%d Resv:%d)]\n\n", |
| @@ -286,8 +283,8 @@ static int stat_show(struct seq_file *s, void *v) | |||
| 286 | seq_printf(s, "\nMemory: %u KB = static: %u + cached: %u\n", | 283 | seq_printf(s, "\nMemory: %u KB = static: %u + cached: %u\n", |
| 287 | (si->base_mem + si->cache_mem) >> 10, | 284 | (si->base_mem + si->cache_mem) >> 10, |
| 288 | si->base_mem >> 10, si->cache_mem >> 10); | 285 | si->base_mem >> 10, si->cache_mem >> 10); |
| 289 | mutex_unlock(&si->stat_lock); | ||
| 290 | } | 286 | } |
| 287 | mutex_unlock(&f2fs_stat_mutex); | ||
| 291 | return 0; | 288 | return 0; |
| 292 | } | 289 | } |
| 293 | 290 | ||
| @@ -303,7 +300,7 @@ static const struct file_operations stat_fops = { | |||
| 303 | .release = single_release, | 300 | .release = single_release, |
| 304 | }; | 301 | }; |
| 305 | 302 | ||
| 306 | static int init_stats(struct f2fs_sb_info *sbi) | 303 | int f2fs_build_stats(struct f2fs_sb_info *sbi) |
| 307 | { | 304 | { |
| 308 | struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); | 305 | struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); |
| 309 | struct f2fs_stat_info *si; | 306 | struct f2fs_stat_info *si; |
| @@ -313,9 +310,6 @@ static int init_stats(struct f2fs_sb_info *sbi) | |||
| 313 | return -ENOMEM; | 310 | return -ENOMEM; |
| 314 | 311 | ||
| 315 | si = sbi->stat_info; | 312 | si = sbi->stat_info; |
| 316 | mutex_init(&si->stat_lock); | ||
| 317 | list_add_tail(&si->stat_list, &f2fs_stat_list); | ||
| 318 | |||
| 319 | si->all_area_segs = le32_to_cpu(raw_super->segment_count); | 313 | si->all_area_segs = le32_to_cpu(raw_super->segment_count); |
| 320 | si->sit_area_segs = le32_to_cpu(raw_super->segment_count_sit); | 314 | si->sit_area_segs = le32_to_cpu(raw_super->segment_count_sit); |
| 321 | si->nat_area_segs = le32_to_cpu(raw_super->segment_count_nat); | 315 | si->nat_area_segs = le32_to_cpu(raw_super->segment_count_nat); |
| @@ -325,21 +319,11 @@ static int init_stats(struct f2fs_sb_info *sbi) | |||
| 325 | si->main_area_zones = si->main_area_sections / | 319 | si->main_area_zones = si->main_area_sections / |
| 326 | le32_to_cpu(raw_super->secs_per_zone); | 320 | le32_to_cpu(raw_super->secs_per_zone); |
| 327 | si->sbi = sbi; | 321 | si->sbi = sbi; |
| 328 | return 0; | ||
| 329 | } | ||
| 330 | 322 | ||
| 331 | int f2fs_build_stats(struct f2fs_sb_info *sbi) | 323 | mutex_lock(&f2fs_stat_mutex); |
| 332 | { | 324 | list_add_tail(&si->stat_list, &f2fs_stat_list); |
| 333 | int retval; | 325 | mutex_unlock(&f2fs_stat_mutex); |
| 334 | |||
| 335 | retval = init_stats(sbi); | ||
| 336 | if (retval) | ||
| 337 | return retval; | ||
| 338 | |||
| 339 | if (!debugfs_root) | ||
| 340 | debugfs_root = debugfs_create_dir("f2fs", NULL); | ||
| 341 | 326 | ||
| 342 | debugfs_create_file("status", S_IRUGO, debugfs_root, NULL, &stat_fops); | ||
| 343 | return 0; | 327 | return 0; |
| 344 | } | 328 | } |
| 345 | 329 | ||
| @@ -347,14 +331,22 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi) | |||
| 347 | { | 331 | { |
| 348 | struct f2fs_stat_info *si = sbi->stat_info; | 332 | struct f2fs_stat_info *si = sbi->stat_info; |
| 349 | 333 | ||
| 334 | mutex_lock(&f2fs_stat_mutex); | ||
| 350 | list_del(&si->stat_list); | 335 | list_del(&si->stat_list); |
| 351 | mutex_lock(&si->stat_lock); | 336 | mutex_unlock(&f2fs_stat_mutex); |
| 352 | si->sbi = NULL; | 337 | |
| 353 | mutex_unlock(&si->stat_lock); | ||
| 354 | kfree(sbi->stat_info); | 338 | kfree(sbi->stat_info); |
| 355 | } | 339 | } |
| 356 | 340 | ||
| 357 | void destroy_root_stats(void) | 341 | void __init f2fs_create_root_stats(void) |
| 342 | { | ||
| 343 | debugfs_root = debugfs_create_dir("f2fs", NULL); | ||
| 344 | if (debugfs_root) | ||
| 345 | debugfs_create_file("status", S_IRUGO, debugfs_root, | ||
| 346 | NULL, &stat_fops); | ||
| 347 | } | ||
| 348 | |||
| 349 | void f2fs_destroy_root_stats(void) | ||
| 358 | { | 350 | { |
| 359 | debugfs_remove_recursive(debugfs_root); | 351 | debugfs_remove_recursive(debugfs_root); |
| 360 | debugfs_root = NULL; | 352 | debugfs_root = NULL; |
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 951ed52748f6..989980e16d0b 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c | |||
| @@ -503,7 +503,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, | |||
| 503 | } | 503 | } |
| 504 | 504 | ||
| 505 | if (inode) { | 505 | if (inode) { |
| 506 | inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; | 506 | inode->i_ctime = CURRENT_TIME; |
| 507 | drop_nlink(inode); | 507 | drop_nlink(inode); |
| 508 | if (S_ISDIR(inode->i_mode)) { | 508 | if (S_ISDIR(inode->i_mode)) { |
| 509 | drop_nlink(inode); | 509 | drop_nlink(inode); |
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 13c6dfbb7183..c8e2d751ef9c 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h | |||
| @@ -211,11 +211,11 @@ struct dnode_of_data { | |||
| 211 | static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode, | 211 | static inline void set_new_dnode(struct dnode_of_data *dn, struct inode *inode, |
| 212 | struct page *ipage, struct page *npage, nid_t nid) | 212 | struct page *ipage, struct page *npage, nid_t nid) |
| 213 | { | 213 | { |
| 214 | memset(dn, 0, sizeof(*dn)); | ||
| 214 | dn->inode = inode; | 215 | dn->inode = inode; |
| 215 | dn->inode_page = ipage; | 216 | dn->inode_page = ipage; |
| 216 | dn->node_page = npage; | 217 | dn->node_page = npage; |
| 217 | dn->nid = nid; | 218 | dn->nid = nid; |
| 218 | dn->inode_page_locked = 0; | ||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | /* | 221 | /* |
| @@ -877,6 +877,8 @@ bool f2fs_empty_dir(struct inode *); | |||
| 877 | * super.c | 877 | * super.c |
| 878 | */ | 878 | */ |
| 879 | int f2fs_sync_fs(struct super_block *, int); | 879 | int f2fs_sync_fs(struct super_block *, int); |
| 880 | extern __printf(3, 4) | ||
| 881 | void f2fs_msg(struct super_block *, const char *, const char *, ...); | ||
| 880 | 882 | ||
| 881 | /* | 883 | /* |
| 882 | * hash.c | 884 | * hash.c |
| @@ -912,7 +914,7 @@ int restore_node_summary(struct f2fs_sb_info *, unsigned int, | |||
| 912 | void flush_nat_entries(struct f2fs_sb_info *); | 914 | void flush_nat_entries(struct f2fs_sb_info *); |
| 913 | int build_node_manager(struct f2fs_sb_info *); | 915 | int build_node_manager(struct f2fs_sb_info *); |
| 914 | void destroy_node_manager(struct f2fs_sb_info *); | 916 | void destroy_node_manager(struct f2fs_sb_info *); |
| 915 | int create_node_manager_caches(void); | 917 | int __init create_node_manager_caches(void); |
| 916 | void destroy_node_manager_caches(void); | 918 | void destroy_node_manager_caches(void); |
| 917 | 919 | ||
| 918 | /* | 920 | /* |
| @@ -964,7 +966,7 @@ void sync_dirty_dir_inodes(struct f2fs_sb_info *); | |||
| 964 | void block_operations(struct f2fs_sb_info *); | 966 | void block_operations(struct f2fs_sb_info *); |
| 965 | void write_checkpoint(struct f2fs_sb_info *, bool, bool); | 967 | void write_checkpoint(struct f2fs_sb_info *, bool, bool); |
| 966 | void init_orphan_info(struct f2fs_sb_info *); | 968 | void init_orphan_info(struct f2fs_sb_info *); |
| 967 | int create_checkpoint_caches(void); | 969 | int __init create_checkpoint_caches(void); |
| 968 | void destroy_checkpoint_caches(void); | 970 | void destroy_checkpoint_caches(void); |
| 969 | 971 | ||
| 970 | /* | 972 | /* |
| @@ -984,9 +986,9 @@ int do_write_data_page(struct page *); | |||
| 984 | int start_gc_thread(struct f2fs_sb_info *); | 986 | int start_gc_thread(struct f2fs_sb_info *); |
| 985 | void stop_gc_thread(struct f2fs_sb_info *); | 987 | void stop_gc_thread(struct f2fs_sb_info *); |
| 986 | block_t start_bidx_of_node(unsigned int); | 988 | block_t start_bidx_of_node(unsigned int); |
| 987 | int f2fs_gc(struct f2fs_sb_info *, int); | 989 | int f2fs_gc(struct f2fs_sb_info *); |
| 988 | void build_gc_manager(struct f2fs_sb_info *); | 990 | void build_gc_manager(struct f2fs_sb_info *); |
| 989 | int create_gc_caches(void); | 991 | int __init create_gc_caches(void); |
| 990 | void destroy_gc_caches(void); | 992 | void destroy_gc_caches(void); |
| 991 | 993 | ||
| 992 | /* | 994 | /* |
| @@ -1058,7 +1060,8 @@ struct f2fs_stat_info { | |||
| 1058 | 1060 | ||
| 1059 | int f2fs_build_stats(struct f2fs_sb_info *); | 1061 | int f2fs_build_stats(struct f2fs_sb_info *); |
| 1060 | void f2fs_destroy_stats(struct f2fs_sb_info *); | 1062 | void f2fs_destroy_stats(struct f2fs_sb_info *); |
| 1061 | void destroy_root_stats(void); | 1063 | void __init f2fs_create_root_stats(void); |
| 1064 | void f2fs_destroy_root_stats(void); | ||
| 1062 | #else | 1065 | #else |
| 1063 | #define stat_inc_call_count(si) | 1066 | #define stat_inc_call_count(si) |
| 1064 | #define stat_inc_seg_count(si, type) | 1067 | #define stat_inc_seg_count(si, type) |
| @@ -1068,7 +1071,8 @@ void destroy_root_stats(void); | |||
| 1068 | 1071 | ||
| 1069 | static inline int f2fs_build_stats(struct f2fs_sb_info *sbi) { return 0; } | 1072 | static inline int f2fs_build_stats(struct f2fs_sb_info *sbi) { return 0; } |
| 1070 | static inline void f2fs_destroy_stats(struct f2fs_sb_info *sbi) { } | 1073 | static inline void f2fs_destroy_stats(struct f2fs_sb_info *sbi) { } |
| 1071 | static inline void destroy_root_stats(void) { } | 1074 | static inline void __init f2fs_create_root_stats(void) { } |
| 1075 | static inline void f2fs_destroy_root_stats(void) { } | ||
| 1072 | #endif | 1076 | #endif |
| 1073 | 1077 | ||
| 1074 | extern const struct file_operations f2fs_dir_operations; | 1078 | extern const struct file_operations f2fs_dir_operations; |
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 7f9ea9271ebe..3191b52aafb0 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
| @@ -96,8 +96,9 @@ out: | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static const struct vm_operations_struct f2fs_file_vm_ops = { | 98 | static const struct vm_operations_struct f2fs_file_vm_ops = { |
| 99 | .fault = filemap_fault, | 99 | .fault = filemap_fault, |
| 100 | .page_mkwrite = f2fs_vm_page_mkwrite, | 100 | .page_mkwrite = f2fs_vm_page_mkwrite, |
| 101 | .remap_pages = generic_file_remap_pages, | ||
| 101 | }; | 102 | }; |
| 102 | 103 | ||
| 103 | static int need_to_sync_dir(struct f2fs_sb_info *sbi, struct inode *inode) | 104 | static int need_to_sync_dir(struct f2fs_sb_info *sbi, struct inode *inode) |
| @@ -137,6 +138,9 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) | |||
| 137 | if (ret) | 138 | if (ret) |
| 138 | return ret; | 139 | return ret; |
| 139 | 140 | ||
| 141 | /* guarantee free sections for fsync */ | ||
| 142 | f2fs_balance_fs(sbi); | ||
| 143 | |||
| 140 | mutex_lock(&inode->i_mutex); | 144 | mutex_lock(&inode->i_mutex); |
| 141 | 145 | ||
| 142 | if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) | 146 | if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) |
| @@ -407,6 +411,8 @@ int truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end) | |||
| 407 | struct dnode_of_data dn; | 411 | struct dnode_of_data dn; |
| 408 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); | 412 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); |
| 409 | 413 | ||
| 414 | f2fs_balance_fs(sbi); | ||
| 415 | |||
| 410 | mutex_lock_op(sbi, DATA_TRUNC); | 416 | mutex_lock_op(sbi, DATA_TRUNC); |
| 411 | set_new_dnode(&dn, inode, NULL, NULL, 0); | 417 | set_new_dnode(&dn, inode, NULL, NULL, 0); |
| 412 | err = get_dnode_of_data(&dn, index, RDONLY_NODE); | 418 | err = get_dnode_of_data(&dn, index, RDONLY_NODE); |
| @@ -534,7 +540,6 @@ static long f2fs_fallocate(struct file *file, int mode, | |||
| 534 | loff_t offset, loff_t len) | 540 | loff_t offset, loff_t len) |
| 535 | { | 541 | { |
| 536 | struct inode *inode = file->f_path.dentry->d_inode; | 542 | struct inode *inode = file->f_path.dentry->d_inode; |
| 537 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); | ||
| 538 | long ret; | 543 | long ret; |
| 539 | 544 | ||
| 540 | if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) | 545 | if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) |
| @@ -545,7 +550,10 @@ static long f2fs_fallocate(struct file *file, int mode, | |||
| 545 | else | 550 | else |
| 546 | ret = expand_inode_data(inode, offset, len, mode); | 551 | ret = expand_inode_data(inode, offset, len, mode); |
| 547 | 552 | ||
| 548 | f2fs_balance_fs(sbi); | 553 | if (!ret) { |
| 554 | inode->i_mtime = inode->i_ctime = CURRENT_TIME; | ||
| 555 | mark_inode_dirty(inode); | ||
| 556 | } | ||
| 549 | return ret; | 557 | return ret; |
| 550 | } | 558 | } |
| 551 | 559 | ||
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index b0ec721e984a..c386910dacc5 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c | |||
| @@ -78,7 +78,7 @@ static int gc_thread_func(void *data) | |||
| 78 | 78 | ||
| 79 | sbi->bg_gc++; | 79 | sbi->bg_gc++; |
| 80 | 80 | ||
| 81 | if (f2fs_gc(sbi, 1) == GC_NONE) | 81 | if (f2fs_gc(sbi) == GC_NONE) |
| 82 | wait_ms = GC_THREAD_NOGC_SLEEP_TIME; | 82 | wait_ms = GC_THREAD_NOGC_SLEEP_TIME; |
| 83 | else if (wait_ms == GC_THREAD_NOGC_SLEEP_TIME) | 83 | else if (wait_ms == GC_THREAD_NOGC_SLEEP_TIME) |
| 84 | wait_ms = GC_THREAD_MAX_SLEEP_TIME; | 84 | wait_ms = GC_THREAD_MAX_SLEEP_TIME; |
| @@ -424,7 +424,11 @@ next_step: | |||
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | /* | 426 | /* |
| 427 | * Calculate start block index that this node page contains | 427 | * Calculate start block index indicating the given node offset. |
| 428 | * Be careful, caller should give this node offset only indicating direct node | ||
| 429 | * blocks. If any node offsets, which point the other types of node blocks such | ||
| 430 | * as indirect or double indirect node blocks, are given, it must be a caller's | ||
| 431 | * bug. | ||
| 428 | */ | 432 | */ |
| 429 | block_t start_bidx_of_node(unsigned int node_ofs) | 433 | block_t start_bidx_of_node(unsigned int node_ofs) |
| 430 | { | 434 | { |
| @@ -651,62 +655,44 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, unsigned int segno, | |||
| 651 | return ret; | 655 | return ret; |
| 652 | } | 656 | } |
| 653 | 657 | ||
| 654 | int f2fs_gc(struct f2fs_sb_info *sbi, int nGC) | 658 | int f2fs_gc(struct f2fs_sb_info *sbi) |
| 655 | { | 659 | { |
| 656 | unsigned int segno; | ||
| 657 | int old_free_secs, cur_free_secs; | ||
| 658 | int gc_status, nfree; | ||
| 659 | struct list_head ilist; | 660 | struct list_head ilist; |
| 661 | unsigned int segno, i; | ||
| 660 | int gc_type = BG_GC; | 662 | int gc_type = BG_GC; |
| 663 | int gc_status = GC_NONE; | ||
| 661 | 664 | ||
| 662 | INIT_LIST_HEAD(&ilist); | 665 | INIT_LIST_HEAD(&ilist); |
| 663 | gc_more: | 666 | gc_more: |
| 664 | nfree = 0; | 667 | if (!(sbi->sb->s_flags & MS_ACTIVE)) |
| 665 | gc_status = GC_NONE; | 668 | goto stop; |
| 666 | 669 | ||
| 667 | if (has_not_enough_free_secs(sbi)) | 670 | if (has_not_enough_free_secs(sbi)) |
| 668 | old_free_secs = reserved_sections(sbi); | 671 | gc_type = FG_GC; |
| 669 | else | ||
| 670 | old_free_secs = free_sections(sbi); | ||
| 671 | |||
| 672 | while (sbi->sb->s_flags & MS_ACTIVE) { | ||
| 673 | int i; | ||
| 674 | if (has_not_enough_free_secs(sbi)) | ||
| 675 | gc_type = FG_GC; | ||
| 676 | 672 | ||
| 677 | cur_free_secs = free_sections(sbi) + nfree; | 673 | if (!__get_victim(sbi, &segno, gc_type, NO_CHECK_TYPE)) |
| 674 | goto stop; | ||
| 678 | 675 | ||
| 679 | /* We got free space successfully. */ | 676 | for (i = 0; i < sbi->segs_per_sec; i++) { |
| 680 | if (nGC < cur_free_secs - old_free_secs) | 677 | /* |
| 681 | break; | 678 | * do_garbage_collect will give us three gc_status: |
| 682 | 679 | * GC_ERROR, GC_DONE, and GC_BLOCKED. | |
| 683 | if (!__get_victim(sbi, &segno, gc_type, NO_CHECK_TYPE)) | 680 | * If GC is finished uncleanly, we have to return |
| 681 | * the victim to dirty segment list. | ||
| 682 | */ | ||
| 683 | gc_status = do_garbage_collect(sbi, segno + i, &ilist, gc_type); | ||
| 684 | if (gc_status != GC_DONE) | ||
| 684 | break; | 685 | break; |
| 685 | |||
| 686 | for (i = 0; i < sbi->segs_per_sec; i++) { | ||
| 687 | /* | ||
| 688 | * do_garbage_collect will give us three gc_status: | ||
| 689 | * GC_ERROR, GC_DONE, and GC_BLOCKED. | ||
| 690 | * If GC is finished uncleanly, we have to return | ||
| 691 | * the victim to dirty segment list. | ||
| 692 | */ | ||
| 693 | gc_status = do_garbage_collect(sbi, segno + i, | ||
| 694 | &ilist, gc_type); | ||
| 695 | if (gc_status != GC_DONE) | ||
| 696 | goto stop; | ||
| 697 | nfree++; | ||
| 698 | } | ||
| 699 | } | 686 | } |
| 700 | stop: | 687 | if (has_not_enough_free_secs(sbi)) { |
| 701 | if (has_not_enough_free_secs(sbi) || gc_status == GC_BLOCKED) { | ||
| 702 | write_checkpoint(sbi, (gc_status == GC_BLOCKED), false); | 688 | write_checkpoint(sbi, (gc_status == GC_BLOCKED), false); |
| 703 | if (nfree) | 689 | if (has_not_enough_free_secs(sbi)) |
| 704 | goto gc_more; | 690 | goto gc_more; |
| 705 | } | 691 | } |
| 692 | stop: | ||
| 706 | mutex_unlock(&sbi->gc_mutex); | 693 | mutex_unlock(&sbi->gc_mutex); |
| 707 | 694 | ||
| 708 | put_gc_inode(&ilist); | 695 | put_gc_inode(&ilist); |
| 709 | BUG_ON(!list_empty(&ilist)); | ||
| 710 | return gc_status; | 696 | return gc_status; |
| 711 | } | 697 | } |
| 712 | 698 | ||
| @@ -715,7 +701,7 @@ void build_gc_manager(struct f2fs_sb_info *sbi) | |||
| 715 | DIRTY_I(sbi)->v_ops = &default_v_ops; | 701 | DIRTY_I(sbi)->v_ops = &default_v_ops; |
| 716 | } | 702 | } |
| 717 | 703 | ||
| 718 | int create_gc_caches(void) | 704 | int __init create_gc_caches(void) |
| 719 | { | 705 | { |
| 720 | winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes", | 706 | winode_slab = f2fs_kmem_cache_create("f2fs_gc_inodes", |
| 721 | sizeof(struct inode_entry), NULL); | 707 | sizeof(struct inode_entry), NULL); |
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index bf20b4d03214..794241777322 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c | |||
| @@ -217,6 +217,9 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 217 | inode->i_ino == F2FS_META_INO(sbi)) | 217 | inode->i_ino == F2FS_META_INO(sbi)) |
| 218 | return 0; | 218 | return 0; |
| 219 | 219 | ||
| 220 | if (wbc) | ||
| 221 | f2fs_balance_fs(sbi); | ||
| 222 | |||
| 220 | node_page = get_node_page(sbi, inode->i_ino); | 223 | node_page = get_node_page(sbi, inode->i_ino); |
| 221 | if (IS_ERR(node_page)) | 224 | if (IS_ERR(node_page)) |
| 222 | return PTR_ERR(node_page); | 225 | return PTR_ERR(node_page); |
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 5066bfd256c9..9bda63c9c166 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c | |||
| @@ -1124,6 +1124,12 @@ static int f2fs_write_node_page(struct page *page, | |||
| 1124 | return 0; | 1124 | return 0; |
| 1125 | } | 1125 | } |
| 1126 | 1126 | ||
| 1127 | /* | ||
| 1128 | * It is very important to gather dirty pages and write at once, so that we can | ||
| 1129 | * submit a big bio without interfering other data writes. | ||
| 1130 | * Be default, 512 pages (2MB), a segment size, is quite reasonable. | ||
| 1131 | */ | ||
| 1132 | #define COLLECT_DIRTY_NODES 512 | ||
| 1127 | static int f2fs_write_node_pages(struct address_space *mapping, | 1133 | static int f2fs_write_node_pages(struct address_space *mapping, |
| 1128 | struct writeback_control *wbc) | 1134 | struct writeback_control *wbc) |
| 1129 | { | 1135 | { |
| @@ -1131,17 +1137,16 @@ static int f2fs_write_node_pages(struct address_space *mapping, | |||
| 1131 | struct block_device *bdev = sbi->sb->s_bdev; | 1137 | struct block_device *bdev = sbi->sb->s_bdev; |
| 1132 | long nr_to_write = wbc->nr_to_write; | 1138 | long nr_to_write = wbc->nr_to_write; |
| 1133 | 1139 | ||
| 1134 | if (wbc->for_kupdate) | 1140 | /* First check balancing cached NAT entries */ |
| 1135 | return 0; | ||
| 1136 | |||
| 1137 | if (get_pages(sbi, F2FS_DIRTY_NODES) == 0) | ||
| 1138 | return 0; | ||
| 1139 | |||
| 1140 | if (try_to_free_nats(sbi, NAT_ENTRY_PER_BLOCK)) { | 1141 | if (try_to_free_nats(sbi, NAT_ENTRY_PER_BLOCK)) { |
| 1141 | write_checkpoint(sbi, false, false); | 1142 | write_checkpoint(sbi, false, false); |
| 1142 | return 0; | 1143 | return 0; |
| 1143 | } | 1144 | } |
| 1144 | 1145 | ||
| 1146 | /* collect a number of dirty node pages and write together */ | ||
| 1147 | if (get_pages(sbi, F2FS_DIRTY_NODES) < COLLECT_DIRTY_NODES) | ||
| 1148 | return 0; | ||
| 1149 | |||
| 1145 | /* if mounting is failed, skip writing node pages */ | 1150 | /* if mounting is failed, skip writing node pages */ |
| 1146 | wbc->nr_to_write = bio_get_nr_vecs(bdev); | 1151 | wbc->nr_to_write = bio_get_nr_vecs(bdev); |
| 1147 | sync_node_pages(sbi, 0, wbc); | 1152 | sync_node_pages(sbi, 0, wbc); |
| @@ -1732,7 +1737,7 @@ void destroy_node_manager(struct f2fs_sb_info *sbi) | |||
| 1732 | kfree(nm_i); | 1737 | kfree(nm_i); |
| 1733 | } | 1738 | } |
| 1734 | 1739 | ||
| 1735 | int create_node_manager_caches(void) | 1740 | int __init create_node_manager_caches(void) |
| 1736 | { | 1741 | { |
| 1737 | nat_entry_slab = f2fs_kmem_cache_create("nat_entry", | 1742 | nat_entry_slab = f2fs_kmem_cache_create("nat_entry", |
| 1738 | sizeof(struct nat_entry), NULL); | 1743 | sizeof(struct nat_entry), NULL); |
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index b571fee677d5..f42e4060b399 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c | |||
| @@ -67,7 +67,7 @@ static int recover_dentry(struct page *ipage, struct inode *inode) | |||
| 67 | kunmap(page); | 67 | kunmap(page); |
| 68 | f2fs_put_page(page, 0); | 68 | f2fs_put_page(page, 0); |
| 69 | } else { | 69 | } else { |
| 70 | f2fs_add_link(&dent, inode); | 70 | err = f2fs_add_link(&dent, inode); |
| 71 | } | 71 | } |
| 72 | iput(dir); | 72 | iput(dir); |
| 73 | out: | 73 | out: |
| @@ -151,7 +151,6 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) | |||
| 151 | goto out; | 151 | goto out; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | INIT_LIST_HEAD(&entry->list); | ||
| 155 | list_add_tail(&entry->list, head); | 154 | list_add_tail(&entry->list, head); |
| 156 | entry->blkaddr = blkaddr; | 155 | entry->blkaddr = blkaddr; |
| 157 | } | 156 | } |
| @@ -174,10 +173,9 @@ out: | |||
| 174 | static void destroy_fsync_dnodes(struct f2fs_sb_info *sbi, | 173 | static void destroy_fsync_dnodes(struct f2fs_sb_info *sbi, |
| 175 | struct list_head *head) | 174 | struct list_head *head) |
| 176 | { | 175 | { |
| 177 | struct list_head *this; | 176 | struct fsync_inode_entry *entry, *tmp; |
| 178 | struct fsync_inode_entry *entry; | 177 | |
| 179 | list_for_each(this, head) { | 178 | list_for_each_entry_safe(entry, tmp, head, list) { |
| 180 | entry = list_entry(this, struct fsync_inode_entry, list); | ||
| 181 | iput(entry->inode); | 179 | iput(entry->inode); |
| 182 | list_del(&entry->list); | 180 | list_del(&entry->list); |
| 183 | kmem_cache_free(fsync_entry_slab, entry); | 181 | kmem_cache_free(fsync_entry_slab, entry); |
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index de6240922b0a..4b0099066582 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c | |||
| @@ -31,7 +31,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi) | |||
| 31 | */ | 31 | */ |
| 32 | if (has_not_enough_free_secs(sbi)) { | 32 | if (has_not_enough_free_secs(sbi)) { |
| 33 | mutex_lock(&sbi->gc_mutex); | 33 | mutex_lock(&sbi->gc_mutex); |
| 34 | f2fs_gc(sbi, 1); | 34 | f2fs_gc(sbi); |
| 35 | } | 35 | } |
| 36 | } | 36 | } |
| 37 | 37 | ||
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 08a94c814bdc..37fad04c8669 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c | |||
| @@ -53,6 +53,18 @@ static match_table_t f2fs_tokens = { | |||
| 53 | {Opt_err, NULL}, | 53 | {Opt_err, NULL}, |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...) | ||
| 57 | { | ||
| 58 | struct va_format vaf; | ||
| 59 | va_list args; | ||
| 60 | |||
| 61 | va_start(args, fmt); | ||
| 62 | vaf.fmt = fmt; | ||
| 63 | vaf.va = &args; | ||
| 64 | printk("%sF2FS-fs (%s): %pV\n", level, sb->s_id, &vaf); | ||
| 65 | va_end(args); | ||
| 66 | } | ||
| 67 | |||
| 56 | static void init_once(void *foo) | 68 | static void init_once(void *foo) |
| 57 | { | 69 | { |
| 58 | struct f2fs_inode_info *fi = (struct f2fs_inode_info *) foo; | 70 | struct f2fs_inode_info *fi = (struct f2fs_inode_info *) foo; |
| @@ -125,6 +137,8 @@ int f2fs_sync_fs(struct super_block *sb, int sync) | |||
| 125 | 137 | ||
| 126 | if (sync) | 138 | if (sync) |
| 127 | write_checkpoint(sbi, false, false); | 139 | write_checkpoint(sbi, false, false); |
| 140 | else | ||
| 141 | f2fs_balance_fs(sbi); | ||
| 128 | 142 | ||
| 129 | return 0; | 143 | return 0; |
| 130 | } | 144 | } |
| @@ -247,7 +261,8 @@ static const struct export_operations f2fs_export_ops = { | |||
| 247 | .get_parent = f2fs_get_parent, | 261 | .get_parent = f2fs_get_parent, |
| 248 | }; | 262 | }; |
| 249 | 263 | ||
| 250 | static int parse_options(struct f2fs_sb_info *sbi, char *options) | 264 | static int parse_options(struct super_block *sb, struct f2fs_sb_info *sbi, |
| 265 | char *options) | ||
| 251 | { | 266 | { |
| 252 | substring_t args[MAX_OPT_ARGS]; | 267 | substring_t args[MAX_OPT_ARGS]; |
| 253 | char *p; | 268 | char *p; |
| @@ -286,7 +301,8 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options) | |||
| 286 | break; | 301 | break; |
| 287 | #else | 302 | #else |
| 288 | case Opt_nouser_xattr: | 303 | case Opt_nouser_xattr: |
| 289 | pr_info("nouser_xattr options not supported\n"); | 304 | f2fs_msg(sb, KERN_INFO, |
| 305 | "nouser_xattr options not supported"); | ||
| 290 | break; | 306 | break; |
| 291 | #endif | 307 | #endif |
| 292 | #ifdef CONFIG_F2FS_FS_POSIX_ACL | 308 | #ifdef CONFIG_F2FS_FS_POSIX_ACL |
| @@ -295,7 +311,7 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options) | |||
| 295 | break; | 311 | break; |
| 296 | #else | 312 | #else |
| 297 | case Opt_noacl: | 313 | case Opt_noacl: |
| 298 | pr_info("noacl options not supported\n"); | 314 | f2fs_msg(sb, KERN_INFO, "noacl options not supported"); |
| 299 | break; | 315 | break; |
| 300 | #endif | 316 | #endif |
| 301 | case Opt_active_logs: | 317 | case Opt_active_logs: |
| @@ -309,8 +325,9 @@ static int parse_options(struct f2fs_sb_info *sbi, char *options) | |||
| 309 | set_opt(sbi, DISABLE_EXT_IDENTIFY); | 325 | set_opt(sbi, DISABLE_EXT_IDENTIFY); |
| 310 | break; | 326 | break; |
| 311 | default: | 327 | default: |
| 312 | pr_err("Unrecognized mount option \"%s\" or missing value\n", | 328 | f2fs_msg(sb, KERN_ERR, |
| 313 | p); | 329 | "Unrecognized mount option \"%s\" or missing value", |
| 330 | p); | ||
| 314 | return -EINVAL; | 331 | return -EINVAL; |
| 315 | } | 332 | } |
| 316 | } | 333 | } |
| @@ -337,23 +354,36 @@ static loff_t max_file_size(unsigned bits) | |||
| 337 | return result; | 354 | return result; |
| 338 | } | 355 | } |
| 339 | 356 | ||
| 340 | static int sanity_check_raw_super(struct f2fs_super_block *raw_super) | 357 | static int sanity_check_raw_super(struct super_block *sb, |
| 358 | struct f2fs_super_block *raw_super) | ||
| 341 | { | 359 | { |
| 342 | unsigned int blocksize; | 360 | unsigned int blocksize; |
| 343 | 361 | ||
| 344 | if (F2FS_SUPER_MAGIC != le32_to_cpu(raw_super->magic)) | 362 | if (F2FS_SUPER_MAGIC != le32_to_cpu(raw_super->magic)) { |
| 363 | f2fs_msg(sb, KERN_INFO, | ||
| 364 | "Magic Mismatch, valid(0x%x) - read(0x%x)", | ||
| 365 | F2FS_SUPER_MAGIC, le32_to_cpu(raw_super->magic)); | ||
| 345 | return 1; | 366 | return 1; |
| 367 | } | ||
| 346 | 368 | ||
| 347 | /* Currently, support only 4KB block size */ | 369 | /* Currently, support only 4KB block size */ |
| 348 | blocksize = 1 << le32_to_cpu(raw_super->log_blocksize); | 370 | blocksize = 1 << le32_to_cpu(raw_super->log_blocksize); |
| 349 | if (blocksize != PAGE_CACHE_SIZE) | 371 | if (blocksize != PAGE_CACHE_SIZE) { |
| 372 | f2fs_msg(sb, KERN_INFO, | ||
| 373 | "Invalid blocksize (%u), supports only 4KB\n", | ||
| 374 | blocksize); | ||
| 350 | return 1; | 375 | return 1; |
| 376 | } | ||
| 351 | if (le32_to_cpu(raw_super->log_sectorsize) != | 377 | if (le32_to_cpu(raw_super->log_sectorsize) != |
| 352 | F2FS_LOG_SECTOR_SIZE) | 378 | F2FS_LOG_SECTOR_SIZE) { |
| 379 | f2fs_msg(sb, KERN_INFO, "Invalid log sectorsize"); | ||
| 353 | return 1; | 380 | return 1; |
| 381 | } | ||
| 354 | if (le32_to_cpu(raw_super->log_sectors_per_block) != | 382 | if (le32_to_cpu(raw_super->log_sectors_per_block) != |
| 355 | F2FS_LOG_SECTORS_PER_BLOCK) | 383 | F2FS_LOG_SECTORS_PER_BLOCK) { |
| 384 | f2fs_msg(sb, KERN_INFO, "Invalid log sectors per block"); | ||
| 356 | return 1; | 385 | return 1; |
| 386 | } | ||
| 357 | return 0; | 387 | return 0; |
| 358 | } | 388 | } |
| 359 | 389 | ||
| @@ -413,14 +443,17 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 413 | if (!sbi) | 443 | if (!sbi) |
| 414 | return -ENOMEM; | 444 | return -ENOMEM; |
| 415 | 445 | ||
| 416 | /* set a temporary block size */ | 446 | /* set a block size */ |
| 417 | if (!sb_set_blocksize(sb, F2FS_BLKSIZE)) | 447 | if (!sb_set_blocksize(sb, F2FS_BLKSIZE)) { |
| 448 | f2fs_msg(sb, KERN_ERR, "unable to set blocksize"); | ||
| 418 | goto free_sbi; | 449 | goto free_sbi; |
| 450 | } | ||
| 419 | 451 | ||
| 420 | /* read f2fs raw super block */ | 452 | /* read f2fs raw super block */ |
| 421 | raw_super_buf = sb_bread(sb, 0); | 453 | raw_super_buf = sb_bread(sb, 0); |
| 422 | if (!raw_super_buf) { | 454 | if (!raw_super_buf) { |
| 423 | err = -EIO; | 455 | err = -EIO; |
| 456 | f2fs_msg(sb, KERN_ERR, "unable to read superblock"); | ||
| 424 | goto free_sbi; | 457 | goto free_sbi; |
| 425 | } | 458 | } |
| 426 | raw_super = (struct f2fs_super_block *) | 459 | raw_super = (struct f2fs_super_block *) |
| @@ -438,12 +471,14 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 438 | set_opt(sbi, POSIX_ACL); | 471 | set_opt(sbi, POSIX_ACL); |
| 439 | #endif | 472 | #endif |
| 440 | /* parse mount options */ | 473 | /* parse mount options */ |
| 441 | if (parse_options(sbi, (char *)data)) | 474 | if (parse_options(sb, sbi, (char *)data)) |
| 442 | goto free_sb_buf; | 475 | goto free_sb_buf; |
| 443 | 476 | ||
| 444 | /* sanity checking of raw super */ | 477 | /* sanity checking of raw super */ |
| 445 | if (sanity_check_raw_super(raw_super)) | 478 | if (sanity_check_raw_super(sb, raw_super)) { |
| 479 | f2fs_msg(sb, KERN_ERR, "Can't find a valid F2FS filesystem"); | ||
| 446 | goto free_sb_buf; | 480 | goto free_sb_buf; |
| 481 | } | ||
| 447 | 482 | ||
| 448 | sb->s_maxbytes = max_file_size(le32_to_cpu(raw_super->log_blocksize)); | 483 | sb->s_maxbytes = max_file_size(le32_to_cpu(raw_super->log_blocksize)); |
| 449 | sb->s_max_links = F2FS_LINK_MAX; | 484 | sb->s_max_links = F2FS_LINK_MAX; |
| @@ -477,18 +512,23 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 477 | /* get an inode for meta space */ | 512 | /* get an inode for meta space */ |
| 478 | sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); | 513 | sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); |
| 479 | if (IS_ERR(sbi->meta_inode)) { | 514 | if (IS_ERR(sbi->meta_inode)) { |
| 515 | f2fs_msg(sb, KERN_ERR, "Failed to read F2FS meta data inode"); | ||
| 480 | err = PTR_ERR(sbi->meta_inode); | 516 | err = PTR_ERR(sbi->meta_inode); |
| 481 | goto free_sb_buf; | 517 | goto free_sb_buf; |
| 482 | } | 518 | } |
| 483 | 519 | ||
| 484 | err = get_valid_checkpoint(sbi); | 520 | err = get_valid_checkpoint(sbi); |
| 485 | if (err) | 521 | if (err) { |
| 522 | f2fs_msg(sb, KERN_ERR, "Failed to get valid F2FS checkpoint"); | ||
| 486 | goto free_meta_inode; | 523 | goto free_meta_inode; |
| 524 | } | ||
| 487 | 525 | ||
| 488 | /* sanity checking of checkpoint */ | 526 | /* sanity checking of checkpoint */ |
| 489 | err = -EINVAL; | 527 | err = -EINVAL; |
| 490 | if (sanity_check_ckpt(raw_super, sbi->ckpt)) | 528 | if (sanity_check_ckpt(raw_super, sbi->ckpt)) { |
| 529 | f2fs_msg(sb, KERN_ERR, "Invalid F2FS checkpoint"); | ||
| 491 | goto free_cp; | 530 | goto free_cp; |
| 531 | } | ||
| 492 | 532 | ||
| 493 | sbi->total_valid_node_count = | 533 | sbi->total_valid_node_count = |
| 494 | le32_to_cpu(sbi->ckpt->valid_node_count); | 534 | le32_to_cpu(sbi->ckpt->valid_node_count); |
| @@ -502,25 +542,28 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 502 | INIT_LIST_HEAD(&sbi->dir_inode_list); | 542 | INIT_LIST_HEAD(&sbi->dir_inode_list); |
| 503 | spin_lock_init(&sbi->dir_inode_lock); | 543 | spin_lock_init(&sbi->dir_inode_lock); |
| 504 | 544 | ||
| 505 | /* init super block */ | ||
| 506 | if (!sb_set_blocksize(sb, sbi->blocksize)) | ||
| 507 | goto free_cp; | ||
| 508 | |||
| 509 | init_orphan_info(sbi); | 545 | init_orphan_info(sbi); |
| 510 | 546 | ||
| 511 | /* setup f2fs internal modules */ | 547 | /* setup f2fs internal modules */ |
| 512 | err = build_segment_manager(sbi); | 548 | err = build_segment_manager(sbi); |
| 513 | if (err) | 549 | if (err) { |
| 550 | f2fs_msg(sb, KERN_ERR, | ||
| 551 | "Failed to initialize F2FS segment manager"); | ||
| 514 | goto free_sm; | 552 | goto free_sm; |
| 553 | } | ||
| 515 | err = build_node_manager(sbi); | 554 | err = build_node_manager(sbi); |
| 516 | if (err) | 555 | if (err) { |
| 556 | f2fs_msg(sb, KERN_ERR, | ||
| 557 | "Failed to initialize F2FS node manager"); | ||
| 517 | goto free_nm; | 558 | goto free_nm; |
| 559 | } | ||
| 518 | 560 | ||
| 519 | build_gc_manager(sbi); | 561 | build_gc_manager(sbi); |
| 520 | 562 | ||
| 521 | /* get an inode for node space */ | 563 | /* get an inode for node space */ |
| 522 | sbi->node_inode = f2fs_iget(sb, F2FS_NODE_INO(sbi)); | 564 | sbi->node_inode = f2fs_iget(sb, F2FS_NODE_INO(sbi)); |
| 523 | if (IS_ERR(sbi->node_inode)) { | 565 | if (IS_ERR(sbi->node_inode)) { |
| 566 | f2fs_msg(sb, KERN_ERR, "Failed to read node inode"); | ||
| 524 | err = PTR_ERR(sbi->node_inode); | 567 | err = PTR_ERR(sbi->node_inode); |
| 525 | goto free_nm; | 568 | goto free_nm; |
| 526 | } | 569 | } |
| @@ -533,6 +576,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) | |||
| 533 | /* read root inode and dentry */ | 576 | /* read root inode and dentry */ |
| 534 | root = f2fs_iget(sb, F2FS_ROOT_INO(sbi)); | 577 | root = f2fs_iget(sb, F2FS_ROOT_INO(sbi)); |
| 535 | if (IS_ERR(root)) { | 578 | if (IS_ERR(root)) { |
| 579 | f2fs_msg(sb, KERN_ERR, "Failed to read root inode"); | ||
| 536 | err = PTR_ERR(root); | 580 | err = PTR_ERR(root); |
| 537 | goto free_node_inode; | 581 | goto free_node_inode; |
| 538 | } | 582 | } |
| @@ -596,7 +640,7 @@ static struct file_system_type f2fs_fs_type = { | |||
| 596 | .fs_flags = FS_REQUIRES_DEV, | 640 | .fs_flags = FS_REQUIRES_DEV, |
| 597 | }; | 641 | }; |
| 598 | 642 | ||
| 599 | static int init_inodecache(void) | 643 | static int __init init_inodecache(void) |
| 600 | { | 644 | { |
| 601 | f2fs_inode_cachep = f2fs_kmem_cache_create("f2fs_inode_cache", | 645 | f2fs_inode_cachep = f2fs_kmem_cache_create("f2fs_inode_cache", |
| 602 | sizeof(struct f2fs_inode_info), NULL); | 646 | sizeof(struct f2fs_inode_info), NULL); |
| @@ -631,14 +675,17 @@ static int __init init_f2fs_fs(void) | |||
| 631 | err = create_checkpoint_caches(); | 675 | err = create_checkpoint_caches(); |
| 632 | if (err) | 676 | if (err) |
| 633 | goto fail; | 677 | goto fail; |
| 634 | return register_filesystem(&f2fs_fs_type); | 678 | err = register_filesystem(&f2fs_fs_type); |
| 679 | if (err) | ||
| 680 | goto fail; | ||
| 681 | f2fs_create_root_stats(); | ||
| 635 | fail: | 682 | fail: |
| 636 | return err; | 683 | return err; |
| 637 | } | 684 | } |
| 638 | 685 | ||
| 639 | static void __exit exit_f2fs_fs(void) | 686 | static void __exit exit_f2fs_fs(void) |
| 640 | { | 687 | { |
| 641 | destroy_root_stats(); | 688 | f2fs_destroy_root_stats(); |
| 642 | unregister_filesystem(&f2fs_fs_type); | 689 | unregister_filesystem(&f2fs_fs_type); |
| 643 | destroy_checkpoint_caches(); | 690 | destroy_checkpoint_caches(); |
| 644 | destroy_gc_caches(); | 691 | destroy_gc_caches(); |
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 940136a3d3a6..8038c0496504 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c | |||
| @@ -318,6 +318,8 @@ int f2fs_setxattr(struct inode *inode, int name_index, const char *name, | |||
| 318 | if (name_len > 255 || value_len > MAX_VALUE_LEN) | 318 | if (name_len > 255 || value_len > MAX_VALUE_LEN) |
| 319 | return -ERANGE; | 319 | return -ERANGE; |
| 320 | 320 | ||
| 321 | f2fs_balance_fs(sbi); | ||
| 322 | |||
| 321 | mutex_lock_op(sbi, NODE_NEW); | 323 | mutex_lock_op(sbi, NODE_NEW); |
| 322 | if (!fi->i_xattr_nid) { | 324 | if (!fi->i_xattr_nid) { |
| 323 | /* Allocate new attribute block */ | 325 | /* Allocate new attribute block */ |
diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig index 0cf160a94eda..1b2f6c2c3aaf 100644 --- a/fs/fuse/Kconfig +++ b/fs/fuse/Kconfig | |||
| @@ -4,12 +4,24 @@ config FUSE_FS | |||
| 4 | With FUSE it is possible to implement a fully functional filesystem | 4 | With FUSE it is possible to implement a fully functional filesystem |
| 5 | in a userspace program. | 5 | in a userspace program. |
| 6 | 6 | ||
| 7 | There's also companion library: libfuse. This library along with | 7 | There's also a companion library: libfuse2. This library is available |
| 8 | utilities is available from the FUSE homepage: | 8 | from the FUSE homepage: |
| 9 | <http://fuse.sourceforge.net/> | 9 | <http://fuse.sourceforge.net/> |
| 10 | although chances are your distribution already has that library | ||
| 11 | installed if you've installed the "fuse" package itself. | ||
| 10 | 12 | ||
| 11 | See <file:Documentation/filesystems/fuse.txt> for more information. | 13 | See <file:Documentation/filesystems/fuse.txt> for more information. |
| 12 | See <file:Documentation/Changes> for needed library/utility version. | 14 | See <file:Documentation/Changes> for needed library/utility version. |
| 13 | 15 | ||
| 14 | If you want to develop a userspace FS, or if you want to use | 16 | If you want to develop a userspace FS, or if you want to use |
| 15 | a filesystem based on FUSE, answer Y or M. | 17 | a filesystem based on FUSE, answer Y or M. |
| 18 | |||
| 19 | config CUSE | ||
| 20 | tristate "Character device in Userspace support" | ||
| 21 | depends on FUSE_FS | ||
| 22 | help | ||
| 23 | This FUSE extension allows character devices to be | ||
| 24 | implemented in userspace. | ||
| 25 | |||
| 26 | If you want to develop or use a userspace character device | ||
| 27 | based on CUSE, answer Y or M. | ||
diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index ee8d55042298..e397b675b029 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/miscdevice.h> | 45 | #include <linux/miscdevice.h> |
| 46 | #include <linux/mutex.h> | 46 | #include <linux/mutex.h> |
| 47 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
| 48 | #include <linux/spinlock.h> | ||
| 49 | #include <linux/stat.h> | 48 | #include <linux/stat.h> |
| 50 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 51 | 50 | ||
| @@ -63,7 +62,7 @@ struct cuse_conn { | |||
| 63 | bool unrestricted_ioctl; | 62 | bool unrestricted_ioctl; |
| 64 | }; | 63 | }; |
| 65 | 64 | ||
| 66 | static DEFINE_SPINLOCK(cuse_lock); /* protects cuse_conntbl */ | 65 | static DEFINE_MUTEX(cuse_lock); /* protects registration */ |
| 67 | static struct list_head cuse_conntbl[CUSE_CONNTBL_LEN]; | 66 | static struct list_head cuse_conntbl[CUSE_CONNTBL_LEN]; |
| 68 | static struct class *cuse_class; | 67 | static struct class *cuse_class; |
| 69 | 68 | ||
| @@ -114,14 +113,14 @@ static int cuse_open(struct inode *inode, struct file *file) | |||
| 114 | int rc; | 113 | int rc; |
| 115 | 114 | ||
| 116 | /* look up and get the connection */ | 115 | /* look up and get the connection */ |
| 117 | spin_lock(&cuse_lock); | 116 | mutex_lock(&cuse_lock); |
| 118 | list_for_each_entry(pos, cuse_conntbl_head(devt), list) | 117 | list_for_each_entry(pos, cuse_conntbl_head(devt), list) |
| 119 | if (pos->dev->devt == devt) { | 118 | if (pos->dev->devt == devt) { |
| 120 | fuse_conn_get(&pos->fc); | 119 | fuse_conn_get(&pos->fc); |
| 121 | cc = pos; | 120 | cc = pos; |
| 122 | break; | 121 | break; |
| 123 | } | 122 | } |
| 124 | spin_unlock(&cuse_lock); | 123 | mutex_unlock(&cuse_lock); |
| 125 | 124 | ||
| 126 | /* dead? */ | 125 | /* dead? */ |
| 127 | if (!cc) | 126 | if (!cc) |
| @@ -267,7 +266,7 @@ static int cuse_parse_one(char **pp, char *end, char **keyp, char **valp) | |||
| 267 | static int cuse_parse_devinfo(char *p, size_t len, struct cuse_devinfo *devinfo) | 266 | static int cuse_parse_devinfo(char *p, size_t len, struct cuse_devinfo *devinfo) |
| 268 | { | 267 | { |
| 269 | char *end = p + len; | 268 | char *end = p + len; |
| 270 | char *key, *val; | 269 | char *uninitialized_var(key), *uninitialized_var(val); |
| 271 | int rc; | 270 | int rc; |
| 272 | 271 | ||
| 273 | while (true) { | 272 | while (true) { |
| @@ -305,14 +304,14 @@ static void cuse_gendev_release(struct device *dev) | |||
| 305 | */ | 304 | */ |
| 306 | static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | 305 | static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req) |
| 307 | { | 306 | { |
| 308 | struct cuse_conn *cc = fc_to_cc(fc); | 307 | struct cuse_conn *cc = fc_to_cc(fc), *pos; |
| 309 | struct cuse_init_out *arg = req->out.args[0].value; | 308 | struct cuse_init_out *arg = req->out.args[0].value; |
| 310 | struct page *page = req->pages[0]; | 309 | struct page *page = req->pages[0]; |
| 311 | struct cuse_devinfo devinfo = { }; | 310 | struct cuse_devinfo devinfo = { }; |
| 312 | struct device *dev; | 311 | struct device *dev; |
| 313 | struct cdev *cdev; | 312 | struct cdev *cdev; |
| 314 | dev_t devt; | 313 | dev_t devt; |
| 315 | int rc; | 314 | int rc, i; |
| 316 | 315 | ||
| 317 | if (req->out.h.error || | 316 | if (req->out.h.error || |
| 318 | arg->major != FUSE_KERNEL_VERSION || arg->minor < 11) { | 317 | arg->major != FUSE_KERNEL_VERSION || arg->minor < 11) { |
| @@ -356,15 +355,24 @@ static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
| 356 | dev_set_drvdata(dev, cc); | 355 | dev_set_drvdata(dev, cc); |
| 357 | dev_set_name(dev, "%s", devinfo.name); | 356 | dev_set_name(dev, "%s", devinfo.name); |
| 358 | 357 | ||
| 358 | mutex_lock(&cuse_lock); | ||
| 359 | |||
| 360 | /* make sure the device-name is unique */ | ||
| 361 | for (i = 0; i < CUSE_CONNTBL_LEN; ++i) { | ||
| 362 | list_for_each_entry(pos, &cuse_conntbl[i], list) | ||
| 363 | if (!strcmp(dev_name(pos->dev), dev_name(dev))) | ||
| 364 | goto err_unlock; | ||
| 365 | } | ||
| 366 | |||
| 359 | rc = device_add(dev); | 367 | rc = device_add(dev); |
| 360 | if (rc) | 368 | if (rc) |
| 361 | goto err_device; | 369 | goto err_unlock; |
| 362 | 370 | ||
| 363 | /* register cdev */ | 371 | /* register cdev */ |
| 364 | rc = -ENOMEM; | 372 | rc = -ENOMEM; |
| 365 | cdev = cdev_alloc(); | 373 | cdev = cdev_alloc(); |
| 366 | if (!cdev) | 374 | if (!cdev) |
| 367 | goto err_device; | 375 | goto err_unlock; |
| 368 | 376 | ||
| 369 | cdev->owner = THIS_MODULE; | 377 | cdev->owner = THIS_MODULE; |
| 370 | cdev->ops = &cuse_frontend_fops; | 378 | cdev->ops = &cuse_frontend_fops; |
| @@ -377,9 +385,8 @@ static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req) | |||
| 377 | cc->cdev = cdev; | 385 | cc->cdev = cdev; |
| 378 | 386 | ||
| 379 | /* make the device available */ | 387 | /* make the device available */ |
| 380 | spin_lock(&cuse_lock); | ||
| 381 | list_add(&cc->list, cuse_conntbl_head(devt)); | 388 | list_add(&cc->list, cuse_conntbl_head(devt)); |
| 382 | spin_unlock(&cuse_lock); | 389 | mutex_unlock(&cuse_lock); |
| 383 | 390 | ||
| 384 | /* announce device availability */ | 391 | /* announce device availability */ |
| 385 | dev_set_uevent_suppress(dev, 0); | 392 | dev_set_uevent_suppress(dev, 0); |
| @@ -391,7 +398,8 @@ out: | |||
| 391 | 398 | ||
| 392 | err_cdev: | 399 | err_cdev: |
| 393 | cdev_del(cdev); | 400 | cdev_del(cdev); |
| 394 | err_device: | 401 | err_unlock: |
| 402 | mutex_unlock(&cuse_lock); | ||
| 395 | put_device(dev); | 403 | put_device(dev); |
| 396 | err_region: | 404 | err_region: |
| 397 | unregister_chrdev_region(devt, 1); | 405 | unregister_chrdev_region(devt, 1); |
| @@ -520,9 +528,9 @@ static int cuse_channel_release(struct inode *inode, struct file *file) | |||
| 520 | int rc; | 528 | int rc; |
| 521 | 529 | ||
| 522 | /* remove from the conntbl, no more access from this point on */ | 530 | /* remove from the conntbl, no more access from this point on */ |
| 523 | spin_lock(&cuse_lock); | 531 | mutex_lock(&cuse_lock); |
| 524 | list_del_init(&cc->list); | 532 | list_del_init(&cc->list); |
| 525 | spin_unlock(&cuse_lock); | 533 | mutex_unlock(&cuse_lock); |
| 526 | 534 | ||
| 527 | /* remove device */ | 535 | /* remove device */ |
| 528 | if (cc->dev) | 536 | if (cc->dev) |
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index c16335315e5d..e83351aa5bad 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
| @@ -692,8 +692,6 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) | |||
| 692 | struct page *oldpage = *pagep; | 692 | struct page *oldpage = *pagep; |
| 693 | struct page *newpage; | 693 | struct page *newpage; |
| 694 | struct pipe_buffer *buf = cs->pipebufs; | 694 | struct pipe_buffer *buf = cs->pipebufs; |
| 695 | struct address_space *mapping; | ||
| 696 | pgoff_t index; | ||
| 697 | 695 | ||
| 698 | unlock_request(cs->fc, cs->req); | 696 | unlock_request(cs->fc, cs->req); |
| 699 | fuse_copy_finish(cs); | 697 | fuse_copy_finish(cs); |
| @@ -724,9 +722,6 @@ static int fuse_try_move_page(struct fuse_copy_state *cs, struct page **pagep) | |||
| 724 | if (fuse_check_page(newpage) != 0) | 722 | if (fuse_check_page(newpage) != 0) |
| 725 | goto out_fallback_unlock; | 723 | goto out_fallback_unlock; |
| 726 | 724 | ||
| 727 | mapping = oldpage->mapping; | ||
| 728 | index = oldpage->index; | ||
| 729 | |||
| 730 | /* | 725 | /* |
| 731 | * This is a new and locked page, it shouldn't be mapped or | 726 | * This is a new and locked page, it shouldn't be mapped or |
| 732 | * have any special flags on it | 727 | * have any special flags on it |
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index e21d4d8f87e3..f3ab824fa302 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
| @@ -2177,8 +2177,8 @@ fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
| 2177 | return ret; | 2177 | return ret; |
| 2178 | } | 2178 | } |
| 2179 | 2179 | ||
| 2180 | long fuse_file_fallocate(struct file *file, int mode, loff_t offset, | 2180 | static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, |
| 2181 | loff_t length) | 2181 | loff_t length) |
| 2182 | { | 2182 | { |
| 2183 | struct fuse_file *ff = file->private_data; | 2183 | struct fuse_file *ff = file->private_data; |
| 2184 | struct fuse_conn *fc = ff->fc; | 2184 | struct fuse_conn *fc = ff->fc; |
| @@ -2213,7 +2213,6 @@ long fuse_file_fallocate(struct file *file, int mode, loff_t offset, | |||
| 2213 | 2213 | ||
| 2214 | return err; | 2214 | return err; |
| 2215 | } | 2215 | } |
| 2216 | EXPORT_SYMBOL_GPL(fuse_file_fallocate); | ||
| 2217 | 2216 | ||
| 2218 | static const struct file_operations fuse_file_operations = { | 2217 | static const struct file_operations fuse_file_operations = { |
| 2219 | .llseek = fuse_file_llseek, | 2218 | .llseek = fuse_file_llseek, |
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c index b906ed17a839..9802de0f85e6 100644 --- a/fs/gfs2/lock_dlm.c +++ b/fs/gfs2/lock_dlm.c | |||
| @@ -281,6 +281,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) | |||
| 281 | { | 281 | { |
| 282 | struct gfs2_sbd *sdp = gl->gl_sbd; | 282 | struct gfs2_sbd *sdp = gl->gl_sbd; |
| 283 | struct lm_lockstruct *ls = &sdp->sd_lockstruct; | 283 | struct lm_lockstruct *ls = &sdp->sd_lockstruct; |
| 284 | int lvb_needs_unlock = 0; | ||
| 284 | int error; | 285 | int error; |
| 285 | 286 | ||
| 286 | if (gl->gl_lksb.sb_lkid == 0) { | 287 | if (gl->gl_lksb.sb_lkid == 0) { |
| @@ -294,8 +295,12 @@ static void gdlm_put_lock(struct gfs2_glock *gl) | |||
| 294 | gfs2_update_request_times(gl); | 295 | gfs2_update_request_times(gl); |
| 295 | 296 | ||
| 296 | /* don't want to skip dlm_unlock writing the lvb when lock is ex */ | 297 | /* don't want to skip dlm_unlock writing the lvb when lock is ex */ |
| 298 | |||
| 299 | if (gl->gl_lksb.sb_lvbptr && (gl->gl_state == LM_ST_EXCLUSIVE)) | ||
| 300 | lvb_needs_unlock = 1; | ||
| 301 | |||
| 297 | if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) && | 302 | if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) && |
| 298 | gl->gl_lksb.sb_lvbptr && (gl->gl_state != LM_ST_EXCLUSIVE)) { | 303 | !lvb_needs_unlock) { |
| 299 | gfs2_glock_free(gl); | 304 | gfs2_glock_free(gl); |
| 300 | return; | 305 | return; |
| 301 | } | 306 | } |
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 4111a40ebe1a..5f707e537171 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c | |||
| @@ -86,11 +86,11 @@ xfs_destroy_ioend( | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | if (ioend->io_iocb) { | 88 | if (ioend->io_iocb) { |
| 89 | inode_dio_done(ioend->io_inode); | ||
| 89 | if (ioend->io_isasync) { | 90 | if (ioend->io_isasync) { |
| 90 | aio_complete(ioend->io_iocb, ioend->io_error ? | 91 | aio_complete(ioend->io_iocb, ioend->io_error ? |
| 91 | ioend->io_error : ioend->io_result, 0); | 92 | ioend->io_error : ioend->io_result, 0); |
| 92 | } | 93 | } |
| 93 | inode_dio_done(ioend->io_inode); | ||
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | mempool_free(ioend, xfs_ioend_pool); | 96 | mempool_free(ioend, xfs_ioend_pool); |
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 0e92d12765d2..cdb2d3348583 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
| @@ -4680,9 +4680,6 @@ __xfs_bmapi_allocate( | |||
| 4680 | return error; | 4680 | return error; |
| 4681 | } | 4681 | } |
| 4682 | 4682 | ||
| 4683 | if (bma->flags & XFS_BMAPI_STACK_SWITCH) | ||
| 4684 | bma->stack_switch = 1; | ||
| 4685 | |||
| 4686 | error = xfs_bmap_alloc(bma); | 4683 | error = xfs_bmap_alloc(bma); |
| 4687 | if (error) | 4684 | if (error) |
| 4688 | return error; | 4685 | return error; |
| @@ -4956,6 +4953,9 @@ xfs_bmapi_write( | |||
| 4956 | bma.flist = flist; | 4953 | bma.flist = flist; |
| 4957 | bma.firstblock = firstblock; | 4954 | bma.firstblock = firstblock; |
| 4958 | 4955 | ||
| 4956 | if (flags & XFS_BMAPI_STACK_SWITCH) | ||
| 4957 | bma.stack_switch = 1; | ||
| 4958 | |||
| 4959 | while (bno < end && n < *nmap) { | 4959 | while (bno < end && n < *nmap) { |
| 4960 | inhole = eof || bma.got.br_startoff > bno; | 4960 | inhole = eof || bma.got.br_startoff > bno; |
| 4961 | wasdelay = !inhole && isnullstartblock(bma.got.br_startblock); | 4961 | wasdelay = !inhole && isnullstartblock(bma.got.br_startblock); |
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 56d1614760cf..fbbb9eb92e32 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
| @@ -487,6 +487,7 @@ _xfs_buf_find( | |||
| 487 | struct rb_node *parent; | 487 | struct rb_node *parent; |
| 488 | xfs_buf_t *bp; | 488 | xfs_buf_t *bp; |
| 489 | xfs_daddr_t blkno = map[0].bm_bn; | 489 | xfs_daddr_t blkno = map[0].bm_bn; |
| 490 | xfs_daddr_t eofs; | ||
| 490 | int numblks = 0; | 491 | int numblks = 0; |
| 491 | int i; | 492 | int i; |
| 492 | 493 | ||
| @@ -498,6 +499,23 @@ _xfs_buf_find( | |||
| 498 | ASSERT(!(numbytes < (1 << btp->bt_sshift))); | 499 | ASSERT(!(numbytes < (1 << btp->bt_sshift))); |
| 499 | ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_smask)); | 500 | ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_smask)); |
| 500 | 501 | ||
| 502 | /* | ||
| 503 | * Corrupted block numbers can get through to here, unfortunately, so we | ||
| 504 | * have to check that the buffer falls within the filesystem bounds. | ||
| 505 | */ | ||
| 506 | eofs = XFS_FSB_TO_BB(btp->bt_mount, btp->bt_mount->m_sb.sb_dblocks); | ||
| 507 | if (blkno >= eofs) { | ||
| 508 | /* | ||
| 509 | * XXX (dgc): we should really be returning EFSCORRUPTED here, | ||
| 510 | * but none of the higher level infrastructure supports | ||
| 511 | * returning a specific error on buffer lookup failures. | ||
| 512 | */ | ||
| 513 | xfs_alert(btp->bt_mount, | ||
| 514 | "%s: Block out of range: block 0x%llx, EOFS 0x%llx ", | ||
| 515 | __func__, blkno, eofs); | ||
| 516 | return NULL; | ||
| 517 | } | ||
| 518 | |||
| 501 | /* get tree root */ | 519 | /* get tree root */ |
| 502 | pag = xfs_perag_get(btp->bt_mount, | 520 | pag = xfs_perag_get(btp->bt_mount, |
| 503 | xfs_daddr_to_agno(btp->bt_mount, blkno)); | 521 | xfs_daddr_to_agno(btp->bt_mount, blkno)); |
| @@ -1487,6 +1505,8 @@ restart: | |||
| 1487 | while (!list_empty(&btp->bt_lru)) { | 1505 | while (!list_empty(&btp->bt_lru)) { |
| 1488 | bp = list_first_entry(&btp->bt_lru, struct xfs_buf, b_lru); | 1506 | bp = list_first_entry(&btp->bt_lru, struct xfs_buf, b_lru); |
| 1489 | if (atomic_read(&bp->b_hold) > 1) { | 1507 | if (atomic_read(&bp->b_hold) > 1) { |
| 1508 | trace_xfs_buf_wait_buftarg(bp, _RET_IP_); | ||
| 1509 | list_move_tail(&bp->b_lru, &btp->bt_lru); | ||
| 1490 | spin_unlock(&btp->bt_lru_lock); | 1510 | spin_unlock(&btp->bt_lru_lock); |
| 1491 | delay(100); | 1511 | delay(100); |
| 1492 | goto restart; | 1512 | goto restart; |
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index 77b09750e92c..3f9949fee391 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c | |||
| @@ -652,7 +652,10 @@ xfs_buf_item_unlock( | |||
| 652 | 652 | ||
| 653 | /* | 653 | /* |
| 654 | * If the buf item isn't tracking any data, free it, otherwise drop the | 654 | * If the buf item isn't tracking any data, free it, otherwise drop the |
| 655 | * reference we hold to it. | 655 | * reference we hold to it. If we are aborting the transaction, this may |
| 656 | * be the only reference to the buf item, so we free it anyway | ||
| 657 | * regardless of whether it is dirty or not. A dirty abort implies a | ||
| 658 | * shutdown, anyway. | ||
| 656 | */ | 659 | */ |
| 657 | clean = 1; | 660 | clean = 1; |
| 658 | for (i = 0; i < bip->bli_format_count; i++) { | 661 | for (i = 0; i < bip->bli_format_count; i++) { |
| @@ -664,7 +667,12 @@ xfs_buf_item_unlock( | |||
| 664 | } | 667 | } |
| 665 | if (clean) | 668 | if (clean) |
| 666 | xfs_buf_item_relse(bp); | 669 | xfs_buf_item_relse(bp); |
| 667 | else | 670 | else if (aborted) { |
| 671 | if (atomic_dec_and_test(&bip->bli_refcount)) { | ||
| 672 | ASSERT(XFS_FORCED_SHUTDOWN(lip->li_mountp)); | ||
| 673 | xfs_buf_item_relse(bp); | ||
| 674 | } | ||
| 675 | } else | ||
| 668 | atomic_dec(&bip->bli_refcount); | 676 | atomic_dec(&bip->bli_refcount); |
| 669 | 677 | ||
| 670 | if (!hold) | 678 | if (!hold) |
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index d0e9c74d3d96..a8bd26b82ecb 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c | |||
| @@ -246,10 +246,10 @@ xfs_swap_extents( | |||
| 246 | goto out_unlock; | 246 | goto out_unlock; |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | error = -filemap_write_and_wait(VFS_I(ip)->i_mapping); | 249 | error = -filemap_write_and_wait(VFS_I(tip)->i_mapping); |
| 250 | if (error) | 250 | if (error) |
| 251 | goto out_unlock; | 251 | goto out_unlock; |
| 252 | truncate_pagecache_range(VFS_I(ip), 0, -1); | 252 | truncate_pagecache_range(VFS_I(tip), 0, -1); |
| 253 | 253 | ||
| 254 | /* Verify O_DIRECT for ftmp */ | 254 | /* Verify O_DIRECT for ftmp */ |
| 255 | if (VN_CACHED(VFS_I(tip)) != 0) { | 255 | if (VN_CACHED(VFS_I(tip)) != 0) { |
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index add06b4e9a63..364818eef40e 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c | |||
| @@ -351,6 +351,15 @@ xfs_iomap_prealloc_size( | |||
| 351 | } | 351 | } |
| 352 | if (shift) | 352 | if (shift) |
| 353 | alloc_blocks >>= shift; | 353 | alloc_blocks >>= shift; |
| 354 | |||
| 355 | /* | ||
| 356 | * If we are still trying to allocate more space than is | ||
| 357 | * available, squash the prealloc hard. This can happen if we | ||
| 358 | * have a large file on a small filesystem and the above | ||
| 359 | * lowspace thresholds are smaller than MAXEXTLEN. | ||
| 360 | */ | ||
| 361 | while (alloc_blocks >= freesp) | ||
| 362 | alloc_blocks >>= 4; | ||
| 354 | } | 363 | } |
| 355 | 364 | ||
| 356 | if (alloc_blocks < mp->m_writeio_blocks) | 365 | if (alloc_blocks < mp->m_writeio_blocks) |
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index da508463ff10..7d6df7c00c36 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
| @@ -658,7 +658,7 @@ xfs_sb_quiet_read_verify( | |||
| 658 | return; | 658 | return; |
| 659 | } | 659 | } |
| 660 | /* quietly fail */ | 660 | /* quietly fail */ |
| 661 | xfs_buf_ioerror(bp, EFSCORRUPTED); | 661 | xfs_buf_ioerror(bp, EWRONGFS); |
| 662 | } | 662 | } |
| 663 | 663 | ||
| 664 | static void | 664 | static void |
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 2e137d4a85ae..16a812977eab 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h | |||
| @@ -341,6 +341,7 @@ DEFINE_BUF_EVENT(xfs_buf_item_relse); | |||
| 341 | DEFINE_BUF_EVENT(xfs_buf_item_iodone); | 341 | DEFINE_BUF_EVENT(xfs_buf_item_iodone); |
| 342 | DEFINE_BUF_EVENT(xfs_buf_item_iodone_async); | 342 | DEFINE_BUF_EVENT(xfs_buf_item_iodone_async); |
| 343 | DEFINE_BUF_EVENT(xfs_buf_error_relse); | 343 | DEFINE_BUF_EVENT(xfs_buf_error_relse); |
| 344 | DEFINE_BUF_EVENT(xfs_buf_wait_buftarg); | ||
| 344 | DEFINE_BUF_EVENT(xfs_trans_read_buf_io); | 345 | DEFINE_BUF_EVENT(xfs_trans_read_buf_io); |
| 345 | DEFINE_BUF_EVENT(xfs_trans_read_buf_shut); | 346 | DEFINE_BUF_EVENT(xfs_trans_read_buf_shut); |
| 346 | 347 | ||
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index ccf7b4f34a3c..6c32af918c2f 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h | |||
| @@ -16,6 +16,22 @@ extern void | |||
| 16 | dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, | 16 | dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, |
| 17 | dma_addr_t dma_handle); | 17 | dma_addr_t dma_handle); |
| 18 | 18 | ||
| 19 | static inline void *dma_alloc_attrs(struct device *dev, size_t size, | ||
| 20 | dma_addr_t *dma_handle, gfp_t flag, | ||
| 21 | struct dma_attrs *attrs) | ||
| 22 | { | ||
| 23 | /* attrs is not supported and ignored */ | ||
| 24 | return dma_alloc_coherent(dev, size, dma_handle, flag); | ||
| 25 | } | ||
| 26 | |||
| 27 | static inline void dma_free_attrs(struct device *dev, size_t size, | ||
| 28 | void *cpu_addr, dma_addr_t dma_handle, | ||
| 29 | struct dma_attrs *attrs) | ||
| 30 | { | ||
| 31 | /* attrs is not supported and ignored */ | ||
| 32 | dma_free_coherent(dev, size, cpu_addr, dma_handle); | ||
| 33 | } | ||
| 34 | |||
| 19 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) | 35 | #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) |
| 20 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) | 36 | #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) |
| 21 | 37 | ||
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 701beab27aab..5cf680a98f9b 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
| @@ -461,10 +461,8 @@ static inline int is_zero_pfn(unsigned long pfn) | |||
| 461 | return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT); | 461 | return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT); |
| 462 | } | 462 | } |
| 463 | 463 | ||
| 464 | static inline unsigned long my_zero_pfn(unsigned long addr) | 464 | #define my_zero_pfn(addr) page_to_pfn(ZERO_PAGE(addr)) |
| 465 | { | 465 | |
| 466 | return page_to_pfn(ZERO_PAGE(addr)); | ||
| 467 | } | ||
| 468 | #else | 466 | #else |
| 469 | static inline int is_zero_pfn(unsigned long pfn) | 467 | static inline int is_zero_pfn(unsigned long pfn) |
| 470 | { | 468 | { |
diff --git a/include/asm-generic/syscalls.h b/include/asm-generic/syscalls.h index 58f466ff00d3..1db51b8524e9 100644 --- a/include/asm-generic/syscalls.h +++ b/include/asm-generic/syscalls.h | |||
| @@ -21,10 +21,12 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, | |||
| 21 | unsigned long fd, off_t pgoff); | 21 | unsigned long fd, off_t pgoff); |
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | #ifndef CONFIG_GENERIC_SIGALTSTACK | ||
| 24 | #ifndef sys_sigaltstack | 25 | #ifndef sys_sigaltstack |
| 25 | asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *, | 26 | asmlinkage long sys_sigaltstack(const stack_t __user *, stack_t __user *, |
| 26 | struct pt_regs *); | 27 | struct pt_regs *); |
| 27 | #endif | 28 | #endif |
| 29 | #endif | ||
| 28 | 30 | ||
| 29 | #ifndef sys_rt_sigreturn | 31 | #ifndef sys_rt_sigreturn |
| 30 | asmlinkage long sys_rt_sigreturn(struct pt_regs *regs); | 32 | asmlinkage long sys_rt_sigreturn(struct pt_regs *regs); |
diff --git a/include/linux/ata.h b/include/linux/ata.h index 408da9502177..8f7a3d68371a 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h | |||
| @@ -297,10 +297,12 @@ enum { | |||
| 297 | ATA_LOG_SATA_NCQ = 0x10, | 297 | ATA_LOG_SATA_NCQ = 0x10, |
| 298 | ATA_LOG_SATA_ID_DEV_DATA = 0x30, | 298 | ATA_LOG_SATA_ID_DEV_DATA = 0x30, |
| 299 | ATA_LOG_SATA_SETTINGS = 0x08, | 299 | ATA_LOG_SATA_SETTINGS = 0x08, |
| 300 | ATA_LOG_DEVSLP_MDAT = 0x30, | 300 | ATA_LOG_DEVSLP_OFFSET = 0x30, |
| 301 | ATA_LOG_DEVSLP_SIZE = 0x08, | ||
| 302 | ATA_LOG_DEVSLP_MDAT = 0x00, | ||
| 301 | ATA_LOG_DEVSLP_MDAT_MASK = 0x1F, | 303 | ATA_LOG_DEVSLP_MDAT_MASK = 0x1F, |
| 302 | ATA_LOG_DEVSLP_DETO = 0x31, | 304 | ATA_LOG_DEVSLP_DETO = 0x01, |
| 303 | ATA_LOG_DEVSLP_VALID = 0x37, | 305 | ATA_LOG_DEVSLP_VALID = 0x07, |
| 304 | ATA_LOG_DEVSLP_VALID_MASK = 0x80, | 306 | ATA_LOG_DEVSLP_VALID_MASK = 0x80, |
| 305 | 307 | ||
| 306 | /* READ/WRITE LONG (obsolete) */ | 308 | /* READ/WRITE LONG (obsolete) */ |
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 8a7096fcb01e..66346521cb65 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -161,6 +161,15 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) | |||
| 161 | extern void clockevents_suspend(void); | 161 | extern void clockevents_suspend(void); |
| 162 | extern void clockevents_resume(void); | 162 | extern void clockevents_resume(void); |
| 163 | 163 | ||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
| 165 | #ifdef CONFIG_ARCH_HAS_TICK_BROADCAST | ||
| 166 | extern void tick_broadcast(const struct cpumask *mask); | ||
| 167 | #else | ||
| 168 | #define tick_broadcast NULL | ||
| 169 | #endif | ||
| 170 | extern int tick_receive_broadcast(void); | ||
| 171 | #endif | ||
| 172 | |||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | 173 | #ifdef CONFIG_GENERIC_CLOCKEVENTS |
| 165 | extern void clockevents_notify(unsigned long reason, void *arg); | 174 | extern void clockevents_notify(unsigned long reason, void *arg); |
| 166 | #else | 175 | #else |
diff --git a/include/linux/efi.h b/include/linux/efi.h index 8b84916dc671..7a9498ab3c2d 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
| @@ -618,18 +618,30 @@ extern int __init efi_setup_pcdp_console(char *); | |||
| 618 | #endif | 618 | #endif |
| 619 | 619 | ||
| 620 | /* | 620 | /* |
| 621 | * We play games with efi_enabled so that the compiler will, if possible, remove | 621 | * We play games with efi_enabled so that the compiler will, if |
| 622 | * EFI-related code altogether. | 622 | * possible, remove EFI-related code altogether. |
| 623 | */ | 623 | */ |
| 624 | #define EFI_BOOT 0 /* Were we booted from EFI? */ | ||
| 625 | #define EFI_SYSTEM_TABLES 1 /* Can we use EFI system tables? */ | ||
| 626 | #define EFI_CONFIG_TABLES 2 /* Can we use EFI config tables? */ | ||
| 627 | #define EFI_RUNTIME_SERVICES 3 /* Can we use runtime services? */ | ||
| 628 | #define EFI_MEMMAP 4 /* Can we use EFI memory map? */ | ||
| 629 | #define EFI_64BIT 5 /* Is the firmware 64-bit? */ | ||
| 630 | |||
| 624 | #ifdef CONFIG_EFI | 631 | #ifdef CONFIG_EFI |
| 625 | # ifdef CONFIG_X86 | 632 | # ifdef CONFIG_X86 |
| 626 | extern int efi_enabled; | 633 | extern int efi_enabled(int facility); |
| 627 | extern bool efi_64bit; | ||
| 628 | # else | 634 | # else |
| 629 | # define efi_enabled 1 | 635 | static inline int efi_enabled(int facility) |
| 636 | { | ||
| 637 | return 1; | ||
| 638 | } | ||
| 630 | # endif | 639 | # endif |
| 631 | #else | 640 | #else |
| 632 | # define efi_enabled 0 | 641 | static inline int efi_enabled(int facility) |
| 642 | { | ||
| 643 | return 0; | ||
| 644 | } | ||
| 633 | #endif | 645 | #endif |
| 634 | 646 | ||
| 635 | /* | 647 | /* |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 83ba0ab2c915..649e5f86b5f0 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -652,8 +652,8 @@ struct ata_device { | |||
| 652 | u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ | 652 | u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ |
| 653 | }; | 653 | }; |
| 654 | 654 | ||
| 655 | /* Identify Device Data Log (30h), SATA Settings (page 08h) */ | 655 | /* DEVSLP Timing Variables from Identify Device Data Log */ |
| 656 | u8 sata_settings[ATA_SECT_SIZE]; | 656 | u8 devslp_timing[ATA_LOG_DEVSLP_SIZE]; |
| 657 | 657 | ||
| 658 | /* error history */ | 658 | /* error history */ |
| 659 | int spdn_cnt; | 659 | int spdn_cnt; |
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 2138bd33021a..e53dcfeaee69 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h | |||
| @@ -272,8 +272,6 @@ struct abx500_bm_data { | |||
| 272 | const struct abx500_fg_parameters *fg_params; | 272 | const struct abx500_fg_parameters *fg_params; |
| 273 | }; | 273 | }; |
| 274 | 274 | ||
| 275 | extern struct abx500_bm_data ab8500_bm_data; | ||
| 276 | |||
| 277 | enum { | 275 | enum { |
| 278 | NTC_EXTERNAL = 0, | 276 | NTC_EXTERNAL = 0, |
| 279 | NTC_INTERNAL, | 277 | NTC_INTERNAL, |
diff --git a/include/linux/mfd/abx500/ab8500-bm.h b/include/linux/mfd/abx500/ab8500-bm.h index 44310c98ee6e..9bd037df97d9 100644 --- a/include/linux/mfd/abx500/ab8500-bm.h +++ b/include/linux/mfd/abx500/ab8500-bm.h | |||
| @@ -422,7 +422,10 @@ struct ab8500_chargalg_platform_data { | |||
| 422 | struct ab8500_btemp; | 422 | struct ab8500_btemp; |
| 423 | struct ab8500_gpadc; | 423 | struct ab8500_gpadc; |
| 424 | struct ab8500_fg; | 424 | struct ab8500_fg; |
| 425 | |||
| 425 | #ifdef CONFIG_AB8500_BM | 426 | #ifdef CONFIG_AB8500_BM |
| 427 | extern struct abx500_bm_data ab8500_bm_data; | ||
| 428 | |||
| 426 | void ab8500_fg_reinit(void); | 429 | void ab8500_fg_reinit(void); |
| 427 | void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA); | 430 | void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA); |
| 428 | struct ab8500_btemp *ab8500_btemp_get(void); | 431 | struct ab8500_btemp *ab8500_btemp_get(void); |
| @@ -434,31 +437,7 @@ int ab8500_fg_inst_curr_finalize(struct ab8500_fg *di, int *res); | |||
| 434 | int ab8500_fg_inst_curr_done(struct ab8500_fg *di); | 437 | int ab8500_fg_inst_curr_done(struct ab8500_fg *di); |
| 435 | 438 | ||
| 436 | #else | 439 | #else |
| 437 | int ab8500_fg_inst_curr_done(struct ab8500_fg *di) | 440 | static struct abx500_bm_data ab8500_bm_data; |
| 438 | { | ||
| 439 | } | ||
| 440 | static void ab8500_fg_reinit(void) | ||
| 441 | { | ||
| 442 | } | ||
| 443 | static void ab8500_charger_usb_state_changed(u8 bm_usb_state, u16 mA) | ||
| 444 | { | ||
| 445 | } | ||
| 446 | static struct ab8500_btemp *ab8500_btemp_get(void) | ||
| 447 | { | ||
| 448 | return NULL; | ||
| 449 | } | ||
| 450 | static int ab8500_btemp_get_batctrl_temp(struct ab8500_btemp *btemp) | ||
| 451 | { | ||
| 452 | return 0; | ||
| 453 | } | ||
| 454 | struct ab8500_fg *ab8500_fg_get(void) | ||
| 455 | { | ||
| 456 | return NULL; | ||
| 457 | } | ||
| 458 | static int ab8500_fg_inst_curr_blocking(struct ab8500_fg *dev) | ||
| 459 | { | ||
| 460 | return -ENODEV; | ||
| 461 | } | ||
| 462 | 441 | ||
| 463 | static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di) | 442 | static inline int ab8500_fg_inst_curr_start(struct ab8500_fg *di) |
| 464 | { | 443 | { |
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h index 86dd93de6ff2..786d02eb79d2 100644 --- a/include/linux/mfd/da9052/da9052.h +++ b/include/linux/mfd/da9052/da9052.h | |||
| @@ -99,6 +99,9 @@ struct da9052 { | |||
| 99 | u8 chip_id; | 99 | u8 chip_id; |
| 100 | 100 | ||
| 101 | int chip_irq; | 101 | int chip_irq; |
| 102 | |||
| 103 | /* SOC I/O transfer related fixes for DA9052/53 */ | ||
| 104 | int (*fix_io) (struct da9052 *da9052, unsigned char reg); | ||
| 102 | }; | 105 | }; |
| 103 | 106 | ||
| 104 | /* ADC API */ | 107 | /* ADC API */ |
| @@ -113,32 +116,87 @@ static inline int da9052_reg_read(struct da9052 *da9052, unsigned char reg) | |||
| 113 | ret = regmap_read(da9052->regmap, reg, &val); | 116 | ret = regmap_read(da9052->regmap, reg, &val); |
| 114 | if (ret < 0) | 117 | if (ret < 0) |
| 115 | return ret; | 118 | return ret; |
| 119 | |||
| 120 | if (da9052->fix_io) { | ||
| 121 | ret = da9052->fix_io(da9052, reg); | ||
| 122 | if (ret < 0) | ||
| 123 | return ret; | ||
| 124 | } | ||
| 125 | |||
| 116 | return val; | 126 | return val; |
| 117 | } | 127 | } |
| 118 | 128 | ||
| 119 | static inline int da9052_reg_write(struct da9052 *da9052, unsigned char reg, | 129 | static inline int da9052_reg_write(struct da9052 *da9052, unsigned char reg, |
| 120 | unsigned char val) | 130 | unsigned char val) |
| 121 | { | 131 | { |
| 122 | return regmap_write(da9052->regmap, reg, val); | 132 | int ret; |
| 133 | |||
| 134 | ret = regmap_write(da9052->regmap, reg, val); | ||
| 135 | if (ret < 0) | ||
| 136 | return ret; | ||
| 137 | |||
| 138 | if (da9052->fix_io) { | ||
| 139 | ret = da9052->fix_io(da9052, reg); | ||
| 140 | if (ret < 0) | ||
| 141 | return ret; | ||
| 142 | } | ||
| 143 | |||
| 144 | return ret; | ||
| 123 | } | 145 | } |
| 124 | 146 | ||
| 125 | static inline int da9052_group_read(struct da9052 *da9052, unsigned char reg, | 147 | static inline int da9052_group_read(struct da9052 *da9052, unsigned char reg, |
| 126 | unsigned reg_cnt, unsigned char *val) | 148 | unsigned reg_cnt, unsigned char *val) |
| 127 | { | 149 | { |
| 128 | return regmap_bulk_read(da9052->regmap, reg, val, reg_cnt); | 150 | int ret; |
| 151 | |||
| 152 | ret = regmap_bulk_read(da9052->regmap, reg, val, reg_cnt); | ||
| 153 | if (ret < 0) | ||
| 154 | return ret; | ||
| 155 | |||
| 156 | if (da9052->fix_io) { | ||
| 157 | ret = da9052->fix_io(da9052, reg); | ||
| 158 | if (ret < 0) | ||
| 159 | return ret; | ||
| 160 | } | ||
| 161 | |||
| 162 | return ret; | ||
| 129 | } | 163 | } |
| 130 | 164 | ||
| 131 | static inline int da9052_group_write(struct da9052 *da9052, unsigned char reg, | 165 | static inline int da9052_group_write(struct da9052 *da9052, unsigned char reg, |
| 132 | unsigned reg_cnt, unsigned char *val) | 166 | unsigned reg_cnt, unsigned char *val) |
| 133 | { | 167 | { |
| 134 | return regmap_raw_write(da9052->regmap, reg, val, reg_cnt); | 168 | int ret; |
| 169 | |||
| 170 | ret = regmap_raw_write(da9052->regmap, reg, val, reg_cnt); | ||
| 171 | if (ret < 0) | ||
| 172 | return ret; | ||
| 173 | |||
| 174 | if (da9052->fix_io) { | ||
| 175 | ret = da9052->fix_io(da9052, reg); | ||
| 176 | if (ret < 0) | ||
| 177 | return ret; | ||
| 178 | } | ||
| 179 | |||
| 180 | return ret; | ||
| 135 | } | 181 | } |
| 136 | 182 | ||
| 137 | static inline int da9052_reg_update(struct da9052 *da9052, unsigned char reg, | 183 | static inline int da9052_reg_update(struct da9052 *da9052, unsigned char reg, |
| 138 | unsigned char bit_mask, | 184 | unsigned char bit_mask, |
| 139 | unsigned char reg_val) | 185 | unsigned char reg_val) |
| 140 | { | 186 | { |
| 141 | return regmap_update_bits(da9052->regmap, reg, bit_mask, reg_val); | 187 | int ret; |
| 188 | |||
| 189 | ret = regmap_update_bits(da9052->regmap, reg, bit_mask, reg_val); | ||
| 190 | if (ret < 0) | ||
| 191 | return ret; | ||
| 192 | |||
| 193 | if (da9052->fix_io) { | ||
| 194 | ret = da9052->fix_io(da9052, reg); | ||
| 195 | if (ret < 0) | ||
| 196 | return ret; | ||
| 197 | } | ||
| 198 | |||
| 199 | return ret; | ||
| 142 | } | 200 | } |
| 143 | 201 | ||
| 144 | int da9052_device_init(struct da9052 *da9052, u8 chip_id); | 202 | int da9052_device_init(struct da9052 *da9052, u8 chip_id); |
diff --git a/include/linux/mfd/da9052/reg.h b/include/linux/mfd/da9052/reg.h index b97f7309d7f6..c4dd3a8add21 100644 --- a/include/linux/mfd/da9052/reg.h +++ b/include/linux/mfd/da9052/reg.h | |||
| @@ -34,6 +34,9 @@ | |||
| 34 | #define DA9052_STATUS_C_REG 3 | 34 | #define DA9052_STATUS_C_REG 3 |
| 35 | #define DA9052_STATUS_D_REG 4 | 35 | #define DA9052_STATUS_D_REG 4 |
| 36 | 36 | ||
| 37 | /* PARK REGISTER */ | ||
| 38 | #define DA9052_PARK_REGISTER DA9052_STATUS_D_REG | ||
| 39 | |||
| 37 | /* EVENT REGISTERS */ | 40 | /* EVENT REGISTERS */ |
| 38 | #define DA9052_EVENT_A_REG 5 | 41 | #define DA9052_EVENT_A_REG 5 |
| 39 | #define DA9052_EVENT_B_REG 6 | 42 | #define DA9052_EVENT_B_REG 6 |
diff --git a/include/linux/mfd/rtsx_common.h b/include/linux/mfd/rtsx_common.h index a8d393e3066b..2b13970596f5 100644 --- a/include/linux/mfd/rtsx_common.h +++ b/include/linux/mfd/rtsx_common.h | |||
| @@ -38,6 +38,9 @@ | |||
| 38 | #define RTSX_SD_CARD 0 | 38 | #define RTSX_SD_CARD 0 |
| 39 | #define RTSX_MS_CARD 1 | 39 | #define RTSX_MS_CARD 1 |
| 40 | 40 | ||
| 41 | #define CLK_TO_DIV_N 0 | ||
| 42 | #define DIV_N_TO_CLK 1 | ||
| 43 | |||
| 41 | struct platform_device; | 44 | struct platform_device; |
| 42 | 45 | ||
| 43 | struct rtsx_slot { | 46 | struct rtsx_slot { |
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h index 060b721fcbfb..4b117a3f54d4 100644 --- a/include/linux/mfd/rtsx_pci.h +++ b/include/linux/mfd/rtsx_pci.h | |||
| @@ -158,10 +158,9 @@ | |||
| 158 | #define SG_TRANS_DATA (0x02 << 4) | 158 | #define SG_TRANS_DATA (0x02 << 4) |
| 159 | #define SG_LINK_DESC (0x03 << 4) | 159 | #define SG_LINK_DESC (0x03 << 4) |
| 160 | 160 | ||
| 161 | /* SD bank voltage */ | 161 | /* Output voltage */ |
| 162 | #define SD_IO_3V3 0 | 162 | #define OUTPUT_3V3 0 |
| 163 | #define SD_IO_1V8 1 | 163 | #define OUTPUT_1V8 1 |
| 164 | |||
| 165 | 164 | ||
| 166 | /* Card Clock Enable Register */ | 165 | /* Card Clock Enable Register */ |
| 167 | #define SD_CLK_EN 0x04 | 166 | #define SD_CLK_EN 0x04 |
| @@ -201,6 +200,20 @@ | |||
| 201 | #define CHANGE_CLK 0x01 | 200 | #define CHANGE_CLK 0x01 |
| 202 | 201 | ||
| 203 | /* LDO_CTL */ | 202 | /* LDO_CTL */ |
| 203 | #define BPP_ASIC_1V7 0x00 | ||
| 204 | #define BPP_ASIC_1V8 0x01 | ||
| 205 | #define BPP_ASIC_1V9 0x02 | ||
| 206 | #define BPP_ASIC_2V0 0x03 | ||
| 207 | #define BPP_ASIC_2V7 0x04 | ||
| 208 | #define BPP_ASIC_2V8 0x05 | ||
| 209 | #define BPP_ASIC_3V2 0x06 | ||
| 210 | #define BPP_ASIC_3V3 0x07 | ||
| 211 | #define BPP_REG_TUNED18 0x07 | ||
| 212 | #define BPP_TUNED18_SHIFT_8402 5 | ||
| 213 | #define BPP_TUNED18_SHIFT_8411 4 | ||
| 214 | #define BPP_PAD_MASK 0x04 | ||
| 215 | #define BPP_PAD_3V3 0x04 | ||
| 216 | #define BPP_PAD_1V8 0x00 | ||
| 204 | #define BPP_LDO_POWB 0x03 | 217 | #define BPP_LDO_POWB 0x03 |
| 205 | #define BPP_LDO_ON 0x00 | 218 | #define BPP_LDO_ON 0x00 |
| 206 | #define BPP_LDO_SUSPEND 0x02 | 219 | #define BPP_LDO_SUSPEND 0x02 |
| @@ -688,7 +701,10 @@ struct pcr_ops { | |||
| 688 | int (*disable_auto_blink)(struct rtsx_pcr *pcr); | 701 | int (*disable_auto_blink)(struct rtsx_pcr *pcr); |
| 689 | int (*card_power_on)(struct rtsx_pcr *pcr, int card); | 702 | int (*card_power_on)(struct rtsx_pcr *pcr, int card); |
| 690 | int (*card_power_off)(struct rtsx_pcr *pcr, int card); | 703 | int (*card_power_off)(struct rtsx_pcr *pcr, int card); |
| 704 | int (*switch_output_voltage)(struct rtsx_pcr *pcr, | ||
| 705 | u8 voltage); | ||
| 691 | unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr); | 706 | unsigned int (*cd_deglitch)(struct rtsx_pcr *pcr); |
| 707 | int (*conv_clk_and_div_n)(int clk, int dir); | ||
| 692 | }; | 708 | }; |
| 693 | 709 | ||
| 694 | enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN}; | 710 | enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN}; |
| @@ -783,6 +799,7 @@ int rtsx_pci_switch_clock(struct rtsx_pcr *pcr, unsigned int card_clock, | |||
| 783 | u8 ssc_depth, bool initial_mode, bool double_clk, bool vpclk); | 799 | u8 ssc_depth, bool initial_mode, bool double_clk, bool vpclk); |
| 784 | int rtsx_pci_card_power_on(struct rtsx_pcr *pcr, int card); | 800 | int rtsx_pci_card_power_on(struct rtsx_pcr *pcr, int card); |
| 785 | int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card); | 801 | int rtsx_pci_card_power_off(struct rtsx_pcr *pcr, int card); |
| 802 | int rtsx_pci_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage); | ||
| 786 | unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr); | 803 | unsigned int rtsx_pci_card_exist(struct rtsx_pcr *pcr); |
| 787 | void rtsx_pci_complete_unfinished_transfer(struct rtsx_pcr *pcr); | 804 | void rtsx_pci_complete_unfinished_transfer(struct rtsx_pcr *pcr); |
| 788 | 805 | ||
diff --git a/include/linux/module.h b/include/linux/module.h index 7760c6d344a3..1375ee3f03aa 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -199,11 +199,11 @@ struct module_use { | |||
| 199 | struct module *source, *target; | 199 | struct module *source, *target; |
| 200 | }; | 200 | }; |
| 201 | 201 | ||
| 202 | enum module_state | 202 | enum module_state { |
| 203 | { | 203 | MODULE_STATE_LIVE, /* Normal state. */ |
| 204 | MODULE_STATE_LIVE, | 204 | MODULE_STATE_COMING, /* Full formed, running module_init. */ |
| 205 | MODULE_STATE_COMING, | 205 | MODULE_STATE_GOING, /* Going away. */ |
| 206 | MODULE_STATE_GOING, | 206 | MODULE_STATE_UNFORMED, /* Still setting it up. */ |
| 207 | }; | 207 | }; |
| 208 | 208 | ||
| 209 | /** | 209 | /** |
diff --git a/arch/arm/mach-imx/iram.h b/include/linux/platform_data/imx-iram.h index 022690c33702..022690c33702 100644 --- a/arch/arm/mach-imx/iram.h +++ b/include/linux/platform_data/imx-iram.h | |||
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index 1693775ecfe8..89573a33ab3c 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h | |||
| @@ -45,7 +45,6 @@ extern long arch_ptrace(struct task_struct *child, long request, | |||
| 45 | extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len); | 45 | extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len); |
| 46 | extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len); | 46 | extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len); |
| 47 | extern void ptrace_disable(struct task_struct *); | 47 | extern void ptrace_disable(struct task_struct *); |
| 48 | extern int ptrace_check_attach(struct task_struct *task, bool ignore_state); | ||
| 49 | extern int ptrace_request(struct task_struct *child, long request, | 48 | extern int ptrace_request(struct task_struct *child, long request, |
| 50 | unsigned long addr, unsigned long data); | 49 | unsigned long addr, unsigned long data); |
| 51 | extern void ptrace_notify(int exit_code); | 50 | extern void ptrace_notify(int exit_code); |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 6fc8f45de4e9..d2112477ff5e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -2714,7 +2714,16 @@ static inline void thread_group_cputime_init(struct signal_struct *sig) | |||
| 2714 | extern void recalc_sigpending_and_wake(struct task_struct *t); | 2714 | extern void recalc_sigpending_and_wake(struct task_struct *t); |
| 2715 | extern void recalc_sigpending(void); | 2715 | extern void recalc_sigpending(void); |
| 2716 | 2716 | ||
| 2717 | extern void signal_wake_up(struct task_struct *t, int resume_stopped); | 2717 | extern void signal_wake_up_state(struct task_struct *t, unsigned int state); |
| 2718 | |||
| 2719 | static inline void signal_wake_up(struct task_struct *t, bool resume) | ||
| 2720 | { | ||
| 2721 | signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0); | ||
| 2722 | } | ||
| 2723 | static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume) | ||
| 2724 | { | ||
| 2725 | signal_wake_up_state(t, resume ? __TASK_TRACED : 0); | ||
| 2726 | } | ||
| 2718 | 2727 | ||
| 2719 | /* | 2728 | /* |
| 2720 | * Wrappers for p->thread_info->cpu access. No-op on UP. | 2729 | * Wrappers for p->thread_info->cpu access. No-op on UP. |
diff --git a/include/linux/security.h b/include/linux/security.h index 0f6afc657f77..eee7478cda70 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
| @@ -989,17 +989,29 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
| 989 | * tells the LSM to decrement the number of secmark labeling rules loaded | 989 | * tells the LSM to decrement the number of secmark labeling rules loaded |
| 990 | * @req_classify_flow: | 990 | * @req_classify_flow: |
| 991 | * Sets the flow's sid to the openreq sid. | 991 | * Sets the flow's sid to the openreq sid. |
| 992 | * @tun_dev_alloc_security: | ||
| 993 | * This hook allows a module to allocate a security structure for a TUN | ||
| 994 | * device. | ||
| 995 | * @security pointer to a security structure pointer. | ||
| 996 | * Returns a zero on success, negative values on failure. | ||
| 997 | * @tun_dev_free_security: | ||
| 998 | * This hook allows a module to free the security structure for a TUN | ||
| 999 | * device. | ||
| 1000 | * @security pointer to the TUN device's security structure | ||
| 992 | * @tun_dev_create: | 1001 | * @tun_dev_create: |
| 993 | * Check permissions prior to creating a new TUN device. | 1002 | * Check permissions prior to creating a new TUN device. |
| 994 | * @tun_dev_post_create: | 1003 | * @tun_dev_attach_queue: |
| 995 | * This hook allows a module to update or allocate a per-socket security | 1004 | * Check permissions prior to attaching to a TUN device queue. |
| 996 | * structure. | 1005 | * @security pointer to the TUN device's security structure. |
| 997 | * @sk contains the newly created sock structure. | ||
| 998 | * @tun_dev_attach: | 1006 | * @tun_dev_attach: |
| 999 | * Check permissions prior to attaching to a persistent TUN device. This | 1007 | * This hook can be used by the module to update any security state |
| 1000 | * hook can also be used by the module to update any security state | ||
| 1001 | * associated with the TUN device's sock structure. | 1008 | * associated with the TUN device's sock structure. |
| 1002 | * @sk contains the existing sock structure. | 1009 | * @sk contains the existing sock structure. |
| 1010 | * @security pointer to the TUN device's security structure. | ||
| 1011 | * @tun_dev_open: | ||
| 1012 | * This hook can be used by the module to update any security state | ||
| 1013 | * associated with the TUN device's security structure. | ||
| 1014 | * @security pointer to the TUN devices's security structure. | ||
| 1003 | * | 1015 | * |
| 1004 | * Security hooks for XFRM operations. | 1016 | * Security hooks for XFRM operations. |
| 1005 | * | 1017 | * |
| @@ -1620,9 +1632,12 @@ struct security_operations { | |||
| 1620 | void (*secmark_refcount_inc) (void); | 1632 | void (*secmark_refcount_inc) (void); |
| 1621 | void (*secmark_refcount_dec) (void); | 1633 | void (*secmark_refcount_dec) (void); |
| 1622 | void (*req_classify_flow) (const struct request_sock *req, struct flowi *fl); | 1634 | void (*req_classify_flow) (const struct request_sock *req, struct flowi *fl); |
| 1623 | int (*tun_dev_create)(void); | 1635 | int (*tun_dev_alloc_security) (void **security); |
| 1624 | void (*tun_dev_post_create)(struct sock *sk); | 1636 | void (*tun_dev_free_security) (void *security); |
| 1625 | int (*tun_dev_attach)(struct sock *sk); | 1637 | int (*tun_dev_create) (void); |
| 1638 | int (*tun_dev_attach_queue) (void *security); | ||
| 1639 | int (*tun_dev_attach) (struct sock *sk, void *security); | ||
| 1640 | int (*tun_dev_open) (void *security); | ||
| 1626 | #endif /* CONFIG_SECURITY_NETWORK */ | 1641 | #endif /* CONFIG_SECURITY_NETWORK */ |
| 1627 | 1642 | ||
| 1628 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1643 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
| @@ -2566,9 +2581,12 @@ void security_inet_conn_established(struct sock *sk, | |||
| 2566 | int security_secmark_relabel_packet(u32 secid); | 2581 | int security_secmark_relabel_packet(u32 secid); |
| 2567 | void security_secmark_refcount_inc(void); | 2582 | void security_secmark_refcount_inc(void); |
| 2568 | void security_secmark_refcount_dec(void); | 2583 | void security_secmark_refcount_dec(void); |
| 2584 | int security_tun_dev_alloc_security(void **security); | ||
| 2585 | void security_tun_dev_free_security(void *security); | ||
| 2569 | int security_tun_dev_create(void); | 2586 | int security_tun_dev_create(void); |
| 2570 | void security_tun_dev_post_create(struct sock *sk); | 2587 | int security_tun_dev_attach_queue(void *security); |
| 2571 | int security_tun_dev_attach(struct sock *sk); | 2588 | int security_tun_dev_attach(struct sock *sk, void *security); |
| 2589 | int security_tun_dev_open(void *security); | ||
| 2572 | 2590 | ||
| 2573 | #else /* CONFIG_SECURITY_NETWORK */ | 2591 | #else /* CONFIG_SECURITY_NETWORK */ |
| 2574 | static inline int security_unix_stream_connect(struct sock *sock, | 2592 | static inline int security_unix_stream_connect(struct sock *sock, |
| @@ -2733,16 +2751,31 @@ static inline void security_secmark_refcount_dec(void) | |||
| 2733 | { | 2751 | { |
| 2734 | } | 2752 | } |
| 2735 | 2753 | ||
| 2754 | static inline int security_tun_dev_alloc_security(void **security) | ||
| 2755 | { | ||
| 2756 | return 0; | ||
| 2757 | } | ||
| 2758 | |||
| 2759 | static inline void security_tun_dev_free_security(void *security) | ||
| 2760 | { | ||
| 2761 | } | ||
| 2762 | |||
| 2736 | static inline int security_tun_dev_create(void) | 2763 | static inline int security_tun_dev_create(void) |
| 2737 | { | 2764 | { |
| 2738 | return 0; | 2765 | return 0; |
| 2739 | } | 2766 | } |
| 2740 | 2767 | ||
| 2741 | static inline void security_tun_dev_post_create(struct sock *sk) | 2768 | static inline int security_tun_dev_attach_queue(void *security) |
| 2769 | { | ||
| 2770 | return 0; | ||
| 2771 | } | ||
| 2772 | |||
| 2773 | static inline int security_tun_dev_attach(struct sock *sk, void *security) | ||
| 2742 | { | 2774 | { |
| 2775 | return 0; | ||
| 2743 | } | 2776 | } |
| 2744 | 2777 | ||
| 2745 | static inline int security_tun_dev_attach(struct sock *sk) | 2778 | static inline int security_tun_dev_open(void *security) |
| 2746 | { | 2779 | { |
| 2747 | return 0; | 2780 | return 0; |
| 2748 | } | 2781 | } |
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index bd45eb7bedc8..5de7a220e986 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -100,6 +100,7 @@ struct driver_info { | |||
| 100 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ | 100 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ |
| 101 | 101 | ||
| 102 | #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ | 102 | #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ |
| 103 | #define FLAG_NOARP 0x2000 /* device can't do ARP */ | ||
| 103 | 104 | ||
| 104 | /* | 105 | /* |
| 105 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. | 106 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. |
diff --git a/include/net/ip.h b/include/net/ip.h index 0707fb9551aa..a68f838a132c 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
| @@ -143,6 +143,8 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4) | |||
| 143 | extern int ip4_datagram_connect(struct sock *sk, | 143 | extern int ip4_datagram_connect(struct sock *sk, |
| 144 | struct sockaddr *uaddr, int addr_len); | 144 | struct sockaddr *uaddr, int addr_len); |
| 145 | 145 | ||
| 146 | extern void ip4_datagram_release_cb(struct sock *sk); | ||
| 147 | |||
| 146 | struct ip_reply_arg { | 148 | struct ip_reply_arg { |
| 147 | struct kvec iov[1]; | 149 | struct kvec iov[1]; |
| 148 | int flags; | 150 | int flags; |
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h index d8f5b9f52169..e98aeb3da033 100644 --- a/include/net/netfilter/nf_conntrack_core.h +++ b/include/net/netfilter/nf_conntrack_core.h | |||
| @@ -31,6 +31,8 @@ extern void nf_conntrack_cleanup(struct net *net); | |||
| 31 | extern int nf_conntrack_proto_init(struct net *net); | 31 | extern int nf_conntrack_proto_init(struct net *net); |
| 32 | extern void nf_conntrack_proto_fini(struct net *net); | 32 | extern void nf_conntrack_proto_fini(struct net *net); |
| 33 | 33 | ||
| 34 | extern void nf_conntrack_cleanup_end(void); | ||
| 35 | |||
| 34 | extern bool | 36 | extern bool |
| 35 | nf_ct_get_tuple(const struct sk_buff *skb, | 37 | nf_ct_get_tuple(const struct sk_buff *skb, |
| 36 | unsigned int nhoff, | 38 | unsigned int nhoff, |
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index 78f99d97475b..2c6c85f18ea0 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h | |||
| @@ -50,7 +50,8 @@ | |||
| 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ | 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ |
| 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ | 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ |
| 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ | 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ |
| 53 | #define PORT_MAX_8250 24 /* max port ID */ | 53 | #define PORT_BRCM_TRUMANAGE 24 |
| 54 | #define PORT_MAX_8250 25 /* max port ID */ | ||
| 54 | 55 | ||
| 55 | /* | 56 | /* |
| 56 | * ARM specific type numbers. These are not currently guaranteed | 57 | * ARM specific type numbers. These are not currently guaranteed |
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 5e4ded51788e..f9acf71b9810 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c | |||
| @@ -36,6 +36,10 @@ __setup("noinitrd", no_initrd); | |||
| 36 | static int init_linuxrc(struct subprocess_info *info, struct cred *new) | 36 | static int init_linuxrc(struct subprocess_info *info, struct cred *new) |
| 37 | { | 37 | { |
| 38 | sys_unshare(CLONE_FS | CLONE_FILES); | 38 | sys_unshare(CLONE_FS | CLONE_FILES); |
| 39 | /* stdin/stdout/stderr for /linuxrc */ | ||
| 40 | sys_open("/dev/console", O_RDWR, 0); | ||
| 41 | sys_dup(0); | ||
| 42 | sys_dup(0); | ||
| 39 | /* move initrd over / and chdir/chroot in initrd root */ | 43 | /* move initrd over / and chdir/chroot in initrd root */ |
| 40 | sys_chdir("/root"); | 44 | sys_chdir("/root"); |
| 41 | sys_mount(".", "/", NULL, MS_MOVE, NULL); | 45 | sys_mount(".", "/", NULL, MS_MOVE, NULL); |
diff --git a/init/main.c b/init/main.c index 85d69dffe864..cee4b5c66d81 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -604,7 +604,7 @@ asmlinkage void __init start_kernel(void) | |||
| 604 | pidmap_init(); | 604 | pidmap_init(); |
| 605 | anon_vma_init(); | 605 | anon_vma_init(); |
| 606 | #ifdef CONFIG_X86 | 606 | #ifdef CONFIG_X86 |
| 607 | if (efi_enabled) | 607 | if (efi_enabled(EFI_RUNTIME_SERVICES)) |
| 608 | efi_enter_virtual_mode(); | 608 | efi_enter_virtual_mode(); |
| 609 | #endif | 609 | #endif |
| 610 | thread_info_cache_init(); | 610 | thread_info_cache_init(); |
| @@ -632,7 +632,7 @@ asmlinkage void __init start_kernel(void) | |||
| 632 | acpi_early_init(); /* before LAPIC and SMP init */ | 632 | acpi_early_init(); /* before LAPIC and SMP init */ |
| 633 | sfi_init_late(); | 633 | sfi_init_late(); |
| 634 | 634 | ||
| 635 | if (efi_enabled) { | 635 | if (efi_enabled(EFI_RUNTIME_SERVICES)) { |
| 636 | efi_late_init(); | 636 | efi_late_init(); |
| 637 | efi_free_boot_services(); | 637 | efi_free_boot_services(); |
| 638 | } | 638 | } |
| @@ -802,7 +802,7 @@ static int run_init_process(const char *init_filename) | |||
| 802 | (const char __user *const __user *)envp_init); | 802 | (const char __user *const __user *)envp_init); |
| 803 | } | 803 | } |
| 804 | 804 | ||
| 805 | static void __init kernel_init_freeable(void); | 805 | static noinline void __init kernel_init_freeable(void); |
| 806 | 806 | ||
| 807 | static int __ref kernel_init(void *unused) | 807 | static int __ref kernel_init(void *unused) |
| 808 | { | 808 | { |
| @@ -845,7 +845,7 @@ static int __ref kernel_init(void *unused) | |||
| 845 | "See Linux Documentation/init.txt for guidance."); | 845 | "See Linux Documentation/init.txt for guidance."); |
| 846 | } | 846 | } |
| 847 | 847 | ||
| 848 | static void __init kernel_init_freeable(void) | 848 | static noinline void __init kernel_init_freeable(void) |
| 849 | { | 849 | { |
| 850 | /* | 850 | /* |
| 851 | * Wait until kthreadd is all set-up. | 851 | * Wait until kthreadd is all set-up. |
diff --git a/kernel/async.c b/kernel/async.c index a1d585c351d6..6f34904a0b53 100644 --- a/kernel/async.c +++ b/kernel/async.c | |||
| @@ -86,18 +86,27 @@ static atomic_t entry_count; | |||
| 86 | */ | 86 | */ |
| 87 | static async_cookie_t __lowest_in_progress(struct async_domain *running) | 87 | static async_cookie_t __lowest_in_progress(struct async_domain *running) |
| 88 | { | 88 | { |
| 89 | async_cookie_t first_running = next_cookie; /* infinity value */ | ||
| 90 | async_cookie_t first_pending = next_cookie; /* ditto */ | ||
| 89 | struct async_entry *entry; | 91 | struct async_entry *entry; |
| 90 | 92 | ||
| 93 | /* | ||
| 94 | * Both running and pending lists are sorted but not disjoint. | ||
| 95 | * Take the first cookies from both and return the min. | ||
| 96 | */ | ||
| 91 | if (!list_empty(&running->domain)) { | 97 | if (!list_empty(&running->domain)) { |
| 92 | entry = list_first_entry(&running->domain, typeof(*entry), list); | 98 | entry = list_first_entry(&running->domain, typeof(*entry), list); |
| 93 | return entry->cookie; | 99 | first_running = entry->cookie; |
| 94 | } | 100 | } |
| 95 | 101 | ||
| 96 | list_for_each_entry(entry, &async_pending, list) | 102 | list_for_each_entry(entry, &async_pending, list) { |
| 97 | if (entry->running == running) | 103 | if (entry->running == running) { |
| 98 | return entry->cookie; | 104 | first_pending = entry->cookie; |
| 105 | break; | ||
| 106 | } | ||
| 107 | } | ||
| 99 | 108 | ||
| 100 | return next_cookie; /* "infinity" value */ | 109 | return min(first_running, first_pending); |
| 101 | } | 110 | } |
| 102 | 111 | ||
| 103 | static async_cookie_t lowest_in_progress(struct async_domain *running) | 112 | static async_cookie_t lowest_in_progress(struct async_domain *running) |
| @@ -118,13 +127,17 @@ static void async_run_entry_fn(struct work_struct *work) | |||
| 118 | { | 127 | { |
| 119 | struct async_entry *entry = | 128 | struct async_entry *entry = |
| 120 | container_of(work, struct async_entry, work); | 129 | container_of(work, struct async_entry, work); |
| 130 | struct async_entry *pos; | ||
| 121 | unsigned long flags; | 131 | unsigned long flags; |
| 122 | ktime_t uninitialized_var(calltime), delta, rettime; | 132 | ktime_t uninitialized_var(calltime), delta, rettime; |
| 123 | struct async_domain *running = entry->running; | 133 | struct async_domain *running = entry->running; |
| 124 | 134 | ||
| 125 | /* 1) move self to the running queue */ | 135 | /* 1) move self to the running queue, make sure it stays sorted */ |
| 126 | spin_lock_irqsave(&async_lock, flags); | 136 | spin_lock_irqsave(&async_lock, flags); |
| 127 | list_move_tail(&entry->list, &running->domain); | 137 | list_for_each_entry_reverse(pos, &running->domain, list) |
| 138 | if (entry->cookie < pos->cookie) | ||
| 139 | break; | ||
| 140 | list_move_tail(&entry->list, &pos->list); | ||
| 128 | spin_unlock_irqrestore(&async_lock, flags); | 141 | spin_unlock_irqrestore(&async_lock, flags); |
| 129 | 142 | ||
| 130 | /* 2) run (and print duration) */ | 143 | /* 2) run (and print duration) */ |
diff --git a/kernel/compat.c b/kernel/compat.c index f6150e92dfc9..36700e9e2be9 100644 --- a/kernel/compat.c +++ b/kernel/compat.c | |||
| @@ -535,9 +535,11 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru) | |||
| 535 | return 0; | 535 | return 0; |
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | asmlinkage long | 538 | COMPAT_SYSCALL_DEFINE4(wait4, |
| 539 | compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options, | 539 | compat_pid_t, pid, |
| 540 | struct compat_rusage __user *ru) | 540 | compat_uint_t __user *, stat_addr, |
| 541 | int, options, | ||
| 542 | struct compat_rusage __user *, ru) | ||
| 541 | { | 543 | { |
| 542 | if (!ru) { | 544 | if (!ru) { |
| 543 | return sys_wait4(pid, stat_addr, options, NULL); | 545 | return sys_wait4(pid, stat_addr, options, NULL); |
| @@ -564,9 +566,10 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options, | |||
| 564 | } | 566 | } |
| 565 | } | 567 | } |
| 566 | 568 | ||
| 567 | asmlinkage long compat_sys_waitid(int which, compat_pid_t pid, | 569 | COMPAT_SYSCALL_DEFINE5(waitid, |
| 568 | struct compat_siginfo __user *uinfo, int options, | 570 | int, which, compat_pid_t, pid, |
| 569 | struct compat_rusage __user *uru) | 571 | struct compat_siginfo __user *, uinfo, int, options, |
| 572 | struct compat_rusage __user *, uru) | ||
| 570 | { | 573 | { |
| 571 | siginfo_t info; | 574 | siginfo_t info; |
| 572 | struct rusage ru; | 575 | struct rusage ru; |
| @@ -584,7 +587,11 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid, | |||
| 584 | return ret; | 587 | return ret; |
| 585 | 588 | ||
| 586 | if (uru) { | 589 | if (uru) { |
| 587 | ret = put_compat_rusage(&ru, uru); | 590 | /* sys_waitid() overwrites everything in ru */ |
| 591 | if (COMPAT_USE_64BIT_TIME) | ||
| 592 | ret = copy_to_user(uru, &ru, sizeof(ru)); | ||
| 593 | else | ||
| 594 | ret = put_compat_rusage(&ru, uru); | ||
| 588 | if (ret) | 595 | if (ret) |
| 589 | return ret; | 596 | return ret; |
| 590 | } | 597 | } |
| @@ -994,7 +1001,7 @@ compat_sys_rt_sigtimedwait (compat_sigset_t __user *uthese, | |||
| 994 | sigset_from_compat(&s, &s32); | 1001 | sigset_from_compat(&s, &s32); |
| 995 | 1002 | ||
| 996 | if (uts) { | 1003 | if (uts) { |
| 997 | if (get_compat_timespec(&t, uts)) | 1004 | if (compat_get_timespec(&t, uts)) |
| 998 | return -EFAULT; | 1005 | return -EFAULT; |
| 999 | } | 1006 | } |
| 1000 | 1007 | ||
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 4d5f8d5612f3..8875254120b6 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c | |||
| @@ -1970,6 +1970,8 @@ static int kdb_lsmod(int argc, const char **argv) | |||
| 1970 | 1970 | ||
| 1971 | kdb_printf("Module Size modstruct Used by\n"); | 1971 | kdb_printf("Module Size modstruct Used by\n"); |
| 1972 | list_for_each_entry(mod, kdb_modules, list) { | 1972 | list_for_each_entry(mod, kdb_modules, list) { |
| 1973 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 1974 | continue; | ||
| 1973 | 1975 | ||
| 1974 | kdb_printf("%-20s%8u 0x%p ", mod->name, | 1976 | kdb_printf("%-20s%8u 0x%p ", mod->name, |
| 1975 | mod->core_size, (void *)mod); | 1977 | mod->core_size, (void *)mod); |
diff --git a/kernel/fork.c b/kernel/fork.c index 65ca6d27f24e..c535f33bbb9c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1668,8 +1668,10 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp, | |||
| 1668 | int, tls_val) | 1668 | int, tls_val) |
| 1669 | #endif | 1669 | #endif |
| 1670 | { | 1670 | { |
| 1671 | return do_fork(clone_flags, newsp, 0, | 1671 | long ret = do_fork(clone_flags, newsp, 0, parent_tidptr, child_tidptr); |
| 1672 | parent_tidptr, child_tidptr); | 1672 | asmlinkage_protect(5, ret, clone_flags, newsp, |
| 1673 | parent_tidptr, child_tidptr, tls_val); | ||
| 1674 | return ret; | ||
| 1673 | } | 1675 | } |
| 1674 | #endif | 1676 | #endif |
| 1675 | 1677 | ||
diff --git a/kernel/module.c b/kernel/module.c index b10b048367e1..eab08274ec9b 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -188,6 +188,7 @@ struct load_info { | |||
| 188 | ongoing or failed initialization etc. */ | 188 | ongoing or failed initialization etc. */ |
| 189 | static inline int strong_try_module_get(struct module *mod) | 189 | static inline int strong_try_module_get(struct module *mod) |
| 190 | { | 190 | { |
| 191 | BUG_ON(mod && mod->state == MODULE_STATE_UNFORMED); | ||
| 191 | if (mod && mod->state == MODULE_STATE_COMING) | 192 | if (mod && mod->state == MODULE_STATE_COMING) |
| 192 | return -EBUSY; | 193 | return -EBUSY; |
| 193 | if (try_module_get(mod)) | 194 | if (try_module_get(mod)) |
| @@ -343,6 +344,9 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr, | |||
| 343 | #endif | 344 | #endif |
| 344 | }; | 345 | }; |
| 345 | 346 | ||
| 347 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 348 | continue; | ||
| 349 | |||
| 346 | if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data)) | 350 | if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data)) |
| 347 | return true; | 351 | return true; |
| 348 | } | 352 | } |
| @@ -450,16 +454,24 @@ const struct kernel_symbol *find_symbol(const char *name, | |||
| 450 | EXPORT_SYMBOL_GPL(find_symbol); | 454 | EXPORT_SYMBOL_GPL(find_symbol); |
| 451 | 455 | ||
| 452 | /* Search for module by name: must hold module_mutex. */ | 456 | /* Search for module by name: must hold module_mutex. */ |
| 453 | struct module *find_module(const char *name) | 457 | static struct module *find_module_all(const char *name, |
| 458 | bool even_unformed) | ||
| 454 | { | 459 | { |
| 455 | struct module *mod; | 460 | struct module *mod; |
| 456 | 461 | ||
| 457 | list_for_each_entry(mod, &modules, list) { | 462 | list_for_each_entry(mod, &modules, list) { |
| 463 | if (!even_unformed && mod->state == MODULE_STATE_UNFORMED) | ||
| 464 | continue; | ||
| 458 | if (strcmp(mod->name, name) == 0) | 465 | if (strcmp(mod->name, name) == 0) |
| 459 | return mod; | 466 | return mod; |
| 460 | } | 467 | } |
| 461 | return NULL; | 468 | return NULL; |
| 462 | } | 469 | } |
| 470 | |||
| 471 | struct module *find_module(const char *name) | ||
| 472 | { | ||
| 473 | return find_module_all(name, false); | ||
| 474 | } | ||
| 463 | EXPORT_SYMBOL_GPL(find_module); | 475 | EXPORT_SYMBOL_GPL(find_module); |
| 464 | 476 | ||
| 465 | #ifdef CONFIG_SMP | 477 | #ifdef CONFIG_SMP |
| @@ -525,6 +537,8 @@ bool is_module_percpu_address(unsigned long addr) | |||
| 525 | preempt_disable(); | 537 | preempt_disable(); |
| 526 | 538 | ||
| 527 | list_for_each_entry_rcu(mod, &modules, list) { | 539 | list_for_each_entry_rcu(mod, &modules, list) { |
| 540 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 541 | continue; | ||
| 528 | if (!mod->percpu_size) | 542 | if (!mod->percpu_size) |
| 529 | continue; | 543 | continue; |
| 530 | for_each_possible_cpu(cpu) { | 544 | for_each_possible_cpu(cpu) { |
| @@ -1048,6 +1062,8 @@ static ssize_t show_initstate(struct module_attribute *mattr, | |||
| 1048 | case MODULE_STATE_GOING: | 1062 | case MODULE_STATE_GOING: |
| 1049 | state = "going"; | 1063 | state = "going"; |
| 1050 | break; | 1064 | break; |
| 1065 | default: | ||
| 1066 | BUG(); | ||
| 1051 | } | 1067 | } |
| 1052 | return sprintf(buffer, "%s\n", state); | 1068 | return sprintf(buffer, "%s\n", state); |
| 1053 | } | 1069 | } |
| @@ -1786,6 +1802,8 @@ void set_all_modules_text_rw(void) | |||
| 1786 | 1802 | ||
| 1787 | mutex_lock(&module_mutex); | 1803 | mutex_lock(&module_mutex); |
| 1788 | list_for_each_entry_rcu(mod, &modules, list) { | 1804 | list_for_each_entry_rcu(mod, &modules, list) { |
| 1805 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 1806 | continue; | ||
| 1789 | if ((mod->module_core) && (mod->core_text_size)) { | 1807 | if ((mod->module_core) && (mod->core_text_size)) { |
| 1790 | set_page_attributes(mod->module_core, | 1808 | set_page_attributes(mod->module_core, |
| 1791 | mod->module_core + mod->core_text_size, | 1809 | mod->module_core + mod->core_text_size, |
| @@ -1807,6 +1825,8 @@ void set_all_modules_text_ro(void) | |||
| 1807 | 1825 | ||
| 1808 | mutex_lock(&module_mutex); | 1826 | mutex_lock(&module_mutex); |
| 1809 | list_for_each_entry_rcu(mod, &modules, list) { | 1827 | list_for_each_entry_rcu(mod, &modules, list) { |
| 1828 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 1829 | continue; | ||
| 1810 | if ((mod->module_core) && (mod->core_text_size)) { | 1830 | if ((mod->module_core) && (mod->core_text_size)) { |
| 1811 | set_page_attributes(mod->module_core, | 1831 | set_page_attributes(mod->module_core, |
| 1812 | mod->module_core + mod->core_text_size, | 1832 | mod->module_core + mod->core_text_size, |
| @@ -2527,6 +2547,13 @@ static int copy_module_from_fd(int fd, struct load_info *info) | |||
| 2527 | err = -EFBIG; | 2547 | err = -EFBIG; |
| 2528 | goto out; | 2548 | goto out; |
| 2529 | } | 2549 | } |
| 2550 | |||
| 2551 | /* Don't hand 0 to vmalloc, it whines. */ | ||
| 2552 | if (stat.size == 0) { | ||
| 2553 | err = -EINVAL; | ||
| 2554 | goto out; | ||
| 2555 | } | ||
| 2556 | |||
| 2530 | info->hdr = vmalloc(stat.size); | 2557 | info->hdr = vmalloc(stat.size); |
| 2531 | if (!info->hdr) { | 2558 | if (!info->hdr) { |
| 2532 | err = -ENOMEM; | 2559 | err = -ENOMEM; |
| @@ -2990,8 +3017,9 @@ static bool finished_loading(const char *name) | |||
| 2990 | bool ret; | 3017 | bool ret; |
| 2991 | 3018 | ||
| 2992 | mutex_lock(&module_mutex); | 3019 | mutex_lock(&module_mutex); |
| 2993 | mod = find_module(name); | 3020 | mod = find_module_all(name, true); |
| 2994 | ret = !mod || mod->state != MODULE_STATE_COMING; | 3021 | ret = !mod || mod->state == MODULE_STATE_LIVE |
| 3022 | || mod->state == MODULE_STATE_GOING; | ||
| 2995 | mutex_unlock(&module_mutex); | 3023 | mutex_unlock(&module_mutex); |
| 2996 | 3024 | ||
| 2997 | return ret; | 3025 | return ret; |
| @@ -3136,6 +3164,32 @@ static int load_module(struct load_info *info, const char __user *uargs, | |||
| 3136 | goto free_copy; | 3164 | goto free_copy; |
| 3137 | } | 3165 | } |
| 3138 | 3166 | ||
| 3167 | /* | ||
| 3168 | * We try to place it in the list now to make sure it's unique | ||
| 3169 | * before we dedicate too many resources. In particular, | ||
| 3170 | * temporary percpu memory exhaustion. | ||
| 3171 | */ | ||
| 3172 | mod->state = MODULE_STATE_UNFORMED; | ||
| 3173 | again: | ||
| 3174 | mutex_lock(&module_mutex); | ||
| 3175 | if ((old = find_module_all(mod->name, true)) != NULL) { | ||
| 3176 | if (old->state == MODULE_STATE_COMING | ||
| 3177 | || old->state == MODULE_STATE_UNFORMED) { | ||
| 3178 | /* Wait in case it fails to load. */ | ||
| 3179 | mutex_unlock(&module_mutex); | ||
| 3180 | err = wait_event_interruptible(module_wq, | ||
| 3181 | finished_loading(mod->name)); | ||
| 3182 | if (err) | ||
| 3183 | goto free_module; | ||
| 3184 | goto again; | ||
| 3185 | } | ||
| 3186 | err = -EEXIST; | ||
| 3187 | mutex_unlock(&module_mutex); | ||
| 3188 | goto free_module; | ||
| 3189 | } | ||
| 3190 | list_add_rcu(&mod->list, &modules); | ||
| 3191 | mutex_unlock(&module_mutex); | ||
| 3192 | |||
| 3139 | #ifdef CONFIG_MODULE_SIG | 3193 | #ifdef CONFIG_MODULE_SIG |
| 3140 | mod->sig_ok = info->sig_ok; | 3194 | mod->sig_ok = info->sig_ok; |
| 3141 | if (!mod->sig_ok) | 3195 | if (!mod->sig_ok) |
| @@ -3145,7 +3199,7 @@ static int load_module(struct load_info *info, const char __user *uargs, | |||
| 3145 | /* Now module is in final location, initialize linked lists, etc. */ | 3199 | /* Now module is in final location, initialize linked lists, etc. */ |
| 3146 | err = module_unload_init(mod); | 3200 | err = module_unload_init(mod); |
| 3147 | if (err) | 3201 | if (err) |
| 3148 | goto free_module; | 3202 | goto unlink_mod; |
| 3149 | 3203 | ||
| 3150 | /* Now we've got everything in the final locations, we can | 3204 | /* Now we've got everything in the final locations, we can |
| 3151 | * find optional sections. */ | 3205 | * find optional sections. */ |
| @@ -3180,54 +3234,33 @@ static int load_module(struct load_info *info, const char __user *uargs, | |||
| 3180 | goto free_arch_cleanup; | 3234 | goto free_arch_cleanup; |
| 3181 | } | 3235 | } |
| 3182 | 3236 | ||
| 3183 | /* Mark state as coming so strong_try_module_get() ignores us. */ | ||
| 3184 | mod->state = MODULE_STATE_COMING; | ||
| 3185 | |||
| 3186 | /* Now sew it into the lists so we can get lockdep and oops | ||
| 3187 | * info during argument parsing. No one should access us, since | ||
| 3188 | * strong_try_module_get() will fail. | ||
| 3189 | * lockdep/oops can run asynchronous, so use the RCU list insertion | ||
| 3190 | * function to insert in a way safe to concurrent readers. | ||
| 3191 | * The mutex protects against concurrent writers. | ||
| 3192 | */ | ||
| 3193 | again: | ||
| 3194 | mutex_lock(&module_mutex); | ||
| 3195 | if ((old = find_module(mod->name)) != NULL) { | ||
| 3196 | if (old->state == MODULE_STATE_COMING) { | ||
| 3197 | /* Wait in case it fails to load. */ | ||
| 3198 | mutex_unlock(&module_mutex); | ||
| 3199 | err = wait_event_interruptible(module_wq, | ||
| 3200 | finished_loading(mod->name)); | ||
| 3201 | if (err) | ||
| 3202 | goto free_arch_cleanup; | ||
| 3203 | goto again; | ||
| 3204 | } | ||
| 3205 | err = -EEXIST; | ||
| 3206 | goto unlock; | ||
| 3207 | } | ||
| 3208 | |||
| 3209 | /* This has to be done once we're sure module name is unique. */ | ||
| 3210 | dynamic_debug_setup(info->debug, info->num_debug); | 3237 | dynamic_debug_setup(info->debug, info->num_debug); |
| 3211 | 3238 | ||
| 3212 | /* Find duplicate symbols */ | 3239 | mutex_lock(&module_mutex); |
| 3240 | /* Find duplicate symbols (must be called under lock). */ | ||
| 3213 | err = verify_export_symbols(mod); | 3241 | err = verify_export_symbols(mod); |
| 3214 | if (err < 0) | 3242 | if (err < 0) |
| 3215 | goto ddebug; | 3243 | goto ddebug_cleanup; |
| 3216 | 3244 | ||
| 3245 | /* This relies on module_mutex for list integrity. */ | ||
| 3217 | module_bug_finalize(info->hdr, info->sechdrs, mod); | 3246 | module_bug_finalize(info->hdr, info->sechdrs, mod); |
| 3218 | list_add_rcu(&mod->list, &modules); | 3247 | |
| 3248 | /* Mark state as coming so strong_try_module_get() ignores us, | ||
| 3249 | * but kallsyms etc. can see us. */ | ||
| 3250 | mod->state = MODULE_STATE_COMING; | ||
| 3251 | |||
| 3219 | mutex_unlock(&module_mutex); | 3252 | mutex_unlock(&module_mutex); |
| 3220 | 3253 | ||
| 3221 | /* Module is ready to execute: parsing args may do that. */ | 3254 | /* Module is ready to execute: parsing args may do that. */ |
| 3222 | err = parse_args(mod->name, mod->args, mod->kp, mod->num_kp, | 3255 | err = parse_args(mod->name, mod->args, mod->kp, mod->num_kp, |
| 3223 | -32768, 32767, &ddebug_dyndbg_module_param_cb); | 3256 | -32768, 32767, &ddebug_dyndbg_module_param_cb); |
| 3224 | if (err < 0) | 3257 | if (err < 0) |
| 3225 | goto unlink; | 3258 | goto bug_cleanup; |
| 3226 | 3259 | ||
| 3227 | /* Link in to syfs. */ | 3260 | /* Link in to syfs. */ |
| 3228 | err = mod_sysfs_setup(mod, info, mod->kp, mod->num_kp); | 3261 | err = mod_sysfs_setup(mod, info, mod->kp, mod->num_kp); |
| 3229 | if (err < 0) | 3262 | if (err < 0) |
| 3230 | goto unlink; | 3263 | goto bug_cleanup; |
| 3231 | 3264 | ||
| 3232 | /* Get rid of temporary copy. */ | 3265 | /* Get rid of temporary copy. */ |
| 3233 | free_copy(info); | 3266 | free_copy(info); |
| @@ -3237,16 +3270,13 @@ again: | |||
| 3237 | 3270 | ||
| 3238 | return do_init_module(mod); | 3271 | return do_init_module(mod); |
| 3239 | 3272 | ||
| 3240 | unlink: | 3273 | bug_cleanup: |
| 3274 | /* module_bug_cleanup needs module_mutex protection */ | ||
| 3241 | mutex_lock(&module_mutex); | 3275 | mutex_lock(&module_mutex); |
| 3242 | /* Unlink carefully: kallsyms could be walking list. */ | ||
| 3243 | list_del_rcu(&mod->list); | ||
| 3244 | module_bug_cleanup(mod); | 3276 | module_bug_cleanup(mod); |
| 3245 | wake_up_all(&module_wq); | 3277 | ddebug_cleanup: |
| 3246 | ddebug: | ||
| 3247 | dynamic_debug_remove(info->debug); | ||
| 3248 | unlock: | ||
| 3249 | mutex_unlock(&module_mutex); | 3278 | mutex_unlock(&module_mutex); |
| 3279 | dynamic_debug_remove(info->debug); | ||
| 3250 | synchronize_sched(); | 3280 | synchronize_sched(); |
| 3251 | kfree(mod->args); | 3281 | kfree(mod->args); |
| 3252 | free_arch_cleanup: | 3282 | free_arch_cleanup: |
| @@ -3255,6 +3285,12 @@ again: | |||
| 3255 | free_modinfo(mod); | 3285 | free_modinfo(mod); |
| 3256 | free_unload: | 3286 | free_unload: |
| 3257 | module_unload_free(mod); | 3287 | module_unload_free(mod); |
| 3288 | unlink_mod: | ||
| 3289 | mutex_lock(&module_mutex); | ||
| 3290 | /* Unlink carefully: kallsyms could be walking list. */ | ||
| 3291 | list_del_rcu(&mod->list); | ||
| 3292 | wake_up_all(&module_wq); | ||
| 3293 | mutex_unlock(&module_mutex); | ||
| 3258 | free_module: | 3294 | free_module: |
| 3259 | module_deallocate(mod, info); | 3295 | module_deallocate(mod, info); |
| 3260 | free_copy: | 3296 | free_copy: |
| @@ -3377,6 +3413,8 @@ const char *module_address_lookup(unsigned long addr, | |||
| 3377 | 3413 | ||
| 3378 | preempt_disable(); | 3414 | preempt_disable(); |
| 3379 | list_for_each_entry_rcu(mod, &modules, list) { | 3415 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3416 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3417 | continue; | ||
| 3380 | if (within_module_init(addr, mod) || | 3418 | if (within_module_init(addr, mod) || |
| 3381 | within_module_core(addr, mod)) { | 3419 | within_module_core(addr, mod)) { |
| 3382 | if (modname) | 3420 | if (modname) |
| @@ -3400,6 +3438,8 @@ int lookup_module_symbol_name(unsigned long addr, char *symname) | |||
| 3400 | 3438 | ||
| 3401 | preempt_disable(); | 3439 | preempt_disable(); |
| 3402 | list_for_each_entry_rcu(mod, &modules, list) { | 3440 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3441 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3442 | continue; | ||
| 3403 | if (within_module_init(addr, mod) || | 3443 | if (within_module_init(addr, mod) || |
| 3404 | within_module_core(addr, mod)) { | 3444 | within_module_core(addr, mod)) { |
| 3405 | const char *sym; | 3445 | const char *sym; |
| @@ -3424,6 +3464,8 @@ int lookup_module_symbol_attrs(unsigned long addr, unsigned long *size, | |||
| 3424 | 3464 | ||
| 3425 | preempt_disable(); | 3465 | preempt_disable(); |
| 3426 | list_for_each_entry_rcu(mod, &modules, list) { | 3466 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3467 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3468 | continue; | ||
| 3427 | if (within_module_init(addr, mod) || | 3469 | if (within_module_init(addr, mod) || |
| 3428 | within_module_core(addr, mod)) { | 3470 | within_module_core(addr, mod)) { |
| 3429 | const char *sym; | 3471 | const char *sym; |
| @@ -3451,6 +3493,8 @@ int module_get_kallsym(unsigned int symnum, unsigned long *value, char *type, | |||
| 3451 | 3493 | ||
| 3452 | preempt_disable(); | 3494 | preempt_disable(); |
| 3453 | list_for_each_entry_rcu(mod, &modules, list) { | 3495 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3496 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3497 | continue; | ||
| 3454 | if (symnum < mod->num_symtab) { | 3498 | if (symnum < mod->num_symtab) { |
| 3455 | *value = mod->symtab[symnum].st_value; | 3499 | *value = mod->symtab[symnum].st_value; |
| 3456 | *type = mod->symtab[symnum].st_info; | 3500 | *type = mod->symtab[symnum].st_info; |
| @@ -3493,9 +3537,12 @@ unsigned long module_kallsyms_lookup_name(const char *name) | |||
| 3493 | ret = mod_find_symname(mod, colon+1); | 3537 | ret = mod_find_symname(mod, colon+1); |
| 3494 | *colon = ':'; | 3538 | *colon = ':'; |
| 3495 | } else { | 3539 | } else { |
| 3496 | list_for_each_entry_rcu(mod, &modules, list) | 3540 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3541 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3542 | continue; | ||
| 3497 | if ((ret = mod_find_symname(mod, name)) != 0) | 3543 | if ((ret = mod_find_symname(mod, name)) != 0) |
| 3498 | break; | 3544 | break; |
| 3545 | } | ||
| 3499 | } | 3546 | } |
| 3500 | preempt_enable(); | 3547 | preempt_enable(); |
| 3501 | return ret; | 3548 | return ret; |
| @@ -3510,6 +3557,8 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, | |||
| 3510 | int ret; | 3557 | int ret; |
| 3511 | 3558 | ||
| 3512 | list_for_each_entry(mod, &modules, list) { | 3559 | list_for_each_entry(mod, &modules, list) { |
| 3560 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3561 | continue; | ||
| 3513 | for (i = 0; i < mod->num_symtab; i++) { | 3562 | for (i = 0; i < mod->num_symtab; i++) { |
| 3514 | ret = fn(data, mod->strtab + mod->symtab[i].st_name, | 3563 | ret = fn(data, mod->strtab + mod->symtab[i].st_name, |
| 3515 | mod, mod->symtab[i].st_value); | 3564 | mod, mod->symtab[i].st_value); |
| @@ -3525,6 +3574,7 @@ static char *module_flags(struct module *mod, char *buf) | |||
| 3525 | { | 3574 | { |
| 3526 | int bx = 0; | 3575 | int bx = 0; |
| 3527 | 3576 | ||
| 3577 | BUG_ON(mod->state == MODULE_STATE_UNFORMED); | ||
| 3528 | if (mod->taints || | 3578 | if (mod->taints || |
| 3529 | mod->state == MODULE_STATE_GOING || | 3579 | mod->state == MODULE_STATE_GOING || |
| 3530 | mod->state == MODULE_STATE_COMING) { | 3580 | mod->state == MODULE_STATE_COMING) { |
| @@ -3566,6 +3616,10 @@ static int m_show(struct seq_file *m, void *p) | |||
| 3566 | struct module *mod = list_entry(p, struct module, list); | 3616 | struct module *mod = list_entry(p, struct module, list); |
| 3567 | char buf[8]; | 3617 | char buf[8]; |
| 3568 | 3618 | ||
| 3619 | /* We always ignore unformed modules. */ | ||
| 3620 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3621 | return 0; | ||
| 3622 | |||
| 3569 | seq_printf(m, "%s %u", | 3623 | seq_printf(m, "%s %u", |
| 3570 | mod->name, mod->init_size + mod->core_size); | 3624 | mod->name, mod->init_size + mod->core_size); |
| 3571 | print_unload_info(m, mod); | 3625 | print_unload_info(m, mod); |
| @@ -3626,6 +3680,8 @@ const struct exception_table_entry *search_module_extables(unsigned long addr) | |||
| 3626 | 3680 | ||
| 3627 | preempt_disable(); | 3681 | preempt_disable(); |
| 3628 | list_for_each_entry_rcu(mod, &modules, list) { | 3682 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3683 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3684 | continue; | ||
| 3629 | if (mod->num_exentries == 0) | 3685 | if (mod->num_exentries == 0) |
| 3630 | continue; | 3686 | continue; |
| 3631 | 3687 | ||
| @@ -3674,10 +3730,13 @@ struct module *__module_address(unsigned long addr) | |||
| 3674 | if (addr < module_addr_min || addr > module_addr_max) | 3730 | if (addr < module_addr_min || addr > module_addr_max) |
| 3675 | return NULL; | 3731 | return NULL; |
| 3676 | 3732 | ||
| 3677 | list_for_each_entry_rcu(mod, &modules, list) | 3733 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3734 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3735 | continue; | ||
| 3678 | if (within_module_core(addr, mod) | 3736 | if (within_module_core(addr, mod) |
| 3679 | || within_module_init(addr, mod)) | 3737 | || within_module_init(addr, mod)) |
| 3680 | return mod; | 3738 | return mod; |
| 3739 | } | ||
| 3681 | return NULL; | 3740 | return NULL; |
| 3682 | } | 3741 | } |
| 3683 | EXPORT_SYMBOL_GPL(__module_address); | 3742 | EXPORT_SYMBOL_GPL(__module_address); |
| @@ -3730,8 +3789,11 @@ void print_modules(void) | |||
| 3730 | printk(KERN_DEFAULT "Modules linked in:"); | 3789 | printk(KERN_DEFAULT "Modules linked in:"); |
| 3731 | /* Most callers should already have preempt disabled, but make sure */ | 3790 | /* Most callers should already have preempt disabled, but make sure */ |
| 3732 | preempt_disable(); | 3791 | preempt_disable(); |
| 3733 | list_for_each_entry_rcu(mod, &modules, list) | 3792 | list_for_each_entry_rcu(mod, &modules, list) { |
| 3793 | if (mod->state == MODULE_STATE_UNFORMED) | ||
| 3794 | continue; | ||
| 3734 | printk(" %s%s", mod->name, module_flags(mod, buf)); | 3795 | printk(" %s%s", mod->name, module_flags(mod, buf)); |
| 3796 | } | ||
| 3735 | preempt_enable(); | 3797 | preempt_enable(); |
| 3736 | if (last_unloaded_module[0]) | 3798 | if (last_unloaded_module[0]) |
| 3737 | printk(" [last unloaded: %s]", last_unloaded_module); | 3799 | printk(" [last unloaded: %s]", last_unloaded_module); |
diff --git a/kernel/printk.c b/kernel/printk.c index 357f714ddd49..267ce780abe8 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -87,12 +87,6 @@ static DEFINE_SEMAPHORE(console_sem); | |||
| 87 | struct console *console_drivers; | 87 | struct console *console_drivers; |
| 88 | EXPORT_SYMBOL_GPL(console_drivers); | 88 | EXPORT_SYMBOL_GPL(console_drivers); |
| 89 | 89 | ||
| 90 | #ifdef CONFIG_LOCKDEP | ||
| 91 | static struct lockdep_map console_lock_dep_map = { | ||
| 92 | .name = "console_lock" | ||
| 93 | }; | ||
| 94 | #endif | ||
| 95 | |||
| 96 | /* | 90 | /* |
| 97 | * This is used for debugging the mess that is the VT code by | 91 | * This is used for debugging the mess that is the VT code by |
| 98 | * keeping track if we have the console semaphore held. It's | 92 | * keeping track if we have the console semaphore held. It's |
| @@ -1924,7 +1918,6 @@ void console_lock(void) | |||
| 1924 | return; | 1918 | return; |
| 1925 | console_locked = 1; | 1919 | console_locked = 1; |
| 1926 | console_may_schedule = 1; | 1920 | console_may_schedule = 1; |
| 1927 | mutex_acquire(&console_lock_dep_map, 0, 0, _RET_IP_); | ||
| 1928 | } | 1921 | } |
| 1929 | EXPORT_SYMBOL(console_lock); | 1922 | EXPORT_SYMBOL(console_lock); |
| 1930 | 1923 | ||
| @@ -1946,7 +1939,6 @@ int console_trylock(void) | |||
| 1946 | } | 1939 | } |
| 1947 | console_locked = 1; | 1940 | console_locked = 1; |
| 1948 | console_may_schedule = 0; | 1941 | console_may_schedule = 0; |
| 1949 | mutex_acquire(&console_lock_dep_map, 0, 1, _RET_IP_); | ||
| 1950 | return 1; | 1942 | return 1; |
| 1951 | } | 1943 | } |
| 1952 | EXPORT_SYMBOL(console_trylock); | 1944 | EXPORT_SYMBOL(console_trylock); |
| @@ -2107,7 +2099,6 @@ skip: | |||
| 2107 | local_irq_restore(flags); | 2099 | local_irq_restore(flags); |
| 2108 | } | 2100 | } |
| 2109 | console_locked = 0; | 2101 | console_locked = 0; |
| 2110 | mutex_release(&console_lock_dep_map, 1, _RET_IP_); | ||
| 2111 | 2102 | ||
| 2112 | /* Release the exclusive_console once it is used */ | 2103 | /* Release the exclusive_console once it is used */ |
| 2113 | if (unlikely(exclusive_console)) | 2104 | if (unlikely(exclusive_console)) |
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 1599157336a6..6cbeaae4406d 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c | |||
| @@ -117,11 +117,45 @@ void __ptrace_unlink(struct task_struct *child) | |||
| 117 | * TASK_KILLABLE sleeps. | 117 | * TASK_KILLABLE sleeps. |
| 118 | */ | 118 | */ |
| 119 | if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child)) | 119 | if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child)) |
| 120 | signal_wake_up(child, task_is_traced(child)); | 120 | ptrace_signal_wake_up(child, true); |
| 121 | 121 | ||
| 122 | spin_unlock(&child->sighand->siglock); | 122 | spin_unlock(&child->sighand->siglock); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | /* Ensure that nothing can wake it up, even SIGKILL */ | ||
| 126 | static bool ptrace_freeze_traced(struct task_struct *task) | ||
| 127 | { | ||
| 128 | bool ret = false; | ||
| 129 | |||
| 130 | /* Lockless, nobody but us can set this flag */ | ||
| 131 | if (task->jobctl & JOBCTL_LISTENING) | ||
| 132 | return ret; | ||
| 133 | |||
| 134 | spin_lock_irq(&task->sighand->siglock); | ||
| 135 | if (task_is_traced(task) && !__fatal_signal_pending(task)) { | ||
| 136 | task->state = __TASK_TRACED; | ||
| 137 | ret = true; | ||
| 138 | } | ||
| 139 | spin_unlock_irq(&task->sighand->siglock); | ||
| 140 | |||
| 141 | return ret; | ||
| 142 | } | ||
| 143 | |||
| 144 | static void ptrace_unfreeze_traced(struct task_struct *task) | ||
| 145 | { | ||
| 146 | if (task->state != __TASK_TRACED) | ||
| 147 | return; | ||
| 148 | |||
| 149 | WARN_ON(!task->ptrace || task->parent != current); | ||
| 150 | |||
| 151 | spin_lock_irq(&task->sighand->siglock); | ||
| 152 | if (__fatal_signal_pending(task)) | ||
| 153 | wake_up_state(task, __TASK_TRACED); | ||
| 154 | else | ||
| 155 | task->state = TASK_TRACED; | ||
| 156 | spin_unlock_irq(&task->sighand->siglock); | ||
| 157 | } | ||
| 158 | |||
| 125 | /** | 159 | /** |
| 126 | * ptrace_check_attach - check whether ptracee is ready for ptrace operation | 160 | * ptrace_check_attach - check whether ptracee is ready for ptrace operation |
| 127 | * @child: ptracee to check for | 161 | * @child: ptracee to check for |
| @@ -139,7 +173,7 @@ void __ptrace_unlink(struct task_struct *child) | |||
| 139 | * RETURNS: | 173 | * RETURNS: |
| 140 | * 0 on success, -ESRCH if %child is not ready. | 174 | * 0 on success, -ESRCH if %child is not ready. |
| 141 | */ | 175 | */ |
| 142 | int ptrace_check_attach(struct task_struct *child, bool ignore_state) | 176 | static int ptrace_check_attach(struct task_struct *child, bool ignore_state) |
| 143 | { | 177 | { |
| 144 | int ret = -ESRCH; | 178 | int ret = -ESRCH; |
| 145 | 179 | ||
| @@ -151,24 +185,29 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state) | |||
| 151 | * be changed by us so it's not changing right after this. | 185 | * be changed by us so it's not changing right after this. |
| 152 | */ | 186 | */ |
| 153 | read_lock(&tasklist_lock); | 187 | read_lock(&tasklist_lock); |
| 154 | if ((child->ptrace & PT_PTRACED) && child->parent == current) { | 188 | if (child->ptrace && child->parent == current) { |
| 189 | WARN_ON(child->state == __TASK_TRACED); | ||
| 155 | /* | 190 | /* |
| 156 | * child->sighand can't be NULL, release_task() | 191 | * child->sighand can't be NULL, release_task() |
| 157 | * does ptrace_unlink() before __exit_signal(). | 192 | * does ptrace_unlink() before __exit_signal(). |
| 158 | */ | 193 | */ |
| 159 | spin_lock_irq(&child->sighand->siglock); | 194 | if (ignore_state || ptrace_freeze_traced(child)) |
| 160 | WARN_ON_ONCE(task_is_stopped(child)); | ||
| 161 | if (ignore_state || (task_is_traced(child) && | ||
| 162 | !(child->jobctl & JOBCTL_LISTENING))) | ||
| 163 | ret = 0; | 195 | ret = 0; |
| 164 | spin_unlock_irq(&child->sighand->siglock); | ||
| 165 | } | 196 | } |
| 166 | read_unlock(&tasklist_lock); | 197 | read_unlock(&tasklist_lock); |
| 167 | 198 | ||
| 168 | if (!ret && !ignore_state) | 199 | if (!ret && !ignore_state) { |
| 169 | ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH; | 200 | if (!wait_task_inactive(child, __TASK_TRACED)) { |
| 201 | /* | ||
| 202 | * This can only happen if may_ptrace_stop() fails and | ||
| 203 | * ptrace_stop() changes ->state back to TASK_RUNNING, | ||
| 204 | * so we should not worry about leaking __TASK_TRACED. | ||
| 205 | */ | ||
| 206 | WARN_ON(child->state == __TASK_TRACED); | ||
| 207 | ret = -ESRCH; | ||
| 208 | } | ||
| 209 | } | ||
| 170 | 210 | ||
| 171 | /* All systems go.. */ | ||
| 172 | return ret; | 211 | return ret; |
| 173 | } | 212 | } |
| 174 | 213 | ||
| @@ -317,7 +356,7 @@ static int ptrace_attach(struct task_struct *task, long request, | |||
| 317 | */ | 356 | */ |
| 318 | if (task_is_stopped(task) && | 357 | if (task_is_stopped(task) && |
| 319 | task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING)) | 358 | task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING)) |
| 320 | signal_wake_up(task, 1); | 359 | signal_wake_up_state(task, __TASK_STOPPED); |
| 321 | 360 | ||
| 322 | spin_unlock(&task->sighand->siglock); | 361 | spin_unlock(&task->sighand->siglock); |
| 323 | 362 | ||
| @@ -737,7 +776,7 @@ int ptrace_request(struct task_struct *child, long request, | |||
| 737 | * tracee into STOP. | 776 | * tracee into STOP. |
| 738 | */ | 777 | */ |
| 739 | if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP))) | 778 | if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP))) |
| 740 | signal_wake_up(child, child->jobctl & JOBCTL_LISTENING); | 779 | ptrace_signal_wake_up(child, child->jobctl & JOBCTL_LISTENING); |
| 741 | 780 | ||
| 742 | unlock_task_sighand(child, &flags); | 781 | unlock_task_sighand(child, &flags); |
| 743 | ret = 0; | 782 | ret = 0; |
| @@ -763,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request, | |||
| 763 | * start of this trap and now. Trigger re-trap. | 802 | * start of this trap and now. Trigger re-trap. |
| 764 | */ | 803 | */ |
| 765 | if (child->jobctl & JOBCTL_TRAP_NOTIFY) | 804 | if (child->jobctl & JOBCTL_TRAP_NOTIFY) |
| 766 | signal_wake_up(child, true); | 805 | ptrace_signal_wake_up(child, true); |
| 767 | ret = 0; | 806 | ret = 0; |
| 768 | } | 807 | } |
| 769 | unlock_task_sighand(child, &flags); | 808 | unlock_task_sighand(child, &flags); |
| @@ -900,6 +939,8 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, | |||
| 900 | goto out_put_task_struct; | 939 | goto out_put_task_struct; |
| 901 | 940 | ||
| 902 | ret = arch_ptrace(child, request, addr, data); | 941 | ret = arch_ptrace(child, request, addr, data); |
| 942 | if (ret || request != PTRACE_DETACH) | ||
| 943 | ptrace_unfreeze_traced(child); | ||
| 903 | 944 | ||
| 904 | out_put_task_struct: | 945 | out_put_task_struct: |
| 905 | put_task_struct(child); | 946 | put_task_struct(child); |
| @@ -1039,8 +1080,11 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, | |||
| 1039 | 1080 | ||
| 1040 | ret = ptrace_check_attach(child, request == PTRACE_KILL || | 1081 | ret = ptrace_check_attach(child, request == PTRACE_KILL || |
| 1041 | request == PTRACE_INTERRUPT); | 1082 | request == PTRACE_INTERRUPT); |
| 1042 | if (!ret) | 1083 | if (!ret) { |
| 1043 | ret = compat_arch_ptrace(child, request, addr, data); | 1084 | ret = compat_arch_ptrace(child, request, addr, data); |
| 1085 | if (ret || request != PTRACE_DETACH) | ||
| 1086 | ptrace_unfreeze_traced(child); | ||
| 1087 | } | ||
| 1044 | 1088 | ||
| 1045 | out_put_task_struct: | 1089 | out_put_task_struct: |
| 1046 | put_task_struct(child); | 1090 | put_task_struct(child); |
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 257002c13bb0..26058d0bebba 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -1523,7 +1523,8 @@ out: | |||
| 1523 | */ | 1523 | */ |
| 1524 | int wake_up_process(struct task_struct *p) | 1524 | int wake_up_process(struct task_struct *p) |
| 1525 | { | 1525 | { |
| 1526 | return try_to_wake_up(p, TASK_ALL, 0); | 1526 | WARN_ON(task_is_stopped_or_traced(p)); |
| 1527 | return try_to_wake_up(p, TASK_NORMAL, 0); | ||
| 1527 | } | 1528 | } |
| 1528 | EXPORT_SYMBOL(wake_up_process); | 1529 | EXPORT_SYMBOL(wake_up_process); |
| 1529 | 1530 | ||
diff --git a/kernel/signal.c b/kernel/signal.c index 372771e948c2..3d09cf6cde75 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
| @@ -680,23 +680,17 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) | |||
| 680 | * No need to set need_resched since signal event passing | 680 | * No need to set need_resched since signal event passing |
| 681 | * goes through ->blocked | 681 | * goes through ->blocked |
| 682 | */ | 682 | */ |
| 683 | void signal_wake_up(struct task_struct *t, int resume) | 683 | void signal_wake_up_state(struct task_struct *t, unsigned int state) |
| 684 | { | 684 | { |
| 685 | unsigned int mask; | ||
| 686 | |||
| 687 | set_tsk_thread_flag(t, TIF_SIGPENDING); | 685 | set_tsk_thread_flag(t, TIF_SIGPENDING); |
| 688 | |||
| 689 | /* | 686 | /* |
| 690 | * For SIGKILL, we want to wake it up in the stopped/traced/killable | 687 | * TASK_WAKEKILL also means wake it up in the stopped/traced/killable |
| 691 | * case. We don't check t->state here because there is a race with it | 688 | * case. We don't check t->state here because there is a race with it |
| 692 | * executing another processor and just now entering stopped state. | 689 | * executing another processor and just now entering stopped state. |
| 693 | * By using wake_up_state, we ensure the process will wake up and | 690 | * By using wake_up_state, we ensure the process will wake up and |
| 694 | * handle its death signal. | 691 | * handle its death signal. |
| 695 | */ | 692 | */ |
| 696 | mask = TASK_INTERRUPTIBLE; | 693 | if (!wake_up_state(t, state | TASK_INTERRUPTIBLE)) |
| 697 | if (resume) | ||
| 698 | mask |= TASK_WAKEKILL; | ||
| 699 | if (!wake_up_state(t, mask)) | ||
| 700 | kick_process(t); | 694 | kick_process(t); |
| 701 | } | 695 | } |
| 702 | 696 | ||
| @@ -844,7 +838,7 @@ static void ptrace_trap_notify(struct task_struct *t) | |||
| 844 | assert_spin_locked(&t->sighand->siglock); | 838 | assert_spin_locked(&t->sighand->siglock); |
| 845 | 839 | ||
| 846 | task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY); | 840 | task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY); |
| 847 | signal_wake_up(t, t->jobctl & JOBCTL_LISTENING); | 841 | ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING); |
| 848 | } | 842 | } |
| 849 | 843 | ||
| 850 | /* | 844 | /* |
| @@ -1800,6 +1794,10 @@ static inline int may_ptrace_stop(void) | |||
| 1800 | * If SIGKILL was already sent before the caller unlocked | 1794 | * If SIGKILL was already sent before the caller unlocked |
| 1801 | * ->siglock we must see ->core_state != NULL. Otherwise it | 1795 | * ->siglock we must see ->core_state != NULL. Otherwise it |
| 1802 | * is safe to enter schedule(). | 1796 | * is safe to enter schedule(). |
| 1797 | * | ||
| 1798 | * This is almost outdated, a task with the pending SIGKILL can't | ||
| 1799 | * block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported | ||
| 1800 | * after SIGKILL was already dequeued. | ||
| 1803 | */ | 1801 | */ |
| 1804 | if (unlikely(current->mm->core_state) && | 1802 | if (unlikely(current->mm->core_state) && |
| 1805 | unlikely(current->mm == current->parent->mm)) | 1803 | unlikely(current->mm == current->parent->mm)) |
| @@ -1925,6 +1923,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info) | |||
| 1925 | if (gstop_done) | 1923 | if (gstop_done) |
| 1926 | do_notify_parent_cldstop(current, false, why); | 1924 | do_notify_parent_cldstop(current, false, why); |
| 1927 | 1925 | ||
| 1926 | /* tasklist protects us from ptrace_freeze_traced() */ | ||
| 1928 | __set_current_state(TASK_RUNNING); | 1927 | __set_current_state(TASK_RUNNING); |
| 1929 | if (clear_code) | 1928 | if (clear_code) |
| 1930 | current->exit_code = 0; | 1929 | current->exit_code = 0; |
| @@ -3116,8 +3115,9 @@ int __save_altstack(stack_t __user *uss, unsigned long sp) | |||
| 3116 | 3115 | ||
| 3117 | #ifdef CONFIG_COMPAT | 3116 | #ifdef CONFIG_COMPAT |
| 3118 | #ifdef CONFIG_GENERIC_SIGALTSTACK | 3117 | #ifdef CONFIG_GENERIC_SIGALTSTACK |
| 3119 | asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr, | 3118 | COMPAT_SYSCALL_DEFINE2(sigaltstack, |
| 3120 | compat_stack_t __user *uoss_ptr) | 3119 | const compat_stack_t __user *, uss_ptr, |
| 3120 | compat_stack_t __user *, uoss_ptr) | ||
| 3121 | { | 3121 | { |
| 3122 | stack_t uss, uoss; | 3122 | stack_t uss, uoss; |
| 3123 | int ret; | 3123 | int ret; |
diff --git a/kernel/smp.c b/kernel/smp.c index 29dd40a9f2f4..69f38bd98b42 100644 --- a/kernel/smp.c +++ b/kernel/smp.c | |||
| @@ -33,6 +33,7 @@ struct call_function_data { | |||
| 33 | struct call_single_data csd; | 33 | struct call_single_data csd; |
| 34 | atomic_t refs; | 34 | atomic_t refs; |
| 35 | cpumask_var_t cpumask; | 35 | cpumask_var_t cpumask; |
| 36 | cpumask_var_t cpumask_ipi; | ||
| 36 | }; | 37 | }; |
| 37 | 38 | ||
| 38 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data); | 39 | static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_function_data, cfd_data); |
| @@ -56,6 +57,9 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 56 | if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL, | 57 | if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL, |
| 57 | cpu_to_node(cpu))) | 58 | cpu_to_node(cpu))) |
| 58 | return notifier_from_errno(-ENOMEM); | 59 | return notifier_from_errno(-ENOMEM); |
| 60 | if (!zalloc_cpumask_var_node(&cfd->cpumask_ipi, GFP_KERNEL, | ||
| 61 | cpu_to_node(cpu))) | ||
| 62 | return notifier_from_errno(-ENOMEM); | ||
| 59 | break; | 63 | break; |
| 60 | 64 | ||
| 61 | #ifdef CONFIG_HOTPLUG_CPU | 65 | #ifdef CONFIG_HOTPLUG_CPU |
| @@ -65,6 +69,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu) | |||
| 65 | case CPU_DEAD: | 69 | case CPU_DEAD: |
| 66 | case CPU_DEAD_FROZEN: | 70 | case CPU_DEAD_FROZEN: |
| 67 | free_cpumask_var(cfd->cpumask); | 71 | free_cpumask_var(cfd->cpumask); |
| 72 | free_cpumask_var(cfd->cpumask_ipi); | ||
| 68 | break; | 73 | break; |
| 69 | #endif | 74 | #endif |
| 70 | }; | 75 | }; |
| @@ -526,6 +531,12 @@ void smp_call_function_many(const struct cpumask *mask, | |||
| 526 | return; | 531 | return; |
| 527 | } | 532 | } |
| 528 | 533 | ||
| 534 | /* | ||
| 535 | * After we put an entry into the list, data->cpumask | ||
| 536 | * may be cleared again when another CPU sends another IPI for | ||
| 537 | * a SMP function call, so data->cpumask will be zero. | ||
| 538 | */ | ||
| 539 | cpumask_copy(data->cpumask_ipi, data->cpumask); | ||
| 529 | raw_spin_lock_irqsave(&call_function.lock, flags); | 540 | raw_spin_lock_irqsave(&call_function.lock, flags); |
| 530 | /* | 541 | /* |
| 531 | * Place entry at the _HEAD_ of the list, so that any cpu still | 542 | * Place entry at the _HEAD_ of the list, so that any cpu still |
| @@ -549,7 +560,7 @@ void smp_call_function_many(const struct cpumask *mask, | |||
| 549 | smp_mb(); | 560 | smp_mb(); |
| 550 | 561 | ||
| 551 | /* Send a message to all CPUs in the map */ | 562 | /* Send a message to all CPUs in the map */ |
| 552 | arch_send_call_function_ipi_mask(data->cpumask); | 563 | arch_send_call_function_ipi_mask(data->cpumask_ipi); |
| 553 | 564 | ||
| 554 | /* Optionally wait for the CPUs to complete */ | 565 | /* Optionally wait for the CPUs to complete */ |
| 555 | if (wait) | 566 | if (wait) |
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index 8601f0db1261..b69692250af4 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig | |||
| @@ -38,6 +38,10 @@ config GENERIC_CLOCKEVENTS_BUILD | |||
| 38 | default y | 38 | default y |
| 39 | depends on GENERIC_CLOCKEVENTS | 39 | depends on GENERIC_CLOCKEVENTS |
| 40 | 40 | ||
| 41 | # Architecture can handle broadcast in a driver-agnostic way | ||
| 42 | config ARCH_HAS_TICK_BROADCAST | ||
| 43 | bool | ||
| 44 | |||
| 41 | # Clockevents broadcasting infrastructure | 45 | # Clockevents broadcasting infrastructure |
| 42 | config GENERIC_CLOCKEVENTS_BROADCAST | 46 | config GENERIC_CLOCKEVENTS_BROADCAST |
| 43 | bool | 47 | bool |
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c index f113755695e2..f726537d24eb 100644 --- a/kernel/time/tick-broadcast.c +++ b/kernel/time/tick-broadcast.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/percpu.h> | 18 | #include <linux/percpu.h> |
| 19 | #include <linux/profile.h> | 19 | #include <linux/profile.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/smp.h> | ||
| 21 | 22 | ||
| 22 | #include "tick-internal.h" | 23 | #include "tick-internal.h" |
| 23 | 24 | ||
| @@ -86,6 +87,11 @@ int tick_is_broadcast_device(struct clock_event_device *dev) | |||
| 86 | return (dev && tick_broadcast_device.evtdev == dev); | 87 | return (dev && tick_broadcast_device.evtdev == dev); |
| 87 | } | 88 | } |
| 88 | 89 | ||
| 90 | static void err_broadcast(const struct cpumask *mask) | ||
| 91 | { | ||
| 92 | pr_crit_once("Failed to broadcast timer tick. Some CPUs may be unresponsive.\n"); | ||
| 93 | } | ||
| 94 | |||
| 89 | /* | 95 | /* |
| 90 | * Check, if the device is disfunctional and a place holder, which | 96 | * Check, if the device is disfunctional and a place holder, which |
| 91 | * needs to be handled by the broadcast device. | 97 | * needs to be handled by the broadcast device. |
| @@ -105,6 +111,13 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) | |||
| 105 | */ | 111 | */ |
| 106 | if (!tick_device_is_functional(dev)) { | 112 | if (!tick_device_is_functional(dev)) { |
| 107 | dev->event_handler = tick_handle_periodic; | 113 | dev->event_handler = tick_handle_periodic; |
| 114 | if (!dev->broadcast) | ||
| 115 | dev->broadcast = tick_broadcast; | ||
| 116 | if (!dev->broadcast) { | ||
| 117 | pr_warn_once("%s depends on broadcast, but no broadcast function available\n", | ||
| 118 | dev->name); | ||
| 119 | dev->broadcast = err_broadcast; | ||
| 120 | } | ||
| 108 | cpumask_set_cpu(cpu, tick_get_broadcast_mask()); | 121 | cpumask_set_cpu(cpu, tick_get_broadcast_mask()); |
| 109 | tick_broadcast_start_periodic(tick_broadcast_device.evtdev); | 122 | tick_broadcast_start_periodic(tick_broadcast_device.evtdev); |
| 110 | ret = 1; | 123 | ret = 1; |
| @@ -125,6 +138,23 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu) | |||
| 125 | return ret; | 138 | return ret; |
| 126 | } | 139 | } |
| 127 | 140 | ||
| 141 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
| 142 | int tick_receive_broadcast(void) | ||
| 143 | { | ||
| 144 | struct tick_device *td = this_cpu_ptr(&tick_cpu_device); | ||
| 145 | struct clock_event_device *evt = td->evtdev; | ||
| 146 | |||
| 147 | if (!evt) | ||
| 148 | return -ENODEV; | ||
| 149 | |||
| 150 | if (!evt->event_handler) | ||
| 151 | return -EINVAL; | ||
| 152 | |||
| 153 | evt->event_handler(evt); | ||
| 154 | return 0; | ||
| 155 | } | ||
| 156 | #endif | ||
| 157 | |||
| 128 | /* | 158 | /* |
| 129 | * Broadcast the event to the cpus, which are set in the mask (mangled). | 159 | * Broadcast the event to the cpus, which are set in the mask (mangled). |
| 130 | */ | 160 | */ |
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 3ffe4c5ad3f3..41473b4ad7a4 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c | |||
| @@ -3998,7 +3998,7 @@ static int ftrace_module_notify(struct notifier_block *self, | |||
| 3998 | 3998 | ||
| 3999 | struct notifier_block ftrace_module_nb = { | 3999 | struct notifier_block ftrace_module_nb = { |
| 4000 | .notifier_call = ftrace_module_notify, | 4000 | .notifier_call = ftrace_module_notify, |
| 4001 | .priority = 0, | 4001 | .priority = INT_MAX, /* Run before anything that can use kprobes */ |
| 4002 | }; | 4002 | }; |
| 4003 | 4003 | ||
| 4004 | extern unsigned long __start_mcount_loc[]; | 4004 | extern unsigned long __start_mcount_loc[]; |
| @@ -55,6 +55,7 @@ static inline unsigned long bug_addr(const struct bug_entry *bug) | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | #ifdef CONFIG_MODULES | 57 | #ifdef CONFIG_MODULES |
| 58 | /* Updates are protected by module mutex */ | ||
| 58 | static LIST_HEAD(module_bug_list); | 59 | static LIST_HEAD(module_bug_list); |
| 59 | 60 | ||
| 60 | static const struct bug_entry *module_find_bug(unsigned long bugaddr) | 61 | static const struct bug_entry *module_find_bug(unsigned long bugaddr) |
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 8e1d89d2b1c1..183f97a86bb2 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c | |||
| @@ -738,6 +738,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, | |||
| 738 | struct arphdr *arphdr; | 738 | struct arphdr *arphdr; |
| 739 | struct ethhdr *ethhdr; | 739 | struct ethhdr *ethhdr; |
| 740 | __be32 ip_src, ip_dst; | 740 | __be32 ip_src, ip_dst; |
| 741 | uint8_t *hw_src, *hw_dst; | ||
| 741 | uint16_t type = 0; | 742 | uint16_t type = 0; |
| 742 | 743 | ||
| 743 | /* pull the ethernet header */ | 744 | /* pull the ethernet header */ |
| @@ -777,9 +778,23 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv, | |||
| 777 | ip_src = batadv_arp_ip_src(skb, hdr_size); | 778 | ip_src = batadv_arp_ip_src(skb, hdr_size); |
| 778 | ip_dst = batadv_arp_ip_dst(skb, hdr_size); | 779 | ip_dst = batadv_arp_ip_dst(skb, hdr_size); |
| 779 | if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || | 780 | if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) || |
| 780 | ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst)) | 781 | ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst) || |
| 782 | ipv4_is_zeronet(ip_src) || ipv4_is_lbcast(ip_src) || | ||
| 783 | ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst)) | ||
| 781 | goto out; | 784 | goto out; |
| 782 | 785 | ||
| 786 | hw_src = batadv_arp_hw_src(skb, hdr_size); | ||
| 787 | if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src)) | ||
| 788 | goto out; | ||
| 789 | |||
| 790 | /* we don't care about the destination MAC address in ARP requests */ | ||
| 791 | if (arphdr->ar_op != htons(ARPOP_REQUEST)) { | ||
| 792 | hw_dst = batadv_arp_hw_dst(skb, hdr_size); | ||
| 793 | if (is_zero_ether_addr(hw_dst) || | ||
| 794 | is_multicast_ether_addr(hw_dst)) | ||
| 795 | goto out; | ||
| 796 | } | ||
| 797 | |||
| 783 | type = ntohs(arphdr->ar_op); | 798 | type = ntohs(arphdr->ar_op); |
| 784 | out: | 799 | out: |
| 785 | return type; | 800 | return type; |
| @@ -1012,6 +1027,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, | |||
| 1012 | */ | 1027 | */ |
| 1013 | ret = !batadv_is_my_client(bat_priv, hw_dst); | 1028 | ret = !batadv_is_my_client(bat_priv, hw_dst); |
| 1014 | out: | 1029 | out: |
| 1030 | if (ret) | ||
| 1031 | kfree_skb(skb); | ||
| 1015 | /* if ret == false -> packet has to be delivered to the interface */ | 1032 | /* if ret == false -> packet has to be delivered to the interface */ |
| 1016 | return ret; | 1033 | return ret; |
| 1017 | } | 1034 | } |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 596660d37c5e..0f78e34220c9 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -2810,14 +2810,6 @@ static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) | |||
| 2810 | if (conn) { | 2810 | if (conn) { |
| 2811 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); | 2811 | hci_conn_enter_active_mode(conn, BT_POWER_FORCE_ACTIVE_OFF); |
| 2812 | 2812 | ||
| 2813 | hci_dev_lock(hdev); | ||
| 2814 | if (test_bit(HCI_MGMT, &hdev->dev_flags) && | ||
| 2815 | !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &conn->flags)) | ||
| 2816 | mgmt_device_connected(hdev, &conn->dst, conn->type, | ||
| 2817 | conn->dst_type, 0, NULL, 0, | ||
| 2818 | conn->dev_class); | ||
| 2819 | hci_dev_unlock(hdev); | ||
| 2820 | |||
| 2821 | /* Send to upper protocol */ | 2813 | /* Send to upper protocol */ |
| 2822 | l2cap_recv_acldata(conn, skb, flags); | 2814 | l2cap_recv_acldata(conn, skb, flags); |
| 2823 | return; | 2815 | return; |
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 705078a0cc39..81b44481d0d9 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
| @@ -2688,7 +2688,7 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) | |||
| 2688 | if (ev->opcode != HCI_OP_NOP) | 2688 | if (ev->opcode != HCI_OP_NOP) |
| 2689 | del_timer(&hdev->cmd_timer); | 2689 | del_timer(&hdev->cmd_timer); |
| 2690 | 2690 | ||
| 2691 | if (ev->ncmd) { | 2691 | if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) { |
| 2692 | atomic_set(&hdev->cmd_cnt, 1); | 2692 | atomic_set(&hdev->cmd_cnt, 1); |
| 2693 | if (!skb_queue_empty(&hdev->cmd_q)) | 2693 | if (!skb_queue_empty(&hdev->cmd_q)) |
| 2694 | queue_work(hdev->workqueue, &hdev->cmd_work); | 2694 | queue_work(hdev->workqueue, &hdev->cmd_work); |
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index b2bcbe2dc328..a7352ff3fd1e 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
| @@ -931,7 +931,7 @@ static int hidp_setup_hid(struct hidp_session *session, | |||
| 931 | hid->version = req->version; | 931 | hid->version = req->version; |
| 932 | hid->country = req->country; | 932 | hid->country = req->country; |
| 933 | 933 | ||
| 934 | strncpy(hid->name, req->name, 128); | 934 | strncpy(hid->name, req->name, sizeof(req->name) - 1); |
| 935 | 935 | ||
| 936 | snprintf(hid->phys, sizeof(hid->phys), "%pMR", | 936 | snprintf(hid->phys, sizeof(hid->phys), "%pMR", |
| 937 | &bt_sk(session->ctrl_sock->sk)->src); | 937 | &bt_sk(session->ctrl_sock->sk)->src); |
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 2c78208d793e..22e658322845 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
| @@ -3727,6 +3727,17 @@ sendresp: | |||
| 3727 | static int l2cap_connect_req(struct l2cap_conn *conn, | 3727 | static int l2cap_connect_req(struct l2cap_conn *conn, |
| 3728 | struct l2cap_cmd_hdr *cmd, u8 *data) | 3728 | struct l2cap_cmd_hdr *cmd, u8 *data) |
| 3729 | { | 3729 | { |
| 3730 | struct hci_dev *hdev = conn->hcon->hdev; | ||
| 3731 | struct hci_conn *hcon = conn->hcon; | ||
| 3732 | |||
| 3733 | hci_dev_lock(hdev); | ||
| 3734 | if (test_bit(HCI_MGMT, &hdev->dev_flags) && | ||
| 3735 | !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags)) | ||
| 3736 | mgmt_device_connected(hdev, &hcon->dst, hcon->type, | ||
| 3737 | hcon->dst_type, 0, NULL, 0, | ||
| 3738 | hcon->dev_class); | ||
| 3739 | hci_dev_unlock(hdev); | ||
| 3740 | |||
| 3730 | l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0); | 3741 | l2cap_connect(conn, cmd, data, L2CAP_CONN_RSP, 0); |
| 3731 | return 0; | 3742 | return 0; |
| 3732 | } | 3743 | } |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 531a93d613d4..57f250c20e39 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -352,7 +352,7 @@ static void __sco_sock_close(struct sock *sk) | |||
| 352 | 352 | ||
| 353 | case BT_CONNECTED: | 353 | case BT_CONNECTED: |
| 354 | case BT_CONFIG: | 354 | case BT_CONFIG: |
| 355 | if (sco_pi(sk)->conn) { | 355 | if (sco_pi(sk)->conn->hcon) { |
| 356 | sk->sk_state = BT_DISCONN; | 356 | sk->sk_state = BT_DISCONN; |
| 357 | sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); | 357 | sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); |
| 358 | hci_conn_put(sco_pi(sk)->conn->hcon); | 358 | hci_conn_put(sco_pi(sk)->conn->hcon); |
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index c31d9e8668c3..4425148d2b51 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c | |||
| @@ -186,8 +186,6 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req, | |||
| 186 | struct fastopen_queue *fastopenq = | 186 | struct fastopen_queue *fastopenq = |
| 187 | inet_csk(lsk)->icsk_accept_queue.fastopenq; | 187 | inet_csk(lsk)->icsk_accept_queue.fastopenq; |
| 188 | 188 | ||
| 189 | BUG_ON(!spin_is_locked(&sk->sk_lock.slock) && !sock_owned_by_user(sk)); | ||
| 190 | |||
| 191 | tcp_sk(sk)->fastopen_rsk = NULL; | 189 | tcp_sk(sk)->fastopen_rsk = NULL; |
| 192 | spin_lock_bh(&fastopenq->lock); | 190 | spin_lock_bh(&fastopenq->lock); |
| 193 | fastopenq->qlen--; | 191 | fastopenq->qlen--; |
diff --git a/net/core/scm.c b/net/core/scm.c index 57fb1ee6649f..905dcc6ad1e3 100644 --- a/net/core/scm.c +++ b/net/core/scm.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <net/sock.h> | 35 | #include <net/sock.h> |
| 36 | #include <net/compat.h> | 36 | #include <net/compat.h> |
| 37 | #include <net/scm.h> | 37 | #include <net/scm.h> |
| 38 | #include <net/cls_cgroup.h> | ||
| 38 | 39 | ||
| 39 | 40 | ||
| 40 | /* | 41 | /* |
| @@ -302,8 +303,10 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) | |||
| 302 | } | 303 | } |
| 303 | /* Bump the usage count and install the file. */ | 304 | /* Bump the usage count and install the file. */ |
| 304 | sock = sock_from_file(fp[i], &err); | 305 | sock = sock_from_file(fp[i], &err); |
| 305 | if (sock) | 306 | if (sock) { |
| 306 | sock_update_netprioidx(sock->sk, current); | 307 | sock_update_netprioidx(sock->sk, current); |
| 308 | sock_update_classid(sock->sk, current); | ||
| 309 | } | ||
| 307 | fd_install(new_fd, get_file(fp[i])); | 310 | fd_install(new_fd, get_file(fp[i])); |
| 308 | } | 311 | } |
| 309 | 312 | ||
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3ab989b0de42..a9a2ae3e2213 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -1649,7 +1649,7 @@ static void sock_spd_release(struct splice_pipe_desc *spd, unsigned int i) | |||
| 1649 | 1649 | ||
| 1650 | static struct page *linear_to_page(struct page *page, unsigned int *len, | 1650 | static struct page *linear_to_page(struct page *page, unsigned int *len, |
| 1651 | unsigned int *offset, | 1651 | unsigned int *offset, |
| 1652 | struct sk_buff *skb, struct sock *sk) | 1652 | struct sock *sk) |
| 1653 | { | 1653 | { |
| 1654 | struct page_frag *pfrag = sk_page_frag(sk); | 1654 | struct page_frag *pfrag = sk_page_frag(sk); |
| 1655 | 1655 | ||
| @@ -1682,14 +1682,14 @@ static bool spd_can_coalesce(const struct splice_pipe_desc *spd, | |||
| 1682 | static bool spd_fill_page(struct splice_pipe_desc *spd, | 1682 | static bool spd_fill_page(struct splice_pipe_desc *spd, |
| 1683 | struct pipe_inode_info *pipe, struct page *page, | 1683 | struct pipe_inode_info *pipe, struct page *page, |
| 1684 | unsigned int *len, unsigned int offset, | 1684 | unsigned int *len, unsigned int offset, |
| 1685 | struct sk_buff *skb, bool linear, | 1685 | bool linear, |
| 1686 | struct sock *sk) | 1686 | struct sock *sk) |
| 1687 | { | 1687 | { |
| 1688 | if (unlikely(spd->nr_pages == MAX_SKB_FRAGS)) | 1688 | if (unlikely(spd->nr_pages == MAX_SKB_FRAGS)) |
| 1689 | return true; | 1689 | return true; |
| 1690 | 1690 | ||
| 1691 | if (linear) { | 1691 | if (linear) { |
| 1692 | page = linear_to_page(page, len, &offset, skb, sk); | 1692 | page = linear_to_page(page, len, &offset, sk); |
| 1693 | if (!page) | 1693 | if (!page) |
| 1694 | return true; | 1694 | return true; |
| 1695 | } | 1695 | } |
| @@ -1706,23 +1706,9 @@ static bool spd_fill_page(struct splice_pipe_desc *spd, | |||
| 1706 | return false; | 1706 | return false; |
| 1707 | } | 1707 | } |
| 1708 | 1708 | ||
| 1709 | static inline void __segment_seek(struct page **page, unsigned int *poff, | ||
| 1710 | unsigned int *plen, unsigned int off) | ||
| 1711 | { | ||
| 1712 | unsigned long n; | ||
| 1713 | |||
| 1714 | *poff += off; | ||
| 1715 | n = *poff / PAGE_SIZE; | ||
| 1716 | if (n) | ||
| 1717 | *page = nth_page(*page, n); | ||
| 1718 | |||
| 1719 | *poff = *poff % PAGE_SIZE; | ||
| 1720 | *plen -= off; | ||
| 1721 | } | ||
| 1722 | |||
| 1723 | static bool __splice_segment(struct page *page, unsigned int poff, | 1709 | static bool __splice_segment(struct page *page, unsigned int poff, |
| 1724 | unsigned int plen, unsigned int *off, | 1710 | unsigned int plen, unsigned int *off, |
| 1725 | unsigned int *len, struct sk_buff *skb, | 1711 | unsigned int *len, |
| 1726 | struct splice_pipe_desc *spd, bool linear, | 1712 | struct splice_pipe_desc *spd, bool linear, |
| 1727 | struct sock *sk, | 1713 | struct sock *sk, |
| 1728 | struct pipe_inode_info *pipe) | 1714 | struct pipe_inode_info *pipe) |
| @@ -1737,23 +1723,19 @@ static bool __splice_segment(struct page *page, unsigned int poff, | |||
| 1737 | } | 1723 | } |
| 1738 | 1724 | ||
| 1739 | /* ignore any bits we already processed */ | 1725 | /* ignore any bits we already processed */ |
| 1740 | if (*off) { | 1726 | poff += *off; |
| 1741 | __segment_seek(&page, &poff, &plen, *off); | 1727 | plen -= *off; |
| 1742 | *off = 0; | 1728 | *off = 0; |
| 1743 | } | ||
| 1744 | 1729 | ||
| 1745 | do { | 1730 | do { |
| 1746 | unsigned int flen = min(*len, plen); | 1731 | unsigned int flen = min(*len, plen); |
| 1747 | 1732 | ||
| 1748 | /* the linear region may spread across several pages */ | 1733 | if (spd_fill_page(spd, pipe, page, &flen, poff, |
| 1749 | flen = min_t(unsigned int, flen, PAGE_SIZE - poff); | 1734 | linear, sk)) |
| 1750 | |||
| 1751 | if (spd_fill_page(spd, pipe, page, &flen, poff, skb, linear, sk)) | ||
| 1752 | return true; | 1735 | return true; |
| 1753 | 1736 | poff += flen; | |
| 1754 | __segment_seek(&page, &poff, &plen, flen); | 1737 | plen -= flen; |
| 1755 | *len -= flen; | 1738 | *len -= flen; |
| 1756 | |||
| 1757 | } while (*len && plen); | 1739 | } while (*len && plen); |
| 1758 | 1740 | ||
| 1759 | return false; | 1741 | return false; |
| @@ -1777,7 +1759,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe, | |||
| 1777 | if (__splice_segment(virt_to_page(skb->data), | 1759 | if (__splice_segment(virt_to_page(skb->data), |
| 1778 | (unsigned long) skb->data & (PAGE_SIZE - 1), | 1760 | (unsigned long) skb->data & (PAGE_SIZE - 1), |
| 1779 | skb_headlen(skb), | 1761 | skb_headlen(skb), |
| 1780 | offset, len, skb, spd, | 1762 | offset, len, spd, |
| 1781 | skb_head_is_locked(skb), | 1763 | skb_head_is_locked(skb), |
| 1782 | sk, pipe)) | 1764 | sk, pipe)) |
| 1783 | return true; | 1765 | return true; |
| @@ -1790,7 +1772,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, struct pipe_inode_info *pipe, | |||
| 1790 | 1772 | ||
| 1791 | if (__splice_segment(skb_frag_page(f), | 1773 | if (__splice_segment(skb_frag_page(f), |
| 1792 | f->page_offset, skb_frag_size(f), | 1774 | f->page_offset, skb_frag_size(f), |
| 1793 | offset, len, skb, spd, false, sk, pipe)) | 1775 | offset, len, spd, false, sk, pipe)) |
| 1794 | return true; | 1776 | return true; |
| 1795 | } | 1777 | } |
| 1796 | 1778 | ||
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c index a0d8392491c3..a69b4e4a02b5 100644 --- a/net/ipv4/ah4.c +++ b/net/ipv4/ah4.c | |||
| @@ -269,7 +269,11 @@ static void ah_input_done(struct crypto_async_request *base, int err) | |||
| 269 | skb->network_header += ah_hlen; | 269 | skb->network_header += ah_hlen; |
| 270 | memcpy(skb_network_header(skb), work_iph, ihl); | 270 | memcpy(skb_network_header(skb), work_iph, ihl); |
| 271 | __skb_pull(skb, ah_hlen + ihl); | 271 | __skb_pull(skb, ah_hlen + ihl); |
| 272 | skb_set_transport_header(skb, -ihl); | 272 | |
| 273 | if (x->props.mode == XFRM_MODE_TUNNEL) | ||
| 274 | skb_reset_transport_header(skb); | ||
| 275 | else | ||
| 276 | skb_set_transport_header(skb, -ihl); | ||
| 273 | out: | 277 | out: |
| 274 | kfree(AH_SKB_CB(skb)->tmp); | 278 | kfree(AH_SKB_CB(skb)->tmp); |
| 275 | xfrm_input_resume(skb, err); | 279 | xfrm_input_resume(skb, err); |
| @@ -381,7 +385,10 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) | |||
| 381 | skb->network_header += ah_hlen; | 385 | skb->network_header += ah_hlen; |
| 382 | memcpy(skb_network_header(skb), work_iph, ihl); | 386 | memcpy(skb_network_header(skb), work_iph, ihl); |
| 383 | __skb_pull(skb, ah_hlen + ihl); | 387 | __skb_pull(skb, ah_hlen + ihl); |
| 384 | skb_set_transport_header(skb, -ihl); | 388 | if (x->props.mode == XFRM_MODE_TUNNEL) |
| 389 | skb_reset_transport_header(skb); | ||
| 390 | else | ||
| 391 | skb_set_transport_header(skb, -ihl); | ||
| 385 | 392 | ||
| 386 | err = nexthdr; | 393 | err = nexthdr; |
| 387 | 394 | ||
| @@ -413,9 +420,12 @@ static void ah4_err(struct sk_buff *skb, u32 info) | |||
| 413 | if (!x) | 420 | if (!x) |
| 414 | return; | 421 | return; |
| 415 | 422 | ||
| 416 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) | 423 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { |
| 424 | atomic_inc(&flow_cache_genid); | ||
| 425 | rt_genid_bump(net); | ||
| 426 | |||
| 417 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0); | 427 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0); |
| 418 | else | 428 | } else |
| 419 | ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0); | 429 | ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0); |
| 420 | xfrm_state_put(x); | 430 | xfrm_state_put(x); |
| 421 | } | 431 | } |
diff --git a/net/ipv4/datagram.c b/net/ipv4/datagram.c index 424fafbc8cb0..b28e863fe0a7 100644 --- a/net/ipv4/datagram.c +++ b/net/ipv4/datagram.c | |||
| @@ -85,3 +85,28 @@ out: | |||
| 85 | return err; | 85 | return err; |
| 86 | } | 86 | } |
| 87 | EXPORT_SYMBOL(ip4_datagram_connect); | 87 | EXPORT_SYMBOL(ip4_datagram_connect); |
| 88 | |||
| 89 | void ip4_datagram_release_cb(struct sock *sk) | ||
| 90 | { | ||
| 91 | const struct inet_sock *inet = inet_sk(sk); | ||
| 92 | const struct ip_options_rcu *inet_opt; | ||
| 93 | __be32 daddr = inet->inet_daddr; | ||
| 94 | struct flowi4 fl4; | ||
| 95 | struct rtable *rt; | ||
| 96 | |||
| 97 | if (! __sk_dst_get(sk) || __sk_dst_check(sk, 0)) | ||
| 98 | return; | ||
| 99 | |||
| 100 | rcu_read_lock(); | ||
| 101 | inet_opt = rcu_dereference(inet->inet_opt); | ||
| 102 | if (inet_opt && inet_opt->opt.srr) | ||
| 103 | daddr = inet_opt->opt.faddr; | ||
| 104 | rt = ip_route_output_ports(sock_net(sk), &fl4, sk, daddr, | ||
| 105 | inet->inet_saddr, inet->inet_dport, | ||
| 106 | inet->inet_sport, sk->sk_protocol, | ||
| 107 | RT_CONN_FLAGS(sk), sk->sk_bound_dev_if); | ||
| 108 | if (!IS_ERR(rt)) | ||
| 109 | __sk_dst_set(sk, &rt->dst); | ||
| 110 | rcu_read_unlock(); | ||
| 111 | } | ||
| 112 | EXPORT_SYMBOL_GPL(ip4_datagram_release_cb); | ||
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index b61e9deb7c7e..3b4f0cd2e63e 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c | |||
| @@ -346,7 +346,10 @@ static int esp_input_done2(struct sk_buff *skb, int err) | |||
| 346 | 346 | ||
| 347 | pskb_trim(skb, skb->len - alen - padlen - 2); | 347 | pskb_trim(skb, skb->len - alen - padlen - 2); |
| 348 | __skb_pull(skb, hlen); | 348 | __skb_pull(skb, hlen); |
| 349 | skb_set_transport_header(skb, -ihl); | 349 | if (x->props.mode == XFRM_MODE_TUNNEL) |
| 350 | skb_reset_transport_header(skb); | ||
| 351 | else | ||
| 352 | skb_set_transport_header(skb, -ihl); | ||
| 350 | 353 | ||
| 351 | err = nexthdr[1]; | 354 | err = nexthdr[1]; |
| 352 | 355 | ||
| @@ -499,9 +502,12 @@ static void esp4_err(struct sk_buff *skb, u32 info) | |||
| 499 | if (!x) | 502 | if (!x) |
| 500 | return; | 503 | return; |
| 501 | 504 | ||
| 502 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) | 505 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { |
| 506 | atomic_inc(&flow_cache_genid); | ||
| 507 | rt_genid_bump(net); | ||
| 508 | |||
| 503 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0); | 509 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0); |
| 504 | else | 510 | } else |
| 505 | ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0); | 511 | ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0); |
| 506 | xfrm_state_put(x); | 512 | xfrm_state_put(x); |
| 507 | } | 513 | } |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 303012adf9e6..e81b1caf2ea2 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
| @@ -963,8 +963,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev | |||
| 963 | ptr--; | 963 | ptr--; |
| 964 | } | 964 | } |
| 965 | if (tunnel->parms.o_flags&GRE_CSUM) { | 965 | if (tunnel->parms.o_flags&GRE_CSUM) { |
| 966 | int offset = skb_transport_offset(skb); | ||
| 967 | |||
| 966 | *ptr = 0; | 968 | *ptr = 0; |
| 967 | *(__sum16 *)ptr = ip_compute_csum((void *)(iph+1), skb->len - sizeof(struct iphdr)); | 969 | *(__sum16 *)ptr = csum_fold(skb_checksum(skb, offset, |
| 970 | skb->len - offset, | ||
| 971 | 0)); | ||
| 968 | } | 972 | } |
| 969 | } | 973 | } |
| 970 | 974 | ||
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index d3ab47e19a89..9a46daed2f3c 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
| @@ -47,9 +47,12 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) | |||
| 47 | if (!x) | 47 | if (!x) |
| 48 | return; | 48 | return; |
| 49 | 49 | ||
| 50 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) | 50 | if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) { |
| 51 | atomic_inc(&flow_cache_genid); | ||
| 52 | rt_genid_bump(net); | ||
| 53 | |||
| 51 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0); | 54 | ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0); |
| 52 | else | 55 | } else |
| 53 | ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0); | 56 | ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0); |
| 54 | xfrm_state_put(x); | 57 | xfrm_state_put(x); |
| 55 | } | 58 | } |
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 8f3d05424a3e..6f9c07268cf6 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c | |||
| @@ -738,6 +738,7 @@ struct proto ping_prot = { | |||
| 738 | .recvmsg = ping_recvmsg, | 738 | .recvmsg = ping_recvmsg, |
| 739 | .bind = ping_bind, | 739 | .bind = ping_bind, |
| 740 | .backlog_rcv = ping_queue_rcv_skb, | 740 | .backlog_rcv = ping_queue_rcv_skb, |
| 741 | .release_cb = ip4_datagram_release_cb, | ||
| 741 | .hash = ping_v4_hash, | 742 | .hash = ping_v4_hash, |
| 742 | .unhash = ping_v4_unhash, | 743 | .unhash = ping_v4_unhash, |
| 743 | .get_port = ping_v4_get_port, | 744 | .get_port = ping_v4_get_port, |
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 73d1e4df4bf6..6f08991409c3 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
| @@ -894,6 +894,7 @@ struct proto raw_prot = { | |||
| 894 | .recvmsg = raw_recvmsg, | 894 | .recvmsg = raw_recvmsg, |
| 895 | .bind = raw_bind, | 895 | .bind = raw_bind, |
| 896 | .backlog_rcv = raw_rcv_skb, | 896 | .backlog_rcv = raw_rcv_skb, |
| 897 | .release_cb = ip4_datagram_release_cb, | ||
| 897 | .hash = raw_hash_sk, | 898 | .hash = raw_hash_sk, |
| 898 | .unhash = raw_unhash_sk, | 899 | .unhash = raw_unhash_sk, |
| 899 | .obj_size = sizeof(struct raw_sock), | 900 | .obj_size = sizeof(struct raw_sock), |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 844a9ef60dbd..a0fcc47fee73 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
| @@ -912,6 +912,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) | |||
| 912 | struct dst_entry *dst = &rt->dst; | 912 | struct dst_entry *dst = &rt->dst; |
| 913 | struct fib_result res; | 913 | struct fib_result res; |
| 914 | 914 | ||
| 915 | if (dst_metric_locked(dst, RTAX_MTU)) | ||
| 916 | return; | ||
| 917 | |||
| 915 | if (dst->dev->mtu < mtu) | 918 | if (dst->dev->mtu < mtu) |
| 916 | return; | 919 | return; |
| 917 | 920 | ||
| @@ -962,7 +965,7 @@ void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, | |||
| 962 | } | 965 | } |
| 963 | EXPORT_SYMBOL_GPL(ipv4_update_pmtu); | 966 | EXPORT_SYMBOL_GPL(ipv4_update_pmtu); |
| 964 | 967 | ||
| 965 | void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) | 968 | static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) |
| 966 | { | 969 | { |
| 967 | const struct iphdr *iph = (const struct iphdr *) skb->data; | 970 | const struct iphdr *iph = (const struct iphdr *) skb->data; |
| 968 | struct flowi4 fl4; | 971 | struct flowi4 fl4; |
| @@ -975,6 +978,53 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) | |||
| 975 | ip_rt_put(rt); | 978 | ip_rt_put(rt); |
| 976 | } | 979 | } |
| 977 | } | 980 | } |
| 981 | |||
| 982 | void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu) | ||
| 983 | { | ||
| 984 | const struct iphdr *iph = (const struct iphdr *) skb->data; | ||
| 985 | struct flowi4 fl4; | ||
| 986 | struct rtable *rt; | ||
| 987 | struct dst_entry *dst; | ||
| 988 | bool new = false; | ||
| 989 | |||
| 990 | bh_lock_sock(sk); | ||
| 991 | rt = (struct rtable *) __sk_dst_get(sk); | ||
| 992 | |||
| 993 | if (sock_owned_by_user(sk) || !rt) { | ||
| 994 | __ipv4_sk_update_pmtu(skb, sk, mtu); | ||
| 995 | goto out; | ||
| 996 | } | ||
| 997 | |||
| 998 | __build_flow_key(&fl4, sk, iph, 0, 0, 0, 0, 0); | ||
| 999 | |||
| 1000 | if (!__sk_dst_check(sk, 0)) { | ||
| 1001 | rt = ip_route_output_flow(sock_net(sk), &fl4, sk); | ||
| 1002 | if (IS_ERR(rt)) | ||
| 1003 | goto out; | ||
| 1004 | |||
| 1005 | new = true; | ||
| 1006 | } | ||
| 1007 | |||
| 1008 | __ip_rt_update_pmtu((struct rtable *) rt->dst.path, &fl4, mtu); | ||
| 1009 | |||
| 1010 | dst = dst_check(&rt->dst, 0); | ||
| 1011 | if (!dst) { | ||
| 1012 | if (new) | ||
| 1013 | dst_release(&rt->dst); | ||
| 1014 | |||
| 1015 | rt = ip_route_output_flow(sock_net(sk), &fl4, sk); | ||
| 1016 | if (IS_ERR(rt)) | ||
| 1017 | goto out; | ||
| 1018 | |||
| 1019 | new = true; | ||
| 1020 | } | ||
| 1021 | |||
| 1022 | if (new) | ||
| 1023 | __sk_dst_set(sk, &rt->dst); | ||
| 1024 | |||
| 1025 | out: | ||
| 1026 | bh_unlock_sock(sk); | ||
| 1027 | } | ||
| 978 | EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu); | 1028 | EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu); |
| 979 | 1029 | ||
| 980 | void ipv4_redirect(struct sk_buff *skb, struct net *net, | 1030 | void ipv4_redirect(struct sk_buff *skb, struct net *net, |
| @@ -1120,7 +1170,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst) | |||
| 1120 | if (!mtu || time_after_eq(jiffies, rt->dst.expires)) | 1170 | if (!mtu || time_after_eq(jiffies, rt->dst.expires)) |
| 1121 | mtu = dst_metric_raw(dst, RTAX_MTU); | 1171 | mtu = dst_metric_raw(dst, RTAX_MTU); |
| 1122 | 1172 | ||
| 1123 | if (mtu && rt_is_output_route(rt)) | 1173 | if (mtu) |
| 1124 | return mtu; | 1174 | return mtu; |
| 1125 | 1175 | ||
| 1126 | mtu = dst->dev->mtu; | 1176 | mtu = dst->dev->mtu; |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 54139fa514e6..70b09ef2463b 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -369,11 +369,10 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) | |||
| 369 | * We do take care of PMTU discovery (RFC1191) special case : | 369 | * We do take care of PMTU discovery (RFC1191) special case : |
| 370 | * we can receive locally generated ICMP messages while socket is held. | 370 | * we can receive locally generated ICMP messages while socket is held. |
| 371 | */ | 371 | */ |
| 372 | if (sock_owned_by_user(sk) && | 372 | if (sock_owned_by_user(sk)) { |
| 373 | type != ICMP_DEST_UNREACH && | 373 | if (!(type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED)) |
| 374 | code != ICMP_FRAG_NEEDED) | 374 | NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS); |
| 375 | NET_INC_STATS_BH(net, LINUX_MIB_LOCKDROPPEDICMPS); | 375 | } |
| 376 | |||
| 377 | if (sk->sk_state == TCP_CLOSE) | 376 | if (sk->sk_state == TCP_CLOSE) |
| 378 | goto out; | 377 | goto out; |
| 379 | 378 | ||
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 79c8dbe59b54..1f4d405eafba 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
| @@ -1952,6 +1952,7 @@ struct proto udp_prot = { | |||
| 1952 | .recvmsg = udp_recvmsg, | 1952 | .recvmsg = udp_recvmsg, |
| 1953 | .sendpage = udp_sendpage, | 1953 | .sendpage = udp_sendpage, |
| 1954 | .backlog_rcv = __udp_queue_rcv_skb, | 1954 | .backlog_rcv = __udp_queue_rcv_skb, |
| 1955 | .release_cb = ip4_datagram_release_cb, | ||
| 1955 | .hash = udp_lib_hash, | 1956 | .hash = udp_lib_hash, |
| 1956 | .unhash = udp_lib_unhash, | 1957 | .unhash = udp_lib_unhash, |
| 1957 | .rehash = udp_v4_rehash, | 1958 | .rehash = udp_v4_rehash, |
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index ecc35b93314b..384233188ac1 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c | |||
| @@ -472,7 +472,10 @@ static void ah6_input_done(struct crypto_async_request *base, int err) | |||
| 472 | skb->network_header += ah_hlen; | 472 | skb->network_header += ah_hlen; |
| 473 | memcpy(skb_network_header(skb), work_iph, hdr_len); | 473 | memcpy(skb_network_header(skb), work_iph, hdr_len); |
| 474 | __skb_pull(skb, ah_hlen + hdr_len); | 474 | __skb_pull(skb, ah_hlen + hdr_len); |
| 475 | skb_set_transport_header(skb, -hdr_len); | 475 | if (x->props.mode == XFRM_MODE_TUNNEL) |
| 476 | skb_reset_transport_header(skb); | ||
| 477 | else | ||
| 478 | skb_set_transport_header(skb, -hdr_len); | ||
| 476 | out: | 479 | out: |
| 477 | kfree(AH_SKB_CB(skb)->tmp); | 480 | kfree(AH_SKB_CB(skb)->tmp); |
| 478 | xfrm_input_resume(skb, err); | 481 | xfrm_input_resume(skb, err); |
| @@ -593,9 +596,13 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) | |||
| 593 | 596 | ||
| 594 | skb->network_header += ah_hlen; | 597 | skb->network_header += ah_hlen; |
| 595 | memcpy(skb_network_header(skb), work_iph, hdr_len); | 598 | memcpy(skb_network_header(skb), work_iph, hdr_len); |
| 596 | skb->transport_header = skb->network_header; | ||
| 597 | __skb_pull(skb, ah_hlen + hdr_len); | 599 | __skb_pull(skb, ah_hlen + hdr_len); |
| 598 | 600 | ||
| 601 | if (x->props.mode == XFRM_MODE_TUNNEL) | ||
| 602 | skb_reset_transport_header(skb); | ||
| 603 | else | ||
| 604 | skb_set_transport_header(skb, -hdr_len); | ||
| 605 | |||
| 599 | err = nexthdr; | 606 | err = nexthdr; |
| 600 | 607 | ||
| 601 | out_free: | 608 | out_free: |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 282f3723ee19..40ffd72243a4 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
| @@ -300,7 +300,10 @@ static int esp_input_done2(struct sk_buff *skb, int err) | |||
| 300 | 300 | ||
| 301 | pskb_trim(skb, skb->len - alen - padlen - 2); | 301 | pskb_trim(skb, skb->len - alen - padlen - 2); |
| 302 | __skb_pull(skb, hlen); | 302 | __skb_pull(skb, hlen); |
| 303 | skb_set_transport_header(skb, -hdr_len); | 303 | if (x->props.mode == XFRM_MODE_TUNNEL) |
| 304 | skb_reset_transport_header(skb); | ||
| 305 | else | ||
| 306 | skb_set_transport_header(skb, -hdr_len); | ||
| 304 | 307 | ||
| 305 | err = nexthdr[1]; | 308 | err = nexthdr[1]; |
| 306 | 309 | ||
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index b4a9fd51dae7..fff5bdd8b680 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
| @@ -81,10 +81,22 @@ static inline struct sock *icmpv6_sk(struct net *net) | |||
| 81 | return net->ipv6.icmp_sk[smp_processor_id()]; | 81 | return net->ipv6.icmp_sk[smp_processor_id()]; |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | static void icmpv6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | ||
| 85 | u8 type, u8 code, int offset, __be32 info) | ||
| 86 | { | ||
| 87 | struct net *net = dev_net(skb->dev); | ||
| 88 | |||
| 89 | if (type == ICMPV6_PKT_TOOBIG) | ||
| 90 | ip6_update_pmtu(skb, net, info, 0, 0); | ||
| 91 | else if (type == NDISC_REDIRECT) | ||
| 92 | ip6_redirect(skb, net, 0, 0); | ||
| 93 | } | ||
| 94 | |||
| 84 | static int icmpv6_rcv(struct sk_buff *skb); | 95 | static int icmpv6_rcv(struct sk_buff *skb); |
| 85 | 96 | ||
| 86 | static const struct inet6_protocol icmpv6_protocol = { | 97 | static const struct inet6_protocol icmpv6_protocol = { |
| 87 | .handler = icmpv6_rcv, | 98 | .handler = icmpv6_rcv, |
| 99 | .err_handler = icmpv6_err, | ||
| 88 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, | 100 | .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, |
| 89 | }; | 101 | }; |
| 90 | 102 | ||
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 5552d13ae92f..0c7c03d50dc0 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
| @@ -1213,10 +1213,10 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, | |||
| 1213 | if (dst_allfrag(rt->dst.path)) | 1213 | if (dst_allfrag(rt->dst.path)) |
| 1214 | cork->flags |= IPCORK_ALLFRAG; | 1214 | cork->flags |= IPCORK_ALLFRAG; |
| 1215 | cork->length = 0; | 1215 | cork->length = 0; |
| 1216 | exthdrlen = (opt ? opt->opt_flen : 0) - rt->rt6i_nfheader_len; | 1216 | exthdrlen = (opt ? opt->opt_flen : 0); |
| 1217 | length += exthdrlen; | 1217 | length += exthdrlen; |
| 1218 | transhdrlen += exthdrlen; | 1218 | transhdrlen += exthdrlen; |
| 1219 | dst_exthdrlen = rt->dst.header_len; | 1219 | dst_exthdrlen = rt->dst.header_len - rt->rt6i_nfheader_len; |
| 1220 | } else { | 1220 | } else { |
| 1221 | rt = (struct rt6_info *)cork->dst; | 1221 | rt = (struct rt6_info *)cork->dst; |
| 1222 | fl6 = &inet->cork.fl.u.ip6; | 1222 | fl6 = &inet->cork.fl.u.ip6; |
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 26dcdec9e3a5..8fd154e5f079 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
| @@ -1710,6 +1710,9 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns | |||
| 1710 | return -EINVAL; | 1710 | return -EINVAL; |
| 1711 | if (get_user(v, (u32 __user *)optval)) | 1711 | if (get_user(v, (u32 __user *)optval)) |
| 1712 | return -EFAULT; | 1712 | return -EFAULT; |
| 1713 | /* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */ | ||
| 1714 | if (v != RT_TABLE_DEFAULT && v >= 100000000) | ||
| 1715 | return -EINVAL; | ||
| 1713 | if (sk == mrt->mroute6_sk) | 1716 | if (sk == mrt->mroute6_sk) |
| 1714 | return -EBUSY; | 1717 | return -EBUSY; |
| 1715 | 1718 | ||
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 47e0aca614b7..516fbc96feff 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
| @@ -164,7 +164,17 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, | |||
| 164 | sta = sta_info_get(sdata, mac_addr); | 164 | sta = sta_info_get(sdata, mac_addr); |
| 165 | else | 165 | else |
| 166 | sta = sta_info_get_bss(sdata, mac_addr); | 166 | sta = sta_info_get_bss(sdata, mac_addr); |
| 167 | if (!sta) { | 167 | /* |
| 168 | * The ASSOC test makes sure the driver is ready to | ||
| 169 | * receive the key. When wpa_supplicant has roamed | ||
| 170 | * using FT, it attempts to set the key before | ||
| 171 | * association has completed, this rejects that attempt | ||
| 172 | * so it will set the key again after assocation. | ||
| 173 | * | ||
| 174 | * TODO: accept the key if we have a station entry and | ||
| 175 | * add it to the device after the station. | ||
| 176 | */ | ||
| 177 | if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) { | ||
| 168 | ieee80211_key_free(sdata->local, key); | 178 | ieee80211_key_free(sdata->local, key); |
| 169 | err = -ENOENT; | 179 | err = -ENOENT; |
| 170 | goto out_unlock; | 180 | goto out_unlock; |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 8563b9a5cac3..2ed065c09562 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -1358,10 +1358,8 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata); | |||
| 1358 | void ieee80211_sched_scan_stopped_work(struct work_struct *work); | 1358 | void ieee80211_sched_scan_stopped_work(struct work_struct *work); |
| 1359 | 1359 | ||
| 1360 | /* off-channel helpers */ | 1360 | /* off-channel helpers */ |
| 1361 | void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, | 1361 | void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local); |
| 1362 | bool offchannel_ps_enable); | 1362 | void ieee80211_offchannel_return(struct ieee80211_local *local); |
| 1363 | void ieee80211_offchannel_return(struct ieee80211_local *local, | ||
| 1364 | bool offchannel_ps_disable); | ||
| 1365 | void ieee80211_roc_setup(struct ieee80211_local *local); | 1363 | void ieee80211_roc_setup(struct ieee80211_local *local); |
| 1366 | void ieee80211_start_next_roc(struct ieee80211_local *local); | 1364 | void ieee80211_start_next_roc(struct ieee80211_local *local); |
| 1367 | void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata); | 1365 | void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata); |
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 47aeee2d8db1..2659e428b80c 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
| @@ -215,6 +215,7 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata, | |||
| 215 | skb->priority = 7; | 215 | skb->priority = 7; |
| 216 | 216 | ||
| 217 | info->control.vif = &sdata->vif; | 217 | info->control.vif = &sdata->vif; |
| 218 | info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; | ||
| 218 | ieee80211_set_qos_hdr(sdata, skb); | 219 | ieee80211_set_qos_hdr(sdata, skb); |
| 219 | } | 220 | } |
| 220 | 221 | ||
| @@ -246,11 +247,13 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn, | |||
| 246 | return -EAGAIN; | 247 | return -EAGAIN; |
| 247 | 248 | ||
| 248 | skb = dev_alloc_skb(local->tx_headroom + | 249 | skb = dev_alloc_skb(local->tx_headroom + |
| 250 | IEEE80211_ENCRYPT_HEADROOM + | ||
| 251 | IEEE80211_ENCRYPT_TAILROOM + | ||
| 249 | hdr_len + | 252 | hdr_len + |
| 250 | 2 + 15 /* PERR IE */); | 253 | 2 + 15 /* PERR IE */); |
| 251 | if (!skb) | 254 | if (!skb) |
| 252 | return -1; | 255 | return -1; |
| 253 | skb_reserve(skb, local->tx_headroom); | 256 | skb_reserve(skb, local->tx_headroom + IEEE80211_ENCRYPT_HEADROOM); |
| 254 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len); | 257 | mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len); |
| 255 | memset(mgmt, 0, hdr_len); | 258 | memset(mgmt, 0, hdr_len); |
| 256 | mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | | 259 | mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | |
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index a5379aea7d09..a3ad4c3c80a3 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -102,8 +102,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata) | |||
| 102 | ieee80211_sta_reset_conn_monitor(sdata); | 102 | ieee80211_sta_reset_conn_monitor(sdata); |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, | 105 | void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local) |
| 106 | bool offchannel_ps_enable) | ||
| 107 | { | 106 | { |
| 108 | struct ieee80211_sub_if_data *sdata; | 107 | struct ieee80211_sub_if_data *sdata; |
| 109 | 108 | ||
| @@ -134,8 +133,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, | |||
| 134 | 133 | ||
| 135 | if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { | 134 | if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { |
| 136 | netif_tx_stop_all_queues(sdata->dev); | 135 | netif_tx_stop_all_queues(sdata->dev); |
| 137 | if (offchannel_ps_enable && | 136 | if (sdata->vif.type == NL80211_IFTYPE_STATION && |
| 138 | (sdata->vif.type == NL80211_IFTYPE_STATION) && | ||
| 139 | sdata->u.mgd.associated) | 137 | sdata->u.mgd.associated) |
| 140 | ieee80211_offchannel_ps_enable(sdata); | 138 | ieee80211_offchannel_ps_enable(sdata); |
| 141 | } | 139 | } |
| @@ -143,8 +141,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, | |||
| 143 | mutex_unlock(&local->iflist_mtx); | 141 | mutex_unlock(&local->iflist_mtx); |
| 144 | } | 142 | } |
| 145 | 143 | ||
| 146 | void ieee80211_offchannel_return(struct ieee80211_local *local, | 144 | void ieee80211_offchannel_return(struct ieee80211_local *local) |
| 147 | bool offchannel_ps_disable) | ||
| 148 | { | 145 | { |
| 149 | struct ieee80211_sub_if_data *sdata; | 146 | struct ieee80211_sub_if_data *sdata; |
| 150 | 147 | ||
| @@ -163,11 +160,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local, | |||
| 163 | continue; | 160 | continue; |
| 164 | 161 | ||
| 165 | /* Tell AP we're back */ | 162 | /* Tell AP we're back */ |
| 166 | if (offchannel_ps_disable && | 163 | if (sdata->vif.type == NL80211_IFTYPE_STATION && |
| 167 | sdata->vif.type == NL80211_IFTYPE_STATION) { | 164 | sdata->u.mgd.associated) |
| 168 | if (sdata->u.mgd.associated) | 165 | ieee80211_offchannel_ps_disable(sdata); |
| 169 | ieee80211_offchannel_ps_disable(sdata); | ||
| 170 | } | ||
| 171 | 166 | ||
| 172 | if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { | 167 | if (sdata->vif.type != NL80211_IFTYPE_MONITOR) { |
| 173 | /* | 168 | /* |
| @@ -385,7 +380,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) | |||
| 385 | local->tmp_channel = NULL; | 380 | local->tmp_channel = NULL; |
| 386 | ieee80211_hw_config(local, 0); | 381 | ieee80211_hw_config(local, 0); |
| 387 | 382 | ||
| 388 | ieee80211_offchannel_return(local, true); | 383 | ieee80211_offchannel_return(local); |
| 389 | } | 384 | } |
| 390 | 385 | ||
| 391 | ieee80211_recalc_idle(local); | 386 | ieee80211_recalc_idle(local); |
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index d59fc6818b1c..bf82e69d0601 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c | |||
| @@ -292,7 +292,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted, | |||
| 292 | if (!was_hw_scan) { | 292 | if (!was_hw_scan) { |
| 293 | ieee80211_configure_filter(local); | 293 | ieee80211_configure_filter(local); |
| 294 | drv_sw_scan_complete(local); | 294 | drv_sw_scan_complete(local); |
| 295 | ieee80211_offchannel_return(local, true); | 295 | ieee80211_offchannel_return(local); |
| 296 | } | 296 | } |
| 297 | 297 | ||
| 298 | ieee80211_recalc_idle(local); | 298 | ieee80211_recalc_idle(local); |
| @@ -341,7 +341,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local) | |||
| 341 | local->next_scan_state = SCAN_DECISION; | 341 | local->next_scan_state = SCAN_DECISION; |
| 342 | local->scan_channel_idx = 0; | 342 | local->scan_channel_idx = 0; |
| 343 | 343 | ||
| 344 | ieee80211_offchannel_stop_vifs(local, true); | 344 | ieee80211_offchannel_stop_vifs(local); |
| 345 | 345 | ||
| 346 | ieee80211_configure_filter(local); | 346 | ieee80211_configure_filter(local); |
| 347 | 347 | ||
| @@ -678,12 +678,8 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local, | |||
| 678 | local->scan_channel = NULL; | 678 | local->scan_channel = NULL; |
| 679 | ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); | 679 | ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); |
| 680 | 680 | ||
| 681 | /* | 681 | /* disable PS */ |
| 682 | * Re-enable vifs and beaconing. Leave PS | 682 | ieee80211_offchannel_return(local); |
| 683 | * in off-channel state..will put that back | ||
| 684 | * on-channel at the end of scanning. | ||
| 685 | */ | ||
| 686 | ieee80211_offchannel_return(local, false); | ||
| 687 | 683 | ||
| 688 | *next_delay = HZ / 5; | 684 | *next_delay = HZ / 5; |
| 689 | /* afterwards, resume scan & go to next channel */ | 685 | /* afterwards, resume scan & go to next channel */ |
| @@ -693,8 +689,7 @@ static void ieee80211_scan_state_suspend(struct ieee80211_local *local, | |||
| 693 | static void ieee80211_scan_state_resume(struct ieee80211_local *local, | 689 | static void ieee80211_scan_state_resume(struct ieee80211_local *local, |
| 694 | unsigned long *next_delay) | 690 | unsigned long *next_delay) |
| 695 | { | 691 | { |
| 696 | /* PS already is in off-channel mode */ | 692 | ieee80211_offchannel_stop_vifs(local); |
| 697 | ieee80211_offchannel_stop_vifs(local, false); | ||
| 698 | 693 | ||
| 699 | if (local->ops->flush) { | 694 | if (local->ops->flush) { |
| 700 | drv_flush(local, false); | 695 | drv_flush(local, false); |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e9eadc40c09c..467c1d1b66f2 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -1673,10 +1673,13 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, | |||
| 1673 | chanctx_conf = | 1673 | chanctx_conf = |
| 1674 | rcu_dereference(tmp_sdata->vif.chanctx_conf); | 1674 | rcu_dereference(tmp_sdata->vif.chanctx_conf); |
| 1675 | } | 1675 | } |
| 1676 | if (!chanctx_conf) | ||
| 1677 | goto fail_rcu; | ||
| 1678 | 1676 | ||
| 1679 | chan = chanctx_conf->def.chan; | 1677 | if (chanctx_conf) |
| 1678 | chan = chanctx_conf->def.chan; | ||
| 1679 | else if (!local->use_chanctx) | ||
| 1680 | chan = local->_oper_channel; | ||
| 1681 | else | ||
| 1682 | goto fail_rcu; | ||
| 1680 | 1683 | ||
| 1681 | /* | 1684 | /* |
| 1682 | * Frame injection is not allowed if beaconing is not allowed | 1685 | * Frame injection is not allowed if beaconing is not allowed |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 016d95ead930..e4a0c4fb3a7c 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -1376,11 +1376,12 @@ void nf_conntrack_cleanup(struct net *net) | |||
| 1376 | synchronize_net(); | 1376 | synchronize_net(); |
| 1377 | nf_conntrack_proto_fini(net); | 1377 | nf_conntrack_proto_fini(net); |
| 1378 | nf_conntrack_cleanup_net(net); | 1378 | nf_conntrack_cleanup_net(net); |
| 1379 | } | ||
| 1379 | 1380 | ||
| 1380 | if (net_eq(net, &init_net)) { | 1381 | void nf_conntrack_cleanup_end(void) |
| 1381 | RCU_INIT_POINTER(nf_ct_destroy, NULL); | 1382 | { |
| 1382 | nf_conntrack_cleanup_init_net(); | 1383 | RCU_INIT_POINTER(nf_ct_destroy, NULL); |
| 1383 | } | 1384 | nf_conntrack_cleanup_init_net(); |
| 1384 | } | 1385 | } |
| 1385 | 1386 | ||
| 1386 | void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls) | 1387 | void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls) |
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 363285d544a1..e7185c684816 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c | |||
| @@ -575,6 +575,7 @@ static int __init nf_conntrack_standalone_init(void) | |||
| 575 | static void __exit nf_conntrack_standalone_fini(void) | 575 | static void __exit nf_conntrack_standalone_fini(void) |
| 576 | { | 576 | { |
| 577 | unregister_pernet_subsys(&nf_conntrack_net_ops); | 577 | unregister_pernet_subsys(&nf_conntrack_net_ops); |
| 578 | nf_conntrack_cleanup_end(); | ||
| 578 | } | 579 | } |
| 579 | 580 | ||
| 580 | module_init(nf_conntrack_standalone_init); | 581 | module_init(nf_conntrack_standalone_init); |
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index 8d987c3573fd..7b3a9e5999c0 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c | |||
| @@ -345,19 +345,27 @@ int xt_find_revision(u8 af, const char *name, u8 revision, int target, | |||
| 345 | } | 345 | } |
| 346 | EXPORT_SYMBOL_GPL(xt_find_revision); | 346 | EXPORT_SYMBOL_GPL(xt_find_revision); |
| 347 | 347 | ||
| 348 | static char *textify_hooks(char *buf, size_t size, unsigned int mask) | 348 | static char * |
| 349 | textify_hooks(char *buf, size_t size, unsigned int mask, uint8_t nfproto) | ||
| 349 | { | 350 | { |
| 350 | static const char *const names[] = { | 351 | static const char *const inetbr_names[] = { |
| 351 | "PREROUTING", "INPUT", "FORWARD", | 352 | "PREROUTING", "INPUT", "FORWARD", |
| 352 | "OUTPUT", "POSTROUTING", "BROUTING", | 353 | "OUTPUT", "POSTROUTING", "BROUTING", |
| 353 | }; | 354 | }; |
| 354 | unsigned int i; | 355 | static const char *const arp_names[] = { |
| 356 | "INPUT", "FORWARD", "OUTPUT", | ||
| 357 | }; | ||
| 358 | const char *const *names; | ||
| 359 | unsigned int i, max; | ||
| 355 | char *p = buf; | 360 | char *p = buf; |
| 356 | bool np = false; | 361 | bool np = false; |
| 357 | int res; | 362 | int res; |
| 358 | 363 | ||
| 364 | names = (nfproto == NFPROTO_ARP) ? arp_names : inetbr_names; | ||
| 365 | max = (nfproto == NFPROTO_ARP) ? ARRAY_SIZE(arp_names) : | ||
| 366 | ARRAY_SIZE(inetbr_names); | ||
| 359 | *p = '\0'; | 367 | *p = '\0'; |
| 360 | for (i = 0; i < ARRAY_SIZE(names); ++i) { | 368 | for (i = 0; i < max; ++i) { |
| 361 | if (!(mask & (1 << i))) | 369 | if (!(mask & (1 << i))) |
| 362 | continue; | 370 | continue; |
| 363 | res = snprintf(p, size, "%s%s", np ? "/" : "", names[i]); | 371 | res = snprintf(p, size, "%s%s", np ? "/" : "", names[i]); |
| @@ -402,8 +410,10 @@ int xt_check_match(struct xt_mtchk_param *par, | |||
| 402 | pr_err("%s_tables: %s match: used from hooks %s, but only " | 410 | pr_err("%s_tables: %s match: used from hooks %s, but only " |
| 403 | "valid from %s\n", | 411 | "valid from %s\n", |
| 404 | xt_prefix[par->family], par->match->name, | 412 | xt_prefix[par->family], par->match->name, |
| 405 | textify_hooks(used, sizeof(used), par->hook_mask), | 413 | textify_hooks(used, sizeof(used), par->hook_mask, |
| 406 | textify_hooks(allow, sizeof(allow), par->match->hooks)); | 414 | par->family), |
| 415 | textify_hooks(allow, sizeof(allow), par->match->hooks, | ||
| 416 | par->family)); | ||
| 407 | return -EINVAL; | 417 | return -EINVAL; |
| 408 | } | 418 | } |
| 409 | if (par->match->proto && (par->match->proto != proto || inv_proto)) { | 419 | if (par->match->proto && (par->match->proto != proto || inv_proto)) { |
| @@ -575,8 +585,10 @@ int xt_check_target(struct xt_tgchk_param *par, | |||
| 575 | pr_err("%s_tables: %s target: used from hooks %s, but only " | 585 | pr_err("%s_tables: %s target: used from hooks %s, but only " |
| 576 | "usable from %s\n", | 586 | "usable from %s\n", |
| 577 | xt_prefix[par->family], par->target->name, | 587 | xt_prefix[par->family], par->target->name, |
| 578 | textify_hooks(used, sizeof(used), par->hook_mask), | 588 | textify_hooks(used, sizeof(used), par->hook_mask, |
| 579 | textify_hooks(allow, sizeof(allow), par->target->hooks)); | 589 | par->family), |
| 590 | textify_hooks(allow, sizeof(allow), par->target->hooks, | ||
| 591 | par->family)); | ||
| 580 | return -EINVAL; | 592 | return -EINVAL; |
| 581 | } | 593 | } |
| 582 | if (par->target->proto && (par->target->proto != proto || inv_proto)) { | 594 | if (par->target->proto && (par->target->proto != proto || inv_proto)) { |
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 2a0843081840..bde009ed8d3b 100644 --- a/net/netfilter/xt_CT.c +++ b/net/netfilter/xt_CT.c | |||
| @@ -109,7 +109,7 @@ static int xt_ct_tg_check_v0(const struct xt_tgchk_param *par) | |||
| 109 | struct xt_ct_target_info *info = par->targinfo; | 109 | struct xt_ct_target_info *info = par->targinfo; |
| 110 | struct nf_conntrack_tuple t; | 110 | struct nf_conntrack_tuple t; |
| 111 | struct nf_conn *ct; | 111 | struct nf_conn *ct; |
| 112 | int ret; | 112 | int ret = -EOPNOTSUPP; |
| 113 | 113 | ||
| 114 | if (info->flags & ~XT_CT_NOTRACK) | 114 | if (info->flags & ~XT_CT_NOTRACK) |
| 115 | return -EINVAL; | 115 | return -EINVAL; |
| @@ -247,7 +247,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) | |||
| 247 | struct xt_ct_target_info_v1 *info = par->targinfo; | 247 | struct xt_ct_target_info_v1 *info = par->targinfo; |
| 248 | struct nf_conntrack_tuple t; | 248 | struct nf_conntrack_tuple t; |
| 249 | struct nf_conn *ct; | 249 | struct nf_conn *ct; |
| 250 | int ret; | 250 | int ret = -EOPNOTSUPP; |
| 251 | 251 | ||
| 252 | if (info->flags & ~XT_CT_NOTRACK) | 252 | if (info->flags & ~XT_CT_NOTRACK) |
| 253 | return -EINVAL; | 253 | return -EINVAL; |
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index 379c81dee9d1..9bcdbd02d777 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
| @@ -224,7 +224,7 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q) | |||
| 224 | 224 | ||
| 225 | /* Free the outqueue structure and any related pending chunks. | 225 | /* Free the outqueue structure and any related pending chunks. |
| 226 | */ | 226 | */ |
| 227 | void sctp_outq_teardown(struct sctp_outq *q) | 227 | static void __sctp_outq_teardown(struct sctp_outq *q) |
| 228 | { | 228 | { |
| 229 | struct sctp_transport *transport; | 229 | struct sctp_transport *transport; |
| 230 | struct list_head *lchunk, *temp; | 230 | struct list_head *lchunk, *temp; |
| @@ -277,8 +277,6 @@ void sctp_outq_teardown(struct sctp_outq *q) | |||
| 277 | sctp_chunk_free(chunk); | 277 | sctp_chunk_free(chunk); |
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | q->error = 0; | ||
| 281 | |||
| 282 | /* Throw away any leftover control chunks. */ | 280 | /* Throw away any leftover control chunks. */ |
| 283 | list_for_each_entry_safe(chunk, tmp, &q->control_chunk_list, list) { | 281 | list_for_each_entry_safe(chunk, tmp, &q->control_chunk_list, list) { |
| 284 | list_del_init(&chunk->list); | 282 | list_del_init(&chunk->list); |
| @@ -286,11 +284,17 @@ void sctp_outq_teardown(struct sctp_outq *q) | |||
| 286 | } | 284 | } |
| 287 | } | 285 | } |
| 288 | 286 | ||
| 287 | void sctp_outq_teardown(struct sctp_outq *q) | ||
| 288 | { | ||
| 289 | __sctp_outq_teardown(q); | ||
| 290 | sctp_outq_init(q->asoc, q); | ||
| 291 | } | ||
| 292 | |||
| 289 | /* Free the outqueue structure and any related pending chunks. */ | 293 | /* Free the outqueue structure and any related pending chunks. */ |
| 290 | void sctp_outq_free(struct sctp_outq *q) | 294 | void sctp_outq_free(struct sctp_outq *q) |
| 291 | { | 295 | { |
| 292 | /* Throw away leftover chunks. */ | 296 | /* Throw away leftover chunks. */ |
| 293 | sctp_outq_teardown(q); | 297 | __sctp_outq_teardown(q); |
| 294 | 298 | ||
| 295 | /* If we were kmalloc()'d, free the memory. */ | 299 | /* If we were kmalloc()'d, free the memory. */ |
| 296 | if (q->malloced) | 300 | if (q->malloced) |
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 618ec7e216ca..5131fcfedb03 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c | |||
| @@ -1779,8 +1779,10 @@ static sctp_disposition_t sctp_sf_do_dupcook_a(struct net *net, | |||
| 1779 | 1779 | ||
| 1780 | /* Update the content of current association. */ | 1780 | /* Update the content of current association. */ |
| 1781 | sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc)); | 1781 | sctp_add_cmd_sf(commands, SCTP_CMD_UPDATE_ASSOC, SCTP_ASOC(new_asoc)); |
| 1782 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl)); | ||
| 1783 | sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev)); | 1782 | sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP, SCTP_ULPEVENT(ev)); |
| 1783 | sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE, | ||
| 1784 | SCTP_STATE(SCTP_STATE_ESTABLISHED)); | ||
| 1785 | sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(repl)); | ||
| 1784 | return SCTP_DISPOSITION_CONSUME; | 1786 | return SCTP_DISPOSITION_CONSUME; |
| 1785 | 1787 | ||
| 1786 | nomem_ev: | 1788 | nomem_ev: |
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c index 043889ac86c0..bf3c6e8fc401 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c | |||
| @@ -366,7 +366,11 @@ int sctp_sysctl_net_register(struct net *net) | |||
| 366 | 366 | ||
| 367 | void sctp_sysctl_net_unregister(struct net *net) | 367 | void sctp_sysctl_net_unregister(struct net *net) |
| 368 | { | 368 | { |
| 369 | struct ctl_table *table; | ||
| 370 | |||
| 371 | table = net->sctp.sysctl_header->ctl_table_arg; | ||
| 369 | unregister_net_sysctl_table(net->sctp.sysctl_header); | 372 | unregister_net_sysctl_table(net->sctp.sysctl_header); |
| 373 | kfree(table); | ||
| 370 | } | 374 | } |
| 371 | 375 | ||
| 372 | static struct ctl_table_header * sctp_sysctl_header; | 376 | static struct ctl_table_header * sctp_sysctl_header; |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 41eabc46f110..07c585756d2a 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -2656,7 +2656,7 @@ static void xfrm_policy_fini(struct net *net) | |||
| 2656 | WARN_ON(!hlist_empty(&net->xfrm.policy_inexact[dir])); | 2656 | WARN_ON(!hlist_empty(&net->xfrm.policy_inexact[dir])); |
| 2657 | 2657 | ||
| 2658 | htab = &net->xfrm.policy_bydst[dir]; | 2658 | htab = &net->xfrm.policy_bydst[dir]; |
| 2659 | sz = (htab->hmask + 1); | 2659 | sz = (htab->hmask + 1) * sizeof(struct hlist_head); |
| 2660 | WARN_ON(!hlist_empty(htab->table)); | 2660 | WARN_ON(!hlist_empty(htab->table)); |
| 2661 | xfrm_hash_free(htab->table, sz); | 2661 | xfrm_hash_free(htab->table, sz); |
| 2662 | } | 2662 | } |
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c index 765f6fe951eb..35754cc8a9e5 100644 --- a/net/xfrm/xfrm_replay.c +++ b/net/xfrm/xfrm_replay.c | |||
| @@ -242,11 +242,13 @@ static void xfrm_replay_advance_bmp(struct xfrm_state *x, __be32 net_seq) | |||
| 242 | u32 diff; | 242 | u32 diff; |
| 243 | struct xfrm_replay_state_esn *replay_esn = x->replay_esn; | 243 | struct xfrm_replay_state_esn *replay_esn = x->replay_esn; |
| 244 | u32 seq = ntohl(net_seq); | 244 | u32 seq = ntohl(net_seq); |
| 245 | u32 pos = (replay_esn->seq - 1) % replay_esn->replay_window; | 245 | u32 pos; |
| 246 | 246 | ||
| 247 | if (!replay_esn->replay_window) | 247 | if (!replay_esn->replay_window) |
| 248 | return; | 248 | return; |
| 249 | 249 | ||
| 250 | pos = (replay_esn->seq - 1) % replay_esn->replay_window; | ||
| 251 | |||
| 250 | if (seq > replay_esn->seq) { | 252 | if (seq > replay_esn->seq) { |
| 251 | diff = seq - replay_esn->seq; | 253 | diff = seq - replay_esn->seq; |
| 252 | 254 | ||
diff --git a/security/capability.c b/security/capability.c index 0fe5a026aef8..579775088967 100644 --- a/security/capability.c +++ b/security/capability.c | |||
| @@ -709,16 +709,31 @@ static void cap_req_classify_flow(const struct request_sock *req, | |||
| 709 | { | 709 | { |
| 710 | } | 710 | } |
| 711 | 711 | ||
| 712 | static int cap_tun_dev_alloc_security(void **security) | ||
| 713 | { | ||
| 714 | return 0; | ||
| 715 | } | ||
| 716 | |||
| 717 | static void cap_tun_dev_free_security(void *security) | ||
| 718 | { | ||
| 719 | } | ||
| 720 | |||
| 712 | static int cap_tun_dev_create(void) | 721 | static int cap_tun_dev_create(void) |
| 713 | { | 722 | { |
| 714 | return 0; | 723 | return 0; |
| 715 | } | 724 | } |
| 716 | 725 | ||
| 717 | static void cap_tun_dev_post_create(struct sock *sk) | 726 | static int cap_tun_dev_attach_queue(void *security) |
| 727 | { | ||
| 728 | return 0; | ||
| 729 | } | ||
| 730 | |||
| 731 | static int cap_tun_dev_attach(struct sock *sk, void *security) | ||
| 718 | { | 732 | { |
| 733 | return 0; | ||
| 719 | } | 734 | } |
| 720 | 735 | ||
| 721 | static int cap_tun_dev_attach(struct sock *sk) | 736 | static int cap_tun_dev_open(void *security) |
| 722 | { | 737 | { |
| 723 | return 0; | 738 | return 0; |
| 724 | } | 739 | } |
| @@ -1050,8 +1065,11 @@ void __init security_fixup_ops(struct security_operations *ops) | |||
| 1050 | set_to_cap_if_null(ops, secmark_refcount_inc); | 1065 | set_to_cap_if_null(ops, secmark_refcount_inc); |
| 1051 | set_to_cap_if_null(ops, secmark_refcount_dec); | 1066 | set_to_cap_if_null(ops, secmark_refcount_dec); |
| 1052 | set_to_cap_if_null(ops, req_classify_flow); | 1067 | set_to_cap_if_null(ops, req_classify_flow); |
| 1068 | set_to_cap_if_null(ops, tun_dev_alloc_security); | ||
| 1069 | set_to_cap_if_null(ops, tun_dev_free_security); | ||
| 1053 | set_to_cap_if_null(ops, tun_dev_create); | 1070 | set_to_cap_if_null(ops, tun_dev_create); |
| 1054 | set_to_cap_if_null(ops, tun_dev_post_create); | 1071 | set_to_cap_if_null(ops, tun_dev_open); |
| 1072 | set_to_cap_if_null(ops, tun_dev_attach_queue); | ||
| 1055 | set_to_cap_if_null(ops, tun_dev_attach); | 1073 | set_to_cap_if_null(ops, tun_dev_attach); |
| 1056 | #endif /* CONFIG_SECURITY_NETWORK */ | 1074 | #endif /* CONFIG_SECURITY_NETWORK */ |
| 1057 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1075 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 19ecc8de9e6b..d794abcc4b3b 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
| @@ -215,7 +215,9 @@ static void devcgroup_css_free(struct cgroup *cgroup) | |||
| 215 | struct dev_cgroup *dev_cgroup; | 215 | struct dev_cgroup *dev_cgroup; |
| 216 | 216 | ||
| 217 | dev_cgroup = cgroup_to_devcgroup(cgroup); | 217 | dev_cgroup = cgroup_to_devcgroup(cgroup); |
| 218 | mutex_lock(&devcgroup_mutex); | ||
| 218 | dev_exception_clean(dev_cgroup); | 219 | dev_exception_clean(dev_cgroup); |
| 220 | mutex_unlock(&devcgroup_mutex); | ||
| 219 | kfree(dev_cgroup); | 221 | kfree(dev_cgroup); |
| 220 | } | 222 | } |
| 221 | 223 | ||
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c index dfb26918699c..7dd538ef5b83 100644 --- a/security/integrity/evm/evm_crypto.c +++ b/security/integrity/evm/evm_crypto.c | |||
| @@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name, | |||
| 205 | rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM, | 205 | rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM, |
| 206 | &xattr_data, | 206 | &xattr_data, |
| 207 | sizeof(xattr_data), 0); | 207 | sizeof(xattr_data), 0); |
| 208 | } | 208 | } else if (rc == -ENODATA && inode->i_op->removexattr) { |
| 209 | else if (rc == -ENODATA) | ||
| 210 | rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM); | 209 | rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM); |
| 210 | } | ||
| 211 | return rc; | 211 | return rc; |
| 212 | } | 212 | } |
| 213 | 213 | ||
diff --git a/security/security.c b/security/security.c index daa97f4ac9d1..7b88c6aeaed4 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -1254,24 +1254,42 @@ void security_secmark_refcount_dec(void) | |||
| 1254 | } | 1254 | } |
| 1255 | EXPORT_SYMBOL(security_secmark_refcount_dec); | 1255 | EXPORT_SYMBOL(security_secmark_refcount_dec); |
| 1256 | 1256 | ||
| 1257 | int security_tun_dev_alloc_security(void **security) | ||
| 1258 | { | ||
| 1259 | return security_ops->tun_dev_alloc_security(security); | ||
| 1260 | } | ||
| 1261 | EXPORT_SYMBOL(security_tun_dev_alloc_security); | ||
| 1262 | |||
| 1263 | void security_tun_dev_free_security(void *security) | ||
| 1264 | { | ||
| 1265 | security_ops->tun_dev_free_security(security); | ||
| 1266 | } | ||
| 1267 | EXPORT_SYMBOL(security_tun_dev_free_security); | ||
| 1268 | |||
| 1257 | int security_tun_dev_create(void) | 1269 | int security_tun_dev_create(void) |
| 1258 | { | 1270 | { |
| 1259 | return security_ops->tun_dev_create(); | 1271 | return security_ops->tun_dev_create(); |
| 1260 | } | 1272 | } |
| 1261 | EXPORT_SYMBOL(security_tun_dev_create); | 1273 | EXPORT_SYMBOL(security_tun_dev_create); |
| 1262 | 1274 | ||
| 1263 | void security_tun_dev_post_create(struct sock *sk) | 1275 | int security_tun_dev_attach_queue(void *security) |
| 1264 | { | 1276 | { |
| 1265 | return security_ops->tun_dev_post_create(sk); | 1277 | return security_ops->tun_dev_attach_queue(security); |
| 1266 | } | 1278 | } |
| 1267 | EXPORT_SYMBOL(security_tun_dev_post_create); | 1279 | EXPORT_SYMBOL(security_tun_dev_attach_queue); |
| 1268 | 1280 | ||
| 1269 | int security_tun_dev_attach(struct sock *sk) | 1281 | int security_tun_dev_attach(struct sock *sk, void *security) |
| 1270 | { | 1282 | { |
| 1271 | return security_ops->tun_dev_attach(sk); | 1283 | return security_ops->tun_dev_attach(sk, security); |
| 1272 | } | 1284 | } |
| 1273 | EXPORT_SYMBOL(security_tun_dev_attach); | 1285 | EXPORT_SYMBOL(security_tun_dev_attach); |
| 1274 | 1286 | ||
| 1287 | int security_tun_dev_open(void *security) | ||
| 1288 | { | ||
| 1289 | return security_ops->tun_dev_open(security); | ||
| 1290 | } | ||
| 1291 | EXPORT_SYMBOL(security_tun_dev_open); | ||
| 1292 | |||
| 1275 | #endif /* CONFIG_SECURITY_NETWORK */ | 1293 | #endif /* CONFIG_SECURITY_NETWORK */ |
| 1276 | 1294 | ||
| 1277 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1295 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 61a53367d029..ef26e9611ffb 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -4399,6 +4399,24 @@ static void selinux_req_classify_flow(const struct request_sock *req, | |||
| 4399 | fl->flowi_secid = req->secid; | 4399 | fl->flowi_secid = req->secid; |
| 4400 | } | 4400 | } |
| 4401 | 4401 | ||
| 4402 | static int selinux_tun_dev_alloc_security(void **security) | ||
| 4403 | { | ||
| 4404 | struct tun_security_struct *tunsec; | ||
| 4405 | |||
| 4406 | tunsec = kzalloc(sizeof(*tunsec), GFP_KERNEL); | ||
| 4407 | if (!tunsec) | ||
| 4408 | return -ENOMEM; | ||
| 4409 | tunsec->sid = current_sid(); | ||
| 4410 | |||
| 4411 | *security = tunsec; | ||
| 4412 | return 0; | ||
| 4413 | } | ||
| 4414 | |||
| 4415 | static void selinux_tun_dev_free_security(void *security) | ||
| 4416 | { | ||
| 4417 | kfree(security); | ||
| 4418 | } | ||
| 4419 | |||
| 4402 | static int selinux_tun_dev_create(void) | 4420 | static int selinux_tun_dev_create(void) |
| 4403 | { | 4421 | { |
| 4404 | u32 sid = current_sid(); | 4422 | u32 sid = current_sid(); |
| @@ -4414,8 +4432,17 @@ static int selinux_tun_dev_create(void) | |||
| 4414 | NULL); | 4432 | NULL); |
| 4415 | } | 4433 | } |
| 4416 | 4434 | ||
| 4417 | static void selinux_tun_dev_post_create(struct sock *sk) | 4435 | static int selinux_tun_dev_attach_queue(void *security) |
| 4418 | { | 4436 | { |
| 4437 | struct tun_security_struct *tunsec = security; | ||
| 4438 | |||
| 4439 | return avc_has_perm(current_sid(), tunsec->sid, SECCLASS_TUN_SOCKET, | ||
| 4440 | TUN_SOCKET__ATTACH_QUEUE, NULL); | ||
| 4441 | } | ||
| 4442 | |||
| 4443 | static int selinux_tun_dev_attach(struct sock *sk, void *security) | ||
| 4444 | { | ||
| 4445 | struct tun_security_struct *tunsec = security; | ||
| 4419 | struct sk_security_struct *sksec = sk->sk_security; | 4446 | struct sk_security_struct *sksec = sk->sk_security; |
| 4420 | 4447 | ||
| 4421 | /* we don't currently perform any NetLabel based labeling here and it | 4448 | /* we don't currently perform any NetLabel based labeling here and it |
| @@ -4425,20 +4452,19 @@ static void selinux_tun_dev_post_create(struct sock *sk) | |||
| 4425 | * cause confusion to the TUN user that had no idea network labeling | 4452 | * cause confusion to the TUN user that had no idea network labeling |
| 4426 | * protocols were being used */ | 4453 | * protocols were being used */ |
| 4427 | 4454 | ||
| 4428 | /* see the comments in selinux_tun_dev_create() about why we don't use | 4455 | sksec->sid = tunsec->sid; |
| 4429 | * the sockcreate SID here */ | ||
| 4430 | |||
| 4431 | sksec->sid = current_sid(); | ||
| 4432 | sksec->sclass = SECCLASS_TUN_SOCKET; | 4456 | sksec->sclass = SECCLASS_TUN_SOCKET; |
| 4457 | |||
| 4458 | return 0; | ||
| 4433 | } | 4459 | } |
| 4434 | 4460 | ||
| 4435 | static int selinux_tun_dev_attach(struct sock *sk) | 4461 | static int selinux_tun_dev_open(void *security) |
| 4436 | { | 4462 | { |
| 4437 | struct sk_security_struct *sksec = sk->sk_security; | 4463 | struct tun_security_struct *tunsec = security; |
| 4438 | u32 sid = current_sid(); | 4464 | u32 sid = current_sid(); |
| 4439 | int err; | 4465 | int err; |
| 4440 | 4466 | ||
| 4441 | err = avc_has_perm(sid, sksec->sid, SECCLASS_TUN_SOCKET, | 4467 | err = avc_has_perm(sid, tunsec->sid, SECCLASS_TUN_SOCKET, |
| 4442 | TUN_SOCKET__RELABELFROM, NULL); | 4468 | TUN_SOCKET__RELABELFROM, NULL); |
| 4443 | if (err) | 4469 | if (err) |
| 4444 | return err; | 4470 | return err; |
| @@ -4446,8 +4472,7 @@ static int selinux_tun_dev_attach(struct sock *sk) | |||
| 4446 | TUN_SOCKET__RELABELTO, NULL); | 4472 | TUN_SOCKET__RELABELTO, NULL); |
| 4447 | if (err) | 4473 | if (err) |
| 4448 | return err; | 4474 | return err; |
| 4449 | 4475 | tunsec->sid = sid; | |
| 4450 | sksec->sid = sid; | ||
| 4451 | 4476 | ||
| 4452 | return 0; | 4477 | return 0; |
| 4453 | } | 4478 | } |
| @@ -5642,9 +5667,12 @@ static struct security_operations selinux_ops = { | |||
| 5642 | .secmark_refcount_inc = selinux_secmark_refcount_inc, | 5667 | .secmark_refcount_inc = selinux_secmark_refcount_inc, |
| 5643 | .secmark_refcount_dec = selinux_secmark_refcount_dec, | 5668 | .secmark_refcount_dec = selinux_secmark_refcount_dec, |
| 5644 | .req_classify_flow = selinux_req_classify_flow, | 5669 | .req_classify_flow = selinux_req_classify_flow, |
| 5670 | .tun_dev_alloc_security = selinux_tun_dev_alloc_security, | ||
| 5671 | .tun_dev_free_security = selinux_tun_dev_free_security, | ||
| 5645 | .tun_dev_create = selinux_tun_dev_create, | 5672 | .tun_dev_create = selinux_tun_dev_create, |
| 5646 | .tun_dev_post_create = selinux_tun_dev_post_create, | 5673 | .tun_dev_attach_queue = selinux_tun_dev_attach_queue, |
| 5647 | .tun_dev_attach = selinux_tun_dev_attach, | 5674 | .tun_dev_attach = selinux_tun_dev_attach, |
| 5675 | .tun_dev_open = selinux_tun_dev_open, | ||
| 5648 | 5676 | ||
| 5649 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 5677 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
| 5650 | .xfrm_policy_alloc_security = selinux_xfrm_policy_alloc, | 5678 | .xfrm_policy_alloc_security = selinux_xfrm_policy_alloc, |
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index df2de54a958d..14d04e63b1f0 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h | |||
| @@ -150,6 +150,6 @@ struct security_class_mapping secclass_map[] = { | |||
| 150 | NULL } }, | 150 | NULL } }, |
| 151 | { "kernel_service", { "use_as_override", "create_files_as", NULL } }, | 151 | { "kernel_service", { "use_as_override", "create_files_as", NULL } }, |
| 152 | { "tun_socket", | 152 | { "tun_socket", |
| 153 | { COMMON_SOCK_PERMS, NULL } }, | 153 | { COMMON_SOCK_PERMS, "attach_queue", NULL } }, |
| 154 | { NULL } | 154 | { NULL } |
| 155 | }; | 155 | }; |
diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 26c7eee1c309..aa47bcabb5f6 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h | |||
| @@ -110,6 +110,10 @@ struct sk_security_struct { | |||
| 110 | u16 sclass; /* sock security class */ | 110 | u16 sclass; /* sock security class */ |
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | struct tun_security_struct { | ||
| 114 | u32 sid; /* SID for the tun device sockets */ | ||
| 115 | }; | ||
| 116 | |||
| 113 | struct key_security_struct { | 117 | struct key_security_struct { |
| 114 | u32 sid; /* SID of key */ | 118 | u32 sid; /* SID of key */ |
| 115 | }; | 119 | }; |
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index b8fb0a5adb9b..822df971972c 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -3654,6 +3654,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) | |||
| 3654 | hda_set_power_state(codec, AC_PWRST_D0); | 3654 | hda_set_power_state(codec, AC_PWRST_D0); |
| 3655 | restore_shutup_pins(codec); | 3655 | restore_shutup_pins(codec); |
| 3656 | hda_exec_init_verbs(codec); | 3656 | hda_exec_init_verbs(codec); |
| 3657 | snd_hda_jack_set_dirty_all(codec); | ||
| 3657 | if (codec->patch_ops.resume) | 3658 | if (codec->patch_ops.resume) |
| 3658 | codec->patch_ops.resume(codec); | 3659 | codec->patch_ops.resume(codec); |
| 3659 | else { | 3660 | else { |
| @@ -3665,10 +3666,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) | |||
| 3665 | 3666 | ||
| 3666 | if (codec->jackpoll_interval) | 3667 | if (codec->jackpoll_interval) |
| 3667 | hda_jackpoll_work(&codec->jackpoll_work.work); | 3668 | hda_jackpoll_work(&codec->jackpoll_work.work); |
| 3668 | else { | 3669 | else |
| 3669 | snd_hda_jack_set_dirty_all(codec); | ||
| 3670 | snd_hda_jack_report_sync(codec); | 3670 | snd_hda_jack_report_sync(codec); |
| 3671 | } | ||
| 3672 | 3671 | ||
| 3673 | codec->in_pm = 0; | 3672 | codec->in_pm = 0; |
| 3674 | snd_hda_power_down(codec); /* flag down before returning */ | 3673 | snd_hda_power_down(codec); /* flag down before returning */ |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0b6aebacc56b..c78286f6e5d8 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
| @@ -656,29 +656,43 @@ static char *driver_short_names[] = { | |||
| 656 | #define get_azx_dev(substream) (substream->runtime->private_data) | 656 | #define get_azx_dev(substream) (substream->runtime->private_data) |
| 657 | 657 | ||
| 658 | #ifdef CONFIG_X86 | 658 | #ifdef CONFIG_X86 |
| 659 | static void __mark_pages_wc(struct azx *chip, void *addr, size_t size, bool on) | 659 | static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool on) |
| 660 | { | 660 | { |
| 661 | int pages; | ||
| 662 | |||
| 661 | if (azx_snoop(chip)) | 663 | if (azx_snoop(chip)) |
| 662 | return; | 664 | return; |
| 663 | if (addr && size) { | 665 | if (!dmab || !dmab->area || !dmab->bytes) |
| 664 | int pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; | 666 | return; |
| 667 | |||
| 668 | #ifdef CONFIG_SND_DMA_SGBUF | ||
| 669 | if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) { | ||
| 670 | struct snd_sg_buf *sgbuf = dmab->private_data; | ||
| 665 | if (on) | 671 | if (on) |
| 666 | set_memory_wc((unsigned long)addr, pages); | 672 | set_pages_array_wc(sgbuf->page_table, sgbuf->pages); |
| 667 | else | 673 | else |
| 668 | set_memory_wb((unsigned long)addr, pages); | 674 | set_pages_array_wb(sgbuf->page_table, sgbuf->pages); |
| 675 | return; | ||
| 669 | } | 676 | } |
| 677 | #endif | ||
| 678 | |||
| 679 | pages = (dmab->bytes + PAGE_SIZE - 1) >> PAGE_SHIFT; | ||
| 680 | if (on) | ||
| 681 | set_memory_wc((unsigned long)dmab->area, pages); | ||
| 682 | else | ||
| 683 | set_memory_wb((unsigned long)dmab->area, pages); | ||
| 670 | } | 684 | } |
| 671 | 685 | ||
| 672 | static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf, | 686 | static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf, |
| 673 | bool on) | 687 | bool on) |
| 674 | { | 688 | { |
| 675 | __mark_pages_wc(chip, buf->area, buf->bytes, on); | 689 | __mark_pages_wc(chip, buf, on); |
| 676 | } | 690 | } |
| 677 | static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev, | 691 | static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev, |
| 678 | struct snd_pcm_runtime *runtime, bool on) | 692 | struct snd_pcm_substream *substream, bool on) |
| 679 | { | 693 | { |
| 680 | if (azx_dev->wc_marked != on) { | 694 | if (azx_dev->wc_marked != on) { |
| 681 | __mark_pages_wc(chip, runtime->dma_area, runtime->dma_bytes, on); | 695 | __mark_pages_wc(chip, snd_pcm_get_dma_buf(substream), on); |
| 682 | azx_dev->wc_marked = on; | 696 | azx_dev->wc_marked = on; |
| 683 | } | 697 | } |
| 684 | } | 698 | } |
| @@ -689,7 +703,7 @@ static inline void mark_pages_wc(struct azx *chip, struct snd_dma_buffer *buf, | |||
| 689 | { | 703 | { |
| 690 | } | 704 | } |
| 691 | static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev, | 705 | static inline void mark_runtime_wc(struct azx *chip, struct azx_dev *azx_dev, |
| 692 | struct snd_pcm_runtime *runtime, bool on) | 706 | struct snd_pcm_substream *substream, bool on) |
| 693 | { | 707 | { |
| 694 | } | 708 | } |
| 695 | #endif | 709 | #endif |
| @@ -1968,11 +1982,10 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, | |||
| 1968 | { | 1982 | { |
| 1969 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); | 1983 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); |
| 1970 | struct azx *chip = apcm->chip; | 1984 | struct azx *chip = apcm->chip; |
| 1971 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
| 1972 | struct azx_dev *azx_dev = get_azx_dev(substream); | 1985 | struct azx_dev *azx_dev = get_azx_dev(substream); |
| 1973 | int ret; | 1986 | int ret; |
| 1974 | 1987 | ||
| 1975 | mark_runtime_wc(chip, azx_dev, runtime, false); | 1988 | mark_runtime_wc(chip, azx_dev, substream, false); |
| 1976 | azx_dev->bufsize = 0; | 1989 | azx_dev->bufsize = 0; |
| 1977 | azx_dev->period_bytes = 0; | 1990 | azx_dev->period_bytes = 0; |
| 1978 | azx_dev->format_val = 0; | 1991 | azx_dev->format_val = 0; |
| @@ -1980,7 +1993,7 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream, | |||
| 1980 | params_buffer_bytes(hw_params)); | 1993 | params_buffer_bytes(hw_params)); |
| 1981 | if (ret < 0) | 1994 | if (ret < 0) |
| 1982 | return ret; | 1995 | return ret; |
| 1983 | mark_runtime_wc(chip, azx_dev, runtime, true); | 1996 | mark_runtime_wc(chip, azx_dev, substream, true); |
| 1984 | return ret; | 1997 | return ret; |
| 1985 | } | 1998 | } |
| 1986 | 1999 | ||
| @@ -1989,7 +2002,6 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) | |||
| 1989 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); | 2002 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); |
| 1990 | struct azx_dev *azx_dev = get_azx_dev(substream); | 2003 | struct azx_dev *azx_dev = get_azx_dev(substream); |
| 1991 | struct azx *chip = apcm->chip; | 2004 | struct azx *chip = apcm->chip; |
| 1992 | struct snd_pcm_runtime *runtime = substream->runtime; | ||
| 1993 | struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream]; | 2005 | struct hda_pcm_stream *hinfo = apcm->hinfo[substream->stream]; |
| 1994 | 2006 | ||
| 1995 | /* reset BDL address */ | 2007 | /* reset BDL address */ |
| @@ -2002,7 +2014,7 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream) | |||
| 2002 | 2014 | ||
| 2003 | snd_hda_codec_cleanup(apcm->codec, hinfo, substream); | 2015 | snd_hda_codec_cleanup(apcm->codec, hinfo, substream); |
| 2004 | 2016 | ||
| 2005 | mark_runtime_wc(chip, azx_dev, runtime, false); | 2017 | mark_runtime_wc(chip, azx_dev, substream, false); |
| 2006 | return snd_pcm_lib_free_pages(substream); | 2018 | return snd_pcm_lib_free_pages(substream); |
| 2007 | } | 2019 | } |
| 2008 | 2020 | ||
| @@ -3613,13 +3625,12 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { | |||
| 3613 | /* 5 Series/3400 */ | 3625 | /* 5 Series/3400 */ |
| 3614 | { PCI_DEVICE(0x8086, 0x3b56), | 3626 | { PCI_DEVICE(0x8086, 0x3b56), |
| 3615 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH }, | 3627 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH }, |
| 3616 | /* SCH */ | 3628 | /* Poulsbo */ |
| 3617 | { PCI_DEVICE(0x8086, 0x811b), | 3629 | { PCI_DEVICE(0x8086, 0x811b), |
| 3618 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP | | 3630 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, |
| 3619 | AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Poulsbo */ | 3631 | /* Oaktrail */ |
| 3620 | { PCI_DEVICE(0x8086, 0x080a), | 3632 | { PCI_DEVICE(0x8086, 0x080a), |
| 3621 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP | | 3633 | .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, |
| 3622 | AZX_DCAPS_BUFSIZE | AZX_DCAPS_POSFIX_LPIB }, /* Oaktrail */ | ||
| 3623 | /* ICH */ | 3634 | /* ICH */ |
| 3624 | { PCI_DEVICE(0x8086, 0x2668), | 3635 | { PCI_DEVICE(0x8086, 0x2668), |
| 3625 | .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC | | 3636 | .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC | |
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index dd798c3196ff..009b77a693cf 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -4636,6 +4636,12 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { | |||
| 4636 | .patch = patch_conexant_auto }, | 4636 | .patch = patch_conexant_auto }, |
| 4637 | { .id = 0x14f15111, .name = "CX20753/4", | 4637 | { .id = 0x14f15111, .name = "CX20753/4", |
| 4638 | .patch = patch_conexant_auto }, | 4638 | .patch = patch_conexant_auto }, |
| 4639 | { .id = 0x14f15113, .name = "CX20755", | ||
| 4640 | .patch = patch_conexant_auto }, | ||
| 4641 | { .id = 0x14f15114, .name = "CX20756", | ||
| 4642 | .patch = patch_conexant_auto }, | ||
| 4643 | { .id = 0x14f15115, .name = "CX20757", | ||
| 4644 | .patch = patch_conexant_auto }, | ||
| 4639 | {} /* terminator */ | 4645 | {} /* terminator */ |
| 4640 | }; | 4646 | }; |
| 4641 | 4647 | ||
| @@ -4659,6 +4665,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150b9"); | |||
| 4659 | MODULE_ALIAS("snd-hda-codec-id:14f1510f"); | 4665 | MODULE_ALIAS("snd-hda-codec-id:14f1510f"); |
| 4660 | MODULE_ALIAS("snd-hda-codec-id:14f15110"); | 4666 | MODULE_ALIAS("snd-hda-codec-id:14f15110"); |
| 4661 | MODULE_ALIAS("snd-hda-codec-id:14f15111"); | 4667 | MODULE_ALIAS("snd-hda-codec-id:14f15111"); |
| 4668 | MODULE_ALIAS("snd-hda-codec-id:14f15113"); | ||
| 4669 | MODULE_ALIAS("snd-hda-codec-id:14f15114"); | ||
| 4670 | MODULE_ALIAS("snd-hda-codec-id:14f15115"); | ||
| 4662 | 4671 | ||
| 4663 | MODULE_LICENSE("GPL"); | 4672 | MODULE_LICENSE("GPL"); |
| 4664 | MODULE_DESCRIPTION("Conexant HD-audio codec"); | 4673 | MODULE_DESCRIPTION("Conexant HD-audio codec"); |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f5196277b6e9..5faaad219a7f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -4694,6 +4694,7 @@ static const struct snd_pci_quirk alc880_fixup_tbl[] = { | |||
| 4694 | SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB), | 4694 | SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_FIXUP_VOL_KNOB), |
| 4695 | SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810), | 4695 | SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810), |
| 4696 | SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM), | 4696 | SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM), |
| 4697 | SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST), | ||
| 4697 | SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734), | 4698 | SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734), |
| 4698 | SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU), | 4699 | SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU), |
| 4699 | SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734), | 4700 | SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734), |
| @@ -5708,6 +5709,7 @@ static const struct alc_model_fixup alc268_fixup_models[] = { | |||
| 5708 | }; | 5709 | }; |
| 5709 | 5710 | ||
| 5710 | static const struct snd_pci_quirk alc268_fixup_tbl[] = { | 5711 | static const struct snd_pci_quirk alc268_fixup_tbl[] = { |
| 5712 | SND_PCI_QUIRK(0x1025, 0x015b, "Acer AOA 150 (ZG5)", ALC268_FIXUP_INV_DMIC), | ||
| 5711 | /* below is codec SSID since multiple Toshiba laptops have the | 5713 | /* below is codec SSID since multiple Toshiba laptops have the |
| 5712 | * same PCI SSID 1179:ff00 | 5714 | * same PCI SSID 1179:ff00 |
| 5713 | */ | 5715 | */ |
| @@ -6251,6 +6253,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
| 6251 | SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC), | 6253 | SND_PCI_QUIRK(0x1025, 0x0349, "Acer AOD260", ALC269_FIXUP_INV_DMIC), |
| 6252 | SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_MIC2_MUTE_LED), | 6254 | SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_MIC2_MUTE_LED), |
| 6253 | SND_PCI_QUIRK(0x103c, 0x1972, "HP Pavilion 17", ALC269_FIXUP_MIC1_MUTE_LED), | 6255 | SND_PCI_QUIRK(0x103c, 0x1972, "HP Pavilion 17", ALC269_FIXUP_MIC1_MUTE_LED), |
| 6256 | SND_PCI_QUIRK(0x103c, 0x1977, "HP Pavilion 14", ALC269_FIXUP_MIC1_MUTE_LED), | ||
| 6254 | SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC), | 6257 | SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC), |
| 6255 | SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC), | 6258 | SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC), |
| 6256 | SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), | 6259 | SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), |
| @@ -6265,6 +6268,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { | |||
| 6265 | SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), | 6268 | SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), |
| 6266 | SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), | 6269 | SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), |
| 6267 | SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), | 6270 | SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), |
| 6271 | SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK), | ||
| 6268 | SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK), | 6272 | SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK), |
| 6269 | SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC), | 6273 | SND_PCI_QUIRK_VENDOR(0x1025, "Acer Aspire", ALC271_FIXUP_DMIC), |
| 6270 | SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), | 6274 | SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), |
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 1d8bb5917594..ef62c435848e 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
| @@ -685,7 +685,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, | |||
| 685 | } | 685 | } |
| 686 | sr_val = i; | 686 | sr_val = i; |
| 687 | 687 | ||
| 688 | lrclk = snd_soc_params_to_bclk(params) / params_rate(params); | 688 | lrclk = rates[bclk] / params_rate(params); |
| 689 | 689 | ||
| 690 | arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n", | 690 | arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n", |
| 691 | rates[bclk], rates[bclk] / lrclk); | 691 | rates[bclk], rates[bclk] / lrclk); |
| @@ -1082,6 +1082,9 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, | |||
| 1082 | id, ret); | 1082 | id, ret); |
| 1083 | } | 1083 | } |
| 1084 | 1084 | ||
| 1085 | regmap_update_bits(arizona->regmap, fll->base + 1, | ||
| 1086 | ARIZONA_FLL1_FREERUN, 0); | ||
| 1087 | |||
| 1085 | return 0; | 1088 | return 0; |
| 1086 | } | 1089 | } |
| 1087 | EXPORT_SYMBOL_GPL(arizona_init_fll); | 1090 | EXPORT_SYMBOL_GPL(arizona_init_fll); |
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index e6cefe1ac677..d8c65f574658 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c | |||
| @@ -1019,8 +1019,6 @@ static const char *wm2200_mixer_texts[] = { | |||
| 1019 | "EQR", | 1019 | "EQR", |
| 1020 | "LHPF1", | 1020 | "LHPF1", |
| 1021 | "LHPF2", | 1021 | "LHPF2", |
| 1022 | "LHPF3", | ||
| 1023 | "LHPF4", | ||
| 1024 | "DSP1.1", | 1022 | "DSP1.1", |
| 1025 | "DSP1.2", | 1023 | "DSP1.2", |
| 1026 | "DSP1.3", | 1024 | "DSP1.3", |
| @@ -1053,7 +1051,6 @@ static int wm2200_mixer_values[] = { | |||
| 1053 | 0x25, | 1051 | 0x25, |
| 1054 | 0x50, /* EQ */ | 1052 | 0x50, /* EQ */ |
| 1055 | 0x51, | 1053 | 0x51, |
| 1056 | 0x52, | ||
| 1057 | 0x60, /* LHPF1 */ | 1054 | 0x60, /* LHPF1 */ |
| 1058 | 0x61, /* LHPF2 */ | 1055 | 0x61, /* LHPF2 */ |
| 1059 | 0x68, /* DSP1 */ | 1056 | 0x68, /* DSP1 */ |
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 7a9048dad1cd..1440b3f9b7bb 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c | |||
| @@ -896,8 +896,7 @@ static const unsigned int wm5102_aec_loopback_values[] = { | |||
| 896 | 896 | ||
| 897 | static const struct soc_enum wm5102_aec_loopback = | 897 | static const struct soc_enum wm5102_aec_loopback = |
| 898 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, | 898 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, |
| 899 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, | 899 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf, |
| 900 | ARIZONA_AEC_LOOPBACK_SRC_MASK, | ||
| 901 | ARRAY_SIZE(wm5102_aec_loopback_texts), | 900 | ARRAY_SIZE(wm5102_aec_loopback_texts), |
| 902 | wm5102_aec_loopback_texts, | 901 | wm5102_aec_loopback_texts, |
| 903 | wm5102_aec_loopback_values); | 902 | wm5102_aec_loopback_values); |
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index ae80c8c28536..7a090968c4f7 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c | |||
| @@ -344,8 +344,7 @@ static const unsigned int wm5110_aec_loopback_values[] = { | |||
| 344 | 344 | ||
| 345 | static const struct soc_enum wm5110_aec_loopback = | 345 | static const struct soc_enum wm5110_aec_loopback = |
| 346 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, | 346 | SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1, |
| 347 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, | 347 | ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf, |
| 348 | ARIZONA_AEC_LOOPBACK_SRC_MASK, | ||
| 349 | ARRAY_SIZE(wm5110_aec_loopback_texts), | 348 | ARRAY_SIZE(wm5110_aec_loopback_texts), |
| 350 | wm5110_aec_loopback_texts, | 349 | wm5110_aec_loopback_texts, |
| 351 | wm5110_aec_loopback_values); | 350 | wm5110_aec_loopback_values); |
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 7b198c38f3ef..b6b654837585 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c | |||
| @@ -324,7 +324,7 @@ static int wm_adsp_load(struct wm_adsp *dsp) | |||
| 324 | 324 | ||
| 325 | if (reg) { | 325 | if (reg) { |
| 326 | buf = kmemdup(region->data, le32_to_cpu(region->len), | 326 | buf = kmemdup(region->data, le32_to_cpu(region->len), |
| 327 | GFP_KERNEL); | 327 | GFP_KERNEL | GFP_DMA); |
| 328 | if (!buf) { | 328 | if (!buf) { |
| 329 | adsp_err(dsp, "Out of memory\n"); | 329 | adsp_err(dsp, "Out of memory\n"); |
| 330 | return -ENOMEM; | 330 | return -ENOMEM; |
| @@ -396,7 +396,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) | |||
| 396 | hdr = (void*)&firmware->data[0]; | 396 | hdr = (void*)&firmware->data[0]; |
| 397 | if (memcmp(hdr->magic, "WMDR", 4) != 0) { | 397 | if (memcmp(hdr->magic, "WMDR", 4) != 0) { |
| 398 | adsp_err(dsp, "%s: invalid magic\n", file); | 398 | adsp_err(dsp, "%s: invalid magic\n", file); |
| 399 | return -EINVAL; | 399 | goto out_fw; |
| 400 | } | 400 | } |
| 401 | 401 | ||
| 402 | adsp_dbg(dsp, "%s: v%d.%d.%d\n", file, | 402 | adsp_dbg(dsp, "%s: v%d.%d.%d\n", file, |
| @@ -439,7 +439,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) | |||
| 439 | 439 | ||
| 440 | if (reg) { | 440 | if (reg) { |
| 441 | buf = kmemdup(blk->data, le32_to_cpu(blk->len), | 441 | buf = kmemdup(blk->data, le32_to_cpu(blk->len), |
| 442 | GFP_KERNEL); | 442 | GFP_KERNEL | GFP_DMA); |
| 443 | if (!buf) { | 443 | if (!buf) { |
| 444 | adsp_err(dsp, "Out of memory\n"); | 444 | adsp_err(dsp, "Out of memory\n"); |
| 445 | return -ENOMEM; | 445 | return -ENOMEM; |
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3b98159d9645..a210c8d7b4bc 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -108,18 +108,13 @@ if SND_IMX_SOC | |||
| 108 | config SND_SOC_IMX_SSI | 108 | config SND_SOC_IMX_SSI |
| 109 | tristate | 109 | tristate |
| 110 | 110 | ||
| 111 | config SND_SOC_IMX_PCM | ||
| 112 | tristate | ||
| 113 | |||
| 114 | config SND_SOC_IMX_PCM_FIQ | 111 | config SND_SOC_IMX_PCM_FIQ |
| 115 | bool | 112 | tristate |
| 116 | select FIQ | 113 | select FIQ |
| 117 | select SND_SOC_IMX_PCM | ||
| 118 | 114 | ||
| 119 | config SND_SOC_IMX_PCM_DMA | 115 | config SND_SOC_IMX_PCM_DMA |
| 120 | bool | 116 | tristate |
| 121 | select SND_SOC_DMAENGINE_PCM | 117 | select SND_SOC_DMAENGINE_PCM |
| 122 | select SND_SOC_IMX_PCM | ||
| 123 | 118 | ||
| 124 | config SND_SOC_IMX_AUDMUX | 119 | config SND_SOC_IMX_AUDMUX |
| 125 | tristate | 120 | tristate |
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile index afd34794db53..ec1457915d7c 100644 --- a/sound/soc/fsl/Makefile +++ b/sound/soc/fsl/Makefile | |||
| @@ -41,7 +41,10 @@ endif | |||
| 41 | obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o | 41 | obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o |
| 42 | obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o | 42 | obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o |
| 43 | 43 | ||
| 44 | obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o | 44 | obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += snd-soc-imx-pcm-fiq.o |
| 45 | snd-soc-imx-pcm-fiq-y := imx-pcm-fiq.o imx-pcm.o | ||
| 46 | obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += snd-soc-imx-pcm-dma.o | ||
| 47 | snd-soc-imx-pcm-dma-y := imx-pcm-dma.o imx-pcm.o | ||
| 45 | 48 | ||
| 46 | # i.MX Machine Support | 49 | # i.MX Machine Support |
| 47 | snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o | 50 | snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o |
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c index d5cd9eff3b48..0c9f188ddc68 100644 --- a/sound/soc/fsl/imx-pcm.c +++ b/sound/soc/fsl/imx-pcm.c | |||
| @@ -31,7 +31,6 @@ int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, | |||
| 31 | runtime->dma_bytes); | 31 | runtime->dma_bytes); |
| 32 | return ret; | 32 | return ret; |
| 33 | } | 33 | } |
| 34 | EXPORT_SYMBOL_GPL(snd_imx_pcm_mmap); | ||
| 35 | 34 | ||
| 36 | static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | 35 | static int imx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) |
| 37 | { | 36 | { |
| @@ -80,7 +79,6 @@ int imx_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
| 80 | out: | 79 | out: |
| 81 | return ret; | 80 | return ret; |
| 82 | } | 81 | } |
| 83 | EXPORT_SYMBOL_GPL(imx_pcm_new); | ||
| 84 | 82 | ||
| 85 | void imx_pcm_free(struct snd_pcm *pcm) | 83 | void imx_pcm_free(struct snd_pcm *pcm) |
| 86 | { | 84 | { |
| @@ -102,7 +100,6 @@ void imx_pcm_free(struct snd_pcm *pcm) | |||
| 102 | buf->area = NULL; | 100 | buf->area = NULL; |
| 103 | } | 101 | } |
| 104 | } | 102 | } |
| 105 | EXPORT_SYMBOL_GPL(imx_pcm_free); | ||
| 106 | 103 | ||
| 107 | MODULE_DESCRIPTION("Freescale i.MX PCM driver"); | 104 | MODULE_DESCRIPTION("Freescale i.MX PCM driver"); |
| 108 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); | 105 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1e36bc81e5af..258acadb9e7d 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -1023,7 +1023,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, | |||
| 1023 | 1023 | ||
| 1024 | if (SND_SOC_DAPM_EVENT_ON(event)) { | 1024 | if (SND_SOC_DAPM_EVENT_ON(event)) { |
| 1025 | if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) { | 1025 | if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) { |
| 1026 | ret = regulator_allow_bypass(w->regulator, true); | 1026 | ret = regulator_allow_bypass(w->regulator, false); |
| 1027 | if (ret != 0) | 1027 | if (ret != 0) |
| 1028 | dev_warn(w->dapm->dev, | 1028 | dev_warn(w->dapm->dev, |
| 1029 | "ASoC: Failed to bypass %s: %d\n", | 1029 | "ASoC: Failed to bypass %s: %d\n", |
| @@ -1033,7 +1033,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, | |||
| 1033 | return regulator_enable(w->regulator); | 1033 | return regulator_enable(w->regulator); |
| 1034 | } else { | 1034 | } else { |
| 1035 | if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) { | 1035 | if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) { |
| 1036 | ret = regulator_allow_bypass(w->regulator, false); | 1036 | ret = regulator_allow_bypass(w->regulator, true); |
| 1037 | if (ret != 0) | 1037 | if (ret != 0) |
| 1038 | dev_warn(w->dapm->dev, | 1038 | dev_warn(w->dapm->dev, |
| 1039 | "ASoC: Failed to unbypass %s: %d\n", | 1039 | "ASoC: Failed to unbypass %s: %d\n", |
| @@ -3039,6 +3039,14 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, | |||
| 3039 | w->name, ret); | 3039 | w->name, ret); |
| 3040 | return NULL; | 3040 | return NULL; |
| 3041 | } | 3041 | } |
| 3042 | |||
| 3043 | if (w->invert & SND_SOC_DAPM_REGULATOR_BYPASS) { | ||
| 3044 | ret = regulator_allow_bypass(w->regulator, true); | ||
| 3045 | if (ret != 0) | ||
| 3046 | dev_warn(w->dapm->dev, | ||
| 3047 | "ASoC: Failed to unbypass %s: %d\n", | ||
| 3048 | w->name, ret); | ||
| 3049 | } | ||
| 3042 | break; | 3050 | break; |
| 3043 | case snd_soc_dapm_clock_supply: | 3051 | case snd_soc_dapm_clock_supply: |
| 3044 | #ifdef CONFIG_CLKDEV_LOOKUP | 3052 | #ifdef CONFIG_CLKDEV_LOOKUP |
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ed4d89c8b52a..e90daf8cdaa8 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
| @@ -1331,16 +1331,23 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void | |||
| 1331 | } | 1331 | } |
| 1332 | channels = (hdr->bLength - 7) / csize - 1; | 1332 | channels = (hdr->bLength - 7) / csize - 1; |
| 1333 | bmaControls = hdr->bmaControls; | 1333 | bmaControls = hdr->bmaControls; |
| 1334 | if (hdr->bLength < 7 + csize) { | ||
| 1335 | snd_printk(KERN_ERR "usbaudio: unit %u: " | ||
| 1336 | "invalid UAC_FEATURE_UNIT descriptor\n", | ||
| 1337 | unitid); | ||
| 1338 | return -EINVAL; | ||
| 1339 | } | ||
| 1334 | } else { | 1340 | } else { |
| 1335 | struct uac2_feature_unit_descriptor *ftr = _ftr; | 1341 | struct uac2_feature_unit_descriptor *ftr = _ftr; |
| 1336 | csize = 4; | 1342 | csize = 4; |
| 1337 | channels = (hdr->bLength - 6) / 4 - 1; | 1343 | channels = (hdr->bLength - 6) / 4 - 1; |
| 1338 | bmaControls = ftr->bmaControls; | 1344 | bmaControls = ftr->bmaControls; |
| 1339 | } | 1345 | if (hdr->bLength < 6 + csize) { |
| 1340 | 1346 | snd_printk(KERN_ERR "usbaudio: unit %u: " | |
| 1341 | if (hdr->bLength < 7 || !csize || hdr->bLength < 7 + csize) { | 1347 | "invalid UAC_FEATURE_UNIT descriptor\n", |
| 1342 | snd_printk(KERN_ERR "usbaudio: unit %u: invalid UAC_FEATURE_UNIT descriptor\n", unitid); | 1348 | unitid); |
| 1343 | return -EINVAL; | 1349 | return -EINVAL; |
| 1350 | } | ||
| 1344 | } | 1351 | } |
| 1345 | 1352 | ||
| 1346 | /* parse the source unit */ | 1353 | /* parse the source unit */ |
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 80db3f4bcf7a..39d41068484f 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST | |||
| @@ -11,11 +11,21 @@ lib/rbtree.c | |||
| 11 | include/linux/swab.h | 11 | include/linux/swab.h |
| 12 | arch/*/include/asm/unistd*.h | 12 | arch/*/include/asm/unistd*.h |
| 13 | arch/*/include/asm/perf_regs.h | 13 | arch/*/include/asm/perf_regs.h |
| 14 | arch/*/include/uapi/asm/unistd*.h | ||
| 15 | arch/*/include/uapi/asm/perf_regs.h | ||
| 14 | arch/*/lib/memcpy*.S | 16 | arch/*/lib/memcpy*.S |
| 15 | arch/*/lib/memset*.S | 17 | arch/*/lib/memset*.S |
| 16 | include/linux/poison.h | 18 | include/linux/poison.h |
| 17 | include/linux/magic.h | 19 | include/linux/magic.h |
| 18 | include/linux/hw_breakpoint.h | 20 | include/linux/hw_breakpoint.h |
| 21 | include/linux/rbtree_augmented.h | ||
| 22 | include/uapi/linux/perf_event.h | ||
| 23 | include/uapi/linux/const.h | ||
| 24 | include/uapi/linux/swab.h | ||
| 25 | include/uapi/linux/hw_breakpoint.h | ||
| 19 | arch/x86/include/asm/svm.h | 26 | arch/x86/include/asm/svm.h |
| 20 | arch/x86/include/asm/vmx.h | 27 | arch/x86/include/asm/vmx.h |
| 21 | arch/x86/include/asm/kvm_host.h | 28 | arch/x86/include/asm/kvm_host.h |
| 29 | arch/x86/include/uapi/asm/svm.h | ||
| 30 | arch/x86/include/uapi/asm/vmx.h | ||
| 31 | arch/x86/include/uapi/asm/kvm.h | ||
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 891bc77bdb2c..8ab05e543ef4 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
| @@ -58,7 +58,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |||
| 58 | -e s/arm.*/arm/ -e s/sa110/arm/ \ | 58 | -e s/arm.*/arm/ -e s/sa110/arm/ \ |
| 59 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ | 59 | -e s/s390x/s390/ -e s/parisc64/parisc/ \ |
| 60 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ | 60 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ |
| 61 | -e s/sh[234].*/sh/ ) | 61 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) |
| 62 | NO_PERF_REGS := 1 | 62 | NO_PERF_REGS := 1 |
| 63 | 63 | ||
| 64 | CC = $(CROSS_COMPILE)gcc | 64 | CC = $(CROSS_COMPILE)gcc |