5.5.6-stable review
Subsystems (10)
Greg Kroah-Hartman
maintainercover 5.5.6-stable review
This is the start of the stable review cycle for the 5.5.6 release. There are 399 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 Sun, 23 Feb 2020 07:19:49 +0000. 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/v5.x/stable-review/patch-5.5.6-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-5.5.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.5.6-rc1
Coly Li <[email protected]>
bcache: properly initialize 'path' and 'err' in register_bcache()
Alex Deucher <[email protected]>
drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2)
Niklas Schnelle <[email protected]>
s390/pci: Recover handle in clp_set_pci_fn()
Ido Schimmel <[email protected]>
mlxsw: spectrum_dpipe: Add missing error path
Vadim Pasternak <[email protected]>
mlxsw: core: Add validation of hardware device types for MGPIR register
Miklos Szeredi <[email protected]>
fuse: don't overflow LLONG_MAX with end offset
Michael S. Tsirkin <[email protected]>
virtio_balloon: prevent pfn array overflow
Steve French <[email protected]>
cifs: log warning message (once) if out of disk space
Masahiro Yamada <[email protected]>
kbuild: make multiple directory targets work
Maciej Fijalkowski <[email protected]>
i40e: Relax i40e_xsk_wakeup's return value when PF is busy
Vasily Averin <[email protected]>
help_next should increase position index
Wenwen Wang <[email protected]>
NFS: Fix memory leaks
Alex Deucher <[email protected]>
drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage
Alex Deucher <[email protected]>
drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency
Zhiqiang Liu <[email protected]>
brd: check and limit max_part par
Shubhrajyoti Datta <[email protected]>
microblaze: Prevent the overflow of the start
Davide Caratti <[email protected]>
tc-testing: add missing 'nsPlugin' to basic.json
Peter Zijlstra <[email protected]>
asm-generic/tlb: add missing CONFIG symbol
Andrei Otcheretianski <[email protected]>
iwlwifi: mvm: Check the sta is not NULL in iwl_mvm_cfg_he_sta()
Andrei Otcheretianski <[email protected]>
iwlwifi: mvm: Fix thermal zone registration
Christoph Hellwig <[email protected]>
nvme-pci: remove nvmeq->tags
Sagi Grimberg <[email protected]>
nvmet: fix dsm failure when payload does not match sgl descriptor
Amol Grover <[email protected]>
nvmet: Pass lockdep expression to RCU lists
Zenghui Yu <[email protected]>
irqchip/gic-v3-its: Reference to its_invall_cmd descriptor when building INVALL
Coly Li <[email protected]>
bcache: fix incorrect data type usage in btree_flush_write()
Coly Li <[email protected]>
bcache: explicity type cast in bset_bkey_last()
Coly Li <[email protected]>
bcache: fix memory corruption in bch_cache_accounting_clear()
Yunfeng Ye <[email protected]>
reiserfs: prevent NULL pointer dereference in reiserfs_insert_item()
Nathan Chancellor <[email protected]>
lib/scatterlist.c: adjust indentation in __sg_alloc_table
wangyan <[email protected]>
ocfs2: fix a NULL pointer dereference when call ocfs2_update_inode_fsync_trans()
Masahiro Yamada <[email protected]>
ocfs2: make local header paths relative to C files
Tom Zanussi <[email protected]>
tracing: Fix now invalid var_ref_vals assumption in trace action
Josef Bacik <[email protected]>
btrfs: do not do delalloc reservation under page lock
Alexandre Ghiti <[email protected]>
powerpc: Do not consider weak unresolved symbol relocations as bad
Daniel Vetter <[email protected]>
radeon: insert 10ms sleep in dce5_crtc_load_lut
Vasily Averin <[email protected]>
trigger_next should increase position index
Vasily Averin <[email protected]>
ftrace: fpid_next() should increase position index
Gustavo A. R. Silva <[email protected]>
char: hpet: Fix out-of-bounds read bug
Ben Skeggs <[email protected]>
drm/nouveau/disp/nv50-: prevent oops when no channel method map provided
Bharata B Rao <[email protected]>
KVM: PPC: Book3S HV: Release lock on page-out failure path
Marc Zyngier <[email protected]>
irqchip/gic-v3: Only provision redistributors that are enabled in ACPI
Dor Askayo <[email protected]>
drm/amd/display: do not allocate display_mode_lib unnecessarily
Guennadi Liakhovetski <[email protected]>
ASoC: Intel: consistent HDMI codec probing code
Arnd Bergmann <[email protected]>
rbd: work around -Wuninitialized warning
Xiubo Li <[email protected]>
ceph: check availability of mds cluster on mount after wait timeout
Christophe Leroy <[email protected]>
powerpc/mm: Don't log user reads to 0xffffffff
Vasily Averin <[email protected]>
bpf: map_seq_next should always increase position index
Wei Hu <[email protected]>
video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.
Ronnie Sahlberg <[email protected]>
cifs: fix NULL dereference in match_prepath
Paulo Alcantara (SUSE) <[email protected]>
cifs: Fix mount options set in automount
Steve French <[email protected]>
cifs: fix unitialized variable poential problem with network I/O cache lock patch
Colin Ian King <[email protected]>
iwlegacy: ensure loop counter addr does not wrap and cause an infinite loop
Yan-Hsuan Chuang <[email protected]>
rtw88: fix potential NULL skb access in TX ISR
Nathan Chancellor <[email protected]>
hostap: Adjust indentation in prism2_hostapd_add_sta
Nicola Lunghi <[email protected]>
ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82
Vincenzo Frascino <[email protected]>
ARM: 8951/1: Fix Kexec compilation issue.
Ard Biesheuvel <[email protected]>
ARM: 8941/1: decompressor: enable CP15 barrier instructions in v7 cache setup code
Oliver O'Halloran <[email protected]>
selftests/eeh: Bump EEH wait time to 60s
Michael Bringmann <[email protected]>
powerpc/pseries/lparcfg: Fix display of Maximum Memory
zhangyi (F) <[email protected]>
jbd2: make sure ESHUTDOWN to be recorded in the journal superblock
zhangyi (F) <[email protected]>
jbd2: switch to use jbd2_journal_abort() when failed to submit the commit record
Lorenz Bauer <[email protected]>
selftests: bpf: Reset global state between reuseport test runs
Stephen Boyd <[email protected]>
alarmtimer: Make alarmtimer platform device child of RTC device
Lu Baolu <[email protected]>
iommu/vt-d: Remove unnecessary WARN_ON_ONCE()
Barret Rhoden <[email protected]>
iommu/vt-d: Mark firmware tainted if RMRR fails sanity check
Coly Li <[email protected]>
bcache: fix use-after-free in register_bcache()
Christoph Hellwig <[email protected]>
bcache: rework error unwinding in register_bcache
Liang Chen <[email protected]>
bcache: cached_dev_free needs to put the sb page
Nikolay Borisov <[email protected]>
btrfs: Fix split-brain handling when changing FSID to metadata uuid
David Sterba <[email protected]>
btrfs: separate definition of assertion failure handlers
Sergey Zakharchenko <[email protected]>
media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value
Oliver O'Halloran <[email protected]>
powerpc/sriov: Remove VF eeh_dev state when disabling SR-IOV
Olof Johansson <[email protected]>
net/mlx5e: Fix printk format warning
Ben Skeggs <[email protected]>
drm/nouveau/mmu: fix comptag memory leak
Trond Myklebust <[email protected]>
sunrpc: Fix potential leaks in sunrpc_cache_unhash()
Peter Große <[email protected]>
ALSA: hda - Add docking station support for Lenovo Thinkpad T420s
Chris Down <[email protected]>
bpf, btf: Always output invariant hit in pahole DWARF to BTF transform
Colin Ian King <[email protected]>
driver core: platform: fix u32 greater or equal to zero comparison
Sven Schnelle <[email protected]>
s390: fix __EMIT_BUG() macro
Vasily Gorbik <[email protected]>
s390/ftrace: generate traced function stack frame
Vasily Gorbik <[email protected]>
s390: adjust -mpacked-stack support check for clang 10
Masami Hiramatsu <[email protected]>
x86/decoder: Add TEST opcode to Group3-2
Shile Zhang <[email protected]>
objtool: Fix ARCH=x86_64 build error
Masahiro Yamada <[email protected]>
kbuild: use -S instead of -E for precise cc-option test in Kconfig
Michael Walle <[email protected]>
spi: spi-fsl-qspi: Ensure width is respected in spi-mem operations
Kai Vehmanen <[email protected]>
ALSA: hda/hdmi - add retry logic to parse_intel_hdmi()
John Garry <[email protected]>
irqchip/mbigen: Set driver .suppress_bind_attrs to avoid remove problems
Enric Balletbo i Serra <[email protected]>
regulator: core: Fix exported symbols to the exported GPL version
Brandon Maier <[email protected]>
remoteproc: Initialize rproc_class before use
Jessica Yu <[email protected]>
module: avoid setting info->name early in case we can fall back to info->mod->name
Anand Jain <[email protected]>
btrfs: device stats, log when stats are zeroed
David Sterba <[email protected]>
btrfs: safely advance counter when looking up bio csums
Johannes Thumshirn <[email protected]>
btrfs: fix possible NULL-pointer dereference in integrity checks
yu kuai <[email protected]>
pwm: Remove set but not set variable 'pwm'
Dan Carpenter <[email protected]>
ide: serverworks: potential overflow in svwks_set_pio_mode()
Dan Carpenter <[email protected]>
cmd64x: potential buffer overflow in cmd64x_program_timings()
Uwe Kleine-König <[email protected]>
pwm: omap-dmtimer: Remove PWM chip in .remove before making it unfunctional
Ard Biesheuvel <[email protected]>
x86/boot/compressed: Relax sed symbol type regex for LLVM ld.lld
Ard Biesheuvel <[email protected]>
efi/arm: Defer probe of PCIe backed efifb on DT systems
Ard Biesheuvel <[email protected]>
x86/mm: Fix NX bit clearing issue in kernel_map_pages_in_pgd
Chao Yu <[email protected]>
f2fs: fix memleak of kobject
Enric Balletbo i Serra <[email protected]>
regulator: vctrl-regulator: Avoid deadlock getting and setting the voltage
Cezary Rojewski <[email protected]>
ASoC: SOF: Intel: hda: Fix SKL dai count
Charles Keepax <[email protected]>
ASoC: wm_adsp: Correct cache handling of new kernel control API
Marco Elver <[email protected]>
debugobjects: Fix various data races
Arnd Bergmann <[email protected]>
x86/apic/uv: Avoid unused variable warning
Hanjun Guo <[email protected]>
ACPI/IORT: Fix 'Number of IDs' handling in iort_id_map()
Vladimir Oltean <[email protected]>
enetc: Don't print from enetc_sched_speed_set when link goes down
Thomas Gleixner <[email protected]>
watchdog/softlockup: Enforce that timestamp is valid on boot
Kim Phillips <[email protected]>
perf/x86/amd: Constrain Large Increment per Cycle events
Valentin Schneider <[email protected]>
sched/topology: Assert non-NUMA topology masks don't (partially) overlap
Li Guanglei <[email protected]>
sched/core: Fix size of rq::uclamp initialization
Lokesh Vutla <[email protected]>
arm64: dts: ti: k3-j721e-main: Add missing power-domains for smmu
zhengbin <[email protected]>
KVM: PPC: Remove set but not used variable 'ra', 'rs', 'rt'
Wei Yongjun <[email protected]>
EDAC/sifive: Fix return value check in ecc_register()
Jérôme Pouiller <[email protected]>
staging: wfx: fix possible overflow on jiffies comparaison
Jun Lei <[email protected]>
drm/amd/display: fixup DML dependencies
Sami Tolvanen <[email protected]>
arm64: fix alternatives with LLVM's integrated assembler
Sami Tolvanen <[email protected]>
arm64: lse: fix LSE atomics with LLVM's integrated assembler
Leon Romanovsky <[email protected]>
RDMA/mlx5: Don't fake udata for kernel path
Mika Westerberg <[email protected]>
pinctrl: tigerlake: Tiger Lake uses _HID enumeration
Chanwoo Choi <[email protected]>
PM / devfreq: Add debugfs support with devfreq_summary file
Alexander Tsoy <[email protected]>
ALSA: usb-audio: add implicit fb quirk for MOTU M Series
Geert Uytterhoeven <[email protected]>
crypto: essiv - fix AEAD capitalization and preposition use in help text
Zaibo Xu <[email protected]>
crypto: hisilicon - Bugfixed tfm leak
Zaibo Xu <[email protected]>
crypto: hisilicon - Update debugfs usage of SEC V2
Nick Black <[email protected]>
scsi: iscsi: Don't destroy session if there are outstanding connections
Stanley Chu <[email protected]>
scsi: ufs-mediatek: add apply_dev_quirks variant operation
Stanley Chu <[email protected]>
scsi: ufs: pass device information to apply_dev_quirks
Jaegeuk Kim <[email protected]>
f2fs: free sysfs kobject
Jaegeuk Kim <[email protected]>
f2fs: set I_LINKABLE early to avoid wrong access by vfs
Dan Carpenter <[email protected]>
ALSA: usb-audio: unlock on error in probe
Will Deacon <[email protected]>
iommu/arm-smmu-v3: Use WRITE_ONCE() when changing validity of an STE
Masahiro Yamada <[email protected]>
kbuild: remove *.tmp file when filechk fails
Tony Lindgren <[email protected]>
usb: musb: omap2430: Get rid of musb .set_vbus for omap2430 glue
Leonard Crestez <[email protected]>
perf/imx_ddr: Fix cpu hotplug state cleanup
Navid Emamdoost <[email protected]>
drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add
Stephen Boyd <[email protected]>
gpiolib: Set lockdep class for hierarchical irq domains
Mikulas Patocka <[email protected]>
dm thin: don't allow changing data device during thin-pool reload
Ben Skeggs <[email protected]>
drm/nouveau/fault/gv100-: fix memory leak on module unload
YueHaibing <[email protected]>
drm/nouveau/drm/ttm: Remove set but not used variable 'mem'
YueHaibing <[email protected]>
drm/nouveau: Fix copy-paste error in nouveau_fence_wait_uevent_handler
Ben Skeggs <[email protected]>
drm/nouveau/gr/gk20a,gm200-: add terminators to method lists read from fw
Dan Carpenter <[email protected]>
drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new()
Reto Schneider <[email protected]>
MIPS: ralink: dts: gardena_smart_gateway_mt7688: Limit UART1
Arnd Bergmann <[email protected]>
vme: bridges: reduce stack usage
Li RongQing <[email protected]>
bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map
Pierre-Louis Bossart <[email protected]>
ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare
Geert Uytterhoeven <[email protected]>
driver core: Print device when resources present in really_probe()
Simon Schwartz <[email protected]>
driver core: platform: Prevent resouce overflow from causing infinite loops
Arnd Bergmann <[email protected]>
visorbus: fix uninitialized variable access
Luc Van Oostenryck <[email protected]>
misc: xilinx_sdfec: fix xsdfec_poll()'s return type
Ioana Ciornei <[email protected]>
bus: fsl-mc: properly empty-initialize structure
Nathan Chancellor <[email protected]>
tty: synclink_gt: Adjust indentation in several functions
Nathan Chancellor <[email protected]>
tty: synclinkmp: Adjust indentation in several functions
Jason Gunthorpe <[email protected]>
RDMA/uverbs: Remove needs_kfree_rcu from uverbs_obj_type_class
Zhengyuan Liu <[email protected]>
raid6/test: fix a compilation warning
Chen Zhou <[email protected]>
ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m
Paul Burton <[email protected]>
ASoC: txx9: Remove unused rtd variable
Alexander Tsoy <[email protected]>
ALSA: usb-audio: Add boot quirk for MOTU M Series
Johan Jonker <[email protected]>
ARM: dts: rockchip: add reg property to brcmf sub node for rk3188-bqedison2qc
Johan Jonker <[email protected]>
arm64: dts: rockchip: add reg property to brcmf sub-nodes
Johan Jonker <[email protected]>
arm64: dts: rockchip: fix dwmmc clock name for rk3308
Johan Jonker <[email protected]>
arm64: dts: rockchip: fix dwmmc clock name for px30
Bartosz Golaszewski <[email protected]>
clocksource: davinci: only enable clockevents once tim34 is initialized
Arnd Bergmann <[email protected]>
wan: ixp4xx_hss: fix compile-testing on 64-bit
Changbin Du <[email protected]>
x86/nmi: Remove irq_work from the long duration NMI handler
Jonathan Lemon <[email protected]>
bnxt: Detach page from page pool before sending up the stack
Philipp Zabel <[email protected]>
Input: edt-ft5x06 - work around first register access error
Paul E. McKenney <[email protected]>
rcu: Use WRITE_ONCE() for assignments to ->pprev for hlist_nulls
Ard Biesheuvel <[email protected]>
efi/x86: Don't panic or BUG() on non-critical error conditions
Dmitry Osipenko <[email protected]>
soc/tegra: fuse: Correct straps' address for older Tegra124 device trees
Mike Marciniszyn <[email protected]>
IB/hfi1: Add RcvShortLengthErrCnt to hfi1stats
Mike Marciniszyn <[email protected]>
IB/hfi1: Add software counter for ctxt0 seq drop
Arnd Bergmann <[email protected]>
staging: rtl8188: avoid excessive stack usage
Yongqiang Niu <[email protected]>
drm/mediatek: Add gamma property according to hardware capability
Alan Maguire <[email protected]>
kunit: remove timeout dependence on sysctl_hung_task_timeout_seconds
Dan Carpenter <[email protected]>
selftests: Uninitialized variable in test_cgcore_proc_migration()
Jan Kara <[email protected]>
udf: Fix free space reporting for metadata and virtual partitions
Shuah Khan <[email protected]>
usbip: Fix unsafe unaligned pointer usage
Benjamin Gaignard <[email protected]>
ARM: dts: stm32: Add power-supply for DSI panel on stm32f469-disco
Dmitry Torokhov <[email protected]>
usb: dwc3: use proper initializers for property entries
Dingchen Zhang <[email protected]>
drm: remove the newline for CRC source name.
Wenpeng Liang <[email protected]>
RDMA/hns: Avoid printing address of mtt page
Arnd Bergmann <[email protected]>
mlx5: work around high stack usage with gcc
Felix Kuehling <[email protected]>
drm/amdkfd: Fix permissions of hang_hws
Jacob Pan <[email protected]>
iommu/vt-d: Avoid sending invalid page response
Jacob Pan <[email protected]>
iommu/vt-d: Match CPU and IOMMU paging mode
Jason Ekstrand <[email protected]>
ACPI: button: Add DMI quirk for Razer Blade Stealth 13 late 2019 lid switch
Shile Zhang <[email protected]>
x86/unwind/orc: Fix !CONFIG_MODULES build warning
Sam McNally <[email protected]>
ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one.
Alexey Kardashevskiy <[email protected]>
vfio/spapr/nvlink2: Skip unpinning pages on error exit
Andrey Zhizhikin <[email protected]>
tools lib api fs: Fix gcc9 stringop-truncation compilation error
Dmitry Torokhov <[email protected]>
net: phy: fixed_phy: fix use-after-free when checking link GPIO
Takashi Iwai <[email protected]>
ALSA: sh: Fix compile warning wrt const
Takashi Iwai <[email protected]>
ALSA: hda/realtek - Apply mic mute LED quirk for Dell E7xx laptops, too
Kunihiko Hayashi <[email protected]>
clk: uniphier: Add SCSSI clock gate for each channel
Stephen Boyd <[email protected]>
clk: Use parent node pointer during registration if necessary
Takashi Iwai <[email protected]>
ALSA: sh: Fix unused variable warnings
Icenowy Zheng <[email protected]>
clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock
Mitch Williams <[email protected]>
ice: add extra check for null Rx descriptor
Jiewei Ke <[email protected]>
RDMA/rxe: Fix error type of mmap_offset
Peter Rosin <[email protected]>
fbdev: fix numbering of fbcon options
Pierre-Louis Bossart <[email protected]>
ASoC: soc-topology: fix endianness issues
Kunihiko Hayashi <[email protected]>
reset: uniphier: Add SCSSI reset control for each channel
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7269: Fix CAN function GPIOs
Manasi Navare <[email protected]>
drm/fbdev: Fallback to non tiled mode if all tiles not present
Chanwoo Choi <[email protected]>
PM / devfreq: rk3399_dmc: Add COMPILE_TEST and HAVE_ARM_SMCCC dependency
Kamil Konieczny <[email protected]>
PM / devfreq: Change time stats to 64-bit
Arnd Bergmann <[email protected]>
PM / devfreq: exynos-ppmu: Fix excessive stack usage
Valdis Kletnieks <[email protected]>
x86/vdso: Provide missing include file
Vinay Kumar Yadav <[email protected]>
crypto: chtls - Fixed memory leak
Martin Blumenstingl <[email protected]>
net: phy: realtek: add logging for the RGMII TX delay configuration
Hechao Li <[email protected]>
bpf: Print error message for bpftool cgroup show
Sascha Hauer <[email protected]>
dmaengine: imx-sdma: Fix memory leak
YueHaibing <[email protected]>
clk: bm1800: Remove set but not used variable 'fref'
Logan Gunthorpe <[email protected]>
dmaengine: Store module owner in dma_device struct
Jerome Brunet <[email protected]>
clk: actually call the clock init before any other callback of the clock
Jeffrey Hugo <[email protected]>
clk: qcom: Add missing msm8998 gcc_bimc_gfx_clk
Qian Cai <[email protected]>
iommu/iova: Silence warnings under memory pressure
Suravee Suthikulpanit <[email protected]>
iommu/amd: Only support x2APIC with IVHD type 11h/40h
Suravee Suthikulpanit <[email protected]>
iommu/amd: Check feature support bit before accessing MSI capability registers
Greg Kroah-Hartman <[email protected]>
PCI/ATS: Restore EXPORT_SYMBOL_GPL() for pci_{enable,disable}_ats()
Bjorn Andersson <[email protected]>
arm64: dts: qcom: db845c: Enable ath10k 8bit host-cap quirk
James Smart <[email protected]>
scsi: lpfc: Fix: Rework setting of fdmi symbolic node name registration
Jaihind Yadav <[email protected]>
selinux: ensure we cleanup the internal AVC counters on error in avc_update()
Sibi Sankar <[email protected]>
remoteproc: q6v5-mss: Remove mem clk from the active pool
Geert Uytterhoeven <[email protected]>
ARM: dts: r8a7779: Add device node for ARM global timer
Sergei Shtylyov <[email protected]>
clk: renesas: rcar-gen3: Allow changing the RPC[D2] clocks
Bibby Hsieh <[email protected]>
drm/mediatek: handle events when enabling/disabling crtc
Brendan Higgins <[email protected]>
crypto: amlogic - add unspecified HAS_IOMEM dependency
Brendan Higgins <[email protected]>
crypto: inside-secure - add unspecified HAS_IOMEM dependency
Nathan Chancellor <[email protected]>
scsi: aic7xxx: Adjust indentation in ahc_find_syncrate
Can Guo <[email protected]>
scsi: ufs: Complete pending requests in host reset and restore path
Trond Myklebust <[email protected]>
nfsd: Clone should commit src file metadata too
Erik Kaneda <[email protected]>
ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1
Jeffrey Hugo <[email protected]>
clk: qcom: smd: Add missing bimc clock
Monk Liu <[email protected]>
drm/amdgpu: fix KIQ ring test fail in TDR of SRIOV
Monk Liu <[email protected]>
drm/amdgpu: fix double gpu_recovery for NV of SRIOV
Sung Lee <[email protected]>
drm/amd/display: Lower DPP DTO only when safe
Sung Lee <[email protected]>
drm/amd/display: Fix update_bw_bounding_box Calcs
Aditya Pakki <[email protected]>
orinoco: avoid assertion in case of NULL pointer
Phong Tran <[email protected]>
rtlwifi: rtl_pci: Fix -Wcast-function-type
Phong Tran <[email protected]>
iwlegacy: Fix -Wcast-function-type
Phong Tran <[email protected]>
ipw2x00: Fix -Wcast-function-type
Phong Tran <[email protected]>
b43legacy: Fix -Wcast-function-type
James Sewart <[email protected]>
PCI: Add DMA alias quirk for PLX PEX NTB
James Sewart <[email protected]>
PCI: Add nr_devfns parameter to pci_add_dma_alias()
Arnd Bergmann <[email protected]>
nfs: fix timstamp debug prints
Nathan Chancellor <[email protected]>
ALSA: usx2y: Adjust indentation in snd_usX2Y_hwdep_dsp_status
Xin Long <[email protected]>
netfilter: nft_tunnel: add the missing ERSPAN_VERSION nla_policy
Tero Kristo <[email protected]>
ARM: OMAP2+: pdata-quirks: add PRM data for reset support
Arnd Bergmann <[email protected]>
x86/mce/therm_throt: Mark throttle_active_work() as __maybe_unused
Arnd Bergmann <[email protected]>
isdn: don't mark kcapi_proc_exit as __exit
Aditya Pakki <[email protected]>
fore200e: Fix incorrect checks of NULL pointer dereference
Heiner Kallweit <[email protected]>
r8169: check that Realtek PHY driver module is loaded
Toke Høiland-Jørgensen <[email protected]>
samples/bpf: Set -fno-stack-protector when building BPF programs
Jan Kara <[email protected]>
reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling
Nathan Chancellor <[email protected]>
media: v4l2-device.h: Explicitly compare grp{id,mask} to zero in v4l2_device macros
Willem de Bruijn <[email protected]>
selftests/net: make so_txtime more robust to timer variance
Paul Cercueil <[email protected]>
gpu/drm: ingenic: Avoid null pointer deference in plane atomic update
Jakub Kicinski <[email protected]>
Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace"
Daniel Drake <[email protected]>
PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers
Daniel Drake <[email protected]>
PCI: Add generic quirk for increasing D3hot delay
Forest Crossman <[email protected]>
media: cx23885: Add support for AVerMedia CE310B
Wei Liu <[email protected]>
PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in
Tony Lindgren <[email protected]>
bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO
Lakshmi Ramasubramanian <[email protected]>
IMA: Check IMA policy flag
Andrey Smirnov <[email protected]>
ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed
Andrey Smirnov <[email protected]>
ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3
Krzysztof Kozlowski <[email protected]>
ARM: exynos_defconfig: Bring back explicitly wanted options
Abel Vesa <[email protected]>
clk: imx: Add correct failure handling for clk based helpers
Daniel Jordan <[email protected]>
padata: always acquire cpu_hotplug_lock before pinst->lock
Daniel Jordan <[email protected]>
padata: validate cpumask without removed CPU during offline
Manu Gautam <[email protected]>
arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core
Chen Wandun <[email protected]>
enetc: remove variable 'tc_max_sized_frame' set but not used
Paul Moore <[email protected]>
selinux: ensure we cleanup the internal AVC counters on error in avc_insert()
Viresh Kumar <[email protected]>
opp: Free static OPPs on errors while adding them
Andre Przywara <[email protected]>
arm: dts: allwinner: H3: Add PMU node
Andre Przywara <[email protected]>
arm64: dts: allwinner: H5: Add PMU node
Andre Przywara <[email protected]>
arm64: dts: allwinner: H6: Add PMU mode
Mao Wenan <[email protected]>
NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().
Thong Thai <[email protected]>
Revert "drm/amdgpu: enable VCN DPG on Raven and Raven2"
Rasmus Villemoes <[email protected]>
net/wan/fsl_ucc_hdlc: reject muram offsets above 64K
Miquel Raynal <[email protected]>
regulator: rk808: Lower log level on optional GPIOs being not available
Bard Liao <[email protected]>
ASoC: SOF: Intel: hda: solve MSI issues by merging ipc and stream irq handlers
Sathyanarayana Nujella <[email protected]>
ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682
Sathyanarayana Nujella <[email protected]>
ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's
Masami Hiramatsu <[email protected]>
modules: lockdep: Suppress suspicious RCU usage warning
Robin Murphy <[email protected]>
arm64: dts: rockchip: Fix NanoPC-T4 cooling maps
Adam Ford <[email protected]>
drm/panel: simple: Add Logic PD Type 28 display support
Nathan Chancellor <[email protected]>
drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG
Wen Gong <[email protected]>
ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
Chris Wilson <[email protected]>
drm/amdgpu/dm: Do not throw an error for a display with no audio
yu kuai <[email protected]>
drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table
Eric Yang <[email protected]>
drm/amd/display: Renoir chroma viewport WA
Jakub Sitnicki <[email protected]>
bpf, sockhash: Synchronize_rcu before free'ing map
Yong Zhao <[email protected]>
drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode
Douglas Anderson <[email protected]>
clk: qcom: rcg2: Don't crash if our parent can't be found; return an error
Stephen Boyd <[email protected]>
clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq()
Masahiro Yamada <[email protected]>
kconfig: fix broken dependency in randconfig-generated .config
Paolo Valente <[email protected]>
block, bfq: do not plug I/O for bfq_queues with no proc refs
Colin Ian King <[email protected]>
drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store
Chris Mason <[email protected]>
Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker
Christian Borntraeger <[email protected]>
KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups
Sun Ke <[email protected]>
nbd: add a flush_workqueue in nbd_start_device
Tom Zanussi <[email protected]>
tracing: Simplify assignment parsing for hist triggers
Harry Wentland <[email protected]>
drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero
Geert Uytterhoeven <[email protected]>
rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed
Matthieu Baerts <[email protected]>
selftests: settings: tests can be in subsubdirs
Jean-Philippe Brucker <[email protected]>
brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362
Ping-Ke Shih <[email protected]>
rtw88: fix rate mask for 1SS chip
Rakesh Pillai <[email protected]>
ath10k: Correct the DMA direction for management tx buffers
zhangyi (F) <[email protected]>
ext4, jbd2: ensure panic when aborting with zero errno
Vincenzo Frascino <[email protected]>
ARM: 8952/1: Disable kmemleak on XIP kernels
Steven Rostedt (VMware) <[email protected]>
tracing: Fix very unlikely race of registering two stat tracers
Luis Henriques <[email protected]>
tracing: Fix tracing_stat return values in error handling paths
Oliver O'Halloran <[email protected]>
powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov()
Chen Zhou <[email protected]>
backlight: qcom-wled: Fix unsigned comparison to zero
Niklas Schnelle <[email protected]>
s390/pci: Fix possible deadlock in recover_store()
Marc Zyngier <[email protected]>
irqchip/gic-v3-its: Fix get_vlpi_map() breakage with doorbells
Martin Schiller <[email protected]>
wan/hdlc_x25: fix skb handling
Chen Zhou <[email protected]>
dmaengine: fsl-qdma: fix duplicated argument to &&
Jan Kara <[email protected]>
udf: Allow writing to 'Rewritable' partitions
Uwe Kleine-König <[email protected]>
pwm: omap-dmtimer: Simplify error handling
Arvind Sankar <[email protected]>
x86/sysfb: Fix check for bad VRAM size
Grygorii Strashko <[email protected]>
clk: ti: dra7: fix parent for gmac_clkctrl
Eric Biggers <[email protected]>
ext4: fix deadlock allocating bio_post_read_ctx from mempool
Kai Li <[email protected]>
jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal
Siddhesh Poyarekar <[email protected]>
kselftest: Minimise dependency of get_size on C library interfaces
Amanda Liu <[email protected]>
drm/amd/display: Clear state after exiting fixed active VRR state
Colin Ian King <[email protected]>
clocksource/drivers/bcm2835_timer: Fix memory leak of timer
John Keeping <[email protected]>
usb: dwc2: Fix IN FIFO allocation
Jia-Ju Bai <[email protected]>
usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe()
Colin Ian King <[email protected]>
drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst
Philippe Schenker <[email protected]>
spi: fsl-lpspi: fix only one cs-gpio working
Tiecheng Zhou <[email protected]>
drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov
Jia-Ju Bai <[email protected]>
uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()
Lorenzo Bianconi <[email protected]>
iio: imu: st_lsm6dsx: check return value from st_lsm6dsx_sensor_set_enable
Zhengyuan Liu <[email protected]>
raid6/test: fix a compilation error
Linus Walleij <[email protected]>
net: ethernet: ixp4xx: Standard module init
David S. Miller <[email protected]>
sparc: Add .exit.data section.
Ard Biesheuvel <[email protected]>
efi/x86: Map the entire EFI vendor string before copying it
Masami Hiramatsu <[email protected]>
kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic
Hans de Goede <[email protected]>
pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins
Parav Pandit <[email protected]>
IB/core: Let IB core distribute cache update events
YueHaibing <[email protected]>
kernel/module: Fix memleak in module_add_modinfo_attrs()
Jia-Ju Bai <[email protected]>
media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run()
Sergey Senozhatsky <[email protected]>
char/random: silence a lockdep splat with printk()
Heinz Mauelshagen <[email protected]>
dm raid: table line rebuild status fixes
Sebastian Andrzej Siewior <[email protected]>
x86/fpu: Deactivate FPU state after failure during state load
Jacob Pan <[email protected]>
iommu/vt-d: Fix off-by-one in PASID allocation
Jia-Ju Bai <[email protected]>
gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap()
Martin Blumenstingl <[email protected]>
clk: meson: meson8b: make the CCF use the glitch-free mali mux
Oliver O'Halloran <[email protected]>
powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number
Eugen Hristev <[email protected]>
clk: at91: sam9x60: fix programmable clock prescaler
Chen-Yu Tsai <[email protected]>
media: sun4i-csi: Fix [HV]sync polarity handling
Chen-Yu Tsai <[email protected]>
media: sun4i-csi: Fix data sampling polarity handling
Chen-Yu Tsai <[email protected]>
media: sun4i-csi: Deal with DRAM offset
Eugen Hristev <[email protected]>
media: i2c: mt9v032: fix enum mbus codes and frame sizes
Adam Ford <[email protected]>
media: ov5640: Fix check for PLL1 exceeding max allowed rate
Christophe JAILLET <[email protected]>
pxa168fb: Fix the function used to release some memory in an error handling path
Rob Clark <[email protected]>
drm/msm/adreno: fix zap vs no-zap handling
Geert Uytterhoeven <[email protected]>
drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank()
John Ogness <[email protected]>
printk: fix exclusive_console replaying
Geert Uytterhoeven <[email protected]>
pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs
Vladimir Oltean <[email protected]>
gianfar: Fix TX timestamping with a stacked DSA driver
Takashi Sakamoto <[email protected]>
ALSA: ctl: allow TLV read operation for callback type of element in locked case
Ritesh Harjani <[email protected]>
ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT
Zahari Petkov <[email protected]>
leds: pca963x: Fix open-drain initialization
Nikola Cornij <[email protected]>
drm/amd/display: Map ODM memory correctly when doing ODM combine
James Sewart <[email protected]>
PCI: Fix pci_add_dma_alias() bitmask size
Dan Carpenter <[email protected]>
brcmfmac: Fix use after free in brcmf_sdio_readframes()
Navid Emamdoost <[email protected]>
brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
Wei Yongjun <[email protected]>
dmaengine: ti: edma: Fix error return code in edma_probe()
Geert Uytterhoeven <[email protected]>
drm: rcar-du: Recognize "renesas,vsps" in addition to "vsps"
Peter Zijlstra <[email protected]>
cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order
Remi Pommarel <[email protected]>
clk: meson: pll: Fix by 0 division in __pll_params_to_rate()
Colin Ian King <[email protected]>
media: meson: add missing allocation failure check on new_buf
Jaegeuk Kim <[email protected]>
f2fs: call f2fs_balance_fs outside of locked page
Jaegeuk Kim <[email protected]>
f2fs: preallocate DIO blocks when forcing buffered_io
Chuhong Yuan <[email protected]>
dmaengine: ti: edma: add missed operations
Marco Elver <[email protected]>
rcu: Fix data-race due to atomic_t copy-by-value
Rasmus Villemoes <[email protected]>
soc: fsl: qe: change return type of cpm_muram_alloc() to s32
Neeraj Upadhyay <[email protected]>
rcu: Fix missed wakeup of exp_wq waiters
Stefan Reiter <[email protected]>
rcu/nocb: Fix dump_tree hierarchy print always active
J. Bruce Fields <[email protected]>
nfsd4: avoid NULL deference on strange COPY compounds
Markus Elfring <[email protected]>
drm/qxl: Complete exception handling in qxl_device_init()
Gerd Hoffmann <[email protected]>
drm/virtio: fix byteorder handling in virtio_gpu_cmd_transfer_{from, to}_host_3d functions
Colin Ian King <[email protected]>
wil6210: fix break that is never reached because of zero'ing of a retry counter
Jeffrey Hugo <[email protected]>
ath10k: Fix qmi init error handling
Colin Ian King <[email protected]>
drm/dp_mst: fix multiple frees of tx->bytes
Paul Kocialkowski <[email protected]>
drm/gma500: Fixup fbdev stolen size usage evaluation
Davide Caratti <[email protected]>
net/sched: flower: add missing validation of TCA_FLOWER_FLAGS
Davide Caratti <[email protected]>
net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS
Per Forlin <[email protected]>
net: dsa: tag_qca: Make sure there is headroom for tag
Eric Dumazet <[email protected]>
net/smc: fix leak of kernel memory to user space
Firo Yang <[email protected]>
enic: prevent waking up stopped tx queues over watchdog reset
Toke Høiland-Jørgensen <[email protected]>
core: Don't skip generic XDP program execution for cloned SKBs
-------------
Diffstat:
.../admin-guide/device-mapper/dm-raid.rst | 2 +
Documentation/fb/fbcon.rst | 8 +-
Makefile | 6 +-
arch/Kconfig | 3 +
arch/arm/Kconfig | 4 +-
arch/arm/boot/compressed/head.S | 13 +
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 7 +-
arch/arm/boot/dts/r8a7779.dtsi | 8 +
arch/arm/boot/dts/rk3188-bqedison2qc.dts | 3 +
arch/arm/boot/dts/stm32f469-disco.dts | 8 +
arch/arm/boot/dts/sun8i-h3.dtsi | 15 +-
arch/arm/configs/exynos_defconfig | 6 +
arch/arm/mach-omap2/pdata-quirks.c | 8 +
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 16 +-
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 +
arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 +
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +
arch/arm64/boot/dts/rockchip/px30.dtsi | 6 +-
arch/arm64/boot/dts/rockchip/rk3308.dtsi | 6 +-
arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 3 +
.../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 3 +
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 27 -
arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 3 +
arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 1 +
arch/arm64/include/asm/alternative.h | 32 +-
arch/arm64/include/asm/atomic_lse.h | 19 +
arch/arm64/include/asm/lse.h | 6 +-
arch/microblaze/kernel/cpu/cache.c | 3 +-
.../dts/ralink/gardena_smart_gateway_mt7688.dts | 3 +
arch/powerpc/Makefile.postlink | 4 +-
arch/powerpc/kernel/eeh_driver.c | 6 -
arch/powerpc/kernel/pci_dn.c | 15 +-
arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +-
arch/powerpc/kvm/emulate_loadstore.c | 5 -
arch/powerpc/mm/fault.c | 3 +
arch/powerpc/platforms/powernv/pci-ioda.c | 48 +-
arch/powerpc/platforms/powernv/pci.c | 18 -
arch/powerpc/platforms/pseries/lparcfg.c | 4 +-
arch/powerpc/tools/relocs_check.sh | 20 +-
arch/s390/Makefile | 2 +-
arch/s390/boot/head.S | 2 +-
arch/s390/include/asm/bug.h | 16 +-
arch/s390/include/asm/pci.h | 2 +-
arch/s390/kernel/entry.h | 1 +
arch/s390/kernel/mcount.S | 15 +-
arch/s390/kernel/pgm_check.S | 2 +-
arch/s390/kernel/traps.c | 41 +-
arch/s390/kvm/interrupt.c | 6 +-
arch/s390/pci/pci.c | 2 +-
arch/s390/pci/pci_clp.c | 48 +-
arch/s390/pci/pci_sysfs.c | 63 ++-
arch/sh/include/cpu-sh2a/cpu/sh7269.h | 11 +-
arch/sparc/kernel/vmlinux.lds.S | 6 +-
arch/x86/boot/Makefile | 2 +-
arch/x86/entry/vdso/vdso32-setup.c | 1 +
arch/x86/events/amd/core.c | 91 ++--
arch/x86/events/perf_event.h | 2 +
arch/x86/include/asm/nmi.h | 1 -
arch/x86/kernel/apic/x2apic_uv_x.c | 43 +-
arch/x86/kernel/cpu/mce/therm_throt.c | 2 +-
arch/x86/kernel/fpu/signal.c | 3 +
arch/x86/kernel/nmi.c | 20 +-
arch/x86/kernel/sysfb_simplefb.c | 2 +-
arch/x86/kernel/unwind_orc.c | 3 +-
arch/x86/lib/x86-opcode-map.txt | 2 +-
arch/x86/mm/pageattr.c | 8 +-
arch/x86/platform/efi/efi.c | 41 +-
arch/x86/platform/efi/efi_64.c | 9 +-
block/bfq-iosched.c | 12 +
crypto/Kconfig | 4 +-
drivers/acpi/acpica/dsfield.c | 2 +-
drivers/acpi/acpica/dswload.c | 21 +
drivers/acpi/arm64/iort.c | 57 ++-
drivers/acpi/button.c | 11 +
drivers/atm/fore200e.c | 25 +-
drivers/base/dd.c | 5 +-
drivers/base/platform.c | 12 +-
drivers/block/brd.c | 22 +-
drivers/block/nbd.c | 10 +
drivers/block/rbd.c | 2 +-
drivers/block/zram/zram_drv.c | 3 +-
drivers/bus/fsl-mc/fsl-mc-bus.c | 6 +-
drivers/bus/ti-sysc.c | 10 +-
drivers/char/hpet.c | 2 +-
drivers/char/random.c | 5 +-
drivers/clk/at91/sam9x60.c | 1 +
drivers/clk/clk-bm1880.c | 3 +-
drivers/clk/clk.c | 53 +-
drivers/clk/imx/clk.h | 37 +-
drivers/clk/meson/clk-pll.c | 9 +
drivers/clk/meson/meson8b.c | 11 +-
drivers/clk/qcom/clk-rcg2.c | 11 +-
drivers/clk/qcom/clk-smd-rpm.c | 3 +
drivers/clk/qcom/gcc-msm8998.c | 14 +
drivers/clk/renesas/rcar-gen3-cpg.c | 6 +-
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 +-
drivers/clk/ti/clk-7xx.c | 2 +-
drivers/clk/uniphier/clk-uniphier-peri.c | 13 +-
drivers/clocksource/bcm2835_timer.c | 5 +-
drivers/clocksource/timer-davinci.c | 8 +-
drivers/crypto/Kconfig | 2 +-
drivers/crypto/amlogic/Kconfig | 1 +
drivers/crypto/chelsio/chtls/chtls_cm.c | 27 +-
drivers/crypto/chelsio/chtls/chtls_cm.h | 21 +
drivers/crypto/chelsio/chtls/chtls_hw.c | 3 +
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +-
drivers/crypto/hisilicon/hpre/hpre_main.c | 24 +-
drivers/crypto/hisilicon/sec2/sec.h | 2 +-
drivers/crypto/hisilicon/sec2/sec_crypto.c | 8 +-
drivers/crypto/hisilicon/sec2/sec_main.c | 18 +-
drivers/devfreq/Kconfig | 3 +-
drivers/devfreq/devfreq.c | 96 +++-
drivers/devfreq/event/Kconfig | 2 +-
drivers/devfreq/event/exynos-ppmu.c | 13 +-
drivers/dma/dmaengine.c | 4 +-
drivers/dma/fsl-qdma.c | 2 +-
drivers/dma/imx-sdma.c | 19 +-
drivers/dma/ti/edma.c | 39 +-
drivers/edac/sifive_edac.c | 4 +-
drivers/firmware/efi/arm-init.c | 107 +++-
drivers/gpio/gpio-grgpio.c | 10 +-
drivers/gpio/gpiolib.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 19 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -
drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 +-
drivers/gpu/drm/amd/amdgpu/nv.c | 6 +
drivers/gpu/drm/amd/amdgpu/soc15.c | 8 +-
drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 +
drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 2 +-
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +-
.../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 -
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 34 +-
.../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 16 +-
.../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.h | 2 +-
.../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 8 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +-
drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +-
drivers/gpu/drm/amd/display/dc/dc.h | 2 +
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 +-
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 65 ++-
.../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 12 +-
.../gpu/drm/amd/display/dc/dml/dml_common_defs.c | 2 +-
.../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 2 +-
.../amd/display/dc/{calcs => inc}/dcn_calc_math.h | 0
.../drm/amd/display/modules/freesync/freesync.c | 2 +
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 23 +-
drivers/gpu/drm/drm_client_modeset.c | 72 +++
drivers/gpu/drm/drm_debugfs_crc.c | 4 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 4 +-
drivers/gpu/drm/drm_mipi_dbi.c | 4 +-
drivers/gpu/drm/gma500/framebuffer.c | 8 +-
drivers/gpu/drm/ingenic/ingenic-drm.c | 16 +-
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 +-
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +-
drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 +-
drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 -
drivers/gpu/drm/nouveau/nvkm/core/memory.c | 2 +-
.../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 2 +
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 21 +-
drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 1 +
.../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 5 +-
drivers/gpu/drm/panel/panel-simple.c | 37 ++
drivers/gpu/drm/qxl/qxl_kms.c | 2 +-
drivers/gpu/drm/radeon/radeon_display.c | 2 +
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 17 +-
drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +-
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +-
drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +-
drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +-
drivers/ide/cmd64x.c | 3 +
drivers/ide/serverworks.c | 6 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +-
drivers/infiniband/core/cache.c | 121 +++--
drivers/infiniband/core/core_priv.h | 1 +
drivers/infiniband/core/device.c | 33 +-
drivers/infiniband/core/rdma_core.c | 23 +-
drivers/infiniband/hw/hfi1/chip.c | 11 +
drivers/infiniband/hw/hfi1/chip.h | 2 +
drivers/infiniband/hw/hfi1/chip_registers.h | 1 +
drivers/infiniband/hw/hfi1/driver.c | 1 +
drivers/infiniband/hw/hfi1/hfi.h | 2 +
drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +-
drivers/infiniband/hw/mlx5/main.c | 34 +-
drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +-
drivers/input/touchscreen/edt-ft5x06.c | 7 +
drivers/iommu/amd_iommu.c | 7 +-
drivers/iommu/amd_iommu_init.c | 19 +-
drivers/iommu/amd_iommu_types.h | 2 +-
drivers/iommu/arm-smmu-v3.c | 3 +-
drivers/iommu/dmar.c | 1 -
drivers/iommu/intel-iommu.c | 15 +-
drivers/iommu/intel-pasid.c | 12 +-
drivers/iommu/intel-svm.c | 9 +-
drivers/iommu/iova.c | 2 +-
drivers/irqchip/irq-gic-v3-its.c | 13 +-
drivers/irqchip/irq-gic-v3.c | 9 +-
drivers/irqchip/irq-mbigen.c | 1 +
drivers/isdn/capi/kcapi_proc.c | 2 +-
drivers/leds/leds-pca963x.c | 8 +-
drivers/md/bcache/bset.h | 3 +-
drivers/md/bcache/journal.c | 3 +-
drivers/md/bcache/stats.c | 10 +-
drivers/md/bcache/super.c | 79 +--
drivers/md/dm-raid.c | 43 +-
drivers/md/dm-thin.c | 18 +-
drivers/media/i2c/mt9v032.c | 10 +-
drivers/media/i2c/ov5640.c | 2 +-
drivers/media/pci/cx23885/cx23885-cards.c | 24 +
drivers/media/pci/cx23885/cx23885-video.c | 3 +-
drivers/media/pci/cx23885/cx23885.h | 1 +
drivers/media/platform/sti/bdisp/bdisp-hw.c | 6 +-
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 22 +
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h | 4 +-
drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 20 +-
drivers/media/usb/uvc/uvc_driver.c | 25 +
drivers/media/usb/uvc/uvcvideo.h | 1 +
drivers/misc/xilinx_sdfec.c | 10 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 +
drivers/net/ethernet/cisco/enic/enic_main.c | 2 +-
drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 +-
drivers/net/ethernet/freescale/gianfar.c | 10 +-
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +-
drivers/net/ethernet/intel/ice/ice_txrx.c | 13 +-
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 3 +
drivers/net/ethernet/mellanox/mlx5/core/wq.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 6 +-
drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 8 +-
.../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 3 +-
drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 +-
drivers/net/ethernet/realtek/r8169_main.c | 9 +
drivers/net/ethernet/xscale/ixp4xx_eth.c | 96 ++--
drivers/net/phy/fixed_phy.c | 7 +-
drivers/net/phy/realtek.c | 19 +-
drivers/net/wan/fsl_ucc_hdlc.c | 5 +
drivers/net/wan/hdlc_x25.c | 13 +-
drivers/net/wan/ixp4xx_hss.c | 4 +-
drivers/net/wireless/ath/ath10k/snoc.c | 5 +-
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 +-
drivers/net/wireless/ath/ath10k/wmi.c | 2 +-
drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 +-
drivers/net/wireless/broadcom/b43legacy/main.c | 5 +-
.../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 +-
.../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +-
drivers/net/wireless/intel/ipw2x00/ipw2100.c | 7 +-
drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +-
drivers/net/wireless/intel/iwlegacy/3945-mac.c | 5 +-
drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 +-
drivers/net/wireless/intel/iwlegacy/common.c | 2 +-
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +-
drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +-
drivers/net/wireless/intersil/hostap/hostap_ap.c | 2 +-
.../net/wireless/intersil/orinoco/orinoco_usb.c | 3 +-
drivers/net/wireless/realtek/rtlwifi/pci.c | 10 +-
drivers/net/wireless/realtek/rtw88/main.c | 12 +-
drivers/net/wireless/realtek/rtw88/pci.c | 5 +
drivers/nfc/port100.c | 2 +-
drivers/nvme/host/pci.c | 23 +-
drivers/nvme/target/core.c | 17 +-
drivers/nvme/target/io-cmd-bdev.c | 2 +-
drivers/nvme/target/io-cmd-file.c | 2 +-
drivers/nvme/target/nvmet.h | 1 +
drivers/opp/of.c | 17 +-
drivers/pci/ats.c | 2 +
drivers/pci/controller/pcie-iproc.c | 24 +
drivers/pci/pci.c | 24 +-
drivers/pci/pci.h | 3 +
drivers/pci/quirks.c | 99 ++--
drivers/pci/search.c | 4 +-
drivers/perf/fsl_imx8_ddr_perf.c | 16 +-
drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +-
drivers/pinctrl/intel/pinctrl-tigerlake.c | 547 ++++++++++-----------
drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 +-
drivers/pinctrl/sh-pfc/pfc-sh7269.c | 39 +-
drivers/pwm/pwm-omap-dmtimer.c | 35 +-
drivers/pwm/pwm-pca9685.c | 4 -
drivers/regulator/core.c | 2 +
drivers/regulator/rk808-regulator.c | 2 +-
drivers/regulator/vctrl-regulator.c | 38 +-
drivers/remoteproc/qcom_q6v5_mss.c | 1 -
drivers/remoteproc/remoteproc_core.c | 2 +-
drivers/reset/reset-uniphier.c | 13 +-
drivers/rtc/Kconfig | 8 +-
drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +-
drivers/scsi/iscsi_tcp.c | 4 +
drivers/scsi/lpfc/lpfc_ct.c | 42 +-
drivers/scsi/scsi_transport_iscsi.c | 26 +-
drivers/scsi/ufs/ufs-mediatek.c | 11 +
drivers/scsi/ufs/ufs-qcom.c | 3 +-
drivers/scsi/ufs/ufshcd.c | 32 +-
drivers/scsi/ufs/ufshcd.h | 9 +-
drivers/soc/fsl/qe/qe_common.c | 29 +-
drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +-
drivers/spi/spi-fsl-lpspi.c | 32 +-
drivers/spi/spi-fsl-qspi.c | 2 +-
drivers/staging/media/meson/vdec/vdec.c | 2 +
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 9 +-
drivers/staging/wfx/data_tx.c | 14 +-
drivers/tty/synclink_gt.c | 18 +-
drivers/tty/synclinkmp.c | 24 +-
drivers/uio/uio_dmem_genirq.c | 6 +-
drivers/usb/dwc2/gadget.c | 3 +-
drivers/usb/dwc3/host.c | 6 +-
drivers/usb/gadget/udc/gr_udc.c | 16 +-
drivers/usb/musb/omap2430.c | 2 -
drivers/vfio/pci/vfio_pci_nvlink2.c | 6 +-
drivers/video/backlight/qcom-wled.c | 4 +-
drivers/video/fbdev/Kconfig | 1 +
drivers/video/fbdev/hyperv_fb.c | 182 +++++--
drivers/video/fbdev/pxa168fb.c | 6 +-
drivers/virtio/virtio_balloon.c | 2 +
drivers/visorbus/visorchipset.c | 11 +-
drivers/vme/bridges/vme_fake.c | 30 +-
fs/btrfs/check-integrity.c | 3 +-
fs/btrfs/ctree.h | 20 +-
fs/btrfs/file-item.c | 3 +-
fs/btrfs/inode.c | 121 ++++-
fs/btrfs/volumes.c | 44 +-
fs/ceph/mds_client.c | 3 +-
fs/ceph/super.c | 5 +
fs/cifs/cifs_dfs_ref.c | 97 ++--
fs/cifs/connect.c | 6 +-
fs/cifs/dfs_cache.c | 2 +-
fs/cifs/smb2pdu.c | 3 +
fs/ext4/file.c | 10 +-
fs/ext4/readpage.c | 17 +-
fs/f2fs/data.c | 13 -
fs/f2fs/file.c | 50 +-
fs/f2fs/namei.c | 27 +-
fs/f2fs/sysfs.c | 12 +-
fs/fuse/file.c | 12 +
fs/jbd2/checkpoint.c | 2 +-
fs/jbd2/commit.c | 4 +-
fs/jbd2/journal.c | 24 +-
fs/nfs/nfs42proc.c | 4 +-
fs/nfs/nfs4xdr.c | 10 +-
fs/nfsd/nfs4proc.c | 3 +-
fs/nfsd/vfs.c | 19 +-
fs/ocfs2/dlm/Makefile | 2 -
fs/ocfs2/dlm/dlmast.c | 8 +-
fs/ocfs2/dlm/dlmconvert.c | 8 +-
fs/ocfs2/dlm/dlmdebug.c | 8 +-
fs/ocfs2/dlm/dlmdomain.c | 8 +-
fs/ocfs2/dlm/dlmlock.c | 8 +-
fs/ocfs2/dlm/dlmmaster.c | 8 +-
fs/ocfs2/dlm/dlmrecovery.c | 8 +-
fs/ocfs2/dlm/dlmthread.c | 8 +-
fs/ocfs2/dlm/dlmunlock.c | 8 +-
fs/ocfs2/dlmfs/Makefile | 2 -
fs/ocfs2/dlmfs/dlmfs.c | 4 +-
fs/ocfs2/dlmfs/userdlm.c | 6 +-
fs/ocfs2/journal.h | 8 +-
fs/orangefs/orangefs-debugfs.c | 1 +
fs/reiserfs/stree.c | 3 +-
fs/reiserfs/super.c | 2 +-
fs/udf/super.c | 23 +-
include/dt-bindings/clock/qcom,gcc-msm8998.h | 1 +
include/linux/cpuhotplug.h | 1 +
include/linux/devfreq.h | 4 +-
include/linux/dmaengine.h | 2 +
include/linux/list_nulls.h | 8 +-
include/linux/pci.h | 2 +-
include/linux/platform_data/ti-sysc.h | 1 +
include/linux/raid/pq.h | 3 +-
include/linux/rculist_nulls.h | 8 +-
include/media/v4l2-device.h | 12 +-
include/rdma/ib_verbs.h | 9 +-
include/rdma/uverbs_types.h | 1 -
include/soc/fsl/qe/qe.h | 16 +-
include/trace/events/rcu.h | 4 +-
kernel/bpf/inode.c | 3 +-
kernel/cpu.c | 13 +-
kernel/kprobes.c | 67 ++-
kernel/module.c | 20 +-
kernel/padata.c | 34 +-
kernel/printk/printk.c | 4 +-
kernel/rcu/tree.c | 11 +-
kernel/rcu/tree_exp.h | 2 +-
kernel/rcu/tree_plugin.h | 22 +-
kernel/sched/core.c | 3 +-
kernel/sched/topology.c | 39 ++
kernel/time/alarmtimer.c | 20 +-
kernel/trace/ftrace.c | 5 +-
kernel/trace/trace_events_hist.c | 123 ++---
kernel/trace/trace_events_trigger.c | 5 +-
kernel/trace/trace_stat.c | 31 +-
kernel/watchdog.c | 10 +-
lib/debugobjects.c | 46 +-
lib/kunit/try-catch.c | 22 +-
lib/raid6/mktables.c | 2 +-
lib/scatterlist.c | 2 +-
net/core/dev.c | 4 +-
net/core/filter.c | 2 +-
net/core/sock_map.c | 3 +
net/dsa/tag_qca.c | 2 +-
net/netfilter/nft_tunnel.c | 3 +-
net/sched/cls_flower.c | 1 +
net/sched/cls_matchall.c | 1 +
net/smc/smc_diag.c | 5 +-
net/sunrpc/cache.c | 2 +
samples/bpf/Makefile | 1 +
scripts/Kbuild.include | 15 +-
scripts/Kconfig.include | 2 +-
scripts/kconfig/confdata.c | 2 +-
scripts/link-vmlinux.sh | 4 +-
security/integrity/ima/ima_main.c | 3 +
security/selinux/avc.c | 53 +-
sound/core/control.c | 5 +-
sound/pci/hda/patch_conexant.c | 1 +
sound/pci/hda/patch_hdmi.c | 7 +-
sound/pci/hda/patch_realtek.c | 10 +-
sound/sh/aica.c | 4 +-
sound/sh/sh_dac_audio.c | 3 -
sound/soc/atmel/Kconfig | 2 +
sound/soc/codecs/wm_adsp.c | 98 ++--
sound/soc/intel/boards/bxt_da7219_max98357a.c | 14 +-
sound/soc/intel/boards/bxt_rt298.c | 14 +-
sound/soc/intel/boards/cml_rt1011_rt5682.c | 13 +-
sound/soc/intel/boards/glk_rt5682_max98357a.c | 16 +-
sound/soc/intel/boards/sof_rt5682.c | 58 ++-
sound/soc/soc-topology.c | 42 +-
sound/soc/sof/intel/apl.c | 1 -
sound/soc/sof/intel/cnl.c | 5 -
sound/soc/sof/intel/hda-dai.c | 3 -
sound/soc/sof/intel/hda-ipc.c | 23 +-
sound/soc/sof/intel/hda-stream.c | 20 +-
sound/soc/sof/intel/hda.c | 69 ++-
sound/soc/sof/intel/hda.h | 13 +-
sound/soc/txx9/txx9aclc.c | 1 -
sound/usb/card.c | 4 +
sound/usb/format.c | 3 +
sound/usb/pcm.c | 4 +
sound/usb/quirks.c | 38 ++
sound/usb/quirks.h | 5 +
sound/usb/usx2y/usX2Yhwdep.c | 2 +-
tools/arch/x86/lib/x86-opcode-map.txt | 2 +-
tools/bpf/bpftool/cgroup.c | 56 ++-
tools/lib/api/fs/fs.c | 4 +-
tools/objtool/Makefile | 6 +-
.../testing/selftests/bpf/test_select_reuseport.c | 16 +-
tools/testing/selftests/cgroup/test_core.c | 2 +-
tools/testing/selftests/kselftest/runner.sh | 2 +-
tools/testing/selftests/net/so_txtime.c | 84 +++-
tools/testing/selftests/net/so_txtime.sh | 9 +-
.../testing/selftests/powerpc/eeh/eeh-functions.sh | 10 +-
tools/testing/selftests/size/get_size.c | 24 +-
.../tc-testing/tc-tests/filters/basic.json | 51 ++
tools/usb/usbip/src/usbip_network.c | 40 +-
tools/usb/usbip/src/usbip_network.h | 12 +-
450 files changed, 4343 insertions(+), 2389 deletions(-)Greg Kroah-Hartman
maintainerPATCH 1/399 core: Dont skip generic XDP program execution for cloned SKBs
From: "Toke H�iland-J�rgensen" <[email protected]>
[ Upstream commit ad1e03b2b3d4430baaa109b77bc308dc73050de3 ]
The current generic XDP handler skips execution of XDP programs entirely if an SKB is marked as cloned. This leads to some surprising behaviour, as packets can end up being cloned in various ways, which will make an XDP program not see all the traffic on an interface.
This was discovered by a simple test case where an XDP program that always returns XDP_DROP is installed on a veth device. When combining this with the Scapy packet sniffer (which uses an AF_PACKET) socket on the sending side, SKBs reliably end up in the cloned state, causing them to be passed through to the receiving interface instead of being dropped. A minimal reproducer script for this is included below.
This patch fixed the issue by simply triggering the existing linearisation code for cloned SKBs instead of skipping the XDP program execution. This behaviour is in line with the behaviour of the native XDP implementation for the veth driver, which will reallocate and copy the SKB data if the SKB is marked as shared.
Reproducer Python script (requires BCC and Scapy):
from scapy.all import TCP, IP, Ether, sendp, sniff, AsyncSniffer, Raw, UDP from bcc import BPF
import time, sys, subprocess, shlex
SKB_MODE = (1 << 1)DRV_MODE = (1 << 2)
PYTHON=sys.executable
def client():
time.sleep(2)
# Sniffing on the sender causes skb_cloned() to be set
s = AsyncSniffer()
s.start()
for p in range(10):
sendp(Ether(dst="aa:aa:aa:aa:aa:aa", src="cc:cc:cc:cc:cc:cc")/IP()/UDP()/Raw("Test"),
verbose=False)
time.sleep(0.1)
s.stop()
return 0def server(mode):
prog = BPF(text="int dummy_drop(struct xdp_md *ctx) {return XDP_DROP;}") func = prog.load_func("dummy_drop", BPF.XDP) prog.attach_xdp("a_to_b", func, mode)
time.sleep(1)
s = sniff(iface="a_to_b", count=10, timeout=15) if len(s):
print(f"Got {len(s)} packets - should have gotten 0") return 1
else:
print("Got no packets - as expected") return 0
if len(sys.argv) < 2:
print(f"Usage: {sys.argv[0]} <skb|drv>")
sys.exit(1)if sys.argv[1] == "client":
sys.exit(client())
elif sys.argv[1] == "server":
mode = SKB_MODE if sys.argv[2] == 'skb' else DRV_MODE
sys.exit(server(mode))else:
try:
mode = sys.argv[1]
if mode not in ('skb', 'drv'):
print(f"Usage: {sys.argv[0]} <skb|drv>") sys.exit(1)
print(f"Running in {mode} mode")
for cmd in [
'ip netns add netns_a',
'ip netns add netns_b',
'ip -n netns_a link add a_to_b type veth peer name b_to_a netns netns_b', # Disable ipv6 to make sure there's no address autoconf traffic 'ip netns exec netns_a sysctl -qw net.ipv6.conf.a_to_b.disable_ipv6=1', 'ip netns exec netns_b sysctl -qw net.ipv6.conf.b_to_a.disable_ipv6=1', 'ip -n netns_a link set dev a_to_b address aa:aa:aa:aa:aa:aa', 'ip -n netns_b link set dev b_to_a address cc:cc:cc:cc:cc:cc', 'ip -n netns_a link set dev a_to_b up',
'ip -n netns_b link set dev b_to_a up']:
subprocess.check_call(shlex.split(cmd))
server = subprocess.Popen(shlex.split(f"ip netns exec netns_a {PYTHON} {sys.argv[0]} server {mode}")) client = subprocess.Popen(shlex.split(f"ip netns exec netns_b {PYTHON} {sys.argv[0]} client"))
client.wait()
server.wait()
sys.exit(server.returncode)
finally:
subprocess.run(shlex.split("ip netns delete netns_a")) subprocess.run(shlex.split("ip netns delete netns_b"))
--- net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/dev.c +2 -2
@@ -4477,14 +4477,14 @@ static u32 netif_receive_generic_xdp(str/* Reinjected packets coming from act_mirred or similar should * not get XDP generic processing. */ -if (skb_cloned (skb) ||skb_is_tc_redirected (skb)) +if (skb_is_tc_redirected (skb))return XDP_PASS ;/* XDP packets must be linear and must have sufficient headroom * of XDP_PACKET_HEADROOM bytes. This is the guarantee that also * native XDP provides, thus we need to do it here as well. */ -if (skb_is_nonlinear (skb) || +if (skb_cloned (skb) ||skb_is_nonlinear (skb) ||skb_headroom (skb) <XDP_PACKET_HEADROOM ) {int hroom =XDP_PACKET_HEADROOM -skb_headroom (skb);int troom = skb->tail + skb->data_len - skb->end;
Greg Kroah-Hartman
maintainerPATCH 2/399 enic: prevent waking up stopped tx queues over watchdog reset
In reply to Greg Kroah-HartmanFrom: Firo Yang <[email protected]>
[ Upstream commit 0f90522591fd09dd201065c53ebefdfe3c6b55cb ]
Recent months, our customer reported several kernel crashes all preceding with following message:
NETDEV WATCHDOG: eth2 (enic): transmit queue 0 timed out Error message of one of those crashes:
BUG: unable to handle kernel paging request at ffffffffa007e090
After analyzing severl vmcores, I found that most of crashes are caused by memory corruption. And all the corrupted memory areas are overwritten by data of network packets. Moreover, I also found that the tx queues were enabled over watchdog reset.
After going through the source code, I found that in enic_stop(), the tx queues stopped by netif_tx_disable() could be woken up over a small time window between netif_tx_disable() and the napi_disable() by the following code path:
napi_poll->
enic_poll_msix_wq->
vnic_cq_service->
enic_wq_service->
netif_wake_subqueue(enic->netdev, q_number)->
test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state)In turn, upper netowrk stack could queue skb to ENIC NIC though enic_hard_start_xmit(). And this might introduce some race condition.
Our customer comfirmed that this kind of kernel crash doesn't occur over 90 days since they applied this patch.
--- drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -2013,10 +2013,10 @@ static int enic_stop(struct net_device *napi_disable (&enic->napi[i]);netif_carrier_off (netdev); -netif_tx_disable (netdev);if (vnic_dev_get_intr_mode (enic->vdev) ==VNIC_DEV_INTR_MODE_MSIX )for (i =0 ; i < enic->wq_count; i++)napi_disable (&enic->napi[enic_cq_wq (enic, i)]); +netif_tx_disable (netdev);if (!enic_is_dynamic (enic) && !enic_is_sriov_vf (enic))enic_dev_del_station_addr (enic);
Greg Kroah-Hartman
maintainerPATCH 3/399 net/smc: fix leak of kernel memory to user space
In reply to Greg Kroah-HartmanFrom: Eric Dumazet <[email protected]>
[ Upstream commit 457fed775c97ac2c0cd1672aaf2ff2c8a6235e87 ]
As nlmsg_put() does not clear the memory that is reserved, it this the caller responsability to make sure all of this memory will be written, in order to not reveal prior content.
While we are at it, we can provide the socket cookie even if clsock is not set.
syzbot reported :
BUG: KMSAN: uninit-value in __arch_swab32 arch/x86/include/uapi/asm/swab.h:10 [inline] BUG: KMSAN: uninit-value in __fswab32 include/uapi/linux/swab.h:59 [inline] BUG: KMSAN: uninit-value in __swab32p include/uapi/linux/swab.h:179 [inline] BUG: KMSAN: uninit-value in __be32_to_cpup include/uapi/linux/byteorder/little_endian.h:82 [inline] BUG: KMSAN: uninit-value in get_unaligned_be32 include/linux/unaligned/access_ok.h:30 [inline] BUG: KMSAN: uninit-value in ____bpf_skb_load_helper_32 net/core/filter.c:240 [inline] BUG: KMSAN: uninit-value in ____bpf_skb_load_helper_32_no_cache net/core/filter.c:255 [inline] BUG: KMSAN: uninit-value in bpf_skb_load_helper_32_no_cache+0x14a/0x390 net/core/filter.c:252 CPU: 1 PID: 5262 Comm: syz-executor.5 Not tainted 5.5.0-rc5-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1c9/0x220 lib/dump_stack.c:118 kmsan_report+0xf7/0x1e0 mm/kmsan/kmsan_report.c:118 __msan_warning+0x58/0xa0 mm/kmsan/kmsan_instr.c:215 __arch_swab32 arch/x86/include/uapi/asm/swab.h:10 [inline] __fswab32 include/uapi/linux/swab.h:59 [inline] __swab32p include/uapi/linux/swab.h:179 [inline] __be32_to_cpup include/uapi/linux/byteorder/little_endian.h:82 [inline] get_unaligned_be32 include/linux/unaligned/access_ok.h:30 [inline] ____bpf_skb_load_helper_32 net/core/filter.c:240 [inline] ____bpf_skb_load_helper_32_no_cache net/core/filter.c:255 [inline] bpf_skb_load_helper_32_no_cache+0x14a/0x390 net/core/filter.c:252
Uninit was created at:
kmsan_save_stack_with_flags mm/kmsan/kmsan.c:144 [inline] kmsan_internal_poison_shadow+0x66/0xd0 mm/kmsan/kmsan.c:127 kmsan_kmalloc_large+0x73/0xc0 mm/kmsan/kmsan_hooks.c:128 kmalloc_large_node_hook mm/slub.c:1406 [inline] kmalloc_large_node+0x282/0x2c0 mm/slub.c:3841 __kmalloc_node_track_caller+0x44b/0x1200 mm/slub.c:4368 __kmalloc_reserve net/core/skbuff.c:141 [inline] __alloc_skb+0x2fd/0xac0 net/core/skbuff.c:209 alloc_skb include/linux/skbuff.h:1049 [inline] netlink_dump+0x44b/0x1ab0 net/netlink/af_netlink.c:2224 __netlink_dump_start+0xbb2/0xcf0 net/netlink/af_netlink.c:2352 netlink_dump_start include/linux/netlink.h:233 [inline] smc_diag_handler_dump+0x2ba/0x300 net/smc/smc_diag.c:242 sock_diag_rcv_msg+0x211/0x610 net/core/sock_diag.c:256 netlink_rcv_skb+0x451/0x650 net/netlink/af_netlink.c:2477 sock_diag_rcv+0x63/0x80 net/core/sock_diag.c:275 netlink_unicast_kernel net/netlink/af_netlink.c:1302 [inline] netlink_unicast+0xf9e/0x1100 net/netlink/af_netlink.c:1328 netlink_sendmsg+0x1248/0x14d0 net/netlink/af_netlink.c:1917 sock_sendmsg_nosec net/socket.c:639 [inline] sock_sendmsg net/socket.c:659 [inline] kernel_sendmsg+0x433/0x440 net/socket.c:679 sock_no_sendpage+0x235/0x300 net/core/sock.c:2740 kernel_sendpage net/socket.c:3776 [inline] sock_sendpage+0x1e1/0x2c0 net/socket.c:937 pipe_to_sendpage+0x38c/0x4c0 fs/splice.c:458 splice_from_pipe_feed fs/splice.c:512 [inline] __splice_from_pipe+0x539/0xed0 fs/splice.c:636 splice_from_pipe fs/splice.c:671 [inline] generic_splice_sendpage+0x1d5/0x2d0 fs/splice.c:844 do_splice_from fs/splice.c:863 [inline] do_splice fs/splice.c:1170 [inline] __do_sys_splice fs/splice.c:1447 [inline] __se_sys_splice+0x2380/0x3350 fs/splice.c:1427 __x64_sys_splice+0x6e/0x90 fs/splice.c:1427 do_syscall_64+0xb8/0x160 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x44/0xa9
--- net/smc/smc_diag.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/smc/smc_diag.c +2 -3
@@ -39,16 +39,15 @@ static void smc_diag_msg_common_fill(str {struct smc_sock *smc =smc_sk (sk); +memset (r,0 ,sizeof (*r)); r->diag_family = sk->sk_family; +sock_diag_save_cookie (sk, r->id.idiag_cookie);if (!smc->clcsock)return ; r->id.idiag_sport =htons (smc->clcsock->sk->sk_num); r->id.idiag_dport = smc->clcsock->sk->sk_dport; r->id.idiag_if = smc->clcsock->sk->sk_bound_dev_if; -sock_diag_save_cookie (sk, r->id.idiag_cookie);if (sk->sk_protocol ==SMCPROTO_SMC ) { -memset (&r->id.idiag_src,0 ,sizeof (r->id.idiag_src)); -memset (&r->id.idiag_dst,0 ,sizeof (r->id.idiag_dst)); r->id.idiag_src[0 ] = smc->clcsock->sk->sk_rcv_saddr; r->id.idiag_dst[0 ] = smc->clcsock->sk->sk_daddr;#if IS_ENABLED (CONFIG_IPV6 )
Greg Kroah-Hartman
maintainerPATCH 4/399 net: dsa: tag_qca: Make sure there is headroom for tag
In reply to Greg Kroah-HartmanFrom: Per Forlin <[email protected]>
[ Upstream commit 04fb91243a853dbde216d829c79d9632e52aa8d9 ]
Passing tag size to skb_cow_head will make sure there is enough headroom for the tag data.
This change does not introduce any overhead in case there is already available headroom for tag.
--- net/dsa/tag_qca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dsa/tag_qca.c +1 -1
@@ -33,7 +33,7 @@ static struct sk_buff *qca_tag_xmit(strustruct dsa_port *dp =dsa_slave_to_port (dev);u16 *phdr, hdr; -if (skb_cow_head (skb,0 ) <0 ) +if (skb_cow_head (skb,QCA_HDR_LEN ) <0 )return NULL ;skb_push (skb,QCA_HDR_LEN );
Greg Kroah-Hartman
maintainerPATCH 5/399 net/sched: matchall: add missing validation of TCA_MATCHALL_FLAGS
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit 1afa3cc90f8fb745c777884d79eaa1001d6927a6 ]
unlike other classifiers that can be offloaded (i.e. users can set flags like 'skip_hw' and 'skip_sw'), 'cls_matchall' doesn't validate the size of netlink attribute 'TCA_MATCHALL_FLAGS' provided by user: add a proper entry to mall_policy.
--- net/sched/cls_matchall.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_matchall.c +1 -0
@@ -157,6 +157,7 @@ static void *mall_get(struct tcf_proto *static const struct nla_policy mall_policy[TCA_MATCHALL_MAX +1 ] = { [TCA_MATCHALL_UNSPEC ] = { .type =NLA_UNSPEC }, [TCA_MATCHALL_CLASSID ] = { .type =NLA_U32 }, + [TCA_MATCHALL_FLAGS ] = { .type =NLA_U32 }, }; static int mall_set_parms(struct net *net, struct tcf_proto *tp,
Greg Kroah-Hartman
maintainerPATCH 6/399 net/sched: flower: add missing validation of TCA_FLOWER_FLAGS
In reply to Greg Kroah-HartmanFrom: Davide Caratti <[email protected]>
[ Upstream commit e2debf0852c4d66ba1a8bde12869b196094c70a7 ]
unlike other classifiers that can be offloaded (i.e. users can set flags like 'skip_hw' and 'skip_sw'), 'cls_flower' doesn't validate the size of netlink attribute 'TCA_FLOWER_FLAGS' provided by user: add a proper entry to fl_policy.
--- net/sched/cls_flower.c | 1 + 1 file changed, 1 insertion(+)
net/sched/cls_flower.c +1 -0
@@ -691,6 +691,7 @@ static const struct nla_policy fl_policy .len = 128 / BITS_PER_BYTE }, [TCA_FLOWER_KEY_CT_LABELS_MASK] = { .type = NLA_BINARY, .len = 128 / BITS_PER_BYTE }, + [TCA_FLOWER_FLAGS] = { .type = NLA_U32 }, }; static const struct nla_policy
Greg Kroah-Hartman
maintainerPATCH 7/399 drm/gma500: Fixup fbdev stolen size usage evaluation
In reply to Greg Kroah-HartmanFrom: Paul Kocialkowski <[email protected]>
[ Upstream commit fd1a5e521c3c083bb43ea731aae0f8b95f12b9bd ]
psbfb_probe performs an evaluation of the required size from the stolen GTT memory, but gets it wrong in two distinct ways:
- The resulting size must be page-size-aligned;
- The size to allocate is derived from the surface dimensions, not the fb dimensions.
When two connectors are connected with different modes, the smallest will be stored in the fb dimensions, but the size that needs to be allocated must match the largest (surface) dimensions. This is what is used in the actual allocation code.
Fix this by correcting the evaluation to conform to the two points above. It allows correctly switching to 16bpp when one connector is e.g. 1920x1080 and the other is 1024x768.
--- drivers/gpu/drm/gma500/framebuffer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/gma500/framebuffer.c +6 -2
@@ -462,6 +462,7 @@ static int psbfb_probe(struct drm_fb_helper *helper, container_of(helper, struct psb_fbdev, psb_fb_helper);struct drm_device *dev = psb_fbdev->psb_fb_helper.dev;struct drm_psb_private *dev_priv = dev->dev_private; +unsigned int fb_size;int bytespp; bytespp = sizes->surface_bpp /8 ;
@@ -471,8 +472,11 @@ static int psbfb_probe(struct drm_fb_helper *helper,/* If the mode will not fit in 32bit then switch to 16bit to get a console on full resolution. The X mode setting server will allocate its own 32bit GEM framebuffer */ -if (ALIGN (sizes->fb_width * bytespp,64 ) * sizes->fb_height > - dev_priv->vram_stolen_size) { + fb_size =ALIGN (sizes->surface_width * bytespp,64 ) * + sizes->surface_height; + fb_size =ALIGN (fb_size,PAGE_SIZE ); + +if (fb_size > dev_priv->vram_stolen_size) { sizes->surface_bpp =16 ; sizes->surface_depth =16 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 8/399 drm/dp_mst: fix multiple frees of tx->bytes
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 2c8bc91488fc57438c43b3bb19deb7fdbc1e5119 ]
Currently tx->bytes is being freed r->num_transactions number of times because tx is not being set correctly. Fix this by setting tx to &r->transactions[i] so that the correct objects are being freed on each loop iteration.
Addresses-Coverity: ("Double free")
--- drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +3 -1
@@ -517,8 +517,10 @@ drm_dp_decode_sideband_req(const struct drm_dp_sideband_msg_tx *raw, }if (failed) { -for (i =0 ; i < r->num_transactions; i++) +for (i =0 ; i < r->num_transactions; i++) { + tx = &r->transactions[i];kfree (tx->bytes); + }return -ENOMEM ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 9/399 ath10k: Fix qmi init error handling
In reply to Greg Kroah-HartmanFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit f8a595a87e93a33a10879f4b856be818d2f53c84 ]
When ath10k_qmi_init() fails, the error handling does not free the irq resources, which causes an issue if we EPROBE_DEFER as we'll attempt to (re-)register irqs which are already registered.
Fix this by doing a power off since we just powered on the hardware, and freeing the irqs as error handling.
--- drivers/net/wireless/ath/ath10k/snoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/snoc.c +4 -1
@@ -1563,13 +1563,16 @@ static int ath10k_snoc_probe(struct platform_device *pdev) ret =ath10k_qmi_init (ar, msa_size);if (ret) {ath10k_warn (ar,"failed to register wlfw qmi client: %d\n" , ret); - goto err_core_destroy; + goto err_power_off; }ath10k_dbg (ar,ATH10K_DBG_SNOC ,"snoc probe\n" );return 0 ; +err_power_off: +ath10k_hw_power_off (ar); + err_free_irq:ath10k_snoc_free_irq (ar);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 10/399 wil6210: fix break that is never reached because of zeroing of a retry counter
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 5b1413f00b5beb9f5fed94e43ea0c497d5db9633 ]
There is a check on the retry counter invalid_buf_id_retry that is always false because invalid_buf_id_retry is initialized to zero on each iteration of a while-loop. Fix this by initializing the retry counter before the while-loop starts.
Addresses-Coverity: ("Logically dead code")
--- drivers/net/wireless/ath/wil6210/txrx_edma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/txrx_edma.c +2 -1
@@ -869,6 +869,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wil6210_priv *wil,u8 data_offset;struct wil_rx_status_extended *s;u16 sring_idx = sring - wil->srings; +int invalid_buff_id_retry;BUILD_BUG_ON (sizeof (struct wil_rx_status_extended ) >sizeof (skb->cb));
@@ -882,9 +883,9 @@ again:/* Extract the buffer ID from the status message */ buff_id =le16_to_cpu (wil_rx_status_get_buff_id (msg)); + invalid_buff_id_retry =0 ;while (!buff_id) {struct wil_rx_status_extended *s; -int invalid_buff_id_retry =0 ; wil_dbg_txrx(wil, "buff_id is not updated yet by HW, (swhead 0x%x)\n",
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 11/399 drm/virtio: fix byteorder handling in virtio_gpu_cmd_transfer_{from, to}_host_3d functions
In reply to Greg Kroah-HartmanFrom: Gerd Hoffmann <[email protected]>
[ Upstream commit 1dc3485247170d3b88a21cadee7f7da1f0433495 ]
Be consistent with the rest of the code base.
No functional change.
v2:
- fix sparse warnings for virtio_gpu_cmd_transfer_to_host_2d call.
- move convert_to_hw_box helper function.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +++-- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 22 +++------------------- drivers/gpu/drm/virtio/virtgpu_vq.c | 19 +++++++++++++++---- 3 files changed, 21 insertions(+), 25 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -2
@@ -38,6 +38,7 @@#include <drm/drm_gem_shmem_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> +#include <drm/virtgpu_drm.h> #define DRIVER_NAME "virtio_gpu"#define DRIVER_DESC "virtio GPU"
@@ -312,13 +313,13 @@ void virtio_gpu_cmd_submit(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence);void
drivers/gpu/drm/virtio/virtgpu_ioctl.c +3 -19
@@ -33,17 +33,6 @@#include "virtgpu_drv.h" -static void convert_to_hw_box (struct virtio_gpu_box *dst, -const struct drm_virtgpu_3d_box *src) -{ - dst->x =cpu_to_le32 (src->x); - dst->y =cpu_to_le32 (src->y); - dst->z =cpu_to_le32 (src->z); - dst->w =cpu_to_le32 (src->w); - dst->h =cpu_to_le32 (src->h); - dst->d =cpu_to_le32 (src->d); -} -static int virtio_gpu_map_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -304,7 +293,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,struct virtio_gpu_fence *fence;int ret;u32 offset = args->offset; -struct virtio_gpu_box box;if (vgdev->has_virgl_3d == false)return -ENOSYS ;
@@ -317,8 +305,6 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,if (ret !=0 ) goto err_put_free; -convert_to_hw_box (&box, &args->box); - fence =virtio_gpu_fence_alloc (vgdev);if (!fence) { ret = -ENOMEM ;
@@ -326,7 +312,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev, }virtio_gpu_cmd_transfer_from_host_3d (vgdev, vfpriv->ctx_id, offset, args->level, - &box, objs, fence); + &args->box, objs, fence);dma_fence_put (&fence->f);return 0 ;
@@ -345,7 +331,6 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,struct drm_virtgpu_3d_transfer_to_host *args = data;struct virtio_gpu_object_array *objs;struct virtio_gpu_fence *fence; -struct virtio_gpu_box box;int ret;u32 offset = args->offset;
@@ -353,11 +338,10 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,if (objs ==NULL )return -ENOENT ; -convert_to_hw_box (&box, &args->box);if (!vgdev->has_virgl_3d) {virtio_gpu_cmd_transfer_to_host_2d (vgdev, offset, - box.w, box.h, box.x, box.y, + args->box.w, args->box.h, args->box.x, args->box.y, objs,NULL ); }else { ret =virtio_gpu_array_lock_resv (objs);
@@ -372,7 +356,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,virtio_gpu_cmd_transfer_to_host_3d (vgdev, vfpriv ? vfpriv->ctx_id :0 , offset, - args->level, &box, objs, fence); + args->level, &args->box, objs, fence);dma_fence_put (&fence->f); }return 0 ;
drivers/gpu/drm/virtio/virtgpu_vq.c +15 -4
@@ -40,6 +40,17 @@ + MAX_INLINE_CMD_SIZE \ + MAX_INLINE_RESP_SIZE) +static void convert_to_hw_box (struct virtio_gpu_box *dst, +const struct drm_virtgpu_3d_box *src) +{ + dst->x =cpu_to_le32 (src->x); + dst->y =cpu_to_le32 (src->y); + dst->z =cpu_to_le32 (src->z); + dst->w =cpu_to_le32 (src->w); + dst->h =cpu_to_le32 (src->h); + dst->d =cpu_to_le32 (src->d); +} +void virtio_gpu_ctrl_ack (struct virtqueue *vq) {struct drm_device *dev = vq->vdev->priv;
@@ -965,7 +976,7 @@ virtio_gpu_cmd_resource_create_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_to_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -987,7 +998,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
@@ -997,7 +1008,7 @@ void virtio_gpu_cmd_transfer_to_host_3d(struct virtio_gpu_device *vgdev,void virtio_gpu_cmd_transfer_from_host_3d (struct virtio_gpu_device *vgdev,uint32_t ctx_id,uint64_t offset,uint32_t level, -struct virtio_gpu_box *box, +struct drm_virtgpu_3d_box *box,struct virtio_gpu_object_array *objs,struct virtio_gpu_fence *fence) {
@@ -1013,7 +1024,7 @@ void virtio_gpu_cmd_transfer_from_host_3d(struct virtio_gpu_device *vgdev, cmd_p->hdr.type =cpu_to_le32 (VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D ); cmd_p->hdr.ctx_id =cpu_to_le32 (ctx_id); cmd_p->resource_id =cpu_to_le32 (bo->hw_res_handle); - cmd_p->box = *box; +convert_to_hw_box (&cmd_p->box, box); cmd_p->offset =cpu_to_le64 (offset); cmd_p->level =cpu_to_le32 (level);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 12/399 drm/qxl: Complete exception handling in qxl_device_init()
In reply to Greg Kroah-HartmanFrom: Markus Elfring <[email protected]>
[ Upstream commit dbe3ad61dcebc49fe3efca70a0f752a95b4600f2 ]
A coccicheck run provided information like the following.
drivers/gpu/drm/qxl/qxl_kms.c:295:1-7: ERROR: missing iounmap; ioremap on line 178 and execution via conditional on line 185
Generated by: scripts/coccinelle/free/iounmap.cocci
A jump target was specified in an if branch. The corresponding function call did not release the desired system resource then.
Thus use the label “rom_unmap” instead to fix the exception handling for this function implementation.
--- drivers/gpu/drm/qxl/qxl_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/qxl/qxl_kms.c +1 -1
@@ -184,7 +184,7 @@ int qxl_device_init(struct qxl_device *qdev,if (!qxl_check_device (qdev)) { r = -ENODEV ; - goto surface_mapping_free; + goto rom_unmap; } r =qxl_bo_init (qdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 13/399 nfsd4: avoid NULL deference on strange COPY compounds
In reply to Greg Kroah-HartmanFrom: J. Bruce Fields <[email protected]>
[ Upstream commit d781e3df710745fbbaee4eb07fd5b64331a1b175 ]
With cross-server COPY we've introduced the possibility that the current or saved filehandle might not have fh_dentry/fh_export filled in, but we missed a place that assumed it was. I think this could be triggered by a compound like:
PUTFH(foreign filehandle)
GETATTR
SAVEFH
COPY
First, check_if_stalefh_allowed sets no_verify on the first (PUTFH) op. Then op_func = nfsd4_putfh runs and leaves current_fh->fh_export NULL. need_wrongsec_check returns true, since this PUTFH has OP_IS_PUTFH_LIKE set and GETATTR does not have OP_HANDLES_WRONGSEC set.
We should probably also consider tightening the checks in check_if_stalefh_allowed and double-checking that we don't assume the filehandle is verified elsewhere in the compound. But I think this fixes the immediate issue.
--- fs/nfsd/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/nfs4proc.c +2 -1
@@ -2025,7 +2025,8 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)if (op->opdesc->op_flags &OP_CLEAR_STATEID )clear_current_stateid (cstate); -if (need_wrongsec_check (rqstp)) +if (current_fh->fh_export && +need_wrongsec_check (rqstp)) op->status =check_nfsd_access (current_fh->fh_export, rqstp); } encode_op:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 14/399 rcu/nocb: Fix dump_tree hierarchy print always active
In reply to Greg Kroah-HartmanFrom: Stefan Reiter <[email protected]>
[ Upstream commit 610dea36d3083a977e4f156206cbe1eaa2a532f0 ]
Commit 18cd8c93e69e ("rcu/nocb: Print gp/cb kthread hierarchy if dump_tree") added print statements to rcu_organize_nocb_kthreads for debugging, but incorrectly guarded them, causing the function to always spew out its message.
This patch fixes it by guarding both pr_alert statements with dump_tree, while also changing the second pr_alert to a pr_cont, to print the hierarchy in a single line (assuming that's how it was supposed to work).
--- kernel/rcu/tree_plugin.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
kernel/rcu/tree_plugin.h +17 -5
@@ -2322,6 +2322,8 @@ static void __init rcu_organize_nocb_kthreads(void) {int cpu;bool firsttime = true; +bool gotnocbs = false; +bool gotnocbscbs = true;int ls = rcu_nocb_gp_stride;int nl =0 ;/* Next GP kthread. */ struct rcu_data *rdp;
@@ -2344,21 +2346,31 @@ static void __init rcu_organize_nocb_kthreads(void) rdp =per_cpu_ptr (&rcu_data, cpu);if (rdp->cpu >= nl) {/* New GP kthread, set up for CBs & next GP. */ + gotnocbs = true; nl =DIV_ROUND_UP (rdp->cpu +1 , ls) * ls; rdp->nocb_gp_rdp = rdp; rdp_gp = rdp; -if (!firsttime && dump_tree) -pr_cont ("\n" ); - firsttime = false; -pr_alert ("%s: No-CB GP kthread CPU %d:" , __func__, cpu); +if (dump_tree) { +if (!firsttime) +pr_cont ("%s\n" , gotnocbscbs + ?"" :" (self only)" ); + gotnocbscbs = false; + firsttime = false; +pr_alert ("%s: No-CB GP kthread CPU %d:" , + __func__, cpu); + } }else {/* Another CB kthread, link to previous GP kthread. */ + gotnocbscbs = true; rdp->nocb_gp_rdp = rdp_gp; rdp_prev->nocb_next_cb_rdp = rdp; -pr_alert (" %d" , cpu); +if (dump_tree) +pr_cont (" %d" , cpu); } rdp_prev = rdp; } +if (gotnocbs && dump_tree) +pr_cont ("%s\n" , gotnocbscbs ?"" :" (self only)" ); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 15/399 rcu: Fix missed wakeup of exp_wq waiters
In reply to Greg Kroah-HartmanFrom: Neeraj Upadhyay <[email protected]>
[ Upstream commit fd6bc19d7676a060a171d1cf3dcbf6fd797eb05f ]
Tasks waiting within exp_funnel_lock() for an expedited grace period to elapse can be starved due to the following sequence of events:
1. Tasks A and B both attempt to start an expedited grace
period at about the same time. This grace period will have
completed when the lower four bits of the rcu_state structure's ->expedited_sequence field are 0b'0100', for example, when the
initial value of this counter is zero. Task A wins, and thus
does the actual work of starting the grace period, including acquiring the rcu_state structure's .exp_mutex and sets the counter to 0b'0001'.
2. Because task B lost the race to start the grace period, it
waits on ->expedited_sequence to reach 0b'0100' inside of exp_funnel_lock(). This task therefore blocks on the rcu_node structure's ->exp_wq[1] field, keeping in mind that the end-of-grace-period value of ->expedited_sequence (0b'0100') is shifted down two bits before indexing the ->exp_wq[] field.
3. Task C attempts to start another expedited grace period,
but blocks on ->exp_mutex, which is still held by Task A.
4. The aforementioned expedited grace period completes, so that
->expedited_sequence now has the value 0b'0100'. A kworker task therefore acquires the rcu_state structure's ->exp_wake_mutex and starts awakening any tasks waiting for this grace period.
5. One of the first tasks awakened happens to be Task A. Task A
therefore releases the rcu_state structure's ->exp_mutex, which allows Task C to start the next expedited grace period, which causes the lower four bits of the rcu_state structure's ->expedited_sequence field to become 0b'0101'.
6. Task C's expedited grace period completes, so that the lower four
bits of the rcu_state structure's ->expedited_sequence field now become 0b'1000'.
7. The kworker task from step 4 above continues its wakeups.
Unfortunately, the wake_up_all() refetches the rcu_state structure's .expedited_sequence field: wake_up_all(&rnp->exp_wq[rcu_seq_ctr(rcu_state.expedited_sequence) & 0x3]); This results in the wakeup being applied to the rcu_node structure's ->exp_wq[2] field, which is unfortunate given that Task B is instead waiting on ->exp_wq[1].
On a busy system, no harm is done (or at least no permanent harm is done). Some later expedited grace period will redo the wakeup. But on a quiet system, such as many embedded systems, it might be a good long time before there was another expedited grace period. On such embedded systems, this situation could therefore result in a system hang.
This issue manifested as DPM device timeout during suspend (which usually qualifies as a quiet time) due to a SCSI device being stuck in _synchronize_rcu_expedited(), with the following stack trace:
schedule() synchronize_rcu_expedited() synchronize_rcu() scsi_device_quiesce() scsi_bus_suspend() dpm_run_callback() __device_suspend()
This commit therefore prevents such delays, timeouts, and hangs by making rcu_exp_wait_wake() use its "s" argument consistently instead of refetching from rcu_state.expedited_sequence.
--- kernel/rcu/tree_exp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/rcu/tree_exp.h +1 -1
@@ -558,7 +558,7 @@ static void rcu_exp_wait_wake(unsigned long s)spin_unlock (&rnp->exp_lock); }smp_mb ();/* All above changes before wakeup. */ -wake_up_all (&rnp->exp_wq[rcu_seq_ctr (rcu_state.expedited_sequence) &0x3 ]); +wake_up_all (&rnp->exp_wq[rcu_seq_ctr (s) &0x3 ]); }trace_rcu_exp_grace_period (rcu_state.name, s,TPS ("endwake" ));mutex_unlock (&rcu_state.exp_wake_mutex);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 16/399 soc: fsl: qe: change return type of cpm_muram_alloc() to s32
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 800cd6fb76f0ec7711deb72a86c924db1ae42648 ]
There are a number of problems with cpm_muram_alloc() and its callers. Most callers assign the return value to some variable and then use IS_ERR_VALUE to check for allocation failure. However, when that variable is not sizeof(long), this leads to warnings - and it is indeed broken to do e.g.
u32 foo = cpm_muram_alloc(); if (IS_ERR_VALUE(foo))
on a 64-bit platform, since the condition
foo >= (unsigned long)-ENOMEM
is tautologically false. There are also callers that ignore the possibility of error, and then there are those that check for error by comparing the return value to 0...
One could fix that by changing all callers to store the return value temporarily in an "unsigned long" and test that. However, use of IS_ERR_VALUE() is error-prone and should be restricted to things which are inherently long-sized (stuff in pt_regs etc.). Instead, let's aim for changing to the standard kernel style
int foo = cpm_muram_alloc();
if (foo < 0)
deal_with_it()
some->where = foo;Changing the return type from unsigned long to s32 (aka signed int) doesn't change the value that gets stored into any of the callers' variables except if the caller was storing the result in a u64 _and_ the allocation failed, so in itself this patch should be a no-op.
Another problem with cpm_muram_alloc() is that it can certainly validly return 0 - and except if some cpm_muram_alloc_fixed() call interferes, the very first cpm_muram_alloc() call will return just that. But that shows that both ucc_slow_free() and ucc_fast_free() are buggy, since they assume that a value of 0 means "that field was never allocated". We'll later change cpm_muram_free() to accept (and ignore) a negative offset, so callers can use a sentinel of -1 instead of 0 and just unconditionally call cpm_muram_free().
--- drivers/soc/fsl/qe/qe_common.c | 29 ++++++++++++++++------------- include/soc/fsl/qe/qe.h | 16 ++++++++-------- 2 files changed, 24 insertions(+), 21 deletions(-)
drivers/soc/fsl/qe/qe_common.c +16 -13
@@ -32,7 +32,7 @@ static phys_addr_t muram_pbase;struct muram_block {struct list_head head; -unsigned long start; +s32 start;int size; };
@@ -110,13 +110,14 @@ out_muram:* @algo: algorithm for alloc. * @data: data for genalloc's algorithm. * -* This function returns an offset into the muram area. +* This function returns a non-negative offset into the muram area, or +* a negative errno on failure. */ -static unsigned long cpm_muram_alloc_common (unsigned long size, -genpool_algo_t algo,void *data) +static s32 cpm_muram_alloc_common (unsigned long size, +genpool_algo_t algo,void *data) {struct muram_block *entry; -unsigned long start; +s32 start;if (!muram_pool &&cpm_muram_init ()) goto out2;
@@ -137,7 +138,7 @@ static unsigned long cpm_muram_alloc_common(unsigned long size, out1:gen_pool_free (muram_pool, start, size); out2: -return (unsigned long )-ENOMEM ; +return -ENOMEM ; }/*
@@ -145,13 +146,14 @@ out2:* @size: number of bytes to allocate * @align: requested alignment, in bytes * -* This function returns an offset into the muram area. +* This function returns a non-negative offset into the muram area, or +* a negative errno on failure. * Use cpm_dpram_addr() to get the virtual address of the area. * Use cpm_muram_free() to free the allocation. */ -unsigned long cpm_muram_alloc (unsigned long size,unsigned long align) +s32 cpm_muram_alloc (unsigned long size,unsigned long align) { -unsigned long start; +s32 start;unsigned long flags;struct genpool_data_align muram_pool_data;
@@ -168,7 +170,7 @@ EXPORT_SYMBOL(cpm_muram_alloc);* cpm_muram_free - free a chunk of multi-user ram * @offset: The beginning of the chunk as returned by cpm_muram_alloc(). */ -int cpm_muram_free (unsigned long offset) +int cpm_muram_free (s32 offset) {unsigned long flags;int size;
@@ -194,13 +196,14 @@ EXPORT_SYMBOL(cpm_muram_free);* cpm_muram_alloc_fixed - reserve a specific region of multi-user ram * @offset: offset of allocation start address * @size: number of bytes to allocate -* This function returns an offset into the muram area +* This function returns @offset if the area was available, a negative +* errno otherwise. * Use cpm_dpram_addr() to get the virtual address of the area. * Use cpm_muram_free() to free the allocation. */ -unsigned long cpm_muram_alloc_fixed (unsigned long offset,unsigned long size) +s32 cpm_muram_alloc_fixed (unsigned long offset,unsigned long size) { -unsigned long start; +s32 start;unsigned long flags;struct genpool_data_fixed muram_pool_data_fixed;
include/soc/fsl/qe/qe.h +8 -8
@@ -98,26 +98,26 @@ static inline void qe_reset(void) {}int cpm_muram_init (void );#if defined(CONFIG_CPM ) || defined(CONFIG_QUICC_ENGINE ) -unsigned long cpm_muram_alloc (unsigned long size,unsigned long align); -int cpm_muram_free (unsigned long offset); -unsigned long cpm_muram_alloc_fixed (unsigned long offset,unsigned long size); +s32 cpm_muram_alloc (unsigned long size,unsigned long align); +int cpm_muram_free (s32 offset); +s32 cpm_muram_alloc_fixed (unsigned long offset,unsigned long size);void __iomem *cpm_muram_addr (unsigned long offset);unsigned long cpm_muram_offset (void __iomem *addr);dma_addr_t cpm_muram_dma (void __iomem *addr);#else -static inline unsigned long cpm_muram_alloc (unsigned long size, -unsigned long align) +static inline s32 cpm_muram_alloc (unsigned long size, +unsigned long align) {return -ENOSYS ; } -static inline int cpm_muram_free (unsigned long offset) +static inline int cpm_muram_free (s32 offset) {return -ENOSYS ; } -static inline unsigned long cpm_muram_alloc_fixed (unsigned long offset, -unsigned long size) +static inline s32 cpm_muram_alloc_fixed (unsigned long offset, +unsigned long size) {return -ENOSYS ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 17/399 rcu: Fix data-race due to atomic_t copy-by-value
In reply to Greg Kroah-HartmanFrom: Marco Elver <[email protected]>
[ Upstream commit 6cf539a87a61a4fbc43f625267dbcbcf283872ed ]
This fixes a data-race where atomic_t dynticks is copied by value. The copy is performed non-atomically, resulting in a data-race if dynticks is updated concurrently.
This data-race was found with KCSAN:
==================================================================
BUG: KCSAN: data-race in dyntick_save_progress_counter / rcu_irq_enter
write to 0xffff989dbdbe98e0 of 4 bytes by task 10 on cpu 3:
atomic_add_return include/asm-generic/atomic-instrumented.h:78 [inline] rcu_dynticks_snap kernel/rcu/tree.c:310 [inline] dyntick_save_progress_counter+0x43/0x1b0 kernel/rcu/tree.c:984 force_qs_rnp+0x183/0x200 kernel/rcu/tree.c:2286 rcu_gp_fqs kernel/rcu/tree.c:1601 [inline] rcu_gp_fqs_loop+0x71/0x880 kernel/rcu/tree.c:1653 rcu_gp_kthread+0x22c/0x3b0 kernel/rcu/tree.c:1799 kthread+0x1b5/0x200 kernel/kthread.c:255 <snip>
read to 0xffff989dbdbe98e0 of 4 bytes by task 154 on cpu 7:
rcu_nmi_enter_common kernel/rcu/tree.c:828 [inline] rcu_irq_enter+0xda/0x240 kernel/rcu/tree.c:870 irq_enter+0x5/0x50 kernel/softirq.c:347 <snip>
Reported by Kernel Concurrency Sanitizer on:
CPU: 7 PID: 154 Comm: kworker/7:1H Not tainted 5.3.0+ #5 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 Workqueue: kblockd blk_mq_run_work_fn ==================================================================
--- include/trace/events/rcu.h | 4 ++-- kernel/rcu/tree.c | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-)
include/trace/events/rcu.h +2 -2
@@ -449,7 +449,7 @@ TRACE_EVENT_RCU(rcu_fqs,*/ TRACE_EVENT_RCU(rcu_dyntick, - TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks), + TP_PROTO(const char *polarity, long oldnesting, long newnesting, int dynticks), TP_ARGS(polarity, oldnesting, newnesting, dynticks),
@@ -464,7 +464,7 @@ TRACE_EVENT_RCU(rcu_dyntick, __entry->polarity = polarity; __entry->oldnesting = oldnesting; __entry->newnesting = newnesting; - __entry->dynticks =atomic_read (&dynticks); + __entry->dynticks = dynticks; ), TP_printk("%s %lx %lx %#3x", __entry->polarity,
kernel/rcu/tree.c +6 -5
@@ -577,7 +577,7 @@ static void rcu_eqs_enter(bool user) }lockdep_assert_irqs_disabled (); -trace_rcu_dyntick (TPS ("Start" ), rdp->dynticks_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Start" ), rdp->dynticks_nesting,0 ,atomic_read (&rdp->dynticks));WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current)); rdp =this_cpu_ptr (&rcu_data);do_nocb_deferred_wakeup (rdp);
@@ -650,14 +650,15 @@ static __always_inline void rcu_nmi_exit_common(bool irq)* leave it in non-RCU-idle state. */ if (rdp->dynticks_nmi_nesting !=1 ) { -trace_rcu_dyntick (TPS ("--=" ), rdp->dynticks_nmi_nesting, rdp->dynticks_nmi_nesting -2 , rdp->dynticks); +trace_rcu_dyntick (TPS ("--=" ), rdp->dynticks_nmi_nesting, rdp->dynticks_nmi_nesting -2 , +atomic_read (&rdp->dynticks));WRITE_ONCE (rdp->dynticks_nmi_nesting,/* No store tearing. */ rdp->dynticks_nmi_nesting -2 );return ; }/* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */ -trace_rcu_dyntick (TPS ("Startirq" ), rdp->dynticks_nmi_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Startirq" ), rdp->dynticks_nmi_nesting,0 ,atomic_read (&rdp->dynticks));WRITE_ONCE (rdp->dynticks_nmi_nesting,0 );/* Avoid store tearing. */ if (irq)
@@ -744,7 +745,7 @@ static void rcu_eqs_exit(bool user)rcu_dynticks_task_exit ();rcu_dynticks_eqs_exit ();rcu_cleanup_after_idle (); -trace_rcu_dyntick (TPS ("End" ), rdp->dynticks_nesting,1 , rdp->dynticks); +trace_rcu_dyntick (TPS ("End" ), rdp->dynticks_nesting,1 ,atomic_read (&rdp->dynticks));WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current));WRITE_ONCE (rdp->dynticks_nesting,1 );WARN_ON_ONCE (rdp->dynticks_nmi_nesting);
@@ -833,7 +834,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq) }trace_rcu_dyntick (incby ==1 ?TPS ("Endirq" ) :TPS ("++=" ), rdp->dynticks_nmi_nesting, - rdp->dynticks_nmi_nesting + incby, rdp->dynticks); + rdp->dynticks_nmi_nesting + incby,atomic_read (&rdp->dynticks));WRITE_ONCE (rdp->dynticks_nmi_nesting,/* Prevent store tearing. */ rdp->dynticks_nmi_nesting + incby);barrier ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 18/399 dmaengine: ti: edma: add missed operations
In reply to Greg Kroah-HartmanFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 2a03c1314506557277829562dd2ec5c11a6ea914 ]
The driver forgets to call pm_runtime_disable and pm_runtime_put_sync in probe failure and remove.
Add the calls and modify probe failure handling to fix it.
To simplify the fix, the patch adjusts the calling order and merges checks for devm_kcalloc.
--- drivers/dma/ti/edma.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
drivers/dma/ti/edma.c +20 -17
@@ -2289,13 +2289,6 @@ static int edma_probe(struct platform_device *pdev)if (!info)return -ENODEV ; -pm_runtime_enable (dev); - ret =pm_runtime_get_sync (dev); -if (ret <0 ) { -dev_err (dev,"pm_runtime_get_sync() failed\n" ); -return ret; - } - ret =dma_set_mask_and_coherent (dev,DMA_BIT_MASK (32 ));if (ret)return ret;
@@ -2326,27 +2319,31 @@ static int edma_probe(struct platform_device *pdev)platform_set_drvdata (pdev, ecc); +pm_runtime_enable (dev); + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"pm_runtime_get_sync() failed\n" ); +pm_runtime_disable (dev); +return ret; + } +/* Get eDMA3 configuration from IP */ ret =edma_setup_from_hw (dev, info, ecc);if (ret) -return ret; + goto err_disable_pm;/* Allocate memory based on the information we got from the IP */ ecc->slave_chans =devm_kcalloc (dev, ecc->num_channels,sizeof (*ecc->slave_chans),GFP_KERNEL ); -if (!ecc->slave_chans) -return -ENOMEM ; ecc->slot_inuse =devm_kcalloc (dev,BITS_TO_LONGS (ecc->num_slots),sizeof (unsigned long ),GFP_KERNEL ); -if (!ecc->slot_inuse) -return -ENOMEM ; ecc->channels_mask =devm_kcalloc (dev,BITS_TO_LONGS (ecc->num_channels),sizeof (unsigned long ),GFP_KERNEL ); -if (!ecc->channels_mask) -return -ENOMEM ; +if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) + goto err_disable_pm;/* Mark all channels available initially */ bitmap_fill (ecc->channels_mask, ecc->num_channels);
@@ -2388,7 +2385,7 @@ static int edma_probe(struct platform_device *pdev) ecc);if (ret) {dev_err (dev,"CCINT (%d) failed --> %d\n" , irq, ret); -return ret; + goto err_disable_pm; } ecc->ccint = irq; }
@@ -2404,7 +2401,7 @@ static int edma_probe(struct platform_device *pdev) ecc);if (ret) {dev_err (dev,"CCERRINT (%d) failed --> %d\n" , irq, ret); -return ret; + goto err_disable_pm; } ecc->ccerrint = irq; }
@@ -2412,7 +2409,8 @@ static int edma_probe(struct platform_device *pdev) ecc->dummy_slot =edma_alloc_slot (ecc,EDMA_SLOT_ANY );if (ecc->dummy_slot <0 ) {dev_err (dev,"Can't allocate PaRAM dummy slot\n" ); -return ecc->dummy_slot; + ret = ecc->dummy_slot; + goto err_disable_pm; } queue_priority_mapping = info->queue_priority_mapping;
@@ -2512,6 +2510,9 @@ static int edma_probe(struct platform_device *pdev) err_reg1:edma_free_slot (ecc, ecc->dummy_slot); +err_disable_pm: +pm_runtime_put_sync (dev); +pm_runtime_disable (dev);return ret; }
@@ -2542,6 +2543,8 @@ static int edma_remove(struct platform_device *pdev)if (ecc->dma_memcpy)dma_async_device_unregister (ecc->dma_memcpy);edma_free_slot (ecc, ecc->dummy_slot); +pm_runtime_put_sync (dev); +pm_runtime_disable (dev);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 19/399 f2fs: preallocate DIO blocks when forcing buffered_io
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit 47501f87c61ad2aa234add63e1ae231521dbc3f5 ]
The previous preallocation and DIO decision like below.
allow_outplace_dio !allow_outplace_dio f2fs_force_buffered_io (*) No_Prealloc / Buffered_IO Prealloc / Buffered_IO !f2fs_force_buffered_io No_Prealloc / DIO Prealloc / DIO
But, Javier reported Case (*) where zoned device bypassed preallocation but fell back to buffered writes in f2fs_direct_IO(), resulting in stale data being read.
In order to fix the issue, actually we need to preallocate blocks whenever we fall back to buffered IO like this. No change is made in the other cases.
allow_outplace_dio !allow_outplace_dio f2fs_force_buffered_io (*) Prealloc / Buffered_IO Prealloc / Buffered_IO !f2fs_force_buffered_io No_Prealloc / DIO Prealloc / DIO
--- fs/f2fs/data.c | 13 ------------- fs/f2fs/file.c | 43 +++++++++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 23 deletions(-)
fs/f2fs/data.c +0 -13
@@ -1180,19 +1180,6 @@ int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)int err =0 ;bool direct_io = iocb->ki_flags &IOCB_DIRECT ; -/* convert inline data for Direct I/O*/ -if (direct_io) { - err =f2fs_convert_inline_inode (inode); -if (err) -return err; - } - -if (direct_io &&allow_outplace_dio (inode, iocb, from)) -return 0 ; - -if (is_inode_flag_set (inode,FI_NO_PREALLOC )) -return 0 ; - map.m_lblk =F2FS_BLK_ALIGN (iocb->ki_pos); map.m_len =F2FS_BYTES_TO_BLK (iocb->ki_pos +iov_iter_count (from));if (map.m_len > map.m_lblk)
fs/f2fs/file.c +33 -10
51 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 20/399 f2fs: call f2fs_balance_fs outside of locked page
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit bdf03299248916640a835a05d32841bb3d31912d ]
Otherwise, we can hit deadlock by waiting for the locked page in move_data_block in GC.
Thread A Thread B
- do_page_mkwrite
- f2fs_vm_page_mkwrite
- lock_page
- f2fs_balance_fs
- mutex_lock(gc_mutex)
- f2fs_gc
- do_garbage_collect
- ra_data_block
- grab_cache_page
- f2fs_balance_fs
- mutex_lock(gc_mutex)
--- fs/f2fs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/f2fs/file.c +4 -3
@@ -50,7 +50,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct page *page = vmf->page;struct inode *inode =file_inode (vmf->vma->vm_file);struct f2fs_sb_info *sbi =F2FS_I_SB (inode); -struct dnode_of_data dn = { .node_changed = false }; +struct dnode_of_data dn;int err;if (unlikely (f2fs_cp_error (sbi))) {
@@ -63,6 +63,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) goto err; } +/* should do out of any locked page */ +f2fs_balance_fs (sbi, true); +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));
@@ -120,8 +123,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);
Signature · 1 line
2.20.1
Re: [PATCH 5.5 020/399] f2fs: call f2fs_balance_fs outside of locked page
Hello,
Quoted 3 lines · Greg Kroah-Hartman
From: Jaegeuk Kim <[email protected]>
[ Upstream commit
bdf03299248916640a835a05d32841bb3d31912d]
I have somes issues with this patch.
It causes panics due to hung tasks on 5.6. I guess it fixes one deadlock, but causes other one? Not sure backporting it to stable branches is a good idea.
regards,
o.
INFO: task kworker/u16:2:341 blocked for more than 122 seconds.
Not tainted 5.6.0-rc2-00254-g9a029a493dc16 #4
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
kworker/u16:2 D 0 341 2 0x00000000
Workqueue: writeback wb_workfn (flush-179:0)
Backtrace:
[<c0912bd0>] (__schedule) from [<c0913274>] (schedule+0x78/0xf4)
r10:ede1a000 r9:00000000 r8:ede1ba60 r7:ec417290 r6:00000002 r5:ede1a000
r4:ee8e8000
[<c09131fc>] (schedule) from [<c017ec74>] (rwsem_down_write_slowpath+0x24c/0x4c0)
r5:00000001 r4:ec417280
[<c017ea28>] (rwsem_down_write_slowpath) from [<c0915f6c>] (down_write+0x6c/0x70)
r10:ec417280 r9:ede1bd80 r8:ee128000 r7:00000001 r6:00000000 r5:eff0afc4
r4:ec417280
[<c0915f00>] (down_write) from [<c0435b68>] (f2fs_write_single_data_page+0x608/0x7ac)
r5:eff0afc4 r4:ec4170e0
[<c0435560>] (f2fs_write_single_data_page) from [<c0435fc0>] (f2fs_write_cache_pages+0x2b4/0x7c4)
r10:ede1bc28 r9:ec4171e0 r8:ec4170e0 r7:00000001 r6:ede1bd80 r5:00000001
r4:eff0afc4
[<c0435d0c>] (f2fs_write_cache_pages) from [<c0436814>] (f2fs_write_data_pages+0x344/0x35c)
r10:0000012c r9:ee12802c r8:ee128000 r7:00000004 r6:ec4171e0 r5:ec4170e0
r4:ede1bd80
[<c04364d0>] (f2fs_write_data_pages) from [<c0267fa0>] (do_writepages+0x3c/0xd4)
r10:0000012c r9:c0e03d00 r8:00001400 r7:c0264e94 r6:ede1bd80 r5:ec4171e0
r4:ec4170e0
[<c0267f64>] (do_writepages) from [<c0310d24>] (__writeback_single_inode+0x44/0x454)
r7:ec4171e0 r6:ede1beac r5:ede1bd80 r4:ec4170e0
[<c0310ce0>] (__writeback_single_inode) from [<c0311338>] (writeback_sb_inodes+0x204/0x4b0)
r10:0000012c r9:c0e03d00 r8:ec417148 r7:ec4170e0 r6:ede1beac r5:ec417188
r4:eebed848
[<c0311134>] (writeback_sb_inodes) from [<c0311634>] (__writeback_inodes_wb+0x50/0xe4)
r10:ee7128e8 r9:c0e03d00 r8:eebed85c r7:ede1beac r6:00000000 r5:eebed848
r4:ee120000
[<c03115e4>] (__writeback_inodes_wb) from [<c031195c>] (wb_writeback+0x294/0x338)
r10:00020800 r9:ede1a000 r8:c0e04e64 r7:eebed848 r6:000192d0 r5:ede1beac
r4:eebed848
[<c03116c8>] (wb_writeback) from [<c0312e98>] (wb_workfn+0x3e0/0x54c)
r10:ee894005 r9:eebed84c r8:eebed948 r7:eebed848 r6:00000000 r5:eebed954
r4:00002b6e
[<c0312ab8>] (wb_workfn) from [<c014f2b8>] (process_one_work+0x214/0x544)
r10:ee894005 r9:00000200 r8:00000000 r7:ee894000 r6:ef044400 r5:edb1c700
r4:eebed954
[<c014f0a4>] (process_one_work) from [<c014f634>] (worker_thread+0x4c/0x574)
r10:ef044400 r9:c0e03d00 r8:ef044418 r7:00000088 r6:ef044400 r5:edb1c714
r4:edb1c700
[<c014f5e8>] (worker_thread) from [<c01564fc>] (kthread+0x144/0x170)
r10:ef125e90 r9:ec0f235c r8:edb1c700 r7:ede1a000 r6:00000000 r5:ec0f2300
r4:ec0f2340
[<c01563b8>] (kthread) from [<c01010e8>] (ret_from_fork+0x14/0x2c)
Exception stack(0xede1bfb0 to 0xede1bff8)bfa0: 00000000 00000000 00000000 00000000
bfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
bfe0: 00000000 00000000 00000000 00000000 00000013 00000000
r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:c01563b8 r4:ec0f2300
NMI backtrace for cpu 2
CPU: 2 PID: 52 Comm: khungtaskd Not tainted 5.6.0-rc2-00254-g9a029a493dc16 #4 Hardware name: Allwinner A83t board Backtrace: [<c010db5c>] (dump_backtrace) from [<c010dee0>] (show_stack+0x20/0x24) r7:00000000 r6:60060013 r5:00000000 r4:c0e9ab10
Quoted 61 lines
Otherwise, we can hit deadlock by waiting for the locked page in
move_data_blockin GC.Thread A Thread B
-do_page_mkwrite
-f2fs_vm_page_mkwrite
-lock_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)
-f2fs_gc
-do_garbage_collect
-ra_data_block
-grab_cache_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)Fixes 39a8695824510 ("f2fs: refactor ->page_mkwrite() flow")Reviewed-by Chao Yu <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/f2fs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)fs/f2fs/file.c +4
-3@@ -50,7 +50,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct page *page = vmf->page;struct inode *inode =file_inode (vmf->vma->vm_file);struct f2fs_sb_info *sbi =F2FS_I_SB (inode); -struct dnode_of_data dn = { .node_changed = false }; +struct dnode_of_data dn;int err;if (unlikely (f2fs_cp_error (sbi))) {@@ -63,6 +63,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) goto err; } +/* should do out of any locked page */ +f2fs_balance_fs (sbi, true); +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));@@ -120,8 +123,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);Signature · 1 line
2.20.1
Re: [PATCH 5.5 020/399] f2fs: call f2fs_balance_fs outside of locked page
Quoted 11 lines · megous hlavni
Hello,
Quoted 3 lines · Greg Kroah-Hartman
From: Jaegeuk Kim <[email protected]>
[ Upstream commit
bdf03299248916640a835a05d32841bb3d31912d]I have somes issues with this patch.
It causes panics due to hung tasks on 5.6. I guess it fixes one deadlock, but causes other one? Not sure backporting it to stable branches is a good idea.
False alarm. The issue is unrelated to this patch.
regards,
o.
Quoted 127 lines
regards,
o.INFO: task kworker/u16:2:341 blocked for more than 122 seconds. Not tainted 5.6.0-rc2-00254-g9a029a493dc16 #4 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kworker/u16:2 D 0 341 2 0x00000000 Workqueue: writeback wb_workfn (flush-179:0) Backtrace: [<c0912bd0>] (__schedule) from [<c0913274>] (schedule+0x78/0xf4) r10:ede1a000 r9:00000000 r8:ede1ba60 r7:ec417290 r6:00000002 r5:ede1a000 r4:ee8e8000 [<c09131fc>] (schedule) from [<c017ec74>] (rwsem_down_write_slowpath+0x24c/0x4c0) r5:00000001 r4:ec417280 [<c017ea28>] (rwsem_down_write_slowpath) from [<c0915f6c>] (down_write+0x6c/0x70) r10:ec417280 r9:ede1bd80 r8:ee128000 r7:00000001 r6:00000000 r5:eff0afc4 r4:ec417280 [<c0915f00>] (down_write) from [<c0435b68>] (f2fs_write_single_data_page+0x608/0x7ac) r5:eff0afc4 r4:ec4170e0 [<c0435560>] (f2fs_write_single_data_page) from [<c0435fc0>] (f2fs_write_cache_pages+0x2b4/0x7c4) r10:ede1bc28 r9:ec4171e0 r8:ec4170e0 r7:00000001 r6:ede1bd80 r5:00000001 r4:eff0afc4 [<c0435d0c>] (f2fs_write_cache_pages) from [<c0436814>] (f2fs_write_data_pages+0x344/0x35c) r10:0000012c r9:ee12802c r8:ee128000 r7:00000004 r6:ec4171e0 r5:ec4170e0 r4:ede1bd80 [<c04364d0>] (f2fs_write_data_pages) from [<c0267fa0>] (do_writepages+0x3c/0xd4) r10:0000012c r9:c0e03d00 r8:00001400 r7:c0264e94 r6:ede1bd80 r5:ec4171e0 r4:ec4170e0 [<c0267f64>] (do_writepages) from [<c0310d24>] (__writeback_single_inode+0x44/0x454) r7:ec4171e0 r6:ede1beac r5:ede1bd80 r4:ec4170e0 [<c0310ce0>] (__writeback_single_inode) from [<c0311338>] (writeback_sb_inodes+0x204/0x4b0) r10:0000012c r9:c0e03d00 r8:ec417148 r7:ec4170e0 r6:ede1beac r5:ec417188 r4:eebed848 [<c0311134>] (writeback_sb_inodes) from [<c0311634>] (__writeback_inodes_wb+0x50/0xe4) r10:ee7128e8 r9:c0e03d00 r8:eebed85c r7:ede1beac r6:00000000 r5:eebed848 r4:ee120000 [<c03115e4>] (__writeback_inodes_wb) from [<c031195c>] (wb_writeback+0x294/0x338) r10:00020800 r9:ede1a000 r8:c0e04e64 r7:eebed848 r6:000192d0 r5:ede1beac r4:eebed848 [<c03116c8>] (wb_writeback) from [<c0312e98>] (wb_workfn+0x3e0/0x54c) r10:ee894005 r9:eebed84c r8:eebed948 r7:eebed848 r6:00000000 r5:eebed954 r4:00002b6e [<c0312ab8>] (wb_workfn) from [<c014f2b8>] (process_one_work+0x214/0x544) r10:ee894005 r9:00000200 r8:00000000 r7:ee894000 r6:ef044400 r5:edb1c700 r4:eebed954 [<c014f0a4>] (process_one_work) from [<c014f634>] (worker_thread+0x4c/0x574) r10:ef044400 r9:c0e03d00 r8:ef044418 r7:00000088 r6:ef044400 r5:edb1c714 r4:edb1c700 [<c014f5e8>] (worker_thread) from [<c01564fc>] (kthread+0x144/0x170) r10:ef125e90 r9:ec0f235c r8:edb1c700 r7:ede1a000 r6:00000000 r5:ec0f2300 r4:ec0f2340 [<c01563b8>] (kthread) from [<c01010e8>] (ret_from_fork+0x14/0x2c) Exception stack(0xede1bfb0 to 0xede1bff8)bfa0: 00000000 00000000 00000000 00000000
bfc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
bfe0: 00000000 00000000 00000000 00000000 00000013 00000000
r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:c01563b8 r4:ec0f2300
NMI backtrace for cpu 2CPU: 2 PID: 52 Comm: khungtaskd Not tainted 5.6.0-rc2-00254-g9a029a493dc16 #4 Hardware name: Allwinner A83t board Backtrace: [<c010db5c>] (dump_backtrace) from [<c010dee0>] (show_stack+0x20/0x24) r7:00000000 r6:60060013 r5:00000000 r4:c0e9ab10Quoted 61 lines
Otherwise, we can hit deadlock by waiting for the locked page in
move_data_blockin GC.Thread A Thread B
-do_page_mkwrite
-f2fs_vm_page_mkwrite
-lock_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)
-f2fs_gc
-do_garbage_collect
-ra_data_block
-grab_cache_page
-f2fs_balance_fs
-mutex_lock(gc_mutex)Fixes 39a8695824510 ("f2fs: refactor ->page_mkwrite() flow")Reviewed-by Chao Yu <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- fs/f2fs/file.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)fs/f2fs/file.c +4
-3@@ -50,7 +50,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct page *page = vmf->page;struct inode *inode =file_inode (vmf->vma->vm_file);struct f2fs_sb_info *sbi =F2FS_I_SB (inode); -struct dnode_of_data dn = { .node_changed = false }; +struct dnode_of_data dn;int err;if (unlikely (f2fs_cp_error (sbi))) {@@ -63,6 +63,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) goto err; } +/* should do out of any locked page */ +f2fs_balance_fs (sbi, true); +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));@@ -120,8 +123,6 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -f2fs_balance_fs (sbi, dn.node_changed); -sb_end_pagefault (inode->i_sb); err:return block_page_mkwrite_return (err);Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 21/399 media: meson: add missing allocation failure check on new_buf
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 11e0e167d071a28288a7a0a211d48c571d19b56f ]
Currently if the allocation of new_buf fails then a null pointer dereference occurs when assiging new_buf->vb. Avoid this by returning early on a memory allocation failure as there is not much more can be done at this point.
Addresses-Coverity: ("Dereference null return")
--- drivers/staging/media/meson/vdec/vdec.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/meson/vdec/vdec.c +2 -0
@@ -133,6 +133,8 @@ vdec_queue_recycle(struct amvdec_session *sess, struct vb2_buffer *vb)struct amvdec_buffer *new_buf; new_buf =kmalloc (sizeof (*new_buf),GFP_KERNEL ); +if (!new_buf) +return ; new_buf->vb = vb;mutex_lock (&sess->bufs_recycle_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 22/399 clk: meson: pll: Fix by 0 division in __pll_params_to_rate()
In reply to Greg Kroah-HartmanFrom: Remi Pommarel <[email protected]>
[ Upstream commit d8488a41800d9f5c80bc0d17b9cc2c91b4841464 ]
Some meson pll registers can be initialized with 0 as N value, introducing the following division by 0 when computing rate :
UBSAN: Undefined behaviour in drivers/clk/meson/clk-pll.c:75:9 division by zero CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.4.0-rc3-608075-g86c9af8630e1-dirty #400 Call trace: dump_backtrace+0x0/0x1c0 show_stack+0x14/0x20 dump_stack+0xc4/0x100 ubsan_epilogue+0x14/0x68 __ubsan_handle_divrem_overflow+0x98/0xb8 __pll_params_to_rate+0xdc/0x140 meson_clk_pll_recalc_rate+0x278/0x3a0 __clk_register+0x7c8/0xbb0 devm_clk_hw_register+0x54/0xc0 meson_eeclkc_probe+0xf4/0x1a0 platform_drv_probe+0x54/0xd8 really_probe+0x16c/0x438 driver_probe_device+0xb0/0xf0 device_driver_attach+0x94/0xa0 __driver_attach+0x70/0x108 bus_for_each_dev+0xd8/0x128 driver_attach+0x30/0x40 bus_add_driver+0x1b0/0x2d8 driver_register+0xbc/0x1d0 __platform_driver_register+0x78/0x88 axg_driver_init+0x18/0x20 do_one_initcall+0xc8/0x24c kernel_init_freeable+0x2b0/0x344 kernel_init+0x10/0x128 ret_from_fork+0x10/0x18
This checks if N is null before doing the division.
--- drivers/clk/meson/clk-pll.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/clk/meson/clk-pll.c +9 -0
@@ -77,6 +77,15 @@ static unsigned long meson_clk_pll_recalc_rate(struct clk_hw *hw,unsigned int m, n, frac; n =meson_parm_read (clk->map, &pll->n); + +/* +* On some HW, N is set to zero on init. This value is invalid as +* it would result in a division by zero. The rate can't be +* calculated in this case +*/ +if (n ==0 ) +return 0 ; + m =meson_parm_read (clk->map, &pll->m); frac = MESON_PARM_APPLICABLE(&pll->frac) ?
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 23/399 cpu/hotplug, stop_machine: Fix stop_machine vs hotplug order
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 45178ac0cea853fe0e405bf11e101bdebea57b15 ]
Paul reported a very sporadic, rcutorture induced, workqueue failure. When the planets align, the workqueue rescuer's self-migrate fails and then triggers a WARN for running a work on the wrong CPU.
Tejun then figured that set_cpus_allowed_ptr()'s stop_one_cpu() call could be ignored! When stopper->enabled is false, stop_machine will insta complete the work, without actually doing the work. Worse, it will not WARN about this (we really should fix this).
It turns out there is a small window where a freshly online'ed CPU is marked 'online' but doesn't yet have the stopper task running:
BP AP bringup_cpu() __cpu_up(cpu, idle) --> start_secondary() ... cpu_startup_entry() bringup_wait_for_ap() wait_for_ap_thread() <-- cpuhp_online_idle() while (1) do_idle() ... available to run kthreads ... stop_machine_unpark() stopper->enable = true;
Close this by moving the stop_machine_unpark() into cpuhp_online_idle(), such that the stopper thread is ready before we start the idle loop and schedule.
--- kernel/cpu.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
kernel/cpu.c +9 -4
@@ -525,8 +525,7 @@ static int bringup_wait_for_ap(unsigned int cpu)if (WARN_ON_ONCE ((!cpu_online (cpu))))return -ECANCELED ; -/* Unpark the stopper thread and the hotplug thread of the target cpu */ -stop_machine_unpark (cpu); +/* Unpark the hotplug thread of the target cpu */ kthread_unpark (st->thread);/*
@@ -1089,8 +1088,8 @@ void notify_cpu_starting(unsigned int cpu)/* * Called from the idle task. Wake up the controlling task which brings the -* stopper and the hotplug thread of the upcoming CPU up and then delegates -* the rest of the online bringup to the hotplug thread. +* hotplug thread of the upcoming CPU up and then delegates the rest of the +* online bringup to the hotplug thread. */ void cpuhp_online_idle (enum cpuhp_state state) {
@@ -1100,6 +1099,12 @@ void cpuhp_online_idle(enum cpuhp_state state)if (state !=CPUHP_AP_ONLINE_IDLE )return ; +/* +* Unpart the stopper thread before we start the idle loop (and start +* scheduling); this ensures the stopper task is always available. +*/ +stop_machine_unpark (smp_processor_id ()); + st->state =CPUHP_AP_ONLINE_IDLE ;complete_ap_thread (st, true); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 24/399 drm: rcar-du: Recognize "renesas,vsps" in addition to "vsps"
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 7b627ce80fbd05885b27f711a5f9820f2b40749a ]
The Renesas-specific "vsps" property lacks a vendor prefix. Add a "renesas," prefix to comply with DT best practises. Retain backward compatibility with old DTBs by falling back to "vsps" when needed.
--- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_kms.c +12 -5
@@ -542,6 +542,7 @@ static int rcar_du_properties_init(struct rcar_du_device *rcdu)static int rcar_du_vsps_init (struct rcar_du_device *rcdu) {const struct device_node *np = rcdu->dev->of_node; +const char *vsps_prop_name ="renesas,vsps" ;struct of_phandle_args args;struct {struct device_node *np;
@@ -557,15 +558,21 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)* entry contains a pointer to the VSP DT node and a bitmask of the * connected DU CRTCs. */ - cells =of_property_count_u32_elems (np,"vsps" ) / rcdu->num_crtcs -1 ; + ret =of_property_count_u32_elems (np, vsps_prop_name); +if (ret <0 ) { +/* Backward compatibility with old DTBs. */ + vsps_prop_name ="vsps" ; + ret =of_property_count_u32_elems (np, vsps_prop_name); + } + cells = ret / rcdu->num_crtcs -1 ;if (cells >1 )return -EINVAL ;for (i =0 ; i < rcdu->num_crtcs; ++i) {unsigned int j; - ret =of_parse_phandle_with_fixed_args (np,"vsps" , cells, i, - &args); + ret =of_parse_phandle_with_fixed_args (np, vsps_prop_name, + cells, i, &args);if (ret <0 ) goto error;
@@ -587,8 +594,8 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)/* * Store the VSP pointer and pipe index in the CRTC. If the -* second cell of the 'vsps' specifier isn't present, default -* to 0 to remain compatible with older DT bindings. +* second cell of the 'renesas,vsps' specifier isn't present, +* default to 0 to remain compatible with older DT bindings. */ rcdu->crtcs[i].vsp = &rcdu->vsps[j]; rcdu->crtcs[i].vsp_pipe = cells >=1 ? args.args[0 ] :0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 25/399 dmaengine: ti: edma: Fix error return code in edma_probe()
In reply to Greg Kroah-HartmanFrom: Wei Yongjun <[email protected]>
[ Upstream commit d1fd03a35efc6285e43f4ef35ef04dbf2c9389c6 ]
Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function.
--- drivers/dma/ti/edma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/dma/ti/edma.c +3 -1
@@ -2342,8 +2342,10 @@ static int edma_probe(struct platform_device *pdev) ecc->channels_mask =devm_kcalloc (dev,BITS_TO_LONGS (ecc->num_channels),sizeof (unsigned long ),GFP_KERNEL ); -if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) +if (!ecc->slave_chans || !ecc->slot_inuse || !ecc->channels_mask) { + ret = -ENOMEM ; goto err_disable_pm; + }/* Mark all channels available initially */ bitmap_fill (ecc->channels_mask, ecc->num_channels);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 26/399 brcmfmac: Fix memory leak in brcmf_p2p_create_p2pdev()
In reply to Greg Kroah-HartmanFrom: Navid Emamdoost <[email protected]>
[ Upstream commit 5cc509aa83c6acd2c5cd94f99065c39d2bd0a490 ]
In the implementation of brcmf_p2p_create_p2pdev() the allocated memory for p2p_vif is leaked when the mac address is the same as primary interface. To fix this, go to error path to release p2p_vif via brcmf_free_vif().
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +2 -1
@@ -2092,7 +2092,8 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p,/* firmware requires unique mac address for p2pdev interface */ if (addr &ðer_addr_equal (addr, pri_ifp->mac_addr)) {bphy_err (drvr,"discovery vif must be different from primary interface\n" ); -return ERR_PTR (-EINVAL ); + err = -EINVAL ; + goto fail; }brcmf_p2p_generate_bss_mac (p2p, addr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 27/399 brcmfmac: Fix use after free in brcmf_sdio_readframes()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 216b44000ada87a63891a8214c347e05a4aea8fe ]
The brcmu_pkt_buf_free_skb() function frees "pkt" so it leads to a static checker warning:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:1974 brcmf_sdio_readframes()
error: dereferencing freed memory 'pkt'
It looks like there was supposed to be a continue after we free "pkt".
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +1 -0
@@ -1935,6 +1935,7 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes) BRCMF_SDIO_FT_NORMAL)) { rd->len =0 ;brcmu_pkt_buf_free_skb (pkt); +continue ; } bus->sdcnt.rx_readahead_cnt++;if (rd->len !=roundup (rd_new.len,16 )) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 28/399 PCI: Fix pci_add_dma_alias() bitmask size
In reply to Greg Kroah-HartmanFrom: James Sewart <[email protected]>
[ Upstream commit f8bf2aeb651b3460a4b36fd7ba1ba1d31777d35c ]
The number of possible devfns is 256, but pci_add_dma_alias() allocated a bitmap of size 255. Fix this off-by-one error.
This fixes commits 338c3149a221 ("PCI: Add support for multiple DMA aliases") and c6635792737b ("PCI: Allocate dma_alias_mask with bitmap_zalloc()"), but I doubt it was possible to see a problem because it takes 4 64-bit longs (or 8 32-bit longs) to hold 255 bits, and bitmap_zalloc() doesn't save the 255-bit size anywhere.
[bhelgaas: commit log, move #define to drivers/pci/pci.h, include loop limit fix from Qian Cai:
https://lore.kernel.org/r/[email protected]]
--- drivers/pci/pci.c | 2 +- drivers/pci/pci.h | 3 +++ drivers/pci/search.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/pci/pci.c +1 -1
@@ -6017,7 +6017,7 @@ EXPORT_SYMBOL_GPL(pci_pr3_present);void pci_add_dma_alias (struct pci_dev *dev,u8 devfn) {if (!dev->dma_alias_mask) - dev->dma_alias_mask =bitmap_zalloc (U8_MAX ,GFP_KERNEL ); + dev->dma_alias_mask =bitmap_zalloc (MAX_NR_DEVFNS ,GFP_KERNEL );if (!dev->dma_alias_mask) {pci_warn (dev,"Unable to allocate DMA alias mask\n" );return ;
drivers/pci/pci.h +3 -0
@@ -4,6 +4,9 @@#include <linux/pci.h> +/* Number of possible devfns: 0.0 to 1f.7 inclusive */ +#define MAX_NR_DEVFNS 256 +#define PCI_FIND_CAP_TTL 48#define PCI_VSEC_ID_INTEL_TBT 0x1234/* Thunderbolt */
drivers/pci/search.c +2 -2
@@ -41,9 +41,9 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,* DMA, iterate over that too. */ if (unlikely (pdev->dma_alias_mask)) { -u8 devfn; +unsigned int devfn; -for_each_set_bit (devfn, pdev->dma_alias_mask,U8_MAX ) { +for_each_set_bit (devfn, pdev->dma_alias_mask,MAX_NR_DEVFNS ) { ret =fn (pdev,PCI_DEVID (pdev->bus->number, devfn), data);if (ret)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 29/399 drm/amd/display: Map ODM memory correctly when doing ODM combine
In reply to Greg Kroah-HartmanFrom: Nikola Cornij <[email protected]>
[ Upstream commit ec5b356c58941bb8930858155d9ce14ceb3d30a0 ]
[why]
Up to 4 ODM memory pieces are required per ODM combine and cannot overlap, i.e. each ODM "session" has to use its own memory pieces. The ODM-memory mapping is currently broken for generic case.
The maximum number of memory pieces is ASIC-dependent, but it's always big enough to satisfy maximum number of ODM combines. Memory pieces are mapped as a bit-map, i.e. one memory piece corresponds to one bit. The OPTC doing ODM needs to select memory pieces by setting the corresponding bits, making sure there's no overlap with other OPTC instances that might be doing ODM.
The current mapping works only for OPTC instance indexes smaller than
3. For instance indexes 3 and up it practically maps no ODM memory, causing black, gray or white screen in display configs that include ODM on OPTC instance 3 or up.
[how]
Statically map two unique ODM memory pieces for each OPTC instance and piece them together when programming ODM combine mode.
--- .../gpu/drm/amd/display/dc/dcn20/dcn20_optc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c +12 -4
@@ -233,12 +233,13 @@ void optc2_set_odm_combine(struct timing_generator *optc, int *opp_id, int opp_c struct dc_crtc_timing *timing) {struct optc *optc1 =DCN10TG_FROM_TG (optc); -/* 2 pieces of memory required for up to 5120 displays, 4 for up to 8192 */ int mpcc_hactive = (timing->h_addressable + timing->h_border_left + timing->h_border_right) / opp_cnt; -int memory_mask = mpcc_hactive <=2560 ?0x3 :0xf ; +uint32_t memory_mask;uint32_t data_fmt =0 ; +ASSERT (opp_cnt ==2 ); +/* TODO: In pseudocode but does not affect maximus, delete comment if we dont need on asic * REG_SET(OTG_GLOBAL_CONTROL2, 0, GLOBAL_UPDATE_LOCK_EN, 1); * Program OTG register MASTER_UPDATE_LOCK_DB_X/Y to the position before DP frame start
@@ -246,9 +247,17 @@ void optc2_set_odm_combine(struct timing_generator *optc, int *opp_id, int opp_c* MASTER_UPDATE_LOCK_DB_X, 160, * MASTER_UPDATE_LOCK_DB_Y, 240); */ + +/* 2 pieces of memory required for up to 5120 displays, 4 for up to 8192, +* however, for ODM combine we can simplify by always using 4. +* To make sure there's no overlap, each instance "reserves" 2 memories and +* they are uniquely combined here. +*/ + memory_mask =0x3 << (opp_id[0 ] *2 ) |0x3 << (opp_id[1 ] *2 ); +if (REG (OPTC_MEMORY_CONFIG ))REG_SET (OPTC_MEMORY_CONFIG ,0 , -OPTC_MEM_SEL , memory_mask << (optc->inst *4 )); +OPTC_MEM_SEL , memory_mask);if (timing->pixel_encoding ==PIXEL_ENCODING_YCBCR422 ) data_fmt =1 ;
@@ -257,7 +266,6 @@ void optc2_set_odm_combine(struct timing_generator *optc, int *opp_id, int opp_cREG_UPDATE (OPTC_DATA_FORMAT_CONTROL ,OPTC_DATA_FORMAT , data_fmt); -ASSERT (opp_cnt ==2 ); REG_SET_3(OPTC_DATA_SOURCE_SELECT, 0, OPTC_NUM_OF_INPUT_SEGMENT, 1, OPTC_SEG0_SRC_SEL, opp_id[0],
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 30/399 leds: pca963x: Fix open-drain initialization
In reply to Greg Kroah-HartmanFrom: Zahari Petkov <[email protected]>
[ Upstream commit 697529091ac7a0a90ca349b914bb30641c13c753 ]
Before commit bb29b9cccd95 ("leds: pca963x: Add bindings to invert polarity") Mode register 2 was initialized directly with either 0x01 or 0x05 for open-drain or totem pole (push-pull) configuration.
Afterwards, MODE2 initialization started using bitwise operations on top of the default MODE2 register value (0x05). Using bitwise OR for setting OUTDRV with 0x01 and 0x05 does not produce correct results. When open-drain is used, instead of setting OUTDRV to 0, the driver keeps it as 1:
Open-drain: 0x05 | 0x01 -> 0x05 (0b101 - incorrect) Totem pole: 0x05 | 0x05 -> 0x05 (0b101 - correct but still wrong)
Now OUTDRV setting uses correct bitwise operations for initialization:
Open-drain: 0x05 & ~0x04 -> 0x01 (0b001 - correct) Totem pole: 0x05 | 0x04 -> 0x05 (0b101 - correct)
Additional MODE2 register definitions are introduced now as well.
--- drivers/leds/leds-pca963x.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/leds/leds-pca963x.c +5 -3
@@ -40,6 +40,8 @@#define PCA963X_LED_PWM 0x2/* Controlled through PWM */ #define PCA963X_LED_GRP_PWM 0x3/* Controlled through PWM/GRPPWM */ +#define PCA963X_MODE2_OUTDRV 0x04/* Open-drain or totem pole */ +#define PCA963X_MODE2_INVRT 0x10/* Normal or inverted direction */ #define PCA963X_MODE2_DMBLNK 0x20/* Enable blinking */ #define PCA963X_MODE1 0x00
@@ -438,12 +440,12 @@ static int pca963x_probe(struct i2c_client *client, PCA963X_MODE2);/* Configure output: open-drain or totem pole (push-pull) */ if (pdata->outdrv ==PCA963X_OPEN_DRAIN ) - mode2 |=0x01 ; + mode2 &= ~PCA963X_MODE2_OUTDRV ;else - mode2 |=0x05 ; + mode2 |=PCA963X_MODE2_OUTDRV ;/* Configure direction: normal or inverted */ if (pdata->dir ==PCA963X_INVERTED ) - mode2 |=0x10 ; + mode2 |=PCA963X_MODE2_INVRT ;i2c_smbus_write_byte_data (pca963x->chip->client,PCA963X_MODE2 , mode2); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 31/399 ext4: fix ext4_dax_read/write inode locking sequence for IOCB_NOWAIT
In reply to Greg Kroah-HartmanFrom: Ritesh Harjani <[email protected]>
[ Upstream commit f629afe3369e9885fd6e9cc7a4f514b6a65cf9e9 ]
Apparently our current rwsem code doesn't like doing the trylock, then lock for real scheme. So change our dax read/write methods to just do the trylock for the RWF_NOWAIT case.
This seems to fix AIM7 regression in some scalable filesystems upto ~25% in some cases. Claimed in commit 942491c9e6d6 ("xfs: fix AIM7 regression")
--- fs/ext4/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/ext4/file.c +6 -4
@@ -88,9 +88,10 @@ static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to)struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; -if (!inode_trylock_shared (inode)) { -if (iocb->ki_flags &IOCB_NOWAIT ) +if (iocb->ki_flags &IOCB_NOWAIT ) { +if (!inode_trylock_shared (inode))return -EAGAIN ; + }else {inode_lock_shared (inode); }/*
@@ -487,9 +488,10 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)bool extend = false;struct inode *inode =file_inode (iocb->ki_filp); -if (!inode_trylock (inode)) { -if (iocb->ki_flags &IOCB_NOWAIT ) +if (iocb->ki_flags &IOCB_NOWAIT ) { +if (!inode_trylock (inode))return -EAGAIN ; + }else {inode_lock (inode); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 32/399 ALSA: ctl: allow TLV read operation for callback type of element in locked case
In reply to Greg Kroah-HartmanFrom: Takashi Sakamoto <[email protected]>
[ Upstream commit d61fe22c2ae42d9fd76c34ef4224064cca4b04b0 ]
A design of ALSA control core allows applications to execute three operations for TLV feature; read, write and command. Furthermore, it allows driver developers to process the operations by two ways; allocated array or callback function. In the former, read operation is just allowed, thus developers uses the latter when device driver supports variety of models or the target model is expected to dynamically change information stored in TLV container.
The core also allows applications to lock any element so that the other applications can't perform write operation to the element for element value and TLV information. When the element is locked, write and command operation for TLV information are prohibited as well as element value. Any read operation should be allowed in the case.
At present, when an element has callback function for TLV information, TLV read operation returns EPERM if the element is locked. On the other hand, the read operation is success when an element has allocated array for TLV information. In both cases, read operation is success for element value expectedly.
This commit fixes the bug. This change can be backported to v4.14 kernel or later.
--- sound/core/control.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/core/control.c +3 -2
@@ -1430,8 +1430,9 @@ static int call_tlv_handler(struct snd_ctl_file *file, int op_flag,if (kctl->tlv.c ==NULL )return -ENXIO ; -/* When locked, this is unavailable. */ -if (vd->owner !=NULL && vd->owner != file) +/* Write and command operations are not allowed for locked element. */ +if (op_flag !=SNDRV_CTL_TLV_OP_READ && + vd->owner !=NULL && vd->owner != file)return -EPERM ;return kctl->tlv.c (kctl, op_flag, size, buf);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 33/399 gianfar: Fix TX timestamping with a stacked DSA driver
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit c26a2c2ddc0115eb088873f5c309cf46b982f522 ]
The driver wrongly assumes that it is the only entity that can set the SKBTX_IN_PROGRESS bit of the current skb. Therefore, in the gfar_clean_tx_ring function, where the TX timestamp is collected if necessary, the aforementioned bit is used to discriminate whether or not the TX timestamp should be delivered to the socket's error queue.
But a stacked driver such as a DSA switch can also set the SKBTX_IN_PROGRESS bit, which is actually exactly what it should do in order to denote that the hardware timestamping process is undergoing.
Therefore, gianfar would misinterpret the "in progress" bit as being its own, and deliver a second skb clone in the socket's error queue, completely throwing off a PTP process which is not expecting to receive it, _even though_ TX timestamping is not enabled for gianfar.
There have been discussions [0] as to whether non-MAC drivers need or not to set SKBTX_IN_PROGRESS at all (whose purpose is to avoid sending 2 timestamps, a sw and a hw one, to applications which only expect one). But as of this patch, there are at least 2 PTP drivers that would break in conjunction with gianfar: the sja1105 DSA switch and the felix switch, by way of its ocelot core driver.
So regardless of that conclusion, fix the gianfar driver to not do stuff based on flags set by others and not intended for it.
[0]: https://www.spinics.net/lists/netdev/msg619699.html
--- drivers/net/ethernet/freescale/gianfar.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +7 -3
@@ -2205,13 +2205,17 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) skb_dirtytx = tx_queue->skb_dirtytx;while ((skb = tx_queue->tx_skbuff[skb_dirtytx])) { +bool do_tstamp; + + do_tstamp = (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) && + priv->hwts_tx_en; frags =skb_shinfo (skb)->nr_frags;/* When time stamping, one additional TxBD must be freed. * Also, we need to dma_unmap_single() the TxPAL. */ -if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_IN_PROGRESS )) +if (unlikely (do_tstamp)) nr_txbds = frags +2 ;else nr_txbds = frags +1 ;
@@ -2225,7 +2229,7 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) (lstatus & BD_LENGTH_MASK))break ; -if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_IN_PROGRESS )) { +if (unlikely (do_tstamp)) { next =next_txbd (bdp, base, tx_ring_size); buflen =be16_to_cpu (next->length) +GMAC_FCB_LEN +GMAC_TXPAL_LEN ;
@@ -2235,7 +2239,7 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)dma_unmap_single (priv->dev,be32_to_cpu (bdp->bufPtr), buflen,DMA_TO_DEVICE ); -if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_IN_PROGRESS )) { +if (unlikely (do_tstamp)) {struct skb_shared_hwtstamps shhwtstamps;u64 *ns = (u64 *)(((uintptr_t )skb->data +0x10 ) & ~0x7UL );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 34/399 pinctrl: sh-pfc: sh7264: Fix CAN function GPIOs
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 55b1cb1f03ad5eea39897d0c74035e02deddcff2 ]
pinmux_func_gpios[] contains a hole due to the missing function GPIO definition for the "CTX0&CTX1" signal, which is the logical "AND" of the two CAN outputs.
Fix this by:
- Renaming CRX0_CRX1_MARK to CTX0_CTX1_MARK, as PJ2MD[2:0]=010 configures the combined "CTX0&CTX1" output signal,
- Renaming CRX0X1_MARK to CRX0_CRX1_MARK, as PJ3MD[1:0]=10 configures the shared "CRX0/CRX1" input signal, which is fed to both CAN inputs,
- Adding the missing function GPIO definition for "CTX0&CTX1" to
pinmux_func_gpios[],
- Moving all CAN enums next to each other.
See SH7262 Group, SH7264 Group User's Manual: Hardware, Rev. 4.00:
[1] Figure 1.2 (3) (Pin Assignment for the SH7264 Group (1-Mbyte Version),
[2] Figure 1.2 (4) Pin Assignment for the SH7264 Group (640-Kbyte Version,
[3] Table 1.4 List of Pins,
[4] Figure 20.29 Connection Example when Using This Module as 1-Channel Module (64 Mailboxes x 1 Channel),
[5] Table 32.10 Multiplexed Pins (Port J),
[6] Section 32.2.30 (3) Port J Control Register 0 (PJCR0).
Note that the last 2 disagree about PJ2MD[2:0], which is probably the root cause of this bug. But considering [4], "CTx0&CTx1" in [5] must be correct, and "CRx0&CRx1" in [6] must be wrong.
--- drivers/pinctrl/sh-pfc/pfc-sh7264.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/pinctrl/sh-pfc/pfc-sh7264.c +4 -5
@@ -497,17 +497,15 @@ enum {SD_WP_MARK ,SD_CLK_MARK ,SD_CMD_MARK ,CRX0_MARK ,CRX1_MARK ,CTX0_MARK ,CTX1_MARK , +CRX0_CRX1_MARK ,CTX0_CTX1_MARK ,PWM1A_MARK ,PWM1B_MARK ,PWM1C_MARK ,PWM1D_MARK ,PWM1E_MARK ,PWM1F_MARK ,PWM1G_MARK ,PWM1H_MARK ,PWM2A_MARK ,PWM2B_MARK ,PWM2C_MARK ,PWM2D_MARK ,PWM2E_MARK ,PWM2F_MARK ,PWM2G_MARK ,PWM2H_MARK ,IERXD_MARK ,IETXD_MARK , -CRX0_CRX1_MARK ,WDTOVF_MARK , -CRX0X1_MARK , -/* DMAC */ TEND0_MARK ,DACK0_MARK ,DREQ0_MARK , TEND1_MARK, DACK1_MARK, DREQ1_MARK,
@@ -995,12 +993,12 @@ static const u16 pinmux_data[] = {PINMUX_DATA (PJ3_DATA ,PJ3MD_00 ),PINMUX_DATA (CRX1_MARK ,PJ3MD_01 ), -PINMUX_DATA (CRX0X1_MARK ,PJ3MD_10 ), +PINMUX_DATA (CRX0_CRX1_MARK ,PJ3MD_10 ),PINMUX_DATA (IRQ1_PJ_MARK ,PJ3MD_11 ),PINMUX_DATA (PJ2_DATA ,PJ2MD_000 ),PINMUX_DATA (CTX1_MARK ,PJ2MD_001 ), -PINMUX_DATA (CRX0_CRX1_MARK ,PJ2MD_010 ), +PINMUX_DATA (CTX0_CTX1_MARK ,PJ2MD_010 ),PINMUX_DATA (CS2_MARK ,PJ2MD_011 ),PINMUX_DATA (SCK0_MARK ,PJ2MD_100 ), PINMUX_DATA(LCD_M_DISP_MARK, PJ2MD_101),
@@ -1245,6 +1243,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {GPIO_FN (CTX1 ),GPIO_FN (CRX1 ),GPIO_FN (CTX0 ), +GPIO_FN (CTX0_CTX1 ),GPIO_FN (CRX0 ), GPIO_FN(CRX0_CRX1),
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 35/399 printk: fix exclusive_console replaying
In reply to Greg Kroah-HartmanFrom: John Ogness <[email protected]>
[ Upstream commit def97da136515cb289a14729292c193e0a93bc64 ]
Commit f92b070f2dc8 ("printk: Do not miss new messages when replaying the log") introduced a new variable @exclusive_console_stop_seq to store when an exclusive console should stop printing. It should be set to the @console_seq value at registration. However, @console_seq is previously set to @syslog_seq so that the exclusive console knows where to begin. This results in the exclusive console immediately reactivating all the other consoles and thus repeating the messages for those consoles.
Set @console_seq after @exclusive_console_stop_seq has stored the current @console_seq value.
--- kernel/printk/printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/printk/printk.c +2 -2
@@ -2770,8 +2770,6 @@ void register_console(struct console *newcon)* for us. */ logbuf_lock_irqsave (flags); - console_seq = syslog_seq; - console_idx = syslog_idx;/* * We're about to replay the log buffer. Only do this to the * just-registered console to avoid excessive message spam to
@@ -2783,6 +2781,8 @@ void register_console(struct console *newcon)*/ exclusive_console = newcon; exclusive_console_stop_seq = console_seq; + console_seq = syslog_seq; + console_idx = syslog_idx;logbuf_unlock_irqrestore (flags); }console_unlock ();
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 36/399 drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 2ce18249af5a28031b3f909cfafccc88ea966c9d ]
When configuring the frame memory window, the last column and row numbers are written to the column resp. page address registers. These numbers are thus one less than the actual window width resp. height.
While this is handled correctly in mipi_dbi_fb_dirty() since commit 03ceb1c8dfd1e293 ("drm/tinydrm: Fix setting of the column/page end addresses."), it is not in mipi_dbi_blank(). The latter still forgets to subtract one when calculating the most significant bytes of the column and row numbers, thus programming wrong values when the display width or height is a multiple of 256.
--- drivers/gpu/drm/drm_mipi_dbi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_mipi_dbi.c +2 -2
@@ -367,9 +367,9 @@ static void mipi_dbi_blank(struct mipi_dbi_dev *dbidev)memset (dbidev->tx_buf,0 , len);mipi_dbi_command (dbi,MIPI_DCS_SET_COLUMN_ADDRESS ,0 ,0 , - (width >>8 ) &0xFF , (width -1 ) &0xFF ); + ((width -1 ) >>8 ) &0xFF , (width -1 ) &0xFF );mipi_dbi_command (dbi,MIPI_DCS_SET_PAGE_ADDRESS ,0 ,0 , - (height >>8 ) &0xFF , (height -1 ) &0xFF ); + ((height -1 ) >>8 ) &0xFF , (height -1 ) &0xFF );mipi_dbi_command_buf (dbi,MIPI_DCS_WRITE_MEMORY_START , (u8 *)dbidev->tx_buf, len);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 37/399 drm/msm/adreno: fix zap vs no-zap handling
In reply to Greg Kroah-HartmanFrom: Rob Clark <[email protected]>
[ Upstream commit 15ab987c423df561e0949d77fb5043921ae59956 ]
We can have two cases, when it comes to "zap" fw. Either the fw requires zap fw to take the GPU out of secure mode at boot, or it does not and we can write RBBM_SECVID_TRUST_CNTL directly. Previously we decided based on whether zap fw load succeeded, but this is not a great plan because:
1) we could have zap fw in the filesystem on a device where it is not required
2) we could have the inverse case
Instead, shift to deciding based on whether we have a 'zap-shader' node in dt. In practice, there is only one device (currently) with upstream dt that does not use zap (cheza), and it already has a /delete-node/ for the zap-shader node.
--- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 11 +++++++++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +9 -2
@@ -753,11 +753,18 @@ static int a5xx_hw_init(struct msm_gpu *gpu) gpu->funcs->flush (gpu, gpu->rb[0 ]);if (!a5xx_idle (gpu, gpu->rb[0 ]))return -EINVAL ; - }else { -/* Print a warning so if we die, we know why */ + }else if (ret == -ENODEV ) { +/* +* This device does not use zap shader (but print a warning +* just in case someone got their dt wrong.. hopefully they +* have a debug UART to realize the error of their ways... +* if you mess this up you are about to crash horribly) +*/ dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A5XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); + }else { +return ret; }/* Last step - yield the ringbuffer */
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +9 -2
@@ -537,12 +537,19 @@ static int a6xx_hw_init(struct msm_gpu *gpu)a6xx_flush (gpu, gpu->rb[0 ]);if (!a6xx_idle (gpu, gpu->rb[0 ]))return -EINVAL ; - }else { -/* Print a warning so if we die, we know why */ + }else if (ret == -ENODEV ) { +/* +* This device does not use zap shader (but print a warning +* just in case someone got their dt wrong.. hopefully they +* have a debug UART to realize the error of their ways... +* if you mess this up you are about to crash horribly) +*/ dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); ret =0 ; + }else { +return ret; } out:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 38/399 pxa168fb: Fix the function used to release some memory in an error handling path
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 3c911fe799d1c338d94b78e7182ad452c37af897 ]
In the probe function, some resources are allocated using 'dma_alloc_wc()', they should be released with 'dma_free_wc()', not 'dma_free_coherent()'.
We already use 'dma_free_wc()' in the remove function, but not in the error handling path of the probe function.
Also, remove a useless 'PAGE_ALIGN()'. 'info->fix.smem_len' is already PAGE_ALIGNed.
--- drivers/video/fbdev/pxa168fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbdev/pxa168fb.c +3 -3
@@ -766,8 +766,8 @@ failed_free_cmap: failed_free_clk:clk_disable_unprepare (fbi->clk); failed_free_fbmem: -dma_free_coherent (fbi->dev, info->fix.smem_len, - info->screen_base, fbi->fb_start_dma); +dma_free_wc (fbi->dev, info->fix.smem_len, + info->screen_base, fbi->fb_start_dma); failed_free_info:kfree (info);
@@ -801,7 +801,7 @@ static int pxa168fb_remove(struct platform_device *pdev) irq =platform_get_irq (pdev,0 ); -dma_free_wc (fbi->dev,PAGE_ALIGN (info->fix.smem_len), +dma_free_wc (fbi->dev, info->fix.smem_len, info->screen_base, info->fix.smem_start);clk_disable_unprepare (fbi->clk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 39/399 media: ov5640: Fix check for PLL1 exceeding max allowed rate
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 2e3df204f9af42a47823ee955c08950373417420 ]
The variable _rate is by ov5640_compute_sys_clk() which returns zero if the PLL exceeds 1GHz. Unfortunately, the check to see if the max PLL1 output is checking 'rate' and not '_rate' and 'rate' does not ever appear to be 0.
This patch changes the check against the returned value of '_rate' to determine if the PLL1 output exceeds 1GHz.
--- drivers/media/i2c/ov5640.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/ov5640.c +1 -1
@@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,* We have reached the maximum allowed PLL1 output, * increase sysdiv. */ -if (!rate) +if (!_rate)break ;/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 40/399 media: i2c: mt9v032: fix enum mbus codes and frame sizes
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 1451d5ae351d938a0ab1677498c893f17b9ee21d ]
This driver supports both the mt9v032 (color) and the mt9v022 (mono) sensors. Depending on which sensor is used, the format from the sensor is different. The format.code inside the dev struct holds this information. The enum mbus and enum frame sizes need to take into account both type of sensors, not just the color one. To solve this, use the format.code in these functions instead of the hardcoded bayer color format (which is only used for mt9v032).
[Sakari Ailus: rewrapped commit message]
--- drivers/media/i2c/mt9v032.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/i2c/mt9v032.c +8 -2
@@ -428,10 +428,12 @@ static int mt9v032_enum_mbus_code(struct v4l2_subdev *subdev,struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_mbus_code_enum *code) { + struct mt9v032 *mt9v032 = to_mt9v032(subdev); +if (code->index >0 )return -EINVAL ; - code->code =MEDIA_BUS_FMT_SGRBG10_1X10 ; + code->code = mt9v032->format.code;return 0 ; }
@@ -439,7 +441,11 @@ static int mt9v032_enum_frame_size(struct v4l2_subdev *subdev,struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_frame_size_enum *fse) { -if (fse->index >=3 || fse->code !=MEDIA_BUS_FMT_SGRBG10_1X10 ) + struct mt9v032 *mt9v032 = to_mt9v032(subdev); + +if (fse->index >=3 ) +return -EINVAL ; +if (mt9v032->format.code != fse->code)return -EINVAL ; fse->min_width =MT9V032_WINDOW_WIDTH_DEF / (1 << fse->index);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 41/399 media: sun4i-csi: Deal with DRAM offset
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 249b286171fa9c358e8d5c825b48c4ebea97c498 ]
On Allwinner SoCs, some high memory bandwidth devices do DMA directly over the memory bus (called MBUS), instead of the system bus. These devices include the CSI camera sensor interface, video (codec) engine, display subsystem, etc.. The memory bus has a different addressing scheme without the DRAM starting offset.
Deal with this using the "interconnects" property from the device tree, or if that is not available, set dev->dma_pfn_offset to PHYS_PFN_OFFSET.
--- .../platform/sunxi/sun4i-csi/sun4i_csi.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +22 -0
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/of_graph.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
@@ -155,6 +156,27 @@ static int sun4i_csi_probe(struct platform_device *pdev) subdev = &csi->subdev; vdev = &csi->vdev; +/* +* On Allwinner SoCs, some high memory bandwidth devices do DMA +* directly over the memory bus (called MBUS), instead of the +* system bus. The memory bus has a different addressing scheme +* without the DRAM starting offset. +* +* In some cases this can be described by an interconnect in +* the device tree. In other cases where the hardware is not +* fully understood and the interconnect is left out of the +* device tree, fall back to a default offset. +*/ +if (of_find_property (csi->dev->of_node,"interconnects" ,NULL )) { + ret =of_dma_configure (csi->dev, csi->dev->of_node, true); +if (ret) +return ret; + }else { +#ifdef PHYS_PFN_OFFSET + csi->dev->dma_pfn_offset =PHYS_PFN_OFFSET ; +#endif + } + csi->mdev.dev = csi->dev;strscpy (csi->mdev.model,"Allwinner Video Capture Device" ,sizeof (csi->mdev.model));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 42/399 media: sun4i-csi: Fix data sampling polarity handling
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit cf9e6d5dbdd56ef2aa72f28c806711c4293c8848 ]
The CLK_POL field specifies whether data is sampled on the falling or rising edge of PCLK, not whether the data lines are active high or low. Evidence of this can be found in the timing diagram labeled "horizontal size setting and pixel clock timing".
Fix the setting by checking the correct flag, V4L2_MBUS_PCLK_SAMPLE_RISING. While at it, reorder the three polarity flag checks so HSYNC and VSYNC are grouped together.
--- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +1 -1
@@ -279,8 +279,8 @@ static int sun4i_csi_start_streaming(struct vb2_queue *vq, unsigned int count) csi->regs + CSI_WIN_CTRL_H_REG); hsync_pol = !!(bus->flags &V4L2_MBUS_HSYNC_ACTIVE_HIGH ); - pclk_pol = !!(bus->flags &V4L2_MBUS_DATA_ACTIVE_HIGH ); vsync_pol = !!(bus->flags &V4L2_MBUS_VSYNC_ACTIVE_HIGH ); + pclk_pol = !!(bus->flags &V4L2_MBUS_PCLK_SAMPLE_RISING ); writel(CSI_CFG_INPUT_FMT(csi_fmt->input) | CSI_CFG_OUTPUT_FMT(csi_fmt->output) | CSI_CFG_VSYNC_POL(vsync_pol) |
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 43/399 media: sun4i-csi: Fix [HV]sync polarity handling
In reply to Greg Kroah-HartmanFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit 1948dcf0f928b8bcdca57ca3fba8545ba380fc29 ]
The Allwinner camera sensor interface has a different definition of [HV]sync. While the timing diagram uses the names HSYNC and VSYNC, the note following the diagram and register names use HREF and VREF. Combined they imply the hardware uses either [HV]REF or inverted [HV]SYNC. There are also registers to set horizontal skip lengths in pixels and vertical skip lengths in lines, also known as back porches.
Fix the polarity handling by using the opposite polarity flag for the checks. Also rename [hv]sync_pol to [hv]ref_pol to better match the hardware register description.
--- .../media/platform/sunxi/sun4i-csi/sun4i_csi.h | 4 ++-- .../media/platform/sunxi/sun4i-csi/sun4i_dma.c | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h +2 -2
@@ -22,8 +22,8 @@#define CSI_CFG_INPUT_FMT (fmt) ((fmt) << 20)#define CSI_CFG_OUTPUT_FMT (fmt) ((fmt) << 16)#define CSI_CFG_YUV_DATA_SEQ (seq) ((seq) << 8) -#define CSI_CFG_VSYNC_POL (pol) ((pol) << 2) -#define CSI_CFG_HSYNC_POL (pol) ((pol) << 1) +#define CSI_CFG_VREF_POL (pol) ((pol) << 2) +#define CSI_CFG_HREF_POL (pol) ((pol) << 1)#define CSI_CFG_PCLK_POL (pol) ((pol) << 0)#define CSI_CPT_CTRL_REG 0x08
drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +13 -5
@@ -228,7 +228,7 @@ static int sun4i_csi_start_streaming(struct vb2_queue *vq, unsigned int count)struct sun4i_csi *csi =vb2_get_drv_priv (vq);struct v4l2_fwnode_bus_parallel *bus = &csi->bus;const struct sun4i_csi_format *csi_fmt; -unsigned long hsync_pol, pclk_pol, vsync_pol; +unsigned long href_pol, pclk_pol, vref_pol;unsigned long flags;unsigned int i;int ret;
@@ -278,13 +278,21 @@ static int sun4i_csi_start_streaming(struct vb2_queue *vq, unsigned int count)writel (CSI_WIN_CTRL_H_ACTIVE (csi->fmt.height), csi->regs +CSI_WIN_CTRL_H_REG ); - hsync_pol = !!(bus->flags &V4L2_MBUS_HSYNC_ACTIVE_HIGH ); - vsync_pol = !!(bus->flags &V4L2_MBUS_VSYNC_ACTIVE_HIGH ); +/* +* This hardware uses [HV]REF instead of [HV]SYNC. Based on the +* provided timing diagrams in the manual, positive polarity +* equals active high [HV]REF. +* +* When the back porch is 0, [HV]REF is more or less equivalent +* to [HV]SYNC inverted. +*/ + href_pol = !!(bus->flags &V4L2_MBUS_HSYNC_ACTIVE_LOW ); + vref_pol = !!(bus->flags &V4L2_MBUS_VSYNC_ACTIVE_LOW ); pclk_pol = !!(bus->flags &V4L2_MBUS_PCLK_SAMPLE_RISING );writel (CSI_CFG_INPUT_FMT (csi_fmt->input) |CSI_CFG_OUTPUT_FMT (csi_fmt->output) | -CSI_CFG_VSYNC_POL (vsync_pol) | -CSI_CFG_HSYNC_POL (hsync_pol) | +CSI_CFG_VREF_POL (vref_pol) | +CSI_CFG_HREF_POL (href_pol) |CSI_CFG_PCLK_POL (pclk_pol), csi->regs +CSI_CFG_REG );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 44/399 clk: at91: sam9x60: fix programmable clock prescaler
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 66d9f5214c9ba1c151478f99520b6817302d50dc ]
The prescaler works as parent rate divided by (PRES + 1) (is_pres_direct == 1) It does not work in the way of parent rate shifted to the right by (PRES + 1), which means division by 2^(PRES + 1) (is_pres_direct == 0)
Thus is_pres_direct must be enabled for this SoC, to make the right computation. This field was added in
commit 45b06682113b ("clk: at91: fix programmable clock for sama5d2") SAM9X60 has the same field as SAMA5D2 in the PCK
--- drivers/clk/at91/sam9x60.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/at91/sam9x60.c +1 -0
@@ -47,6 +47,7 @@ static const struct clk_programmable_layout sam9x60_programmable_layout = { .pres_shift = 8, .css_mask = 0x1f, .have_slck_mck = 0, + .is_pres_direct = 1, };static const struct clk_pcr_layout sam9x60_pcr_layout = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 45/399 powerpc/powernv/iov: Ensure the pdn for VFs always contains a valid PE number
In reply to Greg Kroah-HartmanFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 3b5b9997b331e77ce967eba2c4bc80dc3134a7fe ]
On pseries there is a bug with adding hotplugged devices to an IOMMU group. For a number of dumb reasons fixing that bug first requires re-working how VFs are configured on PowerNV. For background, on PowerNV we use the pcibios_sriov_enable() hook to do two things:
1. Create a pci_dn structure for each of the VFs, and
2. Configure the PHB's internal BARs so the MMIO range for each VF maps to a unique PE.
Roughly speaking a PE is the hardware counterpart to a Linux IOMMU group since all the devices in a PE share the same IOMMU table. A PE also defines the set of devices that should be isolated in response to a PCI error (i.e. bad DMA, UR/CA, AER events, etc). When isolated all MMIO and DMA traffic to and from devicein the PE is blocked by the root complex until the PE is recovered by the OS.
The requirement to block MMIO causes a giant headache because the P8 PHB generally uses a fixed mapping between MMIO addresses and PEs. As a result we need to delay configuring the IOMMU groups for device until after MMIO resources are assigned. For physical devices (i.e. non-VFs) the PE assignment is done in pcibios_setup_bridge() which is called immediately after the MMIO resources for downstream devices (and the bridge's windows) are assigned. For VFs the setup is more complicated because:
a) pcibios_setup_bridge() is not called again when VFs are activated, and
b) The pci_dev for VFs are created by generic code which runs after pcibios_sriov_enable() is called.
The work around for this is a two step process:
1. A fixup in pcibios_add_device() is used to initialised the cached pe_number in pci_dn, then
2. A bus notifier then adds the device to the IOMMU group for the PE
specified in pci_dn->pe_number.
A side effect fixing the pseries bug mentioned in the first paragraph is moving the fixup out of pcibios_add_device() and into pcibios_bus_add_device(), which is called much later. This results in step 2. failing because pci_dn->pe_number won't be initialised when the bus notifier is run.
We can fix this by removing the need for the fixup. The PE for a VF is known before the VF is even scanned so we can initialise pci_dn->pe_number pcibios_sriov_enable() instead. Unfortunately, moving the initialisation causes two problems:
1. We trip the WARN_ON() in the current fixup code, and
2. The EEH core clears pdn->pe_number when recovering a VF and relies on the fixup to correctly re-set it.
The only justification for either of these is a comment in eeh_rmv_device() suggesting that pdn->pe_number *must* be set to IODA_INVALID_PE in order for the VF to be scanned. However, this comment appears to have no basis in reality. Both bugs can be fixed by just deleting the code.
--- arch/powerpc/kernel/eeh_driver.c | 6 ------ arch/powerpc/platforms/powernv/pci-ioda.c | 19 +++++++++++++++---- arch/powerpc/platforms/powernv/pci.c | 4 ---- 3 files changed, 15 insertions(+), 14 deletions(-)
arch/powerpc/kernel/eeh_driver.c +0 -6
@@ -525,12 +525,6 @@ static void eeh_rmv_device(struct eeh_dev *edev, void *userdata)pci_iov_remove_virtfn (edev->physfn, pdn->vf_index); edev->pdev =NULL ; - -/* -* We have to set the VF PE number to invalid one, which is -* required to plug the VF successfully. -*/ - pdn->pe_number =IODA_INVALID_PE ;#endif if (rmv_data)list_add (&edev->rmv_entry, &rmv_data->removed_vf_list);
arch/powerpc/platforms/powernv/pci-ioda.c +15 -4
@@ -1558,6 +1558,10 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)/* Reserve PE for each VF */ for (vf_index =0 ; vf_index < num_vfs; vf_index++) { +int vf_devfn =pci_iov_virtfn_devfn (pdev, vf_index); +int vf_bus =pci_iov_virtfn_bus (pdev, vf_index); +struct pci_dn *vf_pdn; +if (pdn->m64_single_mode) pe_num = pdn->pe_num_map[vf_index];else
@@ -1570,13 +1574,11 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs) pe->pbus =NULL ; pe->parent_dev = pdev; pe->mve_number =-1 ; - pe->rid = (pci_iov_virtfn_bus (pdev, vf_index) <<8 ) | -pci_iov_virtfn_devfn (pdev, vf_index); + pe->rid = (vf_bus <<8 ) | vf_devfn;pe_info (pe,"VF %04d:%02d:%02d.%d associated with PE#%x\n" , hose->global_number, pdev->bus->number, -PCI_SLOT (pci_iov_virtfn_devfn (pdev, vf_index)), -PCI_FUNC (pci_iov_virtfn_devfn (pdev, vf_index)), pe_num); +PCI_SLOT (vf_devfn),PCI_FUNC (vf_devfn), pe_num);if (pnv_ioda_configure_pe (phb, pe)) {/* XXX What do we do here ? */
@@ -1590,6 +1592,15 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)list_add_tail (&pe->list, &phb->ioda.pe_list);mutex_unlock (&phb->ioda.pe_list_mutex); +/* associate this pe to it's pdn */ +list_for_each_entry (vf_pdn, &pdn->parent->child_list, list) { +if (vf_pdn->busno == vf_bus && + vf_pdn->devfn == vf_devfn) { + vf_pdn->pe_number = pe_num; +break ; + } + } +pnv_pci_ioda2_setup_dma_pe (phb, pe);#ifdef CONFIG_IOMMU_API iommu_register_group(&pe->table_group,
arch/powerpc/platforms/powernv/pci.c +0 -4
@@ -816,16 +816,12 @@ void pnv_pci_dma_dev_setup(struct pci_dev *pdev)struct pnv_phb *phb = hose->private_data;#ifdef CONFIG_PCI_IOV struct pnv_ioda_pe *pe; -struct pci_dn *pdn;/* Fix the VF pdn PE number */ if (pdev->is_virtfn) { - pdn =pci_get_pdn (pdev); -WARN_ON (pdn->pe_number !=IODA_INVALID_PE );list_for_each_entry (pe, &phb->ioda.pe_list, list) {if (pe->rid == ((pdev->bus->number <<8 ) | (pdev->devfn &0xff ))) { - pdn->pe_number = pe->pe_number; pe->pdev = pdev;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 46/399 clk: meson: meson8b: make the CCF use the glitch-free mali mux
In reply to Greg Kroah-HartmanFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 8daeaea99caabe24a0929fac17977ebfb882fa86 ]
The "mali_0" or "mali_1" clock trees should not be updated while the clock is running. Enforce this by setting CLK_SET_RATE_GATE on the "mali_0" and "mali_1" gates. This makes the CCF switch to the "mali_1" tree when "mali_0" is currently active and vice versa, which is exactly what the vendor driver does when updating the frequency of the mali clock.
This fixes a potential hang when changing the GPU frequency at runtime.
--- drivers/clk/meson/meson8b.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/clk/meson/meson8b.c +7 -4
@@ -1764,8 +1764,11 @@ static struct clk_regmap meson8b_hdmi_sys = {/* * The MALI IP is clocked by two identical clocks (mali_0 and mali_1) -* muxed by a glitch-free switch on Meson8b and Meson8m2. Meson8 only -* has mali_0 and no glitch-free mux. +* muxed by a glitch-free switch on Meson8b and Meson8m2. The CCF can +* actually manage this glitch-free mux because it does top-to-bottom +* updates the each clock tree and switches to the "inactive" one when +* CLK_SET_RATE_GATE is set. +* Meson8 only has mali_0 and no glitch-free mux. */ static const struct clk_hw *meson8b_mali_0_1_parent_hws[] = { &meson8b_xtal.hw,
@@ -1830,7 +1833,7 @@ static struct clk_regmap meson8b_mali_0 = { &meson8b_mali_0_div.hw }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_GATE | CLK_SET_RATE_PARENT, }, };
@@ -1885,7 +1888,7 @@ static struct clk_regmap meson8b_mali_1 = { &meson8b_mali_1_div.hw }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_GATE | CLK_SET_RATE_PARENT, }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 47/399 gpio: gpio-grgpio: fix possible sleep-in-atomic-context bugs in grgpio_irq_map/unmap()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit e36eaf94be8f7bc4e686246eed3cf92d845e2ef8 ]
The driver may sleep while holding a spinlock.
The function call path (from bottom to top) in Linux 4.19 is:
drivers/gpio/gpio-grgpio.c, 261:
request_irq in grgpio_irq_mapdrivers/gpio/gpio-grgpio.c, 255:
_raw_spin_lock_irqsave in grgpio_irq_map
drivers/gpio/gpio-grgpio.c, 318:
free_irq in grgpio_irq_unmapdrivers/gpio/gpio-grgpio.c, 299:
_raw_spin_lock_irqsave in grgpio_irq_unmap
request_irq() and free_irq() can sleep at runtime.
To fix these bugs, request_irq() and free_irq() are called without holding the spinlock.
These bugs are found by a static analysis tool STCheck written by myself.
--- drivers/gpio/gpio-grgpio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpio/gpio-grgpio.c +6 -4
@@ -253,17 +253,16 @@ static int grgpio_irq_map(struct irq_domain *d, unsigned int irq, lirq->irq = irq; uirq = &priv->uirqs[lirq->index];if (uirq->refcnt ==0 ) { +spin_unlock_irqrestore (&priv->gc.bgpio_lock, flags); ret =request_irq (uirq->uirq, grgpio_irq_handler,0 ,dev_name (priv->dev), priv);if (ret) {dev_err (priv->dev,"Could not request underlying irq %d\n" , uirq->uirq); - -spin_unlock_irqrestore (&priv->gc.bgpio_lock, flags); -return ret; } +spin_lock_irqsave (&priv->gc.bgpio_lock, flags); } uirq->refcnt++;
@@ -309,8 +308,11 @@ static void grgpio_irq_unmap(struct irq_domain *d, unsigned int irq)if (index >=0 ) { uirq = &priv->uirqs[lirq->index]; uirq->refcnt--; -if (uirq->refcnt ==0 ) +if (uirq->refcnt ==0 ) { +spin_unlock_irqrestore (&priv->gc.bgpio_lock, flags);free_irq (uirq->uirq, priv); +return ; + } }spin_unlock_irqrestore (&priv->gc.bgpio_lock, flags);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 48/399 iommu/vt-d: Fix off-by-one in PASID allocation
In reply to Greg Kroah-HartmanFrom: Jacob Pan <[email protected]>
[ Upstream commit 39d630e332144028f56abba83d94291978e72df1 ]
PASID allocator uses IDR which is exclusive for the end of the allocation range. There is no need to decrement pasid_max.
--- drivers/iommu/intel-svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel-svm.c +1 -1
@@ -317,7 +317,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_/* Do not use PASID 0 in caching mode (virtualised IOMMU) */ ret =intel_pasid_alloc_id (svm, !!cap_caching_mode (iommu->cap), - pasid_max -1 ,GFP_KERNEL ); + pasid_max,GFP_KERNEL );if (ret <0 ) {kfree (svm);kfree (sdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 49/399 x86/fpu: Deactivate FPU state after failure during state load
In reply to Greg Kroah-HartmanFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit bbc55341b9c67645d1a5471506370caf7dd4a203 ]
In __fpu__restore_sig(), fpu_fpregs_owner_ctx needs to be reset if the FPU state was not fully restored. Otherwise the following may happen (on the same CPU):
Task A Task B fpu_fpregs_owner_ctx
*active* A.fpu
__fpu__restore_sig()
ctx switch load B.fpu
*active* B.fpu
fpregs_lock()
copy_user_to_fpregs_zeroing()
copy_kernel_to_xregs() *modify*
copy_user_to_xregs() *fails*
fpregs_unlock()
ctx switch skip loading B.fpu,
*active* B.fpu
In the success case, fpu_fpregs_owner_ctx is set to the current task.
In the failure case, the FPU state might have been modified by loading the init state.
In this case, fpu_fpregs_owner_ctx needs to be reset in order to ensure that the FPU state of the following task is loaded from saved state (and not skipped because it was the previous state).
Reset fpu_fpregs_owner_ctx after a failure during restore occurred, to ensure that the FPU state for the next task is always loaded.
The problem was debugged-by Yu-cheng Yu <[email protected]>.
[ bp: Massage commit message. ]
--- arch/x86/kernel/fpu/signal.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kernel/fpu/signal.c +3 -0
@@ -352,6 +352,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)fpregs_unlock ();return 0 ; } +fpregs_deactivate (fpu);fpregs_unlock (); }
@@ -403,6 +404,8 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) }if (!ret)fpregs_mark_activate (); +else +fpregs_deactivate (fpu);fpregs_unlock (); err_out:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 50/399 dm raid: table line rebuild status fixes
In reply to Greg Kroah-HartmanFrom: Heinz Mauelshagen <[email protected]>
[ Upstream commit 43f3952a51f8198d365acb7f51fe42d578fe5d0a ]
raid_status() wasn't emitting rebuild flags on the table line properly because the rdev number was not yet set properly; index raid component devices array directly to solve.
Also fix wrong argument count on emitted table line caused by 1 too many rebuild/write_mostly argument and consider any journal_(dev|mode) pairs.
--- .../admin-guide/device-mapper/dm-raid.rst | 2 + drivers/md/dm-raid.c | 43 ++++++++++--------- 2 files changed, 24 insertions(+), 21 deletions(-)
Documentation/admin-guide/device-mapper/dm-raid.rst +2 -0
@@ -419,3 +419,5 @@ Version History rebuild errors. 1.15.0 Fix size extensions not being synchronized in case of new MD bitmap pages allocated; also fix those not occuring after previous reductions + 1.15.1 Fix argument count and arguments for rebuild/write_mostly/journal_(dev|mode) + on the status line.
drivers/md/dm-raid.c +22 -21
87 lines not on this page · raw message
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 51/399 char/random: silence a lockdep splat with printk()
In reply to Greg Kroah-HartmanFrom: Sergey Senozhatsky <[email protected]>
[ Upstream commit 1b710b1b10eff9d46666064ea25f079f70bc67a8 ]
Sergey didn't like the locking order,
uart_port->lock -> tty_port->lock
uart_write (uart_port->lock)
__uart_start
pl011_start_tx
pl011_tx_chars
uart_write_wakeup
tty_port_tty_wakeup
tty_port_default
tty_port_tty_get (tty_port->lock)but those code is so old, and I have no clue how to de-couple it after checking other locks in the splat. There is an onging effort to make all printk() as deferred, so until that happens, workaround it for now as a short-term fix.
LTP: starting iogen01 (export LTPROOT; rwtest -N iogen01 -i 120s -s read,write -Da -Dv -n 2 500b:$TMPDIR/doio.f1.$$ 1000b:$TMPDIR/doio.f2.$$)
WARNING: possible circular locking dependency detected
------------------------------------------------------
doio/49441 is trying to acquire lock:ffff008b7cff7290 (&(&zone->lock)->rlock){..-.}, at: rmqueue+0x138/0x2050
but task is already holding lock:60ff000822352818 (&pool->lock/1){-.-.}, at: start_flush_work+0xd8/0x3f0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 (&pool->lock/1){-.-.}:
lock_acquire+0x320/0x360
_raw_spin_lock+0x64/0x80
__queue_work+0x4b4/0xa10
queue_work_on+0xac/0x11c
tty_schedule_flip+0x84/0xbc
tty_flip_buffer_push+0x1c/0x28
pty_write+0x98/0xd0
n_tty_write+0x450/0x60c
tty_write+0x338/0x474
__vfs_write+0x88/0x214
vfs_write+0x12c/0x1a4
redirected_tty_write+0x90/0xdc
do_loop_readv_writev+0x140/0x180
do_iter_write+0xe0/0x10c
vfs_writev+0x134/0x1cc
do_writev+0xbc/0x130
__arm64_sys_writev+0x58/0x8c
el0_svc_handler+0x170/0x240
el0_sync_handler+0x150/0x250
el0_sync+0x164/0x180-> #3 (&(&port->lock)->rlock){-.-.}:
lock_acquire+0x320/0x360
_raw_spin_lock_irqsave+0x7c/0x9c
tty_port_tty_get+0x24/0x60
tty_port_default_wakeup+0x1c/0x3c
tty_port_tty_wakeup+0x34/0x40
uart_write_wakeup+0x28/0x44
pl011_tx_chars+0x1b8/0x270
pl011_start_tx+0x24/0x70
__uart_start+0x5c/0x68
uart_write+0x164/0x1c8
do_output_char+0x33c/0x348
n_tty_write+0x4bc/0x60c
tty_write+0x338/0x474
redirected_tty_write+0xc0/0xdc
do_loop_readv_writev+0x140/0x180
do_iter_write+0xe0/0x10c
vfs_writev+0x134/0x1cc
do_writev+0xbc/0x130
__arm64_sys_writev+0x58/0x8c
el0_svc_handler+0x170/0x240
el0_sync_handler+0x150/0x250
el0_sync+0x164/0x180-> #2 (&port_lock_key){-.-.}:
lock_acquire+0x320/0x360
_raw_spin_lock+0x64/0x80
pl011_console_write+0xec/0x2cc
console_unlock+0x794/0x96c
vprintk_emit+0x260/0x31c
vprintk_default+0x54/0x7c
vprintk_func+0x218/0x254
printk+0x7c/0xa4
register_console+0x734/0x7b0
uart_add_one_port+0x734/0x834
pl011_register_port+0x6c/0xac
sbsa_uart_probe+0x234/0x2ec
platform_drv_probe+0xd4/0x124
really_probe+0x250/0x71c
driver_probe_device+0xb4/0x200
__device_attach_driver+0xd8/0x188
bus_for_each_drv+0xbc/0x110
__device_attach+0x120/0x220
device_initial_probe+0x20/0x2c
bus_probe_device+0x54/0x100
device_add+0xae8/0xc2c
platform_device_add+0x278/0x3b8
platform_device_register_full+0x238/0x2ac
acpi_create_platform_device+0x2dc/0x3a8
acpi_bus_attach+0x390/0x3cc
acpi_bus_attach+0x108/0x3cc
acpi_bus_attach+0x108/0x3cc
acpi_bus_attach+0x108/0x3cc
acpi_bus_scan+0x7c/0xb0
acpi_scan_init+0xe4/0x304
acpi_init+0x100/0x114
do_one_initcall+0x348/0x6a0
do_initcall_level+0x190/0x1fc
do_basic_setup+0x34/0x4c
kernel_init_freeable+0x19c/0x260
kernel_init+0x18/0x338
ret_from_fork+0x10/0x18-> #1 (console_owner){-...}:
lock_acquire+0x320/0x360
console_lock_spinning_enable+0x6c/0x7c
console_unlock+0x4f8/0x96c
vprintk_emit+0x260/0x31c
vprintk_default+0x54/0x7c
vprintk_func+0x218/0x254
printk+0x7c/0xa4
get_random_u64+0x1c4/0x1dc
shuffle_pick_tail+0x40/0xac
__free_one_page+0x424/0x710
free_one_page+0x70/0x120
__free_pages_ok+0x61c/0xa94
__free_pages_core+0x1bc/0x294
memblock_free_pages+0x38/0x48
__free_pages_memory+0xcc/0xfc
__free_memory_core+0x70/0x78
free_low_memory_core_early+0x148/0x18c
memblock_free_all+0x18/0x54
mem_init+0xb4/0x17c
mm_init+0x14/0x38
start_kernel+0x19c/0x530-> #0 (&(&zone->lock)->rlock){..-.}:
validate_chain+0xf6c/0x2e2c
__lock_acquire+0x868/0xc2c
lock_acquire+0x320/0x360
_raw_spin_lock+0x64/0x80
rmqueue+0x138/0x2050
get_page_from_freelist+0x474/0x688
__alloc_pages_nodemask+0x3b4/0x18dc
alloc_pages_current+0xd0/0xe0
alloc_slab_page+0x2b4/0x5e0
new_slab+0xc8/0x6bc
___slab_alloc+0x3b8/0x640
kmem_cache_alloc+0x4b4/0x588
__debug_object_init+0x778/0x8b4
debug_object_init_on_stack+0x40/0x50
start_flush_work+0x16c/0x3f0
__flush_work+0xb8/0x124
flush_work+0x20/0x30
xlog_cil_force_lsn+0x88/0x204 [xfs]
xfs_log_force_lsn+0x128/0x1b8 [xfs]
xfs_file_fsync+0x3c4/0x488 [xfs]
vfs_fsync_range+0xb0/0xd0
generic_write_sync+0x80/0xa0 [xfs]
xfs_file_buffered_aio_write+0x66c/0x6e4 [xfs]
xfs_file_write_iter+0x1a0/0x218 [xfs]
__vfs_write+0x1cc/0x214
vfs_write+0x12c/0x1a4
ksys_write+0xb0/0x120
__arm64_sys_write+0x54/0x88
el0_svc_handler+0x170/0x240
el0_sync_handler+0x150/0x250
el0_sync+0x164/0x180other info that might help us debug this:
Chain exists of: &(&zone->lock)->rlock --> &(&port->lock)->rlock --> &pool->lock/1 Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&pool->lock/1);
lock(&(&port->lock)->rlock);
lock(&pool->lock/1);lock(&(&zone->lock)->rlock);
*** DEADLOCK ***
4 locks held by doio/49441:
#0: a0ff00886fc27408 (sb_writers#8){.+.+}, at: vfs_write+0x118/0x1a4 #1: 8fff00080810dfe0 (&xfs_nondir_ilock_class){++++}, at:
xfs_ilock+0x2a8/0x300 [xfs]
#2: ffff9000129f2390 (rcu_read_lock){....}, at:
rcu_lock_acquire+0x8/0x38
#3: 60ff000822352818 (&pool->lock/1){-.-.}, at:
start_flush_work+0xd8/0x3f0
stack backtrace:
CPU: 48 PID: 49441 Comm: doio Tainted: G W
Hardware name: HPE Apollo 70 /C01_APACHE_MB , BIOS
L50_5.13_1.11 06/18/2019
Call trace:
dump_backtrace+0x0/0x248
show_stack+0x20/0x2c
dump_stack+0xe8/0x150
print_circular_bug+0x368/0x380
check_noncircular+0x28c/0x294
validate_chain+0xf6c/0x2e2c
__lock_acquire+0x868/0xc2c
lock_acquire+0x320/0x360
_raw_spin_lock+0x64/0x80
rmqueue+0x138/0x2050
get_page_from_freelist+0x474/0x688
__alloc_pages_nodemask+0x3b4/0x18dc
alloc_pages_current+0xd0/0xe0
alloc_slab_page+0x2b4/0x5e0
new_slab+0xc8/0x6bc
___slab_alloc+0x3b8/0x640
kmem_cache_alloc+0x4b4/0x588
__debug_object_init+0x778/0x8b4
debug_object_init_on_stack+0x40/0x50
start_flush_work+0x16c/0x3f0
__flush_work+0xb8/0x124
flush_work+0x20/0x30
xlog_cil_force_lsn+0x88/0x204 [xfs]
xfs_log_force_lsn+0x128/0x1b8 [xfs]
xfs_file_fsync+0x3c4/0x488 [xfs]
vfs_fsync_range+0xb0/0xd0
generic_write_sync+0x80/0xa0 [xfs]
xfs_file_buffered_aio_write+0x66c/0x6e4 [xfs]
xfs_file_write_iter+0x1a0/0x218 [xfs]
__vfs_write+0x1cc/0x214
vfs_write+0x12c/0x1a4
ksys_write+0xb0/0x120
__arm64_sys_write+0x54/0x88
el0_svc_handler+0x170/0x240
el0_sync_handler+0x150/0x250
el0_sync+0x164/0x180--- drivers/char/random.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/char/random.c +3 -2
@@ -1687,8 +1687,9 @@ static void _warn_unseeded_randomness(const char *func_name, void *caller, print_once = true;#endif if (__ratelimit (&unseeded_warning)) -pr_notice ("random: %s called from %pS with crng_init=%d\n" , - func_name, caller, crng_init); +printk_deferred (KERN_NOTICE "random: %s called from %pS " +"with crng_init=%d\n" , func_name, caller, + crng_init); }/*
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 52/399 media: sti: bdisp: fix a possible sleep-in-atomic-context bug in bdisp_device_run()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit bb6d42061a05d71dd73f620582d9e09c8fbf7f5b ]
The driver may sleep while holding a spinlock.
The function call path (from bottom to top) in Linux 4.19 is:
drivers/media/platform/sti/bdisp/bdisp-hw.c, 385:
msleep in bdisp_hw_resetdrivers/media/platform/sti/bdisp/bdisp-v4l2.c, 341:
bdisp_hw_reset in bdisp_device_rundrivers/media/platform/sti/bdisp/bdisp-v4l2.c, 317:
_raw_spin_lock_irqsave in bdisp_device_run
To fix this bug, msleep() is replaced with udelay().
This bug is found by a static analysis tool STCheck written by myself.
--- drivers/media/platform/sti/bdisp/bdisp-hw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/sti/bdisp/bdisp-hw.c +3 -3
@@ -14,8 +14,8 @@#define MAX_SRC_WIDTH 2048/* Reset & boot poll config */ -#define POLL_RST_MAX 50 -#define POLL_RST_DELAY_MS 20 +#define POLL_RST_MAX 500 +#define POLL_RST_DELAY_MS 2enum bdisp_target_plan {BDISP_RGB ,
@@ -382,7 +382,7 @@ int bdisp_hw_reset(struct bdisp_dev *bdisp)for (i =0 ; i <POLL_RST_MAX ; i++) {if (readl (bdisp->regs +BLT_STA1 ) &BLT_STA1_IDLE )break ; -msleep (POLL_RST_DELAY_MS ); +udelay (POLL_RST_DELAY_MS *1000 ); }if (i ==POLL_RST_MAX )dev_err (bdisp->dev,"Reset timeout\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 53/399 kernel/module: Fix memleak in module_add_modinfo_attrs()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit f6d061d617124abbd55396a3bc37b9bf7d33233c ]
In module_add_modinfo_attrs() if sysfs_create_file() fails on the first iteration of the loop (so i = 0), we forget to free the modinfo_attrs.
--- kernel/module.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/module.c +2 -0
@@ -1781,6 +1781,8 @@ static int module_add_modinfo_attrs(struct module *mod) error_out:if (i >0 )module_remove_modinfo_attrs (mod, --i); +else +kfree (mod->modinfo_attrs);return error; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 54/399 IB/core: Let IB core distribute cache update events
In reply to Greg Kroah-HartmanFrom: Parav Pandit <[email protected]>
[ Upstream commit 6b57cea9221b0247ad5111b348522625e489a8e4 ]
Currently when the low level driver notifies Pkey, GID, and port change events they are notified to the registered handlers in the order they are registered.
IB core and other ULPs such as IPoIB are interested in GID, LID, Pkey change events.
Since all GID queries done by ULPs are serviced by IB core, and the IB core deferes cache updates to a work queue, it is possible for other clients to see stale cache data when they handle their own events.
For example, the below call tree shows how ipoib will call rdma_query_gid() concurrently with the update to the cache sitting in the WQ.
mlx5_ib_handle_event()
ib_dispatch_event()
ib_cache_event()
queue_work() -> slow cache update
[..]
ipoib_event()
queue_work()
[..]
work handler
ipoib_ib_dev_flush_light()
__ipoib_ib_dev_flush()
ipoib_dev_addr_changed_valid()
rdma_query_gid() <- Returns old GID, cache not updated.Move all the event dispatch to a work queue so that the cache update is always done before any clients are notified.
--- drivers/infiniband/core/cache.c | 121 +++++++++++++++++----------- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 33 +++----- include/rdma/ib_verbs.h | 9 ++- 4 files changed, 92 insertions(+), 72 deletions(-)
drivers/infiniband/core/cache.c +75 -46
@@ -51,9 +51,8 @@ struct ib_pkey_cache {struct ib_update_work {struct work_struct work; -struct ib_device *device; -u8 port_num; -bool enforce_security; +struct ib_event event; +bool enforce_security; };union ib_gid zgid;
@@ -130,7 +129,7 @@ static void dispatch_gid_change_event(struct ib_device *ib_dev, u8 port) event.element.port_num = port; event.event =IB_EVENT_GID_CHANGE ; -ib_dispatch_event (&event); +ib_dispatch_event_clients (&event); }static const char *const gid_type_str[] = {
@@ -1381,9 +1380,8 @@ err:return ret; } -static void ib_cache_update (struct ib_device *device, -u8 port, -bool enforce_security) +static int +ib_cache_update (struct ib_device *device,u8 port,bool enforce_security) {struct ib_port_attr *tprops =NULL ;struct ib_pkey_cache *pkey_cache =NULL , *old_pkey_cache;
@@ -1391,11 +1389,11 @@ static void ib_cache_update(struct ib_device *device,int ret;if (!rdma_is_port_valid (device, port)) -return ; +return -EINVAL ; tprops =kmalloc (sizeof *tprops,GFP_KERNEL );if (!tprops) -return ; +return -ENOMEM ; ret =ib_query_port (device, port, tprops);if (ret) {
@@ -1413,8 +1411,10 @@ static void ib_cache_update(struct ib_device *device, pkey_cache =kmalloc (struct_size (pkey_cache, table, tprops->pkey_tbl_len),GFP_KERNEL ); -if (!pkey_cache) +if (!pkey_cache) { + ret = -ENOMEM ; goto err; + } pkey_cache->table_len = tprops->pkey_tbl_len;
@@ -1446,50 +1446,84 @@ static void ib_cache_update(struct ib_device *device,kfree (old_pkey_cache);kfree (tprops); -return ; +return 0 ; err:kfree (pkey_cache);kfree (tprops); +return ret; +} + +static void ib_cache_event_task (struct work_struct *_work) +{ +struct ib_update_work *work = + container_of(_work, struct ib_update_work, work); +int ret; + +/* Before distributing the cache update event, first sync +* the cache. +*/ + ret =ib_cache_update (work->event.device, work->event.element.port_num, + work->enforce_security); + +/* GID event is notified already for individual GID entries by +* dispatch_gid_change_event(). Hence, notifiy for rest of the +* events. +*/ +if (!ret && work->event.event !=IB_EVENT_GID_CHANGE ) +ib_dispatch_event_clients (&work->event); + +kfree (work); } -static void ib_cache_task (struct work_struct *_work) +static void ib_generic_event_task (struct work_struct *_work) {struct ib_update_work *work = container_of(_work, struct ib_update_work, work); -ib_cache_update (work->device, - work->port_num, - work->enforce_security); +ib_dispatch_event_clients (&work->event);kfree (work); } -static void ib_cache_event (struct ib_event_handler *handler, -struct ib_event *event) +static bool is_cache_update_event (const struct ib_event *event) +{ +return (event->event ==IB_EVENT_PORT_ERR || + event->event ==IB_EVENT_PORT_ACTIVE || + event->event ==IB_EVENT_LID_CHANGE || + event->event ==IB_EVENT_PKEY_CHANGE || + event->event ==IB_EVENT_CLIENT_REREGISTER || + event->event ==IB_EVENT_GID_CHANGE ); +} + +/** +* ib_dispatch_event - Dispatch an asynchronous event +* @event:Event to dispatch +* +* Low-level drivers must call ib_dispatch_event() to dispatch the +* event to all registered event handlers when an asynchronous event +* occurs. +*/ +void ib_dispatch_event (const struct ib_event *event) {struct ib_update_work *work; -if (event->event ==IB_EVENT_PORT_ERR || - event->event ==IB_EVENT_PORT_ACTIVE || - event->event ==IB_EVENT_LID_CHANGE || - event->event ==IB_EVENT_PKEY_CHANGE || - event->event ==IB_EVENT_CLIENT_REREGISTER || - event->event ==IB_EVENT_GID_CHANGE ) { - work =kmalloc (sizeof *work,GFP_ATOMIC ); -if (work) { -INIT_WORK (&work->work, ib_cache_task); - work->device = event->device; - work->port_num = event->element.port_num; -if (event->event ==IB_EVENT_PKEY_CHANGE || - event->event ==IB_EVENT_GID_CHANGE ) - work->enforce_security = true; -else - work->enforce_security = false; - -queue_work (ib_wq, &work->work); - } - } + work =kzalloc (sizeof (*work),GFP_ATOMIC ); +if (!work) +return ; + +if (is_cache_update_event (event)) +INIT_WORK (&work->work, ib_cache_event_task); +else +INIT_WORK (&work->work, ib_generic_event_task); + + work->event = *event; +if (event->event ==IB_EVENT_PKEY_CHANGE || + event->event ==IB_EVENT_GID_CHANGE ) + work->enforce_security = true; + +queue_work (ib_wq, &work->work); } +EXPORT_SYMBOL (ib_dispatch_event);int ib_cache_setup_one (struct ib_device *device) {
@@ -1505,9 +1539,6 @@ int ib_cache_setup_one(struct ib_device *device) rdma_for_each_port (device, p)ib_cache_update (device, p, true); -INIT_IB_EVENT_HANDLER (&device->cache.event_handler, - device, ib_cache_event); -ib_register_event_handler (&device->cache.event_handler);return 0 ; }
@@ -1529,14 +1560,12 @@ void ib_cache_release_one(struct ib_device *device)void ib_cache_cleanup_one (struct ib_device *device) { -/* The cleanup function unregisters the event handler, -* waits for all in-progress workqueue elements and cleans -* up the GID cache. This function should be called after -* the device was removed from the devices list and all -* clients were removed, so the cache exists but is +/* The cleanup function waits for all in-progress workqueue +* elements and cleans up the GID cache. This function should be +* called after the device was removed from the devices list and +* all clients were removed, so the cache exists but is * non-functional and shouldn't be updated anymore. */ -ib_unregister_event_handler (&device->cache.event_handler);flush_workqueue (ib_wq);gid_table_cleanup_one (device);
drivers/infiniband/core/core_priv.h +1 -0
@@ -149,6 +149,7 @@ unsigned long roce_gid_type_mask_support(struct ib_device *ib_dev, u8 port);int ib_cache_setup_one (struct ib_device *device);void ib_cache_cleanup_one (struct ib_device *device);void ib_cache_release_one (struct ib_device *device); +void ib_dispatch_event_clients (struct ib_event *event);#ifdef CONFIG_CGROUP_RDMA void ib_device_register_rdmacg (struct ib_device *device);
drivers/infiniband/core/device.c +10 -23
@@ -588,6 +588,7 @@ struct ib_device *_ib_alloc_device(size_t size)INIT_LIST_HEAD (&device->event_handler_list);spin_lock_init (&device->event_handler_lock); +init_rwsem (&device->event_handler_rwsem);mutex_init (&device->unregistration_lock);/* * client_data needs to be alloc because we don't want our mark to be
@@ -1931,17 +1932,15 @@ EXPORT_SYMBOL(ib_set_client_data);* * ib_register_event_handler() registers an event handler that will be * called back when asynchronous IB events occur (as defined in -* chapter 11 of the InfiniBand Architecture Specification). This -* callback may occur in interrupt context. +* chapter 11 of the InfiniBand Architecture Specification). This +* callback occurs in workqueue context. */ void ib_register_event_handler (struct ib_event_handler *event_handler) { -unsigned long flags; - -spin_lock_irqsave (&event_handler->device->event_handler_lock, flags); +down_write (&event_handler->device->event_handler_rwsem);list_add_tail (&event_handler->list, &event_handler->device->event_handler_list); -spin_unlock_irqrestore (&event_handler->device->event_handler_lock, flags); +up_write (&event_handler->device->event_handler_rwsem); }EXPORT_SYMBOL (ib_register_event_handler);
@@ -1954,35 +1953,23 @@ EXPORT_SYMBOL(ib_register_event_handler);*/ void ib_unregister_event_handler (struct ib_event_handler *event_handler) { -unsigned long flags; - -spin_lock_irqsave (&event_handler->device->event_handler_lock, flags); +down_write (&event_handler->device->event_handler_rwsem);list_del (&event_handler->list); -spin_unlock_irqrestore (&event_handler->device->event_handler_lock, flags); +up_write (&event_handler->device->event_handler_rwsem); }EXPORT_SYMBOL (ib_unregister_event_handler); -/** -* ib_dispatch_event - Dispatch an asynchronous event -* @event:Event to dispatch -* -* Low-level drivers must call ib_dispatch_event() to dispatch the -* event to all registered event handlers when an asynchronous event -* occurs. -*/ -void ib_dispatch_event (struct ib_event *event) +void ib_dispatch_event_clients (struct ib_event *event) { -unsigned long flags;struct ib_event_handler *handler; -spin_lock_irqsave (&event->device->event_handler_lock, flags); +down_read (&event->device->event_handler_rwsem);list_for_each_entry (handler, &event->device->event_handler_list, list) handler->handler (handler, event); -spin_unlock_irqrestore (&event->device->event_handler_lock, flags); +up_read (&event->device->event_handler_rwsem); } -EXPORT_SYMBOL (ib_dispatch_event); static int iw_query_port(struct ib_device *device, u8 port_num,
include/rdma/ib_verbs.h +6 -3
@@ -2149,7 +2149,6 @@ struct ib_port_cache {struct ib_cache {rwlock_t lock; -struct ib_event_handler event_handler; };struct ib_port_immutable {
@@ -2627,7 +2626,11 @@ struct ib_device {struct rcu_head rcu_head;struct list_head event_handler_list; -spinlock_t event_handler_lock; +/* Protects event_handler_list */ +struct rw_semaphore event_handler_rwsem; + +/* Protects QP's event_handler calls and open_qp list */ +spinlock_t event_handler_lock;struct rw_semaphore client_data_rwsem;struct xarray client_data;
@@ -2942,7 +2945,7 @@ bool ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,void ib_register_event_handler (struct ib_event_handler *event_handler);void ib_unregister_event_handler (struct ib_event_handler *event_handler); -void ib_dispatch_event (struct ib_event *event); +void ib_dispatch_event (const struct ib_event *event);int ib_query_port (struct ib_device *device,u8 port_num,struct ib_port_attr *port_attr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 55/399 pinctrl: baytrail: Do not clear IRQ flags on direct-irq enabled pins
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit a23680594da7a9e2696dbcf4f023e9273e2fa40b ]
Suspending Goodix touchscreens requires changing the interrupt pin to output before sending them a power-down command. Followed by wiggling the interrupt pin to wake the device up, after which it is put back in input mode.
On Bay Trail devices with a Goodix touchscreen direct-irq mode is used in combination with listing the pin as a normal GpioIo resource.
This works fine, until the goodix driver gets rmmod-ed and then insmod-ed again. In this case byt_gpio_disable_free() calls byt_gpio_clear_triggering() which clears the IRQ flags and after that the (direct) IRQ no longer triggers.
This commit fixes this by adding a check for the BYT_DIRECT_IRQ_EN flag to byt_gpio_clear_triggering().
Note that byt_gpio_clear_triggering() only gets called from byt_gpio_disable_free() for direct-irq enabled pins, as these are excluded from the irq_valid mask by byt_init_irq_valid_mask().
--- drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/pinctrl/intel/pinctrl-baytrail.c +7 -1
@@ -753,7 +753,13 @@ static void byt_gpio_clear_triggering(struct byt_gpio *vg, unsigned int offset)raw_spin_lock_irqsave (&byt_lock, flags); value =readl (reg); - value &= ~(BYT_TRIG_POS |BYT_TRIG_NEG |BYT_TRIG_LVL ); + +/* Do not clear direct-irq enabled IRQs (from gpio_disable_free) */ +if (value &BYT_DIRECT_IRQ_EN ) +/* nothing to do */ ; +else + value &= ~(BYT_TRIG_POS |BYT_TRIG_NEG |BYT_TRIG_LVL ); +writel (value, reg);raw_spin_unlock_irqrestore (&byt_lock, flags); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 56/399 kprobes: Fix optimize_kprobe()/unoptimize_kprobe() cancellation logic
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit e4add247789e4ba5e08ad8256183ce2e211877d4 ]
optimize_kprobe() and unoptimize_kprobe() cancels if a given kprobe is on the optimizing_list or unoptimizing_list already. However, since the following commit:
f66c0447cca1 ("kprobes: Set unoptimized flag after unoptimizing code")
modified the update timing of the KPROBE_FLAG_OPTIMIZED, it doesn't work as expected anymore.
The optimized_kprobe could be in the following states:
- [optimizing]: Before inserting jump instruction
op.kp->flags has KPROBE_FLAG_OPTIMIZED and
op->list is not empty.
- [optimized]: jump inserted
op.kp->flags has KPROBE_FLAG_OPTIMIZED and
op->list is empty.
- [unoptimizing]: Before removing jump instruction (including unused optprobe)
op.kp->flags has KPROBE_FLAG_OPTIMIZED and
op->list is not empty.
- [unoptimized]: jump removed
op.kp->flags doesn't have KPROBE_FLAG_OPTIMIZED and op->list is empty.
Current code mis-expects [unoptimizing] state doesn't have KPROBE_FLAG_OPTIMIZED, and that can cause incorrect results.
To fix this, introduce optprobe_queued_unopt() to distinguish [optimizing] and [unoptimizing] states and fixes the logic in optimize_kprobe() and unoptimize_kprobe().
[ mingo: Cleaned up the changelog and the code a bit. ]
--- kernel/kprobes.c | 67 +++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 24 deletions(-)
kernel/kprobes.c +43 -24
@@ -610,6 +610,18 @@ void wait_for_kprobe_optimizer(void)mutex_unlock (&kprobe_mutex); } +static bool optprobe_queued_unopt (struct optimized_kprobe *op) +{ +struct optimized_kprobe *_op; + +list_for_each_entry (_op, &unoptimizing_list, list) { +if (op == _op) +return true; + } + +return false; +} +/* Optimize kprobe if p is ready to be optimized */ static void optimize_kprobe (struct kprobe *p) {
@@ -631,17 +643,21 @@ static void optimize_kprobe(struct kprobe *p)return ;/* Check if it is already optimized. */ -if (op->kp.flags &KPROBE_FLAG_OPTIMIZED ) +if (op->kp.flags &KPROBE_FLAG_OPTIMIZED ) { +if (optprobe_queued_unopt (op)) { +/* This is under unoptimizing. Just dequeue the probe */ +list_del_init (&op->list); + }return ; + } op->kp.flags |=KPROBE_FLAG_OPTIMIZED ; -if (!list_empty (&op->list)) -/* This is under unoptimizing. Just dequeue the probe */ -list_del_init (&op->list); -else { -list_add (&op->list, &optimizing_list); -kick_kprobe_optimizer (); - } +/* On unoptimizing/optimizing_list, op must have OPTIMIZED flag */ +if (WARN_ON_ONCE (!list_empty (&op->list))) +return ; + +list_add (&op->list, &optimizing_list); +kick_kprobe_optimizer (); }/* Short cut to direct unoptimizing */
@@ -662,31 +678,34 @@ static void unoptimize_kprobe(struct kprobe *p, bool force)return ;/* This is not an optprobe nor optimized */ op = container_of(p, struct optimized_kprobe, kp); -if (!kprobe_optimized (p)) { -/* Unoptimized or unoptimizing case */ -if (force && !list_empty (&op->list)) { -/* -* Only if this is unoptimizing kprobe and forced, -* forcibly unoptimize it. (No need to unoptimize -* unoptimized kprobe again :) -*/ -list_del_init (&op->list); -force_unoptimize_kprobe (op); - } +if (!kprobe_optimized (p))return ; - } op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED ;if (!list_empty (&op->list)) { -/* Dequeue from the optimization queue */ -list_del_init (&op->list); +if (optprobe_queued_unopt (op)) { +/* Queued in unoptimizing queue */ +if (force) { +/* +* Forcibly unoptimize the kprobe here, and queue it +* in the freeing list for release afterwards. +*/ +force_unoptimize_kprobe (op); +list_move (&op->list, &freeing_list); + } + }else { +/* Dequeue from the optimizing queue */ +list_del_init (&op->list); + op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED ; + }return ; } +/* Optimized kprobe case */ -if (force) +if (force) {/* Forcibly update the code: this is a special case */ force_unoptimize_kprobe (op); -else { + }else {list_add (&op->list, &unoptimizing_list);kick_kprobe_optimizer (); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 57/399 efi/x86: Map the entire EFI vendor string before copying it
In reply to Greg Kroah-HartmanFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit ffc2760bcf2dba0dbef74013ed73eea8310cc52c ]
Fix a couple of issues with the way we map and copy the vendor string:
- we map only 2 bytes, which usually works since you get at least a page, but if the vendor string happens to cross a page boundary, a crash will result
- only call early_memunmap() if early_memremap() succeeded, or we will call it with a NULL address which it doesn't like,
- while at it, switch to early_memremap_ro(), and array indexing rather than pointer dereferencing to read the CHAR16 characters.
--- arch/x86/platform/efi/efi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/x86/platform/efi/efi.c +7 -6
@@ -541,7 +541,6 @@ void __init efi_init(void)efi_char16_t *c16;char vendor[100 ] ="unknown" ;int i =0 ; -void *tmp;#ifdef CONFIG_X86_32 if (boot_params.efi_info.efi_systab_hi ||
@@ -566,14 +565,16 @@ void __init efi_init(void)/* * Show what we know for posterity */ - c16 = tmp =early_memremap (efi.systab->fw_vendor,2 ); + c16 =early_memremap_ro (efi.systab->fw_vendor, +sizeof (vendor) *sizeof (efi_char16_t));if (c16) { -for (i =0 ; i <sizeof (vendor) -1 && *c16; ++i) - vendor[i] = *c16++; +for (i =0 ; i <sizeof (vendor) -1 && c16[i]; ++i) + vendor[i] = c16[i]; vendor[i] ='\0' ; - }else +early_memunmap (c16,sizeof (vendor) *sizeof (efi_char16_t)); + }else {pr_err ("Could not map the firmware vendor!\n" ); -early_memunmap (tmp,2 ); + } pr_info("EFI v%u.%.02u by %s\n", efi.systab->hdr.revision >> 16,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 58/399 sparc: Add .exit.data section.
In reply to Greg Kroah-HartmanFrom: David S. Miller <[email protected]>
[ Upstream commit 548f0b9a5f4cffa0cecf62eb12aa8db682e4eee6 ]
This fixes build errors of all sorts.
Also, emit .exit.text unconditionally.
--- arch/sparc/kernel/vmlinux.lds.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/sparc/kernel/vmlinux.lds.S +4 -2
@@ -171,12 +171,14 @@ SECTIONS } PERCPU_SECTION(SMP_CACHE_BYTES) -#ifdef CONFIG_JUMP_LABEL . = ALIGN(PAGE_SIZE); .exit.text : { EXIT_TEXT } -#endif + + .exit.data : { + EXIT_DATA + } . = ALIGN(PAGE_SIZE); __init_end = .;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 59/399 net: ethernet: ixp4xx: Standard module init
In reply to Greg Kroah-HartmanFrom: Linus Walleij <[email protected]>
[ Upstream commit c83db9ef5640548631707e8b4a7bcddc115fdbae ]
The IXP4xx driver was initializing the MDIO bus before even probing, in the callbacks supposed to be used for setting up the module itself, and with the side effect of trying to register the MDIO bus as soon as this module was loaded or compiled into the kernel whether the device was discovered or not.
This does not work with multiplatform environments.
To get rid of this: set up the MDIO bus from the probe() callback and remove it in the remove() callback. Rename the probe() and remove() calls to reflect the most common conventions.
Since there is a bit of checking for the ethernet feature to be present in the MDIO registering function, making the whole module not even be registered if we can't find an MDIO bus, we need something similar: register the MDIO bus when the corresponding ethernet is probed, and return -EPROBE_DEFER on the other interfaces until this happens. If no MDIO bus is present on any of the registered interfaces we will eventually bail out.
None of the platforms I've seen has e.g. MDIO on EthB and only uses EthC, there is always a Ethernet hardware on the NPE (B, C) that has the MDIO bus, we just might have to wait for it.
--- drivers/net/ethernet/xscale/ixp4xx_eth.c | 96 +++++++++++------------- 1 file changed, 44 insertions(+), 52 deletions(-)
drivers/net/ethernet/xscale/ixp4xx_eth.c +44 -52
@@ -517,25 +517,14 @@ static int ixp4xx_mdio_write(struct mii_bus *bus, int phy_id, int location,return ret; } -static int ixp4xx_mdio_register (void ) +static int ixp4xx_mdio_register (struct eth_regs __iomem *regs) {int err;if (!(mdio_bus =mdiobus_alloc ()))return -ENOMEM ; -if (cpu_is_ixp43x ()) { -/* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */ -if (!(ixp4xx_read_feature_bits () &IXP4XX_FEATURE_NPEC_ETH )) -return -ENODEV ; - mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; - }else { -/* All MII PHY accesses use NPE-B Ethernet registers */ -if (!(ixp4xx_read_feature_bits () &IXP4XX_FEATURE_NPEB_ETH0 )) -return -ENODEV ; - mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; - } - + mdio_regs = regs;__raw_writel (DEFAULT_CORE_CNTRL , &mdio_regs->core_control);spin_lock_init (&mdio_lock); mdio_bus->name ="IXP4xx MII Bus" ;
@@ -1374,7 +1363,7 @@ static const struct net_device_ops ixp4xx_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; -static int eth_init_one (struct platform_device *pdev) +static int ixp4xx_eth_probe (struct platform_device *pdev) {struct port *port;struct net_device *dev;
@@ -1384,7 +1373,7 @@ static int eth_init_one(struct platform_device *pdev)char phy_id[MII_BUS_ID_SIZE +3 ];int err; -if (!(dev =alloc_etherdev (sizeof (struct port )))) +if (!(dev =devm_alloc_etherdev (&pdev->dev,sizeof (struct port ))))return -ENOMEM ;SET_NETDEV_DEV (dev, &pdev->dev);
@@ -1394,20 +1383,51 @@ static int eth_init_one(struct platform_device *pdev)switch (port->id) {case IXP4XX_ETH_NPEA : +/* If the MDIO bus is not up yet, defer probe */ +if (!mdio_bus) +return -EPROBE_DEFER ; port->regs = (struct eth_regs __iomem *)IXP4XX_EthA_BASE_VIRT; regs_phys = IXP4XX_EthA_BASE_PHYS;break ;case IXP4XX_ETH_NPEB : +/* +* On all except IXP43x, NPE-B is used for the MDIO bus. +* If there is no NPE-B in the feature set, bail out, else +* register the MDIO bus. +*/ +if (!cpu_is_ixp43x ()) { +if (!(ixp4xx_read_feature_bits () & +IXP4XX_FEATURE_NPEB_ETH0 )) +return -ENODEV ; +/* Else register the MDIO bus on NPE-B */ +if ((err =ixp4xx_mdio_register (IXP4XX_EthC_BASE_VIRT))) +return err; + } +if (!mdio_bus) +return -EPROBE_DEFER ; port->regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT; regs_phys = IXP4XX_EthB_BASE_PHYS;break ;case IXP4XX_ETH_NPEC : +/* +* IXP43x lacks NPE-B and uses NPE-C for the MDIO bus access, +* of there is no NPE-C, no bus, nothing works, so bail out. +*/ +if (cpu_is_ixp43x ()) { +if (!(ixp4xx_read_feature_bits () & +IXP4XX_FEATURE_NPEC_ETH )) +return -ENODEV ; +/* Else register the MDIO bus on NPE-C */ +if ((err =ixp4xx_mdio_register (IXP4XX_EthC_BASE_VIRT))) +return err; + } +if (!mdio_bus) +return -EPROBE_DEFER ; port->regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT; regs_phys = IXP4XX_EthC_BASE_PHYS;break ;default : - err = -ENODEV ; - goto err_free; +return -ENODEV ; } dev->netdev_ops = &ixp4xx_netdev_ops;
@@ -1416,10 +1436,8 @@ static int eth_init_one(struct platform_device *pdev)netif_napi_add (dev, &port->napi, eth_poll,NAPI_WEIGHT ); -if (!(port->npe =npe_request (NPE_ID (port->id)))) { - err = -EIO ; - goto err_free; - } +if (!(port->npe =npe_request (NPE_ID (port->id)))) +return -EIO ; port->mem_res =request_mem_region (regs_phys,REGS_SIZE , dev->name);if (!port->mem_res) {
@@ -1465,12 +1483,10 @@ err_free_mem:release_resource (port->mem_res); err_npe_rel:npe_release (port->npe); -err_free: -free_netdev (dev);return err; } -static int eth_remove_one (struct platform_device *pdev) +static int ixp4xx_eth_remove (struct platform_device *pdev) {struct net_device *dev =platform_get_drvdata (pdev);struct phy_device *phydev = dev->phydev;
@@ -1478,45 +1494,21 @@ static int eth_remove_one(struct platform_device *pdev)unregister_netdev (dev);phy_disconnect (phydev); +ixp4xx_mdio_remove (); npe_port_tab[NPE_ID (port->id)] =NULL ;npe_release (port->npe);release_resource (port->mem_res); -free_netdev (dev);return 0 ; }static struct platform_driver ixp4xx_eth_driver = { .driver.name =DRV_NAME , - .probe = eth_init_one, - .remove = eth_remove_one, + .probe = ixp4xx_eth_probe, + .remove = ixp4xx_eth_remove, }; - -static int __init eth_init_module (void ) -{ -int err; - -/* -* FIXME: we bail out on device tree boot but this really needs -* to be fixed in a nicer way: this registers the MDIO bus before -* even matching the driver infrastructure, we should only probe -* detected hardware. -*/ -if (of_have_populated_dt ()) -return -ENODEV ; -if ((err =ixp4xx_mdio_register ())) -return err; -return platform_driver_register (&ixp4xx_eth_driver); -} - -static void __exit eth_cleanup_module(void) -{ -platform_driver_unregister (&ixp4xx_eth_driver); -ixp4xx_mdio_remove (); -} +module_platform_driver (ixp4xx_eth_driver);MODULE_AUTHOR ("Krzysztof Halasa" );MODULE_DESCRIPTION ("Intel IXP4xx Ethernet driver" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:ixp4xx_eth" ); -module_init (eth_init_module); -module_exit (eth_cleanup_module);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 60/399 raid6/test: fix a compilation error
In reply to Greg Kroah-HartmanFrom: Zhengyuan Liu <[email protected]>
[ Upstream commit 6b8651aac1dca6140dd7fb4c9fec2736ed3f6223 ]
The compilation error is redeclaration showed as following:
In file included from ../../../include/linux/limits.h:6,
from /usr/include/x86_64-linux-gnu/bits/local_lim.h:38,
from /usr/include/x86_64-linux-gnu/bits/posix1_lim.h:161,
from /usr/include/limits.h:183,
from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/limits.h:194,
from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/syslimits.h:7,
from /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed/limits.h:34,
from ../../../include/linux/raid/pq.h:30,
from algos.c:14:
../../../include/linux/types.h:114:15: error: conflicting types for ‘int64_t’
typedef s64 int64_t;
^~~~~~~
In file included from /usr/include/stdint.h:34,
from /usr/lib/gcc/x86_64-linux-gnu/8/include/stdint.h:9,
from /usr/include/inttypes.h:27,
from ../../../include/linux/raid/pq.h:29,
from algos.c:14:
/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:27:19: note: previous \
declaration of ‘int64_t’ was here
typedef __int64_t int64_t;--- include/linux/raid/pq.h | 1 - 1 file changed, 1 deletion(-)
include/linux/raid/pq.h +0 -1
@@ -27,7 +27,6 @@ extern const char raid6_empty_zero_page[PAGE_SIZE];#include <errno.h> #include <inttypes.h> -#include <limits.h> #include <stddef.h> #include <sys/mman.h> #include <sys/time.h>
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 61/399 iio: imu: st_lsm6dsx: check return value from st_lsm6dsx_sensor_set_enable
In reply to Greg Kroah-HartmanFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit a2dd9bd9334efb8dc0bdc0109abff3a7b57effb1 ]
Add missing return value check in st_lsm6dsx_read_oneshot disabling the sensor. The issue is reported by coverity with the following error:
Unchecked return value:
If the function returns an error value, the error value may be mistaken for a normal value.
Addresses-Coverity-ID: 1446733 ("Unchecked return value")
--- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +5 -2
@@ -1506,8 +1506,11 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6dsx_sensor *sensor,if (err <0 )return err; -if (!hw->enable_event) -st_lsm6dsx_sensor_set_enable (sensor, false); +if (!hw->enable_event) { + err =st_lsm6dsx_sensor_set_enable (sensor, false); +if (err <0 ) +return err; + } *val = (s16 )le16_to_cpu (data);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 62/399 uio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit b74351287d4bd90636c3f48bc188c2f53824c2d4 ]
The driver may sleep while holding a spinlock.
The function call path (from bottom to top) in Linux 4.19 is:
kernel/irq/manage.c, 523:
synchronize_irq in disable_irqdrivers/uio/uio_dmem_genirq.c, 140:
disable_irq in uio_dmem_genirq_irqcontroldrivers/uio/uio_dmem_genirq.c, 134:
_raw_spin_lock_irqsave in uio_dmem_genirq_irqcontrol
synchronize_irq() can sleep at runtime.
To fix this bug, disable_irq() is called without holding the spinlock.
This bug is found by a static analysis tool STCheck written by myself.
--- drivers/uio/uio_dmem_genirq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/uio/uio_dmem_genirq.c +4 -2
@@ -132,11 +132,13 @@ static int uio_dmem_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)if (irq_on) {if (test_and_clear_bit (0 , &priv->flags))enable_irq (dev_info->irq); +spin_unlock_irqrestore (&priv->lock, flags); }else { -if (!test_and_set_bit (0 , &priv->flags)) +if (!test_and_set_bit (0 , &priv->flags)) { +spin_unlock_irqrestore (&priv->lock, flags);disable_irq (dev_info->irq); + } } -spin_unlock_irqrestore (&priv->lock, flags);return 0 ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 63/399 drm/amdgpu/sriov: workaround on rev_id for Navi12 under sriov
In reply to Greg Kroah-HartmanFrom: Tiecheng Zhou <[email protected]>
[ Upstream commit df5e984c8bd414561c320d6cbbb66d53abf4c7e2 ]
guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0, as a consequence, the rev_id and external_rev_id are wrong.
workaround it by hardcoding the rev_id to 0, which is the default value.
v2. add comment in the code
--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +6 -0
@@ -701,6 +701,12 @@ static int nv_common_early_init(void *handle) adev->pg_flags =AMD_PG_SUPPORT_VCN |AMD_PG_SUPPORT_VCN_DPG |AMD_PG_SUPPORT_ATHUB ; +/* guest vm gets 0xffffffff when reading RCC_DEV0_EPF0_STRAP0, +* as a consequence, the rev_id and external_rev_id are wrong. +* workaround it by hardcoding rev_id to 0 (default value). +*/ +if (amdgpu_sriov_vf (adev)) + adev->rev_id =0 ; adev->external_rev_id = adev->rev_id +0xa ;break ;default :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 64/399 spi: fsl-lpspi: fix only one cs-gpio working
In reply to Greg Kroah-HartmanFrom: Philippe Schenker <[email protected]>
[ Upstream commit bc3a8b295e5bca9d1ec2622a6ba38289f9fd3d8a ]
Why it does not work at the moment:
- num_chipselect sets the number of cs-gpios that are in the DT. This comes from drivers/spi/spi.c
- num_chipselect gets set with devm_spi_register_controller, that is called in drivers/spi/spi.c
- devm_spi_register_controller got called after num_chipselect has been used.
How this commit fixes the issue:
- devm_spi_register_controller gets called before num_chipselect is being used.
--- drivers/spi/spi-fsl-lpspi.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/spi/spi-fsl-lpspi.c +16 -16
@@ -862,6 +862,22 @@ static int fsl_lpspi_probe(struct platform_device *pdev) fsl_lpspi->dev = &pdev->dev; fsl_lpspi->is_slave = is_slave; + controller->bits_per_word_mask =SPI_BPW_RANGE_MASK (8 ,32 ); + controller->transfer_one = fsl_lpspi_transfer_one; + controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; + controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware; + controller->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; + controller->flags =SPI_MASTER_MUST_RX |SPI_MASTER_MUST_TX ; + controller->dev.of_node = pdev->dev.of_node; + controller->bus_num = pdev->id; + controller->slave_abort = fsl_lpspi_slave_abort; + + ret =devm_spi_register_controller (&pdev->dev, controller); +if (ret <0 ) { +dev_err (&pdev->dev,"spi_register_controller error.\n" ); + goto out_controller_put; + } +if (!fsl_lpspi->is_slave) {for (i =0 ; i < controller->num_chipselect; i++) {int cs_gpio =of_get_named_gpio (np,"cs-gpios" , i);
@@ -885,16 +901,6 @@ static int fsl_lpspi_probe(struct platform_device *pdev) controller->prepare_message = fsl_lpspi_prepare_message; } - controller->bits_per_word_mask =SPI_BPW_RANGE_MASK (8 ,32 ); - controller->transfer_one = fsl_lpspi_transfer_one; - controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; - controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware; - controller->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; - controller->flags =SPI_MASTER_MUST_RX |SPI_MASTER_MUST_TX ; - controller->dev.of_node = pdev->dev.of_node; - controller->bus_num = pdev->id; - controller->slave_abort = fsl_lpspi_slave_abort; -init_completion (&fsl_lpspi->xfer_done); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -952,12 +958,6 @@ static int fsl_lpspi_probe(struct platform_device *pdev)if (ret <0 )dev_err (&pdev->dev,"dma setup error %d, use pio\n" , ret); - ret =devm_spi_register_controller (&pdev->dev, controller); -if (ret <0 ) { -dev_err (&pdev->dev,"spi_register_controller error.\n" ); - goto out_controller_put; - } -return 0 ; out_controller_put:
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 65/399 drm/nouveau/nouveau: fix incorrect sizeof on args.src an args.dst
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit f42e4b337b327b1336c978c4b5174990a25f68a0 ]
The sizeof is currently on args.src and args.dst and should be on *args.src and *args.dst. Fortunately these sizes just so happen to be the same size so it worked, however, this should be fixed and it also cleans up static analysis warnings
Addresses-Coverity: ("sizeof not portable")
--- drivers/gpu/drm/nouveau/nouveau_dmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/nouveau/nouveau_dmem.c +2 -2
@@ -635,10 +635,10 @@ nouveau_dmem_migrate_vma(struct nouveau_drm *drm,unsigned long c, i;int ret = -ENOMEM ; - args.src =kcalloc (max,sizeof (args.src),GFP_KERNEL ); + args.src =kcalloc (max,sizeof (*args.src),GFP_KERNEL );if (!args.src) goto out; - args.dst =kcalloc (max,sizeof (args.dst),GFP_KERNEL ); + args.dst =kcalloc (max,sizeof (*args.dst),GFP_KERNEL );if (!args.dst) goto out_free_src;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 66/399 usb: gadget: udc: fix possible sleep-in-atomic-context bugs in gr_probe()
In reply to Greg Kroah-HartmanFrom: Jia-Ju Bai <[email protected]>
[ Upstream commit 9c1ed62ae0690dfe5d5e31d8f70e70a95cb48e52 ]
The driver may sleep while holding a spinlock.
The function call path (from bottom to top) in Linux 4.19 is:
drivers/usb/gadget/udc/core.c, 1175:
kzalloc(GFP_KERNEL) in usb_add_gadget_udc_releasedrivers/usb/gadget/udc/core.c, 1272:
usb_add_gadget_udc_release in usb_add_gadget_udcdrivers/usb/gadget/udc/gr_udc.c, 2186:
usb_add_gadget_udc in gr_probedrivers/usb/gadget/udc/gr_udc.c, 2183:
spin_lock in gr_probe
drivers/usb/gadget/udc/core.c, 1195:
mutex_lock in usb_add_gadget_udc_releasedrivers/usb/gadget/udc/core.c, 1272:
usb_add_gadget_udc_release in usb_add_gadget_udcdrivers/usb/gadget/udc/gr_udc.c, 2186:
usb_add_gadget_udc in gr_probedrivers/usb/gadget/udc/gr_udc.c, 2183:
spin_lock in gr_probe
drivers/usb/gadget/udc/gr_udc.c, 212:
debugfs_create_file in gr_probedrivers/usb/gadget/udc/gr_udc.c, 2197:
gr_dfs_create in gr_probedrivers/usb/gadget/udc/gr_udc.c, 2183:
spin_lock in gr_probe
drivers/usb/gadget/udc/gr_udc.c, 2114:
devm_request_threaded_irq in gr_request_irqdrivers/usb/gadget/udc/gr_udc.c, 2202:
gr_request_irq in gr_probedrivers/usb/gadget/udc/gr_udc.c, 2183:
spin_lock in gr_probe
kzalloc(GFP_KERNEL), mutex_lock(), debugfs_create_file() and devm_request_threaded_irq() can sleep at runtime.
To fix these possible bugs, usb_add_gadget_udc(), gr_dfs_create() and gr_request_irq() are called without handling the spinlock.
These bugs are found by a static analysis tool STCheck written by myself.
--- drivers/usb/gadget/udc/gr_udc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/usb/gadget/udc/gr_udc.c +9 -7
@@ -2175,8 +2175,6 @@ static int gr_probe(struct platform_device *pdev)return -ENOMEM ; } -spin_lock (&dev->lock); -/* Inside lock so that no gadget can use this udc until probe is done */ retval =usb_add_gadget_udc (dev->dev, &dev->gadget);if (retval) {
@@ -2185,15 +2183,21 @@ static int gr_probe(struct platform_device *pdev) } dev->added =1 ; +spin_lock (&dev->lock); + retval =gr_udc_init (dev); -if (retval) +if (retval) { +spin_unlock (&dev->lock); goto out; - -gr_dfs_create (dev); + }/* Clear all interrupt enables that might be left on since last boot */ gr_disable_interrupts_and_pullup (dev); +spin_unlock (&dev->lock); + +gr_dfs_create (dev); + retval =gr_request_irq (dev, dev->irq);if (retval) {dev_err (dev->dev,"Failed to request irq %d\n" , dev->irq);
@@ -2222,8 +2226,6 @@ static int gr_probe(struct platform_device *pdev)dev_info (dev->dev,"regs: %p, irq %d\n" , dev->regs, dev->irq); out: -spin_unlock (&dev->lock); -if (retval)gr_remove (pdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 67/399 usb: dwc2: Fix IN FIFO allocation
In reply to Greg Kroah-HartmanFrom: John Keeping <[email protected]>
[ Upstream commit 644139f8b64d818f6345351455f14471510879a5 ]
On chips with fewer FIFOs than endpoints (for example RK3288 which has 9 endpoints, but only 6 which are cabable of input), the DPTXFSIZN registers above the FIFO count may return invalid values.
With logging added on startup, I see:
dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=1 sz=256 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=2 sz=128 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=3 sz=128 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=4 sz=64 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=5 sz=64 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=6 sz=32 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=7 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=8 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=9 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=10 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=11 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=12 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=13 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=14 sz=0 dwc2 ff580000.usb: dwc2_hsotg_init_fifo: ep=15 sz=0
but:
# cat /sys/kernel/debug/ff580000.usb/fifo Non-periodic FIFOs: RXFIFO: Size 275 NPTXFIFO: Size 16, Start 0x00000113
Periodic TXFIFOs: DPTXFIFO 1: Size 256, Start 0x00000123 DPTXFIFO 2: Size 128, Start 0x00000223 DPTXFIFO 3: Size 128, Start 0x000002a3 DPTXFIFO 4: Size 64, Start 0x00000323 DPTXFIFO 5: Size 64, Start 0x00000363 DPTXFIFO 6: Size 32, Start 0x000003a3 DPTXFIFO 7: Size 0, Start 0x000003e3 DPTXFIFO 8: Size 0, Start 0x000003a3 DPTXFIFO 9: Size 256, Start 0x00000123
so it seems that FIFO 9 is mirroring FIFO 1.
Fix the allocation by using the FIFO count instead of the endpoint count when selecting a FIFO for an endpoint.
--- drivers/usb/dwc2/gadget.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/dwc2/gadget.c +2 -1
@@ -4056,11 +4056,12 @@ static int dwc2_hsotg_ep_enable(struct usb_ep *ep,* a unique tx-fifo even if it is non-periodic. */ if (dir_in && hsotg->dedicated_fifos) { +unsigned fifo_count =dwc2_hsotg_tx_fifo_count (hsotg);u32 fifo_index =0 ;u32 fifo_size =UINT_MAX ; size = hs_ep->ep.maxpacket * hs_ep->mc; -for (i =1 ; i < hsotg->num_of_eps; ++i) { +for (i =1 ; i <= fifo_count; ++i) {if (hsotg->fifo_map & (1 << i))continue ; val =dwc2_readl (hsotg,DPTXFSIZN (i));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 68/399 clocksource/drivers/bcm2835_timer: Fix memory leak of timer
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 2052d032c06761330bca4944bb7858b00960e868 ]
Currently when setup_irq fails the error exit path will leak the recently allocated timer structure. Originally the code would throw a panic but a later commit changed the behaviour to return via the err_iounmap path and hence we now have a memory leak. Fix this by adding a err_timer_free error path that kfree's timer.
Addresses-Coverity: ("Resource Leak")
--- drivers/clocksource/bcm2835_timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/clocksource/bcm2835_timer.c +4 -1
@@ -121,7 +121,7 @@ static int __init bcm2835_timer_init(struct device_node *node) ret =setup_irq (irq, &timer->act);if (ret) {pr_err ("Can't set up timer IRQ\n" ); - goto err_iounmap; + goto err_timer_free; }clockevents_config_and_register (&timer->evt, freq,0xf ,0xffffffff );
@@ -130,6 +130,9 @@ static int __init bcm2835_timer_init(struct device_node *node)return 0 ; +err_timer_free: +kfree (timer); + err_iounmap:iounmap (base);return ret;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 69/399 drm/amd/display: Clear state after exiting fixed active VRR state
In reply to Greg Kroah-HartmanFrom: Amanda Liu <[email protected]>
[ Upstream commit 6f8f76444baf405bacb0591d97549a71a9aaa1ac ]
[why]
Upon exiting a fixed active VRR state, the state isn't cleared. This leads to the variable VRR range to be calculated incorrectly.
[how]
Set fixed active state to false when updating vrr params
--- drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/modules/freesync/freesync.c +2 -0
@@ -807,6 +807,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, 2 * in_out_vrr->min_refresh_in_uhz) in_out_vrr->btr.btr_enabled = false; + in_out_vrr->fixed.fixed_active = false; in_out_vrr->btr.btr_active = false; in_out_vrr->btr.inserted_duration_in_us =0 ; in_out_vrr->btr.frames_to_insert =0 ;
@@ -826,6 +827,7 @@ void mod_freesync_build_vrr_params(struct mod_freesync *mod_freesync, in_out_vrr->adjust.v_total_max = stream->timing.v_total; }else if (in_out_vrr->state ==VRR_STATE_ACTIVE_VARIABLE && refresh_range >=MIN_REFRESH_RANGE_IN_US ) { + in_out_vrr->adjust.v_total_min =calc_v_total_from_refresh (stream, in_out_vrr->max_refresh_in_uhz);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 70/399 kselftest: Minimise dependency of get_size on C library interfaces
In reply to Greg Kroah-HartmanFrom: Siddhesh Poyarekar <[email protected]>
[ Upstream commit 6b64a650f0b2ae3940698f401732988699eecf7a ]
It was observed[1] on arm64 that __builtin_strlen led to an infinite loop in the get_size selftest. This is because __builtin_strlen (and other builtins) may sometimes result in a call to the C library function. The C library implementation of strlen uses an IFUNC resolver to load the most efficient strlen implementation for the underlying machine and hence has a PLT indirection even for static binaries. Because this binary avoids the C library startup routines, the PLT initialization never happens and hence the program gets stuck in an infinite loop.
On x86_64 the __builtin_strlen just happens to expand inline and avoid the call but that is not always guaranteed.
Further, while testing on x86_64 (Fedora 31), it was observed that the test also failed with a segfault inside write() because the generated code for the write function in glibc seems to access TLS before the syscall (probably due to the cancellation point check) and fails because TLS is not initialised.
To mitigate these problems, this patch reduces the interface with the C library to just the syscall function. The syscall function still sets errno on failure, which is undesirable but for now it only affects cases where syscalls fail.
[1] https://bugs.linaro.org/show_bug.cgi?id=5479
--- tools/testing/selftests/size/get_size.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
tools/testing/selftests/size/get_size.c +18 -6
@@ -11,23 +11,35 @@* own execution. It also attempts to have as few dependencies * on kernel features as possible. * -* It should be statically linked, with startup libs avoided. -* It uses no library calls, and only the following 3 syscalls: +* It should be statically linked, with startup libs avoided. It uses +* no library calls except the syscall() function for the following 3 +* syscalls: * sysinfo(), write(), and _exit() * * For output, it avoids printf (which in some C libraries * has large external dependencies) by implementing it's own * number output and print routines, and using __builtin_strlen() +* +* The test may crash if any of the above syscalls fails because in some +* libc implementations (e.g. the GNU C Library) errno is saved in +* thread-local storage, which does not get initialized due to avoiding +* startup libs. */ #include <sys/sysinfo.h> #include <unistd.h> +#include <sys/syscall.h> #define STDOUT_FILENO 1static int const char *s) { -return write (STDOUT_FILENO , s,__builtin_strlen (s)); +size_t len =0 ; + +while (s[len] !='\0' ) + len++; + +return syscall (SYS_write,STDOUT_FILENO , s, len); }static inline char *num_to_str (unsigned long num,char *buf,int len)
@@ -79,12 +91,12 @@ void _start(void)"TAP version 13\n" );"# Testing system size.\n" ); - ccode =sysinfo (&info); + ccode =syscall (SYS_sysinfo, &info);if (ccode <0 ) {"not ok 1" );" ---\n reason: \"could not get sysinfo\"\n ...\n" ); -_exit (ccode); +syscall (SYS_exit, ccode); }"ok 1" );
@@ -100,5 +112,5 @@ void _start(void)" ...\n" );"1..1\n" ); -_exit (0 ); +syscall (SYS_exit,0 ); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 71/399 jbd2: clear JBD2_ABORT flag before journal_reset to update log tail info when load journal
In reply to Greg Kroah-HartmanFrom: Kai Li <[email protected]>
[ Upstream commit a09decff5c32060639a685581c380f51b14e1fc2 ]
If the journal is dirty when the filesystem is mounted, jbd2 will replay the journal but the journal superblock will not be updated by journal_reset() because JBD2_ABORT flag is still set (it was set in journal_init_common()). This is problematic because when a new transaction is then committed, it will be recorded in block 1 (journal->j_tail was set to 1 in journal_reset()). If unclean shutdown happens again before the journal superblock is updated, the new recorded transaction will not be replayed during the next mount (because of stale sb->s_start and sb->s_sequence values) which can lead to filesystem corruption.
--- fs/jbd2/journal.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/jbd2/journal.c +5 -1
@@ -1711,6 +1711,11 @@ int jbd2_journal_load(journal_t *journal) journal->j_devname);return -EFSCORRUPTED ; } +/* +* clear JBD2_ABORT flag initialized in journal_init_common +* here to update log tail information with the newest seq. +*/ + journal->j_flags &= ~JBD2_ABORT ;/* OK, we've finished with the dynamic journal bits: * reinitialise the dynamic contents of the superblock in memory
@@ -1718,7 +1723,6 @@ int jbd2_journal_load(journal_t *journal)if (journal_reset (journal)) goto recovery_error; - journal->j_flags &= ~JBD2_ABORT ; journal->j_flags |=JBD2_LOADED ;return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 72/399 ext4: fix deadlock allocating bio_post_read_ctx from mempool
In reply to Greg Kroah-HartmanFrom: Eric Biggers <[email protected]>
[ Upstream commit 68e45330e341dad2d3a0a3f8ef2ec46a2a0a3bbc ]
Without any form of coordination, any case where multiple allocations from the same mempool are needed at a time to make forward progress can deadlock under memory pressure.
This is the case for struct bio_post_read_ctx, as one can be allocated to decrypt a Merkle tree page during fsverity_verify_bio(), which itself is running from a post-read callback for a data bio which has its own struct bio_post_read_ctx.
Fix this by freeing the first bio_post_read_ctx before calling fsverity_verify_bio(). This works because verity (if enabled) is always the last post-read step.
This deadlock can be reproduced by trying to read from an encrypted verity file after reducing NUM_PREALLOC_POST_READ_CTXS to 1 and patching mempool_alloc() to pretend that pool->alloc() always fails.
Note that since NUM_PREALLOC_POST_READ_CTXS is actually 128, to actually hit this bug in practice would require reading from lots of encrypted verity files at the same time. But it's theoretically possible, as N available objects isn't enough to guarantee forward progress when > N/2 threads each need 2 objects at a time.
--- fs/ext4/readpage.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/ext4/readpage.c +15 -2
@@ -57,6 +57,7 @@ enum bio_post_read_step {STEP_INITIAL =0 ,STEP_DECRYPT ,STEP_VERITY , + STEP_MAX, }; struct bio_post_read_ctx {
@@ -106,10 +107,22 @@ static void verity_work(struct work_struct *work) {struct bio_post_read_ctx *ctx = container_of(work, struct bio_post_read_ctx, work); +struct bio *bio = ctx->bio; -fsverity_verify_bio (ctx->bio); +/* +* fsverity_verify_bio() may call readpages() again, and although verity +* will be disabled for that, decryption may still be needed, causing +* another bio_post_read_ctx to be allocated. So to guarantee that +* mempool_alloc() never deadlocks we must free the current ctx first. +* This is safe because verity is the last post-read step. +*/ +BUILD_BUG_ON (STEP_VERITY +1 !=STEP_MAX ); +mempool_free (ctx, bio_post_read_ctx_pool); + bio->bi_private =NULL ; -bio_post_read_processing (ctx); +fsverity_verify_bio (bio); + +__read_end_io (bio); }static void bio_post_read_processing (struct bio_post_read_ctx *ctx)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 73/399 clk: ti: dra7: fix parent for gmac_clkctrl
In reply to Greg Kroah-HartmanFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 69e300283796dae7e8c2e6acdabcd31336c0c93e ]
The parent clk for gmac clk ctrl has to be gmac_main_clk (125MHz) instead of dpll_gmac_ck (1GHz). This is caused incorrect CPSW MDIO operation. Hence, fix it.
--- drivers/clk/ti/clk-7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/clk-7xx.c +1 -1
@@ -405,7 +405,7 @@ static const struct omap_clkctrl_bit_data dra7_gmac_bit_data[] __initconst = { };static const struct omap_clkctrl_reg_data dra7_gmac_clkctrl_regs[]__initconst = { - {DRA7_GMAC_GMAC_CLKCTRL , dra7_gmac_bit_data,CLKF_SW_SUP ,"dpll_gmac_ck" }, + {DRA7_GMAC_GMAC_CLKCTRL , dra7_gmac_bit_data,CLKF_SW_SUP ,"gmac_main_clk" }, {0 }, };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 74/399 x86/sysfb: Fix check for bad VRAM size
In reply to Greg Kroah-HartmanFrom: Arvind Sankar <[email protected]>
[ Upstream commit dacc9092336be20b01642afe1a51720b31f60369 ]
When checking whether the reported lfb_size makes sense, the height
* stride result is page-aligned before seeing whether it exceeds the reported size.
This doesn't work if height * stride is not an exact number of pages. For example, as reported in the kernel bugzilla below, an 800x600x32 EFI framebuffer gets skipped because of this.
Move the PAGE_ALIGN to after the check vs size.
--- arch/x86/kernel/sysfb_simplefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/sysfb_simplefb.c +1 -1
@@ -90,11 +90,11 @@ __init int create_simplefb(const struct screen_info *si,if (si->orig_video_isVGA ==VIDEO_TYPE_VLFB ) size <<=16 ; length = mode->height * mode->stride; - length =PAGE_ALIGN (length);if (length > size) {printk (KERN_WARNING "sysfb: VRAM smaller than advertised\n" );return -EINVAL ; } + length =PAGE_ALIGN (length);/* setup IORESOURCE_MEM as framebuffer memory */ memset (&res,0 ,sizeof (res));
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 75/399 pwm: omap-dmtimer: Simplify error handling
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit c4cf7aa57eb83b108d2d9c6c37c143388fee2a4d ]
Instead of doing error handling in the middle of ->probe(), move error handling and freeing the reference to timer to the end.
This fixes a resource leak as dm_timer wasn't freed when allocating *omap failed.
Implementation note: The put: label was never reached without a goto and ret being unequal to 0, so the removed return statement is fine.
--- drivers/pwm/pwm-omap-dmtimer.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/pwm/pwm-omap-dmtimer.c +19 -9
@@ -298,15 +298,10 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev) goto put; } -put: -of_node_put (timer); -if (ret <0 ) -return ret; - omap =devm_kzalloc (&pdev->dev,sizeof (*omap),GFP_KERNEL );if (!omap) { - pdata->free (dm_timer); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_alloc_omap; } omap->pdata = pdata;
@@ -339,13 +334,28 @@ put: ret =pwmchip_add (&omap->chip);if (ret <0 ) {dev_err (&pdev->dev,"failed to register PWM\n" ); - omap->pdata->free (omap->dm_timer); -return ret; + goto err_pwmchip_add; } +of_node_put (timer); +platform_set_drvdata (pdev, omap);return 0 ; + +err_pwmchip_add: + +/* +* *omap is allocated using devm_kzalloc, +* so no free necessary here +*/ +err_alloc_omap: + + pdata->free (dm_timer); +put: +of_node_put (timer); + +return ret; }static int pwm_omap_dmtimer_remove (struct platform_device *pdev)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 76/399 udf: Allow writing to Rewritable partitions
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 15fb05fd286ac57a0802d71624daeb5c1c2d5b07 ]
UDF 2.60 standard states in section 2.2.14.2:
A partition with Access Type 3 (rewritable) shall define a Freed Space Bitmap or a Freed Space Table, see 2.3.3. All other partitions shall not define a Freed Space Bitmap or a Freed Space Table.
Rewritable partitions are used on media that require some form of preprocessing before re-writing data (for example legacy MO). Such partitions shall use Access Type 3.
Overwritable partitions are used on media that do not require preprocessing before overwriting data (for example: CD-RW, DVD-RW, DVD+RW, DVD-RAM, BD-RE, HD DVD-Rewritable). Such partitions shall use Access Type 4.
however older versions of the standard didn't have this wording and there are tools out there that create UDF filesystems with rewritable partitions but that don't contain a Freed Space Bitmap or a Freed Space Table on media that does not require pre-processing before overwriting a block. So instead of forcing media with rewritable partition read-only, base this decision on presence of a Freed Space Bitmap or a Freed Space Table.
--- fs/udf/super.c | 1 - 1 file changed, 1 deletion(-)
fs/udf/super.c +0 -1
@@ -1035,7 +1035,6 @@ static int check_partition_desc(struct super_block *sb,switch (le32_to_cpu (p->accessType)) {case PD_ACCESS_TYPE_READ_ONLY :case PD_ACCESS_TYPE_WRITE_ONCE : -case PD_ACCESS_TYPE_REWRITABLE :case PD_ACCESS_TYPE_NONE : goto force_ro; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 77/399 dmaengine: fsl-qdma: fix duplicated argument to &&
In reply to Greg Kroah-HartmanFrom: Chen Zhou <[email protected]>
[ Upstream commit 4b048178854da11656596d36a107577d66fd1e08 ]
There is duplicated argument to && in function fsl_qdma_free_chan_resources, which looks like a typo, pointer fsl_queue->desc_pool also needs NULL check, fix it.
Detected with coccinelle.
--- drivers/dma/fsl-qdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/fsl-qdma.c +1 -1
@@ -304,7 +304,7 @@ static void fsl_qdma_free_chan_resources(struct dma_chan *chan)vchan_dma_desc_free_list (&fsl_chan->vchan, &head); -if (!fsl_queue->comp_pool && !fsl_queue->comp_pool) +if (!fsl_queue->comp_pool && !fsl_queue->desc_pool)return ; list_for_each_entry_safe(comp_temp, _comp_temp,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 78/399 wan/hdlc_x25: fix skb handling
In reply to Greg Kroah-HartmanFrom: Martin Schiller <[email protected]>
[ Upstream commit 953c4a08dfc9ffe763a8340ac10f459d6c6cc4eb ]
o call skb_reset_network_header() before hdlc->xmit()
o change skb proto to HDLC (0x0019) before hdlc->xmit()
o call dev_queue_xmit_nit() before hdlc->xmit()
This changes make it possible to trace (tcpdump) outgoing layer2 (ETH_P_HDLC) packets
Additionally call skb_reset_network_header() after each skb_push() / skb_pull().
--- drivers/net/wan/hdlc_x25.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/net/wan/hdlc_x25.c +11 -2
@@ -62,11 +62,12 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb) {unsigned char *ptr; -skb_push (skb,1 ); -if (skb_cow (skb,1 ))return NET_RX_DROP ; +skb_push (skb,1 ); +skb_reset_network_header (skb); + ptr = skb->data; *ptr =X25_IFACE_DATA ;
@@ -79,6 +80,13 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)static void x25_data_transmit (struct net_device *dev,struct sk_buff *skb) {hdlc_device *hdlc =dev_to_hdlc (dev); + +skb_reset_network_header (skb); + skb->protocol =hdlc_type_trans (skb, dev); + +if (dev_nit_active (dev)) +dev_queue_xmit_nit (skb, dev); + hdlc->xmit (skb, dev);/* Ignore return value :-( */ }
@@ -93,6 +101,7 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)switch (skb->data[0 ]) {case X25_IFACE_DATA :/* Data to be transmitted */ skb_pull (skb,1 ); +skb_reset_network_header (skb);if ((result =lapb_data_request (dev, skb)) !=LAPB_OK )dev_kfree_skb (skb);return NETDEV_TX_OK ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 79/399 irqchip/gic-v3-its: Fix get_vlpi_map() breakage with doorbells
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
[ Upstream commit 093bf439fee0d40ade7e309c1288b409cdc3b38f ]
When updating an LPI configuration, get_vlpi_map() may be passed a irq_data structure relative to an ITS domain (the normal case) or one that is relative to the core GICv3 domain in the case of a GICv4 doorbell.
In the latter case, special care must be take not to dereference the irq_chip data as an its_dev structure, as that isn't what is stored there. Instead, check *first* whether the IRQ is forwarded to a vcpu, and only then try to obtain the vlpi mapping.
--- drivers/irqchip/irq-gic-v3-its.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +6 -5
@@ -1170,13 +1170,14 @@ static void its_send_vclear(struct its_device *dev, u32 event_id)*/ static struct its_vlpi_map *get_vlpi_map (struct irq_data *d) { -struct its_device *its_dev =irq_data_get_irq_chip_data (d); -u32 event =its_get_event_id (d); +if (irqd_is_forwarded_to_vcpu (d)) { +struct its_device *its_dev =irq_data_get_irq_chip_data (d); +u32 event =its_get_event_id (d); -if (!irqd_is_forwarded_to_vcpu (d)) -return NULL ; +return dev_event_to_vlpi_map (its_dev, event); + } -return dev_event_to_vlpi_map (its_dev, event); +return NULL ; }static void lpi_write_config (struct irq_data *d,u8 clr,u8 set)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 80/399 s390/pci: Fix possible deadlock in recover_store()
In reply to Greg Kroah-HartmanFrom: Niklas Schnelle <[email protected]>
[ Upstream commit 576c75e36c689bec6a940e807bae27291ab0c0de ]
With zpci_disable() working, lockdep detected a potential deadlock (lockdep output at the end).
The deadlock is between recovering a PCI function via the
/sys/bus/pci/devices/<dev>/recover
attribute vs powering it off via
/sys/bus/pci/slots/<slot>/power.
The fix is analogous to the changes in commit 0ee223b2e1f6 ("scsi: core:
Avoid that SCSI device removal through sysfs triggers a deadlock") that fixed a potential deadlock on removing a SCSI device via sysfs.
[ 204.830107] ======================================================
[ 204.830109] WARNING: possible circular locking dependency detected
[ 204.830111] 5.5.0-rc2-06072-gbc03ecc9a672 #6 Tainted: G W
[ 204.830112] ------------------------------------------------------
[ 204.830113] bash/1034 is trying to acquire lock:
[ 204.830115] 0000000192a1a610 (kn->count#200){++++}, at: kernfs_remove_by_name_ns+0x5c/0xa8
[ 204.830122]
but task is already holding lock:
[ 204.830123] 00000000c16134a8 (pci_rescan_remove_lock){+.+.}, at: pci_stop_and_remove_bus_device_locked+0x26/0x48
[ 204.830128]
which lock already depends on the new lock.[ 204.830129]
the existing dependency chain (in reverse order) is:
[ 204.830130]
-> #1 (pci_rescan_remove_lock){+.+.}:
[ 204.830134] validate_chain+0x93a/0xd08
[ 204.830136] __lock_acquire+0x4ae/0x9d0
[ 204.830137] lock_acquire+0x114/0x280
[ 204.830140] __mutex_lock+0xa2/0x960
[ 204.830142] mutex_lock_nested+0x32/0x40
[ 204.830145] recover_store+0x4c/0xa8
[ 204.830147] kernfs_fop_write+0xe6/0x218
[ 204.830151] vfs_write+0xb0/0x1b8
[ 204.830152] ksys_write+0x6c/0xf8
[ 204.830154] system_call+0xd8/0x2d8
[ 204.830155]
-> #0 (kn->count#200){++++}:
[ 204.830187] check_noncircular+0x1e6/0x240
[ 204.830189] check_prev_add+0xfc/0xdb0
[ 204.830190] validate_chain+0x93a/0xd08
[ 204.830192] __lock_acquire+0x4ae/0x9d0
[ 204.830193] lock_acquire+0x114/0x280
[ 204.830194] __kernfs_remove.part.0+0x2e4/0x360
[ 204.830196] kernfs_remove_by_name_ns+0x5c/0xa8
[ 204.830198] remove_files.isra.0+0x4c/0x98
[ 204.830199] sysfs_remove_group+0x66/0xc8
[ 204.830201] sysfs_remove_groups+0x46/0x68
[ 204.830204] device_remove_attrs+0x52/0x90
[ 204.830207] device_del+0x182/0x418
[ 204.830208] pci_remove_bus_device+0x8a/0x130
[ 204.830210] pci_stop_and_remove_bus_device_locked+0x3a/0x48
[ 204.830212] disable_slot+0x68/0x100
[ 204.830213] power_write_file+0x7c/0x130
[ 204.830215] kernfs_fop_write+0xe6/0x218
[ 204.830217] vfs_write+0xb0/0x1b8
[ 204.830218] ksys_write+0x6c/0xf8
[ 204.830220] system_call+0xd8/0x2d8
[ 204.830221]
other info that might help us debug this:[ 204.830223] Possible unsafe locking scenario:
[ 204.830224] CPU0 CPU1
[ 204.830225] ---- ----
[ 204.830226] lock(pci_rescan_remove_lock);
[ 204.830227] lock(kn->count#200);
[ 204.830229] lock(pci_rescan_remove_lock);
[ 204.830231] lock(kn->count#200);
[ 204.830233]
*** DEADLOCK ***[ 204.830234] 4 locks held by bash/1034:
[ 204.830235] #0: 00000001b6fbc498 (sb_writers#4){.+.+}, at: vfs_write+0x158/0x1b8
[ 204.830239] #1: 000000018c9f5090 (&of->mutex){+.+.}, at: kernfs_fop_write+0xaa/0x218
[ 204.830242] #2: 00000001f7da0810 (kn->count#235){.+.+}, at: kernfs_fop_write+0xb6/0x218
[ 204.830245] #3: 00000000c16134a8 (pci_rescan_remove_lock){+.+.}, at: pci_stop_and_remove_bus_device_locked+0x26/0x48
[ 204.830248]
stack backtrace:
[ 204.830250] CPU: 2 PID: 1034 Comm: bash Tainted: G W 5.5.0-rc2-06072-gbc03ecc9a672 #6
[ 204.830252] Hardware name: IBM 8561 T01 703 (LPAR)
[ 204.830253] Call Trace:
[ 204.830257] [<00000000c05e10c0>] show_stack+0x88/0xf0
[ 204.830260] [<00000000c112dca4>] dump_stack+0xa4/0xe0
[ 204.830261] [<00000000c0694c06>] check_noncircular+0x1e6/0x240
[ 204.830263] [<00000000c0695bec>] check_prev_add+0xfc/0xdb0
[ 204.830264] [<00000000c06971da>] validate_chain+0x93a/0xd08
[ 204.830266] [<00000000c06994c6>] __lock_acquire+0x4ae/0x9d0
[ 204.830267] [<00000000c069867c>] lock_acquire+0x114/0x280
[ 204.830269] [<00000000c09ca15c>] __kernfs_remove.part.0+0x2e4/0x360
[ 204.830270] [<00000000c09cb5c4>] kernfs_remove_by_name_ns+0x5c/0xa8
[ 204.830272] [<00000000c09cee14>] remove_files.isra.0+0x4c/0x98
[ 204.830274] [<00000000c09cf2ae>] sysfs_remove_group+0x66/0xc8
[ 204.830276] [<00000000c09cf356>] sysfs_remove_groups+0x46/0x68
[ 204.830278] [<00000000c0e3dfe2>] device_remove_attrs+0x52/0x90
[ 204.830280] [<00000000c0e40382>] device_del+0x182/0x418
[ 204.830281] [<00000000c0dcfd7a>] pci_remove_bus_device+0x8a/0x130
[ 204.830283] [<00000000c0dcfe92>] pci_stop_and_remove_bus_device_locked+0x3a/0x48
[ 204.830285] [<00000000c0de7190>] disable_slot+0x68/0x100
[ 204.830286] [<00000000c0de6514>] power_write_file+0x7c/0x130
[ 204.830288] [<00000000c09cc846>] kernfs_fop_write+0xe6/0x218
[ 204.830290] [<00000000c08f3480>] vfs_write+0xb0/0x1b8
[ 204.830291] [<00000000c08f378c>] ksys_write+0x6c/0xf8
[ 204.830293] [<00000000c1154374>] system_call+0xd8/0x2d8
[ 204.830294] INFO: lockdep is turned off.--- arch/s390/pci/pci_sysfs.c | 63 ++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 21 deletions(-)
arch/s390/pci/pci_sysfs.c +42 -21
@@ -13,6 +13,8 @@#include <linux/stat.h> #include <linux/pci.h> +#include "../../../drivers/pci/pci.h" +#include <asm/sclp.h> #define zpci_attr (name, fmt, member) \
@@ -49,31 +51,50 @@ static DEVICE_ATTR_RO(mio_enabled);static ssize_t recover_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { +struct kernfs_node *kn;struct pci_dev *pdev =to_pci_dev (dev);struct zpci_dev *zdev =to_zpci (pdev); -int ret; - -if (!device_remove_file_self (dev, attr)) -return count; - +int ret =0 ; + +/* Can't use device_remove_self() here as that would lead us to lock +* the pci_rescan_remove_lock while holding the device' kernfs lock. +* This would create a possible deadlock with disable_slot() which is +* not directly protected by the device' kernfs lock but takes it +* during the device removal which happens under +* pci_rescan_remove_lock. +* +* This is analogous to sdev_store_delete() in +* drivers/scsi/scsi_sysfs.c +*/ + kn =sysfs_break_active_protection (&dev->kobj, &attr->attr); +WARN_ON_ONCE (!kn); +/* device_remove_file() serializes concurrent calls ignoring all but +* the first +*/ +device_remove_file (dev, attr); + +/* A concurrent call to recover_store() may slip between +* sysfs_break_active_protection() and the sysfs file removal. +* Once it unblocks from pci_lock_rescan_remove() the original pdev +* will already be removed. +*/ pci_lock_rescan_remove (); -pci_stop_and_remove_bus_device (pdev); - ret =zpci_disable_device (zdev); -if (ret) - goto error; - - ret =zpci_enable_device (zdev); -if (ret) - goto error; - -pci_rescan_bus (zdev->bus); +if (pci_dev_is_added (pdev)) { +pci_stop_and_remove_bus_device (pdev); + ret =zpci_disable_device (zdev); +if (ret) + goto out; + + ret =zpci_enable_device (zdev); +if (ret) + goto out; +pci_rescan_bus (zdev->bus); + } +out:pci_unlock_rescan_remove (); - -return count; - -error: -pci_unlock_rescan_remove (); -return ret; +if (kn) +sysfs_unbreak_active_protection (kn); +return ret ? ret : count; }static DEVICE_ATTR_WO (recover);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 81/399 backlight: qcom-wled: Fix unsigned comparison to zero
In reply to Greg Kroah-HartmanFrom: Chen Zhou <[email protected]>
[ Upstream commit 7af43a76695db71a57203793fb9dd3c81a5783b1 ]
Fixes coccicheck warning:
./drivers/video/backlight/qcom-wled.c:1104:5-15:
WARNING: Unsigned expression compared with zero: string_len > 0
The unsigned variable string_len is assigned a return value from the call to of_property_count_elems_of_size(), which may return negative error code.
--- drivers/video/backlight/qcom-wled.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/backlight/qcom-wled.c +2 -2
@@ -956,8 +956,8 @@ static int wled_configure(struct wled *wled, int version)struct wled_config *cfg = &wled->cfg;struct device *dev = wled->dev;const __be32 *prop_addr; -u32 size, val, c, string_len; -int rc, i, j; +u32 size, val, c; +int rc, i, j, string_len;const struct wled_u32_opts *u32_opts =NULL ;const struct wled_u32_opts wled3_opts[] = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 82/399 powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov()
In reply to Greg Kroah-HartmanFrom: Oliver O'Halloran <[email protected]>
[ Upstream commit 965c94f309be58fbcc6c8d3e4f123376c5970d79 ]
An ioda_pe for each VF is allocated in pnv_pci_sriov_enable() before the pci_dev for the VF is created. We need to set the pe->pdev pointer at some point after the pci_dev is created. Currently we do that in:
pcibios_bus_add_device()
pnv_pci_dma_dev_setup() (via phb->ops.dma_dev_setup) /* fixup is done here */ pnv_pci_ioda_dma_dev_setup() (via pnv_phb->dma_dev_setup)
The fixup needs to be done before setting up DMA for for the VF's PE, but there's no real reason to delay it until this point. Move the fixup into pnv_pci_ioda_fixup_iov() so the ordering is:
pcibios_add_device() pnv_pci_ioda_fixup_iov() (via ppc_md.pcibios_fixup_sriov) pcibios_bus_add_device() ...
This isn't strictly required, but it's a slightly more logical place to do the fixup and it simplifies pnv_pci_dma_dev_setup().
--- arch/powerpc/platforms/powernv/pci-ioda.c | 29 +++++++++++++++++++---- arch/powerpc/platforms/powernv/pci.c | 14 ----------- 2 files changed, 25 insertions(+), 18 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +25 -4
@@ -2900,9 +2900,6 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev)struct pci_dn *pdn;int mul, total_vfs; -if (!pdev->is_physfn ||pci_dev_is_added (pdev)) -return ; - pdn =pci_get_pdn (pdev); pdn->vfs_expanded =0 ; pdn->m64_single_mode = false;
@@ -2977,6 +2974,30 @@ truncate_iov: res->end = res->start - 1; } } + +static void pnv_pci_ioda_fixup_iov (struct pci_dev *pdev) +{ +if (WARN_ON (pci_dev_is_added (pdev))) +return ; + +if (pdev->is_virtfn) { +struct pnv_ioda_pe *pe =pnv_ioda_get_pe (pdev); + +/* +* VF PEs are single-device PEs so their pdev pointer needs to +* be set. The pdev doesn't exist when the PE is allocated (in +* (pcibios_sriov_enable()) so we fix it up here. +*/ + pe->pdev = pdev; +WARN_ON (!(pe->flags &PNV_IODA_PE_VF )); + }else if (pdev->is_physfn) { +/* +* For PFs adjust their allocated IOV resources to match what +* the PHB can support using it's M64 BAR table. +*/ +pnv_pci_ioda_fixup_iov_resources (pdev); + } +}#endif /* CONFIG_PCI_IOV */ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe,
@@ -3873,7 +3894,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, ppc_md.pcibios_default_alignment = pnv_pci_default_alignment;#ifdef CONFIG_PCI_IOV - ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources; + ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov; ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment; ppc_md.pcibios_sriov_enable = pnv_pcibios_sriov_enable; ppc_md.pcibios_sriov_disable = pnv_pcibios_sriov_disable;
arch/powerpc/platforms/powernv/pci.c +0 -14
@@ -814,20 +814,6 @@ void pnv_pci_dma_dev_setup(struct pci_dev *pdev) {struct pci_controller *hose =pci_bus_to_host (pdev->bus);struct pnv_phb *phb = hose->private_data; -#ifdef CONFIG_PCI_IOV -struct pnv_ioda_pe *pe; - -/* Fix the VF pdn PE number */ -if (pdev->is_virtfn) { -list_for_each_entry (pe, &phb->ioda.pe_list, list) { -if (pe->rid == ((pdev->bus->number <<8 ) | - (pdev->devfn &0xff ))) { - pe->pdev = pdev; -break ; - } - } - } -#endif /* CONFIG_PCI_IOV */ if (phb && phb->dma_dev_setup) phb->dma_dev_setup (phb, pdev);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 83/399 tracing: Fix tracing_stat return values in error handling paths
In reply to Greg Kroah-HartmanFrom: Luis Henriques <[email protected]>
[ Upstream commit afccc00f75bbbee4e4ae833a96c2d29a7259c693 ]
tracing_stat_init() was always returning '0', even on the error paths. It now returns -ENODEV if tracing_init_dentry() fails or -ENOMEM if it fails to created the 'trace_stat' debugfs directory.
--- kernel/trace/trace_stat.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
kernel/trace/trace_stat.c +8 -4
@@ -280,18 +280,22 @@ static int tracing_stat_init(void) d_tracing =tracing_init_dentry ();if (IS_ERR (d_tracing)) -return 0 ; +return -ENODEV ; stat_dir =tracefs_create_dir ("trace_stat" , d_tracing); -if (!stat_dir) +if (!stat_dir) {pr_warn ("Could not create tracefs 'trace_stat' entry\n" ); +return -ENOMEM ; + }return 0 ; }static int init_stat_file (struct stat_session *session) { -if (!stat_dir &&tracing_stat_init ()) -return -ENODEV ; +int ret; + +if (!stat_dir && (ret =tracing_stat_init ())) +return ret; session->file = tracefs_create_file(session->ts->name, 0644, stat_dir,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 84/399 tracing: Fix very unlikely race of registering two stat tracers
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
[ Upstream commit dfb6cd1e654315168e36d947471bd2a0ccd834ae ]
Looking through old emails in my INBOX, I came across a patch from Luis Henriques that attempted to fix a race of two stat tracers registering the same stat trace (extremely unlikely, as this is done in the kernel, and probably doesn't even exist). The submitted patch wasn't quite right as it needed to deal with clean up a bit better (if two stat tracers were the same, it would have the same files).
But to make the code cleaner, all we needed to do is to keep the all_stat_sessions_mutex held for most of the registering function.
--- kernel/trace/trace_stat.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
kernel/trace/trace_stat.c +9 -10
@@ -308,7 +308,7 @@ static int init_stat_file(struct stat_session *session)int register_stat_tracer (struct tracer_stat *trace) {struct stat_session *session, *node; -int ret; +int ret = -EINVAL ;if (!trace)return -EINVAL ;
@@ -319,17 +319,15 @@ int register_stat_tracer(struct tracer_stat *trace)/* Already registered? */ mutex_lock (&all_stat_sessions_mutex);list_for_each_entry (node, &all_stat_sessions, session_list) { -if (node->ts == trace) { -mutex_unlock (&all_stat_sessions_mutex); -return -EINVAL ; - } +if (node->ts == trace) + goto out; } -mutex_unlock (&all_stat_sessions_mutex); + ret = -ENOMEM ;/* Init the session */ session =kzalloc (sizeof (*session),GFP_KERNEL );if (!session) -return -ENOMEM ; + goto out; session->ts = trace;INIT_LIST_HEAD (&session->session_list);
@@ -338,15 +336,16 @@ int register_stat_tracer(struct tracer_stat *trace) ret =init_stat_file (session);if (ret) {destroy_session (session); -return ret; + goto out; } + ret =0 ;/* Register */ -mutex_lock (&all_stat_sessions_mutex);list_add_tail (&session->session_list, &all_stat_sessions); + out:mutex_unlock (&all_stat_sessions_mutex); -return 0 ; +return ret; }void unregister_stat_tracer (struct tracer_stat *trace)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 85/399 ARM: 8952/1: Disable kmemleak on XIP kernels
In reply to Greg Kroah-HartmanFrom: Vincenzo Frascino <[email protected]>
[ Upstream commit bc420c6ceefbb86cbbc8c00061bd779c17fa6997 ]
Kmemleak relies on specific symbols to register the read only data during init (e.g. __start_ro_after_init).
Trying to build an XIP kernel on arm results in the linking error reported below because when this option is selected read only data after init are not allowed since .data is read only (.rodata).
arm-linux-gnueabihf-ld: mm/kmemleak.o: in function `kmemleak_init':
kmemleak.c:(.init.text+0x148): undefined reference to `__end_ro_after_init'
arm-linux-gnueabihf-ld: kmemleak.c:(.init.text+0x14c):
undefined reference to `__end_ro_after_init'
arm-linux-gnueabihf-ld: kmemleak.c:(.init.text+0x150):
undefined reference to `__start_ro_after_init'
arm-linux-gnueabihf-ld: kmemleak.c:(.init.text+0x156):
undefined reference to `__start_ro_after_init'
arm-linux-gnueabihf-ld: kmemleak.c:(.init.text+0x162):
undefined reference to `__start_ro_after_init'
arm-linux-gnueabihf-ld: kmemleak.c:(.init.text+0x16a):
undefined reference to `__start_ro_after_init'
linux/Makefile:1078: recipe for target 'vmlinux' failed
Fix the issue enabling kmemleak only on non XIP kernels.
--- arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -74,7 +74,7 @@ config ARM select HAVE_CONTEXT_TRACKING select HAVE_COPY_THREAD_TLS select HAVE_C_RECORDMCOUNT - select HAVE_DEBUG_KMEMLEAK + select HAVE_DEBUG_KMEMLEAK if !XIP_KERNEL select HAVE_DMA_CONTIGUOUS if MMU select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 86/399 ext4, jbd2: ensure panic when aborting with zero errno
In reply to Greg Kroah-HartmanFrom: zhangyi (F) <[email protected]>
[ Upstream commit 51f57b01e4a3c7d7bdceffd84de35144e8c538e7 ]
JBD2_REC_ERR flag used to indicate the errno has been updated when jbd2 aborted, and then __ext4_abort() and ext4_handle_error() can invoke panic if ERRORS_PANIC is specified. But if the journal has been aborted with zero errno, jbd2_journal_abort() didn't set this flag so we can no longer panic. Fix this by always record the proper errno in the journal superblock.
--- fs/jbd2/checkpoint.c | 2 +- fs/jbd2/journal.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-)
fs/jbd2/checkpoint.c +1 -1
@@ -164,7 +164,7 @@ void __jbd2_log_wait_for_space(journal_t *journal)"journal space in %s\n" , __func__, journal->j_devname);WARN_ON (1 ); -jbd2_journal_abort (journal,0 ); +jbd2_journal_abort (journal, -EIO ); }write_lock (&journal->j_state_lock); }else {
fs/jbd2/journal.c +4 -11
@@ -2156,12 +2156,10 @@ static void __journal_abort_soft (journal_t *journal, int errno)__jbd2_journal_abort_hard (journal); -if (errno) { -jbd2_journal_update_sb_errno (journal); -write_lock (&journal->j_state_lock); - journal->j_flags |=JBD2_REC_ERR ; -write_unlock (&journal->j_state_lock); - } +jbd2_journal_update_sb_errno (journal); +write_lock (&journal->j_state_lock); + journal->j_flags |=JBD2_REC_ERR ; +write_unlock (&journal->j_state_lock); }/**
@@ -2203,11 +2201,6 @@ static void __journal_abort_soft (journal_t *journal, int errno)* failure to disk. ext3_error, for example, now uses this * functionality. * -* Errors which originate from within the journaling layer will NOT -* supply an errno; a null errno implies that absolutely no further -* writes are done to the journal (unless there are any already in -* progress). -* */ void jbd2_journal_abort (journal_t *journal,int errno)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 87/399 ath10k: Correct the DMA direction for management tx buffers
In reply to Greg Kroah-HartmanFrom: Rakesh Pillai <[email protected]>
[ Upstream commit 6ba8b3b6bd772f575f7736c8fd893c6981fcce16 ]
The management packets, send to firmware via WMI, are mapped using the direction DMA_TO_DEVICE. Currently in case of wmi cleanup, these buffers are being unmapped using an incorrect DMA direction. This can cause unwanted behavior when the host driver is handling a restart of the wlan firmware.
We might see a trace like below
[<ffffff8008098b18>] __dma_inv_area+0x28/0x58 [<ffffff8001176734>] ath10k_wmi_mgmt_tx_clean_up_pending+0x60/0xb0 [ath10k_core] [<ffffff80088c7c50>] idr_for_each+0x78/0xe4 [<ffffff80011766a4>] ath10k_wmi_detach+0x4c/0x7c [ath10k_core] [<ffffff8001163d7c>] ath10k_core_stop+0x58/0x68 [ath10k_core] [<ffffff800114fb74>] ath10k_halt+0xec/0x13c [ath10k_core] [<ffffff8001165110>] ath10k_core_restart+0x11c/0x1a8 [ath10k_core] [<ffffff80080c36bc>] process_one_work+0x16c/0x31c
Fix the incorrect DMA direction during the wmi
management tx buffer cleanup.
Tested HW: WCN3990
Tested FW: WLAN.HL.3.1-00784-QCAHLSWMTPLZ-1
--- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.c +1 -1
@@ -9476,7 +9476,7 @@ static int ath10k_wmi_mgmt_tx_clean_up_pending(int msdu_id, void *ptr, msdu = pkt_addr->vaddr;dma_unmap_single (ar->dev, pkt_addr->paddr, - msdu->len,DMA_FROM_DEVICE ); + msdu->len,DMA_TO_DEVICE );ieee80211_free_txskb (ar->hw, msdu);return 0 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 88/399 rtw88: fix rate mask for 1SS chip
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
[ Upstream commit 35a68fa5f96a80797e11b6952a47c5a84939a7bf ]
The rate mask is used to tell firmware the supported rate depends on negotiation. We loop 2 times for all VHT/HT 2SS rate mask first, and then only keep the part according to chip's NSS.
This commit fixes the logic error of '&' operations for VHT/HT rate, and we should run this logic before adding legacy rate.
To access HT MCS map, index 0/1 represent MCS 0-7/8-15 respectively. Use NL80211_BAND_xxx is incorrect, so fix it as well.
--- drivers/net/wireless/realtek/rtw88/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/wireless/realtek/rtw88/main.c +5 -7
@@ -706,8 +706,8 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si)if (sta->vht_cap.cap &IEEE80211_VHT_CAP_SHORT_GI_80 ) is_support_sgi = true; }else if (sta->ht_cap.ht_supported) { - ra_mask |= (sta->ht_cap.mcs.rx_mask[NL80211_BAND_5GHZ ] <<20 ) | - (sta->ht_cap.mcs.rx_mask[NL80211_BAND_2GHZ ] <<12 ); + ra_mask |= (sta->ht_cap.mcs.rx_mask[1 ] <<20 ) | + (sta->ht_cap.mcs.rx_mask[0 ] <<12 );if (sta->ht_cap.cap &IEEE80211_HT_CAP_RX_STBC ) stbc_en =HT_STBC_EN ;if (sta->ht_cap.cap &IEEE80211_HT_CAP_LDPC_CODING )
@@ -717,6 +717,9 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) is_support_sgi = true; } +if (efuse->hw_cap.nss ==1 ) + ra_mask &=RA_MASK_VHT_RATES_1SS |RA_MASK_HT_RATES_1SS ; +if (hal->current_band_type ==RTW_BAND_5G ) { ra_mask |= (u64 )sta->supp_rates[NL80211_BAND_5GHZ ] <<4 ;if (sta->vht_cap.vht_supported) {
@@ -750,11 +753,6 @@ void rtw_update_sta_info(struct rtw_dev *rtwdev, struct rtw_sta_info *si) wireless_set =0 ; } -if (efuse->hw_cap.nss ==1 ) { - ra_mask &=RA_MASK_VHT_RATES_1SS ; - ra_mask &=RA_MASK_HT_RATES_1SS ; - } -switch (sta->bandwidth) {case IEEE80211_STA_RX_BW_80 : bw_mode =RTW_CHANNEL_WIDTH_80 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 89/399 brcmfmac: sdio: Fix OOB interrupt initialization on brcm43362
In reply to Greg Kroah-HartmanFrom: Jean-Philippe Brucker <[email protected]>
[ Upstream commit 8c8e60fb86a90a30721bbd797f58f96b3980dcc1 ]
Commit 262f2b53f679 ("brcmfmac: call brcmf_attach() just before calling brcmf_bus_started()") changed the initialization order of the brcmfmac SDIO driver. Unfortunately since brcmf_sdiod_intr_register() is now called before the sdiodev->bus_if initialization, it reads the wrong chip ID and fails to initialize the GPIO on brcm43362. Thus the chip cannot send interrupts and fails to probe:
[ 12.517023] brcmfmac: brcmf_sdio_bus_rxctl: resumed on timeout [ 12.531214] ieee80211 phy0: brcmf_bus_started: failed: -110 [ 12.536976] ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 [ 12.566467] brcmfmac: brcmf_sdio_firmware_callback: brcmf_attach failed
Initialize the bus interface earlier to ensure that brcmf_sdiod_intr_register() properly sets up the OOB interrupt.
--- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +6 -6
@@ -4226,6 +4226,12 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, }if (err ==0 ) { +/* Assign bus interface call back */ + sdiod->bus_if->dev = sdiod->dev; + sdiod->bus_if->ops = &brcmf_sdio_bus_ops; + sdiod->bus_if->chip = bus->ci->chip; + sdiod->bus_if->chiprev = bus->ci->chiprev; +/* Allow full data communication using DPC from now on. */ brcmf_sdiod_change_state (bus->sdiodev,BRCMF_SDIOD_DATA );
@@ -4242,12 +4248,6 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,sdio_release_host (sdiod->func1); -/* Assign bus interface call back */ - sdiod->bus_if->dev = sdiod->dev; - sdiod->bus_if->ops = &brcmf_sdio_bus_ops; - sdiod->bus_if->chip = bus->ci->chip; - sdiod->bus_if->chiprev = bus->ci->chiprev; - err =brcmf_alloc (sdiod->dev, sdiod->settings);if (err) {brcmf_err ("brcmf_alloc failed\n" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 90/399 selftests: settings: tests can be in subsubdirs
In reply to Greg Kroah-HartmanFrom: Matthieu Baerts <[email protected]>
[ Upstream commit ac87813d4372f4c005264acbe3b7f00c1dee37c4 ]
Commit 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test") adds support for a new per-test-directory "settings" file. But this only works for tests not in a sub-subdirectories, e.g.
- tools/testing/selftests/rtc (rtc) is OK,
- tools/testing/selftests/net/mptcp (net/mptcp) is not.
We have to increase the timeout for net/mptcp tests which are not upstreamed yet but this fix is valid for other tests if they need to add a "settings" file, see the full list with:
tools/testing/selftests/*/*/**/Makefile
Note that this patch changes the text header message printed at the end of the execution but this text is modified only for the tests that are in sub-subdirectories, e.g.
ok 1 selftests: net/mptcp: mptcp_connect.sh
Before we had:
ok 1 selftests: mptcp: mptcp_connect.sh
But showing the full target name is probably better, just in case a subsubdir has the same name as another one in another subdirectory.
--- tools/testing/selftests/kselftest/runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kselftest/runner.sh +1 -1
@@ -91,7 +91,7 @@ run_one() run_many() { echo "TAP version 13" - DIR=$(basename "$PWD") + DIR="${PWD#${BASE_DIR}/}" test_num=0 total=$(echo "$@" | wc -w) echo "1..$total"
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 91/399 rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 34719de919af07682861cb0fa2bcf64da33ecf44 ]
Merely enabling I2C and RTC selects REGMAP_I2C and REGMAP_SPI, even when no driver needs it. While the former can be moduler, the latter cannot, and thus becomes built-in.
Fix this by moving the select statements for REGMAP_I2C and REGMAP_SPI from the RTC_I2C_AND_SPI helper to the individual drivers that depend on it.
Note that the comment for RTC_I2C_AND_SPI refers to SND_SOC_I2C_AND_SPI for more information, but the latter does not select REGMAP_{I2C,SPI} itself, and defers that to the individual drivers, too.
--- drivers/rtc/Kconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/rtc/Kconfig +6 -2
@@ -848,14 +848,14 @@ config RTC_I2C_AND_SPI default m if I2C=m default y if I2C=y default y if SPI_MASTER=y - select REGMAP_I2C if I2C - select REGMAP_SPI if SPI_MASTER comment "SPI and I2C RTC drivers" config RTC_DRV_DS3232 tristate "Dallas/Maxim DS3232/DS3234" depends on RTC_I2C_AND_SPI + select REGMAP_I2C if I2C + select REGMAP_SPI if SPI_MASTER help If you say yes here you get support for Dallas Semiconductor DS3232 and DS3234 real-time clock chips. If an interrupt is associated
@@ -875,6 +875,8 @@ config RTC_DRV_DS3232_HWMON config RTC_DRV_PCF2127 tristate "NXP PCF2127" depends on RTC_I2C_AND_SPI + select REGMAP_I2C if I2C + select REGMAP_SPI if SPI_MASTER select WATCHDOG_CORE if WATCHDOG help If you say yes here you get support for the NXP PCF2127/29 RTC
@@ -891,6 +893,8 @@ config RTC_DRV_PCF2127 config RTC_DRV_RV3029C2 tristate "Micro Crystal RV3029/3049" depends on RTC_I2C_AND_SPI + select REGMAP_I2C if I2C + select REGMAP_SPI if SPI_MASTER help If you say yes here you get support for the Micro Crystal RV3029 and RV3049 RTC chips.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 92/399 drm/amd/display: Retrain dongles when SINK_COUNT becomes non-zero
In reply to Greg Kroah-HartmanFrom: Harry Wentland <[email protected]>
[ Upstream commit 3eb6d7aca53d81ce888624f09cd44dc0302161e8 ]
[WHY]
Two years ago the patch referenced by the Fixes tag stopped running dp_verify_link_cap_with_retries during DP detection when the reason for the detection was a short-pulse interrupt. This effectively meant that we were no longer doing the verify_link_cap training on active dongles when their SINK_COUNT changed from 0 to 1.
A year ago this was partly remedied with:
commit 80adaebd2d41 ("drm/amd/display: Don't skip link training for empty dongle")
This made sure that we trained the dongle on initial hotplug (without connected downstream devices).
This is all fine and dandy if it weren't for the fact that there are some dongles on the market that don't like link training when SINK_COUNT is 0 These dongles will in fact indicate a SINK_COUNT of 0 immediately after hotplug, even when a downstream device is connected, and then trigger a shortpulse interrupt indicating a SINK_COUNT change to 1.
In order to play nicely we will need our policy to not link train an active DP dongle when SINK_COUNT is 0 but ensure we train it when the SINK_COUNT changes to 1.
[HOW]
Call dp_verify_link_cap_with_retries on detection even when the detection is triggered from a short pulse interrupt.
With this change we can also revert this commit which we'll do in a separate follow-up change:
commit 80adaebd2d41 ("drm/amd/display: Don't skip link training for empty dongle")
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -2
@@ -968,8 +968,7 @@ static bool dc_link_detect_helper(struct dc_link *link, same_edid =is_same_edid (&prev_sink->dc_edid, &sink->dc_edid);if (link->connector_signal ==SIGNAL_TYPE_DISPLAY_PORT && - sink_caps.transaction_type ==DDC_TRANSACTION_TYPE_I2C_OVER_AUX && - reason !=DETECT_REASON_HPDRX ) { + sink_caps.transaction_type ==DDC_TRANSACTION_TYPE_I2C_OVER_AUX ) {/* * TODO debug why Dell 2413 doesn't like * two link trainings
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 93/399 tracing: Simplify assignment parsing for hist triggers
In reply to Greg Kroah-HartmanFrom: Tom Zanussi <[email protected]>
[ Upstream commit b527b638fd63ba791dc90a0a6e9a3035b10df52b ]
In the process of adding better error messages for sorting, I realized that strsep was being used incorrectly and some of the error paths I was expecting to be hit weren't and just fell through to the common invalid key error case.
It also became obvious that for keyword assignments, it wasn't necessary to save the full assignment and reparse it later, and having a common empty-assignment check would also make more sense in terms of error processing.
Change the code to fix these problems and simplify it for new error message changes in a subsequent patch.
--- kernel/trace/trace_events_hist.c | 70 ++++++++++++-------------------- 1 file changed, 27 insertions(+), 43 deletions(-)
kernel/trace/trace_events_hist.c +27 -43
@@ -2035,12 +2035,6 @@ static int parse_map_size(char *str)unsigned long size, map_bits;int ret; -strsep (&str,"=" ); -if (!str) { - ret = -EINVAL ; - goto out; - } - ret =kstrtoul (str,0 , &size);if (ret) goto out;
@@ -2100,25 +2094,25 @@ static int parse_action(char *str, struct hist_trigger_attrs *attrs)static int parse_assignment (struct trace_array *tr,char *str,struct hist_trigger_attrs *attrs) { -int ret =0 ; +int len, ret =0 ; -if ((str_has_prefix (str,"key=" )) || - (str_has_prefix (str,"keys=" ))) { - attrs->keys_str =kstrdup (str,GFP_KERNEL ); +if ((len =str_has_prefix (str,"key=" )) || + (len =str_has_prefix (str,"keys=" ))) { + attrs->keys_str =kstrdup (str + len,GFP_KERNEL );if (!attrs->keys_str) { ret = -ENOMEM ; goto out; } - }else if ((str_has_prefix (str,"val=" )) || - (str_has_prefix (str,"vals=" )) || - (str_has_prefix (str,"values=" ))) { - attrs->vals_str =kstrdup (str,GFP_KERNEL ); + }else if ((len =str_has_prefix (str,"val=" )) || + (len =str_has_prefix (str,"vals=" )) || + (len =str_has_prefix (str,"values=" ))) { + attrs->vals_str =kstrdup (str + len,GFP_KERNEL );if (!attrs->vals_str) { ret = -ENOMEM ; goto out; } - }else if (str_has_prefix (str,"sort=" )) { - attrs->sort_key_str =kstrdup (str,GFP_KERNEL ); + }else if ((len =str_has_prefix (str,"sort=" ))) { + attrs->sort_key_str =kstrdup (str + len,GFP_KERNEL );if (!attrs->sort_key_str) { ret = -ENOMEM ; goto out;
@@ -2129,12 +2123,8 @@ static int parse_assignment(struct trace_array *tr, ret = -ENOMEM ; goto out; } - }else if (str_has_prefix (str,"clock=" )) { -strsep (&str,"=" ); -if (!str) { - ret = -EINVAL ; - goto out; - } + }else if ((len =str_has_prefix (str,"clock=" ))) { + str += len; str =strstrip (str); attrs->clock =kstrdup (str,GFP_KERNEL );
@@ -2142,8 +2132,8 @@ static int parse_assignment(struct trace_array *tr, ret = -ENOMEM ; goto out; } - }else if (str_has_prefix (str,"size=" )) { -int map_bits =parse_map_size (str); + }else if ((len =str_has_prefix (str,"size=" ))) { +int map_bits =parse_map_size (str + len);if (map_bits <0 ) { ret = map_bits;
@@ -2183,8 +2173,14 @@ parse_hist_trigger_attrs(struct trace_array *tr, char *trigger_str)while (trigger_str) {char *str =strsep (&trigger_str,":" ); +char *rhs; -if (strchr (str,'=' )) { + rhs =strchr (str,'=' ); +if (rhs) { +if (!strlen (++rhs)) { + ret = -EINVAL ; + goto free; + } ret =parse_assignment (tr, str, attrs);if (ret) goto free;
@@ -4536,10 +4532,6 @@ static int create_val_fields(struct hist_trigger_data *hist_data,if (!fields_str) goto out; -strsep (&fields_str,"=" ); -if (!fields_str) - goto out; -for (i =0 , j =1 ; i <TRACING_MAP_VALS_MAX && j <TRACING_MAP_VALS_MAX ; i++) { field_str =strsep (&fields_str,"," );
@@ -4634,10 +4626,6 @@ static int create_key_fields(struct hist_trigger_data *hist_data,if (!fields_str) goto out; -strsep (&fields_str,"=" ); -if (!fields_str) - goto out; -for (i = n_vals; i < n_vals +TRACING_MAP_KEYS_MAX ; i++) { field_str =strsep (&fields_str,"," );if (!field_str)
@@ -4795,12 +4783,6 @@ static int create_sort_keys(struct hist_trigger_data *hist_data)if (!fields_str) goto out; -strsep (&fields_str,"=" ); -if (!fields_str) { - ret = -EINVAL ; - goto out; - } -for (i =0 ; i <TRACING_MAP_SORT_KEYS_MAX ; i++) {struct hist_field *hist_field;char *field_str, *field_name;
@@ -4809,9 +4791,11 @@ static int create_sort_keys(struct hist_trigger_data *hist_data) sort_key = &hist_data->sort_keys[i]; field_str =strsep (&fields_str,"," ); -if (!field_str) { -if (i ==0 ) - ret = -EINVAL ; +if (!field_str) +break ; + +if (!*field_str) { + ret = -EINVAL ;break ; }
@@ -4821,7 +4805,7 @@ static int create_sort_keys(struct hist_trigger_data *hist_data) } field_name =strsep (&field_str,"." ); -if (!field_name) { +if (!field_name || !*field_name) { ret = -EINVAL ;break ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 94/399 nbd: add a flush_workqueue in nbd_start_device
In reply to Greg Kroah-HartmanFrom: Sun Ke <[email protected]>
[ Upstream commit 5c0dd228b5fc30a3b732c7ae2657e0161ec7ed80 ]
When kzalloc fail, may cause trying to destroy the workqueue from inside the workqueue.
If num_connections is m (2 < m), and NO.1 ~ NO.n (1 < n < m) kzalloc are successful. The NO.(n + 1) failed. Then, nbd_start_device will return ENOMEM to nbd_start_device_ioctl, and nbd_start_device_ioctl will return immediately without running flush_workqueue. However, we still have n recv threads. If nbd_release run first, recv threads may have to drop the last config_refs and try to destroy the workqueue from inside the workqueue.
To fix it, add a flush_workqueue in nbd_start_device.
--- drivers/block/nbd.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/block/nbd.c +10 -0
@@ -1265,6 +1265,16 @@ static int nbd_start_device(struct nbd_device *nbd) args =kzalloc (sizeof (*args),GFP_KERNEL );if (!args) {sock_shutdown (nbd); +/* +* If num_connections is m (2 < m), +* and NO.1 ~ NO.n(1 < n < m) kzallocs are successful. +* But NO.(n + 1) failed. We still have n recv threads. +* So, add flush_workqueue here to prevent recv threads +* dropping the last config_refs and trying to destroy +* the workqueue from inside the workqueue. +*/ +if (i) +flush_workqueue (nbd->recv_workq);return -ENOMEM ; }sk_set_memalloc (config->socks[i]->sock->sk);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 95/399 KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups
In reply to Greg Kroah-HartmanFrom: Christian Borntraeger <[email protected]>
[ Upstream commit c611990844c28c61ca4b35ff69d3a2ae95ccd486 ]
There is no ENOTSUPP for userspace.
--- arch/s390/kvm/interrupt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/s390/kvm/interrupt.c +3 -3
@@ -2190,7 +2190,7 @@ static int flic_ais_mode_get_all(struct kvm *kvm, struct kvm_device_attr *attr)return -EINVAL ;if (!test_kvm_facility (kvm,72 )) -return -ENOTSUPP ; +return -EOPNOTSUPP ;mutex_lock (&fi->ais_lock); ais.simm = fi->simm;
@@ -2499,7 +2499,7 @@ static int modify_ais_mode(struct kvm *kvm, struct kvm_device_attr *attr)int ret =0 ;if (!test_kvm_facility (kvm,72 )) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (copy_from_user (&req, (void __user *)attr->addr,sizeof (req)))return -EFAULT ;
@@ -2579,7 +2579,7 @@ static int flic_ais_mode_set_all(struct kvm *kvm, struct kvm_device_attr *attr)struct kvm_s390_ais_all ais;if (!test_kvm_facility (kvm,72 )) -return -ENOTSUPP ; +return -EOPNOTSUPP ;if (copy_from_user (&ais, (void __user *)attr->addr,sizeof (ais)))return -EFAULT ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 96/399 Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker
In reply to Greg Kroah-HartmanFrom: Chris Mason <[email protected]>
[ Upstream commit 25f3c5021985e885292980d04a1423fd83c967bb ]
For COW, btrfs expects pages dirty pages to have been through a few setup steps. This includes reserving space for the new block allocations and marking the range in the state tree for delayed allocation.
A few places outside btrfs will dirty pages directly, especially when unmapping mmap'd pages. In order for these to properly go through COW, we run them through a fixup worker to wait for stable pages, and do the delalloc prep.
87826df0ec36 added a window where the dirty pages were cleaned, but pending more action from the fixup worker. We clear_page_dirty_for_io() before we call into writepage, so the page is no longer dirty. The commit changed it so now we leave the page clean between unlocking it here and the fixup worker starting at some point in the future.
During this window, page migration can jump in and relocate the page. Once our fixup work actually starts, it finds page->mapping is NULL and we end up freeing the page without ever writing it.
This leads to crc errors and other exciting problems, since it screws up the whole statemachine for waiting for ordered extents. The fix here is to keep the page dirty while we're waiting for the fixup worker to get to work. This is accomplished by returning -EAGAIN from btrfs_writepage_cow_fixup if we queued the page up for fixup, which will cause the writepage function to redirty the page.
Because we now expect the page to be dirty once it gets to the fixup worker we must adjust the error cases to call clear_page_dirty_for_io() on the page. That is the bulk of the patch, but it is not the fix, the fix is the -EAGAIN from btrfs_writepage_cow_fixup. We cannot separate these two changes out because the error conditions change with the new expectations.
--- fs/btrfs/inode.c | 61 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 17 deletions(-)
fs/btrfs/inode.c +44 -17
@@ -2204,17 +2204,27 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)struct inode *inode;u64 page_start;u64 page_end; -int ret; +int ret =0 ; fixup = container_of(work, struct btrfs_writepage_fixup, work); page = fixup->page; again:lock_page (page); -if (!page->mapping || !PageDirty (page) || !PageChecked (page)) { -ClearPageChecked (page); + +/* +* Before we queued this fixup, we took a reference on the page. +* page->mapping may go NULL, but it shouldn't be moved to a different +* address space. +*/ +if (!page->mapping || !PageDirty (page) || !PageChecked (page)) goto out_page; - } +/* +* We keep the PageChecked() bit set until we're done with the +* btrfs_start_ordered_extent() dance that we do below. That drops and +* retakes the page lock, so we don't want new fixup workers queued for +* this page during the churn. +*/ inode = page->mapping->host; page_start =page_offset (page); page_end =page_offset (page) +PAGE_SIZE -1 ;
@@ -2239,24 +2249,22 @@ again: ret =btrfs_delalloc_reserve_space (inode, &data_reserved, page_start,PAGE_SIZE ); -if (ret) { -mapping_set_error (page->mapping, ret); -end_extent_writepage (page, ret, page_start, page_end); -ClearPageChecked (page); +if (ret) goto out; - } ret =btrfs_set_extent_delalloc (inode, page_start, page_end,0 , &cached_state); -if (ret) { -mapping_set_error (page->mapping, ret); -end_extent_writepage (page, ret, page_start, page_end); -ClearPageChecked (page); +if (ret) goto out_reserved; - } -ClearPageChecked (page); -set_page_dirty (page); +/* +* Everything went as planned, we're now the owner of a dirty page with +* delayed allocation bits set and space reserved for our COW +* destination. +* +* The page was dirty when we started, nothing should have cleaned it. +*/ +BUG_ON (!PageDirty (page)); out_reserved:btrfs_delalloc_release_extents (BTRFS_I (inode),PAGE_SIZE );if (ret)
@@ -2266,6 +2274,17 @@ out:unlock_extent_cached (&BTRFS_I (inode)->io_tree, page_start, page_end, &cached_state); out_page: +if (ret) { +/* +* We hit ENOSPC or other errors. Update the mapping and page +* to reflect the errors and clean the page. +*/ +mapping_set_error (page->mapping, ret); +end_extent_writepage (page, ret, page_start, page_end); +clear_page_dirty_for_io (page); +SetPageError (page); + } +ClearPageChecked (page);unlock_page (page);put_page (page);kfree (fixup);
@@ -2293,6 +2312,13 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end)if (TestClearPagePrivate2 (page))return 0 ; +/* +* PageChecked is set below when we create a fixup worker for this page, +* don't try to create another one if we're already PageChecked() +* +* The extent_io writepage code will redirty the page if we send back +* EAGAIN. +*/ if (PageChecked (page))return -EAGAIN ;
@@ -2305,7 +2331,8 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end)btrfs_init_work (&fixup->work, btrfs_writepage_fixup_worker,NULL ,NULL ); fixup->page = page;btrfs_queue_work (fs_info->fixup_workers, &fixup->work); -return -EBUSY ; + +return -EAGAIN ; } static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 97/399 drivers/block/zram/zram_drv.c: fix error return codes not being returned in writeback_store
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 3b82a051c10143639a378dcd12019f2353cc9054 ]
Currently when an error code -EIO or -ENOSPC in the for-loop of writeback_store the error code is being overwritten by a ret = len assignment at the end of the function and the error codes are being lost. Fix this by assigning ret = len at the start of the function and remove the assignment from the end, hence allowing ret to be preserved when error codes are assigned to it.
Addresses Coverity ("Unused value")
--- drivers/block/zram/zram_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/zram/zram_drv.c +1 -2
@@ -626,7 +626,7 @@ static ssize_t writeback_store(struct device *dev,struct bio bio;struct bio_vec bio_vec;struct page *page; -ssize_t ret; +ssize_t ret = len;int mode;unsigned long blk_idx =0 ;
@@ -762,7 +762,6 @@ next:if (blk_idx)free_block_bdev (zram, blk_idx); - ret = len;__free_page (page); release_init_lock:up_read (&zram->init_lock);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 98/399 block, bfq: do not plug I/O for bfq_queues with no proc refs
In reply to Greg Kroah-HartmanFrom: Paolo Valente <[email protected]>
[ Upstream commit f718b093277df582fbf8775548a4f163e664d282 ]
Commit 478de3380c1c ("block, bfq: deschedule empty bfq_queues not referred by any process") fixed commit 3726112ec731 ("block, bfq:
re-schedule empty queues if they deserve I/O plugging") by descheduling an empty bfq_queue when it remains with not process reference. Yet, this still left a case uncovered: an empty bfq_queue with not process reference that remains in service. This happens for an in-service sync bfq_queue that is deemed to deserve I/O-dispatch plugging when it remains empty. Yet no new requests will arrive for such a bfq_queue if no process sends requests to it any longer. Even worse, the bfq_queue may happen to be prematurely freed while still in service (because there may remain no reference to it any longer).
This commit solves this problem by preventing I/O dispatch from being plugged for the in-service bfq_queue, if the latter has no process reference (the bfq_queue is then prevented from remaining in service).
--- block/bfq-iosched.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
block/bfq-iosched.c +12 -0
@@ -3444,6 +3444,10 @@ static void bfq_dispatch_remove(struct request_queue *q, struct request *rq)static bool idling_needed_for_service_guarantees (struct bfq_data *bfqd,struct bfq_queue *bfqq) { +/* No point in idling for bfqq if it won't get requests any longer */ +if (unlikely (!bfqq_process_refs (bfqq))) +return false; + return (bfqq->wr_coeff > 1 && (bfqd->wr_busy_queues < bfq_tot_busy_queues(bfqd) ||
@@ -4077,6 +4081,10 @@ static bool idling_boosts_thr_without_issues(struct bfq_data *bfqd, bfqq_sequential_and_IO_bound, idling_boosts_thr; +/* No point in idling for bfqq if it won't get requests any longer */ +if (unlikely (!bfqq_process_refs (bfqq))) +return false; + bfqq_sequential_and_IO_bound = !BFQQ_SEEKY (bfqq) &&bfq_bfqq_IO_bound (bfqq) &&bfq_bfqq_has_short_ttime (bfqq);
@@ -4170,6 +4178,10 @@ static bool bfq_better_to_idle(struct bfq_queue *bfqq)struct bfq_data *bfqd = bfqq->bfqd;bool idling_boosts_thr_with_no_issue, idling_needed_for_service_guar; +/* No point in idling for bfqq if it won't get requests any longer */ +if (unlikely (!bfqq_process_refs (bfqq))) +return false; +if (unlikely (bfqd->strict_guarantees))return true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 99/399 kconfig: fix broken dependency in randconfig-generated .config
In reply to Greg Kroah-HartmanFrom: Masahiro Yamada <[email protected]>
[ Upstream commit c8fb7d7e48d11520ad24808cfce7afb7b9c9f798 ]
Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5) produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y, which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.
This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the value of CONFIG_EFI is calculated.
When this happens, the has_changed flag should be set.
Currently, it takes the result from the last iteration. It should accumulate all the results of the loop.
--- scripts/kconfig/confdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/confdata.c +1 -1
@@ -1353,7 +1353,7 @@ bool conf_set_all_new_symbols(enum conf_def_mode mode)sym_calc_value (csym);if (mode == def_random) - has_changed =randomize_choice_values (csym); + has_changed |=randomize_choice_values (csym);else {set_all_choice_values (csym); has_changed = true;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 100/399 clk: qcom: Dont overwrite cfg in clk_rcg2_dfs_populate_freq()
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 21e157c62eeded8b1558a991b4820b761d48a730 ]
The DFS frequency table logic overwrites 'cfg' while detecting the parent clk and then later on in clk_rcg2_dfs_populate_freq() we use that same variable to figure out the mode of the clk, either MND or not. Add a new variable to hold the parent clk bit so that 'cfg' is left untouched for use later.
This fixes problems in detecting the supported frequencies for any clks in DFS mode.
--- drivers/clk/qcom/clk-rcg2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/qcom/clk-rcg2.c +4 -4
@@ -952,7 +952,7 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,struct clk_rcg2 *rcg =to_clk_rcg2 (hw);struct clk_hw *p;unsigned long prate =0 ; -u32 val, mask, cfg, mode; +u32 val, mask, cfg, mode, src;int i, num_parents;regmap_read (rcg->clkr.regmap, rcg->cmd_rcgr +SE_PERF_DFSR (l), &cfg);
@@ -962,12 +962,12 @@ static void clk_rcg2_dfs_populate_freq(struct clk_hw *hw, unsigned int l,if (cfg & mask) f->pre_div = cfg & mask; - cfg &=CFG_SRC_SEL_MASK ; - cfg >>=CFG_SRC_SEL_SHIFT ; + src = cfg &CFG_SRC_SEL_MASK ; + src >>=CFG_SRC_SEL_SHIFT ; num_parents =clk_hw_get_num_parents (hw);for (i =0 ; i < num_parents; i++) { -if (cfg == rcg->parent_map[i].cfg) { +if (src == rcg->parent_map[i].cfg) { f->src = rcg->parent_map[i].src; p =clk_hw_get_parent_by_index (&rcg->clkr.hw, i); prate =clk_hw_get_rate (p);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 101/399 clk: qcom: rcg2: Dont crash if our parent cant be found; return an error
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 908b050114d8fefdddc57ec9fbc213c3690e7f5f ]
When I got my clock parenting slightly wrong I ended up with a crash that looked like this:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 ... pc : clk_hw_get_rate+0x14/0x44 ... Call trace: clk_hw_get_rate+0x14/0x44 _freq_tbl_determine_rate+0x94/0xfc clk_rcg2_determine_rate+0x2c/0x38 clk_core_determine_round_nolock+0x4c/0x88 clk_core_round_rate_nolock+0x6c/0xa8 clk_core_round_rate_nolock+0x9c/0xa8 clk_core_set_rate_nolock+0x70/0x180 clk_set_rate+0x3c/0x6c of_clk_set_defaults+0x254/0x360 platform_drv_probe+0x28/0xb0 really_probe+0x120/0x2dc driver_probe_device+0x64/0xfc device_driver_attach+0x4c/0x6c __driver_attach+0xac/0xc0 bus_for_each_dev+0x84/0xcc driver_attach+0x2c/0x38 bus_add_driver+0xfc/0x1d0 driver_register+0x64/0xf8 __platform_driver_register+0x4c/0x58 msm_drm_register+0x5c/0x60 ...
It turned out that clk_hw_get_parent_by_index() was returning NULL and we weren't checking. Let's check it so that we don't crash.
--- drivers/clk/qcom/clk-rcg2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/qcom/clk-rcg2.c +3 -0
@@ -217,6 +217,9 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, clk_flags =clk_hw_get_flags (hw); p =clk_hw_get_parent_by_index (hw, index); +if (!p) +return -EINVAL ; +if (clk_flags &CLK_SET_RATE_PARENT ) { rate = f->freq;if (f->pre_div) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 102/399 drm/amdkfd: Fix a bug in SDMA RLC queue counting under HWS mode
In reply to Greg Kroah-HartmanFrom: Yong Zhao <[email protected]>
[ Upstream commit f38abc15d157b7b31fa7f651dc8bf92858c963f8 ]
The sdma_queue_count increment should be done before execute_queues_cpsch(), which calls pm_calc_rlib_size() where sdma_queue_count is used to calculate whether over_subscription is triggered.
With the previous code, when a SDMA queue is created, compute_queue_count in pm_calc_rlib_size() is one more than the actual compute queue number, because the queue_count has been incremented while sdma_queue_count has not. This patch fixes that.
--- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +6 -4
@@ -1225,16 +1225,18 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,list_add (&q->list, &qpd->queues_list); qpd->queue_count++; + +if (q->properties.type ==KFD_QUEUE_TYPE_SDMA ) + dqm->sdma_queue_count++; +else if (q->properties.type ==KFD_QUEUE_TYPE_SDMA_XGMI ) + dqm->xgmi_sdma_queue_count++; +if (q->properties.is_active) { dqm->queue_count++; retval =execute_queues_cpsch (dqm,KFD_UNMAP_QUEUES_FILTER_DYNAMIC_QUEUES ,0 ); } -if (q->properties.type ==KFD_QUEUE_TYPE_SDMA ) - dqm->sdma_queue_count++; -else if (q->properties.type ==KFD_QUEUE_TYPE_SDMA_XGMI ) - dqm->xgmi_sdma_queue_count++;/* * Unconditionally increment this counter, regardless of the queue's * type or whether the queue is active.
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 103/399 bpf, sockhash: Synchronize_rcu before freeing map
In reply to Greg Kroah-HartmanFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit 0b2dc83906cf1e694e48003eae5df8fa63f76fd9 ]
We need to have a synchronize_rcu before free'ing the sockhash because any outstanding psock references will have a pointer to the map and when they use it, this could trigger a use after free.
This is a sister fix for sockhash, following commit 2bb90e5cc90e ("bpf:
sockmap, synchronize_rcu before free'ing map") which addressed sockmap, which comes from a manual audit.
--- net/core/sock_map.c | 3 +++ 1 file changed, 3 insertions(+)
net/core/sock_map.c +3 -0
@@ -881,6 +881,9 @@ static void sock_hash_free(struct bpf_map *map)/* wait for psock readers accessing its map link */ synchronize_rcu (); +/* wait for psock readers accessing its map link */ +synchronize_rcu (); +bpf_map_area_free (htab->buckets);kfree (htab); }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 104/399 drm/amd/display: Renoir chroma viewport WA
In reply to Greg Kroah-HartmanFrom: Eric Yang <[email protected]>
[ Upstream commit 1cad8ff7ecc6b70a062b8e8b74a0cd08c928341d ]
[Why]
For unknown reason, immediate flip with host VM translation on NV12 surface will underflow on last row of PTE.
[How]
Hack chroma viewport height to make fetch one more row of PTE. Note that this will cause hubp underflow on all video underlay cases, but the underflow is not user visible since it is in blank region.
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 65 ++++++++++++++++++- .../drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + 3 files changed, 67 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +2 -0
@@ -417,6 +417,8 @@ struct dc_debug_options {bool cm_in_bypass;#endif int force_clock_mode;/*every mode change.*/ + +bool nv12_iflip_vm_wa; };struct dc_debug_data {
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c +64 -1
77 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1 -0
@@ -847,6 +847,7 @@ static const struct dc_debug_options debug_defaults_drv = { .scl_reset_length10 = true, .sanity_checks = true, .disable_48mhz_pwrdwn = false, + .nv12_iflip_vm_wa = true };static const struct dc_debug_options debug_defaults_diags = {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 105/399 drm/amdgpu: remove 4 set but not used variable in amdgpu_atombios_get_connector_info_from_object_table
In reply to Greg Kroah-HartmanFrom: yu kuai <[email protected]>
[ Upstream commit bae028e3e521e8cb8caf2cc16a455ce4c55f2332 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c: In function 'amdgpu_atombios_get_connector_info_from_object_table':drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:376:26: warning: variable 'grph_obj_num' set but not used [-Wunused-but-set-variable] drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:376:13: warning: variable 'grph_obj_id' set but not used [-Wunused-but-set-variable] drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:341:37: warning: variable 'con_obj_type' set but not used [-Wunused-but-set-variable] drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:341:24: warning: variable 'con_obj_num' set but not used [-Wunused-but-set-variable]
They are never used, so can be removed.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +2 -17
@@ -338,17 +338,9 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * path_size +=le16_to_cpu (path->usSize);if (device_support &le16_to_cpu (path->usDeviceTag)) { -uint8_t con_obj_id, con_obj_num, con_obj_type; - - con_obj_id = +uint8_t con_obj_id = (le16_to_cpu (path->usConnObjectId) &OBJECT_ID_MASK ) >>OBJECT_ID_SHIFT ; - con_obj_num = - (le16_to_cpu (path->usConnObjectId) &ENUM_ID_MASK ) - >>ENUM_ID_SHIFT ; - con_obj_type = - (le16_to_cpu (path->usConnObjectId) & -OBJECT_TYPE_MASK ) >>OBJECT_TYPE_SHIFT ;/* Skip TV/CV support */ if ((le16_to_cpu(path->usDeviceTag) ==
@@ -373,14 +365,7 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * router.ddc_valid = false; router.cd_valid = false;for (j =0 ; j < ((le16_to_cpu (path->usSize) -8 ) /2 ); j++) { -uint8_t grph_obj_id, grph_obj_num, grph_obj_type; - - grph_obj_id = - (le16_to_cpu (path->usGraphicObjIds[j]) & -OBJECT_ID_MASK ) >>OBJECT_ID_SHIFT ; - grph_obj_num = - (le16_to_cpu (path->usGraphicObjIds[j]) & -ENUM_ID_MASK ) >>ENUM_ID_SHIFT ; +uint8_t grph_obj_type= grph_obj_type = (le16_to_cpu (path->usGraphicObjIds[j]) &OBJECT_TYPE_MASK ) >>OBJECT_TYPE_SHIFT ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 106/399 drm/amdgpu/dm: Do not throw an error for a display with no audio
In reply to Greg Kroah-HartmanFrom: Chris Wilson <[email protected]>
[ Upstream commit 852a91d627e9ce849d68df9d3f5336689003bdc7 ]
An old display with no audio may not have an EDID with a CEA block, or it may simply be too old to support audio. This is not a driver error, so don't flag it as such.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112140
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
@@ -97,8 +97,6 @@ enum dc_edid_status dm_helpers_parse_edid_caps( (struct edid *) edid->raw_edid); sad_count =drm_edid_to_sad ((struct edid *) edid->raw_edid, &sads); -if (sad_count <0 ) -DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count);if (sad_count <=0 )return result;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 107/399 ath10k: correct the tlv len of ath10k_wmi_tlv_op_gen_config_pno_start
In reply to Greg Kroah-HartmanFrom: Wen Gong <[email protected]>
[ Upstream commit e01cc82c4d1ec3bddcbb7cd991cf5dc0131ed9a1 ]
the tlv len is set to the total len of the wmi cmd, it will trigger firmware crash, correct the tlv len.
Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00017-QCARMSWP-1 and QCA6174 PCIE with firmware WLAN.RM.4.4.1-00110-QCARMSWPZ-1.
--- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi-tlv.c +4 -1
@@ -3707,6 +3707,7 @@ ath10k_wmi_tlv_op_gen_config_pno_start(struct ath10k *ar,struct wmi_tlv *tlv;struct sk_buff *skb;__le32 *channel_list; +u16 tlv_len;size_t len;void *ptr;u32 i;
@@ -3764,10 +3765,12 @@ ath10k_wmi_tlv_op_gen_config_pno_start(struct ath10k *ar,/* nlo_configured_parameters(nlo_list) */ cmd->no_of_ssids =__cpu_to_le32 (min_t (u8, pno->uc_networks_count,WMI_NLO_MAX_SSIDS )); + tlv_len =__le32_to_cpu (cmd->no_of_ssids) * +sizeof (struct nlo_configured_parameters ); tlv = ptr; tlv->tag =__cpu_to_le16 (WMI_TLV_TAG_ARRAY_STRUCT ); - tlv->len =__cpu_to_le16 (len); + tlv->len =__cpu_to_le16 (tlv_len); ptr +=sizeof (*tlv); nlo_list = ptr;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 108/399 drm/amdgpu: Ensure ret is always initialized when using SOC15_WAIT_ON_RREG
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit a63141e31764f8daf3f29e8e2d450dcf9199d1c8 ]
Commit b0f3cd3191cd ("drm/amdgpu: remove unnecessary JPEG2.0 code from VCN2.0") introduced a new clang warning in the vcn_v2_0_stop function:
../drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c:1082:2: warning: variable 'r' is used uninitialized whenever 'while' loop exits because its condition is false [-Wsometimes-uninitialized]
SOC15_WAIT_ON_RREG(VCN, 0, mmUVD_STATUS, UVD_STATUS__IDLE, 0x7, r);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/amd/amdgpu/../amdgpu/soc15_common.h:55:10: note:
expanded from macro 'SOC15_WAIT_ON_RREG'
while ((tmp_ & (mask)) != (expected_value)) { \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c:1083:6: note: uninitialized use
occurs here
if (r)
^
../drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c:1082:2: note: remove the
condition if it is always true
SOC15_WAIT_ON_RREG(VCN, 0, mmUVD_STATUS, UVD_STATUS__IDLE, 0x7, r);
^
../drivers/gpu/drm/amd/amdgpu/../amdgpu/soc15_common.h:55:10: note:
expanded from macro 'SOC15_WAIT_ON_RREG'
while ((tmp_ & (mask)) != (expected_value)) { \
^
../drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c:1072:7: note: initialize the
variable 'r' to silence this warning
int r;
^
= 01 warning generated.
To prevent warnings like this from happening in the future, make the SOC15_WAIT_ON_RREG macro initialize its ret variable before the while loop that can time out. This macro's return value is always checked so it should set ret in both the success and fail path.
--- drivers/gpu/drm/amd/amdgpu/soc15_common.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc15_common.h +1 -0
@@ -52,6 +52,7 @@uint32_t old_ =0 ; \ uint32_t tmp_ = RREG32(adev->reg_offset[ip##_HWIP][inst][reg##_BASE_IDX] + reg); \uint32_t loop = adev->usec_timeout; \ + ret =0 ; \while ((tmp_ & (mask)) != (expected_value)) { \if (old_ != tmp_) { \ loop = adev->usec_timeout; \
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 109/399 drm/panel: simple: Add Logic PD Type 28 display support
In reply to Greg Kroah-HartmanFrom: Adam Ford <[email protected]>
[ Upstream commit 0d35408afbeb603bc9972ae91e4dd2638bcffe52 ]
Previously, there was an omap panel-dpi driver that would read generic timings from the device tree and set the display timing accordingly. This driver was removed so the screen no longer functions. This patch modifies the panel-simple file to setup the timings to the same values previously used.
--- drivers/gpu/drm/panel/panel-simple.c | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/gpu/drm/panel/panel-simple.c +37 -0
@@ -2061,6 +2061,40 @@ static const struct drm_display_mode mitsubishi_aa070mc01_mode = { .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, }; +static const struct drm_display_mode logicpd_type_28_mode = { + .clock =9000 , + .hdisplay =480 , + .hsync_start =480 +3 , + .hsync_end =480 +3 +42 , + .htotal =480 +3 +42 +2 , + + .vdisplay =272 , + .vsync_start =272 +2 , + .vsync_end =272 +2 +11 , + .vtotal =272 +2 +11 +3 , + .vrefresh =60 , + .flags =DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC , +}; + +static const struct panel_desc logicpd_type_28 = { + .modes = &logicpd_type_28_mode, + .num_modes =1 , + .bpc =8 , + .size = { + .width =105 , + .height =67 , + }, + .delay = { + .prepare =200 , + .enable =200 , + .unprepare =200 , + .disable =200 , + }, + .bus_format =MEDIA_BUS_FMT_RGB888_1X24 , + .bus_flags =DRM_BUS_FLAG_DE_HIGH |DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE | +DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE , +}; +static const struct panel_desc mitsubishi_aa070mc01 = { .modes = &mitsubishi_aa070mc01_mode, .num_modes =1 ,
@@ -3287,6 +3321,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "lg,lp129qe", .data = &lg_lp129qe, + }, { + .compatible = "logicpd,type28", + .data = &logicpd_type_28, }, { .compatible = "mitsubishi,aa070mc01-ca1", .data = &mitsubishi_aa070mc01,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 110/399 arm64: dts: rockchip: Fix NanoPC-T4 cooling maps
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
[ Upstream commit a793e19c15f25a126138ac4ae9facf9204754af3 ]
Although it appeared to follow logically from the bindings, apparently the thermal framework can't properly cope with a single cooling device being shared between multiple maps. The CPU zone is probably easier to overheat, so remove the references to the (optional) fan from the GPU cooling zone to avoid things getting confused. Hopefully GPU-intensive tasks will leak enough heat across to the CPU zone to still hit the fan trips before reaching critical GPU temperatures.
--- .../boot/dts/rockchip/rk3399-nanopc-t4.dts | 27 ------------------- 1 file changed, 27 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts +0 -27
@@ -94,33 +94,6 @@ }; }; -&gpu_thermal { - trips { - gpu_warm: gpu_warm { - temperature = <55000>; - hysteresis = <2000>; - type = "active"; - }; - - gpu_hot: gpu_hot { - temperature = <65000>; - hysteresis = <2000>; - type = "active"; - }; - }; - cooling-maps { - map1 { - trip = <&gpu_warm>; - cooling-device = <&fan THERMAL_NO_LIMIT 1>; - }; - - map2 { - trip = <&gpu_hot>; - cooling-device = <&fan 2 THERMAL_NO_LIMIT>; - }; - }; -}; - &pinctrl { ir { ir_rx: ir-rx {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 111/399 modules: lockdep: Suppress suspicious RCU usage warning
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu <[email protected]>
[ Upstream commit bf08949cc8b98b7d1e20cfbba169a5938d42dae8 ]
While running kprobe module test, find_module_all() caused a suspicious RCU usage warning.
-----
=============================
WARNING: suspicious RCU usage
5.4.0-next-20191202+ #63 Not tainted
-----------------------------
kernel/module.c:619 RCU-list traversed in non-reader section!!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by rmmod/642:
#0: ffffffff8227da80 (module_mutex){+.+.}, at: __x64_sys_delete_module+0x9a/0x230
stack backtrace: CPU: 0 PID: 642 Comm: rmmod Not tainted 5.4.0-next-20191202+ #63 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58e9a3f-prebuilt.qemu.org 04/01/2014 Call Trace: dump_stack+0x71/0xa0 find_module_all+0xc1/0xd0 __x64_sys_delete_module+0xac/0x230 ? do_syscall_64+0x12/0x1f0 do_syscall_64+0x50/0x1f0 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x4b6d49
-----
This is because list_for_each_entry_rcu(modules) is called without rcu_read_lock(). This is safe because the module_mutex is locked.
Pass lockdep_is_held(&module_mutex) to the list_for_each_entry_rcu() to suppress this warning, This also fixes similar issue in mod_find() and each_symbol_section().
--- kernel/module.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/module.c +6 -3
@@ -214,7 +214,8 @@ static struct module *mod_find(unsigned long addr) {struct module *mod; -list_for_each_entry_rcu (mod, &modules, list) { +list_for_each_entry_rcu (mod, &modules, list, +lockdep_is_held (&module_mutex)) {if (within_module (addr, mod))return mod; }
@@ -448,7 +449,8 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,if (each_symbol_in_section (arr,ARRAY_SIZE (arr),NULL , fn, data))return true; -list_for_each_entry_rcu (mod, &modules, list) { +list_for_each_entry_rcu (mod, &modules, list, +lockdep_is_held (&module_mutex)) {struct symsearch arr[] = { { mod->syms, mod->syms + mod->num_syms, mod->crcs,NOT_GPL_ONLY , false },
@@ -616,7 +618,8 @@ static struct module *find_module_all(const char *name, size_t len,module_assert_mutex_or_preempt (); -list_for_each_entry_rcu (mod, &modules, list) { +list_for_each_entry_rcu (mod, &modules, list, +lockdep_is_held (&module_mutex)) {if (!even_unformed && mod->state ==MODULE_STATE_UNFORMED )continue ;if (strlen (mod->name) == len && !memcmp (mod->name, name, len))
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 112/399 ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAIs
In reply to Greg Kroah-HartmanFrom: Sathyanarayana Nujella <[email protected]>
[ Upstream commit c68e07970eca79106b0c35b88a12298569590081 ]
TGL supports one more HDMI DAI than previous models. So add quirk support for number of HDMI DAI's.
--- sound/soc/intel/boards/sof_rt5682.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
sound/soc/intel/boards/sof_rt5682.c +11 -3
@@ -35,6 +35,10 @@#define SOF_RT5682_SSP_AMP (quirk) \ (((quirk) << SOF_RT5682_SSP_AMP_SHIFT) & SOF_RT5682_SSP_AMP_MASK)#define SOF_RT5682_MCLK_BYTCHT_EN BIT(9) +#define SOF_RT5682_NUM_HDMIDEV_SHIFT 10 +#define SOF_RT5682_NUM_HDMIDEV_MASK (GENMASK(12, 10)) +#define SOF_RT5682_NUM_HDMIDEV (quirk) \ + ((quirk << SOF_RT5682_NUM_HDMIDEV_SHIFT) & SOF_RT5682_NUM_HDMIDEV_MASK)/* Default: MCLK on, MCLK 19.2M, SSP0 */ static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN |
@@ -594,6 +598,8 @@ static int sof_audio_probe(struct platform_device *pdev)if (!ctx)return -ENOMEM ; +dmi_check_system (sof_rt5682_quirk_table); +if (soc_intel_is_byt () ||soc_intel_is_cht ()) { is_legacy_cpu =1 ; dmic_be_num =0 ;
@@ -604,11 +610,13 @@ static int sof_audio_probe(struct platform_device *pdev)SOF_RT5682_SSP_CODEC (2 ); }else { dmic_be_num =2 ; - hdmi_num =3 ; + hdmi_num = (sof_rt5682_quirk &SOF_RT5682_NUM_HDMIDEV_MASK ) >> +SOF_RT5682_NUM_HDMIDEV_SHIFT ; +/* default number of HDMI DAI's */ +if (!hdmi_num) + hdmi_num =3 ; } -dmi_check_system (sof_rt5682_quirk_table); -/* need to get main clock from pmc */ if (sof_rt5682_quirk &SOF_RT5682_MCLK_BYTCHT_EN ) { ctx->mclk =devm_clk_get (&pdev->dev,"pmc_plt_clk_3" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 113/399 ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682
In reply to Greg Kroah-HartmanFrom: Sathyanarayana Nujella <[email protected]>
[ Upstream commit 6605f0ca3af3b964635287ec7c9dadc812b78eb0 ]
This patch adds the driver data and updates quirk info for tgl with max98357a speaker amp and ALC5682 headset codec.
--- sound/soc/intel/boards/sof_rt5682.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
sound/soc/intel/boards/sof_rt5682.c +20 -0
@@ -598,6 +598,9 @@ static int sof_audio_probe(struct platform_device *pdev)if (!ctx)return -ENOMEM ; +if (pdev->id_entry && pdev->id_entry->driver_data) + sof_rt5682_quirk = (unsigned long )pdev->id_entry->driver_data; +dmi_check_system (sof_rt5682_quirk_table);if (soc_intel_is_byt () ||soc_intel_is_cht ()) {
@@ -691,6 +694,21 @@ static int sof_rt5682_remove(struct platform_device *pdev)return 0 ; } +static const struct platform_device_id board_ids[] = { + { + .name ="sof_rt5682" , + }, + { + .name ="tgl_max98357a_rt5682" , + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | +SOF_RT5682_SSP_CODEC (0 ) | +SOF_SPEAKER_AMP_PRESENT | +SOF_RT5682_SSP_AMP (1 ) | +SOF_RT5682_NUM_HDMIDEV (4 )), + }, + { } +}; +static struct platform_driver sof_audio = { .probe = sof_audio_probe, .remove = sof_rt5682_remove,
@@ -698,6 +716,7 @@ static struct platform_driver sof_audio = { .name = "sof_rt5682", .pm = &snd_soc_pm_ops, }, + .id_table = board_ids, };module_platform_driver (sof_audio)
@@ -707,3 +726,4 @@ MODULE_AUTHOR("Bard Liao <[email protected]>");MODULE_AUTHOR ("Sathya Prakash M R <[email protected]>" );MODULE_LICENSE ("GPL v2" );MODULE_ALIAS ("platform:sof_rt5682" ); +MODULE_ALIAS ("platform:tgl_max98357a_rt5682" );
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 114/399 ASoC: SOF: Intel: hda: solve MSI issues by merging ipc and stream irq handlers
In reply to Greg Kroah-HartmanFrom: Bard Liao <[email protected]>
[ Upstream commit 7c11af9fcdc425b80f140a218d4fef9f17734bfc ]
The existing code uses two handlers for a shared edge-based MSI interrupts. In corner cases, interrupts are lost, leading to IPC timeouts. Those timeouts do not appear in legacy mode.
This patch merges the two handlers and threads into a single one, and simplifies the mask/unmask operations by using a single top-level mask (Global Interrupt Enable). The handler only checks for interrupt sources using the Global Interrupt Status (GIS) field, and all the actual work happens in the thread. This also enables us to remove the use of spin locks. Stream events are prioritized over IPC ones.
This patch was tested with HDaudio and SoundWire platforms, and all known IPC timeout issues are solved in MSI mode. The SoundWire-specific patches will be provided in follow-up patches, where the SoundWire interrupts are handled in the same thread as IPC and stream interrupts.
--- sound/soc/sof/intel/apl.c | 1 - sound/soc/sof/intel/cnl.c | 5 --- sound/soc/sof/intel/hda-ipc.c | 23 +++-------- sound/soc/sof/intel/hda-stream.c | 20 ++++----- sound/soc/sof/intel/hda.c | 69 ++++++++++++++++++++++---------- sound/soc/sof/intel/hda.h | 11 ++--- 6 files changed, 70 insertions(+), 59 deletions(-)
sound/soc/sof/intel/apl.c +0 -1
@@ -41,7 +41,6 @@ const struct snd_sof_dsp_ops sof_apl_ops = { .block_write = sof_block_write,/* doorbell */ - .irq_handler = hda_dsp_ipc_irq_handler, .irq_thread = hda_dsp_ipc_irq_thread,/* ipc */
sound/soc/sof/intel/cnl.c +0 -5
@@ -106,10 +106,6 @@ static irqreturn_t cnl_ipc_irq_thread(int irq, void *context) "nothing to do in IPC IRQ thread\n"); } -/* re-enable IPC interrupt */ -snd_sof_dsp_update_bits (sdev,HDA_DSP_BAR ,HDA_DSP_REG_ADSPIC , -HDA_DSP_ADSPIC_IPC ,HDA_DSP_ADSPIC_IPC ); -return IRQ_HANDLED ; }
@@ -231,7 +227,6 @@ const struct snd_sof_dsp_ops sof_cnl_ops = { .block_write = sof_block_write,/* doorbell */ - .irq_handler = hda_dsp_ipc_irq_handler, .irq_thread = cnl_ipc_irq_thread,/* ipc */
sound/soc/sof/intel/hda-ipc.c +5 -18
@@ -230,22 +230,15 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context) "nothing to do in IPC IRQ thread\n"); } -/* re-enable IPC interrupt */ -snd_sof_dsp_update_bits (sdev,HDA_DSP_BAR ,HDA_DSP_REG_ADSPIC , -HDA_DSP_ADSPIC_IPC ,HDA_DSP_ADSPIC_IPC ); -return IRQ_HANDLED ; } -/* is this IRQ for ADSP ? - we only care about IPC here */ -irqreturn_t hda_dsp_ipc_irq_handler (int irq,void *context) +/* Check if an IPC IRQ occurred */ +bool hda_dsp_check_ipc_irq (struct snd_sof_dev *sdev) { -struct snd_sof_dev *sdev = context; -int ret =IRQ_NONE ; +bool ret = false;u32 irq_status; -spin_lock (&sdev->hw_lock); -/* store status */ irq_status =snd_sof_dsp_read (sdev,HDA_DSP_BAR ,HDA_DSP_REG_ADSPIS );dev_vdbg (sdev->dev,"irq handler: irq_status:0x%x\n" , irq_status);
@@ -255,16 +248,10 @@ irqreturn_t hda_dsp_ipc_irq_handler(int irq, void *context) goto out;/* IPC message ? */ -if (irq_status &HDA_DSP_ADSPIS_IPC ) { -/* disable IPC interrupt */ -snd_sof_dsp_update_bits_unlocked (sdev,HDA_DSP_BAR , -HDA_DSP_REG_ADSPIC , -HDA_DSP_ADSPIC_IPC ,0 ); - ret =IRQ_WAKE_THREAD ; - } +if (irq_status &HDA_DSP_ADSPIS_IPC ) + ret = true; out: -spin_unlock (&sdev->hw_lock);return ret; }
sound/soc/sof/intel/hda-stream.c +11 -9
@@ -549,22 +549,23 @@ int hda_dsp_stream_hw_free(struct snd_sof_dev *sdev,return 0 ; } -irqreturn_t hda_dsp_stream_interrupt (int irq,void *context) +bool hda_dsp_check_stream_irq (struct snd_sof_dev *sdev) { -struct hdac_bus *bus = context; -int ret =IRQ_WAKE_THREAD ; +struct hdac_bus *bus =sof_to_bus (sdev); +bool ret = false;u32 status; -spin_lock (&bus->reg_lock); +/* The function can be called at irq thread, so use spin_lock_irq */ +spin_lock_irq (&bus->reg_lock); status =snd_hdac_chip_readl (bus,INTSTS );dev_vdbg (bus->dev,"stream irq, INTSTS status: 0x%x\n" , status); -/* Register inaccessible, ignore it.*/ -if (status ==0xffffffff ) - ret =IRQ_NONE ; +/* if Register inaccessible, ignore it.*/ +if (status !=0xffffffff ) + ret = true; -spin_unlock (&bus->reg_lock); +spin_unlock_irq (&bus->reg_lock);return ret; }
@@ -602,7 +603,8 @@ static bool hda_dsp_stream_check(struct hdac_bus *bus, u32 status)irqreturn_t hda_dsp_stream_threaded_handler (int irq,void *context) { -struct hdac_bus *bus = context; +struct snd_sof_dev *sdev = context; +struct hdac_bus *bus =sof_to_bus (sdev);#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA )u32 rirb_status;#endif
sound/soc/sof/intel/hda.c +48 -21
106 lines not on this page · raw message
sound/soc/sof/intel/hda.h +6 -5
@@ -43,11 +43,14 @@/* SOF_HDA_GCTL register bist */ #define SOF_HDA_GCTL_RESET BIT(0) -/* SOF_HDA_INCTL and SOF_HDA_INTSTS regs */ +/* SOF_HDA_INCTL regs */ #define SOF_HDA_INT_GLOBAL_EN BIT(31)#define SOF_HDA_INT_CTRL_EN BIT(30)#define SOF_HDA_INT_ALL_STREAM 0xff +/* SOF_HDA_INTSTS regs */ +#define SOF_HDA_INTSTS_GIS BIT(31) +#define SOF_HDA_MAX_CAPS 10#define SOF_HDA_CAP_ID_OFF 16#define SOF_HDA_CAP_ID_MASK GENMASK(SOF_HDA_CAP_ID_OFF + 11,\
@@ -406,8 +409,6 @@ struct sof_intel_hda_dev {/* the maximum number of streams (playback + capture) supported */ u32 stream_max; -int irq; -/* PM related */ bool l1_support_changed;/* during suspend, is L1SEN changed or not */
@@ -511,11 +512,12 @@ int hda_dsp_stream_hw_params(struct snd_sof_dev *sdev, struct snd_pcm_hw_params *params);int hda_dsp_stream_trigger (struct snd_sof_dev *sdev,struct hdac_ext_stream *stream,int cmd); -irqreturn_t hda_dsp_stream_interrupt (int irq,void *context);irqreturn_t hda_dsp_stream_threaded_handler (int irq,void *context);int hda_dsp_stream_setup_bdl (struct snd_sof_dev *sdev,struct snd_dma_buffer *dmab,struct hdac_stream *stream); +bool hda_dsp_check_ipc_irq (struct snd_sof_dev *sdev); +bool hda_dsp_check_stream_irq (struct snd_sof_dev *sdev);struct hdac_ext_stream *hda_dsp_stream_get (struct snd_sof_dev *sdev,int direction);
@@ -540,7 +542,6 @@ void hda_dsp_ipc_get_reply(struct snd_sof_dev *sdev);int hda_dsp_ipc_get_mailbox_offset (struct snd_sof_dev *sdev);int hda_dsp_ipc_get_window_offset (struct snd_sof_dev *sdev,u32 id); -irqreturn_t hda_dsp_ipc_irq_handler (int irq,void *context);irqreturn_t hda_dsp_ipc_irq_thread (int irq,void *context);int hda_dsp_ipc_cmd_done (struct snd_sof_dev *sdev,int dir);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 115/399 regulator: rk808: Lower log level on optional GPIOs being not available
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit b8a039d37792067c1a380dc710361905724b9b2f ]
RK808 can leverage a couple of GPIOs to tweak the ramp rate during DVS (Dynamic Voltage Scaling). These GPIOs are entirely optional but a dev_warn() appeared when cleaning this driver to use a more up-to-date gpiod API. At least reduce the log level to 'info' as it is totally fine to not populate these GPIO on a hardware design.
This change is trivial but it is worth not polluting the logs during bringup phase by having real warnings and errors sorted out correctly.
--- drivers/regulator/rk808-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/rk808-regulator.c +1 -1
@@ -1282,7 +1282,7 @@ static int rk808_regulator_dt_parse_pdata(struct device *dev, }if (!pdata->dvs_gpio[i]) { -dev_warn (dev,"there is no dvs%d gpio\n" , i); +dev_info (dev,"there is no dvs%d gpio\n" , i);continue ; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 116/399 net/wan/fsl_ucc_hdlc: reject muram offsets above 64K
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
[ Upstream commit 148587a59f6b85831695e0497d9dd1af5f0495af ]
Qiang Zhao points out that these offsets get written to 16-bit registers, and there are some QE platforms with more than 64K muram. So it is possible that qe_muram_alloc() gives us an allocation that can't actually be used by the hardware, so detect and reject that.
--- drivers/net/wan/fsl_ucc_hdlc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wan/fsl_ucc_hdlc.c +5 -0
@@ -245,6 +245,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv) ret = -ENOMEM ; goto free_riptr; } +if (riptr != (u16 )riptr || tiptr != (u16 )tiptr) { +dev_err (priv->dev,"MURAM allocation out of addressable range\n" ); + ret = -ENOMEM ; + goto free_tiptr; + }/* Set RIPTR, TIPTR */ iowrite16be (riptr, &priv->ucc_pram->riptr);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 117/399 Revert "drm/amdgpu: enable VCN DPG on Raven and Raven2"
In reply to Greg Kroah-HartmanFrom: Thong Thai <[email protected]>
[ Upstream commit d515959125f24767d02e82587a11e444eeba0e7b ]
This reverts commit a4840d91c984f93b2acdcd44441d624bbc1af0d2.
Reverting due to power efficiency issues seen on Raven 1 and 2 when DPG mode is enabled.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -6
@@ -1145,9 +1145,7 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_VCN_MGCG ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA | -AMD_PG_SUPPORT_VCN | -AMD_PG_SUPPORT_VCN_DPG ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; }else if (adev->pdev->device ==0x15d8 ) { adev->cg_flags =AMD_CG_SUPPORT_GFX_MGCG | AMD_CG_SUPPORT_GFX_MGLS |
@@ -1190,9 +1188,7 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_SDMA_LS |AMD_CG_SUPPORT_VCN_MGCG ; - adev->pg_flags =AMD_PG_SUPPORT_SDMA | -AMD_PG_SUPPORT_VCN | -AMD_PG_SUPPORT_VCN_DPG ; + adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN ; }break ;case CHIP_ARCTURUS :
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 118/399 NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().
In reply to Greg Kroah-HartmanFrom: Mao Wenan <[email protected]>
[ Upstream commit 718eae277e62a26e5862eb72a830b5e0fe37b04a ]
Convert cpu_to_le16(le16_to_cpu(frame->datalen) + len) to use le16_add_cpu(), which is more concise and does the same thing.
--- drivers/nfc/port100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nfc/port100.c +1 -1
@@ -565,7 +565,7 @@ static void port100_tx_update_payload_len(void *_frame, int len) {struct port100_frame *frame = _frame; - frame->datalen =cpu_to_le16 (le16_to_cpu (frame->datalen) + len); +le16_add_cpu (&frame->datalen, len); }static bool port100_rx_frame_is_valid (void *_frame)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 119/399 arm64: dts: allwinner: H6: Add PMU mode
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 7aa9b9eb7d6a8fde7acbe0446444f7e3fae1fe3b ]
Add the Performance Monitoring Unit (PMU) device tree node to the H6 .dtsi, which tells DT users which interrupts are triggered by PMU overflow events on each core. The numbers come from the manual and have been checked in U-Boot and with perf in Linux.
Tested with perf record and taskset on a Pine H64.
--- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +10 -0
@@ -70,6 +70,16 @@ clock-output-names = "ext_osc32k"; }; + pmu { + compatible = "arm,cortex-a53-pmu", + "arm,armv8-pmuv3"; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + psci { compatible = "arm,psci-0.2"; method = "smc";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 120/399 arm64: dts: allwinner: H5: Add PMU node
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit c35a516a46187c8eeb7a56c64505ec6f7e22a0c7 ]
Add the Performance Monitoring Unit (PMU) device tree node to the H5 .dtsi, which tells DT users which interrupts are triggered by PMU overflow events on each core.
As with the A64, the interrupt numbers from the manual were wrong (off by 4), the actual SPI IDs have been gathered in U-Boot, and were verified with perf in Linux.
Tested with perf record and taskset on an OrangePi PC2.
--- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +13 -3
@@ -54,21 +54,21 @@ enable-method = "psci"; }; - cpu@1 { + cpu1: cpu@1 { compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <1>; enable-method = "psci"; }; - cpu@2 { + cpu2: cpu@2 { compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <2>; enable-method = "psci"; }; - cpu@3 { + cpu3: cpu@3 { compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <3>;
@@ -76,6 +76,16 @@ }; }; + pmu { + compatible = "arm,cortex-a53-pmu", + "arm,armv8-pmuv3"; + interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + psci { compatible = "arm,psci-0.2"; method = "smc";
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 121/399 arm: dts: allwinner: H3: Add PMU node
In reply to Greg Kroah-HartmanFrom: Andre Przywara <[email protected]>
[ Upstream commit 0388a110747bec0c9d9de995842bb2a03a26aae1 ]
Add the Performance Monitoring Unit (PMU) device tree node to the H3 .dtsi, which tells DT users which interrupts are triggered by PMU overflow events on each core. The numbers come from the manual and have been checked in U-Boot and with perf in Linux.
Tested with perf record and taskset on an OrangePi Zero.
--- arch/arm/boot/dts/sun8i-h3.dtsi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/arm/boot/dts/sun8i-h3.dtsi +12 -3
@@ -80,7 +80,7 @@ #cooling-cells = <2>; }; - cpu@1 { + cpu1: cpu@1 { compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <1>;
@@ -90,7 +90,7 @@ #cooling-cells = <2>; }; - cpu@2 { + cpu2: cpu@2 { compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <2>;
@@ -100,7 +100,7 @@ #cooling-cells = <2>; }; - cpu@3 { + cpu3: cpu@3 { compatible = "arm,cortex-a7"; device_type = "cpu"; reg = <3>;
@@ -111,6 +111,15 @@ }; }; + pmu { + compatible = "arm,cortex-a7-pmu"; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>; + }; + timer { compatible = "arm,armv7-timer"; interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 122/399 opp: Free static OPPs on errors while adding them
In reply to Greg Kroah-HartmanFrom: Viresh Kumar <[email protected]>
[ Upstream commit ba0033192145cbd4e70ef64552958b13d597eb9e ]
The static OPPs aren't getting freed properly, if errors occur while adding them. Fix that by calling _put_opp_list_kref() and putting their reference on failures.
--- drivers/opp/of.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/opp/of.c +13 -4
@@ -678,15 +678,17 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)dev_err (dev,"%s: Failed to add OPP, %d\n" , __func__, ret);of_node_put (np); -return ret; + goto put_list_kref; }else if (opp) { count++; } }/* There should be one of more OPP defined */ -if (WARN_ON (!count)) -return -ENOENT ; +if (WARN_ON (!count)) { + ret = -ENOENT ; + goto put_list_kref; + }list_for_each_entry (opp, &opp_table->opp_list, node) pstate_count += !!opp->pstate;
@@ -695,7 +697,8 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)if (pstate_count && pstate_count != count) {dev_err (dev,"Not all nodes have performance state set (%d: %d)\n" , count, pstate_count); -return -ENOENT ; + ret = -ENOENT ; + goto put_list_kref; }if (pstate_count)
@@ -704,6 +707,11 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table) opp_table->parsed_static_opps = true;return 0 ; + +put_list_kref: +_put_opp_list_kref (opp_table); + +return ret; }/* Initializes OPP tables based on old-deprecated bindings */
@@ -738,6 +746,7 @@ static int _of_add_opp_table_v1(struct device *dev, struct opp_table *opp_table)if (ret) {dev_err (dev,"%s: Failed to add OPP %ld (%d)\n" , __func__, freq, ret); +_put_opp_list_kref (opp_table);return ret; } nr -=2 ;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 123/399 selinux: ensure we cleanup the internal AVC counters on error in avc_insert()
In reply to Greg Kroah-HartmanFrom: Paul Moore <[email protected]>
[ Upstream commit d8db60cb23e49a92cf8cada3297395c7fa50fdf8 ]
Fix avc_insert() to call avc_node_kill() if we've already allocated an AVC node and the code fails to insert the node in the cache.
--- security/selinux/avc.c | 51 ++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 27 deletions(-)
security/selinux/avc.c +24 -27
@@ -617,40 +617,37 @@ static struct avc_node *avc_insert(struct selinux_avc *avc,struct avc_node *pos, *node =NULL ;int hvalue;unsigned long flag; +spinlock_t *lock; +struct hlist_head *head;if (avc_latest_notif_update (avc, avd->seqno,1 )) - goto out; +return NULL ; node =avc_alloc_node (avc); -if (node) { -struct hlist_head *head; -spinlock_t *lock; -int rc =0 ; - - hvalue =avc_hash (ssid, tsid, tclass); -avc_node_populate (node, ssid, tsid, tclass, avd); - rc =avc_xperms_populate (node, xp_node); -if (rc) { -kmem_cache_free (avc_node_cachep, node); -return NULL ; - } - head = &avc->avc_cache.slots[hvalue]; - lock = &avc->avc_cache.slots_lock[hvalue]; +if (!node) +return NULL ; -spin_lock_irqsave (lock, flag); -hlist_for_each_entry (pos, head, list) { -if (pos->ae.ssid == ssid && - pos->ae.tsid == tsid && - pos->ae.tclass == tclass) { -avc_node_replace (avc, node, pos); - goto found; - } +avc_node_populate (node, ssid, tsid, tclass, avd); +if (avc_xperms_populate (node, xp_node)) { +avc_node_kill (avc, node); +return NULL ; + } + + hvalue =avc_hash (ssid, tsid, tclass); + head = &avc->avc_cache.slots[hvalue]; + lock = &avc->avc_cache.slots_lock[hvalue]; +spin_lock_irqsave (lock, flag); +hlist_for_each_entry (pos, head, list) { +if (pos->ae.ssid == ssid && + pos->ae.tsid == tsid && + pos->ae.tclass == tclass) { +avc_node_replace (avc, node, pos); + goto found; } -hlist_add_head_rcu (&node->list, head); -found: -spin_unlock_irqrestore (lock, flag); } -out: +hlist_add_head_rcu (&node->list, head); +found: +spin_unlock_irqrestore (lock, flag);return node; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 124/399 enetc: remove variable tc_max_sized_frame set but not used
In reply to Greg Kroah-HartmanFrom: Chen Wandun <[email protected]>
[ Upstream commit 6525b5ef65fdaf8a782449fb5d585195b573c2c1 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/freescale/enetc/enetc_qos.c: In function enetc_setup_tc_cbs:drivers/net/ethernet/freescale/enetc/enetc_qos.c:195:6: warning: variable tc_max_sized_frame set but not used [-Wunused-but-set-variable]
--- drivers/net/ethernet/freescale/enetc/enetc_qos.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc_qos.c +1 -2
@@ -192,7 +192,6 @@ int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data)u32 hi_credit_bit, hi_credit_reg;u32 max_interference_size;u32 port_frame_max_size; -u32 tc_max_sized_frame;u8 tc = cbs->queue;u8 prio_top, prio_next;int bw_sum =0 ;
@@ -250,7 +249,7 @@ int enetc_setup_tc_cbs(struct net_device *ndev, void *type_data)return -EINVAL ; } - tc_max_sized_frame =enetc_port_rd (&si->hw,ENETC_PTCMSDUR (tc)); +enetc_port_rd (&si->hw,ENETC_PTCMSDUR (tc));/* For top prio TC, the max_interfrence_size is maxSizedFrame. *
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 125/399 arm64: dts: qcom: msm8996: Disable USB2 PHY suspend by core
In reply to Greg Kroah-HartmanFrom: Manu Gautam <[email protected]>
[ Upstream commit d026c96b25b7ce5df89526aad2df988d553edb4d ]
QUSB2 PHY on msm8996 doesn't work well when autosuspend by dwc3 core using USB2PHYCFG register is enabled. One of the issue seen is that PHY driver reports PLL lock failure and fails phy_init() if dwc3 core has USB2 PHY suspend enabled. Fix this by using quirks to disable USB2 PHY LPM/suspend and dwc3 core already takes care of explicitly suspending PHY during suspend if quirks are specified.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/msm8996.dtsi +4 -0
@@ -1602,6 +1602,8 @@ interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>; phys = <&hsusb_phy2>; phy-names = "usb2-phy"; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; }; };
@@ -1632,6 +1634,8 @@ interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>; phys = <&hsusb_phy1>, <&ssusb_phy_0>; phy-names = "usb2-phy", "usb3-phy"; + snps,dis_u2_susphy_quirk; + snps,dis_enblslpm_quirk; }; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 126/399 padata: validate cpumask without removed CPU during offline
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
[ Upstream commit 894c9ef9780c5cf2f143415e867ee39a33ecb75d ]
Configuring an instance's parallel mask without any online CPUs...
echo 2 > /sys/kernel/pcrypt/pencrypt/parallel_cpumask echo 0 > /sys/devices/system/cpu/cpu1/online
...makes tcrypt mode=215 crash like this:
divide error: 0000 [#1] SMP PTI
CPU: 4 PID: 283 Comm: modprobe Not tainted 5.4.0-rc8-padata-doc-v2+ #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191013_105130-anatol 04/01/2014 RIP: 0010:padata_do_parallel+0x114/0x300 Call Trace: pcrypt_aead_encrypt+0xc0/0xd0 [pcrypt] crypto_aead_encrypt+0x1f/0x30 do_mult_aead_op+0x4e/0xdf [tcrypt] test_mb_aead_speed.constprop.0.cold+0x226/0x564 [tcrypt] do_test+0x28c2/0x4d49 [tcrypt] tcrypt_mod_init+0x55/0x1000 [tcrypt] ...
cpumask_weight() in padata_cpu_hash() returns 0 because the mask has no CPUs. The problem is __padata_remove_cpu() checks for valid masks too early and so doesn't mark the instance PADATA_INVALID as expected, which would have made padata_do_parallel() return error before doing the division.
Fix by introducing a second padata CPU hotplug state before CPUHP_BRINGUP_CPU so that __padata_remove_cpu() sees the online mask without @cpu. No need for the second argument to padata_replace() since @cpu is now already missing from the online mask.
--- include/linux/cpuhotplug.h | 1 + kernel/padata.c | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-)
include/linux/cpuhotplug.h +1 -0
@@ -59,6 +59,7 @@ enum cpuhp_state {CPUHP_IOMMU_INTEL_DEAD ,CPUHP_LUSTRE_CFS_DEAD ,CPUHP_AP_ARM_CACHE_B15_RAC_DEAD , +CPUHP_PADATA_DEAD ,CPUHP_WORKQUEUE_PREP ,CPUHP_POWER_NUMA_PREPARE , CPUHP_HRTIMERS_PREPARE,
kernel/padata.c +18 -12
@@ -512,7 +512,7 @@ static int padata_replace_one(struct padata_shell *ps)return 0 ; } -static int padata_replace (struct padata_instance *pinst,int cpu) +static int padata_replace (struct padata_instance *pinst) {int notification_mask =0 ;struct padata_shell *ps;
@@ -523,16 +523,12 @@ static int padata_replace(struct padata_instance *pinst, int cpu)cpumask_copy (pinst->omask, pinst->rcpumask.pcpu);cpumask_and (pinst->rcpumask.pcpu, pinst->cpumask.pcpu, cpu_online_mask); -if (cpu >=0 ) -cpumask_clear_cpu (cpu, pinst->rcpumask.pcpu);if (!cpumask_equal (pinst->omask, pinst->rcpumask.pcpu)) notification_mask |=PADATA_CPU_PARALLEL ;cpumask_copy (pinst->omask, pinst->rcpumask.cbcpu);cpumask_and (pinst->rcpumask.cbcpu, pinst->cpumask.cbcpu, cpu_online_mask); -if (cpu >=0 ) -cpumask_clear_cpu (cpu, pinst->rcpumask.cbcpu);if (!cpumask_equal (pinst->omask, pinst->rcpumask.cbcpu)) notification_mask |=PADATA_CPU_SERIAL ;
@@ -624,7 +620,7 @@ out_replace:cpumask_copy (pinst->cpumask.pcpu, pcpumask);cpumask_copy (pinst->cpumask.cbcpu, cbcpumask); - err =padata_setup_cpumasks (pinst) ?:padata_replace (pinst,-1 ); + err =padata_setup_cpumasks (pinst) ?:padata_replace (pinst);if (valid)__padata_start (pinst);
@@ -715,7 +711,7 @@ static int __padata_add_cpu(struct padata_instance *pinst, int cpu)int err =0 ;if (cpumask_test_cpu (cpu, cpu_online_mask)) { - err =padata_replace (pinst,-1 ); + err =padata_replace (pinst);if (padata_validate_cpumask (pinst, pinst->cpumask.pcpu) &&padata_validate_cpumask (pinst, pinst->cpumask.cbcpu))
@@ -729,12 +725,12 @@ static int __padata_remove_cpu(struct padata_instance *pinst, int cpu) {int err =0 ; -if (cpumask_test_cpu (cpu, cpu_online_mask)) { +if (!cpumask_test_cpu (cpu, cpu_online_mask)) {if (!padata_validate_cpumask (pinst, pinst->cpumask.pcpu) || !padata_validate_cpumask (pinst, pinst->cpumask.cbcpu))__padata_stop (pinst); - err =padata_replace (pinst, cpu); + err =padata_replace (pinst); }return err;
@@ -796,7 +792,7 @@ static int padata_cpu_online(unsigned int cpu, struct hlist_node *node)return ret; } -static int padata_cpu_prep_down (unsigned int cpu,struct hlist_node *node) +static int padata_cpu_dead (unsigned int cpu,struct hlist_node *node) {struct padata_instance *pinst;int ret;
@@ -817,6 +813,7 @@ static enum cpuhp_state hp_online;static void __padata_free (struct padata_instance *pinst) {#ifdef CONFIG_HOTPLUG_CPU +cpuhp_state_remove_instance_nocalls (CPUHP_PADATA_DEAD , &pinst->node);cpuhp_state_remove_instance_nocalls (hp_online, &pinst->node);#endif
@@ -1024,6 +1021,8 @@ static struct padata_instance *padata_alloc(const char *name,#ifdef CONFIG_HOTPLUG_CPU cpuhp_state_add_instance_nocalls_cpuslocked (hp_online, &pinst->node); +cpuhp_state_add_instance_nocalls_cpuslocked (CPUHP_PADATA_DEAD , + &pinst->node);#endif put_online_cpus ();
@@ -1136,17 +1135,24 @@ static __init int padata_driver_init(void)int ret; ret =cpuhp_setup_state_multi (CPUHP_AP_ONLINE_DYN ,"padata:online" , - padata_cpu_online, - padata_cpu_prep_down); + padata_cpu_online,NULL );if (ret <0 )return ret; hp_online = ret; + + ret =cpuhp_setup_state_multi (CPUHP_PADATA_DEAD ,"padata:dead" , +NULL , padata_cpu_dead); +if (ret <0 ) { +cpuhp_remove_multi_state (hp_online); +return ret; + }return 0 ; }module_init (padata_driver_init); static __exit void padata_driver_exit(void) { +cpuhp_remove_multi_state (CPUHP_PADATA_DEAD );cpuhp_remove_multi_state (hp_online); }module_exit (padata_driver_exit);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 127/399 padata: always acquire cpu_hotplug_lock before pinst->lock
In reply to Greg Kroah-HartmanFrom: Daniel Jordan <[email protected]>
[ Upstream commit 38228e8848cd7dd86ccb90406af32de0cad24be3 ]
lockdep complains when padata's paths to update cpumasks via CPU hotplug and sysfs are both taken:
# echo 0 > /sys/devices/system/cpu/cpu1/online # echo ff > /sys/kernel/pcrypt/pencrypt/parallel_cpumask
======================================================
WARNING: possible circular locking dependency detected 5.4.0-rc8-padata-cpuhp-v3+ #1 Not tainted
------------------------------------------------------
bash/205 is trying to acquire lock:
ffffffff8286bcd0 (cpu_hotplug_lock.rw_sem){++++}, at: padata_set_cpumask+0x2b/0x120
but task is already holding lock:
ffff8880001abfa0 (&pinst->lock){+.+.}, at: padata_set_cpumask+0x26/0x120
which lock already depends on the new lock.
padata doesn't take cpu_hotplug_lock and pinst->lock in a consistent order. Which should be first? CPU hotplug calls into padata with cpu_hotplug_lock already held, so it should have priority.
--- kernel/padata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/padata.c +2 -2
@@ -643,8 +643,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type,struct cpumask *serial_mask, *parallel_mask;int err = -EINVAL ; -mutex_lock (&pinst->lock);get_online_cpus (); +mutex_lock (&pinst->lock);switch (cpumask_type) {case PADATA_CPU_PARALLEL :
@@ -662,8 +662,8 @@ int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, err =__padata_set_cpumasks (pinst, parallel_mask, serial_mask); out: -put_online_cpus ();mutex_unlock (&pinst->lock); +put_online_cpus ();return err; }
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 128/399 clk: imx: Add correct failure handling for clk based helpers
In reply to Greg Kroah-HartmanFrom: Abel Vesa <[email protected]>
[ Upstream commit f60f1c62c3188fcca945581e35e3440ee3fdcc95 ]
If the clk_hw based API returns an error, trying to return the clk from hw will end up in a NULL pointer dereference. So adding the to_clk checker and using it inside every clk based macro helper we handle that case correctly.
This to_clk is also temporary and will go away along with the clk based macro helpers once there is no user that need them anymore.
--- drivers/clk/imx/clk.h | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-)
drivers/clk/imx/clk.h +22 -15
@@ -54,48 +54,48 @@ extern struct imx_pll14xx_clk imx_1416x_pll;extern struct imx_pll14xx_clk imx_1443x_pll;#define imx_clk_cpu (name, parent_name, div, mux, pll, step) \ - imx_clk_hw_cpu(name, parent_name, div, mux, pll, step)->clk + to_clk(imx_clk_hw_cpu(name, parent_name, div, mux, pll, step))#define clk_register_gate2 (dev, name, parent_name, flags, reg, bit_idx, \ cgr_val, clk_gate_flags, lock, share_count) \ - clk_hw_register_gate2(dev, name, parent_name, flags, reg, bit_idx, \ - cgr_val, clk_gate_flags, lock, share_count)->clk + to_clk(clk_hw_register_gate2(dev, name, parent_name, flags, reg, bit_idx, \ + cgr_val, clk_gate_flags, lock, share_count))#define imx_clk_pllv3 (type, name, parent_name, base, div_mask) \ - imx_clk_hw_pllv3(type, name, parent_name, base, div_mask)->clk + to_clk(imx_clk_hw_pllv3(type, name, parent_name, base, div_mask))#define imx_clk_pfd (name, parent_name, reg, idx) \ - imx_clk_hw_pfd(name, parent_name, reg, idx)->clk + to_clk(imx_clk_hw_pfd(name, parent_name, reg, idx))#define imx_clk_gate_exclusive (name, parent, reg, shift, exclusive_mask) \ - imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask)->clk + to_clk(imx_clk_hw_gate_exclusive(name, parent, reg, shift, exclusive_mask))#define imx_clk_fixed_factor (name, parent, mult, div) \ - imx_clk_hw_fixed_factor(name, parent, mult, div)->clk + to_clk(imx_clk_hw_fixed_factor(name, parent, mult, div))#define imx_clk_divider2 (name, parent, reg, shift, width) \ - imx_clk_hw_divider2(name, parent, reg, shift, width)->clk + to_clk(imx_clk_hw_divider2(name, parent, reg, shift, width))#define imx_clk_gate_dis (name, parent, reg, shift) \ - imx_clk_hw_gate_dis(name, parent, reg, shift)->clk + to_clk(imx_clk_hw_gate_dis(name, parent, reg, shift))#define imx_clk_gate2 (name, parent, reg, shift) \ - imx_clk_hw_gate2(name, parent, reg, shift)->clk + to_clk(imx_clk_hw_gate2(name, parent, reg, shift))#define imx_clk_gate2_flags (name, parent, reg, shift, flags) \ - imx_clk_hw_gate2_flags(name, parent, reg, shift, flags)->clk + to_clk(imx_clk_hw_gate2_flags(name, parent, reg, shift, flags))#define imx_clk_gate2_shared2 (name, parent, reg, shift, share_count) \ - imx_clk_hw_gate2_shared2(name, parent, reg, shift, share_count)->clk + to_clk(imx_clk_hw_gate2_shared2(name, parent, reg, shift, share_count))#define imx_clk_gate3 (name, parent, reg, shift) \ - imx_clk_hw_gate3(name, parent, reg, shift)->clk + to_clk(imx_clk_hw_gate3(name, parent, reg, shift))#define imx_clk_gate4 (name, parent, reg, shift) \ - imx_clk_hw_gate4(name, parent, reg, shift)->clk + to_clk(imx_clk_hw_gate4(name, parent, reg, shift))#define imx_clk_mux (name, reg, shift, width, parents, num_parents) \ - imx_clk_hw_mux(name, reg, shift, width, parents, num_parents)->clk + to_clk(imx_clk_hw_mux(name, reg, shift, width, parents, num_parents))struct clk *imx_clk_pll14xx (const char *name,const char *parent_name,void __iomem *base,const struct imx_pll14xx_clk *pll_clk);
@@ -198,6 +198,13 @@ struct clk_hw *imx_clk_hw_fixup_mux(const char *name, void __iomem *reg, u8 shift, u8 width, const char * const *parents, int num_parents, void (*fixup)(u32 *val)); +static inline struct clk *to_clk (struct clk_hw *hw) +{ +if (IS_ERR_OR_NULL (hw)) +return ERR_CAST (hw); +return hw->clk; +} +static inline struct clk *imx_clk_fixed (const char *name,int rate) {return clk_register_fixed_rate (NULL , name,NULL ,0 , rate);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 129/399 ARM: exynos_defconfig: Bring back explicitly wanted options
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 9f9e2df2e64df197ff6548ef494f76be5b35d08a ]
Few options KALLSYMS_ALL, SCSI, PM_DEVFREQ and mutex/spinlock debugging were removed with savedefconfig because they were selected by other options. However these are user-visible options and they might not be selected in the future. Exactly this happened with commit 0e4a459f56c3 ("tracing: Remove unnecessary DEBUG_FS dependency") removing the dependency between DEBUG_FS and TRACING.
To avoid losing these options in the future, explicitly mention them in defconfig.
--- arch/arm/configs/exynos_defconfig | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/configs/exynos_defconfig +6 -0
@@ -38,6 +38,7 @@ CONFIG_CRYPTO_SHA256_ARM=m CONFIG_CRYPTO_SHA512_ARM=m CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_KALLSYMS_ALL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y
@@ -92,6 +93,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_ATA=y
@@ -291,6 +293,7 @@ CONFIG_CROS_EC_SPI=y CONFIG_COMMON_CLK_MAX77686=y CONFIG_COMMON_CLK_S2MPS11=y CONFIG_EXYNOS_IOMMU=y +CONFIG_PM_DEVFREQ=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y
@@ -356,4 +359,7 @@ CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set CONFIG_PROVE_LOCKING=y CONFIG_DEBUG_ATOMIC_SLEEP=y +CONFIG_DEBUG_RT_MUTEXES=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_MUTEXES=y CONFIG_DEBUG_USER=y
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 130/399 ARM: dts: imx6: rdu2: Disable WP for USDHC2 and USDHC3
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
[ Upstream commit cd58a174e58649426fb43d7456e5f7d7eab58af1 ]
RDU2 production units come with resistor connecting WP pin to correpsonding GPIO DNPed for both SD card slots. Drop any WP related configuration and mark both slots with "disable-wp".
--- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +2 -4
@@ -629,7 +629,7 @@ pinctrl-0 = <&pinctrl_usdhc2>; bus-width = <4>; cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; + disable-wp; vmmc-supply = <®_3p3v_sd>; vqmmc-supply = <®_3p3v>; no-1-8-v;
@@ -642,7 +642,7 @@ pinctrl-0 = <&pinctrl_usdhc3>; bus-width = <4>; cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; - wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + disable-wp; vmmc-supply = <®_3p3v_sd>; vqmmc-supply = <®_3p3v>; no-1-8-v;
@@ -1056,7 +1056,6 @@ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059 - MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x40010040 MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x40010040 >; };
@@ -1069,7 +1068,6 @@ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 - MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x40010040 MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x40010040 >;
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 131/399 ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed
In reply to Greg Kroah-HartmanFrom: Andrey Smirnov <[email protected]>
[ Upstream commit 6bb1e09c4c375db29770444f689f35f5cbe696bc ]
Cabling used to connect devices to USBH1 on RDU2 does not meet USB spec cable quality and cable length requirements to operate at High Speed, so limit the port to Full Speed only.
--- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +1 -0
@@ -776,6 +776,7 @@ &usbh1 { vbus-supply = <®_5p0v_main>; disable-over-current; + maximum-speed = "full-speed"; status = "okay"; };
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 132/399 IMA: Check IMA policy flag
In reply to Greg Kroah-HartmanFrom: Lakshmi Ramasubramanian <[email protected]>
[ Upstream commit c5563bad88e07017e08cce1142903e501598c80c ]
process_buffer_measurement() may be called prior to IMA being initialized (for instance, when the IMA hook is called when a key is added to the .builtin_trusted_keys keyring), which would result in a kernel panic.
This patch adds the check in process_buffer_measurement() to return immediately if IMA is not initialized yet.
--- security/integrity/ima/ima_main.c | 3 +++ 1 file changed, 3 insertions(+)
security/integrity/ima/ima_main.c +3 -0
@@ -655,6 +655,9 @@ void process_buffer_measurement(const void *buf, int size,int action =0 ;u32 secid; +if (!ima_policy_flag) +return ; +/* * Both LSM hooks and auxilary based buffer measurements are * based on policy. To avoid code duplication, differentiate
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 133/399 bus: ti-sysc: Implement quirk handling for CLKDM_NOAUTO
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 94f6345712b37e4bb23cb265ce4c65b9d177e75a ]
For dra7 dcan and dwc3 instances we need to block clockdomain autoidle. Let's do this with CLKDM_NOAUTO quirk flag and enable it for dcan and dwc3.
--- drivers/bus/ti-sysc.c | 10 ++++++++-- include/linux/platform_data/ti-sysc.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/bus/ti-sysc.c +8 -2
@@ -479,7 +479,7 @@ static void sysc_clkdm_deny_idle(struct sysc *ddata) {struct ti_sysc_platform_data *pdata; -if (ddata->legacy_mode) +if (ddata->legacy_mode || (ddata->cfg.quirks &SYSC_QUIRK_CLKDM_NOAUTO ))return ; pdata =dev_get_platdata (ddata->dev);
@@ -491,7 +491,7 @@ static void sysc_clkdm_allow_idle(struct sysc *ddata) {struct ti_sysc_platform_data *pdata; -if (ddata->legacy_mode) +if (ddata->legacy_mode || (ddata->cfg.quirks &SYSC_QUIRK_CLKDM_NOAUTO ))return ; pdata =dev_get_platdata (ddata->dev);
@@ -1251,6 +1251,12 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {/* Quirks that need to be set based on detected module */ SYSC_QUIRK ("aess" ,0 ,0 ,0x10 ,-1 ,0x40000000 ,0xffffffff ,SYSC_MODULE_QUIRK_AESS ), +SYSC_QUIRK ("dcan" ,0x48480000 ,0x20 ,-1 ,-1 ,0xa3170504 ,0xffffffff , +SYSC_QUIRK_CLKDM_NOAUTO ), +SYSC_QUIRK ("dwc3" ,0x48880000 ,0 ,0x10 ,-1 ,0x500a0200 ,0xffffffff , +SYSC_QUIRK_CLKDM_NOAUTO ), +SYSC_QUIRK ("dwc3" ,0x488c0000 ,0 ,0x10 ,-1 ,0x500a0200 ,0xffffffff , +SYSC_QUIRK_CLKDM_NOAUTO ),SYSC_QUIRK ("hdq1w" ,0 ,0 ,0x14 ,0x18 ,0x00000006 ,0xffffffff ,SYSC_MODULE_QUIRK_HDQ1W ), SYSC_QUIRK("hdq1w", 0, 0, 0x14, 0x18, 0x0000000a, 0xffffffff,
include/linux/platform_data/ti-sysc.h +1 -0
@@ -49,6 +49,7 @@ struct sysc_regbits {s8 emufree_shift; }; +#define SYSC_QUIRK_CLKDM_NOAUTO BIT(21)#define SYSC_QUIRK_FORCE_MSTANDBY BIT(20)#define SYSC_MODULE_QUIRK_AESS BIT(19)#define SYSC_MODULE_QUIRK_SGX BIT(18)
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 134/399 PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in
In reply to Greg Kroah-HartmanFrom: Wei Liu <[email protected]>
[ Upstream commit 574f29036fce385e28617547955dd6911d375025 ]
Previously quirk_paxc_bridge() was applied when the iproc driver was built-in, but not when it was compiled as a module.
This happened because it was under #ifdef CONFIG_PCIE_IPROC_PLATFORM:
PCIE_IPROC_PLATFORM=y causes CONFIG_PCIE_IPROC_PLATFORM to be defined, but PCIE_IPROC_PLATFORM=m causes CONFIG_PCIE_IPROC_PLATFORM_MODULE to be defined.
Move quirk_paxc_bridge() to pcie-iproc.c and drop the #ifdef so the quirk is always applied, whether iproc is built-in or a module.
--- drivers/pci/controller/pcie-iproc.c | 24 ++++++++++++++++++++++++ drivers/pci/quirks.c | 26 -------------------------- 2 files changed, 24 insertions(+), 26 deletions(-)
drivers/pci/controller/pcie-iproc.c +24 -0
@@ -1588,6 +1588,30 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_BROADCOM, 0xd802,DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd804 , quirk_paxc_disable_msi_parsing); +static void quirk_paxc_bridge (struct pci_dev *pdev) +{ +/* +* The PCI config space is shared with the PAXC root port and the first +* Ethernet device. So, we need to workaround this by telling the PCI +* code that the bridge is not an Ethernet device. +*/ +if (pdev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) + pdev->class =PCI_CLASS_BRIDGE_PCI <<8 ; + +/* +* MPSS is not being set properly (as it is currently 0). This is +* because that area of the PCI config space is hard coded to zero, and +* is not modifiable by firmware. Set this to 2 (e.g., 512 byte MPS) +* so that the MPS can be set to the real max value. +*/ + pdev->pcie_mpss =2 ; +} +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0x16cd , quirk_paxc_bridge); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0x16f0 , quirk_paxc_bridge); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd750 , quirk_paxc_bridge); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd802 , quirk_paxc_bridge); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd804 , quirk_paxc_bridge); +MODULE_AUTHOR ("Ray Jui <[email protected]>" );MODULE_DESCRIPTION ("Broadcom iPROC PCIe common driver" );MODULE_LICENSE ("GPL v2" );
drivers/pci/quirks.c +0 -26
@@ -2381,32 +2381,6 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM,PCI_DEVICE_ID_TIGON3_5719 , quirk_brcm_5719_limit_mrrs); -#ifdef CONFIG_PCIE_IPROC_PLATFORM -static void quirk_paxc_bridge (struct pci_dev *pdev) -{ -/* -* The PCI config space is shared with the PAXC root port and the first -* Ethernet device. So, we need to workaround this by telling the PCI -* code that the bridge is not an Ethernet device. -*/ -if (pdev->hdr_type ==PCI_HEADER_TYPE_BRIDGE ) - pdev->class =PCI_CLASS_BRIDGE_PCI <<8 ; - -/* -* MPSS is not being set properly (as it is currently 0). This is -* because that area of the PCI config space is hard coded to zero, and -* is not modifiable by firmware. Set this to 2 (e.g., 512 byte MPS) -* so that the MPS can be set to the real max value. -*/ - pdev->pcie_mpss =2 ; -} -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0x16cd , quirk_paxc_bridge); -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0x16f0 , quirk_paxc_bridge); -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd750 , quirk_paxc_bridge); -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd802 , quirk_paxc_bridge); -DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_BROADCOM ,0xd804 , quirk_paxc_bridge); -#endif -/* * Originally in EDAC sources for i82875P: Intel tells BIOS developers to * hide device 6 which configures the overflow device access containing the
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 135/399 media: cx23885: Add support for AVerMedia CE310B
In reply to Greg Kroah-HartmanFrom: Forest Crossman <[email protected]>
[ Upstream commit dc4cac67e13515835ed8081d510aa507aacb013b ]
The AVerMedia CE310B is a simple composite + S-Video + stereo audio capture card, and uses only the CX23888 to perform all of these functions.
I've tested both video inputs and the audio interface and confirmed that they're all working. However, there are some issues:
* Sometimes when I switch inputs the video signal turns black and can't be recovered until the system is rebooted. I haven't been able to determine the cause of this behavior, nor have I found a solution to fix it or any workarounds other than rebooting.
* The card sometimes seems to have trouble syncing to the video signal, and some of the VBI data appears as noise at the top of the frame, but I assume that to be a result of my very noisy RF environment and the card's unshielded input traces rather than a configuration issue.
--- drivers/media/pci/cx23885/cx23885-cards.c | 24 +++++++++++++++++++++++ drivers/media/pci/cx23885/cx23885-video.c | 3 ++- drivers/media/pci/cx23885/cx23885.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-)
drivers/media/pci/cx23885/cx23885-cards.c +24 -0
@@ -801,6 +801,25 @@ struct cx23885_board cx23885_boards[] = { .name = "Hauppauge WinTV-Starburst2", .portb = CX23885_MPEG_DVB, }, + [CX23885_BOARD_AVERMEDIA_CE310B] = { + .name = "AVerMedia CE310B", + .porta = CX23885_ANALOG_VIDEO, + .force_bff = 1, + .input = {{ + .type = CX23885_VMUX_COMPOSITE1, + .vmux = CX25840_VIN1_CH1 | + CX25840_NONE_CH2 | + CX25840_NONE0_CH3, + .amux = CX25840_AUDIO7, + }, { + .type = CX23885_VMUX_SVIDEO, + .vmux = CX25840_VIN8_CH1 | + CX25840_NONE_CH2 | + CX25840_VIN7_CH3 | + CX25840_SVIDEO_ON, + .amux = CX25840_AUDIO7, + } }, + }, };const unsigned int cx23885_bcount =ARRAY_SIZE (cx23885_boards);
@@ -1124,6 +1143,10 @@ struct cx23885_subid cx23885_subids[] = { .subvendor = 0x0070, .subdevice = 0xf02a, .card = CX23885_BOARD_HAUPPAUGE_STARBURST2, + }, { + .subvendor = 0x1461, + .subdevice = 0x3100, + .card = CX23885_BOARD_AVERMEDIA_CE310B, }, };const unsigned int cx23885_idcount =ARRAY_SIZE (cx23885_subids);
@@ -2348,6 +2371,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)case CX23885_BOARD_DVBSKY_T982 :case CX23885_BOARD_VIEWCAST_260E :case CX23885_BOARD_VIEWCAST_460E : +case CX23885_BOARD_AVERMEDIA_CE310B : dev->sd_cx25840 =v4l2_i2c_new_subdev (&dev->v4l2_dev, &dev->i2c_bus[2 ].i2c_adap,"cx25840" ,0x88 >>1 ,NULL );
drivers/media/pci/cx23885/cx23885-video.c +2 -1
@@ -257,7 +257,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input) (dev->board == CX23885_BOARD_MYGICA_X8507) || (dev->board == CX23885_BOARD_AVERMEDIA_HC81R) || (dev->board == CX23885_BOARD_VIEWCAST_260E) || - (dev->board == CX23885_BOARD_VIEWCAST_460E)) { + (dev->board == CX23885_BOARD_VIEWCAST_460E) || + (dev->board == CX23885_BOARD_AVERMEDIA_CE310B)) {/* Configure audio routing */ v4l2_subdev_call (dev->sd_cx25840, audio, s_routing,INPUT (input)->amux,0 ,0 );
drivers/media/pci/cx23885/cx23885.h +1 -0
@@ -101,6 +101,7 @@#define CX23885_BOARD_HAUPPAUGE_STARBURST2 59#define CX23885_BOARD_HAUPPAUGE_QUADHD_DVB_885 60#define CX23885_BOARD_HAUPPAUGE_QUADHD_ATSC_885 61 +#define CX23885_BOARD_AVERMEDIA_CE310B 62#define GPIO_0 0x00000001#define GPIO_1 0x00000002
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 136/399 PCI: Add generic quirk for increasing D3hot delay
In reply to Greg Kroah-HartmanFrom: Daniel Drake <[email protected]>
[ Upstream commit 62fe23df067715a21c4aef44068efe7ceaa8f627 ]
Separate the D3 delay increase functionality out of quirk_radeon_pm() into its own function so that it can be shared with other quirks, including the AMD Ryzen XHCI quirk that will be introduced in a followup commit.
Tweak the function name and message to indicate more clearly that the delay relates to a D3hot-to-D0 transition.
--- drivers/pci/quirks.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/pci/quirks.c +12 -7
@@ -1871,16 +1871,21 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2609, quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260a , quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260b , quirk_intel_pcie_pm); +static void quirk_d3hot_delay (struct pci_dev *dev,unsigned int delay) +{ +if (dev->d3_delay >= delay) +return ; + + dev->d3_delay = delay; +pci_info (dev,"extending delay after power-on from D3hot to %d msec\n" , + dev->d3_delay); +} +static void quirk_radeon_pm (struct pci_dev *dev) {if (dev->subsystem_vendor ==PCI_VENDOR_ID_APPLE && - dev->subsystem_device ==0x00e2 ) { -if (dev->d3_delay <20 ) { - dev->d3_delay =20 ; -pci_info (dev,"extending delay after power-on from D3 to %d msec\n" , - dev->d3_delay); - } - } + dev->subsystem_device ==0x00e2 ) +quirk_d3hot_delay (dev,20 ); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 137/399 PCI: Increase D3 delay for AMD Ryzen5/7 XHCI controllers
In reply to Greg Kroah-HartmanFrom: Daniel Drake <[email protected]>
[ Upstream commit 3030df209aa8cf831b9963829bd9f94900ee8032 ]
On Asus UX434DA (AMD Ryzen7 3700U) and Asus X512DK (AMD Ryzen5 3500U), the XHCI controller fails to resume from runtime suspend or s2idle, and USB becomes unusable from that point.
xhci_hcd 0000:03:00.4: Refused to change power state, currently in D3 xhci_hcd 0000:03:00.4: enabling device (0000 -> 0002) xhci_hcd 0000:03:00.4: WARN: xHC restore state timeout xhci_hcd 0000:03:00.4: PCI post-resume error -110! xhci_hcd 0000:03:00.4: HC died; cleaning up
During suspend, a transition to D3cold is attempted, however the affected platforms do not seem to cut the power to the PCI device when in this state, so the device stays in D3hot.
Upon resume, the D3hot-to-D0 transition is successful only if the D3 delay is increased to 20ms. The transition failure does not appear to be detectable as a CRS condition. Add a PCI quirk to increase the delay on the affected hardware.
--- drivers/pci/quirks.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/pci/quirks.c +16 -0
@@ -1889,6 +1889,22 @@ static void quirk_radeon_pm(struct pci_dev *dev) }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm); +/* +* Ryzen5/7 XHCI controllers fail upon resume from runtime suspend or s2idle. +* https://bugzilla.kernel.org/show_bug.cgi?id=205587 +* +* The kernel attempts to transition these devices to D3cold, but that seems +* to be ineffective on the platforms in question; the PCI device appears to +* remain on in D3hot state. The D3hot-to-D0 transition then requires an +* extended delay in order to succeed. +*/ +static void quirk_ryzen_xhci_d3hot (struct pci_dev *dev) +{ +quirk_d3hot_delay (dev,20 ); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x15e0 , quirk_ryzen_xhci_d3hot); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x15e1 , quirk_ryzen_xhci_d3hot); +#ifdef CONFIG_X86_IO_APIC static int dmi_disable_ioapicreroute (const struct dmi_system_id *d) {
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 138/399 Revert "nfp: abm: fix memory leak in nfp_abm_u32_knode_replace"
In reply to Greg Kroah-HartmanFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 1d1997db870f4058676439ef7014390ba9e24eb2 ]
This reverts commit 78beef629fd9 ("nfp: abm: fix memory leak in nfp_abm_u32_knode_replace").
The quoted commit does not fix anything and resulted in a bogus CVE-2019-19076.
If match is NULL then it is known there is no matching entry in list, hence, calling nfp_abm_u32_knode_delete() is pointless.
--- drivers/net/ethernet/netronome/nfp/abm/cls.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/ethernet/netronome/nfp/abm/cls.c +4 -10
@@ -176,10 +176,8 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,u8 mask, val;int err; -if (!nfp_abm_u32_check_knode (alink->abm, knode, proto, extack)) { - err = -EOPNOTSUPP ; +if (!nfp_abm_u32_check_knode (alink->abm, knode, proto, extack)) goto err_delete; - } tos_off = proto ==htons (ETH_P_IP ) ?16 :20 ;
@@ -200,18 +198,14 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink,if ((iter->val & cmask) == (val & cmask) && iter->band != knode->res->classid) {NL_SET_ERR_MSG_MOD (extack,"conflict with already offloaded filter" ); - err = -EOPNOTSUPP ; goto err_delete; } }if (!match) { match =kzalloc (sizeof (*match),GFP_KERNEL ); -if (!match) { - err = -ENOMEM ; - goto err_delete; - } - +if (!match) +return -ENOMEM ;list_add (&match->list, &alink->dscp_map); } match->handle = knode->handle;
@@ -227,7 +221,7 @@ nfp_abm_u32_knode_replace(struct nfp_abm_link *alink, err_delete:nfp_abm_u32_knode_delete (alink, knode); -return err; +return -EOPNOTSUPP ; } static int nfp_abm_setup_tc_block_cb(enum tc_setup_type type,
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerPATCH 139/399 gpu/drm: ingenic: Avoid null pointer deference in plane atomic update
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
[ Upstream commit 354b051c5dcbeb35bbfd5d54161364fc7a75a58a ]
It is possible that there is no drm_framebuffer associated with a given plane state.
v2: Handle drm_plane->state which can be NULL too
# *** extracted tags ***
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +10 -6
@@ -372,14 +372,18 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,struct ingenic_drm *priv =drm_plane_get_priv (plane);struct drm_plane_state *state = plane->state;unsigned int width, height, cpp; +dma_addr_t addr; - width = state->crtc->state->adjusted_mode.hdisplay; - height = state->crtc->state->adjusted_mode.vdisplay; - cpp = state->fb->format->cpp[plane->index]; +if (state && state->fb) { + addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); + width = state->crtc->state->adjusted_mode.hdisplay; + height = state->crtc->state->adjusted_mode.vdisplay; + cpp = state->fb->format->cpp[plane->index]; - priv->dma_hwdesc->addr =drm_fb_cma_get_gem_addr (state->fb, state,0 ); - priv->dma_hwdesc->cmd = width * height * cpp /4 ; - priv->dma_hwdesc->cmd |=JZ_LCD_CMD_EOF_IRQ ; + priv->dma_hwdesc->addr = addr; + priv->dma_hwdesc->cmd = width * height * cpp /4 ; + priv->dma_hwdesc->cmd |=JZ_LCD_CMD_EOF_IRQ ; + } } static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder,
Signature · 1 line
2.20.1