June 2020 - Linux-stable-mirror

[PATCH 06/10] mfd: ab3100-core: Fix incompatible types in comparison expression warning

by Lee Jones

Smatch reports: drivers/mfd/ab3100-core.c:501:20: error: incompatible types in comparison expression (different type sizes): drivers/mfd/ab3100-core.c:501:20: unsigned int * drivers/mfd/ab3100-core.c:501:20: unsigned long * drivers/mfd/ab8500-debugfs.c:1804:20: error: incompatible types in comparison expression (different type sizes): drivers/mfd/ab8500-debugfs.c:1804:20: unsigned int * drivers/mfd/ab8500-debugfs.c:1804:20: unsigned long * Since the second min() argument can be less than 0 a signed variable is required for assignment. However, the non-sized type size_t is passed in from the userspace handlers. In order to firstly compare, then assign the smallest value, we firstly need to cast them both to the same as the receiving size_t typed variable. Cc: <stable(a)vger.kernel.org> Cc: Linus Walleij <linus.walleij(a)linaro.org> Signed-off-by: Lee Jones <lee.jones(a)linaro.org> --- drivers/mfd/ab3100-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index 57723f116bb58..ee71ae04b5e63 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c @@ -498,7 +498,7 @@ static ssize_t ab3100_get_set_reg(struct file *file, int i = 0; /* Get userspace string and assure termination */ - buf_size = min(count, (sizeof(buf)-1)); + buf_size = min((ssize_t)count, (ssize_t)(sizeof(buf)-1)); if (copy_from_user(buf, user_buf, buf_size)) return -EFAULT; buf[buf_size] = 0; -- 2.25.1

4 years, 5 months

2
1
0 0

[PATCH 1/2] pinctrl: ingenic: Enhance support for IRQ_TYPE_EDGE_BOTH

by Paul Cercueil

Ingenic SoCs don't natively support registering an interrupt for both rising and falling edges. This has to be emulated in software. Until now, this was emulated by switching back and forth between IRQ_TYPE_EDGE_RISING and IRQ_TYPE_EDGE_FALLING according to the level of the GPIO. While this worked most of the time, when used with GPIOs that need debouncing, some events would be lost. For instance, between the time a falling-edge interrupt happens and the interrupt handler configures the hardware for rising-edge, the level of the pin may have already risen, and the rising-edge event is lost. To address that issue, instead of switching back and forth between IRQ_TYPE_EDGE_RISING and IRQ_TYPE_EDGE_FALLING, we now switch back and forth between IRQ_TYPE_LEVEL_LOW and IRQ_TYPE_LEVEL_HIGH. Since we always switch in the interrupt handler, they actually permit to detect level changes. In the example above, if the pin level rises before switching the IRQ type from IRQ_TYPE_LEVEL_LOW to IRQ_TYPE_LEVEL_HIGH, a new interrupt will raise as soon as the handler exits, and the rising-edge event will be properly detected. Cc: stable(a)vger.kernel.org Fixes: e72394e2ea19 ("pinctrl: ingenic: Merge GPIO functionality") Reported-by: João Henrique <johnnyonflame(a)hotmail.com> Tested-by: João Henrique <johnnyonflame(a)hotmail.com> Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index fc0d10411aa9..241e563d5814 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -1813,9 +1813,9 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd) */ high = ingenic_gpio_get_value(jzgc, irq); if (high) - irq_set_type(jzgc, irq, IRQ_TYPE_EDGE_FALLING); + irq_set_type(jzgc, irq, IRQ_TYPE_LEVEL_LOW); else - irq_set_type(jzgc, irq, IRQ_TYPE_EDGE_RISING); + irq_set_type(jzgc, irq, IRQ_TYPE_LEVEL_HIGH); } if (jzgc->jzpc->info->version >= ID_JZ4760) @@ -1851,7 +1851,7 @@ static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) */ bool high = ingenic_gpio_get_value(jzgc, irqd->hwirq); - type = high ? IRQ_TYPE_EDGE_FALLING : IRQ_TYPE_EDGE_RISING; + type = high ? IRQ_TYPE_LEVEL_LOW : IRQ_TYPE_LEVEL_HIGH; } irq_set_type(jzgc, irqd->hwirq, type); -- 2.27.0

4 years, 5 months

3
3
0 0

[PATCH] irq: Request and release resources for chained IRQs

by David Heidelberg

Hello, is there chance to get this patch included or could be this issue solved with different approach? Actually this patch solve issue on two APQ8064 devices: * Nexus 7 2013 Tested-by: David Heidelberg <david(a)ixit.cz> * Nexus 4 Tested-by: Iskren Chernev Best regards David Heidelberg

4 years, 5 months

4
3
0 0

[PATCH][v2] Drivers: hv: Change flag to write log level in panic msg to false

by Joseph Salisbury

When the kernel panics, one page of kmsg data may be collected and sent to Hyper-V to aid in diagnosing the failure. The collected kmsg data typically contains 50 to 100 lines, each of which has a log level prefix that isn't very useful from a diagnostic standpoint. So tell kmsg_dump_get_buffer() to not include the log level, enabling more information that *is* useful to fit in the page. Requesting in stable kernels, since many kernels running in production are stable releases. Cc: stable(a)vger.kernel.org Signed-off-by: Joseph Salisbury <joseph.salisbury(a)microsoft.com> --- drivers/hv/vmbus_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 9147ee9d5f7d..d69f4efa3719 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1368,7 +1368,7 @@ static void hv_kmsg_dump(struct kmsg_dumper *dumper, * Write dump contents to the page. No need to synchronize; panic should * be single-threaded. */ - kmsg_dump_get_buffer(dumper, true, hv_panic_page, HV_HYP_PAGE_SIZE, + kmsg_dump_get_buffer(dumper, false, hv_panic_page, HV_HYP_PAGE_SIZE, &bytes_written); if (bytes_written) hyperv_report_panic_msg(panic_pa, bytes_written); -- 2.17.1

4 years, 5 months

4
5
0 0

[PATCH 5/8] backlight: ili922x: Add missing kerneldoc description for ili922x_reg_dump()'s arg

by Lee Jones

Kerneldoc syntax is used, but not complete. Descriptions required. Prevents warnings like: drivers/video/backlight/ili922x.c:298: warning: Function parameter or member 'spi' not described in 'ili922x_reg_dump' Cc: <stable(a)vger.kernel.org> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: Software Engineering <sbabic(a)denx.de> Signed-off-by: Lee Jones <lee.jones(a)linaro.org> --- drivers/video/backlight/ili922x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c index cd41433b87aeb..26193f38234e7 100644 --- a/drivers/video/backlight/ili922x.c +++ b/drivers/video/backlight/ili922x.c @@ -295,6 +295,8 @@ static int ili922x_write(struct spi_device *spi, u8 reg, u16 value) #ifdef DEBUG /** * ili922x_reg_dump - dump all registers + * + * @spi: pointer to the controller side proxy for an SPI slave device */ static void ili922x_reg_dump(struct spi_device *spi) { -- 2.25.1

4 years, 5 months

2
2
0 0

[PATCH 3/8] backlight: ili922x: Add missing kerneldoc descriptions for CHECK_FREQ_REG() args

by Lee Jones

Kerneldoc syntax is used, but not complete. Descriptions required. Prevents warnings like: drivers/video/backlight/ili922x.c:116: warning: Function parameter or member 's' not described in 'CHECK_FREQ_REG' drivers/video/backlight/ili922x.c:116: warning: Function parameter or member 'x' not described in 'CHECK_FREQ_REG' Cc: <stable(a)vger.kernel.org> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie(a)samsung.com> Cc: Software Engineering <sbabic(a)denx.de> Signed-off-by: Lee Jones <lee.jones(a)linaro.org> --- drivers/video/backlight/ili922x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c index 9c5aa3fbb2842..8cb4b9d3c3bba 100644 --- a/drivers/video/backlight/ili922x.c +++ b/drivers/video/backlight/ili922x.c @@ -107,6 +107,8 @@ * lower frequency when the registers are read/written. * The macro sets the frequency in the spi_transfer structure if * the frequency exceeds the maximum value. + * @s: pointer to controller side proxy for an SPI slave device + * @x: pointer to the read/write buffer pair */ #define CHECK_FREQ_REG(s, x) \ do { \ -- 2.25.1

4 years, 5 months

2
5
0 0

[PATCH 4.19 000/131] 4.19.131-rc1 review

by Sasha Levin

This is the start of the stable review cycle for the 4.19.131 release. There are 131 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed 01 Jul 2020 03:34:57 PM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. -- Thanks, Sasha ------------------------- Pseudo-Shortlog of commits: Aaron Plattner (1): ALSA: hda: Add NVIDIA codec IDs 9a & 9d through a0 to patch table Aditya Pakki (1): rocker: fix incorrect error handling in dma_rings_init Al Cooper (1): xhci: Fix enumeration issue when setting max packet size for FS devices. Al Viro (1): fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()" Alexander Lobakin (3): net: qed: fix left elements count calculation net: qed: fix NVMe login fails over VFs net: qed: fix excessive QM ILT lines consumption Amir Goldstein (1): fanotify: fix ignore mask logic for events on child and on dir Anton Eidelman (1): nvme-multipath: fix deadlock between ana_work and scan_work Charles Keepax (1): regmap: Fix memory leak from regmap_register_patch Chuck Lever (1): SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment() Chuhong Yuan (1): USB: ohci-sm501: Add missed iounmap() in remove Dan Carpenter (3): x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get() usb: gadget: udc: Potential Oops in error handling code Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() Daniel Gomez (1): drm: rcar-du: Fix build error Dave Martin (1): arm64/sve: Eliminate data races on sve_default_vl David Christensen (1): tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes David Howells (2): rxrpc: Fix notification call on completion of discarded calls rxrpc: Fix handling of rwind from an ACK packet Denis Efremov (2): drm/amd/display: Use kfree() to free rgb_user in calculate_user_regamma_ramp() drm/radeon: fix fb_div check in ni_init_smc_spll_table() Denis Kirjanov (1): tcp: don't ignore ECN CWR on pure ACK Dinghao Liu (1): hwrng: ks-sa - Fix runtime PM imbalance on error Doug Berger (2): net: bcmgenet: remove HFB_CTRL access net: bcmgenet: use hardware padding of runt frames Eddie James (1): i2c: fsi: Fix the port number field in status register Eric Dumazet (3): net: be more gentle about silly gso requests coming from user net: increment xmit_recursion level in dev_direct_xmit() tcp: grow window for OOO packets only for SACK flows Fan Guo (1): RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() Filipe Manana (2): btrfs: fix data block group relocation failure due to concurrent scrub btrfs: fix failure of RWF_NOWAIT write into prealloc extent beyond eof Florian Fainelli (1): net: phy: Check harder for errors in get_phy_id() Florian Westphal (2): net: place xmit recursion in softnet data net: use correct this_cpu primitive in dev_recursion_level Gao Xiang (1): erofs: fix partially uninitialized misuse in z_erofs_onlinepage_fixup Huaisheng Ye (1): dm writecache: correct uncommitted_block when discarding uncommitted entry Huy Nguyen (1): xfrm: Fix double ESP trailer insertion in IPsec crypto offload. Ilya Ponetayev (1): sch_cake: don't try to reallocate or unshare skb unconditionally Jann Horn (1): apparmor: don't try to replace stale label in ptraceme check Jeremy Kerr (1): net: usb: ax88179_178a: fix packet alignment padding Jiping Ma (1): arm64: perf: Report the PC value in REGS_ABI_32 mode Joakim Tjernlund (1): cdc-acm: Add DISABLE_ECHO quirk for Microchip/SMSC chip Josef Bacik (1): btrfs: make caching_thread use btrfs_find_next_key Junxiao Bi (4): ocfs2: avoid inode removal while nfsd is accessing it ocfs2: load global_inode_alloc ocfs2: fix value of OCFS2_INVALID_SLOT ocfs2: fix panic on nfs server over ocfs2 Juri Lelli (2): sched/deadline: Initialize ->dl_boosted sched/core: Fix PI boosting between RT and DEADLINE tasks Kai-Heng Feng (4): ALSA: hda/realtek: Enable mute LED on an HP system ALSA: hda/realtek - Enable micmute LED on and HP system xhci: Poll for U0 after disabling USB2 LPM xhci: Return if xHCI doesn't support LPM Keith Busch (1): nvme-multipath: set bdi capabilities once Li Jun (1): usb: typec: tcpci_rt1711h: avoid screaming irq causing boot hangs Longfang Liu (1): USB: ehci: reopen solution for Synopsys HC bug Luis Chamberlain (1): blktrace: break out of blktrace setup on concurrent calls Macpaul Lin (2): usb: host: xhci-mtk: avoid runtime suspend when removing hcd ALSA: usb-audio: add quirk for Samsung USBC Headset (AKG) Mans Rullgard (1): i2c: core: check returned size of emulated smbus block read Marcelo Ricardo Leitner (1): sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket Mark Zhang (1): RDMA/cma: Protect bind_list and listen_list while finding matching cm id Masahiro Yamada (1): kbuild: improve cc-option to clean up all temporary files Masami Hiramatsu (1): tracing: Fix event trigger to accept redundant spaces Mathias Nyman (1): xhci: Fix incorrect EP_STATE_MASK Matt Fleming (1): x86/asm/64: Align start of __clear_user() loop to 16-bytes Matthew Hagan (1): ARM: dts: NSP: Correct FA2 mailbox node Michal Kalderon (1): RDMA/qedr: Fix KASAN: use-after-free in ucma_event_handler+0x532 Mikulas Patocka (1): dm writecache: add cond_resched to loop in persistent_memory_claim() Minas Harutyunyan (1): usb: dwc2: Postponed gadget registration to the udc class driver Miquel Raynal (1): mtd: rawnand: marvell: Fix the condition on a return code Nathan Chancellor (1): ACPI: sysfs: Fix pm_profile_attr type Nathan Huckleberry (1): riscv/atomic: Fix sign extension for RV64I Navid Emamdoost (1): sata_rcar: handle pm_runtime_get_sync failure cases Neal Cardwell (1): tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT Olga Kornievskaia (1): NFSv4 fix CLOSE not waiting for direct IO compeletion Qiushi Wu (2): efi/esrt: Fix reference count leak in esre_create_sysfs_entry. ASoC: rockchip: Fix a reference count leak. Rahul Lakkireddy (1): cxgb4: move handling L2T ARP failures to caller Robin Gong (1): regualtor: pfuze100: correct sw1a/sw2 on pfuze3000 Russell King (1): netfilter: ipset: fix unaligned atomic access Sagi Grimberg (1): nvme: fix possible deadlock when I/O is blocked Sasha Levin (2): ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294 Linux 4.19.131-rc1 Sean Christopherson (1): KVM: nVMX: Plumb L2 GPA through to PML emulation Shay Drory (1): IB/mad: Fix use after free when destroying MAD agent Shengjiu Wang (1): ASoC: fsl_ssi: Fix bclk calculation for mono channel Sowjanya Komatineni (1): i2c: tegra: Fix Maximum transfer size Srinivas Kandagatla (1): ASoC: q6asm: handle EOS correctly Steffen Maier (1): scsi: zfcp: Fix panic on ERP timeout for previously dismissed ERP action Steven Rostedt (VMware) (1): ring-buffer: Zero out time extend if it is nested and not absolute Sven Schnelle (1): s390/ptrace: fix setting syscall number Taehee Yoo (3): ip6_gre: fix use-after-free in ip6gre_tunnel_lookup() ip_tunnel: fix use-after-free in ip_tunnel_lookup() net: core: reduce recursion limit value Takashi Iwai (2): ALSA: usb-audio: Fix OOB access of mixer element list ALSA: hda/realtek - Add quirk for MSI GE63 laptop Tang Bin (1): usb: host: ehci-exynos: Fix error check in exynos_ehci_probe() Tariq Toukan (1): net: Do not clear the sock TX queue in sk_set_socket() Thierry Reding (2): i2c: tegra: Cleanup kerneldoc comments i2c: tegra: Add missing kerneldoc for some fields Thomas Falcon (2): ibmveth: Fix max MTU limit ibmvnic: Harden device login requests Thomas Martitz (1): net: bridge: enfore alignment for ethernet address Toke Høiland-Jørgensen (2): sch_cake: fix a few style nits sch_cake: don't call diffserv parsing code when it is not needed Tomasz Meresiński (1): usb: add USB_QUIRK_DELAY_INIT for Logitech C922 Tony Lindgren (1): ARM: dts: Fix duovero smsc interrupt for suspend Trond Myklebust (1): pNFS/flexfiles: Fix list corruption if the mirror count changes Valentin Longchamp (1): net: sched: export __netdev_watchdog_up() Vasily Averin (1): sunrpc: fixed rollback in rpc_gssd_dummy_populate() Vincenzo Frascino (1): s390/vdso: fix vDSO clock_getres() Waiman Long (1): mm/slab: use memzero_explicit() in kzfree() Wang Hai (1): mld: fix memory leak in ipv6_mc_destroy_dev() Will Deacon (1): arm64: sve: Fix build failure when ARM64_SVE=y and SYSCTL=n Xiaoyao Li (1): KVM: X86: Fix MSR range of APIC registers in X2APIC mode Yang Yingliang (1): net: fix memleak in register_netdevice() Yash Shah (1): RISC-V: Don't allow write+exec only page mapping request in mmap Yazen Ghannam (1): EDAC/amd64: Add Family 17h Model 30h PCI IDs Ye Bin (1): ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function Yick W. Tse (1): ALSA: usb-audio: add quirk for Denon DCD-1500RE Zekun Shen (1): net: alx: fix race condition in alx_remove Zhang Xiaoxu (2): cifs/smb3: Fix data inconsistent when punch hole cifs/smb3: Fix data inconsistent when zero file range Zheng Bin (2): loop: replace kill_bdev with invalidate_bdev xfs: add agf freeblocks verify in xfs_agf_verify guodeqing (1): net: Fix the arp error in some cases yu kuai (2): block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram() Makefile | 4 +- arch/arm/boot/dts/bcm-nsp.dtsi | 6 +- arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- arch/arm/mach-imx/pm-imx5.c | 6 +- arch/arm64/kernel/fpsimd.c | 31 ++++++---- arch/arm64/kernel/perf_regs.c | 25 +++++++- arch/riscv/include/asm/cmpxchg.h | 8 +-- arch/riscv/kernel/sys_riscv.c | 6 ++ arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/ptrace.c | 31 +++++++++- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso64/clock_getres.S | 10 ++-- arch/sparc/kernel/ptrace_32.c | 9 ++- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1 + arch/x86/kvm/mmu.c | 4 +- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/paging_tmpl.h | 7 ++- arch/x86/kvm/vmx.c | 5 +- arch/x86/kvm/x86.c | 4 +- arch/x86/lib/usercopy_64.c | 1 + block/bio-integrity.c | 1 - drivers/acpi/sysfs.c | 4 +- drivers/ata/libata-scsi.c | 9 ++- drivers/ata/sata_rcar.c | 11 ++-- drivers/base/regmap/regmap.c | 1 + drivers/block/loop.c | 6 +- drivers/char/hw_random/ks-sa-rng.c | 1 + drivers/edac/amd64_edac.c | 13 ++++ drivers/edac/amd64_edac.h | 3 + drivers/firmware/efi/esrt.c | 2 +- .../amd/display/modules/color/color_gamma.c | 2 +- drivers/gpu/drm/radeon/ni_dpm.c | 2 +- drivers/gpu/drm/rcar-du/Kconfig | 1 + drivers/i2c/busses/i2c-fsi.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 53 ++++++++++++---- drivers/i2c/i2c-core-smbus.c | 7 +++ drivers/infiniband/core/cma.c | 18 ++++++ drivers/infiniband/core/mad.c | 3 +- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 13 +++- drivers/md/dm-writecache.c | 4 ++ drivers/mtd/nand/raw/marvell_nand.c | 2 +- drivers/net/ethernet/atheros/alx/main.c | 9 +-- .../net/ethernet/broadcom/genet/bcmgenet.c | 8 +-- .../ethernet/broadcom/genet/bcmgenet_wol.c | 4 -- drivers/net/ethernet/broadcom/tg3.c | 4 +- drivers/net/ethernet/chelsio/cxgb4/l2t.c | 52 ++++++++-------- drivers/net/ethernet/ibm/ibmveth.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 21 +++++-- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_vf.c | 23 +++++-- drivers/net/ethernet/rocker/rocker_main.c | 4 +- drivers/net/phy/phy_device.c | 6 +- drivers/net/usb/ax88179_178a.c | 11 ++-- drivers/nvme/host/core.c | 1 - drivers/nvme/host/multipath.c | 32 +++++++--- drivers/regulator/pfuze100-regulator.c | 60 ++++++++++++------- drivers/s390/scsi/zfcp_erp.c | 13 +++- drivers/staging/erofs/unzip_vle.h | 20 +++---- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- drivers/usb/class/cdc-acm.c | 2 + drivers/usb/core/quirks.c | 3 +- drivers/usb/dwc2/gadget.c | 6 -- drivers/usb/dwc2/platform.c | 11 ++++ drivers/usb/gadget/udc/mv_udc_core.c | 3 +- drivers/usb/host/ehci-exynos.c | 5 +- drivers/usb/host/ehci-pci.c | 7 +++ drivers/usb/host/ohci-sm501.c | 1 + drivers/usb/host/xhci-mtk.c | 5 +- drivers/usb/host/xhci.c | 9 ++- drivers/usb/host/xhci.h | 2 +- drivers/usb/typec/tcpci_rt1711h.c | 31 ++++------ fs/btrfs/ctree.c | 4 +- fs/btrfs/extent-tree.c | 2 +- fs/btrfs/inode.c | 22 +++++-- fs/cifs/smb2ops.c | 12 ++++ fs/nfs/direct.c | 13 ++-- fs/nfs/file.c | 1 + fs/nfs/flexfilelayout/flexfilelayout.c | 11 ++-- fs/notify/fanotify/fanotify.c | 5 +- fs/ocfs2/dlmglue.c | 17 +++++- fs/ocfs2/ocfs2.h | 1 + fs/ocfs2/ocfs2_fs.h | 4 +- fs/ocfs2/suballoc.c | 9 ++- fs/xfs/libxfs/xfs_alloc.c | 16 +++++ include/linux/netdevice.h | 40 ++++++++++--- include/linux/qed/qed_chain.h | 26 ++++---- include/linux/virtio_net.h | 17 +++--- include/net/sctp/constants.h | 8 ++- include/net/sock.h | 1 - include/net/xfrm.h | 1 + kernel/sched/core.c | 3 +- kernel/sched/deadline.c | 1 + kernel/trace/blktrace.c | 13 ++++ kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace_events_trigger.c | 21 ++++++- mm/slab_common.c | 2 +- net/bridge/br_private.h | 2 +- net/core/dev.c | 19 +++--- net/core/filter.c | 6 +- net/core/sock.c | 4 +- net/ipv4/fib_semantics.c | 2 +- net/ipv4/ip_tunnel.c | 14 +++-- net/ipv4/tcp_cubic.c | 2 + net/ipv4/tcp_input.c | 26 ++++++-- net/ipv6/ip6_gre.c | 9 ++- net/ipv6/mcast.c | 1 + net/netfilter/ipset/ip_set_core.c | 2 + net/rxrpc/call_accept.c | 7 +++ net/rxrpc/input.c | 7 +-- net/sched/sch_cake.c | 58 ++++++++++++------ net/sched/sch_generic.c | 1 + net/sctp/associola.c | 5 +- net/sctp/bind_addr.c | 1 + net/sctp/protocol.c | 3 +- net/sunrpc/rpc_pipe.c | 1 + net/sunrpc/xdr.c | 4 ++ net/xfrm/xfrm_device.c | 4 +- scripts/Kbuild.include | 11 ++-- security/apparmor/lsm.c | 4 +- sound/pci/hda/patch_hdmi.c | 5 ++ sound/pci/hda/patch_realtek.c | 32 +++++++++- sound/soc/fsl/fsl_ssi.c | 13 ++-- sound/soc/qcom/qdsp6/q6asm.c | 7 ++- sound/soc/rockchip/rockchip_pdm.c | 4 +- sound/usb/mixer.c | 15 +++-- sound/usb/mixer.h | 9 ++- sound/usb/mixer_quirks.c | 3 +- sound/usb/quirks.c | 9 +++ 130 files changed, 875 insertions(+), 354 deletions(-) -- 2.25.1

4 years, 5 months

11
147
0 0

[PATCH] dt-bindings: iio: bmc150_magn: Document missing compatibles

by Krzysztof Kozlowski

The driver supports also BMC156B and BMM150B so document the compatibles for these devices. Fixes: 9d75db36df14 ("iio: magn: Add support for BMM150 magnetometer") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> --- The fixes tag is not accurate but at least offer some backporting. --- .../devicetree/bindings/iio/magnetometer/bmc150_magn.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt b/Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt index fd5fca90fb39..7469073022db 100644 --- a/Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt +++ b/Documentation/devicetree/bindings/iio/magnetometer/bmc150_magn.txt @@ -4,7 +4,10 @@ http://ae-bst.resource.bosch.com/media/products/dokumente/bmc150/BST-BMC150… Required properties: - - compatible : should be "bosch,bmc150_magn" + - compatible : should be one of: + "bosch,bmc150_magn" + "bosch,bmc156_magn" + "bosch,bmm150_magn" - reg : the I2C address of the magnetometer Optional properties: -- 2.17.1

4 years, 5 months

2
5
0 0

Re: [PATCH] crypto: af_alg - Fix regression on empty requests

by Naresh Kamboju

On Fri, 26 Jun 2020 at 12:00, Herbert Xu <herbert(a)gondor.apana.org.au> wrote: > > On Tue, Jun 23, 2020 at 10:02:17AM -0700, Eric Biggers wrote: > > > > The source code for the two failing AF_ALG tests is here: > > > > https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/cryp… > > https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/cryp… > > > > They use read() and write(), not send() and recv(). > > > > af_alg02 uses read() to read from a "salsa20" request socket without writing > > anything to it. It is expected that this returns 0, i.e. that behaves like > > encrypting an empty message. Since we are on this subject, LTP af_alg02 test case fails on stable 4.9 and stable 4.4 This is not a regression because the test case has been failing from the beginning. Is this test case expected to fail on stable 4.9 and 4.4 ? or any chance to fix this on these older branches ? Test output: af_alg02.c:52: BROK: Timed out while reading from request socket. ref: https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.228-19… https://qa-reports.linaro.org/lkft/linux-stable-rc-4.9-oe/build/v4.9.228-19… - Naresh

4 years, 5 months

3
2
0 0

[PATCH] crypto: ccp - Fix use of merged scatterlists

by John Allen

Running the crypto manager self tests with CONFIG_CRYPTO_MANAGER_EXTRA_TESTS may result in several types of errors when using the ccp-crypto driver: alg: skcipher: cbc-des3-ccp encryption failed on test vector 0; expected_error=0, actual_error=-5 ... alg: skcipher: ctr-aes-ccp decryption overran dst buffer on test vector 0 ... alg: ahash: sha224-ccp test failed (wrong result) on test vector ... These errors are the result of improper processing of scatterlists mapped for DMA. Given a scatterlist in which entries are merged as part of mapping the scatterlist for DMA, the DMA length of a merged entry will reflect the combined length of the entries that were merged. The subsequent scatterlist entry will contain DMA information for the scatterlist entry after the last merged entry, but the non-DMA information will be that of the first merged entry. The ccp driver does not take this scatterlist merging into account. To address this, add a second scatterlist pointer to track the current position in the DMA mapped representation of the scatterlist. Both the DMA representation and the original representation of the scatterlist must be tracked as while most of the driver can use just the DMA representation, scatterlist_map_and_copy() must use the original representation and expects the scatterlist pointer to be accurate to the original representation. In order to properly walk the original scatterlist, the scatterlist must be walked until the combined lengths of the entries seen is equal to the DMA length of the current entry being processed in the DMA mapped representation. Fixes: 63b945091a070 ("crypto: ccp - CCP device driver and interface support") Signed-off-by: John Allen <john.allen(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-ops.c | 37 +++++++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index 3f68262d9ab4..87a34d91fdf7 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -469,6 +469,7 @@ struct ccp_sg_workarea { unsigned int sg_used; struct scatterlist *dma_sg; + struct scatterlist *dma_sg_head; struct device *dma_dev; unsigned int dma_count; enum dma_data_direction dma_dir; diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c index 422193690fd4..64112c736810 100644 --- a/drivers/crypto/ccp/ccp-ops.c +++ b/drivers/crypto/ccp/ccp-ops.c @@ -63,7 +63,7 @@ static u32 ccp_gen_jobid(struct ccp_device *ccp) static void ccp_sg_free(struct ccp_sg_workarea *wa) { if (wa->dma_count) - dma_unmap_sg(wa->dma_dev, wa->dma_sg, wa->nents, wa->dma_dir); + dma_unmap_sg(wa->dma_dev, wa->dma_sg_head, wa->nents, wa->dma_dir); wa->dma_count = 0; } @@ -92,6 +92,7 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, return 0; wa->dma_sg = sg; + wa->dma_sg_head = sg; wa->dma_dev = dev; wa->dma_dir = dma_dir; wa->dma_count = dma_map_sg(dev, sg, wa->nents, dma_dir); @@ -104,14 +105,28 @@ static int ccp_init_sg_workarea(struct ccp_sg_workarea *wa, struct device *dev, static void ccp_update_sg_workarea(struct ccp_sg_workarea *wa, unsigned int len) { unsigned int nbytes = min_t(u64, len, wa->bytes_left); + unsigned int sg_combined_len = 0; if (!wa->sg) return; wa->sg_used += nbytes; wa->bytes_left -= nbytes; - if (wa->sg_used == wa->sg->length) { - wa->sg = sg_next(wa->sg); + if (wa->sg_used == sg_dma_len(wa->dma_sg)) { + /* Advance to the next DMA scatterlist entry */ + wa->dma_sg = sg_next(wa->dma_sg); + + /* In the case that the DMA mapped scatterlist has entries + * that have been merged, the non-DMA mapped scatterlist + * must be advanced multiple times for each merged entry. + * This ensures that the current non-DMA mapped entry + * corresponds to the current DMA mapped entry. + */ + do { + sg_combined_len += wa->sg->length; + wa->sg = sg_next(wa->sg); + } while (wa->sg_used > sg_combined_len); + wa->sg_used = 0; } } @@ -299,7 +314,7 @@ static unsigned int ccp_queue_buf(struct ccp_data *data, unsigned int from) /* Update the structures and generate the count */ buf_count = 0; while (sg_wa->bytes_left && (buf_count < dm_wa->length)) { - nbytes = min(sg_wa->sg->length - sg_wa->sg_used, + nbytes = min(sg_dma_len(sg_wa->dma_sg) - sg_wa->sg_used, dm_wa->length - buf_count); nbytes = min_t(u64, sg_wa->bytes_left, nbytes); @@ -331,11 +346,11 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, * and destination. The resulting len values will always be <= UINT_MAX * because the dma length is an unsigned int. */ - sg_src_len = sg_dma_len(src->sg_wa.sg) - src->sg_wa.sg_used; + sg_src_len = sg_dma_len(src->sg_wa.dma_sg) - src->sg_wa.sg_used; sg_src_len = min_t(u64, src->sg_wa.bytes_left, sg_src_len); if (dst) { - sg_dst_len = sg_dma_len(dst->sg_wa.sg) - dst->sg_wa.sg_used; + sg_dst_len = sg_dma_len(dst->sg_wa.dma_sg) - dst->sg_wa.sg_used; sg_dst_len = min_t(u64, src->sg_wa.bytes_left, sg_dst_len); op_len = min(sg_src_len, sg_dst_len); } else { @@ -365,7 +380,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, /* Enough data in the sg element, but we need to * adjust for any previously copied data */ - op->src.u.dma.address = sg_dma_address(src->sg_wa.sg); + op->src.u.dma.address = sg_dma_address(src->sg_wa.dma_sg); op->src.u.dma.offset = src->sg_wa.sg_used; op->src.u.dma.length = op_len & ~(block_size - 1); @@ -386,7 +401,7 @@ static void ccp_prepare_data(struct ccp_data *src, struct ccp_data *dst, /* Enough room in the sg element, but we need to * adjust for any previously used area */ - op->dst.u.dma.address = sg_dma_address(dst->sg_wa.sg); + op->dst.u.dma.address = sg_dma_address(dst->sg_wa.dma_sg); op->dst.u.dma.offset = dst->sg_wa.sg_used; op->dst.u.dma.length = op->src.u.dma.length; } @@ -2028,7 +2043,7 @@ ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) dst.sg_wa.sg_used = 0; for (i = 1; i <= src.sg_wa.dma_count; i++) { if (!dst.sg_wa.sg || - (dst.sg_wa.sg->length < src.sg_wa.sg->length)) { + (sg_dma_len(dst.sg_wa.sg) < sg_dma_len(src.sg_wa.sg))) { ret = -EINVAL; goto e_dst; } @@ -2054,8 +2069,8 @@ ccp_run_passthru_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) goto e_dst; } - dst.sg_wa.sg_used += src.sg_wa.sg->length; - if (dst.sg_wa.sg_used == dst.sg_wa.sg->length) { + dst.sg_wa.sg_used += sg_dma_len(src.sg_wa.sg); + if (dst.sg_wa.sg_used == sg_dma_len(dst.sg_wa.sg)) { dst.sg_wa.sg = sg_next(dst.sg_wa.sg); dst.sg_wa.sg_used = 0; } -- 2.18.4

4 years, 5 months

4
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2020