July 2020 - Linux-stable-mirror

patch "USB: serial: cp210x: re-enable auto-RTS on open" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: serial: cp210x: re-enable auto-RTS on open to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From c7614ff9b73a1e6fb2b1b51396da132ed22fecdb Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman(a)silabs.com> Date: Fri, 26 Jun 2020 04:24:20 +0000 Subject: USB: serial: cp210x: re-enable auto-RTS on open CP210x hardware disables auto-RTS but leaves auto-CTS when in hardware flow control mode and UART on cp210x hardware is disabled. When re-opening the port, if auto-CTS is enabled on the cp210x, then auto-RTS must be re-enabled in the driver. Signed-off-by: Brant Merryman <brant.merryman(a)silabs.com> Co-developed-by: Phu Luu <phu.luu(a)silabs.com> Signed-off-by: Phu Luu <phu.luu(a)silabs.com> Link: https://lore.kernel.org/r/ECCF8E73-91F3-4080-BE17-1714BC8818FB@silabs.com [ johan: fix up tags and problem description ] Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable(a)vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/cp210x.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index bcceb4ad8be0..a90801ef0055 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -917,6 +917,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, u32 baud; u16 bits; u32 ctl_hs; + u32 flow_repl; cp210x_read_u32_reg(port, CP210X_GET_BAUDRATE, &baud); @@ -1017,6 +1018,22 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, ctl_hs = le32_to_cpu(flow_ctl.ulControlHandshake); if (ctl_hs & CP210X_SERIAL_CTS_HANDSHAKE) { dev_dbg(dev, "%s - flow control = CRTSCTS\n", __func__); + /* + * When the port is closed, the CP210x hardware disables + * auto-RTS and RTS is deasserted but it leaves auto-CTS when + * in hardware flow control mode. When re-opening the port, if + * auto-CTS is enabled on the cp210x, then auto-RTS must be + * re-enabled in the driver. + */ + flow_repl = le32_to_cpu(flow_ctl.ulFlowReplace); + flow_repl &= ~CP210X_SERIAL_RTS_MASK; + flow_repl |= CP210X_SERIAL_RTS_SHIFT(CP210X_SERIAL_RTS_FLOW_CTL); + flow_ctl.ulFlowReplace = cpu_to_le32(flow_repl); + cp210x_write_reg_block(port, + CP210X_SET_FLOW, + &flow_ctl, + sizeof(flow_ctl)); + cflag |= CRTSCTS; } else { dev_dbg(dev, "%s - flow control = NONE\n", __func__); -- 2.27.0

4 years, 7 months

1
0
0 0

patch "USB: serial: cp210x: enable usb generic throttle/unthrottle" added to usb-next

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: serial: cp210x: enable usb generic throttle/unthrottle to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 4387b3dbb079d482d3c2b43a703ceed4dd27ed28 Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman(a)silabs.com> Date: Fri, 26 Jun 2020 04:22:58 +0000 Subject: USB: serial: cp210x: enable usb generic throttle/unthrottle Assign the .throttle and .unthrottle functions to be generic function in the driver structure to prevent data loss that can otherwise occur if the host does not enable USB throttling. Signed-off-by: Brant Merryman <brant.merryman(a)silabs.com> Co-developed-by: Phu Luu <phu.luu(a)silabs.com> Signed-off-by: Phu Luu <phu.luu(a)silabs.com> Link: https://lore.kernel.org/r/57401AF3-9961-461F-95E1-F8AFC2105F5E@silabs.com [ johan: fix up tags ] Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable(a)vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index f5143eedbc48..bcceb4ad8be0 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -272,6 +272,8 @@ static struct usb_serial_driver cp210x_device = { .break_ctl = cp210x_break_ctl, .set_termios = cp210x_set_termios, .tx_empty = cp210x_tx_empty, + .throttle = usb_serial_generic_throttle, + .unthrottle = usb_serial_generic_unthrottle, .tiocmget = cp210x_tiocmget, .tiocmset = cp210x_tiocmset, .attach = cp210x_attach, -- 2.27.0

4 years, 7 months

1
0
0 0

