Linux 3.14.20
Greg KH
maintainerI'm announcing the release of the 3.14.20 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.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/interrupt-controller/interrupts.txt | 12 Makefile | 2 arch/arm/boot/dts/dra7-evm.dts | 14 arch/arm/boot/dts/dra7.dtsi | 16 arch/arm/include/asm/tls.h | 64 ++ arch/arm/kernel/irq.c | 2 arch/arm/kernel/process.c | 2 arch/arm/kernel/thumbee.c | 2 arch/arm/kernel/traps.c | 17 arch/arm/kvm/handle_exit.c | 2 arch/arm/kvm/init.S | 4 arch/arm/mach-omap2/omap_hwmod.c | 3 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 22 arch/arm/mach-omap2/soc.h | 6 arch/arm/mm/abort-ev6.S | 6 arch/arm/mm/abort-ev7.S | 6 arch/arm/mm/alignment.c | 3 arch/arm64/include/asm/hw_breakpoint.h | 1 arch/arm64/kernel/irq.c | 12 arch/arm64/kernel/process.c | 18 arch/arm64/kernel/ptrace.c | 3 arch/arm64/kernel/sys_compat.c | 6 arch/arm64/kvm/handle_exit.c | 2 arch/arm64/kvm/hyp-init.S | 4 arch/mips/boot/compressed/decompress.c | 1 arch/mips/kernel/mcount.S | 12 arch/parisc/Makefile | 7 arch/parisc/kernel/syscall.S | 233 +++++++++- arch/powerpc/include/asm/ptrace.h | 7 arch/powerpc/include/asm/spinlock.h | 1 arch/powerpc/lib/locks.c | 4 arch/powerpc/perf/callchain.c | 2 arch/s390/mm/pgtable.c | 10 arch/x86/boot/compressed/aslr.c | 15 arch/x86/include/asm/fixmap.h | 6 arch/x86/include/asm/pgtable_64.h | 1 arch/x86/kernel/cpu/perf_event_intel_rapl.c | 12 arch/x86/kernel/smpboot.c | 3 arch/x86/xen/mmu.c | 27 - arch/xtensa/include/asm/pgtable.h | 7 arch/xtensa/include/asm/uaccess.h | 5 arch/xtensa/include/uapi/asm/ioctls.h | 19 arch/xtensa/kernel/entry.S | 26 - arch/xtensa/kernel/pci-dma.c | 12 block/cfq-iosched.c | 11 block/genhd.c | 26 - block/partition-generic.c | 2 block/partitions/aix.c | 2 drivers/acpi/acpi_cmos_rtc.c | 2 drivers/acpi/acpica/aclocal.h | 1 drivers/acpi/acpica/acobject.h | 1 drivers/acpi/acpica/dsfield.c | 2 drivers/acpi/acpica/evregion.c | 47 +- drivers/acpi/acpica/exfield.c | 67 ++ drivers/acpi/acpica/exprep.c | 2 drivers/acpi/container.c | 8 drivers/acpi/scan.c | 5 drivers/ata/ahci.c | 10 drivers/ata/ata_piix.c | 8 drivers/ata/libata-core.c | 2 drivers/ata/pata_scc.c | 15 drivers/base/regmap/regcache.c | 2 drivers/base/regmap/regmap.c | 2 drivers/clk/clk.c | 7 drivers/clk/qcom/mmcc-msm8960.c | 84 +-- drivers/cpufreq/cpufreq.c | 2 drivers/dma/TODO | 1 drivers/dma/dw/core.c | 38 - drivers/gpu/drm/ast/ast_main.c | 2 drivers/gpu/drm/i915/i915_gem.c | 11 drivers/gpu/drm/i915/intel_bios.c | 2 drivers/gpu/drm/i915/intel_crt.c | 2 drivers/gpu/drm/i915/intel_lvds.c | 2 drivers/gpu/drm/i915/intel_ringbuffer.c | 3 drivers/gpu/drm/i915/intel_tv.c | 4 drivers/gpu/drm/nouveau/nouveau_vga.c | 9 drivers/gpu/drm/radeon/ci_dpm.c | 16 drivers/gpu/drm/radeon/cik.c | 9 drivers/gpu/drm/radeon/cik_sdma.c | 7 drivers/gpu/drm/radeon/ni_dma.c | 6 drivers/gpu/drm/radeon/r600_dma.c | 9 drivers/gpu/drm/radeon/radeon.h | 3 drivers/gpu/drm/radeon/radeon_atombios.c | 72 ++- drivers/gpu/drm/radeon/radeon_device.c | 29 + drivers/gpu/drm/radeon/radeon_kms.c | 9 drivers/gpu/drm/radeon/radeon_pm.c | 24 - drivers/gpu/drm/radeon/radeon_semaphore.c | 2 drivers/gpu/drm/radeon/si.c | 2 drivers/gpu/drm/radeon/trinity_dpm.c | 11 drivers/gpu/drm/tilcdc/tilcdc_drv.c | 7 drivers/gpu/drm/tilcdc/tilcdc_panel.c | 5 drivers/gpu/drm/tilcdc/tilcdc_slave.c | 1 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 drivers/gpu/drm/ttm/ttm_page_alloc.c | 29 - drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 34 - drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 3 drivers/gpu/vga/vga_switcheroo.c | 6 drivers/hid/hid-logitech-dj.c | 43 + drivers/hid/hid-logitech-dj.h | 1 drivers/hid/hid-magicmouse.c | 10 drivers/hid/hid-picolcd_core.c | 6 drivers/hwmon/ds1621.c | 1 drivers/i2c/busses/i2c-at91.c | 32 + drivers/i2c/busses/i2c-ismt.c | 4 drivers/i2c/busses/i2c-mv64xxx.c | 3 drivers/iio/accel/bma180.c | 2 drivers/iio/adc/ad_sigma_delta.c | 2 drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 3 drivers/iio/common/st_sensors/st_sensors_trigger.c | 2 drivers/iio/gyro/itg3200_buffer.c | 2 drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 2 drivers/iio/inkern.c | 2 drivers/iio/magnetometer/st_magn_core.c | 52 +- drivers/infiniband/core/uverbs_marshall.c | 4 drivers/infiniband/hw/mlx4/main.c | 53 +- drivers/infiniband/hw/qib/qib_debugfs.c | 3 drivers/infiniband/hw/qib/qib_qp.c | 8 drivers/infiniband/ulp/isert/ib_isert.c | 7 drivers/input/keyboard/atkbd.c | 8 drivers/input/mouse/elantech.c | 7 drivers/input/mouse/synaptics.c | 68 ++ drivers/input/mouse/synaptics.h | 11 drivers/input/serio/i8042-x86ia64io.h | 15 drivers/input/serio/serport.c | 45 + drivers/iommu/arm-smmu.c | 7 drivers/md/dm-cache-target.c | 4 drivers/md/dm-crypt.c | 20 drivers/md/raid1.c | 40 - drivers/media/dvb-core/dvb-usb-ids.h | 2 drivers/media/i2c/adv7604.c | 2 drivers/media/pci/cx18/cx18-driver.c | 1 drivers/media/usb/dvb-usb-v2/af9035.c | 4 drivers/net/ethernet/ibm/ibmveth.c | 18 drivers/net/wireless/ath/carl9170/carl9170.h | 1 drivers/net/wireless/ath/carl9170/usb.c | 31 + drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 12 drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 2 drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 drivers/net/wireless/iwlwifi/iwl-config.h | 2 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 drivers/net/wireless/iwlwifi/mvm/fw-api.h | 4 drivers/net/wireless/iwlwifi/mvm/sf.c | 2 drivers/net/wireless/iwlwifi/mvm/tx.c | 8 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 drivers/nfc/microread/microread.c | 16 drivers/of/irq.c | 17 drivers/phy/phy-twl4030-usb.c | 121 +++-- drivers/scsi/libiscsi.c | 10 drivers/spi/spi-dw-pci.c | 2 drivers/spi/spi-omap2-mcspi.c | 3 drivers/staging/iio/meter/ade7758_trigger.c | 2 drivers/staging/imx-drm/ipuv3-plane.c | 3 drivers/staging/lustre/lustre/Kconfig | 1 drivers/target/iscsi/iscsi_target.c | 4 drivers/target/iscsi/iscsi_target_parameters.c | 2 drivers/target/target_core_configfs.c | 2 drivers/tty/serial/8250/8250_dma.c | 17 drivers/usb/chipidea/ci_hdrc_msm.c | 7 drivers/usb/core/hub.c | 4 drivers/usb/dwc3/core.c | 13 drivers/usb/dwc3/dwc3-omap.c | 2 drivers/usb/host/ehci-hcd.c | 2 drivers/usb/host/xhci-hub.c | 8 drivers/usb/host/xhci-mem.c | 2 drivers/usb/host/xhci.c | 12 drivers/usb/misc/sisusbvga/sisusb.c | 1 drivers/usb/phy/phy-tegra-usb.c | 4 drivers/usb/serial/ftdi_sio.c | 3 drivers/usb/serial/ftdi_sio_ids.h | 12 drivers/usb/serial/option.c | 31 + drivers/usb/serial/pl2303.c | 1 drivers/usb/serial/pl2303.h | 1 drivers/usb/serial/sierra.c | 9 drivers/usb/serial/usb-serial.c | 37 + drivers/usb/serial/zte_ev.c | 24 - drivers/usb/storage/unusual_devs.h | 38 + drivers/uwb/lc-dev.c | 13 drivers/xen/manage.c | 7 fs/aio.c | 91 +++ fs/buffer.c | 6 fs/cifs/link.c | 8 fs/eventpoll.c | 3 fs/gfs2/inode.c | 5 fs/lockd/svc.c | 4 fs/namei.c | 33 - fs/nfs/nfs4client.c | 38 - fs/nfs/nfs4proc.c | 30 - fs/nilfs2/inode.c | 7 fs/notify/fdinfo.c | 4 fs/ocfs2/dlm/dlmmaster.c | 18 include/acpi/acpi_bus.h | 1 include/linux/iio/trigger.h | 4 include/linux/seqlock.h | 2 include/linux/vga_switcheroo.h | 2 include/linux/workqueue.h | 2 include/net/regulatory.h | 2 include/uapi/linux/usb/functionfs.h | 10 include/uapi/linux/xattr.h | 2 kernel/cgroup.c | 1 kernel/events/core.c | 10 kernel/futex.c | 1 kernel/kcmp.c | 7 kernel/power/main.c | 21 kernel/power/power.h | 9 kernel/power/suspend.c | 66 +- kernel/power/suspend_test.c | 24 - kernel/time/alarmtimer.c | 34 - kernel/trace/ring_buffer.c | 16 mm/memblock.c | 3 mm/memory.c | 2 mm/percpu-vm.c | 22 mm/percpu.c | 2 mm/shmem.c | 4 mm/slab.c | 11 net/mac80211/mlme.c | 3 net/netfilter/ipvs/ip_vs_conn.c | 1 net/netfilter/ipvs/ip_vs_core.c | 2 net/netfilter/ipvs/ip_vs_xmit.c | 2 net/netfilter/xt_cgroup.c | 2 net/netfilter/xt_hashlimit.c | 31 - net/wireless/nl80211.c | 6 sound/core/info.c | 4 sound/core/pcm_lib.c | 8 sound/pci/hda/patch_conexant.c | 9 sound/pci/hda/patch_realtek.c | 2 sound/pci/hda/patch_sigmatel.c | 17 sound/soc/davinci/davinci-mcasp.c | 11 227 files changed, 2063 insertions(+), 850 deletions(-)
Al Viro (2):
don't bugger nd->seq on set_root_rcu() from follow_dotdot_rcu()
GFS2: fix d_splice_alias() misuses
Alan Douglas (1):
xtensa: fix address checks in dma_{alloc,free}_coherent
Alan Stern (1):
USB: EHCI: unlink QHs even after the controller has stopped
Alex Deucher (18):
drm/radeon/dpm: handle voltage info fetching on hawaii drm/radeon: re-enable dpm by default on cayman drm/radeon: re-enable dpm by default on BTC drm/radeon: load the lm63 driver for an lm64 thermal chip. drm/radeon/atom: add new voltage fetch function for hawaii drm/radeon: tweak ACCEL_WORKING2 query for hawaii drm/radeon: enable bapm by default on desktop TN/RL boards drm/radeon/TN: only enable bapm on MSI systems drm/radeon: fix pm handling in radeon_gpu_reset drm/radeon/dpm: set the thermal type properly for special configs drm/radeon: add connector quirk for fujitsu board drm/radeon: don't reset dma on NI/SI init
drm/radeon: don't reset sdma on CIK init
drm/radeon: don't reset dma on r6xx-evergreen init drm/radeon/cik: use a separate counter for CP init timeout
vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops drm/nouveau/runpm: fix module unload
drm/radeon/px: fix module unload
Alex Gartrell (1):
ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding
Andreas Rohner (1):
nilfs2: fix data loss with mmap()
Andrey Vagin (2):
fsnotify/fdinfo: use named constants instead of hardcoded values fs/notify: don't show f_handle if exportfs_encode_inode_fh failed
Andy Shevchenko (3):
spi: dw-pci: fix bug when regs left uninitialized
dmaengine: dw: introduce dwc_dostart_first_queued() helper
dmaengine: dw: don't perform DMA when dmaengine_submit is called
Anssi Hannula (1):
dm cache: fix race causing dirty blocks to be marked as clean
Anton Altaparmakov (1):
Fix nasty 32-bit overflow bug in buffer i/o code.
Anton Blanchard (2):
ibmveth: Fix endian issues with rx_no_buffer statistic powerpc/perf: Fix ABIv2 kernel backtraces
Arend van Spriel (1):
brcmfmac: handle IF event for P2P_DEVICE interface
Arjun Sreedharan (1):
pata_scc: propagate return value of scc_wait_after_reset
Arnd Bergmann (1):
staging/lustre: disable virtual block device for 64K pages
Aurelien Jarno (1):
MIPS: ZBOOT: add missing <linux/string.h> include
Benjamin LaHaise (1):
aio: fix reqs_available handling
Benjamin Tissoires (1):
HID: logitech-dj: prevent false errors to be shown
Bjørn Mork (2):
USB: sierra: avoid CDC class functions on "68A3" devices
USB: sierra: add 1199:68AA device ID
Bob Moore (1):
ACPICA: Update to GPIO region handler interface.
Brennan Ashton (1):
USB: option: add VIA Telecom CDS7 chipset device id
Chen-Yu Tsai (1):
i2c: mv64xxx: continue probe when clock-frequency is missing
Christian Borntraeger (1):
KVM: s390/mm: try a cow on read only pages for key ops
Christian König (2):
drm/radeon: set VM base addr using the PFP v2 drm/radeon: fix semaphore value init
Christoffer Dall (1):
arm/arm64: KVM: Complete WFI/WFE instructions
Clemens Ladisch (2):
ALSA: core: fix buffer overflow in snd_info_get_line()
ALSA: pcm: fix fifo_size frame calculation
Cong Wang (1):
perf: Fix a race condition in perf_remove_from_context()
Dan Carpenter (2):
NFC: microread: Potential overflows in microread_target_discovered()
partitions: aix.c: off by one bug
Daniel Borkmann (1):
netfilter: x_tables: allow to use default cgroup match
Daniel Vetter (1):
drm/i915: Fix EIO/wedged handling in gem fault handler
Dave Young (1):
x86 early_ioremap: Increase FIX_BTMAPS_SLOTS to 8
David Rientjes (1):
mm, slab: initialize object alignment on cache creation
Denis CIOCCA (1):
iio:magnetometer: bugfix magnetometers gain values
Dmitry Torokhov (2):
Input: synaptics - add support for ForcePads
Input: atkbd - do not try 'deactivate' keyboard on any LG laptops
Eliad Peller (2):
iwlwifi: increase DEFAULT_MAX_TX_POWER
regulatory: add NUL to alpha2
Emmanuel Grumbach (2):
Revert "iwlwifi: dvm: don't enable CTS to self"
iwlwifi: mvm: fix endianity issues with Smart Fifo commands
Eric Dumazet (1):
netfilter: xt_hashlimit: perform garbage collection from process context
Eyal Shapira (1):
iwlwifi: mvm: treat EAPOLs like mgmt frames wrt rate
Fan Du (1):
i2c: ismt: use correct length when copy buffer
Felipe Balbi (4):
usb: host: xhci: fix compliance mode workaround
usb: dwc3: omap: fix ordering for runtime pm calls
usb: dwc3: core: fix order of PM runtime calls
usb: dwc3: core: fix ordering for PHY suspend
Filipe Brandenburger (1):
xattr: fix check for simultaneous glibc header inclusion
Florian Fainelli (1):
of/irq: Fix lookup to use 'interrupts-extended' property first
Greg KH (1):
USB: serial: pl2303: add device id for ztek device
Greg Kroah-Hartman (1):
Linux 3.14.20
Gu Zheng (1):
aio: block exit_aio() until all context requests are completed
Guido Martínez (6):
drm/tilcdc: panel: fix dangling sysfs connector node drm/tilcdc: slave: fix dangling sysfs connector node drm/tilcdc: tfp410: fix dangling sysfs connector node drm/tilcdc: panel: fix leak when unloading the module drm/tilcdc: fix release order on exit drm/tilcdc: fix double kfree
Guy Martin (1):
parisc: Implement new LWS CAS supporting 64 bit operations.
Hans Verkuil (2):
media: cx18: fix kernel oops with tda8290 tuner
media: adv7604: fix inverted condition
Hans de Goede (3):
Input: elantech - fix detection of touchpad on ASUS s301l
Input: i8042 - add Fujitsu U574 to no_timeout dmi table
Input: i8042 - add nomux quirk for Avatar AVIU-145A6
Heikki Krogerus (1):
serial: 8250_dma: check the result of TX buffer mapping
Honggang Li (1):
percpu: free percpu allocation info for uniprocessor system
Ivan T. Ivanov (2):
usb: chipidea: msm: Use USB PHY API to control PHY state
usb: chipidea: msm: Initialize PHY on reset event
J. Bruce Fields (1):
lockd: fix rpcbind crash on lockd startup failure
James Ralston (2):
ahci: Add Device IDs for Intel 9 Series PCH
ata_piix: Add Device IDs for Intel 9 Series PCH
Jeff Moyer (1):
aio: add missing smp_rmb() in read_events_ring
Jens Axboe (1):
genhd: fix leftover might_sleep() in blk_free_devt()
Jiri Kosina (3):
drm/i915: read HEAD register back in init_ring_common() to enforce ordering
HID: picolcd: sanity check report size in raw_event() callback
HID: magicmouse: sanity check report size in raw_event() callback
Joe Lawrence (1):
usb: hub: take hub->hdev reference when processing from eventlist
Joern Engel (1):
iscsi-target: avoid NULL pointer in iscsi_copy_param_list failure
Johan Hovold (8):
USB: serial: fix potential stack buffer overflow
USB: serial: fix potential heap buffer overflow
USB: option: reduce interrupt-urb logging verbosity Revert "USB: option,zte_ev: move most ZTE CDMA devices to zte_ev"
USB: zte_ev: remove duplicate Gobi PID
USB: zte_ev: remove duplicate Qualcom PID
USB: ftdi_sio: add support for NOVITUS Bono E thermal printer
USB: zte_ev: fix removed PIDs
Johannes Berg (2):
Revert "mac80211: disable uAPSD if all ACs are under ACM"
nl80211: clear skb cb before passing to netlink
Johannes Pointner (1):
iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
John David Anglin (1):
parisc: Only use -mfast-indirect-calls option for 32-bit kernel builds
John Sung (1):
Input: serport - add compat handling for SPIOCSTYPE ioctl
Jorge A. Ventura (1):
spi/omap-mcspi: Fix the spi task hangs waiting dma_rx
Josef Bacik (1):
trace: Fix epoll hang when we race with new entries
Joseph Qi (1):
ocfs2/dlm: do not get resource spinlock if lockres is new
Julian Anastasov (2):
ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack
ipvs: fix ipv6 hook registration for local replies
Karol Lewandowski (1):
usb: gadget: f_fs: drop duplicate usb_functionfs_descs_head declaration
Kees Cook (1):
x86/kaslr: Avoid the setup_data area when picking location
Keith Busch (1):
block: Fix dev_t minor allocation lifetime
Larry Finger (1):
rtlwifi: rtl8192cu: Add new ID
Lee, Chun-Yi (1):
ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses
Malcolm Priestley (1):
media: af9035: new IDs: add support for PCTV 78e and PCTV 79e
Marek Roszko (1):
i2c: at91: add bound checking on SMBus block length bytes
Mark (4):
storage: Add single-LUN quirk for Jaz USB Adapter
USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter
USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter
USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters
Mark Brown (2):
regmap: Fix handling of volatile registers for format_write() chips
regmap: Don't attempt block writes when syncing cache on single_rw devices
Mark Rutland (1):
ARM: 8128/1: abort: don't clear the exclusive monitors
Markos Chandras (1):
MIPS: mcount: Adjust stack pointer for static trace in MIPS32
Matan Barak (1):
IB/core: When marshaling uverbs path, clear unused fields
Mathias Krause (1):
drm/i915: Remove bogus __init annotation from DMI callbacks
Mathias Nyman (2):
xhci: Fix null pointer dereference if xhci initialization fails
xhci: fix oops when xhci resumes from hibernate with hw lpm capable devices
Max Filippov (4):
xtensa: replace IOCTL code definitions with constants
xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS
xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
xtensa: fix a6 and a7 handling in fast_syscall_xtensa
Michael Ellerman (2):
powerpc: Add smp_mb() to arch_spin_is_locked()
powerpc: Add smp_mb()s to arch_spin_unlock_wait()
Mika Westerberg (1):
ACPI / scan: Correct error return value of create_modalias()
Mike Christie (1):
SCSI: libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu
Mike Marciniszyn (1):
IB/qib: Correct reference counting in debugfs qp_stats
Miklos Szeredi (1):
shmem: fix nlink for rename overwrite directory
Mikulas Patocka (1):
dm crypt: fix access beyond the end of allocated space
Moni Shoua (2):
IB/mlx4: Avoid null pointer dereference in mlx4_ib_scan_netdevs() IB/mlx4: Don't duplicate the default RoCE GID
Murali Karicheri (1):
ahci: add pcid for Marvel 0x9182 controller
Nathan Lynch (2):
ARM: 8148/1: flush TLS and thumbee register state during exec
ARM: 8178/1: fix set_tls for !CONFIG_KUSER_HELPERS
NeilBrown (8):
md/raid1: clean up request counts properly in close_sync() md/raid1: be more cautious where we read-balance during resync. md/raid1: make sure resync waits for conflicting writes to complete. md/raid1: Don't use next_resync to determine how far resync has progressed md/raid1: update next_resync under resync_lock.
md/raid1: count resync requests in nr_pending.
md/raid1: fix_read_error should act on all non-faulty devices. md/raid1: intialise start_next_window for READ case to avoid hang
Nicholas Bellinger (1):
iscsi-target: Fix memory corruption in iscsit_logout_post_handler_diffcid
Nicolas Iooss (1):
eventpoll: fix uninitialized variable in epoll_ctl
Nishanth Menon (2):
ARM: dts: DRA7: fix interrupt-cells for GPIO
ARM: dts: dra7-evm: Fix spi1 mux documentation
Olav Haugan (1):
iommu/arm-smmu: fix programming of SMMU_CBn_TCR for stage 1
Oleg Chernovskiy (1):
drm/radeon: Add missing lines to ci_set_thermal_temperature_range
Pali Rohár (1):
drm/radeon: Add ability to get and change dpm state when radeon PX card is turned off
Peter Feiner (1):
mm: softdirty: keep bit when zapping file pte
Peter Ujfalusi (1):
ASoC: davinci-mcasp: Correct rx format unit configuration
Pranavkumar Sawargaonkar (1):
ARM/ARM64: KVM: Nuke Hyp-mode tlbs before enabling MMU
Prarit Bhargava (1):
cpufreq: release policy->rwsem on error
Rafael J. Wysocki (3):
ACPI / hotplug: Generate online uevents for ACPI containers PM / sleep: Add state field to pm_states[] entries
PM / sleep: Use valid_state() for platform-dependent sleep states only
Rajendra Nayak (2):
ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
Rasmus Villemoes (1):
kcmp: fix standard comparison bug
Richard Larocque (3):
alarmtimer: Return relative times in timer_gettime
alarmtimer: Do not signal SIGEV_NONE timers
alarmtimer: Lock k_itimer during timer callback
Robert Coulson (1):
hwmon: (ds1621) Update zbits after conversion rate change
Robin Murphy (1):
ARM: 8165/1: alignment: don't break misaligned NEON load/store
Ronald Wahl (1):
carl9170: fix sending URBs with wrong type when using full-speed
Ross Lagerwall (1):
xen/manage: Always freeze/thaw processes when suspend/resuming
Russell King (1):
imx-drm: ipuv3-plane: fix ipu_plane_dpms()
Sagi Grimberg (2):
Target/iser: Get isert_conn reference once got to connected_handler Target/iser: Don't put isert_conn inside disconnected handler
Sebastian Herbszt (1):
target: Fix inverted logic in SE_DEV_ALUA_SUPPORT_STATE_STORE
Simon Lindgren (1):
i2c: at91: Fix a race condition during signal handling in at91_do_twi_xfer.
Srinivas Pandruvada (8):
iio:trigger: modify return value for iio_trigger_get
iio: accel: bma180: Fix indio_dev->trig assignment
iio: hid_sensor_hub: Fix indio_dev->trig assignment
iio: gyro: itg3200: Fix indio_dev->trig assignment
iio: inv_mpu6050: Fix indio_dev->trig assignment
iio: meter: ade7758: Fix indio_dev->trig assignment
iio: st_sensors: Fix indio_dev->trig assignment
iio: adc: ad_sigma_delta: Fix indio_dev->trig assignmentStefan Bader (1):
x86/xen: don't copy bogus duplicate entries into kernel page tables
Stephen Boyd (2):
clk: qcom: Fix MN frequency tables, parent map, and jpegd
clk: qcom: mdp_lut_clk is a child of mdp_src
Stephen Hemminger (1):
USB: sisusb: add device id for Magic Control USB video
Steve Dickson (1):
NFSv4: nfs4_state_manager() vs. nfs_server_remove_lists()
Steve French (1):
SMB3: Fix oops when creating symlinks on smb3
Sudeep Holla (2):
arm64: use irq_set_affinity with force=false when migrating irqs
ARM: 8133/1: use irq_set_affinity with force=false when migrating irqs
Takashi Iwai (3):
ALSA: hda - Fix digital mic on Acer Aspire 3830TG
ALSA: hda - Fix COEF setups for ALC1150 codec
ALSA: hda - Fix invalid pin powermap without jack detection
Tang Chen (1):
memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
Taylor Braun-Jones (1):
USB: ftdi_sio: Add support for GE Healthcare Nemo Tracker device
Tejun Heo (4):
libata: widen Crucial M550 blacklist matching
workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
percpu: fix pcpu_alloc_pages() failure path
percpu: perform tlb flush after pcpu_map_pages() failure
Tero Kristo (1):
clk: prevent erronous parsing of children during rate change
Tetsuo Handa (5):
drm/ttm: Fix possible division by 0 in ttm_dma_pool_shrink_scan(). drm/ttm: Choose a pool to shrink correctly in ttm_dma_pool_shrink_scan(). drm/ttm: Use mutex_trylock() to avoid deadlock inside shrinker functions. drm/ttm: Fix possible stack overflow by recursive shrinker calls. drm/ttm: Pass GFP flags in order to avoid deadlock.
Thierry Reding (1):
usb: phy: tegra: Avoid use of sizeof(void)
Thomas Gleixner (1):
futex: Unlock hb->lock in futex_wait_requeue_pi() error path
Thomas Hellstrom (1):
drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
Thomas Pugliese (1):
uwb: init beacon cache entry before registering uwb device
Tony Lindgren (2):
usb: phy: twl4030-usb: Fix lost interrupts after ID pin goes down
usb: phy: twl4030-usb: Fix regressions to runtime PM on omaps
Toshiaki Makita (1):
cfq-iosched: Fix wrong children_weight calculation
Trond Myklebust (2):
NFSv4: Fix another bug in the close/open_downgrade code
lockdep: Revert lockdep check in raw_seqcount_begin()
Venkatesh Srinivas (1):
perf/x86/intel: Use rdmsrl_safe() when initializing RAPL PMU
Ville Syrjälä (1):
drm/i915: Wait for vblank before enabling the TV encoder
Wanpeng Li (1):
sched: Fix unreleased llc_shared_mask bit during CPU hotplug
Will Deacon (2):
arm64: flush TLS registers during exec
arm64: ptrace: fix compat hardware watchpoint reporting
Y.C. Chen (1):
drm/ast: AST2000 cannot be detected correctly
Zefan Li (1):
cgroup: fix unbalanced locking
Greg KH
maintainerDocumentation/devicetree/bindings/interrupt-controller/interrupts.txt +7 -5
@@ -4,11 +4,13 @@ Specifying interrupt information for devices 1) Interrupt client nodes ------------------------- -Nodes that describe devices which generate interrupts must contain an either an -"interrupts" property or an "interrupts-extended" property. These properties -contain a list of interrupt specifiers, one per output interrupt. The format of -the interrupt specifier is determined by the interrupt controller to which the -interrupts are routed; see section 2 below for details. +Nodes that describe devices which generate interrupts must contain an +"interrupts" property, an "interrupts-extended" property, or both. If both are +present, the latter should take precedence; the former may be provided simply +for compatibility with software that does not recognize the latter. These +properties contain a list of interrupt specifiers, one per output interrupt. The +format of the interrupt specifier is determined by the interrupt controller to +which the interrupts are routed; see section 2 below for details. Example: interrupt-parent = <&intc1>;
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 19 +SUBLEVEL = 20 EXTRAVERSION = NAME = Remembering Coco
arch/arm/boot/dts/dra7-evm.dts +7 -7
@@ -50,13 +50,13 @@ mcspi1_pins: pinmux_mcspi1_pins { pinctrl-single,pins = < - 0x3a4 (PIN_INPUT | MUX_MODE0) /* spi2_clk */ - 0x3a8 (PIN_INPUT | MUX_MODE0) /* spi2_d1 */ - 0x3ac (PIN_INPUT | MUX_MODE0) /* spi2_d0 */ - 0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs0 */ - 0x3b4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi2_cs1 */ - 0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi2_cs2 */ - 0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi2_cs3 */ + 0x3a4 (PIN_INPUT | MUX_MODE0) /* spi1_sclk */ + 0x3a8 (PIN_INPUT | MUX_MODE0) /* spi1_d1 */ + 0x3ac (PIN_INPUT | MUX_MODE0) /* spi1_d0 */ + 0x3b0 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs0 */ + 0x3b4 (PIN_INPUT_SLEW | MUX_MODE0) /* spi1_cs1 */ + 0x3b8 (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs2.hdmi1_hpd */ + 0x3bc (PIN_INPUT_SLEW | MUX_MODE6) /* spi1_cs3.hdmi1_cec */ >; };
arch/arm/boot/dts/dra7.dtsi +8 -8
@@ -178,7 +178,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio2: gpio@48055000 {
@@ -189,7 +189,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio3: gpio@48057000 {
@@ -200,7 +200,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio4: gpio@48059000 {
@@ -211,7 +211,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio5: gpio@4805b000 {
@@ -222,7 +222,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio6: gpio@4805d000 {
@@ -233,7 +233,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio7: gpio@48051000 {
@@ -244,7 +244,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; gpio8: gpio@48053000 {
@@ -255,7 +255,7 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; - #interrupt-cells = <1>; + #interrupt-cells = <2>; }; uart1: serial@4806a000 {
arch/arm/include/asm/tls.h +64 -0
81 lines not on this page · raw message
arch/arm/kernel/irq.c +1 -1
@@ -163,7 +163,7 @@ static bool migrate_one_irq(struct irq_desc *desc) c =irq_data_get_irq_chip (d);if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq); -else if (c->irq_set_affinity (d, affinity, true) ==IRQ_SET_MASK_OK && ret) +else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret)cpumask_copy (d->affinity, affinity);return ret;
arch/arm/kernel/process.c +2 -0
@@ -334,6 +334,8 @@ void flush_thread(void)memset (&tsk->thread.debug,0 ,sizeof (struct debug_info ));memset (&thread->fpstate,0 ,sizeof (union fp_state )); +flush_tls (); +thread_notify (THREAD_NOTIFY_FLUSH , thread); }
arch/arm/kernel/thumbee.c +1 -1
@@ -45,7 +45,7 @@ static int thumbee_notifier(struct notifier_block *self, unsigned long cmd, voidswitch (cmd) {case THREAD_NOTIFY_FLUSH : - thread->thumbee_state =0 ; +teehbr_write (0 );break ;case THREAD_NOTIFY_SWITCH :current_thread_info ()->thumbee_state =teehbr_read ();
arch/arm/kernel/traps.c +1 -16
@@ -578,7 +578,6 @@ do_cache_op(unsigned long start, unsigned long end, int flags)#define NR (x) ((__ARM_NR_##x) - __ARM_NR_BASE) asmlinkage int arm_syscall(int no, struct pt_regs *regs) { -struct thread_info *thread =current_thread_info ();siginfo_t info;if ((no >>16 ) != (__ARM_NR_BASE>>16 ))
@@ -629,21 +628,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)return regs->ARM_r0;case NR (set_tls): - thread->tp_value[0 ] = regs->ARM_r0; -if (tls_emu) -return 0 ; -if (has_tls_reg) { - asm ("mcr p15, 0, %0, c13, c0, 3" - : :"r" (regs->ARM_r0)); - }else { -/* -* User space must never try to access this directly. -* Expect your app to break eventually if you do so. -* The user helper at 0xffff0fe0 must be used instead. -* (see entry-armv.S for details) -*/ - *((unsigned int *)0xffff0ff0 ) = regs->ARM_r0; - } +set_tls (regs->ARM_r0);return 0 ;#ifdef CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG
arch/arm/kvm/handle_exit.c +2 -0
@@ -89,6 +89,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)else kvm_vcpu_block (vcpu); +kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu)); +return 1 ; }
arch/arm/kvm/init.S +4 -0
@@ -98,6 +98,10 @@ __do_hyp_init: mrc p15, 0, r0, c10, c2, 1 mcr p15, 4, r0, c10, c2, 1 + @ Invalidate the stale TLBs from Bootloader + mcr p15, 4, r0, c8, c7, 0 @ TLBIALLH + dsb ish + @ Set the HSCTLR to: @ - ARM/THUMB exceptions: Kernel config (Thumb-2 kernel) @ - Endianness: Kernel config
arch/arm/mach-omap2/omap_hwmod.c +3 -0
@@ -3349,6 +3349,9 @@ int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois)if (!ois)return 0 ; +if (ois[0 ] ==NULL )/* Empty list */ +return 0 ; +if (!linkspace) {if (_alloc_linkspace (ois)) {pr_err ("omap_hwmod: could not allocate link space\n" );
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +20 -2
@@ -35,6 +35,7 @@#include "i2c.h" #include "mmc.h" #include "wd_timer.h" +#include "soc.h" /* Base offset for all DRA7XX interrupts external to MPUSS */ #define DRA7XX_IRQ_GIC_START 32
@@ -2707,7 +2708,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_per3__usb_otg_ss1, &dra7xx_l4_per3__usb_otg_ss2, &dra7xx_l4_per3__usb_otg_ss3, - &dra7xx_l4_per3__usb_otg_ss4, &dra7xx_l3_main_1__vcp1, &dra7xx_l4_per2__vcp1, &dra7xx_l3_main_1__vcp2,
@@ -2716,8 +2716,26 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { NULL, }; +static struct omap_hwmod_ocp_if *dra74x_hwmod_ocp_ifs[]__initdata = { + &dra7xx_l4_per3__usb_otg_ss4, +NULL , +}; + +static struct omap_hwmod_ocp_if *dra72x_hwmod_ocp_ifs[]__initdata = { +NULL , +}; +int __init dra7xx_hwmod_init (void ) { +int ret; +omap_hwmod_init (); -return omap_hwmod_register_links (dra7xx_hwmod_ocp_ifs); + ret =omap_hwmod_register_links (dra7xx_hwmod_ocp_ifs); + +if (!ret &&soc_is_dra74x ()) +return omap_hwmod_register_links (dra74x_hwmod_ocp_ifs); +else if (!ret &&soc_is_dra72x ()) +return omap_hwmod_register_links (dra72x_hwmod_ocp_ifs); + +return ret; }
arch/arm/mach-omap2/soc.h +6 -0
@@ -245,6 +245,8 @@ IS_AM_SUBCLASS(437x, 0x437)#define soc_is_omap54xx () 0#define soc_is_omap543x () 0#define soc_is_dra7xx () 0 +#define soc_is_dra74x () 0 +#define soc_is_dra72x () 0#if defined(MULTI_OMAP2 )# if defined(CONFIG_ARCH_OMAP2 )
@@ -393,7 +395,11 @@ IS_OMAP_TYPE(3430, 0x3430)#if defined(CONFIG_SOC_DRA7XX )#undef soc_is_dra7xx +#undef soc_is_dra74x +#undef soc_is_dra72x#define soc_is_dra7xx () (of_machine_is_compatible("ti,dra7")) +#define soc_is_dra74x () (of_machine_is_compatible("ti,dra74")) +#define soc_is_dra72x () (of_machine_is_compatible("ti,dra72"))#endif /* Various silicon revisions for omap2 */
arch/arm/mm/abort-ev6.S +0 -6
@@ -17,12 +17,6 @@ */ .align 5 ENTRY(v6_early_abort) -#ifdef CONFIG_CPU_V6 - sub r1, sp, #4 @ Get unused stack location - strex r0, r1, [r1] @ Clear the exclusive monitor -#elif defined(CONFIG_CPU_32v6K) - clrex -#endif mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR /*
arch/arm/mm/abort-ev7.S +0 -6
@@ -13,12 +13,6 @@ */ .align 5 ENTRY(v7_early_abort) - /* - * The effect of data aborts on on the exclusive access monitor are - * UNPREDICTABLE. Do a CLREX to clear the state - */ - clrex - mrc p15, 0, r1, c5, c0, 0 @ get FSR mrc p15, 0, r0, c6, c0, 0 @ get FAR
arch/arm/mm/alignment.c +3 -0
@@ -40,6 +40,7 @@* This code is not portable to processors with late data abort handling. */ #define CODING_BITS (i) (i & 0x0e000000) +#define COND_BITS (i) (i & 0xf0000000)#define LDST_I_BIT (i) (i & (1 << 26))/* Immediate constant */ #define LDST_P_BIT (i) (i & (1 << 24))/* Preindex */
@@ -817,6 +818,8 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)break ;case 0x04000000 :/* ldr or str immediate */ +if (COND_BITS (instr) ==0xf0000000 )/* NEON VLDn, VSTn */ + goto bad; offset.un =OFFSET_BITS (instr); handler = do_alignment_ldrstr;break ;
arch/arm64/include/asm/hw_breakpoint.h +0 -1
@@ -79,7 +79,6 @@ static inline void decode_ctrl_reg(u32 reg,*/ #define ARM_MAX_BRP 16#define ARM_MAX_WRP 16 -#define ARM_MAX_HBP_SLOTS (ARM_MAX_BRP + ARM_MAX_WRP)/* Virtual debug register bases. */ #define AARCH64_DBG_REG_BVR 0
arch/arm64/kernel/irq.c +4 -8
@@ -97,19 +97,15 @@ static bool migrate_one_irq(struct irq_desc *desc)if (irqd_is_per_cpu (d) || !cpumask_test_cpu (smp_processor_id (), affinity))return false; -if (cpumask_any_and (affinity, cpu_online_mask) >= nr_cpu_ids) +if (cpumask_any_and (affinity, cpu_online_mask) >= nr_cpu_ids) { + affinity = cpu_online_mask; ret = true; + } -/* -* when using forced irq_set_affinity we must ensure that the cpu -* being offlined is not present in the affinity mask, it may be -* selected as the target CPU otherwise -*/ - affinity = cpu_online_mask; c =irq_data_get_irq_chip (d);if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq); -else if (c->irq_set_affinity (d, affinity, true) ==IRQ_SET_MASK_OK && ret) +else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret)cpumask_copy (d->affinity, affinity);return ret;
arch/arm64/kernel/process.c +18 -0
@@ -187,9 +187,27 @@ void exit_thread(void) { } +static void tls_thread_flush (void ) +{ + asm ("msr tpidr_el0, xzr" ); + +if (is_compat_task ()) { + current->thread.tp_value =0 ; + +/* +* We need to ensure ordering between the shadow state and the +* hardware state, so that we don't corrupt the hardware state +* with a stale shadow state during context switch. +*/ +barrier (); + asm ("msr tpidrro_el0, xzr" ); + } +} +void flush_thread (void ) {fpsimd_flush_thread (); +tls_thread_flush ();flush_ptrace_hw_breakpoint (current); }
arch/arm64/kernel/ptrace.c +2 -1
@@ -81,7 +81,8 @@ static void ptrace_hbptriggered(struct perf_event *bp,break ; } } -for (i =ARM_MAX_BRP ; i <ARM_MAX_HBP_SLOTS && !bp; ++i) { + +for (i =0 ; i <ARM_MAX_WRP ; ++i) {if (current->thread.debug.hbp_watch[i] == bp) { info.si_errno = -((i <<1 ) +1 );break ;
arch/arm64/kernel/sys_compat.c +6 -0
@@ -79,6 +79,12 @@ long compat_arm_syscall(struct pt_regs *regs)case __ARM_NR_compat_set_tls: current->thread.tp_value = regs->regs[0 ]; + +/* +* Protect against register corruption from context switch. +* See comment in tls_thread_flush. +*/ +barrier (); asm ("msr tpidrro_el0, %0" : :"r" (regs->regs[0 ]));return 0 ;
arch/arm64/kvm/handle_exit.c +2 -0
@@ -62,6 +62,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run)else kvm_vcpu_block (vcpu); +kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu)); +return 1 ; }
arch/arm64/kvm/hyp-init.S +4 -0
@@ -74,6 +74,10 @@ __do_hyp_init: msr mair_el2, x4 isb + /* Invalidate the stale TLBs from Bootloader */ + tlbi alle2 + dsb sy + mrs x4, sctlr_el2 and x4, x4, #SCTLR_EL2_EE // preserve endianness of EL2 ldr x5, =SCTLR_EL2_FLAGS
arch/mips/boot/compressed/decompress.c +1 -0
@@ -13,6 +13,7 @@#include <linux/types.h> #include <linux/kernel.h> +#include <linux/string.h> #include <asm/addrspace.h>
arch/mips/kernel/mcount.S +12 -0
@@ -123,7 +123,11 @@ NESTED(_mcount, PT_SIZE, ra) nop #endif b ftrace_stub +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#else nop +#endif static_trace: MCOUNT_SAVE_REGS
@@ -133,6 +137,9 @@ static_trace: move a1, AT /* arg2: parent's return address */ MCOUNT_RESTORE_REGS +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#endif .globl ftrace_stub ftrace_stub: RETURN_BACK
@@ -177,6 +184,11 @@ NESTED(ftrace_graph_caller, PT_SIZE, ra) jal prepare_ftrace_return nop MCOUNT_RESTORE_REGS +#ifndef CONFIG_DYNAMIC_FTRACE +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#endif +#endif RETURN_BACK END(ftrace_graph_caller)
arch/parisc/Makefile +6 -1
@@ -48,7 +48,12 @@ cflags-y := -pipe # These flags should be implied by an hppa-linux configuration, but they # are not in gcc 3.2. -cflags-y += -mno-space-regs -mfast-indirect-calls +cflags-y += -mno-space-regs + +# -mfast-indirect-calls is only relevant for 32-bit kernels. +ifndef CONFIG_64BIT +cflags-y += -mfast-indirect-calls +endif # Currently we save and restore fpregs on all kernel entry/interruption paths. # If that gets optimized, we might need to disable the use of fpregs in the
arch/parisc/kernel/syscall.S +229 -4
257 lines not on this page · raw message
arch/powerpc/include/asm/ptrace.h +7 -0
@@ -47,6 +47,12 @@ STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)#define STACK_FRAME_MARKER 12 +#if defined(_CALL_ELF) && _CALL_ELF ==2 +#define STACK_FRAME_MIN_SIZE 32 +#else +#define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD +#endif +/* Size of dummy stack frame allocated when calling signal handler. */ #define __SIGNAL_FRAMESIZE 128#define __SIGNAL_FRAMESIZE32 64
@@ -60,6 +66,7 @@#define STACK_FRAME_REGS_MARKER ASM_CONST(0x72656773)#define STACK_INT_FRAME_SIZE (sizeof(struct pt_regs) + STACK_FRAME_OVERHEAD)#define STACK_FRAME_MARKER 2 +#define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD/* Size of stack frame allocated when calling signal handler. */ #define __SIGNAL_FRAMESIZE 64
arch/powerpc/include/asm/spinlock.h +1 -0
@@ -61,6 +61,7 @@ static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)static inline int arch_spin_is_locked (arch_spinlock_t *lock) { +smp_mb ();return !arch_spin_value_unlocked (*lock); }
arch/powerpc/lib/locks.c +4 -0
@@ -70,12 +70,16 @@ void __rw_yield(arch_rwlock_t *rw)void arch_spin_unlock_wait (arch_spinlock_t *lock) { +smp_mb (); +while (lock->slock) {HMT_low ();if (SHARED_PROCESSOR )__spin_yield (lock); }HMT_medium (); + +smp_mb (); }EXPORT_SYMBOL (arch_spin_unlock_wait);
arch/powerpc/perf/callchain.c +1 -1
@@ -35,7 +35,7 @@ static int valid_next_sp(unsigned long sp, unsigned long prev_sp)return 0 ;/* must be 16-byte aligned */ if (!validate_sp (sp, current,STACK_FRAME_OVERHEAD ))return 0 ; -if (sp >= prev_sp +STACK_FRAME_OVERHEAD ) +if (sp >= prev_sp +STACK_FRAME_MIN_SIZE )return 1 ;/* * sp could decrease when we jump off an interrupt stack
arch/s390/mm/pgtable.c +10 -0
@@ -810,11 +810,21 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,pte_t *ptep;down_read (&mm->mmap_sem); +retry: ptep =get_locked_pte (current->mm, addr, &ptl);if (unlikely (!ptep)) {up_read (&mm->mmap_sem);return -EFAULT ; } +if (!(pte_val (*ptep) & _PAGE_INVALID) && + (pte_val (*ptep) & _PAGE_PROTECT)) { +pte_unmap_unlock (*ptep, ptl); +if (fixup_user_fault (current, mm, addr,FAULT_FLAG_WRITE )) { +up_read (&mm->mmap_sem); +return -EFAULT ; + } + goto retry; + } new = old =pgste_get_lock (ptep); pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |
arch/x86/boot/compressed/aslr.c +15 -0
@@ -183,12 +183,27 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,static bool mem_avoid_overlap (struct mem_vector *img) {int i; +struct setup_data *ptr;for (i =0 ; i <MEM_AVOID_MAX ; i++) {if (mem_overlaps (img, &mem_avoid[i]))return true; } +/* Avoid all entries in the setup_data linked list. */ + ptr = (struct setup_data *)(unsigned long )real_mode->hdr.setup_data; +while (ptr) { +struct mem_vector avoid; + + avoid.start = (u64 )ptr; + avoid.size =sizeof (*ptr) + ptr->len; + +if (mem_overlaps (img, &avoid)) +return true; + + ptr = (struct setup_data *)(unsigned long )ptr->next; + } +return false; }
arch/x86/include/asm/fixmap.h +3 -3
@@ -123,14 +123,14 @@ enum fixed_addresses { __end_of_permanent_fixed_addresses,/* -* 256 temporary boot-time mappings, used by early_ioremap(), +* 512 temporary boot-time mappings, used by early_ioremap(), * before ioremap() is functional. * -* If necessary we round it up to the next 256 pages boundary so +* If necessary we round it up to the next 512 pages boundary so * that we can have a single pgd entry and a single pte table: */ #define NR_FIX_BTMAPS 64 -#define FIX_BTMAPS_SLOTS 4 +#define FIX_BTMAPS_SLOTS 8#define TOTAL_FIX_BTMAPS (NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS) FIX_BTMAP_END = (__end_of_permanent_fixed_addresses ^
arch/x86/include/asm/pgtable_64.h +1 -0
@@ -19,6 +19,7 @@ extern pud_t level3_ident_pgt[512];extern pmd_t level2_kernel_pgt[512 ];extern pmd_t level2_fixmap_pgt[512 ];extern pmd_t level2_ident_pgt[512 ]; +extern pte_t level1_fixmap_pgt[512 ];extern pgd_t init_level4_pgt[];#define swapper_pg_dir init_level4_pgt
arch/x86/kernel/cpu/perf_event_intel_rapl.c +9 -3
@@ -511,6 +511,7 @@ static int rapl_cpu_prepare(int cpu)struct rapl_pmu *pmu =per_cpu (rapl_pmu, cpu);int phys_id =topology_physical_package_id (cpu);u64 ms; +u64 msr_rapl_power_unit_bits;if (pmu)return 0 ;
@@ -518,6 +519,9 @@ static int rapl_cpu_prepare(int cpu)if (phys_id <0 )return -1 ; +if (!rdmsrl_safe (MSR_RAPL_POWER_UNIT , &msr_rapl_power_unit_bits)) +return -1 ; + pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu));if (!pmu)return -1 ;
@@ -531,8 +535,7 @@ static int rapl_cpu_prepare(int cpu)* * we cache in local PMU instance */ -rdmsrl (MSR_RAPL_POWER_UNIT , pmu->hw_unit); - pmu->hw_unit = (pmu->hw_unit >>8 ) &0x1FULL ; + pmu->hw_unit = (msr_rapl_power_unit_bits >>8 ) &0x1FULL ; pmu->pmu = &rapl_pmu_class;/*
@@ -649,7 +652,9 @@ static int __init rapl_pmu_init(void)get_online_cpus ();for_each_online_cpu (cpu) { -rapl_cpu_prepare (cpu); + ret =rapl_cpu_prepare (cpu); +if (ret) + goto out;rapl_cpu_init (cpu); }
@@ -672,6 +677,7 @@ static int __init rapl_pmu_init(void)hweight32 (rapl_cntr_mask), ktime_to_ms(pmu->timer_interval)); +out:put_online_cpus ();return 0 ;
arch/x86/kernel/smpboot.c +3 -0
@@ -1287,6 +1287,9 @@ static void remove_siblinginfo(int cpu)for_each_cpu (sibling,cpu_sibling_mask (cpu))cpumask_clear_cpu (cpu,cpu_sibling_mask (sibling)); +for_each_cpu (sibling,cpu_llc_shared_mask (cpu)) +cpumask_clear_cpu (cpu,cpu_llc_shared_mask (sibling)); +cpumask_clear (cpu_llc_shared_mask (cpu));cpumask_clear (cpu_sibling_mask (cpu));cpumask_clear (cpu_core_mask (cpu)); c->phys_proc_id =0 ;
arch/x86/xen/mmu.c +12 -15
@@ -1866,12 +1866,11 @@ static void __init check_pt_base(unsigned long *pt_base, unsigned long *pt_end,* * We can construct this by grafting the Xen provided pagetable into * head_64.S's preconstructed pagetables. We copy the Xen L2's into -* level2_ident_pgt, level2_kernel_pgt and level2_fixmap_pgt. This -* means that only the kernel has a physical mapping to start with - -* but that's enough to get __va working. We need to fill in the rest -* of the physical mapping once some sort of allocator has been set -* up. -* NOTE: for PVH, the page tables are native. +* level2_ident_pgt, and level2_kernel_pgt. This means that only the +* kernel has a physical mapping to start with - but that's enough to +* get __va working. We need to fill in the rest of the physical +* mapping once some sort of allocator has been set up. NOTE: for +* PVH, the page tables are native. */ void __init xen_setup_kernel_pagetable (pgd_t *pgd,unsigned long max_pfn) {
@@ -1902,8 +1901,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)/* L3_i[0] -> level2_ident_pgt */ convert_pfn_mfn (level3_ident_pgt);/* L3_k[510] -> level2_kernel_pgt -* L3_i[511] -> level2_fixmap_pgt */ +* L3_k[511] -> level2_fixmap_pgt */ convert_pfn_mfn (level3_kernel_pgt); + +/* L3_k[511][506] -> level1_fixmap_pgt */ +convert_pfn_mfn (level2_fixmap_pgt); }/* We get [511][511] and have Xen's version of level2_kernel_pgt */ l3 =m2v (pgd[pgd_index (__START_KERNEL_map)].pgd);
@@ -1913,21 +1915,15 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) addr[1 ] = (unsigned long )l3; addr[2 ] = (unsigned long )l2;/* Graft it onto L4[272][0]. Note that we creating an aliasing problem: -* Both L4[272][0] and L4[511][511] have entries that point to the same +* Both L4[272][0] and L4[511][510] have entries that point to the same * L2 (PMD) tables. Meaning that if you modify it in __va space * it will be also modified in the __ka space! (But if you just * modify the PMD table to point to other PTE's or none, then you * are OK - which is what cleanup_highmap does) */ copy_page (level2_ident_pgt, l2); -/* Graft it onto L4[511][511] */ +/* Graft it onto L4[511][510] */ copy_page (level2_kernel_pgt, l2); -/* Get [511][510] and graft that in level2_fixmap_pgt */ - l3 =m2v (pgd[pgd_index (__START_KERNEL_map +PMD_SIZE )].pgd); - l2 =m2v (l3[pud_index (__START_KERNEL_map +PMD_SIZE )].pud); -copy_page (level2_fixmap_pgt, l2); -/* Note that we don't do anything with level1_fixmap_pgt which -* we don't need. */ if (!xen_feature (XENFEAT_auto_translated_physmap)) {/* Make pagetable pieces RO */ set_page_prot (init_level4_pgt,PAGE_KERNEL_RO );
@@ -1937,6 +1933,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)set_page_prot (level2_ident_pgt,PAGE_KERNEL_RO );set_page_prot (level2_kernel_pgt,PAGE_KERNEL_RO );set_page_prot (level2_fixmap_pgt,PAGE_KERNEL_RO ); +set_page_prot (level1_fixmap_pgt,PAGE_KERNEL_RO );/* Pin down new L4 */ pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
arch/xtensa/include/asm/pgtable.h +6 -1
@@ -67,7 +67,12 @@#define VMALLOC_START 0xC0000000#define VMALLOC_END 0xC7FEFFFF#define TLBTEMP_BASE_1 0xC7FF0000 -#define TLBTEMP_BASE_2 0xC7FF8000 +#define TLBTEMP_BASE_2 (TLBTEMP_BASE_1 + DCACHE_WAY_SIZE) +#if 2 *DCACHE_WAY_SIZE >ICACHE_WAY_SIZE +#define TLBTEMP_SIZE (2 * DCACHE_WAY_SIZE) +#else +#define TLBTEMP_SIZE ICACHE_WAY_SIZE +#endif /* * For the Xtensa architecture, the PTE layout is as follows:
arch/xtensa/include/asm/uaccess.h +5 -0
@@ -52,7 +52,12 @@*/ .macro get_fs ad, sp GET_CURRENT(\ad,\sp) +#if THREAD_CURRENT_DS >1020 + addi \ad, \ad, TASK_THREAD + l32i \ad, \ad, THREAD_CURRENT_DS - TASK_THREAD +#else l32i \ad, \ad, THREAD_CURRENT_DS +#endif .endm/*
arch/xtensa/include/uapi/asm/ioctls.h +10 -9
@@ -28,17 +28,17 @@#define TCSETSW 0x5403#define TCSETSF 0x5404 -#define TCGETA _IOR('t', 23, struct termio) -#define TCSETA _IOW('t', 24, struct termio) -#define TCSETAW _IOW('t', 25, struct termio) -#define TCSETAF _IOW('t', 28, struct termio) +#define TCGETA 0x80127417/* _IOR('t', 23, struct termio) */ +#define TCSETA 0x40127418/* _IOW('t', 24, struct termio) */ +#define TCSETAW 0x40127419/* _IOW('t', 25, struct termio) */ +#define TCSETAF 0x4012741C/* _IOW('t', 28, struct termio) */ #define TCSBRK _IO('t', 29)#define TCXONC _IO('t', 30)#define TCFLSH _IO('t', 31) -#define TIOCSWINSZ _IOW('t', 103, struct winsize) -#define TIOCGWINSZ _IOR('t', 104, struct winsize) +#define TIOCSWINSZ 0x40087467/* _IOW('t', 103, struct winsize) */ +#define TIOCGWINSZ 0x80087468/* _IOR('t', 104, struct winsize) */ #define TIOCSTART _IO('t', 110)/* start output, like ^Q */ #define TIOCSTOP _IO('t', 111)/* stop output, like ^S */ #define TIOCOUTQ _IOR('t', 115, int)/* output queue size */
@@ -88,7 +88,6 @@#define TIOCSETD _IOW('T', 35, int)#define TIOCGETD _IOR('T', 36, int)#define TCSBRKP _IOW('T', 37, int)/* Needed for POSIX tcsendbreak()*/ -#define TIOCTTYGSTRUCT _IOR('T', 38, struct tty_struct)/* For debugging only*/ #define TIOCSBRK _IO('T', 39)/* BSD compatibility */ #define TIOCCBRK _IO('T', 40)/* BSD compatibility */ #define TIOCGSID _IOR('T', 41, pid_t)/* Return the session ID of FD*/
@@ -114,8 +113,10 @@#define TIOCSERGETLSR _IOR('T', 89, unsigned int)/* Get line status reg. */ /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ # define TIOCSER_TEMT 0x01/* Transmitter physically empty */ -#define TIOCSERGETMULTI _IOR('T', 90, struct serial_multiport_struct)/* Get multiport config */ -#define TIOCSERSETMULTI _IOW('T', 91, struct serial_multiport_struct)/* Set multiport config */ +#define TIOCSERGETMULTI 0x80a8545a/* Get multiport config */ +/* _IOR('T', 90, struct serial_multiport_struct) */ +#define TIOCSERSETMULTI 0x40a8545b/* Set multiport config */ +/* _IOW('T', 91, struct serial_multiport_struct) */ #define TIOCMIWAIT _IO('T', 92)/* wait for a change on serial input line(s) */ #define TIOCGICOUNT 0x545D/* read serial port inline interrupt counts */
arch/xtensa/kernel/entry.S +14 -12
@@ -1001,9 +1001,8 @@ ENTRY(fast_syscall_xtensa) movi a7, 4 # sizeof(unsigned int) access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp - addi a6, a6, -1 # assuming SYS_XTENSA_ATOMIC_SET = 1 - _bgeui a6, SYS_XTENSA_COUNT - 1, .Lill - _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP - 1, .Lnswp + _bgeui a6, SYS_XTENSA_COUNT, .Lill + _bnei a6, SYS_XTENSA_ATOMIC_CMP_SWP, .Lnswp /* Fall through for ATOMIC_CMP_SWP. */
@@ -1015,27 +1014,26 @@ TRY s32i a5, a3, 0 # different, modify value l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 1 # and return 1 - addi a6, a6, 1 # restore a6 (really necessary?) rfe 1: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, 0 # return 0 (note that we cannot set - addi a6, a6, 1 # restore a6 (really necessary?) rfe .Lnswp: /* Atomic set, add, and exg_add. */ TRY l32i a7, a3, 0 # orig + addi a6, a6, -SYS_XTENSA_ATOMIC_SET add a0, a4, a7 # + arg moveqz a0, a4, a6 # set + addi a6, a6, SYS_XTENSA_ATOMIC_SET TRY s32i a0, a3, 0 # write new value mov a0, a2 mov a2, a7 l32i a7, a0, PT_AREG7 # restore a7 l32i a0, a0, PT_AREG0 # restore a0 - addi a6, a6, 1 # restore a6 (really necessary?) rfe CATCH
@@ -1044,7 +1042,7 @@ CATCH movi a2, -EFAULT rfe -.Lill: l32i a7, a2, PT_AREG0 # restore a7 +.Lill: l32i a7, a2, PT_AREG7 # restore a7 l32i a0, a2, PT_AREG0 # restore a0 movi a2, -EINVAL rfe
@@ -1565,7 +1563,7 @@ ENTRY(fast_second_level_miss) rsr a0, excvaddr bltu a0, a3, 2f - addi a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT)) + addi a1, a0, -TLBTEMP_SIZE bgeu a1, a3, 2f /* Check if we have to restore an ITLB mapping. */
@@ -1820,7 +1818,6 @@ ENTRY(_switch_to) entry a1, 16 - mov a10, a2 # preserve 'prev' (a2) mov a11, a3 # and 'next' (a3) l32i a4, a2, TASK_THREAD_INFO
@@ -1828,8 +1825,14 @@ ENTRY(_switch_to) save_xtregs_user a4 a6 a8 a9 a12 a13 THREAD_XTREGS_USER - s32i a0, a10, THREAD_RA # save return address - s32i a1, a10, THREAD_SP # save stack pointer +#if THREAD_RA > 1020 || THREAD_SP > 1020 + addi a10, a2, TASK_THREAD + s32i a0, a10, THREAD_RA - TASK_THREAD # save return address + s32i a1, a10, THREAD_SP - TASK_THREAD # save stack pointer +#else + s32i a0, a2, THREAD_RA # save return address + s32i a1, a2, THREAD_SP # save stack pointer +#endif /* Disable ints while we manipulate the stack pointer. */
@@ -1870,7 +1873,6 @@ ENTRY(_switch_to) load_xtregs_user a5 a6 a8 a9 a12 a13 THREAD_XTREGS_USER wsr a14, ps - mov a2, a10 # return 'prev' rsync retw
arch/xtensa/kernel/pci-dma.c +6 -6
@@ -49,9 +49,8 @@ dma_alloc_coherent(struct device *dev,size_t size,dma_addr_t *handle,gfp_t flag)/* We currently don't support coherent memory outside KSEG */ -if (ret <XCHAL_KSEG_CACHED_VADDR - || ret >=XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (ret <XCHAL_KSEG_CACHED_VADDR || + ret >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );if (ret !=0 ) {
@@ -68,10 +67,11 @@ EXPORT_SYMBOL(dma_alloc_coherent);void dma_free_coherent (struct device *hwdev,size_t size,void *vaddr,dma_addr_t dma_handle) { -long addr=(long )vaddr+XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; +unsigned long addr = (unsigned long )vaddr + +XCHAL_KSEG_CACHED_VADDR -XCHAL_KSEG_BYPASS_VADDR ; -if (addr <0 || addr >=XCHAL_KSEG_SIZE ) -BUG (); +BUG_ON (addr <XCHAL_KSEG_CACHED_VADDR || + addr >XCHAL_KSEG_CACHED_VADDR +XCHAL_KSEG_SIZE -1 );free_pages (addr,get_order (size)); }
block/cfq-iosched.c +8 -3
@@ -1275,12 +1275,16 @@ __cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg)static void cfq_update_group_weight (struct cfq_group *cfqg) { -BUG_ON (!RB_EMPTY_NODE (&cfqg->rb_node)); -if (cfqg->new_weight) { cfqg->weight = cfqg->new_weight; cfqg->new_weight =0 ; } +} + +static void +cfq_update_group_leaf_weight (struct cfq_group *cfqg) +{ +BUG_ON (!RB_EMPTY_NODE (&cfqg->rb_node));if (cfqg->new_leaf_weight) { cfqg->leaf_weight = cfqg->new_leaf_weight;
@@ -1299,7 +1303,7 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg)/* add to the service tree */ BUG_ON (!RB_EMPTY_NODE (&cfqg->rb_node)); -cfq_update_group_weight (cfqg); +cfq_update_group_leaf_weight (cfqg);__cfq_group_service_tree_add (st, cfqg);/*
@@ -1323,6 +1327,7 @@ cfq_group_service_tree_add(struct cfq_rb_root *st, struct cfq_group *cfqg)*/ while ((parent =cfqg_parent (pos))) {if (propagate) { +cfq_update_group_weight (pos); propagate = !parent->nr_active++; parent->children_weight += pos->weight; }
block/genhd.c +14 -12
@@ -28,10 +28,10 @@ struct kobject *block_depr;/* for extended dynamic devt allocation, currently only one major is used */ #define NR_EXT_DEVT (1 << MINORBITS) -/* For extended devt allocation. ext_devt_mutex prevents look up +/* For extended devt allocation. ext_devt_lock prevents look up * results from going away underneath its user. */ -static DEFINE_MUTEX (ext_devt_mutex); +static DEFINE_SPINLOCK (ext_devt_lock);static DEFINE_IDR (ext_devt_idr);static struct device_type disk_type;
@@ -420,9 +420,13 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt) }/* allocate ext devt */ -mutex_lock (&ext_devt_mutex); - idx =idr_alloc (&ext_devt_idr, part,0 ,NR_EXT_DEVT ,GFP_KERNEL ); -mutex_unlock (&ext_devt_mutex); +idr_preload (GFP_KERNEL ); + +spin_lock (&ext_devt_lock); + idx =idr_alloc (&ext_devt_idr, part,0 ,NR_EXT_DEVT ,GFP_NOWAIT ); +spin_unlock (&ext_devt_lock); + +idr_preload_end ();if (idx <0 )return idx == -ENOSPC ? -EBUSY : idx;
@@ -441,15 +445,13 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt)*/ void blk_free_devt (dev_t devt) { -might_sleep (); -if (devt ==MKDEV (0 ,0 ))return ;if (MAJOR (devt) ==BLOCK_EXT_MAJOR ) { -mutex_lock (&ext_devt_mutex); +spin_lock (&ext_devt_lock);idr_remove (&ext_devt_idr,blk_mangle_minor (MINOR (devt))); -mutex_unlock (&ext_devt_mutex); +spin_unlock (&ext_devt_lock); } }
@@ -665,7 +667,6 @@ void del_gendisk(struct gendisk *disk)sysfs_remove_link (block_depr,dev_name (disk_to_dev (disk)));pm_runtime_set_memalloc_noio (disk_to_dev (disk), false);device_del (disk_to_dev (disk)); -blk_free_devt (disk_to_dev (disk)->devt); }EXPORT_SYMBOL (del_gendisk);
@@ -690,13 +691,13 @@ struct gendisk *get_gendisk(dev_t devt, int *partno) }else {struct hd_struct *part; -mutex_lock (&ext_devt_mutex); +spin_lock (&ext_devt_lock); part =idr_find (&ext_devt_idr,blk_mangle_minor (MINOR (devt)));if (part &&get_disk (part_to_disk (part))) { *partno = part->partno; disk =part_to_disk (part); } -mutex_unlock (&ext_devt_mutex); +spin_unlock (&ext_devt_lock); }return disk;
@@ -1098,6 +1099,7 @@ static void disk_release(struct device *dev) {struct gendisk *disk =dev_to_disk (dev); +blk_free_devt (dev->devt);disk_release_events (disk);kfree (disk->random);disk_replace_part_tbl (disk,NULL );
block/partition-generic.c +1 -1
@@ -211,6 +211,7 @@ static const struct attribute_group *part_attr_groups[] = {static void part_release (struct device *dev) {struct hd_struct *p =dev_to_part (dev); +blk_free_devt (dev->devt);free_part_stats (p);free_part_info (p);kfree (p);
@@ -253,7 +254,6 @@ void delete_partition(struct gendisk *disk, int partno)rcu_assign_pointer (ptbl->last_lookup,NULL );kobject_put (part->holder_dir);device_del (part_to_dev (part)); -blk_free_devt (part_devt (part));hd_struct_put (part); }
block/partitions/aix.c +1 -1
@@ -253,7 +253,7 @@ int aix_partition(struct parsed_partitions *state)continue ; } lv_ix =be16_to_cpu (p->lv_ix) -1 ; -if (lv_ix > state->limit) { +if (lv_ix >= state->limit) { cur_lv_ix =-1 ;continue ; }
drivers/acpi/acpi_cmos_rtc.c +1 -1
@@ -35,7 +35,7 @@ acpi_cmos_rtc_space_handler(u32 function, acpi_physical_address address, void *handler_context, void *region_context) { int i; -u8 *value = (u8 *)&value64; +u8 *value = (u8 *)value64;if (address >0xff || !value64)return AE_BAD_PARAMETER ;
drivers/acpi/acpica/aclocal.h +1 -0
@@ -254,6 +254,7 @@ struct acpi_create_field_info {u32 field_bit_position;u32 field_bit_length;u16 resource_length; +u16 pin_number_index;u8 field_flags;u8 attribute;u8 field_type;
drivers/acpi/acpica/acobject.h +1 -0
@@ -263,6 +263,7 @@ struct acpi_object_region_field { ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO u16 resource_length;union acpi_operand_object *region_obj;/* Containing op_region object */ u8 *resource_buffer;/* resource_template for serial regions/fields */ +u16 pin_number_index;/* Index relative to previous Connection/Template */ };struct acpi_object_bank_field {
drivers/acpi/acpica/dsfield.c +2 -0
@@ -360,6 +360,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info,*/ info->resource_buffer =NULL ; info->connection_node =NULL ; + info->pin_number_index =0 ;/* * A Connection() is either an actual resource descriptor (buffer)
@@ -437,6 +438,7 @@ acpi_ds_get_field_names(struct acpi_create_field_info *info, } info->field_bit_position += info->field_bit_length; + info->pin_number_index++;/* Index relative to previous Connection() */ break ;default :
drivers/acpi/acpica/evregion.c +31 -16
77 lines not on this page · raw message
drivers/acpi/acpica/exfield.c +67 -0
79 lines not on this page · raw message
drivers/acpi/acpica/exprep.c +2 -0
@@ -484,6 +484,8 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) obj_desc->field.resource_length = info->resource_length; } + obj_desc->field.pin_number_index = info->pin_number_index; +/* Allow full data read from EC address space */ if ((obj_desc->field.region_obj->region.space_id ==
drivers/acpi/container.c +8 -0
@@ -96,6 +96,13 @@ static void container_device_detach(struct acpi_device *adev)device_unregister (dev); } +static void container_device_online (struct acpi_device *adev) +{ +struct device *dev =acpi_driver_data (adev); + +kobject_uevent (&dev->kobj,KOBJ_ONLINE ); +} +static struct acpi_scan_handler container_handler = { .ids = container_device_ids, .attach = container_device_attach,
@@ -103,6 +110,7 @@ static struct acpi_scan_handler container_handler = { .hotplug = { .enabled = true, .demand_offline = true, + .notify_online = container_device_online, }, };
drivers/acpi/scan.c +4 -1
@@ -106,7 +106,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,list_for_each_entry (id, &acpi_dev->pnp.ids, list) { count =snprintf (&modalias[len], size,"%s:" , id->id);if (count <0 ) -return EINVAL ; +return -EINVAL ;if (count >= size)return -ENOMEM ; len += count;
@@ -2068,6 +2068,9 @@ static void acpi_bus_attach(struct acpi_device *device) ok:list_for_each_entry (child, &device->children, node)acpi_bus_attach (child); + +if (device->handler && device->handler->hotplug.notify_online) + device->handler->hotplug.notify_online (device); }/**
drivers/ata/ahci.c +10 -0
@@ -306,6 +306,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(INTEL, 0x9c85), board_ahci }, /* Wildcat Point-LP RAID */ { PCI_VDEVICE(INTEL, 0x9c87), board_ahci }, /* Wildcat Point-LP RAID */ { PCI_VDEVICE(INTEL, 0x9c8f), board_ahci }, /* Wildcat Point-LP RAID */ + { PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */ + { PCI_VDEVICE(INTEL, 0x8c83), board_ahci }, /* 9 Series AHCI */ + { PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c85), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c87), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */ + { PCI_VDEVICE(INTEL, 0x8c8f), board_ahci }, /* 9 Series RAID *//* JMicron 360/1/3/5/6, match class to avoid IDE function */ { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -443,6 +451,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a), .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9172), + .driver_data = board_ahci_yes_fbs }, /* 88se9182 */ + { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9182), .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192), .driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
drivers/ata/ata_piix.c +8 -0
@@ -340,6 +340,14 @@ static const struct pci_device_id piix_pci_tbl[] = { { 0x8086, 0x0F21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_byt },/* SATA Controller IDE (Coleto Creek) */ { 0x8086, 0x23a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, +/* SATA Controller IDE (9 Series) */ + { 0x8086, 0x8c88, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb }, +/* SATA Controller IDE (9 Series) */ + { 0x8086, 0x8c89, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata_snb }, +/* SATA Controller IDE (9 Series) */ + { 0x8086, 0x8c80, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, +/* SATA Controller IDE (9 Series) */ + { 0x8086, 0x8c81, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_snb }, { } /* terminate list */ };
drivers/ata/libata-core.c +1 -1
@@ -4227,7 +4227,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "Micron_M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Crucial_CT???M500SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, { "Micron_M550*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, - { "Crucial_CT???M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, }, + { "Crucial_CT*M550SSD*", NULL, ATA_HORKAGE_NO_NCQ_TRIM, },/* * Some WD SATA-I drives spin up and down erratically when the link
drivers/ata/pata_scc.c +7 -8
@@ -586,7 +586,7 @@ static int scc_wait_after_reset(struct ata_link *link, unsigned int devmask,* Note: Original code is ata_bus_softreset(). */ -static unsigned int scc_bus_softreset (struct ata_port *ap,unsigned int devmask, +static int scc_bus_softreset (struct ata_port *ap,unsigned int devmask,unsigned long deadline) {struct ata_ioports *ioaddr = &ap->ioaddr;
@@ -600,9 +600,7 @@ static unsigned int scc_bus_softreset(struct ata_port *ap, unsigned int devmask,udelay (20 );out_be32 (ioaddr->ctl_addr, ap->ctl); -scc_wait_after_reset (&ap->link, devmask, deadline); - -return 0 ; +return scc_wait_after_reset (&ap->link, devmask, deadline); }/**
@@ -619,7 +617,8 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes, {struct ata_port *ap = link->ap;unsigned int slave_possible = ap->flags &ATA_FLAG_SLAVE_POSS ; -unsigned int devmask =0 , err_mask; +unsigned int devmask =0 ; +int rc;u8 err;DPRINTK ("ENTER\n" );
@@ -635,9 +634,9 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes,/* issue bus reset */ DPRINTK ("about to softreset, devmask=%x\n" , devmask); - err_mask =scc_bus_softreset (ap, devmask, deadline); -if (err_mask) { -ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , err_mask); + rc =scc_bus_softreset (ap, devmask, deadline); +if (rc) { +ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , rc);return -EIO ; }
drivers/base/regmap/regcache.c +1 -1
@@ -701,7 +701,7 @@ int regcache_sync_block(struct regmap *map, void *block, unsigned int block_base, unsigned int start, unsigned int end) { - if (regmap_can_raw_write(map)) + if (regmap_can_raw_write(map) && !map->use_single_rw) return regcache_sync_block_raw(map, block, cache_present, block_base, start, end); else
drivers/base/regmap/regmap.c +1 -1
@@ -105,7 +105,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)bool regmap_volatile (struct regmap *map,unsigned int reg) { -if (!regmap_readable (map, reg)) +if (!map->format.format_write && !regmap_readable (map, reg))return false;if (map->volatile_reg)
drivers/clk/clk.c +6 -1
@@ -1487,6 +1487,7 @@ static struct clk *clk_propagate_rate_change(struct clk *clk, unsigned long evenstatic void clk_change_rate (struct clk *clk) {struct clk *child; +struct hlist_node *tmp;unsigned long old_rate;unsigned long best_parent_rate =0 ;bool skip_set_rate = false;
@@ -1525,7 +1526,11 @@ static void clk_change_rate(struct clk *clk)if (clk->notifier_count && old_rate != clk->rate)__clk_notify (clk,POST_RATE_CHANGE , old_rate, clk->rate); -hlist_for_each_entry (child, &clk->children, child_node) { +/* +* Use safe iteration, as change_rate can actually swap parents +* for certain clock types. +*/ +hlist_for_each_entry_safe (child, tmp, &clk->children, child_node) {/* Skip children who will be reparented to another clock */ if (child->new_parent && child->new_parent != clk)continue ;
drivers/clk/qcom/mmcc-msm8960.c +43 -41
133 lines not on this page · raw message
drivers/cpufreq/cpufreq.c +2 -0
@@ -1225,6 +1225,8 @@ err_get_freq:per_cpu (cpufreq_cpu_data, j) =NULL ;write_unlock_irqrestore (&cpufreq_driver_lock, flags); +up_write (&policy->rwsem); +if (cpufreq_driver->exit) cpufreq_driver->exit (policy); err_set_policy_cpu:
drivers/dma/TODO +0 -1
@@ -7,7 +7,6 @@ TODO for slave dma - imx-dma - imx-sdma - mxs-dma.c - - dw_dmac - intel_mid_dma 4. Check other subsystems for dma drivers and merge/move to dmaengine 5. Remove dma_slave_config's dma direction.
drivers/dma/dw/core.c +18 -20
@@ -279,6 +279,15 @@ static void dwc_dostart(struct dw_dma_chan *dwc, struct dw_desc *first)channel_set_bit (dw,CH_EN , dwc->mask); } +static void dwc_dostart_first_queued (struct dw_dma_chan *dwc) +{ +if (list_empty (&dwc->queue)) +return ; + +list_move (dwc->queue.next, &dwc->active_list); +dwc_dostart (dwc,dwc_first_active (dwc)); +} +/*----------------------------------------------------------------------*/ static void
@@ -335,10 +344,7 @@ static void dwc_complete_all(struct dw_dma *dw, struct dw_dma_chan *dwc)* the completed ones. */ list_splice_init (&dwc->active_list, &list); -if (!list_empty (&dwc->queue)) { -list_move (dwc->queue.next, &dwc->active_list); -dwc_dostart (dwc,dwc_first_active (dwc)); - } +dwc_dostart_first_queued (dwc);spin_unlock_irqrestore (&dwc->lock, flags);
@@ -467,10 +473,7 @@ static void dwc_scan_descriptors(struct dw_dma *dw, struct dw_dma_chan *dwc)/* Try to continue after resetting the channel... */ dwc_chan_disable (dw, dwc); -if (!list_empty (&dwc->queue)) { -list_move (dwc->queue.next, &dwc->active_list); -dwc_dostart (dwc,dwc_first_active (dwc)); - } +dwc_dostart_first_queued (dwc);spin_unlock_irqrestore (&dwc->lock, flags); }
@@ -677,17 +680,9 @@ static dma_cookie_t dwc_tx_submit(struct dma_async_tx_descriptor *tx)* possible, perhaps even appending to those already submitted * for DMA. But this is hard to do in a race-free manner. */ -if (list_empty (&dwc->active_list)) { -dev_vdbg (chan2dev (tx->chan),"%s: started %u\n" , __func__, - desc->txd.cookie); -list_add_tail (&desc->desc_node, &dwc->active_list); -dwc_dostart (dwc,dwc_first_active (dwc)); - }else { -dev_vdbg (chan2dev (tx->chan),"%s: queued %u\n" , __func__, - desc->txd.cookie); -list_add_tail (&desc->desc_node, &dwc->queue); - } +dev_vdbg (chan2dev (tx->chan),"%s: queued %u\n" , __func__, desc->txd.cookie); +list_add_tail (&desc->desc_node, &dwc->queue);spin_unlock_irqrestore (&dwc->lock, flags);
@@ -1092,9 +1087,12 @@ dwc_tx_status(struct dma_chan *chan,static void dwc_issue_pending (struct dma_chan *chan) {struct dw_dma_chan *dwc =to_dw_dma_chan (chan); +unsigned long flags; -if (!list_empty (&dwc->queue)) -dwc_scan_descriptors (to_dw_dma (chan->device), dwc); +spin_lock_irqsave (&dwc->lock, flags); +if (list_empty (&dwc->active_list)) +dwc_dostart_first_queued (dwc); +spin_unlock_irqrestore (&dwc->lock, flags); }static int dwc_alloc_chan_resources (struct dma_chan *chan)
drivers/gpu/drm/ast/ast_main.c +1 -1
@@ -100,7 +100,7 @@ static int ast_detect_chip(struct drm_device *dev) } ast->vga2_clone = false; }else { - ast->chip =2000 ; + ast->chip =AST2000 ;DRM_INFO ("AST 2000 detected\n" ); } }
drivers/gpu/drm/i915/i915_gem.c +7 -4
@@ -1426,10 +1426,13 @@ unlock: out:switch (ret) {case -EIO : -/* If this -EIO is due to a gpu hang, give the reset code a -* chance to clean up the mess. Otherwise return the proper -* SIGBUS. */ -if (i915_terminally_wedged (&dev_priv->gpu_error)) { +/* +* We eat errors when the gpu is terminally wedged to avoid +* userspace unduly crashing (gl has no provisions for mmaps to +* fail). But any other -EIO isn't ours (e.g. swap in failure) +* and so needs to be reported. +*/ +if (!i915_terminally_wedged (&dev_priv->gpu_error)) { ret =VM_FAULT_SIGBUS ;break ; }
drivers/gpu/drm/i915/intel_bios.c +1 -1
@@ -839,7 +839,7 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) } } -static int __init intel_no_opregion_vbt_callback (const struct dmi_system_id *id) +static int intel_no_opregion_vbt_callback (const struct dmi_system_id *id) { DRM_DEBUG_KMS("Falling back to manually reading VBT from " "VBIOS ROM for %s\n",
drivers/gpu/drm/i915/intel_crt.c +1 -1
@@ -750,7 +750,7 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { .destroy = intel_encoder_destroy, }; -static int __init intel_no_crt_dmi_callback (const struct dmi_system_id *id) +static int intel_no_crt_dmi_callback (const struct dmi_system_id *id) {DRM_INFO ("Skipping CRT initialization for %s\n" , id->ident);return 1 ;
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -544,7 +544,7 @@ static const struct drm_encoder_funcs intel_lvds_enc_funcs = { .destroy = intel_encoder_destroy, }; -static int __init intel_no_lvds_dmi_callback (const struct dmi_system_id *id) +static int intel_no_lvds_dmi_callback (const struct dmi_system_id *id) {DRM_INFO ("Skipping LVDS initialization for %s\n" , id->ident);return 1 ;
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -0
@@ -475,6 +475,9 @@ static int init_ring_common(struct intel_ring_buffer *ring) } } +/* Enforce ordering by reading HEAD register back */ +I915_READ_HEAD (ring); +/* Initialize the ring. This must happen _after_ we've cleared the ring * registers with the above sequence (the readback of the HEAD registers * also enforces ordering), otherwise the hw might lose the new ring
drivers/gpu/drm/i915/intel_tv.c +4 -0
@@ -854,6 +854,10 @@ intel_enable_tv(struct intel_encoder *encoder)struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; +/* Prevents vblank waits from timing out in intel_tv_detect_type() */ +intel_wait_for_vblank (encoder->base.dev, +to_intel_crtc (encoder->base.crtc)->pipe); +I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) |TV_ENC_ENABLE ); }
drivers/gpu/drm/nouveau/nouveau_vga.c +9 -0
@@ -100,7 +100,16 @@ void nouveau_vga_fini(struct nouveau_drm *drm) {struct drm_device *dev = drm->dev; +bool runtime = false; + +if (nouveau_runtime_pm ==1 ) + runtime = true; +if ((nouveau_runtime_pm ==-1 ) && (nouveau_is_optimus () ||nouveau_is_v1_dsm ())) + runtime = true; +vga_switcheroo_unregister_client (dev->pdev); +if (runtime &&nouveau_is_v1_dsm () && !nouveau_is_optimus ()) +vga_switcheroo_fini_domain_pm_ops (drm->dev->dev);vga_client_register (dev->pdev,NULL ,NULL ,NULL ); }
drivers/gpu/drm/radeon/ci_dpm.c +15 -1
@@ -851,6 +851,9 @@ static int ci_set_thermal_temperature_range(struct radeon_device *rdev,WREG32_SMC (CG_THERMAL_CTRL , tmp);#endif + rdev->pm.dpm.thermal.min_temp = low_temp; + rdev->pm.dpm.thermal.max_temp = high_temp; +return 0 ; }
@@ -922,7 +925,18 @@ static void ci_get_leakage_voltages(struct radeon_device *rdev) pi->vddc_leakage.count =0 ; pi->vddci_leakage.count =0 ; -if (radeon_atom_get_leakage_id_from_vbios (rdev, &leakage_id) ==0 ) { +if (rdev->pm.dpm.platform_caps &ATOM_PP_PLATFORM_CAP_EVV ) { +for (i =0 ; i <CISLANDS_MAX_LEAKAGE_COUNT ; i++) { + virtual_voltage_id =ATOM_VIRTUAL_VOLTAGE_ID0 + i; +if (radeon_atom_get_voltage_evv (rdev, virtual_voltage_id, &vddc) !=0 ) +continue ; +if (vddc !=0 && vddc != virtual_voltage_id) { + pi->vddc_leakage.actual_voltage[pi->vddc_leakage.count] = vddc; + pi->vddc_leakage.leakage_id[pi->vddc_leakage.count] = virtual_voltage_id; + pi->vddc_leakage.count++; + } + } + }else if (radeon_atom_get_leakage_id_from_vbios (rdev, &leakage_id) ==0 ) {for (i =0 ; i <CISLANDS_MAX_LEAKAGE_COUNT ; i++) { virtual_voltage_id =ATOM_VIRTUAL_VOLTAGE_ID0 + i; if (radeon_atom_get_leakage_vddc_based_on_leakage_params(rdev, &vddc, &vddci,
drivers/gpu/drm/radeon/cik.c +5 -4
@@ -4392,7 +4392,7 @@ struct bonaire_mqd*/ static int cik_cp_compute_resume (struct radeon_device *rdev) { -int r, i, idx; +int r, i, j, idx;u32 tmp;bool use_doorbell = true;u64 hqd_gpu_addr;
@@ -4511,7 +4511,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) mqd->queue_state.cp_hqd_pq_wptr=0 ;if (RREG32 (CP_HQD_ACTIVE ) &1 ) {WREG32 (CP_HQD_DEQUEUE_REQUEST ,1 ); -for (i =0 ; i < rdev->usec_timeout; i++) { +for (j =0 ; j < rdev->usec_timeout; j++) {if (!(RREG32 (CP_HQD_ACTIVE ) &1 ))break ;udelay (1 );
@@ -5545,12 +5545,13 @@ static void cik_vm_decode_fault(struct radeon_device *rdev,void cik_vm_flush (struct radeon_device *rdev,int ridx,struct radeon_vm *vm) {struct radeon_ring *ring = &rdev->ring[ridx]; +int usepfp = (ridx ==RADEON_RING_TYPE_GFX_INDEX );if (vm ==NULL )return ;radeon_ring_write (ring,PACKET3 (PACKET3_WRITE_DATA ,3 )); -radeon_ring_write (ring, (WRITE_DATA_ENGINE_SEL (0 ) | +radeon_ring_write (ring, (WRITE_DATA_ENGINE_SEL (usepfp) |WRITE_DATA_DST_SEL (0 )));if (vm->id <8 ) { radeon_ring_write(ring,
@@ -5600,7 +5601,7 @@ void cik_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)radeon_ring_write (ring,1 << vm->id);/* compute doesn't have PFP */ -if (ridx ==RADEON_RING_TYPE_GFX_INDEX ) { +if (usepfp) {/* sync PFP to ME, otherwise we might get invalid PFP reads */ radeon_ring_write (ring,PACKET3 (PACKET3_PFP_SYNC_ME ,0 ));radeon_ring_write (ring,0x0 );
drivers/gpu/drm/radeon/cik_sdma.c +0 -7
@@ -461,13 +461,6 @@ int cik_sdma_resume(struct radeon_device *rdev) {int r; -/* Reset dma */ -WREG32 (SRBM_SOFT_RESET ,SOFT_RESET_SDMA |SOFT_RESET_SDMA1 ); -RREG32 (SRBM_SOFT_RESET ); -udelay (50 ); -WREG32 (SRBM_SOFT_RESET ,0 ); -RREG32 (SRBM_SOFT_RESET ); - r =cik_sdma_load_microcode (rdev);if (r)return r;
drivers/gpu/drm/radeon/ni_dma.c +0 -6
@@ -191,12 +191,6 @@ int cayman_dma_resume(struct radeon_device *rdev)u32 reg_offset, wb_offset;int i, r; -/* Reset dma */ -WREG32 (SRBM_SOFT_RESET ,SOFT_RESET_DMA |SOFT_RESET_DMA1 ); -RREG32 (SRBM_SOFT_RESET ); -udelay (50 ); -WREG32 (SRBM_SOFT_RESET ,0 ); -for (i =0 ; i <2 ; i++) {if (i ==0 ) { ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX ];
drivers/gpu/drm/radeon/r600_dma.c +0 -9
@@ -124,15 +124,6 @@ int r600_dma_resume(struct radeon_device *rdev)u32 rb_bufsz;int r; -/* Reset dma */ -if (rdev->family >=CHIP_RV770 ) -WREG32 (SRBM_SOFT_RESET ,RV770_SOFT_RESET_DMA ); -else -WREG32 (SRBM_SOFT_RESET ,SOFT_RESET_DMA ); -RREG32 (SRBM_SOFT_RESET ); -udelay (50 ); -WREG32 (SRBM_SOFT_RESET ,0 ); -WREG32 (DMA_SEM_INCOMPLETE_TIMER_CNTL ,0 );WREG32 (DMA_SEM_WAIT_FAIL_TIMER_CNTL ,0 );
drivers/gpu/drm/radeon/radeon.h +3 -0
@@ -294,6 +294,9 @@ int radeon_atom_get_leakage_vddc_based_on_leakage_params(struct radeon_device *r u16 *vddc, u16 *vddci, u16 virtual_voltage_id, u16 vbios_voltage_id); +int radeon_atom_get_voltage_evv (struct radeon_device *rdev, +u16 virtual_voltage_id, +u16 *voltage); int radeon_atom_round_to_true_voltage(struct radeon_device *rdev, u8 voltage_type, u16 nominal_voltage,
drivers/gpu/drm/radeon/radeon_atombios.c +63 -9
108 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_device.c +25 -4
@@ -1314,7 +1314,7 @@ int radeon_device_init(struct radeon_device *rdev, r =radeon_init (rdev);if (r) -return r; + goto failed; r =radeon_ib_ring_tests (rdev);if (r)
@@ -1334,7 +1334,7 @@ int radeon_device_init(struct radeon_device *rdev,radeon_agp_disable (rdev); r =radeon_init (rdev);if (r) -return r; + goto failed; }if ((radeon_testing &1 )) {
@@ -1356,6 +1356,11 @@ int radeon_device_init(struct radeon_device *rdev,DRM_INFO ("radeon: acceleration disabled, skipping benchmarks\n" ); }return 0 ; + +failed: +if (runtime) +vga_switcheroo_fini_domain_pm_ops (rdev->dev); +return r; }static void radeon_debugfs_remove_files (struct radeon_device *rdev);
@@ -1376,6 +1381,8 @@ void radeon_device_fini(struct radeon_device *rdev)radeon_bo_evict_vram (rdev);radeon_fini (rdev);vga_switcheroo_unregister_client (rdev->pdev); +if (rdev->flags &RADEON_IS_PX ) +vga_switcheroo_fini_domain_pm_ops (rdev->dev);vga_client_register (rdev->pdev,NULL ,NULL ,NULL );if (rdev->rio_mem)pci_iounmap (rdev->pdev, rdev->rio_mem);
@@ -1600,7 +1607,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)radeon_save_bios_scratch_regs (rdev);/* block TTM */ resched =ttm_bo_lock_delayed_workqueue (&rdev->mman.bdev); -radeon_pm_suspend (rdev);radeon_suspend (rdev);for (i =0 ; i <RADEON_NUM_RINGS ; ++i) {
@@ -1646,9 +1652,24 @@ retry: } } -radeon_pm_resume (rdev); +if ((rdev->pm.pm_method ==PM_METHOD_DPM ) && rdev->pm.dpm_enabled) { +/* do dpm late init */ + r =radeon_pm_late_init (rdev); +if (r) { + rdev->pm.dpm_enabled = false; +DRM_ERROR ("radeon_pm_late_init failed, disabling dpm\n" ); + } + }else { +/* resume old pm late */ +radeon_pm_resume (rdev); + } +drm_helper_resume_force_mode (rdev->ddev); +/* set the power state here in case we are a PX system or headless */ +if ((rdev->pm.pm_method ==PM_METHOD_DPM ) && rdev->pm.dpm_enabled) +radeon_pm_compute_clocks (rdev); +ttm_bo_unlock_delayed_workqueue (&rdev->mman.bdev, resched);if (r) {/* bad news, how to tell it to userspace ? */
drivers/gpu/drm/radeon/radeon_kms.c +8 -1
@@ -254,7 +254,14 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file }break ;case RADEON_INFO_ACCEL_WORKING2 : - *value = rdev->accel_working; +if (rdev->family ==CHIP_HAWAII ) { +if (rdev->accel_working) + *value =2 ; +else + *value =0 ; + }else { + *value = rdev->accel_working; + }break ;case RADEON_INFO_TILING_CONFIG :if (rdev->family >=CHIP_BONAIRE )
drivers/gpu/drm/radeon/radeon_pm.c +10 -14
@@ -458,10 +458,6 @@ static ssize_t radeon_get_dpm_state(struct device *dev,struct radeon_device *rdev = ddev->dev_private;enum radeon_pm_state_type pm = rdev->pm.dpm.user_state; -if ((rdev->flags &RADEON_IS_PX ) && - (ddev->switch_power_state !=DRM_SWITCH_POWER_ON )) -return snprintf (buf,PAGE_SIZE ,"off\n" ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , (pm ==POWER_STATE_TYPE_BATTERY ) ?"battery" : (pm ==POWER_STATE_TYPE_BALANCED ) ?"balanced" :"performance" );
@@ -475,11 +471,6 @@ static ssize_t radeon_set_dpm_state(struct device *dev,struct drm_device *ddev =dev_get_drvdata (dev);struct radeon_device *rdev = ddev->dev_private; -/* Can't set dpm state when the card is off */ -if ((rdev->flags &RADEON_IS_PX ) && - (ddev->switch_power_state !=DRM_SWITCH_POWER_ON )) -return -EINVAL ; -mutex_lock (&rdev->pm.mutex);if (strncmp ("battery" , buf,strlen ("battery" )) ==0 ) rdev->pm.dpm.user_state =POWER_STATE_TYPE_BATTERY ;
@@ -493,7 +484,12 @@ static ssize_t radeon_set_dpm_state(struct device *dev, goto fail; }mutex_unlock (&rdev->pm.mutex); -radeon_pm_compute_clocks (rdev); + +/* Can't set dpm state when the card is off */ +if (!(rdev->flags &RADEON_IS_PX ) || + (ddev->switch_power_state ==DRM_SWITCH_POWER_ON )) +radeon_pm_compute_clocks (rdev); + fail:return count; }
@@ -1276,10 +1272,6 @@ int radeon_pm_init(struct radeon_device *rdev)case CHIP_RS780 :case CHIP_RS880 :case CHIP_RV770 : -case CHIP_BARTS : -case CHIP_TURKS : -case CHIP_CAICOS : -case CHIP_CAYMAN :/* DPM requires the RLC, RV770+ dGPU requires SMC */ if (!rdev->rlc_fw) rdev->pm.pm_method =PM_METHOD_PROFILE ;
@@ -1303,6 +1295,10 @@ int radeon_pm_init(struct radeon_device *rdev)case CHIP_PALM :case CHIP_SUMO :case CHIP_SUMO2 : +case CHIP_BARTS : +case CHIP_TURKS : +case CHIP_CAICOS : +case CHIP_CAYMAN :case CHIP_ARUBA :case CHIP_TAHITI :case CHIP_PITCAIRN :
drivers/gpu/drm/radeon/radeon_semaphore.c +1 -1
@@ -34,7 +34,7 @@int radeon_semaphore_create (struct radeon_device *rdev,struct radeon_semaphore **semaphore) { -uint32_t *cpu_addr; +uint64_t *cpu_addr;int i, r; *semaphore =kmalloc (sizeof (struct radeon_semaphore ),GFP_KERNEL );
drivers/gpu/drm/radeon/si.c +1 -1
@@ -4810,7 +4810,7 @@ void si_vm_flush(struct radeon_device *rdev, int ridx, struct radeon_vm *vm)/* write new base address */ radeon_ring_write (ring,PACKET3 (PACKET3_WRITE_DATA ,3 )); -radeon_ring_write (ring, (WRITE_DATA_ENGINE_SEL (0 ) | +radeon_ring_write (ring, (WRITE_DATA_ENGINE_SEL (1 ) |WRITE_DATA_DST_SEL (0 )));if (vm->id <8 ) {
drivers/gpu/drm/radeon/trinity_dpm.c +10 -1
@@ -1877,7 +1877,16 @@ int trinity_dpm_init(struct radeon_device *rdev)for (i =0 ; i <SUMO_MAX_HARDWARE_POWERLEVELS ; i++) pi->at[i] =TRINITY_AT_DFLT ; - pi->enable_bapm = false; +/* There are stability issues reported on with +* bapm enabled when switching between AC and battery +* power. At the same time, some MSI boards hang +* if it's not enabled and dpm is enabled. Just enable +* it for MSI boards right now. +*/ +if (rdev->pdev->subsystem_vendor ==0x1462 ) + pi->enable_bapm = true; +else + pi->enable_bapm = false; pi->enable_nbps_policy = true; pi->enable_sclk_ds = true; pi->enable_gfx_power_gating = true;
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -3
@@ -122,6 +122,7 @@ static int tilcdc_unload(struct drm_device *dev)struct tilcdc_drm_private *priv = dev->dev_private;struct tilcdc_module *mod, *cur; +drm_fbdev_cma_fini (priv->fbdev);drm_kms_helper_poll_fini (dev);drm_mode_config_cleanup (dev);drm_vblank_cleanup (dev);
@@ -628,10 +629,10 @@ static int __init tilcdc_drm_init(void) static void __exit tilcdc_drm_fini(void) {DBG ("fini" ); -tilcdc_tfp410_fini (); -tilcdc_slave_fini (); -tilcdc_panel_fini ();platform_driver_unregister (&tilcdc_platform_driver); +tilcdc_panel_fini (); +tilcdc_slave_fini (); +tilcdc_tfp410_fini (); }late_initcall (tilcdc_drm_init);
drivers/gpu/drm/tilcdc/tilcdc_panel.c +2 -3
@@ -151,6 +151,7 @@ struct panel_connector {static void panel_connector_destroy (struct drm_connector *connector) {struct panel_connector *panel_connector =to_panel_connector (connector); +drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (panel_connector); }
@@ -285,10 +286,8 @@ static void panel_destroy(struct tilcdc_module *mod) {struct panel_module *panel_mod =to_panel_module (mod); -if (panel_mod->timings) { +if (panel_mod->timings)display_timings_release (panel_mod->timings); -kfree (panel_mod->timings); - }tilcdc_module_cleanup (mod);kfree (panel_mod->info);
drivers/gpu/drm/tilcdc/tilcdc_slave.c +1 -0
@@ -166,6 +166,7 @@ struct slave_connector {static void slave_connector_destroy (struct drm_connector *connector) {struct slave_connector *slave_connector =to_slave_connector (connector); +drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (slave_connector); }
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +1 -0
@@ -167,6 +167,7 @@ struct tfp410_connector {static void tfp410_connector_destroy (struct drm_connector *connector) {struct tfp410_connector *tfp410_connector =to_tfp410_connector (connector); +drm_sysfs_connector_remove (connector);drm_connector_cleanup (connector);kfree (tfp410_connector); }
drivers/gpu/drm/ttm/ttm_page_alloc.c +17 -12
@@ -297,8 +297,10 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,* * @pool: to free the pages from * @free_all: If set to true will free all pages in pool +* @gfp: GFP flags. **/ -static int ttm_page_pool_free (struct ttm_page_pool *pool,unsigned nr_free) +static int ttm_page_pool_free (struct ttm_page_pool *pool,unsigned nr_free, +gfp_t gfp) {unsigned long irq_flags;struct page *p;
@@ -309,8 +311,7 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free)if (NUM_PAGES_TO_ALLOC < nr_free) npages_to_free =NUM_PAGES_TO_ALLOC ; - pages_to_free =kmalloc (npages_to_free *sizeof (struct page *), -GFP_KERNEL ); + pages_to_free =kmalloc (npages_to_free *sizeof (struct page *), gfp);if (!pages_to_free) {pr_err ("Failed to allocate memory for pool free operation\n" );return 0 ;
@@ -382,32 +383,35 @@ out:* * XXX: (dchinner) Deadlock warning! * -* ttm_page_pool_free() does memory allocation using GFP_KERNEL. that means -* this can deadlock when called a sc->gfp_mask that is not equal to -* GFP_KERNEL. +* We need to pass sc->gfp_mask to ttm_page_pool_free(). * * This code is crying out for a shrinker per pool.... */ static unsigned long ttm_pool_shrink_scan (struct shrinker *shrink,struct shrink_control *sc) { -static atomic_t start_pool =ATOMIC_INIT (0 ); +static DEFINE_MUTEX (lock); +static unsigned start_pool;unsigned i; -unsigned pool_offset =atomic_add_return (1 , &start_pool); +unsigned pool_offset;struct ttm_page_pool *pool;int shrink_pages = sc->nr_to_scan;unsigned long freed =0 ; - pool_offset = pool_offset %NUM_POOLS ; +if (!mutex_trylock (&lock)) +return SHRINK_STOP ; + pool_offset = ++start_pool %NUM_POOLS ;/* select start pool in round robin fashion */ for (i =0 ; i <NUM_POOLS ; ++i) {unsigned nr_free = shrink_pages;if (shrink_pages ==0 )break ; pool = &_manager->pools[(i + pool_offset)%NUM_POOLS ]; - shrink_pages =ttm_page_pool_free (pool, nr_free); + shrink_pages =ttm_page_pool_free (pool, nr_free, + sc->gfp_mask); freed += nr_free - shrink_pages; } +mutex_unlock (&lock);return freed; }
@@ -706,7 +710,7 @@ static void ttm_put_pages(struct page **pages, unsigned npages, int flags, }spin_unlock_irqrestore (&pool->lock, irq_flags);if (npages) -ttm_page_pool_free (pool, npages); +ttm_page_pool_free (pool, npages,GFP_KERNEL ); }/*
@@ -846,7 +850,8 @@ void ttm_page_alloc_fini(void)ttm_pool_mm_shrink_fini (_manager);for (i =0 ; i <NUM_POOLS ; ++i) -ttm_page_pool_free (&_manager->pools[i],FREE_ALL_PAGES ); +ttm_page_pool_free (&_manager->pools[i],FREE_ALL_PAGES , +GFP_KERNEL );kobject_put (&_manager->kobj); _manager =NULL ;
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +19 -15
@@ -411,8 +411,10 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)* * @pool: to free the pages from * @nr_free: If set to true will free all pages in pool +* @gfp: GFP flags. **/ -static unsigned ttm_dma_page_pool_free (struct dma_pool *pool,unsigned nr_free) +static unsigned ttm_dma_page_pool_free (struct dma_pool *pool,unsigned nr_free, +gfp_t gfp) {unsigned long irq_flags;struct dma_page *dma_p, *tmp;
@@ -430,8 +432,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free) npages_to_free, nr_free); }#endif - pages_to_free =kmalloc (npages_to_free *sizeof (struct page *), -GFP_KERNEL ); + pages_to_free =kmalloc (npages_to_free *sizeof (struct page *), gfp);if (!pages_to_free) { pr_err("%s: Failed to allocate memory for pool free operation\n",
@@ -530,7 +531,7 @@ static void ttm_dma_free_pool(struct device *dev, enum pool_type type)if (pool->type != type)continue ;/* Takes a spinlock.. */ -ttm_dma_page_pool_free (pool,FREE_ALL_PAGES ); +ttm_dma_page_pool_free (pool,FREE_ALL_PAGES ,GFP_KERNEL );WARN_ON (((pool->npages_in_use + pool->npages_free) !=0 ));/* This code path is called after _all_ references to the * struct device has been dropped - so nobody should be
@@ -983,7 +984,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)/* shrink pool if necessary (only on !is_cached pools)*/ if (npages) -ttm_dma_page_pool_free (pool, npages); +ttm_dma_page_pool_free (pool, npages,GFP_KERNEL ); ttm->state = tt_unpopulated; }EXPORT_SYMBOL_GPL (ttm_dma_unpopulate);
@@ -993,10 +994,7 @@ EXPORT_SYMBOL_GPL(ttm_dma_unpopulate);* * XXX: (dchinner) Deadlock warning! * -* ttm_dma_page_pool_free() does GFP_KERNEL memory allocation, and so attention -* needs to be paid to sc->gfp_mask to determine if this can be done or not. -* GFP_KERNEL memory allocation in a GFP_ATOMIC reclaim context woul dbe really -* bad. +* We need to pass sc->gfp_mask to ttm_dma_page_pool_free(). * * I'm getting sadder as I hear more pathetical whimpers about needing per-pool * shrinkers
@@ -1004,9 +1002,9 @@ EXPORT_SYMBOL_GPL(ttm_dma_unpopulate);static unsigned long ttm_dma_pool_shrink_scan (struct shrinker *shrink,struct shrink_control *sc) { -static atomic_t start_pool =ATOMIC_INIT (0 ); +static unsigned start_pool;unsigned idx =0 ; -unsigned pool_offset =atomic_add_return (1 , &start_pool); +unsigned pool_offset;unsigned shrink_pages = sc->nr_to_scan;struct device_pools *p;unsigned long freed =0 ;
@@ -1014,8 +1012,11 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)if (list_empty (&_manager->pools))return SHRINK_STOP ; -mutex_lock (&_manager->lock); - pool_offset = pool_offset % _manager->npools; +if (!mutex_trylock (&_manager->lock)) +return SHRINK_STOP ; +if (!_manager->npools) + goto out; + pool_offset = ++start_pool % _manager->npools;list_for_each_entry (p, &_manager->pools, pools) {unsigned nr_free;
@@ -1027,13 +1028,15 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)if (++idx < pool_offset)continue ; nr_free = shrink_pages; - shrink_pages =ttm_dma_page_pool_free (p->pool, nr_free); + shrink_pages =ttm_dma_page_pool_free (p->pool, nr_free, + sc->gfp_mask); freed += nr_free - shrink_pages;pr_debug ("%s: (%s:%d) Asked to shrink %d, have %d more to go\n" , p->pool->dev_name, p->pool->name, current->pid, nr_free, shrink_pages); } +out:mutex_unlock (&_manager->lock);return freed; }
@@ -1044,7 +1047,8 @@ ttm_dma_pool_shrink_count(struct shrinker *shrink, struct shrink_control *sc)struct device_pools *p;unsigned long count =0 ; -mutex_lock (&_manager->lock); +if (!mutex_trylock (&_manager->lock)) +return 0 ;list_for_each_entry (p, &_manager->pools, pools) count += p->pool->npages_free;mutex_unlock (&_manager->lock);
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +2 -1
@@ -180,8 +180,9 @@ void vmw_fifo_release(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)mutex_lock (&dev_priv->hw_mutex); +vmw_write (dev_priv,SVGA_REG_SYNC ,SVGA_SYNC_GENERIC );while (vmw_read (dev_priv,SVGA_REG_BUSY ) !=0 ) -vmw_write (dev_priv,SVGA_REG_SYNC ,SVGA_SYNC_GENERIC ); + ; dev_priv->last_read_seqno =ioread32 (fifo_mem +SVGA_FIFO_FENCE );
drivers/gpu/vga/vga_switcheroo.c +6 -0
@@ -660,6 +660,12 @@ int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain * }EXPORT_SYMBOL (vga_switcheroo_init_domain_pm_ops); +void vga_switcheroo_fini_domain_pm_ops (struct device *dev) +{ + dev->pm_domain =NULL ; +} +EXPORT_SYMBOL (vga_switcheroo_fini_domain_pm_ops); +static int vga_switcheroo_runtime_resume_hdmi_audio (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
drivers/hid/hid-logitech-dj.c +25 -18
66 lines not on this page · raw message
drivers/hid/hid-logitech-dj.h +1 -0
@@ -27,6 +27,7 @@#define DJ_MAX_PAIRED_DEVICES 6#define DJ_MAX_NUMBER_NOTIFICATIONS 8 +#define DJ_RECEIVER_INDEX 0#define DJ_DEVICE_INDEX_MIN 1#define DJ_DEVICE_INDEX_MAX 6
drivers/hid/hid-magicmouse.c +10 -0
@@ -290,6 +290,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <4 || ((size -4 ) %9 ) !=0 )return 0 ; npoints = (size -4 ) /9 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for TRACKPAD_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *9 +4 );
@@ -307,6 +312,11 @@ static int magicmouse_raw_event(struct hid_device *hdev,if (size <6 || ((size -6 ) %8 ) !=0 )return 0 ; npoints = (size -6 ) /8 ; +if (npoints >15 ) { +hid_warn (hdev,"invalid size value (%d) for MOUSE_REPORT_ID\n" , + size); +return 0 ; + } msc->ntouches =0 ;for (ii =0 ; ii < npoints; ii++)magicmouse_emit_touch (msc, ii, data + ii *8 +6 );
drivers/hid/hid-picolcd_core.c +6 -0
@@ -350,6 +350,12 @@ static int picolcd_raw_event(struct hid_device *hdev,if (!data)return 1 ; +if (size >64 ) { +hid_warn (hdev,"invalid size value (%d) for picolcd raw event\n" , + size); +return 0 ; + } +if (report->id ==REPORT_KEY_STATE ) {if (data->input_keys) ret =picolcd_raw_keypad (data, report, raw_data+1 , size-1 );
drivers/hwmon/ds1621.c +1 -0
@@ -309,6 +309,7 @@ static ssize_t set_convrate(struct device *dev, struct device_attribute *da, data->conf |= (resol <<DS1621_REG_CONFIG_RESOL_SHIFT );i2c_smbus_write_byte_data (client,DS1621_REG_CONF , data->conf); data->update_interval = ds1721_convrates[resol]; + data->zbits =7 - resol;mutex_unlock (&data->update_lock);return count;
drivers/i2c/busses/i2c-at91.c +26 -6
@@ -101,6 +101,7 @@ struct at91_twi_dev {unsigned twi_cwgr_reg;struct at91_twi_pdata *pdata;bool use_dma; +bool recv_len_abort;struct at91_twi_dma dma; };
@@ -267,12 +268,24 @@ static void at91_twi_read_next_byte(struct at91_twi_dev *dev) *dev->buf =at91_twi_read (dev,AT91_TWI_RHR ) &0xff ; --dev->buf_len; +/* return if aborting, we only needed to read RHR to clear RXRDY*/ +if (dev->recv_len_abort) +return ; +/* handle I2C_SMBUS_BLOCK_DATA */ if (unlikely (dev->msg->flags &I2C_M_RECV_LEN )) { - dev->msg->flags &= ~I2C_M_RECV_LEN ; - dev->buf_len += *dev->buf; - dev->msg->len = dev->buf_len +1 ; -dev_dbg (dev->dev,"received block length %d\n" , dev->buf_len); +/* ensure length byte is a valid value */ +if (*dev->buf <=I2C_SMBUS_BLOCK_MAX && *dev->buf >0 ) { + dev->msg->flags &= ~I2C_M_RECV_LEN ; + dev->buf_len += *dev->buf; + dev->msg->len = dev->buf_len +1 ; +dev_dbg (dev->dev,"received block length %d\n" , + dev->buf_len); + }else { +/* abort and send the stop by reading one more byte */ + dev->recv_len_abort = true; + dev->buf_len =1 ; + } }/* send stop if second but last byte has been read */
@@ -421,8 +434,8 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) } } - ret =wait_for_completion_interruptible_timeout (&dev->cmd_complete, - dev->adapter.timeout); + ret =wait_for_completion_io_timeout (&dev->cmd_complete, + dev->adapter.timeout);if (ret ==0 ) {dev_err (dev->dev,"controller timed out\n" );at91_init_twi_bus (dev);
@@ -444,6 +457,12 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) ret = -EIO ; goto error; } +if (dev->recv_len_abort) { +dev_err (dev->dev,"invalid smbus block length recvd\n" ); + ret = -EPROTO ; + goto error; + } +dev_dbg (dev->dev,"transfer complete\n" );return 0 ;
@@ -500,6 +519,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) dev->buf_len = m_start->len; dev->buf = m_start->buf; dev->msg = m_start; + dev->recv_len_abort = false; ret =at91_do_twi_transfer (dev);
drivers/i2c/busses/i2c-ismt.c +2 -2
@@ -497,7 +497,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, desc->wr_len_cmd = dma_size; desc->control |=ISMT_DESC_BLK ; priv->dma_buffer[0 ] = command; -memcpy (&priv->dma_buffer[1 ], &data->block[1 ], dma_size); +memcpy (&priv->dma_buffer[1 ], &data->block[1 ], dma_size -1 ); }else {/* Block Read */ dev_dbg (dev,"I2C_SMBUS_BLOCK_DATA: READ\n" );
@@ -525,7 +525,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, desc->wr_len_cmd = dma_size; desc->control |=ISMT_DESC_I2C ; priv->dma_buffer[0 ] = command; -memcpy (&priv->dma_buffer[1 ], &data->block[1 ], dma_size); +memcpy (&priv->dma_buffer[1 ], &data->block[1 ], dma_size -1 ); }else {/* i2c Block Read */ dev_dbg (dev,"I2C_SMBUS_I2C_BLOCK_DATA: READ\n" );
drivers/i2c/busses/i2c-mv64xxx.c +1 -2
@@ -748,8 +748,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data, } tclk =clk_get_rate (drv_data->clk); - rc =of_property_read_u32 (np,"clock-frequency" , &bus_freq); -if (rc) +if (of_property_read_u32 (np,"clock-frequency" , &bus_freq)) bus_freq =100000 ;/* 100kHz by default */ if (!mv64xxx_find_baud_factors(bus_freq, tclk,
drivers/iio/accel/bma180.c +1 -1
@@ -571,7 +571,7 @@ static int bma180_probe(struct i2c_client *client, trig->ops = &bma180_trigger_ops;iio_trigger_set_drvdata (trig, indio_dev); data->trig = trig; - indio_dev->trig = trig; + indio_dev->trig =iio_trigger_get (trig); ret =iio_trigger_register (trig);if (ret)
drivers/iio/adc/ad_sigma_delta.c +1 -1
@@ -472,7 +472,7 @@ static int ad_sd_probe_trigger(struct iio_dev *indio_dev) goto error_free_irq;/* select default trigger */ - indio_dev->trig = sigma_delta->trig; + indio_dev->trig =iio_trigger_get (sigma_delta->trig);return 0 ;
drivers/iio/common/hid-sensors/hid-sensor-trigger.c +2 -1
@@ -99,7 +99,8 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,dev_err (&indio_dev->dev,"Trigger Register Failed\n" ); goto error_free_trig; } - indio_dev->trig = attrb->trigger = trig; + attrb->trigger = trig; + indio_dev->trig =iio_trigger_get (trig);return ret;
drivers/iio/common/st_sensors/st_sensors_trigger.c +1 -1
@@ -49,7 +49,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,dev_err (&indio_dev->dev,"failed to register iio trigger.\n" ); goto iio_trigger_register_error; } - indio_dev->trig = sdata->trig; + indio_dev->trig =iio_trigger_get (sdata->trig);return 0 ;
drivers/iio/gyro/itg3200_buffer.c +1 -1
@@ -132,7 +132,7 @@ int itg3200_probe_trigger(struct iio_dev *indio_dev) goto error_free_irq;/* select default trigger */ - indio_dev->trig = st->trig; + indio_dev->trig =iio_trigger_get (st->trig);return 0 ;
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c +1 -1
@@ -135,7 +135,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev) ret =iio_trigger_register (st->trig);if (ret) goto error_free_irq; - indio_dev->trig = st->trig; + indio_dev->trig =iio_trigger_get (st->trig);return 0 ;
drivers/iio/inkern.c +1 -1
@@ -178,7 +178,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np, index =of_property_match_string (np,"io-channel-names" , name); chan =of_iio_channel_get (np, index); -if (!IS_ERR (chan)) +if (!IS_ERR (chan) ||PTR_ERR (chan) == -EPROBE_DEFER )break ;else if (name && index >=0 ) { pr_err("ERROR: could not get IIO channel %s:%s(%i)\n",
drivers/iio/magnetometer/st_magn_core.c +30 -22
76 lines not on this page · raw message
drivers/infiniband/core/uverbs_marshall.c +4 -0
@@ -140,5 +140,9 @@ void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst, dst->packet_life_time = src->packet_life_time; dst->preference = src->preference; dst->packet_life_time_selector = src->packet_life_time_selector; + +memset (dst->smac,0 ,sizeof (dst->smac)); +memset (dst->dmac,0 ,sizeof (dst->dmac)); + dst->vlan_id =0xffff ; }EXPORT_SYMBOL (ib_copy_path_rec_from_user);
drivers/infiniband/hw/mlx4/main.c +30 -23
45 lines not on this page · raw message
drivers/infiniband/hw/qib/qib_debugfs.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/isert/ib_isert.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/input/mouse/synaptics.c +52 -16
68 lines not on this page · raw message
drivers/input/serio/serport.c +38 -7
45 lines not on this page · raw message
drivers/net/wireless/ath/carl9170/carl9170.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/carl9170/usb.c +27 -4
Lines of this file are not shown. View the raw message.
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +9 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/brcm80211/brcmfmac/fweh.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/dvm/rxon.c +12 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-config.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +1 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/iwlwifi/mvm/fw-api.h +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/phy/phy-twl4030-usb.c +73 -48
121 lines not on this page · raw message
drivers/staging/iio/meter/ade7758_trigger.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_parameters.c +1 -1
Lines of this file are not shown. View the raw message.
fs/aio.c +86 -5
91 lines not on this page · raw message
kernel/power/suspend.c +33 -33
66 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.