Linux 4.1.13
Greg KH
maintainerI'm announcing the release of the 4.1.13 kernel.
All users of the 4.1 kernel series must upgrade.
The updated 4.1.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.1.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/mfd/mfd.txt | 41 +++++++++++++ Makefile | 2 arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 - arch/arm/boot/dts/armada-385-db-ap.dts | 2 arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 + arch/arm/boot/dts/imx6dl-riotboard.dts | 8 +- arch/arm/boot/dts/imx6q-arm2.dts | 5 + arch/arm/boot/dts/imx6q-gk802.dts | 3 - arch/arm/boot/dts/imx6q-tbs2910.dts | 4 - arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 4 - arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 2 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 4 + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 3 - arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 - arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 8 +- arch/arm/boot/dts/imx6qdl-rex.dtsi | 4 - arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 4 - arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 6 +- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 8 +- arch/arm/boot/dts/imx6qdl-tx6.dtsi | 4 - arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 6 +- arch/arm/boot/dts/imx6sl-evk.dts | 10 +-- arch/arm/boot/dts/imx6sx-sabreauto.dts | 4 - arch/arm/boot/dts/imx6sx-sdb.dtsi | 4 - arch/arm/boot/dts/sun7i-a20.dtsi | 2 arch/arm/kvm/Kconfig | 1 arch/arm/plat-orion/common.c | 2 arch/arm/vdso/vdsomunge.c | 17 ++++- arch/arm64/include/asm/cpuidle.h | 8 -- arch/arm64/include/asm/suspend.h | 2 arch/arm64/kernel/armv8_deprecated.c | 18 +++--- arch/arm64/kernel/cpuidle.c | 4 - arch/arm64/kernel/psci.c | 2 arch/arm64/kernel/stacktrace.c | 6 -- arch/arm64/kernel/suspend.c | 26 +++++--- arch/powerpc/kernel/rtas.c | 3 + arch/x86/boot/compressed/eboot.c | 8 ++ arch/x86/xen/enlighten.c | 6 +- crypto/ablkcipher.c | 2 crypto/algapi.c | 2 crypto/api.c | 6 +- crypto/crypto_user.c | 2 drivers/block/nvme-core.c | 9 ++- drivers/block/rbd.c | 71 +++++++++++++----------- drivers/block/xen-blkfront.c | 3 - drivers/cpufreq/intel_pstate.c | 5 + drivers/edac/sb_edac.c | 8 +- drivers/gpu/drm/drm_dp_mst_topology.c | 7 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 5 + drivers/gpu/drm/i915/intel_display.c | 7 ++ drivers/gpu/drm/i915/intel_lrc.c | 1 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 drivers/gpu/drm/nouveau/nouveau_gem.c | 5 + drivers/gpu/drm/radeon/atombios_encoders.c | 19 +++++- drivers/gpu/drm/radeon/radeon.h | 1 drivers/gpu/drm/radeon/radeon_encoders.c | 1 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 1 drivers/gpu/drm/radeon/radeon_pm.c | 43 +++++++++----- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 29 +++++++-- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 12 +++- drivers/i2c/busses/i2c-mv64xxx.c | 2 drivers/iio/accel/st_accel_core.c | 6 -- drivers/infiniband/core/cm.c | 10 +++ drivers/input/mouse/alps.c | 48 ++++++++++++++-- drivers/iommu/amd_iommu.c | 4 - drivers/iommu/amd_iommu_types.h | 1 drivers/iommu/amd_iommu_v2.c | 7 ++ drivers/iommu/intel-iommu.c | 12 ++-- drivers/irqchip/irq-tegra.c | 1 drivers/md/md.c | 3 - drivers/md/persistent-data/dm-btree-remove.c | 17 +++-- drivers/md/persistent-data/dm-btree.c | 2 drivers/md/raid1.c | 2 drivers/md/raid10.c | 2 drivers/md/raid5.c | 6 +- drivers/media/dvb-frontends/si2168.c | 4 + drivers/media/tuners/si2157.c | 4 + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 15 ++++- drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 2 drivers/net/wireless/ath/ath9k/init.c | 1 drivers/net/wireless/iwlwifi/dvm/lib.c | 2 drivers/net/wireless/iwlwifi/iwl-7000.c | 2 drivers/net/wireless/iwlwifi/mvm/d3.c | 12 ++-- drivers/net/wireless/iwlwifi/mvm/fw.c | 4 - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 drivers/net/wireless/iwlwifi/mvm/mvm.h | 5 + drivers/net/wireless/iwlwifi/mvm/ops.c | 1 drivers/net/wireless/iwlwifi/pcie/drv.c | 5 + drivers/net/wireless/rtlwifi/pci.h | 2 drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 17 +++++ drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 5 + drivers/net/wireless/rtlwifi/wifi.h | 3 + drivers/of/platform.c | 1 drivers/pci/pci-sysfs.c | 2 drivers/pinctrl/intel/pinctrl-baytrail.c | 59 +++++++++++-------- drivers/scsi/mvsas/mv_sas.c | 2 drivers/staging/iio/accel/sca3000_ring.c | 2 drivers/staging/iio/adc/mxs-lradc.c | 9 +-- drivers/tty/serial/8250/8250_dma.c | 4 - drivers/tty/serial/8250/8250_pci.c | 21 +++++++ drivers/usb/host/xhci-pci.c | 1 drivers/usb/host/xhci-ring.c | 20 +++++- drivers/usb/serial/qcserial.c | 2 fs/btrfs/ioctl.c | 5 + fs/overlayfs/copy_up.c | 6 +- fs/overlayfs/super.c | 2 include/sound/soc.h | 6 +- include/sound/wm8904.h | 2 kernel/module.c | 8 ++ lib/fault-inject.c | 2 mm/filemap.c | 9 +-- mm/huge_memory.c | 3 - sound/pci/hda/hda_codec.c | 4 - sound/pci/hda/patch_conexant.c | 1 sound/soc/soc-ops.c | 28 +++++++++ 124 files changed, 644 insertions(+), 287 deletions(-)
Adam Richter (1):
drm: fix mutex leak in drm_dp_get_mst_branch_device
Alex Deucher (4):
drm/radeon/dpm: don't add pwm attributes if DPM is disabled drm/radeon: don't try to recreate sysfs entries on resume drm/radeon: fix dpms when driver backlight control is disabled drm/radeon: move bl encoder assignment into bl init
Alexandre Belloni (1):
iio: mxs-lradc: Fix temperature offset
Alim Akhtar (1):
ARM: dts: Fix audio card detection on Peach boards
Andrei Otcheretianski (1):
iwlwifi: mvm: flush fw_dump_wk when mvm fails to start
Antti Palosaari (1):
rtl28xxu: fix control message flaws
Arik Nemtsov (1):
iwlwifi: mvm: init card correctly on ctkill exit check
Arnd Bergmann (1):
KVM: arm: use GIC support unconditionally
Avraham Stern (1):
iwlwifi: mvm: clear csa countdown when AP is stopped
Bjørn Mork (1):
USB: qcserial: add Sierra Wireless MC74xx/EM74xx
Cathy Avery (1):
xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing)
Charles Keepax (2):
ASoC: Add info callback for SX_TLV controls
ASoC: wm8904: Correct number of EQ registers
Chris Wilson (2):
drm/i915: Flush pipecontrol post-sync writes drm/i915: Deny wrapping an userptr into a framebuffer
Christian Engelmayer (1):
btrfs: fix possible leak in btrfs_ioctl_balance()
Christian Zander (1):
iommu/vt-d: fix range computation when making room for large pages
Dan Carpenter (1):
iio: accel: sca3000: memory corruption in sca3000_read_first_n_hw_rb()
David Henningsson (1):
ALSA: hda - Fix inverted internal mic on Lenovo G50-80
David Howells (2):
ovl: use O_LARGEFILE in ovl_copy_up()
ovl: fix dentry reference leak
Dong Aisheng (1):
dts: imx6: fix sd card gpio polarity specified in device tree
Doron Tsur (1):
IB/cm: Fix rb-tree duplicate free and use-after-free
Dāvis Mosāns (1):
mvsas: Fix NULL pointer dereference in mvs_slot_task_free
Felix Fietkau (1):
ath9k: declare required extra tx headroom
Florian Fainelli (1):
ARM: orion: Fix DSA platform device after mvmdio conversion
Florian Westphal (1):
fault-inject: fix inverted interval/probability values in printk
Frederic Danis (1):
Revert "serial: 8250_dma: don't bother DMA with small transfers"
Greg Kroah-Hartman (2):
xen: fix backport of previous kexec patch
Linux 4.1.13
H. Nikolaus Schaller (2):
ARM: 8445/1: fix vdsomunge not to depend on glibc specific byteswap.h
ARM: 8449/1: fix bug in vdsomunge swab32 macro
Hans de Goede (1):
Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits
Herbert Xu (1):
crypto: api - Only abort operations on fatal signal
Hezi Shahmoon (1):
i2c: mv64xxx: really allow I2C offloading
Ilia Mirkin (1):
drm/nouveau/gem: return only valid domain when there's only one
Ilya Dryomov (2):
rbd: don't leak parent_spec in rbd_dev_probe_parent()
rbd: prevent kernel stack blow up on rbd map
Jan Kara (1):
mm: make sendfile(2) killable
Jay Cornwall (1):
iommu/amd: Fix BUG when faulting a PROT_NONE VMA
Jes Sorensen (2):
md/raid1: submit_bio_wait() returns 0 on success md/raid10: submit_bio_wait() returns 0 on success
Joe Thornber (1):
dm btree remove: fix a bug when rebalancing nodes after removal
Joerg Roedel (1):
iommu/amd: Don't clear DTE flags when modifying it
Johannes Berg (3):
iwlwifi: dvm: fix D3 firmware PN programming
iwlwifi: fix firmware filename for 3160
iwlwifi: mvm: fix D3 firmware PN programming
Keith Busch (1):
NVMe: Fix memory leak on retried commands
Konstantin Khlebnikov (2):
ovl: free stack of paths in ovl_fill_super
ovl: free lower_mnt array in ovl_put_super
Kővágó, Zoltán (1):
x86/efi: Fix multiple GOP device support
Larry Finger (1):
rtlwifi: rtl8821ae: Fix system lockups on boot
Laura Abbott (3):
si2157: Bounds check firmware
si2168: Bounds check firmware
xhci: Add spurious wakeup quirk for LynxPoint-LP controllers
Linus Walleij (2):
iio: st_accel: fix interrupt handling on LIS3LV02 MFD/OF: document MFD devices and handle simple-mfd
Lorenzo Pieralisi (1):
arm64: kernel: fix tcr_el1.t0sz restore on systems with extended idmap
Luca Coelho (1):
iwlwifi: pci: add a few more PCI subvendor IDs for the 7265 series
Lucas Stach (1):
irqchip/tegra: Propagate IRQ type setting to parent
Marcin Wojtas (1):
ARM: mvebu: correct a385-db-ap compatible string
Mathias Nyman (1):
xhci: handle no ping response error properly
Mika Westerberg (2):
pinctrl: baytrail: Serialize all register access
pinctrl: baytrail: Use raw_spinlock for locking
Mike Snitzer (1):
dm btree: fix leak of bufio-backed block in btree_split_beneath error path
Minchan Kim (1):
thp: use is_zero_pfn() only after pte_present() check
NeilBrown (1):
Revert "md: allow a partially recovered device to be hot-added to an array."
Peter Zijlstra (1):
module: Fix locking in symbol_put_addr()
Roman Gushchin (1):
md/raid5: fix locking in handle_stripe_clean_event()
Ronny Hegewald (1):
rbd: require stable pages if message data CRCs are enabled
Sasha Levin (1):
PCI: Prevent out of bounds access in numa_node override
Seth Jennings (1):
EDAC, sb_edac: Fix TAD presence check for sbridge_mci_bind_devs()
Soeren Grunewald (1):
serial: 8250_pci: Add support for 12 port Exar boards
Srinivas Pandruvada (1):
cpufreq: intel_pstate: Fix divide by zero on Knights Landing (KNL)
Sudeep Holla (1):
arm64: kernel: rename __cpu_suspend to keep it aligned with arm
Takashi Iwai (1):
ALSA: hda - Fix deadlock at error in building PCM
Thomas Hellstrom (1):
drm/vmwgfx: Fix up user_dmabuf refcounting
Timo Sigurdsson (1):
ARM: dts: sunxi: Raise minimum CPU voltage for sun7i-a20 to meet SoC specifications
Tomi Valkeinen (1):
ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
Vasant Hegde (1):
powerpc/rtas: Validate rtas.entry before calling enter_rtas()
Ville Syrjälä (1):
drm/i915: Restore lost DPLL register write on gen2-4
Will Deacon (2):
Revert "ARM64: unwind: Fix PC calculation"
arm64: compat: fix stxr failure case in SWP emulation
Greg KH
maintainerDocumentation/devicetree/bindings/mfd/mfd.txt new file +41 -0
@@ -0,0 +1,41 @@ +Multi-Function Devices (MFD) + +These devices comprise a nexus for heterogeneous hardware blocks containing +more than one non-unique yet varying hardware functionality. + +A typical MFD can be: + +- A mixed signal ASIC on an external bus, sometimes a PMIC (Power Management + Integrated Circuit) that is manufactured in a lower technology node (rough + silicon) that handles analog drivers for things like audio amplifiers, LED + drivers, level shifters, PHY (physical interfaces to things like USB or + ethernet), regulators etc. + +- A range of memory registers containing "miscellaneous system registers" also + known as a system controller "syscon" or any other memory range containing a + mix of unrelated hardware devices. + +Optional properties: + +- compatible : "simple-mfd" - this signifies that the operating system should + consider all subnodes of the MFD device as separate devices akin to how + "simple-bus" inidicates when to see subnodes as children for a simple + memory-mapped bus. For more complex devices, when the nexus driver has to + probe registers to figure out what child devices exist etc, this should not + be used. In the latter case the child devices will be determined by the + operating system. + +Example: + +foo@1000 { + compatible = "syscon", "simple-mfd"; + reg = <0x01000 0x1000>; + + [email protected] { + compatible = "register-bit-led"; + offset = <0x08>; + mask = <0x01>; + label = "myled"; + default-state = "on"; + }; +};
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 1 -SUBLEVEL = 12 +SUBLEVEL = 13 EXTRAVERSION = NAME = Series 4800
arch/arm/boot/dts/am57xx-beagle-x15.dts +2 -1
@@ -354,11 +354,12 @@ /* SMPS9 unused */ ldo1_reg: ldo1 { - /* VDD_SD */ + /* VDD_SD / VDDSHV8 */ regulator-name = "ldo1"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; regulator-boot-on; + regulator-always-on; }; ldo2_reg: ldo2 {
arch/arm/boot/dts/armada-385-db-ap.dts +1 -1
@@ -46,7 +46,7 @@ / { model = "Marvell Armada 385 Access Point Development Board"; - compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x"; + compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada380"; chosen { stdout-path = "serial1:115200n8";
arch/arm/boot/dts/exynos5420-peach-pit.dts +5 -0
@@ -915,6 +915,11 @@ }; }; +&pmu_system_controller { + assigned-clocks = <&pmu_system_controller 0>; + assigned-clock-parents = <&clock CLK_FIN_PLL>; +}; + &rtc { status = "okay"; clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
arch/arm/boot/dts/exynos5800-peach-pi.dts +5 -0
@@ -878,6 +878,11 @@ }; }; +&pmu_system_controller { + assigned-clocks = <&pmu_system_controller 0>; + assigned-clock-parents = <&clock CLK_FIN_PLL>; +}; + &rtc { status = "okay"; clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;
arch/arm/boot/dts/imx6dl-riotboard.dts +4 -4
@@ -305,8 +305,8 @@ &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; - cd-gpios = <&gpio1 4 0>; - wp-gpios = <&gpio1 2 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; };
@@ -314,8 +314,8 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6q-arm2.dts +3 -2
@@ -11,6 +11,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "imx6q.dtsi" / {
@@ -196,8 +197,8 @@ }; &usdhc3 { - cd-gpios = <&gpio6 11 0>; - wp-gpios = <&gpio6 14 0>; + cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3
arch/arm/boot/dts/imx6q-gk802.dts +2 -1
@@ -7,6 +7,7 @@ */ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> #include "imx6q.dtsi" / {
@@ -161,7 +162,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; - cd-gpios = <&gpio6 11 0>; + cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6q-tbs2910.dts +2 -2
@@ -251,7 +251,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <4>; - cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
@@ -260,7 +260,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; - cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay";
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi +2 -2
@@ -173,7 +173,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; status = "okay"; };
@@ -181,7 +181,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +1 -1
@@ -259,6 +259,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio1 4 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi +3 -1
@@ -1,3 +1,5 @@ +#include <dt-bindings/gpio/gpio.h> + / { regulators { compatible = "simple-bus";
@@ -181,7 +183,7 @@ &usdhc2 { /* module slot */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; - cd-gpios = <&gpio2 2 0>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +1 -1
@@ -318,7 +318,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +1 -1
@@ -324,7 +324,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +1 -1
@@ -417,7 +417,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +2 -1
@@ -41,6 +41,7 @@ */ #include "imx6qdl-microsom.dtsi" #include "imx6qdl-microsom-ar8035.dtsi" +#include <dt-bindings/gpio/gpio.h> / { chosen {
@@ -288,6 +289,6 @@ &pinctrl_hummingboard_usdhc2 >; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio1 4 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +2 -2
@@ -449,7 +449,7 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 0>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
@@ -457,7 +457,7 @@ &usdhc4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; - cd-gpios = <&gpio2 6 0>; + cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +4 -4
@@ -409,8 +409,8 @@ &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; - cd-gpios = <&gpio1 4 0>; - wp-gpios = <&gpio1 2 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; status = "disabled"; };
@@ -418,7 +418,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3 &pinctrl_usdhc3_cdwp>; - cd-gpios = <&gpio1 27 0>; - wp-gpios = <&gpio1 29 0>; + cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>; status = "disabled"; };
arch/arm/boot/dts/imx6qdl-rex.dtsi +2 -2
@@ -340,7 +340,7 @@ pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <4>; cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -349,6 +349,6 @@ pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +2 -2
@@ -467,8 +467,8 @@ pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-1 = <&pinctrl_usdhc3_100mhz>; pinctrl-2 = <&pinctrl_usdhc3_200mhz>; - cd-gpios = <&gpio6 15 0>; - wp-gpios = <&gpio1 13 0>; + cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +3 -3
@@ -444,8 +444,8 @@ &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio7 0 0>; - wp-gpios = <&gpio7 1 0>; + cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; vmmc-supply = <®_3p3v>; status = "okay"; };
@@ -453,7 +453,7 @@ &usdhc4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; - cd-gpios = <&gpio2 6 0>; + cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; vmmc-supply = <®_3p3v>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +4 -4
@@ -562,8 +562,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <8>; - cd-gpios = <&gpio2 2 0>; - wp-gpios = <&gpio2 3 0>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -571,8 +571,8 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <8>; - cd-gpios = <&gpio2 0 0>; - wp-gpios = <&gpio2 1 0>; + cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/imx6qdl-tx6.dtsi +2 -2
@@ -680,7 +680,7 @@ pinctrl-0 = <&pinctrl_usdhc1>; bus-width = <4>; no-1-8-v; - cd-gpios = <&gpio7 2 0>; + cd-gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; fsl,wp-controller; status = "okay"; };
@@ -690,7 +690,7 @@ pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <4>; no-1-8-v; - cd-gpios = <&gpio7 3 0>; + cd-gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; fsl,wp-controller; status = "okay"; };
arch/arm/boot/dts/imx6qdl-wandboard.dtsi +4 -2
@@ -9,6 +9,8 @@ * */ +#include <dt-bindings/gpio/gpio.h> + / { regulators { compatible = "simple-bus";
@@ -250,13 +252,13 @@ &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; - cd-gpios = <&gpio1 2 0>; + cd-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; status = "okay"; }; &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; - cd-gpios = <&gpio3 9 0>; + cd-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6sl-evk.dts +5 -5
@@ -617,8 +617,8 @@ pinctrl-1 = <&pinctrl_usdhc1_100mhz>; pinctrl-2 = <&pinctrl_usdhc1_200mhz>; bus-width = <8>; - cd-gpios = <&gpio4 7 0>; - wp-gpios = <&gpio4 6 0>; + cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -627,8 +627,8 @@ pinctrl-0 = <&pinctrl_usdhc2>; pinctrl-1 = <&pinctrl_usdhc2_100mhz>; pinctrl-2 = <&pinctrl_usdhc2_200mhz>; - cd-gpios = <&gpio5 0 0>; - wp-gpios = <&gpio4 29 0>; + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; status = "okay"; };
@@ -637,6 +637,6 @@ pinctrl-0 = <&pinctrl_usdhc3>; pinctrl-1 = <&pinctrl_usdhc3_100mhz>; pinctrl-2 = <&pinctrl_usdhc3_200mhz>; - cd-gpios = <&gpio3 22 0>; + cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>; status = "okay"; };
arch/arm/boot/dts/imx6sx-sabreauto.dts +2 -2
@@ -49,7 +49,7 @@ pinctrl-1 = <&pinctrl_usdhc3_100mhz>; pinctrl-2 = <&pinctrl_usdhc3_200mhz>; bus-width = <8>; - cd-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; keep-power-in-suspend; enable-sdio-wakeup;
@@ -61,7 +61,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <8>; - cd-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>; no-1-8-v; keep-power-in-suspend; enable-sdio-wakup;
arch/arm/boot/dts/imx6sx-sdb.dtsi +2 -2
@@ -293,7 +293,7 @@ pinctrl-1 = <&pinctrl_usdhc3_100mhz>; pinctrl-2 = <&pinctrl_usdhc3_200mhz>; bus-width = <8>; - cd-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; keep-power-in-suspend; enable-sdio-wakeup;
@@ -304,7 +304,7 @@ &usdhc4 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc4>; - cd-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio6 21 GPIO_ACTIVE_LOW>; wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>; status = "okay"; };
arch/arm/boot/dts/sun7i-a20.dtsi +1 -1
@@ -111,7 +111,7 @@ 720000 1200000 528000 1100000 312000 1000000 - 144000 900000 + 144000 1000000 >; #cooling-cells = <2>; cooling-min-level = <0>;
arch/arm/kvm/Kconfig +1 -0
@@ -21,6 +21,7 @@ config KVM depends on MMU && OF select PREEMPT_NOTIFIERS select ANON_INODES + select ARM_GIC select HAVE_KVM_CPU_RELAX_INTERCEPT select HAVE_KVM_ARCH_TLB_FLUSH_ALL select KVM_MMIO
arch/arm/plat-orion/common.c +1 -1
@@ -499,7 +499,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq) d->netdev = &orion_ge00.dev;for (i =0 ; i < d->nr_chips; i++) - d->chip[i].host_dev = &orion_ge00_shared.dev; + d->chip[i].host_dev = &orion_ge_mvmdio.dev; orion_switch_device.dev.platform_data = d;platform_device_register (&orion_switch_device);
arch/arm/vdso/vdsomunge.c +13 -4
@@ -45,7 +45,6 @@* it does. */ -#include <byteswap.h> #include <elf.h> #include <errno.h> #include <fcntl.h>
@@ -59,6 +58,16 @@#include <sys/types.h> #include <unistd.h> +#define swab16 (x) \ + ((((x) & 0x00ff) << 8) | \ + (((x) & 0xff00) >> 8)) + +#define swab32 (x) \ + ((((x) & 0x000000ff) << 24) | \ + (((x) & 0x0000ff00) << 8) | \ + (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0xff000000) >> 24)) +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__#define HOST_ORDER ELFDATA2LSB#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -104,17 +113,17 @@ static void cleanup(void)static Elf32_Word read_elf_word (Elf32_Word word,bool swap) { -return swap ?bswap_32 (word) : word; +return swap ?swab32 (word) : word; }static Elf32_Half read_elf_half (Elf32_Half half,bool swap) { -return swap ?bswap_16 (half) : half; +return swap ?swab16 (half) : half; }static void write_elf_word (Elf32_Word val,Elf32_Word *dst,bool swap) { - *dst = swap ?bswap_32 (val) : val; + *dst = swap ?swab32 (val) : val; }int main (int argc,char **argv)
arch/arm64/include/asm/cpuidle.h +2 -6
@@ -5,20 +5,16 @@#ifdef CONFIG_CPU_IDLE extern int arm_cpuidle_init (unsigned int cpu); -extern int cpu_suspend (unsigned long arg); +extern int arm_cpuidle_suspend (int index);#else static inline int arm_cpuidle_init (unsigned int cpu) {return -EOPNOTSUPP ; } -static inline int cpu_suspend (unsigned long arg) +static inline int arm_cpuidle_suspend (int index) {return -EOPNOTSUPP ; }#endif -static inline int arm_cpuidle_suspend (int index) -{ -return cpu_suspend (index); -}#endif
arch/arm64/include/asm/suspend.h +1 -1
@@ -21,6 +21,6 @@ struct sleep_save_sp { phys_addr_t save_ptr_stash_phys; }; -extern int __cpu_suspend (unsigned long arg,int (*fn)(unsigned long )); +extern int cpu_suspend (unsigned long arg,int (*fn)(unsigned long ));extern void cpu_resume (void );#endif
arch/arm64/kernel/armv8_deprecated.c +10 -8
@@ -279,22 +279,24 @@ static void register_insn_emulation_sysctl(struct ctl_table *table)*/ #define __user_swpX_asm (data, addr, res, temp,B ) \ __asm__ __volatile__( \ - " mov %w2, %w1\n" \ - "0: ldxr"B" %w1, [%3]\n" \ - "1: stxr"B" %w0, %w2, [%3]\n" \ + "0: ldxr"B" %w2, [%3]\n" \ + "1: stxr"B" %w0, %w1, [%3]\n" \ " cbz %w0, 2f\n" \ " mov %w0, %w4\n" \ + " b 3f\n" \ "2:\n" \ + " mov %w1, %w2\n" \ + "3:\n" \ " .pushsection .fixup,\"ax\"\n" \ " .align 2\n" \ - "3: mov %w0, %w5\n" \ - " b 2b\n" \ + "4: mov %w0, %w5\n" \ + " b 3b\n" \ " .popsection" \ " .pushsection __ex_table,\"a\"\n" \ " .align 3\n" \ - " .quad 0b, 3b\n" \ - " .quad 1b, 3b\n" \ - " .popsection" \ + " .quad 0b, 4b\n" \ + " .quad 1b, 4b\n" \ + " .popsection\n" \ : "=&r" (res), "+r" (data), "=&r" (temp) \ : "r" (addr), "i" (-EAGAIN), "i" (-EFAULT) \ : "memory")
arch/arm64/kernel/cpuidle.c +2 -2
@@ -37,7 +37,7 @@ int arm_cpuidle_init(unsigned int cpu)* Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU * operations back-end error code otherwise. */ -int cpu_suspend (unsigned long arg) +int arm_cpuidle_suspend (int index) {int cpu =smp_processor_id ();
@@ -47,5 +47,5 @@ int cpu_suspend(unsigned long arg)*/ if (!cpu_ops[cpu] || !cpu_ops[cpu]->cpu_suspend)return -EOPNOTSUPP ; -return cpu_ops[cpu]->cpu_suspend (arg); +return cpu_ops[cpu]->cpu_suspend (index); }
arch/arm64/kernel/psci.c +1 -1
@@ -546,7 +546,7 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index)if (state[index -1 ].type ==PSCI_POWER_STATE_TYPE_STANDBY ) ret = psci_ops.cpu_suspend (state[index -1 ],0 );else - ret =__cpu_suspend (index, psci_suspend_finisher); + ret =cpu_suspend (index, psci_suspend_finisher);return ret; }
arch/arm64/kernel/stacktrace.c +1 -5
@@ -48,11 +48,7 @@ int notrace unwind_frame(struct stackframe *frame) frame->sp = fp +0x10 ; frame->fp = *(unsigned long *)(fp); -/* -* -4 here because we care about the PC at time of bl, -* not where the return will go. -*/ - frame->pc = *(unsigned long *)(fp +8 ) -4 ; + frame->pc = *(unsigned long *)(fp +8 );return 0 ; }
arch/arm64/kernel/suspend.c +15 -11
@@ -51,13 +51,13 @@ void __init cpu_suspend_set_dbg_restorer(void (*hw_bp_restore)(void *)) }/* -* __cpu_suspend +* cpu_suspend * * arg: argument to pass to the finisher function * fn: finisher function pointer * */ -int __cpu_suspend (unsigned long arg,int (*fn)(unsigned long )) +int cpu_suspend (unsigned long arg,int (*fn)(unsigned long )) {struct mm_struct *mm = current->active_mm;int ret;
@@ -80,17 +80,21 @@ int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long))if (ret ==0 ) {/* * We are resuming from reset with TTBR0_EL1 set to the -* idmap to enable the MMU; restore the active_mm mappings in -* TTBR0_EL1 unless the active_mm == &init_mm, in which case -* the thread entered __cpu_suspend with TTBR0_EL1 set to -* reserved TTBR0 page tables and should be restored as such. +* idmap to enable the MMU; set the TTBR0 to the reserved +* page tables to prevent speculative TLB allocations, flush +* the local tlb and set the default tcr_el1.t0sz so that +* the TTBR0 address space set-up is properly restored. +* If the current active_mm != &init_mm we entered cpu_suspend +* with mappings in TTBR0 that must be restored, so we switch +* them back to complete the address space configuration +* restoration before returning. */ -if (mm == &init_mm) -cpu_set_reserved_ttbr0 (); -else -cpu_switch_mm (mm->pgd, mm); - +cpu_set_reserved_ttbr0 ();flush_tlb_all (); +cpu_set_default_tcr_t0sz (); + +if (mm != &init_mm) +cpu_switch_mm (mm->pgd, mm);/* * Restore per-cpu offset before any kernel
arch/powerpc/kernel/rtas.c +3 -0
@@ -1041,6 +1041,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs)if (!capable (CAP_SYS_ADMIN ))return -EPERM ; +if (!rtas.entry) +return -EINVAL ; +if (copy_from_user (&args, uargs,3 *sizeof (u32)) !=0 )return -EFAULT ;
arch/x86/boot/compressed/eboot.c +6 -2
@@ -667,6 +667,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto,bool conout_found = false;void *dummy =NULL ;u32 h = handles[i]; +u32 current_fb_base; status =efi_call_early (handle_protocol, h, proto, (void **)&gop32);
@@ -678,7 +679,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto,if (status ==EFI_SUCCESS ) conout_found = true; - status =__gop_query32 (gop32, &info, &size, &fb_base); + status =__gop_query32 (gop32, &info, &size, ¤t_fb_base);if (status ==EFI_SUCCESS && (!first_gop || conout_found)) {/* * Systems that use the UEFI Console Splitter may
@@ -692,6 +693,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto, pixel_format = info->pixel_format; pixel_info = info->pixel_information; pixels_per_scan_line = info->pixels_per_scan_line; + fb_base = current_fb_base;/* * Once we've found a GOP supporting ConOut,
@@ -770,6 +772,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto,bool conout_found = false;void *dummy =NULL ;u64 h = handles[i]; +u32 current_fb_base; status =efi_call_early (handle_protocol, h, proto, (void **)&gop64);
@@ -781,7 +784,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto,if (status ==EFI_SUCCESS ) conout_found = true; - status =__gop_query64 (gop64, &info, &size, &fb_base); + status =__gop_query64 (gop64, &info, &size, ¤t_fb_base);if (status ==EFI_SUCCESS && (!first_gop || conout_found)) {/* * Systems that use the UEFI Console Splitter may
@@ -795,6 +798,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto, pixel_format = info->pixel_format; pixel_info = info->pixel_information; pixels_per_scan_line = info->pixels_per_scan_line; + fb_base = current_fb_base;/* * Once we've found a GOP supporting ConOut,
arch/x86/xen/enlighten.c +3 -3
@@ -33,7 +33,7 @@#include <linux/memblock.h> #include <linux/edd.h> -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC #include <linux/kexec.h> #endif
@@ -1802,7 +1802,7 @@ static struct notifier_block xen_hvm_cpu_notifier = { .notifier_call = xen_hvm_cpu_notify, }; -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC static void xen_hvm_shutdown (void ) {native_machine_shutdown ();
@@ -1836,7 +1836,7 @@ static void __init xen_hvm_guest_init(void) x86_init.irqs.intr_init = xen_init_IRQ;xen_hvm_init_time_ops ();xen_hvm_init_mmu_ops (); -#ifdef CONFIG_KEXEC_CORE +#ifdef CONFIG_KEXEC machine_ops.shutdown = xen_hvm_shutdown; machine_ops.crash_shutdown = xen_hvm_crash_shutdown;#endif
crypto/ablkcipher.c +1 -1
@@ -698,7 +698,7 @@ struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name, err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
crypto/algapi.c +1 -1
@@ -337,7 +337,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)crypto_alg_tested (larval->alg.cra_driver_name,0 ); } - err =wait_for_completion_interruptible (&larval->completion); + err =wait_for_completion_killable (&larval->completion);WARN_ON (err); out:
crypto/api.c +3 -3
@@ -172,7 +172,7 @@ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg)struct crypto_larval *larval = (void *)alg;long timeout; - timeout =wait_for_completion_interruptible_timeout ( + timeout =wait_for_completion_killable_timeout ( &larval->completion,60 *HZ ); alg = larval->adult;
@@ -445,7 +445,7 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask) err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
@@ -562,7 +562,7 @@ void *crypto_alloc_tfm(const char *alg_name, err:if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
crypto/crypto_user.c +1 -1
@@ -381,7 +381,7 @@ static struct crypto_alg *crypto_user_aead_alg(const char *name, u32 type, err =PTR_ERR (alg);if (err != -EAGAIN )break ; -if (signal_pending (current)) { +if (fatal_signal_pending (current)) { err = -EINTR ;break ; }
drivers/block/nvme-core.c +6 -3
@@ -590,6 +590,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,struct nvme_iod *iod = ctx;struct request *req =iod_get_private (iod);struct nvme_cmd_info *cmd_rq =blk_mq_rq_to_pdu (req); +bool requeue = false;u16 status =le16_to_cpup (&cqe->status) >>1 ;
@@ -598,12 +599,13 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, && (jiffies - req->start_time) < req->timeout) {unsigned long flags; + requeue = true;blk_mq_requeue_request (req);spin_lock_irqsave (req->q->queue_lock, flags);if (!blk_queue_stopped (req->q))blk_mq_kick_requeue_list (req->q);spin_unlock_irqrestore (req->q->queue_lock, flags); -return ; + goto release_iod; } req->errors =nvme_error_status (status); }else
@@ -613,7 +615,7 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx,dev_warn (&nvmeq->dev->pci_dev->dev,"completing aborted command with status:%04x\n" , status); - + release_iod:if (iod->nents) {dma_unmap_sg (&nvmeq->dev->pci_dev->dev, iod->sg, iod->nents,rq_data_dir (req) ?DMA_TO_DEVICE :DMA_FROM_DEVICE );
@@ -626,7 +628,8 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, }nvme_free_iod (nvmeq->dev, iod); -blk_mq_complete_request (req); +if (likely (!requeue)) +blk_mq_complete_request (req); }/* length is in bytes. gfp flags indicates whether we may sleep. */
drivers/block/rbd.c +41 -30
151 lines not on this page · raw message
drivers/block/xen-blkfront.c +2 -1
@@ -1925,7 +1925,8 @@ static void blkback_changed(struct xenbus_device *dev,break ;/* Missed the backend's Closing state -- fallthrough */ case XenbusStateClosing: -blkfront_closing (info); +if (info) +blkfront_closing (info);break ; } }
drivers/cpufreq/intel_pstate.c +5 -0
@@ -761,6 +761,11 @@ static inline void intel_pstate_sample(struct cpudata *cpu)local_irq_save (flags);rdmsrl (MSR_IA32_APERF , aperf);rdmsrl (MSR_IA32_MPERF , mperf); +if (cpu->prev_mperf == mperf) { +local_irq_restore (flags); +return ; + } +local_irq_restore (flags); cpu->last_sample_time = cpu->sample.time;
drivers/edac/sb_edac.c +4 -4
@@ -1608,6 +1608,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {struct sbridge_pvt *pvt = mci->pvt_info;struct pci_dev *pdev; +u8 saw_chan_mask =0 ;int i;for (i =0 ; i < sbridge_dev->n_devs; i++) {
@@ -1641,6 +1642,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, {int id = pdev->device -PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0 ; pvt->pci_tad[id] = pdev; + saw_chan_mask |=1 << id; }break ;case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO :
@@ -1661,10 +1663,8 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, !pvt-> pci_tad || !pvt->pci_ras || !pvt->pci_ta) goto enodev; -for (i =0 ; i <NUM_CHANNELS ; i++) { -if (!pvt->pci_tad[i]) - goto enodev; - } +if (saw_chan_mask !=0x0f ) + goto enodev;return 0 ; enodev:
drivers/gpu/drm/drm_dp_mst_topology.c +4 -3
@@ -1179,17 +1179,18 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_list_for_each_entry (port, &mstb->ports, next) {if (port->port_num == port_num) { -if (!port->mstb) { + mstb = port->mstb; +if (!mstb) {DRM_ERROR ("failed to lookup MSTB with lct %d, rad %02x\n" , lct, rad[0 ]); -return NULL ; + goto out; } - mstb = port->mstb;break ; } } }kref_get (&mstb->kref); +out:mutex_unlock (&mgr->lock);return mstb; }
drivers/gpu/drm/i915/i915_gem_userptr.c +4 -1
@@ -776,7 +776,10 @@ static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = {* Also note, that the object created here is not currently a "first class" * object, in that several ioctls are banned. These are the CPU access * ioctls: mmap(), pwrite and pread. In practice, you are expected to use -* direct access via your pointer rather than use those ioctls. +* direct access via your pointer rather than use those ioctls. Another +* restriction is that we do not allow userptr surfaces to be pinned to the +* hardware and so we reject any attempt to create a framebuffer out of a +* userptr. * * If you think this is a good interface to use to pass GPU memory between * drivers, please use dma-buf instead. In fact, wherever possible use
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -1699,6 +1699,8 @@ static void i9xx_enable_pll(struct intel_crtc *crtc) I915_READ(DPLL(!crtc->pipe)) | DPLL_DVO_2X_MODE); } +I915_WRITE (reg, dpll); +/* Wait for the clocks to stabilize. */ POSTING_READ (reg);udelay (150 );
@@ -13212,6 +13214,11 @@ static int intel_user_framebuffer_create_handle(struct drm_framebuffer *fb,struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj; +if (obj->userptr.mm) { +DRM_DEBUG ("attempting to use a userptr for a framebuffer, denied\n" ); +return -EINVAL ; + } +return drm_gem_handle_create (file, &obj->base, handle); }
drivers/gpu/drm/i915/intel_lrc.c +1 -0
@@ -1298,6 +1298,7 @@ static int gen8_emit_flush_render(struct intel_ringbuffer *ringbuf,if (flush_domains) { flags |=PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH ; flags |=PIPE_CONTROL_DEPTH_CACHE_FLUSH ; + flags |=PIPE_CONTROL_FLUSH_ENABLE ; }if (invalidate_domains) {
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -0
@@ -342,6 +342,7 @@ gen7_render_ring_flush(struct intel_engine_cs *ring,if (flush_domains) { flags |=PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH ; flags |=PIPE_CONTROL_DEPTH_CACHE_FLUSH ; + flags |=PIPE_CONTROL_FLUSH_ENABLE ; }if (invalidate_domains) { flags |=PIPE_CONTROL_TLB_INVALIDATE ;
@@ -412,6 +413,7 @@ gen8_render_ring_flush(struct intel_engine_cs *ring,if (flush_domains) { flags |=PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH ; flags |=PIPE_CONTROL_DEPTH_CACHE_FLUSH ; + flags |=PIPE_CONTROL_FLUSH_ENABLE ; }if (invalidate_domains) { flags |=PIPE_CONTROL_TLB_INVALIDATE ;
drivers/gpu/drm/nouveau/nouveau_gem.c +3 -2
@@ -227,11 +227,12 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,struct nouveau_bo *nvbo =nouveau_gem_object (gem);struct nvkm_vma *vma; -if (nvbo->bo.mem.mem_type ==TTM_PL_TT ) +if (is_power_of_2 (nvbo->valid_domains)) + rep->domain = nvbo->valid_domains; +else if (nvbo->bo.mem.mem_type ==TTM_PL_TT ) rep->domain =NOUVEAU_GEM_DOMAIN_GART ;else rep->domain =NOUVEAU_GEM_DOMAIN_VRAM ; - rep->offset = nvbo->bo.offset;if (cli->vm) { vma =nouveau_bo_vma_find (nvbo, cli->vm);
drivers/gpu/drm/radeon/atombios_encoders.c +15 -4
@@ -237,6 +237,7 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder,backlight_update_status (bd);DRM_INFO ("radeon atom DIG backlight initialized\n" ); + rdev->mode_info.bl_encoder = radeon_encoder;return ;
@@ -1624,9 +1625,14 @@ radeon_atom_encoder_dpms_avivo(struct drm_encoder *encoder, int mode) }else atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args);if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { -struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; +if (rdev->mode_info.bl_encoder) { +struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; -atombios_set_backlight_level (radeon_encoder, dig->backlight_level); +atombios_set_backlight_level (radeon_encoder, dig->backlight_level); + }else { + args.ucAction =ATOM_LCD_BLON ; +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); + } }break ;case DRM_MODE_DPMS_STANDBY :
@@ -1706,8 +1712,13 @@ radeon_atom_encoder_dpms_dig(struct drm_encoder *encoder, int mode)if (ASIC_IS_DCE4 (rdev))atombios_dig_encoder_setup (encoder,ATOM_ENCODER_CMD_DP_VIDEO_ON ,0 ); } -if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) -atombios_set_backlight_level (radeon_encoder, dig->backlight_level); +if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { +if (rdev->mode_info.bl_encoder) +atombios_set_backlight_level (radeon_encoder, dig->backlight_level); +else +atombios_dig_transmitter_setup (encoder, +ATOM_TRANSMITTER_ACTION_LCD_BLON ,0 ,0 ); + }if (ext_encoder)atombios_external_encoder_setup (encoder, ext_encoder,ATOM_ENABLE );break ;
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -1656,6 +1656,7 @@ struct radeon_pm {u8 fan_max_rpm;/* dpm */ bool dpm_enabled; +bool sysfs_initialized;struct radeon_dpm dpm; };
drivers/gpu/drm/radeon/radeon_encoders.c +0 -1
@@ -194,7 +194,6 @@ static void radeon_encoder_add_backlight(struct radeon_encoder *radeon_encoder,radeon_atom_backlight_init (radeon_encoder, connector); elseradeon_legacy_backlight_init (radeon_encoder ,connector ); - rdev->mode_info.bl_encoder = radeon_encoder; } }
drivers/gpu/drm/radeon/radeon_legacy_encoders.c +1 -0
@@ -441,6 +441,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder,backlight_update_status (bd);DRM_INFO ("radeon legacy LVDS backlight initialized\n" ); + rdev->mode_info.bl_encoder = radeon_encoder;return ;
drivers/gpu/drm/radeon/radeon_pm.c +27 -16
69 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +3 -0
@@ -1458,6 +1458,9 @@ static void __exit vmwgfx_exit(void)drm_pci_exit (&driver, &vmw_pci_driver); } +MODULE_INFO (vmw_patch,"ed7d78b2" ); +MODULE_INFO (vmw_patch,"54c12bc3" ); +module_init (vmwgfx_init);module_exit (vmwgfx_exit);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +4 -2
@@ -636,7 +636,8 @@ extern int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv,uint32_t size, bool shareable, uint32_t *handle, - struct vmw_dma_buffer **p_dma_buf); + struct vmw_dma_buffer **p_dma_buf, + struct ttm_base_object **p_base);extern int vmw_user_dmabuf_reference (struct ttm_object_file *tfile,struct vmw_dma_buffer *dma_buf,uint32_t *handle);
@@ -650,7 +651,8 @@ extern uint32_t vmw_dmabuf_validate_node(struct ttm_buffer_object *bo, uint32_t cur_validate_node);extern void vmw_dmabuf_validate_clear (struct ttm_buffer_object *bo);extern int vmw_user_dmabuf_lookup (struct ttm_object_file *tfile, -uint32_t id,struct vmw_dma_buffer **out); +uint32_t id,struct vmw_dma_buffer **out, +struct ttm_base_object **base);extern int vmw_stream_claim_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); extern int vmw_stream_unref_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +4 -2
@@ -887,7 +887,8 @@ static int vmw_translate_mob_ptr(struct vmw_private *dev_priv,struct vmw_relocation *reloc;int ret; - ret =vmw_user_dmabuf_lookup (sw_context->fp->tfile, handle, &vmw_bo); + ret =vmw_user_dmabuf_lookup (sw_context->fp->tfile, handle, &vmw_bo, +NULL );if (unlikely (ret !=0 )) {DRM_ERROR ("Could not find or use MOB buffer.\n" ); ret = -EINVAL ;
@@ -949,7 +950,8 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv,struct vmw_relocation *reloc;int ret; - ret =vmw_user_dmabuf_lookup (sw_context->fp->tfile, handle, &vmw_bo); + ret =vmw_user_dmabuf_lookup (sw_context->fp->tfile, handle, &vmw_bo, +NULL );if (unlikely (ret !=0 )) {DRM_ERROR ("Could not find or use GMR region.\n" ); ret = -EINVAL ;
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c +1 -1
@@ -484,7 +484,7 @@ int vmw_overlay_ioctl(struct drm_device *dev, void *data, goto out_unlock; } - ret =vmw_user_dmabuf_lookup (tfile, arg->handle, &buf); + ret =vmw_user_dmabuf_lookup (tfile, arg->handle, &buf,NULL );if (ret) goto out_unlock;
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +21 -8
@@ -356,7 +356,7 @@ int vmw_user_lookup_handle(struct vmw_private *dev_priv, } *out_surf =NULL ; - ret =vmw_user_dmabuf_lookup (tfile, handle, out_buf); + ret =vmw_user_dmabuf_lookup (tfile, handle, out_buf,NULL );return ret; }
@@ -483,7 +483,8 @@ int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv,uint32_t size, bool shareable, uint32_t *handle, - struct vmw_dma_buffer **p_dma_buf) + struct vmw_dma_buffer **p_dma_buf, + struct ttm_base_object **p_base) { struct vmw_user_dma_buffer *user_bo;struct ttm_buffer_object *tmp;
@@ -517,6 +518,10 @@ int vmw_user_dmabuf_alloc(struct vmw_private *dev_priv, } *p_dma_buf = &user_bo->dma; +if (p_base) { + *p_base = &user_bo->prime.base; +kref_get (&(*p_base)->refcount); + } *handle = user_bo->prime.base.hash.key; out_no_base_object:
@@ -633,6 +638,7 @@ int vmw_user_dmabuf_synccpu_ioctl(struct drm_device *dev, void *data,struct vmw_dma_buffer *dma_buf;struct vmw_user_dma_buffer *user_bo;struct ttm_object_file *tfile =vmw_fpriv (file_priv)->tfile; +struct ttm_base_object *buffer_base;int ret; if ((arg->flags & (drm_vmw_synccpu_read | drm_vmw_synccpu_write)) == 0
@@ -645,7 +651,8 @@ int vmw_user_dmabuf_synccpu_ioctl(struct drm_device *dev, void *data,switch (arg->op) {case drm_vmw_synccpu_grab: - ret =vmw_user_dmabuf_lookup (tfile, arg->handle, &dma_buf); + ret =vmw_user_dmabuf_lookup (tfile, arg->handle, &dma_buf, + &buffer_base);if (unlikely (ret !=0 ))return ret;
@@ -653,6 +660,7 @@ int vmw_user_dmabuf_synccpu_ioctl(struct drm_device *dev, void *data, dma); ret =vmw_user_dmabuf_synccpu_grab (user_bo, tfile, arg->flags);vmw_dmabuf_unreference (&dma_buf); +ttm_base_object_unref (&buffer_base);if (unlikely (ret !=0 && ret != -ERESTARTSYS && ret != -EBUSY )) { DRM_ERROR("Failed synccpu grab on handle 0x%08x.\n",
@@ -694,7 +702,8 @@ int vmw_dmabuf_alloc_ioctl(struct drm_device *dev, void *data,return ret; ret =vmw_user_dmabuf_alloc (dev_priv,vmw_fpriv (file_priv)->tfile, - req->size, false, &handle, &dma_buf); + req->size, false, &handle, &dma_buf, +NULL );if (unlikely (ret !=0 )) goto out_no_dmabuf;
@@ -723,7 +732,8 @@ int vmw_dmabuf_unref_ioctl(struct drm_device *dev, void *data, }int vmw_user_dmabuf_lookup (struct ttm_object_file *tfile, -uint32_t handle,struct vmw_dma_buffer **out) +uint32_t handle,struct vmw_dma_buffer **out, +struct ttm_base_object **p_base) {struct vmw_user_dma_buffer *vmw_user_bo;struct ttm_base_object *base;
@@ -745,7 +755,10 @@ int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile, vmw_user_bo = container_of(base, struct vmw_user_dma_buffer, prime.base); (void )ttm_bo_reference (&vmw_user_bo->dma.base); -ttm_base_object_unref (&base); +if (p_base) + *p_base = base; +else +ttm_base_object_unref (&base); *out = &vmw_user_bo->dma;return 0 ;
@@ -1006,7 +1019,7 @@ int vmw_dumb_create(struct drm_file *file_priv, ret =vmw_user_dmabuf_alloc (dev_priv,vmw_fpriv (file_priv)->tfile, args->size, false, &args->handle, - &dma_buf); + &dma_buf,NULL );if (unlikely (ret !=0 )) goto out_no_dmabuf;
@@ -1034,7 +1047,7 @@ int vmw_dumb_map_offset(struct drm_file *file_priv,struct vmw_dma_buffer *out_buf;int ret; - ret =vmw_user_dmabuf_lookup (tfile, handle, &out_buf); + ret =vmw_user_dmabuf_lookup (tfile, handle, &out_buf,NULL );if (ret !=0 )return -EINVAL ;
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +1 -1
@@ -470,7 +470,7 @@ int vmw_shader_define_ioctl(struct drm_device *dev, void *data,if (arg->buffer_handle !=SVGA3D_INVALID_ID ) { ret =vmw_user_dmabuf_lookup (tfile, arg->buffer_handle, - &buffer); + &buffer,NULL );if (unlikely (ret !=0 )) {DRM_ERROR ("Could not find buffer for shader " "creation.\n" );
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +9 -3
@@ -43,6 +43,7 @@ struct vmw_user_surface {struct vmw_surface srf;uint32_t size;struct drm_master *master; +struct ttm_base_object *backup_base; };/**
@@ -652,6 +653,8 @@ static void vmw_user_surface_base_release(struct ttm_base_object **p_base)struct vmw_resource *res = &user_srf->srf.res; *p_base =NULL ; +if (user_srf->backup_base) +ttm_base_object_unref (&user_srf->backup_base);vmw_resource_unreference (&res); }
@@ -846,7 +849,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, res->backup_size, true, &backup_handle, - &res->backup); + &res->backup, + &user_srf->backup_base);if (unlikely (ret !=0 )) {vmw_resource_unreference (&res); goto out_unlock;
@@ -1309,7 +1313,8 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,if (req->buffer_handle !=SVGA3D_INVALID_ID ) { ret =vmw_user_dmabuf_lookup (tfile, req->buffer_handle, - &res->backup); + &res->backup, + &user_srf->backup_base); }else if (req->drm_surface_flags & drm_vmw_surface_flag_create_buffer) ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
@@ -1317,7 +1322,8 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, req->drm_surface_flags & drm_vmw_surface_flag_shareable, &backup_handle, - &res->backup); + &res->backup, + &user_srf->backup_base);if (unlikely (ret !=0 )) {vmw_resource_unreference (&res);
drivers/i2c/busses/i2c-mv64xxx.c +0 -2
@@ -669,8 +669,6 @@ mv64xxx_i2c_can_offload(struct mv64xxx_i2c_data *drv_data)struct i2c_msg *msgs = drv_data->msgs;int num = drv_data->num_msgs; -return false; -if (!drv_data->offload_enabled)return false;
drivers/iio/accel/st_accel_core.c +0 -6
@@ -149,8 +149,6 @@#define ST_ACCEL_4_BDU_MASK 0x40#define ST_ACCEL_4_DRDY_IRQ_ADDR 0x21#define ST_ACCEL_4_DRDY_IRQ_INT1_MASK 0x04 -#define ST_ACCEL_4_IG1_EN_ADDR 0x21 -#define ST_ACCEL_4_IG1_EN_MASK 0x08#define ST_ACCEL_4_MULTIREAD_BIT truestatic const struct iio_chan_spec st_accel_12bit_channels[] = {
@@ -446,10 +444,6 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { .drdy_irq = { .addr = ST_ACCEL_4_DRDY_IRQ_ADDR, .mask_int1 = ST_ACCEL_4_DRDY_IRQ_INT1_MASK, - .ig1 = { - .en_addr = ST_ACCEL_4_IG1_EN_ADDR, - .en_mask = ST_ACCEL_4_IG1_EN_MASK, - }, }, .multi_read_bit = ST_ACCEL_4_MULTIREAD_BIT, .bootime = 2, /* guess */
drivers/infiniband/core/cm.c +9 -1
@@ -859,6 +859,11 @@ retest:case IB_CM_SIDR_REQ_RCVD :spin_unlock_irq (&cm_id_priv->lock);cm_reject_sidr_req (cm_id_priv,IB_SIDR_REJECT ); +spin_lock_irq (&cm.lock); +if (!RB_EMPTY_NODE (&cm_id_priv->sidr_id_node)) +rb_erase (&cm_id_priv->sidr_id_node, + &cm.remote_sidr_table); +spin_unlock_irq (&cm.lock);break ;case IB_CM_REQ_SENT :case IB_CM_MRA_REQ_RCVD :
@@ -3098,7 +3103,10 @@ int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,spin_unlock_irqrestore (&cm_id_priv->lock, flags);spin_lock_irqsave (&cm.lock, flags); -rb_erase (&cm_id_priv->sidr_id_node, &cm.remote_sidr_table); +if (!RB_EMPTY_NODE (&cm_id_priv->sidr_id_node)) { +rb_erase (&cm_id_priv->sidr_id_node, &cm.remote_sidr_table); +RB_CLEAR_NODE (&cm_id_priv->sidr_id_node); + }spin_unlock_irqrestore (&cm.lock, flags);return 0 ;
drivers/input/mouse/alps.c +42 -6
78 lines not on this page · raw message
drivers/iommu/amd_iommu.c +2 -2
@@ -2099,8 +2099,8 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)static void clear_dte_entry (u16 devid) {/* remove entry from the device table seen by the hardware */ - amd_iommu_dev_table[devid].data[0 ] =IOMMU_PTE_P |IOMMU_PTE_TV ; - amd_iommu_dev_table[devid].data[1 ] =0 ; + amd_iommu_dev_table[devid].data[0 ] =IOMMU_PTE_P |IOMMU_PTE_TV ; + amd_iommu_dev_table[devid].data[1 ] &=DTE_FLAG_MASK ;amd_iommu_apply_erratum_63 (devid); }
drivers/iommu/amd_iommu_types.h +1 -0
@@ -295,6 +295,7 @@#define IOMMU_PTE_IR (1ULL << 61)#define IOMMU_PTE_IW (1ULL << 62) +#define DTE_FLAG_MASK (0x3ffULL << 32)#define DTE_FLAG_IOTLB (0x01UL << 32)#define DTE_FLAG_GV (0x01ULL << 55)#define DTE_GLX_SHIFT (56)
drivers/iommu/amd_iommu_v2.c +7 -0
@@ -508,6 +508,13 @@ static void do_fault(struct work_struct *work) goto out; } +if (!(vma->vm_flags & (VM_READ |VM_EXEC |VM_WRITE ))) { +/* handle_mm_fault would BUG_ON() */ +up_read (&mm->mmap_sem); +handle_fault_error (fault); + goto out; + } + ret =handle_mm_fault (mm, vma, address, write);if (ret &VM_FAULT_ERROR ) {/* failed to service fault */
drivers/iommu/intel-iommu.c +8 -4
@@ -2033,15 +2033,19 @@ static int __domain_mapping(struct dmar_domain *domain, unsigned long iov_pfn,return -ENOMEM ;/* It is large page*/ if (largepage_lvl >1 ) { +unsigned long nr_superpages, end_pfn; + pteval |=DMA_PTE_LARGE_PAGE ; lvl_pages =lvl_to_nr_pages (largepage_lvl); + + nr_superpages = sg_res / lvl_pages; + end_pfn = iov_pfn + nr_superpages * lvl_pages -1 ; +/* * Ensure that old small page tables are -* removed to make room for superpage, -* if they exist. +* removed to make room for superpage(s). */ -dma_pte_free_pagetable (domain, iov_pfn, - iov_pfn + lvl_pages -1 ); +dma_pte_free_pagetable (domain, iov_pfn, end_pfn); }else { pteval &= ~(uint64_t )DMA_PTE_LARGE_PAGE ; }
drivers/irqchip/irq-tegra.c +1 -0
@@ -215,6 +215,7 @@ static struct irq_chip tegra_ictlr_chip = { .irq_unmask = tegra_unmask, .irq_retrigger = tegra_retrigger, .irq_set_wake = tegra_set_wake, + .irq_set_type = irq_chip_set_type_parent, .flags =IRQCHIP_MASK_ON_SUSPEND , #ifdef CONFIG_SMP .irq_set_affinity = irq_chip_set_affinity_parent,
drivers/md/md.c +1 -2
@@ -8013,8 +8013,7 @@ static int remove_and_add_spares(struct mddev *mddev, !test_bit(Bitmap_sync, &rdev->flags)))continue ; -if (rdev->saved_raid_disk <0 ) - rdev->recovery_offset =0 ; + rdev->recovery_offset =0 ;if (mddev->pers->hot_add_disk (mddev, rdev) ==0 ) {if (sysfs_link_rdev (mddev, rdev))
drivers/md/persistent-data/dm-btree-remove.c +11 -6
@@ -301,11 +301,16 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, {int s;uint32_t max_entries =le32_to_cpu (left->header.max_entries); -unsigned target = (nr_left + nr_center + nr_right) /3 ; -BUG_ON (target > max_entries); +unsigned total = nr_left + nr_center + nr_right; +unsigned target_right = total /3 ; +unsigned remainder = (target_right *3 ) != total; +unsigned target_left = target_right + remainder; + +BUG_ON (target_left > max_entries); +BUG_ON (target_right > max_entries);if (nr_left < nr_right) { - s = nr_left - target; + s = nr_left - target_left;if (s <0 && nr_center < -s) {/* not enough in central node */
@@ -316,10 +321,10 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, }else shift (left, center, s); -shift (center, right, target - nr_right); +shift (center, right, target_right - nr_right); }else { - s = target - nr_right; + s = target_right - nr_right;if (s >0 && nr_center < s) {/* not enough in central node */ shift (center, right, nr_center);
@@ -329,7 +334,7 @@ static void redistribute3(struct dm_btree_info *info, struct btree_node *parent, }else shift (center, right, s); -shift (left, center, nr_left - target); +shift (left, center, nr_left - target_left); } *key_ptr (parent, c->index) = center->keys[0 ];
drivers/md/persistent-data/dm-btree.c +1 -1
@@ -523,7 +523,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key) r =new_block (s->info, &right);if (r <0 ) { -/* FIXME: put left */ +unlock_block (s->info, left);return r; }
drivers/md/raid1.c +1 -1
@@ -2248,7 +2248,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)bio_trim (wbio, sector - r1_bio->sector, sectors); wbio->bi_iter.bi_sector += rdev->data_offset; wbio->bi_bdev = rdev->bdev; -if (submit_bio_wait (WRITE , wbio) ==0 ) +if (submit_bio_wait (WRITE , wbio) <0 )/* failure! */ ok =rdev_set_badblocks (rdev, sector, sectors,0 )
drivers/md/raid10.c +1 -1
@@ -2590,7 +2590,7 @@ static int narrow_write_error(struct r10bio *r10_bio, int i)choose_data_offset (r10_bio, rdev) + (sector - r10_bio->sector)); wbio->bi_bdev = rdev->bdev; -if (submit_bio_wait (WRITE , wbio) ==0 ) +if (submit_bio_wait (WRITE , wbio) <0 )/* Failure! */ ok =rdev_set_badblocks (rdev, sector, sectors,0 )
drivers/md/raid5.c +4 -2
@@ -3494,6 +3494,7 @@ returnbi: }if (!discard_pending &&test_bit (R5_Discard, &sh->dev[sh->pd_idx].flags)) { +int hash;clear_bit (R5_Discard, &sh->dev[sh->pd_idx].flags);clear_bit (R5_UPTODATE , &sh->dev[sh->pd_idx].flags);if (sh->qd_idx >=0 ) {
@@ -3507,16 +3508,17 @@ returnbi:* no updated data, so remove it from hash list and the stripe * will be reinitialized */ -spin_lock_irq (&conf->device_lock); unhash: + hash = sh->hash_lock_index; +spin_lock_irq (conf->hash_locks + hash);remove_hash (sh); +spin_unlock_irq (conf->hash_locks + hash);if (head_sh->batch_head) { sh =list_first_entry (&sh->batch_list, struct stripe_head, batch_list);if (sh != head_sh) goto unhash; } -spin_unlock_irq (&conf->device_lock); sh = head_sh;if (test_bit (STRIPE_SYNC_REQUESTED , &sh->state))
drivers/media/dvb-frontends/si2168.c +4 -0
@@ -457,6 +457,10 @@ static int si2168_init(struct dvb_frontend *fe)/* firmware is in the new format */ for (remaining = fw->size; remaining >0 ; remaining -=17 ) { len = fw->data[fw->size - remaining]; +if (len >SI2168_ARGLEN ) { + ret = -EINVAL ; +break ; + }memcpy (cmd.args, &fw->data[(fw->size - remaining) +1 ], len); cmd.wlen = len; cmd.rlen =1 ;
drivers/media/tuners/si2157.c +4 -0
@@ -165,6 +165,10 @@ static int si2157_init(struct dvb_frontend *fe)for (remaining = fw->size; remaining >0 ; remaining -=17 ) { len = fw->data[fw->size - remaining]; +if (len >SI2157_ARGLEN ) { +dev_err (&client->dev,"Bad firmware length\n" ); + goto err_release_firmware; + }memcpy (cmd.args, &fw->data[(fw->size - remaining) +1 ], len); cmd.wlen = len; cmd.rlen =1 ;
drivers/media/usb/dvb-usb-v2/rtl28xxu.c +13 -2
@@ -34,6 +34,14 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)unsigned int pipe;u8 requesttype; +mutex_lock (&d->usb_mutex); + +if (req->size >sizeof (dev->buf)) { +dev_err (&d->intf->dev,"too large message %u\n" , req->size); + ret = -EINVAL ; + goto err_mutex_unlock; + } +if (req->index &CMD_WR_FLAG ) {/* write */ memcpy (dev->buf, req->data, req->size);
@@ -50,14 +58,17 @@ static int rtl28xxu_ctrl_msg(struct dvb_usb_device *d, struct rtl28xxu_req *req)dvb_usb_dbg_usb_control_msg (d->udev,0 , requesttype, req->value, req->index, dev->buf, req->size);if (ret <0 ) - goto err; + goto err_mutex_unlock;/* read request, copy returned data to return buf */ if (requesttype == (USB_TYPE_VENDOR |USB_DIR_IN ))memcpy (req->data, dev->buf, req->size); +mutex_unlock (&d->usb_mutex); +return 0 ; -err: +err_mutex_unlock: +mutex_unlock (&d->usb_mutex);dev_dbg (&d->intf->dev,"failed=%d\n" , ret);return ret; }
drivers/media/usb/dvb-usb-v2/rtl28xxu.h +1 -1
@@ -69,7 +69,7 @@struct rtl28xxu_dev { -u8 buf[28 ]; +u8 buf[128 ];u8 chip_id;u8 tuner;char *tuner_name;
drivers/net/wireless/ath/ath9k/init.c +1 -0
@@ -874,6 +874,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) hw->max_rate_tries =10 ; hw->sta_data_size =sizeof (struct ath_node ); hw->vif_data_size =sizeof (struct ath_vif ); + hw->extra_tx_headroom =4 ; hw->wiphy->available_antennas_rx =BIT (ah->caps.max_rxchains) -1 ; hw->wiphy->available_antennas_tx =BIT (ah->caps.max_txchains) -1 ;
drivers/net/wireless/iwlwifi/dvm/lib.c +1 -1
@@ -1022,7 +1022,7 @@ static void iwlagn_wowlan_program_keys(struct ieee80211_hw *hw,u8 *pn = seq.ccmp.pn;ieee80211_get_key_rx_seq (key, i, &seq); - aes_sc->pn = cpu_to_le64( + aes_sc[i].pn = cpu_to_le64( (u64)pn[5] | ((u64)pn[4] << 8) | ((u64)pn[3] << 16) |
drivers/net/wireless/iwlwifi/iwl-7000.c +1 -1
@@ -325,6 +325,6 @@ const struct iwl_cfg iwl7265d_n_cfg = { };MODULE_FIRMWARE (IWL7260_MODULE_FIRMWARE (IWL7260_UCODE_API_OK )); -MODULE_FIRMWARE (IWL3160_MODULE_FIRMWARE (IWL3160_UCODE_API_OK )); +MODULE_FIRMWARE (IWL3160_MODULE_FIRMWARE (IWL7260_UCODE_API_OK ));MODULE_FIRMWARE (IWL7265_MODULE_FIRMWARE (IWL7260_UCODE_API_OK ));MODULE_FIRMWARE (IWL7265D_MODULE_FIRMWARE (IWL7260_UCODE_API_OK ));
drivers/net/wireless/iwlwifi/mvm/d3.c +6 -6
@@ -298,12 +298,12 @@ static void iwl_mvm_wowlan_program_keys(struct ieee80211_hw *hw,u8 *pn = seq.ccmp.pn;ieee80211_get_key_rx_seq (key, i, &seq); - aes_sc->pn =cpu_to_le64 ((u64 )pn[5 ] | - ((u64 )pn[4 ] <<8 ) | - ((u64 )pn[3 ] <<16 ) | - ((u64 )pn[2 ] <<24 ) | - ((u64 )pn[1 ] <<32 ) | - ((u64 )pn[0 ] <<40 )); + aes_sc[i].pn =cpu_to_le64 ((u64 )pn[5 ] | + ((u64 )pn[4 ] <<8 ) | + ((u64 )pn[3 ] <<16 ) | + ((u64 )pn[2 ] <<24 ) | + ((u64 )pn[1 ] <<32 ) | + ((u64 )pn[0 ] <<40 )); } data->use_rsc_tsc = true;break ;
drivers/net/wireless/iwlwifi/mvm/fw.c +2 -2
@@ -364,7 +364,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm)* abort after reading the nvm in case RF Kill is on, we will complete * the init seq later when RF kill will switch to off */ -if (iwl_mvm_is_radio_killed (mvm)) { +if (iwl_mvm_is_radio_hw_killed (mvm)) {IWL_DEBUG_RF_KILL (mvm,"jump over all phy activities due to RF kill\n" );iwl_remove_notification (&mvm->notif_wait, &calib_wait);
@@ -397,7 +397,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm, bool read_nvm) ret =iwl_wait_notification (&mvm->notif_wait, &calib_wait,MVM_UCODE_CALIB_TIMEOUT ); -if (ret &&iwl_mvm_is_radio_killed (mvm)) { +if (ret &&iwl_mvm_is_radio_hw_killed (mvm)) {IWL_DEBUG_RF_KILL (mvm,"RFKILL while calibrating.\n" ); ret =1 ; }
drivers/net/wireless/iwlwifi/mvm/mac80211.c +1 -0
@@ -2277,6 +2277,7 @@ static void iwl_mvm_stop_ap_ibss(struct ieee80211_hw *hw,iwl_mvm_remove_time_event (mvm, mvmvif, &mvmvif->time_event_data);RCU_INIT_POINTER (mvm->csa_vif,NULL ); + mvmvif->csa_countdown = false; }if (rcu_access_pointer (mvm->csa_tx_blocked_vif) == vif) {
drivers/net/wireless/iwlwifi/mvm/mvm.h +5 -0
@@ -870,6 +870,11 @@ static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)test_bit (IWL_MVM_STATUS_HW_CTKILL , &mvm->status); } +static inline bool iwl_mvm_is_radio_hw_killed (struct iwl_mvm *mvm) +{ +return test_bit (IWL_MVM_STATUS_HW_RFKILL , &mvm->status); +} +/* Must be called with rcu_read_lock() held and it can only be * released when mvmsta is not needed anymore. */
drivers/net/wireless/iwlwifi/mvm/ops.c +1 -0
@@ -589,6 +589,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,ieee80211_unregister_hw (mvm->hw);iwl_mvm_leds_exit (mvm); out_free: +flush_delayed_work (&mvm->fw_dump_wk);iwl_phy_db_free (mvm->phy_db);kfree (mvm->scan_cmd);if (!cfg->no_power_up_nic_in_init || !mvm->nvm_file_name)
drivers/net/wireless/iwlwifi/pcie/drv.c +5 -0
@@ -412,6 +412,11 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x095A, 0x5590, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095B, 0x5290, iwl7265_2ac_cfg)}, {IWL_PCI_DEVICE(0x095A, 0x5490, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x5F10, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095B, 0x5212, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095B, 0x520A, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x9000, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x9400, iwl7265_2ac_cfg)},/* 8000 Series */ {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)},
drivers/net/wireless/rtlwifi/pci.h +2 -0
@@ -247,6 +247,8 @@ struct rtl_pci {/* MSI support */ bool msi_support;bool using_msi; +/* interrupt clear before set */ +bool int_clear; };struct mp_adapter {
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c +17 -0
@@ -2253,11 +2253,28 @@ void rtl8821ae_set_qos(struct ieee80211_hw *hw, int aci) } } +static void rtl8821ae_clear_interrupt (struct ieee80211_hw *hw) +{ +struct rtl_priv *rtlpriv =rtl_priv (hw); +u32 tmp =rtl_read_dword (rtlpriv,REG_HISR ); + +rtl_write_dword (rtlpriv,REG_HISR , tmp); + + tmp =rtl_read_dword (rtlpriv,REG_HISRE ); +rtl_write_dword (rtlpriv,REG_HISRE , tmp); + + tmp =rtl_read_dword (rtlpriv,REG_HSISR ); +rtl_write_dword (rtlpriv,REG_HSISR , tmp); +} +void rtl8821ae_enable_interrupt (struct ieee80211_hw *hw) {struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw)); +if (!rtlpci->int_clear) +rtl8821ae_clear_interrupt (hw);/*clear it here first*/ +rtl_write_dword (rtlpriv,REG_HIMR , rtlpci->irq_mask[0 ] &0xFFFFFFFF );rtl_write_dword (rtlpriv,REG_HIMRE , rtlpci->irq_mask[1 ] &0xFFFFFFFF ); rtlpci->irq_enabled = true;
drivers/net/wireless/rtlwifi/rtl8821ae/sw.c +5 -0
@@ -96,6 +96,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)rtl8821ae_bt_reg_init (hw); rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; + rtlpci->int_clear = rtlpriv->cfg->mod_params->int_clear; rtlpriv->btcoexist.btc_ops =rtl_btc_get_ops_pointer (); rtlpriv->dm.dm_initialgain_enable =1 ;
@@ -167,6 +168,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps; rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps; rtlpci->msi_support = rtlpriv->cfg->mod_params->msi_support; + rtlpci->msi_support = rtlpriv->cfg->mod_params->int_clear;if (rtlpriv->cfg->mod_params->disable_watchdog)pr_info ("watchdog disabled\n" ); rtlpriv->psc.reg_fwctrl_lps =3 ;
@@ -308,6 +310,7 @@ static struct rtl_mod_params rtl8821ae_mod_params = { .swctrl_lps = false, .fwctrl_lps = true, .msi_support = true, + .int_clear = true, .debug = DBG_EMERG, .disable_watchdog = 0, };
@@ -437,6 +440,7 @@ module_param_named(fwlps, rtl8821ae_mod_params.fwctrl_lps, bool, 0444);module_param_named (msi, rtl8821ae_mod_params.msi_support, bool,0444 );module_param_named (disable_watchdog, rtl8821ae_mod_params.disable_watchdog, bool,0444 ); +module_param_named (int_clear, rtl8821ae_mod_params.int_clear, bool,0444 );MODULE_PARM_DESC (swenc,"Set to 1 for software crypto (default 0)\n" );MODULE_PARM_DESC (ips,"Set to 0 to not use link power save (default 1)\n" );MODULE_PARM_DESC (swlps,"Set to 1 to use SW control power save (default 0)\n" );
@@ -444,6 +448,7 @@ MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");MODULE_PARM_DESC (msi,"Set to 1 to use MSI interrupts mode (default 1)\n" );MODULE_PARM_DESC (debug,"Set debug level (0-5) (default 0)" );MODULE_PARM_DESC (disable_watchdog,"Set to 1 to disable the watchdog (default 0)\n" ); +MODULE_PARM_DESC (int_clear,"Set to 1 to disable interrupt clear before set (default 0)\n" ); static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);
drivers/net/wireless/rtlwifi/wifi.h +3 -0
@@ -2233,6 +2233,9 @@ struct rtl_mod_params {/* default 0: 1 means disable */ bool disable_watchdog; + +/* default 0: 1 means do not disable interrupts */ +bool int_clear; };struct rtl_hal_usbint_cfg {
drivers/of/platform.c +1 -0
@@ -25,6 +25,7 @@const struct of_device_id of_default_bus_match_table[] = { { .compatible ="simple-bus" , }, + { .compatible ="simple-mfd" , }, #ifdef CONFIG_ARM_AMBA { .compatible ="arm,amba-bus" , }, #endif /* CONFIG_ARM_AMBA */
drivers/pci/pci-sysfs.c +1 -1
@@ -216,7 +216,7 @@ static ssize_t numa_node_store(struct device *dev,if (ret)return ret; -if (!node_online (node)) +if (node >=MAX_NUMNODES || !node_online (node))return -EINVAL ;add_taint (TAINT_FIRMWARE_WORKAROUND ,LOCKDEP_STILL_OK );
drivers/pinctrl/intel/pinctrl-baytrail.c +35 -24
195 lines not on this page · raw message
drivers/scsi/mvsas/mv_sas.c +2 -0
@@ -887,6 +887,8 @@ static void mvs_slot_free(struct mvs_info *mvi, u32 rx_desc)static void mvs_slot_task_free (struct mvs_info *mvi,struct sas_task *task,struct mvs_slot_info *slot,u32 slot_idx) { +if (!slot) +return ;if (!slot->task)return ;if (!sas_protocol_ata (task->task_proto))
drivers/staging/iio/accel/sca3000_ring.c +1 -1
@@ -116,7 +116,7 @@ static int sca3000_read_first_n_hw_rb(struct iio_buffer *r,if (ret) goto error_ret; -for (i =0 ; i < num_read; i++) +for (i =0 ; i < num_read /sizeof (u16); i++) *(((u16 *)rx) + i) =be16_to_cpup ((__be16 *)rx + i);if (copy_to_user (buf, rx, num_read))
drivers/staging/iio/adc/mxs-lradc.c +5 -4
@@ -919,11 +919,12 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev,case IIO_CHAN_INFO_OFFSET :if (chan->type ==IIO_TEMP ) {/* The calculated value from the ADC is in Kelvin, we -* want Celsius for hwmon so the offset is -* -272.15 * scale +* want Celsius for hwmon so the offset is -273.15 +* The offset is applied before scaling so it is +* actually -213.15 * 4 / 1.012 = -1079.644268 */ - *val =-1075 ; - *val2 =691699 ; + *val =-1079 ; + *val2 =644268 ;return IIO_VAL_INT_PLUS_MICRO ; }
drivers/tty/serial/8250/8250_dma.c +0 -4
@@ -80,10 +80,6 @@ int serial8250_tx_dma(struct uart_8250_port *p)return 0 ; dma->tx_size =CIRC_CNT_TO_END (xmit->head, xmit->tail,UART_XMIT_SIZE ); -if (dma->tx_size < p->port.fifosize) { - ret = -EINVAL ; - goto err; - } desc = dmaengine_prep_slave_single(dma->txchan, dma->tx_addr + xmit->tail,
drivers/tty/serial/8250/8250_pci.c +21 -0
@@ -1998,6 +1998,7 @@ pci_wch_ch38x_setup(struct serial_private *priv,#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470 +#define PCI_DEVICE_ID_EXAR_XR17V4358 0x4358#define PCI_DEVICE_ID_EXAR_XR17V8358 0x8358#define PCI_VENDOR_ID_PERICOM 0x12D8
@@ -2515,6 +2516,13 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { }, { .vendor = PCI_VENDOR_ID_EXAR, + .device = PCI_DEVICE_ID_EXAR_XR17V4358, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .setup = pci_xr17v35x_setup, + }, + { + .vendor = PCI_VENDOR_ID_EXAR, .device = PCI_DEVICE_ID_EXAR_XR17V8358, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
@@ -2999,6 +3007,7 @@ enum pci_board_num_t { pbn_exar_XR17V352, pbn_exar_XR17V354, pbn_exar_XR17V358, + pbn_exar_XR17V4358, pbn_exar_XR17V8358, pbn_exar_ibm_saturn, pbn_pasemi_1682M,
@@ -3690,6 +3699,14 @@ static struct pciserial_board pci_boards[] = { .reg_shift = 0, .first_offset = 0, }, + [pbn_exar_XR17V4358] = { + .flags = FL_BASE0, + .num_ports = 12, + .base_baud = 7812500, + .uart_offset = 0x400, + .reg_shift = 0, + .first_offset = 0, + }, [pbn_exar_XR17V8358] = { .flags = FL_BASE0, .num_ports = 16,
@@ -5133,6 +5150,10 @@ static struct pci_device_id serial_pci_tbl[] = {PCI_ANY_ID ,PCI_ANY_ID ,0 , 0, pbn_exar_XR17V358 }, + { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V4358, +PCI_ANY_ID ,PCI_ANY_ID , +0 , + 0, pbn_exar_XR17V4358 }, { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V8358,PCI_ANY_ID ,PCI_ANY_ID , 0,
drivers/usb/host/xhci-pci.c +1 -0
@@ -135,6 +135,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI ) { xhci->quirks |=XHCI_SPURIOUS_REBOOT ; + xhci->quirks |=XHCI_SPURIOUS_WAKEUP ; } if (pdev->vendor == PCI_VENDOR_ID_INTEL && (pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI ||
drivers/usb/host/xhci-ring.c +15 -5
@@ -2239,6 +2239,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,u32 trb_comp_code;int ret =0 ;int td_num =0 ; +bool handling_skipped_tds = false; slot_id =TRB_TO_SLOT_ID (le32_to_cpu (event->flags)); xdev = xhci->devs[slot_id];
@@ -2372,6 +2373,10 @@ static int handle_tx_event(struct xhci_hcd *xhci, ep->skip = true;xhci_dbg (xhci,"Miss service interval error, set skip flag\n" ); goto cleanup; +case COMP_PING_ERR : + ep->skip = true; +xhci_dbg (xhci,"No Ping response error, Skip one Isoc TD\n" ); + goto cleanup;default :if (xhci_is_vendor_info_code (xhci, trb_comp_code)) { status =0 ;
@@ -2508,13 +2513,18 @@ static int handle_tx_event(struct xhci_hcd *xhci, ep, &status); cleanup: + + + handling_skipped_tds = ep->skip && + trb_comp_code !=COMP_MISSED_INT && + trb_comp_code !=COMP_PING_ERR ; +/* -* Do not update event ring dequeue pointer if ep->skip is set. -* Will roll back to continue process missed tds. +* Do not update event ring dequeue pointer if we're in a loop +* processing missed tds. */ -if (trb_comp_code ==COMP_MISSED_INT || !ep->skip) { +if (!handling_skipped_tds)inc_deq (xhci, xhci->event_ring); - }if (ret) { urb = td->urb;
@@ -2549,7 +2559,7 @@ cleanup:* Process them as short transfer until reach the td pointed by * the event. */ - }while (ep->skip && trb_comp_code !=COMP_MISSED_INT ); + }while (handling_skipped_tds);return 0 ; }
drivers/usb/serial/qcserial.c +2 -0
@@ -153,6 +153,8 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x1199, 0x9056)}, /* Sierra Wireless Modem */ {DEVICE_SWI(0x1199, 0x9060)}, /* Sierra Wireless Modem */ {DEVICE_SWI(0x1199, 0x9061)}, /* Sierra Wireless Modem */ + {DEVICE_SWI(0x1199, 0x9070)}, /* Sierra Wireless MC74xx/EM74xx */ + {DEVICE_SWI(0x1199, 0x9071)}, /* Sierra Wireless MC74xx/EM74xx */ {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
fs/btrfs/ioctl.c +4 -1
@@ -4494,7 +4494,7 @@ locked:if (bctl->flags & ~(BTRFS_BALANCE_ARGS_MASK |BTRFS_BALANCE_TYPE_MASK )) { ret = -EINVAL ; - goto out_bargs; + goto out_bctl; } do_balance:
@@ -4508,12 +4508,15 @@ do_balance: need_unlock = false; ret =btrfs_balance (bctl, bargs); + bctl =NULL ;if (arg) {if (copy_to_user (arg, bargs,sizeof (*bargs))) ret = -EFAULT ; } +out_bctl: +kfree (bctl); out_bargs:kfree (bargs); out_unlock:
fs/overlayfs/copy_up.c +3 -3
@@ -81,11 +81,11 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)if (len ==0 )return 0 ; - old_file =ovl_path_open (old,O_RDONLY ); + old_file =ovl_path_open (old,O_LARGEFILE |O_RDONLY );if (IS_ERR (old_file))return PTR_ERR (old_file); - new_file =ovl_path_open (new,O_WRONLY ); + new_file =ovl_path_open (new,O_LARGEFILE |O_WRONLY );if (IS_ERR (new_file)) { error =PTR_ERR (new_file); goto out_fput;
@@ -267,7 +267,7 @@ out: out_cleanup:ovl_cleanup (wdir, newdentry); - goto out; + goto out2; }/*
fs/overlayfs/super.c +2 -0
@@ -474,6 +474,7 @@ static void ovl_put_super(struct super_block *sb)mntput (ufs->upper_mnt);for (i =0 ; i < ufs->numlower; i++)mntput (ufs->lower_mnt[i]); +kfree (ufs->lower_mnt);kfree (ufs->config.lowerdir);kfree (ufs->config.upperdir);
@@ -981,6 +982,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) oe->lowerstack[i].dentry = stack[i].dentry; oe->lowerstack[i].mnt = ufs->lower_mnt[i]; } +kfree (stack); root_dentry->d_fsdata = oe;
include/sound/soc.h +4 -2
@@ -85,7 +85,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array),\ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw_sx, \ .get = snd_soc_get_volsw_sx,\ .put = snd_soc_put_volsw_sx, \ .private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -155,7 +155,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw_sx, \ .get = snd_soc_get_volsw_sx, \ .put = snd_soc_put_volsw_sx, \ .private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -563,6 +563,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);int snd_soc_info_volsw (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_info *uinfo); +int snd_soc_info_volsw_sx (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo);#define snd_soc_info_bool_ext snd_ctl_boolean_mono_infoint snd_soc_get_volsw (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol);
include/sound/wm8904.h +1 -1
@@ -119,7 +119,7 @@#define WM8904_MIC_REGS 2#define WM8904_GPIO_REGS 4#define WM8904_DRC_REGS 4 -#define WM8904_EQ_REGS 25 +#define WM8904_EQ_REGS 24/** * DRC configurations are specified with a label and a set of register
kernel/module.c +6 -2
@@ -906,11 +906,15 @@ void symbol_put_addr(void *addr)if (core_kernel_text (a))return ; -/* module_text_address is safe here: we're supposed to have reference -* to module from symbol_get, so it can't go away. */ +/* +* Even though we hold a reference on the module; we still need to +* disable preemption in order to safely traverse the data structure. +*/ +preempt_disable (); modaddr =__module_text_address (a);BUG_ON (!modaddr);module_put (modaddr); +preempt_enable (); }EXPORT_SYMBOL_GPL (symbol_put_addr);
lib/fault-inject.c +1 -1
@@ -44,7 +44,7 @@ static void fail_dump(struct fault_attr *attr)printk (KERN_NOTICE "FAULT_INJECTION: forcing a failure.\n" "name %pd, interval %lu, probability %lu, " "space %d, times %d\n" , attr->dname, - attr->probability, attr->interval, + attr->interval, attr->probability,atomic_read (&attr->space),atomic_read (&attr->times));if (attr->verbose >1 )
mm/filemap.c +5 -4
@@ -2461,6 +2461,11 @@ again:break ; } +if (fatal_signal_pending (current)) { + status = -EINTR ; +break ; + } + status = a_ops->write_begin (file, mapping, pos, bytes, flags, &page, &fsdata);if (unlikely (status <0 ))
@@ -2498,10 +2503,6 @@ again: written += copied;balance_dirty_pages_ratelimited (mapping); -if (fatal_signal_pending (current)) { - status = -EINTR ; -break ; - } }while (iov_iter_count (i));return written ? written : status;
mm/huge_memory.c +2 -1
@@ -2137,7 +2137,8 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma,for (_pte = pte; _pte < pte+HPAGE_PMD_NR ; _pte++, address +=PAGE_SIZE ) {pte_t pteval = *_pte; -if (pte_none (pteval) ||is_zero_pfn (pte_pfn (pteval))) { +if (pte_none (pteval) || (pte_present (pteval) && +is_zero_pfn (pte_pfn (pteval)))) {if (++none_or_zero <= khugepaged_max_ptes_none)continue ;else
sound/pci/hda/hda_codec.c +1 -3
@@ -3833,10 +3833,8 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec)return -EINVAL ; err =snd_hda_codec_parse_pcms (codec); -if (err <0 ) { -snd_hda_codec_reset (codec); +if (err <0 )return err; - }/* attach a new PCM streams */ list_for_each_entry (cpcm, &codec->pcm_list_head, list) {
sound/pci/hda/patch_conexant.c +1 -0
@@ -819,6 +819,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {SND_PCI_QUIRK (0x17aa ,0x21da ,"Lenovo X220" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x21db ,"Lenovo X220-tablet" ,CXT_PINCFG_LENOVO_TP410 ),SND_PCI_QUIRK (0x17aa ,0x38af ,"Lenovo IdeaPad Z560" ,CXT_FIXUP_MUTE_LED_EAPD ), +SND_PCI_QUIRK (0x17aa ,0x390b ,"Lenovo G50-80" ,CXT_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x17aa ,0x3975 ,"Lenovo U300s" ,CXT_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x17aa ,0x3977 ,"Lenovo IdeaPad U310" ,CXT_FIXUP_STEREO_DMIC ), SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
sound/soc/soc-ops.c +28 -0
@@ -207,6 +207,34 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,EXPORT_SYMBOL_GPL (snd_soc_info_volsw);/** +* snd_soc_info_volsw_sx - Mixer info callback for SX TLV controls +* @kcontrol: mixer control +* @uinfo: control element information +* +* Callback to provide information about a single mixer control, or a double +* mixer control that spans 2 registers of the SX TLV type. SX TLV controls +* have a range that represents both positive and negative values either side +* of zero but without a sign bit. +* +* Returns 0 for success. +*/ +int snd_soc_info_volsw_sx (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ +struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + +snd_soc_info_volsw (kcontrol, uinfo); +/* Max represents the number of levels in an SX control not the +* maximum value, so add the minimum value back on +*/ + uinfo->value.integer.max += mc->min; + +return 0 ; +} +EXPORT_SYMBOL_GPL (snd_soc_info_volsw_sx); + +/** * snd_soc_get_volsw - single mixer get callback * @kcontrol: mixer control * @ucontrol: control element information