[PATCH 4.19 00/86] 4.19.135-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.135 release. There are 86 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, 29 Jul 2020 13:48:51 +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/v4.x/stable-review/patch-4.19.135-r… 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, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.135-rc1 Mark O'Donovan <shiftee(a)posteo.net> ath9k: Fix regression with Atheros 9271 Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix integrity recalculation that is improperly skipped Geert Uytterhoeven <geert(a)linux-m68k.org> ASoC: qcom: Drop HAS_DMA dependency to fix link failure Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it on the Lenovo Miix 2 10 Joerg Roedel <jroedel(a)suse.de> x86, vmlinux.lds: Page-align end of ..page_aligned sections John David Anglin <dave.anglin(a)bell.net> parisc: Add atomic64_set_release() define to avoid CPU soft lockups Qiu Wenbo <qiuwenbo(a)phytium.com.cn> drm/amd/powerplay: fix a crash when overclocking Vega M Paweł Gronowski <me(a)woland.xyz> drm/amdgpu: Fix NULL dereference in dpm sysfs handlers Michael J. Ruhl <michael.j.ruhl(a)intel.com> io-mapping: indicate mapping failure Muchun Song <songmuchun(a)bytedance.com> mm: memcg/slab: fix memory leak at non-root kmem_cache destroy Hugh Dickins <hughd(a)google.com> mm/memcg: fix refcount error while moving and swapping Fangrui Song <maskray(a)google.com> Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> vt: Reject zero-sized screen buffer size. Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. Serge Semin <Sergey.Semin(a)baikalelectronics.ru> serial: 8250_mtk: Fix high-speed baud rates clamping Yang Yingliang <yangyingliang(a)huawei.com> serial: 8250: fix null-ptr-deref in serial8250_start_tx() Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift Rustam Kovhaev <rkovhaev(a)gmail.com> staging: wlan-ng: properly check endpoint types Steve French <stfrench(a)microsoft.com> Revert "cifs: Fix the target file was deleted when rename failed." Forest Crossman <cyrozap(a)gmail.com> usb: xhci: Fix ASM2142/ASM3142 DMA addressing Chunfeng Yun <chunfeng.yun(a)mediatek.com> usb: xhci-mtk: fix the failure of bandwidth allocation Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> binder: Don't use mmput() from shrinker function. Palmer Dabbelt <palmerdabbelt(a)google.com> RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw Arnd Bergmann <arnd(a)arndb.de> x86: math-emu: Fix up 'cmp' insn for clang ias Will Deacon <will(a)kernel.org> arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP Cristian Marussi <cristian.marussi(a)arm.com> hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe() Chu Lin <linchuyuan(a)google.com> hwmon: (adm1275) Make sure we are reading enough data for different chips Evgeny Novikov <novikov(a)ispras.ru> usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init() Derek Basehore <dbasehore(a)chromium.org> Input: elan_i2c - only increment wakeup count on touch Ilya Katsnelson <me(a)0upti.me> Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen Leonid Ravich <Leonid.Ravich(a)emc.com> dmaengine: ioat setting ioat timeout as module parameter Evgeny Novikov <novikov(a)ispras.ru> hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow Marc Kleine-Budde <mkl(a)pengutronix.de> regmap: dev_get_regmap_match(): fix string comparison leilk.liu <leilk.liu(a)mediatek.com> spi: mediatek: use correct SPI_CFG2_REG MACRO Merlijn Wajer <merlijn(a)wizzup.org> Input: add `SW_MACHINE_COVER` Dinghao Liu <dinghao.liu(a)zju.edu.cn> dmaengine: tegra210-adma: Fix runtime PM imbalance on error Hans de Goede <hdegoede(a)redhat.com> HID: apple: Disable Fn-key key-re-mapping on clone keyboards Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> HID: steam: fixes race in handling device list. Caiyuan Xie <caiyuan.xie(a)cn.alps.com> HID: alps: support devices with report id 2 Federico Ricchiuto <fed.ricchiuto(a)gmail.com> HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override Stefano Garzarella <sgarzare(a)redhat.com> scripts/gdb: fix lx-symbols 'gdb.error' while loading modules Pi-Hsun Shih <pihsun(a)chromium.org> scripts/decode_stacktrace: strip basepath from all paths Matthew Howell <matthew.howell(a)sealevel.com> serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X Cong Wang <xiyou.wangcong(a)gmail.com> bonding: check return value of register_netdevice() in bond_newlink() Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: always clear ICSAR to avoid side effects Wang Hai <wanghai38(a)huawei.com> net: ethernet: ave: Fix error returns in ave_init guodeqing <geffrey.guo(a)huawei.com> ipvs: fix the connection sync failed in some cases Alexander Lobakin <alobakin(a)marvell.com> qed: suppress "don't support RoCE & iWARP" flooding on HW init Liu Jian <liujian56(a)huawei.com> mlxsw: destroy workqueue when trap_register in mlxsw_emad_init Taehee Yoo <ap420073(a)gmail.com> bonding: check error value of register_netdevice() immediately Wang Hai <wanghai38(a)huawei.com> net: smc91x: Fix possible memory leak in smc_drv_probe() Chen-Yu Tsai <wens(a)csie.org> drm: sun4i: hdmi: Fix inverted HPD result Liu Jian <liujian56(a)huawei.com> ieee802154: fix one possible memleak in adf7242_probe Sergey Organov <sorganov(a)gmail.com> net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration George Kennedy <george.kennedy(a)oracle.com> ax88172a: fix ax88172a_unbind() failures Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path Matthew Gerlach <matthew.gerlach(a)linux.intel.com> fpga: dfl: fix bug in port reset handshake Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix race when modifying pause settings. Robbie Ko <robbieko(a)synology.com> btrfs: fix page leaks after failure to lock page for delalloc Boris Burkov <boris(a)bur.io> btrfs: fix mount failure caused by race with umount Filipe Manana <fdmanana(a)suse.com> btrfs: fix double free on ulist after backref resolution failure Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Correct RT5670_LDO_SEL_MASK Takashi Iwai <tiwai(a)suse.de> ALSA: info: Drop WARN_ON() from buffer NULL sanity check Oleg Nesterov <oleg(a)redhat.com> uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression Yang Yingliang <yangyingliang(a)huawei.com> IB/umem: fix reference count leak in ib_umem_odp_get() Jon Maloy <jon.maloy(a)ericsson.com> tipc: clean up skb list lock handling on send path Vladimir Oltean <olteanv(a)gmail.com> spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours Olga Kornievskaia <kolga(a)netapp.com> SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion") Thomas Gleixner <tglx(a)linutronix.de> irqdomain/treewide: Keep firmware node unconditionally allocated Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix weird page warning Gavin Shan <gshan(a)redhat.com> drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Tom Rix <trix(a)redhat.com> net: sky2: initialize return of gm_phy_read Xie He <xie.he.0141(a)gmail.com> drivers/net/wan/lapbether: Fixed the value of hard_header_len Max Filippov <jcmvbkbc(a)gmail.com> xtensa: update *pos in cpuinfo_op.next Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix __sync_fetch_and_{and,or}_4 declarations Tom Rix <trix(a)redhat.com> scsi: scsi_transport_spi: Fix function pointer check Markus Theil <markus.theil(a)tu-ilmenau.de> mac80211: allow rx of mesh eapol frames with default rx key Jacky Hu <hengqing.hu(a)gmail.com> pinctrl: amd: fix npins for uart0 in kerncz_groups Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: put pm_runtime in case of failure Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: handle pm_runtime_get_sync failure case Douglas Anderson <dianders(a)chromium.org> soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner ------------- Diffstat: Makefile | 6 +- arch/arm64/kernel/debug-monitors.c | 4 +- arch/parisc/include/asm/atomic.h | 2 + arch/riscv/include/asm/barrier.h | 10 ++- arch/x86/kernel/apic/io_apic.c | 10 +-- arch/x86/kernel/apic/msi.c | 18 ++++-- arch/x86/kernel/apic/vector.c | 1 - arch/x86/kernel/vmlinux.lds.S | 1 + arch/x86/math-emu/wm_sqrt.S | 2 +- arch/x86/platform/uv/uv_irq.c | 3 +- arch/xtensa/kernel/setup.c | 3 +- arch/xtensa/kernel/xtensa_ksyms.c | 4 +- drivers/android/binder_alloc.c | 2 +- drivers/base/regmap/regmap.c | 2 +- drivers/dma/ioat/dma.c | 12 ++++ drivers/dma/ioat/dma.h | 2 - drivers/dma/tegra210-adma.c | 5 +- drivers/firmware/psci_checker.c | 5 +- drivers/fpga/dfl-afu-main.c | 3 +- drivers/gpio/gpio-arizona.c | 7 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +-- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 10 +-- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- drivers/hid/hid-alps.c | 2 + drivers/hid/hid-apple.c | 18 ++++++ drivers/hid/hid-steam.c | 6 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 +++ drivers/hwmon/aspeed-pwm-tacho.c | 2 + drivers/hwmon/pmbus/adm1275.c | 10 ++- drivers/hwmon/scmi-hwmon.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 3 + drivers/infiniband/core/umem_odp.c | 3 +- drivers/input/mouse/elan_i2c_core.c | 7 ++- drivers/input/mouse/synaptics.c | 1 + drivers/iommu/amd_iommu.c | 5 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/md/dm-integrity.c | 4 +- drivers/md/dm.c | 17 ++++++ drivers/net/bonding/bond_main.c | 10 ++- drivers/net/bonding/bond_netlink.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 +- drivers/net/ethernet/qlogic/qed/qed_cxt.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 4 +- drivers/net/ethernet/socionext/sni_ave.c | 2 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/phy/dp83640.c | 4 ++ drivers/net/usb/ax88172a.c | 1 + drivers/net/wan/lapbether.c | 9 ++- drivers/net/wireless/ath/ath9k/hif_usb.c | 52 ++++++++++++---- drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ++ drivers/pci/controller/vmd.c | 5 +- drivers/pinctrl/pinctrl-amd.h | 2 +- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/soc/qcom/rpmh.c | 8 +-- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-mt65xx.c | 15 ++--- drivers/staging/comedi/drivers/addi_apci_1032.c | 20 ++++-- drivers/staging/comedi/drivers/addi_apci_1500.c | 24 ++++++-- drivers/staging/comedi/drivers/addi_apci_1564.c | 20 ++++-- drivers/staging/comedi/drivers/ni_6527.c | 2 +- drivers/staging/wlan-ng/prism2usb.c | 16 ++++- drivers/tty/serial/8250/8250_core.c | 2 +- drivers/tty/serial/8250/8250_exar.c | 12 +++- drivers/tty/serial/8250/8250_mtk.c | 18 ++++++ drivers/tty/vt/vt.c | 29 +++++---- drivers/usb/gadget/udc/gr_udc.c | 7 ++- drivers/usb/host/xhci-mtk-sch.c | 4 ++ drivers/usb/host/xhci-pci.c | 3 + drivers/video/fbdev/core/bitblit.c | 4 +- drivers/video/fbdev/core/fbcon_ccw.c | 4 +- drivers/video/fbdev/core/fbcon_cw.c | 4 +- drivers/video/fbdev/core/fbcon_ud.c | 4 +- fs/btrfs/backref.c | 1 + fs/btrfs/extent_io.c | 3 +- fs/btrfs/volumes.c | 8 +++ fs/cifs/inode.c | 10 +-- fs/fuse/dev.c | 3 +- fs/nfs/direct.c | 13 ++-- fs/nfs/file.c | 1 - include/asm-generic/vmlinux.lds.h | 5 +- include/linux/device-mapper.h | 1 + include/linux/io-mapping.h | 5 +- include/linux/mod_devicetable.h | 2 +- include/sound/rt5670.h | 1 + include/uapi/linux/input-event-codes.h | 3 +- kernel/events/uprobes.c | 2 +- mm/memcontrol.c | 4 +- mm/slab_common.c | 35 ++++++++--- net/mac80211/rx.c | 26 ++++++++ net/netfilter/ipvs/ip_vs_sync.c | 12 ++-- net/tipc/bcast.c | 8 +-- net/tipc/group.c | 4 +- net/tipc/link.c | 12 ++-- net/tipc/node.c | 7 ++- net/tipc/socket.c | 12 ++-- scripts/decode_stacktrace.sh | 4 +- scripts/gdb/linux/symbols.py | 2 +- sound/core/info.c | 4 +- sound/soc/codecs/rt5670.c | 71 +++++++++++++++++----- sound/soc/codecs/rt5670.h | 2 +- sound/soc/qcom/Kconfig | 2 +- 106 files changed, 578 insertions(+), 225 deletions(-)

