Linux 4.0.4
Greg KH
maintainerI'm announcing the release of the 4.0.4 kernel.
All users of the 4.0 kernel series must upgrade.
The updated 4.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.0.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/dma/fsl-mxs-dma.txt | 2 Makefile | 2 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 arch/arm/boot/dts/imx23-olinuxino.dts | 4 arch/arm/boot/dts/imx25.dtsi | 1 arch/arm/boot/dts/imx28.dtsi | 2 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 arch/arm/boot/dts/omap3-n900.dts | 4 arch/arm/boot/dts/ste-dbx5x0.dtsi | 17 -- arch/arm/boot/dts/ste-href.dtsi | 15 ++ arch/arm/boot/dts/ste-snowball.dts | 13 ++ arch/arm/kernel/Makefile | 2 arch/arm/kernel/psci-call.S | 31 +++++ arch/arm/kernel/psci.c | 39 ------ arch/arm/mach-omap2/prm-regbits-34xx.h | 1 arch/arm/mach-omap2/prm-regbits-44xx.h | 1 arch/arm/mach-omap2/vc.c | 12 +- arch/arm/mach-omap2/vc.h | 2 arch/arm/mach-omap2/vc3xxx_data.c | 1 arch/arm/mach-omap2/vc44xx_data.c | 1 arch/arm/net/bpf_jit_32.c | 15 ++ arch/x86/include/asm/spinlock.h | 2 arch/x86/pci/acpi.c | 24 +++- block/blk-core.c | 2 block/blk-mq.c | 50 ++++---- block/blk-sysfs.c | 2 drivers/acpi/acpi_pnp.c | 2 drivers/acpi/acpica/acmacros.h | 13 -- drivers/acpi/acpica/dsopcode.c | 7 - drivers/acpi/acpica/evregion.c | 2 drivers/acpi/acpica/exdump.c | 4 drivers/acpi/acpica/exfldio.c | 10 - drivers/acpi/acpica/exregion.c | 8 - drivers/acpi/acpica/hwvalid.c | 16 +- drivers/acpi/acpica/nsdump.c | 12 +- drivers/acpi/acpica/tbdata.c | 15 +- drivers/acpi/acpica/tbinstal.c | 27 ++-- drivers/acpi/acpica/tbprint.c | 19 +-- drivers/acpi/acpica/tbxfroot.c | 7 - drivers/acpi/acpica/utaddress.c | 34 ++--- drivers/acpi/resource.c | 2 drivers/acpi/sbshc.c | 22 +++ drivers/block/loop.c | 2 drivers/gpio/gpiolib-sysfs.c | 19 +++ drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 - drivers/gpu/drm/drm_irq.c | 9 - drivers/gpu/drm/i915/intel_dp.c | 6 - drivers/gpu/drm/i915/intel_lvds.c | 26 ++++ drivers/gpu/drm/radeon/radeon_asic.c | 2 drivers/gpu/drm/radeon/radeon_asic.h | 4 drivers/gpu/drm/radeon/radeon_audio.c | 4 drivers/gpu/drm/radeon/radeon_ttm.c | 8 - drivers/gpu/drm/radeon/radeon_uvd.c | 105 ++++++++++++------ drivers/gpu/drm/radeon/radeon_vce.c | 65 ++++++++--- drivers/gpu/drm/radeon/rv770d.h | 3 drivers/gpu/drm/radeon/uvd_v1_0.c | 14 -- drivers/gpu/drm/radeon/uvd_v2_2.c | 29 ++++ drivers/infiniband/core/cma.c | 27 ++-- drivers/md/dm-crypt.c | 12 +- drivers/md/md.c | 4 drivers/media/platform/marvell-ccic/mcam-core.c | 14 +- drivers/media/platform/marvell-ccic/mcam-core.h | 8 - drivers/mmc/card/block.c | 12 ++ drivers/mmc/card/queue.c | 2 drivers/mmc/card/queue.h | 2 drivers/mmc/core/core.c | 1 drivers/mmc/host/sh_mmcif.c | 2 drivers/pinctrl/core.c | 10 - drivers/pinctrl/core.h | 2 drivers/pinctrl/devicetree.c | 2 drivers/rtc/rtc-armada38x.c | 24 ++-- drivers/tty/hvc/hvc_xen.c | 18 ++- drivers/vfio/vfio.c | 21 +++ drivers/xen/events/events_2l.c | 10 + drivers/xen/events/events_base.c | 7 - drivers/xen/xen-pciback/conf_space.c | 6 - drivers/xen/xen-pciback/conf_space.h | 2 drivers/xen/xen-pciback/conf_space_header.c | 2 drivers/xen/xenbus/xenbus_probe.c | 29 ++++ fs/coredump.c | 2 fs/namei.c | 3 fs/namespace.c | 6 + fs/nilfs2/btree.c | 2 fs/ocfs2/dlm/dlmmaster.c | 13 ++ include/acpi/acpixf.h | 12 +- include/linux/nilfs2_fs.h | 2 mm/memory-failure.c | 16 +- mm/page-writeback.c | 6 - sound/oss/sequencer.c | 12 -- 89 files changed, 682 insertions(+), 363 deletions(-)
Al Viro (2):
path_openat(): fix double fput()
coredump: accept any write method
Alex Deucher (1):
drm/radeon: don't setup audio on asics that don't support it
Alex Williamson (1):
vfio: Fix runaway interruptible timeout
Alexey Khoroshilov (1):
sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
Ben Hutchings (1):
xen-pciback: Add name prefix to global 'permissive' variable
Boris Ostrovsky (4):
xen/events: Clear cpu_evtchn_mask before resuming
xen/xenbus: Update xenbus event channel on resume
xen/console: Update console event channel on resume
xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq()
Chris Bainbridge (1):
ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
Christian König (4):
drm/radeon: disable semaphores for UVD V1 (v2) drm/radeon: make VCE handle check more strict drm/radeon: make UVD handle checking more strict drm/radeon: more strictly validate the UVD codec
Chuanxiao Dong (1):
mmc: card: Don't access RPMB partitions for normal read/write
Doug Anderson (1):
pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
Eric W. Biederman (1):
mnt: Fix fs_fully_visible to verify the root directory is visible
Fabio Estevam (1):
ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
Greg Kroah-Hartman (1):
Linux 4.0.4
Gregory CLEMENT (2):
rtc: armada38x: fix concurrency access in armada38x_rtc_set_time
ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
Grygorii Strashko (1):
mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
Hans Verkuil (1):
marvell-ccic: fix Y'CbCr ordering
Jani Nikula (1):
drm/i915/dp: there is no audio on port A
Jason Gunthorpe (1):
RDMA/CMA: Canonize IPv4 on IPV6 sockets properly
Jiang Liu (1):
x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus
Johan Hovold (1):
gpio: sysfs: fix memory leaks and device hotplug
Junxiao Bi (1):
ocfs2: dlm: fix race between purge and get lock resource
Lukas Wunner (2):
drm/i915: Assume dual channel LVDS if pixel clock necessitates it drm/i915: Add missing MacBook Pro models with dual channel LVDS
Lv Zheng (4):
ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
ACPICA: Utilities: Cleanup to convert physical address printing formats.
ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
Marek Vasut (1):
ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
Mario Kleiner (1):
drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
Mark Rutland (1):
ARM: 8307/1: psci: move psci firmware calls out of line
Markus Pargmann (1):
ARM: dts: imx25: Add #pwm-cells to pwm4
Ming Lei (2):
blk-mq: fix race between timeout and CPU hotplug
blk-mq: fix CPU hotplug handling
Naoya Horiguchi (2):
mm/memory-failure: call shake_page() when error hits thp tail page
mm: soft-offline: fix num_poisoned_pages counting on concurrent events
NeilBrown (1):
block: destroy bdi before blockdev is unregistered.
Nicolas Schichan (1):
ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
Oded Gabbay (1):
drm/amdkfd: allow unregister process with queues
Pavel Machek (1):
ARM: dts: OMAP3-N900: Add microphone bias voltages
Philipp Zabel (1):
ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
Rabin Vincent (1):
Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"
Ryusuke Konishi (1):
nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
Stefan Wahren (1):
ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
Tahsin Erdogan (1):
x86/spinlocks: Fix regression in spinlock contention detection
Takeshi Kihara (1):
mmc: sh_mmcif: Fix timeout value for command request
Tejun Heo (1):
writeback: use |1 instead of +1 to protect against div by zero
Tony Lindgren (1):
ARM: OMAP2+: Fix omap off idle power consumption creeping up
Ulf Hansson (3):
ARM: ux500: Move GPIO regulator for SD-card into board DTSs
ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
ARM: ux500: Enable GPIO regulator for SD-card for snowball
Witold Szczeponik (1):
ACPI / PNP: add two IDs to list for PNPACPI device enumeration
Xihan Zhang (1):
drm/amdkfd: Initialize sdma vm when creating sdma queue
monk.liu (1):
drm/radeon: fix userptr BO unpin bug v3
Greg KH
maintainerDocumentation/devicetree/bindings/dma/fsl-mxs-dma.txt +1 -1
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { 80 81 68 69 70 71 72 73 74 75 76 77>; - interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty", + interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty", "saif0", "saif1", "i2c0", "i2c1", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 0 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Hurr durr I'ma sheep
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +4 -0
@@ -105,6 +105,10 @@ }; internal-regs { + rtc@10300 { + /* No crystal connected to the internal RTC */ + status = "disabled"; + }; serial@12000 { status = "okay"; };
arch/arm/boot/dts/imx23-olinuxino.dts +3 -1
@@ -12,6 +12,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "imx23.dtsi" / {
@@ -93,6 +94,7 @@ ahb@80080000 { usb0: usb@80080000 { + dr_mode = "host"; vbus-supply = <®_usb0_vbus>; status = "okay"; };
@@ -122,7 +124,7 @@ user { label = "green"; - gpios = <&gpio2 1 1>; + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; }; }; };
arch/arm/boot/dts/imx25.dtsi +1 -0
@@ -428,6 +428,7 @@ pwm4: pwm@53fc8000 { compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; + #pwm-cells = <2>; reg = <0x53fc8000 0x4000>; clocks = <&clks 108>, <&clks 52>; clock-names = "ipg", "per";
arch/arm/boot/dts/imx28.dtsi +1 -1
@@ -900,7 +900,7 @@ 80 81 68 69 70 71 72 73 74 75 76 77>; - interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty", + interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty", "saif0", "saif1", "i2c0", "i2c1", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +2 -0
@@ -31,6 +31,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio4 15 0>; + enable-active-high; }; reg_usb_h1_vbus: regulator@1 {
@@ -40,6 +41,7 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio1 0 0>; + enable-active-high; }; };
arch/arm/boot/dts/omap3-n900.dts +4 -0
@@ -484,6 +484,8 @@ DRVDD-supply = <&vmmc2>; IOVDD-supply = <&vio>; DVDD-supply = <&vio>; + + ai3x-micbias-vg = <1>; }; tlv320aic3x_aux: tlv320aic3x@19 {
@@ -495,6 +497,8 @@ DRVDD-supply = <&vmmc2>; IOVDD-supply = <&vio>; DVDD-supply = <&vio>; + + ai3x-micbias-vg = <2>; }; tsl2563: tsl2563@29 {
arch/arm/boot/dts/ste-dbx5x0.dtsi +0 -17
@@ -1017,23 +1017,6 @@ status = "disabled"; }; - vmmci: regulator-gpio { - compatible = "regulator-gpio"; - - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2900000>; - regulator-name = "mmci-reg"; - regulator-type = "voltage"; - - startup-delay-us = <100>; - enable-active-high; - - states = <1800000 0x1 - 2900000 0x0>; - - status = "disabled"; - }; - mcde@a0350000 { compatible = "stericsson,mcde"; reg = <0xa0350000 0x1000>, /* MCDE */
arch/arm/boot/dts/ste-href.dtsi +15 -0
@@ -111,6 +111,21 @@ pinctrl-1 = <&i2c3_sleep_mode>; }; + vmmci: regulator-gpio { + compatible = "regulator-gpio"; + + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-name = "mmci-reg"; + regulator-type = "voltage"; + + startup-delay-us = <100>; + enable-active-high; + + states = <1800000 0x1 + 2900000 0x0>; + }; + // External Micro SD slot sdi0_per1@80126000 { arm,primecell-periphid = <0x10480180>;
arch/arm/boot/dts/ste-snowball.dts +13 -0
@@ -146,8 +146,21 @@ }; vmmci: regulator-gpio { + compatible = "regulator-gpio"; + gpios = <&gpio7 4 0x4>; enable-gpio = <&gpio6 25 0x4>; + + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2900000>; + regulator-name = "mmci-reg"; + regulator-type = "voltage"; + + startup-delay-us = <100>; + enable-active-high; + + states = <1800000 0x1 + 2900000 0x0>; }; // External Micro SD slot
arch/arm/kernel/Makefile +1 -1
@@ -86,7 +86,7 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_ARM_VIRT_EXT) += hyp-stub.o ifeq ($(CONFIG_ARM_PSCI),y) -obj-y += psci.o +obj-y += psci.o psci-call.o obj-$(CONFIG_SMP) += psci_smp.o endif
arch/arm/kernel/psci-call.S new file +31 -0
@@ -0,0 +1,31 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Copyright (C) 2015 ARM Limited + * + * Author: Mark Rutland <[email protected]> + */ + +#include <linux/linkage.h> + +#include <asm/opcodes-sec.h> +#include <asm/opcodes-virt.h> + +/* int __invoke_psci_fn_hvc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */ +ENTRY(__invoke_psci_fn_hvc) + __HVC(0) + bx lr +ENDPROC(__invoke_psci_fn_hvc) + +/* int __invoke_psci_fn_smc(u32 function_id, u32 arg0, u32 arg1, u32 arg2) */ +ENTRY(__invoke_psci_fn_smc) + __SMC(0) + bx lr +ENDPROC(__invoke_psci_fn_smc)
arch/arm/kernel/psci.c +3 -36
@@ -23,8 +23,6 @@#include <asm/compiler.h> #include <asm/errno.h> -#include <asm/opcodes-sec.h> -#include <asm/opcodes-virt.h> #include <asm/psci.h> #include <asm/system_misc.h>
@@ -33,6 +31,9 @@ struct psci_operations psci_ops;static int (*invoke_psci_fn)(u32 ,u32 ,u32 ,u32 );typedef int (*psci_initcall_t )(const struct device_node *); +asmlinkage int __invoke_psci_fn_hvc(u32, u32, u32, u32); +asmlinkage int __invoke_psci_fn_smc(u32, u32, u32, u32); +enum psci_function {PSCI_FN_CPU_SUSPEND ,PSCI_FN_CPU_ON ,
@@ -71,40 +72,6 @@ static u32 psci_power_state_pack(struct psci_power_state state) & PSCI_0_2_POWER_STATE_AFFL_MASK); } -/* -* The following two functions are invoked via the invoke_psci_fn pointer -* and will not be inlined, allowing us to piggyback on the AAPCS. -*/ -static noinline int __invoke_psci_fn_hvc(u32 function_id, u32 arg0, u32 arg1, -u32 arg2) -{ - asmvolatile ( - __asmeq("%0", "r0") - __asmeq("%1", "r1") - __asmeq("%2", "r2") - __asmeq("%3", "r3") -__HVC (0 ) - : "+r" (function_id) - : "r" (arg0), "r" (arg1), "r" (arg2)); - - return function_id; -} - -static noinline int __invoke_psci_fn_smc(u32 function_id, u32 arg0, u32 arg1, -u32 arg2) -{ - asmvolatile ( - __asmeq("%0", "r0") - __asmeq("%1", "r1") - __asmeq("%2", "r2") - __asmeq("%3", "r3") -__SMC (0 ) - : "+r" (function_id) - : "r" (arg0), "r" (arg1), "r" (arg2)); - - return function_id; -} -static int psci_get_version (void ) {int err;
arch/arm/mach-omap2/prm-regbits-34xx.h +1 -0
@@ -112,6 +112,7 @@#define OMAP3430_VC_CMD_ONLP_SHIFT 16#define OMAP3430_VC_CMD_RET_SHIFT 8#define OMAP3430_VC_CMD_OFF_SHIFT 0 +#define OMAP3430_SREN_MASK (1 << 4)#define OMAP3430_HSEN_MASK (1 << 3)#define OMAP3430_MCODE_MASK (0x7 << 0)#define OMAP3430_VALID_MASK (1 << 24)
arch/arm/mach-omap2/prm-regbits-44xx.h +1 -0
@@ -35,6 +35,7 @@#define OMAP4430_GLOBAL_WARM_SW_RST_SHIFT 1#define OMAP4430_GLOBAL_WUEN_MASK (1 << 16)#define OMAP4430_HSMCODE_MASK (0x7 << 0) +#define OMAP4430_SRMODEEN_MASK (1 << 4)#define OMAP4430_HSMODEEN_MASK (1 << 3)#define OMAP4430_HSSCLL_SHIFT 24#define OMAP4430_ICEPICK_RST_SHIFT 9
arch/arm/mach-omap2/vc.c +10 -2
@@ -316,7 +316,8 @@ static void __init omap3_vc_init_pmic_signaling(struct voltagedomain *voltdm)* idle. And we can also scale voltages to zero for off-idle. * Note that no actual voltage scaling during off-idle will * happen unless the board specific twl4030 PMIC scripts are -* loaded. +* loaded. See also omap_vc_i2c_init for comments regarding +* erratum i531. */ val = voltdm->read (OMAP3_PRM_VOLTCTRL_OFFSET );if (!(val &OMAP3430_PRM_VOLTCTRL_SEL_OFF )) {
@@ -704,9 +705,16 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)return ; } +/* +* Note that for omap3 OMAP3430_SREN_MASK clears SREN to work around +* erratum i531 "Extra Power Consumed When Repeated Start Operation +* Mode Is Enabled on I2C Interface Dedicated for Smart Reflex (I2C4)". +* Otherwise I2C4 eventually leads into about 23mW extra power being +* consumed even during off idle using VMODE. +*/ i2c_high_speed = voltdm->pmic->i2c_high_speed;if (i2c_high_speed) - voltdm->rmw (vc->common->i2c_cfg_hsen_mask, + voltdm->rmw (vc->common->i2c_cfg_clear_mask, vc->common->i2c_cfg_hsen_mask, vc->common->i2c_cfg_reg);
arch/arm/mach-omap2/vc.h +2 -0
@@ -34,6 +34,7 @@ struct voltagedomain;* @cmd_ret_shift: RET field shift in PRM_VC_CMD_VAL_* register * @cmd_off_shift: OFF field shift in PRM_VC_CMD_VAL_* register * @i2c_cfg_reg: I2C configuration register offset +* @i2c_cfg_clear_mask: high-speed mode bit clear mask in I2C config register * @i2c_cfg_hsen_mask: high-speed mode bit field mask in I2C config register * @i2c_mcode_mask: MCODE field mask for I2C config register *
@@ -52,6 +53,7 @@ struct omap_vc_common {u8 cmd_ret_shift;u8 cmd_off_shift;u8 i2c_cfg_reg; +u8 i2c_cfg_clear_mask;u8 i2c_cfg_hsen_mask;u8 i2c_mcode_mask; };
arch/arm/mach-omap2/vc3xxx_data.c +1 -0
@@ -40,6 +40,7 @@ static struct omap_vc_common omap3_vc_common = { .cmd_onlp_shift = OMAP3430_VC_CMD_ONLP_SHIFT, .cmd_ret_shift = OMAP3430_VC_CMD_RET_SHIFT, .cmd_off_shift = OMAP3430_VC_CMD_OFF_SHIFT, + .i2c_cfg_clear_mask = OMAP3430_SREN_MASK | OMAP3430_HSEN_MASK, .i2c_cfg_hsen_mask = OMAP3430_HSEN_MASK, .i2c_cfg_reg = OMAP3_PRM_VC_I2C_CFG_OFFSET, .i2c_mcode_mask = OMAP3430_MCODE_MASK,
arch/arm/mach-omap2/vc44xx_data.c +1 -0
@@ -42,6 +42,7 @@ static const struct omap_vc_common omap4_vc_common = { .cmd_ret_shift = OMAP4430_RET_SHIFT, .cmd_off_shift = OMAP4430_OFF_SHIFT, .i2c_cfg_reg = OMAP4_PRM_VC_CFG_I2C_MODE_OFFSET, + .i2c_cfg_clear_mask = OMAP4430_SRMODEEN_MASK | OMAP4430_HSMODEEN_MASK, .i2c_cfg_hsen_mask = OMAP4430_HSMODEEN_MASK, .i2c_mcode_mask = OMAP4430_HSMCODE_MASK, };
arch/arm/net/bpf_jit_32.c +13 -2
@@ -449,10 +449,21 @@ static inline void emit_udiv(u8 rd, u8 rm, u8 rn, struct jit_ctx *ctx) return; }#endif -if (rm !=ARM_R0 ) -emit (ARM_MOV_R (ARM_R0 , rm), ctx); + +/* +* For BPF_ALU | BPF_DIV | BPF_K instructions, rm is ARM_R4 +* (r_A) and rn is ARM_R0 (r_scratch) so load rn first into +* ARM_R1 to avoid accidentally overwriting ARM_R0 with rm +* before using it as a source for ARM_R1. +* +* For BPF_ALU | BPF_DIV | BPF_X rm is ARM_R4 (r_A) and rn is +* ARM_R5 (r_X) so there is no particular register overlap +* issues. +*/ if (rn !=ARM_R1 )emit (ARM_MOV_R (ARM_R1 , rn), ctx); +if (rm !=ARM_R0 ) +emit (ARM_MOV_R (ARM_R0 , rm), ctx); ctx->seen |=SEEN_CALL ;emit_mov_i (ARM_R3 , (u32 )jit_udiv, ctx);
arch/x86/include/asm/spinlock.h +1 -1
@@ -169,7 +169,7 @@ static inline int arch_spin_is_contended(arch_spinlock_t *lock)struct __raw_tickets tmp =READ_ONCE (lock->tickets); tmp.head &= ~TICKET_SLOWPATH_FLAG ; -return (tmp.tail - tmp.head) >TICKET_LOCK_INC ; +return (__ticket_t)(tmp.tail - tmp.head) >TICKET_LOCK_INC ; }#define arch_spin_is_contended arch_spin_is_contended
arch/x86/pci/acpi.c +22 -2
@@ -325,6 +325,26 @@ static void release_pci_root_info(struct pci_host_bridge *bridge)kfree (info); } +/* +* An IO port or MMIO resource assigned to a PCI host bridge may be +* consumed by the host bridge itself or available to its child +* bus/devices. The ACPI specification defines a bit (Producer/Consumer) +* to tell whether the resource is consumed by the host bridge itself, +* but firmware hasn't used that bit consistently, so we can't rely on it. +* +* On x86 and IA64 platforms, all IO port and MMIO resources are assumed +* to be available to child bus/devices except one special case: +* IO port [0xCF8-0xCFF] is consumed by the host bridge itself +* to access PCI configuration space. +* +* So explicitly filter out PCI CFG IO ports[0xCF8-0xCFF]. +*/ +static bool resource_is_pcicfg_ioport (struct resource *res) +{ +return (res->flags &IORESOURCE_IO ) && + res->start ==0xCF8 && res->end ==0xCFF ; +} + static void probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, int busnum, int domain,
@@ -346,8 +366,8 @@ static void probe_pci_root_info(struct pci_root_info *info, "no IO and memory resources present in _CRS\n"); else resource_list_for_each_entry_safe(entry, tmp, list) { -if ((entry->res->flags &IORESOURCE_WINDOW ) ==0 || - (entry->res->flags &IORESOURCE_DISABLED )) +if ((entry->res->flags &IORESOURCE_DISABLED ) || +resource_is_pcicfg_ioport (entry->res))resource_list_destroy_entry (entry);else entry->res->name = info->name;
block/blk-core.c +2 -0
@@ -552,6 +552,8 @@ void blk_cleanup_queue(struct request_queue *q) q->queue_lock = &q->__queue_lock;spin_unlock_irq (lock); +bdi_destroy (&q->backing_dev_info); +/* @q is and will stay empty, shutdown and put */ blk_put_queue (q); }
block/blk-mq.c +26 -24
95 lines not on this page · raw message
block/blk-sysfs.c +0 -2
@@ -522,8 +522,6 @@ static void blk_release_queue(struct kobject *kobj)blk_trace_shutdown (q); -bdi_destroy (&q->backing_dev_info); -ida_simple_remove (&blk_queue_ida, q->id);call_rcu (&q->rcu_head, blk_free_queue_rcu); }
drivers/acpi/acpi_pnp.c +2 -0
@@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = { {"PNPb006"},/* cs423x-pnpbios */ {"CSC0100"}, + {"CSC0103"}, + {"CSC0110"}, {"CSC0000"}, {"GIM0100"}, /* Guillemot Turtlebeach something appears to be cs4232 compatible *//* es18xx-pnpbios */
drivers/acpi/acpica/acmacros.h +1 -12
@@ -63,23 +63,12 @@#define ACPI_SET64 (ptr, val) (*ACPI_CAST64 (ptr) = (u64) (val))/* -* printf() format helpers. These macros are workarounds for the difficulties +* printf() format helper. This macros is a workaround for the difficulties * with emitting 64-bit integers and 64-bit pointers with the same code * for both 32-bit and 64-bit hosts. */ #define ACPI_FORMAT_UINT64 (i) ACPI_HIDWORD(i), ACPI_LODWORD(i) -#if ACPI_MACHINE_WIDTH ==64 -#define ACPI_FORMAT_NATIVE_UINT (i) ACPI_FORMAT_UINT64(i) -#define ACPI_FORMAT_TO_UINT (i) ACPI_FORMAT_UINT64(i) -#define ACPI_PRINTF_UINT "0x%8.8X%8.8X" - -#else -#define ACPI_FORMAT_NATIVE_UINT (i) 0, (u32) (i) -#define ACPI_FORMAT_TO_UINT (i) (u32) (i) -#define ACPI_PRINTF_UINT "0x%8.8X" -#endif -/* * Macros for moving data around to/from buffers that are possibly unaligned. * If the hardware supports the transfer of unaligned data, just do the store.
drivers/acpi/acpica/dsopcode.c +3 -4
@@ -446,7 +446,7 @@ acpi_ds_eval_region_operands(struct acpi_walk_state *walk_state,ACPI_DEBUG_PRINT ((ACPI_DB_EXEC ,"RgnObj %p Addr %8.8X%8.8X Len %X\n" , obj_desc, -ACPI_FORMAT_NATIVE_UINT (obj_desc->region.address), +ACPI_FORMAT_UINT64 (obj_desc->region.address), obj_desc->region.length));/* Now the address and length are valid for this opregion */
@@ -539,13 +539,12 @@ acpi_ds_eval_table_region_operands(struct acpi_walk_state *walk_state,return_ACPI_STATUS (AE_NOT_EXIST ); } - obj_desc->region.address = - (acpi_physical_address )ACPI_TO_INTEGER (table); + obj_desc->region.address =ACPI_PTR_TO_PHYSADDR (table); obj_desc->region.length = table->length;ACPI_DEBUG_PRINT ((ACPI_DB_EXEC ,"RgnObj %p Addr %8.8X%8.8X Len %X\n" , obj_desc, -ACPI_FORMAT_NATIVE_UINT (obj_desc->region.address), +ACPI_FORMAT_UINT64 (obj_desc->region.address), obj_desc->region.length));/* Now the address and length are valid for this opregion */
drivers/acpi/acpica/evregion.c +1 -1
@@ -272,7 +272,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION ,"Handler %p (@%p) Address %8.8X%8.8X [%s]\n" , ®ion_obj->region.handler->address_space, handler, -ACPI_FORMAT_NATIVE_UINT (address), +ACPI_FORMAT_UINT64 (address),acpi_ut_get_region_name (region_obj->region. space_id)));
drivers/acpi/acpica/exdump.c +2 -2
@@ -767,8 +767,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)acpi_os_printf ("\n" ); }else {acpi_os_printf (" base %8.8X%8.8X Length %X\n" , -ACPI_FORMAT_NATIVE_UINT (obj_desc->region. - address), +ACPI_FORMAT_UINT64 (obj_desc->region. + address), obj_desc->region.length); }break ;
drivers/acpi/acpica/exfldio.c +4 -6
@@ -263,17 +263,15 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc, }ACPI_DEBUG_PRINT_RAW ((ACPI_DB_BFIELD , -" Region [%s:%X], Width %X, ByteBase %X, Offset %X at %p\n" , +" Region [%s:%X], Width %X, ByteBase %X, Offset %X at %8.8X%8.8X\n" ,acpi_ut_get_region_name (rgn_desc->region. space_id), rgn_desc->region.space_id, obj_desc->common_field.access_byte_width, obj_desc->common_field.base_byte_offset, - field_datum_byte_offset,ACPI_CAST_PTR (void, - (rgn_desc-> - region. - address + - region_offset)))); + field_datum_byte_offset, +ACPI_FORMAT_UINT64 (rgn_desc->region.address + + region_offset)));/* Invoke the appropriate address_space/op_region handler */
drivers/acpi/acpica/exregion.c +3 -5
@@ -181,7 +181,7 @@ acpi_ex_system_memory_space_handler(u32 function,if (!mem_info->mapped_logical_address) {ACPI_ERROR ((AE_INFO ,"Could not map memory at 0x%8.8X%8.8X, size %u" , -ACPI_FORMAT_NATIVE_UINT (address), +ACPI_FORMAT_UINT64 (address), (u32 ) map_length)); mem_info->mapped_length =0 ;return_ACPI_STATUS (AE_NO_MEMORY );
@@ -202,8 +202,7 @@ acpi_ex_system_memory_space_handler(u32 function,ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"System-Memory (width %u) R/W %u Address=%8.8X%8.8X\n" , - bit_width, function, -ACPI_FORMAT_NATIVE_UINT (address))); + bit_width, function,ACPI_FORMAT_UINT64 (address)));/* * Perform the memory read or write
@@ -318,8 +317,7 @@ acpi_ex_system_io_space_handler(u32 function,ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"System-IO (width %u) R/W %u Address=%8.8X%8.8X\n" , - bit_width, function, -ACPI_FORMAT_NATIVE_UINT (address))); + bit_width, function,ACPI_FORMAT_UINT64 (address)));/* Decode the function parameter */
drivers/acpi/acpica/hwvalid.c +8 -8
@@ -142,17 +142,17 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) byte_width =ACPI_DIV_8 (bit_width); last_address = address + byte_width -1 ; -ACPI_DEBUG_PRINT ((ACPI_DB_IO ,"Address %p LastAddress %p Length %X" , -ACPI_CAST_PTR (void, address),ACPI_CAST_PTR (void, - last_address), - byte_width)); +ACPI_DEBUG_PRINT ((ACPI_DB_IO , +"Address %8.8X%8.8X LastAddress %8.8X%8.8X Length %X" , +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (last_address), byte_width));/* Maximum 16-bit address in I/O space */ if (last_address >ACPI_UINT16_MAX ) {ACPI_ERROR ((AE_INFO , -"Illegal I/O port address/length above 64K: %p/0x%X" , -ACPI_CAST_PTR (void, address), byte_width)); +"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X" , +ACPI_FORMAT_UINT64 (address), byte_width));return_ACPI_STATUS (AE_LIMIT ); }
@@ -181,8 +181,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)if (acpi_gbl_osi_data >= port_info->osi_dependency) {ACPI_DEBUG_PRINT ((ACPI_DB_IO , -"Denied AML access to port 0x%p/%X (%s 0x%.4X-0x%.4X)" , -ACPI_CAST_PTR (void, address), +"Denied AML access to port 0x%8.8X%8.8X/%X (%s 0x%.4X-0x%.4X)" , +ACPI_FORMAT_UINT64 (address), byte_width, port_info->name, port_info->start, port_info->end));
drivers/acpi/acpica/nsdump.c +6 -6
@@ -271,12 +271,11 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,switch (type) {case ACPI_TYPE_PROCESSOR : -acpi_os_printf ("ID %02X Len %02X Addr %p\n" , +acpi_os_printf ("ID %02X Len %02X Addr %8.8X%8.8X\n" , obj_desc->processor.proc_id, obj_desc->processor.length, -ACPI_CAST_PTR (void, - obj_desc->processor. - address)); +ACPI_FORMAT_UINT64 (obj_desc->processor. + address));break ;case ACPI_TYPE_DEVICE :
@@ -347,8 +346,9 @@ acpi_ns_dump_one_object(acpi_handle obj_handle, space_id));if (obj_desc->region.flags &AOPOBJ_DATA_VALID ) {acpi_os_printf (" Addr %8.8X%8.8X Len %.4X\n" , -ACPI_FORMAT_NATIVE_UINT - (obj_desc->region.address), +ACPI_FORMAT_UINT64 (obj_desc-> + region. + address), obj_desc->region.length); }else { acpi_os_printf
drivers/acpi/acpica/tbdata.c +8 -7
@@ -113,9 +113,9 @@ acpi_tb_acquire_table(struct acpi_table_desc *table_desc,case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL :case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL : - table = - ACPI_CAST_PTR(struct acpi_table_header, - table_desc->address); + table = ACPI_CAST_PTR(struct acpi_table_header, +ACPI_PHYSADDR_TO_PTR (table_desc-> + address));break ;default :
@@ -214,7 +214,8 @@ acpi_tb_acquire_temp_table(struct acpi_table_desc *table_desc,case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL :case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL : - table_header = ACPI_CAST_PTR(struct acpi_table_header, address); + table_header = ACPI_CAST_PTR(struct acpi_table_header, +ACPI_PHYSADDR_TO_PTR (address));if (!table_header) {return (AE_NO_MEMORY ); }
@@ -398,14 +399,14 @@ acpi_tb_verify_temp_table(struct acpi_table_desc * table_desc, char *signature) table_desc->length);if (ACPI_FAILURE (status)) {ACPI_EXCEPTION ((AE_INFO ,AE_NO_MEMORY , -"%4.4s " ACPI_PRINTF_UINT +"%4.4s 0x%8.8X%8.8X" " Attempted table install failed" ,acpi_ut_valid_acpi_name (table_desc-> signature. ascii) ? table_desc->signature.ascii :"????" , -ACPI_FORMAT_TO_UINT (table_desc-> - address))); +ACPI_FORMAT_UINT64 (table_desc-> + address))); goto invalidate_and_exit; } }
drivers/acpi/acpica/tbinstal.c +15 -12
@@ -187,8 +187,9 @@ acpi_tb_install_fixed_table(acpi_physical_address address, status =acpi_tb_acquire_temp_table (&new_table_desc, address,ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL );if (ACPI_FAILURE (status)) { -ACPI_ERROR ((AE_INFO ,"Could not acquire table length at %p" , -ACPI_CAST_PTR (void, address))); +ACPI_ERROR ((AE_INFO , +"Could not acquire table length at %8.8X%8.8X" , +ACPI_FORMAT_UINT64 (address)));return_ACPI_STATUS (status); }
@@ -246,8 +247,9 @@ acpi_tb_install_standard_table(acpi_physical_address address, status =acpi_tb_acquire_temp_table (&new_table_desc, address, flags);if (ACPI_FAILURE (status)) { -ACPI_ERROR ((AE_INFO ,"Could not acquire table length at %p" , -ACPI_CAST_PTR (void, address))); +ACPI_ERROR ((AE_INFO , +"Could not acquire table length at %8.8X%8.8X" , +ACPI_FORMAT_UINT64 (address)));return_ACPI_STATUS (status); }
@@ -258,9 +260,10 @@ acpi_tb_install_standard_table(acpi_physical_address address,if (!reload && acpi_gbl_disable_ssdt_table_install &&ACPI_COMPARE_NAME (&new_table_desc.signature,ACPI_SIG_SSDT )) { -ACPI_INFO ((AE_INFO ,"Ignoring installation of %4.4s at %p" , - new_table_desc.signature.ascii,ACPI_CAST_PTR (void, - address))); +ACPI_INFO ((AE_INFO , +"Ignoring installation of %4.4s at %8.8X%8.8X" , + new_table_desc.signature.ascii, +ACPI_FORMAT_UINT64 (address))); goto release_and_exit; }
@@ -428,11 +431,11 @@ finish_override:return ; } -ACPI_INFO ((AE_INFO ,"%4.4s " ACPI_PRINTF_UINT -" %s table override, new table: " ACPI_PRINTF_UINT , +ACPI_INFO ((AE_INFO ,"%4.4s 0x%8.8X%8.8X" +" %s table override, new table: 0x%8.8X%8.8X" , old_table_desc->signature.ascii, -ACPI_FORMAT_TO_UINT (old_table_desc->address), - override_type,ACPI_FORMAT_TO_UINT (new_table_desc.address))); +ACPI_FORMAT_UINT64 (old_table_desc->address), + override_type,ACPI_FORMAT_UINT64 (new_table_desc.address)));/* We can now uninstall the original table */
@@ -516,7 +519,7 @@ void acpi_tb_uninstall_table(struct acpi_table_desc *table_desc)if ((table_desc->flags &ACPI_TABLE_ORIGIN_MASK ) ==ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL ) { -ACPI_FREE (ACPI_CAST_PTR (void, table_desc->address)); +ACPI_FREE (ACPI_PHYSADDR_TO_PTR (table_desc->address)); } table_desc->address =ACPI_PTR_TO_PHYSADDR (NULL );
drivers/acpi/acpica/tbprint.c +6 -13
@@ -127,18 +127,12 @@ acpi_tb_print_table_header(acpi_physical_address address, {struct acpi_table_header local_header; -/* -* The reason that we use ACPI_PRINTF_UINT and ACPI_FORMAT_TO_UINT is to -* support both 32-bit and 64-bit hosts/addresses in a consistent manner. -* The %p specifier does not emit uniform output on all hosts. On some, -* leading zeros are not supported. -*/ if (ACPI_COMPARE_NAME (header->signature,ACPI_SIG_FACS )) {/* FACS only has signature and length fields */ -ACPI_INFO ((AE_INFO ,"%-4.4s " ACPI_PRINTF_UINT " %06X" , - header->signature,ACPI_FORMAT_TO_UINT (address), +ACPI_INFO ((AE_INFO ,"%-4.4s 0x%8.8X%8.8X %06X" , + header->signature,ACPI_FORMAT_UINT64 (address), header->length)); }else if (ACPI_VALIDATE_RSDP_SIG (header->signature)) {
@@ -149,9 +143,8 @@ acpi_tb_print_table_header(acpi_physical_address address, header)->oem_id, ACPI_OEM_ID_SIZE);acpi_tb_fix_string (local_header.oem_id,ACPI_OEM_ID_SIZE ); - ACPI_INFO((AE_INFO, - "RSDP " ACPI_PRINTF_UINT " %06X (v%.2d %-6.6s)", - ACPI_FORMAT_TO_UINT(address), + ACPI_INFO((AE_INFO, "RSDP 0x%8.8X%8.8X %06X (v%.2d %-6.6s)", + ACPI_FORMAT_UINT64(address), (ACPI_CAST_PTR(struct acpi_table_rsdp, header)-> revision > 0) ? ACPI_CAST_PTR(struct acpi_table_rsdp,
@@ -165,9 +158,9 @@ acpi_tb_print_table_header(acpi_physical_address address,acpi_tb_cleanup_table_header (&local_header, header); ACPI_INFO((AE_INFO, - "%-4.4s " ACPI_PRINTF_UINT + "%-4.4s 0x%8.8X%8.8X" " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)", - local_header.signature, ACPI_FORMAT_TO_UINT(address), + local_header.signature, ACPI_FORMAT_UINT64(address), local_header.length, local_header.revision, local_header.oem_id, local_header.oem_table_id, local_header.oem_revision,
drivers/acpi/acpica/tbxfroot.c +4 -3
@@ -142,7 +142,7 @@ acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp * rsdp)* ******************************************************************************/ -acpi_status __init acpi_find_root_pointer (acpi_size *table_address) +acpi_status __init acpi_find_root_pointer (acpi_physical_address * table_address) {u8 *table_ptr;u8 *mem_rover;
@@ -200,7 +200,8 @@ acpi_status __init acpi_find_root_pointer(acpi_size *table_address) physical_address += (u32 )ACPI_PTR_DIFF (mem_rover, table_ptr); - *table_address = physical_address; + *table_address = + (acpi_physical_address ) physical_address;return_ACPI_STATUS (AE_OK ); } }
@@ -233,7 +234,7 @@ acpi_status __init acpi_find_root_pointer(acpi_size *table_address) (ACPI_HI_RSDP_WINDOW_BASE +ACPI_PTR_DIFF (mem_rover, table_ptr)); - *table_address = physical_address; + *table_address = (acpi_physical_address ) physical_address;return_ACPI_STATUS (AE_OK ); }
drivers/acpi/acpica/utaddress.c +15 -19
@@ -107,10 +107,10 @@ acpi_ut_add_address_range(acpi_adr_space_type space_id, acpi_gbl_address_range_list[space_id] = range_info;ACPI_DEBUG_PRINT ((ACPI_DB_NAMES , -"\nAdded [%4.4s] address range: 0x%p-0x%p\n" , +"\nAdded [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n" ,acpi_ut_get_node_name (range_info->region_node), -ACPI_CAST_PTR (void, address), -ACPI_CAST_PTR (void, range_info->end_address))); +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (range_info->end_address))); (void )acpi_ut_release_mutex (ACPI_MTX_NAMESPACE );return_ACPI_STATUS (AE_OK );
@@ -160,15 +160,13 @@ acpi_ut_remove_address_range(acpi_adr_space_type space_id, }ACPI_DEBUG_PRINT ((ACPI_DB_NAMES , -"\nRemoved [%4.4s] address range: 0x%p-0x%p\n" , +"\nRemoved [%4.4s] address range: 0x%8.8X%8.8X-0x%8.8X%8.8X\n" ,acpi_ut_get_node_name (range_info-> region_node), -ACPI_CAST_PTR (void, - range_info-> - start_address), -ACPI_CAST_PTR (void, - range_info-> - end_address))); +ACPI_FORMAT_UINT64 (range_info-> + start_address), +ACPI_FORMAT_UINT64 (range_info-> + end_address)));ACPI_FREE (range_info); return_VOID;
@@ -245,16 +243,14 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, region_node);ACPI_WARNING ((AE_INFO , -"%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)" , +"%s range 0x%8.8X%8.8X-0x%8.8X%8.8X conflicts with OpRegion 0x%8.8X%8.8X-0x%8.8X%8.8X (%s)" ,acpi_ut_get_region_name (space_id), -ACPI_CAST_PTR (void, address), -ACPI_CAST_PTR (void, end_address), -ACPI_CAST_PTR (void, - range_info-> - start_address), -ACPI_CAST_PTR (void, - range_info-> - end_address), +ACPI_FORMAT_UINT64 (address), +ACPI_FORMAT_UINT64 (end_address), +ACPI_FORMAT_UINT64 (range_info-> + start_address), +ACPI_FORMAT_UINT64 (range_info-> + end_address), pathname));ACPI_FREE (pathname); }
drivers/acpi/resource.c +1 -1
@@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_resources);* @ares: Input ACPI resource object. * @types: Valid resource types of IORESOURCE_XXX * -* This is a hepler function to support acpi_dev_get_resources(), which filters +* This is a helper function to support acpi_dev_get_resources(), which filters * ACPI resource objects according to resource types. */ int acpi_dev_filter_resource_type(struct acpi_resource *ares,
drivers/acpi/sbshc.c +22 -0
@@ -14,6 +14,7 @@#include <linux/delay.h> #include <linux/module.h> #include <linux/interrupt.h> +#include <linux/dmi.h> #include "sbshc.h" #define PREFIX "ACPI: "
@@ -87,6 +88,8 @@ enum acpi_smb_offset { ACPI_SMB_ALARM_DATA = 0x26, /* 2 bytes alarm data */ }; +static bool macbook; +static inline int smb_hc_read (struct acpi_smb_hc *hc,u8 address,u8 *data) {return ec_read (hc->offset + address, data);
@@ -132,6 +135,8 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, }mutex_lock (&hc->lock); +if (macbook) +udelay (5 );if (smb_hc_read (hc,ACPI_SMB_PROTOCOL , &temp)) goto end;if (temp) {
@@ -257,12 +262,29 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit, acpi_handle handle, acpi_ec_query_func func, void *data); +static int macbook_dmi_match (const struct dmi_system_id *d) +{ +pr_debug ("Detected MacBook, enabling workaround\n" ); + macbook = true; +return 0 ; +} + +static struct dmi_system_id acpi_smbus_dmi_table[] = { + { macbook_dmi_match,"Apple MacBook" , { +DMI_MATCH (DMI_BOARD_VENDOR ,"Apple" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"MacBook" ) }, + }, + { }, +}; +static int acpi_smbus_hc_add (struct acpi_device *device) {int status;unsigned long long val;struct acpi_smb_hc *hc; +dmi_check_system (acpi_smbus_dmi_table); +if (!device)return -EINVAL ;
drivers/block/loop.c +1 -1
@@ -1672,8 +1672,8 @@ out:static void loop_remove (struct loop_device *lo) { -del_gendisk (lo->lo_disk);blk_cleanup_queue (lo->lo_queue); +del_gendisk (lo->lo_disk);blk_mq_free_tag_set (&lo->tag_set);put_disk (lo->lo_disk);kfree (lo);
drivers/gpio/gpiolib-sysfs.c +19 -0
@@ -551,6 +551,7 @@ static struct class gpio_class = {*/ int gpiod_export (struct gpio_desc *desc,bool direction_may_change) { +struct gpio_chip *chip;unsigned long flags;int status;const char *ioname =NULL ;
@@ -568,8 +569,16 @@ int gpiod_export(struct gpio_desc *desc, bool direction_may_change)return -EINVAL ; } + chip = desc->chip; +mutex_lock (&sysfs_lock); +/* check if chip is being removed */ +if (!chip || !chip->exported) { + status = -ENODEV ; + goto fail_unlock; + } +spin_lock_irqsave (&gpio_lock, flags);if (!test_bit (FLAG_REQUESTED , &desc->flags) ||test_bit (FLAG_EXPORT , &desc->flags)) {
@@ -783,12 +792,15 @@ void gpiochip_unexport(struct gpio_chip *chip) {int status;struct device *dev; +struct gpio_desc *desc; +unsigned int i;mutex_lock (&sysfs_lock); dev =class_find_device (&gpio_class,NULL , chip, match_export);if (dev) {put_device (dev);device_unregister (dev); +/* prevent further gpiod exports */ chip->exported = false; status =0 ; }else
@@ -797,6 +809,13 @@ void gpiochip_unexport(struct gpio_chip *chip)if (status)chip_dbg (chip,"%s: status %d\n" , __func__, status); + +/* unregister gpiod class devices owned by sysfs */ +for (i =0 ; i < chip->ngpio; i++) { + desc = &chip->desc[i]; +if (test_and_clear_bit (FLAG_SYSFS , &desc->flags)) +gpiod_free (desc); + } }static int __init gpiolib_sysfs_init (void )
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +5 -2
@@ -429,9 +429,10 @@ static int unregister_process_nocpsch(struct device_queue_manager *dqm,BUG_ON (!dqm || !qpd); -BUG_ON (!list_empty (&qpd->queues_list)); +pr_debug ("In func %s\n" , __func__); -pr_debug ("kfd: In func %s\n" , __func__); +pr_debug ("qpd->queues_list is %s\n" , +list_empty (&qpd->queues_list) ?"empty" :"not empty" ); retval =0 ;mutex_lock (&dqm->lock);
@@ -878,6 +879,8 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,return -ENOMEM ; } +init_sdma_vm (dqm, q, qpd); + retval = mqd->init_mqd (mqd, &q->mqd, &q->mqd_mem_obj, &q->gart_mqd_addr, &q->properties);if (retval !=0 )
drivers/gpu/drm/drm_irq.c +4 -5
@@ -131,12 +131,11 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)/* Reinitialize corresponding vblank timestamp if high-precision query * available. Skip this step if query unsupported or failed. Will -* reinitialize delayed at next vblank interrupt in that case. +* reinitialize delayed at next vblank interrupt in that case and +* assign 0 for now, to mark the vblanktimestamp as invalid. */ -if (rc) { - tslot =atomic_read (&vblank->count) + diff; -vblanktimestamp (dev, crtc, tslot) = t_vblank; - } + tslot =atomic_read (&vblank->count) + diff; +vblanktimestamp (dev, crtc, tslot) = rc ? t_vblank : (struct timeval ) {0 ,0 };smp_mb__before_atomic ();atomic_add (diff, &vblank->count);
drivers/gpu/drm/i915/intel_dp.c +3 -3
@@ -1176,7 +1176,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, pipe_config->has_dp_encoder = true; pipe_config->has_drrs = false; - pipe_config->has_audio = intel_dp->has_audio; + pipe_config->has_audio = intel_dp->has_audio && port !=PORT_A ;if (is_edp (intel_dp) && intel_connector->panel.fixed_mode) { intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
@@ -2026,8 +2026,8 @@ static void intel_dp_get_config(struct intel_encoder *encoder,int dotclock; tmp =I915_READ (intel_dp->output_reg); -if (tmp &DP_AUDIO_OUTPUT_ENABLE ) - pipe_config->has_audio = true; + + pipe_config->has_audio = tmp &DP_AUDIO_OUTPUT_ENABLE && port !=PORT_A ;if ((port ==PORT_A ) || !HAS_PCH_CPT (dev)) {if (tmp &DP_SYNC_HS_HIGH )
drivers/gpu/drm/i915/intel_lvds.c +24 -2
@@ -812,12 +812,28 @@ static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)static const struct dmi_system_id intel_dual_link_lvds[] = { { .callback = intel_dual_link_lvds_callback, - .ident ="Apple MacBook Pro (Core i5/i7 Series)" , + .ident ="Apple MacBook Pro 15\" (2010)" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"MacBookPro6,2" ), + }, + }, + { + .callback = intel_dual_link_lvds_callback, + .ident ="Apple MacBook Pro 15\" (2011)" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ),DMI_MATCH (DMI_PRODUCT_NAME ,"MacBookPro8,2" ), }, }, + { + .callback = intel_dual_link_lvds_callback, + .ident ="Apple MacBook Pro 15\" (2012)" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Apple Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"MacBookPro9,1" ), + }, + }, { }/* terminating entry */ };
@@ -847,6 +863,11 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)if (i915.lvds_channel_mode >0 )return i915.lvds_channel_mode ==2 ; +/* single channel LVDS is limited to 112 MHz */ +if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock + >112999 ) +return true; +if (dmi_check_system (intel_dual_link_lvds))return true;
@@ -1104,6 +1125,8 @@ void intel_lvds_init(struct drm_device *dev) out:mutex_unlock (&dev->mode_config.mutex); +intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode); + lvds_encoder->is_dual_link =compute_is_dual_link_lvds (lvds_encoder);DRM_DEBUG_KMS ("detected %s-link lvds configuration\n" , lvds_encoder->is_dual_link ?"dual" :"single" );
@@ -1118,7 +1141,6 @@ out: }drm_connector_register (connector); -intel_panel_init (&intel_connector->panel, fixed_mode, downclock_mode);intel_panel_setup_backlight (connector,INVALID_PIPE );return ;
drivers/gpu/drm/radeon/radeon_asic.c +1 -1
@@ -1180,7 +1180,7 @@ static struct radeon_asic rs780_asic = {static struct radeon_asic_ring rv770_uvd_ring = { .ib_execute = &uvd_v1_0_ib_execute, .emit_fence = &uvd_v2_2_fence_emit, - .emit_semaphore = &uvd_v1_0_semaphore_emit, + .emit_semaphore = &uvd_v2_2_semaphore_emit, .cs_parse = &radeon_uvd_cs_parse, .ring_test = &uvd_v1_0_ring_test, .ib_test = &uvd_v1_0_ib_test,
drivers/gpu/drm/radeon/radeon_asic.h +4 -0
@@ -919,6 +919,10 @@ void uvd_v1_0_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib);int uvd_v2_2_resume (struct radeon_device *rdev);void uvd_v2_2_fence_emit (struct radeon_device *rdev,struct radeon_fence *fence); +bool uvd_v2_2_semaphore_emit (struct radeon_device *rdev, +struct radeon_ring *ring, +struct radeon_semaphore *semaphore, +bool emit_wait);/* uvd v3.1 */ bool uvd_v3_1_semaphore_emit(struct radeon_device *rdev,
drivers/gpu/drm/radeon/radeon_audio.c +4 -0
@@ -464,6 +464,10 @@ void radeon_audio_detect(struct drm_connector *connector,return ; rdev = connector->encoder->dev->dev_private; + +if (!radeon_audio_chipset_supported (rdev)) +return ; + radeon_encoder =to_radeon_encoder (connector->encoder); dig = radeon_encoder->enc_priv;
drivers/gpu/drm/radeon/radeon_ttm.c +3 -5
@@ -591,8 +591,7 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm) {struct radeon_device *rdev =radeon_get_rdev (ttm->bdev);struct radeon_ttm_tt *gtt = (void *)ttm; -struct scatterlist *sg; -int i; +struct sg_page_iter sg_iter;int write = !(gtt->userflags &RADEON_GEM_USERPTR_READONLY ); enum dma_data_direction direction = write ?
@@ -605,9 +604,8 @@ static void radeon_ttm_tt_unpin_userptr(struct ttm_tt *ttm)/* free the sg table and pages again */ dma_unmap_sg (rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction); -for_each_sg (ttm->sg->sgl, sg, ttm->sg->nents, i) { -struct page *page =sg_page (sg); - +for_each_sg_page (ttm->sg->sgl, &sg_iter, ttm->sg->nents,0 ) { +struct page *page =sg_page_iter_page (&sg_iter);if (!(gtt->userflags &RADEON_GEM_USERPTR_READONLY ))set_page_dirty (page);
drivers/gpu/drm/radeon/radeon_uvd.c +74 -31
130 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_vce.c +48 -17
161 lines not on this page · raw message
drivers/gpu/drm/radeon/rv770d.h +3 -0
@@ -989,6 +989,9 @@ ((n) & 0x3FFF) << 16)/* UVD */ +#define UVD_SEMA_ADDR_LOW 0xef00 +#define UVD_SEMA_ADDR_HIGH 0xef04 +#define UVD_SEMA_CMD 0xef08#define UVD_GPCOM_VCPU_CMD 0xef0c#define UVD_GPCOM_VCPU_DATA0 0xef10#define UVD_GPCOM_VCPU_DATA1 0xef14
drivers/gpu/drm/radeon/uvd_v1_0.c +2 -12
@@ -466,18 +466,8 @@ bool uvd_v1_0_semaphore_emit(struct radeon_device *rdev, struct radeon_semaphore *semaphore, bool emit_wait) { - uint64_t addr = semaphore->gpu_addr; - -radeon_ring_write (ring,PACKET0 (UVD_SEMA_ADDR_LOW ,0 )); -radeon_ring_write (ring, (addr >>3 ) &0x000FFFFF ); - -radeon_ring_write (ring,PACKET0 (UVD_SEMA_ADDR_HIGH ,0 )); -radeon_ring_write (ring, (addr >>23 ) &0x000FFFFF ); - -radeon_ring_write (ring,PACKET0 (UVD_SEMA_CMD ,0 )); -radeon_ring_write (ring, emit_wait ?1 :0 ); - -return true; +/* disable semaphores for UVD V1 hardware */ +return false; }/**
drivers/gpu/drm/radeon/uvd_v2_2.c +29 -0
@@ -60,6 +60,35 @@ void uvd_v2_2_fence_emit(struct radeon_device *rdev, }/** +* uvd_v2_2_semaphore_emit - emit semaphore command +* +* @rdev: radeon_device pointer +* @ring: radeon_ring pointer +* @semaphore: semaphore to emit commands for +* @emit_wait: true if we should emit a wait command +* +* Emit a semaphore command (either wait or signal) to the UVD ring. +*/ +bool uvd_v2_2_semaphore_emit (struct radeon_device *rdev, +struct radeon_ring *ring, +struct radeon_semaphore *semaphore, +bool emit_wait) +{ +uint64_t addr = semaphore->gpu_addr; + +radeon_ring_write (ring,PACKET0 (UVD_SEMA_ADDR_LOW ,0 )); +radeon_ring_write (ring, (addr >>3 ) &0x000FFFFF ); + +radeon_ring_write (ring,PACKET0 (UVD_SEMA_ADDR_HIGH ,0 )); +radeon_ring_write (ring, (addr >>23 ) &0x000FFFFF ); + +radeon_ring_write (ring,PACKET0 (UVD_SEMA_CMD ,0 )); +radeon_ring_write (ring, emit_wait ?1 :0 ); + +return true; +} + +/** * uvd_v2_2_resume - memory controller programming * * @rdev: radeon_device pointer
drivers/infiniband/core/cma.c +17 -10
@@ -859,19 +859,27 @@ static void cma_save_ib_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_idmemcpy (&ib->sib_addr, &path->dgid,16 ); } +static __be16 ss_get_port (const struct sockaddr_storage *ss) +{ +if (ss->ss_family ==AF_INET ) +return ((struct sockaddr_in *)ss)->sin_port; +else if (ss->ss_family ==AF_INET6 ) +return ((struct sockaddr_in6 *)ss)->sin6_port; +BUG (); +} +static void cma_save_ip4_info (struct rdma_cm_id *id,struct rdma_cm_id *listen_id,struct cma_hdr *hdr) { -struct sockaddr_in *listen4, *ip4; +struct sockaddr_in *ip4; - listen4 = (struct sockaddr_in *) &listen_id->route.addr.src_addr; ip4 = (struct sockaddr_in *) &id->route.addr.src_addr; - ip4->sin_family = listen4->sin_family; + ip4->sin_family =AF_INET ; ip4->sin_addr.s_addr = hdr->dst_addr.ip4.addr; - ip4->sin_port = listen4->sin_port; + ip4->sin_port =ss_get_port (&listen_id->route.addr.src_addr); ip4 = (struct sockaddr_in *) &id->route.addr.dst_addr; - ip4->sin_family = listen4->sin_family; + ip4->sin_family =AF_INET ; ip4->sin_addr.s_addr = hdr->src_addr.ip4.addr; ip4->sin_port = hdr->port; }
@@ -879,16 +887,15 @@ static void cma_save_ip4_info(struct rdma_cm_id *id, struct rdma_cm_id *listen_istatic void cma_save_ip6_info (struct rdma_cm_id *id,struct rdma_cm_id *listen_id,struct cma_hdr *hdr) { -struct sockaddr_in6 *listen6, *ip6; +struct sockaddr_in6 *ip6; - listen6 = (struct sockaddr_in6 *) &listen_id->route.addr.src_addr; ip6 = (struct sockaddr_in6 *) &id->route.addr.src_addr; - ip6->sin6_family = listen6->sin6_family; + ip6->sin6_family =AF_INET6 ; ip6->sin6_addr = hdr->dst_addr.ip6; - ip6->sin6_port = listen6->sin6_port; + ip6->sin6_port =ss_get_port (&listen_id->route.addr.src_addr); ip6 = (struct sockaddr_in6 *) &id->route.addr.dst_addr; - ip6->sin6_family = listen6->sin6_family; + ip6->sin6_family =AF_INET6 ; ip6->sin6_addr = hdr->src_addr.ip6; ip6->sin6_port = hdr->port; }
drivers/md/dm-crypt.c +6 -6
@@ -925,10 +925,11 @@ static int crypt_convert(struct crypt_config *cc,switch (r) {/* async */ -case -EINPROGRESS :case -EBUSY :wait_for_completion (&ctx->restart);reinit_completion (&ctx->restart); +/* fall through*/ +case -EINPROGRESS : ctx->req =NULL ; ctx->cc_sector++;continue ;
@@ -1345,8 +1346,10 @@ static void kcryptd_async_done(struct crypto_async_request *async_req, struct dm_crypt_io *io = container_of(ctx, struct dm_crypt_io, ctx);struct crypt_config *cc = io->cc; -if (error == -EINPROGRESS ) +if (error == -EINPROGRESS ) { +complete (&ctx->restart);return ; + }if (!error && cc->iv_gen_ops && cc->iv_gen_ops->post) error = cc->iv_gen_ops->post (cc,iv_of_dmreq (cc, dmreq), dmreq);
@@ -1357,15 +1360,12 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,crypt_free_req (cc,req_of_dmreq (cc, dmreq), io->base_bio);if (!atomic_dec_and_test (&ctx->cc_pending)) - goto done; +return ;if (bio_data_dir (io->base_bio) ==READ )kcryptd_crypt_read_done (io);else kcryptd_crypt_write_io_submit (io,1 ); -done: -if (!completion_done (&ctx->restart)) -complete (&ctx->restart); }static void kcryptd_crypt (struct work_struct *work)
drivers/md/md.c +2 -2
@@ -4754,12 +4754,12 @@ static void md_free(struct kobject *ko)if (mddev->sysfs_state)sysfs_put (mddev->sysfs_state); +if (mddev->queue) +blk_cleanup_queue (mddev->queue);if (mddev->gendisk) {del_gendisk (mddev->gendisk);put_disk (mddev->gendisk); } -if (mddev->queue) -blk_cleanup_queue (mddev->queue);kfree (mddev); }
drivers/media/platform/marvell-ccic/mcam-core.c +7 -7
@@ -116,8 +116,8 @@ static struct mcam_format_struct { .planar = false, }, { - .desc = "UYVY 4:2:2", - .pixelformat = V4L2_PIX_FMT_UYVY, + .desc = "YVYU 4:2:2", + .pixelformat = V4L2_PIX_FMT_YVYU, .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, .bpp = 2, .planar = false,
@@ -748,7 +748,7 @@ static void mcam_ctlr_image(struct mcam_camera *cam)switch (fmt->pixelformat) {case V4L2_PIX_FMT_YUYV : -case V4L2_PIX_FMT_UYVY : +case V4L2_PIX_FMT_YVYU : widthy = fmt->width *2 ; widthuv =0 ;break ;
@@ -784,15 +784,15 @@ static void mcam_ctlr_image(struct mcam_camera *cam)case V4L2_PIX_FMT_YUV420 :case V4L2_PIX_FMT_YVU420 :mcam_reg_write_mask (cam,REG_CTRL0 , -C0_DF_YUV |C0_YUV_420PL |C0_YUVE_YVYU ,C0_DF_MASK ); +C0_DF_YUV |C0_YUV_420PL |C0_YUVE_VYUY ,C0_DF_MASK );break ;case V4L2_PIX_FMT_YUYV :mcam_reg_write_mask (cam,REG_CTRL0 , -C0_DF_YUV |C0_YUV_PACKED |C0_YUVE_UYVY ,C0_DF_MASK ); +C0_DF_YUV |C0_YUV_PACKED |C0_YUVE_NOSWAP ,C0_DF_MASK );break ; -case V4L2_PIX_FMT_UYVY : +case V4L2_PIX_FMT_YVYU :mcam_reg_write_mask (cam,REG_CTRL0 , -C0_DF_YUV |C0_YUV_PACKED |C0_YUVE_YUYV ,C0_DF_MASK ); +C0_DF_YUV |C0_YUV_PACKED |C0_YUVE_SWAP24 ,C0_DF_MASK );break ;case V4L2_PIX_FMT_JPEG : mcam_reg_write_mask(cam, REG_CTRL0,
drivers/media/platform/marvell-ccic/mcam-core.h +4 -4
@@ -330,10 +330,10 @@ int mccic_resume(struct mcam_camera *cam);#define C0_YUVE_YVYU 0x00010000/* Y1CrY0Cb */ #define C0_YUVE_VYUY 0x00020000/* CrY1CbY0 */ #define C0_YUVE_UYVY 0x00030000/* CbY1CrY0 */ -#define C0_YUVE_XYUV 0x00000000/* 420: .YUV */ -#define C0_YUVE_XYVU 0x00010000/* 420: .YVU */ -#define C0_YUVE_XUVY 0x00020000/* 420: .UVY */ -#define C0_YUVE_XVUY 0x00030000/* 420: .VUY */ +#define C0_YUVE_NOSWAP 0x00000000/* no bytes swapping */ +#define C0_YUVE_SWAP13 0x00010000/* swap byte 1 and 3 */ +#define C0_YUVE_SWAP24 0x00020000/* swap byte 2 and 4 */ +#define C0_YUVE_SWAP1324 0x00030000/* swap bytes 1&3 and 2&4 */ /* Bayer bits 18,19 if needed */ #define C0_EOF_VSYNC 0x00400000/* Generate EOF by VSYNC */ #define C0_VEDGE_CTRL 0x00800000/* Detect falling edge of VSYNC */
drivers/mmc/card/block.c +12 -0
@@ -1029,6 +1029,18 @@ static inline void mmc_blk_reset_success(struct mmc_blk_data *md, int type) md->reset_done &= ~type; } +int mmc_access_rpmb (struct mmc_queue *mq) +{ +struct mmc_blk_data *md = mq->data; +/* +* If this is a RPMB partition access, return ture +*/ +if (md && md->part_type ==EXT_CSD_PART_CONFIG_ACC_RPMB ) +return true; + +return false; +} +static int mmc_blk_issue_discard_rq (struct mmc_queue *mq,struct request *req) {struct mmc_blk_data *md = mq->data;
drivers/mmc/card/queue.c +1 -1
@@ -38,7 +38,7 @@ static int mmc_prep_request(struct request_queue *q, struct request *req)return BLKPREP_KILL ; } -if (mq &&mmc_card_removed (mq->card)) +if (mq && (mmc_card_removed (mq->card) ||mmc_access_rpmb (mq)))return BLKPREP_KILL ; req->cmd_flags |=REQ_DONTPREP ;
drivers/mmc/card/queue.h +2 -0
@@ -73,4 +73,6 @@ extern void mmc_queue_bounce_post(struct mmc_queue_req *);extern int mmc_packed_init (struct mmc_queue *,struct mmc_card *);extern void mmc_packed_clean (struct mmc_queue *); +extern int mmc_access_rpmb (struct mmc_queue *); +#endif
drivers/mmc/core/core.c +1 -0
@@ -2648,6 +2648,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,switch (mode) {case PM_HIBERNATION_PREPARE :case PM_SUSPEND_PREPARE : +case PM_RESTORE_PREPARE :spin_lock_irqsave (&host->lock, flags); host->rescan_disable =1 ;spin_unlock_irqrestore (&host->lock, flags);
drivers/mmc/host/sh_mmcif.c +1 -1
@@ -1402,7 +1402,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) host =mmc_priv (mmc); host->mmc = mmc; host->addr = reg; - host->timeout =msecs_to_jiffies (1000 ); + host->timeout =msecs_to_jiffies (10000 ); host->ccs_enable = !pd || !pd->ccs_unsupported; host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present;
drivers/pinctrl/core.c +4 -6
@@ -1110,7 +1110,7 @@ void devm_pinctrl_put(struct pinctrl *p)EXPORT_SYMBOL_GPL (devm_pinctrl_put);int pinctrl_register_map (struct pinctrl_map const *maps,unsigned num_maps, -bool dup,bool locked) +bool dup) {int i, ret;struct pinctrl_maps *maps_node;
@@ -1178,11 +1178,9 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps, maps_node->maps = maps; } -if (!locked) -mutex_lock (&pinctrl_maps_mutex); +mutex_lock (&pinctrl_maps_mutex);list_add_tail (&maps_node->node, &pinctrl_maps); -if (!locked) -mutex_unlock (&pinctrl_maps_mutex); +mutex_unlock (&pinctrl_maps_mutex);return 0 ; }
@@ -1197,7 +1195,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,int pinctrl_register_mappings (struct pinctrl_map const *maps,unsigned num_maps) { -return pinctrl_register_map (maps, num_maps, true, false); +return pinctrl_register_map (maps, num_maps, true); }void pinctrl_unregister_map (struct pinctrl_map const *map)
drivers/pinctrl/core.h +1 -1
@@ -183,7 +183,7 @@ static inline struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, }int pinctrl_register_map (struct pinctrl_map const *maps,unsigned num_maps, -bool dup,bool locked); +bool dup);void pinctrl_unregister_map (struct pinctrl_map const *map);extern int pinctrl_force_sleep (struct pinctrl_dev *pctldev);
drivers/pinctrl/devicetree.c +1 -1
@@ -92,7 +92,7 @@ static int dt_remember_or_free_map(struct pinctrl *p, const char *statename, dt_map->num_maps = num_maps;list_add_tail (&dt_map->node, &p->dt_maps); -return pinctrl_register_map (map, num_maps, false, true); +return pinctrl_register_map (map, num_maps, false); }struct pinctrl_dev *of_pinctrl_get (struct device_node *np)
drivers/rtc/rtc-armada38x.c +12 -12
@@ -40,6 +40,13 @@ struct armada38x_rtc {void __iomem *regs;void __iomem *regs_soc;spinlock_t lock; +/* +* While setting the time, the RTC TIME register should not be +* accessed. Setting the RTC time involves sleeping during +* 100ms, so a mutex instead of a spinlock is used to protect +* it +*/ +struct mutex mutex_time;int irq; };
@@ -59,8 +66,7 @@ static int armada38x_rtc_read_time(struct device *dev, struct rtc_time *tm)struct armada38x_rtc *rtc =dev_get_drvdata (dev);unsigned long time, time_check, flags; -spin_lock_irqsave (&rtc->lock, flags); - +mutex_lock (&rtc->mutex_time); time =readl (rtc->regs +RTC_TIME );/* * WA for failing time set attempts. As stated in HW ERRATA if
@@ -71,7 +77,7 @@ static int armada38x_rtc_read_time(struct device *dev, struct rtc_time *tm)if ((time_check - time) >1 ) time_check =readl (rtc->regs +RTC_TIME ); -spin_unlock_irqrestore (&rtc->lock, flags); +mutex_unlock (&rtc->mutex_time);rtc_time_to_tm (time_check, tm);
@@ -94,19 +100,12 @@ static int armada38x_rtc_set_time(struct device *dev, struct rtc_time *tm)* then wait for 100ms before writing to the time register to be * sure that the data will be taken into account. */ -spin_lock_irqsave (&rtc->lock, flags); - +mutex_lock (&rtc->mutex_time);rtc_delayed_write (0 , rtc,RTC_STATUS ); - -spin_unlock_irqrestore (&rtc->lock, flags); -msleep (100 ); - -spin_lock_irqsave (&rtc->lock, flags); -rtc_delayed_write (time, rtc,RTC_TIME ); +mutex_unlock (&rtc->mutex_time); -spin_unlock_irqrestore (&rtc->lock, flags); out:return ret; }
@@ -230,6 +229,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)return -ENOMEM ;spin_lock_init (&rtc->lock); +mutex_init (&rtc->mutex_time); res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"rtc" ); rtc->regs =devm_ioremap_resource (&pdev->dev, res);
drivers/tty/hvc/hvc_xen.c +17 -1
@@ -299,11 +299,27 @@ static int xen_initial_domain_console_init(void)return 0 ; } +static void xen_console_update_evtchn (struct xencons_info *info) +{ +if (xen_hvm_domain ()) { +uint64_t v; +int err; + + err =hvm_get_parameter (HVM_PARAM_CONSOLE_EVTCHN , &v); +if (!err && v) + info->evtchn = v; + }else + info->evtchn = xen_start_info->console.domU.evtchn; +} +void xen_console_resume (void ) {struct xencons_info *info =vtermno_to_xencons (HVC_COOKIE ); -if (info !=NULL && info->irq) +if (info !=NULL && info->irq) { +if (!xen_initial_domain ()) +xen_console_update_evtchn (info);rebind_evtchn_irq (info->evtchn, info->irq); + } }static void xencons_disconnect_backend (struct xencons_info *info)
drivers/vfio/vfio.c +18 -3
@@ -711,6 +711,8 @@ void *vfio_del_group_dev(struct device *dev)void *device_data = device->device_data;struct vfio_unbound_dev *unbound;unsigned int i =0 ; +long ret; +bool interrupted = false;/* * The group exists so long as we have a device reference. Get
@@ -756,9 +758,22 @@ void *vfio_del_group_dev(struct device *dev)vfio_device_put (device); - }while (wait_event_interruptible_timeout (vfio.release_q, - !vfio_dev_present (group, dev), -HZ *10 ) <=0 ); +if (interrupted) { + ret =wait_event_timeout (vfio.release_q, + !vfio_dev_present (group, dev),HZ *10 ); + }else { + ret =wait_event_interruptible_timeout (vfio.release_q, + !vfio_dev_present (group, dev),HZ *10 ); +if (ret == -ERESTARTSYS ) { + interrupted = true; +dev_warn (dev, +"Device is currently in use, task" +" \"%s\" (%d) " +"blocked until device is released" , + current->comm,task_pid_nr (current)); + } + } + }while (ret <=0 );vfio_group_put (group);
drivers/xen/events/events_2l.c +10 -0
@@ -345,6 +345,15 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } +static void evtchn_2l_resume (void ) +{ +int i; + +for_each_online_cpu (i) +memset (per_cpu (cpu_evtchn_mask, i),0 ,sizeof (xen_ulong_t) * +EVTCHN_2L_NR_CHANNELS /BITS_PER_EVTCHN_WORD ); +} +static const struct evtchn_ops evtchn_ops_2l = { .max_channels = evtchn_2l_max_channels, .nr_channels = evtchn_2l_max_channels,
@@ -356,6 +365,7 @@ static const struct evtchn_ops evtchn_ops_2l = { .mask = evtchn_2l_mask, .unmask = evtchn_2l_unmask, .handle_events = evtchn_2l_handle_events, + .resume = evtchn_2l_resume, };void __init xen_evtchn_2l_init (void )
drivers/xen/events/events_base.c +4 -3
@@ -529,8 +529,8 @@ static unsigned int __startup_pirq(unsigned int irq)if (rc) goto err; -bind_evtchn_to_cpu (evtchn,0 ); info->evtchn = evtchn; +bind_evtchn_to_cpu (evtchn,0 ); rc =xen_evtchn_port_setup (info);if (rc)
@@ -1279,8 +1279,9 @@ void rebind_evtchn_irq(int evtchn, int irq)mutex_unlock (&irq_mapping_update_lock); -/* new event channels are always bound to cpu 0 */ -irq_set_affinity (irq,cpumask_of (0 )); +bind_evtchn_to_cpu (evtchn, info->cpu); +/* This will be deferred until interrupt is processed */ +irq_set_affinity (irq,cpumask_of (info->cpu));/* Unmask the event channel. */ enable_irq (irq);
drivers/xen/xen-pciback/conf_space.c +3 -3
@@ -16,8 +16,8 @@#include "conf_space.h" #include "conf_space_quirks.h" -bool permissive; -module_param (permissive, bool,0644 ); +bool xen_pcibk_permissive; +module_param_named (permissive, xen_pcibk_permissive, bool,0644 );/* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word, * xen_pcibk_write_config_word, and xen_pcibk_write_config_byte are created. */
@@ -262,7 +262,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)* This means that some fields may still be read-only because * they have entries in the config_field list that intercept * the write and do nothing. */ -if (dev_data->permissive || permissive) { +if (dev_data->permissive || xen_pcibk_permissive) {switch (size) {case 1 : err = pci_write_config_byte(dev, offset,
drivers/xen/xen-pciback/conf_space.h +1 -1
@@ -64,7 +64,7 @@ struct config_field_entry {void *data; }; -extern bool permissive; +extern bool xen_pcibk_permissive;#define OFFSET (cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)
drivers/xen/xen-pciback/conf_space_header.c +1 -1
@@ -105,7 +105,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) cmd->val = value; -if (!permissive && (!dev_data || !dev_data->permissive)) +if (!xen_pcibk_permissive && (!dev_data || !dev_data->permissive))return 0 ;/* Only allow the guest to control certain bits. */
drivers/xen/xenbus/xenbus_probe.c +29 -0
@@ -57,6 +57,7 @@#include <xen/xen.h> #include <xen/xenbus.h> #include <xen/events.h> +#include <xen/xen-ops.h> #include <xen/page.h> #include <xen/hvm.h>
@@ -735,6 +736,30 @@ static int __init xenstored_local_init(void)return err; } +static int xenbus_resume_cb (struct notifier_block *nb, +unsigned long action,void *data) +{ +int err =0 ; + +if (xen_hvm_domain ()) { +uint64_t v; + + err =hvm_get_parameter (HVM_PARAM_STORE_EVTCHN , &v); +if (!err && v) + xen_store_evtchn = v; +else +pr_warn ("Cannot update xenstore event channel: %d\n" , + err); + }else + xen_store_evtchn = xen_start_info->store_evtchn; + +return err; +} + +static struct notifier_block xenbus_resume_nb = { + .notifier_call = xenbus_resume_cb, +}; +static int __init xenbus_init (void ) {int err =0 ;
@@ -793,6 +818,10 @@ static int __init xenbus_init(void) goto out_error; } +if ((xen_store_domain_type !=XS_LOCAL ) && + (xen_store_domain_type !=XS_UNKNOWN )) +xen_resume_notifier_register (&xenbus_resume_nb); +#ifdef CONFIG_XEN_COMPAT_XENFS /* * Create xenfs mountpoint in /proc for compatibility with
fs/coredump.c +1 -1
@@ -657,7 +657,7 @@ void do_coredump(const siginfo_t *siginfo)*/ if (!uid_eq (inode->i_uid,current_fsuid ())) goto close_fail; -if (!cprm.file->f_op->write) +if (!(cprm.file->f_mode &FMODE_CAN_WRITE )) goto close_fail;if (do_truncate (cprm.file->f_path.dentry,0 ,0 , cprm.file)) goto close_fail;
fs/namei.c +2 -1
@@ -3228,7 +3228,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,if (unlikely (file->f_flags & __O_TMPFILE)) { error =do_tmpfile (dfd, pathname, nd, flags, op, file, &opened); - goto out; + goto out2; } error =path_init (dfd, pathname->name, flags, nd);
@@ -3258,6 +3258,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, } out:path_cleanup (nd); +out2:if (!(opened &FILE_OPENED )) {BUG_ON (!error);put_filp (file);
fs/namespace.c +6 -0
@@ -3178,6 +3178,12 @@ bool fs_fully_visible(struct file_system_type *type)if (mnt->mnt.mnt_sb->s_type != type)continue ; +/* This mount is not fully visible if it's root directory +* is not the root directory of the filesystem. +*/ +if (mnt->mnt.mnt_root != mnt->mnt.mnt_sb->s_root) +continue ; +/* This mount is not fully visible if there are any child mounts * that cover anything except for empty directories. */
fs/nilfs2/btree.c +1 -1
@@ -388,7 +388,7 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, nchildren =nilfs_btree_node_get_nchildren (node);if (unlikely (level <NILFS_BTREE_LEVEL_NODE_MIN || - level >NILFS_BTREE_LEVEL_MAX || + level >=NILFS_BTREE_LEVEL_MAX || nchildren <0 || nchildren >NILFS_BTREE_ROOT_NCHILDREN_MAX )) { pr_crit("NILFS: bad btree root (inode number=%lu): level = %d, flags = 0x%x, nchildren = %d\n",
fs/ocfs2/dlm/dlmmaster.c +13 -0
@@ -757,6 +757,19 @@ lookup:if (tmpres) {spin_unlock (&dlm->spinlock);spin_lock (&tmpres->spinlock); + +/* +* Right after dlm spinlock was released, dlm_thread could have +* purged the lockres. Check if lockres got unhashed. If so +* start over. +*/ +if (hlist_unhashed (&tmpres->hash_node)) { +spin_unlock (&tmpres->spinlock); +dlm_lockres_put (tmpres); + tmpres =NULL ; + goto lookup; + } +/* Wait on the thread that is mastering the resource */ if (tmpres->owner ==DLM_LOCK_RES_OWNER_UNKNOWN ) {__dlm_wait_on_lockres (tmpres);
include/acpi/acpixf.h +6 -6
@@ -431,13 +431,13 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_load_tables(void)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init acpi_reallocate_root_table(void)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status __init - acpi_find_root_pointer(acpi_size * rsdp_address)) - + acpi_find_root_pointer(acpi_physical_address * + rsdp_address)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status - acpi_get_table_header(acpi_string signature, - u32 instance, - struct acpi_table_header - *out_table_header)) + acpi_get_table_header(acpi_string signature, + u32 instance, + struct acpi_table_header + *out_table_header)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_get_table(acpi_string signature, u32 instance, struct acpi_table_header
include/linux/nilfs2_fs.h +1 -1
@@ -460,7 +460,7 @@ struct nilfs_btree_node {/* level */ #define NILFS_BTREE_LEVEL_DATA 0#define NILFS_BTREE_LEVEL_NODE_MIN (NILFS_BTREE_LEVEL_DATA + 1) -#define NILFS_BTREE_LEVEL_MAX 14 +#define NILFS_BTREE_LEVEL_MAX 14/* Max level (exclusive) */ /** * struct nilfs_palloc_group_desc - block group descriptor
mm/memory-failure.c +8 -8
@@ -1141,10 +1141,10 @@ int memory_failure(unsigned long pfn, int trapno, int flags)* The check (unnecessarily) ignores LRU pages being isolated and * walked by the page reclaim code, however that's not a big loss. */ -if (!PageHuge (p) && !PageTransTail (p)) { -if (!PageLRU (p)) -shake_page (p,0 ); -if (!PageLRU (p)) { +if (!PageHuge (p)) { +if (!PageLRU (hpage)) +shake_page (hpage,0 ); +if (!PageLRU (hpage)) {/* * shake_page could have turned it free. */
@@ -1721,12 +1721,12 @@ int soft_offline_page(struct page *page, int flags) }else if (ret ==0 ) {/* for free pages */ if (PageHuge (page)) {set_page_hwpoison_huge_page (hpage); -dequeue_hwpoisoned_huge_page (hpage); -atomic_long_add (1 <<compound_order (hpage), +if (!dequeue_hwpoisoned_huge_page (hpage)) +atomic_long_add (1 <<compound_order (hpage), &num_poisoned_pages); }else { -SetPageHWPoison (page); -atomic_long_inc (&num_poisoned_pages); +if (!TestSetPageHWPoison (page)) +atomic_long_inc (&num_poisoned_pages); } }unset_migratetype_isolate (page,MIGRATE_MOVABLE );
mm/page-writeback.c +3 -3
@@ -580,7 +580,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,long x; x =div64_s64 (((s64 )setpoint - (s64 )dirty) <<RATELIMIT_CALC_SHIFT , - limit - setpoint +1 ); + (limit - setpoint) |1 ); pos_ratio = x; pos_ratio = pos_ratio * x >>RATELIMIT_CALC_SHIFT ; pos_ratio = pos_ratio * x >>RATELIMIT_CALC_SHIFT ;
@@ -807,7 +807,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,* scale global setpoint to bdi's: * bdi_setpoint = setpoint * bdi_thresh / thresh */ - x =div_u64 ((u64 )bdi_thresh <<16 , thresh +1 ); + x =div_u64 ((u64 )bdi_thresh <<16 , thresh |1 ); bdi_setpoint = setpoint * (u64 )x >>16 ;/* * Use span=(8*write_bw) in single bdi case as indicated by
@@ -822,7 +822,7 @@ static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,if (bdi_dirty < x_intercept - span /4 ) { pos_ratio =div64_u64 (pos_ratio * (x_intercept - bdi_dirty), - x_intercept - bdi_setpoint +1 ); + (x_intercept - bdi_setpoint) |1 ); }else pos_ratio /=4 ;
sound/oss/sequencer.c +2 -10
@@ -681,13 +681,8 @@ static int seq_timing_event(unsigned char *event_rec)break ;case TMR_ECHO : -if (seq_mode ==SEQ_2 ) -seq_copy_to_input (event_rec,8 ); -else - { - parm = (parm <<8 |SEQ_ECHO ); -seq_copy_to_input ((unsigned char *) &parm,4 ); - } + parm = (parm <<8 |SEQ_ECHO ); +seq_copy_to_input ((unsigned char *) &parm,4 );break ;default :;
@@ -1324,7 +1319,6 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *aint mode =translate_mode (file);struct synth_info inf;struct seq_event_rec event_rec; -unsigned long flags;int __user *p = arg; orig_dev = dev = dev >>4 ;
@@ -1479,9 +1473,7 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *acase SNDCTL_SEQ_OUTOFBAND :if (copy_from_user (&event_rec, arg,sizeof (event_rec)))return -EFAULT ; -spin_lock_irqsave (&lock,flags);play_event (event_rec.arr); -spin_unlock_irqrestore (&lock,flags);return 0 ;case SNDCTL_MIDI_INFO :