Linux 4.5.1
Greg KH
maintainerI'm announcing the release of the 4.5.1 kernel.
All users of the 4.5 kernel series must upgrade.
The updated 4.5.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.5.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/cgroup-v2.txt | 6 MAINTAINERS | 96 ++-- Makefile | 2 arch/arc/boot/dts/axs10x_mb.dtsi | 8 arch/arc/include/asm/bitops.h | 15 arch/arc/include/asm/io.h | 18 arch/arm/boot/dts/at91-sama5d3_xplained.dts | 1 arch/arm/boot/dts/at91-sama5d4_xplained.dts | 1 arch/arm64/include/asm/pgtable.h | 3 arch/ia64/include/asm/io.h | 1 arch/s390/include/asm/pci.h | 2 arch/s390/kernel/entry.S | 106 ---- arch/s390/kernel/setup.c | 1 arch/s390/pci/pci.c | 5 arch/sh/mm/kmap.c | 2 arch/um/drivers/mconsole_kern.c | 2 arch/x86/Kconfig | 27 - arch/x86/entry/common.c | 23 - arch/x86/include/asm/apic.h | 2 arch/x86/include/asm/hw_irq.h | 1 arch/x86/include/asm/microcode.h | 26 + arch/x86/include/asm/perf_event.h | 1 arch/x86/include/asm/xen/hypervisor.h | 2 arch/x86/kernel/apic/vector.c | 88 +++ arch/x86/kernel/cpu/microcode/intel.c | 38 - arch/x86/kernel/cpu/perf_event.c | 13 arch/x86/kernel/cpu/perf_event.h | 3 arch/x86/kernel/cpu/perf_event_intel.c | 27 + arch/x86/kernel/cpu/perf_event_intel_ds.c | 24 - arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 8 arch/x86/kernel/cpu/perf_event_knc.c | 4 arch/x86/kernel/ioport.c | 12 arch/x86/kernel/process_64.c | 12 arch/x86/kvm/i8254.c | 12 arch/x86/kvm/vmx.c | 16 arch/x86/kvm/x86.c | 1 arch/x86/mm/tlb.c | 12 arch/x86/pci/fixup.c | 7 arch/x86/xen/enlighten.c | 2 arch/xtensa/kernel/head.S | 2 arch/xtensa/mm/cache.c | 8 arch/xtensa/platforms/iss/console.c | 10 block/blk-core.c | 2 crypto/asymmetric_keys/x509_cert_parser.c | 8 crypto/keywrap.c | 4 drivers/acpi/resource.c | 14 drivers/acpi/sleep.c | 1 drivers/block/brd.c | 2 drivers/block/mtip32xx/mtip32xx.c | 267 +++++++++--- drivers/block/mtip32xx/mtip32xx.h | 11 drivers/bluetooth/ath3k.c | 8 drivers/bluetooth/btusb.c | 4 drivers/char/tpm/tpm-chip.c | 14 drivers/char/tpm/tpm_crb.c | 4 drivers/char/tpm/tpm_eventlog.c | 14 drivers/clk/bcm/clk-bcm2835.c | 12 drivers/clk/rockchip/clk-rk3188.c | 1 drivers/clk/rockchip/clk-rk3368.c | 48 +- drivers/crypto/atmel-aes.c | 4 drivers/crypto/atmel-sha.c | 4 drivers/crypto/atmel-tdes.c | 4 drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 36 + drivers/crypto/ccp/ccp-crypto-sha.c | 40 + drivers/crypto/ccp/ccp-crypto.h | 22 drivers/crypto/marvell/cesa.c | 2 drivers/crypto/ux500/cryp/cryp_core.c | 4 drivers/crypto/ux500/hash/hash_core.c | 4 drivers/edac/amd64_edac.c | 2 drivers/edac/sb_edac.c | 26 - drivers/firmware/broadcom/bcm47xx_nvram.c | 5 drivers/gpio/gpio-pca953x.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 8 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 5 drivers/gpu/drm/radeon/atombios_encoders.c | 6 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 8 drivers/gpu/drm/radeon/radeon_device.c | 8 drivers/gpu/drm/radeon/radeon_display.c | 6 drivers/gpu/drm/radeon/radeon_dp_mst.c | 12 drivers/gpu/drm/radeon/radeon_fb.c | 19 drivers/gpu/drm/vc4/vc4_bo.c | 7 drivers/hid/hid-core.c | 8 drivers/hid/hid-multitouch.c | 5 drivers/hid/i2c-hid/i2c-hid.c | 16 drivers/idle/intel_idle.c | 108 +++- drivers/infiniband/ulp/isert/ib_isert.c | 122 ++--- drivers/infiniband/ulp/isert/ib_isert.h | 2 drivers/infiniband/ulp/srpt/ib_srpt.c | 59 -- drivers/input/misc/ati_remote2.c | 36 + drivers/input/misc/ims-pcu.c | 4 drivers/input/misc/powermate.c | 3 drivers/input/mouse/synaptics.c | 5 drivers/md/bcache/super.c | 46 +- drivers/md/dm-cache-metadata.c | 98 ++-- drivers/md/dm-cache-metadata.h | 4 drivers/md/dm-cache-target.c | 12 drivers/md/dm-snap.c | 9 drivers/md/dm-table.c | 36 + drivers/md/dm-thin-metadata.c | 5 drivers/md/dm.c | 15 drivers/md/multipath.c | 4 drivers/md/raid1.c | 7 drivers/md/raid10.c | 7 drivers/md/raid5.c | 51 +- drivers/md/raid5.h | 4 drivers/media/i2c/adv7511.c | 21 drivers/media/pci/bt8xx/bttv-driver.c | 26 - drivers/media/pci/saa7134/saa7134-video.c | 18 drivers/media/platform/coda/coda-bit.c | 2 drivers/media/usb/pwc/pwc-if.c | 6 drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 drivers/misc/mei/bus.c | 9 drivers/mmc/card/block.c | 24 - drivers/mmc/host/atmel-mci.c | 2 drivers/mmc/host/mmc_spi.c | 6 drivers/mmc/host/sdhci-pxav3.c | 6 drivers/mmc/host/sdhci-tegra.c | 14 drivers/mmc/host/sdhci.c | 142 +++--- drivers/mtd/onenand/onenand_base.c | 3 drivers/net/ethernet/marvell/mvneta.c | 2 drivers/net/irda/irtty-sir.c | 10 drivers/net/rionet.c | 4 drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 38 - drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h | 20 drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 11 drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 2 drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 drivers/nvdimm/bus.c | 8 drivers/nvdimm/pmem.c | 11 drivers/of/of_reserved_mem.c | 4 drivers/pci/probe.c | 14 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 drivers/platform/x86/ideapad-laptop.c | 14 drivers/scsi/NCR5380.c | 133 ++--- drivers/scsi/aacraid/aacraid.h | 2 drivers/scsi/aacraid/commsup.c | 37 + drivers/scsi/aacraid/linit.c | 12 drivers/scsi/aacraid/src.c | 30 - drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 drivers/scsi/atari_NCR5380.c | 133 ++--- drivers/scsi/be2iscsi/be_main.c | 1 drivers/scsi/scsi_common.c | 12 drivers/scsi/sd.c | 2 drivers/scsi/sg.c | 3 drivers/scsi/storvsc_drv.c | 5 drivers/staging/android/ion/ion_test.c | 4 drivers/staging/comedi/drivers/ni_mio_common.c | 12 drivers/staging/comedi/drivers/ni_tiocmd.c | 2 drivers/target/target_core_transport.c | 2 drivers/thermal/thermal_core.c | 13 drivers/tty/serial/8250/8250_port.c | 18 drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/driver.c | 6 drivers/usb/core/hub.c | 16 drivers/usb/misc/iowarrior.c | 6 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/cypress_m8.c | 11 drivers/usb/serial/digi_acceleport.c | 19 drivers/usb/serial/ftdi_sio.c | 4 drivers/usb/serial/ftdi_sio_ids.h | 8 drivers/usb/serial/mct_u232.c | 9 drivers/usb/serial/option.c | 2 drivers/usb/storage/uas.c | 2 drivers/watchdog/rc32434_wdt.c | 2 fs/coredump.c | 30 + fs/fhandle.c | 2 fs/fs-writeback.c | 37 + fs/fuse/cuse.c | 4 fs/fuse/file.c | 33 + fs/fuse/fuse_i.h | 9 fs/jbd2/journal.c | 17 fs/nfsd/nfs4proc.c | 1 fs/nfsd/nfs4xdr.c | 13 fs/ocfs2/cluster/heartbeat.c | 4 fs/ocfs2/dlm/dlmconvert.c | 24 + fs/ocfs2/dlm/dlmrecovery.c | 1 fs/open.c | 6 fs/proc_namespace.c | 2 fs/quota/dquot.c | 3 fs/splice.c | 3 fs/xfs/xfs_attr_list.c | 19 include/asm-generic/bitops/lock.h | 14 include/linux/cgroup-defs.h | 3 include/linux/device-mapper.h | 2 include/linux/fs.h | 2 include/linux/kernel.h | 6 include/linux/pci.h | 1 include/linux/thermal.h | 2 include/linux/tty.h | 2 include/sound/hdaudio.h | 2 kernel/cgroup.c | 20 kernel/events/core.c | 7 kernel/power/hibernate.c | 1 kernel/sched/core.c | 1 kernel/sched/cputime.c | 14 kernel/sched/fair.c | 12 kernel/sched/sched.h | 13 kernel/sysctl_binary.c | 2 kernel/trace/trace.c | 5 kernel/trace/trace_irqsoff.c | 8 kernel/trace/trace_printk.c | 3 kernel/watchdog.c | 9 mm/memcontrol.c | 44 + mm/page_alloc.c | 46 +- net/bluetooth/mgmt.c | 4 scripts/coccinelle/iterators/use_after_iter.cocci | 2 scripts/gdb/linux/modules.py | 5 scripts/gdb/linux/symbols.py | 2 scripts/kconfig/Makefile | 4 scripts/package/mkspec | 8 sound/core/pcm_lib.c | 2 sound/hda/hdac_device.c | 16 sound/hda/hdac_regmap.c | 69 ++- sound/pci/hda/patch_cirrus.c | 8 sound/pci/hda/patch_conexant.c | 7 sound/pci/hda/patch_hdmi.c | 43 + sound/pci/hda/patch_realtek.c | 1 sound/pci/intel8x0.c | 1 sound/usb/clock.c | 2 sound/usb/endpoint.c | 3 sound/usb/mixer_quirks.c | 4 sound/usb/pcm.c | 2 sound/usb/quirks.c | 27 - sound/usb/stream.c | 6 tools/hv/Makefile | 2 tools/perf/util/parse-events.c | 6 tools/perf/util/pmu.c | 15 tools/perf/util/setup.py | 4 virt/kvm/kvm_main.c | 21 230 files changed, 2358 insertions(+), 1265 deletions(-)
Aaro Koskinen (2):
drivers/firmware/broadcom/bcm47xx_nvram.c: fix incorrect __ioread32_copy
mtd: onenand: fix deadlock in onenand_block_markbad
Aaron Plattner (1):
ALSA: hda - Add new GPU codec ID 0x10de0082 to snd-hda
Adrian Hunter (1):
mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout
Alan (1):
aic7xxx: Fix queue depth handling
Alex Deucher (3):
drm/radeon: disable runtime pm on PX laptops without dGPU power control drm/radeon: rework fbdev handling on chips with no connectors drm/amdgpu: disable runtime pm on PX laptops without dGPU power control
Alexander Kochetkov (1):
clk: rockchip: add hclk_cpubus to the list of rk3188 critical clocks
Alexander Shishkin (1):
perf/core: Fix perf_sched_count derailment
Alexander Usyskin (1):
mei: bus: check if the device is enabled before data transfer
Alexey Brodkin (1):
ARC: [plat-axs10x] add Ethernet PHY description in .dts
Andi Kleen (2):
perf tools: Dont stop PMU parsing on alias parse error perf/x86/intel: Fix PEBS data source interpretation on Nehalem/Westmere
Andy Lutomirski (3):
x86/entry/compat: Keep TS_COMPAT set during signal delivery x86/iopl/64: Properly context-switch IOPL on Xen PV x86/iopl: Fix iopl capability check on Xen PV
Anthony Wong (1):
rt2x00: add new rt2800usb device Buffalo WLI-UC-G450
Asai Thambi SP (9):
mtip32xx: Avoid issuing standby immediate cmd during FTL rebuild
mtip32xx: Fix broken service thread handling
mtip32xx: Remove unwanted code from taskfile error handler
mtip32xx: Print exact time when an internal command is interrupted
mtip32xx: Fix for rmmod crash when drive is in FTL rebuild
mtip32xx: Handle safe removal during IO
mtip32xx: Handle FTL rebuild failure state during device initialization
mtip32xx: Implement timeout handler
mtip32xx: Cleanup queued requests after surprise removal
Aurelien Jacquiot (1):
rapidio/rionet: fix deadlock on SMP
Bart Van Assche (2):
brd: Fix discard request processing
IB/srpt: Simplify srpt_handle_tsk_mgmt()
Benjamin Tissoires (3):
HID: multitouch: force retrieving of Win8 signature blob
HID: fix hid_ignore_special_drivers module parameter
Input: synaptics - handle spurious release of trackstick buttons, again
Bjorn Helgaas (2):
PCI: Disable IO/MEM decoding for devices with non-compliant BARs x86/PCI: Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs
Bjørn Mork (1):
USB: option: add "D-Link DWM-221 B1" device id
Boris BREZILLON (1):
crypto: marvell/cesa - forward devm_ioremap_resource() error code
Borislav Petkov (2):
x86/microcode/intel: Make early loader look for builtin microcode too x86/microcode: Untangle from BLK_DEV_INITRD
Brent Taylor (1):
mmc: atmel-mci: Check pdata for NULL before dereferencing it at DMA config
Bryn M. Reeves (1):
dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request()
Byungchul Park (1):
sched/fair: Avoid using decay_load_missed() with a negative value
Catalin Marinas (1):
arm64: Update PTE_RDONLY in set_pte_at() for PROT_NONE permission
Chris Friesen (1):
sched/cputime: Fix steal_account_process_tick() to always return jiffies
Dan Carpenter (3):
EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr()
crypto: keywrap - memzero the correct memory
drm/vc4: Return -EFAULT on copy_from_user() failure
Dan Williams (1):
libnvdimm, pmem: fix kmap_atomic() leak in error path
Dave Airlie (1):
drm/radeon/mst: fix regression in lane/link handling.
Dave Jones (1):
x86/apic: Fix suspicious RCU usage in smp_trace_call_function_interrupt()
David Hildenbrand (1):
sched/preempt, sh: kmap_coherent relies on disabled preemption
David Howells (1):
X.509: Fix leap year handling again
DingXiang (1):
dm snapshot: disallow the COW and origin devices from being identical
Dmitri Epshtein (1):
net: mvneta: enable change MAC address when interface is up
Dmitry Torokhov (1):
HID: i2c-hid: fix OOB write in i2c_hid_set_or_send_report()
Dmitry Tunin (4):
Bluetooth: btusb: Add new AR3012 ID 13d3:3395
Bluetooth: btusb: Add a new AR3012 ID 04ca:3014
Bluetooth: btusb: Add a new AR3012 ID 13d3:3472
Bluetooth: Add new AR3012 ID 0489:e095Dmitry V. Levin (1):
vfs: show_vfsstat: do not ignore errors from show_devname method
Douglas Gilbert (1):
sg: fix dxferp in from_to case
Eric Anholt (1):
clk: bcm2835: Fix setting of PLL divider clock rates
Eric Huang (1):
drm/amd/powerplay: add uvd/vce dpm enabling flag to fix the performance issue for CZ
Eric Wheeler (3):
bcache: cleaned up error handling around register_cache()
bcache: fix race of writeback thread starting before complete initialization
bcache: fix cache_set_flush() NULL pointer dereference on OOM
Finn Thain (6):
ncr5380: Correctly clear command pointers and lists after bus reset
ncr5380: Dont release lock for PIO transfer
ncr5380: Dont re-enter NCR5380_select()
ncr5380: Forget aborted commands
ncr5380: Fix NCR5380_select() EH checks and result handling
ncr5380: Call scsi_eh_prep_cmnd() and scsi_eh_restore_cmnd() as and when appropriate
Geert Uytterhoeven (1):
gpio: pca953x: Fix pca953x_gpio_set_multiple() on 64-bit
Grazvydas Ignotas (1):
HID: logitech: fix Dual Action gamepad support
Greg Kroah-Hartman (1):
Linux 4.5.1
Guenter Roeck (1):
MAINTAINERS: Update mailing list and web page for hwmon subsystem
H Hartley Sweeten (1):
staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
Hannes Reinecke (1):
scsi_common: do not clobber fixed sense information
Hans Verkuil (1):
adv7511: TX_EDID_PRESENT is still 1 after a disconnect
Hans de Goede (4):
USB: uas: Reduce can_queue to MAX_CMNDS
pwc: Add USB id for Philips Spc880nc webcam
saa7134: Fix bytesperline not being set correctly for planar formats
bttv: Width must be a multiple of 16 when capturing planar formats
Hante Meuleman (1):
brcmfmac: Increase nr of supported flowrings.
Harald Hoyer (1):
tpm_eventlog.c: fix binary_bios_measurements
Heiko Carstens (1):
s390/cpumf: add missing lpp magic initialization
Heiko Stuebner (4):
clk: rockchip: rk3368: fix cpuclk mux bit of big cpu-cluster
clk: rockchip: rk3368: fix cpuclk core dividers
clk: rockchip: rk3368: fix parents of video encoder/decoder
clk: rockchip: rk3368: fix hdmi_cec gate-register
Himanshu Madhani (1):
target: Fix target_release_cmd_kref shutdown comp leak
Hui Wang (1):
ALSA: hda - fix the mic mute button and led problem for a Lenovo AIO
J. Bruce Fields (2):
nfsd4: fix bad bounds checking
nfsd: fix deadlock secinfo+readdir compound
Jan Beulich (1):
scripts/kconfig: allow building with make 3.80 again
Jan Kiszka (1):
scripts/gdb: account for changes in module data structure
Jann Horn (1):
fs/coredump: prevent fsuid=0 dumps into user-controlled directories
Jarkko Sakkinen (3):
tpm: fix the rollback in tpm_chip_register()
tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()
tpm: fix the cleanup of struct tpm_chip
Jenny Derzhavetz (4):
iser-target: Fix identification of login rx descriptor type
iser-target: Add new state ISER_CONN_BOUND to isert_conn
iser-target: Separate flows for np listeners and connections cma events
iser-target: Rework connection termination
Jerry Hoemann (1):
libnvdimm: Fix security issue with DSM IOCTL.
Jes Sorensen (1):
md/raid5: Compare apples to apples (or sectors to sectors)
Jiri Kosina (1):
kbuild/mkspec: fix grub2 installkernel issue
Jiri Olsa (2):
perf tools: Fix python extension build perf/x86/intel: Use PAGE_SIZE for PEBS buffer size on Core2
Joe Thornber (2):
dm thin metadata: don't issue prefetches if a transaction abort has failed dm cache: make sure every metadata function checks fail_io
Johan Hedberg (1):
Bluetooth: Fix potential buffer overflow with Add Advertising
Johannes Weiner (2):
mm: memcontrol: reclaim when shrinking memory.high below usage
mm: memcontrol: reclaim and OOM kill when shrinking memory.max below usage
John Dahlstrom (1):
ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list
Jon Hunter (1):
mmc: tegra: Disable UHS-I modes for tegra114
Joseph Qi (2):
ocfs2/dlm: fix race between convert and recovery ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list
Josh Boyer (3):
USB: iowarrior: fix oops with malicious USB descriptors
USB: serial: ftdi_sio: Add support for ICP DAS I-756xU devices
Input: powermate - fix oops with malicious USB descriptors
Joshua Hunt (1):
watchdog: don't run proc_watchdog_update if new value is same as old
Julia Lawall (1):
scripts/coccinelle: modernize &
Junxiao Bi (1):
ocfs2: o2hb: fix double free bug
Kamal Mostafa (1):
tools/hv: Use include/uapi with __EXPORTED_HEADERS__
Kan Liang (2):
perf/x86/intel/uncore: Remove SBOX support for BDX-DE perf/x86/intel: Fix PEBS warning by only restoring active PMU in pmi
Ken Wang (1):
drm/amdgpu: include the right version of gmc header files for iceland
Lada Trimasova (1):
ARC: [BE] readl()/writel() to work in Big Endian CPU configuration
Len Brown (1):
intel_idle: prevent SKL-H boot failure when C8+C9+C10 enabled
Lorenzo Pieralisi (1):
PCI: ACPI: IA64: fix IO port generic range check
Lucas Stach (1):
mmc: tegra: properly disable card clock
Ludovic Desroches (2):
ARM: dts: at91: sama5d3 Xplained: don't disable hsmci regulator
ARM: dts: at91: sama5d4 Xplained: don't disable hsmci regulator
Luis R. Rodriguez (1):
ia64: define ioremap_uc()
Lukas Wunner (2):
ACPI / PM: Runtime resume devices when waking from hibernate PM / sleep: Clear pm_suspend_global_flags upon hibernate
Magnus Damm (1):
mmc: mmc_spi: Add Card Detect comments and fix CD GPIO case
Mario Kleiner (1):
drm/radeon: Don't drop DP 2.7 Ghz link setup on some cards.
Martin K. Petersen (1):
sd: Fix discard granularity when LBPRZ=1
Martin Schwidefsky (1):
s390: fix floating pointer register corruption (again)
Martyn Welch (1):
USB: serial: cp210x: Adding GE Healthcare Device ID
Mateusz Guzik (1):
xfs: fix two memory leaks in xfs_attr_list.c error paths
Maurizio Lombardi (1):
be2iscsi: set the boot_kset pointer to NULL in case of failure
Max Filippov (3):
xtensa: ISS: don't hang if stdin EOF is reached
xtensa: fix preemption in {clear,copy}_user_highpage
xtensa: clear all DBREAKC registers on start
Michael S. Tsirkin (1):
watchdog: rc32434_wdt: fix ioctl error handling
Mike Snitzer (1):
dm: fix excessive dm-mq context switching
Ming Lei (1):
md: multipath: don't hardcopy bio in .make_request path
Nadav Amit (1):
x86/mm: TLB_REMOTE_SEND_IPI should count pages
Nate Dailey (1):
raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang
NeilBrown (1):
md/raid5: preserve STRIPE_PREREAD_ACTIVE in break_stripe_batch_list
Nikolay Borisov (1):
quota: Fix possible GPF due to uninitialised pointers
OGAWA Hirofumi (1):
jbd2: fix FS corruption possibility in jbd2_journal_destroy() on umount path
Oliver Neukum (8):
usb: retry reset if a device times out
usb: hub: fix a typo in hub_port_init() leading to wrong logic
USB: cdc-acm: more sanity checking
USB: usb_driver_claim_interface: add sanity checking
USB: mct_u232: add sanity checking in probe
USB: digi_acceleport: do sanity checking for the number of ports
USB: cypress_m8: add endpoint sanity check
Input: ims-pcu - sanity check against missing interfaces
Paolo Bonzini (5):
KVM: x86: fix missed hardware breakpoints
KVM: fix spin_lock_init order on x86
KVM: VMX: avoid guest hang on invalid invept instruction
KVM: VMX: avoid guest hang on invalid invvpid instruction
KVM: VMX: fix nested vpid for old KVM guests
Peter Hurley (2):
tty: Fix GPF in flush_to_ldisc(), part 2
net: irda: Fix use-after-free in irtty_open()
Peter Zijlstra (1):
bitops: Do not default to __clear_bit() for __clear_bit_unlock()
Phil Elwell (1):
pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing
Philipp Zabel (1):
coda: fix first encoded frame payload
Rabin Vincent (1):
splice: handle zero nr_pages in splice_to_pipe()
Radim Krčmář (1):
KVM: i8254: change PIT discard tick policy
Raghava Aditya Renukunta (3):
aacraid: Fix RRQ overload
aacraid: Fix memory leak in aac_fib_map_free
aacraid: Set correct msix count for EEH recovery
Robert Doebbelin (1):
fuse: do not use iocb after it may have been freed
Russell King (9):
mmc: sdhci: move initialisation of command error member
mmc: sdhci: clean up command error handling
mmc: sdhci: fix command response CRC error handling
mmc: sdhci: further fix for DMA unmapping in sdhci_post_req()
mmc: sdhci: avoid unnecessary mapping/unmapping of align buffer
mmc: sdhci: plug DMA mapping leak on error
mmc: sdhci: fix data timeout (part 1)
mmc: sdhci: fix data timeout (part 2)
mmc: sdhci-pxav3: fix higher speed mode capabilities
Sebastian Frias (1):
8250: use callbacks to access UART_DLL/UART_DLM
Sebastian Ott (1):
s390/pci: enforce fmb page boundary rule
Seth Forshee (1):
fuse: Add reference counting for fuse_io_priv
Shaohua Li (3):
RAID5: check_reshape() shouldn't call mddev_suspend
RAID5: revert e9e4c377e2f563 to fix a livelock
raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang
Shawn Lin (1):
mmc: block: fix ABI regression of mmc_blk_ioctl
Spencer E. Olson (1):
staging: comedi: ni_tiocmd: change mistaken use of start_src for start_arg
Stephane Eranian (2):
perf/x86/intel: Add definition for PT PMI bit perf/x86/pebs: Add workaround for broken OVFL status on HSW+
Steven Rostedt (Red Hat) (3):
tracing: Have preempt(irqs)off trace preempt disabled functions
tracing: Fix crash from reading trace_pipe with sendfile
tracing: Fix trace_printk() to print when not using bprintk()
Takashi Iwai (14):
ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
ALSA: usb-audio: Add sanity checks for endpoint accesses
ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
ALSA: hda - Fix unexpected resume through regmap code path
ALSA: hda - Apply reboot D3 fix for CX20724 codec, too
ALSA: pcm: Avoid "BUG:" string for warnings again
ALSA: hda - Don't handle ELD notify from invalid port
ALSA: hda - Fix unconditional GPIO toggle via automute
ALSA: hda - Limit i915 HDMI binding only for HSW and later
ALSA: hda - Fix spurious kernel WARNING on Baytrail HDMI
ALSA: hda - Really restrict i915 notifier to HSW+
ALSA: hda - Fix forgotten HDMI monitor_present update
ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe
ALSA: hda - Fix missing ELD update at unplugging
Tejun Heo (3):
cgroup: ignore css_sets associated with dead cgroups during migration writeback, cgroup: fix premature wb_put() in locked_inode_to_wb_and_lock_list() writeback, cgroup: fix use of the wrong bdi_writeback which mismatches the inode
Thomas Gleixner (2):
x86/irq: Cure live lock in fixup_irqs() sched/cputime: Fix steal time accounting vs. CPU hotplug
Tiffany Lin (1):
media: v4l2-compat-ioctl32: fix missing length copy in put_v4l2_buffer32
Tom Lendacky (4):
crypto: ccp - Add hash state import and export support
crypto: ccp - Limit the amount of information exported
crypto: ccp - Don't assume export/import areas are aligned
crypto: ccp - memset request context to zero during import
Tony Luck (1):
EDAC/sb_edac: Fix computation of channel address
Victor Clément (1):
ALSA: usb-audio: add Microsoft HD-5001 to quirks
Vinayak Menon (1):
of: alloc anywhere from memblock if range not specified
Vineet Gupta (1):
ARC: bitops: Remove non relevant comments
Vitaly Kuznetsov (1):
scsi: storvsc: fix SRB_STATUS_ABORTED handling
Vittorio Gambaletta (VittGam) (1):
ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM ThinkPad X41.
Vladimir Zapolskiy (3):
crypto: atmel - fix checks of error code returned by devm_ioremap_resource()
crypto: ux500 - fix checks of error code returned by devm_ioremap_resource()
staging: android: ion_test: fix check of platform_device_register_simple() error code
Vladis Dronov (2):
ALSA: usb-audio: Fix double-free in error paths after snd_usb_add_audio_stream() call
Input: ati_remote2 - fix crashes on detecting device with invalid descriptor
Vlastimil Babka (1):
mm/page_alloc: prevent merging between isolated and other pageblocks
Wang Nan (1):
perf tools: Fix checking asprintf return value
Zhang Rui (1):
Thermal: Ignore invalid trip points
Greg KH
maintainerDocumentation/cgroup-v2.txt +6 -0
@@ -1368,6 +1368,12 @@ system than killing the group. Otherwise, memory.max is there to limit this type of spillover and ultimately contain buggy or even malicious applications. +Setting the original memory.limit_in_bytes below the current usage was +subject to a race condition, where concurrent charges could cause the +limit setting to fail. memory.max on the other hand will first set the +limit to prevent new charges, and then reclaim and OOM kill until the +new limit is met - or the task writing to memory.max is killed. + The combined memory+swap accounting and limiting is replaced by real control over swap space.
MAINTAINERS +48 -48
370 lines not on this page · raw message
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 5 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Blurry Fish Butt
arch/arc/boot/dts/axs10x_mb.dtsi +8 -0
@@ -47,6 +47,14 @@ clocks = <&apbclk>; clock-names = "stmmaceth"; max-speed = <100>; + mdio0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + phy1: ethernet-phy@1 { + reg = <1>; + }; + }; }; ehci@0x40000 {
arch/arc/include/asm/bitops.h +0 -15
@@ -35,21 +35,6 @@ static inline void op##_bit(unsigned long nr, volatile unsigned long *m)\ \ m += nr >>5 ; \ \ -/* \ -* ARC ISA micro-optimization: \ -* \ -* Instructions dealing with bitpos only consider lower 5 bits \ -* e.g (x << 33) is handled like (x << 1) by ASL instruction \ -* (mem pointer still needs adjustment to point to next word) \ -* \ -* Hence the masking to clamp @nr arg can be elided in general. \ -* \ -* However if @nr is a constant (above assumed in a register), \ -* and greater than 31, gcc can optimize away (x << 33) to 0, \ -* as overflow, given the 32-bit ISA. Thus masking needs to be \ -* done for const @nr, but no code is generated due to gcc \ -* const prop. \ -*/ \ nr &=0x1f ; \ \ __asm__ __volatile__( \
arch/arc/include/asm/io.h +13 -5
@@ -129,15 +129,23 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr)#define writel (v,c) ({ __iowmb(); writel_relaxed(v,c); })/* -* Relaxed API for drivers which can handle any ordering themselves +* Relaxed API for drivers which can handle barrier ordering themselves +* +* Also these are defined to perform little endian accesses. +* To provide the typical device register semantics of fixed endian, +* swap the byte order for Big Endian +* +* http://lkml.kernel.org/r/[email protected] */ #define readb_relaxed (c) __raw_readb(c) -#define readw_relaxed (c) __raw_readw(c) -#define readl_relaxed (c) __raw_readl(c) +#define readw_relaxed (c) ({ u16 __r = le16_to_cpu((__force __le16) \ + __raw_readw(c)); __r; }) +#define readl_relaxed (c) ({ u32 __r = le32_to_cpu((__force __le32) \ + __raw_readl(c)); __r; })#define writeb_relaxed (v,c) __raw_writeb(v,c) -#define writew_relaxed (v,c) __raw_writew(v,c) -#define writel_relaxed (v,c) __raw_writel(v,c) +#define writew_relaxed (v,c) __raw_writew((__force u16) cpu_to_le16(v),c) +#define writel_relaxed (v,c) __raw_writel((__force u32) cpu_to_le32(v),c)#include <asm-generic/io.h>
arch/arm/boot/dts/at91-sama5d3_xplained.dts +1 -0
@@ -303,6 +303,7 @@ regulator-name = "mmc0-card-supply"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; gpio_keys {
arch/arm/boot/dts/at91-sama5d4_xplained.dts +1 -0
@@ -268,5 +268,6 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; vin-supply = <&vcc_3v3_reg>; + regulator-always-on; }; };
arch/arm64/include/asm/pgtable.h +2 -1
@@ -279,7 +279,7 @@ extern void __sync_icache_dcache(pte_t pteval, unsigned long addr);static inline void set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pte) { -if (pte_valid (pte)) { +if (pte_present (pte)) {if (pte_sw_dirty (pte) &&pte_write (pte))pte_val (pte) &= ~PTE_RDONLY ;else
@@ -649,6 +649,7 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD];* bits 0-1: present (must be zero) * bits 2-7: swap type * bits 8-57: swap offset +* bit 58: PTE_PROT_NONE (must be zero) */ #define __SWP_TYPE_SHIFT 2#define __SWP_TYPE_BITS 6
arch/ia64/include/asm/io.h +1 -0
@@ -433,6 +433,7 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned loreturn ioremap (phys_addr, size); }#define ioremap_cache ioremap_cache +#define ioremap_uc ioremap_nocache/*
arch/s390/include/asm/pci.h +1 -1
@@ -45,7 +45,7 @@ struct zpci_fmb {u64 rpcit_ops;u64 dma_rbytes;u64 dma_wbytes; -} __packed__aligned(16) ; +} __packed__aligned(64) ;enum zpci_state {ZPCI_FN_STATE_RESERVED ,
arch/s390/kernel/entry.S +2 -104
116 lines not on this page · raw message
arch/s390/kernel/setup.c +1 -0
@@ -327,6 +327,7 @@ static void __init setup_lowcore(void) +PAGE_SIZE -STACK_FRAME_OVERHEAD -sizeof (struct pt_regs ); lc->current_task = (unsigned long ) init_thread_union.thread_info.task; lc->thread_info = (unsigned long ) &init_thread_union; + lc->lpp =LPP_MAGIC ; lc->machine_flags = S390_lowcore.machine_flags; lc->stfl_fac_list = S390_lowcore.stfl_fac_list; memcpy(lc->stfle_fac_list, S390_lowcore.stfle_fac_list,
arch/s390/pci/pci.c +4 -1
@@ -864,8 +864,11 @@ static inline int barsize(u8 size)static int zpci_mem_init (void ) { +BUILD_BUG_ON (!is_power_of_2 (__alignof__(struct zpci_fmb )) || + __alignof__(struct zpci_fmb ) <sizeof (struct zpci_fmb )); + zdev_fmb_cache =kmem_cache_create ("PCI_FMB_cache" ,sizeof (struct zpci_fmb ), -16 ,0 ,NULL ); + __alignof__(struct zpci_fmb ),0 ,NULL );if (!zdev_fmb_cache) goto error_fmb;
arch/sh/mm/kmap.c +2 -0
@@ -36,6 +36,7 @@ void *kmap_coherent(struct page *page, unsigned long addr)BUG_ON (!test_bit (PG_dcache_clean, &page->flags)); +preempt_disable ();pagefault_disable (); idx = FIX_CMAP_END -
@@ -64,4 +65,5 @@ void kunmap_coherent(void *kvaddr) }pagefault_enable (); +preempt_enable (); }
arch/um/drivers/mconsole_kern.c +1 -1
@@ -133,7 +133,7 @@ void mconsole_proc(struct mc_request *req) ptr +=strlen ("proc" ); ptr =skip_spaces (ptr); - file =file_open_root (mnt->mnt_root, mnt, ptr,O_RDONLY ); + file =file_open_root (mnt->mnt_root, mnt, ptr,O_RDONLY ,0 );if (IS_ERR (file)) {mconsole_reply (req,"Failed to open file" ,1 ,0 );printk (KERN_ERR "open /proc/%s: %ld\n" , ptr,PTR_ERR (file));
arch/x86/Kconfig +14 -13
@@ -1160,22 +1160,23 @@ config MICROCODE bool "CPU microcode loading support" default y depends on CPU_SUP_AMD || CPU_SUP_INTEL - depends on BLK_DEV_INITRD select FW_LOADER ---help--- - If you say Y here, you will be able to update the microcode on - certain Intel and AMD processors. The Intel support is for the - IA32 family, e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, - Xeon etc. The AMD support is for families 0x10 and later. You will - obviously need the actual microcode binary data itself which is not - shipped with the Linux kernel. - - This option selects the general module only, you need to select - at least one vendor specific module as well. - - To compile this driver as a module, choose M here: the module - will be called microcode. + Intel and AMD processors. The Intel support is for the IA32 family, + e.g. Pentium Pro, Pentium II, Pentium III, Pentium 4, Xeon etc. The + AMD support is for families 0x10 and later. You will obviously need + the actual microcode binary data itself which is not shipped with + the Linux kernel. + + The preferred method to load microcode from a detached initrd is described + in Documentation/x86/early-microcode.txt. For that you need to enable + CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the + initrd for microcode blobs. + + In addition, you can build-in the microcode into the kernel. For that you + need to enable FIRMWARE_IN_KERNEL and add the vendor-supplied microcode + to the CONFIG_EXTRA_FIRMWARE config option. config MICROCODE_INTEL bool "Intel microcode loading support"
arch/x86/entry/common.c +13 -10
@@ -268,6 +268,7 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)/* Called with IRQs disabled. */ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs) { +struct thread_info *ti =pt_regs_to_thread_info (regs);u32 cached_flags;if (IS_ENABLED (CONFIG_PROVE_LOCKING ) &&WARN_ON (!irqs_disabled ()))
@@ -275,12 +276,22 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs)lockdep_sys_exit (); - cached_flags = -READ_ONCE (pt_regs_to_thread_info (regs)->flags); + cached_flags =READ_ONCE (ti->flags);if (unlikely (cached_flags &EXIT_TO_USERMODE_LOOP_FLAGS ))exit_to_usermode_loop (regs, cached_flags); +#ifdef CONFIG_COMPAT +/* +* Compat syscalls set TS_COMPAT. Make sure we clear it before +* returning to user mode. We need to clear it *after* signal +* handling, because syscall restart has a fixup for compat +* syscalls. The fixup is exercised by the ptrace_syscall_32 +* selftest. +*/ + ti->status &= ~TS_COMPAT ; +#endif +user_enter (); }
@@ -332,14 +343,6 @@ __visible inline void syscall_return_slowpath(struct pt_regs *regs)if (unlikely (cached_flags &SYSCALL_EXIT_WORK_FLAGS ))syscall_slow_exit_work (regs, cached_flags); -#ifdef CONFIG_COMPAT -/* -* Compat syscalls set TS_COMPAT. Make sure we clear it before -* returning to user mode. -*/ - ti->status &= ~TS_COMPAT ; -#endif -local_irq_disable ();prepare_exit_to_usermode (regs); }
arch/x86/include/asm/apic.h +1 -1
@@ -644,8 +644,8 @@ static inline void entering_irq(void)static inline void entering_ack_irq (void ) { -ack_APIC_irq ();entering_irq (); +ack_APIC_irq (); }static inline void ipi_entering_ack_irq (void )
arch/x86/include/asm/hw_irq.h +1 -0
@@ -141,6 +141,7 @@ struct irq_alloc_info {struct irq_cfg {unsigned int dest_apicid;u8 vector; +u8 old_vector; };extern struct irq_cfg *irq_cfg (unsigned int irq);
arch/x86/include/asm/microcode.h +26 -0
@@ -3,6 +3,7 @@#include <asm/cpu.h> #include <linux/earlycpio.h> +#include <linux/initrd.h> #define native_rdmsr (msr, val1, val2) \ do { \
@@ -143,4 +144,29 @@ static inline void reload_early_microcode(void) { }static inline bool get_builtin_firmware (struct cpio_data *cd,const char *name) {return false; }#endif + +static inline unsigned long get_initrd_start (void ) +{ +#ifdef CONFIG_BLK_DEV_INITRD +return initrd_start; +#else +return 0 ; +#endif +} + +static inline unsigned long get_initrd_start_addr (void ) +{ +#ifdef CONFIG_BLK_DEV_INITRD +#ifdef CONFIG_X86_32 +unsigned long *initrd_start_p = (unsigned long *)__pa_nodebug (&initrd_start); + +return (unsigned long )__pa_nodebug (*initrd_start_p); +#else +return get_initrd_start (); +#endif +#else /* CONFIG_BLK_DEV_INITRD */ +return 0 ; +#endif +} +#endif /* _ASM_X86_MICROCODE_H */
arch/x86/include/asm/perf_event.h +1 -0
@@ -165,6 +165,7 @@ struct x86_pmu_capability {#define GLOBAL_STATUS_ASIF BIT_ULL(60)#define GLOBAL_STATUS_COUNTERS_FROZEN BIT_ULL(59)#define GLOBAL_STATUS_LBRS_FROZEN BIT_ULL(58) +#define GLOBAL_STATUS_TRACE_TOPAPMI BIT_ULL(55)/* * IBS cpuid feature detection
arch/x86/include/asm/xen/hypervisor.h +2 -0
@@ -62,4 +62,6 @@ void xen_arch_register_cpu(int num);void xen_arch_unregister_cpu (int num);#endif +extern void xen_set_iopl_mask (unsigned mask); +#endif /* _ASM_X86_XEN_HYPERVISOR_H */
arch/x86/kernel/apic/vector.c +70 -18
122 lines not on this page · raw message
arch/x86/kernel/cpu/microcode/intel.c +20 -18
@@ -551,10 +551,14 @@ scan_microcode(struct mc_saved_data *mc_saved_data, unsigned long *initrd, cd.data =NULL ; cd.size =0 ; - cd =find_cpio_data (p, (void *)start, size, &offset); -if (!cd.data) { +/* try built-in microcode if no initrd */ +if (!size) {if (!load_builtin_intel_microcode (&cd))return UCODE_ERROR ; + }else { + cd =find_cpio_data (p, (void *)start, size, &offset); +if (!cd.data) +return UCODE_ERROR ; } return get_matching_model_microcode(0, start, cd.data, cd.size,
@@ -690,7 +694,7 @@ int __init save_microcode_in_initrd_intel(void)if (count ==0 )return ret; -copy_initrd_ptrs (mc_saved, mc_saved_in_initrd, initrd_start, count); +copy_initrd_ptrs (mc_saved, mc_saved_in_initrd,get_initrd_start (), count); ret =save_microcode (&mc_saved_data, mc_saved, count);if (ret)pr_err ("Cannot save microcode patches from initrd.\n" );
@@ -728,16 +732,20 @@ void __init load_ucode_intel_bsp(void)struct boot_params *p; p = (struct boot_params *)__pa_nodebug (&boot_params); - start = p->hdr.ramdisk_image; size = p->hdr.ramdisk_size; -_load_ucode_intel_bsp ( - (struct mc_saved_data *)__pa_nodebug (&mc_saved_data), - (unsigned long *)__pa_nodebug (&mc_saved_in_initrd), - start, size); +/* +* Set start only if we have an initrd image. We cannot use initrd_start +* because it is not set that early yet. +*/ + start = (size ? p->hdr.ramdisk_image :0 ); + +_load_ucode_intel_bsp ((struct mc_saved_data *)__pa_nodebug (&mc_saved_data), + (unsigned long *)__pa_nodebug (&mc_saved_in_initrd), + start, size);#else - start = boot_params.hdr.ramdisk_image +PAGE_OFFSET ; size = boot_params.hdr.ramdisk_size; + start = (size ? boot_params.hdr.ramdisk_image +PAGE_OFFSET :0 );_load_ucode_intel_bsp (&mc_saved_data, mc_saved_in_initrd, start, size);#endif
@@ -748,20 +756,14 @@ void load_ucode_intel_ap(void)struct mc_saved_data *mc_saved_data_p;struct ucode_cpu_info uci;unsigned long *mc_saved_in_initrd_p; -unsigned long initrd_start_addr;enum ucode_state ret;#ifdef CONFIG_X86_32 -unsigned long *initrd_start_p; - mc_saved_in_initrd_p = - (unsigned long *)__pa_nodebug (mc_saved_in_initrd); + mc_saved_in_initrd_p = (unsigned long *)__pa_nodebug (mc_saved_in_initrd); mc_saved_data_p = (struct mc_saved_data *)__pa_nodebug (&mc_saved_data); - initrd_start_p = (unsigned long *)__pa_nodebug (&initrd_start); - initrd_start_addr = (unsigned long )__pa_nodebug (*initrd_start_p);#else - mc_saved_data_p = &mc_saved_data; mc_saved_in_initrd_p = mc_saved_in_initrd; - initrd_start_addr = initrd_start; + mc_saved_data_p = &mc_saved_data;#endif /*
@@ -773,7 +775,7 @@ void load_ucode_intel_ap(void)collect_cpu_info_early (&uci); ret =load_microcode (mc_saved_data_p, mc_saved_in_initrd_p, - initrd_start_addr, &uci); +get_initrd_start_addr (), &uci);if (ret !=UCODE_OK )return ;
arch/x86/kernel/cpu/perf_event.c +13 -0
@@ -596,6 +596,19 @@ void x86_pmu_disable_all(void) } } +/* +* There may be PMI landing after enabled=0. The PMI hitting could be before or +* after disable_all. +* +* If PMI hits before disable_all, the PMU will be disabled in the NMI handler. +* It will not be re-enabled in the NMI handler again, because enabled=0. After +* handling the NMI, disable_all will be called, which will not change the +* state either. If PMI hits after disable_all, the PMU is already disabled +* before entering NMI handler. The NMI handler will not change the state +* either. +* +* So either situation is harmless. +*/ static void x86_pmu_disable (struct pmu *pmu) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);
arch/x86/kernel/cpu/perf_event.h +3 -0
@@ -586,6 +586,7 @@ struct x86_pmu { pebs_broken :1 , pebs_prec_dist :1;int pebs_record_size; +int pebs_buffer_size;void (*drain_pebs)(struct pt_regs *regs);struct event_constraint *pebs_constraints;void (*pebs_aliases)(struct perf_event *event);
@@ -904,6 +905,8 @@ void intel_pmu_lbr_init_skl(void);void intel_pmu_lbr_init_knl (void ); +void intel_pmu_pebs_data_source_nhm (void ); +int intel_pmu_setup_lbr_filter (struct perf_event *event);void intel_pt_interrupt (void );
arch/x86/kernel/cpu/perf_event_intel.c +25 -2
@@ -1502,7 +1502,15 @@ static __initconst const u64 knl_hw_cache_extra_regs };/* -* Use from PMIs where the LBRs are already disabled. +* Used from PMIs where the LBRs are already disabled. +* +* This function could be called consecutively. It is required to remain in +* disabled state if called consecutively. +* +* During consecutive calls, the same disable value will be written to related +* registers, so the PMU state remains unchanged. hw.state in +* intel_bts_disable_local will remain PERF_HES_STOPPED too in consecutive +* calls. */ static void __intel_pmu_disable_all (void ) {
@@ -1884,6 +1892,16 @@ again:if (__test_and_clear_bit (62 , (unsigned long *)&status)) { handled++; x86_pmu.drain_pebs (regs); +/* +* There are cases where, even though, the PEBS ovfl bit is set +* in GLOBAL_OVF_STATUS, the PEBS events may also have their +* overflow bits set for their counters. We must clear them +* here because they have been processed as exact samples in +* the drain_pebs() routine. They must not be processed again +* in the for_each_bit_set() loop for regular samples below. +*/ + status &= ~cpuc->pebs_enabled; + status &= x86_pmu.intel_ctrl |GLOBAL_STATUS_TRACE_TOPAPMI ; }/*
@@ -1929,7 +1947,10 @@ again: goto again; done: -__intel_pmu_enable_all (0 , true); +/* Only restore PMU state when it's active. See x86_pmu_disable(). */ +if (cpuc->enabled) +__intel_pmu_enable_all (0 , true); +/* * Only unmask the NMI after the overflow counters * have been reset. This avoids spurious NMIs on
@@ -3396,6 +3417,7 @@ __init int intel_pmu_init(void) intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND ] = X86_CONFIG(.event=0xb1, .umask=0x3f, .inv=1, .cmask=1); +intel_pmu_pebs_data_source_nhm ();x86_add_quirk (intel_nehalem_quirk);pr_cont ("Nehalem events, " );
@@ -3459,6 +3481,7 @@ __init int intel_pmu_init(void) intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND ] = X86_CONFIG(.event=0xb1, .umask=0x3f, .inv=1, .cmask=1); +intel_pmu_pebs_data_source_nhm ();pr_cont ("Westmere events, " );break ;
arch/x86/kernel/cpu/perf_event_intel_ds.c +21 -3
@@ -51,7 +51,8 @@ union intel_x86_pebs_dse {#define OP_LH (P(OP, LOAD) | P(LVL, HIT))#define SNOOP_NONE_MISS (P(SNOOP, NONE) | P(SNOOP, MISS)) -static const u64 pebs_data_source[] = { +/* Version for Sandy Bridge and later */ +static u64 pebs_data_source[] = {P (OP ,LOAD ) |P (LVL ,MISS ) |P (LVL ,L3 ) |P (SNOOP ,NA ),/* 0x00:ukn L3 */ OP_LH |P (LVL ,L1 ) |P (SNOOP ,NONE ),/* 0x01: L1 local */ OP_LH |P (LVL ,LFB ) |P (SNOOP ,NONE ),/* 0x02: LFB hit */
@@ -70,6 +71,14 @@ static const u64 pebs_data_source[] = { OP_LH | P(LVL, UNC) | P(SNOOP, NONE), /* 0x0f: uncached */ }; +/* Patch up minor differences in the bits */ +void __init intel_pmu_pebs_data_source_nhm (void ) +{ + pebs_data_source[0x05 ] =OP_LH |P (LVL ,L3 ) |P (SNOOP ,HIT ); + pebs_data_source[0x06 ] =OP_LH |P (LVL ,L3 ) |P (SNOOP ,HITM ); + pebs_data_source[0x07 ] =OP_LH |P (LVL ,L3 ) |P (SNOOP ,HITM ); +} +static u64 precise_store_data (u64 status) {union intel_x86_pebs_dse dse;
@@ -269,7 +278,7 @@ static int alloc_pebs_buffer(int cpu)if (!x86_pmu.pebs)return 0 ; - buffer =kzalloc_node (PEBS_BUFFER_SIZE ,GFP_KERNEL , node); + buffer =kzalloc_node (x86_pmu.pebs_buffer_size,GFP_KERNEL , node);if (unlikely (!buffer))return -ENOMEM ;
@@ -286,7 +295,7 @@ static int alloc_pebs_buffer(int cpu)per_cpu (insn_buffer, cpu) = ibuffer; } - max =PEBS_BUFFER_SIZE / x86_pmu.pebs_record_size; + max = x86_pmu.pebs_buffer_size / x86_pmu.pebs_record_size; ds->pebs_buffer_base = (u64 )(unsigned long )buffer; ds->pebs_index = ds->pebs_buffer_base;
@@ -1319,6 +1328,7 @@ void __init intel_ds_init(void) x86_pmu.bts =boot_cpu_has (X86_FEATURE_BTS ); x86_pmu.pebs =boot_cpu_has (X86_FEATURE_PEBS ); + x86_pmu.pebs_buffer_size =PEBS_BUFFER_SIZE ;if (x86_pmu.pebs) {char pebs_type = x86_pmu.intel_cap.pebs_trap ?'+' :'-' ;int format = x86_pmu.intel_cap.pebs_format;
@@ -1327,6 +1337,14 @@ void __init intel_ds_init(void)case 0 :printk (KERN_CONT "PEBS fmt0%c, " , pebs_type); x86_pmu.pebs_record_size =sizeof (struct pebs_record_core ); +/* +* Using >PAGE_SIZE buffers makes the WRMSR to +* PERF_GLOBAL_CTRL in intel_pmu_enable_all() +* mysteriously hang on Core2. +* +* As a workaround, we don't do this. +*/ + x86_pmu.pebs_buffer_size =PAGE_SIZE ; x86_pmu.drain_pebs = intel_pmu_drain_pebs_core;break ;
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +7 -1
@@ -2875,11 +2875,13 @@ static struct intel_uncore_type bdx_uncore_sbox = { .format_group = &hswep_uncore_sbox_format_group, }; +#define BDX_MSR_UNCORE_SBOX 3 +static struct intel_uncore_type *bdx_msr_uncores[] = { &bdx_uncore_ubox, &bdx_uncore_cbox, - &bdx_uncore_sbox, &hswep_uncore_pcu, + &bdx_uncore_sbox,NULL , };
@@ -2888,6 +2890,10 @@ void bdx_uncore_cpu_init(void)if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores; uncore_msr_uncores = bdx_msr_uncores; + +/* BDX-DE doesn't have SBOX */ +if (boot_cpu_data.x86_model ==86 ) + uncore_msr_uncores[BDX_MSR_UNCORE_SBOX ] =NULL ; }static struct intel_uncore_type bdx_uncore_ha = {
arch/x86/kernel/cpu/perf_event_knc.c +3 -1
@@ -263,7 +263,9 @@ again: goto again; done: -knc_pmu_enable_all (0 ); +/* Only restore PMU state when it's active. See x86_pmu_disable(). */ +if (cpuc->enabled) +knc_pmu_enable_all (0 );return handled; }
arch/x86/kernel/ioport.c +9 -3
@@ -96,9 +96,14 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) SYSCALL_DEFINE1(iopl, unsigned int, level) {struct pt_regs *regs =current_pt_regs (); -unsigned int old = (regs->flags >>12 ) &3 ;struct thread_struct *t = ¤t->thread; +/* +* Careful: the IOPL bits in regs->flags are undefined under Xen PV +* and changing them has no effect. +*/ +unsigned int old = t->iopl >>X86_EFLAGS_IOPL_BIT ; +if (level >3 )return -EINVAL ;/* Trying to gain more privileges? */
@@ -106,8 +111,9 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)if (!capable (CAP_SYS_RAWIO ))return -EPERM ; } - regs->flags = (regs->flags & ~X86_EFLAGS_IOPL ) | (level <<12 ); - t->iopl = level <<12 ; + regs->flags = (regs->flags & ~X86_EFLAGS_IOPL ) | + (level <<X86_EFLAGS_IOPL_BIT ); + t->iopl = level <<X86_EFLAGS_IOPL_BIT ;set_iopl_mask (t->iopl);return 0 ;
arch/x86/kernel/process_64.c +12 -0
@@ -48,6 +48,7 @@#include <asm/syscalls.h> #include <asm/debugreg.h> #include <asm/switch_to.h> +#include <asm/xen/hypervisor.h> asmlinkage extern void ret_from_fork(void);
@@ -411,6 +412,17 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV))__switch_to_xtra (prev_p, next_p, tss); +#ifdef CONFIG_XEN +/* +* On Xen PV, IOPL bits in pt_regs->flags have no effect, and +* current_pt_regs()->flags may not match the current task's +* intended IOPL. We need to switch it manually. +*/ +if (unlikely (static_cpu_has (X86_FEATURE_XENPV ) && + prev->iopl != next->iopl)) +xen_set_iopl_mask (next->iopl); +#endif +if (static_cpu_has_bug (X86_BUG_SYSRET_SS_ATTRS )) {/* * AMD CPUs have a misfeature: SYSRET sets the SS selector but
arch/x86/kvm/i8254.c +7 -5
@@ -245,7 +245,7 @@ static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)* PIC is being reset. Handle it gracefully here */ atomic_inc (&ps->pending); - else if (value > 0) + else if (value > 0 && ps->reinject)/* in this case, we had multiple outstanding pit interrupts * that we needed to inject. Reinject */
@@ -288,7 +288,9 @@ static void pit_do_work(struct kthread_work *work)* last one has been acked. */ spin_lock (&ps->inject_lock); -if (ps->irq_ack) { +if (!ps->reinject) + inject =1 ; +else if (ps->irq_ack) { ps->irq_ack =0 ; inject =1 ; }
@@ -317,10 +319,10 @@ static enum hrtimer_restart pit_timer_fn(struct hrtimer *data) struct kvm_kpit_state *ps = container_of(data, struct kvm_kpit_state, timer);struct kvm_pit *pt = ps->kvm->arch.vpit; -if (ps->reinject || !atomic_read (&ps->pending)) { +if (ps->reinject)atomic_inc (&ps->pending); -queue_kthread_work (&pt->worker, &pt->expired); - } + +queue_kthread_work (&pt->worker, &pt->expired);if (ps->is_periodic) {hrtimer_add_expires_ns (&ps->timer, ps->period);
arch/x86/kvm/vmx.c +15 -1
@@ -2702,8 +2702,15 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) }else vmx->nested.nested_vmx_ept_caps =0 ; +/* +* Old versions of KVM use the single-context version without +* checking for support, so declare that it is supported even +* though it is treated as global context. The alternative is +* not failing the single-context invvpid, and it is worse. +*/ if (enable_vpid) vmx->nested.nested_vmx_vpid_caps =VMX_VPID_INVVPID_BIT | +VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT ;else vmx->nested.nested_vmx_vpid_caps =0 ;
@@ -7398,6 +7405,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)if (!(types & (1UL << type))) {nested_vmx_failValid (vcpu,VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID ); +skip_emulated_instruction (vcpu);return 1 ; }
@@ -7456,6 +7464,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)if (!(types & (1UL << type))) {nested_vmx_failValid (vcpu,VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID ); +skip_emulated_instruction (vcpu);return 1 ; }
@@ -7472,12 +7481,17 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) }switch (type) { +case VMX_VPID_EXTENT_SINGLE_CONTEXT : +/* +* Old versions of KVM use the single-context version so we +* have to support it; just treat it the same as all-context. +*/ case VMX_VPID_EXTENT_ALL_CONTEXT :__vmx_flush_tlb (vcpu,to_vmx (vcpu)->nested.vpid02);nested_vmx_succeed (vcpu);break ;default : -/* Trap single context invalidation invvpid calls */ +/* Trap individual address invalidation invvpid calls */ BUG_ON (1 );break ; }
arch/x86/kvm/x86.c +1 -0
@@ -2752,6 +2752,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) }kvm_make_request (KVM_REQ_STEAL_UPDATE , vcpu); + vcpu->arch.switch_db_regs |=KVM_DEBUGREG_RELOAD ; }void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu)
arch/x86/mm/tlb.c +9 -3
@@ -106,8 +106,6 @@ static void flush_tlb_func(void *info)if (f->flush_mm !=this_cpu_read (cpu_tlbstate.active_mm))return ; -if (!f->flush_end) - f->flush_end = f->flush_start +PAGE_SIZE ;count_vm_tlb_event (NR_TLB_REMOTE_FLUSH_RECEIVED );if (this_cpu_read (cpu_tlbstate.state) ==TLBSTATE_OK ) {
@@ -135,12 +133,20 @@ void native_flush_tlb_others(const struct cpumask *cpumask, unsigned long end) {struct flush_tlb_info info; + +if (end ==0 ) + end = start +PAGE_SIZE ; info.flush_mm = mm; info.flush_start = start; info.flush_end = end;count_vm_tlb_event (NR_TLB_REMOTE_FLUSH ); -trace_tlb_flush (TLB_REMOTE_SEND_IPI , end - start); +if (end ==TLB_FLUSH_ALL ) +trace_tlb_flush (TLB_REMOTE_SEND_IPI ,TLB_FLUSH_ALL ); +else +trace_tlb_flush (TLB_REMOTE_SEND_IPI , + (end - start) >>PAGE_SHIFT ); +if (is_uv_system ()) {unsigned int cpu;
arch/x86/pci/fixup.c +7 -0
@@ -540,3 +540,10 @@ static void twinhead_reserve_killing_zone(struct pci_dev *dev) } }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,0x27B9 , twinhead_reserve_killing_zone); + +static void pci_bdwep_bar (struct pci_dev *dev) +{ + dev->non_compliant_bars =1 ; +} +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x6fa0 , pci_bdwep_bar); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_INTEL ,0x6fc0 , pci_bdwep_bar);
arch/x86/xen/enlighten.c +1 -1
@@ -961,7 +961,7 @@ static void xen_load_sp0(struct tss_struct *tss, tss->x86_tss.sp0 = thread->sp0; } -static void xen_set_iopl_mask (unsigned mask) +void xen_set_iopl_mask (unsigned mask) {struct physdev_set_iopl set_iopl;
arch/xtensa/kernel/head.S +1 -1
@@ -128,7 +128,7 @@ ENTRY(_startup) wsr a0, icountlevel .set _index, 0 - .rept XCHAL_NUM_DBREAK - 1 + .rept XCHAL_NUM_DBREAK wsr a0, SREG_DBREAKC + _index .set _index, _index + 1 .endr
arch/xtensa/mm/cache.c +4 -4
@@ -97,11 +97,11 @@ void clear_user_highpage(struct page *page, unsigned long vaddr)unsigned long paddr;void *kvaddr =coherent_kvaddr (page,TLBTEMP_BASE_1 , vaddr, &paddr); -pagefault_disable (); +preempt_disable ();kmap_invalidate_coherent (page, vaddr);set_bit (PG_arch_1, &page->flags);clear_page_alias (kvaddr, paddr); -pagefault_enable (); +preempt_enable (); } void copy_user_highpage(struct page *dst, struct page *src,
@@ -113,11 +113,11 @@ void copy_user_highpage(struct page *dst, struct page *src,void *src_vaddr =coherent_kvaddr (src,TLBTEMP_BASE_2 , vaddr, &src_paddr); -pagefault_disable (); +preempt_disable ();kmap_invalidate_coherent (dst, vaddr);set_bit (PG_arch_1, &dst->flags);copy_page_alias (dst_vaddr, src_vaddr, dst_paddr, src_paddr); - pagefault_enable(); + preempt_enable(); }#endif /* DCACHE_WAY_SIZE > PAGE_SIZE */
arch/xtensa/platforms/iss/console.c +6 -4
@@ -100,21 +100,23 @@ static void rs_poll(unsigned long priv) {struct tty_port *port = (struct tty_port *)priv;int i =0 ; +int rd =1 ;unsigned char c;spin_lock (&timer_lock);while (simc_poll (0 )) { -simc_read (0 , &c,1 ); + rd =simc_read (0 , &c,1 ); +if (rd <=0 ) +break ;tty_insert_flip_char (port, c,TTY_NORMAL ); i++; }if (i)tty_flip_buffer_push (port); - - -mod_timer (&serial_timer, jiffies +SERIAL_TIMER_VALUE ); +if (rd) +mod_timer (&serial_timer, jiffies +SERIAL_TIMER_VALUE );spin_unlock (&timer_lock); }
block/blk-core.c +1 -1
@@ -2198,7 +2198,7 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)if (q->mq_ops) {if (blk_queue_io_stat (q))blk_account_io_start (rq, true); -blk_mq_insert_request (rq, false, true, true); +blk_mq_insert_request (rq, false, true, false);return 0 ; }
crypto/asymmetric_keys/x509_cert_parser.c +4 -4
@@ -494,7 +494,7 @@ int x509_decode_time(time64_t *_t, size_t hdrlen,unsigned char tag, const unsigned char *value, size_t vlen) { - static const unsigned char month_lengths[] = { 31, 29, 31, 30, 31, 30, + static const unsigned char month_lengths[] = { 31, 28, 31, 30, 31, 30,31 ,31 ,30 ,31 ,30 ,31 };const unsigned char *p = value;unsigned year, mon, day, hour, min, sec, mon_len;
@@ -540,9 +540,9 @@ int x509_decode_time(time64_t *_t, size_t hdrlen,if (year %4 ==0 ) { mon_len =29 ;if (year %100 ==0 ) { - year /=100 ; -if (year %4 !=0 ) - mon_len =28 ; + mon_len =28 ; +if (year %400 ==0 ) + mon_len =29 ; } } }
crypto/keywrap.c +2 -2
@@ -212,7 +212,7 @@ static int crypto_kw_decrypt(struct blkcipher_desc *desc, SEMIBSIZE)) ret = -EBADMSG ; -memzero_explicit (&block,sizeof (struct crypto_kw_block )); +memzero_explicit (block,sizeof (struct crypto_kw_block ));return ret; }
@@ -297,7 +297,7 @@ static int crypto_kw_encrypt(struct blkcipher_desc *desc,/* establish the IV for the caller to pick up */ memcpy (desc->info, block->A,SEMIBSIZE ); -memzero_explicit (&block,sizeof (struct crypto_kw_block )); +memzero_explicit (block,sizeof (struct crypto_kw_block ));return 0 ; }
drivers/acpi/resource.c +13 -1
@@ -27,8 +27,20 @@#ifdef CONFIG_X86 #define valid_IRQ (i) (((i) != 0) && ((i) != 2)) +static inline bool acpi_iospace_resource_valid (struct resource *res) +{ +/* On X86 IO space is limited to the [0 - 64K] IO port range */ +return res->end <0x10003 ; +}#else #define valid_IRQ (i) (true) +/* +* ACPI IO descriptors on arches other than X86 contain MMIO CPU physical +* addresses mapping IO space in CPU physical address space, IO space +* resources can be placed anywhere in the 64-bit physical address space. +*/ +static inline bool +acpi_iospace_resource_valid (struct resource *res) {return true; }#endif static bool acpi_dev_resource_len_valid (u64 start,u64 end,u64 len,bool io)
@@ -127,7 +139,7 @@ static void acpi_dev_ioresource_flags(struct resource *res, u64 len,if (!acpi_dev_resource_len_valid (res->start, res->end, len, true)) res->flags |=IORESOURCE_DISABLED |IORESOURCE_UNSET ; -if (res->end >=0x10003 ) +if (!acpi_iospace_resource_valid (res)) res->flags |=IORESOURCE_DISABLED |IORESOURCE_UNSET ;if (io_decode ==ACPI_DECODE_16 )
drivers/acpi/sleep.c +1 -0
@@ -714,6 +714,7 @@ static int acpi_hibernation_enter(void)static void acpi_hibernation_leave (void ) { +pm_set_resume_via_firmware ();/* * If ACPI is not enabled by the BIOS and the boot kernel, we need to * enable it here.
drivers/block/brd.c +1 -1
@@ -341,7 +341,7 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio)if (unlikely (bio->bi_rw &REQ_DISCARD )) {if (sector & ((PAGE_SIZE >>SECTOR_SHIFT ) -1 ) || - bio->bi_iter.bi_size &PAGE_MASK ) + bio->bi_iter.bi_size & ~PAGE_MASK ) goto io_error;discard_from_brd (brd, sector, bio->bi_iter.bi_size); goto out;
drivers/block/mtip32xx/mtip32xx.c +210 -57
553 lines not on this page · raw message
drivers/block/mtip32xx/mtip32xx.h +10 -1
@@ -134,16 +134,24 @@ enum {MTIP_PF_EH_ACTIVE_BIT =1 ,/* error handling */ MTIP_PF_SE_ACTIVE_BIT =2 ,/* secure erase */ MTIP_PF_DM_ACTIVE_BIT =3 ,/* download microcde */ +MTIP_PF_TO_ACTIVE_BIT =9 ,/* timeout handling */ MTIP_PF_PAUSE_IO = ((1 <<MTIP_PF_IC_ACTIVE_BIT ) | (1 <<MTIP_PF_EH_ACTIVE_BIT ) | (1 <<MTIP_PF_SE_ACTIVE_BIT ) | - (1 <<MTIP_PF_DM_ACTIVE_BIT )), + (1 <<MTIP_PF_DM_ACTIVE_BIT ) | + (1 <<MTIP_PF_TO_ACTIVE_BIT )),MTIP_PF_SVC_THD_ACTIVE_BIT =4 ,MTIP_PF_ISSUE_CMDS_BIT =5 ,MTIP_PF_REBUILD_BIT =6 ,MTIP_PF_SVC_THD_STOP_BIT =8 , +MTIP_PF_SVC_THD_WORK = ((1 <<MTIP_PF_EH_ACTIVE_BIT ) | + (1 <<MTIP_PF_ISSUE_CMDS_BIT ) | + (1 <<MTIP_PF_REBUILD_BIT ) | + (1 <<MTIP_PF_SVC_THD_STOP_BIT ) | + (1 <<MTIP_PF_TO_ACTIVE_BIT )), +/* below are bit numbers in 'dd_flag' defined in driver_data */ MTIP_DDF_SEC_LOCK_BIT =0 , MTIP_DDF_REMOVE_PENDING_BIT = 1,
@@ -153,6 +161,7 @@ enum {MTIP_DDF_RESUME_BIT =6 ,MTIP_DDF_INIT_DONE_BIT =7 ,MTIP_DDF_REBUILD_FAILED_BIT =8 , +MTIP_DDF_REMOVAL_BIT =9 , MTIP_DDF_STOP_IO = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | (1 << MTIP_DDF_SEC_LOCK_BIT) |
drivers/bluetooth/ath3k.c +8 -0
@@ -82,6 +82,7 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x0489, 0xe05f) }, { USB_DEVICE(0x0489, 0xe076) }, { USB_DEVICE(0x0489, 0xe078) }, + { USB_DEVICE(0x0489, 0xe095) }, { USB_DEVICE(0x04c5, 0x1330) }, { USB_DEVICE(0x04CA, 0x3004) }, { USB_DEVICE(0x04CA, 0x3005) },
@@ -92,6 +93,7 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x04CA, 0x300d) }, { USB_DEVICE(0x04CA, 0x300f) }, { USB_DEVICE(0x04CA, 0x3010) }, + { USB_DEVICE(0x04CA, 0x3014) }, { USB_DEVICE(0x0930, 0x0219) }, { USB_DEVICE(0x0930, 0x021c) }, { USB_DEVICE(0x0930, 0x0220) },
@@ -113,10 +115,12 @@ static const struct usb_device_id ath3k_table[] = { { USB_DEVICE(0x13d3, 0x3362) }, { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, + { USB_DEVICE(0x13d3, 0x3395) }, { USB_DEVICE(0x13d3, 0x3402) }, { USB_DEVICE(0x13d3, 0x3408) }, { USB_DEVICE(0x13d3, 0x3423) }, { USB_DEVICE(0x13d3, 0x3432) }, + { USB_DEVICE(0x13d3, 0x3472) }, { USB_DEVICE(0x13d3, 0x3474) }, /* Atheros AR5BBU12 with sflash firmware */
@@ -144,6 +148,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe095), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
@@ -154,6 +159,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x04ca, 0x300d), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3014), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
@@ -175,10 +181,12 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3395), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },/* Atheros AR5BBU22 with sflash firmware */
drivers/bluetooth/btusb.c +4 -0
@@ -196,6 +196,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe095), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
@@ -206,6 +207,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x300d), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3014), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
@@ -227,10 +229,12 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3395), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3408), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3423), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3432), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },/* Atheros AR5BBU12 with sflash firmware */
drivers/char/tpm/tpm-chip.c +8 -6
@@ -136,11 +136,13 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, chip->cdev.owner = chip->pdev->driver->owner; chip->cdev.kobj.parent = &chip->dev.kobj; +devm_add_action (dev, (void (*)(void *)) put_device, &chip->dev); +return chip; }EXPORT_SYMBOL_GPL (tpmm_chip_alloc); -static int tpm_dev_add_device (struct tpm_chip *chip) +static int tpm_add_char_device (struct tpm_chip *chip) {int rc;
@@ -151,7 +153,6 @@ static int tpm_dev_add_device(struct tpm_chip *chip) chip->devname,MAJOR (chip->dev.devt), MINOR(chip->dev.devt), rc); -device_unregister (&chip->dev);return rc; }
@@ -162,16 +163,17 @@ static int tpm_dev_add_device(struct tpm_chip *chip) chip->devname,MAJOR (chip->dev.devt), MINOR(chip->dev.devt), rc); +cdev_del (&chip->cdev);return rc; }return rc; } -static void tpm_dev_del_device (struct tpm_chip *chip) +static void tpm_del_char_device (struct tpm_chip *chip) {cdev_del (&chip->cdev); -device_unregister (&chip->dev); +device_del (&chip->dev); }static int tpm1_chip_register (struct tpm_chip *chip)
@@ -222,7 +224,7 @@ int tpm_chip_register(struct tpm_chip *chip)tpm_add_ppi (chip); - rc =tpm_dev_add_device (chip); + rc =tpm_add_char_device (chip);if (rc) goto out_err;
@@ -274,6 +276,6 @@ void tpm_chip_unregister(struct tpm_chip *chip)sysfs_remove_link (&chip->pdev->kobj,"ppi" );tpm1_chip_unregister (chip); -tpm_dev_del_device (chip); +tpm_del_char_device (chip); }EXPORT_SYMBOL_GPL (tpm_chip_unregister);
drivers/char/tpm/tpm_crb.c +2 -2
@@ -302,11 +302,11 @@ static int crb_acpi_remove(struct acpi_device *device)struct device *dev = &device->dev;struct tpm_chip *chip =dev_get_drvdata (dev); -tpm_chip_unregister (chip); -if (chip->flags &TPM_CHIP_FLAG_TPM2 )tpm2_shutdown (chip,TPM2_SU_CLEAR ); +tpm_chip_unregister (chip); +return 0 ; }
drivers/char/tpm/tpm_eventlog.c +10 -4
@@ -232,7 +232,7 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) {struct tcpa_event *event = v;struct tcpa_event temp_event; -char *tempPtr; +char *temp_ptr;int i;memcpy (&temp_event, event,sizeof (struct tcpa_event ));
@@ -242,10 +242,16 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) temp_event.event_type =do_endian_conversion (event->event_type); temp_event.event_size =do_endian_conversion (event->event_size); - tempPtr = (char *)&temp_event; + temp_ptr = (char *) &temp_event; -for (i =0 ; i <sizeof (struct tcpa_event ) + temp_event.event_size; i++) -seq_putc (m, tempPtr[i]); +for (i =0 ; i < (sizeof (struct tcpa_event ) -1 ) ; i++) +seq_putc (m, temp_ptr[i]); + + temp_ptr = (char *) v; + +for (i = (sizeof (struct tcpa_event ) -1 ); + i < (sizeof (struct tcpa_event ) + temp_event.event_size); i++) +seq_putc (m, temp_ptr[i]);return 0 ;
drivers/clk/bcm/clk-bcm2835.c +7 -5
@@ -1107,13 +1107,15 @@ static int bcm2835_pll_divider_set_rate(struct clk_hw *hw,struct bcm2835_pll_divider *divider =bcm2835_pll_divider_from_hw (hw);struct bcm2835_cprman *cprman = divider->cprman;const struct bcm2835_pll_divider_data *data = divider->data; -u32 cm; -int ret; +u32 cm, div, max_div =1 <<A2W_PLL_DIV_BITS ; - ret = clk_divider_ops.set_rate (hw, rate, parent_rate); -if (ret) -return ret; + div =DIV_ROUND_UP_ULL (parent_rate, rate); + + div =min (div, max_div); +if (div == max_div) + div =0 ; +cprman_write (cprman, data->a2w_reg, div); cm =cprman_read (cprman, data->cm_reg);cprman_write (cprman, data->cm_reg, cm | data->load_mask);cprman_write (cprman, data->cm_reg, cm & ~data->load_mask);
drivers/clk/rockchip/clk-rk3188.c +1 -0
@@ -748,6 +748,7 @@ static const char *const rk3188_critical_clocks[] __initconst = {"hclk_peri" ,"pclk_cpu" ,"pclk_peri" , + "hclk_cpubus" };static void __init rk3188_common_clk_init (struct device_node *np)
drivers/clk/rockchip/clk-rk3368.c +24 -24
77 lines not on this page · raw message
drivers/crypto/atmel-aes.c +2 -2
@@ -2085,9 +2085,9 @@ static int atmel_aes_probe(struct platform_device *pdev) } aes_dd->io_base =devm_ioremap_resource (&pdev->dev, aes_res); -if (!aes_dd->io_base) { +if (IS_ERR (aes_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); - err = -ENOMEM ; + err =PTR_ERR (aes_dd->io_base); goto res_err; }
drivers/crypto/atmel-sha.c +2 -2
@@ -1404,9 +1404,9 @@ static int atmel_sha_probe(struct platform_device *pdev) } sha_dd->io_base =devm_ioremap_resource (&pdev->dev, sha_res); -if (!sha_dd->io_base) { +if (IS_ERR (sha_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); - err = -ENOMEM ; + err =PTR_ERR (sha_dd->io_base); goto res_err; }
drivers/crypto/atmel-tdes.c +2 -2
@@ -1417,9 +1417,9 @@ static int atmel_tdes_probe(struct platform_device *pdev) } tdes_dd->io_base =devm_ioremap_resource (&pdev->dev, tdes_res); -if (!tdes_dd->io_base) { +if (IS_ERR (tdes_dd->io_base)) {dev_err (dev,"can't ioremap\n" ); - err = -ENOMEM ; + err =PTR_ERR (tdes_dd->io_base); goto res_err; }
drivers/crypto/ccp/ccp-crypto-aes-cmac.c +36 -0
@@ -220,6 +220,39 @@ static int ccp_aes_cmac_digest(struct ahash_request *req)return ccp_aes_cmac_finup (req); } +static int ccp_aes_cmac_export (struct ahash_request *req,void *out) +{ +struct ccp_aes_cmac_req_ctx *rctx =ahash_request_ctx (req); +struct ccp_aes_cmac_exp_ctx state; + + state.null_msg = rctx->null_msg; +memcpy (state.iv, rctx->iv,sizeof (state.iv)); + state.buf_count = rctx->buf_count; +memcpy (state.buf, rctx->buf,sizeof (state.buf)); + +/* 'out' may not be aligned so memcpy from local variable */ +memcpy (out, &state,sizeof (state)); + +return 0 ; +} + +static int ccp_aes_cmac_import (struct ahash_request *req,const void *in) +{ +struct ccp_aes_cmac_req_ctx *rctx =ahash_request_ctx (req); +struct ccp_aes_cmac_exp_ctx state; + +/* 'in' may not be aligned so memcpy to local variable */ +memcpy (&state, in,sizeof (state)); + +memset (rctx,0 ,sizeof (*rctx)); + rctx->null_msg = state.null_msg; +memcpy (rctx->iv, state.iv,sizeof (rctx->iv)); + rctx->buf_count = state.buf_count; +memcpy (rctx->buf, state.buf,sizeof (rctx->buf)); + +return 0 ; +} +static int ccp_aes_cmac_setkey (struct crypto_ahash *tfm,const u8 *key,unsigned int key_len) {
@@ -352,10 +385,13 @@ int ccp_register_aes_cmac_algs(struct list_head *head) alg->final = ccp_aes_cmac_final; alg->finup = ccp_aes_cmac_finup; alg->digest = ccp_aes_cmac_digest; + alg->export = ccp_aes_cmac_export; + alg->import = ccp_aes_cmac_import; alg->setkey = ccp_aes_cmac_setkey; halg = &alg->halg; halg->digestsize =AES_BLOCK_SIZE ; + halg->statesize =sizeof (struct ccp_aes_cmac_exp_ctx ); base = &halg->base;snprintf (base->cra_name,CRYPTO_MAX_ALG_NAME ,"cmac(aes)" );
drivers/crypto/ccp/ccp-crypto-sha.c +40 -0
@@ -207,6 +207,43 @@ static int ccp_sha_digest(struct ahash_request *req)return ccp_sha_finup (req); } +static int ccp_sha_export (struct ahash_request *req,void *out) +{ +struct ccp_sha_req_ctx *rctx =ahash_request_ctx (req); +struct ccp_sha_exp_ctx state; + + state.type = rctx->type; + state.msg_bits = rctx->msg_bits; + state.first = rctx->first; +memcpy (state.ctx, rctx->ctx,sizeof (state.ctx)); + state.buf_count = rctx->buf_count; +memcpy (state.buf, rctx->buf,sizeof (state.buf)); + +/* 'out' may not be aligned so memcpy from local variable */ +memcpy (out, &state,sizeof (state)); + +return 0 ; +} + +static int ccp_sha_import (struct ahash_request *req,const void *in) +{ +struct ccp_sha_req_ctx *rctx =ahash_request_ctx (req); +struct ccp_sha_exp_ctx state; + +/* 'in' may not be aligned so memcpy to local variable */ +memcpy (&state, in,sizeof (state)); + +memset (rctx,0 ,sizeof (*rctx)); + rctx->type = state.type; + rctx->msg_bits = state.msg_bits; + rctx->first = state.first; +memcpy (rctx->ctx, state.ctx,sizeof (rctx->ctx)); + rctx->buf_count = state.buf_count; +memcpy (rctx->buf, state.buf,sizeof (rctx->buf)); + +return 0 ; +} +static int ccp_sha_setkey (struct crypto_ahash *tfm,const u8 *key,unsigned int key_len) {
@@ -403,9 +440,12 @@ static int ccp_register_sha_alg(struct list_head *head, alg->final = ccp_sha_final; alg->finup = ccp_sha_finup; alg->digest = ccp_sha_digest; + alg->export = ccp_sha_export; + alg->import = ccp_sha_import; halg = &alg->halg; halg->digestsize = def->digest_size; + halg->statesize =sizeof (struct ccp_sha_exp_ctx ); base = &halg->base;snprintf (base->cra_name,CRYPTO_MAX_ALG_NAME ,"%s" , def->name);
drivers/crypto/ccp/ccp-crypto.h +22 -0
@@ -129,6 +129,15 @@ struct ccp_aes_cmac_req_ctx {struct ccp_cmd cmd; }; +struct ccp_aes_cmac_exp_ctx { +unsigned int null_msg; + +u8 iv[AES_BLOCK_SIZE ]; + +unsigned int buf_count; +u8 buf[AES_BLOCK_SIZE ]; +}; +/***** SHA related defines *****/ #define MAX_SHA_CONTEXT_SIZE SHA256_DIGEST_SIZE#define MAX_SHA_BLOCK_SIZE SHA256_BLOCK_SIZE
@@ -171,6 +180,19 @@ struct ccp_sha_req_ctx {struct ccp_cmd cmd; }; +struct ccp_sha_exp_ctx { +enum ccp_sha_type type; + +u64 msg_bits; + +unsigned int first; + +u8 ctx[MAX_SHA_CONTEXT_SIZE ]; + +unsigned int buf_count; +u8 buf[MAX_SHA_BLOCK_SIZE ]; +}; +/***** Common Context Structure *****/ struct ccp_ctx {int (*complete)(struct crypto_async_request *req,int ret);
drivers/crypto/marvell/cesa.c +1 -1
@@ -420,7 +420,7 @@ static int mv_cesa_probe(struct platform_device *pdev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"regs" ); cesa->regs =devm_ioremap_resource (dev, res);if (IS_ERR (cesa->regs)) -return -ENOMEM ; +return PTR_ERR (cesa->regs); ret =mv_cesa_dev_dma_init (cesa);if (ret)
drivers/crypto/ux500/cryp/cryp_core.c +2 -2
@@ -1440,9 +1440,9 @@ static int ux500_cryp_probe(struct platform_device *pdev) device_data->phybase = res->start; device_data->base =devm_ioremap_resource (dev, res); -if (!device_data->base) { +if (IS_ERR (device_data->base)) {dev_err (dev,"[%s]: ioremap failed!" , __func__); - ret = -ENOMEM ; + ret =PTR_ERR (device_data->base); goto out; }
drivers/crypto/ux500/hash/hash_core.c +2 -2
@@ -1659,9 +1659,9 @@ static int ux500_hash_probe(struct platform_device *pdev) device_data->phybase = res->start; device_data->base =devm_ioremap_resource (dev, res); -if (!device_data->base) { +if (IS_ERR (device_data->base)) {dev_err (dev,"%s: ioremap() failed!\n" , __func__); - ret = -ENOMEM ; + ret =PTR_ERR (device_data->base); goto out; }spin_lock_init (&device_data->ctx_lock);
drivers/edac/amd64_edac.c +1 -1
@@ -1452,7 +1452,7 @@ static u64 f1x_get_norm_dct_addr(struct amd64_pvt *pvt, u8 range,u64 chan_off;u64 dram_base =get_dram_base (pvt, range);u64 hole_off =f10_dhar_offset (pvt); -u64 dct_sel_base_off = (pvt->dct_sel_hi &0xFFFFFC00 ) <<16 ; +u64 dct_sel_base_off = (u64)(pvt->dct_sel_hi &0xFFFFFC00 ) <<16 ;if (hi_rng) {/*
drivers/edac/sb_edac.c +10 -16
@@ -1839,8 +1839,8 @@ static void get_memory_layout(const struct mem_ctl_info *mci) edac_dbg(0, "TAD#%d: up to %u.%03u GB (0x%016Lx), socket interleave %d, memory interleave %d, TGT: %d, %d, %d, %d, reg=0x%08x\n", n_tads, gb, (mb*1000)/1024, ((u64)tmp_mb) << 20L, - (u32)TAD_SOCK(reg), - (u32)TAD_CH(reg), + (u32)(1 << TAD_SOCK(reg)), + (u32)TAD_CH(reg) + 1, (u32)TAD_TGT0(reg), (u32)TAD_TGT1(reg), (u32)TAD_TGT2(reg),
@@ -2118,7 +2118,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci, } ch_way =TAD_CH (reg) +1 ; - sck_way =TAD_SOCK (reg) +1 ; + sck_way =1 <<TAD_SOCK (reg);if (ch_way ==3 ) idx = addr >>6 ;
@@ -2175,7 +2175,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci, n_tads, addr, limit, - (u32 )TAD_SOCK (reg), + sck_way, ch_way, offset, idx,
@@ -2190,18 +2190,12 @@ static int get_memory_error_data(struct mem_ctl_info *mci, offset, addr);return -EINVAL ; } - addr -= offset; -/* Store the low bits [0:6] of the addr */ - ch_addr = addr &0x7f ; -/* Remove socket wayness and remove 6 bits */ - addr >>=6 ; - addr =div_u64 (addr, sck_xch); -#if 0 -/* Divide by channel way */ - addr = addr / ch_way; -#endif -/* Recover the last 6 bits */ - ch_addr |= addr <<6 ; + + ch_addr = addr - offset; + ch_addr >>= (6 + shiftup); + ch_addr /= ch_way * sck_way; + ch_addr <<= (6 + shiftup); + ch_addr |= addr & ((1 << (6 + shiftup)) -1 );/* * Step 3) Decode rank
drivers/firmware/broadcom/bcm47xx_nvram.c +2 -3
@@ -94,15 +94,14 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) found:__ioread32_copy (nvram_buf, header,sizeof (*header) /4 ); - header = (struct nvram_header *)nvram_buf; - nvram_len = header->len; + nvram_len = ((struct nvram_header *)(nvram_buf))->len;if (nvram_len > size) {pr_err ("The nvram size according to the header seems to be bigger than the partition on flash\n" ); nvram_len = size; }if (nvram_len >=NVRAM_SPACE ) {pr_err ("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n" , - header->len,NVRAM_SPACE -1 ); + nvram_len,NVRAM_SPACE -1 ); nvram_len =NVRAM_SPACE -1 ; }/* proceed reading data after header */
drivers/gpio/gpio-pca953x.c +4 -2
@@ -367,9 +367,11 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc,memcpy (reg_val, chip->reg_output,NBANK (chip));mutex_lock (&chip->i2c_lock);for (bank=0 ; bank<NBANK (chip); bank++) { -unsigned bankmask = mask[bank/4 ] >> ((bank %4 ) *8 ); +unsigned bankmask = mask[bank /sizeof (*mask)] >> + ((bank %sizeof (*mask)) *8 );if (bankmask) { -unsigned bankval = bits[bank/4 ] >> ((bank %4 ) *8 ); +unsigned bankval = bits[bank /sizeof (*bits)] >> + ((bank %sizeof (*bits)) *8 ); reg_val[bank] = (reg_val[bank] & ~bankmask) | bankval; } }
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c +4 -4
@@ -63,6 +63,10 @@ bool amdgpu_has_atpx(void) {return amdgpu_atpx_priv.atpx_detected; } +bool amdgpu_has_atpx_dgpu_power_cntl (void ) { +return amdgpu_atpx_priv.atpx.functions.power_cntl; +} +/** * amdgpu_atpx_call - call an ATPX method *
@@ -142,10 +146,6 @@ static void amdgpu_atpx_parse_functions(struct amdgpu_atpx_functions *f, u32 mas*/ static int amdgpu_atpx_validate (struct amdgpu_atpx *atpx) { -/* make sure required functions are enabled */ -/* dGPU power control is required */ - atpx->functions.power_cntl = true; -if (atpx->functions.px_params) {union acpi_object *info;struct atpx_px_params output;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +7 -1
@@ -62,6 +62,12 @@ static const char *amdgpu_asic_name[] = { "LAST", }; +#if defined(CONFIG_VGA_SWITCHEROO ) +bool amdgpu_has_atpx_dgpu_power_cntl (void ); +#else +static inline bool amdgpu_has_atpx_dgpu_power_cntl (void ) {return false; } +#endif +bool amdgpu_device_is_px (struct drm_device *dev) {struct amdgpu_device *adev = dev->dev_private;
@@ -1511,7 +1517,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,if (amdgpu_runtime_pm ==1 ) runtime = true; -if (amdgpu_device_is_px (ddev)) +if (amdgpu_device_is_px (ddev) &&amdgpu_has_atpx_dgpu_power_cntl ()) runtime = true;vga_switcheroo_register_client (adev->pdev, &amdgpu_switcheroo_ops, runtime);if (runtime)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +2 -2
@@ -32,8 +32,8 @@#include "oss/oss_2_4_d.h" #include "oss/oss_2_4_sh_mask.h" -#include "gmc/gmc_8_1_d.h" -#include "gmc/gmc_8_1_sh_mask.h" +#include "gmc/gmc_7_1_d.h" +#include "gmc/gmc_7_1_sh_mask.h" #include "gca/gfx_8_0_d.h" #include "gca/gfx_8_0_enum.h"
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +5 -0
@@ -241,6 +241,11 @@ static int cz_initialize_dpm_defaults(struct pp_hwmgr *hwmgr)phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_DynamicUVDState); +phm_cap_set (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_UVDDPM); +phm_cap_set (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_VCEDPM); + cz_hwmgr->cc6_settings.cpu_cc6_disable = false; cz_hwmgr->cc6_settings.cpu_pstate_disable = false; cz_hwmgr->cc6_settings.nb_pstate_switch_disable = false;
drivers/gpu/drm/radeon/atombios_encoders.c +4 -2
@@ -892,8 +892,6 @@ atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_melse args.v1.ucLaneNum =4 ; -if (ENCODER_MODE_IS_DP (args.v1.ucEncoderMode) && (dp_clock ==270000 )) - args.v1.ucConfig |=ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ ;switch (radeon_encoder->encoder_id) {case ENCODER_OBJECT_ID_INTERNAL_UNIPHY : args.v1.ucConfig =ATOM_ENCODER_CONFIG_V2_TRANSMITTER1 ;
@@ -910,6 +908,10 @@ atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_m args.v1.ucConfig |=ATOM_ENCODER_CONFIG_LINKB ; else args.v1.ucConfig |= ATOM_ENCODER_CONFIG_LINKA; + +if (ENCODER_MODE_IS_DP (args.v1.ucEncoderMode) && (dp_clock ==270000 )) + args.v1.ucConfig |=ATOM_ENCODER_CONFIG_DPLINKRATE_2_70GHZ ; +break ;case 2 :case 3 :
drivers/gpu/drm/radeon/radeon_atpx_handler.c +4 -4
@@ -62,6 +62,10 @@ bool radeon_has_atpx(void) {return radeon_atpx_priv.atpx_detected; } +bool radeon_has_atpx_dgpu_power_cntl (void ) { +return radeon_atpx_priv.atpx.functions.power_cntl; +} +/** * radeon_atpx_call - call an ATPX method *
@@ -141,10 +145,6 @@ static void radeon_atpx_parse_functions(struct radeon_atpx_functions *f, u32 mas*/ static int radeon_atpx_validate (struct radeon_atpx *atpx) { -/* make sure required functions are enabled */ -/* dGPU power control is required */ - atpx->functions.power_cntl = true; -if (atpx->functions.px_params) {union acpi_object *info;struct atpx_px_params output;
drivers/gpu/drm/radeon/radeon_device.c +7 -1
@@ -103,6 +103,12 @@ static const char radeon_family_name[][16] = { "LAST", }; +#if defined(CONFIG_VGA_SWITCHEROO ) +bool radeon_has_atpx_dgpu_power_cntl (void ); +#else +static inline bool radeon_has_atpx_dgpu_power_cntl (void ) {return false; } +#endif +#define RADEON_PX_QUIRK_DISABLE_PX (1 << 0)#define RADEON_PX_QUIRK_LONG_WAKEUP (1 << 1)
@@ -1433,7 +1439,7 @@ int radeon_device_init(struct radeon_device *rdev,* ignore it */ vga_client_register (rdev->pdev, rdev,NULL , radeon_vga_set_decode); -if (rdev->flags &RADEON_IS_PX ) +if ((rdev->flags &RADEON_IS_PX ) &&radeon_has_atpx_dgpu_power_cntl ()) runtime = true;vga_switcheroo_register_client (rdev->pdev, &radeon_switcheroo_ops, runtime);if (runtime)
drivers/gpu/drm/radeon/radeon_display.c +2 -4
@@ -1683,10 +1683,8 @@ int radeon_modeset_init(struct radeon_device *rdev)/* setup afmt */ radeon_afmt_init (rdev); -if (!list_empty (&rdev->ddev->mode_config.connector_list)) { -radeon_fbdev_init (rdev); -drm_kms_helper_poll_init (rdev->ddev); - } +radeon_fbdev_init (rdev); +drm_kms_helper_poll_init (rdev->ddev);/* do pm late init */ ret =radeon_pm_late_init (rdev);
drivers/gpu/drm/radeon/radeon_dp_mst.c +2 -10
@@ -525,17 +525,9 @@ static bool radeon_mst_mode_fixup(struct drm_encoder *encoder,drm_mode_set_crtcinfo (adjusted_mode,0 ); {struct radeon_connector_atom_dig *dig_connector; -int ret; - dig_connector = mst_enc->connector->con_priv; - ret =radeon_dp_get_dp_link_config (&mst_enc->connector->base, - dig_connector->dpcd, adjusted_mode->clock, - &dig_connector->dp_lane_count, - &dig_connector->dp_clock); -if (ret) { - dig_connector->dp_lane_count =0 ; - dig_connector->dp_clock =0 ; - } + dig_connector->dp_lane_count =drm_dp_max_lane_count (dig_connector->dpcd); + dig_connector->dp_clock =drm_dp_max_link_rate (dig_connector->dpcd);DRM_DEBUG_KMS ("dig clock %p %d %d\n" , dig_connector, dig_connector->dp_lane_count, dig_connector->dp_clock); }
drivers/gpu/drm/radeon/radeon_fb.c +15 -4
@@ -292,7 +292,8 @@ out_unref:void radeon_fb_output_poll_changed (struct radeon_device *rdev) { -drm_fb_helper_hotplug_event (&rdev->mode_info.rfbdev->helper); +if (rdev->mode_info.rfbdev) +drm_fb_helper_hotplug_event (&rdev->mode_info.rfbdev->helper); }static int radeon_fbdev_destroy (struct drm_device *dev,struct radeon_fbdev *rfbdev)
@@ -325,6 +326,10 @@ int radeon_fbdev_init(struct radeon_device *rdev)int bpp_sel =32 ;int ret; +/* don't enable fbdev if no connectors */ +if (list_empty (&rdev->ddev->mode_config.connector_list)) +return 0 ; +/* select 8 bpp console on RN50 or 16MB cards */ if (ASIC_IS_RN50 (rdev) || rdev->mc.real_vram_size <= (32 *1024 *1024 )) bpp_sel =8 ;
@@ -377,11 +382,15 @@ void radeon_fbdev_fini(struct radeon_device *rdev)void radeon_fbdev_set_suspend (struct radeon_device *rdev,int state) { -fb_set_suspend (rdev->mode_info.rfbdev->helper.fbdev, state); +if (rdev->mode_info.rfbdev) +fb_set_suspend (rdev->mode_info.rfbdev->helper.fbdev, state); }bool radeon_fbdev_robj_is_fb (struct radeon_device *rdev,struct radeon_bo *robj) { +if (!rdev->mode_info.rfbdev) +return false; +if (robj ==gem_to_radeon_bo (rdev->mode_info.rfbdev->rfb.obj))return true;return false;
@@ -389,12 +398,14 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)void radeon_fb_add_connector (struct radeon_device *rdev,struct drm_connector *connector) { -drm_fb_helper_add_one_connector (&rdev->mode_info.rfbdev->helper, connector); +if (rdev->mode_info.rfbdev) +drm_fb_helper_add_one_connector (&rdev->mode_info.rfbdev->helper, connector); }void radeon_fb_remove_connector (struct radeon_device *rdev,struct drm_connector *connector) { -drm_fb_helper_remove_one_connector (&rdev->mode_info.rfbdev->helper, connector); +if (rdev->mode_info.rfbdev) +drm_fb_helper_remove_one_connector (&rdev->mode_info.rfbdev->helper, connector); }void radeon_fbdev_restore_mode (struct radeon_device *rdev)
drivers/gpu/drm/vc4/vc4_bo.c +4 -3
@@ -499,11 +499,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,if (IS_ERR (bo))return PTR_ERR (bo); - ret =copy_from_user (bo->base.vaddr, +if (copy_from_user (bo->base.vaddr, (void __user *)(uintptr_t )args->data, - args->size); -if (ret !=0 ) + args->size)) { + ret = -EFAULT ; goto fail; + }/* Clear the rest of the memory from allocating from the BO * cache. */
drivers/hid/hid-core.c +5 -3
@@ -1891,6 +1891,7 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DUAL_ACTION) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD_CORD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },
@@ -2615,9 +2616,10 @@ int hid_add_device(struct hid_device *hdev)/* * Scan generic devices for group information */ -if (hid_ignore_special_drivers || - (!hdev->group && - !hid_match_id (hdev, hid_have_special_driver))) { +if (hid_ignore_special_drivers) { + hdev->group =HID_GROUP_GENERIC ; + }else if (!hdev->group && + !hid_match_id (hdev, hid_have_special_driver)) { ret =hid_scan_report (hdev);if (ret)hid_warn (hdev,"bad device descriptor (%d)\n" , ret);
drivers/hid/hid-multitouch.c +5 -0
@@ -396,6 +396,11 @@ static void mt_feature_mapping(struct hid_device *hdev, td->is_buttonpad = true;break ; +case 0xff0000c5 : +/* Retrieve the Win8 blob once to enable some devices */ +if (usage->usage_index ==0 ) +mt_get_feature (hdev, field->report); +break ; } }
drivers/hid/i2c-hid/i2c-hid.c +10 -6
@@ -283,17 +283,21 @@ static int i2c_hid_set_or_send_report(struct i2c_client *client, u8 reportType,u16 dataRegister =le16_to_cpu (ihid->hdesc.wDataRegister);u16 outputRegister =le16_to_cpu (ihid->hdesc.wOutputRegister);u16 maxOutputLength =le16_to_cpu (ihid->hdesc.wMaxOutputLength); +u16 size; +int args_len; +int index =0 ; + +i2c_hid_dbg (ihid,"%s\n" , __func__); + +if (data_len > ihid->bufsize) +return -EINVAL ; -/* hid_hw_* already checked that data_len < HID_MAX_BUFFER_SIZE */ -u16 size =2 /* size */ + + size =2 /* size */ + (reportID ?1 :0 )/* reportID */ + data_len/* buf */ ; -int args_len = (reportID >=0x0F ?1 :0 )/* optional third byte */ + + args_len = (reportID >=0x0F ?1 :0 )/* optional third byte */ +2 /* dataRegister */ + size/* args */ ; -int index =0 ; - -i2c_hid_dbg (ihid,"%s\n" , __func__);if (!use_data && maxOutputLength ==0 )return -ENOSYS ;
drivers/idle/intel_idle.c +86 -22
59 lines not on this page · raw message
drivers/infiniband/ulp/isert/ib_isert.c +61 -61
122 lines not on this page · raw message
drivers/infiniband/ulp/isert/ib_isert.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/srpt/ib_srpt.c +1 -58
59 lines not on this page · raw message
drivers/md/bcache/super.c +33 -13
46 lines not on this page · raw message
drivers/md/dm-cache-metadata.c +59 -39
98 lines not on this page · raw message
drivers/md/raid5.c +29 -22
51 lines not on this page · raw message
drivers/media/pci/saa7134/saa7134-video.c +12 -6
Lines of this file are not shown. View the raw message.
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +8 -13
Lines of this file are not shown. View the raw message.
drivers/mmc/host/sdhci.c +84 -58
142 lines not on this page · raw message
drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c +21 -17
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h +10 -10
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +9 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ralink/rt2x00/rt2800usb.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/scsi/NCR5380.c +59 -74
133 lines not on this page · raw message
drivers/scsi/atari_NCR5380.c +59 -74
133 lines not on this page · raw message
drivers/staging/comedi/drivers/ni_mio_common.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/staging/comedi/drivers/ni_tiocmd.c +1 -1
Lines of this file are not shown. View the raw message.
mm/memcontrol.c +40 -4
44 lines not on this page · raw message
mm/page_alloc.c +33 -13
46 lines not on this page · raw message
scripts/coccinelle/iterators/use_after_iter.cocci +1 -1
Lines of this file are not shown. View the raw message.
sound/hda/hdac_regmap.c +46 -23
69 lines not on this page · raw message
sound/pci/hda/patch_hdmi.c +33 -10
43 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.