4 years, 7 months

12
109
0 0

[PATCH v3 bpf 1/2] bpf: fix map leak in HASH_OF_MAPS map

by Andrii Nakryiko

Fix HASH_OF_MAPS bug of not putting inner map pointer on bpf_map_elem_update() operation. This is due to per-cpu extra_elems optimization, which bypassed free_htab_elem() logic doing proper clean ups. Make sure that inner map is put properly in optimized case as well. Fixes: 8c290e60fa2a ("bpf: fix hashmap extra_elems logic") Acked-by: Song Liu <songliubraving(a)fb.com> Cc: <stable(a)vger.kernel.org> # v4.14+ Signed-off-by: Andrii Nakryiko <andriin(a)fb.com> --- kernel/bpf/hashtab.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index b4b288a3c3c9..b32cc8ce8ff6 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -779,15 +779,20 @@ static void htab_elem_free_rcu(struct rcu_head *head) htab_elem_free(htab, l); } -static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) +static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l) { struct bpf_map *map = &htab->map; + void *ptr; if (map->ops->map_fd_put_ptr) { - void *ptr = fd_htab_map_get_ptr(map, l); - + ptr = fd_htab_map_get_ptr(map, l); map->ops->map_fd_put_ptr(ptr); } +} + +static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) +{ + htab_put_fd_value(htab, l); if (htab_is_prealloc(htab)) { __pcpu_freelist_push(&htab->freelist, &l->fnode); @@ -839,6 +844,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, */ pl_new = this_cpu_ptr(htab->extra_elems); l_new = *pl_new; + htab_put_fd_value(htab, old_elem); *pl_new = old_elem; } else { struct pcpu_freelist_node *l; -- 2.24.1

4 years, 7 months

2
2
0 0

