4.20.8-stable review
Subsystems (11)
Greg Kroah-Hartman
maintainercover 4.20.8-stable review
This is the start of the stable review cycle for the 4.20.8 release. There are 352 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 13 14:17:03 UTC 2019. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.20.8-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.20.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 4.20.8-rc1
Trond Myklebust <[email protected]>
nfsd: Fix error return values for nfsd4_clone_file_range()
Huacai Chen <[email protected]>
cacheinfo: Keep the old value if of_property_read_u32 fails
Chris Brandt <[email protected]>
serial: sh-sci: Do not free irqs that have already been freed
Andy Shevchenko <[email protected]>
serial: 8250_pci: Make PCI class test non fatal
Greg Kroah-Hartman <[email protected]>
serial: fix race between flush_to_ldisc and tty_open
Gustavo A. R. Silva <[email protected]>
perf tests evsel-tp-sched: Fix bitwise operator
Mark Rutland <[email protected]>
perf/core: Don't WARN() for impossible ring-buffer sizes
Tony Luck <[email protected]>
x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
Peter Zijlstra <[email protected]>
perf/x86/intel: Delay memory deallocation until x86_pmu_dead_cpu()
Kan Liang <[email protected]>
perf/x86/intel/uncore: Add Node ID mask
Josh Poimboeuf <[email protected]>
cpu/hotplug: Fix "SMT disabled by BIOS" detection for KVM
Peter Shier <[email protected]>
KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
Jann Horn <[email protected]>
kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
Paolo Bonzini <[email protected]>
KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
James Bottomley <[email protected]>
scsi: aic94xx: fix module loading
Vaibhav Jain <[email protected]>
scsi: cxlflash: Prevent deadlock when adapter probe fails
Damien Le Moal <[email protected]>
scsi: sd_zbc: Fix zone information messages
Johan Hovold <[email protected]>
staging: speakup: fix tty-operation NULL derefs
Paul Elder <[email protected]>
usb: gadget: musb: fix short isoc packets with inventra dma
Gustavo A. R. Silva <[email protected]>
usb: gadget: udc: net2272: Fix bitwise and boolean operations
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Handle 0 xfer length for OUT EP
Bin Liu <[email protected]>
usb: phy: am335x: fix race condition in _probe
Jernej Skrabec <[email protected]>
arm64: dts: allwinner: a64: Fix USB OTG regulator
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Plug allocation race for devices sharing a DevID
Thomas Gleixner <[email protected]>
futex: Handle early deadlock return correctly
Leonid Iziumtsev <[email protected]>
dmaengine: imx-dma: fix wrong callback invoke
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix abort of transactions
Lukas Wunner <[email protected]>
dmaengine: bcm2835: Fix interrupt race on RT
Vladis Dronov <[email protected]>
HID: debug: fix the ring buffer implementation
Miklos Szeredi <[email protected]>
cuse: fix ioctl
Miklos Szeredi <[email protected]>
fuse: handle zero sized retrieve correctly
Miklos Szeredi <[email protected]>
fuse: decrement NR_WRITEBACK_TEMP on the right page
Jann Horn <[email protected]>
fuse: call pipe_buf_release() under pipe lock
Jeremy Soller <[email protected]>
ALSA: hda/realtek - Headset microphone support for System76 darp5
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Use a common helper for hp pin reference
Kailang Yang <[email protected]>
ALSA: hda/realtek - Fix lose hp_pins for disable auto mute
Takashi Iwai <[email protected]>
ALSA: hda - Serialize codec registrations
Udo Eberhardt <[email protected]>
ALSA: usb-audio: Add support for new T+A USB DAC
Charles Keepax <[email protected]>
ALSA: compress: Fix stop handling on compressed capture streams
Brian Foster <[email protected]>
xfs: eof trim writeback mapping as soon as it is cached
Cong Wang <[email protected]>
net/mlx5e: Force CHECKSUM_UNNECESSARY for short ethernet frames
Guy Shattah <[email protected]>
net/mlx5e: Use the inner headers to determine tc/pedit offload limitation on decap flows
Arun Parameswaran <[email protected]>
net: dsa: b53: Fix for failure when irq is not defined in dt
Petr Machata <[email protected]>
net: cls_flower: Remove filter from mask before freeing it
Michael Chan <[email protected]>
bnxt_en: Disable interrupts when allocating CP rings or NQs.
Toshiaki Makita <[email protected]>
virtio_net: Account for tx bytes and packets on sending xdp_frames
Dan Carpenter <[email protected]>
skge: potential memory corruption in skge_get_regs()
Greg Kroah-Hartman <[email protected]>
sctp: walk the list of asoc safely
Xin Long <[email protected]>
sctp: check and update stream->out_curr when allocating stream_out
Eric Dumazet <[email protected]>
rxrpc: bad unlock balance in rxrpc_recvmsg
Russell King <[email protected]>
Revert "net: phy: marvell: avoid pause mode on SGMII-to-Copper for 88e151x"
Eric Dumazet <[email protected]>
rds: fix refcount bug in rds_sock_addref
Florian Fainelli <[email protected]>
net: systemport: Fix WoL with password after deep sleep
Rundong Ge <[email protected]>
net: dsa: slave: Don't propagate flag changes on down slave interfaces
Andrew Lunn <[email protected]>
net: dsa: mv88e6xxx: Fix counting of ATU violations
Dan Carpenter <[email protected]>
net: dsa: Fix NULL checking in dsa_slave_set_eee()
Marc Zyngier <[email protected]>
net: dsa: Fix lockdep false positive splat
Sebastian Andrzej Siewior <[email protected]>
net: dp83640: expire old TX-skb
Bart Van Assche <[email protected]>
lib/test_rhashtable: Make test_insert_dup() allocate its hash table dynamically
Govindarajulu Varadarajan <[email protected]>
enic: fix checksum validation for IPv6
Eric Dumazet <[email protected]>
dccp: fool proof ccid_hc_[rt]x_parse_options()
Eduardo Valentin <[email protected]>
thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set
Chuck Lever <[email protected]>
xprtrdma: Don't wake pending tasks until disconnect is done
Du Changbin <[email protected]>
scripts/gdb: fix lx-version string output
Anders Roxell <[email protected]>
kernel/kcov.c: mark write_comp_data() as notrace
Oleg Nesterov <[email protected]>
exec: load_script: don't blindly truncate shebang string
Davidlohr Bueso <[email protected]>
fs/epoll: drop ovflist branch prediction
Liu, Chuansheng <[email protected]>
kernel/hung_task.c: force console verbose before panic
Cheng Lin <[email protected]>
proc/sysctl: fix return error for proc_doulongvec_minmax()
Tetsuo Handa <[email protected]>
kernel/hung_task.c: break RCU locks based on jiffies
Benjamin Gordon <[email protected]>
fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
Dave Martin <[email protected]>
arm64/sve: ptrace: Fix SVE_PT_REGS_OFFSET definition
Aditya Pakki <[email protected]>
HID: lenovo: Add checks to fix of_led_classdev_register
Bjorn Andersson <[email protected]>
thermal: generic-adc: Fix adc to temp interpolation
Finn Thain <[email protected]>
block/swim3: Fix regression on PowerBook G3
Richard Zhu <[email protected]>
PCI: imx: Enable MSI from downstream components
Srinivas Kandagatla <[email protected]>
thermal: tsens: qcom: do not create duplicate regmap debugfs entries
Douglas Anderson <[email protected]>
kdb: Don't back trace on a cpu that didn't round up
Matthias Brugger <[email protected]>
thermal: bcm2835: enable hwmon explicitly
Finn Thain <[email protected]>
block/swim3: Fix -EBUSY error when re-opening device after unmount
Scott Wood <[email protected]>
fsl/fman: Use GFP_ATOMIC in {memac,tgec}_add_hash_mac_address()
Wenwen Wang <[email protected]>
gdrom: fix a memory leak bug
Jia-Ju Bai <[email protected]>
isdn: hisax: hfc_pci: Fix a possible concurrency use-after-free bug in HFCPCI_l1hw()
Minchan Kim <[email protected]>
zram: fix lockdep warning of free block handling
Waiman Long <[email protected]>
mm/page_alloc.c: don't call kasan_free_pages() at deferred mem init
Larry Chen <[email protected]>
ocfs2: improve ocfs2 Makefile
Junxiao Bi <[email protected]>
ocfs2: don't clear bh uptodate for block read
Randy Dunlap <[email protected]>
arch/sh/boards/mach-kfr2r09/setup.c: fix struct mtd_oob_ops build warning
Marc Zyngier <[email protected]>
scripts/decode_stacktrace: only strip base path when a prefix of the path
Jiri Olsa <[email protected]>
perf python: Do not force closing original perf descriptor in evlist.get_pollfd()
Ondrej Mosnacek <[email protected]>
cgroup: fix parsing empty mount option string
Sahitya Tummala <[email protected]>
f2fs: fix sbi->extent_list corruption issue
Kangjie Lu <[email protected]>
niu: fix missing checks of niu_pci_eeprom_read
Anton Ivanov <[email protected]>
um: Avoid marking pages with "changed protection"
Sahitya Tummala <[email protected]>
f2fs: fix use-after-free issue when accessing sbi->stat_info
Ronnie Sahlberg <[email protected]>
cifs: check ntwrk_buf_start for NULL before dereferencing it
Stefan Roese <[email protected]>
MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in hash_set_dma_transfer
Nathan Chancellor <[email protected]>
crypto: ux500 - Use proper enum in cryp_set_dma_transfer
Michael Ellerman <[email protected]>
seq_buf: Make seq_buf_puts() null-terminate the buffer
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of bus read in lm80 probe
Kangjie Lu <[email protected]>
hwmon: (lm80) fix a missing check of the status of SMBus read
Stanislav Fomichev <[email protected]>
perf build: Don't unconditionally link the libbfd feature test to -liberty and -lz
Chris Perl <[email protected]>
NFS: nfs_compare_mount_options always compare auth flavors.
Jim Mattson <[email protected]>
kvm: Change offset in kvm_write_guest_offset_cached to unsigned
Vitaly Kuznetsov <[email protected]>
selftests: kvm: report failed stage when exit reason is unexpected
Mahesh Salgaonkar <[email protected]>
powerpc/fadump: Do not allow hot-remove memory from fadump reserved area.
Vitaly Kuznetsov <[email protected]>
KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
Martin Blumenstingl <[email protected]>
pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
John Fastabend <[email protected]>
bpf: sk_msg, fix socket data_ready events
Christophe Leroy <[email protected]>
powerpc/mm: Fix reporting of kernel execute faults on the 8xx
John Fastabend <[email protected]>
bpf: sk_msg, zap ingress queue on psock down
Noralf Trønnes <[email protected]>
fbdev: fbcon: Fix unregister crash when more than one framebuffer
Lenny Szubowicz <[email protected]>
ACPI/APEI: Clear GHES block_status before panic()
Kai-Heng Feng <[email protected]>
igb: Fix an issue that PME is not enabled during runtime suspend
Young Xiao <[email protected]>
ice: Do not enable NAPI on q_vectors that have no rings
Konstantin Khorenko <[email protected]>
i40e: define proper net_device::neigh_priv_len
Peter Rosin <[email protected]>
fbdev: fbmem: behave better with small rotated displays and many CPUs
Guoqing Jiang <[email protected]>
md: fix raid10 hang issue caused by barrier
Alexey Khoroshilov <[email protected]>
video: clps711x-fb: release disp device node in probe()
Wenjing Liu <[email protected]>
drm/amd/display: validate extended dongle caps
Zhi Chen <[email protected]>
ath10k: fix tx_stats memory leak
Karthikeyan Periyasamy <[email protected]>
ath10k: fix kernel panic due to use after free
Nathan Chancellor <[email protected]>
drbd: Avoid Clang warning about pointless switch statment
Lars Ellenberg <[email protected]>
drbd: skip spurious timeout (ping-timeo) when failing promote
Lars Ellenberg <[email protected]>
drbd: disconnect, if the wrong UUIDs are attached on a connected peer
Roland Kammerer <[email protected]>
drbd: narrow rcu_read_lock in drbd_sync_handshake
Miroslav Lichvar <[email protected]>
mlx5: update timecounter at least twice per counter overflow
Alexey Kardashevskiy <[email protected]>
powerpc/powernv/ioda: Allocate indirect TCE levels of cached userspace addresses on demand
Naftali Goldstein <[email protected]>
iwlwifi: mvm: fix setting HE ppe FW config
Madhavan Srinivasan <[email protected]>
powerpc/perf: Fix thresholding counter data for unknown type
Jian Shen <[email protected]>
net: hns3: don't restore rules when flow director is disabled
Peng Li <[email protected]>
net: hns3: fix the descriptor index when get rss type
Jian Shen <[email protected]>
net: hns3: add max vector number check for pf
Jia-Ju Bai <[email protected]>
cw1200: Fix concurrency use-after-free bugs in cw1200_hw_scan()
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: increase fw status register read timeout
Dave Carroll <[email protected]>
scsi: smartpqi: correct volume status
Mahesh Rajashekhara <[email protected]>
scsi: smartpqi: correct host serial num for ssa
Ido Schimmel <[email protected]>
mlxsw: spectrum: Properly cleanup LAG uppers when removing port from LAG
YueHaibing <[email protected]>
xfrm6_tunnel: Fix spi check in __xfrm6_tunnel_alloc_spi
Johannes Berg <[email protected]>
mac80211: fix radiotap vendor presence bitmap handling
Christophe Leroy <[email protected]>
powerpc/uaccess: fix warning/error with access_ok()
Eric Yang <[email protected]>
drm/amd/display: fix YCbCr420 blank color
Chen-Yu Tsai <[email protected]>
Bluetooth: hci_bcm: Handle deferred probing for the clock supply
Dale Zhao <[email protected]>
drm/amd/display: Wait edp HPD to high in detect_sink
Paul Hsieh <[email protected]>
drm/amd/display: Add retry to read ddc_clock pin
Huazhong Tan <[email protected]>
net: hns3: fix incomplete uninitialization of IRQ in the hns3_nic_uninit_vector_data()
Huazhong Tan <[email protected]>
net: hns3: fix error handling int the hns3_get_vector_ring_chain
Dennis Zhou <[email protected]>
percpu: convert spin_lock_irq to spin_lock_irqsave.
Arnaldo Carvalho de Melo <[email protected]>
perf tools: Cast off_t to s64 to avoid warning on bionic libc
Arnaldo Carvalho de Melo <[email protected]>
perf header: Fix up argument to ctime()
Bin Liu <[email protected]>
usb: musb: dsps: fix runtime pm for peripheral mode
Bin Liu <[email protected]>
usb: musb: dsps: fix otg state machine
Mark Rutland <[email protected]>
arm64: KVM: Skip MMIO insn after emulation
Nicholas Mc Guire <[email protected]>
livepatch: check kzalloc return values
Ilan Peer <[email protected]>
mac80211: Properly handle SKB with radiotap only
Nicholas Mc Guire <[email protected]>
pinctrl: rza1: Handle devm_kasprintf() failure cases
Doug Smythies <[email protected]>
tools/power/x86/intel_pstate_tracer: Fix non root execution for post processing a trace file
Michael Mueller <[email protected]>
KVM: s390: unregister debug feature on failing arch init
Michael Chan <[email protected]>
bnxt_en: Disable MSIX before re-reserving NQs/CMPL rings.
Fabrizio Castro <[email protected]>
i2c: sh_mobile: Add support for r8a774c0 (RZ/G2E)
Arnaldo Carvalho de Melo <[email protected]>
perf probe: Fix unchecked usage of strncpy()
Ethan Lien <[email protected]>
btrfs: use tagged writepage to mitigate livelock of snapshot
Arnaldo Carvalho de Melo <[email protected]>
perf header: Fix unchecked usage of strncpy()
Arnaldo Carvalho de Melo <[email protected]>
perf dso: Fix unchecked usage of strncpy()
Adrian Hunter <[email protected]>
perf test: Fix perf_event_attr test failure
Stephane Eranian <[email protected]>
perf stat: Fix CSV mode column output for non-cgroup events
Beomho Seo <[email protected]>
tty: serial: samsung: Properly set flags in autoCTS mode
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Resume PIO in sci_rx_interrupt() on DMA failure
Geert Uytterhoeven <[email protected]>
serial: sh-sci: Fix locking in sci_submit_rx()
David Sterba <[email protected]>
btrfs: reada: reorder dev-replace locks before radix tree preload
Anand Jain <[email protected]>
btrfs: harden agaist duplicate fsid on scanned devices
Fabrizio Castro <[email protected]>
usb: renesas_usbhs: add support for RZ/G2E
Linus Walleij <[email protected]>
mmc: jz4740: Get CD/WP GPIOs from descriptors
Adrian Hunter <[email protected]>
mmc: sdhci-xenon: Fix timeout checks
Adrian Hunter <[email protected]>
mmc: sdhci-omap: Fix timeout checks
Adrian Hunter <[email protected]>
mmc: sdhci-of-esdhc: Fix timeout checks
Kai-Heng Feng <[email protected]>
memstick: Prevent memstick host from getting runtime suspended during card detection
Nicholas Mc Guire <[email protected]>
mmc: meson-mx-sdio: check devm_kasprintf for failure
Michal Suchanek <[email protected]>
mmc: bcm2835: reset host on timeout
Phil Elwell <[email protected]>
mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
Suraj Jitindar Singh <[email protected]>
KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
Quentin Monnet <[email protected]>
tools: bpftool: fix -Wmissing declaration warnings
David Ahern <[email protected]>
ipv6: Fix handling of LLA with VRF and sockets bound to VRF
Chao Yu <[email protected]>
f2fs: fix to reorder set_page_dirty and wait_on_page_writeback
Jeffrey Hugo <[email protected]>
clk: qcom: Leave mmss noc on for 8998
Tom Murphy <[email protected]>
fix dma-buf/udmabuf selftest
Arnd Bergmann <[email protected]>
ARM: mmp: fix timer_init calls
Fabio Estevam <[email protected]>
ASoC: fsl: Fix SND_SOC_EUKREA_TLV320 build error on i.MX8M
Arnd Bergmann <[email protected]>
ARM: pxa: avoid section mismatch warning
Stanislav Fomichev <[email protected]>
selftests/bpf: use __bpf_constant_htons in test_prog.c
Joey Zhang <[email protected]>
switchtec: Fix SWITCHTEC_IOCTL_EVENT_IDX_ALL flags overwrite
Jan Kara <[email protected]>
udf: Fix BUG on corrupted inode
Nir Dotan <[email protected]>
mlxsw: spectrum_acl: Limit priority value
Icenowy Zheng <[email protected]>
phy: sun4i-usb: add support for missing USB PHY index
Geert Uytterhoeven <[email protected]>
lightnvm: Fix uninitialized return value in nvm_get_chunk_meta()
Adamski, Krzysztof (Nokia - PL/Wroclaw) <[email protected]>
i2c-axxia: check for error conditions first
Hua Su <[email protected]>
lightnvm: pblk: add lock protection to list operations
Hans Holmberg <[email protected]>
lightnvm: pblk: fix resubmission of overwritten write err lbas
Sean Paul <[email protected]>
drm/msm: dpu: Only check flush register against pending flushes
Abhinav Kumar <[email protected]>
drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
Zhizhou Zhang <[email protected]>
tee: optee: avoid possible double list_del()
Viresh Kumar <[email protected]>
OPP: Use opp_table->regulators to verify no regulator case
Yangtao Li <[email protected]>
cpuidle: big.LITTLE: fix refcount leak
Vadim Pasternak <[email protected]>
platform/x86: mlx-platform: Fix tachometer registers
Anson Huang <[email protected]>
clk: imx6sl: ensure MMDC CH0 handshake is bypassed
Sergei Shtylyov <[email protected]>
sata_rcar: fix deferred probing
Will Deacon <[email protected]>
iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
Vivek Gautam <[email protected]>
iommu/arm-smmu: Add support for qcom,smmu-v2 variant
Zhen Lei <[email protected]>
iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
Tejas Joglekar <[email protected]>
usb: dwc3: gadget: Disable CSP for stream OUT ep
Andrey Smirnov <[email protected]>
ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
Wolfram Sang <[email protected]>
watchdog: renesas_wdt: don't set divider while watchdog is running
Dan Carpenter <[email protected]>
tracing: Have trace_stack nr_entries compare not be so subtle
Linus Walleij <[email protected]>
ARM: dts: Fix up the D-Link DIR-685 MTD partition info
Carlo Caione <[email protected]>
arm64: dts: meson: Fix IRQ trigger type for macirq
Philipp Zabel <[email protected]>
media: coda: fix H.264 deblocking filter controls
Jiong Wang <[email protected]>
mips: bpf: fix encoding bug for mm_srlv32_op
Russell King - ARM Linux <[email protected]>
ARM: dts: Fix OMAP4430 SDP Ethernet startup
Janusz Krzysztofik <[email protected]>
ARM: OMAP1: ams-delta: Fix audio permanently muted
Tomasz Figa <[email protected]>
media: v4l2-device: Link subdevices to their parent devices if available
Yu Zhao <[email protected]>
iommu/amd: Fix amd_iommu=force_isolation
Nicholas Mc Guire <[email protected]>
pinctrl: sx150x: handle failure case of devm_kstrdup
Nicholas Mc Guire <[email protected]>
gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
Nicholas Mc Guire <[email protected]>
gpio: mt7621: report failure of devm_kasprintf()
Andy Shevchenko <[email protected]>
usb: dwc3: trace: add missing break statement to make compiler happy
Kaike Wan <[email protected]>
IB/hfi1: Unreserve a reserved request when it is completed
Peter Rajnoha <[email protected]>
kobject: return error code if writing /sys/.../uevent fails
Alexander Duyck <[email protected]>
driver core: Move async_synchronize_full call
Oskari Lemmela <[email protected]>
arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
Hoang Le <[email protected]>
tipc: fix node keep alive interval calculation
Alex Deucher <[email protected]>
drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2)
Nicholas Mc Guire <[email protected]>
pinctrl: nuvoton: check for devm_kasprintf() failure
Emmanuel Grumbach <[email protected]>
mac80211: fix deauth TX when we disconnect
Luca Ceresoli <[email protected]>
media: imx274: select REGMAP_I2C
Chen-Yu Tsai <[email protected]>
clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks
Chunfeng Yun <[email protected]>
usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
Bart Van Assche <[email protected]>
timekeeping: Use proper seqcount initializer
Mathias Nyman <[email protected]>
usb: hub: delay hub autosuspend if USB3 port is still link training
Marek Szyprowski <[email protected]>
usb: dwc2: Disable power down feature on Samsung SoCs
Eric Long <[email protected]>
dmaengine: sprd: Support DMA link-list cyclic callback
Anurag Kumar Vulisha <[email protected]>
usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
Max Filippov <[email protected]>
xtensa: xtfpga.dtsi: fix dtc warnings about SPI
Zoran Markovic <[email protected]>
smack: fix access permissions for keyring
Ville Syrjälä <[email protected]>
platform/x86: Fix config space access for intel_atomisp2_pm
Alexey Khoroshilov <[email protected]>
media: DaVinci-VPBE: fix error handling in vpbe_initialize()
Arnd Bergmann <[email protected]>
media: i2c: TDA1997x: select CONFIG_HDMI
Sebastian Andrzej Siewior <[email protected]>
x86/fpu: Add might_fault() to user_insn()
Randy Dunlap <[email protected]>
spi: fix spi-at91-usart.c build errors when PINCTRL is not set
Rob Herring <[email protected]>
ARM: dts: aspeed: add missing memory unit-address
Lubomir Rintel <[email protected]>
ARM: mmp/mmp2: dt: enable the clock
Lubomir Rintel <[email protected]>
ARM: dts: mmp2: fix TWSI2
Eric Anholt <[email protected]>
drm/v3d: Fix prime imports of buffers from other drivers.
Mark Rutland <[email protected]>
arm64: ftrace: don't adjust the LR value
Lorenzo Bianconi <[email protected]>
mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
Harald Freudenberger <[email protected]>
s390/zcrypt: improve special ap message cmd handling
Arend van Spriel <[email protected]>
firmware/efi: Add NULL pointer checks in efivars API functions
Thara Gopinath <[email protected]>
thermal: Fix locking in cooling device sysfs update cur_state
Wei Wang <[email protected]>
Thermal: do not clear passive state during system sleep
Will Deacon <[email protected]>
arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
Nicholas Mc Guire <[email protected]>
perf: arm_spe: handle devm_kasprintf() failure
Sean Paul <[email protected]>
drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
J. Bruce Fields <[email protected]>
nfsd4: fix crash on writing v4_end_grace before nfsd startup
Yangtao Li <[email protected]>
soc: bcm: brcmstb: Don't leak device tree node reference
Young Xiao <[email protected]>
sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
YueHaibing <[email protected]>
net: aquantia: return 'err' if set MPI_DEINIT state fails
Will Deacon <[email protected]>
arm64: io: Ensure calls to delay routines are ordered against prior readX()
Simon Horman <[email protected]>
i2c: sh_mobile: add support for r8a77990 (R-Car E3)
Tiezhu Yang <[email protected]>
f2fs: fix wrong return value of f2fs_acl_create
Sheng Yong <[email protected]>
f2fs: fix race between write_checkpoint and write_begin
Jaegeuk Kim <[email protected]>
f2fs: avoid build warn of fall_through
Yunlei He <[email protected]>
f2fs: move dir data flush to write checkpoint process
Yunlong Song <[email protected]>
f2fs: avoid GC causing encrypted file corrupted
Michael Straube <[email protected]>
staging: pi433: fix potential null dereference
Andy Shevchenko <[email protected]>
ACPI: SPCR: Consider baud rate 0 as preconfigured state
Hans Verkuil <[email protected]>
media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
Hans de Goede <[email protected]>
iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
Martin Blumenstingl <[email protected]>
iio: adc: meson-saradc: fix internal clock names
Nicholas Mc Guire <[email protected]>
iio: adc: meson-saradc: check for devm_kasprintf failure
Mathieu Malaterre <[email protected]>
powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
Nathan Chancellor <[email protected]>
dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
YueHaibing <[email protected]>
ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: fix the width of the cpu_scale_div clock
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
Chen-Yu Tsai <[email protected]>
ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
Laurent Pinchart <[email protected]>
drm: rcar-du: Fix external clock error checks
Parav Pandit <[email protected]>
RDMA/core: Sync unregistration with netlink commands
Hans Verkuil <[email protected]>
media: vivid: fill in media_device bus_info
Babu Moger <[email protected]>
x86/resctrl: Fixup the user-visible strings
Gao Xiang <[email protected]>
staging: erofs: fix race when the managed cache is enabled
Gao Xiang <[email protected]>
staging: erofs: fix the definition of DBG_BUGON
Alexey Khoroshilov <[email protected]>
media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
Akinobu Mita <[email protected]>
media: video-i2c: avoid accessing released memory area when removing driver
Sean Young <[email protected]>
media: rc: ensure close() is called on rc_unregister_device
Yangtao Li <[email protected]>
soc/tegra: Don't leak device tree node reference
Arnd Bergmann <[email protected]>
scsi: cxgb4i: fix thermal configuration dependencies
Pu Wen <[email protected]>
perf tools: Add Hygon Dhyana support
Sami Tolvanen <[email protected]>
modpost: validate symbol names also in find_elf_symbol
Saeed Mahameed <[email protected]>
net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
Stanislav Fomichev <[email protected]>
bpf: libbpf: retry map creation without the name
Yogesh Mohan Marimuthu <[email protected]>
drm/amd/display: calculate stream->phy_pix_clk before clock mapping
Murton Liu <[email protected]>
drm/amd/display: fix gamma not being applied correctly
Nathan Chancellor <[email protected]>
ARM: OMAP2+: hwmod: Fix some section annotations
Damian Kos <[email protected]>
drm/rockchip: fix for mailbox read size
Ben Dooks <[email protected]>
usbnet: smsc95xx: fix rx packet alignment
Renato Lui Geh <[email protected]>
staging: iio: ad7780: update voltage on read
Xiang Chen <[email protected]>
scsi: hisi_sas: change the time of SAS SSP connection
Alan Brady <[email protected]>
i40e: prevent overlapping tx_timeout recover
Mitch Williams <[email protected]>
i40e: suppress bogus error message
Brian Norris <[email protected]>
platform/chrome: don't report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
Arnd Bergmann <[email protected]>
vbox: fix link error with 'gcc -Og'
Anatolij Gustschin <[email protected]>
fpga: altera-cvp: fix 'bad IO access' on x86_64
Dexuan Cui <[email protected]>
Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
Andreas Puhm <[email protected]>
fpga: altera-cvp: Fix registration for CvP incapable devices
Matheus Tavares <[email protected]>
staging:iio:ad2s90: Make probe handle spi_setup failure
Naftali Goldstein <[email protected]>
iwlwifi: fw: do not set sgi bits for HE connection
Ioana Ciornei <[email protected]>
dpaa2-ptp: defer probe when portal allocation failed
Paul Burton <[email protected]>
MIPS: Boston: Disable EG20T prefetch
Miroslav Lichvar <[email protected]>
ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
Andy Duan <[email protected]>
serial: fsl_lpuart: clear parity enable bit when disable parity
Boris Brezillon <[email protected]>
drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
Eric Biggers <[email protected]>
crypto: aes_ti - disable interrupts while accessing S-box
Julian Wiedmann <[email protected]>
s390/qeth: utilize virtual MAC for Layer2 OSD devices
David Ahern <[email protected]>
bpftool: Improve handling of ENOENT on map dumps
Frank Rowand <[email protected]>
powerpc/pseries: add of_node_put() in dlpar_detach_node()
Colin Ian King <[email protected]>
x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
Bob Peterson <[email protected]>
dlm: Don't swamp the CPU with callbacks queued during recovery
Yi Wang <[email protected]>
clk: boston: fix possible memory leak in clk_boston_setup()
Yufen Wang <[email protected]>
ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
James Smart <[email protected]>
scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
Suganath Prabu <[email protected]>
scsi: mpt3sas: Call sas_remove_host before removing the target devices
James Smart <[email protected]>
scsi: lpfc: Correct LCB RJT handling
Lorenzo Bianconi <[email protected]>
ath9k: dynack: use authentication messages for 'late' ack
Brian Norris <[email protected]>
ath10k: assign 'n_cipher_suites' for WCN3990
Lior David <[email protected]>
wil6210: fix memory leak in wil_find_tx_bcast_2
Alexei Avshalom Lazar <[email protected]>
wil6210: fix reset flow for Talyn-mb
Nickhu <[email protected]>
nds32: Fix gcc 8.0 compiler option incompatible.
Bhawanpreet Lakha <[email protected]>
drm/amd/display: Fix potential nullptr error
Steve Longerbeam <[email protected]>
gpu: ipu-v3: image-convert: Prevent race between run and unprepare
Long Li <[email protected]>
genirq/affinity: Spread IRQs to all available NUMA nodes
Dan Carpenter <[email protected]>
ath10k: fixup extended per sta tx statistics
Jernej Skrabec <[email protected]>
drm/sun4i: Initialize registers in tcon-top driver
Muchun Song <[email protected]>
gpiolib: Fix possible use after free on label
Arnd Bergmann <[email protected]>
ASoC: Intel: mrfld: fix uninitialized variable access
Jernej Skrabec <[email protected]>
clk: sunxi-ng: h6: Set video PLLs limits
Lukas Wunner <[email protected]>
pinctrl: bcm2835: Use raw spinlock for RT compatibility
Deepak Sharma <[email protected]>
drm/vgem: Fix vgem_init to get drm device available.
Slawomir Stepien <[email protected]>
staging: iio: adc: ad7280a: handle error from __ad7280_read32()
Eric Anholt <[email protected]>
drm/v3d: Fix a use-after-free race accessing the scheduler's fences.
Gustavo A. R. Silva <[email protected]>
drm/bufs: Fix Spectre v1 vulnerability
-------------
Diffstat:
Makefile | 4 +- .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 +-- arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 ++- arch/arm/boot/dts/mmp2.dtsi | 9 +- arch/arm/boot/dts/omap4-sdp.dts | 1 + arch/arm/kernel/smp.c | 15 +++ arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/pxa910.c | 2 +- arch/arm/mach-mmp/time.c | 32 +++-- arch/arm/mach-omap1/board-ams-delta.c | 6 +- arch/arm/mach-omap2/omap_hwmod.c | 6 +- arch/arm/mach-pxa/cm-x300.c | 2 +- arch/arm/mach-pxa/littleton.c | 2 +- arch/arm/mach-pxa/zeus.c | 2 +- .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 20 +-- arch/arm64/include/asm/io.h | 32 +++-- arch/arm64/include/uapi/asm/ptrace.h | 2 +- arch/arm64/kernel/entry-ftrace.S | 1 - arch/mips/boot/dts/img/boston.dts | 6 + arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 2 - arch/mips/include/uapi/asm/inst.h | 2 +- arch/mips/jz4740/board-qi_lb60.c | 12 +- arch/mips/ralink/Kconfig | 1 + arch/nds32/mm/Makefile | 6 +- arch/powerpc/include/asm/fadump.h | 2 +- arch/powerpc/include/asm/uaccess.h | 2 +- arch/powerpc/kernel/fadump.c | 10 +- arch/powerpc/kernel/vmlinux.lds.S | 4 + arch/powerpc/kvm/powerpc.c | 5 +- arch/powerpc/mm/fault.c | 4 +- arch/powerpc/perf/isa207-common.c | 7 +- arch/powerpc/platforms/powernv/pci-ioda-tce.c | 2 +- arch/powerpc/platforms/pseries/dlpar.c | 2 + arch/powerpc/platforms/pseries/hotplug-memory.c | 7 +- arch/s390/include/uapi/asm/zcrypt.h | 4 +- arch/s390/kvm/kvm-s390.c | 17 ++- arch/sh/boards/mach-kfr2r09/setup.c | 1 - arch/um/include/asm/pgtable.h | 9 +- arch/x86/events/intel/core.c | 16 ++- arch/x86/events/intel/uncore_snbep.c | 4 +- arch/x86/include/asm/fpu/internal.h | 3 + arch/x86/kernel/cpu/bugs.c | 2 +- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++-- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++--- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 +++--- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kvm/svm.c | 7 ++ arch/x86/kvm/vmx.c | 4 +- arch/x86/kvm/x86.c | 7 ++ arch/x86/pci/broadcom_bus.c | 4 +- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- crypto/Kconfig | 3 +- crypto/aes_ti.c | 18 +++ drivers/acpi/apei/ghes.c | 2 + drivers/acpi/spcr.c | 11 ++ drivers/ata/sata_rcar.c | 4 +- drivers/base/bus.c | 12 +- drivers/base/cacheinfo.c | 6 +- drivers/base/core.c | 8 +- drivers/base/dd.c | 6 +- drivers/block/drbd/drbd_nl.c | 15 +-- drivers/block/drbd/drbd_receiver.c | 13 +- drivers/block/sunvdc.c | 5 + drivers/block/swim3.c | 13 +- drivers/block/zram/zram_drv.c | 38 +++--- drivers/block/zram/zram_drv.h | 2 +- drivers/bluetooth/hci_bcm.c | 4 + drivers/cdrom/gdrom.c | 1 + drivers/clk/imgtec/clk-boston.c | 11 +- drivers/clk/imx/clk-imx6sl.c | 6 + drivers/clk/meson/meson8b.c | 16 ++- drivers/clk/qcom/gcc-msm8998.c | 6 + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 4 + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +- drivers/cpuidle/cpuidle-big_little.c | 7 +- drivers/crypto/ux500/cryp/cryp_core.c | 4 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/bcm2835-dma.c | 70 ++++------- drivers/dma/imx-dma.c | 8 +- drivers/dma/sprd-dma.c | 25 ++-- drivers/dma/xilinx/zynqmp_dma.c | 2 +- drivers/firmware/efi/vars.c | 99 +++++++++++---- drivers/fpga/altera-cvp.c | 15 ++- drivers/gpio/gpio-mt7621.c | 10 +- drivers/gpio/gpiolib.c | 25 +++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 26 +++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 11 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 12 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 ++- drivers/gpu/drm/drm_atomic_helper.c | 8 +- drivers/gpu/drm/drm_bufs.c | 3 + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 14 ++- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 ++ drivers/gpu/drm/v3d/v3d_bo.c | 1 + drivers/gpu/drm/v3d/v3d_drv.h | 5 + drivers/gpu/drm/v3d/v3d_gem.c | 8 +- drivers/gpu/drm/vc4/vc4_plane.c | 12 +- drivers/gpu/drm/vgem/vgem_drv.c | 16 +-- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +- drivers/hid/hid-debug.c | 120 ++++++++---------- drivers/hid/hid-lenovo.c | 10 +- drivers/hwmon/lm80.c | 26 ++-- drivers/i2c/busses/i2c-axxia.c | 32 ++--- drivers/i2c/busses/i2c-sh_mobile.c | 2 + drivers/iio/accel/kxcjk-1013.c | 1 + drivers/iio/adc/meson_saradc.c | 14 ++- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 26 +++- drivers/infiniband/core/nldev.c | 20 +-- drivers/infiniband/hw/hfi1/rc.c | 2 + drivers/iommu/amd_iommu.c | 9 +- drivers/iommu/arm-smmu-v3.c | 14 ++- drivers/iommu/arm-smmu.c | 3 + drivers/irqchip/irq-gic-v3-its.c | 32 ++++- drivers/isdn/hisax/hfc_pci.c | 2 + drivers/lightnvm/core.c | 2 +- drivers/lightnvm/pblk-core.c | 13 +- drivers/lightnvm/pblk-write.c | 8 +- drivers/md/raid10.c | 4 + drivers/media/i2c/Kconfig | 2 + drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 +- drivers/media/i2c/adv7842.c | 4 +- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- drivers/media/i2c/video-i2c.c | 11 +- drivers/media/platform/coda/coda-bit.c | 19 ++- drivers/media/platform/coda/coda-common.c | 15 ++- drivers/media/platform/coda/coda.h | 6 +- drivers/media/platform/coda/coda_regs.h | 2 +- drivers/media/platform/davinci/vpbe.c | 7 +- .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 +- drivers/media/platform/vivid/vivid-core.c | 2 + drivers/media/rc/rc-main.c | 2 + drivers/media/v4l2-core/v4l2-device.c | 1 + drivers/memstick/core/memstick.c | 3 + drivers/mmc/host/bcm2835.c | 12 ++ drivers/mmc/host/jz4740_mmc.c | 20 +-- drivers/mmc/host/meson-mx-sdio.c | 6 + drivers/mmc/host/sdhci-of-esdhc.c | 16 ++- drivers/mmc/host/sdhci-omap.c | 16 ++- drivers/mmc/host/sdhci-xenon-phy.c | 10 +- drivers/mmc/host/sdhci-xenon.c | 10 +- drivers/net/dsa/b53/b53_srab.c | 3 - drivers/net/dsa/mv88e6xxx/global1_atu.c | 21 ++-- .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 + drivers/net/ethernet/broadcom/bcmsysport.c | 25 ++-- drivers/net/ethernet/broadcom/bcmsysport.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 27 +++-- drivers/net/ethernet/cisco/enic/enic_main.c | 3 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 5 +- drivers/net/ethernet/freescale/fman/fman_memac.c | 2 +- drivers/net/ethernet/freescale/fman/fman_tgec.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 30 +++-- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 + drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 ++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +- drivers/net/ethernet/intel/ice/ice_main.c | 16 ++- drivers/net/ethernet/intel/igb/igb_main.c | 8 +- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 13 ++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 23 ++++ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 5 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 27 +---- drivers/net/ethernet/sun/niu.c | 10 +- drivers/net/phy/dp83640.c | 13 +- drivers/net/phy/marvell.c | 12 -- drivers/net/usb/smsc95xx.c | 1 + drivers/net/virtio_net.c | 20 ++- drivers/net/wireless/ath/ath10k/core.c | 1 + drivers/net/wireless/ath/ath10k/mac.c | 28 +++-- drivers/net/wireless/ath/ath9k/dynack.c | 3 +- drivers/net/wireless/ath/wil6210/main.c | 11 +- drivers/net/wireless/ath/wil6210/txrx.c | 2 + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 + .../net/wireless/mediatek/mt76/mt76x2/pci_dfs.c | 8 +- drivers/net/wireless/st/cw1200/scan.c | 13 +- drivers/nvme/host/lightnvm.c | 3 +- drivers/opp/core.c | 11 +- drivers/pci/controller/dwc/pci-imx6.c | 10 ++ drivers/pci/switch/switchtec.c | 3 + drivers/perf/arm_spe_pmu.c | 5 + drivers/phy/allwinner/phy-sun4i-usb.c | 7 ++ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 +-- drivers/pinctrl/meson/pinctrl-meson8.c | 3 + drivers/pinctrl/meson/pinctrl-meson8b.c | 13 +- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 3 + drivers/pinctrl/pinctrl-rza1.c | 5 + drivers/pinctrl/pinctrl-sx150x.c | 11 +- drivers/platform/chrome/cros_ec_proto.c | 18 ++- drivers/platform/x86/intel_atomisp2_pm.c | 68 ++++++++--- drivers/platform/x86/mlx-platform.c | 12 +- drivers/ptp/ptp_chardev.c | 5 +- drivers/ptp/ptp_clock.c | 5 +- drivers/s390/crypto/zcrypt_error.h | 2 + drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_main.c | 12 +- drivers/s390/net/qeth_core_mpc.h | 25 ++-- drivers/s390/net/qeth_l2_main.c | 10 +- drivers/scsi/aic94xx/aic94xx_init.c | 8 +- drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 +- drivers/scsi/cxlflash/main.c | 2 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- drivers/scsi/lpfc/lpfc_els.c | 52 ++++---- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +- drivers/scsi/sd_zbc.c | 12 +- drivers/scsi/smartpqi/smartpqi_init.c | 6 + drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- drivers/soc/bcm/brcmstb/common.c | 6 +- drivers/soc/tegra/common.c | 6 +- drivers/spi/spi-at91-usart.c | 1 + drivers/staging/erofs/internal.h | 3 +- drivers/staging/erofs/utils.c | 134 +++++++++++++++------ drivers/staging/iio/adc/ad7280a.c | 17 ++- drivers/staging/iio/adc/ad7780.c | 6 +- drivers/staging/iio/resolver/ad2s90.c | 7 +- drivers/staging/pi433/pi433_if.c | 4 + drivers/staging/speakup/spk_ttyio.c | 6 +- drivers/tee/optee/supp.c | 13 +- drivers/thermal/broadcom/bcm2835_thermal.c | 11 ++ drivers/thermal/qcom/tsens-common.c | 12 +- drivers/thermal/thermal-generic-adc.c | 12 +- drivers/thermal/thermal_core.c | 12 +- drivers/thermal/thermal_hwmon.h | 4 +- drivers/thermal/thermal_sysfs.c | 11 +- drivers/tty/serial/8250/8250_pci.c | 9 +- drivers/tty/serial/fsl_lpuart.c | 4 + drivers/tty/serial/samsung.c | 3 + drivers/tty/serial/serial_core.c | 6 + drivers/tty/serial/sh-sci.c | 32 +++-- drivers/usb/core/hub.c | 10 ++ drivers/usb/dwc2/params.c | 10 +- drivers/usb/dwc3/gadget.c | 16 ++- drivers/usb/dwc3/trace.h | 2 + drivers/usb/gadget/udc/net2272.c | 2 +- drivers/usb/mtu3/mtu3_core.c | 4 +- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 +- drivers/usb/musb/musb_dsps.c | 21 +++- drivers/usb/musb/musb_gadget.c | 13 +- drivers/usb/musb/musbhsdma.c | 21 ++-- drivers/usb/phy/phy-am335x.c | 5 +- drivers/usb/renesas_usbhs/common.c | 4 + drivers/video/fbdev/clps711x-fb.c | 5 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 8 +- drivers/virt/vboxguest/vboxguest_core.c | 2 +- drivers/watchdog/renesas_wdt.c | 9 +- fs/binfmt_script.c | 10 +- fs/btrfs/btrfs_inode.h | 1 + fs/btrfs/ctree.h | 2 +- fs/btrfs/extent_io.c | 17 ++- fs/btrfs/inode.c | 11 +- fs/btrfs/ioctl.c | 2 +- fs/btrfs/reada.c | 12 +- fs/btrfs/volumes.c | 29 +++++ fs/cifs/readdir.c | 9 +- fs/dlm/ast.c | 10 ++ fs/eventpoll.c | 2 +- fs/f2fs/acl.c | 14 ++- fs/f2fs/checkpoint.c | 7 +- fs/f2fs/data.c | 12 +- fs/f2fs/f2fs.h | 12 +- fs/f2fs/file.c | 3 + fs/f2fs/gc.c | 15 ++- fs/f2fs/node.c | 5 +- fs/f2fs/segment.c | 3 +- fs/f2fs/shrinker.c | 2 +- fs/f2fs/super.c | 27 +++-- fs/fuse/dev.c | 4 +- fs/fuse/file.c | 2 +- fs/fuse/inode.c | 2 +- fs/nfs/super.c | 3 +- fs/nfsd/nfsctl.c | 2 + fs/nfsd/vfs.c | 6 +- fs/ocfs2/Makefile | 2 +- fs/ocfs2/buffer_head_io.c | 2 - fs/ocfs2/dlm/Makefile | 2 +- fs/ocfs2/dlmfs/Makefile | 2 +- fs/proc/base.c | 12 +- fs/udf/inode.c | 6 + fs/xfs/xfs_aops.c | 2 + include/linux/cpu.h | 2 - include/linux/genl_magic_struct.h | 5 +- include/linux/gpio/consumer.h | 6 +- include/linux/hid-debug.h | 9 +- include/linux/kvm_host.h | 3 +- include/linux/mlx5/driver.h | 2 +- include/linux/skmsg.h | 8 ++ include/rdma/ib_verbs.h | 8 +- include/sound/compress_driver.h | 6 +- include/sound/hda_codec.h | 1 + kernel/cgroup/cgroup.c | 2 +- kernel/cpu.c | 33 +---- kernel/debug/debug_core.c | 4 + kernel/debug/kdb/kdb_bt.c | 11 +- kernel/debug/kdb/kdb_debugger.c | 7 -- kernel/events/ring_buffer.c | 3 + kernel/futex.c | 28 +++-- kernel/hung_task.c | 20 ++- kernel/irq/affinity.c | 5 +- kernel/kcov.c | 2 +- kernel/locking/rtmutex.c | 37 +++++- kernel/module.c | 6 +- kernel/sched/fair.c | 1 + kernel/smp.c | 2 - kernel/sysctl.c | 2 + kernel/time/timekeeping.c | 4 +- kernel/trace/trace_stack.c | 2 +- lib/seq_buf.c | 6 +- lib/test_rhashtable.c | 23 ++-- mm/page_alloc.c | 37 ++++-- mm/percpu-km.c | 5 +- net/core/skmsg.c | 7 +- net/dccp/ccid.h | 4 +- net/dsa/master.c | 4 + net/dsa/slave.c | 17 +-- net/ipv4/tcp_bpf.c | 2 +- net/ipv6/tcp_ipv6.c | 3 +- net/ipv6/xfrm6_tunnel.c | 3 + net/mac80211/rx.c | 31 +++-- net/mac80211/util.c | 49 +++++--- net/rds/bind.c | 6 +- net/rxrpc/recvmsg.c | 3 +- net/sched/cls_flower.c | 6 +- net/sctp/socket.c | 4 +- net/sctp/stream.c | 20 +++ net/sunrpc/xprtrdma/backchannel.c | 13 +- net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 8 +- net/sunrpc/xprtrdma/transport.c | 17 +-- net/sunrpc/xprtrdma/verbs.c | 1 - net/sunrpc/xprtrdma/xprt_rdma.h | 1 + net/tipc/node.c | 6 + samples/livepatch/livepatch-shadow-fix1.c | 5 + samples/livepatch/livepatch-shadow-mod.c | 4 + scripts/decode_stacktrace.sh | 2 +- scripts/gdb/linux/proc.py | 2 +- scripts/mod/modpost.c | 50 ++++---- security/smack/smack_lsm.c | 12 +- sound/pci/hda/hda_bind.c | 3 +- sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 62 +++++----- sound/soc/fsl/Kconfig | 2 +- sound/soc/intel/atom/sst/sst_loader.c | 8 +- sound/soc/sunxi/sun50i-codec-analog.c | 2 + sound/usb/quirks.c | 1 + tools/bpf/bpftool/common.c | 4 +- tools/bpf/bpftool/json_writer.c | 6 +- tools/bpf/bpftool/map.c | 18 ++- tools/bpf/bpftool/prog.c | 4 +- tools/bpf/bpftool/xlated_dumper.c | 7 +- tools/build/Makefile.feature | 4 +- tools/build/feature/Makefile | 10 +- tools/hv/hv_kvp_daemon.c | 15 ++- tools/lib/bpf/bpf.c | 11 +- tools/perf/Makefile.config | 44 +++---- tools/perf/arch/x86/util/kvm-stat.c | 2 +- tools/perf/tests/attr.py | 2 +- tools/perf/tests/evsel-tp-sched.c | 2 +- tools/perf/util/dso.c | 2 +- tools/perf/util/header.c | 6 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/python.c | 3 +- tools/perf/util/s390-cpumsf.c | 2 +- tools/perf/util/stat-display.c | 16 ++- .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 4 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/bpf/test_progs.c | 8 +- tools/testing/selftests/drivers/dma-buf/Makefile | 2 + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 11 +- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 4 +- tools/testing/selftests/kvm/x86_64/state_test.c | 4 +- virt/kvm/arm/mmio.c | 11 +- virt/kvm/kvm_main.c | 6 +- 400 files changed, 2627 insertions(+), 1313 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/352 drm/bufs: Fix Spectre v1 vulnerability
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a37805098900a6e73a55b3a43b7d3bcd987bb3f4 ]
idx can be indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
This issue was detected with the help of Smatch:
drivers/gpu/drm/drm_bufs.c:1420 drm_legacy_freebufs() warn: potential spectre issue 'dma->buflist' [r] (local cap)
Fix this by sanitizing idx before using it to index dma->buflist
Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1].
[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2
--- drivers/gpu/drm/drm_bufs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_bufs.c +3 -0
@@ -36,6 +36,8 @@#include <drm/drmP.h> #include "drm_legacy.h" +#include <linux/nospec.h> +static struct drm_map_list *drm_find_matching_map (struct drm_device *dev,struct drm_local_map *map) {
@@ -1417,6 +1419,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, idx, dma->buf_count - 1);return -EINVAL ; } + idx =array_index_nospec (idx, dma->buf_count); buf = dma->buflist[idx];if (buf->file_priv != file_priv) { DRM_ERROR("Process %d freeing buffer not owned\n",
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 2/352 drm/v3d: Fix a use-after-free race accessing the schedulers fences.
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 34c2c4f632f232ed2fdb66d4e42cc72d322273fe ]
Once we push the job, the scheduler could run it and free it. So, if we want to reference their fences, we need to grab them before then. I haven't seen this happen in many days of conformance test runtime, but let's still close the race.
--- drivers/gpu/drm/v3d/v3d_drv.h | 5 +++++ drivers/gpu/drm/v3d/v3d_gem.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_drv.h +5 -0
@@ -198,6 +198,11 @@ struct v3d_exec_info {*/ struct dma_fence *bin_done_fence; +/* Fence for when the scheduler considers the render to be +* done, for when the BOs reservations should be complete. +*/ +struct dma_fence *render_done_fence; +struct kref refcount;/* This is the array of BOs that were looked up at the start of exec. */
drivers/gpu/drm/v3d/v3d_gem.c +6 -2
@@ -209,7 +209,7 @@ v3d_flush_caches(struct v3d_dev *v3d)static void v3d_attach_object_fences (struct v3d_exec_info *exec) { -struct dma_fence *out_fence = &exec->render.base.s_fence->finished; +struct dma_fence *out_fence = exec->render_done_fence;struct v3d_bo *bo;int i;
@@ -409,6 +409,7 @@ v3d_exec_cleanup(struct kref *ref)dma_fence_put (exec->render.done_fence);dma_fence_put (exec->bin_done_fence); +dma_fence_put (exec->render_done_fence);for (i =0 ; i < exec->bo_count; i++)drm_gem_object_put_unlocked (&exec->bo[i]->base);
@@ -572,6 +573,9 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,if (ret) goto fail_unreserve; + exec->render_done_fence = +dma_fence_get (&exec->render.base.s_fence->finished); +kref_get (&exec->refcount);/* put by scheduler job completion */ drm_sched_entity_push_job (&exec->render.base, &v3d_priv->sched_entity[V3D_RENDER ]);
@@ -585,7 +589,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, sync_out =drm_syncobj_find (file_priv, args->out_sync);if (sync_out) {drm_syncobj_replace_fence (sync_out,0 , - &exec->render.base.s_fence->finished); + exec->render_done_fence);drm_syncobj_put (sync_out); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 3/352 staging: iio: adc: ad7280a: handle error from __ad7280_read32()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0559ef7fde67bc6c83c6eb6329dbd6649528263e ]
Inside __ad7280_read32(), the spi_sync_transfer() can fail with negative error code. This change will ensure that this error is being passed up in the call stack, so it can be handled.
--- drivers/staging/iio/adc/ad7280a.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/staging/iio/adc/ad7280a.c +13 -4
@@ -256,7 +256,9 @@ static int ad7280_read(struct ad7280_state *st, unsigned int devaddr,if (ret)return ret; -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -294,7 +296,9 @@ static int ad7280_read_channel(struct ad7280_state *st, unsigned int devaddr,ad7280_delay (st); -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -327,7 +331,9 @@ static int ad7280_read_all_channels(struct ad7280_state *st, unsigned int cnt,ad7280_delay (st);for (i =0 ; i < cnt; i++) { -__ad7280_read32 (st, &tmp); + ret =__ad7280_read32 (st, &tmp); +if (ret) +return ret;if (ad7280_check_crc (st, tmp))return -EIO ;
@@ -370,7 +376,10 @@ static int ad7280_chain_setup(struct ad7280_state *st)return ret;for (n =0 ; n <=AD7280A_MAX_CHAIN ; n++) { -__ad7280_read32 (st, &val); + ret =__ad7280_read32 (st, &val); +if (ret) +return ret; +if (val ==0 )return n -1 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 4/352 drm/vgem: Fix vgem_init to get drm device available.
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ]
Modify vgem_init to take platform dev as parent in drm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.
v2: rebase, address checkpatch typo and line over 80 characters
--- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +8 -8
@@ -471,31 +471,31 @@ static int __init vgem_init(void)if (!vgem_device)return -ENOMEM ; - ret =drm_dev_init (&vgem_device->drm, &vgem_driver,NULL ); -if (ret) - goto out_free; - vgem_device->platform =platform_device_register_simple ("vgem" ,-1 ,NULL ,0 );if (IS_ERR (vgem_device->platform)) { ret =PTR_ERR (vgem_device->platform); - goto out_fini; + goto out_free; }dma_coerce_mask_and_coherent (&vgem_device->platform->dev,DMA_BIT_MASK (64 )); + ret =drm_dev_init (&vgem_device->drm, &vgem_driver, + &vgem_device->platform->dev); +if (ret) + goto out_unregister;/* Final step: expose the device/driver to userspace */ ret =drm_dev_register (&vgem_device->drm,0 );if (ret) - goto out_unregister; + goto out_fini;return 0 ; -out_unregister: -platform_device_unregister (vgem_device->platform); out_fini:drm_dev_fini (&vgem_device->drm); +out_unregister: +platform_device_unregister (vgem_device->platform); out_free:kfree (vgem_device);return ret;
Signature · 1 line
2.19.1
Re: [PATCH 4.20 004/352] drm/vgem: Fix vgem_init to get drm device available.
Hi Greg,
Quoted 12 lines · Greg Kroah-Hartman
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27]Modify
vgem_initto take platform dev as parent indrm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.v2: rebase, address checkpatch typo and line over 80 characters
Quoted 7 lines
Cc Daniel Vetter <[email protected]>Signed-off-by Deepak Sharma <[email protected]>Reviewed-by Sean Paul <[email protected]>Signed-off-by Emil Velikov <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Zero objections to picking this for stable, although I'm curious what flagged this commit as stable material.
Especially since it's closer to a feature than a bug-fix.
Can you share some light? Perhaps a link to a thread/document since I would imagine you've been asked before.
Thanks
Emil
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 004/352] drm/vgem: Fix vgem_init to get drm device available.
Quoted 23 lines · Emil Velikov
Hi Greg,
Quoted 12 lines · Greg Kroah-Hartman
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27]Modify
vgem_initto take platform dev as parent indrm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.v2: rebase, address checkpatch typo and line over 80 characters
Quoted 7 lines
Cc Daniel Vetter <[email protected]>Signed-off-by Deepak Sharma <[email protected]>Reviewed-by Sean Paul <[email protected]>Signed-off-by Emil Velikov <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 7 lines
Zero objections to picking this for stable, although I'm curious what flagged this commit as stable material.
Especially since it's closer to a feature than a bug-fix.
Can you share some light? Perhaps a link to a thread/document since I would imagine you've been asked before.
Sasha has a presentation all about how this gets picked up, but I can't find the link right now. Sasha?
Re: [PATCH 4.20 004/352] drm/vgem: Fix vgem_init to get drm device available.
Quoted 28 lines · Greg Kroah-Hartman
Quoted 26 lines · Emil Velikov
Hi Greg,
Quoted 12 lines · Greg Kroah-Hartman
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27]Modify
vgem_initto take platform dev as parent indrm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.v2: rebase, address checkpatch typo and line over 80 characters
Quoted 7 lines
Cc Daniel Vetter <[email protected]>Signed-off-by Deepak Sharma <[email protected]>Reviewed-by Sean Paul <[email protected]>Signed-off-by Emil Velikov <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Signed-off-by Sasha Levin <[email protected]>Zero objections to picking this for stable, although I'm curious what flagged this commit as stable material.
Quoted 7 lines
Quoted 4 lines
Especially since it's closer to a feature than a bug-fix.
Can you share some light? Perhaps a link to a thread/document since I would imagine you've been asked before.
Sasha has a presentation all about how this gets picked up, but I can't find the link right now. Sasha?
https://lwn.net/Articles/764647/
Afaiui the autoselected patches do get posted to dri-devel. At least I see some mails show up there.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Greg Kroah-Hartman
maintainerPATCH 5/352 pinctrl: bcm2835: Use raw spinlock for RT compatibility
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3c7b30f704b6f5e53eed6bf89cf2c8d1b38b02c0 ]
The BCM2835 pinctrl driver acquires a spinlock in its ->irq_enable, ->irq_disable and ->irq_set_type callbacks. Spinlocks become sleeping locks with CONFIG_PREEMPT_RT_FULL=y, therefore invocation of one of the callbacks in atomic context may cause a hard lockup if at least two GPIO pins in the same bank are used as interrupts. The issue doesn't occur with just a single interrupt pin per bank because the lock is never contended. I'm experiencing such lockups with GPIO 8 and 28 used as level-triggered interrupts, i.e. with ->irq_disable being invoked on reception of every IRQ.
The critical section protected by the spinlock is very small (one bitop and one RMW of an MMIO register), hence converting to a raw spinlock seems a better trade-off than converting the driver to threaded IRQ handling (which would increase latency to handle an interrupt).
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +8 -8
@@ -90,7 +90,7 @@ struct bcm2835_pinctrl {struct gpio_chip gpio_chip;struct pinctrl_gpio_range gpio_range; -spinlock_t irq_lock[BCM2835_NUM_BANKS ]; +raw_spinlock_t irq_lock[BCM2835_NUM_BANKS ]; };/* pins are just named GPIO0..GPIO53 */
@@ -461,10 +461,10 @@ static void bcm2835_gpio_irq_enable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);set_bit (offset, &pc->enabled_irq_map[bank]);bcm2835_gpio_irq_config (pc, gpio, true); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); }static void bcm2835_gpio_irq_disable (struct irq_data *data)
@@ -476,12 +476,12 @@ static void bcm2835_gpio_irq_disable(struct irq_data *data)unsigned bank =GPIO_REG_OFFSET (gpio);unsigned long flags; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);bcm2835_gpio_irq_config (pc, gpio, false);/* Clear events that were latched prior to clearing event sources */ bcm2835_gpio_set_bit (pc,GPEDS0 , gpio);clear_bit (offset, &pc->enabled_irq_map[bank]); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags); } static int __bcm2835_gpio_irq_set_type_disabled(struct bcm2835_pinctrl *pc,
@@ -584,7 +584,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)unsigned long flags;int ret; -spin_lock_irqsave (&pc->irq_lock[bank], flags); +raw_spin_lock_irqsave (&pc->irq_lock[bank], flags);if (test_bit (offset, &pc->enabled_irq_map[bank])) ret =__bcm2835_gpio_irq_set_type_enabled (pc, gpio, type);
@@ -596,7 +596,7 @@ static int bcm2835_gpio_irq_set_type(struct irq_data *data, unsigned int type)else irq_set_handler_locked (data, handle_level_irq); -spin_unlock_irqrestore (&pc->irq_lock[bank], flags); +raw_spin_unlock_irqrestore (&pc->irq_lock[bank], flags);return ret; }
@@ -1047,7 +1047,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)for_each_set_bit (offset, &events,32 )bcm2835_gpio_wr (pc,GPEDS0 + i *4 ,BIT (offset)); -spin_lock_init (&pc->irq_lock[i]); +raw_spin_lock_init (&pc->irq_lock[i]); } err =gpiochip_add_data (&pc->gpio_chip, pc);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 6/352 clk: sunxi-ng: h6: Set video PLLs limits
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ed4433419d45bf8b58aef34c4450a27e1c8699e8 ]
Video PLL factors can be set in a way that final PLL rate is outside stable range. H6 user manual specifically says that N factor should not be below 12. While it doesn't says anything about maximum stable rate, it is clear that PLL doesn't work at 6.096 GHz (254 * 24 MHz).
Set minimum allowed PLL video rate to 288 MHz (12 * 24 MHz) and maximum to 2.4 GHz, which is maximum in BSP driver.
--- drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/sunxi-ng/ccu-sun50i-h6.c +4 -0
@@ -120,6 +120,8 @@ static struct ccu_nm pll_video0_clk = { .n = _SUNXI_CCU_MULT_MIN(8, 8, 12), .m = _SUNXI_CCU_DIV(1, 1), /* input divider */ .fixed_post_div = 4, + .min_rate = 288000000, + .max_rate = 2400000000UL, .common = { .reg = 0x040, .features = CCU_FEATURE_FIXED_POSTDIV,
@@ -136,6 +138,8 @@ static struct ccu_nm pll_video1_clk = { .n = _SUNXI_CCU_MULT_MIN(8, 8, 12), .m = _SUNXI_CCU_DIV(1, 1), /* input divider */ .fixed_post_div = 4, + .min_rate = 288000000, + .max_rate = 2400000000UL, .common = { .reg = 0x048, .features = CCU_FEATURE_FIXED_POSTDIV,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 7/352 ASoC: Intel: mrfld: fix uninitialized variable access
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1539c7f23f256120f89f8b9ec53160790bce9ed2 ]
Randconfig testing revealed a very old bug, with gcc-8:
sound/soc/intel/atom/sst/sst_loader.c: In function 'sst_load_fw':sound/soc/intel/atom/sst/sst_loader.c:357:5: error: 'fw' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (fw == NULL) {
^sound/soc/intel/atom/sst/sst_loader.c:354:25: note: 'fw' was declared here
const struct firmware *fw;
We must check the return code of request_firmware() before we look at the pointer result that may be uninitialized when the function fails.
--- sound/soc/intel/atom/sst/sst_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/atom/sst/sst_loader.c +4 -4
@@ -354,14 +354,14 @@ static int sst_request_fw(struct intel_sst_drv *sst)const struct firmware *fw; retval =request_firmware (&fw, sst->firmware_name, sst->dev); -if (fw ==NULL ) { -dev_err (sst->dev,"fw is returning as null\n" ); -return -EINVAL ; - }if (retval) {dev_err (sst->dev,"request fw failed %d\n" , retval);return retval; } +if (fw ==NULL ) { +dev_err (sst->dev,"fw is returning as null\n" ); +return -EINVAL ; + }mutex_lock (&sst->sst_lock); retval =sst_cache_and_parse_fw (sst, fw);mutex_unlock (&sst->sst_lock);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 8/352 gpiolib: Fix possible use after free on label
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 18534df419041e6c1f4b41af56ee7d41f757815c ]
gpiod_request_commit() copies the pointer to the label passed as an argument only to be used later. But there's a chance the caller could immediately free the passed string(e.g., local variable). This could trigger a use after free when we use gpio label(e.g., gpiochip_unlock_as_irq(), gpiochip_is_requested()).
To be on the safe side: duplicate the string with kstrdup_const() so that if an unaware user passes an address to a stack-allocated buffer, we won't get the arbitrary label.
Also fix gpiod_set_consumer_name().
--- drivers/gpio/gpiolib.c | 25 +++++++++++++++++++++---- include/linux/gpio/consumer.h | 6 ++++-- 2 files changed, 25 insertions(+), 6 deletions(-)
drivers/gpio/gpiolib.c +21 -4
@@ -2306,6 +2306,12 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)unsigned long flags;unsigned offset; +if (label) { + label =kstrdup_const (label,GFP_KERNEL ); +if (!label) +return -ENOMEM ; + } +spin_lock_irqsave (&gpio_lock, flags);/* NOTE: gpio_request() can be called in early boot,
@@ -2316,6 +2322,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)desc_set_label (desc, label ? :"?" ); status =0 ; }else { +kfree_const (label); status = -EBUSY ; goto done; }
@@ -2332,6 +2339,7 @@ static int gpiod_request_commit(struct gpio_desc *desc, const char *label)if (status <0 ) {desc_set_label (desc,NULL ); +kfree_const (label);clear_bit (FLAG_REQUESTED , &desc->flags); goto done; }
@@ -2427,6 +2435,7 @@ static bool gpiod_free_commit(struct gpio_desc *desc) chip->free (chip,gpio_chip_hwgpio (desc));spin_lock_irqsave (&gpio_lock, flags); } +kfree_const (desc->label);desc_set_label (desc,NULL );clear_bit (FLAG_ACTIVE_LOW , &desc->flags);clear_bit (FLAG_REQUESTED , &desc->flags);
@@ -3382,11 +3391,19 @@ EXPORT_SYMBOL_GPL(gpiod_cansleep);* @desc: gpio to set the consumer name on * @name: the new consumer name */ -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) { -VALIDATE_DESC_VOID (desc); -/* Just overwrite whatever the previous name was */ - desc->label = name; +VALIDATE_DESC (desc); +if (name) { + name =kstrdup_const (name,GFP_KERNEL ); +if (!name) +return -ENOMEM ; + } + +kfree_const (desc->label); +desc_set_label (desc, name); + +return 0 ; }EXPORT_SYMBOL_GPL (gpiod_set_consumer_name);
include/linux/gpio/consumer.h +4 -2
@@ -162,7 +162,7 @@ int gpiod_is_active_low(const struct gpio_desc *desc);int gpiod_cansleep (const struct gpio_desc *desc);int gpiod_to_irq (const struct gpio_desc *desc); -void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name); +int gpiod_set_consumer_name (struct gpio_desc *desc,const char *name);/* Convert between the old gpio_ and new gpiod_ interfaces */ struct gpio_desc *gpio_to_desc (unsigned gpio);
@@ -495,10 +495,12 @@ static inline int gpiod_to_irq(const struct gpio_desc *desc)return -EINVAL ; } -static inline void gpiod_set_consumer_name (struct gpio_desc *desc,const char *name) +static inline int gpiod_set_consumer_name (struct gpio_desc *desc, +const char *name) {/* GPIO can never have been requested */ WARN_ON (1 ); +return -EINVAL ; }static inline struct gpio_desc *gpio_to_desc (unsigned gpio)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 9/352 drm/sun4i: Initialize registers in tcon-top driver
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c96d62215fb540e2ae61de44cb7caf4db50958e3 ]
It turns out that TCON TOP registers in H6 SoC have non-zero reset value. This may cause issues if bits are not changed during configuration.
To prevent that, initialize registers to 0.
--- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +7 -0
@@ -167,6 +167,13 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, goto err_assert_reset; } +/* +* At least on H6, some registers have some bits set by default +* which may cause issues. Clear them here. +*/ +writel (0 , regs +TCON_TOP_PORT_SEL_REG ); +writel (0 , regs +TCON_TOP_GATE_SRC_REG ); +/* * TCON TOP has two muxes, which select parent clock for each TCON TV * channel clock. Parent could be either TCON TV or TVE clock. For now
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 10/352 ath10k: fixup extended per sta tx statistics
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 539b44e70c5b4ad82d2c0c97a4dfb37523d891f6 ]
I had a couple concerns with this code. First, we definitely need to set the error code if the kzalloc() fails. Secondly, I was worried that if we didn't set "arsta->tx_stats" to NULL after freeing it, then it looks to me like it might lead to a use after free. I can't test that, but it's harmless to set it to NULL so I did.
--- drivers/net/wireless/ath/ath10k/mac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +6 -2
@@ -6296,8 +6296,10 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,if (ath10k_debug_is_extd_tx_stats_enabled (ar)) { arsta->tx_stats =kzalloc (sizeof (*arsta->tx_stats),GFP_KERNEL ); -if (!arsta->tx_stats) +if (!arsta->tx_stats) { + ret = -ENOMEM ; goto exit; + } } num_tdls_stations =ath10k_mac_tdls_vif_stations_count (hw, vif);
@@ -6385,8 +6387,10 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,"mac vdev %d peer delete %pM sta %pK (sta gone)\n" , arvif->vdev_id, sta->addr, sta); -if (ath10k_debug_is_extd_tx_stats_enabled (ar)) +if (ath10k_debug_is_extd_tx_stats_enabled (ar)) {kfree (arsta->tx_stats); + arsta->tx_stats =NULL ; + }if (sta->tdls) { ret = ath10k_mac_tdls_peer_update(ar, arvif->vdev_id,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 11/352 genirq/affinity: Spread IRQs to all available NUMA nodes
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b82592199032bf7c778f861b936287e37ebc9f62 ]
If the number of NUMA nodes exceeds the number of MSI/MSI-X interrupts which are allocated for a device, the interrupt affinity spreading code fails to spread them across all nodes.
The reason is, that the spreading code starts from node 0 and continues up to the number of interrupts requested for allocation. This leaves the nodes past the last interrupt unused.
This results in interrupt concentration on the first nodes which violates the assumption of the block layer that all nodes are covered evenly. As a consequence the NUMA nodes above the number of interrupts are all assigned to hardware queue 0 and therefore NUMA node 0, which results in bad performance and has CPU hotplug implications, because queue 0 gets shut down when the last CPU of node 0 is offlined.
Go over all NUMA nodes and assign them round-robin to all requested interrupts to solve this.
[ tglx: Massaged changelog ]
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -117,12 +117,11 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,*/ if (numvecs <= nodes) {for_each_node_mask (n, nodemsk) { -cpumask_copy (masks + curvec, node_to_cpumask[n]); -if (++done == numvecs) -break ; +cpumask_or (masks + curvec, masks + curvec, node_to_cpumask[n]);if (++curvec == last_affv) curvec = affd->pre_vectors; } + done = numvecs; goto out; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 12/352 gpu: ipu-v3: image-convert: Prevent race between run and unprepare
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 819bec35c8c9706185498c9222bd244e0781ad35 ]
Prevent possible race by parallel threads between ipu_image_convert_run() and ipu_image_convert_unprepare(). This involves setting ctx->aborting to true unconditionally so that no new job runs can be queued during unprepare, and holding the ctx->aborting flag until the context is freed.
Note that the "normal" ipu_image_convert_abort() case (e.g. not during context unprepare) should clear the ctx->aborting flag after aborting any active run and clearing the context's pending queue. This is because it should be possible to continue to use the conversion context and queue more runs after an abort.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +7 -3
@@ -1524,7 +1524,7 @@ unlock:EXPORT_SYMBOL_GPL (ipu_image_convert_queue);/* Abort any active or pending conversions for this context */ -void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +static void __ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) {struct ipu_image_convert_chan *chan = ctx->chan;struct ipu_image_convert_priv *priv = chan->priv;
@@ -1551,7 +1551,7 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) need_abort = (run_count || active_run); - ctx->aborting = need_abort; + ctx->aborting = true;spin_unlock_irqrestore (&chan->irqlock, flags);
@@ -1572,7 +1572,11 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx)dev_warn (priv->ipu->dev,"%s: timeout\n" , __func__);force_abort (ctx); } +} +void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +{ +__ipu_image_convert_abort (ctx); ctx->aborting = false; }EXPORT_SYMBOL_GPL (ipu_image_convert_abort);
@@ -1586,7 +1590,7 @@ void ipu_image_convert_unprepare(struct ipu_image_convert_ctx *ctx)bool put_res;/* make sure no runs are hanging around */ -ipu_image_convert_abort (ctx); +__ipu_image_convert_abort (ctx);dev_dbg (priv->ipu->dev,"%s: task %u: removing ctx %p\n" , __func__, chan->ic_task, ctx);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 13/352 drm/amd/display: Fix potential nullptr error
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f7129112c2a30331f3045a42026fad82e6cb72b ]
[Why]
Fix surface/plane potential nullptr
[How]
add null check
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -0
@@ -5333,6 +5333,12 @@ enum surface_update_type dm_determine_update_type_for_commit(struct dc *dc, strustruct dc_stream_update stream_update;enum surface_update_type update_type =UPDATE_TYPE_FAST ; +if (!updates || !surface) { +DRM_ERROR ("Plane or surface update failed to allocate" ); +/* Set type to FULL to avoid crashing in DC*/ + update_type =UPDATE_TYPE_FULL ; + goto ret; + }for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { new_dm_crtc_state =to_dm_crtc_state (new_crtc_state);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 14/352 nds32: Fix gcc 8.0 compiler option incompatible.
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4c3d6174e0e17599549f636ec48ddf78627a17fe ]
When the kernel configs of ftrace and frame pointer options are
choosed, the compiler option of kernel will incompatible.
Error message:
nds32le-linux-gcc: error: -pg and -fomit-frame-pointer are incompatible
--- arch/nds32/mm/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/nds32/mm/Makefile +5 -1
@@ -4,4 +4,8 @@ obj-y := extable.o tlb.o \ obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o -CFLAGS_proc-n13.o += -fomit-frame-pointer + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE) +endif +CFLAGS_proc.o += -fomit-frame-pointer
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 15/352 wil6210: fix reset flow for Talyn-mb
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d083b2e2b7db5cca1791643d036e6597af27f49b ]
With current reset flow, Talyn sometimes get stuck causing PCIe enumeration to fail. Fix this by removing some reset flow operations that are not relevant for Talyn.
Setting bit 15 in RGF_HP_CTRL is WBE specific and is not in use for all wil6210 devices.
For Sparrow, BIT_HPAL_PERST_FROM_PAD and BIT_CAR_PERST_RST were set as a WA an HW issue.
--- drivers/net/wireless/ath/wil6210/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/main.c +7 -4
@@ -998,10 +998,13 @@ static int wil_target_reset(struct wil6210_priv *wil, int no_flash)wil_dbg_misc (wil,"Resetting \"%s\"...\n" , wil->hw_name); -/* Clear MAC link up */ -wil_s (wil,RGF_HP_CTRL ,BIT (15 )); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_HPAL_PERST_FROM_PAD ); -wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); +if (wil->hw_version <HW_VER_TALYN ) { +/* Clear MAC link up */ +wil_s (wil,RGF_HP_CTRL ,BIT (15 )); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 , +BIT_HPAL_PERST_FROM_PAD ); +wil_s (wil,RGF_USER_CLKS_CTL_SW_RST_MASK_0 ,BIT_CAR_PERST_RST ); + }wil_halt_cpu (wil);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 16/352 wil6210: fix memory leak in wil_find_tx_bcast_2
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 664497400c89a4d40aee51bcf48bbd2e4dc71104 ]
A successful call to wil_tx_ring takes skb reference so it will only be freed in wil_tx_complete. Consume the skb in wil_find_tx_bcast_2 to prevent memory leak.
--- drivers/net/wireless/ath/wil6210/txrx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/wil6210/txrx.c +2 -0
@@ -1403,6 +1403,8 @@ found:wil_dbg_txrx (wil,"BCAST DUP -> ring %d\n" , i);wil_set_da_for_vring (wil, skb2, i);wil_tx_ring (wil, vif, v2, skb2); +/* successful call to wil_tx_ring takes skb2 ref */ +dev_kfree_skb_any (skb2); }else {wil_err (wil,"skb_copy failed\n" ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 17/352 ath10k: assign n_cipher_suites for WCN3990
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2bd345cd2bfc0bd44528896313c0b45f087bdf67 ]
Commit 2ea9f12cefe4 ("ath10k: add new cipher suite support") added a new n_cipher_suites HW param with a fallback value and a warning log. Commit 03a72288c546 ("ath10k: wmi: add hw params entry for wcn3990") later added WCN3990 HW entries, but it missed the n_cipher_suites.
Rather than seeing this warning every boot
ath10k_snoc 18800000.wifi: invalid hw_params.n_cipher_suites 0
let's provide the appropriate value.
--- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/core.c +1 -0
@@ -561,6 +561,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .hw_ops = &wcn3990_ops, .decap_align_bytes = 1, .num_peers = TARGET_HL_10_TLV_NUM_PEERS, + .n_cipher_suites = 8, .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT, .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES, .target_64bit = true,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 18/352 ath9k: dynack: use authentication messages for late ack
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link
--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/dynack.c +2 -1
@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Signature · 1 line
2.19.1
Re: [PATCH 4.20 018/352] ath9k: dynack: use authentication messages for late ack
Quoted 26 lines · Greg Kroah-Hartman
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
3831a2a0010c72e3956020cbf1057a1701a2e469]In order to properly support dynack in ad-hoc mode running
wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km linkReported-by Koen Vandeputte <[email protected]>Tested-by Koen Vandeputte <[email protected]>Signed-off-by Lorenzo Bianconi <[email protected]>Signed-off-by Kalle Valo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/wireless/ath/ath9k/dynack.c +0
-0
drivers/net/wireless/ath/ath9k/dynack.c void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, · line 194
Quoted 9 lines
drivers/net/wireless/ath/ath9k/dynack.c +2
-1@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Dear Greg,
No idea if this is the proper location to report this or if I should inform stable@vger.. , but:
This backport alone is useless without backporting following 2 commits below also, unless the 2 wifi devices using dynack start off at very close distance.
Their commits messages indicate them as improvements, but they should be considered as fixes.
It's safe to add them to all stables involved (4.20, 4.19, 4.14, 4.9)
Thanks,
Koen
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 018/352] ath9k: dynack: use authentication messages for late ack
Quoted 51 lines · Koen Vandeputte
Quoted 26 lines · Greg Kroah-Hartman
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
3831a2a0010c72e3956020cbf1057a1701a2e469]In order to properly support dynack in ad-hoc mode running
wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km linkReported-by Koen Vandeputte <[email protected]>Tested-by Koen Vandeputte <[email protected]>Signed-off-by Lorenzo Bianconi <[email protected]>Signed-off-by Kalle Valo <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/wireless/ath/ath9k/dynack.c +0
-0drivers/net/wireless/ath/ath9k/dynack.c void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, · line 194
Quoted 9 lines
drivers/net/wireless/ath/ath9k/dynack.c +2
-1@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );Dear Greg,
No idea if this is the proper location to report this or if I should inform stable@vger.. , but:
This backport alone is useless without backporting following 2 commits below also, unless the 2 wifi devices using dynack start off at very close distance.
Their commits messages indicate them as improvements, but they should be considered as fixes.
Quoted 6 lines
It's safe to add them to all stables involved (4.20, 4.19, 4.14, 4.9)
Thanks, that looks reasonable, now queued up.
greg k-h
Re: [PATCH 4.20 018/352] ath9k: dynack: use authentication messages for late ack
Quoted 16 lines · Greg Kroah-Hartman
Quoted 16 lines
Dear Greg,
No idea if this is the proper location to report this or if I should inform stable@vger.. , but:
This backport alone is useless without backporting following 2 commits below also, unless the 2 wifi devices using dynack start off at very close distance.
Their commits messages indicate them as improvements, but they should be considered as fixes.
Quoted 7 lines
Quoted 4 lines
It's safe to add them to all stables involved (4.20, 4.19, 4.14, 4.9)
Thanks, that looks reasonable, now queued up.
greg k-h
Hi Greg,
Just noticed the primary dynack patch also got merged into 4.4 stable rc
Could you also apply the 2 fixes above to 4.4?
Checked older versions (< 4.4) .. and they are not required there.
Highly appreciated,
Koen
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 018/352] ath9k: dynack: use authentication messages for late ack
Quoted 27 lines · Koen Vandeputte
Quoted 16 lines · Greg Kroah-Hartman
Quoted 16 lines
Dear Greg,
No idea if this is the proper location to report this or if I should inform stable@vger.. , but:
This backport alone is useless without backporting following 2 commits below also, unless the 2 wifi devices using dynack start off at very close distance.
Their commits messages indicate them as improvements, but they should be considered as fixes.
Quoted 7 lines
Quoted 4 lines
It's safe to add them to all stables involved (4.20, 4.19, 4.14, 4.9)
Thanks, that looks reasonable, now queued up.
greg k-h
Quoted 8 lines
Hi Greg,
Just noticed the primary dynack patch also got merged into 4.4 stable rc
Could you also apply the 2 fixes above to 4.4?
Checked older versions (< 4.4) .. and they are not required there.
The build breaks when the series in on 4.4, so I dropped the patches from there, and 3.18. If you want to send a backported series that builds properly, I will be glad to queue that up.
thanks,
greg k-h
Greg Kroah-Hartman
maintainerPATCH 19/352 scsi: lpfc: Correct LCB RJT handling
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ]
When LCB's are rejected, if beaconing was already in progress, the Reason Code Explanation was not being set. Should have been set to command in progress.
--- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +3 -0
@@ -5701,6 +5701,9 @@ error: stat = (struct ls_rjt *)(pcmd +sizeof (uint32_t )); stat->un.b.lsRjtRsnCode =LSRJT_UNABLE_TPC ; +if (shdr_add_status ==ADD_STATUS_OPERATION_ALREADY_ACTIVE ) + stat->un.b.lsRjtRsnCodeExp =LSEXP_CMD_IN_PROGRESS ; + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitLSRJT++; rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 20/352 scsi: mpt3sas: Call sas_remove_host before removing the target devices
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ]
Call sas_remove_host() before removing the target devices in the driver's .remove() callback function(i.e. during driver unload time). So that driver can provide a way to allow SYNC CACHE, START STOP unit commands etc. (which are issued from SML) to the target drives during driver unload time.
Once sas_remove_host() is called before removing the target drives then driver can just clean up the resources allocated for target devices and no need to call sas_port_delete_phy(), sas_port_delete() API's as these API's internally called from sas_remove_host().
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -9641,6 +9641,7 @@ static void scsih_remove(struct pci_dev *pdev)/* release all the volumes */ _scsih_ir_shutdown (ioc); +sas_remove_host (shost);list_for_each_entry_safe (raid_device, next, &ioc->raid_device_list, list) {if (raid_device->starget) {
@@ -9682,7 +9683,6 @@ static void scsih_remove(struct pci_dev *pdev) ioc->sas_hba.num_phys =0 ; } -sas_remove_host (shost);mpt3sas_base_detach (ioc);spin_lock (&gioc_lock);list_del (&ioc->list);
drivers/scsi/mpt3sas/mpt3sas_transport.c +5 -2
@@ -821,10 +821,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, mpt3sas_port->remote_identify.sas_address, mpt3sas_phy->phy_id); mpt3sas_phy->phy_belongs_to_port =0 ; -sas_port_delete_phy (mpt3sas_port->port, mpt3sas_phy->phy); +if (!ioc->remove_host) +sas_port_delete_phy (mpt3sas_port->port, + mpt3sas_phy->phy);list_del (&mpt3sas_phy->port_siblings); } -sas_port_delete (mpt3sas_port->port); +if (!ioc->remove_host) +sas_port_delete (mpt3sas_port->port);kfree (mpt3sas_port); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 21/352 scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ]
After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to re-establish the login. An nlp_type check in the LOGO completion handler failed to restart discovery for NVME targets. Revised the nlp_type check for NVME as well as SCSI.
While reviewing the LOGO handling a few other issues were seen and were addressed:
- Better lock synchronization around ndlp data types
- When the ABTS times out, unregister the RPI before sending the LOGO so that all local exchange contexts are cleared and nothing received while awaiting LOGO/PLOGI handling will be accepted.
- LOGO handling optimized to:
Wait only R_A_TOV for a response.
It doesn't need to be retried on timeout. If there wasn't a
response, a PLOGI will be sent, thus an implicit logout applies as well when the other port sees it.
If there is a response, any kind of response is considered "good"
and the XRI quarantined for a exchange qualifier window.
- PLOGI is issued as soon a LOGO state is resolved.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +21 -28
@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, icmd->ulpCommand =CMD_ELS_REQUEST64_CR ;if (elscmd ==ELS_CMD_FLOGI ) icmd->ulpTimeout =FF_DEF_RATOV *2 ; +else if (elscmd ==ELS_CMD_LOGO ) + icmd->ulpTimeout = phba->fc_ratov;else icmd->ulpTimeout = phba->fc_ratov *2 ; }else {
@@ -2682,16 +2684,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* The LOGO will not be retried on failure. A LOGO was +* issued to the remote rport and a ACC or RJT or no Answer are +* all acceptable. Note the failure and move forward with +* discovery. The PLOGI will retry. +*/ if (irsp->ulpStatus) { -/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { -/* ELS command is being retried */ - skip_recovery =1 ; - goto out; - }/* LOGO failed */ lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"2756 LOGO failure DID:%06X Status:x%x/x%x\n" , +"2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n" , ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ]);/* Do not call DSM for lpfc_els_abort'ed ELS cmds */
@@ -2737,7 +2738,8 @@ out:* For any other port type, the rpi is unregistered as an implicit * LOGO. */ -if ((ndlp->nlp_type &NLP_FCP_TARGET ) && (skip_recovery ==0 )) { +if (ndlp->nlp_type & (NLP_FCP_TARGET |NLP_NVME_TARGET ) && + skip_recovery ==0 ) {lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;
@@ -2770,6 +2772,8 @@ out:* will be stored into the context1 field of the IOCB for the completion * callback function to the LOGO ELS command. * +* Callers of this routine are expected to unregister the RPI first +* * Return code * 0 - successfully issued logo * 1 - failed to issue logo
@@ -2811,22 +2815,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue LOGO: did:x%x" , ndlp->nlp_DID, 0, 0); -/* -* If we are issuing a LOGO, we may try to recover the remote NPort -* by issuing a PLOGI later. Even though we issue ELS cmds by the -* VPI, if we have a valid RPI, and that RPI gets unreg'ed while -* that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI -* for that ELS cmd. To avoid this situation, lets get rid of the -* RPI right now, before any ELS cmds are sent. -*/ -spin_lock_irq (shost->host_lock); - ndlp->nlp_flag |=NLP_ISSUE_LOGO ; -spin_unlock_irq (shost->host_lock); -if (lpfc_unreg_rpi (vport, ndlp)) { -lpfc_els_free_iocb (phba, elsiocb); -return 0 ; - } - phba->fc_stat.elsXmitLOGO++; elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;spin_lock_irq (shost->host_lock);
@@ -2834,7 +2822,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (shost->host_lock); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;
@@ -2842,6 +2829,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_els_free_iocb (phba, elsiocb);return 1 ; } + +spin_lock_irq (shost->host_lock); + ndlp->nlp_prev_state = ndlp->nlp_state; +spin_unlock_irq (shost->host_lock); +lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; }
@@ -9508,7 +9500,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, "rport in state 0x%x\n", ndlp->nlp_state);return ; } - lpfc_printf_log(phba, KERN_INFO, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, + LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, "3094 Start rport recovery on shost id 0x%x " "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " "flags 0x%x\n",
@@ -9521,8 +9514,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,*/ spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE ; + ndlp->nlp_flag |=NLP_ISSUE_LOGO ;spin_unlock_irqrestore (shost->host_lock, flags); -lpfc_issue_els_logo (vport, ndlp,0 ); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE ); +lpfc_unreg_rpi (vport, ndlp); }
drivers/scsi/lpfc/lpfc_nportdisc.c +5 -0
@@ -836,7 +836,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if (!(ndlp->nlp_flag &NLP_RPI_REGISTERED )) { +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);return 0 ; }
@@ -851,7 +853,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)return 1 ; } } + +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);lpfc_unreg_rpi (vport, ndlp);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 22/352 ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 82c08c3e7f171aa7f579b231d0abbc1d62e91974 ]
In case panic() and panic() called at the same time on different CPUS. For example:
CPU 0:
panic()
__crash_kexec
machine_crash_shutdown
crash_smp_send_stop
machine_kexec
BUG_ON(num_online_cpus() > 1);CPU 1:
panic()
local_irq_disable
panic_smp_self_stop
If CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop(), kdump fails. CPU1 can't receive the ipi irq, CPU1 will be always online. To fix this problem, this patch split out the panic_smp_self_stop() and add set_cpu_online(smp_processor_id(), false).
--- arch/arm/kernel/smp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm/kernel/smp.c +15 -0
@@ -724,6 +724,21 @@ void smp_send_stop(void)pr_warn ("SMP: failed to stop secondary CPUs\n" ); } +/* In case panic() and panic() called at the same time on CPU1 and CPU2, +* and CPU 1 calls panic_smp_self_stop() before crash_smp_send_stop() +* CPU1 can't receive the ipi irqs from CPU2, CPU1 will be always online, +* kdump fails. So split out the panic_smp_self_stop() and add +* set_cpu_online(smp_processor_id(), false). +*/ +void panic_smp_self_stop (void ) +{ +pr_debug ("CPU %u will stop doing anything useful since another CPU has paniced\n" , +smp_processor_id ()); +set_cpu_online (smp_processor_id (), false); +while (1 ) +cpu_relax (); +} +/* * not supported here */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 23/352 clk: boston: fix possible memory leak in clk_boston_setup()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ]
Smatch report warnings:drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell'
'onecell' is malloced in clk_boston_setup(), but not be freed before leaving from the error handling cases.
--- drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clk/imgtec/clk-boston.c +8 -3
@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) hw =clk_hw_register_fixed_rate (NULL ,"input" ,NULL ,0 , in_freq);if (IS_ERR (hw)) {pr_err ("failed to register input clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_INPUT ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"sys" ,"input" ,0 , sys_freq);if (IS_ERR (hw)) {pr_err ("failed to register sys clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_SYS ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"cpu" ,"input" ,0 , cpu_freq);if (IS_ERR (hw)) {pr_err ("failed to register cpu clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_CPU ] = hw; err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, onecell);if (err)pr_err ("failed to add DT provider: %d\n" , err); + +return ; + +error: +kfree (onecell); }/*
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 24/352 dlm: Dont swamp the CPU with callbacks queued during recovery
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]
Before this patch, recovery would cause all callbacks to be delayed, put on a queue, and afterward they were all queued to the callback work queue. This patch does the same thing, but occasionally takes a break after 25 of them so it won't swamp the CPU at the expense of other RT processes like corosync.
--- fs/dlm/ast.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/dlm/ast.c +10 -0
@@ -292,6 +292,8 @@ void dlm_callback_suspend(struct dlm_ls *ls)flush_workqueue (ls->ls_callback_wq); } +#define MAX_CB_QUEUE 25 +void dlm_callback_resume (struct dlm_ls *ls) {struct dlm_lkb *lkb, *safe;
@@ -302,15 +304,23 @@ void dlm_callback_resume(struct dlm_ls *ls)if (!ls->ls_callback_wq)return ; +more:mutex_lock (&ls->ls_cb_mutex);list_for_each_entry_safe (lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {list_del_init (&lkb->lkb_cb_list);queue_work (ls->ls_callback_wq, &lkb->lkb_cb_work); count++; +if (count ==MAX_CB_QUEUE ) +break ; }mutex_unlock (&ls->ls_cb_mutex);if (count)log_rinfo (ls,"dlm_callback_resume %d" , count); +if (count ==MAX_CB_QUEUE ) { + count =0 ; +cond_resched (); + goto more; + } }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 25/352 x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ]
In the expression "word1 << 16", word1 starts as u16, but is promoted to a signed int, then sign-extended to resource_size_t, which is probably not what was intended. Cast to resource_size_t to avoid the sign extension.
This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI:
Fix Broadcom CNB20LE unintended sign extension") back in 2014.
Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension")
--- arch/x86/pci/broadcom_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/broadcom_bus.c +2 -2
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) word1 =read_pci_config_16 (bus, slot, func,0xc0 ); word2 =read_pci_config_16 (bus, slot, func,0xc2 );if (word1 != word2) { - res.start = (word1 <<16 ) |0x0000 ; - res.end = (word2 <<16 ) |0xffff ; + res.start = ((resource_size_t ) word1 <<16 ) |0x0000 ; + res.end = ((resource_size_t ) word2 <<16 ) |0xffff ; res.flags =IORESOURCE_MEM ;update_res (info, res.start, res.end, res.flags,0 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 26/352 powerpc/pseries: add of_node_put() in dlpar_detach_node()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5b3f5c408d8cc59b87e47f1ab9803dbd006e4a91 ]
The previous commit, "of: overlay: add missing of_node_get() in __of_attach_node_sysfs" added a missing of_node_get() to __of_attach_node_sysfs(). This results in a refcount imbalance for nodes attached with dlpar_attach_node(). The calling sequence from dlpar_attach_node() to __of_attach_node_sysfs() is:
dlpar_attach_node()
of_attach_node()
__of_attach_node_sysfs()For more detailed description of the node refcount, see commit 68baf692c435 ("powerpc/pseries: Fix of_node_put() underflow during DLPAR remove").
--- arch/powerpc/platforms/pseries/dlpar.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/pseries/dlpar.c +2 -0
@@ -270,6 +270,8 @@ int dlpar_detach_node(struct device_node *dn)if (rc)return rc; +of_node_put (dn); +return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 27/352 bpftool: Improve handling of ENOENT on map dumps
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit bf598a8f0f771302d4ecb0ef0003c54732221597 ]
bpftool output is not user friendly when dumping a map with only a few populated entries:
$ bpftool map
1: devmap name tx_devmap flags 0x0
key 4B value 4B max_entries 64 memlock 4096B
2: array name tx_idxmap flags 0x0
key 4B value 4B max_entries 64 memlock 4096B $ bpftool map dump id 1
key:
00 00 00 00
value:
No such file or directory
key:
01 00 00 00
value:
No such file or directory
key:
02 00 00 00
value:
No such file or directory
key: 03 00 00 00 value: 03 00 00 00Handle ENOENT by keeping the line format sane and dumping "<no entry>" for the value
$ bpftool map dump id 1
key: 00 00 00 00 value: <no entry>
key: 01 00 00 00 value: <no entry>
key: 02 00 00 00 value: <no entry>
key: 03 00 00 00 value: 03 00 00 00
...--- tools/bpf/bpftool/map.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/bpf/bpftool/map.c +14 -4
@@ -383,7 +383,10 @@ static void print_entry_plain(struct bpf_map_info *info, unsigned char *key,printf (single_line ?" " :"\n" );printf ("value:%c" , break_names ?'\n' :' ' ); -fprint_hex (stdout, value, info->value_size," " ); +if (value) +fprint_hex (stdout, value, info->value_size," " ); +else +printf ("<no entry>" );printf ("\n" ); }else {
@@ -398,8 +401,11 @@ static void print_entry_plain(struct bpf_map_info *info, unsigned char *key,for (i =0 ; i < n; i++) {printf ("value (CPU %02d):%c" , i, info->value_size >16 ?'\n' :' ' ); -fprint_hex (stdout, value + i * step, - info->value_size," " ); +if (value) +fprint_hex (stdout, value + i * step, + info->value_size," " ); +else +printf ("<no entry>" );printf ("\n" ); } }
@@ -731,7 +737,11 @@ static int dump_map_elem(int fd, void *key, void *value,jsonw_string_field (json_wtr,"error" ,strerror (lookup_errno));jsonw_end_object (json_wtr); }else { -print_entry_error (map_info, key,strerror (lookup_errno)); +if (errno ==ENOENT ) +print_entry_plain (map_info, key,NULL ); +else +print_entry_error (map_info, key, +strerror (lookup_errno)); }return 0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 28/352 s390/qeth: utilize virtual MAC for Layer2 OSD devices
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b144b99fff69a5bc0d34c8e168bedb88c68ca23d ]
By default, READ MAC on a Layer2 OSD device returns the adapter's burnt-in MAC address. Given the default scenario of many virtual devices on the same adapter, qeth can't make any use of this address and therefore skips the READ MAC call for this device type.
But in some configurations, the READ MAC command for a Layer2 OSD device actually returns a pre-provisioned, virtual MAC address. So enable the READ MAC code to detect this situation, and let the L2 subdriver call READ MAC for OSD devices.
This also removes the QETH_LAYER2_MAC_READ flag, which protects L2 devices against calling READ MAC multiple times. Instead protect the whole call to qeth_l2_request_initial_mac().
--- drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_main.c | 12 +++++++----- drivers/s390/net/qeth_core_mpc.h | 25 +++++++++++++++---------- drivers/s390/net/qeth_l2_main.c | 10 ++++------ 4 files changed, 26 insertions(+), 22 deletions(-)
drivers/s390/net/qeth_core.h +0 -1
@@ -665,7 +665,6 @@ struct qeth_card_blkt {#define QETH_BROADCAST_WITH_ECHO 0x01#define QETH_BROADCAST_WITHOUT_ECHO 0x02 -#define QETH_LAYER2_MAC_READ 0x01#define QETH_LAYER2_MAC_REGISTERED 0x02struct qeth_card_info {unsigned short unit_addr2;
drivers/s390/net/qeth_core_main.c +7 -5
@@ -4235,16 +4235,18 @@ static int qeth_setadpparms_change_macaddr_cb(struct qeth_card *card, struct qeth_reply *reply, unsigned long data) {struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *) data; +struct qeth_ipacmd_setadpparms *adp_cmd;QETH_CARD_TEXT (card,4 ,"chgmaccb" );if (qeth_setadpparms_inspect_rc (cmd))return 0 ; -if (IS_LAYER3 (card) || !(card->info.mac_bits &QETH_LAYER2_MAC_READ )) { -ether_addr_copy (card->dev->dev_addr, - cmd->data.setadapterparms.data.change_addr.addr); - card->info.mac_bits |=QETH_LAYER2_MAC_READ ; - } + adp_cmd = &cmd->data.setadapterparms; +if (IS_LAYER2 (card) &&IS_OSD (card) && !IS_VM_NIC (card) && + !(adp_cmd->hdr.flags &QETH_SETADP_FLAGS_VIRTUAL_MAC )) +return 0 ; + +ether_addr_copy (card->dev->dev_addr, adp_cmd->data.change_addr.addr);return 0 ; }
drivers/s390/net/qeth_core_mpc.h +15 -10
@@ -80,7 +80,9 @@ enum qeth_card_types { };#define IS_IQD (card) ((card)->info.type == QETH_CARD_TYPE_IQD) +#define IS_OSD (card) ((card)->info.type == QETH_CARD_TYPE_OSD)#define IS_OSN (card) ((card)->info.type == QETH_CARD_TYPE_OSN) +#define IS_VM_NIC (card) ((card)->info.guestlan)#define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18/* only the first two bytes are looked at in qeth_get_cardname_short */
@@ -529,17 +531,20 @@ struct qeth_query_switch_attributes {__u8 reserved3[8 ]; }; +#define QETH_SETADP_FLAGS_VIRTUAL_MAC 0x80/* for CHANGE_ADDR_READ_MAC */ +struct qeth_ipacmd_setadpparms_hdr { -__u32 supp_hw_cmds; -__u32 reserved1; -__u16 cmdlength; -__u16 reserved2; -__u32 command_code; -__u16 return_code; -__u8 used_total; -__u8 seq_no; -__u32 reserved3; -} __attribute__ ((packed)); +u32 supp_hw_cmds; +u32 reserved1; +u16 cmdlength; +u16 reserved2; +u32 command_code; +u16 return_code; +u8 used_total; +u8 seq_no; +u8 flags; +u8 reserved3[3 ]; +};struct qeth_ipacmd_setadpparms {struct qeth_ipacmd_setadpparms_hdr hdr;
drivers/s390/net/qeth_l2_main.c +4 -6
@@ -461,12 +461,9 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)/* fall back to alternative mechanism: */ } -if (card->info.type ==QETH_CARD_TYPE_IQD || - card->info.type ==QETH_CARD_TYPE_OSM || - card->info.type ==QETH_CARD_TYPE_OSX || - card->info.guestlan) { +if (!IS_OSN (card)) { rc =qeth_setadpparms_change_macaddr (card); -if (!rc) +if (!rc &&is_valid_ether_addr (card->dev->dev_addr)) goto out;QETH_DBF_MESSAGE (2 ,"READ_MAC Assist failed on device %x: %#x\n" ,CARD_DEVID (card), rc);
@@ -917,7 +914,8 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 1)); } -qeth_l2_request_initial_mac (card); +if (!is_valid_ether_addr (card->dev->dev_addr)) +qeth_l2_request_initial_mac (card);netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); rc =register_netdev (card->dev);if (!rc && carrier_ok)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 29/352 crypto: aes_ti - disable interrupts while accessing S-box
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0a6a40c2a8c184a2fb467efacfb1cd338d719e0b ]
In the "aes-fixed-time" AES implementation, disable interrupts while accessing the S-box, in order to make cache-timing attacks more difficult. Previously it was possible for the CPU to be interrupted while the S-box was loaded into L1 cache, potentially evicting the cachelines and causing later table lookups to be time-variant.
In tests I did on x86 and ARM, this doesn't affect performance significantly. Responsiveness is potentially a concern, but interrupts are only disabled for a single AES block.
Note that even after this change, the implementation still isn't necessarily guaranteed to be constant-time; see
https://cr.yp.to/antiforgery/cachetiming-20050414.pdf for a discussion of the many difficulties involved in writing truly constant-time AES software. But it's valuable to make such attacks more difficult.
--- crypto/Kconfig | 3 ++- crypto/aes_ti.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
crypto/Kconfig +2 -1
@@ -1006,7 +1006,8 @@ config CRYPTO_AES_TI 8 for decryption), this implementation only uses just two S-boxes of 256 bytes each, and attempts to eliminate data dependent latencies by prefetching the entire table into the cache at the start of each - block. + block. Interrupts are also disabled to avoid races where cachelines + are evicted when the CPU is interrupted to do something else. config CRYPTO_AES_586 tristate "AES cipher algorithms (i586)"
crypto/aes_ti.c +18 -0
@@ -269,6 +269,7 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_enc +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_enc[0 ] ^get_unaligned_le32 (in);
@@ -276,6 +277,12 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_enc[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_enc[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_sbox[0 ] ^ __aesti_sbox[128 ]; st0[1 ] ^= __aesti_sbox[32 ] ^ __aesti_sbox[160 ]; st0[2 ] ^= __aesti_sbox[64 ] ^ __aesti_sbox[192 ];
@@ -300,6 +307,8 @@ static void aesti_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static void aesti_decrypt (struct crypto_tfm *tfm,u8 *out,const u8 *in)
@@ -308,6 +317,7 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)const u32 *rkp = ctx->key_dec +4 ;int rounds =6 + ctx->key_length /4 ;u32 st0[4 ], st1[4 ]; +unsigned long flags;int round; st0[0 ] = ctx->key_dec[0 ] ^get_unaligned_le32 (in);
@@ -315,6 +325,12 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) st0[2 ] = ctx->key_dec[2 ] ^get_unaligned_le32 (in +8 ); st0[3 ] = ctx->key_dec[3 ] ^get_unaligned_le32 (in +12 ); +/* +* Temporarily disable interrupts to avoid races where cachelines are +* evicted when the CPU is interrupted to do something else. +*/ +local_irq_save (flags); + st0[0 ] ^= __aesti_inv_sbox[0 ] ^ __aesti_inv_sbox[128 ]; st0[1 ] ^= __aesti_inv_sbox[32 ] ^ __aesti_inv_sbox[160 ]; st0[2 ] ^= __aesti_inv_sbox[64 ] ^ __aesti_inv_sbox[192 ];
@@ -339,6 +355,8 @@ static void aesti_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)put_unaligned_le32 (inv_subshift (st1,1 ) ^ rkp[5 ], out +4 );put_unaligned_le32 (inv_subshift (st1,2 ) ^ rkp[6 ], out +8 );put_unaligned_le32 (inv_subshift (st1,3 ) ^ rkp[7 ], out +12 ); + +local_irq_restore (flags); }static struct crypto_alg aes_alg = {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 30/352 drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ]
For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens.
The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment).
--- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +7 -5
@@ -314,12 +314,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)vc4_get_scaling_mode (vc4_state->src_h[1 ], vc4_state->crtc_h); -/* YUV conversion requires that horizontal scaling be enabled, -* even on a plane that's otherwise 1:1. Looks like only PPF -* works in that case, so let's pick that one. +/* YUV conversion requires that horizontal scaling be enabled +* on the UV plane even if vc4_get_scaling_mode() returned +* VC4_SCALING_NONE (which can happen when the down-scaling +* ratio is 0.5). Let's force it to VC4_SCALING_PPF in this +* case. */ -if (vc4_state->is_unity) - vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; +if (vc4_state->x_scaling[1 ] ==VC4_SCALING_NONE ) + vc4_state->x_scaling[1 ] =VC4_SCALING_PPF ; }else { vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 31/352 serial: fsl_lpuart: clear parity enable bit when disable parity
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ]
Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1479,6 +1479,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,else cr1 &= ~UARTCR1_PT ; } + }else { + cr1 &= ~UARTCR1_PE ; }/* ask the core to calculate the divisor */
@@ -1690,6 +1692,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,else ctrl &= ~UARTCTRL_PT ; } + }else { + ctrl &= ~UARTCTRL_PE ; }/* ask the core to calculate the divisor */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 32/352 ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]
If a gettime64 call fails, return the error and avoid copying data back to user.
--- drivers/ptp/ptp_chardev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_chardev.c +4 -1
@@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64 (ptp->info, &ts); + err = ptp->info->gettime64 (ptp->info, &ts); +if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++;
@@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)break ; } +out:kfree (sysoff);return err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 33/352 MIPS: Boston: Disable EG20T prefetch
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ]
The Intel EG20T Platform Controller Hub used on the MIPS Boston development board supports prefetching memory to optimize DMA transfers. Unfortunately for unknown reasons this doesn't work well with some MIPS CPUs such as the P6600, particularly when using an I/O Coherence Unit (IOCU) to provide cache-coherent DMA. In these systems it is common for DMA data to be lost, resulting in broken access to EG20T devices such as the MMC or SATA controllers.
Support for a DT property to configure the prefetching was added a while back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from device tree if passed") but we never added the DT snippet to make use of it. Add that now in order to disable the prefetching & fix DMA on the affected systems.
Patchwork: https://patchwork.linux-mips.org/patch/21068/
--- arch/mips/boot/dts/img/boston.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -141,6 +141,12 @@ #size-cells = <2>; #interrupt-cells = <1>; + eg20t_phub@2,0,0 { + compatible = "pci8086,8801"; + reg = <0x00020000 0 0 0 0>; + intel,eg20t-prefetch = <0>; + }; + eg20t_mac@2,0,1 { compatible = "pci8086,8802"; reg = <0x00020100 0 0 0 0>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 34/352 dpaa2-ptp: defer probe when portal allocation failed
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5500598abbfb5b46201b9768bd9ea873a5eeaece ]
The fsl_mc_portal_allocate can fail when the requested MC portals are not yet probed by the fsl_mc_allocator. In this situation, the driver should defer the probe.
--- drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c +4 -1
@@ -140,7 +140,10 @@ static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev) err =fsl_mc_portal_allocate (mc_dev,0 , &mc_dev->mc_io);if (err) { -dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); +if (err == -ENXIO ) + err = -EPROBE_DEFER ; +else +dev_err (dev,"fsl_mc_portal_allocate err %d\n" , err); goto err_exit; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 35/352 iwlwifi: fw: do not set sgi bits for HE connection
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5c2dbebb446539eb9640bf59a02756d6e7f1fc53 ]
If the association supports HE, HT/VHT rates will never be used for Tx and therefore there's no need to set the sgi-per-channel-width-support bits, so don't set them in this case.
--- drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c +4 -0
@@ -98,8 +98,12 @@ static u8 rs_fw_sgi_cw_support(struct ieee80211_sta *sta) {struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; +struct ieee80211_sta_he_cap *he_cap = &sta->he_cap;u8 supp =0 ; +if (he_cap && he_cap->has_he) +return 0 ; +if (ht_cap->cap &IEEE80211_HT_CAP_SGI_20 ) supp |=BIT (IWL_TLC_MNG_CH_WIDTH_20MHZ );if (ht_cap->cap &IEEE80211_HT_CAP_SGI_40 )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 36/352 staging:iio:ad2s90: Make probe handle spi_setup failure
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b3a3eafeef769c6982e15f83631dcbf8d1794efb ]
Previously, ad2s90_probe ignored the return code from spi_setup, not handling its possible failure. This patch makes ad2s90_probe check if the code is an error code and, if so, do the following:
- Call dev_err with an appropriate error message.
- Return the spi_setup's error code.
Note: The 'return ret' statement could be out of the 'if' block, but this whole block will be moved up in the function in the patch:
'staging:iio:ad2s90: Move device registration to the end of probe'.
--- drivers/staging/iio/resolver/ad2s90.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/iio/resolver/ad2s90.c +6 -1
@@ -85,7 +85,12 @@ static int ad2s90_probe(struct spi_device *spi)/* need 600ns between CS and the first falling edge of SCLK */ spi->max_speed_hz =830000 ; spi->mode =SPI_MODE_3 ; -spi_setup (spi); + ret =spi_setup (spi); + +if (ret <0 ) { +dev_err (&spi->dev,"spi_setup failed!\n" ); +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 37/352 fpga: altera-cvp: Fix registration for CvP incapable devices
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 68f60538daa4bc3da5d0764d46f391916fba20fd ]
The probe function needs to verify the CvP enable bit in order to properly determine if FPGA Manager functionality can be safely enabled.
--- drivers/fpga/altera-cvp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/fpga/altera-cvp.c +9 -0
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,struct altera_cvp_conf *conf;struct fpga_manager *mgr;u16 cmd, val; +u32 regval;int ret;/*
@@ -416,6 +417,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,return -ENODEV ; } +pci_read_config_dword (pdev,VSE_CVP_STATUS , ®val); +if (!(regval &VSE_CVP_STATUS_CVP_EN )) { +dev_err (&pdev->dev, +"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n" , + regval); +return -ENODEV ; + } + conf =devm_kzalloc (&pdev->dev,sizeof (*conf),GFP_KERNEL );if (!conf)return -ENOMEM ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 38/352 Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ]
The patch fixes:
hv_kvp_daemon.c: In function 'kvp_set_ip_info':
hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes into a destination of size 4096
The "(unsigned int)str_len" is to avoid:
hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/hv/hv_kvp_daemon.c +13 -2
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)FILE *file;char cmd[PATH_MAX ];char *mac_addr; +int str_len;/* * Set the configuration for the specified interface with
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)* invoke the external script to do its magic. */ -snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , -"hv_set_ifconfig" , if_file); + str_len =snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , +"hv_set_ifconfig" , if_file); +/* +* This is a little overcautious, but it's necessary to suppress some +* false warnings from gcc 8.0.1. +*/ +if (str_len <=0 || (unsigned int )str_len >=sizeof (cmd)) { +syslog (LOG_ERR ,"Cmd '%s' (len=%d) may be too long" , + cmd, str_len); +return HV_E_FAIL ; + } +if (system (cmd)) {syslog (LOG_ERR ,"Failed to execute cmd '%s'; error: %d %s" , cmd, errno,strerror (errno));
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 39/352 fpga: altera-cvp: fix bad IO access on x86_64
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 187fade88ca0ff2df9d360ca751d948d73db7095 ]
If mapping the CvP BAR fails, we still can configure the FPGA via PCI config space access. In this case the iomap pointer is NULL. On x86_64, passing NULL address to pci_iounmap() generates "Bad IO access at port 0x0" output with stack call trace. Fix it.
--- drivers/fpga/altera-cvp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/fpga/altera-cvp.c +4 -2
@@ -478,7 +478,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,return 0 ; err_unmap: -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR ); err_disable: cmd &= ~PCI_COMMAND_MEMORY ;
@@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)u16 cmd;fpga_mgr_unregister (mgr); -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR );pci_read_config_word (pdev,PCI_COMMAND , &cmd); cmd &= ~PCI_COMMAND_MEMORY ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 40/352 vbox: fix link error with gcc -Og
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b8ae30a7020d61e0504529adf45abb08fa5c59f5 ]
With the new CONFIG_CC_OPTIMIZE_FOR_DEBUGGING option, we get a link error in the vboxguest driver, when that fails to optimize out the call to the compat handler:
drivers/virt/vboxguest/vboxguest_core.o: In function `vbg_ioctl_hgcm_call':
vboxguest_core.c:(.text+0x1f6e): undefined reference to `vbg_hgcm_call32'
Another compile-time check documents better what we want and avoids the error.
--- drivers/virt/vboxguest/vboxguest_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virt/vboxguest/vboxguest_core.c +1 -1
@@ -1312,7 +1312,7 @@ static int vbg_ioctl_hgcm_call(struct vbg_dev *gdev,return -EINVAL ; } -if (f32bit) +if (IS_ENABLED (CONFIG_COMPAT ) && f32bit) ret = vbg_hgcm_call32(gdev, client_id, call->function, call->timeout_ms, VBG_IOCTL_HGCM_CALL_PARMS32(call),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 41/352 platform/chrome: dont report EC_MKBP_EVENT_SENSOR_FIFO as wakeup
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6ad16b78a039b45294b1ad5d69c14ac57b2fe706 ]
EC_MKBP_EVENT_SENSOR_FIFO events can be triggered for a variety of reasons, and there are very few cases in which they should be treated as wakeup interrupts (particularly, when a certain MOTIONSENSE_MODULE_FLAG_* is set, but this is not even supported in the mainline cros_ec_sensor driver yet). Most of the time, they are benign sensor readings. In any case, the top-level cros_ec device doesn't know enough to determine that they should wake the system, and so it should not report the event. This would be the job of the cros_ec_sensors driver to parse.
This patch adds checks to cros_ec_get_next_event() such that it doesn't signal 'wakeup' for events of type EC_MKBP_EVENT_SENSOR_FIFO.
This patch is particularly relevant on devices like Scarlet (Rockchip RK3399 tablet, known as Acer Chromebook Tab 10), where the EC firmware reports sensor events much more frequently. This was causing /sys/power/wakeup_count to increase very frequently, often needlessly interrupting our ability to suspend the system.
--- drivers/platform/chrome/cros_ec_proto.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/platform/chrome/cros_ec_proto.c +15 -3
@@ -575,6 +575,7 @@ static int get_keyboard_state_event(struct cros_ec_device *ec_dev)int cros_ec_get_next_event (struct cros_ec_device *ec_dev,bool *wake_event) { +u8 event_type;u32 host_event;int ret;
@@ -594,11 +595,22 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev, bool *wake_event)return ret;if (wake_event) { + event_type = ec_dev->event_data.event_type; host_event =cros_ec_get_host_event (ec_dev); -/* Consider non-host_event as wake event */ - *wake_event = !host_event || - !!(host_event & ec_dev->host_event_wake_mask); +/* +* Sensor events need to be parsed by the sensor sub-device. +* Defer them, and don't report the wakeup here. +*/ +if (event_type ==EC_MKBP_EVENT_SENSOR_FIFO ) + *wake_event = false; +/* Masked host-events should not count as wake events. */ +else if (host_event && + !(host_event & ec_dev->host_event_wake_mask)) + *wake_event = false; +/* Consider all other events as wake events. */ +else + *wake_event = true; }return ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 42/352 i40e: suppress bogus error message
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7cd8eb0861981ad212ce4242a1870c4b5831ceff ]
The i40e driver complains about unprivileged VFs trying to configure promiscuous mode each time a VF reset occurs. This isn't the fault of the poor VF driver - the PF driver itself is making the request.
To fix this, skip the privilege check if the request is to disable all promiscuous activity. This gets rid of the bogus message, but doesn't affect privilege checks, since we really only care if the unprivileged VF is trying to enable promiscuous mode.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -1
@@ -1112,7 +1112,8 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf,if (!i40e_vc_isvalid_vsi_id (vf, vsi_id) || !vsi)return I40E_ERR_PARAM ; -if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps)) { +if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps) && + (allmulti || alluni)) {dev_err (&pf->pdev->dev,"Unprivileged VF %d is attempting to configure promiscuous mode\n" , vf->vf_id);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 43/352 i40e: prevent overlapping tx_timeout recover
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit d5585b7b6846a6d0f9517afe57be3843150719da ]
If a TX hang occurs, we attempt to recover by incrementally resetting. If we're starved for CPU time, it's possible the reset doesn't actually complete (or even fire) before another tx_timeout fires causing us to fly through the different resets without actually doing them.
This adds a bit to set and check if a timeout recovery is already pending and, if so, bail out of tx_timeout. The bit will get cleared at the end of i40e_rebuild when reset is complete.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -122,6 +122,7 @@ enum i40e_state_t { __I40E_MDD_EVENT_PENDING, __I40E_VFLR_EVENT_PENDING, __I40E_RESET_RECOVERY_PENDING, + __I40E_TIMEOUT_RECOVERY_PENDING, __I40E_MISC_IRQ_REQUESTED, __I40E_RESET_INTR_RECEIVED, __I40E_REINIT_REQUESTED,
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -338,6 +338,10 @@ static void i40e_tx_timeout(struct net_device *netdev) (pf->tx_timeout_last_recovery + netdev->watchdog_timeo))) return; /* don't do any new action before the next timeout */ +/* don't kick off another recovery if one is already pending */ +if (test_and_set_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state)) +return ; +if (tx_ring) { head =i40e_get_head (tx_ring);/* Read interrupt register */
@@ -9632,6 +9636,7 @@ end_core_reset:clear_bit (__I40E_RESET_FAILED, pf->state); clear_recovery:clear_bit (__I40E_RESET_RECOVERY_PENDING, pf->state); +clear_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state); }/**
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 44/352 scsi: hisi_sas: change the time of SAS SSP connection
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 15bc43f31a074076f114e0b87931e3b220b7bff1 ]
Currently the time of SAS SSP connection is 1ms, which means the link connection will fail if no IO response after this period.
For some disks handling large IO (such as 512k), 1ms is not enough, so change it to 5ms.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -494,7 +494,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)hisi_sas_phy_write32 (hisi_hba, i,PHYCTRL_OOB_RESTART_MSK ,0x1 );hisi_sas_phy_write32 (hisi_hba, i,STP_LINK_TIMER ,0x7f7a120 );hisi_sas_phy_write32 (hisi_hba, i,CON_CFG_DRIVER ,0x2a0a01 ); - +hisi_sas_phy_write32 (hisi_hba, i,SAS_SSP_CON_TIMER_CFG ,0x32 );/* used for 12G negotiate */ hisi_sas_phy_write32 (hisi_hba, i,COARSETUNE_TIME ,0x1e );hisi_sas_phy_write32 (hisi_hba, i,AIP_LIMIT ,0x2ffff );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 45/352 staging: iio: ad7780: update voltage on read
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 336650c785b62c3bea7c8cf6061c933a90241f67 ]
The ad7780 driver previously did not read the correct device output, as it read an outdated value set at initialization. It now updates its voltage on read.
--- drivers/staging/iio/adc/ad7780.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/iio/adc/ad7780.c +5 -1
@@ -87,12 +87,16 @@ static int ad7780_read_raw(struct iio_dev *indio_dev, long m) {struct ad7780_state *st =iio_priv (indio_dev); +int voltage_uv;switch (m) {case IIO_CHAN_INFO_RAW :return ad_sigma_delta_single_conversion (indio_dev, chan, val);case IIO_CHAN_INFO_SCALE : - *val = st->int_vref_mv * st->gain; + voltage_uv =regulator_get_voltage (st->reg); +if (voltage_uv <0 ) +return voltage_uv; + *val = (voltage_uv /1000 ) * st->gain; *val2 = chan->scan_type.realbits -1 ;return IIO_VAL_FRACTIONAL_LOG2 ;case IIO_CHAN_INFO_OFFSET :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 46/352 usbnet: smsc95xx: fix rx packet alignment
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ]
The smsc95xx driver already takes into account the NET_IP_ALIGN parameter when setting up the receive packet data, which means we do not need to worry about aligning the packets in the usbnet driver.
Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now passed to the ip_rcv() routine with the start on an aligned address.
Tested on Raspberry Pi B3.
--- drivers/net/usb/smsc95xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/smsc95xx.c +1 -0
@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->features |=NETIF_F_RXCSUM ; dev->net->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM ; +set_bit (EVENT_NO_IP_ALIGN , &dev->flags);smsc95xx_init_mac_address (dev);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 47/352 drm/rockchip: fix for mailbox read size
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ]
Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is used by them, can read only up to 255 bytes at once. Normally, it's not a big issue as DPCD or EDID reads won't (hopefully) exceed that value.
The real issue here is the revocation list read during the HDCP authentication process. (problematic use case:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152)
The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + 4 bytes of an additional info).
In other words - CTSes with HDCP Repeater won't pass without this fix. Oh, and the driver will most likely stop working (best case scenario).
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, }static int cdn_dp_mailbox_read_receive (struct cdn_dp_device *dp, -u8 *buff,u8 buff_size) +u8 *buff,u16 buff_size) {u32 i;int ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 48/352 ARM: OMAP2+: hwmod: Fix some section annotations
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ]
When building the kernel with Clang, the following section mismatch warnings appears:
WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from the function _setup() to the function .init.text:_setup_iclk_autoidle() The function _setup() references
the function __init _setup_iclk_autoidle().
This is often because _setup lacks a __init
annotation or the annotation of _setup_iclk_autoidle is wrong.
WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from the function _setup() to the function .init.text:_setup_reset() The function _setup() references
the function __init _setup_reset().
This is often because _setup lacks a __init
annotation or the annotation of _setup_reset is wrong.
WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from the function _setup() to the function .init.text:_setup_postsetup() The function _setup() references
the function __init _setup_postsetup().
This is often because _setup lacks a __init
annotation or the annotation of _setup_postsetup is wrong.
_setup is used in omap_hwmod_allocate_module, which isn't marked __init and looks like it shouldn't be, meaning to fix these warnings, those functions must be moved out of the init section, which this patch does.
--- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +3 -3
@@ -2413,7 +2413,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)* a stub; implementing this properly requires iclk autoidle usecounting in * the clock code. No return value. */ -static void __init _setup_iclk_autoidle (struct omap_hwmod *oh) +static void _setup_iclk_autoidle (struct omap_hwmod *oh) {struct omap_hwmod_ocp_if *os;
@@ -2444,7 +2444,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)* reset. Returns 0 upon success or a negative error code upon * failure. */ -static int __init _setup_reset (struct omap_hwmod *oh) +static int _setup_reset (struct omap_hwmod *oh) {int r;
@@ -2505,7 +2505,7 @@ static int __init _setup_reset(struct omap_hwmod *oh)* * No return value. */ -static void __init _setup_postsetup (struct omap_hwmod *oh) +static void _setup_postsetup (struct omap_hwmod *oh) {u8 postsetup_state;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 49/352 drm/amd/display: fix gamma not being applied correctly
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ce504b9389be846bcdf512ed5be8f661b3bf097 ]
[why]
Gamma was always being set as identity on SDR monitor, leading to no changes in gamma. This caused nightlight to not apply correctly.
[how]
Added a default gamma structure to compare against in the sdr case.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +2 -1
@@ -1226,7 +1226,8 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx, tf = plane_state->in_transfer_func;if (plane_state->gamma_correction && - !plane_state->gamma_correction->is_identity + !dpp_base->ctx->dc->debug.always_use_regamma + && !plane_state->gamma_correction->is_identity &&dce_use_lut (plane_state->format)) dpp_base->funcs->dpp_program_input_lut (dpp_base, plane_state->gamma_correction);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 50/352 drm/amd/display: calculate stream->phy_pix_clk before clock mapping
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 08e1c28dd521c7b08d1b0af0bae9fb22ccc012a4 ]
[why]phy_pix_clk is one of the variable used to check if one PLL can be shared with displays having common mode set configuration. As of now phy_pix_clock varialbe is calculated in function dc_validate_stream(). dc_validate_stream() function is called after clocks are assigned for the new display. Due to this during hotplug, when PLL sharing conditions are checked for new display phy_pix_clk variable will be 0 and for displays that are already enabled phy_pix_clk will have some value. Hence PLL will not be shared and if the display hardware doesn't have any more PLL to assign, mode set will fail due to resource unavailability.
[how]
Instead of only calculating the phy_pix_clk variable after the PLL is assigned for new display, this patch calculates phy_pix_clk also during the before assigning the PLL for new display.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
@@ -2002,6 +2002,8 @@ enum dc_status resource_map_pool_resources(} */ +calculate_phy_pix_clks (stream); +/* acquire new resources */ pipe_idx =acquire_first_free_pipe (&context->res_ctx, pool, stream);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 51/352 bpf: libbpf: retry map creation without the name
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 23499442c319412aa8e54e7a939e2eb531bdd77d ]
Since commit 88cda1c9da02 ("bpf: libbpf: Provide basic API support to specify BPF obj name"), libbpf unconditionally sets bpf_attr->name for maps. Pre v4.14 kernels don't know about map names and return an error about unexpected non-zero data. Retry sys_bpf without a map name to cover older kernels.
v2 changes:
* check for errno == EINVAL as suggested by Daniel Borkmann
--- tools/lib/bpf/bpf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/lib/bpf/bpf.c +10 -1
@@ -69,6 +69,7 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) {__u32 name_len = create_attr->name ?strlen (create_attr->name) :0 ;union bpf_attr attr; +int ret;memset (&attr,'\0' ,sizeof (attr));
@@ -86,7 +87,15 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) attr.map_ifindex = create_attr->map_ifindex; attr.inner_map_fd = create_attr->inner_map_fd; -return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + ret =sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); +if (ret <0 && errno ==EINVAL && create_attr->name) { +/* Retry the same syscall, but without the name. +* Pre v4.14 kernels don't support map names. +*/ +memset (attr.map_name,0 ,sizeof (attr.map_name)); +return sys_bpf (BPF_MAP_CREATE , &attr,sizeof (attr)); + } +return ret; } int bpf_create_map_node(enum bpf_map_type map_type, const char *name,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 52/352 net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1e86ace4c140fd5a693e266c9b23409358f25381 ]
Currently the cpu affinity hint mask for completion EQs is stored and read from the wrong place, since reading and storing is done from the same index, there is no actual issue with that, but internal irq_info for completion EQs stars at MLX5_EQ_VEC_COMP_BASE offset in irq_info array, this patch changes the code to use the correct offset to store and read the IRQ affinity hint.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++++++++------ include/linux/mlx5/driver.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -1771,7 +1771,7 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq)static int mlx5e_get_cpu (struct mlx5e_priv *priv,int ix) { -return cpumask_first (priv->mdev->priv.irq_info[ix].mask); +return cpumask_first (priv->mdev->priv.irq_info[ix +MLX5_EQ_VEC_COMP_BASE ].mask); } static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,
drivers/net/ethernet/mellanox/mlx5/core/main.c +8 -6
@@ -640,18 +640,19 @@ u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev)static int mlx5_irq_set_affinity_hint (struct mlx5_core_dev *mdev,int i) {struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int vecidx =MLX5_EQ_VEC_COMP_BASE + i; +int irq =pci_irq_vector (mdev->pdev, vecidx); -if (!zalloc_cpumask_var (&priv->irq_info[i].mask,GFP_KERNEL )) { +if (!zalloc_cpumask_var (&priv->irq_info[vecidx].mask,GFP_KERNEL )) {mlx5_core_warn (mdev,"zalloc_cpumask_var failed" );return -ENOMEM ; }cpumask_set_cpu (cpumask_local_spread (i, priv->numa_node), - priv->irq_info[i].mask); + priv->irq_info[vecidx].mask);if (IS_ENABLED (CONFIG_SMP ) && -irq_set_affinity_hint (irq, priv->irq_info[i].mask)) +irq_set_affinity_hint (irq, priv->irq_info[vecidx].mask))mlx5_core_warn (mdev,"irq_set_affinity_hint failed, irq 0x%.4x" , irq);return 0 ;
@@ -659,11 +660,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)static void mlx5_irq_clear_affinity_hint (struct mlx5_core_dev *mdev,int i) { +int vecidx =MLX5_EQ_VEC_COMP_BASE + i;struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int irq =pci_irq_vector (mdev->pdev, vecidx);irq_set_affinity_hint (irq,NULL ); -free_cpumask_var (priv->irq_info[i].mask); +free_cpumask_var (priv->irq_info[vecidx].mask); }static int mlx5_irq_set_affinity_hints (struct mlx5_core_dev *mdev)
include/linux/mlx5/driver.h +1 -1
@@ -1309,7 +1309,7 @@ enum {static inline const struct cpumask *mlx5_get_vector_affinity_hint (struct mlx5_core_dev *dev,int vector) { -return dev->priv.irq_info[vector].mask; +return dev->priv.irq_info[vector +MLX5_EQ_VEC_COMP_BASE ].mask; }#endif /* MLX5_DRIVER_H */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 53/352 modpost: validate symbol names also in find_elf_symbol
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ]
If an ARM mapping symbol shares an address with a valid symbol, find_elf_symbol can currently return the mapping symbol instead, as the symbol is not validated. This can result in confusing warnings:
WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference from the function set_reset_devices() to the variable .init.text:$x.0
This change adds a call to is_valid_name to find_elf_symbol, similarly to how it's already used in find_elf_symbol2.
--- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
scripts/mod/modpost.c +26 -24
@@ -1204,6 +1204,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch,return 1 ; } +static inline int is_arm_mapping_symbol (const char *str) +{ +return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) + && (str[2 ] =='\0' || str[2 ] =='.' ); +} + +/* +* If there's no name there, ignore it; likewise, ignore it if it's +* one of the magic symbols emitted used by current ARM tools. +* +* Otherwise if find_symbols_between() returns those symbols, they'll +* fail the whitelist tests and cause lots of false alarms ... fixable +* only by merging __exit and __init sections into __text, bloating +* the kernel (which is especially evil on embedded platforms). +*/ +static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) +{ +const char *name = elf->strtab + sym->st_name; + +if (!name || !strlen (name)) +return 0 ; +return !is_arm_mapping_symbol (name); +} +/** * Find symbol based on relocation record info. * In some cases the symbol supplied is a valid symbol so
@@ -1229,6 +1253,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,continue ;if (ELF_ST_TYPE (sym->st_info) ==STT_SECTION )continue ; +if (!is_valid_name (elf, sym)) +continue ;if (sym->st_value == addr)return sym;/* Find a symbol nearby - addr are maybe negative */
@@ -1247,30 +1273,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,return NULL ; } -static inline int is_arm_mapping_symbol (const char *str) -{ -return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) - && (str[2 ] =='\0' || str[2 ] =='.' ); -} - -/* -* If there's no name there, ignore it; likewise, ignore it if it's -* one of the magic symbols emitted used by current ARM tools. -* -* Otherwise if find_symbols_between() returns those symbols, they'll -* fail the whitelist tests and cause lots of false alarms ... fixable -* only by merging __exit and __init sections into __text, bloating -* the kernel (which is especially evil on embedded platforms). -*/ -static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) -{ -const char *name = elf->strtab + sym->st_name; - -if (!name || !strlen (name)) -return 0 ; -return !is_arm_mapping_symbol (name); -} -/* * Find symbols before or equal addr and after addr - in the section sec. * If we find two symbols with equal offset prefer one with a valid name.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 54/352 perf tools: Add Hygon Dhyana support
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4787eff3fa88f62fede6ed7afa06477ae6bf984d ]
The tool perf is useful for the performance analysis on the Hygon Dhyana platform. But right now there is no Hygon support for it to analyze the KVM guest os data. So add Hygon Dhyana support to it by checking vendor string to share the code path of AMD.
--- tools/perf/arch/x86/util/kvm-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/kvm-stat.c +1 -1
@@ -156,7 +156,7 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)if (strstr (cpuid,"Intel" )) { kvm->exit_reasons = vmx_exit_reasons; kvm->exit_reasons_isa ="VMX" ; - }else if (strstr (cpuid,"AMD" )) { + }else if (strstr (cpuid,"AMD" ) ||strstr (cpuid,"Hygon" )) { kvm->exit_reasons = svm_exit_reasons; kvm->exit_reasons_isa ="SVM" ; }else
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 55/352 scsi: cxgb4i: fix thermal configuration dependencies
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8d0bb86e2cf6c96d88c3de56a2a29329872c454d ]
I fixed a bug by adding a dependency in the network driver, but that fix caused a related bug in the SCSI driver:
WARNING: unmet direct dependencies detected for CHELSIO_T4
Depends on [m]: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CHELSIO [=y] && PCI [=y] && (IPV6 [=y] || IPV6 [=y]=n) && (THERMAL [=m] || !THERMAL [=m]) Selected by [y]:
- SCSI_CXGB4_ISCSI [=y] && SCSI_LOWLEVEL [=y] && SCSI [=y] && PCI [=y] && INET [=y] && (IPV6 [=y] || IPV6 [=y]=n)drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.o: In function `cxgb4_thermal_init':
cxgb4_thermal.c:(.text+0x158): undefined reference to thermal_zone_device_register' drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.o: In function cxgb4_thermal_remove':
cxgb4_thermal.c:(.text+0x1d8): undefined reference to `thermal_zone_device_unregister'
/git/arm-soc/Makefile:1042: recipe for target 'vmlinux' failed
The same dependency needs to be propagated here to make it work correctly with CONFIG_THERMAL=m and SCSI_CXGB4_ISCSI=y. That change by itself causes another problem with a circular dependency, as we use 'select NETDEVICES'. This is something we really should not do anyway, as a driver symbol should never select another major subsystem, so let's turn that into a 'depends on'. I don't see any downsides of that, as NETDEVICES is only disabled in rather obscure cases that are not relevant to the users of cxgb4i.
--- drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/cxgbi/cxgb4i/Kconfig +2 -2
@@ -1,8 +1,8 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" depends on PCI && INET && (IPV6 || IPV6=n) - select NETDEVICES - select ETHERNET + depends on THERMAL || !THERMAL + depends on ETHERNET select NET_VENDOR_CHELSIO select CHELSIO_T4 select CHELSIO_LIB
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 56/352 soc/tegra: Dont leak device tree node reference
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it.
--- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/tegra/common.c +5 -1
@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = {bool soc_is_tegra (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (tegra_machine_match, root) !=NULL ; + match =of_match_node (tegra_machine_match, root); +of_node_put (root); + +return match !=NULL ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 57/352 media: rc: ensure close() is called on rc_unregister_device
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8e782fcf78275f505194e767c515202d4fd274bc ]
If userspace has an open file descriptor on the rc input device or lirc device when rc_unregister_device() is called, then the rc close() is never called.
This ensures that the receiver is turned off on the nuvoton-cir driver during shutdown.
--- drivers/media/rc/rc-main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/rc/rc-main.c +2 -0
@@ -1952,6 +1952,8 @@ void rc_unregister_device(struct rc_dev *dev)rc_free_rx_device (dev);mutex_lock (&dev->lock); +if (dev->users && dev->close) + dev->close (dev); dev->registered = false;mutex_unlock (&dev->lock);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 58/352 media: video-i2c: avoid accessing released memory area when removing driver
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c764da98a600a4b068d25c77164f092f159cecec ]
The video device release() callback for video-i2c driver frees the whole struct video_i2c_data. If there is no user left for the video device when video_unregister_device() is called, the release callback is executed.
However, in video_i2c_remove() some fields (v4l2_dev, lock, and queue_lock) in struct video_i2c_data are still accessed after video_unregister_device() is called.
This fixes the use after free by moving the code from video_i2c_remove() to the release() callback.
--- drivers/media/i2c/video-i2c.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/i2c/video-i2c.c +6 -5
@@ -510,7 +510,12 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = {static void video_i2c_release (struct video_device *vdev) { -kfree (video_get_drvdata (vdev)); +struct video_i2c_data *data =video_get_drvdata (vdev); + +v4l2_device_unregister (&data->v4l2_dev); +mutex_destroy (&data->lock); +mutex_destroy (&data->queue_lock); +kfree (data); } static int video_i2c_probe(struct i2c_client *client,
@@ -608,10 +613,6 @@ static int video_i2c_remove(struct i2c_client *client)struct video_i2c_data *data =i2c_get_clientdata (client);video_unregister_device (&data->vdev); -v4l2_device_unregister (&data->v4l2_dev); - -mutex_destroy (&data->lock); -mutex_destroy (&data->queue_lock);return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 59/352 media: mtk-vcodec: Release device nodes in mtk_vcodec_init_enc_pm()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ea0f2ba0fa3f91ea1b8d823a54b042026ada6b3 ]
of_parse_phandle() returns the device node with refcount incremented. There are two nodes that are used temporary in mtk_vcodec_init_enc_pm(), but their refcounts are not decremented.
The patch adds one of_node_put() and fixes returning error codes.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +6 -4
@@ -41,25 +41,27 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev *mtkdev) node =of_parse_phandle (dev->of_node,"mediatek,larb" ,0 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenc = &pdev->dev; node =of_parse_phandle (dev->of_node,"mediatek,larb" ,1 );if (!node) {mtk_v4l2_err ("no mediatek,larb found" ); -return -1 ; +return -ENODEV ; } pdev =of_find_device_by_node (node); +of_node_put (node);if (!pdev) {mtk_v4l2_err ("no mediatek,larb device found" ); -return -1 ; +return -ENODEV ; } pm->larbvenclt = &pdev->dev;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 60/352 staging: erofs: fix the definition of DBG_BUGON
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit eef168789866514e5d4316f030131c9fe65b643f ]
It's better not to positively BUG_ON the kernel, however developers need a way to locate issues as soon as possible.
DBG_BUGON is introduced and it could only crash when EROFS_FS_DEBUG (EROFS developping feature) is on. It is helpful for developers to find and solve bugs quickly by eng builds.
Previously, DBG_BUGON is defined as ((void)0) if EROFS_FS_DEBUG is off, but some unused variable warnings as follows could occur:
drivers/staging/erofs/unzip_vle.c: In function `init_alway:':drivers/staging/erofs/unzip_vle.c:61:33: warning: unused variable `work' [-Wunused-variable]
struct z_erofs_vle_work *const work =
^~~~
Fix it to #define DBG_BUGON(x) ((void)(x)).
--- drivers/staging/erofs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/erofs/internal.h +1 -1
@@ -39,7 +39,7 @@#define debugln (x, ...) ((void)0)#define dbg_might_sleep () ((void)0) -#define DBG_BUGON (...) ((void)0) +#define DBG_BUGON (x) ((void)(x))#endif enum {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 61/352 staging: erofs: fix race when the managed cache is enabled
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 51232df5e4b268936beccde5248f312a316800be ]
When the managed cache is enabled, the last reference count of a workgroup must be used for its workstation.
Otherwise, it could lead to incorrect (un)freezes in the reclaim path, and it would be harmful.
A typical race as follows:
Thread 1 (In the reclaim path) Thread 2workgroup_freeze(grp, 1) refcnt = 1
...
workgroup_unfreeze(grp, 1) refcnt = 1
workgroup_get(grp) refcnt = 2 (x)
workgroup_put(grp) refcnt = 1 (x)...unexpected behaviors
* grp is detached but still used, which violates cache-managed freeze constraint.
--- drivers/staging/erofs/internal.h | 1 + drivers/staging/erofs/utils.c | 134 ++++++++++++++++++++++--------- 2 files changed, 96 insertions(+), 39 deletions(-)
drivers/staging/erofs/internal.h +1 -0
@@ -250,6 +250,7 @@ repeat: }#define __erofs_workgroup_get (grp) atomic_inc(&(grp)->refcount) +#define __erofs_workgroup_put (grp) atomic_dec(&(grp)->refcount)extern int erofs_workgroup_put (struct erofs_workgroup *grp);
drivers/staging/erofs/utils.c +95 -39
168 lines not on this page · raw message
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 62/352 x86/resctrl: Fixup the user-visible strings
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 723f1a0dd8e26a7523ba068204bee11c95ded38d ]
Fix the messages in rdt_last_cmd_printf() and rdt_last_cmd_puts() to make them more meaningful and consistent.
[ bp: s/cpu/CPU/; s/mem\W/memory ]
--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++++++------- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++++++++---------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 ++++++++++----------- 3 files changed, 46 insertions(+), 46 deletions(-)
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +11 -11
@@ -71,7 +71,7 @@ int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,unsigned long bw_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -97,12 +97,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) ret =kstrtoul (buf,16 , &val);if (ret) { -rdt_last_cmd_printf ("non-hex character in mask %s\n" , buf); +rdt_last_cmd_printf ("Non-hex character in the mask %s\n" , buf);return false; }if (val ==0 || val > r->default_ctrl) { -rdt_last_cmd_puts ("mask out of range\n" ); +rdt_last_cmd_puts ("Mask out of range\n" );return false; }
@@ -110,12 +110,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) zero_bit =find_next_zero_bit (&val, cbm_len, first_bit);if (find_next_bit (&val, cbm_len, zero_bit) < cbm_len) { -rdt_last_cmd_printf ("mask %lx has non-consecutive 1-bits\n" , val); +rdt_last_cmd_printf ("The mask %lx has non-consecutive 1-bits\n" , val);return false; }if ((zero_bit - first_bit) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("Need at least %d bits in mask\n" , +rdt_last_cmd_printf ("Need at least %d bits in the mask\n" , r->cache.min_cbm_bits);return false; }
@@ -135,7 +135,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,u32 cbm_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -145,7 +145,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP &&rdtgroup_pseudo_locked_in_hierarchy (d)) { -rdt_last_cmd_printf ("pseudo-locked region in hierarchy\n" ); +rdt_last_cmd_printf ("Pseudo-locked region in hierarchy\n" );return -EINVAL ; }
@@ -164,14 +164,14 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,* either is exclusive. */ if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, true)) { -rdt_last_cmd_printf ("overlaps with exclusive group\n" ); +rdt_last_cmd_printf ("Overlaps with exclusive group\n" );return -EINVAL ; }if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, false)) {if (rdtgrp->mode ==RDT_MODE_EXCLUSIVE || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { -rdt_last_cmd_printf ("overlaps with other group\n" ); +rdt_last_cmd_printf ("0verlaps with other group\n" );return -EINVAL ; } }
@@ -293,7 +293,7 @@ static int rdtgroup_parse_resource(char *resname, char *tok,if (!strcmp (resname, r->name) && rdtgrp->closid < r->num_closid)return parse_line (tok, r, rdtgrp); } -rdt_last_cmd_printf ("unknown/unsupported resource name '%s'\n" , resname); +rdt_last_cmd_printf ("Unknown or unsupported resource name '%s'\n" , resname);return -EINVAL ; }
@@ -326,7 +326,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret = -EINVAL ; -rdt_last_cmd_puts ("resource group is pseudo-locked\n" ); +rdt_last_cmd_puts ("Resource group is pseudo-locked\n" ); goto out; }
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +17 -17
@@ -213,7 +213,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)for_each_cpu (cpu, &plr->d->cpu_mask) { pm_req =kzalloc (sizeof (*pm_req),GFP_KERNEL );if (!pm_req) { -rdt_last_cmd_puts ("fail allocating mem for PM QoS\n" ); +rdt_last_cmd_puts ("Failure to allocate memory for PM QoS\n" ); ret = -ENOMEM ; goto out_err; }
@@ -222,7 +222,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)DEV_PM_QOS_RESUME_LATENCY , 30);if (ret <0 ) { -rdt_last_cmd_printf ("fail to add latency req cpu%d\n" , +rdt_last_cmd_printf ("Failed to add latency req CPU%d\n" , cpu);kfree (pm_req); ret =-1 ;
@@ -289,7 +289,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) plr->cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (plr->cpu)) { -rdt_last_cmd_printf ("cpu %u associated with cache not online\n" , +rdt_last_cmd_printf ("CPU %u associated with cache not online\n" , plr->cpu); ret = -ENODEV ; goto out_region;
@@ -307,7 +307,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) } ret =-1 ; -rdt_last_cmd_puts ("unable to determine cache line size\n" ); +rdt_last_cmd_puts ("Unable to determine cache line size\n" ); out_region:pseudo_lock_region_clear (plr);return ret;
@@ -361,14 +361,14 @@ static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)* KMALLOC_MAX_SIZE. */ if (plr->size >KMALLOC_MAX_SIZE ) { -rdt_last_cmd_puts ("requested region exceeds maximum size\n" ); +rdt_last_cmd_puts ("Requested region exceeds maximum size\n" ); ret = -E2BIG ; goto out_region; } plr->kmem =kzalloc (plr->size,GFP_KERNEL );if (!plr->kmem) { -rdt_last_cmd_puts ("unable to allocate memory\n" ); +rdt_last_cmd_puts ("Unable to allocate memory\n" ); ret = -ENOMEM ; goto out_region; }
@@ -665,7 +665,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)* default closid associated with it. */ if (rdtgrp == &rdtgroup_default) { -rdt_last_cmd_puts ("cannot pseudo-lock default group\n" ); +rdt_last_cmd_puts ("Cannot pseudo-lock default group\n" );return -EINVAL ; }
@@ -707,17 +707,17 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)*/ prefetch_disable_bits =get_prefetch_disable_bits ();if (prefetch_disable_bits ==0 ) { -rdt_last_cmd_puts ("pseudo-locking not supported\n" ); +rdt_last_cmd_puts ("Pseudo-locking not supported\n" );return -EINVAL ; }if (rdtgroup_monitor_in_progress (rdtgrp)) { -rdt_last_cmd_puts ("monitoring in progress\n" ); +rdt_last_cmd_puts ("Monitoring in progress\n" );return -EINVAL ; }if (rdtgroup_tasks_assigned (rdtgrp)) { -rdt_last_cmd_puts ("tasks assigned to resource group\n" ); +rdt_last_cmd_puts ("Tasks assigned to resource group\n" );return -EINVAL ; }
@@ -727,13 +727,13 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp) }if (rdtgroup_locksetup_user_restrict (rdtgrp)) { -rdt_last_cmd_puts ("unable to modify resctrl permissions\n" ); +rdt_last_cmd_puts ("Unable to modify resctrl permissions\n" );return -EIO ; } ret =pseudo_lock_init (rdtgrp);if (ret) { -rdt_last_cmd_puts ("unable to init pseudo-lock region\n" ); +rdt_last_cmd_puts ("Unable to init pseudo-lock region\n" ); goto out_release; }
@@ -770,7 +770,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" );return ret; } rdtgrp->mon.rmid = ret;
@@ -1304,7 +1304,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) "pseudo_lock/%u", plr->cpu);if (IS_ERR (thread)) { ret =PTR_ERR (thread); -rdt_last_cmd_printf ("locking thread returned error %d\n" , ret); +rdt_last_cmd_printf ("Locking thread returned error %d\n" , ret); goto out_cstates; }
@@ -1322,13 +1322,13 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)* the cleared, but not freed, plr struct resulting in an * empty pseudo-locking loop. */ -rdt_last_cmd_puts ("locking thread interrupted\n" ); +rdt_last_cmd_puts ("Locking thread interrupted\n" ); goto out_cstates; } ret =pseudo_lock_minor_get (&new_minor);if (ret <0 ) { -rdt_last_cmd_puts ("unable to obtain a new minor number\n" ); +rdt_last_cmd_puts ("Unable to obtain a new minor number\n" ); goto out_cstates; }
@@ -1360,7 +1360,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)if (IS_ERR (dev)) { ret =PTR_ERR (dev); -rdt_last_cmd_printf ("failed to create character device: %d\n" , +rdt_last_cmd_printf ("Failed to create character device: %d\n" , ret); goto out_debugfs; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +18 -18
@@ -345,7 +345,7 @@ static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,/* Check whether cpus belong to parent ctrl group */ cpumask_andnot (tmpmask, newmask, &prgrp->cpu_mask);if (cpumask_weight (tmpmask)) { -rdt_last_cmd_puts ("can only add CPUs to mongroup that belong to parent\n" ); +rdt_last_cmd_puts ("Can only add CPUs to mongroup that belong to parent\n" );return -EINVAL ; }
@@ -470,14 +470,14 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,rdt_last_cmd_clear ();if (!rdtgrp) { ret = -ENOENT ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto unlock; }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -487,7 +487,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, ret =cpumask_parse (buf, newmask);if (ret) { -rdt_last_cmd_puts ("bad cpu list/mask\n" ); +rdt_last_cmd_puts ("Bad CPU list/mask\n" ); goto unlock; }
@@ -495,7 +495,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,cpumask_andnot (tmpmask, newmask, cpu_online_mask);if (cpumask_weight (tmpmask)) { ret = -EINVAL ; -rdt_last_cmd_puts ("can only assign online cpus\n" ); +rdt_last_cmd_puts ("Can only assign online CPUs\n" ); goto unlock; }
@@ -574,7 +574,7 @@ static int __rdtgroup_move_task(struct task_struct *tsk,*/ atomic_dec (&rdtgrp->waitcount);kfree (callback); -rdt_last_cmd_puts ("task exited\n" ); +rdt_last_cmd_puts ("Task exited\n" ); }else {/* * For ctrl_mon groups move both closid and rmid.
@@ -692,7 +692,7 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -1158,14 +1158,14 @@ static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)list_for_each_entry (d, &r->domains, list) {if (rdtgroup_cbm_overlaps (r, d, d->ctrl_val[closid], rdtgrp->closid, false)) { -rdt_last_cmd_puts ("schemata overlaps\n" ); +rdt_last_cmd_puts ("Schemata overlaps\n" );return false; } } }if (!has_cache) { -rdt_last_cmd_puts ("cannot be exclusive without CAT/CDP\n" ); +rdt_last_cmd_puts ("Cannot be exclusive without CAT/CDP\n" );return false; }
@@ -1206,7 +1206,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out;if (mode ==RDT_MODE_PSEUDO_LOCKED ) { -rdt_last_cmd_printf ("cannot change pseudo-locked group\n" ); +rdt_last_cmd_printf ("Cannot change pseudo-locked group\n" ); ret = -EINVAL ; goto out; }
@@ -1235,7 +1235,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out; rdtgrp->mode =RDT_MODE_PSEUDO_LOCKSETUP ; }else { -rdt_last_cmd_printf ("unknown/unsupported mode\n" ); +rdt_last_cmd_printf ("Unknown orunsupported mode\n" ); ret = -EINVAL ; }
@@ -2540,7 +2540,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) tmp_cbm = d->new_ctrl;if (bitmap_weight (&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("no space on %s:%d\n" , +rdt_last_cmd_printf ("No space on %s:%d\n" , r->name, d->id);return -ENOSPC ; }
@@ -2557,7 +2557,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)continue ; ret =update_domains (r, rdtgrp->closid);if (ret <0 ) { -rdt_last_cmd_puts ("failed to initialize allocations\n" ); +rdt_last_cmd_puts ("Failed to initialize allocations\n" );return ret; } rdtgrp->mode =RDT_MODE_SHAREABLE ;
@@ -2580,7 +2580,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,rdt_last_cmd_clear ();if (!prdtgrp) { ret = -ENODEV ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto out_unlock; }
@@ -2588,7 +2588,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, (prdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || prdtgrp->mode == RDT_MODE_PSEUDO_LOCKED)) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto out_unlock; }
@@ -2596,7 +2596,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, rdtgrp =kzalloc (sizeof (*rdtgrp),GFP_KERNEL );if (!rdtgrp) { ret = -ENOSPC ; -rdt_last_cmd_puts ("kernel out of memory\n" ); +rdt_last_cmd_puts ("Kernel out of memory\n" ); goto out_unlock; } *r = rdtgrp;
@@ -2637,7 +2637,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" ); goto out_destroy; } rdtgrp->mon.rmid = ret;
@@ -2725,7 +2725,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, kn = rdtgrp->kn; ret =closid_alloc ();if (ret <0 ) { -rdt_last_cmd_puts ("out of CLOSIDs\n" ); +rdt_last_cmd_puts ("Out of CLOSIDs\n" ); goto out_common_fail; } closid = ret;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 63/352 media: vivid: fill in media_device bus_info
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e10b40f3304360d3a2d07d690ff12197f828f2c8 ]
If you create multiple vivid instances, each with their own media device, then there was no way to tell them apart.
Fill in the bus_info so each instance has a unique bus_info string.
--- drivers/media/platform/vivid/vivid-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/vivid/vivid-core.c +2 -0
@@ -669,6 +669,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)/* Initialize media device */ strlcpy (dev->mdev.model,VIVID_MODULE_NAME ,sizeof (dev->mdev.model)); +snprintf (dev->mdev.bus_info,sizeof (dev->mdev.bus_info), +"platform:%s-%03d" ,VIVID_MODULE_NAME , inst); dev->mdev.dev = &pdev->dev;media_device_init (&dev->mdev); dev->mdev.ops = &vivid_media_ops;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 64/352 RDMA/core: Sync unregistration with netlink commands
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 01b671170d7f82b959dad6d5dbb44d7a915e647d ]
When the rdma device is getting removed, get resource info can race with device removal, as below:
CPU-0 CPU-1
-------- --------
rdma_nl_rcv_msg()
nldev_res_get_cq_dumpit()
mutex_lock(device_lock);
get device reference
mutex_unlock(device_lock); [..]
ib_unregister_device()
/* Valid reference to
* device->dev exists.
*/
ib_dealloc_device()
[..]
provider->fill_res_entry();Even though device object is not freed, fill_res_entry() can get called on device which doesn't have a driver anymore. Kernel core device reference count is not sufficient, as this only keeps the structure valid, and doesn't guarantee the driver is still loaded.
Similar race can occur with device renaming and device removal, where device_rename() tries to rename a unregistered device. While this is fine for devices of a class which are not net namespace aware, but it is incorrect for net namespace aware class coming in subsequent series. If a class is net namespace aware, then the below [1] call trace is observed in above situation.
Therefore, to avoid the race, keep a reference count and let device unregistration wait until all netlink users drop the reference.
[1] Call trace:
kernfs: ns required in 'infiniband' for 'mlx5_0'
WARNING: CPU: 18 PID: 44270 at fs/kernfs/dir.c:842 kernfs_find_ns+0x104/0x120 libahci i2c_core mlxfw libata dca [last unloaded: devlink] RIP: 0010:kernfs_find_ns+0x104/0x120 Call Trace: kernfs_find_and_get_ns+0x2e/0x50 sysfs_rename_link_ns+0x40/0xb0 device_rename+0xb2/0xf0 ib_device_rename+0xb3/0x100 [ib_core] nldev_set_doit+0x165/0x190 [ib_core] rdma_nl_rcv_msg+0x249/0x250 [ib_core] ? netlink_deliver_tap+0x8f/0x3e0 rdma_nl_rcv+0xd6/0x120 [ib_core] netlink_unicast+0x17c/0x230 netlink_sendmsg+0x2f0/0x3e0 sock_sendmsg+0x30/0x40 __sys_sendto+0xdc/0x160
--- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 26 ++++++++++++++++++++++---- drivers/infiniband/core/nldev.c | 20 ++++++++++---------- include/rdma/ib_verbs.h | 8 +++++++- 4 files changed, 40 insertions(+), 15 deletions(-)
drivers/infiniband/core/core_priv.h +1 -0
@@ -296,6 +296,7 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map,#endif struct ib_device *ib_device_get_by_index (u32 ifindex); +void ib_device_put (struct ib_device *device);/* RDMA device netlink */ void nldev_init (void );void nldev_exit (void );
drivers/infiniband/core/device.c +22 -4
@@ -145,7 +145,8 @@ static struct ib_device *__ib_device_get_by_index(u32 index) }/* -* Caller is responsible to return refrerence count by calling put_device() +* Caller must perform ib_device_put() to return the device reference count +* when ib_device_get_by_index() returns valid device pointer. */ struct ib_device *ib_device_get_by_index (u32 index) {
@@ -153,13 +154,21 @@ struct ib_device *ib_device_get_by_index(u32 index)down_read (&lists_rwsem); device =__ib_device_get_by_index (index); -if (device) -get_device (&device->dev); - +if (device) { +/* Do not return a device if unregistration has started. */ +if (!refcount_inc_not_zero (&device->refcount)) + device =NULL ; + }up_read (&lists_rwsem);return device; } +void ib_device_put (struct ib_device *device) +{ +if (refcount_dec_and_test (&device->refcount)) +complete (&device->unreg_completion); +} +static struct ib_device *__ib_device_get_by_name (const char *name) {struct ib_device *device;
@@ -293,6 +302,8 @@ struct ib_device *ib_alloc_device(size_t size)rwlock_init (&device->client_data_lock);INIT_LIST_HEAD (&device->client_data_list);INIT_LIST_HEAD (&device->port_list); +refcount_set (&device->refcount,1 ); +init_completion (&device->unreg_completion);return device; }
@@ -641,6 +652,13 @@ void ib_unregister_device(struct ib_device *device)struct ib_client_data *context, *tmp;unsigned long flags; +/* +* Wait for all netlink command callers to finish working on the +* device. +*/ +ib_device_put (device); +wait_for_completion (&device->unreg_completion); +mutex_lock (&device_mutex);down_write (&lists_rwsem);
drivers/infiniband/core/nldev.c +10 -10
@@ -632,13 +632,13 @@ static int nldev_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -668,7 +668,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh, err =ib_device_rename (device, name); } -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -752,14 +752,14 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, goto err_free;nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -816,7 +816,7 @@ static int nldev_port_get_dumpit(struct sk_buff *skb, } out: -put_device (&device->dev); +ib_device_put (device); cb->args[0 ] = idx;return skb->len; }
@@ -855,13 +855,13 @@ static int nldev_res_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, goto err_free;nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return ret; }
@@ -1054,7 +1054,7 @@ next: idx++;if (!filled) goto err; -put_device (&device->dev); +ib_device_put (device);return skb->len; res_err:
@@ -1065,7 +1065,7 @@ err:nlmsg_cancel (skb, nlh); err_index: -put_device (&device->dev); +ib_device_put (device);return ret; }
include/rdma/ib_verbs.h +7 -1
@@ -56,7 +56,7 @@#include <linux/string.h> #include <linux/slab.h> #include <linux/netdevice.h> - +#include <linux/refcount.h> #include <linux/if_link.h> #include <linux/atomic.h> #include <linux/mmu_notifier.h>
@@ -2605,6 +2605,12 @@ struct ib_device {const struct uverbs_object_tree_def *const *driver_specs;enum rdma_driver_id driver_id; +/* +* Provides synchronization between device unregistration and netlink +* commands on a device. To be used only by core. +*/ +refcount_t refcount; +struct completion unreg_completion; };struct ib_client {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 65/352 drm: rcar-du: Fix external clock error checks
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 63a298f22a6183b5b7536a203596c6570dfcfe8e ]
The rcar-du driver supports probe deferral for external clocks, but implements it badly by checking the wrong pointer due to a bad copy and paste. Fix it.
While at it, reject invalid clocks outright for DU channels that have a display PLL, as the external clock is mandatory in that case. This avoids a WARN_ON() at runtime.
--- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_crtc.c +9 -5
@@ -226,9 +226,6 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)* system clock, and have no internal clock divider. */ -if (WARN_ON (!rcrtc->extclock)) -return ; -/* * The H3 ES1.x exhibits dot clock duty cycle stability issues. * We can work around them by configuring the DPLL to twice the
@@ -1113,9 +1110,16 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, clk =devm_clk_get (rcdu->dev, clk_name);if (!IS_ERR (clk)) { rcrtc->extclock = clk; - }else if (PTR_ERR (rcrtc->clock) == -EPROBE_DEFER ) { -dev_info (rcdu->dev,"can't get external clock %u\n" , hwindex); + }else if (PTR_ERR (clk) == -EPROBE_DEFER ) {return -EPROBE_DEFER ; + }else if (rcdu->info->dpll_mask &BIT (hwindex)) { +/* +* DU channels that have a display PLL can't use the internal +* system clock and thus require an external clock. +*/ + ret =PTR_ERR (clk); +dev_err (rcdu->dev,"can't get dclkin.%u: %d\n" , hwindex, ret); +return ret; }init_waitqueue_head (&rcrtc->flip_wait);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 66/352 ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca0412a05756cd0b94751ca4d54fe6522f00b1f4 ]
On the Allwinner A64 SoCs, the audio codec has a built-in headphone amplifier. This amplifier has a power supply separate from the rest of the analog audio circuitry, labeled cpvdd.
This patch adds a DAPM widget for this supply, and ties it to the headphone amp widget.
--- sound/soc/sunxi/sun50i-codec-analog.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/sunxi/sun50i-codec-analog.c +2 -0
@@ -274,6 +274,7 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {* stream widgets at the card level. */ +SND_SOC_DAPM_REGULATOR_SUPPLY ("hpvcc" ,0 ,0 ),SND_SOC_DAPM_MUX ("Headphone Source Playback Route" ,SND_SOC_NOPM ,0 ,0 , sun50i_codec_hp_src), SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN50I_ADDA_HP_CTRL,
@@ -361,6 +362,7 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = { { "Headphone Source Playback Route", "Mixer", "Left Mixer" }, { "Headphone Source Playback Route", "Mixer", "Right Mixer" }, { "Headphone Amp", NULL, "Headphone Source Playback Route" }, + { "Headphone Amp", NULL, "hpvcc" }, { "HP", NULL, "Headphone Amp" }, /* Microphone Routes */
Signature · 1 line
2.19.1
Mark Brown
maintainerRe: [PATCH 4.20 066/352] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
Quoted 6 lines · Greg Kroah-Hartman
On the Allwinner A64 SoCs, the audio codec has a built-in headphone amplifier. This amplifier has a power supply separate from the rest of the analog audio circuitry, labeled cpvdd.
This patch adds a DAPM widget for this supply, and ties it to the headphone amp widget.
This is more a new feature than a bug fix, it doesn't look like obvious stable material.
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 066/352] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
Quoted 11 lines · Mark Brown
Quoted 6 lines · Greg Kroah-Hartman
On the Allwinner A64 SoCs, the audio codec has a built-in headphone amplifier. This amplifier has a power supply separate from the rest of the analog audio circuitry, labeled cpvdd.
This patch adds a DAPM widget for this supply, and ties it to the headphone amp widget.
This is more a new feature than a bug fix, it doesn't look like obvious stable material.
Normally we take "new quirks and device ids", and given that this is a tiny 2 line patch, that seems to fit that requirement.
If not, I'll be glad to drop it, it's your call.
thanks,
greg k-h
Mark Brown
maintainerRe: [PATCH 4.20 066/352] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
Quoted 7 lines · Greg Kroah-Hartman
Quoted 2 lines · Mark Brown
This is more a new feature than a bug fix, it doesn't look like obvious stable material.
Normally we take "new quirks and device ids", and given that this is a tiny 2 line patch, that seems to fit that requirement.
It's definitely not a quirk, it's changing from completely ignoring a supply to actively managing it at runtime which if it has any effect on existing systems is more likely to break something than fix it. It's not like the fixes for build problems which can't be triggered in old kernels, it'll start us things we never used to do.
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 066/352] ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
Quoted 6 lines · Mark Brown
Quoted 4 lines · Greg Kroah-Hartman
Quoted 2 lines · Mark Brown
This is more a new feature than a bug fix, it doesn't look like obvious stable material.
Quoted 8 lines
Quoted 2 lines
Normally we take "new quirks and device ids", and given that this is a tiny 2 line patch, that seems to fit that requirement.
It's definitely not a quirk, it's changing from completely ignoring a supply to actively managing it at runtime which if it has any effect on existing systems is more likely to break something than fix it. It's not like the fixes for build problems which can't be triggered in old kernels, it'll start us things we never used to do.
Ok, that's fair enough, now dropped.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 67/352 clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a5ac1ead32c9aac285f6436e09b4f6111996e9b8 ]
The cpu_div3 clock (cpu_in divided by 3) generates a signal with a duty cycle of 33%. The CPU clock however requires a clock signal with a duty cycle of 50% to run stable.cpu_div3 was observed to be problematic when cycling through all available CPU frequencies (with additional patches on top of this one) while running "stress --cpu 4" in the background. This caused sporadic hangs where the whole system would fully lock up.
Amlogic's 3.10 kernel code also does not use the cpu_div3 clock either when changing the CPU clock.
--- drivers/clk/meson/meson8b.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/clk/meson/meson8b.c +9 -2
@@ -612,20 +612,27 @@ static struct clk_regmap meson8b_cpu_scale_div = { }, }; +static u32 mux_table_cpu_scale_out_sel[] = {0 ,1 ,3 };static struct clk_regmap meson8b_cpu_scale_out_sel = { .data = &(struct clk_regmap_mux_data ){ .offset =HHI_SYS_CPU_CLK_CNTL0 , .mask =0x3 , .shift =2 , + .table = mux_table_cpu_scale_out_sel, }, .hw.init = &(struct clk_init_data ){ .name ="cpu_scale_out_sel" , .ops = &clk_regmap_mux_ro_ops, +/* +* NOTE: We are skipping the parent with value 0x2 (which is +* "cpu_div3") because it results in a duty cycle of 33% which +* makes the system unstable and can result in a lockup of the +* whole system. +*/ .parent_names = (const char *[]) {"cpu_in_sel" ,"cpu_div2" , -"cpu_div3" ,"cpu_scale_div" }, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , }, };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 68/352 clk: meson: meson8b: fix the width of the cpu_scale_div clock
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a8662eadd1032018f31e37deda811790b2326662 ]
According to the public S805 datasheet HHI_SYS_CPU_CLK_CNTL1[29:20] is the register for the CPU scale_div clock. This matches the code in Amlogic's 3.10 GPL kernel sources:
N = (aml_read_reg32(P_HHI_SYS_CPU_CLK_CNTL1) >> 20) & 0x3FF;
This means that the divider register is 10 bit wide instead of 9 bits. So far this is not a problem since all u-boot versions I have seen are not using the cpu_scale_div clock at all (instead they are configuring the CPU clock to run off cpu_in_sel directly).
The fixes tag points to the latest rework of the CPU clocks. However, even before the rework it was wrong. Commit 7a29a869434e8b ("clk: meson:
Add support for Meson clock controller") defines MESON_N_WIDTH as 9 (in drivers/clk/meson/clk-cpu.c). But since the old clk-cpu implementation this only carries the fixes tag for the CPU clock rewordk.
--- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +1 -1
@@ -599,7 +599,7 @@ static struct clk_regmap meson8b_cpu_scale_div = { .data = &(struct clk_regmap_div_data){ .offset =HHI_SYS_CPU_CLK_CNTL1 , .shift =20 , - .width =9 , + .width =10 , .table = cpu_scale_table, .flags =CLK_DIVIDER_ALLOW_ZERO , },
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 69/352 clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0dad1ec65bc30a549aba38d34a727309bbf41bc8 ]
We don't want the common clock framework to disable the "cpu_clk" if it's not used by any device. The cpufreq-dt driver does not enable the CPU clocks. However, even if it would we would still want the CPU clock to be enabled at all times because the CPU clock is also required even if we disable CPU frequency scaling on a specific board.
The reason why we want the CPU clock to be enabled is a clock further up in the tree:
Since commit 6f888e7bc7bd58 ("clk: meson: clk-pll: add enable bit") the sys_pll can be disabled. However, since the CPU clock is derived from sys_pll we don't want sys_pll to get disabled. The common clock framework takes care of that for us by enabling all parent clocks of our CPU clock when we mark the CPU clock with CLK_IS_CRITICAL.
Until now this is not a problem yet because all clocks in the CPU clock's tree (including sys_pll) are read-only. However, once we allow modifications to the clocks in that tree we will need this.
--- drivers/clk/meson/meson8b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +2 -1
@@ -650,7 +650,8 @@ static struct clk_regmap meson8b_cpu_clk = { "cpu_scale_out_sel" }, .num_parents = 2, .flags = (CLK_SET_RATE_PARENT | - CLK_SET_RATE_NO_REPARENT), +CLK_SET_RATE_NO_REPARENT | + CLK_IS_CRITICAL), }, };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 70/352 ptp: Fix pass zero to ERR_PTR() in ptp_clock_register
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aea0a897af9e44c258e8ab9296fad417f1bc063a ]
Fix smatch warning:
drivers/ptp/ptp_clock.c:298 ptp_clock_register() warn:
passing zero to 'ERR_PTR'
'err' should be set while device_create_with_groups and pps_register_source fails
--- drivers/ptp/ptp_clock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +4 -1
@@ -249,8 +249,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, ptp->dev =device_create_with_groups (ptp_class, parent, ptp->devid, ptp, ptp->pin_attr_groups,"ptp%d" , ptp->index); -if (IS_ERR (ptp->dev)) +if (IS_ERR (ptp->dev)) { + err =PTR_ERR (ptp->dev); goto no_device; + }/* Register a new PPS source. */ if (info->pps) {
@@ -261,6 +263,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, pps.owner = info->owner; ptp->pps_source =pps_register_source (&pps,PTP_PPS_DEFAULTS );if (!ptp->pps_source) { + err = -EINVAL ;pr_err ("failed to register pps source\n" ); goto no_pps; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 71/352 dmaengine: xilinx_dma: Remove __aligned attribute on zynqmp_dma_desc_ll
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aeaebcc17cdf37065d2693865eeb1ff1c7dc5bf3 ]
Clang warns:
drivers/dma/xilinx/zynqmp_dma.c:166:4: warning: attribute 'aligned' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]
}; __aligned(64)
^./include/linux/compiler_types.h:200:38: note: expanded from macro '__aligned'
^
1 warning generated.
As Nick pointed out in the previous version of this patch, the author likely intended for this struct to be 8-byte (64-bit) aligned, not 64-byte, which is the default. Remove the hanging __aligned attribute.
--- drivers/dma/xilinx/zynqmp_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/xilinx/zynqmp_dma.c +1 -1
@@ -163,7 +163,7 @@ struct zynqmp_dma_desc_ll {u32 ctrl;u64 nxtdscraddr;u64 rsvd; -};__aligned(64) +};/** * struct zynqmp_dma_desc_sw - Per Transaction structure
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 72/352 powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit beba24ac59133cb36ecd03f9af9ccb11971ee20e ]
When both CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y and CONFIG_UBSAN=y are set, link step typically produce numberous warnings about orphan section:
+ powerpc-linux-gnu-ld -EB -m elf32ppc -Bstatic --orphan-handling=warn --build-id --gc-sections -X -o .tmp_vmlinux1 -T ./arch/powerpc/kernel/vmlinux.lds --who le-archive built-in.a --no-whole-archive --start-group lib/lib.a --end-group
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data393' from init/main.o' being placed in section `.data..Lubsan_data393'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data394' from init/main.o' being placed in section `.data..Lubsan_data394'.
...
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type11' from init/main.o' being placed in section `.data..Lubsan_type11'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type12' from init/main.o' being placed in section `.data..Lubsan_type12'.
...
This commit remove those warnings produced at W=1.
--- arch/powerpc/kernel/vmlinux.lds.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/vmlinux.lds.S +4 -0
@@ -308,6 +308,10 @@ SECTIONS #ifdef CONFIG_PPC32 .data : AT(ADDR(.data) - LOAD_OFFSET) { DATA_DATA +#ifdef CONFIG_UBSAN + *(.data..Lubsan_data*) + *(.data..Lubsan_type*) +#endif *(.data.rel*) *(SDATA_MAIN) *(.sdata2)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 73/352 iio: adc: meson-saradc: check for devm_kasprintf failure
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aad172b017617994343e36d8659c69e14cd694fd ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_sar_adc_clk_init() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/iio/adc/meson_saradc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/adc/meson_saradc.c +6 -0
@@ -589,6 +589,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =0 ; init.ops = &clk_divider_ops; clk_parents[0 ] =__clk_get_name (priv->clkin);
@@ -608,6 +611,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =CLK_SET_RATE_PARENT ; init.ops = &clk_gate_ops; clk_parents[0 ] =__clk_get_name (priv->adc_div_clk);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 74/352 iio: adc: meson-saradc: fix internal clock names
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ]
Before this patch we are registering the internal clocks (for example on Meson8b, where the SAR ADC IP block implements the divider and gate clocks) with the following names:
- /soc/cbus@c1100000/adc@8680#adc_div
- /soc/cbus@c1100000/adc@8680#adc_en
This is bad because the common clock framework uses the clock to create a directory in <debugfs>/clk. With such name, the directory creation (silently) fails and the debugfs entry ends up being created at the debugfs root.
With this change, the new clock names are:
- c1108680.adc#adc_div
- c1108680.adc#adc_en
This matches the clock naming scheme used in the PWM, Ethernet and MMC drivers. It also fixes the problem with debugfs.
The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson:
Fix mux clock names").
--- drivers/iio/adc/meson_saradc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/meson_saradc.c +4 -4
@@ -587,8 +587,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,struct clk_init_data init;const char *clk_parents[1 ]; - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_div" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
@@ -609,8 +609,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,if (WARN_ON (IS_ERR (priv->adc_div_clk)))return PTR_ERR (priv->adc_div_clk); - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_en" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 75/352 iio: accel: kxcjk1013: Add KIOX010A ACPI Hardware-ID
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 7f6232e69539971cf9eaed07a6c14ab4a2361133 ]
Various 2-in-1's use KIOX010A and KIOX020A as HIDs for 2 KXCJ91008 accelerometers. The KIOX010A HID is for the one in the base and the KIOX020A for the accelerometer in the keyboard.
Since userspace does not have a way yet to deal with (or ignore) the accelerometer in the keyboard, this commit just adds the KIOX010A HID for now so that display rotation will work.
Related: https://github.com/hadess/iio-sensor-proxy/issues/166
--- drivers/iio/accel/kxcjk-1013.c | 1 + 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
@@ -1490,6 +1490,7 @@ static const struct acpi_device_id kx_acpi_match[] = { {"KXCJ1008", KXCJ91008}, {"KXCJ9000", KXCJ91008}, {"KIOX000A", KXCJ91008}, + {"KIOX010A", KXCJ91008}, /* KXCJ91008 inside the display of a 2-in-1 */ {"KXTJ1009", KXTJ21009}, {"SMO8500", KXCJ91008}, { },
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 76/352 media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ]
The v4l2_dv_timings_cap struct is used to do sanity checks when setting and enumerating DV timings, ensuring that only valid timings as per the HW capabilities are allowed.
However, many drivers just filled in 0 for the minimum width, height or pixelclock frequency. This can cause timings with e.g. 0 as width and height to be accepted, which will in turn lead to a potential division by zero.
Fill in proper values are minimum boundaries. 640x350 was chosen since it is the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the v4l2-dv-timings.h header).
--- drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 ++-- drivers/media/i2c/adv7842.c | 4 ++-- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
drivers/media/i2c/ad9389b.c +1 -1
@@ -578,7 +578,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7511.c +1 -1
@@ -130,7 +130,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, + V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT, ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
drivers/media/i2c/adv7604.c +2 -2
@@ -766,7 +766,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -777,7 +777,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7842.c +2 -2
@@ -663,7 +663,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -674,7 +674,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/tc358743.c +1 -1
@@ -59,7 +59,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = {/* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 },/* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */ - V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE |
drivers/media/i2c/ths8200.c +1 -1
@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, -V4L2_INIT_BT_TIMINGS (0 ,1920 ,0 ,1080 ,25000000 ,148500000 , +V4L2_INIT_BT_TIMINGS (640 ,1920 ,350 ,1080 ,25000000 ,148500000 , V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 77/352 ACPI: SPCR: Consider baud rate 0 as preconfigured state
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b413b1abeb21b4a152c0bf8d1379efa30759b6e3 ]
Since SPCR 1.04 [1] the baud rate of 0 means a preconfigured state of UART. Assume firmware or bootloader configures console correctly.
--- drivers/acpi/spcr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/spcr.c +11 -0
@@ -148,6 +148,13 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) }switch (table->baud_rate) { +case 0 : +/* +* SPCR 1.04 defines 0 as a preconfigured state of UART. +* Assume firmware or bootloader configures console correctly. +*/ + baud_rate =0 ; +break ;case 3 : baud_rate =9600 ;break ;
@@ -196,6 +203,10 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)* UART so don't attempt to change to the baud rate state * in the table because driver cannot calculate the dividers */ + baud_rate =0 ; + } + +if (!baud_rate) {snprintf (opts,sizeof (opts),"%s,%s,0x%llx" , uart, iotype, table->serial_port.address); }else {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 78/352 staging: pi433: fix potential null dereference
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 64c4c4ca6c129a4191e8e1e91b2d5d9b8d08c518 ]
Add a test for successful call to cdev_alloc() to avoid potential null dereference. Issue reported by smatch.
--- drivers/staging/pi433/pi433_if.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/pi433/pi433_if.c +4 -0
@@ -1255,6 +1255,10 @@ static int pi433_probe(struct spi_device *spi)/* create cdev */ device->cdev =cdev_alloc (); +if (!device->cdev) { +dev_dbg (device->dev,"allocation of cdev failed" ); + goto cdev_failed; + } device->cdev->owner =THIS_MODULE ;cdev_init (device->cdev, &pi433_fops); retval =cdev_add (device->cdev, device->devt,1 );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 79/352 f2fs: avoid GC causing encrypted file corrupted
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9bf1a3f73927492c8be127b642197125e9d52be8 ]
The encrypted file may be corrupted by GC in following case:
Time 1: | segment 1 blkaddr = A | GC -> | segment 2 blkaddr = B | Encrypted block 1 is moved from blkaddr A of segment 1 to blkaddr B of segment 2,
Time 2: | segment 1 blkaddr = B | GC -> | segment 3 blkaddr = C |
Before page 1 is written back and if segment 2 become a victim, then page 1 is moved from blkaddr B of segment 2 to blkaddr Cof segment 3, during the GC process of Time 2, f2fs should wait for page 1 written back before reading it, or move_data_block will read a garbage block from blkaddr B since page is not written back to blkaddr B yet.
Commit 6aa58d8a ("f2fs: readahead encrypted block during GC") introduce ra_data_block to read encrypted block, but it forgets to add f2fs_wait_on_page_writeback to avoid racing between GC and flush.
--- fs/f2fs/gc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/f2fs/gc.c +10 -0
@@ -658,6 +658,14 @@ got_it: fio.page = page; fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr; +/* +* don't cache encrypted data into meta inode until previous dirty +* data were writebacked to avoid racing between GC and flush. +*/ +f2fs_wait_on_page_writeback (page,DATA , true); + +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); + fio.encrypted_page =f2fs_pagecache_get_page (META_MAPPING (sbi), dn.data_blkaddr,FGP_LOCK |FGP_CREAT ,GFP_NOFS );
@@ -745,6 +753,8 @@ static int move_data_block(struct inode *inode, block_t bidx,*/ f2fs_wait_on_page_writeback (page,DATA , true); +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); + err =f2fs_get_node_info (fio.sbi, dn.nid, &ni);if (err) goto put_out;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 80/352 f2fs: move dir data flush to write checkpoint process
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ]
This patch move dir data flush to write checkpoint process, by doing this, it may reduce some time for dir fsync.
pre:
-f2fs_do_sync_file enter
-file_write_and_wait_range <- flush & wait -write_checkpoint
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
now:
-f2fs_do_sync_file enter
-write_checkpoint
-block_operations <- flush dir & no wait
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
--- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/file.c +3 -0
@@ -216,6 +216,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,trace_f2fs_sync_file_enter (inode); +if (S_ISDIR (inode->i_mode)) + goto go_write; +/* if fdatasync is triggered, let's do in-place-update */ if (datasync ||get_dirty_pages (inode) <=SM_I (sbi)->min_fsync_blocks)set_inode_flag (inode,FI_NEED_IPU );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 81/352 f2fs: avoid build warn of fall_through
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
In file included from fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (set)
^ fs/f2fs/f2fs.h:2390:2: note: here
case FI_DATA_EXIST:
^~~~
Exposed by my use of -Wimplicit-fallthrough
--- fs/f2fs/f2fs.h | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/f2fs.h +1 -0
@@ -2370,6 +2370,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,case FI_NEW_INODE :if (set)return ; +/* fall through */ case FI_DATA_EXIST :case FI_INLINE_DOTS :case FI_PIN_FILE :
Signature · 1 line
2.19.1
Re: [PATCH 4.20 081/352] f2fs: avoid build warn of fall_through
Hi Greg,
Quoted 13 lines · On Mon, 11 Feb 2019 15:15:08 +0100 Greg Kroah-Hartman…
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit
f5d5510e7389fa264337fb524346bac9eb93adc8]After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:In file included from
fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Quoted 7 lines
if (set) ^ fs/f2fs/f2fs.h:2390:2: note: here case FI_DATA_EXIST: ^~~~Exposed by my use of -Wimplicit-fallthrough
Does the 4.20 stable tree use -Wimplicit-fallthrough? I assume not (since v4.20 doesn't), so this warning does not happen in that tree.
Signature · 2 lines
Cheers, Stephen Rothwell
Re: [PATCH 4.20 081/352] f2fs: avoid build warn of fall_through
Hi all,
Quoted 3 lines · On Tue, 12 Feb 2019 07:18:58 +1100 Stephen Rothwell <[email protected]>…
Does the 4.20 stable tree use -Wimplicit-fallthrough? I assume not (since v4.20 doesn't), so this warning does not happen in that tree.
Ditto for 4.19, 4.14 and 4.9.
Signature · 2 lines
Cheers, Stephen Rothwell
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 081/352] f2fs: avoid build warn of fall_through
Quoted 8 lines · Stephen Rothwell
Hi all,
Quoted 3 lines · On Tue, 12 Feb 2019 07:18:58 +1100 Stephen Rothwell <[email protected]>…
Does the 4.20 stable tree use -Wimplicit-fallthrough? I assume not (since v4.20 doesn't), so this warning does not happen in that tree.
Ditto for 4.19, 4.14 and 4.9.
You are right, I thought this was needed for a later patch in the series, but it wasn't, so I'll go drop it from all trees now, thanks.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 82/352 f2fs: fix race between write_checkpoint and write_begin
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ]
The following race could lead to inconsistent SIT bitmap:
Task A Task B
====== ======f2fs_write_checkpoint
block_operations
f2fs_lock_all
down_write(node_change)
down_write(node_write)
... sync ...
up_write(node_change)
f2fs_file_write_iter
set_inode_flag(FI_NO_PREALLOC)
......
f2fs_write_begin(index=0, has inline data)
prepare_write_begin
__do_map_lock(AIO) => down_read(node_change)
f2fs_convert_inline_page => update SIT
__do_map_lock(AIO) => up_read(node_change) f2fs_flush_sit_entries <= inconsistent SIT finish write checkpoint sudden-power-off
If SPO occurs after checkpoint is finished, SIT bitmap will be set incorrectly.
--- fs/f2fs/data.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +10 -2
@@ -2326,6 +2326,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,bool locked = false;struct extent_info ei = {0 ,0 ,0 };int err =0 ; +int flag;/* * we already allocated all the blocks, so we don't need to get
@@ -2335,9 +2336,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, !is_inode_flag_set(inode, FI_NO_PREALLOC))return 0 ; +/* f2fs_lock_op avoids race between write CP and convert_inline_page */ +if (f2fs_has_inline_data (inode) && pos + len >MAX_INLINE_DATA (inode)) + flag =F2FS_GET_BLOCK_DEFAULT ; +else + flag =F2FS_GET_BLOCK_PRE_AIO ; +if (f2fs_has_inline_data (inode) || (pos &PAGE_MASK ) >=i_size_read (inode)) { -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +__do_map_lock (sbi, flag, true); locked = true; } restart:
@@ -2375,6 +2382,7 @@ restart:f2fs_put_dnode (&dn);__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +WARN_ON (flag !=F2FS_GET_BLOCK_PRE_AIO ); locked = true; goto restart; }
@@ -2388,7 +2396,7 @@ out:f2fs_put_dnode (&dn); unlock_out:if (locked) -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +__do_map_lock (sbi, flag, false);return err; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 83/352 f2fs: fix wrong return value of f2fs_acl_create
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() should return -EIO instead of -ENOMEM, this patch makes it consistent with posix_acl_create() which has been fixed in commit beaf226b863a ("posix_acl: don't ignore return value of posix_acl_create_masq()").
--- fs/f2fs/acl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/acl.c +8 -6
@@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return PTR_ERR (p); clone =f2fs_acl_clone (p,GFP_NOFS ); -if (!clone) - goto no_mem; +if (!clone) { + ret = -ENOMEM ; + goto release_acl; + } ret =f2fs_acl_create_masq (clone, mode);if (ret <0 ) - goto no_mem_clone; + goto release_clone;if (ret ==0 )posix_acl_release (clone);
@@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return 0 ; -no_mem_clone: +release_clone:posix_acl_release (clone); -no_mem: +release_acl:posix_acl_release (p); -return -ENOMEM ; +return ret; } int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 84/352 i2c: sh_mobile: add support for r8a77990 (R-Car E3)
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ]
Add support for the IIC code for the r8a77990 (R-Car E3).
It is not considered compatible with existing fallback bindings due to the documented absence of automatic transmission registers.
These registers are currently not used by the driver and thus the provides the same behaviour for "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic". The point of declaring incompatibility is to allow for automatic transmission register support to be added to "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -808,6 +808,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {},
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 85/352 arm64: io: Ensure calls to delay routines are ordered against prior readX()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ]
A relatively standard idiom for ensuring that a pair of MMIO writes to a device arrive at that device with a specified minimum delay between them is as follows:
writel_relaxed(42, dev_base + CTL1); readl(dev_base + CTL1); udelay(10); writel_relaxed(42, dev_base + CTL2);
the intention being that the read-back from the device will push the prior write to CTL1, and the udelay will hold up the write to CTL1 until at least 10us have elapsed.
Unfortunately, on arm64 where the underlying delay loop is implemented as a read of the architected counter, the CPU does not guarantee ordering from the readl() to the delay loop and therefore the delay loop could in theory be speculated and not provide the desired interval between the two writes.
Fix this in a similar manner to PowerPC by introducing a dummy control dependency on the output of readX() which, combined with the ISB in the read of the architected counter, guarantees that a subsequent delay loop can not be executed until the readX() has returned its result.
--- arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/arm64/include/asm/io.h +23 -8
@@ -104,7 +104,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb () rmb() +#define __iormb (v) \ +({ \ + unsigned long tmp; \ + \ + rmb(); \ + \ +/* \ +* Create a dummy control dependency from the IO read to any \ +* later instructions. This ensures that a subsequent call to \ +* udelay() will be ordered due to the ISB in get_cycles(). \ +*/ \ + asmvolatile ("eor %0, %1, %1\n" \ +"cbnz %0, ." \ + :"=r" (tmp) :"r" (v) :"memory" ); \ +}) +#define __iowmb () wmb()#define mmiowb () do { } while (0)
@@ -129,10 +144,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)* following Normal memory access. Writes are ordered relative to any prior * Normal memory access. */ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) +#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) +#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) +#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) +#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; })#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); })#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); })
@@ -183,9 +198,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);/* * io{read,write}{16,32,64}be() macros */ -#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) -#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) -#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) +#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) +#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) +#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; })#define iowrite16be (v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })#define iowrite32be (v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 86/352 net: aquantia: return err if set MPI_DEINIT state fails
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4e3c7c00bba0636b97eb23d582c20b0f5d95ce20 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c:260:7:
warning: variable 'err' set but not used [-Wunused-but-set-variable]
'err' should be returned while set MPI_DEINIT state fails in hw_atl_utils_soft_reset.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
@@ -263,6 +263,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,HW_ATL_MPI_STATE_ADR ) &HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT ,10 ,1000U ); +if (err) +return err; }if (self->rbl_enabled)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 87/352 sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ]
__vdc_tx_trigger should only loop on EAGAIN a finite number of times.
See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail.
--- drivers/block/sunvdc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/sunvdc.c +5 -0
@@ -45,6 +45,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);#define WAITING_FOR_GEN_CMD 0x04#define WAITING_FOR_ANY -1 +#define VDC_MAX_RETRIES 10 +static struct workqueue_struct *sunvdc_wq;struct vdc_req_entry {
@@ -431,6 +433,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) .end_idx = dr->prod, };int err, delay; +int retries =0 ; hdr.seq = dr->snd_nxt; delay =1 ;
@@ -443,6 +446,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)udelay (delay);if ((delay <<=1 ) >128 ) delay =128 ; +if (retries++ >VDC_MAX_RETRIES ) +break ; }while (err == -EAGAIN );if (err == -ENOTCONN )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 88/352 soc: bcm: brcmstb: Dont leak device tree node reference
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_brcmstb() doesn't do that, so fix it.
[treding: slightly rewrite to avoid inline comparison]
--- drivers/soc/bcm/brcmstb/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/bcm/brcmstb/common.c +5 -1
@@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = {bool soc_is_brcmstb (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (brcmstb_machine_match, root) !=NULL ; + match =of_match_node (brcmstb_machine_match, root); +of_node_put (root); + +return match !=NULL ; }u32 brcmstb_get_family_id (void )
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 89/352 nfsd4: fix crash on writing v4_end_grace before nfsd startup
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 62a063b8e7d1db684db3f207261a466fa3194e72 ]
Anatoly Trosinenko reports that this:
1) Checkout fresh master Linux branch (tested with commit e195ca6cb)
2) Copy x84_64-config-4.14 to .config, then enable NFS server v4 and build
3) From kvm-xfstests shell:
results in NULL dereference in locks_end_grace.
Check that nfsd has been started before trying to end the grace period.
--- fs/nfsd/nfsctl.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfsd/nfsctl.c +2 -0
@@ -1126,6 +1126,8 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size)case 'Y' :case 'y' :case '1' : +if (nn->nfsd_serv) +return -EBUSY ;nfsd4_end_grace (nn);break ;default :
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 90/352 drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aa394b0dd68cb00c483e151dcd84713d4d517ed1 ]
drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to the context given in the argument and leaves it in state after it quits. The lifetime of state and context are not guaranteed to be the same, so we shouldn't leave that pointer hanging around. This patch resets the context to NULL to avoid any oopses.
Changes in v2:
- Added to the set
--- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +6 -2
@@ -3212,7 +3212,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend);int drm_atomic_helper_commit_duplicated_state (struct drm_atomic_state *state,struct drm_modeset_acquire_ctx *ctx) { -int i; +int i, ret;struct drm_plane *plane;struct drm_plane_state *new_plane_state;struct drm_connector *connector;
@@ -3231,7 +3231,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,for_each_new_connector_in_state (state, connector, new_conn_state, i) state->connectors[i].old_state = connector->state; -return drm_atomic_commit (state); + ret =drm_atomic_commit (state); + + state->acquire_ctx =NULL ; + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_commit_duplicated_state);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 91/352 perf: arm_spe: handle devm_kasprintf() failure
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to 'name' is not safe if unchecked. If NULL is passed in for name then perf_pmu_register() would not fail but rather silently jump to skip_type which is not the intent here. As perf_pmu_register() may also return -ENOMEM returning -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here as well.
--- drivers/perf/arm_spe_pmu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/perf/arm_spe_pmu.c +5 -0
@@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) idx =atomic_inc_return (&pmu_idx); name =devm_kasprintf (dev,GFP_KERNEL ,"%s_%d" ,PMUNAME , idx); +if (!name) { +dev_err (dev,"failed to allocate name for pmu %d\n" , idx); +return -ENOMEM ; + } +return perf_pmu_register (&spe_pmu->pmu, name,-1 ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 92/352 arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ]
As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines are ordered against prior readX()"), MMIO reads smaller than 64 bits fail to compile under clang because we end up mixing 32-bit and 64-bit register operands for the same data processing instruction:
./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths]
return readb(addr);
^
./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb'
^
./include/asm-generic/io.h:695:9: note: use constraint modifier "w"
./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb'
^
./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb'
asm volatile("eor %0, %1, %1\n" \
^Fix the build by casting the macro argument to 'unsigned long' when used as an input to the inline asm.
--- arch/arm64/include/asm/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/io.h +2 -1
@@ -117,7 +117,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)*/ \ asmvolatile ("eor %0, %1, %1\n" \"cbnz %0, ." \ - :"=r" (tmp) :"r" (v) :"memory" ); \ + :"=r" (tmp) :"r" ((unsigned long )(v)) \ + :"memory" ); \ })#define __iowmb () wmb()
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 93/352 Thermal: do not clear passive state during system sleep
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ]
commit ff140fea847e ("Thermal: handle thermal zone device properly during system sleep") added PM hook to call thermal zone reset during sleep. However resetting thermal zone will also clear the passive state and thus cancel the polling queue which leads the passive cooling device state not being cleared properly after sleep.
thermal_pm_notify => thermal_zone_device_reset set passive to 0 thermal_zone_trip_update will skip update passive as `old_target == instance->target'.monitor_thermal_zone => thermal_zone_device_set_polling will cancel tz->poll_queue, so the cooling device state will not be changed afterwards.
--- drivers/thermal/thermal_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +8 -4
@@ -453,16 +453,20 @@ static void update_temperature(struct thermal_zone_device *tz) tz->last_temperature, tz->temperature); } -static void thermal_zone_device_reset (struct thermal_zone_device *tz) +static void thermal_zone_device_init (struct thermal_zone_device *tz) {struct thermal_instance *pos; - tz->temperature =THERMAL_TEMP_INVALID ; - tz->passive =0 ;list_for_each_entry (pos, &tz->thermal_instances, tz_node) pos->initialized = false; } +static void thermal_zone_device_reset (struct thermal_zone_device *tz) +{ + tz->passive =0 ; +thermal_zone_device_init (tz); +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
@@ -1504,7 +1508,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { -thermal_zone_device_reset (tz); +thermal_zone_device_init (tz);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 94/352 thermal: Fix locking in cooling device sysfs update cur_state
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 68000a0d983f539c95ebe5dccd4f29535c7ac0af ]
Sysfs interface to update cooling device cur_state does not currently holding cooling device lock sometimes leading to stale values in cur_state if getting updated simultanelously from user space and thermal framework. Adding the proper locking code fixes this issue.
--- drivers/thermal/thermal_sysfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/thermal/thermal_sysfs.c +7 -4
@@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; +mutex_lock (&cdev->lock); + result = cdev->ops->set_cur_state (cdev, state); -if (result) -return result; -thermal_cooling_device_stats_update (cdev, state); -return count; +if (!result) +thermal_cooling_device_stats_update (cdev, state); + +mutex_unlock (&cdev->lock); +return result ? result : count; } static struct device_attribute
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 95/352 firmware/efi: Add NULL pointer checks in efivars API functions
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ]
Since commit:
ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
we have a device driver accessing the efivars API. Several functions in the efivars API assume __efivars is set, i.e., that they will be accessed only after efivars_register() has been called. However, the following NULL pointer access was reported calling efivar_entry_size() from the brcmfmac device driver:
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = 60bfa5f1 [00000008] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM ... Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events request_firmware_work_func PC is at efivar_entry_size+0x28/0x90 LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] pc : [<c0c40718>] lr : [<bf2a3ef4>] psr: a00d0113 sp : ede7fe28 ip : ee983410 fp : c1787f30 r10: 00000000 r9 : 00000000 r8 : bf2b2258 r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: ad16804a DAC: 00000051
Disassembly showed that the local static variable __efivars is NULL, which is not entirely unexpected given that it is a non-EFI platform.
So add a NULL pointer check to efivar_entry_size(), and to related functions while at it. In efivars_register() a couple of sanity checks are added as well.
--- drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 21 deletions(-)
drivers/firmware/efi/vars.c +78 -21
@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable);static efi_status_t check_var_size (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size)static efi_status_t check_var_size_nonblocking (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *),void *data,bool duplicates,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;unsigned long variable_name_size =1024 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;int err =0 ; +if (!__efivars) +return -EFAULT ; + + ops = __efivars->ops; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry)*/ int __efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -0 ,0 ,NULL ); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL );return efi_status_to_err (status); }
@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete);*/ int efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->set_variable (entry->var.VariableName, &entry->var.VendorGuid,0 ,0 ,NULL );
@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete);int efivar_entry_set (struct efivar_entry *entry,u32 attributes,unsigned long size,void *data,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;efi_char16_t *name = entry->var.VariableName;efi_guid_t vendor = entry->var.VendorGuid;if (down_interruptible (&efivars_lock))return -EINTR ; + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops;if (head &&efivar_entry_find (name, vendor, head, false)) {up (&efivars_lock);return -EEXIST ;
@@ -687,12 +715,17 @@ static int efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, u32 attributes, unsigned long size, void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_trylock (&efivars_lock))return -EBUSY ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + status =check_var_size_nonblocking (attributes, size +ucs2_strsize (name,1024 ));if (status !=EFI_SUCCESS ) {
@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,return -ENOSPC ; } + ops = __efivars->ops; status = ops->set_variable_nonblocking (name, &vendor, attributes, size, data);
@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,int efivar_entry_set_safe (efi_char16_t *name,efi_guid_t vendor,u32 attributes,bool block,unsigned long size,void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; +if (!__efivars) +return -EINVAL ; + + ops = __efivars->ops;if (!ops->query_variable_store)return -ENOSYS ;
@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find);*/ int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; *size =0 ;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->get_variable (entry->var.VariableName, &entry->var.VendorGuid,NULL , size,NULL );up (&efivars_lock);
@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size);int __efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);return efi_status_to_err (status); }
@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get);int efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);up (&efivars_lock);return efi_status_to_err (status);
@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get);int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes,unsigned long *size,void *data,bool *set) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_char16_t *name = entry->var.VariableName;efi_guid_t *vendor = &entry->var.VendorGuid;efi_status_t status;
@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { + err = -EINVAL ; + goto out; + } +/* * Ensure that the available space hasn't shrunk below the safe level */
@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, } } + ops = __efivars->ops; + status = ops->set_variable (name, vendor, attributes, *size, data);if (status !=EFI_SUCCESS ) { err =efi_status_to_err (status);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 96/352 s390/zcrypt: improve special ap message cmd handling
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit be534791011100d204602e2e0496e9e6ce8edf63 ]
There exist very few ap messages which need to have the 'special' flag enabled. This flag tells the firmware layer to do some pre- and maybe postprocessing. However, it may happen that this special flag is enabled but the firmware is unable to deal with this kind of message and thus returns with reply code 0x41. For example older firmware may not know the newest messages triggered by the zcrypt device driver and thus react with reject and the named reply code. Unfortunately this reply code is not known to the zcrypt error routines and thus default behavior is to switch the ap queue offline.
This patch now makes the ap error routine aware of the reply code and so userspace is informed about the bad processing result but the queue is not switched to offline state any more.
--- arch/s390/include/uapi/asm/zcrypt.h | 4 ++-- drivers/s390/crypto/zcrypt_error.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/zcrypt.h +2 -2
@@ -150,8 +150,8 @@ struct ica_xcRB {* @cprb_len: CPRB header length [0x0020] * @cprb_ver_id: CPRB version id. [0x04] * @pad_000: Alignment pad bytes -* @flags: Admin cmd [0x80] or functional cmd [0x00] -* @func_id: Function id / subtype [0x5434] +* @flags: Admin bit [0x80], Special bit [0x20] +* @func_id: Function id / subtype [0x5434] "T4" * @source_id: Source id [originator id] * @target_id: Target id [usage/ctrl domain id] * @ret_code: Return code
drivers/s390/crypto/zcrypt_error.h +2 -0
@@ -51,6 +51,7 @@ struct error_hdr {#define REP82_ERROR_FORMAT_FIELD 0x29#define REP82_ERROR_INVALID_COMMAND 0x30#define REP82_ERROR_MALFORMED_MSG 0x40 +#define REP82_ERROR_INVALID_SPECIAL_CMD 0x41#define REP82_ERROR_INVALID_DOMAIN_PRECHECK 0x42#define REP82_ERROR_RESERVED_FIELDO 0x50/* old value */ #define REP82_ERROR_WORD_ALIGNMENT 0x60
@@ -89,6 +90,7 @@ static inline int convert_error(struct zcrypt_queue *zq,case REP88_ERROR_MESSAGE_MALFORMD :case REP82_ERROR_INVALID_DOMAIN_PRECHECK :case REP82_ERROR_INVALID_DOMAIN_PENDING : +case REP82_ERROR_INVALID_SPECIAL_CMD :// REP88_ERROR_INVALID_KEY // '82' CEX2A // REP88_ERROR_OPERAND // '84' CEX2A // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 97/352 mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6bf4a8e902aad7df55d7f2b10b850cfa3f880996 ]
Fix IBI_R11 configuration on non-radar channels for mt76x0e driver. This patch improve system stability under heavy load. Moreover use IBI_R11 name and remove magic numbers for 0x212c register
--- drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c +6 -2
@@ -800,7 +800,7 @@ static void mt76x2_dfs_set_bbp_params(struct mt76x02_dev *dev)/* enable detection*/ mt76_wr (dev,MT_BBP (DFS ,0 ),MT_DFS_CH_EN <<16 ); -mt76_wr (dev,0x212c ,0x0c350001 ); +mt76_wr (dev,MT_BBP (IBI ,11 ),0x0c350001 ); }void mt76x2_dfs_adjust_agc (struct mt76x02_dev *dev)
@@ -843,7 +843,11 @@ void mt76x2_dfs_init_params(struct mt76x02_dev *dev)mt76_wr (dev,MT_BBP (DFS ,0 ),0 );/* clear detector status */ mt76_wr (dev,MT_BBP (DFS ,1 ),0xf ); -mt76_wr (dev,0x212c ,0 ); +if (mt76_chip (&dev->mt76) ==0x7610 || +mt76_chip (&dev->mt76) ==0x7630 ) +mt76_wr (dev,MT_BBP (IBI ,11 ),0xfde8081 ); +else +mt76_wr (dev,MT_BBP (IBI ,11 ),0 );mt76x02_irq_disable (dev,MT_INT_GPTIMER ); mt76_rmw_field(dev, MT_INT_TIMER_EN,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 98/352 arm64: ftrace: dont adjust the LR value
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ]
The core ftrace code requires that when it is handed the PC of an instrumented function, this PC is the address of the instrumented instruction. This is necessary so that the core ftrace code can identify the specific instrumentation site. Since the instrumented function will be a BL, the address of the instrumented function is LR - 4 at entry to the ftrace code.
This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, which acquire the PC of the instrumented function.
The mcount_get_lr helper is used to acquire the LR of the instrumented function, whose value does not require this adjustment, and cannot be adjusted to anything meaningful. No adjustment of this value is made on other architectures, including arm. However, arm64 adjusts this value by 4.
This patch brings arm64 in line with other architectures and removes the adjustment of the LR value.
--- arch/arm64/kernel/entry-ftrace.S | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/entry-ftrace.S +0 -1
@@ -79,7 +79,6 @@ .macro mcount_get_lr reg ldr \reg, [x29] ldr \reg, [\reg, #8] - mcount_adjust_addr \reg, \reg .endm .macro mcount_get_lr_addr reg
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 99/352 drm/v3d: Fix prime imports of buffers from other drivers.
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 62d1a752874962f072de8a779e960fcd2ab4847b ]
v3d_bo_get_pages() checks this to decide to map the imported buffer instead of the backing shmem file. The caller was about to set this value anyway, and there's no error path in between. Ideally we wouldn't even allocate the shmem file for our imports, but that's a more invasive fix.
--- drivers/gpu/drm/v3d/v3d_bo.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/v3d/v3d_bo.c +1 -0
@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, bo->resv = attach->dmabuf->resv; bo->sgt = sgt; + obj->import_attach = attach;v3d_bo_get_pages (bo);v3d_mmu_insert_ptes (bo);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 100/352 ARM: dts: mmp2: fix TWSI2
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ]
Marvell keeps their MMP2 datasheet secret, but there are good clues that TWSI2 is not on 0xd4025000 on that platform, not does it use IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:
arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58
I'm taking a somewhat educated guess that is probably a copy & paste error from PXA168 or PXA910 and that the real controller in fact hides at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.
I'm also copying some properties from TWSI1 that were missing or incorrect.
Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.
--- arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mmp2.dtsi +6 -3
@@ -220,12 +220,15 @@ status = "disabled"; }; - twsi2: i2c@d4025000 { + twsi2: i2c@d4031000 { compatible = "mrvl,mmp-twsi"; - reg = <0xd4025000 0x1000>; - interrupts = <58>; + reg = <0xd4031000 0x1000>; + interrupt-parent = <&intcmux17>; + interrupts = <0>; clocks = <&soc_clocks MMP2_CLK_TWSI1>; resets = <&soc_clocks MMP2_CLK_TWSI1>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 101/352 ARM: mmp/mmp2: dt: enable the clock
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ]
The device-tree booted MMP2 needs to enable the timer clock, otherwise it would stop ticking when the boot finishes.
It can also use the clock rate from the clk, the non-DT boards need to keep using the hardcoded rates.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ 4 files changed, 23 insertions(+), 15 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq); +extern void timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ); +timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ); +timer_init (IRQ_PXA168_TIMER1 ,6500000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/time.c +20 -12
@@ -22,6 +22,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clk.h> #include <linux/io.h> #include <linux/irq.h>
@@ -38,12 +39,6 @@#include "cputype.h" #include "clock.h" -#ifdef CONFIG_CPU_MMP2 -#define MMP_CLOCK_FREQ 6500000 -#else -#define MMP_CLOCK_FREQ 3250000 -#endif -#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE#define MAX_DELTA (0xfffffffe)
@@ -189,19 +184,18 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq) +void __init timer_init (int irq,unsigned long rate) {timer_config (); -sched_clock_register (mmp_read_sched_clock,32 ,MMP_CLOCK_FREQ ); +sched_clock_register (mmp_read_sched_clock,32 , rate); ckevt.cpumask =cpumask_of (0 );setup_irq (irq, &timer_irq); -clocksource_register_hz (&cksrc,MMP_CLOCK_FREQ ); -clockevents_config_and_register (&ckevt,MMP_CLOCK_FREQ , -MIN_DELTA ,MAX_DELTA ); +clocksource_register_hz (&cksrc, rate); +clockevents_config_and_register (&ckevt, rate,MIN_DELTA ,MAX_DELTA ); }#ifdef CONFIG_OF
@@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = {void __init mmp_dt_init_timer (void ) {struct device_node *np; +struct clk *clk;int irq, ret; +unsigned long rate; np =of_find_matching_node (NULL , mmp_timer_dt_ids);if (!np) {
@@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) goto out; } + clk =of_clk_get (np,0 ); +if (!IS_ERR (clk)) { + ret =clk_prepare_enable (clk); +if (ret) + goto out; + rate =clk_get_rate (clk) /2 ; + }else if (cpu_is_pj4 ()) { + rate =6500000 ; + }else { + rate =3250000 ; + } + irq =irq_of_parse_and_map (np,0 );if (!irq) { ret = -EINVAL ;
@@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq); +timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 102/352 ARM: dts: aspeed: add missing memory unit-address
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]
The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so '/memory' in the board files create a duplicate node. We're probably getting lucky that the bootloader fixes up the memory node that the kernel ends up using. Add the unit-address so it's merged with the base node.
Found with DT json-schema checks.
--- arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -2
@@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
@@ -322,4 +322,3 @@ &adc { status = "okay"; }; -
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +1 -1
@@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 103/352 spi: fix spi-at91-usart.c build errors when PINCTRL is not set
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c2b142cc3939e932d4fa2210c2a5155df5736590 ]
Fix build errors when CONFIG_PINCTRL is not enabled.
The header file <linux/pinctrl/consumer.h> handles both CONFIG_PINCTRL enabled and disabled cases.
CC [M] drivers/spi/spi-at91-usart.o../drivers/spi/spi-at91-usart.c: In function 'at91_usart_spi_runtime_suspend':../drivers/spi/spi-at91-usart.c:409:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_sleep_state(dev);../drivers/spi/spi-at91-usart.c: In function 'at91_usart_spi_runtime_resume':../drivers/spi/spi-at91-usart.c:419:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_default_state(dev);
--- drivers/spi/spi-at91-usart.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-at91-usart.c +1 -0
@@ -12,6 +12,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/spi/spi.h>
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 104/352 x86/fpu: Add might_fault() to user_insn()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ]
Every user of user_insn() passes an user memory pointer to this macro.
Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed.
[ bp: Space it out to make it more visible. ]
--- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/fpu/internal.h +3 -0
@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 105/352 media: i2c: TDA1997x: select CONFIG_HDMI
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 79e89e36dc8a47ef965a35b484d737a5227feed1 ]
Without CONFIG_HDMI, we get a link error for this driver:
drivers/media/i2c/tda1997x.o: In function `tda1997x_parse_infoframe':
tda1997x.c:(.text+0x2195): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text+0x21b6): undefined reference to hdmi_infoframe_log' drivers/media/i2c/tda1997x.o: In function `tda1997x_log_infoframe':
tda1997x.c:(.text.unlikely+0x13d3): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text.unlikely+0x1426): undefined reference to hdmi_infoframe_log'
All other drivers in this directory that use HDMI select CONFIG_HDMI, so do the same here:
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -61,6 +61,7 @@ config VIDEO_TDA1997X depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API depends on SND_SOC select SND_PCM + select HDMI ---help--- V4L2 subdevice driver for the NXP TDA1997x HDMI receivers.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 106/352 media: DaVinci-VPBE: fix error handling in vpbe_initialize()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]
If vpbe_set_default_output() or vpbe_set_default_mode() fails, vpbe_initialize() returns error code without releasing resources.
The patch adds error handling for that case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +5 -2
@@ -740,7 +740,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , def_output); -return ret; + goto fail_kfree_amp; }printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode);
@@ -748,12 +748,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , def_mode); -return ret; + goto fail_kfree_amp; } vpbe_dev->initialized =1 ;/* TBD handling of bootargs for default output and mode */ return 0 ; +fail_kfree_amp: +mutex_lock (&vpbe_dev->lock); +kfree (vpbe_dev->amp); fail_kfree_encoders:kfree (vpbe_dev->encoders); fail_dev_unregister:
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 107/352 platform/x86: Fix config space access for intel_atomisp2_pm
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6a31061833a52a79c99221b6251db08cf377470e ]
We lose even config space access when we power gate the ISP via the PUNIT. That makes lspci & co. produce gibberish.
To fix that let's try to implement actual runtime pm hooks and inform the pci core that the device always goes to D3cold. That will cause the pci core to resume the device before attempting config space access.
This introduces another annoyance though. We get the
following error every time we try to resume the device:intel_atomisp2_pm 0000:00:03.0: Refused to change power state, currently in D3
The reason being that the pci core tries to put the device back into D0 via the standard PCI PM mechanism before calling the driver resume hook. To fix this properly we'd need to infiltrate the platform pm hooks (could turn ugly real fast), or use pm domains (which don't seem to exist on x86), or some extra early resume hook for the driver (which doesn't exist either). So maybe we just choose to live with the error?
--- drivers/platform/x86/intel_atomisp2_pm.c | 68 +++++++++++++++++------- 1 file changed, 48 insertions(+), 20 deletions(-)
drivers/platform/x86/intel_atomisp2_pm.c +48 -20
@@ -33,46 +33,45 @@#define ISPSSPM0_IUNIT_POWER_ON 0x0#define ISPSSPM0_IUNIT_POWER_OFF 0x3 -static int isp_probe (struct pci_dev *dev,const struct pci_device_id *id) +static int isp_set_power (struct pci_dev *dev,bool enable) {unsigned long timeout; -u32 val; - -pci_write_config_dword (dev,PCI_INTERRUPT_CTRL ,0 ); - -/* -* MRFLD IUNIT DPHY is located in an always-power-on island -* MRFLD HW design need all CSI ports are disabled before -* powering down the IUNIT. -*/ -pci_read_config_dword (dev,PCI_CSI_CONTROL , &val); - val |=PCI_CSI_CONTROL_PORTS_OFF_MASK ; -pci_write_config_dword (dev,PCI_CSI_CONTROL , val); +u32 val = enable ?ISPSSPM0_IUNIT_POWER_ON : +ISPSSPM0_IUNIT_POWER_OFF ; -/* Write 0x3 to ISPSSPM0 bit[1:0] to power off the IUNIT */ +/* Write to ISPSSPM0 bit[1:0] to power on/off the IUNIT */ iosf_mbi_modify (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , -ISPSSPM0_IUNIT_POWER_OFF ,ISPSSPM0_ISPSSC_MASK ); + val,ISPSSPM0_ISPSSC_MASK );/* * There should be no IUNIT access while power-down is * in progress HW sighting: 4567865 * Wait up to 50 ms for the IUNIT to shut down. +* And we do the same for power on. */ timeout = jiffies +msecs_to_jiffies (50 );while (1 ) { -/* Wait until ISPSSPM0 bit[25:24] shows 0x3 */ -iosf_mbi_read (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , &val); - val = (val &ISPSSPM0_ISPSSS_MASK ) >>ISPSSPM0_ISPSSS_OFFSET ; -if (val ==ISPSSPM0_IUNIT_POWER_OFF ) +u32 tmp; + +/* Wait until ISPSSPM0 bit[25:24] shows the right value */ +iosf_mbi_read (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , &tmp); + tmp = (tmp &ISPSSPM0_ISPSSS_MASK ) >>ISPSSPM0_ISPSSS_OFFSET ; +if (tmp == val)break ;if (time_after (jiffies, timeout)) { -dev_err (&dev->dev,"IUNIT power-off timeout.\n" ); +dev_err (&dev->dev,"IUNIT power-%s timeout.\n" , + enable ?"on" :"off" );return -EBUSY ; }usleep_range (1000 ,2000 ); } +return 0 ; +} + +static int isp_probe (struct pci_dev *dev,const struct pci_device_id *id) +{pm_runtime_allow (&dev->dev);pm_runtime_put_sync_suspend (&dev->dev);
@@ -87,11 +86,40 @@ static void isp_remove(struct pci_dev *dev)static int isp_pci_suspend (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev); +u32 val; + +pci_write_config_dword (pdev,PCI_INTERRUPT_CTRL ,0 ); + +/* +* MRFLD IUNIT DPHY is located in an always-power-on island +* MRFLD HW design need all CSI ports are disabled before +* powering down the IUNIT. +*/ +pci_read_config_dword (pdev,PCI_CSI_CONTROL , &val); + val |=PCI_CSI_CONTROL_PORTS_OFF_MASK ; +pci_write_config_dword (pdev,PCI_CSI_CONTROL , val); + +/* +* We lose config space access when punit power gates +* the ISP. Can't use pci_set_power_state() because +* pmcsr won't actually change when we write to it. +*/ +pci_save_state (pdev); + pdev->current_state = PCI_D3cold; +isp_set_power (pdev, false); +return 0 ; }static int isp_pci_resume (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev); + +isp_set_power (pdev, true); + pdev->current_state =PCI_D0 ; +pci_restore_state (pdev); +return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 108/352 smack: fix access permissions for keyring
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ]
Function smack_key_permission() only issues smack requests for the following operations:
- KEY_NEED_READ (issues MAY_READ)
- KEY_NEED_WRITE (issues MAY_WRITE)
- KEY_NEED_LINK (issues MAY_WRITE)
- KEY_NEED_SETATTR (issues MAY_WRITE)
A blank smack request is issued in all other cases, resulting in smack access being granted if there is any rule defined between subject and object, or denied with -EACCES otherwise.
Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. Fix the logic in the unlikely case when both MAY_READ and MAY_WRITE are needed. Validate access permission field for valid contents.
--- security/smack/smack_lsm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
security/smack/smack_lsm.c +9 -3
@@ -4333,6 +4333,12 @@ static int smack_key_permission(key_ref_t key_ref,int request =0 ;int rc; +/* +* Validate requested permissions +*/ +if (perm & ~KEY_NEED_ALL ) +return -EINVAL ; + keyp =key_ref_to_ptr (key_ref);if (keyp ==NULL )return -EINVAL ;
@@ -4356,10 +4362,10 @@ static int smack_key_permission(key_ref_t key_ref, ad.a.u.key_struct.key = keyp->serial; ad.a.u.key_struct.key_desc = keyp->description;#endif -if (perm &KEY_NEED_READ ) - request =MAY_READ ; +if (perm & (KEY_NEED_READ |KEY_NEED_SEARCH |KEY_NEED_VIEW )) + request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) - request =MAY_WRITE ; + request |=MAY_WRITE ; rc =smk_access (tkp, keyp->security, request, &ad); rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc);return rc;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 109/352 xtensa: xtfpga.dtsi: fix dtc warnings about SPI
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f37598be4e3896359e87c824be57ddddc280cc3f ]
Rename SPI controller node in the XTFPGA DTS to spi@... This fixes the following build warnings:
arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'
--- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/boot/dts/xtfpga.dtsi +1 -1
@@ -103,7 +103,7 @@ }; }; - spi0: spi-master@0d0a0000 { + spi0: spi@0d0a0000 { compatible = "cdns,xtfpga-spi"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 110/352 usb: dwc3: Correct the logic for checking TRB full in __dwc3_prepare_one_trb()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit b7a4fbe2300a8965ea760c7e871507b84aea17f6 ]
Availability of TRB's is calculated using dwc3_calc_trbs_left(), which determines total available TRB's based on the HWO bit set in a TRB.
In the present code, __dwc3_prepare_one_trb() is called with a TRB which needs to be prepared for transfer. This __dwc3_prepare_one_trb() calls dwc3_calc_trbs_left() to determine total available TRBs and set IOC bit if the total available TRBs are zero. Since the present working TRB (which is passed as an argument to __dwc3_prepare_one_trb() ) doesn't yet have the HWO bit set before calling dwc3_calc_trbs_left(), there are chances that dwc3_calc_trbs_left() wrongly calculates this present working TRB as free(since the HWO bit is not yet set) and returns the total available TRBs as greater than zero (including the present working TRB). This could be a problem.
This patch corrects the above mentioned problem in __dwc3_prepare_one_trb() by increementing the dep->trb_enqueue at the last (after preparing the TRB) instead of increementing at the start and setting the IOC bit only if the total available TRBs returned by dwc3_calc_trbs_left() is 1 . Since we are increementing the dep->trb_enqueue at the last, the present working TRB is also considered as available by dwc3_calc_trbs_left() and non zero value is returned . So, according to the modified logic, when the total available TRBs is equal to 1 that means the total available TRBs in the pool are 0.
--- drivers/usb/dwc3/gadget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/dwc3/gadget.c +3 -3
@@ -921,8 +921,6 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb,struct usb_gadget *gadget = &dwc->gadget;enum usb_device_speed speed = gadget->speed; -dwc3_ep_inc_enq (dep); - trb->size =DWC3_TRB_SIZE_LENGTH (length); trb->bpl =lower_32_bits (dma); trb->bph =upper_32_bits (dma);
@@ -1001,7 +999,7 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, }if ((!no_interrupt && !chain) || - (dwc3_calc_trbs_left (dep) ==0 )) + (dwc3_calc_trbs_left (dep) ==1 )) trb->ctrl |=DWC3_TRB_CTRL_IOC ;if (chain)
@@ -1012,6 +1010,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, trb->ctrl |=DWC3_TRB_CTRL_HWO ; +dwc3_ep_inc_enq (dep); +trace_dwc3_prepare_trb (dep, trb); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 111/352 dmaengine: sprd: Support DMA link-list cyclic callback
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 97dbd6ea02beb3a7027c158e0a110b5095268d59 ]
The Spreadtrum DMA link-list mode is always one cyclic transfer, so we should clear the SPRD_DMA_LLIST_END flag for the link-list configuration. Moreover add cyclic callback support for the cyclic transfer.
--- drivers/dma/sprd-dma.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/dma/sprd-dma.c +14 -11
@@ -450,7 +450,7 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id)struct sprd_dma_desc *sdesc;enum sprd_dma_req_mode req_type;enum sprd_dma_int_type int_type; -bool trans_done = false; +bool trans_done = false, cyclic = false;u32 i;while (irq_status) {
@@ -465,13 +465,19 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id) sdesc = schan->cur_desc; -/* Check if the dma request descriptor is done. */ - trans_done =sprd_dma_check_trans_done (sdesc, int_type, - req_type); -if (trans_done == true) { -vchan_cookie_complete (&sdesc->vd); - schan->cur_desc =NULL ; -sprd_dma_start (schan); +/* cyclic mode schedule callback */ + cyclic = schan->linklist.phy_addr ? true : false; +if (cyclic == true) { +vchan_cyclic_callback (&sdesc->vd); + }else { +/* Check if the dma request descriptor is done. */ + trans_done =sprd_dma_check_trans_done (sdesc, int_type, + req_type); +if (trans_done == true) { +vchan_cookie_complete (&sdesc->vd); + schan->cur_desc =NULL ; +sprd_dma_start (schan); + } }spin_unlock (&schan->vc.lock); }
@@ -674,9 +680,6 @@ static int sprd_dma_fill_desc(struct dma_chan *chan,/* link-list configuration */ if (schan->linklist.phy_addr) { -if (sg_index == sglen -1 ) - hw->frg_len |=SPRD_DMA_LLIST_END ; - hw->cfg |=SPRD_DMA_LINKLIST_EN ;/* link-list index */
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 112/352 usb: dwc2: Disable power down feature on Samsung SoCs
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 35a6054132286a4ab92b536595093b82e6bdfcbc ]
Power down feature of DWC2 module integrated in Samsung SoCs doesn't work properly or needs some additional handling in PHY or SoC glue layer, so disable it for now. Without disabling power down, DWC2 causes random memory trashes and fails enumeration if there is no USB link to host on driver probe.
--- drivers/usb/dwc2/params.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/usb/dwc2/params.c +9 -1
@@ -71,6 +71,13 @@ static void dwc2_set_his_params(struct dwc2_hsotg *hsotg) p->power_down = false; } +static void dwc2_set_s3c6400_params (struct dwc2_hsotg *hsotg) +{ +struct dwc2_core_params *p = &hsotg->params; + + p->power_down =0 ; +} +static void dwc2_set_rk_params (struct dwc2_hsotg *hsotg) {struct dwc2_core_params *p = &hsotg->params;
@@ -152,7 +159,8 @@ const struct of_device_id dwc2_of_match_table[] = { { .compatible = "lantiq,arx100-usb", .data = dwc2_set_ltq_params }, { .compatible = "lantiq,xrx200-usb", .data = dwc2_set_ltq_params }, { .compatible = "snps,dwc2" }, - { .compatible = "samsung,s3c6400-hsotg" }, + { .compatible = "samsung,s3c6400-hsotg", + .data = dwc2_set_s3c6400_params }, { .compatible = "amlogic,meson8-usb", .data = dwc2_set_amlogic_params }, { .compatible = "amlogic,meson8b-usb",
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 113/352 usb: hub: delay hub autosuspend if USB3 port is still link training
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ]
When initializing a hub we want to give a USB3 port in link training the same debounce delay time before autosuspening the hub as already trained, connected enabled ports.
USB3 ports won't reach the enabled state with "current connect status" and "connect status change" bits set until the USB3 link training finishes.
Catching the port in link training (polling) and adding the debounce delay prevents unnecessary failed attempts to autosuspend the hub.
--- drivers/usb/core/hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/core/hub.c +10 -0
@@ -1112,6 +1112,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } +/* +* Add debounce if USB3 link is in polling/link training state. +* Link will automatically transition to Enabled state after +* link training completes. +*/ +if (hub_is_superspeed (hdev) && + ((portstatus &USB_PORT_STAT_LINK_STATE ) == +USB_SS_PORT_LS_POLLING )) + need_debounce_delay = true; +/* Clear status-change flags; we'll debounce later */ if (portchange &USB_PORT_STAT_C_CONNECTION ) { need_debounce_delay = true;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 114/352 timekeeping: Use proper seqcount initializer
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ce10a5b3954f2514af726beb78ed8d7350c5e41c ]
tk_core.seq is initialized open coded, but that misses to initialize the lockdep map when lockdep is enabled. Lockdep splats involving tk_core seq consequently lack a name and are hard to read.
Use the proper initializer which takes care of the lockdep map initialization.
[ tglx: Massaged changelog ]
--- kernel/time/timekeeping.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/time/timekeeping.c +3 -1
@@ -50,7 +50,9 @@ enum timekeeping_adv_mode {static struct {seqcount_t seq;struct timekeeper timekeeper; -} tk_core____cacheline_aligned ; +} tk_core____cacheline_aligned = { + .seq =SEQCNT_ZERO (tk_core.seq), +};static DEFINE_RAW_SPINLOCK (timekeeper_lock);static struct timekeeper shadow_timekeeper;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 115/352 usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a0678e2eed41e81004308693ac84ea95614b0920 ]
Fix the issue: device doesn't accept LGO_U1/U2:
1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2
by default;
2. enable/disable controller to initiate requests for transition into
U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE;--- drivers/usb/mtu3/mtu3_core.c | 4 +++- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/usb/mtu3/mtu3_core.c +3 -1
@@ -578,8 +578,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* disable LGO_U1/U2 by default */ mtu3_clrbits (mbase,U3D_LINK_POWER_CONTROL , -SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE |SW_U1_REQUEST_ENABLE |SW_U2_REQUEST_ENABLE ); +/* enable accept LGO_U1/U2 link command from host */ +mtu3_setbits (mbase,U3D_LINK_POWER_CONTROL , +SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE );/* device responses to u3_exit from host automatically */ mtu3_clrbits (mbase,U3D_LTSSM_CTRL ,SOFT_U3_EXIT_EN );/* automatically build U2 link when U3 detect fail */
drivers/usb/mtu3/mtu3_gadget_ep0.c +4 -4
@@ -336,9 +336,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U1_ACCEPT_ENABLE ; + lpc |=SW_U1_REQUEST_ENABLE ;else - lpc &= ~SW_U1_ACCEPT_ENABLE ; + lpc &= ~SW_U1_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u1_enable = !!set;
@@ -351,9 +351,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U2_ACCEPT_ENABLE ; + lpc |=SW_U2_REQUEST_ENABLE ;else - lpc &= ~SW_U2_ACCEPT_ENABLE ; + lpc &= ~SW_U2_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u2_enable = !!set;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 116/352 clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 6e6da2039c82271dd873b9ad2b902a692a7dd554 ]
All the audio interfaces on Allwinner SoCs need to change their module clocks during operation, to switch between support for 44.1 kHz and 48 kHz family sample rates. The clock rate for the module clocks is governed by their upstream audio PLL. The module clocks themselves only have a gate, and sometimes a divider or mux. Thus any rate changes need to be propagated upstream.
Set the CLK_SET_RATE_PARENT flag for all audio module clocks to achieve this.
--- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/clk/sunxi-ng/ccu-sun8i-a33.c +3 -3
@@ -366,10 +366,10 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4,static const char *const i2s_parents[] = {"pll-audio-8x" ,"pll-audio-4x" ,"pll-audio-2x" ,"pll-audio" }; static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents, - 0x0b0, 16, 2, BIT(31), 0); + 0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents, - 0x0b4, 16, 2, BIT(31), 0); + 0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT);/* TODO: the parent for most of the USB clocks is not known */ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M",
@@ -446,7 +446,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", static SUNXI_CCU_GATE(ac_dig_clk, "ac-dig", "pll-audio", 0x140, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(ac_dig_4x_clk, "ac-dig-4x", "pll-audio-4x", - 0x140, BIT(30), 0); + 0x140, BIT(30), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", 0x144, BIT(31), 0);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 117/352 media: imx274: select REGMAP_I2C
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4f9d7225c70dd9d3f406b79e60f8dbd2cd5ae743 ]
The imx274 driver uses regmap and the build will fail without it.
Fixes:
drivers/media/i2c/imx274.c:142:21: error: variable ‘imx274_regmap_config’ has initializer but incomplete type
static const struct regmap_config imx274_regmap_config = {
^~~~~~~~~~~~~
drivers/media/i2c/imx274.c:1869:19: error: implicit declaration of function ‘devm_regmap_init_i2c’ [-Werror=implicit-function-declaration]
imx274->regmap = devm_regmap_init_i2c(client, &imx274_regmap_config);
^~~~~~~~~~~~~~~~~~~~and others.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -611,6 +611,7 @@ config VIDEO_IMX274 tristate "Sony IMX274 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT + select REGMAP_I2C ---help--- This is a V4L2 sensor driver for the Sony IMX274 CMOS image sensor.
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 118/352 mac80211: fix deauth TX when we disconnect
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f6c7f03f69f7422bc237bc79599e152d390b74e0 ]
The iTXQs stop/wake queue mechanism involves a whole bunch of locks and this is probably why the call to ieee80211_wake_txqs is deferred to a tasklet when called from __ieee80211_wake_queue.
Another advantage of that is that ieee80211_wake_txqs might call the wake_tx_queue() callback and then the driver may call mac80211 which will call it back in the same context.
The bug I saw is that when we send a deauth frame as a station we do:
flush(drop=1)
tx deauth
flush(drop=0)
While we flush we stop the queues and wake them up immediately after we finished flushing. The problem here is that the tasklet that de-facto enables the queue may not have run until we send the deauth. Then the deauth frame is sent to the driver (which is surprising by itself), but the driver won't get anything useful from ieee80211_tx_dequeue because the queue is stopped (or more precisely because vif->txqs_stopped[0] is true).
Then the deauth is not sent. Later on, the tasklet will run, but that'll be too late. We'll already have removed all the vif etc...
Fix this by calling ieee80211_wake_txqs synchronously if we are not waking up the queues from the driver (we check the reason to determine that). This makes the code really convoluted because we may call ieee80211_wake_txqs from __ieee80211_wake_queue. The latter assumes that queue_stop_reason_lock has been taken by the caller and ieee80211_wake_txqs may release the lock to send the frames.
--- net/mac80211/util.c | 49 ++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-)
net/mac80211/util.c +35 -14
@@ -299,16 +299,16 @@ out:spin_unlock_bh (&fq->lock); } -void ieee80211_wake_txqs (unsigned long data) +static void +__releases(&local->queue_stop_reason_lock) +__acquires(&local->queue_stop_reason_lock) +_ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags) { -struct ieee80211_local *local = (struct ieee80211_local *)data; struct ieee80211_sub_if_data *sdata;int n_acs =IEEE80211_NUM_ACS ; -unsigned long flags;int i;rcu_read_lock (); -spin_lock_irqsave (&local->queue_stop_reason_lock, flags);if (local->hw.queues <IEEE80211_NUM_ACS ) n_acs =1 ;
@@ -317,7 +317,7 @@ void ieee80211_wake_txqs(unsigned long data)if (local->queue_stop_reasons[i])continue ; -spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); +spin_unlock_irqrestore (&local->queue_stop_reason_lock, *flags);list_for_each_entry_rcu (sdata, &local->interfaces, list) {int ac;
@@ -329,13 +329,22 @@ void ieee80211_wake_txqs(unsigned long data)__ieee80211_wake_txqs (sdata, ac); } } -spin_lock_irqsave (&local->queue_stop_reason_lock, flags); +spin_lock_irqsave (&local->queue_stop_reason_lock, *flags); } -spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags);rcu_read_unlock (); } +void ieee80211_wake_txqs (unsigned long data) +{ +struct ieee80211_local *local = (struct ieee80211_local *)data; +unsigned long flags; + +spin_lock_irqsave (&local->queue_stop_reason_lock, flags); +_ieee80211_wake_txqs (local, &flags); +spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); +} +void ieee80211_propagate_queue_wake (struct ieee80211_local *local,int queue) {struct ieee80211_sub_if_data *sdata;
@@ -371,7 +380,8 @@ void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue)static void __ieee80211_wake_queue (struct ieee80211_hw *hw,int queue,enum queue_stop_reason reason, -bool refcounted) +bool refcounted, +unsigned long *flags) {struct ieee80211_local *local =hw_to_local (hw);
@@ -405,8 +415,19 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, }else tasklet_schedule (&local->tx_pending_tasklet); -if (local->ops->wake_tx_queue) -tasklet_schedule (&local->wake_txqs_tasklet); +/* +* Calling _ieee80211_wake_txqs here can be a problem because it may +* release queue_stop_reason_lock which has been taken by +* __ieee80211_wake_queue's caller. It is certainly not very nice to +* release someone's lock, but it is fine because all the callers of +* __ieee80211_wake_queue call it right before releasing the lock. +*/ +if (local->ops->wake_tx_queue) { +if (reason ==IEEE80211_QUEUE_STOP_REASON_DRIVER ) +tasklet_schedule (&local->wake_txqs_tasklet); +else +_ieee80211_wake_txqs (local, flags); + } } void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
@@ -417,7 +438,7 @@ void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,unsigned long flags;spin_lock_irqsave (&local->queue_stop_reason_lock, flags); -__ieee80211_wake_queue (hw, queue, reason, refcounted); +__ieee80211_wake_queue (hw, queue, reason, refcounted, &flags);spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); }
@@ -514,7 +535,7 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, false);__skb_queue_tail (&local->pending[queue], skb);__ieee80211_wake_queue (hw, queue,IEEE80211_QUEUE_STOP_REASON_SKB_ADD , - false); + false, &flags);spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); }
@@ -547,7 +568,7 @@ void ieee80211_add_pending_skbs(struct ieee80211_local *local,for (i =0 ; i < hw->queues; i++)__ieee80211_wake_queue (hw, i,IEEE80211_QUEUE_STOP_REASON_SKB_ADD , - false); + false, &flags);spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); }
@@ -605,7 +626,7 @@ void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,spin_lock_irqsave (&local->queue_stop_reason_lock, flags);for_each_set_bit (i, &queues, hw->queues) -__ieee80211_wake_queue (hw, i, reason, refcounted); +__ieee80211_wake_queue (hw, i, reason, refcounted, &flags);spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 119/352 pinctrl: nuvoton: check for devm_kasprintf() failure
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 4be1eaf322f07bb9694618fd2763a3a1f0a3dd25 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to .label is not safe if not checked. On error npcm7xx_gpio_of() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +3 -0
@@ -1932,6 +1932,9 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl) pctrl->gpio_bank[id].gc.label =devm_kasprintf (pctrl->dev,GFP_KERNEL ,"%pOF" , np); +if (pctrl->gpio_bank[id].gc.label ==NULL ) +return -ENOMEM ; + pctrl->gpio_bank[id].gc.dbg_show = npcmgpio_dbg_show; pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].gc.direction_input;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 120/352 drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2)
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit de4aaab5cc9770a8c4dc13d9bfb6a83b06bba57e ]
Adjust limits for newer polaris variants.
v2: fix polaris11 kicker (Jerry)
--- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +15 -2
@@ -1529,8 +1529,21 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) efuse = efuse >>24 ;if (hwmgr->chip_id ==CHIP_POLARIS10 ) { - min =1000 ; - max =2300 ; +if (hwmgr->is_kicker) { + min =1200 ; + max =2500 ; + }else { + min =1000 ; + max =2300 ; + } + }else if (hwmgr->chip_id ==CHIP_POLARIS11 ) { +if (hwmgr->is_kicker) { + min =900 ; + max =2100 ; + }else { + min =1100 ; + max =2100 ; + } }else { min =1100 ; max =2100 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 121/352 tipc: fix node keep alive interval calculation
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit f5d6c3e5a359c0507800e7ac68d565c21de9b5a1 ]
When setting LINK tolerance, node timer interval will be calculated base on the LINK with lowest tolerance.
But when calculated, the old node timer interval only updated if current setting value (tolerance/4) less than old ones regardless of number of links as well as links' lowest tolerance value.
This caused to two cases missing if tolerance changed as following:
Case 1:
1.1/ There is one link (L1) available in the system
1.2/ Set L1's tolerance from 1500ms => lower (i.e 500ms) 1.3/ Then, fallback to default (1500ms) or higher (i.e 2000ms)
Expected:
node timer interval is 1500/4=375ms after 1.3
Result:
node timer interval will not being updated after changing tolerance at 1.3 since its value 1500/4=375ms is not less than 500/4=125ms at 1.2.
Case 2:
2.1/ There are two links (L1, L2) available in the system 2.2/ L1 and L2 tolerance value are 2000ms as initial 2.3/ Set L2's tolerance from 2000ms => lower 1500ms 2.4/ Disable link L2 (bring down its bearer)
Expected:
node timer interval is 2000ms/4=500ms after 2.4
Result:
node timer interval will not being updated after disabling L2 since its value 2000ms/4=500ms is still not less than 1500/4=375ms at 2.3 although L2 is already not available in the system.
To fix this, we start the node interval calculation by initializing it to a value larger than any conceivable calculated value. This way, the link with the lowest tolerance will always determine the calculated value.
--- net/tipc/node.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tipc/node.c +6 -0
@@ -624,6 +624,12 @@ static void tipc_node_timeout(struct timer_list *t)__skb_queue_head_init (&xmitq); +/* Initial node interval to value larger (10 seconds), then it will be +* recalculated with link lowest tolerance +*/ +tipc_node_read_lock (n); + n->keepalive_intv =10000 ; +tipc_node_read_unlock (n);for (bearer_id =0 ; remains && (bearer_id <MAX_BEARERS ); bearer_id++) {tipc_node_read_lock (n); le = &n->links[bearer_id];
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 122/352 arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 690e16bada6029694740d5501025faf483d14339 ]
Rockpro64 is not able boot if GPIO1_C1 pin is pulled high before loading linux kernel.
In rockpro64 GPIO1_C1 pin is connected vdd_cpu_b regulator VSEL pin. Pin should be pulled down in normal operation and pulled high in suspend.
PMIC LDO_REG2 is connected to touch panel connector. Rename regulator and set it to correct voltage.
PCIe power is controller by GPIO1_D0.
Schematics can be downloaded from:
http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
--- .../boot/dts/rockchip/rk3399-rockpro64.dts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +12 -8
@@ -97,7 +97,7 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie_pwr_en>; regulator-name = "vcc3v3_pcie";
@@ -293,12 +293,12 @@ }; }; - vcc2v8_dvp: LDO_REG2 { - regulator-name = "vcc2v8_dvp"; + vcc3v0_touch: LDO_REG2 { + regulator-name = "vcc3v0_touch"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; regulator-state-mem { regulator-off-in-suspend; };
@@ -397,7 +397,9 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; - fcs,suspend-voltage-selector = <0>; + fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel1_gpio>; regulator-name = "vdd_cpu_b"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>;
@@ -415,6 +417,8 @@ compatible = "silergy,syr828"; reg = <0x41>; fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel2_gpio>; regulator-name = "vdd_gpu"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>;
@@ -519,7 +523,7 @@ pcie { pcie_pwr_en: pcie-pwr-en { - rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
@@ -529,7 +533,7 @@ }; vsel1_gpio: vsel1-gpio { - rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; }; vsel2_gpio: vsel2-gpio {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 123/352 driver core: Move async_synchronize_full call
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c37d721c68ad88925ba0e72f6e14acb829a8c6bb ]
Move the async_synchronize_full call out of __device_release_driver and into driver_detach.
The idea behind this is that the async_synchronize_full call will only guarantee that any existing async operations are flushed. This doesn't do anything to guarantee that a hotplug event that may occur while we are doing the release of the driver will not be asynchronously scheduled.
By moving this into the driver_detach path we can avoid potential deadlocks as we aren't holding the device lock at this point and we should not have the driver we want to flush loaded so the flush will take care of any asynchronous events the driver we are detaching might have scheduled.
--- drivers/base/dd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/base/dd.c +3 -3
@@ -928,9 +928,6 @@ static void __device_release_driver(struct device *dev, struct device *parent) drv = dev->driver;if (drv) { -if (driver_allows_async_probing (drv)) -async_synchronize_full (); -while (device_links_busy (dev)) {device_unlock (dev);if (parent && dev->bus->need_parent_lock)
@@ -1036,6 +1033,9 @@ void driver_detach(struct device_driver *drv)struct device_private *dev_prv;struct device *dev; +if (driver_allows_async_probing (drv)) +async_synchronize_full (); +for (;;) {spin_lock (&drv->p->klist_devices.k_lock);if (list_empty (&drv->p->klist_devices.k_list)) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 124/352 kobject: return error code if writing /sys/.../uevent fails
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ]
Propagate error code back to userspace if writing the /sys/.../uevent file fails. Before, the write operation always returned with success, even if we failed to recognize the input string or if we failed to generate the uevent itself.
With the error codes properly propagated back to userspace, we are able to react in userspace accordingly by not assuming and awaiting a uevent that is not delivered.
--- drivers/base/bus.c | 12 ++++++++---- drivers/base/core.c | 8 +++++++- kernel/module.c | 6 ++++-- 3 files changed, 19 insertions(+), 7 deletions(-)
drivers/base/bus.c +8 -4
@@ -614,8 +614,10 @@ static void remove_probe_files(struct bus_type *bus)static ssize_t uevent_store (struct device_driver *drv,const char *buf,size_t count) { -kobject_synth_uevent (&drv->p->kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&drv->p->kobj, buf, count); +return rc ? rc : count; }static DRIVER_ATTR_WO (uevent);
@@ -831,8 +833,10 @@ static void klist_devices_put(struct klist_node *n)static ssize_t bus_uevent_store (struct bus_type *bus,const char *buf,size_t count) { -kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); +return rc ? rc : count; } static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
drivers/base/core.c +7 -1
@@ -1067,8 +1067,14 @@ out:static ssize_t uevent_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -if (kobject_synth_uevent (&dev->kobj, buf, count)) +int rc; + + rc =kobject_synth_uevent (&dev->kobj, buf, count); + +if (rc) {dev_err (dev,"uevent: failed to send synthetic uevent\n" ); +return rc; + }return count; }
kernel/module.c +4 -2
@@ -1207,8 +1207,10 @@ static ssize_t store_uevent(struct module_attribute *mattr,struct module_kobject *mk, const char *buffer, size_t count) { - kobject_synth_uevent(&mk->kobj, buffer, count); -return count; + int rc; + + rc =kobject_synth_uevent (&mk->kobj, buffer, count); +return rc ? rc : count; } struct module_attribute module_uevent =
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 125/352 IB/hfi1: Unreserve a reserved request when it is completed
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ]
Currently, When a reserved operation is completed, its entry in the send queue will not be unreserved, which leads to the miscalculation of qp->s_avail and thus the triggering of a WARN_ON call trace. This patch fixes the problem by unreserving the reserved operation when it is completed.
--- drivers/infiniband/hw/hfi1/rc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/rc.c +2 -0
@@ -1157,6 +1157,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)if (cmp_psn (wqe->lpsn, qp->s_sending_psn) >=0 &&cmp_psn (qp->s_sending_psn, qp->s_sending_hpsn) <=0 )break ; +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
@@ -1209,6 +1210,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp,u32 s_last;rvt_put_swqe (wqe); +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 126/352 usb: dwc3: trace: add missing break statement to make compiler happy
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 54d48183d21e03f780053d7129312049cb5dd591 ]
The missed break statement in the outer switch makes the code fall through always and thus always same value will be printed.
Besides that, compiler warns about missed fall through marker:
drivers/usb/dwc3/./trace.h: In function ‘trace_raw_output_dwc3_log_trb’:drivers/usb/dwc3/./trace.h:246:4: warning: this statement may fall through [-Wimplicit-fallthrough=]
switch (pcm) {
^~~~~~Add the missing break statement to work correctly without compilation warnings.
--- drivers/usb/dwc3/trace.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/dwc3/trace.h +2 -0
@@ -251,9 +251,11 @@ DECLARE_EVENT_CLASS(dwc3_log_trb, s ="2x " ;break ;case 3 : +default : s ="3x " ;break ; } +break ;default : s ="" ; } s; }),
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 127/352 gpio: mt7621: report failure of devm_kasprintf()
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 59d646c775d6ae688ee90fda9f2a4270c47b7490 ]
kasprintf() may return NULL on failure of internal allocation thus the assigned label is not safe if not explicitly checked. On error mediatek_gpio_bank_probe() returns negative values so -ENOMEM in the (unlikely) failure case should be fine here.
--- drivers/gpio/gpio-mt7621.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-mt7621.c +2 -0
@@ -244,6 +244,8 @@ mediatek_gpio_bank_probe(struct device *dev, rg->chip.of_xlate = mediatek_gpio_xlate; rg->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"%s-bank%d" ,dev_name (dev), bank); +if (!rg->chip.label) +return -ENOMEM ; ret =devm_gpiochip_add_data (dev, &rg->chip, mtk);if (ret <0 ) {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 128/352 gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a109c2dbb571b10bb9969285b646f57309c98251 ]
The error cases of mediatek_gpio_bank_probe() would go unnoticed (except for the dev_err() messages). The probe function should return an error if one of the banks failed to initialize properly indicated by not returning non-0.
--- drivers/gpio/gpio-mt7621.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpio/gpio-mt7621.c +6 -2
@@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct mtk *mtk;int i; +int ret; mtk =devm_kzalloc (dev,sizeof (*mtk),GFP_KERNEL );if (!mtk)
@@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, mtk); mediatek_gpio_irq_chip.name =dev_name (dev); -for (i =0 ; i <MTK_BANK_CNT ; i++) -mediatek_gpio_bank_probe (dev, np, i); +for (i =0 ; i <MTK_BANK_CNT ; i++) { + ret =mediatek_gpio_bank_probe (dev, np, i); +if (ret) +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 129/352 pinctrl: sx150x: handle failure case of devm_kstrdup
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ]
devm_kstrdup() may return NULL if internal allocation failed. Thus using label, name is unsafe without checking. Therefor in the unlikely case of allocation failure, sx150x_probe() simply returns -ENOMEM.
--- drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-sx150x.c +8 -3
@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, }/* Register GPIO controller */ - pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); pctl->gpio.base =-1 ; pctl->gpio.ngpio = pctl->data->npins; pctl->gpio.get_direction = sx150x_gpio_get_direction;
@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, pctl->gpio.of_node = dev->of_node;#endif pctl->gpio.can_sleep = true; + pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); +if (!pctl->gpio.label) +return -ENOMEM ; +/* * Setting multiple pins is not safe when all pins are not * handled by the same regmap register. The oscio pin (present
@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client,/* Add Interrupt support if an irq is specified */ if (client->irq >0 ) { - pctl->irq_chip.name =devm_kstrdup (dev, client->name, -GFP_KERNEL ); pctl->irq_chip.irq_mask = sx150x_irq_mask; pctl->irq_chip.irq_unmask = sx150x_irq_unmask; pctl->irq_chip.irq_set_type = sx150x_irq_set_type; pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; + pctl->irq_chip.name =devm_kstrdup (dev, client->name, +GFP_KERNEL ); +if (!pctl->irq_chip.name) +return -ENOMEM ; pctl->irq.masked = ~0 ; pctl->irq.sense =0 ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 130/352 iommu/amd: Fix amd_iommu=force_isolation
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit c12b08ebbe16f0d3a96a116d86709b04c1ee8e74 ]
The parameter is still there but it's ignored. We need to check its value before deciding to go into passthrough mode for AMD IOMMU v2 capable device.
We occasionally use this parameter to force v2 capable device into translation mode to debug memory corruption that we suspect is caused by DMA writes.
To address the following comment from Joerg Roedel on the first version, v2 capability of device is completely ignored.
Quoted 2 lines
This breaks the
iommu_v2use-case, as it needs a direct mapping for the devices that support it.
And from Documentation/admin-guide/kernel-parameters.txt:
This option does not override iommu=pt
--- drivers/iommu/amd_iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +8 -1
@@ -438,7 +438,14 @@ static int iommu_init_device(struct device *dev) dev_data->alias =get_alias (dev); -if (dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) { +/* +* By default we use passthrough mode for IOMMUv2 capable device. +* But if amd_iommu=force_isolation is set (e.g. to debug DMA to +* invalid address), we ignore the capability for the device so +* it'll be forced to go into translation mode. +*/ +if ((iommu_pass_through || !amd_iommu_force_isolation) && +dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) {struct amd_iommu *iommu; iommu = amd_iommu_rlookup_table[dev_data->devid];
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 131/352 media: v4l2-device: Link subdevices to their parent devices if available
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ee494cf377e142f65f202fadf0d859f8e12119fb ]
Currently v4l2_device_register_subdev_nodes() does not initialize the dev_parent field of the video_device structs it creates for subdevices being registered. This leads to __video_register_device() falling back to the parent device of associated v4l2_device struct, which often does not match the physical device the subdevice is registered for.
Due to the problem above, the links between real devices and v4l-subdev nodes cannot be obtained from sysfs, which might be confusing for the userspace trying to identify the hardware.
Fix this by initializing the dev_parent field of the video_device struct with the value of dev field of the v4l2_subdev struct. In case of subdevices without a parent struct device, the field will be NULL and the old behavior will be preserved by the semantics of __video_register_device().
--- drivers/media/v4l2-core/v4l2-device.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/v4l2-core/v4l2-device.c +1 -0
@@ -247,6 +247,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)video_set_drvdata (vdev, sd);strscpy (vdev->name, sd->name,sizeof (vdev->name)); + vdev->dev_parent = sd->dev; vdev->v4l2_dev = v4l2_dev; vdev->fops = &v4l2_subdev_fops; vdev->release = v4l2_device_release_subdev_node;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 132/352 ARM: OMAP1: ams-delta: Fix audio permanently muted
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 2afdb4c41d7876e430b9bc6e2d7e2fe28609fd6a ]
Since commit 1137ceee76ba ("ARM: OMAP1: ams-delta: Don't request unused GPIOs"), on-board audio has appeared muted. Believed to be unused GPIO pin "hookflash1", apparently set high regardless of the corresponding bit of "latch2" port attempted to be set low during .init_machine(), has been identified as the reason.
According to Amstrad E3 wiki, the purpose of the pin hasn't been clearly identified. Original Amstrad software used to produce a high pulse on it when the phone was taken off hook or recall was pressed. With the current finding, we can assume the pin provides a kind of audio mute function.
Proper resolution of the issue should be done in two steps:
- resolution of an issue with the pin state not reflecting the value the corresponding bit of the port was attempted to be initialized with,
- extension of on-board audio driver with a new control.
For now, rename the pin to "audio_mute" to reflect its function and, as a quick fix, hogg it as output low so on-board audio can produce audible sound again.
--- arch/arm/mach-omap1/board-ams-delta.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +4 -2
@@ -247,8 +247,8 @@ static struct platform_device latch2_gpio_device = {#define LATCH2_PIN_SCARD_CMDVCC 11#define LATCH2_PIN_MODEM_NRESET 12#define LATCH2_PIN_MODEM_CODEC 13 -#define LATCH2_PIN_HOOKFLASH1 14 -#define LATCH2_PIN_HOOKFLASH2 15 +#define LATCH2_PIN_AUDIO_MUTE 14 +#define LATCH2_PIN_HOOKFLASH 15static struct regulator_consumer_supply modem_nreset_consumers[] = {REGULATOR_SUPPLY ("RESET#" ,"serial8250.1" ),
@@ -588,6 +588,8 @@ static int gpiochip_match_by_label(struct gpio_chip *chip, void *data)static struct gpiod_hog ams_delta_gpio_hogs[] = {GPIO_HOG (LATCH2_LABEL ,LATCH2_PIN_KEYBRD_DATAOUT ,"keybrd_dataout" ,GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW ), +GPIO_HOG (LATCH2_LABEL ,LATCH2_PIN_AUDIO_MUTE ,"audio_mute" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW ), {}, };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 133/352 ARM: dts: Fix OMAP4430 SDP Ethernet startup
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 ]
It was noticed that unbinding and rebinding the KSZ8851 ethernet resulted in the driver reporting "failed to read device ID" at probe. Probing the reset line with a 'scope while repeatedly attempting to bind the driver in a shell loop revealed that the KSZ8851 RSTN pin is constantly held at zero, meaning the device is held in reset, and does not respond on the SPI bus.
Experimentation with the startup delay on the regulator set to 50ms shows that the reset is positively released after 20ms.
Schematics for this board are not available, and the traces are buried in the inner layers of the board which makes tracing where the RSTN pin extremely difficult. We can only guess that the RSTN pin is wired to a reset generator chip driven off the ethernet supply, which fits the observed behaviour.
Include this delay in the regulator startup delay - effectively treating the reset as a "supply stable" indicator.
This can not be modelled as a delay in the KSZ8851 driver since the reset generation is board specific - if the RSTN pin had been wired to a GPIO, reset could be released earlier via the already provided support in the KSZ8851 driver.
This also got confirmed by Peter Ujfalusi <[email protected]> based on Blaze schematics that should be very close to SDP4430:
TPS22902YFPR is used as the regulator switch (gpio48 controlled):
Convert arm boot_lock to raw The VOUT is routed to TPS3808G01DBV. (SCH Note: Threshold set at 90%. Vsense: 0.405V).
According to the TPS3808 data sheet the RESET delay time when Ct is open (this is the case in the schema): MIN/TYP/MAX: 12/20/28 ms.
--- arch/arm/boot/dts/omap4-sdp.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap4-sdp.dts +1 -0
@@ -33,6 +33,7 @@ gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ enable-active-high; regulator-boot-on; + startup-delay-us = <25000>; }; vbat: fixedregulator-vbat {
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 134/352 mips: bpf: fix encoding bug for mm_srlv32_op
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ]
For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90.
Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav.
v1->v2:
- Keep mm_srlv32_op sorted by value.
--- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/uapi/asm/inst.h +1 -1
@@ -369,8 +369,8 @@ enum mm_32a_minor_op { mm_ext_op =0x02c , mm_pool32axf_op =0x03c , mm_srl32_op =0x040 , + mm_srlv32_op =0x050 , mm_sra_op =0x080 , - mm_srlv32_op =0x090 , mm_rotr_op =0x0c0 , mm_lwxs_op =0x118 , mm_addu32_op = 0x150,
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 135/352 media: coda: fix H.264 deblocking filter controls
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 75fa6e4f83a0923fe753827d354998d448b4fd6a ]
Add support for the third loop filter mode V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY, and fix V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA and V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA controls.
The filter offset controls are signed values in the -6 to 6 range and are stored into the slice header fields slice_alpha_c0_offset_div2 and slice_beta_offset_div2. The actual filter offsets FilterOffsetA/B are double their value, in range of -12 to 12.
Rename variables to more closely match the nomenclature in the H.264 specification.
--- drivers/media/platform/coda/coda-bit.c | 19 +++++++++---------- drivers/media/platform/coda/coda-common.c | 15 +++++++-------- drivers/media/platform/coda/coda.h | 6 +++--- drivers/media/platform/coda/coda_regs.h | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-)
drivers/media/platform/coda/coda-bit.c +9 -10
@@ -991,16 +991,15 @@ static int coda_start_encoding(struct coda_ctx *ctx)else coda_write (dev,CODA_STD_H264 ,CODA_CMD_ENC_SEQ_COD_STD ); -if (ctx->params.h264_deblk_enabled) { - value = ((ctx->params.h264_deblk_alpha & -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | - ((ctx->params.h264_deblk_beta & -CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << -CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET ); - }else { - value =1 <<CODA_264PARAM_DISABLEDEBLK_OFFSET ; - } + value = ((ctx->params.h264_disable_deblocking_filter_idc & +CODA_264PARAM_DISABLEDEBLK_MASK ) << +CODA_264PARAM_DISABLEDEBLK_OFFSET ) | + ((ctx->params.h264_slice_alpha_c0_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET ) | + ((ctx->params.h264_slice_beta_offset_div2 & +CODA_264PARAM_DEBLKFILTEROFFSETBETA_MASK ) << +CODA_264PARAM_DEBLKFILTEROFFSETBETA_OFFSET );coda_write (dev, value,CODA_CMD_ENC_SEQ_264_PARA );break ;case V4L2_PIX_FMT_JPEG :
drivers/media/platform/coda/coda-common.c +7 -8
@@ -1792,14 +1792,13 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) ctx->params.h264_max_qp = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA : - ctx->params.h264_deblk_alpha = ctrl->val; + ctx->params.h264_slice_alpha_c0_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA : - ctx->params.h264_deblk_beta = ctrl->val; + ctx->params.h264_slice_beta_offset_div2 = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE : - ctx->params.h264_deblk_enabled = (ctrl->val == -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); + ctx->params.h264_disable_deblocking_filter_idc = ctrl->val;break ;case V4L2_CID_MPEG_VIDEO_H264_PROFILE :/* TODO: switch between baseline and constrained baseline */
@@ -1881,13 +1880,13 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_MAX_QP ,0 ,51 ,1 ,51 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std (&ctx->ctrls, &coda_ctrl_ops, -V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,0 ,15 ,1 ,0 ); +V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA ,-6 ,6 ,1 ,0 );v4l2_ctrl_new_std_menu (&ctx->ctrls, &coda_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED ,0x0 , -V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); +V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY , +0x0 ,V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED ); v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE, V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, 0x0,
drivers/media/platform/coda/coda.h +3 -3
@@ -115,9 +115,9 @@ struct coda_params {u8 h264_inter_qp;u8 h264_min_qp;u8 h264_max_qp; -u8 h264_deblk_enabled; -u8 h264_deblk_alpha; -u8 h264_deblk_beta; +u8 h264_disable_deblocking_filter_idc; +s8 h264_slice_alpha_c0_offset_div2; +s8 h264_slice_beta_offset_div2;u8 h264_profile_idc;u8 h264_level_idc;u8 mpeg4_intra_qp;
drivers/media/platform/coda/coda_regs.h +1 -1
@@ -292,7 +292,7 @@#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_OFFSET 8#define CODA_264PARAM_DEBLKFILTEROFFSETALPHA_MASK 0x0f#define CODA_264PARAM_DISABLEDEBLK_OFFSET 6 -#define CODA_264PARAM_DISABLEDEBLK_MASK 0x01 +#define CODA_264PARAM_DISABLEDEBLK_MASK 0x03#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_OFFSET 5#define CODA_264PARAM_CONSTRAINEDINTRAPREDFLAG_MASK 0x01#define CODA_264PARAM_CHROMAQPOFFSET_OFFSET 0
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 136/352 arm64: dts: meson: Fix IRQ trigger type for macirq
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 8b3e6f8999f8d704fccce225b9455b3fa639d1c9 ]
A long running stress test on a custom board shipping an AXG SoCs and a Realtek RTL8211F PHY revealed that after a few hours the connection speed would drop drastically, from ~1000Mbps to ~3Mbps. At the same time the 'macirq' (eth0) IRQ would stop being triggered at all and as consequence the GMAC IRQs never ACKed.
After a painful investigation the problem seemed to be due to a wrong defined IRQ type for the GMAC IRQ that should be LEVEL_HIGH instead of EDGE_RISING.
The change in the macirq IRQ type also solved another long standing issue affecting this SoC/PHY where EEE was causing the network connection to die after stressing it with iperf3 (even though much sooner). It's now possible to remove the 'eee-broken-1000t' quirk as well.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 - 4 files changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
@@ -143,7 +143,7 @@ compatible = "amlogic,meson-axg-dwmac", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8>; - interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; clocks = <&clkc CLKID_ETH>, <&clkc CLKID_FCLK_DIV2>,
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -1
@@ -462,7 +462,7 @@ compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x4>; - interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; status = "disabled"; };
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +0 -1
@@ -143,7 +143,6 @@ interrupt-parent = <&gpio_intc>; /* MAC_INTR on GPIOZ_15 */ interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - eee-broken-1000t; }; }; };
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +0 -1
@@ -142,7 +142,6 @@ eth_phy0: ethernet-phy@0 { /* Realtek RTL8211F (0x001cc916) */ reg = <0>; - eee-broken-1000t; }; }; };
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 137/352 ARM: dts: Fix up the D-Link DIR-685 MTD partition info
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ]
The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains:
dev: size erasesize name
mtd0: 01e7ff40 00020000 "rootfs"
mtd1: 01f40000 00020000 "upgrade"
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd4: 00040000 00020000 "RedBoot"
mtd5: 00020000 00020000 "LangPack"
mtd6: 02000000 00020000 "flash"
Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered.
Remains:
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd5: 00020000 00020000 "LangPack"
Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000.
--- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/gemini-dlink-dir-685.dts +6 -10
@@ -274,20 +274,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 138/352 tracing: Have trace_stack nr_entries compare not be so subtle
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit ca16b0fbb05242f18da9d810c07d3882ffed831c ]
Dan Carpenter reviewed the trace_stack.c code and figured he found an off by one bug.
"From reviewing the code, it seems possible for
stack_trace_max.nr_entries to be set to .max_entries and in that case we would be reading one element beyond the end of the stack_dump_trace[] array. If it's not set to .max_entries then the bug doesn't affect runtime."
Although it looks to be the case, it is not. Because we have:
static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES+1] =
{ [0 ... (STACK_TRACE_ENTRIES)] = ULONG_MAX }; struct stack_trace stack_trace_max = {
.max_entries = STACK_TRACE_ENTRIES - 1,
.entries = &stack_dump_trace[0],};
And:
stack_trace_max.nr_entries = x; for (; x < i; x++) stack_dump_trace[x] = ULONG_MAX;
Even if nr_entries equals max_entries, indexing with it into the stack_dump_trace[] array will not overflow the array. But if it is the case, the second part of the conditional that tests stack_dump_trace[nr_entries] to ULONG_MAX will always be true.
By applying Dan's patch, it removes the subtle aspect of it and makes the if conditional slightly more efficient.
--- kernel/trace/trace_stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_stack.c +1 -1
@@ -286,7 +286,7 @@ __next(struct seq_file *m, loff_t *pos) {long n = *pos -1 ; -if (n > stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX ) +if (n >= stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX )return NULL ; m->private = (void *)n;
Signature · 1 line
2.19.1
Re: [PATCH 4.20 138/352] tracing: Have trace_stack nr_entries compare not be so subtle
Quoted 2 lines · On Mon, 11 Feb 2019 15:16:05 +0100 Greg Kroah-Hartman…
4.20-stable review patch. If anyone has any objections, please let me know.
This is not a bug fix and was not meant for stable. Please do not apply.
-- Steve
Quoted 59 lines
------------------
[ Upstream commit
ca16b0fbb05242f18da9d810c07d3882ffed831c]Dan Carpenter reviewed the
trace_stack.ccode and figured he found an off by one bug."From reviewing the code, it seems possible for
stack_trace_max.nr_entries to be set to .max_entries and in that case we would be reading one element beyond the end of the stack_dump_trace[] array. If it's not set to .max_entries then the bug doesn't affect runtime."Although it looks to be the case, it is not. Because we have:
static unsigned long stack_dump_trace[STACK_TRACE_ENTRIES+1] =
{ [0 ... (STACK_TRACE_ENTRIES)] = ULONG_MAX };struct stack_trace stack_trace_max = { .max_entries = STACK_TRACE_ENTRIES - 1, .entries = &stack_dump_trace[0],};
And:
stack_trace_max.nr_entries = x; for (; x < i; x++) stack_dump_trace[x] = ULONG_MAX;Even if
nr_entriesequalsmax_entries, indexing with it into the stack_dump_trace[] array will not overflow the array. But if it is the case, the second part of the conditional that tests stack_dump_trace[nr_entries] toULONG_MAXwill always be true.By applying Dan's patch, it removes the subtle aspect of it and makes the if conditional slightly more efficient.
Signed-off-by Dan Carpenter <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- kernel/trace/trace_stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/trace/trace_stack.c +1
-1@@ -286,7 +286,7 @@ __next(struct seq_file *m, loff_t *pos) {long n = *pos -1 ; -if (n > stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX ) +if (n >= stack_trace_max.nr_entries || stack_dump_trace[n] ==ULONG_MAX )return NULL ; m->private = (void *)n;
Greg Kroah-Hartman
maintainerRe: [PATCH 4.20 138/352] tracing: Have trace_stack nr_entries compare not be so subtle
Quoted 7 lines · Steven Rostedt
Quoted 2 lines · On Mon, 11 Feb 2019 15:16:05 +0100 Greg Kroah-Hartman…
4.20-stable review patch. If anyone has any objections, please let me know.
This is not a bug fix and was not meant for stable. Please do not apply.
Thanks for letting me know, now dropped from all queues.
greg k-h
Greg Kroah-Hartman
maintainerPATCH 139/352 watchdog: renesas_wdt: dont set divider while watchdog is running
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit e990e12741877e9bfac402ca468f4007a75f6e2a ]
The datasheet says we must stop the timer before changing the clock divider. This can happen when the restart handler is called while the watchdog is running.
--- drivers/watchdog/renesas_wdt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/watchdog/renesas_wdt.c +7 -2
@@ -74,12 +74,17 @@ static int rwdt_init_timeout(struct watchdog_device *wdev)static int rwdt_start (struct watchdog_device *wdev) {struct rwdt_priv *priv =watchdog_get_drvdata (wdev); +u8 val;pm_runtime_get_sync (wdev->parent); -rwdt_write (priv,0 ,RWTCSRB ); -rwdt_write (priv, priv->cks,RWTCSRA ); +/* Stop the timer before we modify any register */ + val =readb_relaxed (priv->base +RWTCSRA ) & ~RWTCSRA_TME ; +rwdt_write (priv, val,RWTCSRA ); +rwdt_init_timeout (wdev); +rwdt_write (priv, priv->cks,RWTCSRA ); +rwdt_write (priv,0 ,RWTCSRB );while (readb_relaxed (priv->base +RWTCSRA ) &RWTCSRA_WRFLG )cpu_relax ();
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 140/352 ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 79da07dec740a42c70963ebacbd2bf8866af9e20 ]
TPA6130A2 SD pin on RDU1 is not really controlled by SoC and instead is only meant to notify the system that audio was "muted" by external actors. To accommodate that, drop "power-gpio" property of hpa1 node as well as specify a name for that GPIO so that userspace can access it.
--- arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx51-zii-rdu1.dts +13 -4
@@ -477,6 +477,15 @@ }; &gpio1 { + gpio-line-names = "", "", "", "", + "", "", "", "", + "", "hp-amp-shutdown-b", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", ""; + unused-sd3-wp-gpio { /* * See pinctrl_esdhc1 below for more details on this
@@ -495,9 +504,6 @@ hpa1: amp@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ampgpio>; - power-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_3p3v>; };
@@ -671,7 +677,10 @@ }; &iomuxc { - pinctrl_ampgpio: ampgpiogrp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + pinctrl_hog: hoggrp { fsl,pins = < MX51_PAD_GPIO1_9__GPIO1_9 0x5e >;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 141/352 usb: dwc3: gadget: Disable CSP for stream OUT ep
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 244add8ebfb231c39db9e33b204bd0ce8f24f782 ]
In stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned. So we don't want controller to carry on transfers when short packet is received. So disable the CSP for stream capable endpoint.
This is based on the 3.30a Programming guide, where table 3-1 device descriptor structure field definitions says for CSP bit If this bit is 0, the controller generates an XferComplete event and remove the stream. So if we keep CSP as 1 then switching between streams would not happen as in stream mode, when fast-forwarding TRBs, the stream number is not cleared causing the new stream to not get assigned.
--- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/usb/dwc3/gadget.c +6 -2
@@ -990,9 +990,13 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, usb_endpoint_type(dep->endpoint.desc)); } -/* always enable Continue on Short Packet */ +/* +* Enable Continue on Short Packet +* when endpoint is not a stream capable +*/ if (usb_endpoint_dir_out (dep->endpoint.desc)) { - trb->ctrl |=DWC3_TRB_CTRL_CSP ; +if (!dep->stream_capable) + trb->ctrl |=DWC3_TRB_CTRL_CSP ;if (short_not_ok) trb->ctrl |=DWC3_TRB_CTRL_ISP_IMI ;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 142/352 iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 84a9a75774961612d0c7dd34a1777e8f98a65abd ]
The GITS_TRANSLATER MMIO doorbell register in the ITS hardware is architected to be 4 bytes in size, yet on hi1620 and earlier, Hisilicon have allocated the adjacent 4 bytes to carry some IMPDEF sideband information which results in an 8-byte MSI payload being delivered when signalling an interrupt:
MSIAddr:
|----4bytes----|----4bytes----| | MSIData | IMPDEF |
This poses no problem for the ITS hardware because the adjacent 4 bytes are reserved in the memory map. However, when delivering MSIs to memory, as we do in the SMMUv3 driver for signalling the completion of a SYNC command, the extended payload will corrupt the 4 bytes adjacent to the "sync_count" member in struct arm_smmu_device. Fortunately, the current layout allocates these bytes to padding, but this is fragile and we should make this explicit.
--- drivers/iommu/arm-smmu-v3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +5 -1
@@ -576,7 +576,11 @@ struct arm_smmu_device {struct arm_smmu_strtab_cfg strtab_cfg; -u32 sync_count; +/* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ +union { +u32 sync_count; +u64 padding; + };/* IOMMU core code handle */ struct iommu_device iommu;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 143/352 iommu/arm-smmu: Add support for qcom,smmu-v2 variant
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ]
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
--- drivers/iommu/arm-smmu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/arm-smmu.c +3 -0
@@ -119,6 +119,7 @@ enum arm_smmu_implementation {GENERIC_SMMU ,ARM_MMU500 ,CAVIUM_SMMUV2 , + QCOM_SMMUV2, }; struct arm_smmu_s2cr {
@@ -1954,6 +1955,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);ARM_SMMU_MATCH_DATA (arm_mmu401,ARM_SMMU_V1_64K ,GENERIC_SMMU );ARM_SMMU_MATCH_DATA (arm_mmu500,ARM_SMMU_V2 ,ARM_MMU500 );ARM_SMMU_MATCH_DATA (cavium_smmuv2,ARM_SMMU_V2 ,CAVIUM_SMMUV2 ); +ARM_SMMU_MATCH_DATA (qcom_smmuv2,ARM_SMMU_V2 ,QCOM_SMMUV2 );static const struct of_device_id arm_smmu_of_match[] = { { .compatible ="arm,smmu-v1" , .data = &smmu_generic_v1 },
@@ -1962,6 +1964,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, { }, };MODULE_DEVICE_TABLE (of, arm_smmu_of_match);
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 144/352 iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ]
After removing an entry from a queue (e.g. reading an event in arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer pointer to free the queue slot back to the SMMU. A memory barrier is required here so that all reads targetting the queue entry have completed before the consumer pointer is updated.
The implementation of queue_inc_cons() relies on a writel() to complete the previous reads, but this is incorrect because writel() is only guaranteed to complete prior writes. This patch replaces the call to writel() with an mb(); writel_relaxed() sequence, which gives us the read->write ordering which we require.
--- drivers/iommu/arm-smmu-v3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +7 -1
@@ -679,7 +679,13 @@ static void queue_inc_cons(struct arm_smmu_queue *q)u32 cons = (Q_WRP (q, q->cons) |Q_IDX (q, q->cons)) +1 ; q->cons =Q_OVF (q, q->cons) |Q_WRP (q, cons) |Q_IDX (q, cons); -writel (q->cons, q->cons_reg); + +/* +* Ensure that all CPU accesses (reads and writes) to the queue +* are complete before we update the cons pointer. +*/ +mb (); +writel_relaxed (q->cons, q->cons_reg); }static int queue_sync_prod (struct arm_smmu_queue *q)
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 145/352 sata_rcar: fix deferred probing
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/sata_rcar.c +3 -1
@@ -891,7 +891,9 @@ static int sata_rcar_probe(struct platform_device *pdev)int ret =0 ; irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) +if (irq <0 ) +return irq; +if (!irq)return -EINVAL ; priv =devm_kzalloc (dev,sizeof (struct sata_rcar_priv ),GFP_KERNEL );
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 146/352 clk: imx6sl: ensure MMDC CH0 handshake is bypassed
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit 0efcc2c0fd2001a83240a8c3d71f67770484917e ]
Same as other i.MX6 SoCs, ensure unused MMDC channel's handshake is bypassed, this is to make sure no request signal will be generated when periphe_clk_sel is changed or SRC warm reset is triggered.
--- drivers/clk/imx/clk-imx6sl.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/imx/clk-imx6sl.c +6 -0
@@ -17,6 +17,8 @@#include "clk.h" +#define CCDR 0x4 +#define BM_CCM_CCDR_MMDC_CH0_MASK (1 << 17)#define CCSR 0xc#define BM_CCSR_PLL1_SW_CLK_SEL (1 << 2)#define CACRR 0x10
@@ -411,6 +413,10 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) clks[IMX6SL_CLK_USDHC3 ] =imx_clk_gate2 ("usdhc3" ,"usdhc3_podf" , base +0x80 ,6 ); clks[IMX6SL_CLK_USDHC4 ] =imx_clk_gate2 ("usdhc4" ,"usdhc4_podf" , base +0x80 ,8 ); +/* Ensure the MMDC CH0 handshake is bypassed */ +writel_relaxed (readl_relaxed (base +CCDR ) | +BM_CCM_CCDR_MMDC_CH0_MASK , base +CCDR ); +imx_check_clocks (clks,ARRAY_SIZE (clks)); clk_data.clks = clks;
Signature · 1 line
2.19.1
Greg Kroah-Hartman
maintainerPATCH 147/352 platform/x86: mlx-platform: Fix tachometer registers
In reply to Greg Kroah-Hartman4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ Upstream commit edd45cba5ed7f53974475ddc9a1453c2c87b3328 ]
Shift by one the registers for tachometers (7 - 12).
This fix is relevant for the same new systems MQMB7, MSN37, MSN34, which are about to be released to the customers.
At the moment, none of them is at customers sites. The customers will not suffer from this change.
This fix is necessary, because register used before for tachometer 7 has been than reserved for the second PWM for newer systems, which are not supported yet in mlx-platform driver. So registers of tachometers 7-12 have been shifted by one.
--- drivers/platform/x86/mlx-platform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/platform/x86/mlx-platform.c +6 -6
@@ -83,12 +83,12 @@#define MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET 0xe7#define MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET 0xe8#define MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET 0xe9 -#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xea -#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xeb -#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xec -#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xed -#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xee -#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xeb +#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xec +#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xed +#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee +#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0#define MLXPLAT_CPLD_LPC_IO_RANGE 0x100#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
Signature · 1 line
2.19.1