Linux 4.17.12
Greg KH
maintainerDocumentation/devicetree/bindings/net/dsa/qca8k.txt +22 -1
@@ -2,7 +2,10 @@ Required properties: -- compatible: should be "qca,qca8337" +- compatible: should be one of: + "qca,qca8334" + "qca,qca8337" + - #size-cells: must be 0 - #address-cells: must be 1
@@ -14,6 +17,20 @@ port and PHY id, each subnode describing a port needs to have a valid phandle referencing the internal PHY connected to it. The CPU port of this switch is always port 0. +A CPU port node has the following optional node: + +- fixed-link : Fixed-link subnode describing a link to a non-MDIO + managed entity. See + Documentation/devicetree/bindings/net/fixed-link.txt + for details. + +For QCA8K the 'fixed-link' sub-node supports only the following properties: + +- 'speed' (integer, mandatory), to indicate the link speed. Accepted + values are 10, 100 and 1000 +- 'full-duplex' (boolean, optional), to indicate that full duplex is + used. When absent, half duplex is assumed. + Example:
@@ -53,6 +70,10 @@ Example: label = "cpu"; ethernet = <&gmac1>; phy-mode = "rgmii"; + fixed-link { + speed = 1000; + full-duplex; + }; }; port@1 {
Documentation/devicetree/bindings/net/meson-dwmac.txt +1 -0
@@ -11,6 +11,7 @@ Required properties on all platforms: - "amlogic,meson8b-dwmac" - "amlogic,meson8m2-dwmac" - "amlogic,meson-gxbb-dwmac" + - "amlogic,meson-axg-dwmac" Additionally "snps,dwmac" and any applicable more detailed version number described in net/stmmac.txt should be used.
Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +2 -0
@@ -3,8 +3,10 @@ Required properties for the root node: - compatible: one of "amlogic,meson8-cbus-pinctrl" "amlogic,meson8b-cbus-pinctrl" + "amlogic,meson8m2-cbus-pinctrl" "amlogic,meson8-aobus-pinctrl" "amlogic,meson8b-aobus-pinctrl" + "amlogic,meson8m2-aobus-pinctrl" "amlogic,meson-gxbb-periphs-pinctrl" "amlogic,meson-gxbb-aobus-pinctrl" "amlogic,meson-gxl-periphs-pinctrl"
Documentation/devicetree/bindings/watchdog/renesas-wdt.txt +1 -0
@@ -7,6 +7,7 @@ Required properties: - "renesas,r7s72100-wdt" (RZ/A1) - "renesas,r8a7795-wdt" (R-Car H3) - "renesas,r8a7796-wdt" (R-Car M3-W) + - "renesas,r8a77965-wdt" (R-Car M3-N) - "renesas,r8a77970-wdt" (R-Car V3M) - "renesas,r8a77995-wdt" (R-Car D3)
Documentation/vfio-mediated-device.txt +5 -0
@@ -145,6 +145,11 @@ The functions in the mdev_parent_ops structure are as follows: * create: allocate basic resources in a driver for a mediated device * remove: free resources in a driver when a mediated device is destroyed +(Note that mdev-core provides no implicit serialization of create/remove +callbacks per mdev parent device, per mdev type, or any other categorization. +Vendor drivers are expected to be fully asynchronous in this respect or +provide their own internal resource protection.) + The callbacks in the mdev_parent_ops structure are as follows: * open: open callback of mediated device
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 17 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Merciless Moray
arch/arm/boot/dts/emev2.dtsi +3 -2
@@ -31,13 +31,13 @@ #address-cells = <1>; #size-cells = <0>; - cpu@0 { + cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a9"; reg = <0>; clock-frequency = <533000000>; }; - cpu@1 { + cpu1: cpu@1 { device_type = "cpu"; compatible = "arm,cortex-a9"; reg = <1>;
@@ -57,6 +57,7 @@ compatible = "arm,cortex-a9-pmu"; interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>; }; clocks@e0110000 {
arch/arm/boot/dts/imx53-ppd.dts +0 -2
@@ -559,8 +559,6 @@ status = "okay"; port@2 { - reg = <2>; - lvds0_out: endpoint { remote-endpoint = <&panel_in_lvds0>; };
arch/arm/boot/dts/imx53.dtsi +8 -0
@@ -488,6 +488,10 @@ remote-endpoint = <&ipu_di0_lvds0>; }; }; + + port@2 { + reg = <2>; + }; }; lvds-channel@1 {
@@ -503,6 +507,10 @@ remote-endpoint = <&ipu_di1_lvds1>; }; }; + + port@2 { + reg = <2>; + }; }; };
arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi +0 -1
@@ -17,7 +17,6 @@ imx6qdl-wandboard { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 /* GPIO_0_CLKO */ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* uSDHC1 CD */ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 /* uSDHC3 CD */ MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x0f0b0 /* WL_REF_ON */
arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi +0 -1
@@ -17,7 +17,6 @@ imx6qdl-wandboard { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 /* GPIO_0_CLKO */ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* uSDHC1 CD */ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 /* uSDHC3 CD */ MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00 0x0f0b0 /* WIFI_ON (reset, active low) */
arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi +0 -1
@@ -147,7 +147,6 @@ imx6qdl-wandboard { pinctrl_hog: hoggrp { fsl,pins = < - MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 MX6QDL_PAD_EIM_D22__USB_OTG_PWR 0x80000000 /* USB Power Enable */ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 /* USDHC1 CD */ MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 /* uSDHC3 CD */
arch/arm/boot/dts/imx6qdl-wandboard.dtsi +8 -0
@@ -83,6 +83,8 @@ status = "okay"; codec: sgtl5000@a { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mclk>; compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&clks IMX6QDL_CLK_CKO>;
@@ -142,6 +144,12 @@ >; }; + pinctrl_mclk: mclkgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 + >; + }; + pinctrl_spdif: spdifgrp { fsl,pins = < MX6QDL_PAD_ENET_RXD0__SPDIF_OUT 0x1b0b0
arch/arm/boot/dts/sh73a0.dtsi +3 -2
@@ -22,7 +22,7 @@ #address-cells = <1>; #size-cells = <0>; - cpu@0 { + cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a9"; reg = <0>;
@@ -31,7 +31,7 @@ power-domains = <&pd_a2sl>; next-level-cache = <&L2>; }; - cpu@1 { + cpu1: cpu@1 { device_type = "cpu"; compatible = "arm,cortex-a9"; reg = <1>;
@@ -91,6 +91,7 @@ compatible = "arm,cortex-a9-pmu"; interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>; }; cmt1: timer@e6138000 {
arch/arm/boot/dts/stih407-pinctrl.dtsi +5 -5
@@ -52,7 +52,7 @@ st,syscfg = <&syscfg_sbc>; reg = <0x0961f080 0x4>; reg-names = "irqmux"; - interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irqmux"; ranges = <0 0x09610000 0x6000>;
@@ -376,7 +376,7 @@ st,syscfg = <&syscfg_front>; reg = <0x0920f080 0x4>; reg-names = "irqmux"; - interrupts = <GIC_SPI 189 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irqmux"; ranges = <0 0x09200000 0x10000>;
@@ -936,7 +936,7 @@ st,syscfg = <&syscfg_front>; reg = <0x0921f080 0x4>; reg-names = "irqmux"; - interrupts = <GIC_SPI 190 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irqmux"; ranges = <0 0x09210000 0x10000>;
@@ -969,7 +969,7 @@ st,syscfg = <&syscfg_rear>; reg = <0x0922f080 0x4>; reg-names = "irqmux"; - interrupts = <GIC_SPI 191 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irqmux"; ranges = <0 0x09220000 0x6000>;
@@ -1164,7 +1164,7 @@ st,syscfg = <&syscfg_flash>; reg = <0x0923f080 0x4>; reg-names = "irqmux"; - interrupts = <GIC_SPI 192 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irqmux"; ranges = <0 0x09230000 0x3000>;
arch/arm/boot/dts/stih410.dtsi +9 -9
@@ -43,7 +43,7 @@ ohci0: usb@9a03c00 { compatible = "st,st-ohci-300x"; reg = <0x9a03c00 0x100>; - interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
@@ -58,7 +58,7 @@ ehci0: usb@9a03e00 { compatible = "st,st-ehci-300x"; reg = <0x9a03e00 0x100>; - interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
@@ -75,7 +75,7 @@ ohci1: usb@9a83c00 { compatible = "st,st-ohci-300x"; reg = <0x9a83c00 0x100>; - interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
@@ -90,7 +90,7 @@ ehci1: usb@9a83e00 { compatible = "st,st-ehci-300x"; reg = <0x9a83e00 0x100>; - interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>; clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
@@ -202,7 +202,7 @@ reg = <0x8d04000 0x1000>; reg-names = "hdmi-reg"; #sound-dai-cells = <0>; - interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "irq"; clock-names = "pix", "tmds",
@@ -254,7 +254,7 @@ bdisp0:bdisp@9f10000 { compatible = "st,stih407-bdisp"; reg = <0x9f10000 0x1000>; - interrupts = <GIC_SPI 38 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; clock-names = "bdisp"; clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>; };
@@ -263,8 +263,8 @@ compatible = "st,st-hva"; reg = <0x8c85000 0x400>, <0x6000000 0x40000>; reg-names = "hva_registers", "hva_esram"; - interrupts = <GIC_SPI 58 IRQ_TYPE_NONE>, - <GIC_SPI 59 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; clock-names = "clk_hva"; clocks = <&clk_s_c0_flexgen CLK_HVA>; };
@@ -292,7 +292,7 @@ reg = <0x94a087c 0x64>; clocks = <&clk_sysin>; clock-names = "cec-clk"; - interrupts = <GIC_SPI 140 IRQ_TYPE_NONE>; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "cec-irq"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_cec0_default>;
arch/arm/net/bpf_jit_32.c +5 -5
@@ -708,7 +708,7 @@ static inline void emit_a32_arsh_r64(const u8 dst[], const u8 src[], bool dstk, }/* dst = dst >> src */ -static inline void emit_a32_lsr_r64 (const u8 dst[],const u8 src[],bool dstk, +static inline void emit_a32_rsh_r64 (const u8 dst[],const u8 src[],bool dstk,bool sstk,struct jit_ctx *ctx) {const u8 *tmp = bpf2a32[TMP_REG_1 ];const u8 *tmp2 = bpf2a32[TMP_REG_2 ];
@@ -724,7 +724,7 @@ static inline void emit_a32_lsr_r64(const u8 dst[], const u8 src[], bool dstk,emit (ARM_LDR_I (rm,ARM_SP ,STACK_VAR (dst_hi)), ctx); } -/* Do LSH operation */ +/* Do RSH operation */ emit (ARM_RSB_I (ARM_IP , rt,32 ), ctx);emit (ARM_SUBS_I (tmp2[0 ], rt,32 ), ctx);emit (ARM_MOV_SR (ARM_LR , rd,SRTYPE_LSR , rt), ctx);
@@ -774,7 +774,7 @@ static inline void emit_a32_lsh_i64(const u8 dst[], bool dstk, }/* dst = dst >> val */ -static inline void emit_a32_lsr_i64 (const u8 dst[],bool dstk, +static inline void emit_a32_rsh_i64 (const u8 dst[],bool dstk,const u32 val,struct jit_ctx *ctx) {const u8 *tmp = bpf2a32[TMP_REG_1 ];const u8 *tmp2 = bpf2a32[TMP_REG_2 ];
@@ -1330,7 +1330,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)case BPF_ALU64 |BPF_RSH |BPF_K :if (unlikely (imm >63 ))return -EINVAL ; -emit_a32_lsr_i64 (dst, dstk, imm, ctx); +emit_a32_rsh_i64 (dst, dstk, imm, ctx);break ;/* dst = dst << src */ case BPF_ALU64 |BPF_LSH |BPF_X :
@@ -1338,7 +1338,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx)break ;/* dst = dst >> src */ case BPF_ALU64 |BPF_RSH |BPF_X : -emit_a32_lsr_r64 (dst, src, dstk, sstk, ctx); +emit_a32_rsh_r64 (dst, src, dstk, sstk, ctx);break ;/* dst = dst >> src (signed) */ case BPF_ALU64 |BPF_ARSH |BPF_X :
arch/arm64/boot/dts/renesas/salvator-common.dtsi +22 -16
@@ -93,20 +93,12 @@ regulator-always-on; }; - rsnd_ak4613: sound { - compatible = "simple-audio-card"; + sound_card: sound { + compatible = "audio-graph-card"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcpu>; - simple-audio-card,frame-master = <&sndcpu>; + label = "rcar-sound"; - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4613>; - }; + dais = <&rsnd_port0>; }; vbus0_usb2: regulator-vbus0-usb2 {
@@ -322,6 +314,12 @@ asahi-kasei,out4-single-end; asahi-kasei,out5-single-end; asahi-kasei,out6-single-end; + + port { + ak4613_endpoint: endpoint { + remote-endpoint = <&rsnd_endpoint0>; + }; + }; }; cs2000: clk_multiplier@4f {
@@ -581,10 +579,18 @@ <&audio_clk_c>, <&cpg CPG_CORE CPG_AUDIO_CLK_I>; - rcar_sound,dai { - dai0 { - playback = <&ssi0 &src0 &dvc0>; - capture = <&ssi1 &src1 &dvc1>; + ports { + rsnd_port0: port@0 { + rsnd_endpoint0: endpoint { + remote-endpoint = <&ak4613_endpoint>; + + dai-format = "left_j"; + bitclock-master = <&rsnd_endpoint0>; + frame-master = <&rsnd_endpoint0>; + + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; + }; }; }; };
arch/arm64/configs/defconfig +2 -0
@@ -333,6 +333,8 @@ CONFIG_GPIO_XGENE_SB=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_MAX77620=y +CONFIG_POWER_AVS=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_POWER_RESET_MSM=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y
arch/arm64/include/asm/cmpxchg.h +3 -1
@@ -204,7 +204,9 @@ static inline void __cmpwait_case_##name(volatile void *ptr, \unsigned long tmp; \ \ asm volatile( \ - " ldxr" #sz "\t%" #w "[tmp], %[v]\n" \ + " sevl\n" \ + " wfe\n" \ + " ldxr" #sz "\t%" #w "[tmp], %[v]\n" \ " eor %" #w "[tmp], %" #w "[tmp], %" #w "[val]\n" \ " cbnz %" #w "[tmp], 1f\n" \ " wfe\n" \
arch/arm64/mm/init.c +3 -1
@@ -611,11 +611,13 @@ void __init mem_init(void)BUILD_BUG_ON (TASK_SIZE_32 >TASK_SIZE_64 );#endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP /* * Make sure we chose the upper bound of sizeof(struct page) -* correctly. +* correctly when sizing the VMEMMAP array. */ BUILD_BUG_ON (sizeof (struct page ) > (1 <<STRUCT_PAGE_MAX_SHIFT )); +#endif if (PAGE_SIZE >=16384 &&get_num_physpages () <=128 ) {extern int sysctl_overcommit_memory;
arch/microblaze/boot/Makefile +6 -4
@@ -22,17 +22,19 @@ $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE quiet_cmd_cp = CP $< $@$2 cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) -quiet_cmd_strip = STRIP $@ +quiet_cmd_strip = STRIP $< $@$2 cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \ - -K _fdt_start vmlinux -o $@ + -K _fdt_start $< -o $@$2 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR) +UIMAGE_IN = $@ +UIMAGE_OUT = [email protected] $(obj)/simpleImage.%: vmlinux FORCE $(call if_changed,cp,.unstrip) $(call if_changed,objcopy) $(call if_changed,uimage) - $(call if_changed,strip) - @echo 'Kernel: $@ is ready' ' (#'`cat .version`')' + $(call if_changed,strip,.strip) + @echo 'Kernel: $(UIMAGE_OUT) is ready' ' (#'`cat .version`')' clean-files += simpleImage.*.unstrip linux.bin.ub
arch/powerpc/include/asm/barrier.h +15 -0
@@ -76,6 +76,21 @@ do { \ ___p1; \ }) +#ifdef CONFIG_PPC_BOOK3S_64 +/* +* Prevent execution of subsequent instructions until preceding branches have +* been fully resolved and are no longer executing speculatively. +*/ +#define barrier_nospec_asm ori 31,31,0 + +// This also acts as a compiler barrier due to the memory clobber. +#define barrier_nospec () asm (stringify_in_c(barrier_nospec_asm) ::: "memory") + +#else /* !CONFIG_PPC_BOOK3S_64 */ +#define barrier_nospec_asm +#define barrier_nospec () +#endif +#include <asm-generic/barrier.h> #endif /* _ASM_POWERPC_BARRIER_H */
arch/powerpc/include/asm/cache.h +3 -0
@@ -9,11 +9,14 @@#if defined(CONFIG_PPC_8xx) || defined(CONFIG_403GCX )#define L1_CACHE_SHIFT 4#define MAX_COPY_PREFETCH 1 +#define IFETCH_ALIGN_SHIFT 2#elif defined(CONFIG_PPC_E500MC )#define L1_CACHE_SHIFT 6#define MAX_COPY_PREFETCH 4 +#define IFETCH_ALIGN_SHIFT 3#elif defined(CONFIG_PPC32 )#define MAX_COPY_PREFETCH 4 +#define IFETCH_ALIGN_SHIFT 3/* 603 fetches 2 insn at a time */ #if defined(CONFIG_PPC_47x)#define L1_CACHE_SHIFT 7#else
arch/powerpc/include/asm/pkeys.h +2 -0
@@ -26,6 +26,8 @@ extern u32 initial_allocation_mask; /* bits set for reserved keys */# define VM_PKEY_BIT2 VM_HIGH_ARCH_2# define VM_PKEY_BIT3 VM_HIGH_ARCH_3# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 +#elif !defined(VM_PKEY_BIT4 ) +# define VM_PKEY_BIT4 VM_HIGH_ARCH_4#endif #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \
arch/powerpc/kernel/eeh_driver.c +16 -12
@@ -458,9 +458,11 @@ static void *eeh_add_virt_device(void *data, void *userdata) driver =eeh_pcid_get (dev);if (driver) { -eeh_pcid_put (dev); -if (driver->err_handler) +if (driver->err_handler) { +eeh_pcid_put (dev);return NULL ; + } +eeh_pcid_put (dev); }#ifdef CONFIG_PCI_IOV
@@ -497,17 +499,19 @@ static void *eeh_rmv_device(void *data, void *userdata)if (eeh_dev_removed (edev))return NULL ; - driver =eeh_pcid_get (dev); -if (driver) { -eeh_pcid_put (dev); -if (removed && -eeh_pe_passed (edev->pe)) -return NULL ; -if (removed && - driver->err_handler && - driver->err_handler->error_detected && - driver->err_handler->slot_reset) +if (removed) { +if (eeh_pe_passed (edev->pe))return NULL ; + driver =eeh_pcid_get (dev); +if (driver) { +if (driver->err_handler && + driver->err_handler->error_detected && + driver->err_handler->slot_reset) { +eeh_pcid_put (dev); +return NULL ; + } +eeh_pcid_put (dev); + } }/* Remove it from PCI subsystem */
arch/powerpc/kernel/head_8xx.S +1 -1
@@ -913,7 +913,7 @@ start_here: tovirt(r6,r6) lis r5, abatron_pteptrs@h ori r5, r5, abatron_pteptrs@l - stw r5, 0xf0(r0) /* Must match your Abatron config file */ + stw r5, 0xf0(0) /* Must match your Abatron config file */ tophys(r5,r5) stw r6, 0(r5)
arch/powerpc/kernel/pci_32.c +1 -0
@@ -11,6 +11,7 @@#include <linux/sched.h> #include <linux/errno.h> #include <linux/bootmem.h> +#include <linux/syscalls.h> #include <linux/irq.h> #include <linux/list.h> #include <linux/of.h>
arch/powerpc/kernel/prom_init.c +58 -56
289 lines not on this page · raw message
arch/powerpc/lib/string.S +4 -3
@@ -12,6 +12,7 @@ #include <asm/errno.h> #include <asm/ppc_asm.h> #include <asm/export.h> +#include <asm/cache.h> .text
@@ -23,7 +24,7 @@ _GLOBAL(strncpy) mtctr r5 addi r6,r3,-1 addi r4,r4,-1 - .balign 16 + .balign IFETCH_ALIGN_BYTES 1: lbzu r0,1(r4) cmpwi 0,r0,0 stbu r0,1(r6)
@@ -43,7 +44,7 @@ _GLOBAL(strncmp) mtctr r5 addi r5,r3,-1 addi r4,r4,-1 - .balign 16 + .balign IFETCH_ALIGN_BYTES 1: lbzu r3,1(r5) cmpwi 1,r3,0 lbzu r0,1(r4)
@@ -77,7 +78,7 @@ _GLOBAL(memchr) beq- 2f mtctr r5 addi r3,r3,-1 - .balign 16 + .balign IFETCH_ALIGN_BYTES 1: lbzu r0,1(r3) cmpw 0,r0,r4 bdnzf 2,1b
arch/powerpc/mm/slb.c +4 -4
@@ -63,14 +63,14 @@ static inline void slb_shadow_update(unsigned long ea, int ssize,* updating it. No write barriers are needed here, provided * we only update the current CPU's SLB shadow buffer. */ - p->save_area[index].esid =0 ; - p->save_area[index].vsid =cpu_to_be64 (mk_vsid_data (ea, ssize, flags)); - p->save_area[index].esid =cpu_to_be64 (mk_esid_data (ea, ssize, index)); +WRITE_ONCE (p->save_area[index].esid,0 ); +WRITE_ONCE (p->save_area[index].vsid,cpu_to_be64 (mk_vsid_data (ea, ssize, flags))); +WRITE_ONCE (p->save_area[index].esid,cpu_to_be64 (mk_esid_data (ea, ssize, index))); }static inline void slb_shadow_clear (enum slb_index index) { -get_slb_shadow ()->save_area[index].esid =0 ; +WRITE_ONCE (get_slb_shadow ()->save_area[index].esid,0 ); } static inline void create_shadowed_slbe(unsigned long ea, int ssize,
arch/powerpc/net/bpf_jit_comp64.c +23 -11
@@ -202,25 +202,37 @@ static void bpf_jit_build_epilogue(u32 *image, struct codegen_context *ctx)static void bpf_jit_emit_func_call (u32 *image,struct codegen_context *ctx,u64 func) { +unsigned int i, ctx_idx = ctx->idx; + +/* Load function address into r12 */ +PPC_LI64 (12 , func); + +/* For bpf-to-bpf function calls, the callee's address is unknown +* until the last extra pass. As seen above, we use PPC_LI64() to +* load the callee's address, but this may optimize the number of +* instructions required based on the nature of the address. +* +* Since we don't want the number of instructions emitted to change, +* we pad the optimized PPC_LI64() call with NOPs to guarantee that +* we always have a five-instruction sequence, which is the maximum +* that PPC_LI64() can emit. +*/ +for (i = ctx->idx - ctx_idx; i <5 ; i++) +PPC_NOP (); +#ifdef PPC64_ELF_ABI_v1 -/* func points to the function descriptor */ -PPC_LI64 (b2p[TMP_REG_2 ], func); -/* Load actual entry point from function descriptor */ -PPC_BPF_LL (b2p[TMP_REG_1 ], b2p[TMP_REG_2 ],0 ); -/* ... and move it to LR */ -PPC_MTLR (b2p[TMP_REG_1 ]);/* * Load TOC from function descriptor at offset 8. * We can clobber r2 since we get called through a * function pointer (so caller will save/restore r2) * and since we don't use a TOC ourself. */ -PPC_BPF_LL (2 , b2p[TMP_REG_2 ],8 ); -#else -/* We can clobber r12 */ -PPC_FUNC_ADDR (12 , func); -PPC_MTLR (12 ); +PPC_BPF_LL (2 ,12 ,8 ); +/* Load actual entry point from function descriptor */ +PPC_BPF_LL (12 ,12 ,0 );#endif + +PPC_MTLR (12 );PPC_BLRL (); }
arch/powerpc/platforms/chrp/time.c +4 -2
@@ -28,6 +28,8 @@#include <asm/sections.h> #include <asm/time.h> +#include <platforms/chrp/chrp.h> +extern spinlock_t rtc_lock;#define NVRAM_AS0 0x74
@@ -63,7 +65,7 @@ long __init chrp_time_init(void)return 0 ; } -int chrp_cmos_clock_read (int addr) +static int chrp_cmos_clock_read (int addr) {if (nvram_as1 !=0 )outb (addr>>8 , nvram_as1);
@@ -71,7 +73,7 @@ int chrp_cmos_clock_read(int addr)return (inb (nvram_data)); } -void chrp_cmos_clock_write (unsigned long val,int addr) +static void chrp_cmos_clock_write (unsigned long val,int addr) {if (nvram_as1 !=0 )outb (addr>>8 , nvram_as1);
arch/powerpc/platforms/embedded6xx/hlwd-pic.c +5 -0
@@ -35,6 +35,8 @@*/ #define HW_BROADWAY_ICR 0x00#define HW_BROADWAY_IMR 0x04 +#define HW_STARLET_ICR 0x08 +#define HW_STARLET_IMR 0x0c/*
@@ -74,6 +76,9 @@ static void hlwd_pic_unmask(struct irq_data *d)void __iomem *io_base =irq_data_get_irq_chip_data (d);setbits32 (io_base +HW_BROADWAY_IMR ,1 << irq); + +/* Make sure the ARM (aka. Starlet) doesn't handle this interrupt. */ +clrbits32 (io_base +HW_STARLET_IMR ,1 << irq); }
arch/powerpc/platforms/powermac/bootx_init.c +3 -1
@@ -468,7 +468,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)boot_infos_t *bi = (boot_infos_t *) r4;unsigned long hdr;unsigned long space; -unsigned long ptr, x; +unsigned long ptr;char *model;unsigned long offset =reloc_offset ();
@@ -562,6 +562,8 @@ void __init bootx_init(unsigned long r3, unsigned long r4)* MMU switched OFF, so this should not be useful anymore. */ if (bi->version <4 ) { +unsigned long x__maybe_unused ; +bootx_printf ("Touching pages...\n" );/*
arch/powerpc/platforms/powermac/setup.c +1 -0
@@ -352,6 +352,7 @@ static int pmac_late_init(void) }machine_late_initcall (powermac, pmac_late_init); +void note_bootable_part (dev_t dev,int part,int goodness);/* * This is __ref because we check for "initializing" before * touching any of the __init sensitive things and "initializing"
arch/s390/include/asm/cpu_mf.h +4 -2
@@ -113,7 +113,7 @@ struct hws_basic_entry {struct hws_diag_entry {unsigned int def:16 ;/* 0-15 Data Entry Format */ -unsigned int R:14 ;/* 16-19 and 20-30 reserved */ +unsigned int R:15 ;/* 16-19 and 20-30 reserved */ unsigned int I:1 ;/* 31 entry valid or invalid */ u8 data[];/* Machine-dependent sample data */ } __packed;
@@ -129,7 +129,9 @@ struct hws_trailer_entry { unsigned int f:1; /* 0 - Block Full Indicator */ unsigned int a:1; /* 1 - Alert request control */ unsigned int t:1; /* 2 - Timestamp format */ - unsigned long long:61; /* 3 - 63: Reserved */ + unsigned int :29; /* 3 - 31: Reserved */ + unsigned int bsdes:16; /* 32-47: size of basic SDE */ + unsigned int dsdes:16; /* 48-63: size of diagnostic SDE */ };unsigned long long flags;/* 0 - 63: All indicators */ };
arch/sh/boards/mach-migor/setup.c +1 -1
@@ -359,7 +359,7 @@ static struct gpiod_lookup_table ov7725_gpios = {static struct gpiod_lookup_table tw9910_gpios = { .dev_id ="0-0045" , .table = { -GPIO_LOOKUP ("sh7722_pfc" ,GPIO_PTT2 ,"pdn" ,GPIO_ACTIVE_HIGH ), +GPIO_LOOKUP ("sh7722_pfc" ,GPIO_PTT2 ,"pdn" ,GPIO_ACTIVE_LOW ),GPIO_LOOKUP ("sh7722_pfc" ,GPIO_PTT3 ,"rstb" ,GPIO_ACTIVE_LOW ), }, };
arch/x86/events/intel/uncore.c +1 -1
@@ -218,7 +218,7 @@ void uncore_perf_event_update(struct intel_uncore_box *box, struct perf_event *eu64 prev_count, new_count, delta;int shift; -if (event->hw.idx >=UNCORE_PMC_IDX_FIXED ) +if (event->hw.idx ==UNCORE_PMC_IDX_FIXED ) shift =64 -uncore_fixed_ctr_bits (box);else shift =64 -uncore_perf_ctr_bits (box);
arch/x86/events/intel/uncore_nhmex.c +1 -1
@@ -246,7 +246,7 @@ static void nhmex_uncore_msr_enable_event(struct intel_uncore_box *box, struct p {struct hw_perf_event *hwc = &event->hw; -if (hwc->idx >=UNCORE_PMC_IDX_FIXED ) +if (hwc->idx ==UNCORE_PMC_IDX_FIXED )wrmsrl (hwc->config_base,NHMEX_PMON_CTL_EN_BIT0 );else if (box->pmu->type->event_mask &NHMEX_PMON_CTL_EN_BIT0 )wrmsrl (hwc->config_base, hwc->config |NHMEX_PMON_CTL_EN_BIT22 );
arch/x86/kernel/cpu/microcode/core.c +3 -3
@@ -70,7 +70,7 @@ static DEFINE_MUTEX(microcode_mutex);/* * Serialize late loading so that CPUs get updated one-by-one. */ -static DEFINE_SPINLOCK (update_lock); +static DEFINE_RAW_SPINLOCK (update_lock);struct ucode_cpu_info ucode_cpu_info[NR_CPUS ];
@@ -560,9 +560,9 @@ static int __reload_late(void *info)if (__wait_for_cpus (&late_cpus_in,NSEC_PER_SEC ))return -1 ; -spin_lock (&update_lock); +raw_spin_lock (&update_lock);apply_microcode_local (&err); -spin_unlock (&update_lock); +raw_spin_unlock (&update_lock);/* siblings return UCODE_OK because their engine got updated already */ if (err >UCODE_NFOUND ) {
arch/x86/kvm/mmu.c +1 -1
@@ -891,7 +891,7 @@ static int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache,if (cache->nobjs >= min)return 0 ;while (cache->nobjs <ARRAY_SIZE (cache->objects)) { - page = (void *)__get_free_page (GFP_KERNEL ); + page = (void *)__get_free_page (GFP_KERNEL_ACCOUNT );if (!page)return -ENOMEM ; cache->objects[cache->nobjs++] = page;
arch/x86/kvm/svm.c +7 -1
@@ -1768,7 +1768,10 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,unsigned long npages, npinned, size;unsigned long locked, lock_limit;struct page **pages; -int first, last; +unsigned long first, last; + +if (ulen ==0 || uaddr + ulen < uaddr) +return NULL ;/* Calculate number of pages. */ first = (uaddr &PAGE_MASK ) >>PAGE_SHIFT ;
@@ -6947,6 +6950,9 @@ static int svm_register_enc_region(struct kvm *kvm,if (!sev_guest (kvm))return -ENOTTY ; +if (range->addr >ULONG_MAX || range->size >ULONG_MAX ) +return -EINVAL ; + region =kzalloc (sizeof (*region),GFP_KERNEL );if (!region)return -ENOMEM ;
block/bfq-iosched.c +0 -2
@@ -1898,7 +1898,6 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,if (!RB_EMPTY_NODE (&rq->rb_node)) goto end; -spin_lock_irq (&bfqq->bfqd->lock);/* * If next and rq belong to the same bfq_queue and next is older
@@ -1923,7 +1922,6 @@ static void bfq_requests_merged(struct request_queue *q, struct request *rq,bfq_remove_request (q, next);bfqg_stats_update_io_remove (bfqq_group (bfqq), next->cmd_flags); -spin_unlock_irq (&bfqq->bfqd->lock); end:bfqg_stats_update_io_merged (bfqq_group (bfqq), next->cmd_flags); }
block/bio.c +9 -10
@@ -881,16 +881,16 @@ EXPORT_SYMBOL(bio_add_page);*/ int bio_iov_iter_get_pages (struct bio *bio,struct iov_iter *iter) { -unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt; +unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt, idx;struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;struct page **pages = (struct page **)bv; -size_t offset, diff; +size_t offset;ssize_t size; size =iov_iter_get_pages (iter, pages,LONG_MAX , nr_pages, &offset);if (unlikely (size <=0 ))return size ? size : -EFAULT ; - nr_pages = (size + offset +PAGE_SIZE -1 ) /PAGE_SIZE ; + idx = nr_pages = (size + offset +PAGE_SIZE -1 ) /PAGE_SIZE ;/* * Deep magic below: We need to walk the pinned pages backwards
@@ -903,17 +903,15 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) bio->bi_iter.bi_size += size; bio->bi_vcnt += nr_pages; - diff = (nr_pages *PAGE_SIZE - offset) - size; -while (nr_pages--) { - bv[nr_pages].bv_page = pages[nr_pages]; - bv[nr_pages].bv_len =PAGE_SIZE ; - bv[nr_pages].bv_offset =0 ; +while (idx--) { + bv[idx].bv_page = pages[idx]; + bv[idx].bv_len =PAGE_SIZE ; + bv[idx].bv_offset =0 ; } bv[0 ].bv_offset += offset; bv[0 ].bv_len -= offset; -if (diff) - bv[bio->bi_vcnt -1 ].bv_len -= diff; + bv[nr_pages -1 ].bv_len -= nr_pages *PAGE_SIZE - offset - size;iov_iter_advance (iter, size);return 0 ;
@@ -1808,6 +1806,7 @@ struct bio *bio_split(struct bio *bio, int sectors,bio_integrity_trim (split);bio_advance (bio, split->bi_iter.bi_size); + bio->bi_iter.bi_done =0 ;if (bio_flagged (bio,BIO_TRACE_COMPLETION ))bio_set_flag (split,BIO_TRACE_COMPLETION );
crypto/authenc.c +1 -0
@@ -108,6 +108,7 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key, CRYPTO_TFM_RES_MASK); out: +memzero_explicit (&keys,sizeof (keys));return err; badkey:
crypto/authencesn.c +1 -0
@@ -90,6 +90,7 @@ static int crypto_authenc_esn_setkey(struct crypto_aead *authenc_esn, const u8 * CRYPTO_TFM_RES_MASK); out: +memzero_explicit (&keys,sizeof (keys));return err; badkey:
drivers/acpi/acpi_lpss.c +22 -10
@@ -70,6 +70,10 @@ ACPI_MODULE_NAME("acpi_lpss");#define LPSS_SAVE_CTX BIT(4)#define LPSS_NO_D3_DELAY BIT(5) +/* Crystal Cove PMIC shares same ACPI ID between different platforms */ +#define BYT_CRC_HRV 2 +#define CHT_CRC_HRV 3 +struct lpss_private_data ;struct lpss_device_desc {
@@ -163,7 +167,7 @@ static void byt_pwm_setup(struct lpss_private_data *pdata)if (!adev->pnp.unique_id ||strcmp (adev->pnp.unique_id,"1" ))return ; -if (!acpi_dev_present ("INT33FD" ,NULL ,-1 )) +if (!acpi_dev_present ("INT33FD" ,NULL ,BYT_CRC_HRV ))pwm_add_table (byt_pwm_lookup,ARRAY_SIZE (byt_pwm_lookup)); }
@@ -875,6 +879,7 @@ static void acpi_lpss_dismiss(struct device *dev)#define LPSS_GPIODEF0_DMA_LLP BIT(13)static DEFINE_MUTEX (lpss_iosf_mutex); +static bool lpss_iosf_d3_entered;static void lpss_iosf_enter_d3_state (void ) {
@@ -917,6 +922,9 @@ static void lpss_iosf_enter_d3_state(void)iosf_mbi_modify (LPSS_IOSF_UNIT_LPIOEP ,MBI_CR_WRITE ,LPSS_IOSF_GPIODEF0 , value1, mask1); + + lpss_iosf_d3_entered = true; + exit:mutex_unlock (&lpss_iosf_mutex); }
@@ -931,6 +939,11 @@ static void lpss_iosf_exit_d3_state(void)mutex_lock (&lpss_iosf_mutex); +if (!lpss_iosf_d3_entered) + goto exit; + + lpss_iosf_d3_entered = false; +iosf_mbi_modify (LPSS_IOSF_UNIT_LPIOEP ,MBI_CR_WRITE ,LPSS_IOSF_GPIODEF0 , value1, mask1);
@@ -940,13 +953,13 @@ static void lpss_iosf_exit_d3_state(void)iosf_mbi_modify (LPSS_IOSF_UNIT_LPIO1 ,MBI_CFG_WRITE ,LPSS_IOSF_PMCSR , value2, mask2); +exit:mutex_unlock (&lpss_iosf_mutex); } -static int acpi_lpss_suspend (struct device *dev,bool runtime) +static int acpi_lpss_suspend (struct device *dev,bool wakeup) {struct lpss_private_data *pdata =acpi_driver_data (ACPI_COMPANION (dev)); -bool wakeup = runtime ||device_may_wakeup (dev);int ret;if (pdata->dev_desc->flags &LPSS_SAVE_CTX )
@@ -959,14 +972,14 @@ static int acpi_lpss_suspend(struct device *dev, bool runtime)* wrong status for devices being about to be powered off. See * lpss_iosf_enter_d3_state() for further information. */ -if ((runtime || !pm_suspend_via_firmware ()) && +if (acpi_target_system_state () ==ACPI_STATE_S0 && lpss_quirks &LPSS_QUIRK_ALWAYS_POWER_ON &&iosf_mbi_available ())lpss_iosf_enter_d3_state ();return ret; } -static int acpi_lpss_resume (struct device *dev,bool runtime) +static int acpi_lpss_resume (struct device *dev) {struct lpss_private_data *pdata =acpi_driver_data (ACPI_COMPANION (dev));int ret;
@@ -975,8 +988,7 @@ static int acpi_lpss_resume(struct device *dev, bool runtime)* This call is kept first to be in symmetry with * acpi_lpss_runtime_suspend() one. */ -if ((runtime || !pm_resume_via_firmware ()) && - lpss_quirks &LPSS_QUIRK_ALWAYS_POWER_ON &&iosf_mbi_available ()) +if (lpss_quirks &LPSS_QUIRK_ALWAYS_POWER_ON &&iosf_mbi_available ())lpss_iosf_exit_d3_state (); ret =acpi_dev_resume (dev);
@@ -1000,12 +1012,12 @@ static int acpi_lpss_suspend_late(struct device *dev)return 0 ; ret =pm_generic_suspend_late (dev); -return ret ? ret :acpi_lpss_suspend (dev, false); +return ret ? ret :acpi_lpss_suspend (dev,device_may_wakeup (dev)); }static int acpi_lpss_resume_early (struct device *dev) { -int ret =acpi_lpss_resume (dev, false); +int ret =acpi_lpss_resume (dev);return ret ? ret :pm_generic_resume_early (dev); }
@@ -1020,7 +1032,7 @@ static int acpi_lpss_runtime_suspend(struct device *dev)static int acpi_lpss_runtime_resume (struct device *dev) { -int ret =acpi_lpss_resume (dev, true); +int ret =acpi_lpss_resume (dev);return ret ? ret :pm_generic_runtime_resume (dev); }
drivers/acpi/acpica/psloop.c +12 -7
@@ -709,15 +709,20 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state) }else if ((walk_state-> parse_flags &ACPI_PARSE_MODULE_LEVEL ) + && status !=AE_CTRL_TRANSFER &&ACPI_FAILURE (status)) {/* -* ACPI_PARSE_MODULE_LEVEL means that we are loading a table by -* executing it as a control method. However, if we encounter -* an error while loading the table, we need to keep trying to -* load the table rather than aborting the table load. Set the -* status to AE_OK to proceed with the table load. If we get a -* failure at this point, it means that the dispatcher got an -* error while processing Op (most likely an AML operand error. +* ACPI_PARSE_MODULE_LEVEL flag means that we are currently +* loading a table by executing it as a control method. +* However, if we encounter an error while loading the table, +* we need to keep trying to load the table rather than +* aborting the table load (setting the status to AE_OK +* continues the table load). If we get a failure at this +* point, it means that the dispatcher got an error while +* processing Op (most likely an AML operand error) or a +* control method was called from module level and the +* dispatcher returned AE_CTRL_TRANSFER. In the latter case, +* leave the status alone, there's nothing wrong with it. */ status =AE_OK ; }
drivers/acpi/pci_root.c +3 -1
@@ -472,9 +472,11 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm) } control =OSC_PCI_EXPRESS_CAPABILITY_CONTROL - |OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |OSC_PCI_EXPRESS_PME_CONTROL ; +if (IS_ENABLED (CONFIG_HOTPLUG_PCI_PCIE )) + control |=OSC_PCI_EXPRESS_NATIVE_HP_CONTROL ; +if (pci_aer_available ()) {if (aer_acpi_firmware_first ()) dev_info(&device->dev,
drivers/ata/libata-eh.c +8 -4
@@ -2218,12 +2218,16 @@ static void ata_eh_link_autopsy(struct ata_link *link)if (qc->err_mask & ~AC_ERR_OTHER ) qc->err_mask &= ~AC_ERR_OTHER ; -/* SENSE_VALID trumps dev/unknown error and revalidation */ +/* +* SENSE_VALID trumps dev/unknown error and revalidation. Upper +* layers will determine whether the command is worth retrying +* based on the sense data and device class/type. Otherwise, +* determine directly if the command is worth retrying using its +* error mask and flags. +*/ if (qc->flags &ATA_QCFLAG_SENSE_VALID ) qc->err_mask &= ~(AC_ERR_DEV |AC_ERR_OTHER ); - -/* determine whether the command is worth retrying */ -if (ata_eh_worth_retry (qc)) +else if (ata_eh_worth_retry (qc)) qc->flags |=ATA_QCFLAG_RETRY ;/* accumulate error info */
drivers/bluetooth/btusb.c +4 -0
@@ -276,6 +276,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3015), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x04ca, 0x3016), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x04ca, 0x301a), .driver_info = BTUSB_QCA_ROME }, /* Broadcom BCM2035 */ { USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
@@ -371,6 +372,9 @@ static const struct usb_device_id blacklist_table[] = {/* Additional Realtek 8723BU Bluetooth devices */ { USB_DEVICE(0x7392, 0xa611), .driver_info = BTUSB_REALTEK }, + /* Additional Realtek 8723DE Bluetooth devices */ + { USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK }, + /* Additional Realtek 8821AE Bluetooth devices */ { USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x13d3, 0x3414), .driver_info = BTUSB_REALTEK },
drivers/bluetooth/hci_qca.c +1 -1
@@ -880,7 +880,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)*/ set_current_state (TASK_UNINTERRUPTIBLE );schedule_timeout (msecs_to_jiffies (BAUDRATE_SETTLE_TIMEOUT_MS )); -set_current_state (TASK_INTERRUPTIBLE ); +set_current_state (TASK_RUNNING );return 0 ; }
drivers/char/random.c +9 -1
@@ -1895,14 +1895,22 @@ static int write_pool(struct entropy_store *r, const char __user *buffer, size_t count) { size_t bytes; -__u32 buf[16 ]; +__u32 t, buf[16 ];const char __user *p = buffer;while (count >0 ) { +int b, i =0 ; + bytes =min (count,sizeof (buf));if (copy_from_user (&buf, p, bytes))return -EFAULT ; +for (b = bytes ; b >0 ; b -=sizeof (__u32), i++) { +if (!arch_get_random_int (&t)) +break ; + buf[i] ^= t; + } + count -= bytes; p += bytes;
drivers/clk/clk-si544.c +1 -0
@@ -207,6 +207,7 @@ static int si544_calc_muldiv(struct clk_si544_muldiv *settings,/* And the fractional bits using the remainder */ vco = (u64 )tmp <<32 ; + vco +=FXO /2 ;/* Round to nearest multiple */ do_div (vco,FXO ); settings->fb_div_frac = vco;
drivers/clk/ingenic/jz4770-cgu.c +2 -1
@@ -194,9 +194,10 @@ static const struct ingenic_cgu_clk_info jz4770_cgu_clocks[] = { .div = { CGU_REG_CPCCR, 16, 1, 4, 22, -1, -1 }, }, [JZ4770_CLK_C1CLK] = { -"c1clk" ,CGU_CLK_DIV , +"c1clk" ,CGU_CLK_DIV |CGU_CLK_GATE , .parents = { JZ4770_CLK_PLL0, }, .div = { CGU_REG_CPCCR, 12, 1, 4, 22, -1, -1 }, + .gate = { CGU_REG_OPCR, 31, true }, // disable CCLK stop on idle }, [JZ4770_CLK_PCLK] = { "pclk", CGU_CLK_DIV,
drivers/edac/altera_edac.c +1 -1
@@ -1106,7 +1106,7 @@ static void *ocram_alloc_mem(size_t size, void **other)static void ocram_free_mem (void *p,size_t size,void *other) { -gen_pool_free ((struct gen_pool *)other, (u32 )p, size); +gen_pool_free ((struct gen_pool *)other, (unsigned long )p, size); }static const struct edac_device_prv_data ocramecc_data = {
drivers/gpio/gpio-uniphier.c +5 -1
@@ -181,7 +181,11 @@ static int uniphier_gpio_to_irq(struct gpio_chip *chip, unsigned int offset) fwspec.fwnode =of_node_to_fwnode (chip->parent->of_node); fwspec.param_count =2 ; fwspec.param[0 ] = offset -UNIPHIER_GPIO_IRQ_OFFSET ; - fwspec.param[1 ] =IRQ_TYPE_NONE ; +/* +* IRQ_TYPE_NONE is rejected by the parent irq domain. Set LEVEL_HIGH +* temporarily. Anyway, ->irq_set_type() will override it later. +*/ + fwspec.param[1 ] =IRQ_TYPE_LEVEL_HIGH ;return irq_create_fwspec_mapping (&fwspec); }
drivers/gpio/gpiolib-of.c +2 -1
@@ -64,7 +64,8 @@ static void of_gpio_flags_quirks(struct device_node *np,* Note that active low is the default. */ if (IS_ENABLED (CONFIG_REGULATOR ) && - (of_device_is_compatible (np,"reg-fixed-voltage" ) || + (of_device_is_compatible (np,"regulator-fixed" ) || +of_device_is_compatible (np,"reg-fixed-voltage" ) ||of_device_is_compatible (np,"regulator-gpio" ))) {/* * The regulator GPIO handles are specified such that the
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c +9 -8
@@ -316,7 +316,7 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)unsigned long end = addr +amdgpu_bo_size (bo) -1 ;struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);struct amdgpu_mn *rmn; -struct amdgpu_mn_node *node =NULL ; +struct amdgpu_mn_node *node =NULL , *new_node;struct list_head bos;struct interval_tree_node *it;
@@ -324,6 +324,10 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)if (IS_ERR (rmn))return PTR_ERR (rmn); + new_node =kmalloc (sizeof (*new_node),GFP_KERNEL ); +if (!new_node) +return -ENOMEM ; +INIT_LIST_HEAD (&bos);down_write (&rmn->lock);
@@ -337,13 +341,10 @@ int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr)list_splice (&node->bos, &bos); } -if (!node) { - node =kmalloc (sizeof (struct amdgpu_mn_node ),GFP_KERNEL ); -if (!node) { -up_write (&rmn->lock); -return -ENOMEM ; - } - } +if (!node) + node = new_node; +else +kfree (new_node); bo->mn = rmn;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +6 -2
@@ -689,8 +689,12 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,return -EINVAL ;/* A shared bo cannot be migrated to VRAM */ -if (bo->prime_shared_count && (domain ==AMDGPU_GEM_DOMAIN_VRAM )) -return -EINVAL ; +if (bo->prime_shared_count) { +if (domain &AMDGPU_GEM_DOMAIN_GTT ) + domain =AMDGPU_GEM_DOMAIN_GTT ; +else +return -EINVAL ; + }if (bo->pin_count) {uint32_t mem_type = bo->tbo.mem.mem_type;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +5 -3
@@ -4037,7 +4037,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, }spin_unlock_irqrestore (&crtc->dev->event_lock, flags); -if (!pflip_needed) { +if (!pflip_needed || plane->type ==DRM_PLANE_TYPE_OVERLAY ) {WARN_ON (!dm_new_plane_state->dc_state); plane_states_constructed[planes_count] = dm_new_plane_state->dc_state;
@@ -4783,7 +4783,8 @@ static int dm_update_planes_state(struct dc *dc,/* Remove any changed/removed planes */ if (!enable) { -if (pflip_needed) +if (pflip_needed && + plane->type !=DRM_PLANE_TYPE_OVERLAY )continue ;if (!old_plane_crtc)
@@ -4830,7 +4831,8 @@ static int dm_update_planes_state(struct dc *dc,if (!dm_new_crtc_state->stream)continue ; -if (pflip_needed) +if (pflip_needed && + plane->type !=DRM_PLANE_TYPE_OVERLAY )continue ;WARN_ON (dm_new_plane_state->dc_state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c +3 -0
@@ -555,6 +555,9 @@ static inline int dm_irq_state(struct amdgpu_device *adev,return 0 ; } +if (acrtc->otg_inst ==-1 ) +return 0 ; + irq_source = dal_irq_type + acrtc->otg_inst; st = (state ==AMDGPU_IRQ_STATE_ENABLE );
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +3 -1
@@ -279,7 +279,9 @@ dce110_set_input_transfer_func(struct pipe_ctx *pipe_ctx,build_prescale_params (&prescale_params, plane_state); ipp->funcs->ipp_program_prescale (ipp, &prescale_params); -if (plane_state->gamma_correction &&dce_use_lut (plane_state->format)) +if (plane_state->gamma_correction && + !plane_state->gamma_correction->is_identity && +dce_use_lut (plane_state->format)) ipp->funcs->ipp_program_input_lut (ipp, plane_state->gamma_correction);if (tf ==NULL ) {
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +5 -2
@@ -3715,14 +3715,17 @@ static int smu7_trim_dpm_states(struct pp_hwmgr *hwmgr,static int smu7_generate_dpm_level_enable_mask (struct pp_hwmgr *hwmgr,const void *input) { -int result; +int result =0 ;const struct phm_set_power_state_input *states = (const struct phm_set_power_state_input *)input;struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);const struct smu7_power_state *smu7_ps =cast_const_phw_smu7_power_state (states->pnew_state); - result =smu7_trim_dpm_states (hwmgr, smu7_ps); +/*skip the trim if od is enabled*/ +if (!hwmgr->od_enabled) + result =smu7_trim_dpm_states (hwmgr, smu7_ps); +if (result)return result;
drivers/gpu/drm/drm_atomic.c +3 -1
@@ -1429,7 +1429,9 @@ drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, {struct drm_plane *plane = plane_state->plane;struct drm_crtc_state *crtc_state; - +/* Nothing to do for same crtc*/ +if (plane_state->crtc == crtc) +return 0 ;if (plane_state->crtc) { crtc_state =drm_atomic_get_crtc_state (plane_state->state, plane_state->crtc);
drivers/gpu/drm/drm_atomic_helper.c +39 -39
118 lines not on this page · raw message
drivers/gpu/drm/drm_dp_mst_topology.c +5 -4
@@ -2941,12 +2941,14 @@ static void drm_dp_mst_dump_mstb(struct seq_file *m, } } +#define DP_PAYLOAD_TABLE_SIZE 64 +static bool dump_dp_payload_table (struct drm_dp_mst_topology_mgr *mgr,char *buf) {int i; -for (i =0 ; i <64 ; i +=16 ) { +for (i =0 ; i <DP_PAYLOAD_TABLE_SIZE ; i +=16 ) {if (drm_dp_dpcd_read (mgr->aux,DP_PAYLOAD_TABLE_UPDATE_STATUS + i, &buf[i],16 ) !=16 )
@@ -3015,7 +3017,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,mutex_lock (&mgr->lock);if (mgr->mst_primary) { -u8 buf[64 ]; +u8 buf[DP_PAYLOAD_TABLE_SIZE ];int ret; ret =drm_dp_dpcd_read (mgr->aux,DP_DPCD_REV , buf,DP_RECEIVER_CAP_SIZE );
@@ -3033,8 +3035,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,seq_printf (m," revision: hw: %x.%x sw: %x.%x\n" , buf[0x9 ] >>4 , buf[0x9 ] &0xf , buf[0xa ], buf[0xb ]);if (dump_dp_payload_table (mgr, buf)) -seq_printf (m,"payload table: %*ph\n" ,63 , buf); - +seq_printf (m,"payload table: %*ph\n" ,DP_PAYLOAD_TABLE_SIZE , buf); }mutex_unlock (&mgr->lock);
drivers/gpu/drm/gma500/psb_intel_drv.h +1 -1
@@ -255,7 +255,7 @@ extern int intelfb_remove(struct drm_device *dev,extern bool psb_intel_lvds_mode_fixup (struct drm_encoder *encoder,const struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode); -extern int psb_intel_lvds_mode_valid (struct drm_connector *connector, +extern enum drm_mode_status psb_intel_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode); extern int psb_intel_lvds_set_property(struct drm_connector *connector, struct drm_property *property,
drivers/gpu/drm/gma500/psb_intel_lvds.c +1 -1
@@ -343,7 +343,7 @@ static void psb_intel_lvds_restore(struct drm_connector *connector) } } -int psb_intel_lvds_mode_valid (struct drm_connector *connector, +enum drm_mode_status psb_intel_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {struct drm_psb_private *dev_priv = connector->dev->dev_private;
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -804,6 +804,7 @@ enum intel_sbi_destination {#define QUIRK_BACKLIGHT_PRESENT (1<<3)#define QUIRK_PIN_SWIZZLED_PAGES (1<<5)#define QUIRK_INCREASE_T12_DELAY (1<<6) +#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)struct intel_fbdev ;struct intel_fbc_work ;
drivers/gpu/drm/i915/intel_ddi.c +11 -2
@@ -1605,15 +1605,24 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); } -void intel_ddi_disable_transcoder_func (struct drm_i915_private *dev_priv, -enum transcoder cpu_transcoder) +void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state) { +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder);uint32_t val =I915_READ (reg); val &= ~(TRANS_DDI_FUNC_ENABLE |TRANS_DDI_PORT_MASK |TRANS_DDI_DP_VC_PAYLOAD_ALLOC ); val |=TRANS_DDI_PORT_NONE ;I915_WRITE (reg, val); + +if (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME && +intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +DRM_DEBUG_KMS ("Quirk Increase DDI disabled time\n" ); +/* Quirk time at 100ms for reliable operation */ +msleep (100 ); + } } int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,
drivers/gpu/drm/i915/intel_display.c +20 -1
@@ -5685,7 +5685,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,intel_ddi_set_vc_payload_alloc (intel_crtc->config, false);if (!transcoder_is_dsi (cpu_transcoder)) -intel_ddi_disable_transcoder_func (dev_priv, cpu_transcoder); +intel_ddi_disable_transcoder_func (old_crtc_state);if (INTEL_GEN (dev_priv) >=9 )skylake_scaler_disable (intel_crtc);
@@ -14388,6 +14388,18 @@ static void quirk_increase_t12_delay(struct drm_device *dev)DRM_INFO ("Applying T12 delay quirk\n" ); } +/* +* GeminiLake NUC HDMI outputs require additional off time +* this allows the onboard retimer to correctly sync to signal +*/ +static void quirk_increase_ddi_disabled_time (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv =to_i915 (dev); + + dev_priv->quirks |=QUIRK_INCREASE_DDI_DISABLED_TIME ; +DRM_INFO ("Applying Increase DDI Disabled quirk\n" ); +} +struct intel_quirk {int device;int subsystem_vendor;
@@ -14474,6 +14486,13 @@ static struct intel_quirk intel_quirks[] = {/* Toshiba Satellite P50-C-18C */ { 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay }, + +/* GeminiLake NUC */ + { 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time }, + { 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time }, +/* ASRock ITX*/ + { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, + { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, };static void intel_init_quirks (struct drm_device *dev)
drivers/gpu/drm/i915/intel_drv.h +1 -2
@@ -1368,8 +1368,7 @@ void hsw_fdi_link_train(struct intel_crtc *crtc,void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);bool intel_ddi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe);void intel_ddi_enable_transcoder_func (const struct intel_crtc_state *crtc_state); -void intel_ddi_disable_transcoder_func (struct drm_i915_private *dev_priv, -enum transcoder cpu_transcoder); +void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state);void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state);void intel_ddi_disable_pipe_clock (const struct intel_crtc_state *crtc_state); struct intel_encoder *
drivers/gpu/drm/nouveau/nouveau_dma.c +1 -9
@@ -80,18 +80,10 @@ READ_GET(struct nouveau_channel *chan, uint64_t *prev_get, int *timeout) }void -nv50_dma_push (struct nouveau_channel *chan,struct nouveau_bo *bo, -int delta,int length) +nv50_dma_push (struct nouveau_channel *chan,u64 offset,int length) { -struct nouveau_cli *cli = (void *)chan->user.client;struct nouveau_bo *pb = chan->push.buffer; -struct nouveau_vma *vma;int ip = (chan->dma.ib_put *2 ) + chan->dma.ib_base; -u64 offset; - - vma =nouveau_vma_find (bo, &cli->vmm); -BUG_ON (!vma); - offset = vma->addr + delta;BUG_ON (chan->dma.ib_free <1 );
drivers/gpu/drm/nouveau/nouveau_dma.h +2 -3
@@ -31,8 +31,7 @@#include "nouveau_chan.h" int nouveau_dma_wait (struct nouveau_channel *,int slots,int size); -void nv50_dma_push (struct nouveau_channel *,struct nouveau_bo *, -int delta,int length); +void nv50_dma_push (struct nouveau_channel *,u64 addr,int length);/* * There's a hw race condition where you can't jump to your PUT offset,
@@ -151,7 +150,7 @@ FIRE_RING(struct nouveau_channel *chan) chan->accel_done = true;if (chan->dma.ib_max) { -nv50_dma_push (chan, chan->push.buffer, chan->dma.put <<2 , +nv50_dma_push (chan, chan->push.addr + (chan->dma.put <<2 ), (chan->dma.cur - chan->dma.put) <<2 ); }else {WRITE_PUT (chan->dma.cur);
drivers/gpu/drm/nouveau/nouveau_drm.c +14 -16
@@ -116,24 +116,22 @@ nouveau_name(struct drm_device *dev) }static inline bool -nouveau_cli_work_ready (struct dma_fence *fence,bool wait) +nouveau_cli_work_ready (struct dma_fence *fence) { -if (!dma_fence_is_signaled (fence)) { -if (!wait) -return false; -WARN_ON (dma_fence_wait_timeout (fence, false,2 *HZ ) <=0 ); - } +if (!dma_fence_is_signaled (fence)) +return false;dma_fence_put (fence);return true; }static void -nouveau_cli_work_flush (struct nouveau_cli *cli,bool wait) +nouveau_cli_work (struct work_struct *w) { +struct nouveau_cli *cli =container_of (w,typeof (*cli), work);struct nouveau_cli_work *work, *wtmp;mutex_lock (&cli->lock);list_for_each_entry_safe (work, wtmp, &cli->worker, head) { -if (!work->fence ||nouveau_cli_work_ready (work->fence, wait)) { +if (!work->fence ||nouveau_cli_work_ready (work->fence)) {list_del (&work->head); work->func (work); }
@@ -161,17 +159,17 @@ nouveau_cli_work_queue(struct nouveau_cli *cli, struct dma_fence *fence,mutex_unlock (&cli->lock); } -static void -nouveau_cli_work (struct work_struct *w) -{ -struct nouveau_cli *cli =container_of (w,typeof (*cli), work); -nouveau_cli_work_flush (cli, false); -} -static void nouveau_cli_fini (struct nouveau_cli *cli) { -nouveau_cli_work_flush (cli, true); +/* All our channels are dead now, which means all the fences they +* own are signalled, and all callback functions have been called. +* +* So, after flushing the workqueue, there should be nothing left. +*/ +flush_work (&cli->work); +WARN_ON (!list_empty (&cli->worker)); +usif_client_fini (cli);nouveau_vmm_fini (&cli->vmm);nvif_mmu_fini (&cli->mmu);
drivers/gpu/drm/nouveau/nouveau_gem.c +16 -3
@@ -432,7 +432,20 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, } } - b->user_priv = (uint64_t )(unsigned long )nvbo; +if (cli->vmm.vmm.object.oclass >=NVIF_CLASS_VMM_NV50 ) { +struct nouveau_vmm *vmm = &cli->vmm; +struct nouveau_vma *vma =nouveau_vma_find (nvbo, vmm); +if (!vma) { +NV_PRINTK (err, cli,"vma not found!\n" ); + ret = -EINVAL ; +break ; + } + + b->user_priv = (uint64_t )(unsigned long )vma; + }else { + b->user_priv = (uint64_t )(unsigned long )nvbo; + } + nvbo->reserved_by = file_priv; nvbo->pbbo_index = i; if ((b->valid_domains & NOUVEAU_GEM_DOMAIN_VRAM) &&
@@ -763,10 +776,10 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, }for (i =0 ; i < req->nr_push; i++) { -struct nouveau_bo *nvbo = (void *)(unsigned long ) +struct nouveau_vma *vma = (void *)(unsigned long ) bo[push[i].bo_index].user_priv; -nv50_dma_push (chan, nvbo, push[i].offset, +nv50_dma_push (chan, vma->addr + push[i].offset, push[i].length); } }else
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +4 -4
@@ -155,10 +155,10 @@ gk104_fifo_runlist_commit(struct gk104_fifo *fifo, int runl) (target << 28));nvkm_wr32 (device,0x002274 , (runl <<20 ) | nr); -if (wait_event_timeout (fifo->runlist[runl].wait, - !(nvkm_rd32 (device,0x002284 + (runl *0x08 )) - &0x00100000 ), -msecs_to_jiffies (2000 )) ==0 ) +if (nvkm_msec (device,2000 , + if (!(nvkm_rd32(device, 0x002284 + (runl * 0x08)) & 0x00100000)) + break; + ) <0 )nvkm_error (subdev,"runlist %d update timeout\n" , runl); unlock:mutex_unlock (&subdev->mutex);
drivers/gpu/drm/radeon/radeon_connectors.c +5 -5
@@ -852,7 +852,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)return ret; } -static int radeon_lvds_mode_valid (struct drm_connector *connector, +static enum drm_mode_status radeon_lvds_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {struct drm_encoder *encoder =radeon_best_single_encoder (connector);
@@ -1012,7 +1012,7 @@ static int radeon_vga_get_modes(struct drm_connector *connector)return ret; } -static int radeon_vga_mode_valid (struct drm_connector *connector, +static enum drm_mode_status radeon_vga_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {struct drm_device *dev = connector->dev;
@@ -1156,7 +1156,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)return 1 ; } -static int radeon_tv_mode_valid (struct drm_connector *connector, +static enum drm_mode_status radeon_tv_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {if ((mode->hdisplay >1024 ) || (mode->vdisplay >768 ))
@@ -1498,7 +1498,7 @@ static void radeon_dvi_force(struct drm_connector *connector) radeon_connector->use_digital = true; } -static int radeon_dvi_mode_valid (struct drm_connector *connector, +static enum drm_mode_status radeon_dvi_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {struct drm_device *dev = connector->dev;
@@ -1800,7 +1800,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)return ret; } -static int radeon_dp_mode_valid (struct drm_connector *connector, +static enum drm_mode_status radeon_dp_mode_valid (struct drm_connector *connector,struct drm_display_mode *mode) {struct drm_device *dev = connector->dev;
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +9 -0
@@ -358,6 +358,8 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master,analogix_dp_unbind (dp->adp);rockchip_drm_psr_unregister (&dp->encoder); dp->encoder.funcs->destroy (&dp->encoder); + + dp->adp =ERR_PTR (-ENODEV ); }static const struct component_ops rockchip_dp_component_ops = {
@@ -381,6 +383,7 @@ static int rockchip_dp_probe(struct platform_device *pdev)return -ENOMEM ; dp->dev = dev; + dp->adp =ERR_PTR (-ENODEV ); dp->plat_data.panel = panel; ret =rockchip_dp_of_probe (dp);
@@ -404,6 +407,9 @@ static int rockchip_dp_suspend(struct device *dev) {struct rockchip_dp_device *dp =dev_get_drvdata (dev); +if (IS_ERR (dp->adp)) +return 0 ; +return analogix_dp_suspend (dp->adp); }
@@ -411,6 +417,9 @@ static int rockchip_dp_resume(struct device *dev) {struct rockchip_dp_device *dp =dev_get_drvdata (dev); +if (IS_ERR (dp->adp)) +return 0 ; +return analogix_dp_resume (dp->adp); }#endif
drivers/gpu/drm/stm/ltdc.c +0 -3
@@ -392,9 +392,6 @@ static void ltdc_crtc_update_clut(struct drm_crtc *crtc)u32 val;int i; -if (!crtc || !crtc->state) -return ; -if (!crtc->state->color_mgmt_changed || !crtc->state->gamma_lut)return ;
drivers/gpu/host1x/dev.c +10 -1
@@ -223,10 +223,14 @@ static int host1x_probe(struct platform_device *pdev)struct iommu_domain_geometry *geometry;unsigned long order; + err =iova_cache_get (); +if (err <0 ) + goto put_group; + host->domain =iommu_domain_alloc (&platform_bus_type);if (!host->domain) { err = -ENOMEM ; - goto put_group; + goto put_cache; } err =iommu_attach_group (host->domain, host->group);
@@ -234,6 +238,7 @@ static int host1x_probe(struct platform_device *pdev)if (err == -ENODEV ) {iommu_domain_free (host->domain); host->domain =NULL ; +iova_cache_put ();iommu_group_put (host->group); host->group =NULL ; goto skip_iommu;
@@ -308,6 +313,9 @@ static int host1x_probe(struct platform_device *pdev) fail_free_domain:if (host->domain)iommu_domain_free (host->domain); +put_cache: +if (host->group) +iova_cache_put (); put_group:iommu_group_put (host->group);
@@ -328,6 +336,7 @@ static int host1x_remove(struct platform_device *pdev)put_iova_domain (&host->iova);iommu_detach_group (host->domain, host->group);iommu_domain_free (host->domain); +iova_cache_put ();iommu_group_put (host->group); }
drivers/hid/hid-plantronics.c +5 -1
@@ -2,7 +2,7 @@* Plantronics USB HID Driver * * Copyright (c) 2014 JD Cole <[email protected]> -* Copyright (c) 2015 Terry Junge <[email protected]> +* Copyright (c) 2015-2018 Terry Junge <[email protected]> */ /*
@@ -48,6 +48,10 @@ static int plantronics_input_mapping(struct hid_device *hdev,unsigned short mapped_key;unsigned long plt_type = (unsigned long )hid_get_drvdata (hdev); +/* special case for PTT products */ +if (field->application ==HID_GD_JOYSTICK ) + goto defaulted; +/* handle volume up/down mapping */ /* non-standard types or multi-HID interfaces - plt_type is PID */ if (!(plt_type &HID_USAGE_PAGE )) {
drivers/hid/i2c-hid/i2c-hid.c +8 -0
@@ -1054,6 +1054,14 @@ static int i2c_hid_probe(struct i2c_client *client,pm_runtime_enable (&client->dev);device_enable_async_suspend (&client->dev); +/* Make sure there is something at this address */ + ret =i2c_smbus_read_byte (client); +if (ret <0 ) { +dev_dbg (&client->dev,"nothing at this address: %d\n" , ret); + ret = -ENXIO ; + goto err_pm; + } + ret =i2c_hid_fetch_hid_descriptor (ihid);if (ret <0 ) goto err_pm;
drivers/i2c/busses/i2c-rcar.c +51 -3
103 lines not on this page · raw message
drivers/infiniband/core/mad.c +7 -4
@@ -1557,7 +1557,8 @@ static int add_oui_reg_req(struct ib_mad_reg_req *mad_reg_req, mad_reg_req->oui, 3)) { method = &(*vendor_table)->vendor_class[ vclass]->method_table[i]; -BUG_ON (!*method); +if (!*method) + goto error3; goto check_in_use; } }
@@ -1567,10 +1568,12 @@ static int add_oui_reg_req(struct ib_mad_reg_req *mad_reg_req, vclass]->oui[i])) { method = &(*vendor_table)->vendor_class[ vclass]->method_table[i]; -BUG_ON (*method);/* Allocate method table for this OUI */ -if ((ret =allocate_method_table (method))) - goto error3; +if (!*method) { + ret =allocate_method_table (method); +if (ret) + goto error3; + }memcpy ((*vendor_table)->vendor_class[vclass]->oui[i], mad_reg_req->oui,3 ); goto check_in_use;
drivers/infiniband/core/ucma.c +5 -1
@@ -235,7 +235,7 @@ static struct ucma_multicast* ucma_alloc_multicast(struct ucma_context *ctx)return NULL ;mutex_lock (&mut); - mc->id =idr_alloc (&multicast_idr, mc,0 ,0 ,GFP_KERNEL ); + mc->id =idr_alloc (&multicast_idr,NULL ,0 ,0 ,GFP_KERNEL );mutex_unlock (&mut);if (mc->id <0 ) goto error;
@@ -1421,6 +1421,10 @@ static ssize_t ucma_process_join(struct ucma_file *file, goto err3; } +mutex_lock (&mut); +idr_replace (&multicast_idr, mc, mc->id); +mutex_unlock (&mut); +mutex_unlock (&file->mut);ucma_put_ctx (ctx);return 0 ;
drivers/infiniband/core/uverbs_cmd.c +5 -0
@@ -3478,6 +3478,11 @@ int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file, goto err_uobj; } +if (qp->qp_type !=IB_QPT_UD && qp->qp_type !=IB_QPT_RAW_PACKET ) { + err = -EINVAL ; + goto err_put; + } + flow_attr =kzalloc (sizeof (*flow_attr) + cmd.flow_attr.num_of_specs *sizeof (union ib_flow_spec ),GFP_KERNEL );if (!flow_attr) {
drivers/infiniband/sw/rdmavt/Kconfig +1 -1
@@ -1,6 +1,6 @@ config INFINIBAND_RDMAVT tristate "RDMA verbs transport library" - depends on 64BIT + depends on 64BIT && ARCH_DMA_ADDR_T_64BIT depends on PCI select DMA_VIRT_OPS ---help---
drivers/infiniband/sw/rxe/Kconfig +1 -0
@@ -1,6 +1,7 @@ config RDMA_RXE tristate "Software RDMA over Ethernet (RoCE) driver" depends on INET && PCI && INFINIBAND + depends on !64BIT || ARCH_DMA_ADDR_T_64BIT select NET_UDP_TUNNEL select CRYPTO_CRC32 select DMA_VIRT_OPS
drivers/input/mouse/elan_i2c_core.c +2 -0
@@ -1264,6 +1264,8 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN0611", 0 }, { "ELAN0612", 0 }, { "ELAN0618", 0 }, + { "ELAN061D", 0 }, + { "ELAN0622", 0 }, { "ELAN1000", 0 }, { } };
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -527,6 +527,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"), }, }, + { + /* Lenovo LaVie Z */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), + }, + }, { } };
drivers/irqchip/irq-ls-scfg-msi.c +3 -0
@@ -21,6 +21,7 @@#include <linux/of_pci.h> #include <linux/of_platform.h> #include <linux/spinlock.h> +#include <linux/dma-iommu.h> #define MSI_IRQS_PER_MSIR 32#define MSI_MSIR_OFFSET 4
@@ -94,6 +95,8 @@ static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg)if (msi_affinity_flag) msg->data |=cpumask_first (data->common->affinity); + +iommu_dma_map_msi_msg (data->irq, msg); } static int ls_scfg_msi_set_affinity(struct irq_data *irq_data,
drivers/lightnvm/pblk-core.c +4 -2
@@ -278,7 +278,9 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)return ; } -nvm_dev_dma_free (dev->parent, rqd->meta_list, rqd->dma_meta_list); +if (rqd->meta_list) +nvm_dev_dma_free (dev->parent, rqd->meta_list, + rqd->dma_meta_list);mempool_free (rqd, pool); }
@@ -316,7 +318,7 @@ int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags,return 0 ; err: -pblk_bio_free_pages (pblk, bio,0 , i -1 ); +pblk_bio_free_pages (pblk, bio, (bio->bi_vcnt - i), i);return -1 ; }
drivers/lightnvm/pblk-rb.c +2 -3
@@ -142,10 +142,9 @@ static void clean_wctx(struct pblk_w_ctx *w_ctx) {int flags; -try: flags =READ_ONCE (w_ctx->flags); -if (!(flags &PBLK_SUBMITTED_ENTRY )) - goto try; +WARN_ONCE (!(flags &PBLK_SUBMITTED_ENTRY ), +"pblk: overwriting unsubmitted data\n" );/* Release flags on context. Protect from writes and reads */ smp_store_release (&w_ctx->flags,PBLK_WRITABLE_ENTRY );
drivers/lightnvm/pblk-read.c +4 -4
@@ -219,7 +219,7 @@ static int pblk_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, new_bio =bio_alloc (GFP_KERNEL , nr_holes);if (pblk_bio_add_pages (pblk, new_bio,GFP_KERNEL , nr_holes)) - goto err; + goto err_add_pages;if (nr_holes != new_bio->bi_vcnt) {pr_err ("pblk: malformed bio\n" );
@@ -310,10 +310,10 @@ static int pblk_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd,return NVM_IO_OK ; err: -pr_err ("pblk: failed to perform partial read\n" ); -/* Free allocated pages in new bio */ -pblk_bio_free_pages (pblk, bio,0 , new_bio->bi_vcnt); +pblk_bio_free_pages (pblk, new_bio,0 , new_bio->bi_vcnt); +err_add_pages: +pr_err ("pblk: failed to perform partial read\n" );__pblk_end_io_read (pblk, rqd, false);return NVM_IO_ERR ; }
drivers/md/md.c +3 -0
@@ -6525,6 +6525,9 @@ static int hot_remove_disk(struct mddev *mddev, dev_t dev)char b[BDEVNAME_SIZE ];struct md_rdev *rdev; +if (!mddev->pers) +return -ENODEV ; + rdev =find_rdev (mddev, dev);if (!rdev)return -ENXIO ;
drivers/md/raid1.c +2 -0
@@ -2474,6 +2474,8 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio)fix_read_error (conf, r1_bio->read_disk, r1_bio->sector, r1_bio->sectors);unfreeze_array (conf); + }else if (mddev->ro ==0 &&test_bit (FailFast, &rdev->flags)) { +md_error (mddev, rdev); }else { r1_bio->bios[r1_bio->read_disk] =IO_BLOCKED ; }
drivers/media/cec/cec-pin-error-inj.c +18 -15
@@ -81,10 +81,9 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line)u64 *error;u8 *args;bool has_op; -u32 op; +u8 op;u8 mode;u8 pos; -u8 v; p =skip_spaces (p); token =strsep (&p, delims);
@@ -146,12 +145,18 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line) comma =strchr (token,',' );if (comma) *comma++ ='\0' ; -if (!strcmp (token,"any" )) - op =CEC_ERROR_INJ_OP_ANY ; -else if (!kstrtou8 (token,0 , &v)) - op = v; -else +if (!strcmp (token,"any" )) { + has_op = false; + error = pin->error_inj +CEC_ERROR_INJ_OP_ANY ; + args = pin->error_inj_args[CEC_ERROR_INJ_OP_ANY ]; + }else if (!kstrtou8 (token,0 , &op)) { + has_op = true; + error = pin->error_inj + op; + args = pin->error_inj_args[op]; + }else {return false; + } + mode =CEC_ERROR_INJ_MODE_ONCE ;if (comma) {if (!strcmp (comma,"off" ))
@@ -166,10 +171,6 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line)return false; } - error = pin->error_inj + op; - args = pin->error_inj_args[op]; - has_op = op <=0xff ; - token =strsep (&p, delims);if (p) { p =skip_spaces (p);
@@ -203,16 +204,18 @@ bool cec_pin_error_inj_parse_line(struct cec_adapter *adap, char *line) mode_mask =CEC_ERROR_INJ_MODE_MASK << mode_offset; arg_idx = cec_error_inj_cmds[i].arg_idx; -if (mode_offset ==CEC_ERROR_INJ_RX_ARB_LOST_OFFSET || - mode_offset ==CEC_ERROR_INJ_TX_ADD_BYTES_OFFSET ) - is_bit_pos = false; -if (mode_offset ==CEC_ERROR_INJ_RX_ARB_LOST_OFFSET ) {if (has_op)return false;if (!has_pos) pos =0x0f ; + is_bit_pos = false; + }else if (mode_offset ==CEC_ERROR_INJ_TX_ADD_BYTES_OFFSET ) { +if (!has_pos || !pos) +return false; + is_bit_pos = false; } +if (arg_idx >=0 && is_bit_pos) {if (!has_pos || pos >=160 )return false;
drivers/media/common/siano/smsendian.c +7 -7
@@ -35,7 +35,7 @@ void smsendian_handle_tx_message(void *buffer)switch (msg->x_msg_header.msg_type) {case MSG_SMS_DATA_DOWNLOAD_REQ : { - msg->msg_data[0 ] =le32_to_cpu (msg->msg_data[0 ]); + msg->msg_data[0 ] =le32_to_cpu ((__force __le32)(msg->msg_data[0 ]));break ; }
@@ -44,7 +44,7 @@ void smsendian_handle_tx_message(void *buffer) sizeof(struct sms_msg_hdr))/4;for (i =0 ; i < msg_words; i++) - msg->msg_data[i] =le32_to_cpu (msg->msg_data[i]); + msg->msg_data[i] =le32_to_cpu ((__force __le32 )msg->msg_data[i]);break ; }
@@ -64,7 +64,7 @@ void smsendian_handle_rx_message(void *buffer) {struct sms_version_res *ver = (struct sms_version_res *) msg; - ver->chip_model =le16_to_cpu (ver->chip_model); + ver->chip_model =le16_to_cpu ((__force __le16 )ver->chip_model);break ; }
@@ -81,7 +81,7 @@ void smsendian_handle_rx_message(void *buffer) sizeof(struct sms_msg_hdr))/4;for (i =0 ; i < msg_words; i++) - msg->msg_data[i] =le32_to_cpu (msg->msg_data[i]); + msg->msg_data[i] =le32_to_cpu ((__force __le32 )msg->msg_data[i]);break ; }
@@ -95,9 +95,9 @@ void smsendian_handle_message_header(void *msg)#ifdef __BIG_ENDIANstruct sms_msg_hdr *phdr = (struct sms_msg_hdr *)msg; - phdr->msg_type =le16_to_cpu (phdr->msg_type); - phdr->msg_length =le16_to_cpu (phdr->msg_length); - phdr->msg_flags =le16_to_cpu (phdr->msg_flags); + phdr->msg_type =le16_to_cpu ((__force __le16 )phdr->msg_type); + phdr->msg_length =le16_to_cpu ((__force __le16 )phdr->msg_length); + phdr->msg_flags =le16_to_cpu ((__force __le16 )phdr->msg_flags);#endif /* __BIG_ENDIAN */ }EXPORT_SYMBOL_GPL (smsendian_handle_message_header);
drivers/media/common/videobuf2/videobuf2-core.c +6 -3
@@ -916,9 +916,12 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)dprintk (4 ,"done processing on buffer %d, state: %d\n" , vb->index, state); -/* sync buffers */ -for (plane =0 ; plane < vb->num_planes; ++plane) -call_void_memop (vb, finish, vb->planes[plane].mem_priv); +if (state !=VB2_BUF_STATE_QUEUED && + state !=VB2_BUF_STATE_REQUEUEING ) { +/* sync buffers */ +for (plane =0 ; plane < vb->num_planes; ++plane) +call_void_memop (vb, finish, vb->planes[plane].mem_priv); + }spin_lock_irqsave (&q->done_lock, flags); if (state == VB2_BUF_STATE_QUEUED ||
drivers/media/i2c/smiapp/smiapp-core.c +5 -6
@@ -1001,7 +1001,7 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor,if (rval) goto out; -for (i =0 ; i <1000 ; i++) { +for (i =1000 ; i >0 ; i--) { rval =smiapp_read ( sensor,SMIAPP_REG_U8_DATA_TRANSFER_IF_1_STATUS , &s);
@@ -1012,11 +1012,10 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor,if (s &SMIAPP_DATA_TRANSFER_IF_1_STATUS_RD_READY )break ; -if (--i ==0 ) { - rval = -ETIMEDOUT ; - goto out; - } - + } +if (!i) { + rval = -ETIMEDOUT ; + goto out; }for (i =0 ; i <SMIAPP_NVM_PAGE_SIZE ; i++) {
drivers/media/media-device.c +11 -10
@@ -54,9 +54,10 @@ static int media_device_close(struct file *filp)return 0 ; } -static int media_device_get_info (struct media_device *dev, -struct media_device_info *info) +static long media_device_get_info (struct media_device *dev,void *arg) { +struct media_device_info *info = arg; +memset (info,0 ,sizeof (*info));if (dev->driver_name[0 ])
@@ -93,9 +94,9 @@ static struct media_entity *find_entity(struct media_device *mdev, u32 id)return NULL ; } -static long media_device_enum_entities (struct media_device *mdev, -struct media_entity_desc *entd) +static long media_device_enum_entities (struct media_device *mdev,void *arg) { +struct media_entity_desc *entd = arg;struct media_entity *ent; ent =find_entity (mdev, entd->id);
@@ -146,9 +147,9 @@ static void media_device_kpad_to_upad(const struct media_pad *kpad, upad->flags = kpad->flags; } -static long media_device_enum_links (struct media_device *mdev, -struct media_links_enum *links) +static long media_device_enum_links (struct media_device *mdev,void *arg) { +struct media_links_enum *links = arg;struct media_entity *entity; entity =find_entity (mdev, links->entity);
@@ -195,9 +196,9 @@ static long media_device_enum_links(struct media_device *mdev,return 0 ; } -static long media_device_setup_link (struct media_device *mdev, -struct media_link_desc *linkd) +static long media_device_setup_link (struct media_device *mdev,void *arg) { +struct media_link_desc *linkd = arg;struct media_link *link =NULL ;struct media_entity *source;struct media_entity *sink;
@@ -225,9 +226,9 @@ static long media_device_setup_link(struct media_device *mdev,return __media_entity_setup_link (link, linkd->flags); } -static long media_device_get_topology (struct media_device *mdev, -struct media_v2_topology *topo) +static long media_device_get_topology (struct media_device *mdev,void *arg) { +struct media_v2_topology *topo = arg;struct media_entity *entity;struct media_interface *intf;struct media_pad *pad;
drivers/media/pci/saa7164/saa7164-fw.c +2 -1
@@ -426,7 +426,8 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) __func__, fw->size);if (fw->size != fwlength) { -printk (KERN_ERR "xc5000: firmware incorrect size\n" ); +printk (KERN_ERR "saa7164: firmware incorrect size %zu != %u\n" , + fw->size, fwlength); ret = -ENOMEM ; goto out; }
drivers/media/pci/tw686x/tw686x-video.c +2 -1
@@ -1228,7 +1228,8 @@ int tw686x_video_init(struct tw686x_dev *dev) vc->vidq.timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; vc->vidq.min_buffers_needed =2 ; vc->vidq.lock = &vc->vb_mutex; - vc->vidq.gfp_flags =GFP_DMA32 ; + vc->vidq.gfp_flags = dev->dma_mode !=TW686X_DMA_MODE_MEMCPY ? +GFP_DMA32 :0 ; vc->vidq.dev = &dev->pci_dev->dev; err =vb2_queue_init (&vc->vidq);
drivers/media/platform/omap3isp/isp.c +4 -3
@@ -1945,6 +1945,7 @@ static int isp_initialize_modules(struct isp_device *isp)static void isp_detach_iommu (struct isp_device *isp) { +arm_iommu_detach_device (isp->dev);arm_iommu_release_mapping (isp->mapping); isp->mapping =NULL ; }
@@ -1961,8 +1962,7 @@ static int isp_attach_iommu(struct isp_device *isp) mapping =arm_iommu_create_mapping (&platform_bus_type,SZ_1G ,SZ_2G );if (IS_ERR (mapping)) {dev_err (isp->dev,"failed to create ARM IOMMU mapping\n" ); - ret =PTR_ERR (mapping); - goto error; +return PTR_ERR (mapping); } isp->mapping = mapping;
@@ -1977,7 +1977,8 @@ static int isp_attach_iommu(struct isp_device *isp)return 0 ; error: -isp_detach_iommu (isp); +arm_iommu_release_mapping (isp->mapping); + isp->mapping =NULL ;return ret; }
drivers/media/platform/rcar_jpu.c +3 -1
@@ -1280,7 +1280,7 @@ static int jpu_open(struct file *file)/* ...issue software reset */ ret =jpu_reset (jpu);if (ret) - goto device_prepare_rollback; + goto jpu_reset_rollback; } jpu->ref_count++;
@@ -1288,6 +1288,8 @@ static int jpu_open(struct file *file)mutex_unlock (&jpu->mutex);return 0 ; +jpu_reset_rollback: +clk_disable_unprepare (jpu->clk); device_prepare_rollback:mutex_unlock (&jpu->mutex); v4l_prepare_rollback:
drivers/media/platform/renesas-ceu.c +15 -5
@@ -777,8 +777,15 @@ static int ceu_try_fmt(struct ceu_device *ceudev, struct v4l2_format *v4l2_fmt)const struct ceu_fmt *ceu_fmt;int ret; +/* +* Set format on sensor sub device: bus format used to produce memory +* format is selected at initialization time. +*/ struct v4l2_subdev_format sd_format = { - .which =V4L2_SUBDEV_FORMAT_TRY , + .which =V4L2_SUBDEV_FORMAT_TRY , + .format = { + .code = ceu_sd->mbus_fmt.mbus_code, + }, };switch (pix->pixelformat) {
@@ -800,10 +807,6 @@ static int ceu_try_fmt(struct ceu_device *ceudev, struct v4l2_format *v4l2_fmt)v4l_bound_align_image (&pix->width,2 ,CEU_MAX_WIDTH ,4 , &pix->height,4 ,CEU_MAX_HEIGHT ,4 ,0 ); -/* -* Set format on sensor sub device: bus format used to produce memory -* format is selected at initialization time. -*/ v4l2_fill_mbus_format_mplane (&sd_format.format, pix); ret =v4l2_subdev_call (v4l2_sd, pad, set_fmt, &pad_cfg, &sd_format);if (ret)
@@ -827,8 +830,15 @@ static int ceu_set_fmt(struct ceu_device *ceudev, struct v4l2_format *v4l2_fmt)struct v4l2_subdev *v4l2_sd = ceu_sd->v4l2_sd;int ret; +/* +* Set format on sensor sub device: bus format used to produce memory +* format is selected at initialization time. +*/ struct v4l2_subdev_format format = { .which =V4L2_SUBDEV_FORMAT_ACTIVE , + .format = { + .code = ceu_sd->mbus_fmt.mbus_code, + }, }; ret =ceu_try_fmt (ceudev, v4l2_fmt);
drivers/media/radio/si470x/radio-si470x-i2c.c +3 -3
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(max_rds_errors, "RDS maximum block errors: *1*");*/ int si470x_get_register (struct si470x_device *radio,int regnr) { -u16 buf[READ_REG_NUM ]; +__be16 buf[READ_REG_NUM ];struct i2c_msg msgs[1 ] = { { .addr = radio->client->addr,
@@ -116,7 +116,7 @@ int si470x_get_register(struct si470x_device *radio, int regnr)int si470x_set_register (struct si470x_device *radio,int regnr) {int i; -u16 buf[WRITE_REG_NUM ]; +__be16 buf[WRITE_REG_NUM ];struct i2c_msg msgs[1 ] = { { .addr = radio->client->addr,
@@ -146,7 +146,7 @@ int si470x_set_register(struct si470x_device *radio, int regnr)static int si470x_get_all_registers (struct si470x_device *radio) {int i; -u16 buf[READ_REG_NUM ]; +__be16 buf[READ_REG_NUM ];struct i2c_msg msgs[1 ] = { { .addr = radio->client->addr,
drivers/media/rc/ir-mce_kbd-decoder.c +7 -5
@@ -324,11 +324,13 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev) scancode = data->body &0xffff ;dev_dbg (&dev->dev,"keyboard data 0x%08x\n" , data->body); -if (dev->timeout) - delay =usecs_to_jiffies (dev->timeout /1000 ); -else - delay =msecs_to_jiffies (100 ); -mod_timer (&data->rx_timeout, jiffies + delay); +if (scancode) { + delay =nsecs_to_jiffies (dev->timeout) + +msecs_to_jiffies (100 ); +mod_timer (&data->rx_timeout, jiffies + delay); + }else { +del_timer (&data->rx_timeout); + }/* Pass data to keyboard buffer parser */ ir_mce_kbd_process_keyboard_data (dev, scancode); lsc.rc_proto =RC_PROTO_MCIR2_KBD ;
drivers/media/usb/em28xx/em28xx-dvb.c +3 -1
@@ -199,6 +199,7 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)int rc;struct em28xx_i2c_bus *i2c_bus = dvb->adapter.priv;struct em28xx *dev = i2c_bus->dev; +struct usb_device *udev =interface_to_usbdev (dev->intf);int dvb_max_packet_size, packet_multiplier, dvb_alt;if (dev->dvb_xfer_bulk) {
@@ -217,6 +218,7 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb) dvb_alt = dev->dvb_alt_isoc; } +usb_set_interface (udev, dev->ifnum, dvb_alt); rc =em28xx_set_mode (dev,EM28XX_DIGITAL_MODE );if (rc <0 )return rc;
@@ -1392,7 +1394,7 @@ static int em28174_dvb_init_hauppauge_wintv_dualhd_01595(struct em28xx *dev) dvb->i2c_client_tuner =dvb_module_probe ("si2157" ,NULL , adapter, -0x60 , &si2157_config); + addr, &si2157_config);if (!dvb->i2c_client_tuner) {dvb_module_release (dvb->i2c_client_demod);return -ENODEV ;
drivers/memory/tegra/mc.c +5 -17
@@ -20,14 +20,6 @@#include "mc.h" #define MC_INTSTATUS 0x000 -#define MC_INT_DECERR_MTS (1 << 16) -#define MC_INT_SECERR_SEC (1 << 13) -#define MC_INT_DECERR_VPR (1 << 12) -#define MC_INT_INVALID_APB_ASID_UPDATE (1 << 11) -#define MC_INT_INVALID_SMMU_PAGE (1 << 10) -#define MC_INT_ARBITRATION_EMEM (1 << 9) -#define MC_INT_SECURITY_VIOLATION (1 << 8) -#define MC_INT_DECERR_EMEM (1 << 6)#define MC_INTMASK 0x004
@@ -248,12 +240,13 @@ static const char *const error_names[8] = {static irqreturn_t tegra_mc_irq (int irq,void *data) {struct tegra_mc *mc = data; -unsigned long status, mask; +unsigned long status;unsigned int bit;/* mask all interrupts to avoid flooding */ - status =mc_readl (mc,MC_INTSTATUS ); - mask =mc_readl (mc,MC_INTMASK ); + status =mc_readl (mc,MC_INTSTATUS ) & mc->soc->intmask; +if (!status) +return IRQ_NONE ;for_each_set_bit (bit, &status,32 ) {const char *error = status_names[bit] ?:"unknown" ;
@@ -346,7 +339,6 @@ static int tegra_mc_probe(struct platform_device *pdev)const struct of_device_id *match;struct resource *res;struct tegra_mc *mc; -u32 value;int err; match =of_match_node (tegra_mc_of_match, pdev->dev.of_node);
@@ -414,11 +406,7 @@ static int tegra_mc_probe(struct platform_device *pdev)WARN (!mc->soc->client_id_mask,"Missing client ID mask for this SoC\n" ); - value =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | -MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | -MC_INT_SECURITY_VIOLATION |MC_INT_DECERR_EMEM ; - -mc_writel (mc, value,MC_INTMASK ); +mc_writel (mc, mc->soc->intmask,MC_INTMASK );return 0 ; }
drivers/memory/tegra/mc.h +9 -0
@@ -14,6 +14,15 @@#include <soc/tegra/mc.h> +#define MC_INT_DECERR_MTS (1 << 16) +#define MC_INT_SECERR_SEC (1 << 13) +#define MC_INT_DECERR_VPR (1 << 12) +#define MC_INT_INVALID_APB_ASID_UPDATE (1 << 11) +#define MC_INT_INVALID_SMMU_PAGE (1 << 10) +#define MC_INT_ARBITRATION_EMEM (1 << 9) +#define MC_INT_SECURITY_VIOLATION (1 << 8) +#define MC_INT_DECERR_EMEM (1 << 6) +static inline u32 mc_readl (struct tegra_mc *mc,unsigned long offset) {return readl (mc->regs + offset);
drivers/memory/tegra/tegra114.c +2 -0
@@ -945,4 +945,6 @@ const struct tegra_mc_soc tegra114_mc_soc = { .atom_size = 32, .client_id_mask = 0x7f, .smmu = &tegra114_smmu_soc, + .intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION | + MC_INT_DECERR_EMEM, };
drivers/memory/tegra/tegra124.c +6 -0
@@ -1035,6 +1035,9 @@ const struct tegra_mc_soc tegra124_mc_soc = { .smmu = &tegra124_smmu_soc, .emem_regs = tegra124_mc_emem_regs, .num_emem_regs = ARRAY_SIZE(tegra124_mc_emem_regs), + .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, };#endif /* CONFIG_ARCH_TEGRA_124_SOC */
@@ -1059,5 +1062,8 @@ const struct tegra_mc_soc tegra132_mc_soc = { .atom_size = 32, .client_id_mask = 0x7f, .smmu = &tegra132_smmu_soc, + .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, };#endif /* CONFIG_ARCH_TEGRA_132_SOC */
drivers/memory/tegra/tegra210.c +3 -0
@@ -1092,4 +1092,7 @@ const struct tegra_mc_soc tegra210_mc_soc = { .atom_size = 64, .client_id_mask = 0xff, .smmu = &tegra210_smmu_soc, + .intmask =MC_INT_DECERR_MTS |MC_INT_SECERR_SEC |MC_INT_DECERR_VPR | +MC_INT_INVALID_APB_ASID_UPDATE |MC_INT_INVALID_SMMU_PAGE | + MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, };
drivers/memory/tegra/tegra30.c +2 -0
@@ -967,4 +967,6 @@ const struct tegra_mc_soc tegra30_mc_soc = { .atom_size = 16, .client_id_mask = 0x7f, .smmu = &tegra30_smmu_soc, + .intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION | + MC_INT_DECERR_EMEM, };
drivers/mfd/cros_ec.c +5 -1
@@ -112,7 +112,11 @@ int cros_ec_register(struct cros_ec_device *ec_dev)mutex_init (&ec_dev->lock); -cros_ec_query_all (ec_dev); + err =cros_ec_query_all (ec_dev); +if (err) { +dev_err (dev,"Cannot identify the EC: error %d\n" , err); +return err; + }if (ec_dev->irq) { err = request_threaded_irq(ec_dev->irq, NULL, ec_irq_thread,
drivers/mmc/core/pwrseq_simple.c +9 -5
@@ -40,14 +40,18 @@ static void mmc_pwrseq_simple_set_gpios_value(struct mmc_pwrseq_simple *pwrseq,struct gpio_descs *reset_gpios = pwrseq->reset_gpios;if (!IS_ERR (reset_gpios)) { -int i; -int values[reset_gpios->ndescs]; +int i, *values; +int nvalues = reset_gpios->ndescs; -for (i =0 ; i < reset_gpios->ndescs; i++) + values =kmalloc_array (nvalues,sizeof (int ),GFP_KERNEL ); +if (!values) +return ; + +for (i =0 ; i < nvalues; i++) values[i] = value; -gpiod_set_array_value_cansleep ( - reset_gpios->ndescs, reset_gpios->desc, values); +gpiod_set_array_value_cansleep (nvalues, reset_gpios->desc, values); +kfree (values); } }
drivers/mmc/host/dw_mmc.c +4 -0
@@ -1231,6 +1231,8 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)if (host->state ==STATE_WAITING_CMD11_DONE ) sdmmc_cmd_bits |=SDMMC_CMD_VOLT_SWITCH ; + slot->mmc->actual_clock =0 ; +if (!clock) {mci_writel (host,CLKENA ,0 );mci_send_cmd (slot, sdmmc_cmd_bits,0 );
@@ -1289,6 +1291,8 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)/* keep the last clock value that was requested from core */ slot->__clk_old = clock; + slot->mmc->actual_clock = div ? ((host->bus_hz / div) >>1 ) : + host->bus_hz; } host->current_speed = clock;
drivers/mmc/host/sdhci-omap.c +12 -5
@@ -916,10 +916,6 @@ static int sdhci_omap_probe(struct platform_device *pdev) goto err_put_sync; } - ret =sdhci_omap_config_iodelay_pinctrl_state (omap_host); -if (ret) - goto err_put_sync; - host->mmc_host_ops.get_ro = mmc_gpio_get_ro; host->mmc_host_ops.start_signal_voltage_switch = sdhci_omap_start_signal_voltage_switch;
@@ -930,12 +926,23 @@ static int sdhci_omap_probe(struct platform_device *pdev)sdhci_read_caps (host); host->caps |=SDHCI_CAN_DO_ADMA2 ; - ret =sdhci_add_host (host); + ret =sdhci_setup_host (host);if (ret) goto err_put_sync; + ret =sdhci_omap_config_iodelay_pinctrl_state (omap_host); +if (ret) + goto err_cleanup_host; + + ret =__sdhci_add_host (host); +if (ret) + goto err_cleanup_host; +return 0 ; +err_cleanup_host: +sdhci_cleanup_host (host); + err_put_sync:pm_runtime_put_sync (dev);
drivers/mtd/nand/raw/fsl_ifc_nand.c +10 -7
@@ -342,9 +342,16 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command,case NAND_CMD_READID :case NAND_CMD_PARAM : { +/* +* For READID, read 8 bytes that are currently used. +* For PARAM, read all 3 copies of 256-bytes pages. +*/ +int len =8 ;int timing =IFC_FIR_OP_RB ; -if (command ==NAND_CMD_PARAM ) +if (command ==NAND_CMD_PARAM ) { timing =IFC_FIR_OP_RBCD ; + len =256 *3 ; + } ifc_out32((IFC_FIR_OP_CW0 << IFC_NAND_FIR0_OP0_SHIFT) | (IFC_FIR_OP_UA << IFC_NAND_FIR0_OP1_SHIFT) |
@@ -354,12 +361,8 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command, &ifc->ifc_nand.nand_fcr0);ifc_out32 (column, &ifc->ifc_nand.row3); -/* -* although currently it's 8 bytes for READID, we always read -* the maximum 256 bytes(for PARAM) -*/ -ifc_out32 (256 , &ifc->ifc_nand.nand_fbcr); - ifc_nand_ctrl->read_bytes =256 ; +ifc_out32 (len, &ifc->ifc_nand.nand_fbcr); + ifc_nand_ctrl->read_bytes = len;set_addr (mtd,0 ,0 ,0 );fsl_ifc_run_command (mtd);
drivers/net/dsa/qca8k.c +50 -2
50 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_com.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hnae3.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hnae3.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +5 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +10 -7
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +17 -11
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/e1000e/netdev.c +6 -9
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_ptp.c +33 -15
48 lines not on this page · raw message
drivers/net/ethernet/intel/igb/igb_main.c +7 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +8 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -8
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/socionext/netsec.c +15 -8
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/hyperv/netvsc_drv.c +20 -23
43 lines not on this page · raw message
drivers/net/virtio_net.c +23 -18
41 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/core.c +72 -62
134 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/debug.c +7 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/regd_common.h +13 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +3 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +19 -19
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/rs.h +2 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/sta.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/mvm/sta.h +4 -6
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlwifi/pcie/rx.c +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/usb.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/util.c +5 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x2_init.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x2_main.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x2_phy.c +4 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/tx.c +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +14 -7
Lines of this file are not shown. View the raw message.
drivers/net/wireless/quantenna/qtnfmac/event.c +3 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c +4 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rsi/rsi_91x_hal.c +21 -14
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rsi/rsi_91x_mac80211.c +6 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rsi/rsi_91x_sdio.c +14 -9
Lines of this file are not shown. View the raw message.
drivers/nvme/target/fc.c +35 -9
44 lines not on this page · raw message
drivers/platform/x86/dell-smbios-base.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/scsi/megaraid/megaraid_sas_fusion.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +16 -14
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +5 -1
Lines of this file are not shown. View the raw message.
drivers/staging/lustre/lustre/llite/xattr.c +5 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/i2c/gc2235.h +8 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/i2c/ov2680.h +4 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/i2c/ov2722.h +6 -0
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +17 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c +26 -23
49 lines not on this page · raw message
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/vfio/mdev/mdev_core.c +36 -66
102 lines not on this page · raw message
drivers/vfio/platform/vfio_platform_common.c +10 -5
Lines of this file are not shown. View the raw message.
drivers/vfio/vfio_iommu_type1.c +47 -26
73 lines not on this page · raw message
include/linux/netfilter/ipset/ip_set_timeout.h +8 -2
Lines of this file are not shown. View the raw message.
net/ipv4/tcp_input.c +33 -24
57 lines not on this page · raw message
sound/soc/soc-compress.c +28 -24
52 lines not on this page · raw message
tools/testing/selftests/filesystems/Makefile +1 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/filesystems/devpts_pts.c +8 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/intel_pstate/run.sh +14 -15
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/lib/assert.c +7 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/kvm/vmx_tsc_adjust_test.c +2 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/memfd/run_tests.sh +9 -5
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Greg KH
maintainerI'm announcing the release of the 4.17.12 kernel.
All users of the 4.17 kernel series must upgrade.
The updated 4.17.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.17.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/devicetree/bindings/net/dsa/qca8k.txt | 23 + Documentation/devicetree/bindings/net/meson-dwmac.txt | 1 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 1 Documentation/vfio-mediated-device.txt | 5 Makefile | 2 arch/arm/boot/dts/emev2.dtsi | 5 arch/arm/boot/dts/imx53-ppd.dts | 2 arch/arm/boot/dts/imx53.dtsi | 8 arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 8 arch/arm/boot/dts/sh73a0.dtsi | 5 arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 arch/arm/boot/dts/stih410.dtsi | 18 - arch/arm/net/bpf_jit_32.c | 10 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 38 +- arch/arm64/configs/defconfig | 2 arch/arm64/include/asm/cmpxchg.h | 4 arch/arm64/mm/init.c | 4 arch/microblaze/boot/Makefile | 10 arch/powerpc/include/asm/barrier.h | 15 + arch/powerpc/include/asm/cache.h | 3 arch/powerpc/include/asm/pkeys.h | 2 arch/powerpc/kernel/eeh_driver.c | 28 +- arch/powerpc/kernel/head_8xx.S | 2 arch/powerpc/kernel/pci_32.c | 1 arch/powerpc/kernel/prom_init.c | 114 ++++---- arch/powerpc/lib/string.S | 7 arch/powerpc/mm/slb.c | 8 arch/powerpc/net/bpf_jit_comp64.c | 34 +- arch/powerpc/platforms/chrp/time.c | 6 arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 5 arch/powerpc/platforms/powermac/bootx_init.c | 4 arch/powerpc/platforms/powermac/setup.c | 1 arch/s390/include/asm/cpu_mf.h | 6 arch/sh/boards/mach-migor/setup.c | 2 arch/x86/events/intel/uncore.c | 2 arch/x86/events/intel/uncore_nhmex.c | 2 arch/x86/kernel/cpu/microcode/core.c | 6 arch/x86/kvm/mmu.c | 2 arch/x86/kvm/svm.c | 8 block/bfq-iosched.c | 2 block/bio.c | 19 - crypto/authenc.c | 1 crypto/authencesn.c | 1 drivers/acpi/acpi_lpss.c | 32 +- drivers/acpi/acpica/psloop.c | 19 - drivers/acpi/pci_root.c | 4 drivers/ata/libata-eh.c | 12 drivers/bluetooth/btusb.c | 4 drivers/bluetooth/hci_qca.c | 2 drivers/char/random.c | 10 drivers/clk/clk-si544.c | 1 drivers/clk/ingenic/jz4770-cgu.c | 3 drivers/edac/altera_edac.c | 2 drivers/gpio/gpio-uniphier.c | 6 drivers/gpio/gpiolib-of.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 17 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 8 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 3 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 4 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 7 drivers/gpu/drm/drm_atomic.c | 4 drivers/gpu/drm/drm_atomic_helper.c | 78 ++--- drivers/gpu/drm/drm_dp_mst_topology.c | 9 drivers/gpu/drm/gma500/psb_intel_drv.h | 2 drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 drivers/gpu/drm/i915/i915_drv.h | 1 drivers/gpu/drm/i915/intel_ddi.c | 13 drivers/gpu/drm/i915/intel_display.c | 21 + drivers/gpu/drm/i915/intel_drv.h | 3 drivers/gpu/drm/nouveau/nouveau_dma.c | 10 drivers/gpu/drm/nouveau/nouveau_dma.h | 5 drivers/gpu/drm/nouveau/nouveau_drm.c | 30 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 19 + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 8 drivers/gpu/drm/radeon/radeon_connectors.c | 10 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 drivers/gpu/drm/stm/ltdc.c | 3 drivers/gpu/host1x/dev.c | 11 drivers/hid/hid-plantronics.c | 6 drivers/hid/i2c-hid/i2c-hid.c | 8 drivers/i2c/busses/i2c-rcar.c | 54 +++- drivers/infiniband/core/mad.c | 11 drivers/infiniband/core/ucma.c | 6 drivers/infiniband/core/uverbs_cmd.c | 5 drivers/infiniband/sw/rdmavt/Kconfig | 2 drivers/infiniband/sw/rxe/Kconfig | 1 drivers/input/mouse/elan_i2c_core.c | 2 drivers/input/serio/i8042-x86ia64io.h | 7 drivers/irqchip/irq-ls-scfg-msi.c | 3 drivers/lightnvm/pblk-core.c | 6 drivers/lightnvm/pblk-rb.c | 5 drivers/lightnvm/pblk-read.c | 8 drivers/md/md.c | 3 drivers/md/raid1.c | 2 drivers/media/cec/cec-pin-error-inj.c | 33 +- drivers/media/common/siano/smsendian.c | 14 - drivers/media/common/videobuf2/videobuf2-core.c | 9 drivers/media/i2c/smiapp/smiapp-core.c | 11 drivers/media/media-device.c | 21 - drivers/media/pci/saa7164/saa7164-fw.c | 3 drivers/media/pci/tw686x/tw686x-video.c | 3 drivers/media/platform/omap3isp/isp.c | 7 drivers/media/platform/rcar_jpu.c | 4 drivers/media/platform/renesas-ceu.c | 20 + drivers/media/radio/si470x/radio-si470x-i2c.c | 6 drivers/media/rc/ir-mce_kbd-decoder.c | 12 drivers/media/usb/em28xx/em28xx-dvb.c | 4 drivers/memory/tegra/mc.c | 22 - drivers/memory/tegra/mc.h | 9 drivers/memory/tegra/tegra114.c | 2 drivers/memory/tegra/tegra124.c | 6 drivers/memory/tegra/tegra210.c | 3 drivers/memory/tegra/tegra30.c | 2 drivers/mfd/cros_ec.c | 6 drivers/mmc/core/pwrseq_simple.c | 14 - drivers/mmc/host/dw_mmc.c | 4 drivers/mmc/host/sdhci-omap.c | 17 - drivers/mtd/nand/raw/fsl_ifc_nand.c | 17 - drivers/net/dsa/qca8k.c | 52 +++ drivers/net/dsa/qca8k.h | 7 drivers/net/ethernet/amazon/ena/ena_com.c | 1 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 3 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 drivers/net/ethernet/hisilicon/hns3/hnae3.c | 1 drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 5 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 17 - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 28 +- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 2 drivers/net/ethernet/intel/e1000e/netdev.c | 15 - drivers/net/ethernet/intel/i40e/i40e.h | 2 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 drivers/net/ethernet/intel/i40e/i40e_ptp.c | 48 ++- drivers/net/ethernet/intel/igb/igb_main.c | 9 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 drivers/net/ethernet/marvell/mvpp2.c | 3 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 14 - drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 drivers/net/ethernet/socionext/netsec.c | 23 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 drivers/net/ethernet/ti/cpsw-phy-sel.c | 8 drivers/net/hyperv/hyperv_net.h | 2 drivers/net/hyperv/netvsc_drv.c | 43 +-- drivers/net/netdevsim/devlink.c | 1 drivers/net/phy/mdio-mux-bcm-iproc.c | 2 drivers/net/phy/phylink.c | 2 drivers/net/phy/sfp-bus.c | 7 drivers/net/usb/lan78xx.c | 2 drivers/net/virtio_net.c | 41 +-- drivers/net/wireless/ath/ath10k/core.c | 134 +++++----- drivers/net/wireless/ath/ath10k/debug.c | 8 drivers/net/wireless/ath/ath10k/wmi.c | 6 drivers/net/wireless/ath/ath10k/wmi.h | 2 drivers/net/wireless/ath/regd.h | 5 drivers/net/wireless/ath/regd_common.h | 13 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 38 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 7 drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 10 drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 drivers/net/wireless/marvell/mwifiex/usb.c | 3 drivers/net/wireless/marvell/mwifiex/util.c | 8 drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 3 drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 3 drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 6 drivers/net/wireless/mediatek/mt76/tx.c | 2 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 21 + drivers/net/wireless/quantenna/qtnfmac/event.c | 8 drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c | 4 drivers/net/wireless/rsi/rsi_91x_hal.c | 35 +- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 7 drivers/net/wireless/rsi/rsi_91x_sdio.c | 23 + drivers/net/wireless/rsi/rsi_sdio.h | 2 drivers/net/wireless/ti/wlcore/sdio.c | 5 drivers/net/xen-netfront.c | 10 drivers/nvme/host/pci.c | 16 - drivers/nvme/host/rdma.c | 10 drivers/nvme/target/fc.c | 44 ++- drivers/nvmem/core.c | 7 drivers/pci/pci-sysfs.c | 15 - drivers/pci/pcie/aspm.c | 9 drivers/pci/pcie/dpc.c | 5 drivers/pci/probe.c | 4 drivers/perf/arm-cci.c | 6 drivers/perf/arm-ccn.c | 20 - drivers/pinctrl/pinctrl-at91-pio4.c | 4 drivers/pinctrl/qcom/pinctrl-msm.c | 23 + drivers/platform/x86/dell-smbios-base.c | 5 drivers/regulator/cpcap-regulator.c | 2 drivers/regulator/internal.h | 9 drivers/regulator/of_regulator.c | 13 drivers/regulator/pfuze100-regulator.c | 1 drivers/regulator/twl-regulator.c | 2 drivers/rtc/interface.c | 5 drivers/rtc/rtc-tps6586x.c | 14 - drivers/rtc/rtc-tps65910.c | 12 drivers/rtc/rtc-vr41xx.c | 9 drivers/s390/scsi/zfcp_dbf.c | 2 drivers/scsi/3w-9xxx.c | 5 drivers/scsi/3w-xxxx.c | 3 drivers/scsi/cxlflash/main.c | 11 drivers/scsi/cxlflash/sislite.h | 1 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 11 drivers/scsi/megaraid.c | 3 drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 drivers/scsi/qedf/qedf_main.c | 10 drivers/scsi/scsi_dh.c | 5 drivers/scsi/ufs/ufshcd.c | 28 +- drivers/soc/imx/gpcv2.c | 22 + drivers/soc/qcom/qmi_interface.c | 5 drivers/soc/qcom/smem.c | 27 +- drivers/soc/tegra/pmc.c | 20 - drivers/spi/spi-meson-spicc.c | 11 drivers/spi/spi-s3c64xx.c | 4 drivers/spi/spi-sh-msiof.c | 6 drivers/spi/spi.c | 1 drivers/staging/ks7010/ks7010_sdio.c | 3 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 30 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 drivers/staging/lustre/lustre/llite/xattr.c | 6 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 6 drivers/staging/media/atomisp/i2c/gc2235.h | 9 drivers/staging/media/atomisp/i2c/ov2680.h | 5 drivers/staging/media/atomisp/i2c/ov2722.h | 6 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 18 + drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 49 +-- drivers/staging/most/cdev/cdev.c | 6 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 1 drivers/thermal/samsung/exynos_tmu.c | 1 drivers/tty/hvc/hvc_opal.c | 1 drivers/tty/pty.c | 3 drivers/usb/core/hub.c | 4 drivers/vfio/mdev/mdev_core.c | 102 ++----- drivers/vfio/mdev/mdev_private.h | 2 drivers/vfio/platform/vfio_platform_common.c | 15 - drivers/vfio/vfio_iommu_type1.c | 73 +++-- drivers/video/backlight/pwm_bl.c | 6 drivers/watchdog/da9063_wdt.c | 17 + fs/block_dev.c | 9 fs/btrfs/inode.c | 33 +- fs/btrfs/qgroup.c | 19 + fs/btrfs/tree-log.c | 10 fs/ceph/super.c | 13 fs/crypto/crypto.c | 11 fs/ext4/balloc.c | 3 fs/ext4/ialloc.c | 8 fs/ext4/inline.c | 19 - fs/ext4/inode.c | 16 - fs/ext4/super.c | 13 fs/f2fs/data.c | 14 - fs/f2fs/f2fs.h | 8 fs/f2fs/file.c | 20 + fs/f2fs/gc.c | 11 fs/f2fs/segment.c | 5 fs/f2fs/super.c | 6 fs/nfs/inode.c | 3 fs/nfs/nfs4proc.c | 14 - fs/nfs/pnfs.c | 6 fs/nfsd/nfs4state.c | 5 fs/nfsd/nfs4xdr.c | 2 fs/proc/task_mmu.c | 30 +- fs/squashfs/cache.c | 3 fs/squashfs/file.c | 8 fs/squashfs/fragment.c | 4 fs/squashfs/squashfs_fs.h | 6 include/drm/drm_dp_helper.h | 1 include/linux/delayacct.h | 4 include/linux/dma-iommu.h | 1 include/linux/memcontrol.h | 23 + include/linux/mm.h | 9 include/linux/mmc/sdio_ids.h | 1 include/linux/netfilter/ipset/ip_set_timeout.h | 10 include/linux/regulator/consumer.h | 1 include/linux/serial_core.h | 3 include/net/tcp.h | 2 include/soc/tegra/mc.h | 2 include/uapi/sound/asoc.h | 23 + ipc/msg.c | 6 ipc/sem.c | 6 kernel/auditfilter.c | 2 kernel/auditsc.c | 2 kernel/bpf/syscall.c | 37 ++ kernel/bpf/verifier.c | 4 kernel/delayacct.c | 17 - kernel/fork.c | 8 kernel/hung_task.c | 11 kernel/kcov.c | 3 kernel/kthread.c | 8 kernel/memremap.c | 18 + kernel/power/suspend.c | 14 - kernel/printk/printk_safe.c | 2 kernel/sched/cpufreq_schedutil.c | 17 - kernel/stop_machine.c | 24 - kernel/time/clocksource.c | 4 kernel/trace/trace_events_trigger.c | 18 - kernel/trace/trace_kprobe.c | 15 - lib/dma-direct.c | 7 mm/slub.c | 2 mm/vmalloc.c | 3 net/core/dev.c | 17 - net/ipv4/fib_frontend.c | 4 net/ipv4/ipconfig.c | 13 net/ipv4/tcp_bbr.c | 4 net/ipv4/tcp_dctcp.c | 4 net/ipv4/tcp_input.c | 57 ++-- net/netfilter/ipset/ip_set_hash_gen.h | 5 net/netfilter/nf_tables_api.c | 11 net/netlink/af_netlink.c | 5 net/rds/ib_frmr.c | 5 net/rds/ib_mr.h | 3 net/rds/ib_rdma.c | 21 - net/rds/rdma.c | 13 net/rds/rds.h | 5 net/rds/send.c | 12 net/rxrpc/conn_event.c | 2 security/integrity/ima/ima_main.c | 1 sound/pci/emu10k1/emupcm.c | 4 sound/pci/emu10k1/memory.c | 6 sound/pci/fm801.c | 16 - sound/pci/hda/patch_ca0132.c | 8 sound/soc/fsl/fsl_ssi.c | 3 sound/soc/soc-compress.c | 52 ++- sound/soc/soc-pcm.c | 6 sound/soc/soc-topology.c | 19 + sound/usb/pcm.c | 2 tools/perf/util/parse-events.y | 14 - tools/testing/selftests/filesystems/Makefile | 1 tools/testing/selftests/filesystems/devpts_pts.c | 13 tools/testing/selftests/intel_pstate/run.sh | 29 +- tools/testing/selftests/kvm/lib/assert.c | 9 tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 2 tools/testing/selftests/memfd/run_tests.sh | 14 - tools/usb/usbip/libsrc/vhci_driver.c | 32 +- tools/usb/usbip/libsrc/vhci_driver.h | 3 tools/usb/usbip/src/usbip_detach.c | 9 349 files changed, 2486 insertions(+), 1290 deletions(-)
Aaron Lu (1):
mem_cgroup: make sure moving_account, move_lock_task and stat_cpu in the same cacheline
Alex Elder (3):
soc: qcom: qmi: fix a buffer sizing bug
soc: qcom: smem: fix qcom_smem_set_global_partition()
soc: qcom: smem: byte swap values properly
Alex Williamson (2):
vfio/mdev: Check globally for duplicate devices vfio/type1: Fix task tracking for QEMU vCPU hotplug
Alexander Duyck (1):
ixgbe: Fix setting of TC configuration for macvlan case
Alexandre Belloni (4):
rtc: ensure rtc_set_alarm fails when alarms are not supported
rtc: tps6586x: fix possible race condition
rtc: vr41xx: fix possible race condition
rtc: tps65910: fix possible race condition
Alexey Khoroshilov (1):
spi: meson-spicc: Fix error handling in meson_spicc_probe()
Alexey Kodanev (1):
netfilter: nf_tables: check msg_type before nft_trans_set(trans)
Anatoly Pugachev (1):
disable loading f2fs module on PAGE_SIZE > 4KB
Anders Roxell (1):
selftests/filesystems: devpts_pts included wrong header
Andrew Elble (1):
nfsd: fix error handling in nfs4_set_delegation()
Andrey Smirnov (1):
soc: imx: gpcv2: Do not pass static memory as platform data
Andy Shevchenko (1):
drm/dp/mst: Fix off-by-one typo when dump payload table
Anson Huang (1):
regulator: pfuze100: add .is_enable() for pfuze100_swb_regulator_ops
Antoine Tenart (1):
net: phy: sfp: handle cases where neither BR, min nor BR, max is given
Anton Vasilyev (1):
net: mdio-mux: bcm-iproc: fix wrong getter and setter pair
Arjun Vynipadath (1):
cxgb4: Added missing break in ndo_udp_tunnel_{add/del}Arnd Bergmann (2):
drivers/bus: arm-cci: fix build warnings
y2038: ipc: Use ktime_get_real_seconds consistently
Artem Savkov (1):
tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure
Avinash Repaka (1):
RDS: RDMA: Fix the NULL-ptr deref in rds_ib_get_mr
Bartlomiej Zolnierkiewicz (1):
thermal: exynos: fix setting rising_threshold for Exynos5433
Ben Hutchings (1):
IB: Fix RDMA_RXE and INFINIBAND_RDMAVT dependencies for DMA_VIRT_OPS
Ben Skeggs (3):
drm/nouveau: remove fence wait code from deferred client work handler drm/nouveau/gem: lookup VMAs for buffers referenced by pushbuf ioctl drm/nouveau/fifo/gk104-: poll for runlist update completion
Benjamin Poirier (1):
e1000e: Ignore TSYNCRXCTL when getting I219 clock attributes
Bjorn Helgaas (1):
PCI/ASPM: Disable ASPM L1.2 Substate if we don't have LTR
Brad Love (2):
media: saa7164: Fix driver name in debug output
media: em28xx: Fix DualHD broken second tuner
Chad Dupuis (1):
scsi: qedf: Set the UNLOADING flag when removing a vport
Changbin Du (1):
regulator: add dummy function of_find_regulator_by_node
Chao Yu (6):
f2fs: fix error path of move_data_page
f2fs: don't drop dentry pages after fs shutdown
f2fs: fix to don't trigger writeback during recovery
f2fs: fix to wait page writeback during revoking atomic write
f2fs: fix to detect failure of dquot_initialize
f2fs: fix race in between GC and atomic open
Charles Keepax (1):
ASoC: compress: Only call free for components which have been opened
Chen-Yu Tsai (1):
Input: i8042 - add Lenovo LaVie Z to the i8042 reset list
Chengguang Xu (1):
ceph: fix alignment of rasize
Chintan Pandya (1):
mm: vmalloc: avoid racy handling of debugobjects in vunmap
Chris Novakovic (1):
ipconfig: Correctly initialise ic_nameservers
Christian Gromm (1):
staging: most: cdev: fix chrdev_region leak
Christian Lamparter (1):
pinctrl: msm: fix gpio-hog related boot issues
Christoph Hellwig (1):
PCI: Prevent sysfs disable of device while driver is attached
Christophe Leroy (2):
powerpc/lib: Adjust .balign inside string functions for PPC32 powerpc/8xx: fix invalid register expression in head_8xx.S
Clint Taylor (1):
drm/i915/glk: Add Quirk for GLK NUC HDMI port issues.
Colin Ian King (1):
media: smiapp: fix timeout checking in smiapp_read_nvm
Cong Wang (1):
infiniband: fix a possible use-after-free bug
DaeRyong Jeong (1):
tty: Fix data race in tty_insert_flip_string_fixed_flag
Damien Le Moal (1):
libata: Fix command retry decision
Dan Carpenter (2):
KVM: x86: prevent integer overflows in KVM_MEMORY_ENCRYPT_REG_REGION
scsi: megaraid: silence a static checker bug
Daniel Díaz (1):
selftests/intel_pstate: Improve test, minor fixes
Dave Jiang (1):
mm: disallow mappings that conflict for devm_memremap_pages()
David Howells (1):
rxrpc: Fix terminal retransmission connection ID to include the channel
David Sterba (1):
btrfs: add barriers to btrfs_sync_log before log_commit_wait wakeups
Dmitry Osipenko (2):
memory: tegra: Do not handle spurious interrupts
memory: tegra: Apply interrupts mask per SoC
Dmitry Safonov (2):
netlink: Do not subscribe to non-existent groups
netlink: Don't shift with UB on nlk->ngroups
Dmitry Torokhov (1):
HID: i2c-hid: check if device is there before really probing
Dominik Bozek (1):
usb: hub: Don't wait for connect state at resume for powered-off ports
Donald Shanty III (1):
Input: elan_i2c - add ACPI ID for lenovo ideapad 330
Doug Oucahrek (1):
staging: lustre: o2iblnd: fix race at kiblnd_connect_peer
Doug Oucharek (1):
staging: lustre: o2iblnd: Fix FastReg map/unmap for MLX5
Douglas Anderson (2):
serial: core: Make sure compiler barfs for 16-byte earlycon names
regulator: Don't return or expect -errno from of_map_mode()
Emil Tantilov (1):
ixgbevf: fix MAC address changes through ixgbevf_set_mac()
Enric Balletbo i Serra (1):
arm64: defconfig: Enable Rockchip io-domain driver
Eric Biggers (1):
fscrypt: use unbound workqueue for decryption
Eric Dumazet (4):
tcp: do not force quickack when receiving out-of-order packets
tcp: add max_quickacks param to tcp_incr_quickack and tcp_enter_quickack_mode
tcp: do not aggressively quick ack after ECN events
tcp: add one more quick ack after after ECN events
Erik Schmauss (1):
ACPICA: AML Parser: ignore control method status in module-level code
Ethan Lien (1):
btrfs: balance dirty metadata pages in btrfs_finish_ordered_io
Eugeniy Paltsev (1):
NET: stmmac: align DMA stuff to largest cache line length
Eyal Reizer (1):
wlcore: sdio: check for valid platform device data before suspend
Ezequiel Garcia (1):
media: tw686x: Fix incorrect vb2_mem_ops GFP flags
Fabio Estevam (2):
ASoC: fsl_ssi: Use u32 variable type when using regmap_read()
ARM: dts: imx6qdl-wandboard: Let the codec control MCLK pinctrl
Felix Fietkau (1):
mt76: add rcu locking around tx scheduling
Felix Kuehling (1):
drm/amdgpu: Avoid reclaim while holding locks taken in MMU notifier
Filippo Muzzini (1):
block, bfq: remove wrong lock in bfq_requests_merged
Florent Fourcot (1):
netfilter: ipset: forbid family for hash:mac sets
Florian Fainelli (1):
net: phy: phylink: Release link GPIO
Fuyun Liang (1):
net: hns3: Fixes the init of the VALID BD info in the descriptor
Gal Pressman (1):
net: ena: Fix use of uninitialized DMA address bits field
Ganapathi Bhat (1):
mwifiex: handle race during mwifiex_usb_disconnect
Geert Uytterhoeven (4):
vfio: platform: Fix reset module leak in error path
spi: sh-msiof: Fix setting SIRMDR1.SYNCAC to match SITMDR1.SYNCAC
ARM: dts: emev2: Add missing interrupt-affinity to PMU node
ARM: dts: sh73a0: Add missing interrupt-affinity to PMU node
Gioh Kim (1):
md/raid1: add error handling of read error from FailFast device
Greg Edwards (1):
block: reset bi_iter.bi_done after splitting bio
Greg Kroah-Hartman (1):
Linux 4.17.12
Gregory Greenman (1):
iwlwifi: mvm: open BA session only when sta is authorized
Grygorii Strashko (1):
net: ethernet: ti: cpsw-phy-sel: check bus_find_device() ret value
Gustavo A. R. Silva (1):
qtnfmac: pearl: pcie: fix memory leak in qtnf_fw_work_handler
Hans Verkuil (2):
media: videobuf2-core: don't call memop 'finish' when queueing
media: cec: fix smatch error
Hans de Goede (1):
ACPI / LPSS: Only call pwm_add_table() for Bay Trail PWM if PMIC HRV is 2
Huang Ying (1):
mm: /proc/pid/pagemap: hide swap entries from unprivileged users
Huazhong Tan (1):
net: hns3: Fixes the out of bounds access in hclge_map_tqp
Ido Schimmel (1):
mlxsw: spectrum_router: Return an error for non-default FIB rules
Igor Konopko (2):
lightnvm: fix partial read error path
lightnvm: proper error handling for pblk_bio_add_pages
Jacob Keller (2):
i40e: free the skb after clearing the bitlock
i40e: avoid overflow in i40e_ptp_adjfreq()
Jacopo Mondi (2):
media: arch: sh: migor: Fix TW9910 PDN gpio
media: renesas-ceu: Set mbus_fmt on subdev operations
Jaegeuk Kim (2):
f2fs: avoid fsync() failure caused by EAGAIN in writepage()
f2fs: check cap_resource only for data blocks
Jakub Kicinski (2):
bpf: fix references to free_bpf_prog_info() in comments
netdevsim: don't leak devlink resources
Jakub Pawlak (1):
i40e: Add advertising 10G LR mode
James Simmons (1):
staging: lustre: llite: correct removexattr detection
James Smart (1):
nvmet-fc: fix target sgl list on large transfers
Jan Kiszka (1):
PCI: Fix devm_pci_alloc_host_bridge() memory leak
Jane Wan (1):
mtd: rawnand: fsl_ifc: fix FSL NAND driver to read all ONFI parameter pages
Javier González (1):
lightnvm: pblk: warn in case of corrupted write buffer
Jens Remus (1):
scsi: zfcp: assert that the ERP lock is held when tracing a recovery trigger
Jian-Hong Pan (1):
Bluetooth: btusb: Add a new Realtek 8723DE ID 2ff8:b011
Jianchao Wang (1):
nvme-rdma: stop admin queue before freeing it
Jiri Olsa (1):
perf tools: Fix pmu events parsing rule
Johannes Weiner (1):
arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups
Jonathan Neuschäfer (1):
powerpc/embedded6xx/hlwd-pic: Prevent interrupts from being handled by Starlet
José Roberto de Souza (1):
drm: Add DP PSR2 sink enable bit
Jozsef Kadlecsik (1):
netfilter: ipset: List timing out entries with "timeout 1" instead of zero
Juergen Gross (1):
xen/netfront: raise max number of slots in xennet_get_responses()
Julia Lawall (1):
pinctrl: at91-pio4: add missing of_node_put
KT Liao (1):
Input: elan_i2c - add another ACPI ID for Lenovo Ideapad 330-15AST
Kai Chieh Chuang (1):
ASoC: dpcm: fix BE dai not hw_free and shutdown
Kan Liang (2):
perf/x86/intel/uncore: Correct fixed counter index check in generic code perf/x86/intel/uncore: Correct fixed counter index check for NHM
Keith Busch (1):
nvme-pci: Fix AER reset handling
Kenneth Feng (1):
drm/amd/powerplay: Set higher SCLK&MCLK frequency than dpm7 in OD (v2)
Kirill Marinushkin (2):
ASoC: topology: Fix bclk and fsync inversion in set_link_hw_format()
ASoC: topology: Add missing clock gating parameter when parsing hw_configs
Kishon Vijay Abraham I (1):
mmc: sdhci-omap: Fix when capabilities are obtained from SDHCI_CAPABILITIES reg
Kuninori Morimoto (1):
arm64: dts: renesas: salvator-common: use audio-graph-card for Sound
Laurentiu Tudor (1):
irqchip/ls-scfg-msi: Map MSIs in the iommu
Lawrence Brakmo (1):
tcp: ack immediately when a cwr packet arrives
Leo (Sunpeng) Li (1):
drm/amd/display: Fix dim display on DCE11
Leon Romanovsky (2):
RDMA/mad: Convert BUG_ONs to error flows
RDMA/uverbs: Protect from attempts to create flows on unsupported QP
Lijun Ou (1):
net: hns3: Fixes initalization of RoCE handle and makes it conditional
Linus Torvalds (1):
squashfs: be more careful about metadata corruption
Linus Walleij (1):
gpio: of: Handle fixed regulator flags properly
Lorenzo Bianconi (3):
mt76x2: apply coverage class on slot time too
mt76x2: fix avg_rssi estimation
ipv4: remove BUG_ON() from fib_compute_spec_dst
Luc Van Oostenryck (2):
drm/radeon: fix mode_valid's return type drm/gma500: fix psb_intel_lvds_mode_valid()'s return type
Luis Henriques (1):
ceph: fix use-after-free in ceph_statfs()
Marc Zyngier (1):
dma-iommu: Fix compilation when !CONFIG_IOMMU_DMA
Marco Felsch (1):
watchdog: da9063: Fix updating timeout value
Marek Szyprowski (1):
spi: spi-s3c64xx: Fix system resume support
Mario Limonciello (1):
platform/x86: dell-smbios: Match on www.dell.com in OEM strings too
Mark Rutland (2):
kcov: ensure irq code sees a valid area drivers/perf: arm-ccn: don't log to dmesg in event_init
Martin Blumenstingl (1):
dt-bindings: pinctrl: meson: add support for the Meson8m2 SoC
Martin Wilck (2):
block: bio_iov_iter_get_pages: fix size of last iovec
blkdev: __blkdev_direct_IO_simple: fix leak in error case
Masahiro Yamada (1):
gpio: uniphier: set legitimate irq trigger type in .to_irq hook
Masahisa KOJIMA (1):
net: socionext: reset hardware in ndo_stop
Mathieu Malaterre (8):
mm/slub.c: add __printf verification to slab_err() powerpc/32: Add a missing include header
powerpc/chrp/time: Make some functions static, add missing header include powerpc/powermac: Add missing prototype for note_bootable_part() powerpc/powermac: Mark variable x as unused
powerpc: Add __printf verification to prom_printf
clocksource: Move inline keyword to the beginning of function declarations
nvmem: properly handle returned value nvmem_reg_read
Matthew R. Ochs (1):
scsi: cxlflash: Avoid clobbering context control register value
Mauro Carvalho Chehab (7):
media: cec-pin-error-inj: avoid a false-positive Spectre detection
media: atomisp: ov2680: don't declare unused vars
media: staging: atomisp: Comment out several unused sensor resolutions
media: em28xx: fix a regression with HVR-950
media: siano: get rid of __le32/__le16 cast warnings
media: atomisp: compat32: fix __user annotations
media: si470x: fix __be16 annotations
Maxime Chevallier (1):
net: mvpp2: Add missing VLAN tag detection
Maya Erez (1):
scsi: ufs: fix exception event handling
Michael Chan (2):
bnxt_en: Check unsupported speeds in bnxt_update_link() on PF only.
bnxt_en: Always forward VF MAC address to the PF.
Michael Grzeschik (1):
usbip: dynamically allocate idev by nports found in sysfs
Michal Simek (1):
microblaze: Fix simpleImage format generation
Michal Suchanek (1):
powerpc/64s: Add barrier_nospec
Michal Vokáč (5):
net: dsa: qca8k: Add support for QCA8334 switch
net: dsa: qca8k: Force CPU port to its highest bandwidth
net: dsa: qca8k: Enable RXMAC when bringing up a port
net: dsa: qca8k: Add QCA8334 binding documentation
net: dsa: qca8k: Allow overwriting CPU port setting
Mika Westerberg (1):
PCI: pciehp: Request control of native hotplug only if supported
Mike Looijmans (1):
clk-si544: Properly round requested frequency to nearest match
Mikita Lipski (1):
drm/amd/display: Do not program interrupt status on disabled crtc
Mimi Zohar (1):
ima: based on policy verify firmware signatures (pre-allocated buffer)
Neal Cardwell (1):
tcp_bbr: fix bw probing to raise in-flight data for very small BDPs
NeilBrown (1):
staging: lustre: ldlm: free resource when ldlm_lock_create() fails.
Nicholas Piggin (1):
powerpc/64s: Fix compiler store ordering to SLB shadow area
Olga Kornievskaia (1):
skip LAYOUTRETURN if layout is invalid
Omar Sandoval (2):
Btrfs: don't return ino to ino cache if inode item removal fails
Btrfs: don't BUG_ON() in btrfs_truncate_inode_items()
Ondrej Mosnáček (1):
audit: allow not equal op for audit by executable
Oza Pawandeep (1):
PCI/DPC: Clear interrupt status in interrupt handler top half
Patrice Chotard (2):
ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage
ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage
Patrick Bellasi (1):
sched/cpufreq: Modify aggregate utilization to always include blocked FAIR utilization
Paul Cercueil (1):
clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle
Petr Machata (1):
mlxsw: spectrum_switchdev: Fix port_vlan refcounting
Philippe CORNU (1):
drm/stm: ltdc: fix warning in ltdc_crtc_update_clut()
Qu Wenruo (1):
btrfs: qgroup: Finish rescan when hit the last leaf of extent tree
Rafael J. Wysocki (1):
ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation
Ram Pai (1):
mm, powerpc, x86: define VM_PKEY_BITx bits if CONFIG_ARCH_HAS_PKEYS is enabled
Rob Herring (1):
ARM: dts: imx53: Fix LDB OF graph warning
Sahitya Tummala (1):
f2fs: Fix deadlock in shutdown ioctl
Sam Bobroff (1):
powerpc/eeh: Fix use-after-release of EEH driver
Sami Tolvanen (1):
media: media-device: fix ioctl function types
Samuel Li (1):
drm/amdgpu: Remove VRAM from shared bo domains.
Sandipan Das (2):
bpf: fix multi-function JITed dump obtained via syscall
bpf: powerpc64: pad function address loads with NOPs
Sanjay Kumar Konduri (1):
rsi: Add null check for virtual interfaces in wowlan config
Satendra Singh Thakur (1):
drm/atomic: Handling the case when setting old crtc for plane
Scott Mayhew (1):
nfsd: fix potential use-after-free in nfsd4_decode_getdeviceinfo
Scott Wood (1):
x86/microcode: Make the late update update_lock a raw lock for RT
Sean Lanigan (1):
brcmfmac: Add support for bcm43364 wireless chipset
Sean Young (1):
media: rc: mce_kbd decoder: low timeout values cause double keydowns
Sebastian Andrzej Siewior (2):
PM / wakeup: Make s2idle_lock a RAW_SPINLOCK
delayacct: Use raw_spinlocks
Sergey Matyukevich (1):
qtnfmac: fix invalid STA state on EAPOL failure
Sergey Senozhatsky (1):
printk: drop in_nmi check from printk_safe_flush_on_panic()
Sergio Paracuellos (1):
staging: ks7010: fix error handling in ks7010_upload_firmware
Shakeel Butt (1):
kvm, mm: account shadow page tables to kmemcg
Shaul Triebitz (1):
iwlwifi: pcie: fix race in Rx buffer allocator
Shawn Lin (1):
mmc: dw_mmc: update actual clock for mmc debugfs
Shirish S (1):
drm/amd/display: remove need of modeset flag for overlay planes (V2)
Shivasharan S (1):
scsi: megaraid_sas: Increase timeout by 1 sec for non-RAID fastpath IOs
Shuah Khan (Samsung OSG) (5):
usbip: usbip_detach: Fix memory, udev context and udev leak
selftests: memfd: return Kselftest Skip code for skipped tests
selftests: kvm: return Kselftest Skip code for skipped tests
selftests: intel_pstate: return Kselftest Skip code for skipped tests
selftests: filesystems: return Kselftest Skip code for skipped tests
Siva Rebbagondla (2):
rsi: Fix 'invalid vdd' warning in mmc
rsi: fix nommu_map_sg overflow kernel panic
Snild Dolkow (1):
kthread, tracing: Don't expose half-written comm when creating kthreads
Stefan Wahren (2):
staging: vchiq_core: Fix missing semaphore release in error case
net: lan78xx: fix rx handling before first packet is send
Stephen Hemminger (1):
hv_netvsc: fix network namespace issues with VF support
Steven Rostedt (VMware) (3):
tracing: Fix double free of event_trigger_data
tracing: Fix possible double free in event_enable_trigger_func()
tracing: Quiet gcc warning about maybe unused link variable
Stewart Smith (1):
hvc_opal: don't set tb_ticks_per_usec in udbg_init_opal_common()
Subhash Jadavani (1):
scsi: ufs: ufshcd: fix possible unclocked register access
Suman Anna (1):
media: omap3isp: fix unbalanced dma_iommu_mapping
Sven Eckelmann (9):
ath: Add regulatory mapping for FCC3_ETSIC
ath: Add regulatory mapping for ETSI8_WORLD
ath: Add regulatory mapping for APL13_WORLD
ath: Add regulatory mapping for APL2_FCCA
ath: Add regulatory mapping for Uganda
ath: Add regulatory mapping for Tanzania
ath: Add regulatory mapping for Serbia
ath: Add regulatory mapping for Bermuda
ath: Add regulatory mapping for Bahamas
Takashi Iwai (3):
ALSA: emu10k1: Rate-limit error messages about page errors
ALSA: usb-audio: Apply rate limit to warning messages in URB complete callback
dma-direct: try reallocation with GFP_DMA32 if possible
Takashi Sakamoto (1):
ALSA: hda/ca0132: fix build failure when a local macro is defined
Tamizh Chelvam (1):
ath10k: fix kernel panic while reading tpc_stats
Tariq Toukan (1):
net: rollback orig value on failure of dev_qdisc_change_tx_queue_len
Tejun Heo (1):
delayacct: fix crash in delayacct_blkio_end() after delayacct init failure
Terry Junge (1):
HID: hid-plantronics: Re-resend Update to map button for PTT products
Tetsuo Handa (2):
mm: check for SIGKILL inside dup_mmap() loop kernel/hung_task.c: show all hung tasks before panic
Theodore Ts'o (5):
random: mix rdrand with entropy sent in from userspace
ext4: fix false negatives *and* false positives in ext4_check_descriptors()
ext4: fix inline data updates with checksums enabled
ext4: check for allocation block validity with block group locked
ext4: fix check to prevent initializing reserved inodes
Thierry Escande (1):
Bluetooth: hci_qca: Fix "Sleep inside atomic section" warning
Thierry Reding (1):
gpu: host1x: Acquire a reference to the IOVA cache
Thomas Gleixner (1):
stop_machine: Use raw spinlocks
Thomas Hebb (1):
ath10k: search all IEs for variant before falling back
Thomas Richter (2):
s390/cpum_sf: Add data entry sizes to sampling trailer entry
perf: fix invalid bit in diagnostic entry
Thor Thayer (1):
EDAC, altera: Fix ARM64 build warning
Tobin C. Harding (1):
mmc: pwrseq: Use kmalloc_array instead of stack VLA
Tomasz Figa (1):
drm/rockchip: analogix_dp: Do not call Analogix code before bind
Tony Lindgren (1):
spi: Add missing pm_runtime_put_noidle() after failed get
Toshiaki Makita (1):
virtio_net: Fix incosistent received bytes counter
Trond Myklebust (3):
NFSv4.1: Fix the client behaviour on NFS4ERR_SEQ_FALSE_RETRY
pnfs: Don't release the sequence slot until we've processed layoutget on open
NFS: Fix up nfs_post_op_update_inode() to force ctime updates
Tudor-Dan Ambarus (2):
crypto: authencesn - don't leak pointers to authenc keys
crypto: authenc - don't leak pointers to authenc keys
Uma Krishnan (1):
scsi: cxlflash: Synchronize reset and remove ops
Vic Wei (1):
Bluetooth: btusb: add ID for LiteOn 04ca:301a
Ville Syrjälä (1):
drm/atomic-helper: Drop plane->fb references only for drm_atomic_helper_shutdown()
Vincent Palatin (1):
mfd: cros_ec: Fail early if we cannot identify the EC
Vinicius Costa Gomes (1):
igb: Fix queue selection on MAC filters on i210
Viresh Kumar (1):
soc/tegra: pmc: Don't allocate struct tegra_powergate on stack
Wang YanQing (1):
bpf, arm32: fix inconsistent naming about emit_a32_lsr_{r64,i64}Wei Xu (1):
nvme: lightnvm: add granby support
Wei Yongjun (1):
media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()
Wenwen Wang (2):
scsi: 3w-9xxx: fix a missing-check bug
scsi: 3w-xxxx: fix a missing-check bug
Will Deacon (1):
arm64: cmpwait: Clear event register before arming exclusive monitor
Wolfram Sang (3):
watchdog: renesas-wdt: Add support for the R8A77965 WDT
backlight: pwm_bl: Don't use GPIOF_* with gpiod_get_direction
i2c: rcar: handle RXDMA HW behaviour on Gen3
Xi Wang (3):
net: hns3: Fix for VF mailbox cannot receiving PF response
net: hns3: Fix the missing client list node initialization
net: hns3: Fix for hns3 module is loaded multiple times problem
Xiang Chen (1):
scsi: hisi_sas: config ATA de-reset as an constrained command for v3 hw
Xiao Liang (1):
xen-netfront: wait xenbus state change when load module manually
Xinming Hu (1):
mwifiex: correct histogram data with appropriate index
Xose Vazquez Perez (1):
scsi: scsi_dh: replace too broad "TP9" string with the exact models
Yixun Lan (1):
dt-bindings: net: meson-dwmac: new compatible name for AXG SoC
Yousuk Seung (1):
tcp: refactor tcp_ecn_check_ce to remove sk type cast
Yufen Yu (1):
md: fix NULL dereference of mddev->pers in remove_and_add_spares()
Yunlei He (1):
f2fs: fix missing clear FI_NO_PREALLOC in some error case
Yunsheng Lin (4):
net: hns3: Fix for phy not link up problem after resetting
net: hns3: Fix for service_task not running problem after resetting
net: hns3: Fix for CMDQ and Misc. interrupt init order problem
net: hns3: Fix for fiber link up problem
Zhouyang Jia (2):
ALSA: emu10k1: add error handling for snd_ctl_add
ALSA: fm801: add error handling for snd_ctl_add
tangpengpeng (1):
net: fix amd-xgbe flow-control issue
Hey Greg,
as with the 4.17.11 release, there is no signature file for the patch
(<https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.17.12.xz>. Could you please add a signature for that patch?
Thanks,
Kai
Greg K-H
maintainerQuoted 8 lines · Kai Wasserbäch
Hey Greg,
as with the 4.17.11 release, there is no signature file for the patch
(<https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.17.12.xz>. Could you
please add a signature for that patch?Thanks,
Kai
https://www.kernel.org/minor-changes-to-tarball-release-format.html
Greg K-H wrote on 04.08.2018 14:30:
Quoted 11 lines · Kai Wasserbäch
Quoted 8 lines
Hey Greg,
as with the 4.17.11 release, there is no signature file for the patch
(<https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-4.17.12.xz>. Could you
please add a signature for that patch?Thanks,
Kaihttps://www.kernel.org/minor-changes-to-tarball-release-format.html
Oh, I must have missed that! Sorry for the noise then.