[PATCH 5.4 000/138] 5.4.54-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.54 release. There are 138 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, 29 Jul 2020 13:48:51 +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.4.54-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.54-rc1 Mark O'Donovan <shiftee(a)posteo.net> ath9k: Fix regression with Atheros 9271 Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix integrity recalculation that is improperly skipped Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: topology: fix tlvs in error handling for widget_dmixer Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> ASoC: topology: fix kernel oops on route addition error Geert Uytterhoeven <geert(a)linux-m68k.org> ASoC: qcom: Drop HAS_DMA dependency to fix link failure Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it on the Lenovo Miix 2 10 Joerg Roedel <jroedel(a)suse.de> x86, vmlinux.lds: Page-align end of ..page_aligned sections John David Anglin <dave.anglin(a)bell.net> parisc: Add atomic64_set_release() define to avoid CPU soft lockups Qiu Wenbo <qiuwenbo(a)phytium.com.cn> drm/amd/powerplay: fix a crash when overclocking Vega M Paweł Gronowski <me(a)woland.xyz> drm/amdgpu: Fix NULL dereference in dpm sysfs handlers Eddie James <eajames(a)linux.ibm.com> mmc: sdhci-of-aspeed: Fix clock divider calculation Michael J. Ruhl <michael.j.ruhl(a)intel.com> io-mapping: indicate mapping failure Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> khugepaged: fix null-pointer dereference due to race Muchun Song <songmuchun(a)bytedance.com> mm: memcg/slab: fix memory leak at non-root kmem_cache destroy Hugh Dickins <hughd(a)google.com> mm/memcg: fix refcount error while moving and swapping Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> mm/mmap.c: close race between munmap() and expand_upwards()/downwards() Fangrui Song <maskray(a)google.com> Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> vt: Reject zero-sized screen buffer size. Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. Eric Biggers <ebiggers(a)google.com> /dev/mem: Add missing memory barriers for devmem_inode Serge Semin <Sergey.Semin(a)baikalelectronics.ru> serial: 8250_mtk: Fix high-speed baud rates clamping Yang Yingliang <yangyingliang(a)huawei.com> serial: 8250: fix null-ptr-deref in serial8250_start_tx() Johan Hovold <johan(a)kernel.org> serial: tegra: fix CREAD handling for PIO Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift Rustam Kovhaev <rkovhaev(a)gmail.com> staging: wlan-ng: properly check endpoint types Helmut Grohne <helmut.grohne(a)intenta.de> tty: xilinx_uartps: Really fix id assignment Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: don't call iwl_mvm_free_inactive_queue() under RCU Steve French <stfrench(a)microsoft.com> Revert "cifs: Fix the target file was deleted when rename failed." Forest Crossman <cyrozap(a)gmail.com> usb: xhci: Fix ASM2142/ASM3142 DMA addressing Chunfeng Yun <chunfeng.yun(a)mediatek.com> usb: xhci-mtk: fix the failure of bandwidth allocation Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> binder: Don't use mmput() from shrinker function. Palmer Dabbelt <palmerdabbelt(a)google.com> RISC-V: Upgrade smp_mb__after_spinlock() to iorw,iorw Qi Liu <liuqi115(a)huawei.com> drivers/perf: Prevent forced unbinding of PMU drivers Will Deacon <will(a)kernel.org> asm-generic/mmiowb: Allow mmiowb_set_pending() when preemptible() Arnd Bergmann <arnd(a)arndb.de> x86: math-emu: Fix up 'cmp' insn for clang ias Will Deacon <will(a)kernel.org> arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP Qi Liu <liuqi115(a)huawei.com> drivers/perf: Fix kernel panic when rmmod PMU modules during perf sampling PeiSen Hou <pshou(a)realtek.com.tw> ALSA: hda/realtek - fixup for yet another Intel reference board Cristian Marussi <cristian.marussi(a)arm.com> hwmon: (scmi) Fix potential buffer overflow in scmi_hwmon_probe() Vasiliy Kupriakov <rublag-ns(a)yandex.ru> platform/x86: asus-wmi: allow BAT1 battery name Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> platform/x86: ISST: Add new PCI device ids Guenter Roeck <linux(a)roeck-us.net> hwmon: (nct6775) Accept PECI Calibration as temperature source for NCT6798D Jack Xiao <Jack.Xiao(a)amd.com> drm/amdgpu: fix preemption unit test Jack Xiao <Jack.Xiao(a)amd.com> drm/amdgpu/gfx10: fix race condition for kiq Chu Lin <linchuyuan(a)google.com> hwmon: (adm1275) Make sure we are reading enough data for different chips Peter Chen <peter.chen(a)nxp.com> usb: cdns3: trace: fix some endian issues Peter Chen <peter.chen(a)nxp.com> usb: cdns3: ep0: fix some endian issues Evgeny Novikov <novikov(a)ispras.ru> usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init() Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: dwc3: pci: add support for the Intel Jasper Lake Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: dwc3: pci: add support for the Intel Tiger Lake PCH -H variant Derek Basehore <dbasehore(a)chromium.org> Input: elan_i2c - only increment wakeup count on touch Ilya Katsnelson <me(a)0upti.me> Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen Leonid Ravich <Leonid.Ravich(a)emc.com> dmaengine: ioat setting ioat timeout as module parameter Angelo Dureghello <angelo.dureghello(a)timesys.com> dmaengine: fsl-edma: fix wrong tcd endianness for big-endian cpu Evgeny Novikov <novikov(a)ispras.ru> hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow Marc Kleine-Budde <mkl(a)pengutronix.de> regmap: dev_get_regmap_match(): fix string comparison leilk.liu <leilk.liu(a)mediatek.com> spi: mediatek: use correct SPI_CFG2_REG MACRO Merlijn Wajer <merlijn(a)wizzup.org> ARM: dts: n900: remove mmc1 card detect gpio Merlijn Wajer <merlijn(a)wizzup.org> Input: add `SW_MACHINE_COVER` Dinghao Liu <dinghao.liu(a)zju.edu.cn> dmaengine: tegra210-adma: Fix runtime PM imbalance on error Hans de Goede <hdegoede(a)redhat.com> HID: apple: Disable Fn-key key-re-mapping on clone keyboards Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> HID: steam: fixes race in handling device list. Caiyuan Xie <caiyuan.xie(a)cn.alps.com> HID: alps: support devices with report id 2 Federico Ricchiuto <fed.ricchiuto(a)gmail.com> HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override Stefano Garzarella <sgarzare(a)redhat.com> scripts/gdb: fix lx-symbols 'gdb.error' while loading modules Pi-Hsun Shih <pihsun(a)chromium.org> scripts/decode_stacktrace: strip basepath from all paths Matthew Howell <matthew.howell(a)sealevel.com> serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X Cong Wang <xiyou.wangcong(a)gmail.com> geneve: fix an uninitialized value in geneve_changelink() Cong Wang <xiyou.wangcong(a)gmail.com> bonding: check return value of register_netdevice() in bond_newlink() Douglas Anderson <dianders(a)chromium.org> i2c: i2c-qcom-geni: Fix DMA transfer race Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: always clear ICSAR to avoid side effects Claudiu Manoil <claudiu.manoil(a)nxp.com> enetc: Remove the mdio bus on PF probe bailout J. Bruce Fields <bfields(a)redhat.com> nfsd4: fix NULL dereference in nfsd/clients display code Bjorn Helgaas <bhelgaas(a)google.com> Revert "PCI/PM: Assume ports without DLL Link Active train links in 100 ms" Wang Hai <wanghai38(a)huawei.com> net: ethernet: ave: Fix error returns in ave_init guodeqing <geffrey.guo(a)huawei.com> ipvs: fix the connection sync failed in some cases Alexander Lobakin <alobakin(a)marvell.com> qed: suppress false-positives interrupt error messages on HW init Alexander Lobakin <alobakin(a)marvell.com> qed: suppress "don't support RoCE & iWARP" flooding on HW init Taehee Yoo <ap420073(a)gmail.com> netdevsim: fix unbalaced locking in nsim_create() Helmut Grohne <helmut.grohne(a)intenta.de> net: dsa: microchip: call phy_remove_link_mode during probe Yunsheng Lin <linyunsheng(a)huawei.com> net: hns3: fix error handling for desc filling Huang Guobin <huangguobin4(a)huawei.com> net: ag71xx: add missed clk_disable_unprepare in error path of probe Shannon Nelson <snelson(a)pensando.io> ionic: fix up filter locks and debug msgs Shannon Nelson <snelson(a)pensando.io> ionic: use offset for ethtool regs data Liu Jian <liujian56(a)huawei.com> mlxsw: destroy workqueue when trap_register in mlxsw_emad_init Taehee Yoo <ap420073(a)gmail.com> bonding: check error value of register_netdevice() immediately Wang Hai <wanghai38(a)huawei.com> net: smc91x: Fix possible memory leak in smc_drv_probe() Chen-Yu Tsai <wens(a)csie.org> drm: sun4i: hdmi: Fix inverted HPD result Liu Jian <liujian56(a)huawei.com> ieee802154: fix one possible memleak in adf7242_probe Sergey Organov <sorganov(a)gmail.com> net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration Jing Xiangfeng <jingxiangfeng(a)huawei.com> ASoC: Intel: bytcht_es8316: Add missed put_device() Maor Gottlieb <maorg(a)mellanox.com> RDMA/mlx5: Use xa_lock_irq when access to SRQ table George Kennedy <george.kennedy(a)oracle.com> ax88172a: fix ax88172a_unbind() failures Stefano Garzarella <sgarzare(a)redhat.com> vsock/virtio: annotate 'the_virtio_vsock' RCU pointer Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path Matthew Gerlach <matthew.gerlach(a)linux.intel.com> fpga: dfl: fix bug in port reset handshake Xu Yilun <yilun.xu(a)intel.com> fpga: dfl: pci: reduce the scope of variable 'ret' Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Fix completion ring sizing with TPA enabled. Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix race when modifying pause settings. Robbie Ko <robbieko(a)synology.com> btrfs: fix page leaks after failure to lock page for delalloc Boris Burkov <boris(a)bur.io> btrfs: fix mount failure caused by race with umount Filipe Manana <fdmanana(a)suse.com> btrfs: fix double free on ulist after backref resolution failure Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Correct RT5670_LDO_SEL_MASK Takashi Iwai <tiwai(a)suse.de> ALSA: info: Drop WARN_ON() from buffer NULL sanity check Joonho Wohn <doomsheart(a)gmail.com> ALSA: hda/realtek: Fixed ALC298 sound bug by adding quirk for Samsung Notebook Pen S Oleg Nesterov <oleg(a)redhat.com> uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression Qu Wenruo <wqu(a)suse.com> btrfs: reloc: clear DEAD_RELOC_TREE bit for orphan roots to prevent runaway balance Qu Wenruo <wqu(a)suse.com> btrfs: reloc: fix reloc root leak and NULL pointer dereference Olga Kornievskaia <kolga(a)netapp.com> SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion") Ming Lei <ming.lei(a)redhat.com> dm: do not use waitqueue for request-based DM Gabriel Krisman Bertazi <krisman(a)collabora.com> dm mpath: pass IO start time to path selector Jerry (Fangzhi) Zuo <Jerry.Zuo(a)amd.com> drm/amd/display: Check DMCU Exists Before Loading Charan Teja Kalla <charante(a)codeaurora.org> dmabuf: use spinlock to access dmabuf->name Tim Harvey <tharvey(a)gateworks.com> ARM: dts: imx6qdl-gw551x: fix audio SSI Fabio Estevam <festevam(a)gmail.com> ARM: dts: imx6qdl-gw551x: Do not use 'simple-audio-card,dai-link' Thomas Gleixner <tglx(a)linutronix.de> irqdomain/treewide: Keep firmware node unconditionally allocated Miklos Szeredi <mszeredi(a)redhat.com> fuse: fix weird page warning Gavin Shan <gshan(a)redhat.com> drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() Christoph Hellwig <hch(a)lst.de> dm: use bio_uninit instead of bio_disassociate_blkg Steve Schremmer <steve.schremmer(a)netapp.com> scsi: dh: Add Fujitsu device to devinfo and dh lists Johannes Thumshirn <johannes.thumshirn(a)wdc.com> scsi: mpt3sas: Fix error returns in BRM_status_show Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Tom Rix <trix(a)redhat.com> net: sky2: initialize return of gm_phy_read Kai Vehmanen <kai.vehmanen(a)linux.intel.com> ALSA: hda/hdmi: fix failures at PCM open on Intel ICL and later Xie He <xie.he.0141(a)gmail.com> drivers/net/wan/lapbether: Fixed the value of hard_header_len Damien Le Moal <damien.lemoal(a)wdc.com> scsi: mpt3sas: Fix unlock imbalance Max Filippov <jcmvbkbc(a)gmail.com> xtensa: update *pos in cpuinfo_op.next Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix __sync_fetch_and_{and,or}_4 declarations Tom Rix <trix(a)redhat.com> scsi: scsi_transport_spi: Fix function pointer check Markus Theil <markus.theil(a)tu-ilmenau.de> mac80211: allow rx of mesh eapol frames with default rx key Jacky Hu <hengqing.hu(a)gmail.com> pinctrl: amd: fix npins for uart0 in kerncz_groups Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: put pm_runtime in case of failure Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: handle pm_runtime_get_sync failure case Douglas Anderson <dianders(a)chromium.org> soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner ------------- Diffstat: Makefile | 6 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 19 ++--- arch/arm/boot/dts/omap3-n900.dts | 12 ++- arch/arm64/kernel/debug-monitors.c | 4 +- arch/mips/pci/pci-xtalk-bridge.c | 5 +- arch/parisc/include/asm/atomic.h | 2 + arch/riscv/include/asm/barrier.h | 10 ++- arch/x86/kernel/apic/io_apic.c | 10 +-- arch/x86/kernel/apic/msi.c | 18 +++-- arch/x86/kernel/apic/vector.c | 1 - arch/x86/kernel/vmlinux.lds.S | 1 + arch/x86/math-emu/wm_sqrt.S | 2 +- arch/x86/platform/uv/uv_irq.c | 3 +- arch/xtensa/kernel/setup.c | 3 +- arch/xtensa/kernel/xtensa_ksyms.c | 4 +- drivers/android/binder_alloc.c | 2 +- drivers/base/regmap/regmap.c | 2 +- drivers/char/mem.c | 10 ++- drivers/dma-buf/dma-buf.c | 11 ++- drivers/dma/fsl-edma-common.c | 26 ++++--- drivers/dma/ioat/dma.c | 12 +++ drivers/dma/ioat/dma.h | 2 - drivers/dma/tegra210-adma.c | 5 +- drivers/firmware/psci/psci_checker.c | 5 +- drivers/fpga/dfl-afu-main.c | 3 +- drivers/fpga/dfl-pci.c | 3 +- drivers/gpio/gpio-arizona.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 20 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 +-- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 9 ++- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 +- .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 10 ++- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- drivers/hid/hid-alps.c | 2 + drivers/hid/hid-apple.c | 18 +++++ drivers/hid/hid-steam.c | 6 +- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++ drivers/hwmon/aspeed-pwm-tacho.c | 2 + drivers/hwmon/nct6775.c | 6 +- drivers/hwmon/pmbus/adm1275.c | 10 ++- drivers/hwmon/scmi-hwmon.c | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 6 +- drivers/i2c/busses/i2c-rcar.c | 3 + drivers/infiniband/hw/mlx5/srq_cmd.c | 4 +- drivers/input/mouse/elan_i2c_core.c | 9 ++- drivers/input/mouse/synaptics.c | 1 + drivers/iommu/amd_iommu.c | 5 +- drivers/iommu/hyperv-iommu.c | 5 +- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/md/dm-integrity.c | 4 +- drivers/md/dm-mpath.c | 9 ++- drivers/md/dm-path-selector.h | 2 +- drivers/md/dm-queue-length.c | 2 +- drivers/md/dm-rq.c | 4 - drivers/md/dm-service-time.c | 2 +- drivers/md/dm.c | 87 ++++++++++++++++------ drivers/mmc/host/sdhci-of-aspeed.c | 2 +- drivers/net/bonding/bond_main.c | 10 ++- drivers/net/bonding/bond_netlink.c | 3 +- drivers/net/dsa/microchip/ksz9477.c | 42 ++++++----- drivers/net/dsa/microchip/ksz_common.c | 2 - drivers/net/dsa/microchip/ksz_common.h | 2 - drivers/net/ethernet/atheros/ag71xx.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 ++- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 1 + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 1 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 ++ drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 +- .../net/ethernet/pensando/ionic/ionic_ethtool.c | 7 +- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 ++--- .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 5 ++ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 4 +- drivers/net/ethernet/qlogic/qed/qed_dev.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 50 +++++++------ drivers/net/ethernet/qlogic/qed/qed_int.h | 4 +- drivers/net/ethernet/smsc/smc91x.c | 4 +- drivers/net/ethernet/socionext/sni_ave.c | 2 +- drivers/net/geneve.c | 2 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/ieee802154/adf7242.c | 4 +- drivers/net/netdevsim/netdev.c | 4 +- drivers/net/phy/dp83640.c | 4 + drivers/net/usb/ax88172a.c | 1 + drivers/net/wan/lapbether.c | 9 ++- drivers/net/wireless/ath/ath9k/hif_usb.c | 52 ++++++++++--- drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ++ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +- drivers/pci/controller/vmd.c | 5 +- drivers/pci/pci.c | 30 +++----- drivers/perf/arm-cci.c | 1 + drivers/perf/arm-ccn.c | 1 + drivers/perf/arm_dsu_pmu.c | 1 + drivers/perf/arm_smmuv3_pmu.c | 2 + drivers/perf/arm_spe_pmu.c | 1 + drivers/perf/fsl_imx8_ddr_perf.c | 2 + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 + drivers/perf/qcom_l2_pmu.c | 1 + drivers/perf/qcom_l3_pmu.c | 1 + drivers/perf/thunderx2_pmu.c | 1 + drivers/perf/xgene_pmu.c | 1 + drivers/pinctrl/pinctrl-amd.h | 2 +- drivers/platform/x86/asus-wmi.c | 1 + .../x86/intel_speed_select_if/isst_if_common.h | 3 + .../x86/intel_speed_select_if/isst_if_mbox_pci.c | 1 + .../x86/intel_speed_select_if/isst_if_mmio.c | 1 + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 12 +-- drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/scsi_dh.c | 1 + drivers/scsi/scsi_transport_spi.c | 2 +- drivers/soc/qcom/rpmh.c | 8 +- drivers/spi/spi-mt65xx.c | 15 ++-- drivers/staging/comedi/drivers/addi_apci_1032.c | 20 +++-- drivers/staging/comedi/drivers/addi_apci_1500.c | 24 ++++-- drivers/staging/comedi/drivers/addi_apci_1564.c | 20 +++-- drivers/staging/comedi/drivers/ni_6527.c | 2 +- drivers/staging/wlan-ng/prism2usb.c | 16 +++- drivers/tty/serial/8250/8250_core.c | 2 +- drivers/tty/serial/8250/8250_exar.c | 12 ++- drivers/tty/serial/8250/8250_mtk.c | 18 +++++ drivers/tty/serial/serial-tegra.c | 7 +- drivers/tty/serial/xilinx_uartps.c | 8 +- drivers/tty/vt/vt.c | 29 +++++--- drivers/usb/cdns3/ep0.c | 30 ++++---- drivers/usb/cdns3/trace.h | 6 +- drivers/usb/dwc3/dwc3-pci.c | 8 ++ drivers/usb/gadget/udc/gr_udc.c | 7 +- drivers/usb/host/xhci-mtk-sch.c | 4 + drivers/usb/host/xhci-pci.c | 3 + drivers/video/fbdev/core/bitblit.c | 4 +- drivers/video/fbdev/core/fbcon_ccw.c | 4 +- drivers/video/fbdev/core/fbcon_cw.c | 4 +- drivers/video/fbdev/core/fbcon_ud.c | 4 +- fs/btrfs/backref.c | 1 + fs/btrfs/extent_io.c | 3 +- fs/btrfs/relocation.c | 11 ++- fs/btrfs/volumes.c | 8 ++ fs/cifs/inode.c | 10 +-- fs/fuse/dev.c | 3 +- fs/nfs/direct.c | 13 +--- fs/nfs/file.c | 1 - fs/nfsd/nfs4state.c | 20 ++++- include/asm-generic/mmiowb.h | 6 +- include/asm-generic/vmlinux.lds.h | 5 +- include/linux/device-mapper.h | 3 + include/linux/dma-buf.h | 1 + include/linux/io-mapping.h | 5 +- include/linux/mod_devicetable.h | 2 +- include/sound/rt5670.h | 1 + include/uapi/linux/input-event-codes.h | 3 +- kernel/events/uprobes.c | 2 +- mm/khugepaged.c | 3 + mm/memcontrol.c | 4 +- mm/mmap.c | 16 +++- mm/slab_common.c | 35 +++++++-- net/mac80211/rx.c | 26 +++++++ net/netfilter/ipvs/ip_vs_sync.c | 12 ++- net/vmw_vsock/virtio_transport.c | 2 +- scripts/decode_stacktrace.sh | 4 +- scripts/gdb/linux/symbols.py | 2 +- sound/core/info.c | 4 +- sound/pci/hda/patch_hdmi.c | 36 +++++---- sound/pci/hda/patch_realtek.c | 2 + sound/soc/codecs/rt5670.c | 71 ++++++++++++++---- sound/soc/codecs/rt5670.h | 2 +- sound/soc/intel/boards/bytcht_es8316.c | 4 +- sound/soc/qcom/Kconfig | 2 +- sound/soc/soc-topology.c | 24 ++++-- 173 files changed, 975 insertions(+), 438 deletions(-)

