Linux 4.18.12
Greg KH
maintainerI'm announcing the release of the 4.18.12 kernel.
All users of the 4.18 kernel series must upgrade.
The updated 4.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.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/hwmon/ina2xx | 2 Documentation/process/2.Process.rst | 2 Makefile | 2 arch/arm/boot/dts/dra7.dtsi | 4 arch/arm/boot/dts/imx7d.dtsi | 12 arch/arm/boot/dts/ls1021a.dtsi | 1 arch/arm/boot/dts/mt7623.dtsi | 3 arch/arm/boot/dts/omap4-droid4-xt894.dts | 20 - arch/arm/mach-mvebu/pmsu.c | 6 arch/arm/mach-omap2/omap_hwmod.c | 39 ++ arch/arm/mach-omap2/omap_hwmod_reset.c | 12 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 6 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 6 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 4 arch/arm64/boot/dts/renesas/salvator-common.dtsi | 4 arch/arm64/kvm/guest.c | 55 ++ arch/mips/boot/Makefile | 6 arch/powerpc/kernel/exceptions-64s.S | 4 arch/powerpc/kernel/machine_kexec.c | 7 arch/powerpc/lib/checksum_64.S | 3 arch/powerpc/mm/numa.c | 3 arch/powerpc/mm/pkeys.c | 2 arch/powerpc/platforms/powernv/pci-ioda.c | 2 arch/s390/kernel/sysinfo.c | 4 arch/s390/mm/extmem.c | 4 arch/s390/mm/pgalloc.c | 2 arch/x86/entry/entry_64.S | 4 arch/x86/events/intel/lbr.c | 32 + arch/x86/events/perf_event.h | 1 arch/x86/include/asm/fixmap.h | 10 arch/x86/include/asm/pgtable_64.h | 3 arch/x86/kernel/head64.c | 4 arch/x86/kernel/head_64.S | 16 arch/x86/kernel/tsc_msr.c | 1 arch/x86/mm/numa_emulation.c | 2 arch/x86/mm/pgtable.c | 9 arch/x86/mm/pti.c | 2 arch/x86/xen/mmu_pv.c | 8 block/elevator.c | 2 crypto/ablkcipher.c | 2 crypto/blkcipher.c | 1 drivers/acpi/button.c | 13 drivers/ata/pata_ftide010.c | 27 - drivers/block/floppy.c | 3 drivers/bluetooth/btusb.c | 1 drivers/bus/ti-sysc.c | 37 - drivers/clk/x86/clk-st.c | 2 drivers/crypto/cavium/nitrox/nitrox_dev.h | 3 drivers/crypto/cavium/nitrox/nitrox_lib.c | 1 drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 57 +-- drivers/crypto/chelsio/chtls/chtls.h | 5 drivers/crypto/chelsio/chtls/chtls_main.c | 7 drivers/edac/altera_edac.c | 3 drivers/edac/edac_mc_sysfs.c | 6 drivers/edac/i7core_edac.c | 22 - drivers/gpio/gpio-menz127.c | 4 drivers/gpio/gpio-tegra.c | 15 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 16 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 11 drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 drivers/gpu/drm/amd/amdgpu/si_dpm.c | 3 drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 10 drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 2 drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 drivers/gpu/drm/omapdrm/omap_drv.c | 2 drivers/gpu/drm/omapdrm/omap_drv.h | 2 drivers/gpu/drm/omapdrm/omap_gem.c | 15 drivers/gpu/drm/sun4i/sun4i_drv.c | 3 drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 7 drivers/gpu/drm/v3d/v3d_drv.h | 5 drivers/gpu/drm/v3d/v3d_gem.c | 4 drivers/gpu/drm/vc4/vc4_plane.c | 3 drivers/hid/hid-ntrig.c | 2 drivers/hid/i2c-hid/i2c-hid.c | 9 drivers/hwmon/adt7475.c | 14 drivers/hwmon/ina2xx.c | 13 drivers/hwtracing/intel_th/core.c | 16 drivers/i2c/busses/i2c-i801.c | 9 drivers/iio/accel/adxl345_core.c | 21 - drivers/iio/adc/ina2xx-adc.c | 17 drivers/iio/counter/104-quad-8.c | 2 drivers/infiniband/core/rw.c | 2 drivers/infiniband/core/uverbs_cmd.c | 5 drivers/infiniband/core/uverbs_main.c | 1 drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 drivers/infiniband/hw/bnxt_re/qplib_sp.c | 4 drivers/infiniband/hw/hfi1/chip.c | 6 drivers/infiniband/hw/hfi1/pio.c | 51 ++ drivers/infiniband/hw/hfi1/pio.h | 2 drivers/infiniband/hw/hfi1/user_sdma.c | 2 drivers/infiniband/hw/hfi1/verbs.c | 8 drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 drivers/infiniband/hw/mlx4/qp.c | 2 drivers/infiniband/hw/mlx5/main.c | 2 drivers/infiniband/ulp/srp/ib_srp.c | 6 drivers/input/misc/xen-kbdfront.c | 8 drivers/input/mouse/elantech.c | 2 drivers/iommu/amd_iommu.c | 2 drivers/iommu/msm_iommu.c | 16 drivers/md/md-cluster.c | 19 - drivers/media/i2c/ov772x.c | 40 +- drivers/media/i2c/soc_camera/ov772x.c | 2 drivers/media/platform/exynos4-is/fimc-isp-video.c | 11 drivers/media/platform/fsl-viu.c | 38 +- drivers/media/platform/omap3isp/isp.c | 2 drivers/media/platform/s3c-camif/camif-capture.c | 2 drivers/media/usb/tm6000/tm6000-dvb.c | 5 drivers/media/v4l2-core/v4l2-event.c | 38 +- drivers/media/v4l2-core/v4l2-fh.c | 2 drivers/misc/ibmvmc.c | 2 drivers/misc/sram.c | 13 drivers/misc/tsl2550.c | 2 drivers/misc/vmw_vmci/vmci_queue_pair.c | 4 drivers/mmc/host/android-goldfish.c | 4 drivers/mmc/host/atmel-mci.c | 12 drivers/mtd/nand/raw/atmel/nand-controller.c | 7 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 drivers/net/ethernet/hisilicon/hns/hnae.h | 6 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 9 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 11 drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 3 drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 15 drivers/net/ethernet/intel/ice/ice.h | 7 drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 25 - drivers/net/ethernet/intel/ice/ice_common.c | 27 - drivers/net/ethernet/intel/ice/ice_controlq.c | 29 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 52 ++ drivers/net/ethernet/intel/ice/ice_main.c | 98 +++-- drivers/net/ethernet/intel/ice/ice_switch.c | 4 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 26 + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 drivers/net/ethernet/qlogic/qed/qed_mcp.c | 187 ++++++++-- drivers/net/ethernet/qlogic/qed/qed_mcp.h | 27 - drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 2 drivers/net/phy/xilinx_gmii2rgmii.c | 10 drivers/net/wireless/ath/ath10k/ce.c | 2 drivers/net/wireless/ath/ath10k/htt_rx.c | 13 drivers/net/wireless/ath/ath10k/mac.c | 1 drivers/net/wireless/ath/ath10k/sdio.c | 9 drivers/net/wireless/ath/ath10k/snoc.c | 2 drivers/net/wireless/ath/ath10k/wmi.c | 8 drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 2 drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 6 drivers/net/wireless/rndis_wlan.c | 2 drivers/net/wireless/ti/wlcore/cmd.c | 6 drivers/nvme/target/fcloop.c | 3 drivers/pci/hotplug/acpiphp_glue.c | 11 drivers/platform/x86/asus-wireless.c | 23 - drivers/power/reset/vexpress-poweroff.c | 12 drivers/power/supply/axp288_charger.c | 2 drivers/power/supply/power_supply_core.c | 11 drivers/regulator/core.c | 4 drivers/regulator/of_regulator.c | 2 drivers/s390/block/dasd.c | 1 drivers/s390/block/scm_blk.c | 1 drivers/scsi/bnx2i/bnx2i_hwi.c | 2 drivers/scsi/hisi_sas/hisi_sas.h | 1 drivers/scsi/hisi_sas/hisi_sas_main.c | 6 drivers/scsi/ibmvscsi/ibmvscsi.c | 4 drivers/scsi/megaraid/megaraid_sas_base.c | 3 drivers/siox/siox-core.c | 10 drivers/spi/spi-orion.c | 77 ++-- drivers/spi/spi-rspi.c | 34 + drivers/spi/spi-sh-msiof.c | 28 + drivers/spi/spi-tegra20-slink.c | 31 + drivers/staging/android/ashmem.c | 6 drivers/staging/media/imx/imx-ic-prpencvf.c | 1 drivers/staging/media/imx/imx-media-csi.c | 1 drivers/staging/mt7621-dts/gbpc1.dts | 2 drivers/staging/mt7621-dts/mt7621.dtsi | 21 - drivers/staging/mt7621-eth/mtk_eth_soc.c | 13 drivers/staging/pi433/pi433_if.c | 7 drivers/staging/rts5208/sd.c | 2 drivers/target/iscsi/iscsi_target_tpg.c | 3 drivers/target/target_core_device.c | 22 - drivers/thermal/imx_thermal.c | 5 drivers/thermal/of-thermal.c | 7 drivers/tty/serial/8250/serial_cs.c | 6 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 10 drivers/tty/serial/fsl_lpuart.c | 3 drivers/tty/serial/imx.c | 8 drivers/tty/serial/mvebu-uart.c | 1 drivers/tty/serial/pxa.c | 3 drivers/tty/serial/sh-sci.c | 2 drivers/usb/class/cdc-wdm.c | 2 drivers/usb/common/roles.c | 15 drivers/usb/core/devio.c | 24 + drivers/usb/core/driver.c | 28 - drivers/usb/core/quirks.c | 3 drivers/usb/core/usb.c | 2 drivers/usb/musb/musb_dsps.c | 12 drivers/usb/serial/kobil_sct.c | 12 drivers/usb/wusbcore/security.c | 2 drivers/uwb/hwa-rc.c | 1 drivers/vhost/net.c | 35 + fs/dax.c | 13 fs/ext2/inode.c | 2 fs/iomap.c | 21 - fs/isofs/inode.c | 7 fs/locks.c | 7 fs/nfsd/nfs4proc.c | 1 include/linux/arm-smccc.h | 38 +- include/linux/bitfield.h | 6 include/linux/platform_data/ina2xx.h | 2 include/linux/posix-timers.h | 4 include/linux/power_supply.h | 1 include/linux/regulator/machine.h | 6 include/linux/uio.h | 2 include/media/v4l2-fh.h | 4 include/rdma/opa_addr.h | 2 kernel/bpf/sockmap.c | 11 kernel/events/hw_breakpoint.c | 57 ++- kernel/module.c | 6 kernel/time/alarmtimer.c | 7 kernel/time/posix-cpu-timers.c | 2 kernel/time/posix-timers.c | 33 + kernel/time/posix-timers.h | 2 lib/klist.c | 10 net/6lowpan/iphc.c | 1 net/ipv4/tcp_bbr.c | 38 +- net/ncsi/ncsi-netlink.c | 4 net/tls/tls_main.c | 9 sound/aoa/core/gpio-feature.c | 4 sound/pci/hda/hda_intel.c | 3 sound/soc/codecs/rt1305.c | 4 sound/soc/intel/boards/bytcr_rt5640.c | 2 sound/soc/qcom/qdsp6/q6afe.c | 6 sound/soc/sh/rcar/ssi.c | 32 + sound/soc/soc-dapm.c | 7 tools/bpf/bpftool/map_perf_ring.c | 5 tools/perf/tests/builtin-test.c | 2 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh | 6 tools/testing/selftests/net/forwarding/mirror_gre_lib.sh | 2 tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh | 6 244 files changed, 1764 insertions(+), 807 deletions(-)
Aaron Ma (1):
Input: elantech - enable middle button of touchpad on ThinkPad P72
Akinobu Mita (6):
iio: adc: ina2xx: avoid kthread_stop() with stale task_struct
iio: accel: adxl345: convert address field usage in iio_chan_spec
media: s3c-camif: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
media: soc_camera: ov772x: correct setting of banding filter
media: ov772x: add checks for register read errors
media: ov772x: allow i2c controllers without I2C_FUNC_PROTOCOL_MANGLING
Akshu Agrawal (1):
clk: x86: Set default parent to 48Mhz
Alagu Sankar (2):
ath10k: sdio: use same endpoint id for all packets in a bundle
ath10k: sdio: set skb len for all rx packets
Alan Stern (3):
USB: fix error handling in usb_driver_claim_interface()
USB: handle NULL config in usb_find_alt_setting()
USB: remove LPM management from usb_driver_claim_interface()
Alexander Shishkin (2):
intel_th: Fix device removal logic
intel_th: Fix resource handling for ACPI glue layer
Alexey Kardashevskiy (1):
powerpc/powernv/ioda2: Reduce upper limit for DMA window size
Alexey Khoroshilov (1):
media: fsl-viu: fix error handling in viu_of_probe()
Alistair Strachan (1):
staging: android: ashmem: Fix mmap size validation
Andreas Gruenbacher (1):
iomap: complete partial direct I/O writes synchronously
Andy Shevchenko (1):
x86/tsc: Add missing header to tsc_msr.c
Andy Whitcroft (1):
floppy: Do not copy a kernel pointer to user memory in FDGETPRM ioctl
Anirudh Venkataramanan (3):
ice: Fix multiple static analyser warnings
ice: Fix bugs in control queue processing
ice: Fix a few null pointer dereference issues
Anson Huang (1):
thermal: of-thermal: disable passive polling when thermal zone is disabled
Anton Vasilyev (1):
uwb: hwa-rc: fix memory leak at probe
Bart Van Assche (5):
include/rdma/opa_addr.h: Fix an endianness issue
scsi: target/iscsi: Make iscsit_ta_authentication() respect the output buffer size
scsi: klist: Make it safe to use klists in atomic context
scsi: target: Avoid that EXTENDED COPY commands trigger lock inversion IB/srp: Avoid that sg_reset -d ${srp_device} triggers an infinite loop
Ben Greear (1):
ath10k: protect ath10k_htt_rx_ring_free with rx_ring.lock
Benjamin Tissoires (1):
power: remove possible deadlock when unregistering power_supply
Bin Liu (1):
usb: musb: dsps: do not disable CPPI41 irq in driver teardown
Bo Chen (2):
e1000: check on netif_running() before calling e1000_up()
e1000: ensure to free old tx/rx rings in set_ringparam()
Bob Copeland (1):
ath10k: use locked skb_dequeue for rx completions
Brandon Maier (2):
net: phy: xgmiitorgmii: Check read_status results
net: phy: xgmiitorgmii: Check phy_driver ready before accessing
Breno Leitao (1):
scsi: ibmvscsi: Improve strings handling
Brett Creeley (1):
ice: Set VLAN flags correctly
Brian Norris (1):
ath10k: snoc: use correct bus-specific pointer in RX retry
Christian König (2):
drm/amdgpu: fix VM clearing for the root PD
drm/amdgpu: fix preamble handling
Christophe JAILLET (2):
serial: pxa: Fix an error handling path in 'serial_pxa_probe()' EDAC, altera: Fix an error handling path in altr_s10_sdram_probe()
Christophe Leroy (2):
serial: cpm_uart: return immediately from console poll
powerpc: fix csum_ipv6_magic() on little endian platforms
Colin Ian King (2):
staging: rts5208: fix missing error check on call to rtsx_write_register
ath10k: fix memory leak of tpc_stats
Damien Le Moal (1):
block: fix deadline elevator drain for zoned block devices
Dan Carpenter (7):
vmci: type promotion bug in qp_host_get_user_memory() RDMA/bnxt_re: Fix a couple off by one bugs
RDMA/bnxt_re: Fix a bunch of off by one bugs in qplib_fp.c IB/core: type promotion bug in rdma_rw_init_one_mr()
ASoC: qdsp6: qdafe: fix some off by one bugs
rndis_wlan: potential buffer overflow in rndis_wlan_auth_indication()
hwmon: (adt7475) Make adt7475_read_word() return errors
Dan Williams (1):
x86/numa_emulation: Fix emulated-to-physical node mapping
Daniel Borkmann (2):
bpf, sockmap: fix sock_hash_alloc and reject zero-sized keys bpf, sockmap: fix sock hash count in alloc_sock_hash_elem
Daniel Vetter (1):
drm/omap: gem: Fix mm_list locking
Dave Gerlach (1):
ARM: hwmod: RTC: Don't assume lock/unlock will be called with irq enabled
Dave Jiang (1):
uaccess: Fix is_source param for check_copy_size() in copy_to_iter_mcsafe()
Dave Martin (1):
arm64: KVM: Tighten guest core register access from userspace
Dmitry Osipenko (1):
gpio: tegra: Fix tegra_gpio_irq_set_type()
Emily Deng (2):
amdgpu: fix multi-process hang issue drm/amdgpu: Need to set moved to true when evict bo
Eric Anholt (2):
drm/v3d: Take a lock across GPU scheduler job creation and queuing. drm/vc4: Add missing formats to vc4_format_mod_supported().
Eric Sandeen (1):
isofs: reject hardware sector size > 2048 bytes
Ethan Tuttle (1):
ARM: mvebu: declare asm symbols as character arrays in pmsu.c
Feng Tang (1):
x86/mm: Expand static page table for fixmap space
Frederic Weisbecker (1):
perf/hw_breakpoint: Split attribute parse and commit
Fuyun Liang (1):
net: hns3: Fix for mailbox message truncated problem
Gaku Inami (1):
spi: sh-msiof: Fix invalid SPI use during system suspend
Ganesh Goudar (2):
cxgb4: Fix the condition to check if the card is T5
crypto: chtls - fix null dereference chtls_free_uld()
Geert Uytterhoeven (5):
serial: sh-sci: Stop RX FIFO timer during port shutdown
arm64: dts: renesas: salvator-common: Fix adv7482 decimal unit addresses
ASoC: rt1305: Use ULL suffixes for 64-bit constants
spi: rspi: Fix invalid SPI use during system suspend
spi: rspi: Fix interrupted DMA transfers
Greg Kroah-Hartman (1):
Linux 4.18.12
Guoqing Jiang (1):
md-cluster: clear another node's suspend_area after the copy is finished
Gustavo A. R. Silva (1):
drm/amd/display/dc/dce: Fix multiple potential integer overflows
Hans de Goede (2):
power: supply: axp288_charger: Fix initial constant_charge_current value
ASoC: Intel: bytcr_rt5640: Fix Acer Iconia 8 over-current detect threshold
Hari Bathini (1):
powerpc/kdump: Handle crashkernel memory reservation failure
Harry Pan (1):
usb: core: safely deal with the dynamic quirk lists
Heikki Krogerus (1):
usb: roles: Take care of driver module reference counting
Heiko Carstens (1):
s390/sysinfo: add missing #ifdef CONFIG_PROC_FS
Hiromitsu Yamasaki (1):
spi: sh-msiof: Fix handling of write value for SISTR register
Huazhong Tan (3):
net: hns: fix length and page_offset overflow when CONFIG_ARM64_64K_PAGES
net: hns: fix skb->truesize underestimation
net: hns3: fix page_offset overflow when CONFIG_ARM64_64K_PAGES
Hugo Lefeuvre (1):
staging: pi433: fix race condition in pi433_ioctl
Ira Weiny (1):
IB/hfi1: Fix SL array bounds check
J. Bruce Fields (1):
nfsd: fix corrupted reply to badly ordered compound
Jacob Keller (3):
ice: Report stats for allocated queues via ethtool stats
ice: Use order_base_2 to calculate higher power of 2
i40e: fix condition of WARN_ONCE for stat strings
James Smart (1):
nvme-fcloop: Fix dropped LS's to removed target port
Jan Beulich (1):
x86/entry/64: Add two more instruction suffixes
Jan Kiszka (1):
serial: mvebu-uart: Fix reporting of effective CSIZE to userspace
Jan Kundrát (1):
spi: orion: fix CS GPIO handling again
Javier Martinez Canillas (1):
media: omap3isp: zero-initialize the isp cam_xclk{a,b} initial data
Jean-Christophe Dubois (1):
thermal: i.MX: Allow thermal probe to fail gracefully in case of bad calibration.
Jernej Skrabec (2):
drm/sun4i: Enable DW HDMI PHY clock drm/sun4i: Fix releasing node when enumerating enpoints
Jesse Brandeburg (1):
ice: Fix potential return of uninitialized value
Jessica Yu (1):
module: exclude SHN_UNDEF symbols from kallsyms api
Jian-Hong Pan (1):
Bluetooth: Add a new Realtek 8723DE ID 0bda:b009
Johan Hovold (4):
misc: sram: enable clock before registering regions
USB: serial: kobil_sct: fix modem-status error handling EDAC, i7core: Fix memleaks and use-after-free on probe and remove
EDAC: Fix memleak in module init error path
Johannes Berg (1):
bitfield: fix *_encode_bits()
John Fastabend (2):
tls: possible hang when do_tcp_sendpages hits sndbuf is full case
bpf: sockmap: write_space events need to be passed to TCP handler
João Paulo Rechi Vita (1):
platform/x86: asus-wireless: Fix uninitialized symbol usage
Julia Lawall (1):
usb: wusbcore: security: cast sizeof to int for comparison
Kai-Heng Feng (1):
ALSA: hda: Add AZX_DCAPS_PM_RUNTIME for AMD Raven Ridge
Kamal Heib (1):
staging: mt7621-eth: Fix memory leak in mtk_add_mac() error path
Kan Liang (1):
perf/x86/intel/lbr: Fix incomplete LBR call stack
Kevin Hilman (1):
ARM: dts: dra7: fix DCAN node addresses
Kevin Yang (2):
tcp_bbr: add bbr_check_probe_rtt_done() helper
tcp_bbr: in restart from idle, see if we should exit PROBE_RTT
Konstantin Khorenko (1):
fs/lock: skip lock owner pid translation in case we are in init_pid_ns
Kuninori Morimoto (1):
ASoC: rsnd: SSI parent cares SWSP bit
Laurent Pinchart (1):
arm64: dts: renesas: Fix VSPD registers range
Leon Romanovsky (2):
RDMA/i40w: Hold read semaphore while looking after VMA RDMA/uverbs: Don't overwrite NULL pointer with ZERO_SIZE_PTR
Leonard Crestez (1):
Revert "ARM: dts: imx7d: Invert legacy PCI irq mapping"
Liam Girdwood (1):
ASoC: dapm: Fix potential DAI widget pointer deref when linking DAIs
Linus Walleij (1):
ata: ftide010: Add a quirk for SQ201
Lorenzo Bianconi (1):
mt76x2: fix mrr idx/count estimation in mt76x2_mac_fill_tx_status()
Lothar Felten (1):
hwmon: (ina2xx) fix sysfs shunt resistor read access
Ludovic Desroches (2):
mmc: atmel-mci: fix bad logic of sg_copy_{from,to}_buffer conversion
mmc: android-goldfish: fix bad logic of sg_copy_{from,to}_buffer conversion
Maor Gottlieb (1):
IB/mlx5: Fix GRE flow specification
Marc Zyngier (3):
arm/arm64: smccc-1.1: Make return values unsigned long arm/arm64: smccc-1.1: Handle function result as parameters
arm64: KVM: Sanitize PSTATE.M when being set from userspace
Marcel Ziswiler (1):
spi: tegra20-slink: explicitly enable/disable clock
Marek Szyprowski (1):
regulator: Fix 'do-nothing' value for regulators without suspend state
Martyna Szapar (1):
i40e: Fix for Tx timeouts when interface is brought up if DCB is enabled
Masahiro Yamada (1):
MIPS: boot: fix build rule of vmlinux.its.S
Matt Ranostay (1):
tsl2550: fix lux1_input error in low light
Matthew Wilcox (1):
filesystem-dax: Fix use of zero page
Maxime Ripard (1):
drm/vc4: plane: Expand the lower bits by repeating the higher bits
Michael Bringmann (1):
powerpc/pseries: Fix unitialized timer reset on migration
Michael J. Ruhl (3):
IB/hfi1: Invalid user input can result in crash IB/hfi1: Fix context recovery when PBC has an UnsupportedVL IB/hfi1: Fix destroy_qp hang after a link down
Michael Neuling (1):
KVM: PPC: Book3S HV: Fix guest r11 corruption with POWER9 TM workarounds
Michael Scott (1):
6lowpan: iphc: reset mac_header after decompress to fix panic
Mika Westerberg (2):
ACPI / hotplug / PCI: Don't scan for non-hotplug bridges if slot is not bridge
i2c: i801: Allow ACPI AML access I/O ports not reserved for SMBus
Nadav Amit (1):
gpio: Fix wrong rounding in gpio-menz127
Nicholas Mc Guire (1):
ALSA: snd-aoa: add of_node_put() in error path
Niklas Cassel (2):
iommu/msm: Don't call iommu_device_{,un}link from atomic context
ath10k: transmit queued frames after processing rx packets
Oleksandr Andrushchenko (1):
Input: xen-kbdfront - fix multi-touch XenStore node's locations
Oliver Neukum (2):
USB: usbdevfs: sanitize flags more
USB: usbdevfs: restore warning for nonsensical flags
Pavel Machek (1):
ARM: dts: omap4-droid4: fix vibrations on Droid 4
Peter Rosin (1):
mtd: rawnand: atmel: add module param to avoid using dma
Peter Seiderer (1):
media: staging/imx: fill vb2_v4l2_buffer field entry
Petr Machata (1):
selftests: forwarding: Tweak tc filters for mirror-to-gretap tests
Preethi Banala (1):
ice: Clean control queues only when they are initialized
Quentin Monnet (1):
tools: bpftool: return from do_event_pipe() on bad arguments
Randy Dunlap (2):
Documentation/process: fix reST table border error x86/pti: Fix section mismatch warning/error
Ravi Chandra Sadineni (1):
ACPI / button: increment wakeup count only when notified
Rex Zhu (2):
drm/amdgpu: Enable/disable gfx PG feature in rlc safe mode drm/amdgpu: Update power state at the end of smu hw_init.
Rosen Penev (1):
staging: mt7621-dts: Fix remaining pcie warnings
Sakari Ailus (1):
media: v4l: event: Prevent freeing event subscriptions while accessed
Samuel Mendoza-Jonas (1):
net/ncsi: Fixup .dumpit message flags and ID check in Netlink handler
Sandipan Das (1):
perf tests: Fix indexing when invoking subtests
Sebastian Andrzej Siewior (1):
Revert "usb: cdc-wdm: Fix a sleep-in-atomic-context bug in service_outstanding_interrupt()"
Sebastian Basierski (1):
ixgbe: fix driver behaviour after issuing VFLR
Shivasharan S (1):
scsi: megaraid_sas: Update controller info during resume
Srikanth Jampala (1):
crypto: cavium/nitrox - fix for command corruption in queue full case with backlog submissions.
Stafford Horne (1):
crypto: skcipher - Fix -Wstringop-truncation warnings
Stefan Agner (2):
brcmsmac: fix wrap around in conversion from constant to s16
tty: serial: lpuart: avoid leaking struct tty_struct
Stephen Boyd (1):
HID: i2c-hid: Use devm to allocate i2c_hid struct
Steve Wise (1):
RDMA/uverbs: Atomically flush and mark closed the comp event queue
Sudeep Holla (1):
power: vexpress: fix corruption in notifier registration
Sylwester Nawrocki (1):
media: exynos4-is: Prevent NULL pointer dereference in __isp_video_try_fmt()
Tarick Bedeir (1):
IB/mlx4: Test port number before querying type.
Thiago Jung Bauermann (1):
powerpc/pkeys: Fix reading of ibm, processor-storage-keys property
Thomas Gleixner (3):
alarmtimer: Prevent overflow for relative nanosleep
posix-timers: Make forward callback return s64
posix-timers: Sanitize overrun handling
Tomer Tayar (4):
qed: Wait for ready indication before rereading the shmem
qed: Wait for MCP halt and resume commands to take place
qed: Prevent a possible deadlock during driver load and unload
qed: Avoid sending mailbox commands when MFW is not responsive
Tony Lindgren (6):
wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()
ARM: OMAP2+: Fix null hwmod for ti-sysc debug
ARM: OMAP2+: Fix module address for modules using mpu_rt_idx
bus: ti-sysc: Fix module register ioremap for larger offsets
bus: ti-sysc: Fix no_console_suspend handling
ARM: dts: omap4-droid4: Fix emmc errors seen on some devices
Toshi Kani (1):
ext2, dax: set ext2_dax_aops for dax files
Toshiaki Makita (1):
vhost_net: Avoid tx vring kicks during busyloop
Uwe Kleine-König (2):
siox: don't create a thread without starting it
serial: imx: restore handshaking irq for imx1
Vasily Gorbik (4):
s390/mm: correct allocate_pgste proc_handler callback s390/dasd: correct numa_node in dasd_alloc_queue s390/scm_blk: correct numa_node in scm_blk_dev_setup s390/extmem: fix gcc 8 stringop-overflow warning
Viresh Kumar (2):
ARM: dts: ls1021a: Add missing cooling device properties for CPUs
arm: dts: mediatek: Add missing cooling device properties for CPUs
Wei Yongjun (1):
misc: ibmvmc: Use GFP_ATOMIC under spin lock
Wesley Chalmers (1):
drm/amd/display: fix use of uninitialized memory
William Breathitt Gray (1):
iio: 104-quad-8: Fix off-by-one error in register selection
Xiaofei Tan (1):
scsi: hisi_sas: Fix the conflict between dev gone and host reset
Yu Zhao (1):
regulator: fix crash caused by null driver data
YueHaibing (1):
ath10k: fix incorrect size of dma_free_coherent in ath10k_ce_alloc_src_ring_64
Yunsheng Lin (3):
net: hns3: Fix for mac pause not disable in pfc mode
net: hns3: Fix warning bug when doing lp selftest
net: hns3: Fix get_vector ops in hclgevf_main module
Zhen Lei (1):
iommu/amd: make sure TLB to be flushed before IOVA freed
Zhouyang Jia (4):
drivers/tty: add error handling for pcmcia_loop_config
media: tm6000: add error handling for dvb_register_adapter
HID: hid-ntrig: add error handling for sysfs_create_group
scsi: bnx2i: add error handling for ioremap_nocache
Greg KH
maintainerDocumentation/hwmon/ina2xx +1 -1
@@ -32,7 +32,7 @@ Supported chips: Datasheet: Publicly available at the Texas Instruments website http://www.ti.com/ -Author: Lothar Felten <[email protected]> +Author: Lothar Felten <[email protected]> Description -----------
Documentation/process/2.Process.rst +1 -1
@@ -134,7 +134,7 @@ and their maintainers are: 4.4 Greg Kroah-Hartman (very long-term stable kernel) 4.9 Greg Kroah-Hartman 4.14 Greg Kroah-Hartman - ====== ====================== =========================== + ====== ====================== ============================== The selection of a kernel for long-term support is purely a matter of a maintainer having the need and the time to maintain that release. There
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 18 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = Merciless Moray
arch/arm/boot/dts/dra7.dtsi +2 -2
@@ -1893,7 +1893,7 @@ }; }; - dcan1: can@481cc000 { + dcan1: can@4ae3c000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan1"; reg = <0x4ae3c000 0x2000>;
@@ -1903,7 +1903,7 @@ status = "disabled"; }; - dcan2: can@481d0000 { + dcan2: can@48480000 { compatible = "ti,dra7-d_can"; ti,hwmods = "dcan2"; reg = <0x48480000 0x2000>;
arch/arm/boot/dts/imx7d.dtsi +8 -4
@@ -125,10 +125,14 @@ interrupt-names = "msi"; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; - interrupt-map = <0 0 0 1 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>; + /* + * Reference manual lists pci irqs incorrectly + * Real hardware ordering is same as imx6: D+MSI, C, B, A + */ + interrupt-map = <0 0 0 1 &intc GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &intc GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7D_PCIE_CTRL_ROOT_CLK>, <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>, <&clks IMX7D_PCIE_PHY_ROOT_CLK>;
arch/arm/boot/dts/ls1021a.dtsi +1 -0
@@ -84,6 +84,7 @@ device_type = "cpu"; reg = <0xf01>; clocks = <&clockgen 1 0>; + #cooling-cells = <2>; }; };
arch/arm/boot/dts/mt7623.dtsi +3 -0
@@ -92,6 +92,7 @@ <&apmixedsys CLK_APMIXED_MAINPLL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; };
@@ -103,6 +104,7 @@ <&apmixedsys CLK_APMIXED_MAINPLL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; };
@@ -114,6 +116,7 @@ <&apmixedsys CLK_APMIXED_MAINPLL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; clock-frequency = <1300000000>; }; };
arch/arm/boot/dts/omap4-droid4-xt894.dts +10 -10
@@ -351,7 +351,7 @@ &mmc2 { vmmc-supply = <&vsdio>; bus-width = <8>; - non-removable; + ti,non-removable; }; &mmc3 {
@@ -618,15 +618,6 @@ OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */ >; }; -}; - -&omap4_pmx_wkup { - usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins { - /* gpio_wk0 */ - pinctrl-single,pins = < - OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3) - >; - }; vibrator_direction_pin: pinmux_vibrator_direction_pin { pinctrl-single,pins = <
@@ -641,6 +632,15 @@ }; }; +&omap4_pmx_wkup { + usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins { + /* gpio_wk0 */ + pinctrl-single,pins = < + OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3) + >; + }; +}; + /* * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for * uart1 wakeirq.
arch/arm/mach-mvebu/pmsu.c +3 -3
@@ -116,8 +116,8 @@ void mvebu_pmsu_set_cpu_boot_addr(int hw_cpu, void *boot_addr) PMSU_BOOT_ADDR_REDIRECT_OFFSET(hw_cpu)); } -extern unsigned char mvebu_boot_wa_start; -extern unsigned char mvebu_boot_wa_end; +extern unsigned char mvebu_boot_wa_start[]; +extern unsigned char mvebu_boot_wa_end[];/* * This function sets up the boot address workaround needed for SMP
@@ -130,7 +130,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target, phys_addr_t resume_addr_reg) {void __iomem *sram_virt_base; -u32 code_len = &mvebu_boot_wa_end - &mvebu_boot_wa_start; +u32 code_len = mvebu_boot_wa_end - mvebu_boot_wa_start;mvebu_mbus_del_window (BOOTROM_BASE ,BOOTROM_SIZE ); mvebu_mbus_add_window_by_id(crypto_eng_target, crypto_eng_attribute,
arch/arm/mach-omap2/omap_hwmod.c +38 -1
@@ -2160,6 +2160,37 @@ static int of_dev_hwmod_lookup(struct device_node *np,return -ENODEV ; } +/** +* omap_hwmod_fix_mpu_rt_idx - fix up mpu_rt_idx register offsets +* +* @oh: struct omap_hwmod * +* @np: struct device_node * +* +* Fix up module register offsets for modules with mpu_rt_idx. +* Only needed for cpsw with interconnect target module defined +* in device tree while still using legacy hwmod platform data +* for rev, sysc and syss registers. +* +* Can be removed when all cpsw hwmod platform data has been +* dropped. +*/ +static void omap_hwmod_fix_mpu_rt_idx (struct omap_hwmod *oh, +struct device_node *np, +struct resource *res) +{ +struct device_node *child =NULL ; +int error; + + child =of_get_next_child (np, child); +if (!child) +return ; + + error =of_address_to_resource (child, oh->mpu_rt_idx, res); +if (error) +pr_err ("%s: error mapping mpu_rt_idx: %i\n" , + __func__, error); +} +/** * omap_hwmod_parse_module_range - map module IO range from device tree * @oh: struct omap_hwmod *
@@ -2220,7 +2251,13 @@ int omap_hwmod_parse_module_range(struct omap_hwmod *oh, size =be32_to_cpup (ranges);pr_debug ("omap_hwmod: %s %s at 0x%llx size 0x%llx\n" , - oh->name, np->name, base, size); + oh ? oh->name :"" , np->name, base, size); + +if (oh && oh->mpu_rt_idx) { +omap_hwmod_fix_mpu_rt_idx (oh, np, res); + +return 0 ; + } res->start = base; res->end = base + size -1 ;
arch/arm/mach-omap2/omap_hwmod_reset.c +8 -4
@@ -92,11 +92,13 @@ static void omap_rtc_wait_not_busy(struct omap_hwmod *oh)*/ void omap_hwmod_rtc_unlock (struct omap_hwmod *oh) { -local_irq_disable (); +unsigned long flags; + +local_irq_save (flags);omap_rtc_wait_not_busy (oh);omap_hwmod_write (OMAP_RTC_KICK0_VALUE , oh,OMAP_RTC_KICK0_REG );omap_hwmod_write (OMAP_RTC_KICK1_VALUE , oh,OMAP_RTC_KICK1_REG ); -local_irq_enable (); +local_irq_restore (flags); }/**
@@ -110,9 +112,11 @@ void omap_hwmod_rtc_unlock(struct omap_hwmod *oh)*/ void omap_hwmod_rtc_lock (struct omap_hwmod *oh) { -local_irq_disable (); +unsigned long flags; + +local_irq_save (flags);omap_rtc_wait_not_busy (oh);omap_hwmod_write (0x0 , oh,OMAP_RTC_KICK0_REG );omap_hwmod_write (0x0 , oh,OMAP_RTC_KICK1_REG ); -local_irq_enable (); +local_irq_restore (flags); }
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +1 -1
@@ -80,7 +80,7 @@ vspd3: vsp@fea38000 { compatible = "renesas,vsp2"; - reg = <0 0xfea38000 0 0x8000>; + reg = <0 0xfea38000 0 0x5000>; interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 620>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/r8a7795.dtsi +3 -3
@@ -2530,7 +2530,7 @@ vspd0: vsp@fea20000 { compatible = "renesas,vsp2"; - reg = <0 0xfea20000 0 0x8000>; + reg = <0 0xfea20000 0 0x5000>; interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 623>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2541,7 +2541,7 @@ vspd1: vsp@fea28000 { compatible = "renesas,vsp2"; - reg = <0 0xfea28000 0 0x8000>; + reg = <0 0xfea28000 0 0x5000>; interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 622>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2552,7 +2552,7 @@ vspd2: vsp@fea30000 { compatible = "renesas,vsp2"; - reg = <0 0xfea30000 0 0x8000>; + reg = <0 0xfea30000 0 0x5000>; interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 621>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/r8a7796.dtsi +3 -3
@@ -2212,7 +2212,7 @@ vspd0: vsp@fea20000 { compatible = "renesas,vsp2"; - reg = <0 0xfea20000 0 0x8000>; + reg = <0 0xfea20000 0 0x5000>; interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 623>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -2223,7 +2223,7 @@ vspd1: vsp@fea28000 { compatible = "renesas,vsp2"; - reg = <0 0xfea28000 0 0x8000>; + reg = <0 0xfea28000 0 0x5000>; interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 622>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -2234,7 +2234,7 @@ vspd2: vsp@fea30000 { compatible = "renesas,vsp2"; - reg = <0 0xfea30000 0 0x8000>; + reg = <0 0xfea30000 0 0x5000>; interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 621>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/r8a77965.dtsi +2 -2
@@ -1397,7 +1397,7 @@ vspd0: vsp@fea20000 { compatible = "renesas,vsp2"; - reg = <0 0xfea20000 0 0x8000>; + reg = <0 0xfea20000 0 0x5000>; interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 623>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
@@ -1416,7 +1416,7 @@ vspd1: vsp@fea28000 { compatible = "renesas,vsp2"; - reg = <0 0xfea28000 0 0x8000>; + reg = <0 0xfea28000 0 0x5000>; interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 622>; power-domains = <&sysc R8A77965_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/r8a77970.dtsi +1 -1
@@ -776,7 +776,7 @@ vspd0: vsp@fea20000 { compatible = "renesas,vsp2"; - reg = <0 0xfea20000 0 0x8000>; + reg = <0 0xfea20000 0 0x5000>; interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 623>; power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/r8a77995.dtsi +2 -2
@@ -699,7 +699,7 @@ vspd0: vsp@fea20000 { compatible = "renesas,vsp2"; - reg = <0 0xfea20000 0 0x8000>; + reg = <0 0xfea20000 0 0x5000>; interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 623>; power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
@@ -709,7 +709,7 @@ vspd1: vsp@fea28000 { compatible = "renesas,vsp2"; - reg = <0 0xfea28000 0 0x8000>; + reg = <0 0xfea28000 0 0x5000>; interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 622>; power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
arch/arm64/boot/dts/renesas/salvator-common.dtsi +2 -2
@@ -440,7 +440,7 @@ }; }; - port@10 { + port@a { reg = <10>; adv7482_txa: endpoint {
@@ -450,7 +450,7 @@ }; }; - port@11 { + port@b { reg = <11>; adv7482_txb: endpoint {
arch/arm64/kvm/guest.c +54 -1
89 lines not on this page · raw message
arch/mips/boot/Makefile +4 -2
@@ -118,10 +118,12 @@ ifeq ($(ADDR_BITS),64) itb_addr_cells = 2 endif +targets += vmlinux.its.S + quiet_cmd_its_cat = CAT $@ - cmd_its_cat = cat $^ >$@ + cmd_its_cat = cat $(filter-out $(PHONY), $^) >$@ -$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) +$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) FORCE $(call if_changed,its_cat) quiet_cmd_cpp_its_S = ITS $@
arch/powerpc/kernel/exceptions-64s.S +2 -2
@@ -1321,9 +1321,7 @@ EXC_REAL_BEGIN(denorm_exception_hv, 0x1500, 0x100) #ifdef CONFIG_PPC_DENORMALISATION mfspr r10,SPRN_HSRR1 - mfspr r11,SPRN_HSRR0 /* save HSRR0 */ andis. r10,r10,(HSRR1_DENORM)@h /* denorm? */ - addi r11,r11,-4 /* HSRR0 is next instruction */ bne+ denorm_assist #endif
@@ -1389,6 +1387,8 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) */ XVCPSGNDP32(32) denorm_done: + mfspr r11,SPRN_HSRR0 + subi r11,r11,4 mtspr SPRN_HSRR0,r11 mtcrf 0x80,r9 ld r9,PACA_EXGEN+EX_R9(r13)
arch/powerpc/kernel/machine_kexec.c +6 -1
@@ -188,7 +188,12 @@ void __init reserve_crashkernel(void) (unsigned long )(crashk_res.start >>20 ), (unsigned long)(memblock_phys_mem_size() >> 20)); -memblock_reserve (crashk_res.start, crash_size); +if (!memblock_is_region_memory (crashk_res.start, crash_size) || +memblock_reserve (crashk_res.start, crash_size)) { +pr_err ("Failed to reserve memory for crashkernel!\n" ); + crashk_res.start = crashk_res.end =0 ; +return ; + } }int overlaps_crashkernel (unsigned long start,unsigned long size)
arch/powerpc/lib/checksum_64.S +3 -0
@@ -443,6 +443,9 @@ _GLOBAL(csum_ipv6_magic) addc r0, r8, r9 ld r10, 0(r4) ld r11, 8(r4) +#ifdef CONFIG_CPU_LITTLE_ENDIAN + rotldi r5, r5, 8 +#endif adde r0, r0, r10 add r5, r5, r7 adde r0, r0, r11
arch/powerpc/mm/numa.c +2 -1
@@ -1452,7 +1452,8 @@ static struct timer_list topology_timer;static void reset_topology_timer (void ) { -mod_timer (&topology_timer, jiffies + topology_timer_secs *HZ ); +if (vphn_enabled) +mod_timer (&topology_timer, jiffies + topology_timer_secs *HZ ); }#ifdef CONFIG_SMP
arch/powerpc/mm/pkeys.c +1 -1
@@ -44,7 +44,7 @@ static void scan_pkey_feature(void)* Since any pkey can be used for data or execute, we will just treat * all keys as equal and track them as one entity. */ - pkeys_total =be32_to_cpu (vals[0 ]); + pkeys_total = vals[0 ]; pkeys_devtree_defined = true; }
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -2841,7 +2841,7 @@ static long pnv_pci_ioda2_table_alloc_pages(int nid, __u64 bus_offset, level_shift = entries_shift +3 ; level_shift =max_t (unsigned, level_shift,PAGE_SHIFT ); -if ((level_shift -3 ) * levels + page_shift >=60 ) +if ((level_shift -3 ) * levels + page_shift >=55 )return -EINVAL ;/* Allocate TCE table */
arch/s390/kernel/sysinfo.c +4 -0
@@ -59,6 +59,8 @@ int stsi(void *sysinfo, int fc, int sel1, int sel2) }EXPORT_SYMBOL (stsi); +#ifdef CONFIG_PROC_FS +static bool convert_ext_name (unsigned char encoding,char *name,size_t len) {switch (encoding) {
@@ -301,6 +303,8 @@ static int __init sysinfo_create_proc(void) }device_initcall (sysinfo_create_proc); +#endif /* CONFIG_PROC_FS */ +/* * Service levels interface. */
arch/s390/mm/extmem.c +2 -2
@@ -80,7 +80,7 @@ struct qin64 {struct dcss_segment {struct list_head list;char dcss_name[8 ]; -char res_name[15 ]; +char res_name[16 ];unsigned long start_addr;unsigned long end;atomic_t ref_count;
@@ -433,7 +433,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned longmemcpy (&seg->res_name, seg->dcss_name,8 );EBCASC (seg->res_name,8 ); seg->res_name[8 ] ='\0' ; -strncat (seg->res_name," (DCSS)" ,7 ); +strlcat (seg->res_name," (DCSS)" ,sizeof (seg->res_name)); seg->res->name = seg->res_name; rc = seg->vm_segtype; if (rc == SEG_TYPE_SC ||
arch/s390/mm/pgalloc.c +1 -1
@@ -28,7 +28,7 @@ static struct ctl_table page_table_sysctl[] = { .data = &page_table_allocate_pgste, .maxlen = sizeof(int), .mode = S_IRUGO | S_IWUSR, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, .extra1 = &page_table_allocate_pgste_min, .extra2 = &page_table_allocate_pgste_max, },
arch/x86/entry/entry_64.S +2 -2
@@ -92,7 +92,7 @@ END(native_usergs_sysret64) .endm .macro TRACE_IRQS_IRETQ_DEBUG - bt $9, EFLAGS(%rsp) /* interrupts off? */ + btl $9, EFLAGS(%rsp) /* interrupts off? */ jnc 1f TRACE_IRQS_ON_DEBUG 1:
@@ -701,7 +701,7 @@ retint_kernel: #ifdef CONFIG_PREEMPT /* Interrupts are off */ /* Check if we need preemption */ - bt $9, EFLAGS(%rsp) /* were interrupts off? */ + btl $9, EFLAGS(%rsp) /* were interrupts off? */ jnc 1f 0: cmpl $0, PER_CPU_VAR(__preempt_count) jnz 1f
arch/x86/events/intel/lbr.c +26 -6
@@ -346,7 +346,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx) mask = x86_pmu.lbr_nr -1 ; tos = task_ctx->tos; -for (i =0 ; i < tos; i++) { +for (i =0 ; i < task_ctx->valid_lbrs; i++) { lbr_idx = (tos - i) & mask;wrlbr_from (lbr_idx, task_ctx->lbr_from[i]);wrlbr_to (lbr_idx, task_ctx->lbr_to[i]);
@@ -354,6 +354,15 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx)if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO )wrmsrl (MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]); } + +for (; i < x86_pmu.lbr_nr; i++) { + lbr_idx = (tos - i) & mask; +wrlbr_from (lbr_idx,0 ); +wrlbr_to (lbr_idx,0 ); +if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO ) +wrmsrl (MSR_LBR_INFO_0 + lbr_idx,0 ); + } +wrmsrl (x86_pmu.lbr_tos, tos); task_ctx->lbr_stack_state =LBR_NONE ; }
@@ -361,7 +370,7 @@ static void __intel_pmu_lbr_restore(struct x86_perf_task_context *task_ctx)static void __intel_pmu_lbr_save (struct x86_perf_task_context *task_ctx) {unsigned lbr_idx, mask; -u64 tos; +u64 tos, from;int i;if (task_ctx->lbr_callstack_users ==0 ) {
@@ -371,13 +380,17 @@ static void __intel_pmu_lbr_save(struct x86_perf_task_context *task_ctx) mask = x86_pmu.lbr_nr -1 ; tos =intel_pmu_lbr_tos (); -for (i =0 ; i < tos; i++) { +for (i =0 ; i < x86_pmu.lbr_nr; i++) { lbr_idx = (tos - i) & mask; - task_ctx->lbr_from[i] =rdlbr_from (lbr_idx); + from =rdlbr_from (lbr_idx); +if (!from) +break ; + task_ctx->lbr_from[i] = from; task_ctx->lbr_to[i] =rdlbr_to (lbr_idx);if (x86_pmu.intel_cap.lbr_format ==LBR_FORMAT_INFO )rdmsrl (MSR_LBR_INFO_0 + lbr_idx, task_ctx->lbr_info[i]); } + task_ctx->valid_lbrs = i; task_ctx->tos = tos; task_ctx->lbr_stack_state =LBR_VALID ; }
@@ -531,7 +544,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc)*/ static void intel_pmu_lbr_read_64 (struct cpu_hw_events *cpuc) { -bool need_info = false; +bool need_info = false, call_stack = false;unsigned long mask = x86_pmu.lbr_nr -1 ;int lbr_format = x86_pmu.intel_cap.lbr_format;u64 tos =intel_pmu_lbr_tos ();
@@ -542,7 +555,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)if (cpuc->lbr_sel) { need_info = !(cpuc->lbr_sel->config &LBR_NO_INFO );if (cpuc->lbr_sel->config &LBR_CALL_STACK ) - num = tos; + call_stack = true; }for (i =0 ; i < num; i++) {
@@ -555,6 +568,13 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) from =rdlbr_from (lbr_idx); to =rdlbr_to (lbr_idx); +/* +* Read LBR call stack entries +* until invalid entry (0s) is detected. +*/ +if (call_stack && !from) +break ; +if (lbr_format ==LBR_FORMAT_INFO && need_info) {u64 info;
arch/x86/events/perf_event.h +1 -0
@@ -648,6 +648,7 @@ struct x86_perf_task_context {u64 lbr_to[MAX_LBR_ENTRIES ];u64 lbr_info[MAX_LBR_ENTRIES ];int tos; +int valid_lbrs;int lbr_callstack_users;int lbr_stack_state; };
arch/x86/include/asm/fixmap.h +10 -0
@@ -14,6 +14,16 @@#ifndef _ASM_X86_FIXMAP_H#define _ASM_X86_FIXMAP_H +/* +* Exposed to assembly code for setting up initial page tables. Cannot be +* calculated in assembly code (fixmap entries are an enum), but is sanity +* checked in the actual fixmap C code to make sure that the fixmap is +* covered fully. +*/ +#define FIXMAP_PMD_NUM 2 +/* fixmap starts downwards from the 507th entry in level2_fixmap_pgt */ +#define FIXMAP_PMD_TOP 507 +#ifndef __ASSEMBLY__#include <linux/kernel.h> #include <asm/acpi.h>
arch/x86/include/asm/pgtable_64.h +2 -1
@@ -14,6 +14,7 @@#include <asm/processor.h> #include <linux/bitops.h> #include <linux/threads.h> +#include <asm/fixmap.h> extern p4d_t level4_kernel_pgt[512 ];extern p4d_t level4_ident_pgt[512 ];
@@ -22,7 +23,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 pte_t level1_fixmap_pgt[512 *FIXMAP_PMD_NUM ];extern pgd_t init_top_pgt[];#define swapper_pg_dir init_top_pgt
arch/x86/kernel/head64.c +3 -1
@@ -35,6 +35,7 @@#include <asm/bootparam_utils.h> #include <asm/microcode.h> #include <asm/kasan.h> +#include <asm/fixmap.h> /* * Manage page tables very early on.
@@ -165,7 +166,8 @@ unsigned long __head __startup_64(unsigned long physaddr, pud[511 ] += load_delta; pmd =fixup_pointer (level2_fixmap_pgt, physaddr); - pmd[506 ] += load_delta; +for (i =FIXMAP_PMD_TOP ; i >FIXMAP_PMD_TOP -FIXMAP_PMD_NUM ; i--) + pmd[i] += load_delta;/* * Set up the identity mapping for the switchover. These
arch/x86/kernel/head_64.S +12 -4
@@ -24,6 +24,7 @@ #include "../entry/calling.h" #include <asm/export.h> #include <asm/nospec-branch.h> +#include <asm/fixmap.h> #ifdef CONFIG_PARAVIRT #include <asm/asm-offsets.h>
@@ -445,13 +446,20 @@ NEXT_PAGE(level2_kernel_pgt) KERNEL_IMAGE_SIZE/PMD_SIZE) NEXT_PAGE(level2_fixmap_pgt) - .fill 506,8,0 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE_NOENC - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ - .fill 5,8,0 + .fill (512 - 4 - FIXMAP_PMD_NUM),8,0 + pgtno = 0 + .rept (FIXMAP_PMD_NUM) + .quad level1_fixmap_pgt + (pgtno << PAGE_SHIFT) - __START_KERNEL_map \ + + _PAGE_TABLE_NOENC; + pgtno = pgtno + 1 + .endr + /* 6 MB reserved space + a 2MB hole */ + .fill 4,8,0 NEXT_PAGE(level1_fixmap_pgt) + .rept (FIXMAP_PMD_NUM) .fill 512,8,0 + .endr #undef PMDS
arch/x86/kernel/tsc_msr.c +1 -0
@@ -12,6 +12,7 @@#include <asm/setup.h> #include <asm/apic.h> #include <asm/param.h> +#include <asm/tsc.h> #define MAX_NUM_FREQS 9
arch/x86/mm/numa_emulation.c +1 -1
@@ -61,7 +61,7 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, eb->nid = nid;if (emu_nid_to_phys[nid] ==NUMA_NO_NODE ) - emu_nid_to_phys[nid] = nid; + emu_nid_to_phys[nid] = pb->nid; pb->start += size;if (pb->start >= pb->end) {
arch/x86/mm/pgtable.c +9 -0
@@ -577,6 +577,15 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) {unsigned long address =__fix_to_virt (idx); +#ifdef CONFIG_X86_64 +/* +* Ensure that the static initial page tables are covering the +* fixmap completely. +*/ +BUILD_BUG_ON (__end_of_permanent_fixed_addresses > + (FIXMAP_PMD_NUM *PTRS_PER_PTE )); +#endif +if (idx >= __end_of_fixed_addresses) {BUG ();return ;
arch/x86/mm/pti.c +1 -1
@@ -239,7 +239,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address)* * Returns a pointer to a PTE on success, or NULL on failure. */ -static __init pte_t *pti_user_pagetable_walk_pte (unsigned long address) +static pte_t *pti_user_pagetable_walk_pte (unsigned long address) {gfp_t gfp = (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);pmd_t *pmd;
arch/x86/xen/mmu_pv.c +6 -2
@@ -1908,7 +1908,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)/* L3_k[511] -> level2_fixmap_pgt */ convert_pfn_mfn (level3_kernel_pgt); -/* L3_k[511][506] -> level1_fixmap_pgt */ +/* L3_k[511][508-FIXMAP_PMD_NUM ... 507] -> level1_fixmap_pgt */ convert_pfn_mfn (level2_fixmap_pgt);/* We get [511][511] and have Xen's version of level2_kernel_pgt */
@@ -1953,7 +1953,11 @@ 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 ); + +for (i =0 ; i <FIXMAP_PMD_NUM ; i++) { +set_page_prot (level1_fixmap_pgt + i *PTRS_PER_PTE , +PAGE_KERNEL_RO ); + }/* Pin down new L4 */ pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
block/elevator.c +1 -1
@@ -609,7 +609,7 @@ void elv_drain_elevator(struct request_queue *q)while (e->type->ops.sq.elevator_dispatch_fn (q,1 )) ; -if (q->nr_sorted && printed++ <10 ) { +if (q->nr_sorted && !blk_queue_is_zoned (q) && printed++ <10 ) {printk (KERN_ERR "%s: forced dispatching is broken " "(nr_sorted=%u), please report this\n" , q->elevator->type->elevator_name, q->nr_sorted);
crypto/ablkcipher.c +2 -0
@@ -368,6 +368,7 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"ablkcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_ablkcipher.geniv ?:"<default>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
@@ -442,6 +443,7 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"givcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_ablkcipher.geniv ?:"<built-in>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_ablkcipher.min_keysize;
crypto/blkcipher.c +1 -0
@@ -510,6 +510,7 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)strncpy (rblkcipher.type,"blkcipher" ,sizeof (rblkcipher.type));strncpy (rblkcipher.geniv, alg->cra_blkcipher.geniv ?:"<default>" ,sizeof (rblkcipher.geniv)); + rblkcipher.geniv[sizeof (rblkcipher.geniv) -1 ] ='\0' ; rblkcipher.blocksize = alg->cra_blocksize; rblkcipher.min_keysize = alg->cra_blkcipher.min_keysize;
drivers/acpi/button.c +7 -6
@@ -235,9 +235,6 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) button->last_time =ktime_get (); } -if (state) -acpi_pm_wakeup_event (&device->dev); - ret =blocking_notifier_call_chain (&acpi_lid_notifier, state, device);if (ret ==NOTIFY_DONE ) ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
@@ -366,7 +363,8 @@ int acpi_lid_open(void) }EXPORT_SYMBOL (acpi_lid_open); -static int acpi_lid_update_state (struct acpi_device *device) +static int acpi_lid_update_state (struct acpi_device *device, +bool signal_wakeup) {int state;
@@ -374,6 +372,9 @@ static int acpi_lid_update_state(struct acpi_device *device)if (state <0 )return state; +if (state && signal_wakeup) +acpi_pm_wakeup_event (&device->dev); +return acpi_lid_notify_state (device, state); }
@@ -384,7 +385,7 @@ static void acpi_lid_initialize_state(struct acpi_device *device) (void )acpi_lid_notify_state (device,1 );break ;case ACPI_BUTTON_LID_INIT_METHOD : - (void )acpi_lid_update_state (device); + (void )acpi_lid_update_state (device, false);break ;case ACPI_BUTTON_LID_INIT_IGNORE :default :
@@ -409,7 +410,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) users = button->input->users;mutex_unlock (&button->input->mutex);if (users) -acpi_lid_update_state (device); +acpi_lid_update_state (device, true); }else {int keycode;
drivers/ata/pata_ftide010.c +17 -10
@@ -256,14 +256,12 @@ static struct ata_port_operations pata_ftide010_port_ops = { .qc_issue = ftide010_qc_issue, }; -static struct ata_port_info ftide010_port_info[] = { - { - .flags =ATA_FLAG_SLAVE_POSS , - .mwdma_mask =ATA_MWDMA2 , - .udma_mask =ATA_UDMA6 , - .pio_mask =ATA_PIO4 , - .port_ops = &pata_ftide010_port_ops, - }, +static struct ata_port_info ftide010_port_info = { + .flags =ATA_FLAG_SLAVE_POSS , + .mwdma_mask =ATA_MWDMA2 , + .udma_mask =ATA_UDMA6 , + .pio_mask =ATA_PIO4 , + .port_ops = &pata_ftide010_port_ops, };#if IS_ENABLED (CONFIG_SATA_GEMINI )
@@ -349,6 +347,7 @@ static int pata_ftide010_gemini_cable_detect(struct ata_port *ap) }static int pata_ftide010_gemini_init (struct ftide010 *ftide, +struct ata_port_info *pi,bool is_ata1) {struct device *dev = ftide->dev;
@@ -373,7 +372,13 @@ static int pata_ftide010_gemini_init(struct ftide010 *ftide,/* Flag port as SATA-capable */ if (gemini_sata_bridge_enabled (sg, is_ata1)) - ftide010_port_info[0 ].flags |=ATA_FLAG_SATA ; + pi->flags |=ATA_FLAG_SATA ; + +/* This device has broken DMA, only PIO works */ +if (of_machine_is_compatible ("itian,sq201" )) { + pi->mwdma_mask =0 ; + pi->udma_mask =0 ; + }/* * We assume that a simple 40-wire cable is used in the PATA mode.
@@ -435,6 +440,7 @@ static int pata_ftide010_gemini_init(struct ftide010 *ftide, }#else static int pata_ftide010_gemini_init (struct ftide010 *ftide, +struct ata_port_info *pi,bool is_ata1) {return -ENOTSUPP ;
@@ -446,7 +452,7 @@ static int pata_ftide010_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; -const struct ata_port_info pi = ftide010_port_info[0 ]; +struct ata_port_info pi = ftide010_port_info;const struct ata_port_info *ppi[] = { &pi,NULL };struct ftide010 *ftide;struct resource *res;
@@ -490,6 +496,7 @@ static int pata_ftide010_probe(struct platform_device *pdev)* are ATA0. This will also set up the cable types. */ ret =pata_ftide010_gemini_init (ftide, + &pi, (res->start ==0x63400000 ));if (ret) goto err_dis_clk;
drivers/block/floppy.c +3 -0
@@ -3470,6 +3470,9 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int (struct floppy_struct **)&outparam);if (ret)return ret; +memcpy (&inparam.g, outparam, + offsetof(struct floppy_struct , name)); + outparam = &inparam.g;break ;case FDMSGON :UDP ->flags |=FTD_MSG ;
drivers/bluetooth/btusb.c +1 -0
@@ -374,6 +374,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x7392, 0xa611), .driver_info = BTUSB_REALTEK }, /* Additional Realtek 8723DE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK }, { USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },/* Additional Realtek 8821AE Bluetooth devices */
drivers/bus/ti-sysc.c +17 -20
@@ -490,32 +490,29 @@ static int sysc_check_registers(struct sysc *ddata)/** * syc_ioremap - ioremap register space for the interconnect target module -* @ddata: deviec driver data +* @ddata: device driver data * * Note that the interconnect target module registers can be anywhere -* within the first child device address space. For example, SGX has -* them at offset 0x1fc00 in the 32MB module address space. We just -* what we need around the interconnect target module registers. +* within the interconnect target module range. For example, SGX has +* them at offset 0x1fc00 in the 32MB module address space. And cpsw +* has them at offset 0x1200 in the CPSW_WR child. Usually the +* the interconnect target module registers are at the beginning of +* the module range though. */ static int sysc_ioremap (struct sysc *ddata) { -u32 size =0 ; - -if (ddata->offsets[SYSC_SYSSTATUS ] >=0 ) - size = ddata->offsets[SYSC_SYSSTATUS ]; -else if (ddata->offsets[SYSC_SYSCONFIG ] >=0 ) - size = ddata->offsets[SYSC_SYSCONFIG ]; -else if (ddata->offsets[SYSC_REVISION ] >=0 ) - size = ddata->offsets[SYSC_REVISION ]; -else -return -EINVAL ; +int size; - size &=0xfff00 ; - size +=SZ_256 ; + size =max3 (ddata->offsets[SYSC_REVISION ], + ddata->offsets[SYSC_SYSCONFIG ], + ddata->offsets[SYSC_SYSSTATUS ]); + +if (size <0 || (size +sizeof (u32)) > ddata->module_size) +return -EINVAL ; ddata->module_va =devm_ioremap (ddata->dev, ddata->module_pa, - size); + size +sizeof (u32));if (!ddata->module_va)return -EIO ;
@@ -1178,10 +1175,10 @@ static int sysc_child_suspend_noirq(struct device *dev)if (!pm_runtime_status_suspended (dev)) { error =pm_generic_runtime_suspend (dev);if (error) { -dev_err (dev,"%s error at %i: %i\n" , - __func__, __LINE__, error); +dev_warn (dev,"%s busy at %i: %i\n" , + __func__, __LINE__, error); -return error; +return 0 ; } error =sysc_runtime_suspend (ddata->dev);
drivers/clk/x86/clk-st.c +1 -1
@@ -46,7 +46,7 @@ static int st_clk_probe(struct platform_device *pdev) clk_oscout1_parents,ARRAY_SIZE (clk_oscout1_parents), 0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL); -clk_set_parent (hws[ST_CLK_MUX ]->clk, hws[ST_CLK_25M ]->clk); +clk_set_parent (hws[ST_CLK_MUX ]->clk, hws[ST_CLK_48M ]->clk); hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux", 0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
drivers/crypto/cavium/nitrox/nitrox_dev.h +2 -1
@@ -35,6 +35,7 @@ struct nitrox_cmdq {/* requests in backlog queues */ atomic_t backlog_count; +int write_idx;/* command size 32B/64B */ u8 instr_size;u8 qno;
@@ -87,7 +88,7 @@ struct nitrox_bh {struct bh_data *slc; }; -/* NITROX-5 driver state */ +/* NITROX-V driver state */ #define NITROX_UCODE_LOADED 0#define NITROX_READY 1
drivers/crypto/cavium/nitrox/nitrox_lib.c +1 -0
@@ -36,6 +36,7 @@ static int cmdq_common_init(struct nitrox_cmdq *cmdq) cmdq->head =PTR_ALIGN (cmdq->head_unaligned,PKT_IN_ALIGN ); cmdq->dma =PTR_ALIGN (cmdq->dma_unaligned,PKT_IN_ALIGN ); cmdq->qsize = (qsize +PKT_IN_ALIGN ); + cmdq->write_idx =0 ;spin_lock_init (&cmdq->response_lock);spin_lock_init (&cmdq->cmdq_lock);
drivers/crypto/cavium/nitrox/nitrox_reqmgr.c +32 -25
115 lines not on this page · raw message
drivers/crypto/chelsio/chtls/chtls.h +5 -0
@@ -96,6 +96,10 @@ enum csk_flags { CSK_CONN_INLINE, /* Connection on HW */ }; +enum chtls_cdev_state { +CHTLS_CDEV_STATE_UP =1 +}; +struct listen_ctx {struct sock *lsk;struct chtls_dev *cdev;
@@ -146,6 +150,7 @@ struct chtls_dev {unsigned int send_page_order;int max_host_sndbuf;struct key_map kmap; +unsigned int cdev_state; };struct chtls_hws {
drivers/crypto/chelsio/chtls/chtls_main.c +5 -2
@@ -160,6 +160,7 @@ static void chtls_register_dev(struct chtls_dev *cdev) tlsdev->hash = chtls_create_hash; tlsdev->unhash = chtls_destroy_hash;tls_register_device (&cdev->tlsdev); + cdev->cdev_state =CHTLS_CDEV_STATE_UP ; }static void chtls_unregister_dev (struct chtls_dev *cdev)
@@ -281,8 +282,10 @@ static void chtls_free_all_uld(void)struct chtls_dev *cdev, *tmp;mutex_lock (&cdev_mutex); -list_for_each_entry_safe (cdev, tmp, &cdev_list, list) -chtls_free_uld (cdev); +list_for_each_entry_safe (cdev, tmp, &cdev_list, list) { +if (cdev->cdev_state ==CHTLS_CDEV_STATE_UP ) +chtls_free_uld (cdev); + }mutex_unlock (&cdev_mutex); }
drivers/edac/altera_edac.c +2 -1
@@ -730,7 +730,8 @@ static int altr_s10_sdram_probe(struct platform_device *pdev) S10_DDR0_IRQ_MASK)) {edac_printk (KERN_ERR ,EDAC_MC ,"Error clearing SDRAM ECC count\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto err2; } if (regmap_update_bits(drvdata->mc_vbase, priv->ecc_irq_en_offset,
drivers/edac/edac_mc_sysfs.c +3 -3
@@ -1075,14 +1075,14 @@ int __init edac_mc_sysfs_init(void) err =device_add (mci_pdev);if (err <0 ) - goto out_dev_free; + goto out_put_device;edac_dbg (0 ,"device %s created\n" ,dev_name (mci_pdev));return 0 ; - out_dev_free: -kfree (mci_pdev); + out_put_device: +put_device (mci_pdev); out:return err; }
drivers/edac/i7core_edac.c +15 -7
@@ -1177,15 +1177,14 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) rc =device_add (pvt->addrmatch_dev);if (rc <0 ) -return rc; + goto err_put_addrmatch;if (!pvt->is_registered) { pvt->chancounts_dev =kzalloc (sizeof (*pvt->chancounts_dev),GFP_KERNEL );if (!pvt->chancounts_dev) { -put_device (pvt->addrmatch_dev); -device_del (pvt->addrmatch_dev); -return -ENOMEM ; + rc = -ENOMEM ; + goto err_del_addrmatch; } pvt->chancounts_dev->type = &all_channel_counts_type;
@@ -1199,9 +1198,18 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) rc =device_add (pvt->chancounts_dev);if (rc <0 ) -return rc; + goto err_put_chancounts; }return 0 ; + +err_put_chancounts: +put_device (pvt->chancounts_dev); +err_del_addrmatch: +device_del (pvt->addrmatch_dev); +err_put_addrmatch: +put_device (pvt->addrmatch_dev); + +return rc; }static void i7core_delete_sysfs_devices (struct mem_ctl_info *mci)
@@ -1211,11 +1219,11 @@ static void i7core_delete_sysfs_devices(struct mem_ctl_info *mci)edac_dbg (1 ,"\n" );if (!pvt->is_registered) { -put_device (pvt->chancounts_dev);device_del (pvt->chancounts_dev); +put_device (pvt->chancounts_dev); } -put_device (pvt->addrmatch_dev);device_del (pvt->addrmatch_dev); +put_device (pvt->addrmatch_dev); }/****************************************************************************
drivers/gpio/gpio-menz127.c +2 -2
@@ -56,9 +56,9 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, rnd =fls (debounce) -1 ;if (rnd && (debounce &BIT (rnd -1 ))) - debounce =round_up (debounce,MEN_Z127_DB_MIN_US ); + debounce =roundup (debounce,MEN_Z127_DB_MIN_US );else - debounce =round_down (debounce,MEN_Z127_DB_MIN_US ); + debounce =rounddown (debounce,MEN_Z127_DB_MIN_US );if (debounce >MEN_Z127_DB_MAX_US ) debounce =MEN_Z127_DB_MAX_US ;
drivers/gpio/gpio-tegra.c +8 -7
@@ -323,13 +323,6 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)return -EINVAL ; } - ret =gpiochip_lock_as_irq (&tgi->gc, gpio); -if (ret) { -dev_err (tgi->dev, -"unable to lock Tegra GPIO %u as IRQ\n" , gpio); -return ret; - } -spin_lock_irqsave (&bank->lvl_lock[port], flags); val =tegra_gpio_readl (tgi,GPIO_INT_LVL (tgi, gpio));
@@ -342,6 +335,14 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)tegra_gpio_mask_write (tgi,GPIO_MSK_OE (tgi, gpio), gpio,0 );tegra_gpio_enable (tgi, gpio); + ret =gpiochip_lock_as_irq (&tgi->gc, gpio); +if (ret) { +dev_err (tgi->dev, +"unable to lock Tegra GPIO %u as IRQ\n" , gpio); +tegra_gpio_disable (tgi, gpio); +return ret; + } +if (type & (IRQ_TYPE_LEVEL_LOW |IRQ_TYPE_LEVEL_HIGH ))irq_set_handler_locked (d, handle_level_irq);else if (type & (IRQ_TYPE_EDGE_FALLING |IRQ_TYPE_EDGE_RISING ))
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +9 -7
@@ -975,13 +975,9 @@ static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,if (r)return r; -if (chunk_ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) { - parser->job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT ; -if (!parser->ctx->preamble_presented) { - parser->job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT_FIRST ; - parser->ctx->preamble_presented = true; - } - } +if (chunk_ib->flags &AMDGPU_IB_FLAG_PREAMBLE ) + parser->job->preamble_status |= +AMDGPU_PREAMBLE_IB_PRESENT ;if (parser->job->ring && parser->job->ring != ring)return -EINVAL ;
@@ -1206,6 +1202,12 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_cs_post_dependencies (p); +if ((job->preamble_status &AMDGPU_PREAMBLE_IB_PRESENT ) && + !p->ctx->preamble_presented) { + job->preamble_status |=AMDGPU_PREAMBLE_IB_PRESENT_FIRST ; + p->ctx->preamble_presented = true; + } + cs->out.handle = seq; job->uf_sequence = seq;
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +2 -1
@@ -164,8 +164,10 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,return r; } + need_ctx_switch = ring->current_ctx != fence_ctx;if (ring->funcs->emit_pipeline_sync && job && ((tmp =amdgpu_sync_get_fence (&job->sched_sync,NULL )) || + (amdgpu_sriov_vf (adev) && need_ctx_switch) ||amdgpu_vm_need_pipeline_sync (ring, job))) { need_pipe_sync = true;dma_fence_put (tmp);
@@ -196,7 +198,6 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, } skip_preamble = ring->current_ctx == fence_ctx; - need_ctx_switch = ring->current_ctx != fence_ctx;if (job && ring->funcs->emit_cntxcntl) {if (need_ctx_switch) status |=AMDGPU_HAVE_CTX_SWITCH ;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -1
@@ -123,6 +123,7 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,* is validated on next vm use to avoid fault. * */ list_move_tail (&base->vm_status, &vm->evicted); + base->moved = true; }/**
@@ -303,7 +304,6 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,uint64_t addr;int r; - addr =amdgpu_bo_gpu_offset (bo); entries =amdgpu_bo_size (bo) /8 ;if (pte_support_ats) {
@@ -335,6 +335,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,if (r) goto error; + addr =amdgpu_bo_gpu_offset (bo);if (ats_entries) {uint64_t ats_value;
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +10 -1
@@ -5614,6 +5614,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,if (amdgpu_sriov_vf (adev))return 0 ; +if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG | +AMD_PG_SUPPORT_RLC_SMU_HS | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_GFX_DMG )) + adev->gfx.rlc.funcs->enter_safe_mode (adev);switch (adev->asic_type) {case CHIP_CARRIZO :case CHIP_STONEY :
@@ -5663,7 +5668,11 @@ static int gfx_v8_0_set_powergating_state(void *handle,default :break ; } - +if (adev->pg_flags & (AMD_PG_SUPPORT_GFX_SMG | +AMD_PG_SUPPORT_RLC_SMU_HS | +AMD_PG_SUPPORT_CP | +AMD_PG_SUPPORT_GFX_DMG )) + adev->gfx.rlc.funcs->exit_safe_mode (adev);return 0 ; }
drivers/gpu/drm/amd/amdgpu/kv_dpm.c +1 -3
@@ -1354,8 +1354,6 @@ static int kv_dpm_enable(struct amdgpu_device *adev)return ret; } -kv_update_current_ps (adev, adev->pm.dpm.boot_ps); -if (adev->irq.installed &&amdgpu_is_internal_thermal_sensor (adev->pm.int_thermal_type)) { ret =kv_set_thermal_temperature_range (adev,KV_TEMP_RANGE_MIN ,KV_TEMP_RANGE_MAX );
@@ -3061,7 +3059,7 @@ static int kv_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); - +amdgpu_pm_compute_clocks (adev);return ret; }
drivers/gpu/drm/amd/amdgpu/si_dpm.c +1 -2
@@ -6887,7 +6887,6 @@ static int si_dpm_enable(struct amdgpu_device *adev)si_enable_auto_throttle_source (adev,AMDGPU_DPM_AUTO_THROTTLE_SRC_THERMAL , true);si_thermal_start_thermal_controller (adev); -ni_update_current_ps (adev, boot_ps);return 0 ; }
@@ -7764,7 +7763,7 @@ static int si_dpm_hw_init(void *handle)else adev->pm.dpm_enabled = true;mutex_unlock (&adev->pm.mutex); - +amdgpu_pm_compute_clocks (adev);return ret; }
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +5 -5
@@ -133,7 +133,7 @@ static bool calculate_fb_and_fractional_fb_divider(uint64_t feedback_divider; feedback_divider = - (uint64_t )(target_pix_clk_khz * ref_divider * post_divider); + (uint64_t )target_pix_clk_khz * ref_divider * post_divider; feedback_divider *=10 ;/* additional factor, since we divide by 10 afterwards */ feedback_divider *= (uint64_t )(calc_pll_cs->fract_fb_divider_factor);
@@ -145,8 +145,8 @@ static bool calculate_fb_and_fractional_fb_divider(* of fractional feedback decimal point and the fractional FB Divider precision * is 2 then the equation becomes (ullfeedbackDivider + 5*100) / (10*100))*/ - feedback_divider += (uint64_t ) - (5 * calc_pll_cs->fract_fb_divider_precision_factor); + feedback_divider +=5ULL * + calc_pll_cs->fract_fb_divider_precision_factor; feedback_divider =div_u64 (feedback_divider, calc_pll_cs->fract_fb_divider_precision_factor *10 );
@@ -203,8 +203,8 @@ static bool calc_fb_divider_checking_tolerance( &fract_feedback_divider);/*Actual calculated value*/ - actual_calc_clk_khz = (uint64_t )(feedback_divider * - calc_pll_cs->fract_fb_divider_factor) + + actual_calc_clk_khz = (uint64_t )feedback_divider * + calc_pll_cs->fract_fb_divider_factor + fract_feedback_divider; actual_calc_clk_khz *= calc_pll_cs->ref_freq_khz; actual_calc_clk_khz =
drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c +2 -0
@@ -239,6 +239,8 @@ void dml1_extract_rq_regs(extract_rq_sizing_regs (mode_lib, &(rq_regs->rq_regs_l), rq_param.sizing.rq_l);if (rq_param.yuv420)extract_rq_sizing_regs (mode_lib, &(rq_regs->rq_regs_c), rq_param.sizing.rq_c); +else +memset (&(rq_regs->rq_regs_c),0 ,sizeof (rq_regs->rq_regs_c)); rq_regs->rq_regs_l.swath_height =dml_log2 (rq_param.dlg.rq_l.swath_height); rq_regs->rq_regs_c.swath_height =dml_log2 (rq_param.dlg.rq_c.swath_height);
drivers/gpu/drm/omapdrm/omap_debugfs.c +2 -0
@@ -37,7 +37,9 @@ static int gem_show(struct seq_file *m, void *arg)return ret;seq_printf (m,"All Objects:\n" ); +mutex_lock (&priv->list_lock);omap_gem_describe_objects (&priv->obj_list, m); +mutex_unlock (&priv->list_lock);mutex_unlock (&dev->struct_mutex);
drivers/gpu/drm/omapdrm/omap_drv.c +1 -1
@@ -540,7 +540,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) priv->omaprev = soc ? (unsigned int )soc->data :0 ; priv->wq =alloc_ordered_workqueue ("omapdrm" ,0 ); -spin_lock_init (&priv->list_lock); +mutex_init (&priv->list_lock);INIT_LIST_HEAD (&priv->obj_list);/* Allocate and initialize the DRM device. */
drivers/gpu/drm/omapdrm/omap_drv.h +1 -1
@@ -71,7 +71,7 @@ struct omap_drm_private {struct workqueue_struct *wq;/* lock for obj_list below */ -spinlock_t list_lock; +struct mutex list_lock;/* list of GEM objects: */ struct list_head obj_list;
drivers/gpu/drm/omapdrm/omap_gem.c +9 -6
@@ -1001,6 +1001,7 @@ int omap_gem_resume(struct drm_device *dev)struct omap_gem_object *omap_obj;int ret =0 ; +mutex_lock (&priv->list_lock);list_for_each_entry (omap_obj, &priv->obj_list, mm_list) {if (omap_obj->block) {struct drm_gem_object *obj = &omap_obj->base;
@@ -1012,12 +1013,14 @@ int omap_gem_resume(struct drm_device *dev) omap_obj->roll, true);if (ret) {dev_err (dev->dev,"could not repin: %d\n" , ret); -return ret; + goto done; } } } -return 0 ; +done: +mutex_unlock (&priv->list_lock); +return ret; }#endif
@@ -1085,9 +1088,9 @@ void omap_gem_free_object(struct drm_gem_object *obj)WARN_ON (!mutex_is_locked (&dev->struct_mutex)); -spin_lock (&priv->list_lock); +mutex_lock (&priv->list_lock);list_del (&omap_obj->mm_list); -spin_unlock (&priv->list_lock); +mutex_unlock (&priv->list_lock);/* this means the object is still pinned.. which really should * not happen. I think..
@@ -1206,9 +1209,9 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, goto err_release; } -spin_lock (&priv->list_lock); +mutex_lock (&priv->list_lock);list_add (&omap_obj->mm_list, &priv->obj_list); -spin_unlock (&priv->list_lock); +mutex_unlock (&priv->list_lock);return obj;
drivers/gpu/drm/sun4i/sun4i_drv.c +2 -1
@@ -283,7 +283,6 @@ static int sun4i_drv_add_endpoints(struct device *dev, remote =of_graph_get_remote_port_parent (ep);if (!remote) {DRM_DEBUG_DRIVER ("Error retrieving the output node\n" ); -of_node_put (remote);continue ; }
@@ -297,11 +296,13 @@ static int sun4i_drv_add_endpoints(struct device *dev,if (of_graph_parse_endpoint (ep, &endpoint)) {DRM_DEBUG_DRIVER ("Couldn't parse endpoint\n" ); +of_node_put (remote);continue ; }if (!endpoint.id) {DRM_DEBUG_DRIVER ("Endpoint is our panel... skipping\n" ); +of_node_put (remote);continue ; } }
drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +6 -1
@@ -477,13 +477,15 @@ int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node)dev_err (dev,"Couldn't create the PHY clock\n" ); goto err_put_clk_pll0; } + +clk_prepare_enable (phy->clk_phy); } phy->rst_phy =of_reset_control_get_shared (node,"phy" );if (IS_ERR (phy->rst_phy)) {dev_err (dev,"Could not get phy reset control\n" ); ret =PTR_ERR (phy->rst_phy); - goto err_put_clk_pll0; + goto err_disable_clk_phy; } ret =reset_control_deassert (phy->rst_phy);
@@ -514,6 +516,8 @@ int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node)reset_control_assert (phy->rst_phy); err_put_rst_phy:reset_control_put (phy->rst_phy); +err_disable_clk_phy: +clk_disable_unprepare (phy->clk_phy); err_put_clk_pll0:if (phy->variant->has_phy_clk)clk_put (phy->clk_pll0);
@@ -531,6 +535,7 @@ void sun8i_hdmi_phy_remove(struct sun8i_dw_hdmi *hdmi)clk_disable_unprepare (phy->clk_mod);clk_disable_unprepare (phy->clk_bus); +clk_disable_unprepare (phy->clk_phy);reset_control_assert (phy->rst_phy);
drivers/gpu/drm/v3d/v3d_drv.h +5 -0
@@ -85,6 +85,11 @@ struct v3d_dev {*/ struct mutex reset_lock; +/* Lock taken when creating and pushing the GPU scheduler +* jobs, to keep the sched-fence seqnos in order. +*/ +struct mutex sched_lock; +struct {u32 num_allocated;u32 pages_allocated;
drivers/gpu/drm/v3d/v3d_gem.c +4 -0
@@ -550,6 +550,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,if (ret) goto fail; +mutex_lock (&v3d->sched_lock);if (exec->bin.start != exec->bin.end) { ret = drm_sched_job_init(&exec->bin.base, &v3d->queue[V3D_BIN].sched,
@@ -576,6 +577,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,kref_get (&exec->refcount);/* put by scheduler job completion */ drm_sched_entity_push_job (&exec->render.base, &v3d_priv->sched_entity[V3D_RENDER ]); +mutex_unlock (&v3d->sched_lock);v3d_attach_object_fences (exec);
@@ -594,6 +596,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,return 0 ; fail_unreserve: +mutex_unlock (&v3d->sched_lock);v3d_unlock_bo_reservations (dev, exec, &acquire_ctx); fail:v3d_exec_put (exec);
@@ -615,6 +618,7 @@ v3d_gem_init(struct drm_device *dev)spin_lock_init (&v3d->job_lock);mutex_init (&v3d->bo_lock);mutex_init (&v3d->reset_lock); +mutex_init (&v3d->sched_lock);/* Note: We don't allocate address 0. Various bits of HW * treat 0 as special, such as the occlusion query counters
drivers/gpu/drm/vc4/vc4_plane.c +3 -0
@@ -543,6 +543,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane,/* Control word */ vc4_dlist_write(vc4_state, SCALER_CTL0_VALID | + VC4_SET_FIELD(SCALER_CTL0_RGBA_EXPAND_ROUND, SCALER_CTL0_RGBA_EXPAND) | (format->pixel_order << SCALER_CTL0_ORDER_SHIFT) | (format->hvs << SCALER_CTL0_PIXEL_FORMAT_SHIFT) | VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) |
@@ -874,7 +875,9 @@ static bool vc4_format_mod_supported(struct drm_plane *plane,case DRM_FORMAT_YUV420 :case DRM_FORMAT_YVU420 :case DRM_FORMAT_NV12 : +case DRM_FORMAT_NV21 :case DRM_FORMAT_NV16 : +case DRM_FORMAT_NV61 :default :return (modifier ==DRM_FORMAT_MOD_LINEAR ); }
drivers/hid/hid-ntrig.c +2 -0
@@ -955,6 +955,8 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) ret =sysfs_create_group (&hdev->dev.kobj, &ntrig_attribute_group); +if (ret) +hid_err (hdev,"cannot create sysfs group\n" );return 0 ; err_free:
drivers/hid/i2c-hid/i2c-hid.c +3 -6
@@ -1004,18 +1004,18 @@ static int i2c_hid_probe(struct i2c_client *client,return client->irq; } - ihid =kzalloc (sizeof (struct i2c_hid ),GFP_KERNEL ); + ihid =devm_kzalloc (&client->dev,sizeof (*ihid),GFP_KERNEL );if (!ihid)return -ENOMEM ;if (client->dev.of_node) { ret =i2c_hid_of_probe (client, &ihid->pdata);if (ret) - goto err; +return ret; }else if (!platform_data) { ret =i2c_hid_acpi_pdata (client, &ihid->pdata);if (ret) - goto err; +return ret; }else { ihid->pdata = *platform_data; }
@@ -1128,7 +1128,6 @@ static int i2c_hid_probe(struct i2c_client *client, err:i2c_hid_free_buffers (ihid); -kfree (ihid);return ret; }
@@ -1152,8 +1151,6 @@ static int i2c_hid_remove(struct i2c_client *client)regulator_disable (ihid->pdata.supply); -kfree (ihid); -return 0 ; }
drivers/hwmon/adt7475.c +9 -5
@@ -303,14 +303,18 @@ static inline u16 volt2reg(int channel, long volt, u8 bypass_attn)return clamp_val (reg,0 ,1023 ) & (0xff <<2 ); } -static u16 adt7475_read_word (struct i2c_client *client,int reg) +static int adt7475_read_word (struct i2c_client *client,int reg) { -u16 val; +int val1, val2; - val =i2c_smbus_read_byte_data (client, reg); - val |= (i2c_smbus_read_byte_data (client, reg +1 ) <<8 ); + val1 =i2c_smbus_read_byte_data (client, reg); +if (val1 <0 ) +return val1; + val2 =i2c_smbus_read_byte_data (client, reg +1 ); +if (val2 <0 ) +return val2; -return val; +return val1 | (val2 <<8 ); }static void adt7475_write_word (struct i2c_client *client,int reg,u16 val)
drivers/hwmon/ina2xx.c +11 -2
@@ -17,7 +17,7 @@* Bi-directional Current/Power Monitor with I2C Interface * Datasheet: http://www.ti.com/product/ina230 * -* Copyright (C) 2012 Lothar Felten <[email protected]> +* Copyright (C) 2012 Lothar Felten <[email protected]> * Thanks to Jan Volkering * * This program is free software; you can redistribute it and/or modify
@@ -329,6 +329,15 @@ static int ina2xx_set_shunt(struct ina2xx_data *data, long val)return 0 ; } +static ssize_t ina2xx_show_shunt (struct device *dev, +struct device_attribute *da, +char *buf) +{ +struct ina2xx_data *data =dev_get_drvdata (dev); + +return snprintf (buf,PAGE_SIZE ,"%li\n" , data->rshunt); +} +static ssize_t ina2xx_store_shunt (struct device *dev,struct device_attribute *da,const char *buf,size_t count)
@@ -403,7 +412,7 @@ static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, ina2xx_show_value, NULL,/* shunt resistance */ static SENSOR_DEVICE_ATTR(shunt_resistor, S_IRUGO | S_IWUSR, - ina2xx_show_value, ina2xx_store_shunt, + ina2xx_show_shunt, ina2xx_store_shunt, INA2XX_CALIBRATION);/* update interval (ina226 only) */
drivers/hwtracing/intel_th/core.c +13 -3
@@ -139,7 +139,8 @@ static int intel_th_remove(struct device *dev) th->thdev[i] =NULL ; } - th->num_thdevs = lowest; +if (lowest >=0 ) + th->num_thdevs = lowest; }if (thdrv->attr_group)
@@ -487,7 +488,7 @@ static const struct intel_th_subdevice { .flags = IORESOURCE_MEM, }, { - .start = TH_MMIO_SW, + .start = 1, /* use resource[1] */ .end = 0, .flags = IORESOURCE_MEM, },
@@ -580,6 +581,7 @@ intel_th_subdevice_alloc(struct intel_th *th,struct intel_th_device *thdev;struct resource res[3 ];unsigned int req =0 ; +bool is64bit = false;int r, err; thdev = intel_th_device_alloc(th, subdev->type, subdev->name,
@@ -589,12 +591,18 @@ intel_th_subdevice_alloc(struct intel_th *th, thdev->drvdata = th->drvdata; +for (r =0 ; r < th->num_resources; r++) +if (th->resource[r].flags &IORESOURCE_MEM_64 ) { + is64bit = true; +break ; + } +memcpy (res, subdev->res,sizeof (struct resource ) * subdev->nres);for (r =0 ; r < subdev->nres; r++) {struct resource *devres = th->resource; -int bar =TH_MMIO_CONFIG ; +int bar =0 ;/* cut subdevices' MMIO from resource[0] */ /* * Take .end == 0 to mean 'take the whole bar',
@@ -603,6 +611,8 @@ intel_th_subdevice_alloc(struct intel_th *th,*/ if (!res[r].end && res[r].flags ==IORESOURCE_MEM ) { bar = res[r].start; +if (is64bit) + bar *=2 ; res[r].start =0 ; res[r].end =resource_size (&devres[bar]) -1 ; }
drivers/i2c/busses/i2c-i801.c +8 -1
@@ -1417,6 +1417,13 @@ static void i801_add_tco(struct i801_priv *priv) }#ifdef CONFIG_ACPI +static bool i801_acpi_is_smbus_ioport (const struct i801_priv *priv, +acpi_physical_address address) +{ +return address >= priv->smba && + address <=pci_resource_end (priv->pci_dev,SMBBAR ); +} +static acpi_status i801_acpi_io_handler (u32 function,acpi_physical_address address,u32 bits,u64 *value,void *handler_context,void *region_context)
@@ -1432,7 +1439,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits,*/ mutex_lock (&priv->acpi_lock); -if (!priv->acpi_reserved) { +if (!priv->acpi_reserved &&i801_acpi_is_smbus_ioport (priv, address)) { priv->acpi_reserved = true;dev_warn (&pdev->dev,"BIOS is accessing SMBus registers\n" );
drivers/iio/accel/adxl345_core.c +12 -9
@@ -21,6 +21,8 @@#define ADXL345_REG_DATAX0 0x32#define ADXL345_REG_DATAY0 0x34#define ADXL345_REG_DATAZ0 0x36 +#define ADXL345_REG_DATA_AXIS (index) \ + (ADXL345_REG_DATAX0 + (index) * sizeof(__le16))#define ADXL345_POWER_CTL_MEASURE BIT(3)#define ADXL345_POWER_CTL_STANDBY 0x00
@@ -47,19 +49,19 @@ struct adxl345_data {u8 data_range; }; -#define ADXL345_CHANNEL (reg, axis) { \ +#define ADXL345_CHANNEL (index, axis) { \ .type = IIO_ACCEL, \ .modified = 1, \ .channel2 = IIO_MOD_##axis, \ - .address = reg, \ + .address = index, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ }static const struct iio_chan_spec adxl345_channels[] = { -ADXL345_CHANNEL (ADXL345_REG_DATAX0 ,X ), -ADXL345_CHANNEL (ADXL345_REG_DATAY0 ,Y ), -ADXL345_CHANNEL (ADXL345_REG_DATAZ0 ,Z ), +ADXL345_CHANNEL (0 ,X ), +ADXL345_CHANNEL (1 ,Y ), +ADXL345_CHANNEL (2 ,Z ), }; static int adxl345_read_raw(struct iio_dev *indio_dev,
@@ -67,7 +69,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct adxl345_data *data = iio_priv(indio_dev); -__le16 regval; +__le16 accel;int ret;switch (mask) {
@@ -77,12 +79,13 @@ static int adxl345_read_raw(struct iio_dev *indio_dev,* ADXL345_REG_DATA(X0/Y0/Z0) contain the least significant byte * and ADXL345_REG_DATA(X0/Y0/Z0) + 1 the most significant byte */ - ret =regmap_bulk_read (data->regmap, chan->address, ®val, -sizeof (regval)); + ret =regmap_bulk_read (data->regmap, +ADXL345_REG_DATA_AXIS (chan->address), + &accel,sizeof (accel));if (ret <0 )return ret; - *val =sign_extend32 (le16_to_cpu (regval),12 ); + *val =sign_extend32 (le16_to_cpu (accel),12 );return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : *val =0 ;
drivers/iio/adc/ina2xx-adc.c +13 -4
@@ -30,6 +30,7 @@#include <linux/module.h> #include <linux/of_device.h> #include <linux/regmap.h> +#include <linux/sched/task.h> #include <linux/util_macros.h> #include <linux/platform_data/ina2xx.h>
@@ -826,6 +827,7 @@ static int ina2xx_buffer_enable(struct iio_dev *indio_dev) {struct ina2xx_chip_info *chip =iio_priv (indio_dev);unsigned int sampling_us =SAMPLING_PERIOD (chip); +struct task_struct *task; dev_dbg(&indio_dev->dev, "Enabling buffer w/ scan_mask %02x, freq = %d, avg =%u\n", (unsigned int)(*indio_dev->active_scan_mask),
@@ -835,11 +837,17 @@ static int ina2xx_buffer_enable(struct iio_dev *indio_dev)dev_dbg (&indio_dev->dev,"Async readout mode: %d\n" , chip->allow_async_readout); - chip->task =kthread_run (ina2xx_capture_thread, (void *)indio_dev, -"%s:%d-%uus" , indio_dev->name, indio_dev->id, - sampling_us); + task =kthread_create (ina2xx_capture_thread, (void *)indio_dev, +"%s:%d-%uus" , indio_dev->name, indio_dev->id, + sampling_us); +if (IS_ERR (task)) +return PTR_ERR (task); + +get_task_struct (task); +wake_up_process (task); + chip->task = task; -return PTR_ERR_OR_ZERO (chip->task); +return 0 ; }static int ina2xx_buffer_disable (struct iio_dev *indio_dev)
@@ -848,6 +856,7 @@ static int ina2xx_buffer_disable(struct iio_dev *indio_dev)if (chip->task) {kthread_stop (chip->task); +put_task_struct (chip->task); chip->task =NULL ; }
drivers/iio/counter/104-quad-8.c +1 -1
@@ -138,7 +138,7 @@ static int quad8_write_raw(struct iio_dev *indio_dev,outb (val >> (8 * i), base_offset);/* Reset Borrow, Carry, Compare, and Sign flags */ -outb (0x02 , base_offset +1 ); +outb (0x04 , base_offset +1 );/* Reset Error flag */ outb (0x06 , base_offset +1 );
drivers/infiniband/core/rw.c +1 -1
@@ -87,7 +87,7 @@ static int rdma_rw_init_one_mr(struct ib_qp *qp, u8 port_num, } ret =ib_map_mr_sg (reg->mr, sg, nents, &offset,PAGE_SIZE ); -if (ret < nents) { +if (ret <0 || ret < nents) {ib_mr_pool_put (qp, &qp->rdma_mrs, reg->mr);return -EINVAL ; }
drivers/infiniband/core/uverbs_cmd.c +4 -1
@@ -2812,6 +2812,9 @@ static struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)if (!resources) goto err_res; +if (!num_specs) + goto out; + resources->counters =kcalloc (num_specs,sizeof (*resources->counters),GFP_KERNEL );
@@ -2824,8 +2827,8 @@ static struct ib_uflow_resources *flow_resources_alloc(size_t num_specs)if (!resources->collection) goto err_collection; +out: resources->max = num_specs; -return resources; err_collection:
drivers/infiniband/core/uverbs_main.c +1 -0
@@ -429,6 +429,7 @@ static int ib_uverbs_comp_event_close(struct inode *inode, struct file *filp)list_del (&entry->obj_list);kfree (entry); } + file->ev_queue.is_closed =1 ;spin_unlock_irq (&file->ev_queue.lock);uverbs_close_fd (filp);
drivers/infiniband/hw/bnxt_re/qplib_fp.c +6 -6
@@ -2354,7 +2354,7 @@ static int bnxt_qplib_cq_process_res_rc(struct bnxt_qplib_cq *cq, srq = qp->srq;if (!srq)return -EINVAL ; -if (wr_id_idx > srq->hwq.max_elements) { +if (wr_id_idx >= srq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process RC " ); dev_err(&cq->hwq.pdev->dev,
@@ -2369,7 +2369,7 @@ static int bnxt_qplib_cq_process_res_rc(struct bnxt_qplib_cq *cq, *pcqe = cqe; }else { rq = &qp->rq; -if (wr_id_idx > rq->hwq.max_elements) { +if (wr_id_idx >= rq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process RC " ); dev_err(&cq->hwq.pdev->dev,
@@ -2437,7 +2437,7 @@ static int bnxt_qplib_cq_process_res_ud(struct bnxt_qplib_cq *cq,if (!srq)return -EINVAL ; -if (wr_id_idx > srq->hwq.max_elements) { +if (wr_id_idx >= srq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process UD " ); dev_err(&cq->hwq.pdev->dev,
@@ -2452,7 +2452,7 @@ static int bnxt_qplib_cq_process_res_ud(struct bnxt_qplib_cq *cq, *pcqe = cqe; }else { rq = &qp->rq; -if (wr_id_idx > rq->hwq.max_elements) { +if (wr_id_idx >= rq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process UD " ); dev_err(&cq->hwq.pdev->dev,
@@ -2546,7 +2546,7 @@ static int bnxt_qplib_cq_process_res_raweth_qp1(struct bnxt_qplib_cq *cq, "QPLIB: FP: SRQ used but not defined??");return -EINVAL ; } -if (wr_id_idx > srq->hwq.max_elements) { +if (wr_id_idx >= srq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process Raw/QP1 " ); dev_err(&cq->hwq.pdev->dev,
@@ -2561,7 +2561,7 @@ static int bnxt_qplib_cq_process_res_raweth_qp1(struct bnxt_qplib_cq *cq, *pcqe = cqe; }else { rq = &qp->rq; -if (wr_id_idx > rq->hwq.max_elements) { +if (wr_id_idx >= rq->hwq.max_elements) {dev_err (&cq->hwq.pdev->dev,"QPLIB: FP: CQ Process Raw/QP1 RQ wr_id " ); dev_err(&cq->hwq.pdev->dev,
drivers/infiniband/hw/bnxt_re/qplib_sp.c +2 -2
@@ -197,7 +197,7 @@ int bnxt_qplib_get_sgid(struct bnxt_qplib_res *res, struct bnxt_qplib_sgid_tbl *sgid_tbl, int index, struct bnxt_qplib_gid *gid) { - if (index > sgid_tbl->max) { + if (index >= sgid_tbl->max) { dev_err(&res->pdev->dev,"QPLIB: Index %d exceeded SGID table max (%d)" , index, sgid_tbl->max);
@@ -402,7 +402,7 @@ int bnxt_qplib_get_pkey(struct bnxt_qplib_res *res, *pkey =0xFFFF ;return 0 ; } -if (index > pkey_tbl->max) { +if (index >= pkey_tbl->max) {dev_err (&res->pdev->dev,"QPLIB: Index %d exceeded PKEY table max (%d)" , index, pkey_tbl->max);
drivers/infiniband/hw/hfi1/chip.c +5 -1
@@ -6733,6 +6733,7 @@ void start_freeze_handling(struct hfi1_pportdata *ppd, int flags)struct hfi1_devdata *dd = ppd->dd;struct send_context *sc;int i; +int sc_flags;if (flags &FREEZE_SELF )write_csr (dd,CCE_CTRL ,CCE_CTRL_SPC_FREEZE_SMASK );
@@ -6743,11 +6744,13 @@ void start_freeze_handling(struct hfi1_pportdata *ppd, int flags)/* notify all SDMA engines that they are going into a freeze */ sdma_freeze_notify (dd, !!(flags &FREEZE_LINK_DOWN )); + sc_flags =SCF_FROZEN |SCF_HALTED | (flags &FREEZE_LINK_DOWN ? +SCF_LINK_DOWN :0 );/* do halt pre-handling on all enabled send contexts */ for (i =0 ; i < dd->num_send_contexts; i++) { sc = dd->send_contexts[i].sc;if (sc && (sc->flags &SCF_ENABLED )) -sc_stop (sc,SCF_FROZEN |SCF_HALTED ); +sc_stop (sc, sc_flags); }/* Send context are frozen. Notify user space */
@@ -10665,6 +10668,7 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)add_rcvctrl (dd,RCV_CTRL_RCV_PORT_ENABLE_SMASK );handle_linkup_change (dd,1 ); +pio_kernel_linkup (dd);/* * After link up, a new link width will have been set.
drivers/infiniband/hw/hfi1/pio.c +41 -10
112 lines not on this page · raw message
drivers/infiniband/hw/hfi1/pio.h +2 -0
@@ -139,6 +139,7 @@ struct send_context {#define SCF_IN_FREE 0x02#define SCF_HALTED 0x04#define SCF_FROZEN 0x08 +#define SCF_LINK_DOWN 0x10struct send_context_info {struct send_context *sc;/* allocated working context */
@@ -306,6 +307,7 @@ void set_pio_integrity(struct send_context *sc);void pio_reset_all (struct hfi1_devdata *dd);void pio_freeze (struct hfi1_devdata *dd);void pio_kernel_unfreeze (struct hfi1_devdata *dd); +void pio_kernel_linkup (struct hfi1_devdata *dd);/* global PIO send control operations */ #define PSC_GLOBAL_ENABLE 0
drivers/infiniband/hw/hfi1/user_sdma.c +1 -1
@@ -828,7 +828,7 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)if (READ_ONCE (iovec->offset) == iovec->iov.iov_len) {if (++req->iov_idx == req->data_iovs) { ret = -EFAULT ; - goto free_txreq; + goto free_tx; } iovec = &req->iovs[req->iov_idx];WARN_ON (iovec->offset);
drivers/infiniband/hw/hfi1/verbs.c +7 -1
@@ -1590,6 +1590,7 @@ static int hfi1_check_ah(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr)struct hfi1_pportdata *ppd;struct hfi1_devdata *dd;u8 sc5; +u8 sl;if (hfi1_check_mcast (rdma_ah_get_dlid (ah_attr)) && !(rdma_ah_get_ah_flags (ah_attr) &IB_AH_GRH ))
@@ -1598,8 +1599,13 @@ static int hfi1_check_ah(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr)/* test the mapping for validity */ ibp =to_iport (ibdev,rdma_ah_get_port_num (ah_attr)); ppd =ppd_from_ibp (ibp); - sc5 = ibp->sl_to_sc[rdma_ah_get_sl (ah_attr)]; dd =dd_from_ppd (ppd); + + sl =rdma_ah_get_sl (ah_attr); +if (sl >=ARRAY_SIZE (ibp->sl_to_sc)) +return -EINVAL ; + + sc5 = ibp->sl_to_sc[sl];if (sc_to_vlt (dd, sc5) > num_vls &&sc_to_vlt (dd, sc5) !=0xf )return -EINVAL ;return 0 ;
drivers/infiniband/hw/i40iw/i40iw_verbs.c +2 -0
@@ -1409,6 +1409,7 @@ static void i40iw_set_hugetlb_values(u64 addr, struct i40iw_mr *iwmr)struct vm_area_struct *vma;struct hstate *h; +down_read (¤t->mm->mmap_sem); vma =find_vma (current->mm, addr);if (vma &&is_vm_hugetlb_page (vma)) { h =hstate_vma (vma);
@@ -1417,6 +1418,7 @@ static void i40iw_set_hugetlb_values(u64 addr, struct i40iw_mr *iwmr) iwmr->page_msk =huge_page_mask (h); } } +up_read (¤t->mm->mmap_sem); }/**
drivers/infiniband/hw/mlx4/qp.c +1 -1
@@ -4047,9 +4047,9 @@ static void to_rdma_ah_attr(struct mlx4_ib_dev *ibdev,u8 port_num = path->sched_queue &0x40 ?2 :1 ;memset (ah_attr,0 ,sizeof (*ah_attr)); - ah_attr->type =rdma_ah_find_type (&ibdev->ib_dev, port_num);if (port_num ==0 || port_num > dev->caps.num_ports)return ; + ah_attr->type =rdma_ah_find_type (&ibdev->ib_dev, port_num);if (ah_attr->type ==RDMA_AH_ATTR_TYPE_ROCE ) rdma_ah_set_sl(ah_attr, ((path->sched_queue >> 3) & 0x7) |
drivers/infiniband/hw/mlx5/main.c +1 -1
@@ -2699,7 +2699,7 @@ static int parse_flow_attr(struct mlx5_core_dev *mdev, u32 *match_c, IPPROTO_GRE);MLX5_SET (fte_match_set_misc, misc_params_c, gre_protocol, -0xffff ); +ntohs (ib_spec->gre.mask.protocol));MLX5_SET (fte_match_set_misc, misc_params_v, gre_protocol,ntohs (ib_spec->gre.val.protocol));
drivers/infiniband/ulp/srp/ib_srp.c +3 -3
@@ -2954,7 +2954,7 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) {struct srp_target_port *target =host_to_target (scmnd->device->host);struct srp_rdma_ch *ch; -int i; +int i, j;u8 status;shost_printk (KERN_ERR , target->scsi_host,"SRP reset_device called\n" );
@@ -2968,8 +2968,8 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)for (i =0 ; i < target->ch_count; i++) { ch = &target->ch[i]; -for (i =0 ; i < target->req_ring_size; ++i) { -struct srp_request *req = &ch->req_ring[i]; +for (j =0 ; j < target->req_ring_size; ++j) { +struct srp_request *req = &ch->req_ring[j];srp_finish_req (ch, req, scmnd->device,DID_RESET <<16 ); }
drivers/input/misc/xen-kbdfront.c +4 -4
@@ -229,7 +229,7 @@ static int xenkbd_probe(struct xenbus_device *dev, } } - touch =xenbus_read_unsigned (dev->nodename, + touch =xenbus_read_unsigned (dev->otherend,XENKBD_FIELD_FEAT_MTOUCH ,0 );if (touch) { ret = xenbus_write(XBT_NIL, dev->nodename,
@@ -304,13 +304,13 @@ static int xenkbd_probe(struct xenbus_device *dev,if (!mtouch) goto error_nomem; - num_cont =xenbus_read_unsigned (info->xbdev->nodename, + num_cont =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_NUM_CONTACTS ,1 ); - width =xenbus_read_unsigned (info->xbdev->nodename, + width =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_WIDTH ,XENFB_WIDTH ); - height =xenbus_read_unsigned (info->xbdev->nodename, + height =xenbus_read_unsigned (info->xbdev->otherend,XENKBD_FIELD_MT_HEIGHT ,XENFB_HEIGHT );
drivers/input/mouse/elantech.c +2 -0
@@ -1178,6 +1178,8 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = {static const char *const middle_button_pnp_ids[] = {"LEN2131" ,/* ThinkPad P52 w/ NFC */ "LEN2132" ,/* ThinkPad P52 */ +"LEN2133" ,/* ThinkPad P72 w/ NFC */ +"LEN2134" ,/* ThinkPad P72 */ NULL };
drivers/iommu/amd_iommu.c +1 -1
@@ -2405,9 +2405,9 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, }if (amd_iommu_unmap_flush) { -dma_ops_free_iova (dma_dom, dma_addr, pages);domain_flush_tlb (&dma_dom->domain);domain_flush_complete (&dma_dom->domain); +dma_ops_free_iova (dma_dom, dma_addr, pages); }else { pages =__roundup_pow_of_two (pages);queue_iova (&dma_dom->iovad, dma_addr >>PAGE_SHIFT , pages,0 );
drivers/iommu/msm_iommu.c +5 -11
@@ -395,20 +395,15 @@ static int msm_iommu_add_device(struct device *dev)struct msm_iommu_dev *iommu;struct iommu_group *group;unsigned long flags; -int ret =0 ;spin_lock_irqsave (&msm_iommu_lock, flags); - iommu =find_iommu_for_dev (dev); +spin_unlock_irqrestore (&msm_iommu_lock, flags); +if (iommu)iommu_device_link (&iommu->iommu, dev);else - ret = -ENODEV ; - -spin_unlock_irqrestore (&msm_iommu_lock, flags); - -if (ret) -return ret; +return -ENODEV ; group =iommu_group_get_for_dev (dev);if (IS_ERR (group))
@@ -425,13 +420,12 @@ static void msm_iommu_remove_device(struct device *dev)unsigned long flags;spin_lock_irqsave (&msm_iommu_lock, flags); - iommu =find_iommu_for_dev (dev); +spin_unlock_irqrestore (&msm_iommu_lock, flags); +if (iommu)iommu_device_unlink (&iommu->iommu, dev); -spin_unlock_irqrestore (&msm_iommu_lock, flags); -iommu_group_remove_device (dev); }
drivers/md/md-cluster.c +10 -9
@@ -304,15 +304,6 @@ static void recover_bitmaps(struct md_thread *thread)while (cinfo->recovery_map) { slot =fls64 ((u64 )cinfo->recovery_map) -1 ; -/* Clear suspend_area associated with the bitmap */ -spin_lock_irq (&cinfo->suspend_lock); -list_for_each_entry_safe (s, tmp, &cinfo->suspend_list, list) -if (slot == s->slot) { -list_del (&s->list); -kfree (s); - } -spin_unlock_irq (&cinfo->suspend_lock); -snprintf (str,64 ,"bitmap%04d" , slot); bm_lockres =lockres_init (mddev, str,NULL ,1 );if (!bm_lockres) {
@@ -331,6 +322,16 @@ static void recover_bitmaps(struct md_thread *thread)pr_err ("md-cluster: Could not copy data from bitmap %d\n" , slot); goto clear_bit; } + +/* Clear suspend_area associated with the bitmap */ +spin_lock_irq (&cinfo->suspend_lock); +list_for_each_entry_safe (s, tmp, &cinfo->suspend_list, list) +if (slot == s->slot) { +list_del (&s->list); +kfree (s); + } +spin_unlock_irq (&cinfo->suspend_lock); +if (hi >0 ) {if (lo < mddev->recovery_cp) mddev->recovery_cp = lo;
drivers/media/i2c/ov772x.c +28 -12
@@ -542,9 +542,19 @@ static struct ov772x_priv *to_ov772x(struct v4l2_subdev *sd) return container_of(sd, struct ov772x_priv, subdev); } -static inline int ov772x_read (struct i2c_client *client,u8 addr) +static int ov772x_read (struct i2c_client *client,u8 addr) { -return i2c_smbus_read_byte_data (client, addr); +int ret; +u8 val; + + ret =i2c_master_send (client, &addr,1 ); +if (ret <0 ) +return ret; + ret =i2c_master_recv (client, &val,1 ); +if (ret <0 ) +return ret; + +return val; }static inline int ov772x_write (struct i2c_client *client,u8 addr,u8 value)
@@ -1136,7 +1146,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd,static int ov772x_video_probe (struct ov772x_priv *priv) {struct i2c_client *client =v4l2_get_subdevdata (&priv->subdev); -u8 pid, ver; +int pid, ver, midh, midl;const char *devname;int ret;
@@ -1146,7 +1156,11 @@ static int ov772x_video_probe(struct ov772x_priv *priv)/* Check and show product ID and manufacturer ID. */ pid =ov772x_read (client,PID ); +if (pid <0 ) +return pid; ver =ov772x_read (client,VER ); +if (ver <0 ) +return ver;switch (VERSION (pid, ver)) {case OV7720 :
@@ -1162,13 +1176,17 @@ static int ov772x_video_probe(struct ov772x_priv *priv) goto done; } + midh =ov772x_read (client,MIDH ); +if (midh <0 ) +return midh; + midl =ov772x_read (client,MIDL ); +if (midl <0 ) +return midl; +dev_info (&client->dev,"%s Product ID %0x:%0x Manufacturer ID %x:%x\n" , - devname, - pid, - ver, -ov772x_read (client,MIDH ), -ov772x_read (client,MIDL )); + devname, pid, ver, midh, midl); + ret =v4l2_ctrl_handler_setup (&priv->hdl); done:
@@ -1255,13 +1273,11 @@ static int ov772x_probe(struct i2c_client *client,return -EINVAL ; } -if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE_DATA | -I2C_FUNC_PROTOCOL_MANGLING )) { +if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE_DATA )) {dev_err (&adapter->dev, -"I2C-Adapter doesn't support SMBUS_BYTE_DATA or PROTOCOL_MANGLING\n" ); +"I2C-Adapter doesn't support SMBUS_BYTE_DATA\n" );return -EIO ; } - client->flags |=I2C_CLIENT_SCCB ; priv =devm_kzalloc (&client->dev,sizeof (*priv),GFP_KERNEL );if (!priv)
drivers/media/i2c/soc_camera/ov772x.c +1 -1
@@ -834,7 +834,7 @@ static int ov772x_set_params(struct ov772x_priv *priv,* set COM8 */ if (priv->band_filter) { - ret =ov772x_mask_set (client,COM8 ,BNDF_ON_OFF ,1 ); + ret =ov772x_mask_set (client,COM8 ,BNDF_ON_OFF ,BNDF_ON_OFF );if (!ret) ret =ov772x_mask_set (client,BDBASE ,0xff ,256 - priv->band_filter);
drivers/media/platform/exynos4-is/fimc-isp-video.c +8 -3
@@ -384,12 +384,17 @@ static void __isp_video_try_fmt(struct fimc_isp *isp,struct v4l2_pix_format_mplane *pixm, const struct fimc_fmt **fmt) { - *fmt =fimc_isp_find_format (&pixm->pixelformat,NULL ,2 ); + const struct fimc_fmt *__fmt; + + __fmt =fimc_isp_find_format (&pixm->pixelformat,NULL ,2 ); + +if (fmt) + *fmt = __fmt; pixm->colorspace =V4L2_COLORSPACE_SRGB ; pixm->field =V4L2_FIELD_NONE ; - pixm->num_planes = (*fmt)->memplanes; - pixm->pixelformat = (*fmt)->fourcc; + pixm->num_planes = __fmt->memplanes; + pixm->pixelformat = __fmt->fourcc;/* * TODO: double check with the docmentation these width/height * constraints are correct.
drivers/media/platform/fsl-viu.c +23 -15
@@ -1414,7 +1414,7 @@ static int viu_of_probe(struct platform_device *op) sizeof(struct viu_reg), DRV_NAME)) {dev_err (&op->dev,"Error while requesting mem region\n" ); ret = -EBUSY ; - goto err; + goto err_irq; }/* remap registers */
@@ -1422,7 +1422,7 @@ static int viu_of_probe(struct platform_device *op)if (!viu_regs) {dev_err (&op->dev,"Can't map register set\n" ); ret = -ENOMEM ; - goto err; + goto err_irq; }/* Prepare our private structure */
@@ -1430,7 +1430,7 @@ static int viu_of_probe(struct platform_device *op)if (!viu_dev) {dev_err (&op->dev,"Can't allocate private structure\n" ); ret = -ENOMEM ; - goto err; + goto err_irq; } viu_dev->vr = viu_regs;
@@ -1446,16 +1446,21 @@ static int viu_of_probe(struct platform_device *op) ret =v4l2_device_register (viu_dev->dev, &viu_dev->v4l2_dev);if (ret <0 ) {dev_err (&op->dev,"v4l2_device_register() failed: %d\n" , ret); - goto err; + goto err_irq; } ad =i2c_get_adapter (0 ); +if (!ad) { + ret = -EFAULT ; +dev_err (&op->dev,"couldn't get i2c adapter\n" ); + goto err_v4l2; + }v4l2_ctrl_handler_init (&viu_dev->hdl,5 );if (viu_dev->hdl.error) { ret = viu_dev->hdl.error;dev_err (&op->dev,"couldn't register control\n" ); - goto err_vdev; + goto err_i2c; }/* This control handler will inherit the control(s) from the sub-device(s). */
@@ -1471,7 +1476,7 @@ static int viu_of_probe(struct platform_device *op) vdev =video_device_alloc ();if (vdev ==NULL ) { ret = -ENOMEM ; - goto err_vdev; + goto err_hdl; } *vdev = viu_template;
@@ -1492,7 +1497,7 @@ static int viu_of_probe(struct platform_device *op) ret =video_register_device (viu_dev->vdev,VFL_TYPE_GRABBER ,-1 );if (ret <0 ) {video_device_release (viu_dev->vdev); - goto err_vdev; + goto err_unlock; }/* enable VIU clock */
@@ -1500,12 +1505,12 @@ static int viu_of_probe(struct platform_device *op)if (IS_ERR (clk)) {dev_err (&op->dev,"failed to lookup the clock!\n" ); ret =PTR_ERR (clk); - goto err_clk; + goto err_vdev; } ret =clk_prepare_enable (clk);if (ret) {dev_err (&op->dev,"failed to enable the clock!\n" ); - goto err_clk; + goto err_vdev; } viu_dev->clk = clk;
@@ -1516,7 +1521,7 @@ static int viu_of_probe(struct platform_device *op)if (request_irq (viu_dev->irq, viu_intr,0 ,"viu" , (void *)viu_dev)) {dev_err (&op->dev,"Request VIU IRQ failed.\n" ); ret = -ENODEV ; - goto err_irq; + goto err_clk; }mutex_unlock (&viu_dev->lock);
@@ -1524,16 +1529,19 @@ static int viu_of_probe(struct platform_device *op)dev_info (&op->dev,"Freescale VIU Video Capture Board\n" );return ret; -err_irq: -clk_disable_unprepare (viu_dev->clk); err_clk: -video_unregister_device (viu_dev->vdev); +clk_disable_unprepare (viu_dev->clk); err_vdev: -v4l2_ctrl_handler_free (&viu_dev->hdl); +video_unregister_device (viu_dev->vdev); +err_unlock:mutex_unlock (&viu_dev->lock); +err_hdl: +v4l2_ctrl_handler_free (&viu_dev->hdl); +err_i2c:i2c_put_adapter (ad); +err_v4l2:v4l2_device_unregister (&viu_dev->v4l2_dev); -err: +err_irq:irq_dispose_mapping (viu_irq);return ret; }
drivers/media/platform/omap3isp/isp.c +1 -1
@@ -300,7 +300,7 @@ static struct clk *isp_xclk_src_get(struct of_phandle_args *clkspec, void *data)static int isp_xclk_init (struct isp_device *isp) {struct device_node *np = isp->dev->of_node; -struct clk_init_data init; +struct clk_init_data init = {0 };unsigned int i;for (i =0 ; i <ARRAY_SIZE (isp->xclks); ++i)
drivers/media/platform/s3c-camif/camif-capture.c +2 -0
@@ -117,6 +117,8 @@ static int sensor_set_power(struct camif_dev *camif, int on)if (camif->sensor.power_count == !on) err =v4l2_subdev_call (sensor->sd, core, s_power, on); +if (err == -ENOIOCTLCMD ) + err =0 ;if (!err) sensor->power_count += on ?1 :-1 ;
drivers/media/usb/tm6000/tm6000-dvb.c +5 -0
@@ -266,6 +266,11 @@ static int register_dvb(struct tm6000_core *dev) ret =dvb_register_adapter (&dvb->adapter,"Trident TVMaster 6000 DVB-T" ,THIS_MODULE , &dev->udev->dev, adapter_nr); +if (ret <0 ) { +pr_err ("tm6000: couldn't register the adapter!\n" ); + goto err; + } + dvb->adapter.priv = dev;if (dvb->frontend) {
drivers/media/v4l2-core/v4l2-event.c +20 -18
@@ -115,14 +115,6 @@ static void __v4l2_event_queue_fh(struct v4l2_fh *fh, const struct v4l2_event *eif (sev ==NULL )return ; -/* -* If the event has been added to the fh->subscribed list, but its -* add op has not completed yet elems will be 0, treat this as -* not being subscribed. -*/ -if (!sev->elems) -return ; -/* Increase event sequence number on fh. */ fh->sequence++;
@@ -208,6 +200,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,struct v4l2_subscribed_event *sev, *found_ev;unsigned long flags;unsigned i; +int ret =0 ;if (sub->type ==V4L2_EVENT_ALL )return -EINVAL ;
@@ -225,31 +218,36 @@ int v4l2_event_subscribe(struct v4l2_fh *fh, sev->flags = sub->flags; sev->fh = fh; sev->ops = ops; + sev->elems = elems; + +mutex_lock (&fh->subscribe_lock);spin_lock_irqsave (&fh->vdev->fh_lock, flags); found_ev =v4l2_event_subscribed (fh, sub->type, sub->id); -if (!found_ev) -list_add (&sev->list, &fh->subscribed);spin_unlock_irqrestore (&fh->vdev->fh_lock, flags);if (found_ev) { +/* Already listening */ kvfree (sev); -return 0 ;/* Already listening */ + goto out_unlock; }if (sev->ops && sev->ops->add) { -int ret = sev->ops->add (sev, elems); + ret = sev->ops->add (sev, elems);if (ret) { - sev->ops =NULL ; -v4l2_event_unsubscribe (fh, sub); -return ret; +kvfree (sev); + goto out_unlock; } } -/* Mark as ready for use */ - sev->elems = elems; +spin_lock_irqsave (&fh->vdev->fh_lock, flags); +list_add (&sev->list, &fh->subscribed); +spin_unlock_irqrestore (&fh->vdev->fh_lock, flags); -return 0 ; +out_unlock: +mutex_unlock (&fh->subscribe_lock); + +return ret; }EXPORT_SYMBOL_GPL (v4l2_event_subscribe);
@@ -288,6 +286,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,return 0 ; } +mutex_lock (&fh->subscribe_lock); +spin_lock_irqsave (&fh->vdev->fh_lock, flags); sev =v4l2_event_subscribed (fh, sub->type, sub->id);
@@ -305,6 +305,8 @@ int v4l2_event_unsubscribe(struct v4l2_fh *fh,if (sev && sev->ops && sev->ops->del) sev->ops->del (sev); +mutex_unlock (&fh->subscribe_lock); +kvfree (sev);return 0 ;
drivers/media/v4l2-core/v4l2-fh.c +2 -0
@@ -45,6 +45,7 @@ void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev)INIT_LIST_HEAD (&fh->available);INIT_LIST_HEAD (&fh->subscribed); fh->sequence =-1 ; +mutex_init (&fh->subscribe_lock); }EXPORT_SYMBOL_GPL (v4l2_fh_init);
@@ -90,6 +91,7 @@ void v4l2_fh_exit(struct v4l2_fh *fh)return ;v4l_disable_media_source (fh->vdev);v4l2_event_unsubscribe_all (fh); +mutex_destroy (&fh->subscribe_lock); fh->vdev =NULL ; }EXPORT_SYMBOL_GPL (v4l2_fh_exit);
drivers/misc/ibmvmc.c +1 -1
@@ -273,7 +273,7 @@ static void *alloc_dma_buffer(struct vio_dev *vdev, size_t size, dma_addr_t *dma_handle) {/* allocate memory */ -void *buffer =kzalloc (size,GFP_KERNEL ); +void *buffer =kzalloc (size,GFP_ATOMIC );if (!buffer) { *dma_handle =0 ;
drivers/misc/sram.c +7 -6
@@ -391,23 +391,23 @@ static int sram_probe(struct platform_device *pdev)if (IS_ERR (sram->pool))return PTR_ERR (sram->pool); - ret =sram_reserve_regions (sram, res); -if (ret) -return ret; - sram->clk =devm_clk_get (sram->dev,NULL );if (IS_ERR (sram->clk)) sram->clk =NULL ;else clk_prepare_enable (sram->clk); + ret =sram_reserve_regions (sram, res); +if (ret) + goto err_disable_clk; +platform_set_drvdata (pdev, sram); init_func =of_device_get_match_data (&pdev->dev);if (init_func) { ret =init_func ();if (ret) - goto err_disable_clk; + goto err_free_partitions; } dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",
@@ -415,10 +415,11 @@ static int sram_probe(struct platform_device *pdev)return 0 ; +err_free_partitions: +sram_free_partitions (sram); err_disable_clk:if (sram->clk)clk_disable_unprepare (sram->clk); -sram_free_partitions (sram);return ret; }
drivers/misc/tsl2550.c +1 -1
@@ -177,7 +177,7 @@ static int tsl2550_calculate_lux(u8 ch0, u8 ch1) }else lux =0 ; else - return -EAGAIN; + return 0;/* LUX range check */ return lux >TSL2550_MAX_LUX ?TSL2550_MAX_LUX : lux;
drivers/misc/vmw_vmci/vmci_queue_pair.c +2 -2
@@ -668,7 +668,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) produce_uva, produce_q->kernel_if->num_pages,1 , produce_q->kernel_if->u.h.header_page); -if (retval < produce_q->kernel_if->num_pages) { +if (retval < (int )produce_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(produce) failed (retval=%d)" , retval); qp_release_pages(produce_q->kernel_if->u.h.header_page,
@@ -680,7 +680,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) consume_uva, consume_q->kernel_if->num_pages,1 , consume_q->kernel_if->u.h.header_page); -if (retval < consume_q->kernel_if->num_pages) { +if (retval < (int )consume_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(consume) failed (retval=%d)" , retval); qp_release_pages(consume_q->kernel_if->u.h.header_page,
drivers/mmc/host/android-goldfish.c +2 -2
@@ -217,7 +217,7 @@ static void goldfish_mmc_xfer_done(struct goldfish_mmc_host *host,* We don't really have DMA, so we need * to copy from our platform driver buffer */ -sg_copy_to_buffer (data->sg,1 , host->virt_base, +sg_copy_from_buffer (data->sg,1 , host->virt_base, data->sg->length); } host->data->bytes_xfered += data->sg->length;
@@ -393,7 +393,7 @@ static void goldfish_mmc_prepare_data(struct goldfish_mmc_host *host,* We don't really have DMA, so we need to copy to our * platform driver buffer */ -sg_copy_from_buffer (data->sg,1 , host->virt_base, +sg_copy_to_buffer (data->sg,1 , host->virt_base, data->sg->length); } }
drivers/mmc/host/atmel-mci.c +6 -6
@@ -1976,7 +1976,7 @@ static void atmci_read_data_pio(struct atmel_mci *host) do { value = atmci_readl(host, ATMCI_RDR); if (likely(offset + 4 <= sg->length)) { - sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset); + sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset); offset += 4; nbytes += 4;
@@ -1993,7 +1993,7 @@ static void atmci_read_data_pio(struct atmel_mci *host) }else {unsigned int remaining = sg->length - offset; -sg_pcopy_to_buffer (sg,1 , &value, remaining, offset); +sg_pcopy_from_buffer (sg,1 , &value, remaining, offset); nbytes += remaining;flush_dcache_page (sg_page (sg));
@@ -2003,7 +2003,7 @@ static void atmci_read_data_pio(struct atmel_mci *host) goto done; offset =4 - remaining; -sg_pcopy_to_buffer (sg,1 , (u8 *)&value + remaining, +sg_pcopy_from_buffer (sg,1 , (u8 *)&value + remaining, offset,0 ); nbytes += offset; }
@@ -2042,7 +2042,7 @@ static void atmci_write_data_pio(struct atmel_mci *host) do { if (likely(offset + 4 <= sg->length)) { - sg_pcopy_from_buffer(sg, 1, &value, sizeof(u32), offset); + sg_pcopy_to_buffer(sg, 1, &value, sizeof(u32), offset); atmci_writel(host, ATMCI_TDR, value); offset += 4;
@@ -2059,7 +2059,7 @@ static void atmci_write_data_pio(struct atmel_mci *host)unsigned int remaining = sg->length - offset; value =0 ; -sg_pcopy_from_buffer (sg,1 , &value, remaining, offset); +sg_pcopy_to_buffer (sg,1 , &value, remaining, offset); nbytes += remaining; host->sg = sg =sg_next (sg);
@@ -2070,7 +2070,7 @@ static void atmci_write_data_pio(struct atmel_mci *host) } offset =4 - remaining; -sg_pcopy_from_buffer (sg,1 , (u8 *)&value + remaining, +sg_pcopy_to_buffer (sg,1 , (u8 *)&value + remaining, offset,0 );atmci_writel (host,ATMCI_TDR , value); nbytes += offset;
drivers/mtd/nand/raw/atmel/nand-controller.c +6 -1
@@ -129,6 +129,11 @@#define DEFAULT_TIMEOUT_MS 1000#define MIN_DMA_LEN 128 +static bool atmel_nand_avoid_dma__read_mostly ; + +MODULE_PARM_DESC (avoiddma,"Avoid using DMA" ); +module_param_named (avoiddma, atmel_nand_avoid_dma, bool,0400 ); +enum atmel_nand_rb_type {ATMEL_NAND_NO_RB ,ATMEL_NAND_NATIVE_RB ,
@@ -1977,7 +1982,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc,return ret; } -if (nc->caps->has_dma) { +if (nc->caps->has_dma && !atmel_nand_avoid_dma) {dma_cap_mask_t mask;dma_cap_zero (mask);
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
@@ -5705,7 +5705,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (t4_read_reg (adapter,LE_DB_CONFIG_A ) &HASHEN_F ) {u32 hash_base, hash_reg; -if (chip <=CHELSIO_T5 ) { +if (chip_ver <=CHELSIO_T5 ) { hash_reg =LE_DB_TID_HASHBASE_A ; hash_base =t4_read_reg (adapter, hash_reg); adapter->tids.hash_base = hash_base /4 ;
drivers/net/ethernet/hisilicon/hns/hnae.h +3 -3
@@ -220,10 +220,10 @@ struct hnae_desc_cb {/* priv data for the desc, e.g. skb when use with ip stack*/ void *priv; -u16 page_offset; -u16 reuse_flag; +u32 page_offset; +u32 length;/* length of the buffer */ -u16 length;/* length of the buffer */ +u16 reuse_flag;/* desc type, used by the ring user to mark the type of the priv data */ u16 type;
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -530,7 +530,7 @@ static void hns_nic_reuse_page(struct sk_buff *skb, int i, }skb_add_rx_frag (skb, i, desc_cb->priv, desc_cb->page_offset + pull_len, - size - pull_len, truesize - pull_len); + size - pull_len, truesize);/* avoid re-using remote pages,flag default unreuse */ if (unlikely (page_to_nid (desc_cb->priv) !=numa_node_id ()))
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +3 -3
@@ -290,11 +290,11 @@ struct hns3_desc_cb {/* priv data for the desc, e.g. skb when use with ip stack*/ void *priv; -u16 page_offset; -u16 reuse_flag; - +u32 page_offset;u32 length;/* length of the buffer */ +u16 reuse_flag; +/* desc type, used by the ring user to mark the type of the priv data */ u16 type; };
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -0
@@ -201,7 +201,9 @@ static u32 hns3_lb_check_rx_ring(struct hns3_nic_priv *priv, u32 budget) rx_group = &ring->tqp_vector->rx_group; pre_rx_pkt = rx_group->total_packets; +preempt_disable ();hns3_clean_rx_ring (ring, budget, hns3_lb_check_skb_data); +preempt_enable (); rcv_good_pkt_total += (rx_group->total_packets - pre_rx_pkt); rx_group->total_packets = pre_rx_pkt;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +7 -2
@@ -1223,6 +1223,10 @@ static int hclge_mac_pause_setup_hw(struct hclge_dev *hdev) tx_en = true; rx_en = true;break ; +case HCLGE_FC_PFC : + tx_en = false; + rx_en = false; +break ;default : tx_en = true; rx_en = true;
@@ -1240,8 +1244,9 @@ int hclge_pause_setup_hw(struct hclge_dev *hdev)if (ret)return ret; -if (hdev->tm_info.fc_mode !=HCLGE_FC_PFC ) -return hclge_mac_pause_setup_hw (hdev); + ret =hclge_mac_pause_setup_hw (hdev); +if (ret) +return ret;/* Only DCB-supported dev supports qset back pressure and pfc cmd */ if (!hnae3_dev_dcb_supported (hdev))
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +10 -1
@@ -648,8 +648,17 @@ static int hclgevf_unmap_ring_from_vector(static int hclgevf_put_vector (struct hnae3_handle *handle,int vector) {struct hclgevf_dev *hdev =hclgevf_ae_get_hdev (handle); +int vector_id; -hclgevf_free_vector (hdev, vector); + vector_id =hclgevf_get_vector_index (hdev, vector); +if (vector_id <0 ) { +dev_err (&handle->pdev->dev, +"hclgevf_put_vector get vector index fail. ret =%d\n" , + vector_id); +return vector_id; + } + +hclgevf_free_vector (hdev, vector_id);return 0 ; }
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +2 -1
@@ -208,7 +208,8 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev)/* tail the async message in arq */ msg_q = hdev->arq.msg_q[hdev->arq.tail]; -memcpy (&msg_q[0 ], req->msg,HCLGE_MBX_MAX_ARQ_MSG_SIZE ); +memcpy (&msg_q[0 ], req->msg, +HCLGE_MBX_MAX_ARQ_MSG_SIZE *sizeof (u16));hclge_mbx_tail_ptr_move_arq (hdev->arq); hdev->arq.count++;
drivers/net/ethernet/intel/e1000/e1000_ethtool.c +4 -3
@@ -624,14 +624,14 @@ static int e1000_set_ringparam(struct net_device *netdev, adapter->tx_ring = tx_old;e1000_free_all_rx_resources (adapter);e1000_free_all_tx_resources (adapter); -kfree (tx_old); -kfree (rx_old); adapter->rx_ring = rxdr; adapter->tx_ring = txdr; err =e1000_up (adapter);if (err) goto err_setup; } +kfree (tx_old); +kfree (rx_old);clear_bit (__E1000_RESETTING, &adapter->flags);return 0 ;
@@ -644,7 +644,8 @@ static int e1000_set_ringparam(struct net_device *netdev, err_alloc_rx:kfree (txdr); err_alloc_tx: -e1000_up (adapter); +if (netif_running (adapter->netdev)) +e1000_up (adapter); err_setup:clear_bit (__E1000_RESETTING, &adapter->flags);return err;
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +1 -1
@@ -1903,7 +1903,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data) data +=ETH_GSTRING_LEN ; } -WARN_ONCE (p - data !=i40e_get_stats_count (netdev) *ETH_GSTRING_LEN , +WARN_ONCE (data - p !=i40e_get_stats_count (netdev) *ETH_GSTRING_LEN ,"stat strings count mismatch!" ); }
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -7
@@ -5121,15 +5121,17 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, u8 *bw_share) {struct i40e_aqc_configure_vsi_tc_bw_data bw_data; +struct i40e_pf *pf = vsi->back;i40e_status ret;int i; -if (vsi->back->flags &I40E_FLAG_TC_MQPRIO ) +/* There is no need to reset BW when mqprio mode is on. */ +if (pf->flags &I40E_FLAG_TC_MQPRIO )return 0 ; -if (!vsi->mqprio_qopt.qopt.hw) { +if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags &I40E_FLAG_DCB_ENABLED )) { ret =i40e_set_bw_limit (vsi, vsi->seid,0 );if (ret) -dev_info (&vsi->back->pdev->dev, +dev_info (&pf->pdev->dev,"Failed to reset tx rate for vsi->seid %u\n" , vsi->seid);return ret;
@@ -5138,12 +5140,11 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc,for (i =0 ; i <I40E_MAX_TRAFFIC_CLASS ; i++) bw_data.tc_bw_credits[i] = bw_share[i]; - ret =i40e_aq_config_vsi_tc_bw (&vsi->back->hw, vsi->seid, &bw_data, -NULL ); + ret =i40e_aq_config_vsi_tc_bw (&pf->hw, vsi->seid, &bw_data,NULL );if (ret) { -dev_info (&vsi->back->pdev->dev, +dev_info (&pf->pdev->dev,"AQ command Config VSI BW allocation per TC failed = %d\n" , - vsi->back->hw.aq.asq_last_status); + pf->hw.aq.asq_last_status);return -EINVAL ; }
drivers/net/ethernet/intel/ice/ice.h +7 -0
@@ -89,6 +89,13 @@ extern const char ice_drv_ver[];#define ice_for_each_rxq (vsi, i) \ for ((i) = 0; (i) < (vsi)->num_rxq; (i)++) +/* Macros for each allocated tx/rx ring whether used or not in a VSI */ +#define ice_for_each_alloc_txq (vsi, i) \ + for ((i) = 0; (i) < (vsi)->alloc_txq; (i)++) +
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h +13 -12
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_common.c +15 -12
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_controlq.c +20 -9
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ice/ice_ethtool.c +39 -13
52 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_main.c +59 -39
98 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_switch.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +26 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +1 -0
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_mcp.c +158 -29
187 lines not on this page · raw message
drivers/net/ethernet/qlogic/qed/qed_mcp.h +18 -9
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_reg_addr.h +2 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath10k/htt_rx.c +8 -5
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x2_mac.c +2 -4
Lines of this file are not shown. View the raw message.
drivers/power/reset/vexpress-poweroff.c +8 -4
Lines of this file are not shown. View the raw message.
drivers/power/supply/power_supply_core.c +9 -2
Lines of this file are not shown. View the raw message.
drivers/scsi/megaraid/megaraid_sas_base.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/spi/spi-orion.c +40 -37
77 lines not on this page · raw message
drivers/staging/media/imx/imx-ic-prpencvf.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/staging/media/imx/imx-media-csi.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/staging/mt7621-dts/mt7621.dtsi +9 -12
Lines of this file are not shown. View the raw message.
drivers/staging/mt7621-eth/mtk_eth_soc.c +10 -3
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_tpg.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/tty/serial/cpm_uart/cpm_uart_core.c +7 -3
Lines of this file are not shown. View the raw message.
kernel/events/hw_breakpoint.c +41 -16
57 lines not on this page · raw message
tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh +4 -2
Lines of this file are not shown. View the raw message.
tools/testing/selftests/net/forwarding/mirror_gre_lib.sh +1 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh +4 -2
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.