4 years, 7 months

6
143
0 0

[PATCH 4.14 00/64] 4.14.190-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.190 release. There are 64 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, 29 Jul 2020 13:48:51 +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/v4.x/stable-review/patch-4.14.190-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.190-rc1 Mark O'Donovan <shiftee(a)posteo.net> ath9k: Fix regression with Atheros 9271 Qiujun Huang <hqjagain(a)gmail.com> ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb John David Anglin <dave.anglin(a)bell.net> parisc: Add atomic64_set_release() define to avoid CPU soft lockups Michael J. Ruhl <michael.j.ruhl(a)intel.com> io-mapping: indicate mapping failure Hugh Dickins <hughd(a)google.com> mm/memcg: fix refcount error while moving and swapping Fangrui Song <maskray(a)google.com> Makefile: Fix GCC_TOOLCHAIN_DIR prefix for Clang cross compilation Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> vt: Reject zero-sized screen buffer size. Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins. Serge Semin <Sergey.Semin(a)baikalelectronics.ru> serial: 8250_mtk: Fix high-speed baud rates clamping Yang Yingliang <yangyingliang(a)huawei.com> serial: 8250: fix null-ptr-deref in serial8250_start_tx() Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG shift Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support Ian Abbott <abbotti(a)mev.co.uk> staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG shift Rustam Kovhaev <rkovhaev(a)gmail.com> staging: wlan-ng: properly check endpoint types Steve French <stfrench(a)microsoft.com> Revert "cifs: Fix the target file was deleted when rename failed." Forest Crossman <cyrozap(a)gmail.com> usb: xhci: Fix ASM2142/ASM3142 DMA addressing Chunfeng Yun <chunfeng.yun(a)mediatek.com> usb: xhci-mtk: fix the failure of bandwidth allocation Tetsuo Handa <penguin-kernel(a)i-love.sakura.ne.jp> binder: Don't use mmput() from shrinker function. Arnd Bergmann <arnd(a)arndb.de> x86: math-emu: Fix up 'cmp' insn for clang ias Will Deacon <will(a)kernel.org> arm64: Use test_tsk_thread_flag() for checking TIF_SINGLESTEP Evgeny Novikov <novikov(a)ispras.ru> usb: gadget: udc: gr_udc: fix memleak on error handling path in gr_ep_init() Ilya Katsnelson <me(a)0upti.me> Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen Leonid Ravich <Leonid.Ravich(a)emc.com> dmaengine: ioat setting ioat timeout as module parameter Evgeny Novikov <novikov(a)ispras.ru> hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow Marc Kleine-Budde <mkl(a)pengutronix.de> regmap: dev_get_regmap_match(): fix string comparison leilk.liu <leilk.liu(a)mediatek.com> spi: mediatek: use correct SPI_CFG2_REG MACRO Merlijn Wajer <merlijn(a)wizzup.org> Input: add `SW_MACHINE_COVER` Dinghao Liu <dinghao.liu(a)zju.edu.cn> dmaengine: tegra210-adma: Fix runtime PM imbalance on error Hans de Goede <hdegoede(a)redhat.com> HID: apple: Disable Fn-key key-re-mapping on clone keyboards Federico Ricchiuto <fed.ricchiuto(a)gmail.com> HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override Pi-Hsun Shih <pihsun(a)chromium.org> scripts/decode_stacktrace: strip basepath from all paths Matthew Howell <matthew.howell(a)sealevel.com> serial: exar: Fix GPIO configuration for Sealevel cards based on XR17V35X Cong Wang <xiyou.wangcong(a)gmail.com> bonding: check return value of register_netdevice() in bond_newlink() Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: rcar: always clear ICSAR to avoid side effects guodeqing <geffrey.guo(a)huawei.com> ipvs: fix the connection sync failed in some cases Liu Jian <liujian56(a)huawei.com> mlxsw: destroy workqueue when trap_register in mlxsw_emad_init Taehee Yoo <ap420073(a)gmail.com> bonding: check error value of register_netdevice() immediately Wang Hai <wanghai38(a)huawei.com> net: smc91x: Fix possible memory leak in smc_drv_probe() Chen-Yu Tsai <wens(a)csie.org> drm: sun4i: hdmi: Fix inverted HPD result Sergey Organov <sorganov(a)gmail.com> net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration George Kennedy <george.kennedy(a)oracle.com> ax88172a: fix ax88172a_unbind() failures Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> hippi: Fix a size used in a 'pci_free_consistent()' in an error handling path Vasundhara Volam <vasundhara-v.volam(a)broadcom.com> bnxt_en: Fix race when modifying pause settings. Robbie Ko <robbieko(a)synology.com> btrfs: fix page leaks after failure to lock page for delalloc Boris Burkov <boris(a)bur.io> btrfs: fix mount failure caused by race with umount Filipe Manana <fdmanana(a)suse.com> btrfs: fix double free on ulist after backref resolution failure Hans de Goede <hdegoede(a)redhat.com> ASoC: rt5670: Correct RT5670_LDO_SEL_MASK Takashi Iwai <tiwai(a)suse.de> ALSA: info: Drop WARN_ON() from buffer NULL sanity check Oleg Nesterov <oleg(a)redhat.com> uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to fix GDB regression Yang Yingliang <yangyingliang(a)huawei.com> IB/umem: fix reference count leak in ib_umem_odp_get() Vladimir Oltean <olteanv(a)gmail.com> spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours Olga Kornievskaia <kolga(a)netapp.com> SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion") Thomas Gleixner <tglx(a)linutronix.de> irqdomain/treewide: Keep firmware node unconditionally allocated Ben Skeggs <bskeggs(a)redhat.com> drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout Tom Rix <trix(a)redhat.com> net: sky2: initialize return of gm_phy_read Xie He <xie.he.0141(a)gmail.com> drivers/net/wan/lapbether: Fixed the value of hard_header_len Max Filippov <jcmvbkbc(a)gmail.com> xtensa: update *pos in cpuinfo_op.next Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix __sync_fetch_and_{and,or}_4 declarations Tom Rix <trix(a)redhat.com> scsi: scsi_transport_spi: Fix function pointer check Markus Theil <markus.theil(a)tu-ilmenau.de> mac80211: allow rx of mesh eapol frames with default rx key Jacky Hu <hengqing.hu(a)gmail.com> pinctrl: amd: fix npins for uart0 in kerncz_groups Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: put pm_runtime in case of failure Navid Emamdoost <navid.emamdoost(a)gmail.com> gpio: arizona: handle pm_runtime_get_sync failure case ------------- Diffstat: Makefile | 6 +-- arch/arm64/kernel/debug-monitors.c | 4 +- arch/parisc/include/asm/atomic.h | 2 + arch/x86/kernel/apic/io_apic.c | 10 ++--- arch/x86/kernel/apic/msi.c | 16 ++++--- arch/x86/kernel/apic/vector.c | 1 - arch/x86/math-emu/wm_sqrt.S | 2 +- arch/x86/platform/uv/uv_irq.c | 3 +- arch/xtensa/kernel/setup.c | 3 +- arch/xtensa/kernel/xtensa_ksyms.c | 4 +- drivers/android/binder_alloc.c | 2 +- drivers/base/regmap/regmap.c | 2 +- drivers/dma/ioat/dma.c | 12 +++++ drivers/dma/ioat/dma.h | 2 - drivers/dma/tegra210-adma.c | 5 ++- drivers/gpio/gpio-arizona.c | 7 ++- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 4 +- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- drivers/hid/hid-apple.c | 18 ++++++++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 8 ++++ drivers/hwmon/aspeed-pwm-tacho.c | 2 + drivers/i2c/busses/i2c-rcar.c | 3 ++ drivers/infiniband/core/umem_odp.c | 3 +- drivers/input/mouse/synaptics.c | 1 + drivers/iommu/amd_iommu.c | 5 ++- drivers/iommu/intel_irq_remapping.c | 2 +- drivers/net/bonding/bond_main.c | 10 +++-- drivers/net/bonding/bond_netlink.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 ++- drivers/net/ethernet/marvell/sky2.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 +- drivers/net/ethernet/smsc/smc91x.c | 4 +- drivers/net/hippi/rrunner.c | 2 +- drivers/net/phy/dp83640.c | 4 ++ drivers/net/usb/ax88172a.c | 1 + drivers/net/wan/lapbether.c | 9 +++- drivers/net/wireless/ath/ath9k/hif_usb.c | 52 +++++++++++++++++----- drivers/net/wireless/ath/ath9k/hif_usb.h | 5 +++ drivers/pci/host/vmd.c | 5 ++- drivers/pinctrl/pinctrl-amd.h | 2 +- drivers/scsi/scsi_transport_spi.c | 2 +- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-mt65xx.c | 15 ++++--- drivers/staging/comedi/drivers/addi_apci_1032.c | 20 ++++++--- drivers/staging/comedi/drivers/addi_apci_1500.c | 24 +++++++--- drivers/staging/comedi/drivers/addi_apci_1564.c | 20 ++++++--- drivers/staging/comedi/drivers/ni_6527.c | 2 +- drivers/staging/wlan-ng/prism2usb.c | 16 ++++++- drivers/tty/serial/8250/8250_core.c | 2 +- drivers/tty/serial/8250/8250_exar.c | 12 ++++- drivers/tty/serial/8250/8250_mtk.c | 18 ++++++++ drivers/tty/vt/vt.c | 29 +++++++----- drivers/usb/gadget/udc/gr_udc.c | 7 ++- drivers/usb/host/xhci-mtk-sch.c | 4 ++ drivers/usb/host/xhci-pci.c | 3 ++ drivers/video/fbdev/core/bitblit.c | 4 +- drivers/video/fbdev/core/fbcon_ccw.c | 4 +- drivers/video/fbdev/core/fbcon_cw.c | 4 +- drivers/video/fbdev/core/fbcon_ud.c | 4 +- fs/btrfs/backref.c | 1 + fs/btrfs/extent_io.c | 3 +- fs/btrfs/volumes.c | 8 ++++ fs/cifs/inode.c | 10 +---- fs/nfs/direct.c | 13 ++---- fs/nfs/file.c | 1 - include/linux/io-mapping.h | 5 ++- include/linux/mod_devicetable.h | 2 +- include/uapi/linux/input-event-codes.h | 3 +- kernel/events/uprobes.c | 2 +- mm/memcontrol.c | 4 +- net/mac80211/rx.c | 26 +++++++++++ net/netfilter/ipvs/ip_vs_sync.c | 12 +++-- scripts/decode_stacktrace.sh | 4 +- sound/core/info.c | 4 +- sound/soc/codecs/rt5670.h | 2 +- 76 files changed, 387 insertions(+), 147 deletions(-)

4 years, 7 months

5
68
0 0

[PATCH] spi: spidev: Align buffers for DMA

by Christian Eggers

Simply copying all xfers from userspace into one bounce buffer causes alignment problems if the SPI controller uses DMA. Ensure that all transfer data blocks within the rx and tx bounce buffers are aligned for DMA (according to ARCH_KMALLOC_MINALIGN). Alignment may increase the usage of the bounce buffers. In some cases, the buffers may need to be increased using the "bufsiz" module parameter. Signed-off-by: Christian Eggers <ceggers(a)arri.de> Cc: stable(a)vger.kernel.org --- drivers/spi/spidev.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 59e07675ef86..455e99c4958e 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -224,6 +224,11 @@ static int spidev_message(struct spidev_data *spidev, for (n = n_xfers, k_tmp = k_xfers, u_tmp = u_xfers; n; n--, k_tmp++, u_tmp++) { + /* Ensure that also following allocations from rx_buf/tx_buf will meet + * DMA alignment requirements. + */ + unsigned int len_aligned = ALIGN(u_tmp->len, ARCH_KMALLOC_MINALIGN); + k_tmp->len = u_tmp->len; total += k_tmp->len; @@ -239,17 +244,17 @@ static int spidev_message(struct spidev_data *spidev, if (u_tmp->rx_buf) { /* this transfer needs space in RX bounce buffer */ - rx_total += k_tmp->len; + rx_total += len_aligned; if (rx_total > bufsiz) { status = -EMSGSIZE; goto done; } k_tmp->rx_buf = rx_buf; - rx_buf += k_tmp->len; + rx_buf += len_aligned; } if (u_tmp->tx_buf) { /* this transfer needs space in TX bounce buffer */ - tx_total += k_tmp->len; + tx_total += len_aligned; if (tx_total > bufsiz) { status = -EMSGSIZE; goto done; @@ -259,7 +264,7 @@ static int spidev_message(struct spidev_data *spidev, (uintptr_t) u_tmp->tx_buf, u_tmp->len)) goto done; - tx_buf += k_tmp->len; + tx_buf += len_aligned; } k_tmp->cs_change = !!u_tmp->cs_change; @@ -293,16 +298,16 @@ static int spidev_message(struct spidev_data *spidev, goto done; /* copy any rx data out of bounce buffer */ - rx_buf = spidev->rx_buffer; - for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) { + for (n = n_xfers, k_tmp = k_xfers, u_tmp = u_xfers; + n; + n--, k_tmp++, u_tmp++) { if (u_tmp->rx_buf) { if (copy_to_user((u8 __user *) - (uintptr_t) u_tmp->rx_buf, rx_buf, + (uintptr_t) u_tmp->rx_buf, k_tmp->rx_buf, u_tmp->len)) { status = -EFAULT; goto done; } - rx_buf += u_tmp->len; } } status = total; -- Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler

4 years, 7 months

2
1
0 0

[PATCH v3 1/1] PCI/ATS: Check PRI supported on the PF device when SRIOV is enabled

by Ashok Raj

PASID and PRI capabilities are only enumerated in PF devices. VF devices do not enumerate these capabilites. IOMMU drivers also need to enumerate them before enabling features in the IOMMU. Extending the same support as PASID feature discovery (pci_pasid_features) for PRI. Fixes: b16d0cb9e2fc ("iommu/vt-d: Always enable PASID/PRI PCI capabilities before ATS") Signed-off-by: Ashok Raj <ashok.raj(a)intel.com> To: Bjorn Helgaas <bhelgaas(a)google.com> To: Joerg Roedel <joro(a)8bytes.com> To: Lu Baolu <baolu.lu(a)intel.com> Cc: stable(a)vger.kernel.org Cc: linux-pci(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: Ashok Raj <ashok.raj(a)intel.com> Cc: iommu(a)lists.linux-foundation.org --- v3: Added Fixes tag v2: Fixed build failure reported from lkp when CONFIG_PRI=n drivers/iommu/intel/iommu.c | 2 +- drivers/pci/ats.c | 13 +++++++++++++ include/linux/pci-ats.h | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index d759e7234e98..276452f5e6a7 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -2560,7 +2560,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, } if (info->ats_supported && ecap_prs(iommu->ecap) && - pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI)) + pci_pri_supported(pdev)) info->pri_supported = 1; } } diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index b761c1f72f67..2e6cf0c700f7 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -325,6 +325,19 @@ int pci_prg_resp_pasid_required(struct pci_dev *pdev) return pdev->pasid_required; } + +/** + * pci_pri_supported - Check if PRI is supported. + * @pdev: PCI device structure + * + * Returns true if PRI capability is present, false otherwise. + */ +bool pci_pri_supported(struct pci_dev *pdev) +{ + /* VFs share the PF PRI configuration */ + return !!(pci_physfn(pdev)->pri_cap); +} +EXPORT_SYMBOL_GPL(pci_pri_supported); #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index f75c307f346d..df54cd5b15db 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -28,6 +28,10 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs); void pci_disable_pri(struct pci_dev *pdev); int pci_reset_pri(struct pci_dev *pdev); int pci_prg_resp_pasid_required(struct pci_dev *pdev); +bool pci_pri_supported(struct pci_dev *pdev); +#else +static inline bool pci_pri_supported(struct pci_dev *pdev) +{ return false; } #endif /* CONFIG_PCI_PRI */ #ifdef CONFIG_PCI_PASID -- 2.7.4

4 years, 7 months

6
6
0 0

patch "USB: serial: cp210x: re-enable auto-RTS on open" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: serial: cp210x: re-enable auto-RTS on open to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From c7614ff9b73a1e6fb2b1b51396da132ed22fecdb Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman(a)silabs.com> Date: Fri, 26 Jun 2020 04:24:20 +0000 Subject: USB: serial: cp210x: re-enable auto-RTS on open CP210x hardware disables auto-RTS but leaves auto-CTS when in hardware flow control mode and UART on cp210x hardware is disabled. When re-opening the port, if auto-CTS is enabled on the cp210x, then auto-RTS must be re-enabled in the driver. Signed-off-by: Brant Merryman <brant.merryman(a)silabs.com> Co-developed-by: Phu Luu <phu.luu(a)silabs.com> Signed-off-by: Phu Luu <phu.luu(a)silabs.com> Link: https://lore.kernel.org/r/ECCF8E73-91F3-4080-BE17-1714BC8818FB@silabs.com [ johan: fix up tags and problem description ] Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable(a)vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/cp210x.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index bcceb4ad8be0..a90801ef0055 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -917,6 +917,7 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, u32 baud; u16 bits; u32 ctl_hs; + u32 flow_repl; cp210x_read_u32_reg(port, CP210X_GET_BAUDRATE, &baud); @@ -1017,6 +1018,22 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, ctl_hs = le32_to_cpu(flow_ctl.ulControlHandshake); if (ctl_hs & CP210X_SERIAL_CTS_HANDSHAKE) { dev_dbg(dev, "%s - flow control = CRTSCTS\n", __func__); + /* + * When the port is closed, the CP210x hardware disables + * auto-RTS and RTS is deasserted but it leaves auto-CTS when + * in hardware flow control mode. When re-opening the port, if + * auto-CTS is enabled on the cp210x, then auto-RTS must be + * re-enabled in the driver. + */ + flow_repl = le32_to_cpu(flow_ctl.ulFlowReplace); + flow_repl &= ~CP210X_SERIAL_RTS_MASK; + flow_repl |= CP210X_SERIAL_RTS_SHIFT(CP210X_SERIAL_RTS_FLOW_CTL); + flow_ctl.ulFlowReplace = cpu_to_le32(flow_repl); + cp210x_write_reg_block(port, + CP210X_SET_FLOW, + &flow_ctl, + sizeof(flow_ctl)); + cflag |= CRTSCTS; } else { dev_dbg(dev, "%s - flow control = NONE\n", __func__); -- 2.27.0

4 years, 7 months

1
0
0 0

patch "USB: serial: cp210x: enable usb generic throttle/unthrottle" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: serial: cp210x: enable usb generic throttle/unthrottle to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 4387b3dbb079d482d3c2b43a703ceed4dd27ed28 Mon Sep 17 00:00:00 2001 From: Brant Merryman <brant.merryman(a)silabs.com> Date: Fri, 26 Jun 2020 04:22:58 +0000 Subject: USB: serial: cp210x: enable usb generic throttle/unthrottle Assign the .throttle and .unthrottle functions to be generic function in the driver structure to prevent data loss that can otherwise occur if the host does not enable USB throttling. Signed-off-by: Brant Merryman <brant.merryman(a)silabs.com> Co-developed-by: Phu Luu <phu.luu(a)silabs.com> Signed-off-by: Phu Luu <phu.luu(a)silabs.com> Link: https://lore.kernel.org/r/57401AF3-9961-461F-95E1-F8AFC2105F5E@silabs.com [ johan: fix up tags ] Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable(a)vger.kernel.org> # 2.6.12 Signed-off-by: Johan Hovold <johan(a)kernel.org> --- drivers/usb/serial/cp210x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index f5143eedbc48..bcceb4ad8be0 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -272,6 +272,8 @@ static struct usb_serial_driver cp210x_device = { .break_ctl = cp210x_break_ctl, .set_termios = cp210x_set_termios, .tx_empty = cp210x_tx_empty, + .throttle = usb_serial_generic_throttle, + .unthrottle = usb_serial_generic_unthrottle, .tiocmget = cp210x_tiocmget, .tiocmset = cp210x_tiocmset, .attach = cp210x_attach, -- 2.27.0

4 years, 7 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2020