5.18.11-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.18.11-rc1 review
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +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.18.11-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.18.11-rc1
Dave Jiang <[email protected]>
dmaengine: idxd: force wq context cleanup on device disable path
Miaoqian Lin <[email protected]>
dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
Caleb Connolly <[email protected]>
dmaengine: qcom: bam_dma: fix runtime PM underflow
Miaoqian Lin <[email protected]>
dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate
Michael Walle <[email protected]>
dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly
Christophe JAILLET <[email protected]>
dmaengine: lgm: Fix an error handling path in intel_ldma_probe()
Dmitry Osipenko <[email protected]>
dmaengine: pl330: Fix lockdep warning about non-static key
Linus Torvalds <[email protected]>
ida: don't use BUG_ON() for debugging
Samuel Holland <[email protected]>
dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo
Emil Renner Berthing <[email protected]>
dmaengine: dw-axi-dmac: Fix RMW on channel suspend register
Shuah Khan <[email protected]>
misc: rtsx_usb: set return value in rsp_buf alloc err path
Shuah Khan <[email protected]>
misc: rtsx_usb: use separate command and response buffers
Shuah Khan <[email protected]>
misc: rtsx_usb: fix use of dma mapped buffer for usb bulk transfer
Sascha Hauer <[email protected]>
dmaengine: imx-sdma: only restart cyclic channel when enabled
Peter Robinson <[email protected]>
dmaengine: imx-sdma: Allow imx8m for imx7 FW revs
Vlad Buslov <[email protected]>
net/sched: act_police: allow 'continue' action offload
Ido Schimmel <[email protected]>
net/sched: act_police: Add extack messages for offload failure
Ido Schimmel <[email protected]>
net/sched: act_api: Add extack to offload_act_setup() callback
Satish Nagireddy <[email protected]>
i2c: cadence: Unregister the clk notifier in error path
Heiner Kallweit <[email protected]>
r8169: fix accessing unset transport header
Paolo Abeni <[email protected]>
mptcp: fix local endpoint accounting
Mat Martineau <[email protected]>
mptcp: Acquire the subflow socket lock before modifying MP_PRIO flags
Mat Martineau <[email protected]>
mptcp: Avoid acquiring PM lock for subflow priority changes
Vlad Buslov <[email protected]>
net/mlx5e: Fix matchall police parameters validation
Mario Limonciello <[email protected]>
ACPI: CPPC: Don't require _OSC if X86_FEATURE_CPPC is supported
Mario Limonciello <[email protected]>
ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked
Pierre Gondois <[email protected]>
ACPI: bus: Set CPPC _OSC bits for all and when CPPC_LIB is supported
Pierre Gondois <[email protected]>
ACPI: CPPC: Check _OSC for flexible address space
Vladimir Oltean <[email protected]>
selftests: forwarding: fix error message in learning_test
Vladimir Oltean <[email protected]>
selftests: forwarding: fix learning_test when h1 supports IFF_UNICAST_FLT
Vladimir Oltean <[email protected]>
selftests: forwarding: fix flood_unicast_test when h2 supports IFF_UNICAST_FLT
Rick Lindsley <[email protected]>
ibmvnic: Properly dispose of all skbs during a failover.
Fabrice Gasnier <[email protected]>
ARM: dts: stm32: add missing usbh clock and fix clk order on stm32mp15
Norbert Zulinski <[email protected]>
i40e: Fix VF's MAC Address change on VM
Lukasz Cieplicki <[email protected]>
i40e: Fix dropped jumbo frames statistics
Jean Delvare <[email protected]>
i2c: piix4: Fix a memory leak in the EFCH MMIO support
Ivan Malov <[email protected]>
xsk: Clear page contiguity bit when unmapping pool
Mihai Sain <[email protected]>
ARM: at91: fix soc detection for SAM9X60 SiPs
Eugen Hristev <[email protected]>
ARM: dts: at91: sama5d2_icp: fix eeprom compatibles
Eugen Hristev <[email protected]>
ARM: dts: at91: sam9x60ek: fix eeprom compatible and size
Claudiu Beznea <[email protected]>
ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt
Claudiu Beznea <[email protected]>
ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt
Claudiu Beznea <[email protected]>
ARM: at91: pm: use proper compatible for sama5d2's rtc
Stephan Gerhold <[email protected]>
arm64: dts: qcom: msm8992-*: Fix vdd_lvs1_2-supply typo
Andrei Lalaev <[email protected]>
pinctrl: sunxi: sunxi_pconf_set: use correct offset
Peng Fan <[email protected]>
arm64: dts: imx8mp-phyboard-pollux-rdk: correct i2c2 & mmc settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-phyboard-pollux-rdk: correct eqos pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-phyboard-pollux-rdk: correct uart pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct I2C3 pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct I2C1 pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct I2C5 pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct eqos pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct vbus pad settings
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct gpio-led pad settings
Sherry Sun <[email protected]>
arm64: dts: imx8mp-evk: correct the uart2 pinctl value
Peng Fan <[email protected]>
arm64: dts: imx8mp-evk: correct mmc pad settings
Fabio Estevam <[email protected]>
ARM: mxs_defconfig: Enable the framebuffer
Dmitry Baryshkov <[email protected]>
arm64: dts: qcom: sdm845: use dispcc AHB clock for mdss node
Konrad Dybcio <[email protected]>
arm64: dts: qcom: msm8994: Fix CPU6/7 reg values
Vladimir Zapolskiy <[email protected]>
arm64: dts: qcom: sm8450: fix interconnects property of UFS node
Peter Ujfalusi <[email protected]>
ASoC: SOF: Intel: hda: Fix compressed stream position tracking
Peter Ujfalusi <[email protected]>
ASoC: SOF: ipc3-topology: Move and correct size checks in sof_ipc3_control_load_bytes()
Pierre-Louis Bossart <[email protected]>
ASoC: codecs: rt700/rt711/rt711-sdca: resume bus/codec in .set_jack_detect
Charles Keepax <[email protected]>
ASoC: rt711-sdca: Add endianness flag in snd_soc_component_driver
Charles Keepax <[email protected]>
ASoC: rt711: Add endianness flag in snd_soc_component_driver
Paul E. McKenney <[email protected]>
srcu: Tighten cleanup_srcu_struct() GP checks
Samuel Holland <[email protected]>
pinctrl: sunxi: a83t: Fix NAND function name for some pins
Miaoqian Lin <[email protected]>
ARM: meson: Fix refcount leak in meson_smp_prepare_cpus
Christian Marangi <[email protected]>
net: dsa: qca8k: reset cpu port on MTU change
Jason A. Donenfeld <[email protected]>
powerpc/powernv: delay rng platform device creation until later in boot
Yue Hu <[email protected]>
fscache: Fix if condition in fscache_wait_on_volume_collision()
David Howells <[email protected]>
fscache: Fix invalidation/lookup race
Hsin-Yi Wang <[email protected]>
video: of_display_timing.h: include errno.h
Dan Williams <[email protected]>
memregion: Fix memregion_free() fallback definition
Rafael J. Wysocki <[email protected]>
PM: runtime: Fix supplier device management during consumer probe
Rafael J. Wysocki <[email protected]>
PM: runtime: Redefine pm_runtime_release_supplier()
Helge Deller <[email protected]>
fbcon: Prevent that screen size is smaller than font size
Helge Deller <[email protected]>
fbcon: Disallow setting font bigger than screen size
Helge Deller <[email protected]>
fbmem: Check virtual screen sizes in fb_set_var()
Guiling Deng <[email protected]>
fbdev: fbmem: Fix logo center image dx issue
Jonathan Cameron <[email protected]>
cxl: Fix cleanup of port devices on failure to probe driver.
Alison Schofield <[email protected]>
cxl/mbox: Use __le32 in get,set_lsa mailbox structures
Lu Baolu <[email protected]>
iommu/vt-d: Fix RID2PASID setup/teardown failure
Yian Chen <[email protected]>
iommu/vt-d: Fix PCI bus rescan device hot add
Joerg Roedel <[email protected]>
MAINTAINERS: Remove [email protected]
Srinivas Kandagatla <[email protected]>
ASoC: qdsp6: q6apm-dai: unprepare stream if its already prepared
Duy Nguyen <[email protected]>
can: rcar_canfd: Fix data transmission failed on R-Car V3U
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix endianness conversion
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_register_get_dev_id(): use correct length to read dev_id
Hangbin Liu <[email protected]>
selftests/net: fix section name when using xdp_dummy.o
Pablo Neira Ayuso <[email protected]>
netfilter: nf_tables: stricter validation of element data
Pablo Neira Ayuso <[email protected]>
netfilter: nft_set_pipapo: release elements in clone from abort path
Michael Walle <[email protected]>
net: lan966x: hardcode the number of external ports
Duoming Zhou <[email protected]>
net: rose: fix UAF bug caused by rose_t0timer_expiry
Oliver Neukum <[email protected]>
usbnet: fix memory leak in error case
Daniel Borkmann <[email protected]>
bpf: Fix insufficient bounds propagation from adjust_scalar_min_max_vals
Daniel Borkmann <[email protected]>
bpf: Fix incorrect verifier simulation around jmp32's jeq/jne
Marc Kleine-Budde <[email protected]>
can: mcp251xfd: mcp251xfd_stop(): add missing hrtimer_cancel()
Thomas Kopp <[email protected]>
can: mcp251xfd: mcp251xfd_regmap_crc_read(): update workaround broken CRC on TBC register
Thomas Kopp <[email protected]>
can: mcp251xfd: mcp251xfd_regmap_crc_read(): improve workaround handling for mcp2517fd
Jimmy Assarsson <[email protected]>
can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits
Jimmy Assarsson <[email protected]>
can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression
Jimmy Assarsson <[email protected]>
can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info
Marc Kleine-Budde <[email protected]>
can: m_can: m_can_{read_fifo,echo_tx_event}(): shift timestamp to full 32 bits
Marc Kleine-Budde <[email protected]>
can: m_can: m_can_chip_config(): actually enable internal timestamping
Rhett Aultman <[email protected]>
can: gs_usb: gs_usb_open/close(): fix memory leak
Liang He <[email protected]>
can: grcan: grcan_probe(): remove extra of_node_get()
Oliver Hartkopp <[email protected]>
can: bcm: use call_rcu() instead of costly synchronize_rcu()
Takashi Iwai <[email protected]>
ALSA: cs46xx: Fix missing snd_card_free() call at probe error
Tim Crawford <[email protected]>
ALSA: hda/realtek: Add quirk for Clevo L140PU
Takashi Iwai <[email protected]>
ALSA: usb-audio: Workarounds for Behringer UMC 204/404 HD
Dylan Yudaken <[email protected]>
io_uring: fix provided buffer import
-------------
Diffstat:
.../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- MAINTAINERS | 11 - Makefile | 4 +- arch/arm/boot/dts/at91-sam9x60ek.dts | 3 +- arch/arm/boot/dts/at91-sama5d2_icp.dts | 6 +- arch/arm/boot/dts/stm32mp151.dtsi | 4 +- arch/arm/configs/mxs_defconfig | 1 + arch/arm/mach-at91/pm.c | 10 +- arch/arm/mach-meson/platsmp.c | 2 + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 58 ++--- .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 48 ++-- arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 +- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8450.dtsi | 4 +- arch/powerpc/platforms/powernv/rng.c | 16 +- arch/x86/kernel/acpi/cppc.c | 10 + drivers/acpi/bus.c | 39 ++- drivers/acpi/cppc_acpi.c | 29 ++- drivers/base/core.c | 13 +- drivers/base/power/runtime.c | 34 +-- drivers/cxl/cxlmem.h | 8 +- drivers/cxl/mem.c | 7 +- drivers/cxl/pmem.c | 6 +- drivers/dma/at_xdmac.c | 5 + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 +- drivers/dma/idxd/device.c | 5 +- drivers/dma/imx-sdma.c | 4 +- drivers/dma/lgm/lgm-dma.c | 3 +- drivers/dma/pl330.c | 2 +- drivers/dma/qcom/bam_dma.c | 39 +-- drivers/dma/ti/dma-crossbar.c | 5 + drivers/i2c/busses/i2c-cadence.c | 1 + drivers/i2c/busses/i2c-piix4.c | 16 +- drivers/iommu/intel/dmar.c | 2 +- drivers/iommu/intel/iommu.c | 24 -- drivers/iommu/intel/pasid.c | 69 +---- drivers/iommu/intel/pasid.h | 1 - drivers/misc/cardreader/rtsx_usb.c | 27 +- drivers/net/can/grcan.c | 1 - drivers/net/can/m_can/m_can.c | 8 +- drivers/net/can/rcar/rcar_canfd.c | 5 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 6 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 22 +- drivers/net/can/usb/gs_usb.c | 23 +- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 25 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 285 ++++++++++++--------- drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 +- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 119 +++++---- drivers/net/dsa/qca8k.c | 23 +- drivers/net/ethernet/ibm/ibmvnic.c | 9 + drivers/net/ethernet/intel/i40e/i40e.h | 16 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 73 ++++++ drivers/net/ethernet/intel/i40e/i40e_register.h | 13 + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 13 +- .../net/ethernet/microchip/lan966x/lan966x_main.c | 8 +- .../net/ethernet/microchip/lan966x/lan966x_main.h | 1 + drivers/net/ethernet/realtek/r8169_main.c | 10 +- drivers/net/usb/usbnet.c | 17 +- drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 10 +- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 + drivers/soc/atmel/soc.c | 12 +- drivers/video/fbdev/core/fbcon.c | 33 +++ drivers/video/fbdev/core/fbmem.c | 16 +- fs/fscache/cookie.c | 15 +- fs/fscache/volume.c | 4 +- fs/io_uring.c | 14 +- include/acpi/cppc_acpi.h | 1 + include/linux/acpi.h | 4 +- include/linux/fbcon.h | 4 + include/linux/fscache.h | 1 + include/linux/intel-iommu.h | 3 - include/linux/memregion.h | 2 +- include/linux/pm_runtime.h | 5 +- include/linux/rtsx_usb.h | 2 - include/net/act_api.h | 3 +- include/net/flow_offload.h | 1 + include/net/pkt_cls.h | 6 +- include/video/of_display_timing.h | 2 + kernel/bpf/verifier.c | 113 ++++---- kernel/rcu/srcutree.c | 6 +- lib/idr.c | 3 +- net/can/bcm.c | 18 +- net/mptcp/options.c | 3 + net/mptcp/pm_netlink.c | 16 +- net/mptcp/protocol.c | 9 +- net/mptcp/protocol.h | 1 + net/netfilter/nf_tables_api.c | 9 +- net/netfilter/nft_set_pipapo.c | 48 ++-- net/rose/rose_route.c | 4 +- net/sched/act_api.c | 4 +- net/sched/act_csum.c | 3 +- net/sched/act_ct.c | 3 +- net/sched/act_gact.c | 3 +- net/sched/act_gate.c | 3 +- net/sched/act_mirred.c | 3 +- net/sched/act_mpls.c | 3 +- net/sched/act_pedit.c | 3 +- net/sched/act_police.c | 20 +- net/sched/act_sample.c | 3 +- net/sched/act_skbedit.c | 3 +- net/sched/act_tunnel_key.c | 3 +- net/sched/act_vlan.c | 3 +- net/sched/cls_api.c | 16 +- net/sched/cls_flower.c | 6 +- net/sched/cls_matchall.c | 6 +- net/xdp/xsk_buff_pool.c | 1 + sound/pci/cs46xx/cs46xx.c | 22 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/rt700.c | 16 +- sound/soc/codecs/rt711-sdca.c | 27 +- sound/soc/codecs/rt711.c | 25 +- sound/soc/qcom/qdsp6/q6apm-dai.c | 6 + sound/soc/sof/intel/hda-pcm.c | 74 +----- sound/soc/sof/intel/hda-stream.c | 94 ++++++- sound/soc/sof/intel/hda.h | 3 + sound/soc/sof/ipc3-topology.c | 23 +- sound/usb/quirks.c | 4 + tools/testing/selftests/net/forwarding/lib.sh | 6 +- tools/testing/selftests/net/udpgro.sh | 2 +- tools/testing/selftests/net/udpgro_bench.sh | 2 +- tools/testing/selftests/net/udpgro_frglist.sh | 2 +- tools/testing/selftests/net/udpgro_fwd.sh | 2 +- tools/testing/selftests/net/veth.sh | 6 +- 127 files changed, 1179 insertions(+), 814 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/112 io_uring: fix provided buffer import
From: Dylan Yudaken <[email protected]>
commit 09007af2b627f0f195c6c53c4829b285cc3990ec upstream.
io_import_iovec uses the s pointer, but this was changed immediately after the iovec was re-imported and so it was imported into the wrong place.
Change the ordering.
--- fs/io_uring.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
fs/io_uring.c +11 -3
@@ -3495,6 +3495,13 @@ static ssize_t io_iov_buffer_select(strureturn __io_iov_buffer_select (req, iov, issue_flags); } +static inline bool io_do_buffer_select (struct io_kiocb *req) +{ +if (!(req->flags &REQ_F_BUFFER_SELECT )) +return false; +return !(req->flags &REQ_F_BUFFER_SELECTED ); +} +static struct iovec *__io_import_iovec (int rw,struct io_kiocb *req,struct io_rw_state *s,unsigned int issue_flags)
@@ -3854,18 +3861,19 @@ static int io_read(struct io_kiocb *req,if (unlikely (ret <0 ))return ret; }else { + rw = req->async_data; + s = &rw->s; +/* * Safe and required to re-import if we're using provided * buffers, as we dropped the selected one before retry. */ -if (req->flags &REQ_F_BUFFER_SELECT ) { +if (io_do_buffer_select (req)) { ret =io_import_iovec (READ , req, &iovec, s, issue_flags);if (unlikely (ret <0 ))return ret; } - rw = req->async_data; - s = &rw->s;/* * We come here from an earlier attempt, restore our state to * match in case it doesn't. It's cheap enough that we don't
Greg Kroah-Hartman
maintainerPATCH 2/112 ALSA: usb-audio: Workarounds for Behringer UMC 204/404 HD
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit ae8b1631561a3634cc09d0c62bbdd938eade05ec upstream.
Both Behringer UMC 202 HD and 404 HD need explicit quirks to enable the implicit feedback mode and start the playback stream primarily. The former seems fixing the stuttering and the latter is required for a playback-only case.
Note that the "clock source 41 is not valid" error message still appears even after this fix, but it should be only once at probe. The reason of the error is still unknown, but this seems to be mostly harmless as it's a one-off error and the driver retires the clock setup and it succeeds afterwards.
--- sound/usb/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/usb/quirks.c +4 -0
@@ -1842,6 +1842,10 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x1395 ,0x740a ,/* Sennheiser DECT */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x1397 ,0x0508 ,/* Behringer UMC204HD */ +QUIRK_FLAG_PLAYBACK_FIRST |QUIRK_FLAG_GENERIC_IMPLICIT_FB ), +DEVICE_FLG (0x1397 ,0x0509 ,/* Behringer UMC404HD */ +QUIRK_FLAG_PLAYBACK_FIRST |QUIRK_FLAG_GENERIC_IMPLICIT_FB ),DEVICE_FLG (0x13e5 ,0x0001 ,/* Serato Phono */ QUIRK_FLAG_IGNORE_CTL_ERROR ), DEVICE_FLG(0x154e, 0x1002, /* Denon DCD-1500RE */
Greg Kroah-Hartman
maintainerPATCH 3/112 ALSA: hda/realtek: Add quirk for Clevo L140PU
In reply to Greg Kroah-HartmanFrom: Tim Crawford <[email protected]>
commit 11bea26929a1a3a9dd1a287b60c2f471701bf706 upstream.
Fixes headset detection on Clevo L140PU.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9264,6 +9264,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1558 ,0x70f4 ,"Clevo NH77EPY" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x70f6 ,"Clevo NH77DPQ-Y" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x7716 ,"Clevo NS50PU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1558 ,0x7718 ,"Clevo L140PU" ,ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x8228 ,"Clevo NR40BU" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1558 ,0x8520 ,"Clevo NH50D[CD]" ,ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1558, 0x8521, "Clevo NH77D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
Greg Kroah-Hartman
maintainerPATCH 4/112 ALSA: cs46xx: Fix missing snd_card_free() call at probe error
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit c5e58c4545a69677d078b4c813b5d10d3481be9c upstream.
The previous cleanup with devres may lead to the incorrect release orders at the probe error handling due to the devres's nature. Until we register the card, snd_card_free() has to be called at first for releasing the stuff properly when the driver tries to manage and release the stuff via card->private_free().
This patch fixes it by calling snd_card_free() manually on the error from the probe callback.
--- sound/pci/cs46xx/cs46xx.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
sound/pci/cs46xx/cs46xx.c +13 -9
@@ -74,36 +74,36 @@ static int snd_card_cs46xx_probe(struct err =snd_cs46xx_create (card, pci, external_amp[dev], thinkpad[dev]);if (err <0 ) -return err; + goto error; card->private_data = chip; chip->accept_valid = mmap_valid[dev]; err =snd_cs46xx_pcm (chip,0 );if (err <0 ) -return err; + goto error;#ifdef CONFIG_SND_CS46XX_NEW_DSP err =snd_cs46xx_pcm_rear (chip,1 );if (err <0 ) -return err; + goto error; err =snd_cs46xx_pcm_iec958 (chip,2 );if (err <0 ) -return err; + goto error;#endif err =snd_cs46xx_mixer (chip,2 );if (err <0 ) -return err; + goto error;#ifdef CONFIG_SND_CS46XX_NEW_DSP if (chip->nr_ac97_codecs ==2 ) { err =snd_cs46xx_pcm_center_lfe (chip,3 );if (err <0 ) -return err; + goto error; }#endif err =snd_cs46xx_midi (chip,0 );if (err <0 ) -return err; + goto error; err =snd_cs46xx_start_dsp (chip);if (err <0 ) -return err; + goto error;snd_cs46xx_gameport (chip);
@@ -117,11 +117,15 @@ static int snd_card_cs46xx_probe(struct err =snd_card_register (card);if (err <0 ) -return err; + goto error;pci_set_drvdata (pci, card); dev++;return 0 ; + + error: +snd_card_free (card); +return err; }static struct pci_driver cs46xx_driver = {
Greg Kroah-Hartman
maintainerPATCH 5/112 can: bcm: use call_rcu() instead of costly synchronize_rcu()
In reply to Greg Kroah-HartmanFrom: Oliver Hartkopp <[email protected]>
commit f1b4e32aca0811aa011c76e5d6cf2fa19224b386 upstream.
In commit d5f9023fa61e ("can: bcm: delay release of struct bcm_op after synchronize_rcu()") Thadeu Lima de Souza Cascardo introduced two synchronize_rcu() calls in bcm_release() (only once at socket close) and in bcm_delete_rx_op() (called on removal of each single bcm_op).
Unfortunately this slow removal of the bcm_op's affects user space applications like cansniffer where the modification of a filter removes 2048 bcm_op's which blocks the cansniffer application for 40(!) seconds.
In commit 181d4447905d ("can: gw: use call_rcu() instead of costly synchronize_rcu()") Eric Dumazet replaced the synchronize_rcu() calls with several call_rcu()'s to safely remove the data structures after the removal of CAN ID subscriptions with can_rx_unregister() calls.
This patch adopts Erics approach for the can-bcm which should be applicable since the removal of tasklet_kill() in bcm_remove_op() and the introduction of the HRTIMER_MODE_SOFT timer handling in Linux 5.4.
--- net/can/bcm.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
net/can/bcm.c +14 -4
@@ -100,6 +100,7 @@ static inline u64 get_u64(const struct cstruct bcm_op {struct list_head list; +struct rcu_head rcu;int ifindex;canid_t can_id;u32 flags;
@@ -718,10 +719,9 @@ static struct bcm_op *bcm_find_op(structreturn NULL ; } -static void bcm_remove_op (struct bcm_op *op) +static void bcm_free_op_rcu (struct rcu_head *rcu_head) { -hrtimer_cancel (&op->timer); -hrtimer_cancel (&op->thrtimer); + struct bcm_op *op = container_of(rcu_head, struct bcm_op, rcu);if ((op->frames) && (op->frames != &op->sframe))kfree (op->frames);
@@ -732,6 +732,14 @@ static void bcm_remove_op(struct bcm_opkfree (op); } +static void bcm_remove_op (struct bcm_op *op) +{ +hrtimer_cancel (&op->timer); +hrtimer_cancel (&op->thrtimer); + +call_rcu (&op->rcu, bcm_free_op_rcu); +} +static void bcm_rx_unreg (struct net_device *dev,struct bcm_op *op) {if (op->rx_reg_dev == dev) {
@@ -757,6 +765,9 @@ static int bcm_delete_rx_op(struct list_if ((op->can_id == mh->can_id) && (op->ifindex == ifindex) && (op->flags &CAN_FD_FRAME ) == (mh->flags &CAN_FD_FRAME )) { +/* disable automatic timer on frame reception */ + op->flags |=RX_NO_AUTOTIMER ; +/* * Don't care if we're bound or not (due to netdev * problems) can_rx_unregister() is always a save
@@ -785,7 +796,6 @@ static int bcm_delete_rx_op(struct list_ bcm_rx_handler, op);list_del (&op->list); -synchronize_rcu ();bcm_remove_op (op);return 1 ;/* done */ }
Greg Kroah-Hartman
maintainerPATCH 6/112 can: grcan: grcan_probe(): remove extra of_node_get()
In reply to Greg Kroah-HartmanFrom: Liang He <[email protected]>
commit 562fed945ea482833667f85496eeda766d511386 upstream.
In grcan_probe(), of_find_node_by_path() has already increased the refcount. There is no need to call of_node_get() again, so remove it.
--- drivers/net/can/grcan.c | 1 - 1 file changed, 1 deletion(-)
drivers/net/can/grcan.c +0 -1
@@ -1646,7 +1646,6 @@ static int grcan_probe(struct platform_d*/ sysid_parent =of_find_node_by_path ("/ambapp0" );if (sysid_parent) { -of_node_get (sysid_parent); err =of_property_read_u32 (sysid_parent,"systemid" , &sysid);if (!err && ((sysid &GRLIB_VERSION_MASK ) >=GRCAN_TXBUG_SAFE_GRLIB_VERSION ))
Greg Kroah-Hartman
maintainerPATCH 7/112 can: gs_usb: gs_usb_open/close(): fix memory leak
In reply to Greg Kroah-HartmanFrom: Rhett Aultman <[email protected]>
commit 2bda24ef95c0311ab93bda00db40486acf30bd0a upstream.
The gs_usb driver appears to suffer from a malady common to many USB CAN adapter drivers in that it performs usb_alloc_coherent() to allocate a number of USB request blocks (URBs) for RX, and then later relies on usb_kill_anchored_urbs() to free them, but this doesn't actually free them. As a result, this may be leaking DMA memory that's been used by the driver.
This commit is an adaptation of the techniques found in the esd_usb2 driver where a similar design pattern led to a memory leak. It explicitly frees the RX URBs and their DMA memory via a call to usb_free_coherent(). Since the RX URBs were allocated in the gs_can_open(), we remove them in gs_can_close() rather than in the disconnect function as was done in esd_usb2.
For more information, see the 928150fad41b ("can: esd_usb2: fix memory leak").
--- drivers/net/can/usb/gs_usb.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
drivers/net/can/usb/gs_usb.c +21 -2
@@ -268,6 +268,8 @@ struct gs_can {struct usb_anchor tx_submitted;atomic_t active_tx_urbs; +void *rxbuf[GS_MAX_RX_URBS ]; +dma_addr_t rxbuf_dma[GS_MAX_RX_URBS ]; };/* usb interface struct */
@@ -742,6 +744,7 @@ static int gs_can_open(struct net_devicefor (i =0 ; i <GS_MAX_RX_URBS ; i++) {struct urb *urb;u8 *buf; +dma_addr_t buf_dma;/* alloc rx urb */ urb =usb_alloc_urb (0 ,GFP_KERNEL );
@@ -752,7 +755,7 @@ static int gs_can_open(struct net_device buf =usb_alloc_coherent (dev->udev, dev->parent->hf_size_rx,GFP_KERNEL , - &urb->transfer_dma); + &buf_dma);if (!buf) {netdev_err (netdev,"No memory left for USB buffer\n" );
@@ -760,6 +763,8 @@ static int gs_can_open(struct net_devicereturn -ENOMEM ; } + urb->transfer_dma = buf_dma; +/* fill, anchor, and submit rx urb */ usb_fill_bulk_urb(urb, dev->udev,
@@ -781,10 +786,17 @@ static int gs_can_open(struct net_device "usb_submit failed (err=%d)\n", rc);usb_unanchor_urb (urb); +usb_free_coherent (dev->udev, +sizeof (struct gs_host_frame ), + buf, + buf_dma);usb_free_urb (urb);break ; } + dev->rxbuf[i] = buf; + dev->rxbuf_dma[i] = buf_dma; +/* Drop reference, * USB core will take care of freeing it */
@@ -842,13 +854,20 @@ static int gs_can_close(struct net_devicint rc;struct gs_can *dev =netdev_priv (netdev);struct gs_usb *parent = dev->parent; +unsigned int i;netif_stop_queue (netdev);/* Stop polling */ parent->active_channels--; -if (!parent->active_channels) +if (!parent->active_channels) {usb_kill_anchored_urbs (&parent->rx_submitted); +for (i =0 ; i <GS_MAX_RX_URBS ; i++) +usb_free_coherent (dev->udev, +sizeof (struct gs_host_frame ), + dev->rxbuf[i], + dev->rxbuf_dma[i]); + }/* Stop sending URBs */ usb_kill_anchored_urbs (&dev->tx_submitted);
Greg Kroah-Hartman
maintainerPATCH 8/112 can: m_can: m_can_chip_config(): actually enable internal timestamping
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 5b12933de4e76ec164031c18ce8e0904abf530d7 upstream.
In commit df06fd678260 ("can: m_can: m_can_chip_config(): enable and configure internal timestamps") the timestamping in the m_can core should be enabled. In peripheral mode, the RX'ed CAN frames, TX compete frames and error events are sorted by the timestamp.
The above mentioned commit however forgot to enable the timestamping. Add the missing bits to enable the timestamp counter to the write of the Timestamp Counter Configuration register.
--- drivers/net/can/m_can/m_can.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/can/m_can/m_can.c +3 -1
@@ -1360,7 +1360,9 @@ static void m_can_chip_config(struct net/* enable internal timestamp generation, with a prescalar of 16. The * prescalar is applied to the nominal bit timing */ -m_can_write (cdev,M_CAN_TSCC ,FIELD_PREP (TSCC_TCP_MASK ,0xf )); +m_can_write (cdev,M_CAN_TSCC , +FIELD_PREP (TSCC_TCP_MASK ,0xf ) | +FIELD_PREP (TSCC_TSS_MASK ,TSCC_TSS_INTERNAL ));m_can_config_endisable (cdev, false);
Greg Kroah-Hartman
maintainerPATCH 9/112 can: m_can: m_can_{read_fifo,echo_tx_event}(): shift timestamp to full 32 bits
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 4c3333693f07313f5f0145a922f14a7d3c0f4f21 upstream.
In commit 1be37d3b0414 ("can: m_can: fix periph RX path: use rx-offload to ensure skbs are sent from softirq context") the RX path for peripheral devices was switched to RX-offload.
Received CAN frames are pushed to RX-offload together with a timestamp. RX-offload is designed to handle overflows of the timestamp correctly, if 32 bit timestamps are provided.
The timestamps of m_can core are only 16 bits wide. So this patch shifts them to full 32 bit before passing them to RX-offload.
--- drivers/net/can/m_can/m_can.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/can/m_can/m_can.c +2 -2
@@ -532,7 +532,7 @@ static int m_can_read_fifo(struct net_de/* acknowledge rx fifo 0 */ m_can_write (cdev,M_CAN_RXF0A , fgi); - timestamp =FIELD_GET (RX_BUF_RXTS_MASK , fifo_header.dlc); + timestamp =FIELD_GET (RX_BUF_RXTS_MASK , fifo_header.dlc) <<16 ;m_can_receive_skb (cdev, skb, timestamp);
@@ -1036,7 +1036,7 @@ static int m_can_echo_tx_event(struct ne } msg_mark =FIELD_GET (TX_EVENT_MM_MASK , txe); - timestamp =FIELD_GET (TX_EVENT_TXTS_MASK , txe); + timestamp =FIELD_GET (TX_EVENT_TXTS_MASK , txe) <<16 ;/* ack txe element */ m_can_write(cdev, M_CAN_TXEFA, FIELD_PREP(TXEFA_EFAI_MASK,
Greg Kroah-Hartman
maintainerPATCH 10/112 can: kvaser_usb: replace run-time checks with struct kvaser_usb_driver_info
In reply to Greg Kroah-HartmanFrom: Jimmy Assarsson <[email protected]>
commit 49f274c72357d2d74cba70b172cf369768909707 upstream.
Unify and move compile-time known information into new struct kvaser_usb_driver_info, in favor of run-time checks.
All Kvaser USBcanII supports listen-only mode and error counter reporting.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 22 + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 274 ++++++++++++----------- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 24 +- 3 files changed, 172 insertions(+), 148 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb.h +12 -10
@@ -35,9 +35,9 @@#define KVASER_USB_RX_BUFFER_SIZE 3072#define KVASER_USB_MAX_NET_DEVICES 5 -/* USB devices features */ -#define KVASER_USB_HAS_SILENT_MODE BIT(0) -#define KVASER_USB_HAS_TXRX_ERRORS BIT(1) +/* Kvaser USB device quirks */ +#define KVASER_USB_QUIRK_HAS_SILENT_MODE BIT(0) +#define KVASER_USB_QUIRK_HAS_TXRX_ERRORS BIT(1)/* Device capabilities */ #define KVASER_USB_CAP_BERR_CAP 0x01
@@ -65,12 +65,7 @@ struct kvaser_usb_dev_card_data_hydra {struct kvaser_usb_dev_card_data {u32 ctrlmode_supported;u32 capabilities; -union { -struct { -enum kvaser_usb_leaf_family family; - } leaf; -struct kvaser_usb_dev_card_data_hydra hydra; - }; +struct kvaser_usb_dev_card_data_hydra hydra; };/* Context for an outstanding, not yet ACKed, transmission */
@@ -83,7 +78,7 @@ struct kvaser_usb {struct usb_device *udev;struct usb_interface *intf;struct kvaser_usb_net_priv *nets[KVASER_USB_MAX_NET_DEVICES ]; -const struct kvaser_usb_dev_ops *ops; +const struct kvaser_usb_driver_info *driver_info;const struct kvaser_usb_dev_cfg *cfg;struct usb_endpoint_descriptor *bulk_in, *bulk_out;
@@ -165,6 +160,12 @@ struct kvaser_usb_dev_ops { u16 transid); }; +struct kvaser_usb_driver_info { +u32 quirks; +enum kvaser_usb_leaf_family family; +const struct kvaser_usb_dev_ops *ops; +}; +struct kvaser_usb_dev_cfg {const struct can_clock clock;const unsigned int timestamp_freq;
@@ -184,4 +185,5 @@ int kvaser_usb_send_cmd_async(struct kva int len);int kvaser_usb_can_rx_over_error (struct net_device *netdev); +#endif /* KVASER_USB_H */
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +148 -126
446 lines not on this page · raw message
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +12 -12
@@ -404,7 +404,7 @@ kvaser_usb_leaf_frame_to_cmd(const strucsizeof (struct kvaser_cmd_tx_can ); cmd->u.tx_can.channel = priv->channel; -switch (dev->card_data.leaf.family) { +switch (dev->driver_info->family) {case KVASER_LEAF : cmd_tx_can_flags = &cmd->u.tx_can.leaf.flags;break ;
@@ -550,7 +550,7 @@ static int kvaser_usb_leaf_get_software_if (err)return err; -switch (dev->card_data.leaf.family) { +switch (dev->driver_info->family) {case KVASER_LEAF :kvaser_usb_leaf_get_software_info_leaf (dev, &cmd.u.leaf.softinfo);break ;
@@ -597,7 +597,7 @@ static int kvaser_usb_leaf_get_card_info dev->nchannels = cmd.u.cardinfo.nchannels;if (dev->nchannels >KVASER_USB_MAX_NET_DEVICES || - (dev->card_data.leaf.family ==KVASER_USBCAN && + (dev->driver_info->family ==KVASER_USBCAN && dev->nchannels >MAX_USBCAN_NET_DEVICES ))return -EINVAL ;
@@ -730,7 +730,7 @@ kvaser_usb_leaf_rx_error_update_can_stat new_state < CAN_STATE_BUS_OFF) priv->can.can_stats.restarts++; -switch (dev->card_data.leaf.family) { +switch (dev->driver_info->family) {case KVASER_LEAF :if (es->leaf.error_factor) { priv->can.can_stats.bus_error++;
@@ -809,7 +809,7 @@ static void kvaser_usb_leaf_rx_error(con } } -switch (dev->card_data.leaf.family) { +switch (dev->driver_info->family) {case KVASER_LEAF :if (es->leaf.error_factor) { cf->can_id |=CAN_ERR_BUSERROR |CAN_ERR_PROT ;
@@ -999,7 +999,7 @@ static void kvaser_usb_leaf_rx_can_msg(c stats = &priv->netdev->stats;if ((cmd->u.rx_can_header.flag &MSG_FLAG_ERROR_FRAME ) && - (dev->card_data.leaf.family ==KVASER_LEAF && + (dev->driver_info->family ==KVASER_LEAF && cmd->id ==CMD_LEAF_LOG_MESSAGE )) {kvaser_usb_leaf_leaf_rx_error (dev, cmd);return ;
@@ -1015,7 +1015,7 @@ static void kvaser_usb_leaf_rx_can_msg(creturn ; } -switch (dev->card_data.leaf.family) { +switch (dev->driver_info->family) {case KVASER_LEAF : rx_data = cmd->u.leaf.rx_can.data;break ;
@@ -1030,7 +1030,7 @@ static void kvaser_usb_leaf_rx_can_msg(creturn ; } -if (dev->card_data.leaf.family ==KVASER_LEAF && cmd->id == +if (dev->driver_info->family ==KVASER_LEAF && cmd->id ==CMD_LEAF_LOG_MESSAGE ) { cf->can_id =le32_to_cpu (cmd->u.leaf.log_message.id);if (cf->can_id &KVASER_EXTENDED_FRAME )
@@ -1128,14 +1128,14 @@ static void kvaser_usb_leaf_handle_commabreak ;case CMD_LEAF_LOG_MESSAGE : -if (dev->card_data.leaf.family !=KVASER_LEAF ) +if (dev->driver_info->family !=KVASER_LEAF ) goto warn;kvaser_usb_leaf_rx_can_msg (dev, cmd);break ;case CMD_CHIP_STATE_EVENT :case CMD_CAN_ERROR_EVENT : -if (dev->card_data.leaf.family ==KVASER_LEAF ) +if (dev->driver_info->family ==KVASER_LEAF )kvaser_usb_leaf_leaf_rx_error (dev, cmd);else kvaser_usb_leaf_usbcan_rx_error (dev, cmd);
@@ -1147,12 +1147,12 @@ static void kvaser_usb_leaf_handle_comma/* Ignored commands */ case CMD_USBCAN_CLOCK_OVERFLOW_EVENT : -if (dev->card_data.leaf.family !=KVASER_USBCAN ) +if (dev->driver_info->family !=KVASER_USBCAN ) goto warn;break ;case CMD_FLUSH_QUEUE_REPLY : -if (dev->card_data.leaf.family !=KVASER_LEAF ) +if (dev->driver_info->family !=KVASER_LEAF ) goto warn;break ;
Greg Kroah-Hartman
maintainerPATCH 11/112 can: kvaser_usb: kvaser_usb_leaf: fix CAN clock frequency regression
In reply to Greg Kroah-HartmanFrom: Jimmy Assarsson <[email protected]>
commit e6c80e601053ffdac5709f11ff3ec1e19ed05f7b upstream.
The firmware of M32C based Leaf devices expects bittiming parameters calculated for 16MHz clock. Since we use the actual clock frequency of the device, the device may end up with wrong bittiming parameters, depending on user requested parameters.
This regression affects M32C based Leaf devices with non-16MHz clock.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 1 drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 33 ++++++++++++++--------- drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 25 +++++++++++------ 3 files changed, 38 insertions(+), 21 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb.h +1 -0
@@ -38,6 +38,7 @@/* Kvaser USB device quirks */ #define KVASER_USB_QUIRK_HAS_SILENT_MODE BIT(0)#define KVASER_USB_QUIRK_HAS_TXRX_ERRORS BIT(1) +#define KVASER_USB_QUIRK_IGNORE_CLK_FREQ BIT(2)/* Device capabilities */ #define KVASER_USB_CAP_BERR_CAP 0x01
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +21 -12
@@ -101,26 +101,33 @@ static const struct kvaser_usb_driver_in };static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf = { - .quirks =0 , + .quirks =KVASER_USB_QUIRK_IGNORE_CLK_FREQ , .family =KVASER_LEAF , .ops = &kvaser_usb_leaf_dev_ops, };static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = { - .quirks =KVASER_USB_QUIRK_HAS_TXRX_ERRORS , + .quirks =KVASER_USB_QUIRK_HAS_TXRX_ERRORS | +KVASER_USB_QUIRK_IGNORE_CLK_FREQ , .family =KVASER_LEAF , .ops = &kvaser_usb_leaf_dev_ops, };static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err_listen = { .quirks =KVASER_USB_QUIRK_HAS_TXRX_ERRORS | -KVASER_USB_QUIRK_HAS_SILENT_MODE , +KVASER_USB_QUIRK_HAS_SILENT_MODE | +KVASER_USB_QUIRK_IGNORE_CLK_FREQ , .family =KVASER_LEAF , .ops = &kvaser_usb_leaf_dev_ops, }; +static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = { + .quirks =0 , + .ops = &kvaser_usb_leaf_dev_ops, +}; +static const struct usb_device_id kvaser_usb_table[] = { -/* Leaf USB product IDs */ +/* Leaf M32C USB product IDs */ {USB_DEVICE (KVASER_VENDOR_ID ,USB_LEAF_DEVEL_PRODUCT_ID ), .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, {USB_DEVICE (KVASER_VENDOR_ID ,USB_LEAF_LITE_PRODUCT_ID ),
@@ -161,22 +168,24 @@ static const struct usb_device_id kvaser .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err }, { USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID), .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf_err }, + +/* Leaf i.MX28 USB product IDs */ { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_R_V2_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_R_V2_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx }, { USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID), - .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leaf }, + .driver_info = (kernel_ulong_t)&kvaser_usb_driver_info_leafimx },/* USBCANII USB product IDs */ { USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +16 -9
@@ -524,16 +524,23 @@ static void kvaser_usb_leaf_get_software dev->fw_version =le32_to_cpu (softinfo->fw_version); dev->max_tx_urbs =le16_to_cpu (softinfo->max_outstanding_tx); -switch (sw_options &KVASER_USB_LEAF_SWOPTION_FREQ_MASK ) { -case KVASER_USB_LEAF_SWOPTION_FREQ_16_MHZ_CLK : +if (dev->driver_info->quirks &KVASER_USB_QUIRK_IGNORE_CLK_FREQ ) { +/* Firmware expects bittiming parameters calculated for 16MHz +* clock, regardless of the actual clock +*/ dev->cfg = &kvaser_usb_leaf_dev_cfg_16mhz; -break ; -case KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK : - dev->cfg = &kvaser_usb_leaf_dev_cfg_24mhz; -break ; -case KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK : - dev->cfg = &kvaser_usb_leaf_dev_cfg_32mhz; -break ; + }else { +switch (sw_options &KVASER_USB_LEAF_SWOPTION_FREQ_MASK ) { +case KVASER_USB_LEAF_SWOPTION_FREQ_16_MHZ_CLK : + dev->cfg = &kvaser_usb_leaf_dev_cfg_16mhz; +break ; +case KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK : + dev->cfg = &kvaser_usb_leaf_dev_cfg_24mhz; +break ; +case KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK : + dev->cfg = &kvaser_usb_leaf_dev_cfg_32mhz; +break ; + } } }
Greg Kroah-Hartman
maintainerPATCH 12/112 can: kvaser_usb: kvaser_usb_leaf: fix bittiming limits
In reply to Greg Kroah-HartmanFrom: Jimmy Assarsson <[email protected]>
commit b3b6df2c56d80b8c6740433cff5f016668b8de70 upstream.
Use correct bittiming limits depending on device. For devices based on USBcanII, Leaf M32C or Leaf i.MX28.
--- drivers/net/can/usb/kvaser_usb/kvaser_usb.h | 2 drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 4 - drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c | 76 ++++++++++++---------- 3 files changed, 47 insertions(+), 35 deletions(-)
drivers/net/can/usb/kvaser_usb/kvaser_usb.h +2 -0
@@ -187,4 +187,6 @@ int kvaser_usb_send_cmd_async(struct kvaint kvaser_usb_can_rx_over_error (struct net_device *netdev); +extern const struct can_bittiming_const kvaser_usb_flexc_bittiming_const; +#endif /* KVASER_USB_H */
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +2 -2
@@ -375,7 +375,7 @@ static const struct can_bittiming_const .brp_inc = 1, }; -static const struct can_bittiming_const kvaser_usb_hydra_flexc_bittiming_c = { +const struct can_bittiming_const kvaser_usb_flexc_bittiming_const = { .name ="kvaser_usb_flex" , .tseg1_min =4 , .tseg1_max =16 ,
@@ -2052,7 +2052,7 @@ static const struct kvaser_usb_dev_cfg k .freq = 24 * MEGA /* Hz */, }, .timestamp_freq = 1, - .bittiming_const = &kvaser_usb_hydra_flexc_bittiming_c, + .bittiming_const = &kvaser_usb_flexc_bittiming_const, }; static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt = {
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +43 -33
131 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 13/112 can: mcp251xfd: mcp251xfd_regmap_crc_read(): improve workaround handling for mcp2517fd
In reply to Greg Kroah-HartmanFrom: Thomas Kopp <[email protected]>
commit 406cc9cdb3e8d644b15e8028948f091b82abdbca upstream.
The mcp251xfd compatible chips have an erratum ([1], [2]), where the received CRC doesn't match the calculated CRC. In commit c7eb923c3caf ("can: mcp251xfd: mcp251xfd_regmap_crc_read(): work around broken CRC on TBC register") the following workaround was implementierend.
- If a CRC read error on the TBC register is detected and the first byte is 0x00 or 0x80, the most significant bit of the first byte is flipped and the CRC is calculated again.
- If the CRC now matches, the _original_ data is passed to the reader. For now we assume transferred data was OK.
Measurements on the mcp2517fd show that the workaround is applicable not only of the lowest byte is 0x00 or 0x80, but also if 3 least significant bits are set.
Update check on 1st data byte and workaround description accordingly.
[1] mcp2517fd: DS80000792C: "Incorrect CRC for certain READ_CRC commands"
[2] mcp2518fd: DS80000789C: "Incorrect CRC for certain READ_CRC commands"
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c +8 -5
@@ -334,10 +334,12 @@ mcp251xfd_regmap_crc_read(void *context,* register. It increments once per SYS clock tick, * which is 20 or 40 MHz. * -* Observation shows that if the lowest byte (which is -* transferred first on the SPI bus) of that register -* is 0x00 or 0x80 the calculated CRC doesn't always -* match the transferred one. +* Observation on the mcp2518fd shows that if the +* lowest byte (which is transferred first on the SPI +* bus) of that register is 0x00 or 0x80 the +* calculated CRC doesn't always match the transferred +* one. On the mcp2517fd this problem is not limited +* to the first byte being 0x00 or 0x80. * * If the highest bit in the lowest byte is flipped * the transferred CRC matches the calculated one. We
@@ -346,7 +348,8 @@ mcp251xfd_regmap_crc_read(void *context,* correct. */ if (reg ==MCP251XFD_REG_TBC && - (buf_rx->data[0 ] ==0x0 || buf_rx->data[0 ] ==0x80 )) { + ((buf_rx->data[0 ] &0xf8 ) ==0x0 || + (buf_rx->data[0 ] &0xf8 ) ==0x80 )) {/* Flip highest bit in lowest byte of le32 */ buf_rx->data[0 ] ^=0x80 ;
Greg Kroah-Hartman
maintainerPATCH 14/112 can: mcp251xfd: mcp251xfd_regmap_crc_read(): update workaround broken CRC on TBC register
In reply to Greg Kroah-HartmanFrom: Thomas Kopp <[email protected]>
commit e3d4ee7d5f7f5256dfe89219afcc7a2d553b731f upstream.
The mcp251xfd compatible chips have an erratum ([1], [2]), where the received CRC doesn't match the calculated CRC. In commit c7eb923c3caf ("can: mcp251xfd: mcp251xfd_regmap_crc_read(): work around broken CRC on TBC register") the following workaround was implementierend.
- If a CRC read error on the TBC register is detected and the first byte is 0x00 or 0x80, the most significant bit of the first byte is flipped and the CRC is calculated again.
- If the CRC now matches, the _original_ data is passed to the reader. For now we assume transferred data was OK.
New investigations and simulations indicate that the CRC send by the device is calculated on correct data, and the data is incorrectly received by the SPI host controller.
Use flipped instead of original data and update workaround description in mcp251xfd_regmap_crc_read().
[1] mcp2517fd: DS80000792C: "Incorrect CRC for certain READ_CRC commands"
[2] mcp2518fd: DS80000789C: "Incorrect CRC for certain READ_CRC commands"
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c +3 -6
@@ -343,9 +343,8 @@ mcp251xfd_regmap_crc_read(void *context,* * If the highest bit in the lowest byte is flipped * the transferred CRC matches the calculated one. We -* assume for now the CRC calculation in the chip -* works on wrong data and the transferred data is -* correct. +* assume for now the CRC operates on the correct +* data. */ if (reg == MCP251XFD_REG_TBC && ((buf_rx->data[0] & 0xf8) == 0x0 ||
@@ -359,10 +358,8 @@ mcp251xfd_regmap_crc_read(void *context, val_len);if (!err) {/* If CRC is now correct, assume -* transferred data was OK, flip bit -* back to original value. +* flipped data is OK. */ - buf_rx->data[0 ] ^=0x80 ; goto out; } }
Greg Kroah-Hartman
maintainerPATCH 15/112 can: mcp251xfd: mcp251xfd_stop(): add missing hrtimer_cancel()
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit d5a972f561a003e302e4267340c57e8fbd096fa4 upstream.
In commit 169d00a25658 ("can: mcp251xfd: add TX IRQ coalescing support") software based TX coalescing was added to the driver. The key idea is to keep the TX complete IRQ disabled for some time after processing it and re-enable later by a hrtimer. When bringing the interface down, this timer has to be stopped.
Add the missing hrtimer_cancel() of the tx_irq_time hrtimer to mcp251xfd_stop().
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +1 -0
@@ -1641,6 +1641,7 @@ static int mcp251xfd_stop(struct net_devnetif_stop_queue (ndev);set_bit (MCP251XFD_FLAGS_DOWN , priv->flags);hrtimer_cancel (&priv->rx_irq_timer); +hrtimer_cancel (&priv->tx_irq_timer);mcp251xfd_chip_interrupts_disable (priv);free_irq (ndev->irq, priv);can_rx_offload_disable (&priv->offload);
Greg Kroah-Hartman
maintainerPATCH 16/112 bpf: Fix incorrect verifier simulation around jmp32s jeq/jne
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
commit a12ca6277eca6aeeccf66e840c23a2b520e24c8f upstream.
Kuee reported a quirk in the jmp32's jeq/jne simulation, namely that the register value does not match expectations for the fall-through path. For example:
Before fix:
0: R1=ctx(off=0,imm=0) R10=fp0
0: (b7) r2 = 0 ; R2_w=P0 1: (b7) r6 = 563 ; R6_w=P563 2: (87) r2 = -r2 ; R2_w=Pscalar() 3: (87) r2 = -r2 ; R2_w=Pscalar() 4: (4c) w2 |= w6 ; R2_w=Pscalar(umin=563,umax=4294967295,var_off=(0x233; 0xfffffdcc),s32_min=-2147483085) R6_w=P563 5: (56) if w2 != 0x8 goto pc+1 ; R2_w=P571 <--- [*]
6: (95) exit
R0 !read_ok
After fix:
0: R1=ctx(off=0,imm=0) R10=fp0
0: (b7) r2 = 0 ; R2_w=P0 1: (b7) r6 = 563 ; R6_w=P563 2: (87) r2 = -r2 ; R2_w=Pscalar() 3: (87) r2 = -r2 ; R2_w=Pscalar() 4: (4c) w2 |= w6 ; R2_w=Pscalar(umin=563,umax=4294967295,var_off=(0x233; 0xfffffdcc),s32_min=-2147483085) R6_w=P563 5: (56) if w2 != 0x8 goto pc+1 ; R2_w=P8 <--- [*]
6: (95) exit
R0 !read_ok
As can be seen on line 5 for the branch fall-through path in R2 [*] is that given condition w2 != 0x8 is false, verifier should conclude that r2 = 8 as upper 32 bit are known to be zero. However, verifier incorrectly concludes that r2 = 571 which is far off.
The problem is it only marks false{true}_reg as known in the switch for JE/NE case, but at the end of the function, it uses {false,true}_{64,32}off to update {false,true}_reg->var_off and they still hold the prior value of {false,true}_reg->var_off before it got marked as known. The subsequent __reg_combine_32_into_64() then propagates this old var_off and derives new bounds. The information between min/max bounds on {false,true}_reg from setting the register to known const combined with the {false,true}_reg->var_off based on the old information then derives wrong register data.
Fix it by detangling the BPF_JEQ/BPF_JNE cases and updating relevant {false,true}_{64,32}off tnums along with the register marking to known constant.
--- kernel/bpf/verifier.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)
kernel/bpf/verifier.c +24 -17
@@ -9068,26 +9068,33 @@ static void reg_set_min_max(struct bpf_rreturn ;switch (opcode) { +/* JEQ/JNE comparison doesn't change the register equivalence. +* +* r1 = r2; +* if (r1 == 42) goto label; +* ... +* label: // here both r1 and r2 are known to be 42. +* +* Hence when marking register as known preserve it's ID. +*/ case BPF_JEQ : +if (is_jmp32) { +__mark_reg32_known (true_reg, val32); + true_32off =tnum_subreg (true_reg->var_off); + }else { +___mark_reg_known (true_reg, val); + true_64off = true_reg->var_off; + } +break ;case BPF_JNE : - { -struct bpf_reg_state *reg = - opcode ==BPF_JEQ ? true_reg : false_reg; - -/* JEQ/JNE comparison doesn't change the register equivalence. -* r1 = r2; -* if (r1 == 42) goto label; -* ... -* label: // here both r1 and r2 are known to be 42. -* -* Hence when marking register as known preserve it's ID. -*/ -if (is_jmp32) -__mark_reg32_known (reg, val32); -else -___mark_reg_known (reg, val); +if (is_jmp32) { +__mark_reg32_known (false_reg, val32); + false_32off =tnum_subreg (false_reg->var_off); + }else { +___mark_reg_known (false_reg, val); + false_64off = false_reg->var_off; + }break ; - }case BPF_JSET :if (is_jmp32) { false_32off =tnum_and (false_32off,tnum_const (~val32));
Greg Kroah-Hartman
maintainerPATCH 17/112 bpf: Fix insufficient bounds propagation from adjust_scalar_min_max_vals
In reply to Greg Kroah-HartmanFrom: Daniel Borkmann <[email protected]>
commit 3844d153a41adea718202c10ae91dc96b37453b5 upstream.
Kuee reported a corner case where the tnum becomes constant after the call to __reg_bound_offset(), but the register's bounds are not, that is, its min bounds are still not equal to the register's max bounds.
This in turn allows to leak pointers through turning a pointer register as is into an unknown scalar via adjust_ptr_min_max_vals().
Before:
func#0 @0
0: R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
0: (b7) r0 = 1 ; R0_w=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) 1: (b7) r3 = 0 ; R3_w=scalar(imm=0,umax=0,var_off=(0x0; 0x0)) 2: (87) r3 = -r3 ; R3_w=scalar() 3: (87) r3 = -r3 ; R3_w=scalar() 4: (47) r3 |= 32767 ; R3_w=scalar(smin=-9223372036854743041,umin=32767,var_off=(0x7fff; 0xffffffffffff8000),s32_min=-2147450881) 5: (75) if r3 s>= 0x0 goto pc+1 ; R3_w=scalar(umin=9223372036854808575,var_off=(0x8000000000007fff; 0x7fffffffffff8000),s32_min=-2147450881,u32_min=32767)
6: (95) exit
from 5 to 7: R0=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R3=scalar(umin=32767,umax=9223372036854775807,var_off=(0x7fff; 0x7fffffffffff8000),s32_min=-2147450881) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
7: (d5) if r3 s<= 0x8000 goto pc+1 ; R3=scalar(umin=32769,umax=9223372036854775807,var_off=(0x7fff; 0x7fffffffffff8000),s32_min=-2147450881,u32_min=32767)
8: (95) exit
from 7 to 9: R0=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R3=scalar(umin=32767,umax=32768,var_off=(0x7fff; 0x8000)) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
9: (07) r3 += -32767 ; R3_w=scalar(imm=0,umax=1,var_off=(0x0; 0x0)) <--- [*]
10: (95) exit
What can be seen here is that R3=scalar(umin=32767,umax=32768,var_off=(0x7fff; 0x8000)) after the operation R3 += -32767 results in a 'malformed' constant, that is, R3_w=scalar(imm=0,umax=1,var_off=(0x0; 0x0)). Intersecting with var_off has not been done at that point via __update_reg_bounds(), which would have improved the umax to be equal to umin.
Refactor the tnum <> min/max bounds information flow into a reg_bounds_sync() helper and use it consistently everywhere. After the fix, bounds have been corrected to R3_w=scalar(imm=0,umax=0,var_off=(0x0; 0x0)) and thus the register is regarded as a 'proper' constant scalar of 0.
After:
func#0 @0
0: R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
0: (b7) r0 = 1 ; R0_w=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) 1: (b7) r3 = 0 ; R3_w=scalar(imm=0,umax=0,var_off=(0x0; 0x0)) 2: (87) r3 = -r3 ; R3_w=scalar() 3: (87) r3 = -r3 ; R3_w=scalar() 4: (47) r3 |= 32767 ; R3_w=scalar(smin=-9223372036854743041,umin=32767,var_off=(0x7fff; 0xffffffffffff8000),s32_min=-2147450881) 5: (75) if r3 s>= 0x0 goto pc+1 ; R3_w=scalar(umin=9223372036854808575,var_off=(0x8000000000007fff; 0x7fffffffffff8000),s32_min=-2147450881,u32_min=32767)
6: (95) exit
from 5 to 7: R0=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R3=scalar(umin=32767,umax=9223372036854775807,var_off=(0x7fff; 0x7fffffffffff8000),s32_min=-2147450881) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
7: (d5) if r3 s<= 0x8000 goto pc+1 ; R3=scalar(umin=32769,umax=9223372036854775807,var_off=(0x7fff; 0x7fffffffffff8000),s32_min=-2147450881,u32_min=32767)
8: (95) exit
from 7 to 9: R0=scalar(imm=1,umin=1,umax=1,var_off=(0x1; 0x0)) R1=ctx(off=0,imm=0,umax=0,var_off=(0x0; 0x0)) R3=scalar(umin=32767,umax=32768,var_off=(0x7fff; 0x8000)) R10=fp(off=0,imm=0,umax=0,var_off=(0x0; 0x0))
9: (07) r3 += -32767 ; R3_w=scalar(imm=0,umax=0,var_off=(0x0; 0x0)) <--- [*]
10: (95) exit
--- kernel/bpf/verifier.c | 72 +++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 49 deletions(-)
kernel/bpf/verifier.c +23 -49
@@ -1417,6 +1417,21 @@ static void __reg_bound_offset(struct bp reg->var_off =tnum_or (tnum_clear_subreg (var64_off), var32_off); } +static void reg_bounds_sync (struct bpf_reg_state *reg) +{ +/* We might have learned new bounds from the var_off. */ +__update_reg_bounds (reg); +/* We might have learned something about the sign bit. */ +__reg_deduce_bounds (reg); +/* We might have learned some bits from the bounds. */ +__reg_bound_offset (reg); +/* Intersecting with the old var_off might have improved our bounds +* slightly, e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), +* then new var_off is (0; 0x7f...fc) which improves our umax. +*/ +__update_reg_bounds (reg); +} +static bool __reg32_bound_s64 (s32 a) {return a >=0 && a <=S32_MAX ;
@@ -1458,16 +1473,8 @@ static void __reg_combine_32_into_64(str* so they do not impact tnum bounds calculation. */ __mark_reg64_unbounded (reg); -__update_reg_bounds (reg); } - -/* Intersecting with the old var_off might have improved our bounds -* slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), -* then new var_off is (0; 0x7f...fc) which improves our umax. -*/ -__reg_deduce_bounds (reg); -__reg_bound_offset (reg); -__update_reg_bounds (reg); +reg_bounds_sync (reg); }static bool __reg64_bound_s32 (s64 a)
@@ -1483,7 +1490,6 @@ static bool __reg64_bound_u32(u64 a)static void __reg_combine_64_into_32 (struct bpf_reg_state *reg) {__mark_reg32_unbounded (reg); -if (__reg64_bound_s32 (reg->smin_value) &&__reg64_bound_s32 (reg->smax_value)) { reg->s32_min_value = (s32 )reg->smin_value; reg->s32_max_value = (s32 )reg->smax_value;
@@ -1492,14 +1498,7 @@ static void __reg_combine_64_into_32(str reg->u32_min_value = (u32 )reg->umin_value; reg->u32_max_value = (u32 )reg->umax_value; } - -/* Intersecting with the old var_off might have improved our bounds -* slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), -* then new var_off is (0; 0x7f...fc) which improves our umax. -*/ -__reg_deduce_bounds (reg); -__reg_bound_offset (reg); -__update_reg_bounds (reg); +reg_bounds_sync (reg); }/* Mark a register as having a completely unknown (scalar) value. */
@@ -6485,9 +6484,7 @@ static void do_refine_retval_range(struc ret_reg->s32_max_value = meta->msize_max_value; ret_reg->smin_value = -MAX_ERRNO ; ret_reg->s32_min_value = -MAX_ERRNO ; -__reg_deduce_bounds (ret_reg); -__reg_bound_offset (ret_reg); -__update_reg_bounds (ret_reg); +reg_bounds_sync (ret_reg); } static int
@@ -7693,11 +7690,7 @@ static int adjust_ptr_min_max_vals(strucif (!check_reg_sane_offset (env, dst_reg, ptr_reg->type))return -EINVAL ; - -__update_reg_bounds (dst_reg); -__reg_deduce_bounds (dst_reg); -__reg_bound_offset (dst_reg); - +reg_bounds_sync (dst_reg);if (sanitize_check_bounds (env, insn, dst_reg) <0 )return -EACCES ;if (sanitize_needed (opcode)) {
@@ -8435,10 +8428,7 @@ static int adjust_scalar_min_max_vals(st/* ALU32 ops are zero extended into 64bit register */ if (alu32)zext_32_to_64 (dst_reg); - -__update_reg_bounds (dst_reg); -__reg_deduce_bounds (dst_reg); -__reg_bound_offset (dst_reg); +reg_bounds_sync (dst_reg);return 0 ; }
@@ -8627,10 +8617,7 @@ static int check_alu_op(struct bpf_verif insn->dst_reg); }zext_32_to_64 (dst_reg); - -__update_reg_bounds (dst_reg); -__reg_deduce_bounds (dst_reg); -__reg_bound_offset (dst_reg); +reg_bounds_sync (dst_reg); } }else {/* case: R = imm
@@ -9233,21 +9220,8 @@ static void __reg_combine_min_max(struct dst_reg->smax_value); src_reg->var_off = dst_reg->var_off =tnum_intersect (src_reg->var_off, dst_reg->var_off); -/* We might have learned new bounds from the var_off. */ -__update_reg_bounds (src_reg); -__update_reg_bounds (dst_reg); -/* We might have learned something about the sign bit. */ -__reg_deduce_bounds (src_reg); -__reg_deduce_bounds (dst_reg); -/* We might have learned some bits from the bounds. */ -__reg_bound_offset (src_reg); -__reg_bound_offset (dst_reg); -/* Intersecting with the old var_off might have improved our bounds -* slightly. e.g. if umax was 0x7f...f and var_off was (0; 0xf...fc), -* then new var_off is (0; 0x7f...fc) which improves our umax. -*/ -__update_reg_bounds (src_reg); -__update_reg_bounds (dst_reg); +reg_bounds_sync (src_reg); +reg_bounds_sync (dst_reg); } static void reg_combine_min_max(struct bpf_reg_state *true_src,
Greg Kroah-Hartman
maintainerPATCH 18/112 usbnet: fix memory leak in error case
In reply to Greg Kroah-HartmanFrom: Oliver Neukum <[email protected]>
commit b55a21b764c1e182014630fa5486d717484ac58f upstream.
usbnet_write_cmd_async() mixed up which buffers
need to be freed in which error case.
v2: add Fixes tag
v3: fix uninitialized buf pointer
--- drivers/net/usb/usbnet.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/usb/usbnet.c +12 -5
@@ -2137,7 +2137,7 @@ static void usbnet_async_cmd_cb(struct uint usbnet_write_cmd_async (struct usbnet *dev,u8 cmd,u8 reqtype,u16 value,u16 index,const void *data,u16 size) { -struct usb_ctrlrequest *req =NULL ; +struct usb_ctrlrequest *req;struct urb *urb;int err = -ENOMEM ;void *buf =NULL ;
@@ -2155,7 +2155,7 @@ int usbnet_write_cmd_async(struct usbnetif (!buf) {netdev_err (dev->net,"Error allocating buffer" " in %s!\n" , __func__); - goto fail_free; + goto fail_free_urb; } }
@@ -2179,14 +2179,21 @@ int usbnet_write_cmd_async(struct usbnetif (err <0 ) {netdev_err (dev->net,"Error submitting the control" " message: status=%d\n" , err); - goto fail_free; + goto fail_free_all; }return 0 ; +fail_free_all: +kfree (req); fail_free_buf:kfree (buf); -fail_free: -kfree (req); +/* +* avoid a double free +* needed because the flag can be set only +* after filling the URB +*/ + urb->transfer_flags =0 ; +fail_free_urb:usb_free_urb (urb); fail:return err;
Greg Kroah-Hartman
maintainerPATCH 19/112 net: rose: fix UAF bug caused by rose_t0timer_expiry
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
commit 148ca04518070910739dfc4eeda765057856403d upstream.
There are UAF bugs caused by rose_t0timer_expiry(). The root cause is that del_timer() could not stop the timer handler that is running and there is no synchronization. One of the race conditions is shown below:
(thread 1) | (thread 2)
| rose_device_event
| rose_rt_device_down
| rose_remove_neigh
rose_t0timer_expiry | rose_stop_t0timer(rose_neigh)
... | del_timer(&neigh->t0timer)
| kfree(rose_neigh) //[1]FREE
neigh->dce_mode //[2]USE |The rose_neigh is deallocated in position [1] and use in position [2].
The crash trace triggered by POC is like below:
BUG: KASAN: use-after-free in expire_timers+0x144/0x320 Write of size 8 at addr ffff888009b19658 by task swapper/0/0 ... Call Trace: <IRQ> dump_stack_lvl+0xbf/0xee print_address_description+0x7b/0x440 print_report+0x101/0x230 ? expire_timers+0x144/0x320 kasan_report+0xed/0x120 ? expire_timers+0x144/0x320 expire_timers+0x144/0x320 __run_timers+0x3ff/0x4d0 run_timer_softirq+0x41/0x80 __do_softirq+0x233/0x544 ...
This patch changes rose_stop_ftimer() and rose_stop_t0timer() in rose_remove_neigh() to del_timer_sync() in order that the timer handler could be finished before the resources such as rose_neigh and so on are deallocated. As a result, the UAF bugs could be mitigated.
--- net/rose/rose_route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/rose/rose_route.c +2 -2
@@ -227,8 +227,8 @@ static void rose_remove_neigh(struct ros {struct rose_neigh *s; -rose_stop_ftimer (rose_neigh); -rose_stop_t0timer (rose_neigh); +del_timer_sync (&rose_neigh->ftimer); +del_timer_sync (&rose_neigh->t0timer);skb_queue_purge (&rose_neigh->queue);
Greg Kroah-Hartman
maintainerPATCH 20/112 net: lan966x: hardcode the number of external ports
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit e6fa930f73a15238f3cb0c204e2f786c919b815c upstream.
Instead of counting the child nodes in the device tree, hardcode the number of ports in the driver itself. The counting won't work at all if an ethernet port is marked as disabled, e.g. because it is not connected on the board at all.
It turns out that the LAN9662 and LAN9668 use the same switching IP with the same synthesis parameters. The only difference is that the output ports are not connected. Thus, we can just hardcode the number of physical ports to 8.
--- drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++------ drivers/net/ethernet/microchip/lan966x/lan966x_main.h | 1 + 2 files changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_main.c +2 -6
@@ -979,7 +979,7 @@ static int lan966x_probe(struct platformstruct fwnode_handle *ports, *portnp;struct lan966x *lan966x;u8 mac_addr[ETH_ALEN ]; -int err, i; +int err; lan966x =devm_kzalloc (&pdev->dev,sizeof (*lan966x),GFP_KERNEL );if (!lan966x)
@@ -1010,11 +1010,7 @@ static int lan966x_probe(struct platformif (err)return dev_err_probe (&pdev->dev, err,"Reset failed" ); - i =0 ; -fwnode_for_each_available_child_node (ports, portnp) - ++i; - - lan966x->num_phys_ports = i; + lan966x->num_phys_ports =NUM_PHYS_PORTS ; lan966x->ports =devm_kcalloc (&pdev->dev, lan966x->num_phys_ports,sizeof (struct lan966x_port *),GFP_KERNEL );
drivers/net/ethernet/microchip/lan966x/lan966x_main.h +1 -0
@@ -31,6 +31,7 @@/* Reserved amount for (SRC, PRIO) at index 8*SRC + PRIO */ #define QSYS_Q_RSRV 95 +#define NUM_PHYS_PORTS 8#define CPU_PORT 8/* Reserved PGIDs */
Greg Kroah-Hartman
maintainerPATCH 21/112 netfilter: nft_set_pipapo: release elements in clone from abort path
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 9827a0e6e23bf43003cd3d5b7fb11baf59a35e1e upstream.
New elements that reside in the clone are not released in case that the transaction is aborted.
[16302.231754] ------------[ cut here ]------------ [16302.231756] WARNING: CPU: 0 PID: 100509 at net/netfilter/nf_tables_api.c:1864 nf_tables_chain_destroy+0x26/0x127 [nf_tables] [...] [16302.231882] CPU: 0 PID: 100509 Comm: nft Tainted: G W 5.19.0-rc3+ #155 [...] [16302.231887] RIP: 0010:nf_tables_chain_destroy+0x26/0x127 [nf_tables] [16302.231899] Code: f3 fe ff ff 41 55 41 54 55 53 48 8b 6f 10 48 89 fb 48 c7 c7 82 96 d9 a0 8b 55 50 48 8b 75 58 e8 de f5 92 e0 83 7d 50 00 74 09 <0f> 0b 5b 5d 41 5c 41 5d c3 4c 8b 65 00 48 8b 7d 08 49 39 fc 74 05 [...] [16302.231917] Call Trace: [16302.231919] <TASK> [16302.231921] __nf_tables_abort.cold+0x23/0x28 [nf_tables] [16302.231934] nf_tables_abort+0x30/0x50 [nf_tables] [16302.231946] nfnetlink_rcv_batch+0x41a/0x840 [nfnetlink] [16302.231952] ? __nla_validate_parse+0x48/0x190 [16302.231959] nfnetlink_rcv+0x110/0x129 [nfnetlink] [16302.231963] netlink_unicast+0x211/0x340 [16302.231969] netlink_sendmsg+0x21e/0x460
Add nft_set_pipapo_match_destroy() helper function to release the elements in the lookup tables.
Stefano Brivio says: "We additionally look for elements pointers in the cloned matching data if priv->dirty is set, because that means that cloned data might point to additional elements we did not commit to the working copy yet (such as the abort path case, but perhaps not limited to it)."
--- net/netfilter/nft_set_pipapo.c | 48 ++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-)
net/netfilter/nft_set_pipapo.c +33 -15
@@ -2125,6 +2125,32 @@ out_scratch: }/** +* nft_set_pipapo_match_destroy() - Destroy elements from key mapping array +* @set: nftables API set representation +* @m: matching data pointing to key mapping array +*/ +static void nft_set_pipapo_match_destroy (const struct nft_set *set, +struct nft_pipapo_match *m) +{ +struct nft_pipapo_field *f; +int i, r; + +for (i =0 , f = m->f; i < m->field_count -1 ; i++, f++) + ; + +for (r =0 ; r < f->rules; r++) { +struct nft_pipapo_elem *e; + +if (r < f->rules -1 && f->mt[r +1 ].e == f->mt[r].e) +continue ; + + e = f->mt[r].e; + +nft_set_elem_destroy (set, e, true); + } +} + +/** * nft_pipapo_destroy() - Free private data for set and all committed elements * @set: nftables API set representation */
@@ -2132,26 +2158,13 @@ static void nft_pipapo_destroy(const str {struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_match *m; -struct nft_pipapo_field *f; -int i, r, cpu; +int cpu; m =rcu_dereference_protected (priv->match, true);if (m) {rcu_barrier (); -for (i =0 , f = m->f; i < m->field_count -1 ; i++, f++) - ; - -for (r =0 ; r < f->rules; r++) { -struct nft_pipapo_elem *e; - -if (r < f->rules -1 && f->mt[r +1 ].e == f->mt[r].e) -continue ; - - e = f->mt[r].e; - -nft_set_elem_destroy (set, e, true); - } +nft_set_pipapo_match_destroy (set, m);#ifdef NFT_PIPAPO_ALIGN free_percpu (m->scratch_aligned);
@@ -2165,6 +2178,11 @@ static void nft_pipapo_destroy(const str }if (priv->clone) { + m = priv->clone; + +if (priv->dirty) +nft_set_pipapo_match_destroy (set, m); +#ifdef NFT_PIPAPO_ALIGN free_percpu (priv->clone->scratch_aligned);#endif
Greg Kroah-Hartman
maintainerPATCH 22/112 netfilter: nf_tables: stricter validation of element data
In reply to Greg Kroah-HartmanFrom: Pablo Neira Ayuso <[email protected]>
commit 7e6bc1f6cabcd30aba0b11219d8e01b952eacbb6 upstream.
Make sure element data type and length do not mismatch the one specified by the set declaration.
--- net/netfilter/nf_tables_api.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/netfilter/nf_tables_api.c +8 -1
@@ -5213,13 +5213,20 @@ static int nft_setelem_parse_data(structstruct nft_data *data, struct nlattr *attr) { + u32 dtype;int err; err =nft_data_init (ctx, data,NFT_DATA_VALUE_MAXLEN , desc, attr);if (err <0 )return err; -if (desc->type !=NFT_DATA_VERDICT && desc->len != set->dlen) { +if (set->dtype ==NFT_DATA_VERDICT ) + dtype =NFT_DATA_VERDICT ; +else + dtype =NFT_DATA_VALUE ; + +if (dtype != desc->type || + set->dlen != desc->len) {nft_data_release (data, desc->type);return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 23/112 selftests/net: fix section name when using xdp_dummy.o
In reply to Greg Kroah-HartmanFrom: Hangbin Liu <[email protected]>
commit d28b25a62a47a8c8aa19bd543863aab6717e68c9 upstream.
Since commit 8fffa0e3451a ("selftests/bpf: Normalize XDP section names in selftests") the xdp_dummy.o's section name has changed to xdp. But some tests are still using "section xdp_dummy", which make the tests failed. Fix them by updating to the new section name.
--- tools/testing/selftests/net/udpgro.sh | 2 +- tools/testing/selftests/net/udpgro_bench.sh | 2 +- tools/testing/selftests/net/udpgro_frglist.sh | 2 +- tools/testing/selftests/net/udpgro_fwd.sh | 2 +- tools/testing/selftests/net/veth.sh | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)
tools/testing/selftests/net/udpgro.sh +1 -1
@@ -34,7 +34,7 @@ cfg_veth() { ip -netns "${PEER_NS}" addr add dev veth1 192.168.1.1/24 ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad ip -netns "${PEER_NS}" link set dev veth1 up - ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp_dummy + ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp } run_one() {
tools/testing/selftests/net/udpgro_bench.sh +1 -1
@@ -34,7 +34,7 @@ run_one() { ip -netns "${PEER_NS}" addr add dev veth1 2001:db8::1/64 nodad ip -netns "${PEER_NS}" link set dev veth1 up - ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp_dummy + ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp ip netns exec "${PEER_NS}" ./udpgso_bench_rx ${rx_args} -r & ip netns exec "${PEER_NS}" ./udpgso_bench_rx -t ${rx_args} -r &
tools/testing/selftests/net/udpgro_frglist.sh +1 -1
@@ -36,7 +36,7 @@ run_one() { ip netns exec "${PEER_NS}" ethtool -K veth1 rx-gro-list on - ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp_dummy + ip -n "${PEER_NS}" link set veth1 xdp object ../bpf/xdp_dummy.o section xdp tc -n "${PEER_NS}" qdisc add dev veth1 clsact tc -n "${PEER_NS}" filter add dev veth1 ingress prio 4 protocol ipv6 bpf object-file ../bpf/nat6to4.o section schedcls/ingress6/nat_6 direct-action tc -n "${PEER_NS}" filter add dev veth1 egress prio 4 protocol ip bpf object-file ../bpf/nat6to4.o section schedcls/egress4/snat4 direct-action
tools/testing/selftests/net/udpgro_fwd.sh +1 -1
@@ -46,7 +46,7 @@ create_ns() { ip -n $BASE$ns addr add dev veth$ns $BM_NET_V4$ns/24 ip -n $BASE$ns addr add dev veth$ns $BM_NET_V6$ns/64 nodad done - ip -n $NS_DST link set veth$DST xdp object ../bpf/xdp_dummy.o section xdp_dummy 2>/dev/null + ip -n $NS_DST link set veth$DST xdp object ../bpf/xdp_dummy.o section xdp 2>/dev/null } create_vxlan_endpoint() {
tools/testing/selftests/net/veth.sh +3 -3
@@ -289,14 +289,14 @@ if [ $CPUS -gt 1 ]; then ip netns exec $NS_SRC ethtool -L veth$SRC rx 1 tx 2 2>/dev/null printf "%-60s" "bad setting: XDP with RX nr less than TX" ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o \ - section xdp_dummy 2>/dev/null &&\ + section xdp 2>/dev/null &&\ echo "fail - set operation successful ?!?" || echo " ok " # the following tests will run with multiple channels active ip netns exec $NS_SRC ethtool -L veth$SRC rx 2 ip netns exec $NS_DST ethtool -L veth$DST rx 2 ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o \ - section xdp_dummy 2>/dev/null + section xdp 2>/dev/null printf "%-60s" "bad setting: reducing RX nr below peer TX with XDP set" ip netns exec $NS_DST ethtool -L veth$DST rx 1 2>/dev/null &&\ echo "fail - set operation successful ?!?" || echo " ok "
@@ -311,7 +311,7 @@ if [ $CPUS -gt 2 ]; then chk_channels "setting invalid channels nr" $DST 2 2 fi -ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o section xdp_dummy 2>/dev/null +ip -n $NS_DST link set dev veth$DST xdp object ../bpf/xdp_dummy.o section xdp 2>/dev/null chk_gro_flag "with xdp attached - gro flag" $DST on chk_gro_flag " - peer gro flag" $SRC off chk_tso_flag " - tso flag" $SRC off
Greg Kroah-Hartman
maintainerPATCH 24/112 can: mcp251xfd: mcp251xfd_register_get_dev_id(): use correct length to read dev_id
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 0ff32bfa0e794ccc3601de7158b522bf736fa63c upstream.
The device ID register is 32 bits wide. The driver uses incorrectly the size of a pointer to a u32 to calculate the length of the SPI transfer. This results in a read of 2 registers on 64 bit platforms. This is no problem on the Linux side, as the RX buffer of the SPI transfer is large enough. In the mpc251xfd chip this results in the read of an undocumented register. So far no problems were observed.
Fix the length of the SPI transfer to read the device ID register only.
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +1 -1
@@ -1769,7 +1769,7 @@ mcp251xfd_register_get_dev_id(const stru xfer[0 ].len =sizeof (buf_tx->cmd); xfer[0 ].speed_hz = priv->spi_max_speed_hz_slow; xfer[1 ].rx_buf = buf_rx->data; - xfer[1 ].len =sizeof (dev_id); + xfer[1 ].len =sizeof (*dev_id); xfer[1 ].speed_hz = priv->spi_max_speed_hz_fast;mcp251xfd_spi_cmd_read_nocrc (&buf_tx->cmd,MCP251XFD_REG_DEVID );
Greg Kroah-Hartman
maintainerPATCH 25/112 can: mcp251xfd: mcp251xfd_register_get_dev_id(): fix endianness conversion
In reply to Greg Kroah-HartmanFrom: Marc Kleine-Budde <[email protected]>
commit 1c0e78a287e3493e22bde8553d02f3b89177eaf7 upstream.
In mcp251xfd_register_get_dev_id() the device ID register is read with handcrafted SPI transfers. As all registers, this register is in little endian. Further it is not naturally aligned in struct mcp251xfd_map_buf_nocrc::data. However after the transfer the register content is converted from big endian to CPU endianness not taking care of being unaligned.
Fix the conversion by converting from little endian to CPU endianness taking the unaligned source into account.
Side note: So far the register content is 0x0 on all mcp251xfd compatible chips, and is only used for an informative printk.
--- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +2 -1
@@ -12,6 +12,7 @@// Copyright (c) 2019 Martin Sperl <[email protected]> // +#include <asm/unaligned.h> #include <linux/bitfield.h> #include <linux/clk.h> #include <linux/device.h>
@@ -1778,7 +1779,7 @@ mcp251xfd_register_get_dev_id(const struif (err) goto out_kfree_buf_tx; - *dev_id =be32_to_cpup ((__be32 *)buf_rx->data); + *dev_id =get_unaligned_le32 (buf_rx->data); *effective_speed_hz_slow = xfer[0 ].effective_speed_hz; *effective_speed_hz_fast = xfer[1 ].effective_speed_hz;
Greg Kroah-Hartman
maintainerPATCH 26/112 can: rcar_canfd: Fix data transmission failed on R-Car V3U
In reply to Greg Kroah-HartmanFrom: Duy Nguyen <[email protected]>
commit 374e11f1bde91545674233459e5a0416ba842b69 upstream.
On R-Car V3U, this driver should use suitable register offset instead of other SoCs' one. Otherwise, data transmission failed on R-Car V3U.
--- drivers/net/can/rcar/rcar_canfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/can/rcar/rcar_canfd.c +4 -1
@@ -1334,7 +1334,10 @@ static void rcar_canfd_set_bittiming(str cfg = (RCANFD_DCFG_DTSEG1 (gpriv, tseg1) |RCANFD_DCFG_DBRP (brp) |RCANFD_DCFG_DSJW (sjw) |RCANFD_DCFG_DTSEG2 (gpriv, tseg2)); -rcar_canfd_write (priv->base,RCANFD_F_DCFG (ch), cfg); +if (is_v3u (gpriv)) +rcar_canfd_write (priv->base,RCANFD_V3U_DCFG (ch), cfg); +else +rcar_canfd_write (priv->base,RCANFD_F_DCFG (ch), cfg);netdev_dbg (priv->ndev,"drate: brp %u, sjw %u, tseg1 %u, tseg2 %u\n" , brp, sjw, tseg1, tseg2); }else {
Greg Kroah-Hartman
maintainerPATCH 27/112 ASoC: qdsp6: q6apm-dai: unprepare stream if its already prepared
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
commit 58136d93d4e2c1207a5e4f3044815cd40b1d95fd upstream.
prepare callback can be called multiple times, so unprepare the stream if its already prepared.
Without this DSP is not happy to setting the params on a already prepared graph.
--- sound/soc/qcom/qdsp6/q6apm-dai.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/qcom/qdsp6/q6apm-dai.c +6 -0
@@ -147,6 +147,12 @@ static int q6apm_dai_prepare(struct snd_ cfg.num_channels = runtime->channels; cfg.bit_width = prtd->bits_per_sample; +if (prtd->state) { +/* clear the previous setup if any */ +q6apm_graph_stop (prtd->graph); +q6apm_unmap_memory_regions (prtd->graph, substream->stream); + } + prtd->pcm_count =snd_pcm_lib_period_bytes (substream); prtd->pos =0 ;/* rate and channels are sent to audio driver */
Greg Kroah-Hartman
maintainerPATCH 28/112 MAINTAINERS: Remove [email protected]
In reply to Greg Kroah-HartmanFrom: Joerg Roedel <[email protected]>
commit c51b8f85c4157eb91c2f4ab34b0c52fea642e77c upstream.
The IOMMU mailing list has moved to [email protected] and the old list should bounce by now. Remove it from the MAINTAINERS file.
--- MAINTAINERS | 11 ----------- 1 file changed, 11 deletions(-)
MAINTAINERS +0 -11
@@ -426,7 +426,6 @@ F: drivers/acpi/*thermal* ACPI VIOT DRIVER M: Jean-Philippe Brucker <[email protected]> L: [email protected] -L: [email protected] L: [email protected] S: Maintained F: drivers/acpi/viot.c
@@ -960,7 +959,6 @@ F: drivers/video/fbdev/geode/ AMD IOMMU (AMD-VI) M: Joerg Roedel <[email protected]> R: Suravee Suthikulpanit <[email protected]> -L: [email protected] L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -5899,7 +5897,6 @@ DMA MAPPING HELPERS M: Christoph Hellwig <[email protected]> M: Marek Szyprowski <[email protected]> R: Robin Murphy <[email protected]> -L: [email protected] L: [email protected] S: Supported W: http://git.infradead.org/users/hch/dma-mapping.git
@@ -5912,7 +5909,6 @@ F: kernel/dma/ DMA MAPPING BENCHMARK M: Xiang Chen <[email protected]> -L: [email protected] L: [email protected] F: kernel/dma/map_benchmark.c F: tools/testing/selftests/dma/
@@ -7479,7 +7475,6 @@ F: drivers/gpu/drm/exynos/exynos_dp* EXYNOS SYSMMU (IOMMU) driver M: Marek Szyprowski <[email protected]> -L: [email protected] L: [email protected] S: Maintained F: drivers/iommu/exynos-iommu.c
@@ -9879,7 +9874,6 @@ F: drivers/hid/intel-ish-hid/ INTEL IOMMU (VT-d) M: David Woodhouse <[email protected]> M: Lu Baolu <[email protected]> -L: [email protected] L: [email protected] S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -10258,7 +10252,6 @@ F: include/linux/iomap.h IOMMU DRIVERS M: Joerg Roedel <[email protected]> M: Will Deacon <[email protected]> -L: [email protected] L: [email protected] S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -12375,7 +12368,6 @@ F: drivers/i2c/busses/i2c-mt65xx.c MEDIATEK IOMMU DRIVER M: Yong Wu <[email protected]> -L: [email protected] L: [email protected] L: [email protected] (moderated for non-subscribers) S: Supported
@@ -16361,7 +16353,6 @@ F: drivers/i2c/busses/i2c-qcom-cci.c QUALCOMM IOMMU M: Rob Clark <[email protected]> -L: [email protected] L: [email protected] L: [email protected] S: Maintained
@@ -18947,7 +18938,6 @@ F: arch/x86/boot/video* SWIOTLB SUBSYSTEM M: Christoph Hellwig <[email protected]> -L: [email protected] L: [email protected] S: Supported W: http://git.infradead.org/users/hch/dma-mapping.git
@@ -21618,7 +21608,6 @@ XEN SWIOTLB SUBSYSTEM M: Juergen Gross <[email protected]> M: Stefano Stabellini <[email protected]> L: [email protected] (moderated for non-subscribers) -L: [email protected] L: [email protected] S: Supported F: arch/x86/xen/*swiotlb*
Greg Kroah-Hartman
maintainerPATCH 29/112 iommu/vt-d: Fix PCI bus rescan device hot add
In reply to Greg Kroah-HartmanFrom: Yian Chen <[email protected]>
commit 316f92a705a4c2bf4712135180d56f3cca09243a upstream.
Notifier calling chain uses priority to determine the execution order of the notifiers or listeners registered to the chain. PCI bus device hot add utilizes the notification mechanism.
The current code sets low priority (INT_MIN) to Intel dmar_pci_bus_notifier and postpones DMAR decoding after adding new device into IOMMU. The result is that struct device pointer cannot be found in DRHD search for the new device's DMAR/IOMMU. Subsequently, the device is put under the "catch-all" IOMMU instead of the correct one. This could cause system hang when device TLB invalidation is sent to the wrong IOMMU. Invalidation timeout error and hard lockup have been observed and data inconsistency/crush may occur as well.
This patch fixes the issue by setting a positive priority(1) for dmar_pci_bus_notifier while the priority of IOMMU bus notifier uses the default value(0), therefore DMAR decoding will be in advance of DRHD search for a new device to find the correct IOMMU.
Following is a 2-step example that triggers the bug by simulating PCI device hot add behavior in Intel Sapphire Rapids server.
echo 1 > /sys/bus/pci/devices/0000:6a:01.0/remove
echo 1 > /sys/bus/pci/rescan
--- drivers/iommu/intel/dmar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/dmar.c +1 -1
@@ -383,7 +383,7 @@ static int dmar_pci_bus_notifier(structstatic struct notifier_block dmar_pci_bus_nb = { .notifier_call = dmar_pci_bus_notifier, - .priority =INT_MIN , + .priority =1 , }; static struct dmar_drhd_unit *
Greg Kroah-Hartman
maintainerPATCH 30/112 iommu/vt-d: Fix RID2PASID setup/teardown failure
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
commit 4140d77a022101376bbfa3ec3e3da5063455c60e upstream.
The IOMMU driver shares the pasid table for PCI alias devices. When the RID2PASID entry of the shared pasid table has been filled by the first device, the subsequent device will encounter the "DMAR: Setup RID2PASID failed" failure as the pasid entry has already been marked as present. As the result, the IOMMU probing process will be aborted.
On the contrary, when any alias device is hot-removed from the system, for example, by writing to /sys/bus/pci/devices/.../remove, the shared RID2PASID will be cleared without any notifications to other devices. As the result, any DMAs from those rest devices are blocked.
Sharing pasid table among PCI alias devices could save two memory pages for devices underneath the PCIe-to-PCI bridges. Anyway, considering that those devices are rare on modern platforms that support VT-d in scalable mode and the saved memory is negligible, it's reasonable to remove this part of immature code to make the driver feasible and stable.
--- drivers/iommu/intel/iommu.c | 24 --------------- drivers/iommu/intel/pasid.c | 69 +------------------------------------------- drivers/iommu/intel/pasid.h | 1 include/linux/intel-iommu.h | 3 - 4 files changed, 3 insertions(+), 94 deletions(-)
drivers/iommu/intel/iommu.c +0 -24
@@ -320,30 +320,6 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mappedDEFINE_SPINLOCK (device_domain_lock);static LIST_HEAD (device_domain_list); -/* -* Iterate over elements in device_domain_list and call the specified -* callback @fn against each element. -*/ -int for_each_device_domain (int (*fn)(struct device_domain_info *info, -void *data),void *data) -{ -int ret =0 ; -unsigned long flags; -struct device_domain_info *info; - -spin_lock_irqsave (&device_domain_lock, flags); -list_for_each_entry (info, &device_domain_list, global) { - ret =fn (info, data); -if (ret) { -spin_unlock_irqrestore (&device_domain_lock, flags); -return ret; - } - } -spin_unlock_irqrestore (&device_domain_lock, flags); - -return 0 ; -} -const struct iommu_ops intel_iommu_ops;static bool translation_pre_enabled (struct intel_iommu *iommu)
drivers/iommu/intel/pasid.c +3 -66
104 lines not on this page · raw message
drivers/iommu/intel/pasid.h +0 -1
@@ -74,7 +74,6 @@ struct pasid_table {void *table;/* pasid table pointer */ int order;/* page order of pasid table */ u32 max_pasid;/* max pasid */ -struct list_head dev;/* device list */ };/* Get PRESENT bit of a PASID directory entry. */
include/linux/intel-iommu.h +0 -3
@@ -611,7 +611,6 @@ struct intel_iommu {struct device_domain_info {struct list_head link;/* link to domain siblings */ struct list_head global;/* link to global list */ -struct list_head table;/* link to pasid table */ u32 segment;/* PCI segment number */ u8 bus;/* PCI bus number */ u8 devfn;/* PCI devfn number */
@@ -728,8 +727,6 @@ extern int dmar_ir_support(void);void *alloc_pgtable_page (int node);void free_pgtable_page (void *vaddr);struct intel_iommu *domain_get_iommu (struct dmar_domain *domain); -int for_each_device_domain (int (*fn)(struct device_domain_info *info, -void *data),void *data);void iommu_flush_write_buffer (struct intel_iommu *iommu);int intel_iommu_enable_pasid (struct intel_iommu *iommu,struct device *dev);struct intel_iommu *device_to_iommu (struct device *dev,u8 *bus,u8 *devfn);
Greg Kroah-Hartman
maintainerPATCH 31/112 cxl/mbox: Use __le32 in get,set_lsa mailbox structures
In reply to Greg Kroah-HartmanFrom: Alison Schofield <[email protected]>
commit 8a66487506161dbc1d22fd154d2de0244e232040 upstream.
CXL specification defines these as little endian.
--- drivers/cxl/cxlmem.h | 8 ++++---- drivers/cxl/pmem.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/cxl/cxlmem.h +4 -4
@@ -252,13 +252,13 @@ struct cxl_mbox_identify { } __packed;struct cxl_mbox_get_lsa { -u32 offset; -u32 length; +__le32 offset; +__le32 length; } __packed;struct cxl_mbox_set_lsa { -u32 offset; -u32 reserved; +__le32 offset; +__le32 reserved;u8 data[]; } __packed;
drivers/cxl/pmem.c +3 -3
@@ -108,8 +108,8 @@ static int cxl_pmem_get_config_data(strureturn -EINVAL ; get_lsa = (struct cxl_mbox_get_lsa ) { - .offset = cmd->in_offset, - .length = cmd->in_length, + .offset =cpu_to_le32 (cmd->in_offset), + .length =cpu_to_le32 (cmd->in_length), }; rc = cxl_mbox_send_cmd(cxlds, CXL_MBOX_OP_GET_LSA, &get_lsa,
@@ -139,7 +139,7 @@ static int cxl_pmem_set_config_data(strureturn -ENOMEM ; *set_lsa = (struct cxl_mbox_set_lsa ) { - .offset = cmd->in_offset, + .offset =cpu_to_le32 (cmd->in_offset), };memcpy (set_lsa->data, cmd->in_buf, cmd->in_length);
Greg Kroah-Hartman
maintainerPATCH 32/112 cxl: Fix cleanup of port devices on failure to probe driver.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
commit db9a3a35d31ea337331f0e6e07e04bcd52642894 upstream.
The device is created, and then there is a check if a driver succesfully bound to it. In event of failing the bind (e.g. failure in cxl_port_probe()) the device is left registered. When a bus rescan later occurs, fresh devices are created leading to a multiple device representing the same underlying hardware. Bad things may follow and at very least we have far too many devices.
Fix by ensuring autoremove is registered if the device create succeeds, but doesn't depend on sucessful binding to a driver.
Bug was observed as side effect of incorrect ownership in [PATCH v9 6/9] cxl/port: Read CDAT table
but will result from any failure to in cxl_port_probe().
--- drivers/cxl/mem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cxl/mem.c +6 -1
@@ -46,6 +46,7 @@ static int create_endpoint(struct cxl_me {struct cxl_dev_state *cxlds = cxlmd->cxlds;struct cxl_port *endpoint; +int rc; endpoint =devm_cxl_add_port (&parent_port->dev, &cxlmd->dev, cxlds->component_reg_phys, parent_port);
@@ -54,13 +55,17 @@ static int create_endpoint(struct cxl_medev_dbg (&cxlmd->dev,"add: %s\n" ,dev_name (&endpoint->dev)); + rc =cxl_endpoint_autoremove (cxlmd, endpoint); +if (rc) +return rc; +if (!endpoint->dev.driver) {dev_err (&cxlmd->dev,"%s failed probe\n" ,dev_name (&endpoint->dev));return -ENXIO ; } -return cxl_endpoint_autoremove (cxlmd, endpoint); +return 0 ; }/**
Greg Kroah-Hartman
maintainerPATCH 33/112 fbdev: fbmem: Fix logo center image dx issue
In reply to Greg Kroah-HartmanFrom: Guiling Deng <[email protected]>
commit 955f04766d4e6eb94bf3baa539e096808c74ebfb upstream.
Image.dx gets wrong value because of missing '()'.
If xres == logo->width and n == 1, image.dx = -16.
--- drivers/video/fbdev/core/fbmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbmem.c +1 -1
@@ -510,7 +510,7 @@ static int fb_show_logo_line(struct fb_iwhile (n && (n * (logo->width +8 ) -8 > xres)) --n; - image.dx = (xres - n * (logo->width +8 ) -8 ) /2 ; + image.dx = (xres - (n * (logo->width +8 ) -8 )) /2 ; image.dy = y ?: (yres - logo->height) /2 ; }else { image.dx =0 ;
Greg Kroah-Hartman
maintainerPATCH 34/112 fbmem: Check virtual screen sizes in fb_set_var()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6c11df58fd1ac0aefcb3b227f72769272b939e56 upstream.
Verify that the fbdev or drm driver correctly adjusted the virtual screen sizes. On failure report the failing driver and reject the screen size change.
--- drivers/video/fbdev/core/fbmem.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/video/fbdev/core/fbmem.c +10 -0
@@ -1016,6 +1016,16 @@ fb_set_var(struct fb_info *info, structif (ret)return ret; +/* verify that virtual resolution >= physical resolution */ +if (var->xres_virtual < var->xres || + var->yres_virtual < var->yres) { +pr_warn ("WARNING: fbcon: Driver '%s' missed to adjust virtual screen size (%ux%u vs. %ux%u)\n" , + info->fix.id, + var->xres_virtual, var->yres_virtual, + var->xres, var->yres); +return -EINVAL ; + } +if ((var->activate &FB_ACTIVATE_MASK ) !=FB_ACTIVATE_NOW )return 0 ;
Greg Kroah-Hartman
maintainerPATCH 35/112 fbcon: Disallow setting font bigger than screen size
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 65a01e601dbba8b7a51a2677811f70f783766682 upstream.
Prevent that users set a font size which is bigger than the physical screen. It's unlikely this may happen (because screens are usually much larger than the fonts and each font char is limited to 32x32 pixels), but it may happen on smaller screens/LCD displays.
--- drivers/video/fbdev/core/fbcon.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/video/fbdev/core/fbcon.c +5 -0
@@ -2480,6 +2480,11 @@ static int fbcon_set_font(struct vc_dataif (charcount !=256 && charcount !=512 )return -EINVAL ; +/* font bigger than screen resolution ? */ +if (w >FBCON_SWAP (info->var.rotate, info->var.xres, info->var.yres) || + h >FBCON_SWAP (info->var.rotate, info->var.yres, info->var.xres)) +return -EINVAL ; +/* Make sure drawing engine can handle the font */ if (!(info->pixmap.blit_x & (1 << (font->width -1 ))) || !(info->pixmap.blit_y & (1 << (font->height -1 ))))
Greg Kroah-Hartman
maintainerPATCH 36/112 fbcon: Prevent that screen size is smaller than font size
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit e64242caef18b4a5840b0e7a9bff37abd4f4f933 upstream.
We need to prevent that users configure a screen size which is smaller than the currently selected font size. Otherwise rendering chars on the screen will access memory outside the graphics memory region.
This patch adds a new function fbcon_modechange_possible() which implements this check and which later may be extended with other checks if necessary. The new function is called from the FBIOPUT_VSCREENINFO ioctl handler in fbmem.c, which will return -EINVAL if userspace asked for a too small screen size.
--- drivers/video/fbdev/core/fbcon.c | 28 ++++++++++++++++++++++++++++ drivers/video/fbdev/core/fbmem.c | 4 +++- include/linux/fbcon.h | 4 ++++ 3 files changed, 35 insertions(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +28 -0
@@ -2747,6 +2747,34 @@ void fbcon_update_vcs(struct fb_info *in }EXPORT_SYMBOL (fbcon_update_vcs); +/* let fbcon check if it supports a new screen resolution */ +int fbcon_modechange_possible (struct fb_info *info,struct fb_var_screeninfo *var) +{ +struct fbcon_ops *ops = info->fbcon_par; +struct vc_data *vc; +unsigned int i; + +WARN_CONSOLE_UNLOCKED (); + +if (!ops) +return 0 ; + +/* prevent setting a screen size which is smaller than font size */ +for (i = first_fb_vc; i <= last_fb_vc; i++) { + vc = vc_cons[i].d; +if (!vc || vc->vc_mode !=KD_TEXT || + registered_fb[con2fb_map[i]] != info) +continue ; + +if (vc->vc_font.width >FBCON_SWAP (var->rotate, var->xres, var->yres) || + vc->vc_font.height >FBCON_SWAP (var->rotate, var->yres, var->xres)) +return -EINVAL ; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (fbcon_modechange_possible); +int fbcon_mode_deleted (struct fb_info *info,struct fb_videomode *mode) {
drivers/video/fbdev/core/fbmem.c +3 -1
@@ -1116,7 +1116,9 @@ static long do_fb_ioctl(struct fb_info *return -EFAULT ;console_lock ();lock_fb_info (info); - ret =fb_set_var (info, &var); + ret =fbcon_modechange_possible (info, &var); +if (!ret) + ret =fb_set_var (info, &var);if (!ret)fbcon_update_vcs (info, var.activate &FB_ACTIVATE_ALL );unlock_fb_info (info);
include/linux/fbcon.h +4 -0
@@ -15,6 +15,8 @@ void fbcon_new_modelist(struct fb_info *void fbcon_get_requirement (struct fb_info *info,struct fb_blit_caps *caps);void fbcon_fb_blanked (struct fb_info *info,int blank); +int fbcon_modechange_possible (struct fb_info *info, +struct fb_var_screeninfo *var);void fbcon_update_vcs (struct fb_info *info,bool all);void fbcon_remap_all (struct fb_info *info);int fbcon_set_con2fb_map_ioctl (void __user *argp);
@@ -33,6 +35,8 @@ static inline void fbcon_new_modelist(ststatic inline void fbcon_get_requirement (struct fb_info *info,struct fb_blit_caps *caps) {}static inline void fbcon_fb_blanked (struct fb_info *info,int blank) {} +static inline int fbcon_modechange_possible (struct fb_info *info, +struct fb_var_screeninfo *var) {return 0 ; }static inline void fbcon_update_vcs (struct fb_info *info,bool all) {}static inline void fbcon_remap_all (struct fb_info *info) {}static inline int fbcon_set_con2fb_map_ioctl (void __user *argp) {return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 37/112 PM: runtime: Redefine pm_runtime_release_supplier()
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 07358194badf73e267289b40b761f5dc56928eab upstream.
Instead of passing an extra bool argument to pm_runtime_release_supplier(), make its callers take care of triggering a runtime-suspend of the supplier device as needed.
No expected functional impact.
--- drivers/base/core.c | 3 ++- drivers/base/power/runtime.c | 20 +++++++++----------- include/linux/pm_runtime.h | 5 ++--- 3 files changed, 13 insertions(+), 15 deletions(-)
drivers/base/core.c +2 -1
@@ -485,7 +485,8 @@ static void device_link_release_fn(struc/* Ensure that all references to the link object have been dropped. */ device_link_synchronize_removal (); -pm_runtime_release_supplier (link, true); +pm_runtime_release_supplier (link); +pm_request_idle (link->supplier);put_device (link->consumer);put_device (link->supplier);
drivers/base/power/runtime.c +9 -11
@@ -308,13 +308,10 @@ static int rpm_get_suppliers(struct devi/** * pm_runtime_release_supplier - Drop references to device link's supplier. * @link: Target device link. -* @check_idle: Whether or not to check if the supplier device is idle. * -* Drop all runtime PM references associated with @link to its supplier device -* and if @check_idle is set, check if that device is idle (and so it can be -* suspended). +* Drop all runtime PM references associated with @link to its supplier device. */ -void pm_runtime_release_supplier (struct device_link *link,bool check_idle) +void pm_runtime_release_supplier (struct device_link *link) {struct device *supplier = link->supplier;
@@ -327,9 +324,6 @@ void pm_runtime_release_supplier(structwhile (refcount_dec_not_one (&link->rpm_active) &&atomic_read (&supplier->power.usage_count) >0 )pm_runtime_put_noidle (supplier); - -if (check_idle) -pm_request_idle (supplier); }static void __rpm_put_suppliers (struct device *dev,bool try_to_suspend)
@@ -337,8 +331,11 @@ static void __rpm_put_suppliers(struct dstruct device_link *link;list_for_each_entry_rcu (link, &dev->links.suppliers, c_node, -device_links_read_lock_held ()) -pm_runtime_release_supplier (link, try_to_suspend); +device_links_read_lock_held ()) { +pm_runtime_release_supplier (link); +if (try_to_suspend) +pm_request_idle (link->supplier); + } }static void rpm_put_suppliers (struct device *dev)
@@ -1807,7 +1804,8 @@ void pm_runtime_drop_link(struct device_return ;pm_runtime_drop_link_count (link->consumer); -pm_runtime_release_supplier (link, true); +pm_runtime_release_supplier (link); +pm_request_idle (link->supplier); }static bool pm_runtime_need_not_resume (struct device *dev)
include/linux/pm_runtime.h +2 -3
@@ -82,7 +82,7 @@ extern void pm_runtime_get_suppliers(strextern void pm_runtime_put_suppliers (struct device *dev);extern void pm_runtime_new_link (struct device *dev);extern void pm_runtime_drop_link (struct device_link *link); -extern void pm_runtime_release_supplier (struct device_link *link,bool check_idle); +extern void pm_runtime_release_supplier (struct device_link *link);extern int devm_pm_runtime_enable (struct device *dev);
@@ -308,8 +308,7 @@ static inline void pm_runtime_get_supplistatic inline void pm_runtime_put_suppliers (struct device *dev) {}static inline void pm_runtime_new_link (struct device *dev) {}static inline void pm_runtime_drop_link (struct device_link *link) {} -static inline void pm_runtime_release_supplier (struct device_link *link, -bool check_idle) {} +static inline void pm_runtime_release_supplier (struct device_link *link) {}#endif /* !CONFIG_PM */
Greg Kroah-Hartman
maintainerPATCH 38/112 PM: runtime: Fix supplier device management during consumer probe
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
commit 887371066039011144b4a94af97d9328df6869a2 upstream.
Because pm_runtime_get_suppliers() bumps up the rpm_active counter of each device link to a supplier of the given device in addition to bumping up the supplier's PM-runtime usage counter, a runtime suspend of the consumer device may case the latter to go down to 0 when pm_runtime_put_suppliers() is running on a remote CPU. If that happens after pm_runtime_put_suppliers() has released power.lock for the consumer device, and a runtime resume of that device takes place immediately after it, before pm_runtime_put() is called for the supplier, that pm_runtime_put() call may cause the supplier to be suspended even though the consumer is active.
To prevent that from happening, modify pm_runtime_get_suppliers() to call pm_runtime_get_sync() for the given device's suppliers without touching the rpm_active counters of the involved device links Accordingly, modify pm_runtime_put_suppliers() to call pm_runtime_put() for the given device's suppliers without looking at the rpm_active counters of the device links at hand. [This is analogous to what happened before commit 4c06c4e6cf63 ("driver core: Fix possible supplier PM-usage counter imbalance").]
Since pm_runtime_get_suppliers() sets supplier_preactivated for each device link where the supplier's PM-runtime usage counter has been incremented and pm_runtime_put_suppliers() calls pm_runtime_put() for the suppliers whose device links have supplier_preactivated set, the PM-runtime usage counter is balanced for each supplier and this is independent of the runtime suspend and resume of the consumer device.
However, in case a device link with DL_FLAG_PM_RUNTIME set is dropped during the consumer device probe, so pm_runtime_get_suppliers() bumps up the supplier's PM-runtime usage counter, but it cannot be dropped by pm_runtime_put_suppliers(), make device_link_release_fn() take care of that.
--- drivers/base/core.c | 10 ++++++++++ drivers/base/power/runtime.c | 14 +------------- 2 files changed, 11 insertions(+), 13 deletions(-)
drivers/base/core.c +10 -0
@@ -486,6 +486,16 @@ static void device_link_release_fn(strucdevice_link_synchronize_removal ();pm_runtime_release_supplier (link); +/* +* If supplier_preactivated is set, the link has been dropped between +* the pm_runtime_get_suppliers() and pm_runtime_put_suppliers() calls +* in __driver_probe_device(). In that case, drop the supplier's +* PM-runtime usage counter to remove the reference taken by +* pm_runtime_get_suppliers(). +*/ +if (link->supplier_preactivated) +pm_runtime_put_noidle (link->supplier); +pm_request_idle (link->supplier);put_device (link->consumer);
drivers/base/power/runtime.c +1 -13
@@ -1737,7 +1737,6 @@ void pm_runtime_get_suppliers(struct devif (link->flags &DL_FLAG_PM_RUNTIME ) { link->supplier_preactivated = true;pm_runtime_get_sync (link->supplier); -refcount_inc (&link->rpm_active); }device_links_read_unlock (idx);
@@ -1757,19 +1756,8 @@ void pm_runtime_put_suppliers(struct devlist_for_each_entry_rcu (link, &dev->links.suppliers, c_node,device_links_read_lock_held ())if (link->supplier_preactivated) { -bool put; - link->supplier_preactivated = false; - -spin_lock_irq (&dev->power.lock); - - put =pm_runtime_status_suspended (dev) && -refcount_dec_not_one (&link->rpm_active); - -spin_unlock_irq (&dev->power.lock); - -if (put) -pm_runtime_put (link->supplier); +pm_runtime_put (link->supplier); }device_links_read_unlock (idx);
Greg Kroah-Hartman
maintainerPATCH 39/112 memregion: Fix memregion_free() fallback definition
In reply to Greg Kroah-HartmanFrom: Dan Williams <[email protected]>
commit f50974eee5c4a5de1e4f1a3d873099f170df25f8 upstream.
In the CONFIG_MEMREGION=n case, memregion_free() is meant to be a static inline. 0day reports:
In file included from drivers/cxl/core/port.c:4:
include/linux/memregion.h:19:6: warning: no previous prototype for function 'memregion_free' [-Wmissing-prototypes]
Mark memregion_free() static.
--- include/linux/memregion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/memregion.h +1 -1
@@ -16,7 +16,7 @@ static inline int memregion_alloc(gfp_t {return -ENOMEM ; } -void memregion_free (int id) +static inline void memregion_free (int id) { }#endif
Greg Kroah-Hartman
maintainerPATCH 40/112 video: of_display_timing.h: include errno.h
In reply to Greg Kroah-HartmanFrom: Hsin-Yi Wang <[email protected]>
commit 3663a2fb325b8782524f3edb0ae32d6faa615109 upstream.
If CONFIG_OF is not enabled, default of_get_display_timing() returns an errno, so include the header.
--- include/video/of_display_timing.h | 2 ++ 1 file changed, 2 insertions(+)
include/video/of_display_timing.h +2 -0
@@ -8,6 +8,8 @@#ifndef __LINUX_OF_DISPLAY_TIMING_H#define __LINUX_OF_DISPLAY_TIMING_H +#include <linux/errno.h> +struct device_node ;struct display_timing ;struct display_timings ;
Greg Kroah-Hartman
maintainerPATCH 41/112 fscache: Fix invalidation/lookup race
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
commit 85e4ea1049c70fb99de5c6057e835d151fb647da upstream.
If an NFS file is opened for writing and closed, fscache_invalidate() will be asked to invalidate the file - however, if the cookie is in the LOOKING_UP state (or the CREATING state), then request to invalidate doesn't get recorded for fscache_cookie_state_machine() to do something with.
Fix this by making __fscache_invalidate() set a flag if it sees the cookie is in the LOOKING_UP state to indicate that we need to go to invalidation. Note that this requires a count on the n_accesses counter for the state machine, which that will release when it's done.
fscache_cookie_state_machine() then shifts to the INVALIDATING state if it sees the flag.
Without this, an nfs file can get corrupted if it gets modified locally and then read locally as the cache contents may not get updated.
--- fs/fscache/cookie.c | 15 ++++++++++++++- include/linux/fscache.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-)
fs/fscache/cookie.c +14 -1
@@ -517,7 +517,14 @@ static void fscache_perform_lookup(struc }fscache_see_cookie (cookie, fscache_cookie_see_active); -fscache_set_cookie_state (cookie,FSCACHE_COOKIE_STATE_ACTIVE ); +spin_lock (&cookie->lock); +if (test_and_clear_bit (FSCACHE_COOKIE_DO_INVALIDATE , &cookie->flags)) +__fscache_set_cookie_state (cookie, +FSCACHE_COOKIE_STATE_INVALIDATING ); +else +__fscache_set_cookie_state (cookie,FSCACHE_COOKIE_STATE_ACTIVE ); +spin_unlock (&cookie->lock); +wake_up_cookie_state (cookie); trace = fscache_access_lookup_cookie_end; out:
@@ -752,6 +759,9 @@ again_locked:spin_lock (&cookie->lock); } +if (test_and_clear_bit (FSCACHE_COOKIE_DO_INVALIDATE , &cookie->flags)) +fscache_end_cookie_access (cookie, fscache_access_invalidate_cookie_end); +switch (state) {case FSCACHE_COOKIE_STATE_RELINQUISHING :fscache_see_cookie (cookie, fscache_cookie_see_relinquish);
@@ -1048,6 +1058,9 @@ void __fscache_invalidate(struct fscachereturn ;case FSCACHE_COOKIE_STATE_LOOKING_UP : +__fscache_begin_cookie_access (cookie, fscache_access_invalidate_cookie); +set_bit (FSCACHE_COOKIE_DO_INVALIDATE , &cookie->flags); + fallthrough;case FSCACHE_COOKIE_STATE_CREATING :spin_unlock (&cookie->lock);_leave (" [look %x]" , cookie->inval_counter);
include/linux/fscache.h +1 -0
@@ -129,6 +129,7 @@ struct fscache_cookie {#define FSCACHE_COOKIE_DO_PREP_TO_WRITE 12/* T if cookie needs write preparation */ #define FSCACHE_COOKIE_HAVE_DATA 13/* T if this cookie has data stored */ #define FSCACHE_COOKIE_IS_HASHED 14/* T if this cookie is hashed */ +#define FSCACHE_COOKIE_DO_INVALIDATE 15/* T if cookie needs invalidation */ enum fscache_cookie_state state;u8 advice;/* FSCACHE_ADV_* */
Greg Kroah-Hartman
maintainerPATCH 42/112 fscache: Fix if condition in fscache_wait_on_volume_collision()
In reply to Greg Kroah-HartmanFrom: Yue Hu <[email protected]>
commit bf17455b9cbd4b10bf30d39c047307e1d774fb1a upstream.
After waiting for the volume to complete the acquisition with timeout, the if condition under which potential volume collision occurs should be acquire the volume is still pending rather than not pending so that we will continue to wait until the pending flag is cleared. Also, use the existing test pending wrapper directly instead of test_bit().
--- fs/fscache/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/fscache/volume.c +2 -2
@@ -143,7 +143,7 @@ static void fscache_wait_on_volume_colli {wait_var_event_timeout (&candidate->flags, !fscache_is_acquire_pending (candidate),20 *HZ ); -if (!fscache_is_acquire_pending (candidate)) { +if (fscache_is_acquire_pending (candidate)) {pr_notice ("Potential volume collision new=%08x old=%08x" , candidate->debug_id, collidee_debug_id);fscache_stat (&fscache_n_volumes_collision);
@@ -182,7 +182,7 @@ static bool fscache_hash_volume(struct fhlist_bl_add_head (&candidate->hash_link, h);hlist_bl_unlock (h); -if (test_bit (FSCACHE_VOLUME_ACQUIRE_PENDING , &candidate->flags)) +if (fscache_is_acquire_pending (candidate))fscache_wait_on_volume_collision (candidate, collidee_debug_id);return true;
Greg Kroah-Hartman
maintainerPATCH 43/112 powerpc/powernv: delay rng platform device creation until later in boot
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
commit 887502826549caa7e4215fd9e628f48f14c0825a upstream.
The platform device for the rng must be created much later in boot. Otherwise it tries to connect to a parent that doesn't yet exist, resulting in this splat:
[ 0.000478] kobject: '(null)' ((____ptrval____)): is not initialized, yet kobject_get() is being called. [ 0.002925] [c000000002a0fb30] [c00000000073b0bc] kobject_get+0x8c/0x100 (unreliable) [ 0.003071] [c000000002a0fba0] [c00000000087e464] device_add+0xf4/0xb00 [ 0.003194] [c000000002a0fc80] [c000000000a7f6e4] of_device_add+0x64/0x80 [ 0.003321] [c000000002a0fcb0] [c000000000a800d0] of_platform_device_create_pdata+0xd0/0x1b0 [ 0.003476] [c000000002a0fd00] [c00000000201fa44] pnv_get_random_long_early+0x240/0x2e4 [ 0.003623] [c000000002a0fe20] [c000000002060c38] random_init+0xc0/0x214
This patch fixes the issue by doing the platform device creation inside of machine_subsys_initcall.
--- arch/powerpc/platforms/powernv/rng.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
arch/powerpc/platforms/powernv/rng.c +10 -6
@@ -176,12 +176,8 @@ static int __init pnv_get_random_long_ea NULL) != pnv_get_random_long_early)return 0 ; -for_each_compatible_node (dn,NULL ,"ibm,power-rng" ) { -if (rng_create (dn)) -continue ; -/* Create devices for hwrng driver */ -of_platform_device_create (dn,NULL ,NULL ); - } +for_each_compatible_node (dn,NULL ,"ibm,power-rng" ) +rng_create (dn);if (!ppc_md.get_random_seed)return 0 ;
@@ -205,10 +201,18 @@ void __init pnv_rng_init(void)static int __init pnv_rng_late_init (void ) { +struct device_node *dn;unsigned long v; +/* In case it wasn't called during init for some other reason. */ if (ppc_md.get_random_seed == pnv_get_random_long_early)pnv_get_random_long_early (&v); + +if (ppc_md.get_random_seed == powernv_get_random_long) { +for_each_compatible_node (dn,NULL ,"ibm,power-rng" ) +of_platform_device_create (dn,NULL ,NULL ); + } +return 0 ; }machine_subsys_initcall (powernv, pnv_rng_late_init);
Greg Kroah-Hartman
maintainerPATCH 44/112 net: dsa: qca8k: reset cpu port on MTU change
In reply to Greg Kroah-HartmanFrom: Christian Marangi <[email protected]>
commit 386228c694bf1e7a7688e44412cb33500b0ac585 upstream.
It was discovered that the Documentation lacks of a fundamental detail on how to correctly change the MAX_FRAME_SIZE of the switch.
In fact if the MAX_FRAME_SIZE is changed while the cpu port is on, the switch panics and cease to send any packet. This cause the mgmt ethernet system to not receive any packet (the slow fallback still works) and makes the device not reachable. To recover from this a switch reset is required.
To correctly handle this, turn off the cpu ports before changing the MAX_FRAME_SIZE and turn on again after the value is applied.
--- drivers/net/dsa/qca8k.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
drivers/net/dsa/qca8k.c +21 -2
@@ -2372,7 +2372,7 @@ static int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) { struct qca8k_priv *priv = ds->priv; -int i, mtu =0 ; +int ret, i, mtu =0 ; priv->port_mtu[port] = new_mtu;
@@ -2380,8 +2380,27 @@ qca8k_port_change_mtu(struct dsa_switchif (priv->port_mtu[i] > mtu) mtu = priv->port_mtu[i]; +/* To change the MAX_FRAME_SIZE the cpu ports must be off or +* the switch panics. +* Turn off both cpu ports before applying the new value to prevent +* this. +*/ +if (priv->port_sts[0 ].enabled) +qca8k_port_set_status (priv,0 ,0 ); + +if (priv->port_sts[6 ].enabled) +qca8k_port_set_status (priv,6 ,0 ); +/* Include L2 header / FCS length */ -return qca8k_write (priv,QCA8K_MAX_FRAME_SIZE , mtu +ETH_HLEN +ETH_FCS_LEN ); + ret =qca8k_write (priv,QCA8K_MAX_FRAME_SIZE , mtu +ETH_HLEN +ETH_FCS_LEN ); + +if (priv->port_sts[0 ].enabled) +qca8k_port_set_status (priv,0 ,1 ); + +if (priv->port_sts[6 ].enabled) +qca8k_port_set_status (priv,6 ,1 ); + +return ret; } static int
Greg Kroah-Hartman
maintainerPATCH 45/112 ARM: meson: Fix refcount leak in meson_smp_prepare_cpus
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 34d2cd3fccced12b958b8848e3eff0ee4296764c ]
of_find_compatible_node() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- arch/arm/mach-meson/platsmp.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-meson/platsmp.c +2 -0
@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, } sram_base =of_iomap (node,0 ); +of_node_put (node);if (!sram_base) {pr_err ("Couldn't map SRAM registers\n" );return ;
@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, } scu_base =of_iomap (node,0 ); +of_node_put (node);if (!scu_base) {pr_err ("Couldn't map SCU registers\n" );return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 46/112 pinctrl: sunxi: a83t: Fix NAND function name for some pins
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
[ Upstream commit aaefa29270d9551b604165a08406543efa9d16f5 ]
The other NAND pins on Port C use the "nand0" function name. "nand0" also matches all of the other Allwinner SoCs.
--- drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c +5 -5
@@ -158,26 +158,26 @@ static const struct sunxi_desc_pin sun8i_a83t_pins[] = {SUNXI_PIN (SUNXI_PINCTRL_PIN (C ,14 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), -SUNXI_FUNCTION (0x2 ,"nand" ),/* DQ6 */ +SUNXI_FUNCTION (0x2 ,"nand0" ),/* DQ6 */ SUNXI_FUNCTION (0x3 ,"mmc2" )),/* D6 */ SUNXI_PIN (SUNXI_PINCTRL_PIN (C ,15 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), -SUNXI_FUNCTION (0x2 ,"nand" ),/* DQ7 */ +SUNXI_FUNCTION (0x2 ,"nand0" ),/* DQ7 */ SUNXI_FUNCTION (0x3 ,"mmc2" )),/* D7 */ SUNXI_PIN (SUNXI_PINCTRL_PIN (C ,16 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), -SUNXI_FUNCTION (0x2 ,"nand" ),/* DQS */ +SUNXI_FUNCTION (0x2 ,"nand0" ),/* DQS */ SUNXI_FUNCTION (0x3 ,"mmc2" )),/* RST */ SUNXI_PIN (SUNXI_PINCTRL_PIN (C ,17 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), -SUNXI_FUNCTION (0x2 ,"nand" )),/* CE2 */ +SUNXI_FUNCTION (0x2 ,"nand0" )),/* CE2 */ SUNXI_PIN (SUNXI_PINCTRL_PIN (C ,18 ),SUNXI_FUNCTION (0x0 ,"gpio_in" ),SUNXI_FUNCTION (0x1 ,"gpio_out" ), -SUNXI_FUNCTION (0x2 ,"nand" )),/* CE3 */ +SUNXI_FUNCTION (0x2 ,"nand0" )),/* CE3 */ /* Hole */ SUNXI_PIN(SUNXI_PINCTRL_PIN(D, 2), SUNXI_FUNCTION(0x0, "gpio_in"),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 47/112 srcu: Tighten cleanup_srcu_struct() GP checks
In reply to Greg Kroah-HartmanFrom: Paul E. McKenney <[email protected]>
[ Upstream commit 8ed00760203d8018bee042fbfe8e076579be2c2b ]
Currently, cleanup_srcu_struct() checks for a grace period in progress, but it does not check for a grace period that has not yet started but which might start at any time. Such a situation could result in a use-after-free bug, so this commit adds a check for a grace period that is needed but not yet started to cleanup_srcu_struct().
--- kernel/rcu/srcutree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/rcu/srcutree.c +4 -2
@@ -382,9 +382,11 @@ void cleanup_srcu_struct(struct srcu_struct *ssp)return ;/* Forgot srcu_barrier(), so just leak it! */ }if (WARN_ON (rcu_seq_state (READ_ONCE (ssp->srcu_gp_seq)) !=SRCU_STATE_IDLE ) || +WARN_ON (rcu_seq_current (&ssp->srcu_gp_seq) != ssp->srcu_gp_seq_needed) ||WARN_ON (srcu_readers_active (ssp))) { -pr_info ("%s: Active srcu_struct %p state: %d\n" , - __func__, ssp,rcu_seq_state (READ_ONCE (ssp->srcu_gp_seq))); +pr_info ("%s: Active srcu_struct %p read state: %d gp state: %lu/%lu\n" , + __func__, ssp,rcu_seq_state (READ_ONCE (ssp->srcu_gp_seq)), +rcu_seq_current (&ssp->srcu_gp_seq), ssp->srcu_gp_seq_needed);return ;/* Caller forgot to stop doing call_srcu()? */ }free_percpu (ssp->sda);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 48/112 ASoC: rt711: Add endianness flag in snd_soc_component_driver
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit 33f06beac3ade10834a82ad4105dcd91d4b00d61 ]
The endianness flag is used on the CODEC side to specify an ambivalence to endian, typically because it is lost over the hardware link. This device receives audio over a SoundWire DAI and as such should have endianness applied.
--- sound/soc/codecs/rt711.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt711.c +1 -0
@@ -950,6 +950,7 @@ static const struct snd_soc_component_driver soc_codec_dev_rt711 = { .num_dapm_routes = ARRAY_SIZE(rt711_audio_map), .set_jack = rt711_set_jack_detect, .remove = rt711_remove, + .endianness = 1, }; static int rt711_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 49/112 ASoC: rt711-sdca: Add endianness flag in snd_soc_component_driver
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit 3e50a5001055d79c04ea1c79fe4b4ff937a3339c ]
The endianness flag is used on the CODEC side to specify an ambivalence to endian, typically because it is lost over the hardware link. This device receives audio over a SoundWire DAI and as such should have endianness applied.
--- sound/soc/codecs/rt711-sdca.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt711-sdca.c +1 -0
@@ -1208,6 +1208,7 @@ static const struct snd_soc_component_driver soc_sdca_dev_rt711 = { .num_dapm_routes = ARRAY_SIZE(rt711_sdca_audio_map), .set_jack = rt711_sdca_set_jack_detect, .remove = rt711_sdca_remove, + .endianness = 1, }; static int rt711_sdca_set_sdw_stream(struct snd_soc_dai *dai, void *sdw_stream,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 50/112 ASoC: codecs: rt700/rt711/rt711-sdca: resume bus/codec in .set_jack_detect
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 40737057b48f1b4db67b0d766b95c87ba8fc5e03 ]
The .set_jack_detect() codec component callback is invoked during card registration, which happens when the machine driver is probed.
The issue is that this callback can race with the bus suspend/resume, and IO timeouts can happen. This can be reproduced very easily if the machine driver is 'blacklisted' and manually probed after the bus suspends. The bus and codec need to be re-initialized using pm_runtime helpers.
Previous contributions tried to make sure accesses to the bus during the .set_jack_detect() component callback only happen when the bus is active. This was done by changing the regcache status on a component remove. This is however a layering violation, the regcache status should only be modified on device probe, suspend and resume. The component probe/remove should not modify how the device regcache is handled. This solution also didn't handle all the possible race conditions, and the RT700 headset codec was not handled.
This patch tries to resume the codec device before handling the jack initializations. In case the codec has not yet been initialized, pm_runtime may not be enabled yet, so we don't squelch the -EACCES error code and only stop the jack information. When the codec reports as attached, the jack initialization will proceed as usual.
--- sound/soc/codecs/rt700.c | 16 +++++++++++++--- sound/soc/codecs/rt711-sdca.c | 26 ++++++++++++++------------ sound/soc/codecs/rt711.c | 24 +++++++++++++----------- 3 files changed, 40 insertions(+), 26 deletions(-)
sound/soc/codecs/rt700.c +13 -3
@@ -315,17 +315,27 @@ static int rt700_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack, void *data) { struct rt700_priv *rt700 = snd_soc_component_get_drvdata(component); +int ret; rt700->hs_jack = hs_jack; -if (!rt700->hw_init) { -dev_dbg (&rt700->slave->dev, -"%s hw_init not ready yet\n" , __func__); + ret =pm_runtime_resume_and_get (component->dev); +if (ret <0 ) { +if (ret != -EACCES ) { +dev_err (component->dev,"%s: failed to resume %d\n" , __func__, ret); +return ret; + } + +/* pm_runtime not enabled yet */ +dev_dbg (component->dev,"%s: skipping jack init for now\n" , __func__);return 0 ; }rt700_jack_init (rt700); +pm_runtime_mark_last_busy (component->dev); +pm_runtime_put_autosuspend (component->dev); +return 0 ; }
sound/soc/codecs/rt711-sdca.c +14 -12
@@ -487,16 +487,27 @@ static int rt711_sdca_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack, void *data) { struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component); +int ret; rt711->hs_jack = hs_jack; -if (!rt711->hw_init) { -dev_dbg (&rt711->slave->dev, -"%s hw_init not ready yet\n" , __func__); + ret =pm_runtime_resume_and_get (component->dev); +if (ret <0 ) { +if (ret != -EACCES ) { +dev_err (component->dev,"%s: failed to resume %d\n" , __func__, ret); +return ret; + } + +/* pm_runtime not enabled yet */ +dev_dbg (component->dev,"%s: skipping jack init for now\n" , __func__);return 0 ; }rt711_sdca_jack_init (rt711); + +pm_runtime_mark_last_busy (component->dev); +pm_runtime_put_autosuspend (component->dev); +return 0 ; }
@@ -1190,14 +1201,6 @@ static int rt711_sdca_probe(struct snd_soc_component *component)return 0 ; } -static void rt711_sdca_remove (struct snd_soc_component *component) -{ -struct rt711_sdca_priv *rt711 =snd_soc_component_get_drvdata (component); - -regcache_cache_only (rt711->regmap, true); -regcache_cache_only (rt711->mbq_regmap, true); -} -static const struct snd_soc_component_driver soc_sdca_dev_rt711 = { .probe = rt711_sdca_probe, .controls = rt711_sdca_snd_controls,
@@ -1207,7 +1210,6 @@ static const struct snd_soc_component_driver soc_sdca_dev_rt711 = { .dapm_routes = rt711_sdca_audio_map, .num_dapm_routes = ARRAY_SIZE(rt711_sdca_audio_map), .set_jack = rt711_sdca_set_jack_detect, - .remove = rt711_sdca_remove, .endianness = 1, };
sound/soc/codecs/rt711.c +13 -11
@@ -457,17 +457,27 @@ static int rt711_set_jack_detect(struct snd_soc_component *component, struct snd_soc_jack *hs_jack, void *data) { struct rt711_priv *rt711 = snd_soc_component_get_drvdata(component); +int ret; rt711->hs_jack = hs_jack; -if (!rt711->hw_init) { -dev_dbg (&rt711->slave->dev, -"%s hw_init not ready yet\n" , __func__); + ret =pm_runtime_resume_and_get (component->dev); +if (ret <0 ) { +if (ret != -EACCES ) { +dev_err (component->dev,"%s: failed to resume %d\n" , __func__, ret); +return ret; + } + +/* pm_runtime not enabled yet */ +dev_dbg (component->dev,"%s: skipping jack init for now\n" , __func__);return 0 ; }rt711_jack_init (rt711); +pm_runtime_mark_last_busy (component->dev); +pm_runtime_put_autosuspend (component->dev); +return 0 ; }
@@ -932,13 +942,6 @@ static int rt711_probe(struct snd_soc_component *component)return 0 ; } -static void rt711_remove (struct snd_soc_component *component) -{ -struct rt711_priv *rt711 =snd_soc_component_get_drvdata (component); - -regcache_cache_only (rt711->regmap, true); -} -static const struct snd_soc_component_driver soc_codec_dev_rt711 = { .probe = rt711_probe, .set_bias_level = rt711_set_bias_level,
@@ -949,7 +952,6 @@ static const struct snd_soc_component_driver soc_codec_dev_rt711 = { .dapm_routes = rt711_audio_map, .num_dapm_routes = ARRAY_SIZE(rt711_audio_map), .set_jack = rt711_set_jack_detect, - .remove = rt711_remove, .endianness = 1, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 51/112 ASoC: SOF: ipc3-topology: Move and correct size checks in sof_ipc3_control_load_bytes()
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit c2d1aec3f5da2475aa13a487d329823b7d27d499 ]
Move the size checks prior to allocating memory as these checks do not need the data to be allocated and in case of an error we would not need to free the allocation.
The max size must not be less than the size of
struct sof_ipc_ctrl_data + struct sof_abi_hdr as the ABI header needs to be present under all circumstances.
The check was incorrectly used or between the two size checks.
--- sound/soc/sof/ipc3-topology.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
sound/soc/sof/ipc3-topology.c +11 -12
@@ -1578,24 +1578,23 @@ static int sof_ipc3_control_load_bytes(struct snd_sof_dev *sdev, struct snd_sof_struct sof_ipc_ctrl_data *cdata;int ret; - scontrol->ipc_control_data =kzalloc (scontrol->max_size,GFP_KERNEL ); -if (!scontrol->ipc_control_data) -return -ENOMEM ; - -if (scontrol->max_size <sizeof (*cdata) || - scontrol->max_size <sizeof (struct sof_abi_hdr )) { - ret = -EINVAL ; - goto err; +if (scontrol->max_size < (sizeof (*cdata) +sizeof (struct sof_abi_hdr ))) { +dev_err (sdev->dev,"%s: insufficient size for a bytes control: %zu.\n" , + __func__, scontrol->max_size); +return -EINVAL ; } -/* init the get/put bytes data */ if (scontrol->priv_size > scontrol->max_size -sizeof (*cdata)) { -dev_err (sdev->dev,"err: bytes data size %zu exceeds max %zu.\n" , +dev_err (sdev->dev, +"%s: bytes data size %zu exceeds max %zu.\n" , __func__, scontrol->priv_size, scontrol->max_size -sizeof (*cdata)); - ret = -EINVAL ; - goto err; +return -EINVAL ; } + scontrol->ipc_control_data =kzalloc (scontrol->max_size,GFP_KERNEL ); +if (!scontrol->ipc_control_data) +return -ENOMEM ; + scontrol->size =sizeof (struct sof_ipc_ctrl_data ) + scontrol->priv_size; cdata = scontrol->ipc_control_data;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 52/112 ASoC: SOF: Intel: hda: Fix compressed stream position tracking
In reply to Greg Kroah-HartmanFrom: Peter Ujfalusi <[email protected]>
[ Upstream commit ca7ab1dcf58dfce5bc851bf7e50fd94822c24665 ]
Commit 288fad2f71fa ("ASoC: SOF: Intel: hda: add quirks for HDAudio DMA position information") modified the PCM path only, but left the compressed data patch using an obsolete option.
Move the functionality in a helper that can be called for both PCM and compressed data.
--- sound/soc/sof/intel/hda-pcm.c | 74 +------------------------ sound/soc/sof/intel/hda-stream.c | 94 ++++++++++++++++++++++++++++++-- sound/soc/sof/intel/hda.h | 3 + 3 files changed, 94 insertions(+), 77 deletions(-)
sound/soc/sof/intel/hda-pcm.c +1 -73
@@ -192,79 +192,7 @@ snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev, goto found; } -switch (sof_hda_position_quirk) { -case SOF_HDA_POSITION_QUIRK_USE_SKYLAKE_LEGACY : -/* -* This legacy code, inherited from the Skylake driver, -* mixes DPIB registers and DPIB DDR updates and -* does not seem to follow any known hardware recommendations. -* It's not clear e.g. why there is a different flow -* for capture and playback, the only information that matters is -* what traffic class is used, and on all SOF-enabled platforms -* only VC0 is supported so the work-around was likely not necessary -* and quite possibly wrong. -*/ - -/* DPIB/posbuf position mode: -* For Playback, Use DPIB register from HDA space which -* reflects the actual data transferred. -* For Capture, Use the position buffer for pointer, as DPIB -* is not accurate enough, its update may be completed -* earlier than the data written to DDR. -*/ -if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { - pos =snd_sof_dsp_read (sdev,HDA_DSP_HDA_BAR , -AZX_REG_VS_SDXDPIB_XBASE + - (AZX_REG_VS_SDXDPIB_XINTERVAL * - hstream->index)); - }else { -/* -* For capture stream, we need more workaround to fix the -* position incorrect issue: -* -* 1. Wait at least 20us before reading position buffer after -* the interrupt generated(IOC), to make sure position update -* happens on frame boundary i.e. 20.833uSec for 48KHz. -* 2. Perform a dummy Read to DPIB register to flush DMA -* position value. -* 3. Read the DMA Position from posbuf. Now the readback -* value should be >= period boundary. -*/ -usleep_range (20 ,21 ); -snd_sof_dsp_read (sdev,HDA_DSP_HDA_BAR , -AZX_REG_VS_SDXDPIB_XBASE + - (AZX_REG_VS_SDXDPIB_XINTERVAL * - hstream->index)); - pos =snd_hdac_stream_get_pos_posbuf (hstream); - } -break ; -case SOF_HDA_POSITION_QUIRK_USE_DPIB_REGISTERS : -/* -* In case VC1 traffic is disabled this is the recommended option -*/ - pos =snd_sof_dsp_read (sdev,HDA_DSP_HDA_BAR , -AZX_REG_VS_SDXDPIB_XBASE + - (AZX_REG_VS_SDXDPIB_XINTERVAL * - hstream->index)); -break ; -case SOF_HDA_POSITION_QUIRK_USE_DPIB_DDR_UPDATE : -/* -* This is the recommended option when VC1 is enabled. -* While this isn't needed for SOF platforms it's added for -* consistency and debug. -*/ - pos =snd_hdac_stream_get_pos_posbuf (hstream); -break ; -default : -dev_err_once (sdev->dev,"hda_position_quirk value %d not supported\n" , - sof_hda_position_quirk); - pos =0 ; -break ; - } - -if (pos >= hstream->bufsize) - pos =0 ; - + pos =hda_dsp_stream_get_position (hstream, substream->stream, true); found: pos =bytes_to_frames (substream->runtime, pos);
sound/soc/sof/intel/hda-stream.c +90 -4
113 lines not on this page · raw message
sound/soc/sof/intel/hda.h +3 -0
@@ -557,6 +557,9 @@ int hda_dsp_stream_setup_bdl(struct snd_sof_dev *sdev,bool hda_dsp_check_ipc_irq (struct snd_sof_dev *sdev);bool hda_dsp_check_stream_irq (struct snd_sof_dev *sdev); +snd_pcm_uframes_t hda_dsp_stream_get_position (struct hdac_stream *hstream, +int direction,bool can_sleep); +struct hdac_ext_stream *hda_dsp_stream_get (struct snd_sof_dev *sdev,int direction,u32 flags);int hda_dsp_stream_put (struct snd_sof_dev *sdev,int direction,int stream_tag);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 53/112 arm64: dts: qcom: sm8450: fix interconnects property of UFS node
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit de9b3d9616078f1d1d0d51b01cdafa101733f935 ]
All interconnect device tree nodes on sm8450 are 2-cells, however in UFS node they are handled as 1-cells, fix it.
--- arch/arm64/boot/dts/qcom/sm8450.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8450.dtsi +2 -2
@@ -1383,8 +1383,8 @@ iommus = <&apps_smmu 0xe0 0x0>; - interconnects = <&aggre1_noc MASTER_UFS_MEM &mc_virt SLAVE_EBI1>, - <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_UFS_MEM_CFG>; + interconnects = <&aggre1_noc MASTER_UFS_MEM 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_UFS_MEM_CFG 0>; interconnect-names = "ufs-ddr", "cpu-ufs"; clock-names = "core_clk",
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 54/112 arm64: dts: qcom: msm8994: Fix CPU6/7 reg values
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 47bf59c4755930f616dd90c8c6a85f40a6d347ea ]
CPU6 and CPU7 were mistakengly pointing to CPU5 reg. Fix it.
--- arch/arm64/boot/dts/qcom/msm8994.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8994.dtsi +2 -2
@@ -93,7 +93,7 @@ CPU6: cpu@102 { device_type = "cpu"; compatible = "arm,cortex-a57"; - reg = <0x0 0x101>; + reg = <0x0 0x102>; enable-method = "psci"; next-level-cache = <&L2_1>; };
@@ -101,7 +101,7 @@ CPU7: cpu@103 { device_type = "cpu"; compatible = "arm,cortex-a57"; - reg = <0x0 0x101>; + reg = <0x0 0x103>; enable-method = "psci"; next-level-cache = <&L2_1>; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 55/112 arm64: dts: qcom: sdm845: use dispcc AHB clock for mdss node
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 3ba500dee327e0261e728edec8a4f2f563d2760c ]
It was noticed that on sdm845 after an MDSS suspend/resume cycle the driver can not read HW_REV registers properly (they will return 0 instead). Chaning the "iface" clock from <&gcc GCC_DISP_AHB_CLK> to <&dispcc DISP_CC_MDSS_AHB_CLK> fixes the issue.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -4238,7 +4238,7 @@ power-domains = <&dispcc MDSS_GDSC>; - clocks = <&gcc GCC_DISP_AHB_CLK>, + clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>, <&dispcc DISP_CC_MDSS_MDP_CLK>; clock-names = "iface", "core";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 56/112 ARM: mxs_defconfig: Enable the framebuffer
In reply to Greg Kroah-HartmanFrom: Fabio Estevam <[email protected]>
[ Upstream commit b10ef5f2ddb3a5a22ac0936c8d91a50ac5e55e77 ]
Currently, when booting Linux on a imx28-evk board there is no display activity.
Enable CONFIG_FB which is nowadays required for CONFIG_DRM_PANEL_LVDS, CONFIG_DRM_PANEL_SIMPLE, CONFIG_DRM_PANEL_SEIKO_43WVF1G, CONFIG_FB_MODE_HELPERS, CONFIG_BACKLIGHT_PWM, CONFIG_BACKLIGHT_GPIO, CONFIG_FRAMEBUFFER_CONSOLE, CONFIG_LOGO, CONFIG_FONTS, CONFIG_FONT_8x8 and CONFIG_FONT_8x16.
Based on commit c54467482ffd ("ARM: imx_v6_v7_defconfig: enable fb").
--- arch/arm/configs/mxs_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/mxs_defconfig +1 -0
@@ -93,6 +93,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_DRM=y CONFIG_DRM_PANEL_SEIKO_43WVF1G=y CONFIG_DRM_MXSFB=y +CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 57/112 arm64: dts: imx8mp-evk: correct mmc pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 01785f1f156511c4f285786b4192245d4f476bf1 ]
According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -4
@@ -500,7 +500,7 @@ pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { fsl,pins = < - MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x41 + MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x40 >; };
@@ -525,7 +525,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d0 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d0 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d0 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; };
@@ -537,7 +537,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; };
@@ -549,7 +549,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d6 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d6 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d6 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 58/112 arm64: dts: imx8mp-evk: correct the uart2 pinctl value
In reply to Greg Kroah-HartmanFrom: Sherry Sun <[email protected]>
[ Upstream commit 2d4fb72b681205eed4553d8802632bd3270be3ba ]
According to the IOMUXC_SW_PAD_CTL_PAD_UART2_RXD/TXD register define in imx8mp RM, bit0 and bit3 are reserved, and the uart2 rx/tx pin should enable the pull up, so need to set bit8 to 1. The original pinctl value 0x49 is incorrect and needs to be changed to 0x140, same as uart1 and uart3.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -2
@@ -506,8 +506,8 @@ pinctrl_uart2: uart2grp { fsl,pins = < - MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX 0x49 - MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX 0x49 + MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX 0x140 + MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX 0x140 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 59/112 arm64: dts: imx8mp-evk: correct gpio-led pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit b838582ab8d5fb11b2c0275056a9f34e1d94fece ]
0x19 is not a valid setting. According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Correct setting with PE PUE set, DSE set to 0.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +1 -1
@@ -461,7 +461,7 @@ pinctrl_gpio_led: gpioledgrp { fsl,pins = < - MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16 0x19 + MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16 0x140 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 60/112 arm64: dts: imx8mp-evk: correct vbus pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit e2c00820a99c55c9bb40642d5818a904a1e0d664 ]
0x19 is not a valid setting. According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +1 -1
@@ -513,7 +513,7 @@ pinctrl_usb1_vbus: usb1grp { fsl,pins = < - MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR 0x19 + MX8MP_IOMUXC_GPIO1_IO14__USB2_OTG_PWR 0x10 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 61/112 arm64: dts: imx8mp-evk: correct eqos pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit e6e1bc0ec9e8ad212fa46d8878a6e17cd31fdf7b ]
According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Although function is not broken, we should not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +15 -15
@@ -395,21 +395,21 @@ &iomuxc { pinctrl_eqos: eqosgrp { fsl,pins = < - MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC 0x3 - MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO 0x3 - MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0 0x91 - MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1 0x91 - MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2 0x91 - MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3 0x91 - MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x91 - MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x91 - MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0 0x1f - MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1 0x1f - MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2 0x1f - MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3 0x1f - MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x1f - MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x1f - MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22 0x19 + MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC 0x2 + MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO 0x2 + MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0 0x90 + MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1 0x90 + MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2 0x90 + MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3 0x90 + MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x90 + MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x90 + MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0 0x16 + MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1 0x16 + MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2 0x16 + MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3 0x16 + MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x16 + MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x16 + MX8MP_IOMUXC_SAI2_RXC__GPIO4_IO22 0x10 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 62/112 arm64: dts: imx8mp-evk: correct I2C5 pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 8c214b78e149dc7209e38a031292fe21d7017561 ]
According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Although function is not broken, we should not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -2
@@ -481,8 +481,8 @@ pinctrl_i2c5: i2c5grp { fsl,pins = < - MX8MP_IOMUXC_SPDIF_RX__I2C5_SDA 0x400001c3 - MX8MP_IOMUXC_SPDIF_TX__I2C5_SCL 0x400001c3 + MX8MP_IOMUXC_SPDIF_RX__I2C5_SDA 0x400001c2 + MX8MP_IOMUXC_SPDIF_TX__I2C5_SCL 0x400001c2 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 63/112 arm64: dts: imx8mp-evk: correct I2C1 pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 05a7f43478e890513d571f36660bfedc1482a588 ]
According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Although function is not broken, we should not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -2
@@ -467,8 +467,8 @@ pinctrl_i2c1: i2c1grp { fsl,pins = < - MX8MP_IOMUXC_I2C1_SCL__I2C1_SCL 0x400001c3 - MX8MP_IOMUXC_I2C1_SDA__I2C1_SDA 0x400001c3 + MX8MP_IOMUXC_I2C1_SCL__I2C1_SCL 0x400001c2 + MX8MP_IOMUXC_I2C1_SDA__I2C1_SDA 0x400001c2 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 64/112 arm64: dts: imx8mp-evk: correct I2C3 pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 0836de513ebaae5f03014641eac996290d67493d ]
According to RM bit layout, BIT3 and BIT0 are reserved.
8 7 6 5 4 3 2 1 0 PE HYS PUE ODE FSEL X DSE X
Although function is not broken, we should not set reserved bit.
--- arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +2 -2
@@ -474,8 +474,8 @@ pinctrl_i2c3: i2c3grp { fsl,pins = < - MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL 0x400001c3 - MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA 0x400001c3 + MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL 0x400001c2 + MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA 0x400001c2 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 65/112 arm64: dts: imx8mp-phyboard-pollux-rdk: correct uart pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit e266c155bd88e95f9b86379d6b0add6ac6e5452e ]
BIT3 and BIT0 are reserved bits, should not touch.
--- arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts +2 -2
@@ -156,8 +156,8 @@ pinctrl_uart1: uart1grp { fsl,pins = < - MX8MP_IOMUXC_UART1_RXD__UART1_DCE_RX 0x49 - MX8MP_IOMUXC_UART1_TXD__UART1_DCE_TX 0x49 + MX8MP_IOMUXC_UART1_RXD__UART1_DCE_RX 0x40 + MX8MP_IOMUXC_UART1_TXD__UART1_DCE_TX 0x40 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 66/112 arm64: dts: imx8mp-phyboard-pollux-rdk: correct eqos pad settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit bae4de618efe1c41d34aa2e6cef8b08e46256667 ]
BIT3 and BIT0 are reserved bits, should not touch.
--- .../freescale/imx8mp-phyboard-pollux-rdk.dts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts +14 -14
@@ -116,20 +116,20 @@ &iomuxc { pinctrl_eqos: eqosgrp { fsl,pins = < - MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC 0x3 - MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO 0x3 - MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0 0x91 - MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1 0x91 - MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2 0x91 - MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3 0x91 - MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x91 - MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x91 - MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0 0x1f - MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1 0x1f - MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2 0x1f - MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3 0x1f - MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x1f - MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x1f + MX8MP_IOMUXC_ENET_MDC__ENET_QOS_MDC 0x2 + MX8MP_IOMUXC_ENET_MDIO__ENET_QOS_MDIO 0x2 + MX8MP_IOMUXC_ENET_RD0__ENET_QOS_RGMII_RD0 0x90 + MX8MP_IOMUXC_ENET_RD1__ENET_QOS_RGMII_RD1 0x90 + MX8MP_IOMUXC_ENET_RD2__ENET_QOS_RGMII_RD2 0x90 + MX8MP_IOMUXC_ENET_RD3__ENET_QOS_RGMII_RD3 0x90 + MX8MP_IOMUXC_ENET_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x90 + MX8MP_IOMUXC_ENET_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x90 + MX8MP_IOMUXC_ENET_TD0__ENET_QOS_RGMII_TD0 0x16 + MX8MP_IOMUXC_ENET_TD1__ENET_QOS_RGMII_TD1 0x16 + MX8MP_IOMUXC_ENET_TD2__ENET_QOS_RGMII_TD2 0x16 + MX8MP_IOMUXC_ENET_TD3__ENET_QOS_RGMII_TD3 0x16 + MX8MP_IOMUXC_ENET_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x16 + MX8MP_IOMUXC_ENET_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x16 MX8MP_IOMUXC_SAI1_MCLK__GPIO4_IO20 0x10 >; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 67/112 arm64: dts: imx8mp-phyboard-pollux-rdk: correct i2c2 & mmc settings
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 242d8ee9111171a6e68249aaff62643c513be6ec ]
BIT3 and BIT0 are reserved bits, should not touch.
--- .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-rdk.dts +8 -8
@@ -136,21 +136,21 @@ pinctrl_i2c2: i2c2grp { fsl,pins = < - MX8MP_IOMUXC_I2C2_SCL__I2C2_SCL 0x400001c3 - MX8MP_IOMUXC_I2C2_SDA__I2C2_SDA 0x400001c3 + MX8MP_IOMUXC_I2C2_SCL__I2C2_SCL 0x400001c2 + MX8MP_IOMUXC_I2C2_SDA__I2C2_SDA 0x400001c2 >; }; pinctrl_i2c2_gpio: i2c2gpiogrp { fsl,pins = < - MX8MP_IOMUXC_I2C2_SCL__GPIO5_IO16 0x1e3 - MX8MP_IOMUXC_I2C2_SDA__GPIO5_IO17 0x1e3 + MX8MP_IOMUXC_I2C2_SCL__GPIO5_IO16 0x1e2 + MX8MP_IOMUXC_I2C2_SDA__GPIO5_IO17 0x1e2 >; }; pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { fsl,pins = < - MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x41 + MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x40 >; };
@@ -175,7 +175,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d0 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d0 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d0 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; };
@@ -187,7 +187,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d4 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d4 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d4 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; };
@@ -199,7 +199,7 @@ MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1 0x1d6 MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2 0x1d6 MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3 0x1d6 - MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1 + MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0 >; }; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 68/112 pinctrl: sunxi: sunxi_pconf_set: use correct offset
In reply to Greg Kroah-HartmanFrom: Andrei Lalaev <[email protected]>
[ Upstream commit cd4c1e65a32afd003b08ad4aafe1e4d3e4e8e61b ]
Some Allwinner SoCs have 2 pinctrls (PIO and R_PIO). Previous implementation used absolute pin numbering and it was incorrect for R_PIO pinctrl.
It's necessary to take into account the base pin number.
--- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/sunxi/pinctrl-sunxi.c +2 -0
@@ -544,6 +544,8 @@ static int sunxi_pconf_set(struct pinctrl_dev *pctldev, unsigned pin,struct sunxi_pinctrl *pctl =pinctrl_dev_get_drvdata (pctldev);int i; + pin -= pctl->desc->pin_base; +for (i =0 ; i < num_configs; i++) {enum pin_config_param param;unsigned long flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 69/112 arm64: dts: qcom: msm8992-*: Fix vdd_lvs1_2-supply typo
In reply to Greg Kroah-HartmanFrom: Stephan Gerhold <[email protected]>
[ Upstream commit 5fb779558f1c97e2bf2794cb59553e569c38e2f9 ]
"make dtbs_check" complains about the missing "-supply" suffix for vdd_lvs1_2 which is clearly a typo, originally introduced in the msm8994-smd-rpm.dtsi file and apparently later copied to msm8992-xiaomi-libra.dts:
msm8992-lg-bullhead-rev-10/101.dtb: pm8994-regulators: 'vdd_lvs1_2' does not match any of the regexes:
'.*-supply$', '^((s|l|lvs|5vs)[0-9]*)|(boost-bypass)|(bob)$', 'pinctrl-[0-9]+'
Quoted 1 line
From schema:
regulator/qcom,smd-rpm-regulator.yaml
msm8992-xiaomi-libra.dtb: pm8994-regulators: 'vdd_lvs1_2'
does not match any of the regexes:
'.*-supply$', '^((s|l|lvs|5vs)[0-9]*)|(boost-bypass)|(bob)$', 'pinctrl-[0-9]+'
Quoted 1 line
From schema:
regulator/qcom,smd-rpm-regulator.yaml
--- arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi +1 -1
@@ -74,7 +74,7 @@ vdd_l17_29-supply = <&vph_pwr>; vdd_l20_21-supply = <&vph_pwr>; vdd_l25-supply = <&pm8994_s5>; - vdd_lvs1_2 = <&pm8994_s4>; + vdd_lvs1_2-supply = <&pm8994_s4>; /* S1, S2, S6 and S12 are managed by RPMPD */
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +1 -1
@@ -143,7 +143,7 @@ vdd_l17_29-supply = <&vph_pwr>; vdd_l20_21-supply = <&vph_pwr>; vdd_l25-supply = <&pm8994_s5>; - vdd_lvs1_2 = <&pm8994_s4>; + vdd_lvs1_2-supply = <&pm8994_s4>; /* S1, S2, S6 and S12 are managed by RPMPD */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 70/112 ARM: at91: pm: use proper compatible for sama5d2s rtc
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit ddc980da8043779119acaca106c6d9b445c9b65b ]
Use proper compatible strings for SAMA5D2's RTC IPs. This is necessary for configuring wakeup sources for ULP1 PM mode.
--- arch/arm/mach-at91/pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-at91/pm.c +1 -1
@@ -146,7 +146,7 @@ static const struct wakeup_source_info ws_info[] = {static const struct of_device_id sama5d2_ws_ids[] = { { .compatible ="atmel,sama5d2-gem" , .data = &ws_info[0 ] }, - { .compatible ="atmel,at91rm9200-rtc" , .data = &ws_info[1 ] }, + { .compatible ="atmel,sama5d2-rtc" , .data = &ws_info[1 ] }, { .compatible ="atmel,sama5d3-udc" , .data = &ws_info[2 ] }, { .compatible ="atmel,at91rm9200-ohci" , .data = &ws_info[2 ] }, { .compatible ="usb-ohci" , .data = &ws_info[2 ] },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 71/112 ARM: at91: pm: use proper compatibles for sam9x60s rtc and rtt
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 641522665dbb25ce117c78746df1aad8b58c80e5 ]
Use proper compatible strings for SAM9X60's RTC and RTT IPs. These are necessary for configuring wakeup sources for ULP1 PM mode.
--- arch/arm/mach-at91/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-at91/pm.c +2 -2
@@ -157,12 +157,12 @@ static const struct of_device_id sama5d2_ws_ids[] = { };static const struct of_device_id sam9x60_ws_ids[] = { - { .compatible ="atmel,at91sam9x5-rtc" , .data = &ws_info[1 ] }, + { .compatible ="microchip,sam9x60-rtc" , .data = &ws_info[1 ] }, { .compatible ="atmel,at91rm9200-ohci" , .data = &ws_info[2 ] }, { .compatible ="usb-ohci" , .data = &ws_info[2 ] }, { .compatible ="atmel,at91sam9g45-ehci" , .data = &ws_info[2 ] }, { .compatible ="usb-ehci" , .data = &ws_info[2 ] }, - { .compatible ="atmel,at91sam9260-rtt" , .data = &ws_info[4 ] }, + { .compatible ="microchip,sam9x60-rtt" , .data = &ws_info[4 ] }, { .compatible ="cdns,sam9x60-macb" , .data = &ws_info[5 ] }, {/* sentinel */ } };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 72/112 ARM: at91: pm: use proper compatibles for sama7g5s rtc and rtt
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit 1c40169b35ad58906814d53a517ac92db3d20d5f ]
Use proper compatible strings for SAMA7G5's RTC and RTT IPs. These are necessary for configuring wakeup sources for ULP1 PM mode.
--- arch/arm/mach-at91/pm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-at91/pm.c +2 -2
@@ -168,13 +168,13 @@ static const struct of_device_id sam9x60_ws_ids[] = { };static const struct of_device_id sama7g5_ws_ids[] = { - { .compatible ="atmel,at91sam9x5-rtc" , .data = &ws_info[1 ] }, + { .compatible ="microchip,sama7g5-rtc" , .data = &ws_info[1 ] }, { .compatible ="microchip,sama7g5-ohci" , .data = &ws_info[2 ] }, { .compatible ="usb-ohci" , .data = &ws_info[2 ] }, { .compatible ="atmel,at91sam9g45-ehci" , .data = &ws_info[2 ] }, { .compatible ="usb-ehci" , .data = &ws_info[2 ] }, { .compatible ="microchip,sama7g5-sdhci" , .data = &ws_info[3 ] }, - { .compatible ="atmel,at91sam9260-rtt" , .data = &ws_info[4 ] }, + { .compatible ="microchip,sama7g5-rtt" , .data = &ws_info[4 ] }, {/* sentinel */ } };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 73/112 ARM: dts: at91: sam9x60ek: fix eeprom compatible and size
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit f2cbbc3f926316ccf8ef9363d8a60c1110afc1c7 ]
The board has a microchip 24aa025e48 eeprom, which is a 2 Kbits memory, so it's compatible with at24c02 not at24c32.
Also the size property is wrong, it's not 128 bytes, but 256 bytes. Thus removing and leaving it to the default (256).
--- arch/arm/boot/dts/at91-sam9x60ek.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/at91-sam9x60ek.dts +1 -2
@@ -233,10 +233,9 @@ status = "okay"; eeprom@53 { - compatible = "atmel,24c32"; + compatible = "atmel,24c02"; reg = <0x53>; pagesize = <16>; - size = <128>; status = "okay"; }; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 74/112 ARM: dts: at91: sama5d2_icp: fix eeprom compatibles
In reply to Greg Kroah-HartmanFrom: Eugen Hristev <[email protected]>
[ Upstream commit 416ce193d73a734ded6d09fe141017b38af1c567 ]
The eeprom memories on the board are microchip 24aa025e48, which are 2 Kbits and are compatible with at24c02 not at24c32.
--- arch/arm/boot/dts/at91-sama5d2_icp.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/at91-sama5d2_icp.dts +3 -3
@@ -329,21 +329,21 @@ status = "okay"; eeprom@50 { - compatible = "atmel,24c32"; + compatible = "atmel,24c02"; reg = <0x50>; pagesize = <16>; status = "okay"; }; eeprom@52 { - compatible = "atmel,24c32"; + compatible = "atmel,24c02"; reg = <0x52>; pagesize = <16>; status = "disabled"; }; eeprom@53 { - compatible = "atmel,24c32"; + compatible = "atmel,24c02"; reg = <0x53>; pagesize = <16>; status = "disabled";
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 75/112 ARM: at91: fix soc detection for SAM9X60 SiPs
In reply to Greg Kroah-HartmanFrom: Mihai Sain <[email protected]>
[ Upstream commit 35074df65a8d8c5328a83e2eea948f7bbc8e6e08 ]
Fix SoC detection for SAM9X60 SiPs:
SAM9X60D5M
SAM9X60D1G
SAM9X60D6K
--- drivers/soc/atmel/soc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/soc/atmel/soc.c +6 -6
@@ -91,14 +91,14 @@ static const struct at91_soc socs[] __initconst = {AT91_SOC (SAM9X60_CIDR_MATCH ,AT91_CIDR_MATCH_MASK ,AT91_CIDR_VERSION_MASK ,SAM9X60_EXID_MATCH ,"sam9x60" ,"sam9x60" ), -AT91_SOC (SAM9X60_CIDR_MATCH ,SAM9X60_D5M_EXID_MATCH , -AT91_CIDR_VERSION_MASK ,SAM9X60_EXID_MATCH , +AT91_SOC (SAM9X60_CIDR_MATCH ,AT91_CIDR_MATCH_MASK , +AT91_CIDR_VERSION_MASK ,SAM9X60_D5M_EXID_MATCH ,"sam9x60 64MiB DDR2 SiP" ,"sam9x60" ), -AT91_SOC (SAM9X60_CIDR_MATCH ,SAM9X60_D1G_EXID_MATCH , -AT91_CIDR_VERSION_MASK ,SAM9X60_EXID_MATCH , +AT91_SOC (SAM9X60_CIDR_MATCH ,AT91_CIDR_MATCH_MASK , +AT91_CIDR_VERSION_MASK ,SAM9X60_D1G_EXID_MATCH ,"sam9x60 128MiB DDR2 SiP" ,"sam9x60" ), -AT91_SOC (SAM9X60_CIDR_MATCH ,SAM9X60_D6K_EXID_MATCH , -AT91_CIDR_VERSION_MASK ,SAM9X60_EXID_MATCH , +AT91_SOC (SAM9X60_CIDR_MATCH ,AT91_CIDR_MATCH_MASK , +AT91_CIDR_VERSION_MASK ,SAM9X60_D6K_EXID_MATCH ,"sam9x60 8MiB SDRAM SiP" ,"sam9x60" ), #endif #ifdef CONFIG_SOC_SAMA5
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 76/112 xsk: Clear page contiguity bit when unmapping pool
In reply to Greg Kroah-HartmanFrom: Ivan Malov <[email protected]>
[ Upstream commit 512d1999b8e94a5d43fba3afc73e774849674742 ]
When a XSK pool gets mapped, xp_check_dma_contiguity() adds bit 0x1 to pages' DMA addresses that go in ascending order and at 4K stride.
The problem is that the bit does not get cleared before doing unmap. As a result, a lot of warnings from iommu_dma_unmap_page() are seen in dmesg, which indicates that lookups by iommu_iova_to_phys() fail.
--- net/xdp/xsk_buff_pool.c | 1 + 1 file changed, 1 insertion(+)
net/xdp/xsk_buff_pool.c +1 -0
@@ -332,6 +332,7 @@ static void __xp_dma_unmap(struct xsk_dma_map *dma_map, unsigned long attrs)for (i =0 ; i < dma_map->dma_pages_cnt; i++) { dma = &dma_map->dma_pages[i];if (*dma) { + *dma &= ~XSK_NEXT_PG_CONTIG_MASK ;dma_unmap_page_attrs (dma_map->dev, *dma,PAGE_SIZE ,DMA_BIDIRECTIONAL , attrs); *dma =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 77/112 i2c: piix4: Fix a memory leak in the EFCH MMIO support
In reply to Greg Kroah-HartmanFrom: Jean Delvare <[email protected]>
[ Upstream commit 8ad59b397f86a4d8014966fdc0552095a0c4fb2b ]
The recently added support for EFCH MMIO regions introduced a memory leak in that code path. The leak is caused by the fact that release_resource() merely removes the resource from the tree but does not free its memory. We need to call release_mem_region() instead, which does free the memory. As a nice side effect, this brings back some symmetry between the legacy and MMIO paths.
--- drivers/i2c/busses/i2c-piix4.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-piix4.c +7 -9
@@ -161,7 +161,6 @@ static const char *piix4_aux_port_name_sb800 = " port 1";struct sb800_mmio_cfg {void __iomem *addr; -struct resource *res;bool use_mmio; };
@@ -179,13 +178,11 @@ static int piix4_sb800_region_request(struct device *dev, struct sb800_mmio_cfg *mmio_cfg) {if (mmio_cfg->use_mmio) { -struct resource *res;void __iomem *addr; - res =request_mem_region_muxed (SB800_PIIX4_FCH_PM_ADDR , -SB800_PIIX4_FCH_PM_SIZE , -"sb800_piix4_smb" ); -if (!res) { +if (!request_mem_region_muxed (SB800_PIIX4_FCH_PM_ADDR , +SB800_PIIX4_FCH_PM_SIZE , +"sb800_piix4_smb" )) {dev_err (dev,"SMBus base address memory region 0x%x already in use.\n" ,SB800_PIIX4_FCH_PM_ADDR );
@@ -195,12 +192,12 @@ static int piix4_sb800_region_request(struct device *dev, addr =ioremap (SB800_PIIX4_FCH_PM_ADDR ,SB800_PIIX4_FCH_PM_SIZE );if (!addr) { -release_resource (res); +release_mem_region (SB800_PIIX4_FCH_PM_ADDR , +SB800_PIIX4_FCH_PM_SIZE );dev_err (dev,"SMBus base address mapping failed.\n" );return -ENOMEM ; } - mmio_cfg->res = res; mmio_cfg->addr = addr;return 0 ;
@@ -222,7 +219,8 @@ static void piix4_sb800_region_release(struct device *dev, {if (mmio_cfg->use_mmio) {iounmap (mmio_cfg->addr); -release_resource (mmio_cfg->res); +release_mem_region (SB800_PIIX4_FCH_PM_ADDR , +SB800_PIIX4_FCH_PM_SIZE );return ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 78/112 i40e: Fix dropped jumbo frames statistics
In reply to Greg Kroah-HartmanFrom: Lukasz Cieplicki <[email protected]>
[ Upstream commit 1adb1563e7b7ec659379a18e607e8bc3522d8a78 ]
Dropped packets caused by too large frames were not included in dropped RX packets statistics.
Issue was caused by not reading the GL_RXERR1 register. That register stores count of packet which was have been dropped due to too large size.
Fix it by reading GL_RXERR1 register for each interface.
Repro steps:
Send a packet larger than the set MTU to SUT
Observe rx statists: ethtool -S <interface> | grep rx | grep -v ": 0"
--- drivers/net/ethernet/intel/i40e/i40e.h | 16 ++++ drivers/net/ethernet/intel/i40e/i40e_main.c | 73 +++++++++++++++++++ .../net/ethernet/intel/i40e/i40e_register.h | 13 ++++ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + 4 files changed, 103 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +16 -0
@@ -37,6 +37,7 @@#include <net/tc_act/tc_mirred.h> #include <net/udp_tunnel.h> #include <net/xdp_sock.h> +#include <linux/bitfield.h> #include "i40e_type.h" #include "i40e_prototype.h" #include <linux/net/intel/i40e_client.h>
@@ -1091,6 +1092,21 @@ static inline void i40e_write_fd_input_set(struct i40e_pf *pf, (u32)(val & 0xFFFFFFFFULL)); } +/** +* i40e_get_pf_count - get PCI PF count. +* @hw: pointer to a hw. +* +* Reports the function number of the highest PCI physical +* function plus 1 as it is loaded from the NVM. +* +* Return: PCI PF count. +**/ +static inline u32 i40e_get_pf_count (struct i40e_hw *hw) +{ +return FIELD_GET (I40E_GLGEN_PCIFCNCNT_PCIPFCNT_MASK , +rd32 (hw,I40E_GLGEN_PCIFCNCNT )); +} +/* needed by i40e_ethtool.c */ int i40e_up (struct i40e_vsi *vsi);void i40e_down (struct i40e_vsi *vsi);
drivers/net/ethernet/intel/i40e/i40e_main.c +73 -0
91 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_register.h +13 -0
@@ -211,6 +211,11 @@#define I40E_GLGEN_MSRWD_MDIWRDATA_SHIFT 0#define I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT 16#define I40E_GLGEN_MSRWD_MDIRDDATA_MASK I40E_MASK(0xFFFF, I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT) +#define I40E_GLGEN_PCIFCNCNT 0x001C0AB4/* Reset: PCIR */ +#define I40E_GLGEN_PCIFCNCNT_PCIPFCNT_SHIFT 0 +#define I40E_GLGEN_PCIFCNCNT_PCIPFCNT_MASK I40E_MASK(0x1F, I40E_GLGEN_PCIFCNCNT_PCIPFCNT_SHIFT) +#define I40E_GLGEN_PCIFCNCNT_PCIVFCNT_SHIFT 16 +#define I40E_GLGEN_PCIFCNCNT_PCIVFCNT_MASK I40E_MASK(0xFF, I40E_GLGEN_PCIFCNCNT_PCIVFCNT_SHIFT)#define I40E_GLGEN_RSTAT 0x000B8188/* Reset: POR */ #define I40E_GLGEN_RSTAT_DEVSTATE_SHIFT 0#define I40E_GLGEN_RSTAT_DEVSTATE_MASK I40E_MASK(0x3, I40E_GLGEN_RSTAT_DEVSTATE_SHIFT)
@@ -643,6 +648,14 @@#define I40E_VFQF_HKEY1_MAX_INDEX 12#define I40E_VFQF_HLUT1 (_i, _VF) (0x00220000 + ((_i) * 1024 + (_VF) * 4))/* _i=0...15, _VF=0...127 */ /* Reset: CORER */ #define I40E_VFQF_HLUT1_MAX_INDEX 15 +#define I40E_GL_RXERR1H (_i) (0x00318004 + ((_i) * 8))/* _i=0...143 */ /* Reset: CORER */ +#define I40E_GL_RXERR1H_MAX_INDEX 143 +#define I40E_GL_RXERR1H_RXERR1H_SHIFT 0 +#define I40E_GL_RXERR1H_RXERR1H_MASK I40E_MASK(0xFFFFFFFF, I40E_GL_RXERR1H_RXERR1H_SHIFT) +#define I40E_GL_RXERR1L (_i) (0x00318000 + ((_i) * 8))/* _i=0...143 */ /* Reset: CORER */ +#define I40E_GL_RXERR1L_MAX_INDEX 143 +#define I40E_GL_RXERR1L_RXERR1L_SHIFT 0 +#define I40E_GL_RXERR1L_RXERR1L_MASK I40E_MASK(0xFFFFFFFF, I40E_GL_RXERR1L_RXERR1L_SHIFT)#define I40E_GLPRT_BPRCH (_i) (0x003005E4 + ((_i) * 8))/* _i=0...3 */ /* Reset: CORER */ #define I40E_GLPRT_BPRCL (_i) (0x003005E0 + ((_i) * 8))/* _i=0...3 */ /* Reset: CORER */ #define I40E_GLPRT_BPTCH (_i) (0x00300A04 + ((_i) * 8))/* _i=0...3 */ /* Reset: CORER */
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -0
@@ -1172,6 +1172,7 @@ struct i40e_eth_stats {u64 tx_broadcast;/* bptc */ u64 tx_discards;/* tdpc */ u64 tx_errors;/* tepc */ +u64 rx_discards_other;/* rxerr1 */ };/* Statistics collected per VEB per TC */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 79/112 i40e: Fix VFs MAC Address change on VM
In reply to Greg Kroah-HartmanFrom: Norbert Zulinski <[email protected]>
[ Upstream commit fed0d9f13266a22ce1fc9a97521ef9cdc6271a23 ]
Clear VF MAC from parent PF and remove VF filter from VSI when both conditions are true:
-VIRTCHNL_VF_OFFLOAD_USO is not used
-VM MAC was not set from PF level
It affects older version of IAVF and it allow them to change MAC Address on VM, newer IAVF won't change their behaviour.
Previously it wasn't possible to change VF's MAC Address on VM because there is flag on IAVF driver that won't allow to change MAC Address if this address is given from PF driver.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -0
@@ -2147,6 +2147,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)/* VFs only use TC 0 */ vfres->vsi_res[0 ].qset_handle =le16_to_cpu (vsi->info.qs_handle[0 ]); +if (!(vf->driver_caps &VIRTCHNL_VF_OFFLOAD_USO ) && !vf->pf_set_mac) { +i40e_del_mac_filter (vsi, vf->default_lan_addr.addr); +eth_zero_addr (vf->default_lan_addr.addr); + }ether_addr_copy (vfres->vsi_res[0 ].default_mac_addr, vf->default_lan_addr.addr); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 80/112 ARM: dts: stm32: add missing usbh clock and fix clk order on stm32mp15
In reply to Greg Kroah-HartmanFrom: Fabrice Gasnier <[email protected]>
[ Upstream commit 1d0c1aadf1fd9f3de95d1532b3651e8634546e71 ]
The USBH composed of EHCI and OHCI controllers needs the PHY clock to be initialized first, before enabling (gating) them. The reverse is also required when going to suspend.
So, add USBPHY clock as 1st entry in both controllers, so the USBPHY PLL gets enabled 1st upon controller init. Upon suspend/resume, this also makes the clock to be disabled/re-enabled in the correct order.
This fixes some IRQ storm conditions seen when going to low-power, due to PHY PLL being disabled before all clocks are cleanly gated.
--- arch/arm/boot/dts/stm32mp151.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp151.dtsi +2 -2
@@ -1474,7 +1474,7 @@ usbh_ohci: usb@5800c000 { compatible = "generic-ohci"; reg = <0x5800c000 0x1000>; - clocks = <&rcc USBH>, <&usbphyc>; + clocks = <&usbphyc>, <&rcc USBH>; resets = <&rcc USBH_R>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; status = "disabled";
@@ -1483,7 +1483,7 @@ usbh_ehci: usb@5800d000 { compatible = "generic-ehci"; reg = <0x5800d000 0x1000>; - clocks = <&rcc USBH>; + clocks = <&usbphyc>, <&rcc USBH>; resets = <&rcc USBH_R>; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; companion = <&usbh_ohci>;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 81/112 ibmvnic: Properly dispose of all skbs during a failover.
In reply to Greg Kroah-HartmanFrom: Rick Lindsley <[email protected]>
[ Upstream commit 1b18f09d31cfa7148df15a7d5c5e0e86f105f7d1 ]
During a reset, there may have been transmits in flight that are no longer valid and cannot be fulfilled. Resetting and clearing the queues is insufficient; each skb also needs to be explicitly freed so that upper levels are not left waiting for confirmation of a transmit that will never happen. If this happens frequently enough, the apparent backlog will cause TCP to begin "congestion control" unnecessarily, culminating in permanently decreased throughput.
--- drivers/net/ethernet/ibm/ibmvnic.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +9 -0
@@ -5774,6 +5774,15 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter, bool reset)release_sub_crqs (adapter,0 ); rc =init_sub_crqs (adapter); }else { +/* no need to reinitialize completely, but we do +* need to clean up transmits that were in flight +* when we processed the reset. Failure to do so +* will confound the upper layer, usually TCP, by +* creating the illusion of transmits that are +* awaiting completion. +*/ +clean_tx_pools (adapter); + rc =reset_sub_crq_queues (adapter); } }else {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 82/112 selftests: forwarding: fix flood_unicast_test when h2 supports IFF_UNICAST_FLT
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit b8e629b05f5d23f9649c901bef09fab8b0c2e4b9 ]
As mentioned in the blamed commit, flood_unicast_test() works by checking the match count on a tc filter placed on the receiving interface.
But the second host interface (host2_if) has no interest in receiving a packet with MAC DA de:ad:be:ef:13:37, so its RX filter drops it even before the ingress tc filter gets to be executed. So we will incorrectly get the message "Packet was not flooded when should", when in fact, the packet was flooded as expected but dropped due to an unrelated reason, at some other layer on the receiving side.
Force h2 to accept this packet by temporarily placing it in promiscuous mode. Alternatively we could either deliver to its MAC address or use tcpdump_start, but this has the fewest complications.
This fixes the "flooding" test from bridge_vlan_aware.sh and bridge_vlan_unaware.sh, which calls flood_test from the lib.
--- tools/testing/selftests/net/forwarding/lib.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/forwarding/lib.sh +2 -0
@@ -1242,6 +1242,7 @@ flood_test_do() # Add an ACL on `host2_if` which will tell us whether the packet # was flooded to it or not. + ip link set $host2_if promisc on tc qdisc add dev $host2_if ingress tc filter add dev $host2_if ingress protocol ip pref 1 handle 101 \ flower dst_mac $mac action drop
@@ -1259,6 +1260,7 @@ flood_test_do() tc filter del dev $host2_if ingress protocol ip pref 1 handle 101 flower tc qdisc del dev $host2_if ingress + ip link set $host2_if promisc off return $err }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 83/112 selftests: forwarding: fix learning_test when h1 supports IFF_UNICAST_FLT
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 1a635d3e1c80626237fdae47a5545b6655d8d81c ]
The first host interface has by default no interest in receiving packets MAC DA de:ad:be:ef:13:37, so it might drop them before they hit the tc filter and this might confuse the selftest.
Enable promiscuous mode such that the filter properly counts received packets.
--- tools/testing/selftests/net/forwarding/lib.sh | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/net/forwarding/lib.sh +2 -0
@@ -1176,6 +1176,7 @@ learning_test() # FDB entry was installed. bridge link set dev $br_port1 flood off + ip link set $host1_if promisc on tc qdisc add dev $host1_if ingress tc filter add dev $host1_if ingress protocol ip pref 1 handle 101 \ flower dst_mac $mac action drop
@@ -1225,6 +1226,7 @@ learning_test() tc filter del dev $host1_if ingress protocol ip pref 1 handle 101 flower tc qdisc del dev $host1_if ingress + ip link set $host1_if promisc off bridge link set dev $br_port1 flood on
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 84/112 selftests: forwarding: fix error message in learning_test
In reply to Greg Kroah-HartmanFrom: Vladimir Oltean <[email protected]>
[ Upstream commit 83844aacab2015da1dba1df0cc61fc4b4c4e8076 ]
When packets are not received, they aren't received on $host1_if, so the message talking about the second host not receiving them is incorrect. Fix it.
--- tools/testing/selftests/net/forwarding/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/net/forwarding/lib.sh +1 -1
@@ -1187,7 +1187,7 @@ learning_test() tc -j -s filter show dev $host1_if ingress \ | jq -e ".[] | select(.options.handle == 101) \ | select(.options.actions[0].stats.packets == 1)" &> /dev/null - check_fail $? "Packet reached second host when should not" + check_fail $? "Packet reached first host when should not" $MZ $host1_if -c 1 -p 64 -a $mac -t ip -q sleep 1
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 85/112 ACPI: CPPC: Check _OSC for flexible address space
In reply to Greg Kroah-HartmanFrom: Pierre Gondois <[email protected]>
[ Upstream commit 0651ab90e4ade17f1d4f4367b70f6120480410f3 ]
ACPI 6.2 Section 6.2.11.2 'Platform-Wide OSPM Capabilities':
Starting with ACPI Specification 6.2, all _CPC registers can be in PCC, System Memory, System IO, or Functional Fixed Hardware address spaces. OSPM support for this more flexible register space scheme is indicated by the “Flexible Address Space for CPPC Registers” _OSC bit
Otherwise (cf ACPI 6.1, s8.4.7.1.1.X), _CPC registers must be in:
- PCC or Functional Fixed Hardware address space if defined
- SystemMemory address space (NULL register) if not defined
Add the corresponding _OSC bit and check it when parsing _CPC objects.
--- drivers/acpi/bus.c | 18 ++++++++++++++++++ drivers/acpi/cppc_acpi.c | 9 +++++++++ include/linux/acpi.h | 2 ++ 3 files changed, 29 insertions(+)
drivers/acpi/bus.c +18 -0
@@ -278,6 +278,20 @@ bool osc_sb_apei_support_acked;bool osc_pc_lpi_support_confirmed;EXPORT_SYMBOL_GPL (osc_pc_lpi_support_confirmed); +/* +* ACPI 6.2 Section 6.2.11.2 'Platform-Wide OSPM Capabilities': +* Starting with ACPI Specification 6.2, all _CPC registers can be in +* PCC, System Memory, System IO, or Functional Fixed Hardware address +* spaces. OSPM support for this more flexible register space scheme is +* indicated by the “Flexible Address Space for CPPC Registers” _OSC bit. +* +* Otherwise (cf ACPI 6.1, s8.4.7.1.1.X), _CPC registers must be in: +* - PCC or Functional Fixed Hardware address space if defined +* - SystemMemory address space (NULL register) if not defined +*/ +bool osc_cpc_flexible_adr_space_confirmed; +EXPORT_SYMBOL_GPL (osc_cpc_flexible_adr_space_confirmed); +/* * ACPI 6.4 Operating System Capabilities for USB. */
@@ -321,6 +335,8 @@ static void acpi_bus_osc_negotiate_platform_control(void) }#endif + capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPC_FLEXIBLE_ADR_SPACE ; +if (IS_ENABLED (CONFIG_SCHED_MC_PRIO )) capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPC_DIVERSE_HIGH_SUPPORT ;
@@ -366,6 +382,8 @@ static void acpi_bus_osc_negotiate_platform_control(void) capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_PCLPI_SUPPORT ; osc_sb_native_usb4_support_confirmed = capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_NATIVE_USB4_SUPPORT ; + osc_cpc_flexible_adr_space_confirmed = + capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_CPC_FLEXIBLE_ADR_SPACE ; }kfree (context.ret.pointer);
drivers/acpi/cppc_acpi.c +9 -0
@@ -746,6 +746,11 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)if (gas_t->address) {void __iomem *addr; +if (!osc_cpc_flexible_adr_space_confirmed) { +pr_debug ("Flexible address space capability not supported\n" ); + goto out_free; + } + addr =ioremap (gas_t->address, gas_t->bit_width/8 );if (!addr) goto out_free;
@@ -768,6 +773,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) gas_t->address); goto out_free; } +if (!osc_cpc_flexible_adr_space_confirmed) { +pr_debug ("Flexible address space capability not supported\n" ); + goto out_free; + } }else {if (gas_t->space_id !=ACPI_ADR_SPACE_FIXED_HARDWARE || !cpc_ffh_supported ()) {/* Support only PCC, SystemMemory, SystemIO, and FFH type regs. */
include/linux/acpi.h +2 -0
@@ -574,6 +574,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);#define OSC_SB_OSLPI_SUPPORT 0x00000100#define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000 +#define OSC_SB_CPC_FLEXIBLE_ADR_SPACE 0x00004000#define OSC_SB_NATIVE_USB4_SUPPORT 0x00040000#define OSC_SB_PRM_SUPPORT 0x00200000
@@ -581,6 +582,7 @@ extern bool osc_sb_apei_support_acked;extern bool osc_pc_lpi_support_confirmed;extern bool osc_sb_native_usb4_support_confirmed;extern bool osc_sb_cppc_not_supported; +extern bool osc_cpc_flexible_adr_space_confirmed;/* USB4 Capabilities */ #define OSC_USB_USB3_TUNNELING 0x00000001
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 86/112 ACPI: bus: Set CPPC _OSC bits for all and when CPPC_LIB is supported
In reply to Greg Kroah-HartmanFrom: Pierre Gondois <[email protected]>
[ Upstream commit 72f2ecb7ece7c1d89758d4929d98e95d95fe7199 ]
The _OSC method allows the OS and firmware to communicate about supported features/capabitlities. It also allows the OS to take control of some features.
In ACPI 6.4, s6.2.11.2 Platform-Wide OSPM Capabilities, the CPPC (resp. v2) bit should be set by the OS if it 'supports controlling processor performance via the interfaces described in the _CPC object'.
The OS supports CPPC and parses the _CPC object only if CONFIG_ACPI_CPPC_LIB is set. Replace the x86 specific boot_cpu_has(X86_FEATURE_HWP) dynamic check with an arch generic CONFIG_ACPI_CPPC_LIB build-time check.
Note:CONFIG_X86_INTEL_PSTATE selects CONFIG_ACPI_CPPC_LIB.
--- drivers/acpi/bus.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +8 -8
@@ -329,10 +329,11 @@ static void acpi_bus_osc_negotiate_platform_control(void)#endif #ifdef CONFIG_X86 capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_GENERIC_INITIATOR_SUPPORT ; -if (boot_cpu_has (X86_FEATURE_HWP )) { - capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPC_SUPPORT ; - capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPCV2_SUPPORT ; - } +#endif + +#ifdef CONFIG_ACPI_CPPC_LIB + capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPC_SUPPORT ; + capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPCV2_SUPPORT ;#endif capbuf[OSC_SUPPORT_DWORD ] |=OSC_SB_CPC_FLEXIBLE_ADR_SPACE ;
@@ -357,10 +358,9 @@ static void acpi_bus_osc_negotiate_platform_control(void)return ; } -#ifdef CONFIG_X86 -if (boot_cpu_has (X86_FEATURE_HWP )) - osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD ] & - (OSC_SB_CPC_SUPPORT |OSC_SB_CPCV2_SUPPORT )); +#ifdef CONFIG_ACPI_CPPC_LIB + osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD ] & + (OSC_SB_CPC_SUPPORT |OSC_SB_CPCV2_SUPPORT ));#endif /*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 87/112 ACPI: CPPC: Only probe for _CPC if CPPC v2 is acked
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 7feec7430edddb87c24b0a86b08a03d0b496a755 ]
Previously the kernel used to ignore whether the firmware masked CPPC or CPPCv2 and would just pretend that it worked.
When support for the USB4 bit in _OSC was introduced from commit 9e1f561afb ("ACPI: Execute platform _OSC also with query bit clear") the kernel began to look at the return when the query bit was clear.
This caused regressions that were misdiagnosed and attempted to be solved as part of commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag""). This caused a different regression where non-Intel systems weren't able to negotiate _OSC properly.
This was reverted in commit 2ca8e6285250 ("Revert "ACPI: Pass the same capabilities to the _OSC regardless of the query flag"") and attempted to be fixed by commit c42fa24b4475 ("ACPI: bus: Avoid using CPPC if not supported by firmware") but the regression still returned.
These systems with the regression only load support for CPPC from an SSDT dynamically when _OSC reports CPPC v2. Avoid the problem by not letting CPPC satisfy the requirement in acpi_cppc_processor_probe.
--- drivers/acpi/bus.c | 11 +++++------ drivers/acpi/cppc_acpi.c | 4 +++- include/linux/acpi.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +5 -6
@@ -298,7 +298,7 @@ EXPORT_SYMBOL_GPL(osc_cpc_flexible_adr_space_confirmed);bool osc_sb_native_usb4_support_confirmed;EXPORT_SYMBOL_GPL (osc_sb_native_usb4_support_confirmed); -bool osc_sb_cppc_not_supported; +bool osc_sb_cppc2_support_acked;static u8 sb_uuid_str[] ="0811B06E-4A27-44F9-8D60-3CBBC22E7B48" ;static void acpi_bus_osc_negotiate_platform_control (void )
@@ -358,11 +358,6 @@ static void acpi_bus_osc_negotiate_platform_control(void)return ; } -#ifdef CONFIG_ACPI_CPPC_LIB - osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD ] & - (OSC_SB_CPC_SUPPORT |OSC_SB_CPCV2_SUPPORT )); -#endif -/* * Now run _OSC again with query flag clear and with the caps * supported by both the OS and the platform.
@@ -376,6 +371,10 @@ static void acpi_bus_osc_negotiate_platform_control(void) capbuf_ret = context.ret.pointer;if (context.ret.length >OSC_SUPPORT_DWORD ) { +#ifdef CONFIG_ACPI_CPPC_LIB + osc_sb_cppc2_support_acked = capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_CPCV2_SUPPORT ; +#endif + osc_sb_apei_support_acked = capbuf_ret[OSC_SUPPORT_DWORD ] &OSC_SB_APEI_SUPPORT ; osc_pc_lpi_support_confirmed =
drivers/acpi/cppc_acpi.c +3 -1
@@ -666,8 +666,10 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)acpi_status status;int ret = -ENODATA ; -if (osc_sb_cppc_not_supported) +if (!osc_sb_cppc2_support_acked) { +pr_debug ("CPPC v2 _OSC not acked\n" );return -ENODEV ; + }/* Parse the ACPI _CPC table for this CPU. */ status = acpi_evaluate_object_typed(handle, "_CPC", NULL, &output,
include/linux/acpi.h +1 -1
@@ -581,7 +581,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);extern bool osc_sb_apei_support_acked;extern bool osc_pc_lpi_support_confirmed;extern bool osc_sb_native_usb4_support_confirmed; -extern bool osc_sb_cppc_not_supported; +extern bool osc_sb_cppc2_support_acked;extern bool osc_cpc_flexible_adr_space_confirmed;/* USB4 Capabilities */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 88/112 ACPI: CPPC: Dont require _OSC if X86_FEATURE_CPPC is supported
In reply to Greg Kroah-HartmanFrom: Mario Limonciello <[email protected]>
[ Upstream commit 8b356e536e69f3a4d6778ae9f0858a1beadabb1f ]
commit 72f2ecb7ece7 ("ACPI: bus: Set CPPC _OSC bits for all and when CPPC_LIB is supported") added support for claiming to support CPPC in _OSC on non-Intel platforms.
This unfortunately caused a regression on a vartiety of AMD platforms in the field because a number of AMD platforms don't set the _OSC bit 5 or 6 to indicate CPPC or CPPC v2 support.
As these AMD platforms already claim CPPC support via a dedicated MSR from X86_FEATURE_CPPC, use this enable this feature rather than requiring the _OSC on platforms with a dedicated MSR.
If there is additional breakage on the shared memory designs also missing this _OSC, additional follow up changes may be needed.
--- arch/x86/kernel/acpi/cppc.c | 10 ++++++++++ drivers/acpi/cppc_acpi.c | 16 +++++++++++++++- include/acpi/cppc_acpi.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-)
arch/x86/kernel/acpi/cppc.c +10 -0
@@ -11,6 +11,16 @@/* Refer to drivers/acpi/cppc_acpi.c for the description of functions */ +bool cpc_supported_by_cpu (void ) +{ +switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : +return boot_cpu_has (X86_FEATURE_CPPC ); + } +return false; +} +bool cpc_ffh_supported (void ) {return true;
drivers/acpi/cppc_acpi.c +15 -1
@@ -559,6 +559,19 @@ bool __weak cpc_ffh_supported(void)return false; } +/** +* cpc_supported_by_cpu() - check if CPPC is supported by CPU +* +* Check if the architectural support for CPPC is present even +* if the _OSC hasn't prescribed it +* +* Return: true for supported, false for not supported +*/ +bool __weak cpc_supported_by_cpu (void ) +{ +return false; +} +/** * pcc_data_alloc() - Allocate the pcc_data memory for pcc subspace *
@@ -668,7 +681,8 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr)if (!osc_sb_cppc2_support_acked) {pr_debug ("CPPC v2 _OSC not acked\n" ); -return -ENODEV ; +if (!cpc_supported_by_cpu ()) +return -ENODEV ; }/* Parse the ACPI _CPC table for this CPU. */
include/acpi/cppc_acpi.h +1 -0
@@ -144,6 +144,7 @@ extern bool acpi_cpc_valid(void);extern int acpi_get_psd_map (unsigned int cpu,struct cppc_cpudata *cpu_data);extern unsigned int cppc_get_transition_latency (int cpu);extern bool cpc_ffh_supported (void ); +extern bool cpc_supported_by_cpu (void );extern int cpc_read_ffh (int cpunum,struct cpc_reg *reg,u64 *val);extern int cpc_write_ffh (int cpunum,struct cpc_reg *reg,u64 val);#else /* !CONFIG_ACPI_CPPC_LIB */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 89/112 net/mlx5e: Fix matchall police parameters validation
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit 4d1e07d83ccc87f210e5b852b0a5ea812a2f191c ]
Referenced commit prepared the code for upcoming extension that allows mlx5 to offload police action attached to flower classifier. However, with regard to existing matchall classifier offload validation should be reversed as FLOW_ACTION_CONTINUE is the only supported notexceed police action type. Fix the problem by allowing FLOW_ACTION_CONTINUE for police action and extend scan_tc_matchall_fdb_actions() to only allow such actions with matchall classifier.
--- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +6 -7
@@ -4503,13 +4503,6 @@ static int mlx5e_policer_validate(const struct flow_action *action,return -EOPNOTSUPP ; } -if (act->police.notexceed.act_id !=FLOW_ACTION_PIPE && - act->police.notexceed.act_id !=FLOW_ACTION_ACCEPT ) { -NL_SET_ERR_MSG_MOD (extack, -"Offload not supported when conform action is not pipe or ok" ); -return -EOPNOTSUPP ; - } -if (act->police.notexceed.act_id ==FLOW_ACTION_ACCEPT && !flow_action_is_last_entry (action, act)) { NL_SET_ERR_MSG_MOD(extack,
@@ -4560,6 +4553,12 @@ static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv,flow_action_for_each (i, act, flow_action) {switch (act->id) {case FLOW_ACTION_POLICE : +if (act->police.notexceed.act_id !=FLOW_ACTION_CONTINUE ) { +NL_SET_ERR_MSG_MOD (extack, +"Offload not supported when conform action is not continue" ); +return -EOPNOTSUPP ; + } + err =mlx5e_policer_validate (flow_action, act, extack);if (err)return err;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 90/112 mptcp: Avoid acquiring PM lock for subflow priority changes
In reply to Greg Kroah-HartmanFrom: Mat Martineau <[email protected]>
[ Upstream commit c21b50d5912b68c4414c60ef5b30416c103f9fd8 ]
The in-kernel path manager code for changing subflow flags acquired both the msk socket lock and the PM lock when possibly changing the "backup" and "fullmesh" flags. mptcp_pm_nl_mp_prio_send_ack() does not access anything protected by the PM lock, and it must release and reacquire the PM lock.
By pushing the PM lock to where it is needed in mptcp_pm_nl_fullmesh(), the lock is only acquired when the fullmesh flag is changed and the backup flag code no longer has to release and reacquire the PM lock. The change in locking context requires the MIB update to be modified - move that to a better location instead.
This change also makes it possible to call mptcp_pm_nl_mp_prio_send_ack() for the userspace PM commands without manipulating the in-kernel PM lock.
--- net/mptcp/options.c | 3 +++ net/mptcp/pm_netlink.c | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-)
net/mptcp/options.c +3 -0
@@ -1538,6 +1538,9 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, *ptr++ =mptcp_option (MPTCPOPT_MP_PRIO ,TCPOLEN_MPTCP_PRIO , opts->backup,TCPOPT_NOP ); + +MPTCP_INC_STATS (sock_net ((const struct sock *)tp), +MPTCP_MIB_MPPRIOTX ); } mp_capable_done:
net/mptcp/pm_netlink.c +2 -6
@@ -720,7 +720,6 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,mptcp_for_each_subflow (msk, subflow) {struct sock *ssk =mptcp_subflow_tcp_sock (subflow); -struct sock *sk = (struct sock *)msk;struct mptcp_addr_info local;local_address ((struct sock_common *)ssk, &local);
@@ -732,12 +731,9 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, subflow->backup = bkup; subflow->send_mp_prio =1 ; subflow->request_bkup = bkup; -__MPTCP_INC_STATS (sock_net (sk),MPTCP_MIB_MPPRIOTX ); -spin_unlock_bh (&msk->pm.lock);pr_debug ("send ack for mp_prio" );mptcp_subflow_send_ack (ssk); -spin_lock_bh (&msk->pm.lock);return 0 ; }
@@ -1769,8 +1765,10 @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk, list.ids[list.nr++] = addr->id; +spin_lock_bh (&msk->pm.lock);mptcp_pm_nl_rm_subflow_received (msk, &list);mptcp_pm_create_subflow_or_signal_addr (msk); +spin_unlock_bh (&msk->pm.lock); } static int mptcp_nl_set_flags(struct net *net,
@@ -1788,12 +1786,10 @@ static int mptcp_nl_set_flags(struct net *net, goto next;lock_sock (sk); -spin_lock_bh (&msk->pm.lock);if (changed &MPTCP_PM_ADDR_FLAG_BACKUP ) ret =mptcp_pm_nl_mp_prio_send_ack (msk, addr, bkup);if (changed &MPTCP_PM_ADDR_FLAG_FULLMESH )mptcp_pm_nl_fullmesh (msk, addr); -spin_unlock_bh (&msk->pm.lock);release_sock (sk); next:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 91/112 mptcp: Acquire the subflow socket lock before modifying MP_PRIO flags
In reply to Greg Kroah-HartmanFrom: Mat Martineau <[email protected]>
[ Upstream commit a657430260e5437df16004c8c317821d946b5ead ]
When setting up a subflow's flags for sending MP_PRIO MPTCP options, the subflow socket lock was not held while reading and modifying several struct members that are also read and modified in mptcp_write_options().
Acquire the subflow socket lock earlier and send the MP_PRIO ACK with that lock already acquired. Add a new variant of the mptcp_subflow_send_ack() helper to use with the subflow lock held.
--- net/mptcp/pm_netlink.c | 5 ++++- net/mptcp/protocol.c | 9 +++++++-- net/mptcp/protocol.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-)
net/mptcp/pm_netlink.c +4 -1
@@ -721,11 +721,13 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,mptcp_for_each_subflow (msk, subflow) {struct sock *ssk =mptcp_subflow_tcp_sock (subflow);struct mptcp_addr_info local; +bool slow;local_address ((struct sock_common *)ssk, &local);if (!addresses_equal (&local, addr, addr->port))continue ; + slow =lock_sock_fast (ssk);if (subflow->backup != bkup) msk->last_snd =NULL ; subflow->backup = bkup;
@@ -733,7 +735,8 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, subflow->request_bkup = bkup;pr_debug ("send ack for mp_prio" ); -mptcp_subflow_send_ack (ssk); +__mptcp_subflow_send_ack (ssk); +unlock_sock_fast (ssk, slow);return 0 ; }
net/mptcp/protocol.c +7 -2
@@ -506,13 +506,18 @@ static bool tcp_can_send_ack(const struct sock *ssk) (TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN)); } +void __mptcp_subflow_send_ack (struct sock *ssk) +{ +if (tcp_can_send_ack (ssk)) +tcp_send_ack (ssk); +} +void mptcp_subflow_send_ack (struct sock *ssk) {bool slow; slow =lock_sock_fast (ssk); -if (tcp_can_send_ack (ssk)) -tcp_send_ack (ssk); +__mptcp_subflow_send_ack (ssk);unlock_sock_fast (ssk, slow); }
net/mptcp/protocol.h +1 -0
@@ -584,6 +584,7 @@ void __init mptcp_subflow_init(void);void mptcp_subflow_shutdown (struct sock *sk,struct sock *ssk,int how);void mptcp_close_ssk (struct sock *sk,struct sock *ssk,struct mptcp_subflow_context *subflow); +void __mptcp_subflow_send_ack (struct sock *ssk);void mptcp_subflow_send_ack (struct sock *ssk);void mptcp_subflow_reset (struct sock *ssk);void mptcp_subflow_queue_clean (struct sock *ssk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 92/112 mptcp: fix local endpoint accounting
In reply to Greg Kroah-HartmanFrom: Paolo Abeni <[email protected]>
[ Upstream commit 843b5e75efff04db34fcf9856de53c9e415530a2 ]
In mptcp_pm_nl_rm_addr_or_subflow() we always mark as available the id corresponding to the just removed address.
The used bitmap actually tracks only the local IDs: we must restrict the operation when a (local) subflow is removed.
--- net/mptcp/pm_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mptcp/pm_netlink.c +2 -1
@@ -793,7 +793,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, removed = true;__MPTCP_INC_STATS (sock_net (sk), rm_type); } -__set_bit (rm_list->ids[i], msk->pm.id_avail_bitmap); +if (rm_type ==MPTCP_MIB_RMSUBFLOW ) +__set_bit (rm_list->ids[i], msk->pm.id_avail_bitmap);if (!removed)continue ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 93/112 r8169: fix accessing unset transport header
In reply to Greg Kroah-HartmanFrom: Heiner Kallweit <[email protected]>
[ Upstream commit faa4e04e5e140a6d02260289a8fba8fd8d7a3003 ]
66e4c8d95008 ("net: warn if transport header was not set") added a check that triggers a warning in r8169, see [0].
The commit referenced in the Fixes tag refers to the change from which the patch applies cleanly, there's nothing wrong with this commit. It seems the actual issue (not bug, because the warning is harmless here) was introduced with bdfa4ed68187 ("r8169: use Giant Send").
[0] https://bugzilla.kernel.org/show_bug.cgi?id=216157
--- drivers/net/ethernet/realtek/r8169_main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +4 -6
@@ -4190,7 +4190,6 @@ static void rtl8169_tso_csum_v1(struct sk_buff *skb, u32 *opts)static bool rtl8169_tso_csum_v2 (struct rtl8169_private *tp,struct sk_buff *skb,u32 *opts) { -u32 transport_offset = (u32 )skb_transport_offset (skb);struct skb_shared_info *shinfo =skb_shinfo (skb);u32 mss = shinfo->gso_size;
@@ -4207,7 +4206,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,WARN_ON_ONCE (1 ); } - opts[0 ] |= transport_offset <<GTTCPHO_SHIFT ; + opts[0 ] |=skb_transport_offset (skb) <<GTTCPHO_SHIFT ; opts[1 ] |= mss <<TD1_MSS_SHIFT ; }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {u8 ip_protocol;
@@ -4235,7 +4234,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,else WARN_ON_ONCE (1 ); - opts[1 ] |= transport_offset <<TCPHO_SHIFT ; + opts[1 ] |=skb_transport_offset (skb) <<TCPHO_SHIFT ; }else {unsigned int padto =rtl_quirk_packet_padto (tp, skb);
@@ -4402,14 +4401,13 @@ static netdev_features_t rtl8169_features_check(struct sk_buff *skb, struct net_device *dev, netdev_features_t features) { - int transport_offset = skb_transport_offset(skb);struct rtl8169_private *tp =netdev_priv (dev);if (skb_is_gso (skb)) {if (tp->mac_version ==RTL_GIGA_MAC_VER_34 ) features =rtl8168evl_fix_tso (skb, features); -if (transport_offset >GTTCPHO_MAX && +if (skb_transport_offset (skb) >GTTCPHO_MAX &&rtl_chip_supports_csum_v2 (tp)) features &= ~NETIF_F_ALL_TSO ; }else if (skb->ip_summed ==CHECKSUM_PARTIAL ) {
@@ -4420,7 +4418,7 @@ static netdev_features_t rtl8169_features_check(struct sk_buff *skb,if (rtl_quirk_packet_padto (tp, skb)) features &= ~NETIF_F_CSUM_MASK ; -if (transport_offset >TCPHO_MAX && +if (skb_transport_offset (skb) >TCPHO_MAX &&rtl_chip_supports_csum_v2 (tp)) features &= ~NETIF_F_CSUM_MASK ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 94/112 i2c: cadence: Unregister the clk notifier in error path
In reply to Greg Kroah-HartmanFrom: Satish Nagireddy <[email protected]>
[ Upstream commit 3501f0c663063513ad604fb1b3f06af637d3396d ]
This patch ensures that the clock notifier is unregistered when driver probe is returning error.
--- drivers/i2c/busses/i2c-cadence.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-cadence.c +1 -0
@@ -1338,6 +1338,7 @@ static int cdns_i2c_probe(struct platform_device *pdev)return 0 ; err_clk_dis: +clk_notifier_unregister (id->clk, &id->clk_rate_change_nb);clk_disable_unprepare (id->clk);pm_runtime_disable (&pdev->dev);pm_runtime_set_suspended (&pdev->dev);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 95/112 net/sched: act_api: Add extack to offload_act_setup() callback
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit c2ccf84ecb715bb81dc7f51e69d680a95bf055ae ]
The callback is used by various actions to populate the flow action structure prior to offload. Pass extack to this callback so that the various actions will be able to report accurate error messages to user space.
--- include/net/act_api.h | 3 ++- include/net/pkt_cls.h | 6 ++++-- net/sched/act_api.c | 4 ++-- net/sched/act_csum.c | 3 ++- net/sched/act_ct.c | 3 ++- net/sched/act_gact.c | 3 ++- net/sched/act_gate.c | 3 ++- net/sched/act_mirred.c | 3 ++- net/sched/act_mpls.c | 3 ++- net/sched/act_pedit.c | 3 ++- net/sched/act_police.c | 3 ++- net/sched/act_sample.c | 3 ++- net/sched/act_skbedit.c | 3 ++- net/sched/act_tunnel_key.c | 3 ++- net/sched/act_vlan.c | 3 ++- net/sched/cls_api.c | 16 ++++++++++------ net/sched/cls_flower.c | 6 ++++-- net/sched/cls_matchall.c | 6 ++++-- 18 files changed, 50 insertions(+), 27 deletions(-)
include/net/act_api.h +2 -1
@@ -134,7 +134,8 @@ struct tc_action_ops { (*get_psample_group)(const struct tc_action *a, tc_action_priv_destructor *destructor);int (*offload_act_setup)(struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind); +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack); };struct tc_action_net {
include/net/pkt_cls.h +4 -2
@@ -547,10 +547,12 @@ tcf_match_indev(struct sk_buff *skb, int ifindex) }int tc_setup_offload_action (struct flow_action *flow_action, -const struct tcf_exts *exts); +const struct tcf_exts *exts, +struct netlink_ext_ack *extack);void tc_cleanup_offload_action (struct flow_action *flow_action);int tc_setup_action (struct flow_action *flow_action, -struct tc_action *actions[]); +struct tc_action *actions[], +struct netlink_ext_ack *extack);int tc_setup_cb_call (struct tcf_block *block,enum tc_setup_type type,void *type_data,bool err_stop,bool rtnl_held);
net/sched/act_api.c +2 -2
@@ -195,7 +195,7 @@ static int offload_action_init(struct flow_offload_action *fl_action,if (act->ops->offload_act_setup) {spin_lock_bh (&act->tcfa_lock); err = act->ops->offload_act_setup (act, fl_action,NULL , - false); + false, extack);spin_unlock_bh (&act->tcfa_lock);return err; }
@@ -271,7 +271,7 @@ static int tcf_action_offload_add_ex(struct tc_action *action,if (err) goto fl_err; - err =tc_setup_action (&fl_action->action, actions); + err =tc_setup_action (&fl_action->action, actions, extack);if (err) {NL_SET_ERR_MSG_MOD (extack,"Failed to setup tc actions for offload" );
net/sched/act_csum.c +2 -1
@@ -696,7 +696,8 @@ static size_t tcf_csum_get_fill_size(const struct tc_action *act) }static int tcf_csum_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_ct.c +2 -1
@@ -1584,7 +1584,8 @@ static void tcf_stats_update(struct tc_action *a, u64 bytes, u64 packets, }static int tcf_ct_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_gact.c +2 -1
@@ -253,7 +253,8 @@ static size_t tcf_gact_get_fill_size(const struct tc_action *act) }static int tcf_gact_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_gate.c +2 -1
@@ -619,7 +619,8 @@ static int tcf_gate_get_entries(struct flow_action_entry *entry, }static int tcf_gate_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {int err;
net/sched/act_mirred.c +2 -1
@@ -460,7 +460,8 @@ static void tcf_offload_mirred_get_dev(struct flow_action_entry *entry, }static int tcf_mirred_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_mpls.c +2 -1
@@ -385,7 +385,8 @@ static int tcf_mpls_search(struct net *net, struct tc_action **a, u32 index) }static int tcf_mpls_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_pedit.c +2 -1
@@ -510,7 +510,8 @@ static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index) }static int tcf_pedit_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_police.c +2 -1
@@ -442,7 +442,8 @@ static int tcf_police_act_to_flow_act(int tc_act, u32 *extval) }static int tcf_police_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_sample.c +2 -1
@@ -291,7 +291,8 @@ static void tcf_offload_sample_get_group(struct flow_action_entry *entry, }static int tcf_sample_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_skbedit.c +2 -1
@@ -328,7 +328,8 @@ static size_t tcf_skbedit_get_fill_size(const struct tc_action *act) }static int tcf_skbedit_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/act_tunnel_key.c +2 -1
@@ -808,7 +808,8 @@ static int tcf_tunnel_encap_get_tunnel(struct flow_action_entry *entry,static int tcf_tunnel_key_offload_act_setup (struct tc_action *act,void *entry_data,u32 *index_inc, -bool bind) +bool bind, +struct netlink_ext_ack *extack) {int err;
net/sched/act_vlan.c +2 -1
@@ -369,7 +369,8 @@ static size_t tcf_vlan_get_fill_size(const struct tc_action *act) }static int tcf_vlan_offload_act_setup (struct tc_action *act,void *entry_data, -u32 *index_inc,bool bind) +u32 *index_inc,bool bind, +struct netlink_ext_ack *extack) {if (bind) {struct flow_action_entry *entry = entry_data;
net/sched/cls_api.c +10 -6
@@ -3513,11 +3513,13 @@ EXPORT_SYMBOL(tc_cleanup_offload_action);static int tc_setup_offload_act (struct tc_action *act,struct flow_action_entry *entry, -u32 *index_inc) +u32 *index_inc, +struct netlink_ext_ack *extack) {#ifdef CONFIG_NET_CLS_ACT if (act->ops->offload_act_setup) -return act->ops->offload_act_setup (act, entry, index_inc, true); +return act->ops->offload_act_setup (act, entry, index_inc, true, + extack);else return -EOPNOTSUPP ;#else
@@ -3526,7 +3528,8 @@ static int tc_setup_offload_act(struct tc_action *act, }int tc_setup_action (struct flow_action *flow_action, -struct tc_action *actions[]) +struct tc_action *actions[], +struct netlink_ext_ack *extack) {int i, j, index, err =0 ;struct tc_action *act;
@@ -3551,7 +3554,7 @@ int tc_setup_action(struct flow_action *flow_action, entry->hw_stats =tc_act_hw_stats (act->hw_stats); entry->hw_index = act->tcfa_index; index =0 ; - err =tc_setup_offload_act (act, entry, &index); + err =tc_setup_offload_act (act, entry, &index, extack);if (!err) j += index;else
@@ -3570,13 +3573,14 @@ int tc_setup_action(struct flow_action *flow_action, }int tc_setup_offload_action (struct flow_action *flow_action, -const struct tcf_exts *exts) +const struct tcf_exts *exts, +struct netlink_ext_ack *extack) {#ifdef CONFIG_NET_CLS_ACT if (!exts)return 0 ; -return tc_setup_action (flow_action, exts->actions); +return tc_setup_action (flow_action, exts->actions, extack);#else return 0 ;#endif
net/sched/cls_flower.c +4 -2
@@ -464,7 +464,8 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.rule->match.key = &f->mkey; cls_flower.classid = f->res.classid; - err =tc_setup_offload_action (&cls_flower.rule->action, &f->exts); + err =tc_setup_offload_action (&cls_flower.rule->action, &f->exts, + cls_flower.common.extack);if (err) {kfree (cls_flower.rule);if (skip_sw) {
@@ -2362,7 +2363,8 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb, cls_flower.rule->match.mask = &f->mask->key; cls_flower.rule->match.key = &f->mkey; - err =tc_setup_offload_action (&cls_flower.rule->action, &f->exts); + err =tc_setup_offload_action (&cls_flower.rule->action, &f->exts, + cls_flower.common.extack);if (err) {kfree (cls_flower.rule);if (tc_skip_sw (f->flags)) {
net/sched/cls_matchall.c +4 -2
@@ -97,7 +97,8 @@ static int mall_replace_hw_filter(struct tcf_proto *tp, cls_mall.command =TC_CLSMATCHALL_REPLACE ; cls_mall.cookie = cookie; - err =tc_setup_offload_action (&cls_mall.rule->action, &head->exts); + err =tc_setup_offload_action (&cls_mall.rule->action, &head->exts, + cls_mall.common.extack);if (err) {kfree (cls_mall.rule);mall_destroy_hw_filter (tp, head, cookie,NULL );
@@ -302,7 +303,8 @@ static int mall_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb, TC_CLSMATCHALL_REPLACE :TC_CLSMATCHALL_DESTROY ; cls_mall.cookie = (unsigned long )head; - err =tc_setup_offload_action (&cls_mall.rule->action, &head->exts); + err =tc_setup_offload_action (&cls_mall.rule->action, &head->exts, + cls_mall.common.extack);if (err) {kfree (cls_mall.rule);if (add &&tc_skip_sw (head->flags)) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 96/112 net/sched: act_police: Add extack messages for offload failure
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
[ Upstream commit b50e462bc22df4488ec04d85606646e3db5952b8 ]
For better error reporting to user space, add extack messages when police action offload fails.
Example:
# echo 1 > /sys/kernel/tracing/events/netlink/netlink_extack/enable
# tc filter add dev dummy0 ingress pref 1 proto all matchall skip_sw action police rate 100Mbit burst 10000 Error: cls_matchall: Failed to setup flow action. We have an error talking to the kernel
# cat /sys/kernel/tracing/trace_pipe
tc-182 [000] b..1. 21.592969: netlink_extack: msg=act_police: Offload not supported when conform/exceed action is "reclassify"
tc-182 [000] ..... 21.592982: netlink_extack: msg=cls_matchall: Failed to setup flow action# tc filter add dev dummy0 ingress pref 1 proto all matchall skip_sw action police rate 100Mbit burst 10000 conform-exceed drop/continue Error: cls_matchall: Failed to setup flow action. We have an error talking to the kernel
# cat /sys/kernel/tracing/trace_pipe
tc-184 [000] b..1. 38.882579: netlink_extack: msg=act_police: Offload not supported when conform/exceed action is "continue"
tc-184 [000] ..... 38.882593: netlink_extack: msg=cls_matchall: Failed to setup flow action--- net/sched/act_police.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
net/sched/act_police.c +14 -3
@@ -419,7 +419,8 @@ static int tcf_police_search(struct net *net, struct tc_action **a, u32 index)return tcf_idr_search (tn, a, index); } -static int tcf_police_act_to_flow_act (int tc_act,u32 *extval) +static int tcf_police_act_to_flow_act (int tc_act,u32 *extval, +struct netlink_ext_ack *extack) {int act_id = -EOPNOTSUPP ;
@@ -430,12 +431,20 @@ static int tcf_police_act_to_flow_act(int tc_act, u32 *extval) act_id =FLOW_ACTION_DROP ; else if (tc_act == TC_ACT_PIPE) act_id =FLOW_ACTION_PIPE ; + else if (tc_act == TC_ACT_RECLASSIFY) + NL_SET_ERR_MSG_MOD(extack, "Offload not supported when conform/exceed action is \"reclassify\""); + else + NL_SET_ERR_MSG_MOD(extack, "Unsupported conform/exceed action offload"); }else if (TC_ACT_EXT_CMP (tc_act,TC_ACT_GOTO_CHAIN )) { act_id =FLOW_ACTION_GOTO ; *extval = tc_act &TC_ACT_EXT_VAL_MASK ; }else if (TC_ACT_EXT_CMP (tc_act,TC_ACT_JUMP )) { act_id =FLOW_ACTION_JUMP ; *extval = tc_act &TC_ACT_EXT_VAL_MASK ; + }else if (tc_act ==TC_ACT_UNSPEC ) { +NL_SET_ERR_MSG_MOD (extack,"Offload not supported when conform/exceed action is \"continue\"" ); + }else { +NL_SET_ERR_MSG_MOD (extack,"Unsupported conform/exceed action offload" ); }return act_id;
@@ -467,14 +476,16 @@ static int tcf_police_offload_act_setup(struct tc_action *act, void *entry_data, entry->police.mtu =tcf_police_tcfp_mtu (act); act_id =tcf_police_act_to_flow_act (police->tcf_action, - &entry->police.exceed.extval); + &entry->police.exceed.extval, + extack);if (act_id <0 )return act_id; entry->police.exceed.act_id = act_id; act_id =tcf_police_act_to_flow_act (p->tcfp_result, - &entry->police.notexceed.extval); + &entry->police.notexceed.extval, + extack);if (act_id <0 )return act_id;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 97/112 net/sched: act_police: allow continue action offload
In reply to Greg Kroah-HartmanFrom: Vlad Buslov <[email protected]>
[ Upstream commit 052f744f44462cc49b88a125b0f7b93a9e47a9dd ]
Offloading police with action TC_ACT_UNSPEC was erroneously disabled even though it was supported by mlx5 matchall offload implementation, which didn't verify the action type but instead assumed that any single police action attached to matchall classifier is a 'continue' action. Lack of action type check made it non-obvious what mlx5 matchall implementation actually supports and caused implementers and reviewers of referenced commits to disallow it as a part of improved validation code.
--- include/net/flow_offload.h | 1 + net/sched/act_police.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
include/net/flow_offload.h +1 -0
@@ -152,6 +152,7 @@ enum flow_action_id {FLOW_ACTION_PIPE ,FLOW_ACTION_VLAN_PUSH_ETH ,FLOW_ACTION_VLAN_POP_ETH , +FLOW_ACTION_CONTINUE , NUM_FLOW_ACTIONS, };
net/sched/act_police.c +1 -1
@@ -442,7 +442,7 @@ static int tcf_police_act_to_flow_act(int tc_act, u32 *extval, act_id =FLOW_ACTION_JUMP ; *extval = tc_act &TC_ACT_EXT_VAL_MASK ; }else if (tc_act ==TC_ACT_UNSPEC ) { -NL_SET_ERR_MSG_MOD (extack,"Offload not supported when conform/exceed action is \"continue\"" ); + act_id =FLOW_ACTION_CONTINUE ; }else {NL_SET_ERR_MSG_MOD (extack,"Unsupported conform/exceed action offload" ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 98/112 dmaengine: imx-sdma: Allow imx8m for imx7 FW revs
In reply to Greg Kroah-HartmanFrom: Peter Robinson <[email protected]>
commit a7cd3cf0b2e5aaacfe5e02c472bd28e98e640be7 upstream.
The revision of the imx-sdma IP that is in the i.MX8M series is the same is that as that in the i.MX7 series but the imx7d MODULE_FIRMWARE directive is wrapped in a condiditional which means it's not defined when built for aarch64 SOC_IMX8M platforms and hence you get the following errors when the driver loads on imx8m devices:
imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 imx-sdma 302c0000.dma-controller: external firmware not found, using ROM firmware
Add the SOC_IMX8M into the check so the firmware can load on i.MX8.
--- drivers/dma/imx-sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/imx-sdma.c +1 -1
@@ -2280,7 +2280,7 @@ MODULE_DESCRIPTION("i.MX SDMA driver");#if IS_ENABLED (CONFIG_SOC_IMX6Q )MODULE_FIRMWARE ("imx/sdma/sdma-imx6q.bin" );#endif -#if IS_ENABLED (CONFIG_SOC_IMX7D ) +#if IS_ENABLED (CONFIG_SOC_IMX7D ) ||IS_ENABLED (CONFIG_SOC_IMX8M )MODULE_FIRMWARE ("imx/sdma/sdma-imx7d.bin" );#endif MODULE_LICENSE ("GPL" );
Greg Kroah-Hartman
maintainerPATCH 99/112 dmaengine: imx-sdma: only restart cyclic channel when enabled
In reply to Greg Kroah-HartmanFrom: Sascha Hauer <[email protected]>
commit 09f7b80fac3e588b282ad26aabd7336d7d293efd upstream.
An interrupt for a channel might be pending even after struct dma_device::device_terminate_all has been called. In that case the recently introduced warning message "restart cyclic channel..." triggers and the channel will be restarted. This is not desired as the channel has just been stopped. Only restart the channel when we still have a descriptor set for it (which will be set to NULL in sdma_terminate_all()).
--- drivers/dma/imx-sdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/imx-sdma.c +1 -1
@@ -872,7 +872,7 @@ static void sdma_update_channel_loop(str* SDMA stops cyclic channel when DMA request triggers a channel and no SDMA * owned buffer is available (i.e. BD_DONE was set too late). */ -if (!is_sdma_channel_enabled (sdmac->sdma, sdmac->channel)) { +if (sdmac->desc && !is_sdma_channel_enabled (sdmac->sdma, sdmac->channel)) {dev_warn (sdmac->sdma->dev,"restart cyclic channel %d\n" , sdmac->channel);sdma_enable_channel (sdmac->sdma, sdmac->channel); }
Greg Kroah-Hartman
maintainerPATCH 100/112 misc: rtsx_usb: fix use of dma mapped buffer for usb bulk transfer
In reply to Greg Kroah-HartmanFrom: Shuah Khan <[email protected]>
commit eb7f8e28420372787933eec079735c35034bda7d upstream.
rtsx_usb driver allocates coherent dma buffer for urb transfers. This buffer is passed to usb_bulk_msg() and usb core tries to map already mapped buffer running into a dma mapping error.
xhci_hcd 0000:01:00.0: rejecting DMA map of vmalloc memory
WARNING: CPU: 1 PID: 279 at include/linux/dma-mapping.h:326 usb_ hcd_map_urb_for_dma+0x7d6/0x820
...
xhci_map_urb_for_dma+0x291/0x4e0 usb_hcd_submit_urb+0x199/0x12b0 ... usb_submit_urb+0x3b8/0x9e0 usb_start_wait_urb+0xe3/0x2d0 usb_bulk_msg+0x115/0x240 rtsx_usb_transfer_data+0x185/0x1a8 [rtsx_usb] rtsx_usb_send_cmd+0xbb/0x123 [rtsx_usb] rtsx_usb_write_register+0x12c/0x143 [rtsx_usb] rtsx_usb_probe+0x226/0x4b2 [rtsx_usb]
Fix it to use kmalloc() to get DMA-able memory region instead.
--- drivers/misc/cardreader/rtsx_usb.c | 13 +++++++------ include/linux/rtsx_usb.h | 1 - 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/misc/cardreader/rtsx_usb.c +7 -6
@@ -631,8 +631,7 @@ static int rtsx_usb_probe(struct usb_int ucr->pusb_dev = usb_dev; - ucr->iobuf =usb_alloc_coherent (ucr->pusb_dev,IOBUF_SIZE , -GFP_KERNEL , &ucr->iobuf_dma); + ucr->iobuf =kmalloc (IOBUF_SIZE ,GFP_KERNEL );if (!ucr->iobuf)return -ENOMEM ;
@@ -668,8 +667,9 @@ static int rtsx_usb_probe(struct usb_int out_init_fail:usb_set_intfdata (ucr->pusb_intf,NULL ); -usb_free_coherent (ucr->pusb_dev,IOBUF_SIZE , ucr->iobuf, - ucr->iobuf_dma); +kfree (ucr->iobuf); + ucr->iobuf =NULL ; + ucr->cmd_buf = ucr->rsp_buf =NULL ;return ret; }
@@ -682,8 +682,9 @@ static void rtsx_usb_disconnect(struct umfd_remove_devices (&intf->dev);usb_set_intfdata (ucr->pusb_intf,NULL ); -usb_free_coherent (ucr->pusb_dev,IOBUF_SIZE , ucr->iobuf, - ucr->iobuf_dma); +kfree (ucr->iobuf); + ucr->iobuf =NULL ; + ucr->cmd_buf = ucr->rsp_buf =NULL ; }#ifdef CONFIG_PM
include/linux/rtsx_usb.h +0 -1
@@ -55,7 +55,6 @@ struct rtsx_ucr {struct usb_interface *pusb_intf;struct usb_sg_request current_sg;unsigned char *iobuf; -dma_addr_t iobuf_dma;struct timer_list sg_timer;struct mutex dev_mutex;
Greg Kroah-Hartman
maintainerPATCH 101/112 misc: rtsx_usb: use separate command and response buffers
In reply to Greg Kroah-HartmanFrom: Shuah Khan <[email protected]>
commit 3776c78559853fd151be7c41e369fd076fb679d5 upstream.
rtsx_usb uses same buffer for command and response. There could be a potential conflict using the same buffer for both especially if retries and timeouts are involved.
Use separate command and response buffers to avoid conflicts.
--- drivers/misc/cardreader/rtsx_usb.c | 26 +++++++++++++++++--------- include/linux/rtsx_usb.h | 1 - 2 files changed, 17 insertions(+), 10 deletions(-)
drivers/misc/cardreader/rtsx_usb.c +17 -9
@@ -631,15 +631,18 @@ static int rtsx_usb_probe(struct usb_int ucr->pusb_dev = usb_dev; - ucr->iobuf =kmalloc (IOBUF_SIZE ,GFP_KERNEL ); -if (!ucr->iobuf) + ucr->cmd_buf =kmalloc (IOBUF_SIZE ,GFP_KERNEL ); +if (!ucr->cmd_buf)return -ENOMEM ; + ucr->rsp_buf =kmalloc (IOBUF_SIZE ,GFP_KERNEL ); +if (!ucr->rsp_buf) + goto out_free_cmd_buf; +usb_set_intfdata (intf, ucr); ucr->vendor_id = id->idVendor; ucr->product_id = id->idProduct; - ucr->cmd_buf = ucr->rsp_buf = ucr->iobuf;mutex_init (&ucr->dev_mutex);
@@ -667,9 +670,11 @@ static int rtsx_usb_probe(struct usb_int out_init_fail:usb_set_intfdata (ucr->pusb_intf,NULL ); -kfree (ucr->iobuf); - ucr->iobuf =NULL ; - ucr->cmd_buf = ucr->rsp_buf =NULL ; +kfree (ucr->rsp_buf); + ucr->rsp_buf =NULL ; +out_free_cmd_buf: +kfree (ucr->cmd_buf); + ucr->cmd_buf =NULL ;return ret; }
@@ -682,9 +687,12 @@ static void rtsx_usb_disconnect(struct umfd_remove_devices (&intf->dev);usb_set_intfdata (ucr->pusb_intf,NULL ); -kfree (ucr->iobuf); - ucr->iobuf =NULL ; - ucr->cmd_buf = ucr->rsp_buf =NULL ; + +kfree (ucr->cmd_buf); + ucr->cmd_buf =NULL ; + +kfree (ucr->rsp_buf); + ucr->rsp_buf =NULL ; }#ifdef CONFIG_PM
include/linux/rtsx_usb.h +0 -1
@@ -54,7 +54,6 @@ struct rtsx_ucr {struct usb_device *pusb_dev;struct usb_interface *pusb_intf;struct usb_sg_request current_sg; -unsigned char *iobuf;struct timer_list sg_timer;struct mutex dev_mutex;
Greg Kroah-Hartman
maintainerPATCH 102/112 misc: rtsx_usb: set return value in rsp_buf alloc err path
In reply to Greg Kroah-HartmanFrom: Shuah Khan <[email protected]>
commit 2cd37c2e72449a7add6da1183d20a6247d6db111 upstream.
Set return value in rsp_buf alloc error path before going to error handling.
drivers/misc/cardreader/rtsx_usb.c:639:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (!ucr->rsp_buf)
^~~~~~~~~~~~~
drivers/misc/cardreader/rtsx_usb.c:678:9: note: uninitialized use occurs here
return ret;
^~~
drivers/misc/cardreader/rtsx_usb.c:639:2: note: remove the 'if' if its condition is always false
if (!ucr->rsp_buf)
^~~~~~~~~~~~~~~~~~
drivers/misc/cardreader/rtsx_usb.c:622:9: note: initialize the variable 'ret' to silence this warning
int ret;
^
= 0--- drivers/misc/cardreader/rtsx_usb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/misc/cardreader/rtsx_usb.c +3 -1
@@ -636,8 +636,10 @@ static int rtsx_usb_probe(struct usb_intreturn -ENOMEM ; ucr->rsp_buf =kmalloc (IOBUF_SIZE ,GFP_KERNEL ); -if (!ucr->rsp_buf) +if (!ucr->rsp_buf) { + ret = -ENOMEM ; goto out_free_cmd_buf; + }usb_set_intfdata (intf, ucr);
Greg Kroah-Hartman
maintainerPATCH 103/112 dmaengine: dw-axi-dmac: Fix RMW on channel suspend register
In reply to Greg Kroah-HartmanFrom: Emil Renner Berthing <[email protected]>
commit 49db68d45bdcad06e28a420d5d911e4178389666 upstream.
When the DMA is configured for more than 8 channels the bits controlling suspend moves to another register. However when adding support for this the new register would be completely overwritten in one case and overwritten with values from the old register in another case.
Found by comparing the parallel implementation of more than 8 channel support for the StarFive JH7100 SoC by Samin.
--- drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +5 -3
@@ -1164,8 +1164,9 @@ static int dma_chan_pause(struct dma_chaBIT (chan->id) <<DMAC_CHAN_SUSP_WE_SHIFT ;axi_dma_iowrite32 (chan->chip,DMAC_CHEN , val); }else { - val =BIT (chan->id) <<DMAC_CHAN_SUSP2_SHIFT | -BIT (chan->id) <<DMAC_CHAN_SUSP2_WE_SHIFT ; + val =axi_dma_ioread32 (chan->chip,DMAC_CHSUSPREG ); + val |=BIT (chan->id) <<DMAC_CHAN_SUSP2_SHIFT | +BIT (chan->id) <<DMAC_CHAN_SUSP2_WE_SHIFT ;axi_dma_iowrite32 (chan->chip,DMAC_CHSUSPREG , val); }
@@ -1190,12 +1191,13 @@ static inline void axi_chan_resume(struc {u32 val; - val =axi_dma_ioread32 (chan->chip,DMAC_CHEN );if (chan->chip->dw->hdata->reg_map_8_channels) { + val =axi_dma_ioread32 (chan->chip,DMAC_CHEN ); val &= ~(BIT (chan->id) <<DMAC_CHAN_SUSP_SHIFT ); val |= (BIT (chan->id) <<DMAC_CHAN_SUSP_WE_SHIFT );axi_dma_iowrite32 (chan->chip,DMAC_CHEN , val); }else { + val =axi_dma_ioread32 (chan->chip,DMAC_CHSUSPREG ); val &= ~(BIT (chan->id) <<DMAC_CHAN_SUSP2_SHIFT ); val |= (BIT (chan->id) <<DMAC_CHAN_SUSP2_WE_SHIFT );axi_dma_iowrite32 (chan->chip,DMAC_CHSUSPREG , val);
Greg Kroah-Hartman
maintainerPATCH 104/112 dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo
In reply to Greg Kroah-HartmanFrom: Samuel Holland <[email protected]>
commit 607a48c78e6b427b0b684d24e61c19e846ad65d6 upstream.
The conditional block for variants with a second clock should have set minItems, not maxItems, which was already 2. Since clock-names requires two items, this typo should not have caused any problems.
--- Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml +1 -1
@@ -64,7 +64,7 @@ if: then: properties: clocks: - maxItems: 2 + minItems: 2 required: - clock-names
Greg Kroah-Hartman
maintainerPATCH 105/112 ida: dont use BUG_ON() for debugging
In reply to Greg Kroah-HartmanFrom: Linus Torvalds <[email protected]>
commit fc82bbf4dede758007763867d0282353c06d1121 upstream.
This is another old BUG_ON() that just shouldn't exist (see also commita382f8fee42c: "signal handling: don't use BUG_ON() for debugging").
In fact, as Matthew Wilcox points out, this condition shouldn't really even result in a warning, since a negative id allocation result is just a normal allocation failure:
"I wonder if we should even warn here -- sure, the caller is trying to
free something that wasn't allocated, but we don't warn for kfree(NULL)"
and goes on to point out how that current error check is only causing people to unnecessarily do their own index range checking before freeing it.
This was noted by Itay Iellin, because the bluetooth HCI socket cookie code does *not* do that range checking, and ends up just freeing the error case too, triggering the BUG_ON().
The HCI code requires CAP_NET_RAW, and seems to just result in an ugly splat, but there really is no reason to BUG_ON() here, and we have generally striven for allocation models where it's always ok to just do
free(alloc());
even if the allocation were to fail for some random reason (usually obviously that "random" reason being some resource limit).
--- lib/idr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/idr.c +2 -1
@@ -491,7 +491,8 @@ void ida_free(struct ida *ida, unsignedstruct ida_bitmap *bitmap;unsigned long flags; -BUG_ON ((int )id <0 ); +if ((int )id <0 ) +return ;xas_lock_irqsave (&xas, flags); bitmap =xas_load (&xas);
Greg Kroah-Hartman
maintainerPATCH 106/112 dmaengine: pl330: Fix lockdep warning about non-static key
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit b64b3b2f1d81f83519582e1feee87d77f51f5f17 upstream.
The DEFINE_SPINLOCK() macro shouldn't be used for dynamically allocated spinlocks. The lockdep warns about this and disables locking validator. Fix the warning by making lock static.
INFO: trying to register non-static key.
The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator.
Hardware name: Radxa ROCK Pi 4C (DT) Call trace: dump_backtrace.part.0+0xcc/0xe0 show_stack+0x18/0x6c dump_stack_lvl+0x8c/0xb8 dump_stack+0x18/0x34 register_lock_class+0x4a8/0x4cc __lock_acquire+0x78/0x20cc lock_acquire.part.0+0xe0/0x230 lock_acquire+0x68/0x84 _raw_spin_lock_irqsave+0x84/0xc4 add_desc+0x44/0xc0 pl330_get_desc+0x15c/0x1d0 pl330_prep_dma_cyclic+0x100/0x270 snd_dmaengine_pcm_trigger+0xec/0x1c0 dmaengine_pcm_trigger+0x18/0x24 ...
--- drivers/dma/pl330.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/pl330.c +1 -1
@@ -2589,7 +2589,7 @@ static struct dma_pl330_desc *pl330_get_/* If the DMAC pool is empty, alloc new */ if (!desc) { -DEFINE_SPINLOCK (lock); +static DEFINE_SPINLOCK (lock);LIST_HEAD (pool);if (!add_desc (&pool, &lock,GFP_ATOMIC ,1 ))
Greg Kroah-Hartman
maintainerPATCH 107/112 dmaengine: lgm: Fix an error handling path in intel_ldma_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
commit 1dbe67b9faea0bc340cce894018076679c16cb71 upstream.
ldma_clk_disable() calls both:
clk_disable_unprepare(d->core_clk); reset_control_assert(d->rst);
So, should devm_reset_control_get_optional() fail, core_clk should not be prepare_enable'd before it, otherwise it will never be disable_unprepare'd.
Reorder the code to handle the error handling path as expected.
--- drivers/dma/lgm/lgm-dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/dma/lgm/lgm-dma.c +2 -1
@@ -1593,11 +1593,12 @@ static int intel_ldma_probe(struct platf d->core_clk =devm_clk_get_optional (dev,NULL );if (IS_ERR (d->core_clk))return PTR_ERR (d->core_clk); -clk_prepare_enable (d->core_clk); d->rst =devm_reset_control_get_optional (dev,NULL );if (IS_ERR (d->rst))return PTR_ERR (d->rst); + +clk_prepare_enable (d->core_clk);reset_control_deassert (d->rst); ret =devm_add_action_or_reset (dev, ldma_clk_disable, d);
Greg Kroah-Hartman
maintainerPATCH 108/112 dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit 3770d92bd5237d686e49da7b2fb86f53ee6ed259 upstream.
It seems that it is valid to have less than the requested number of descriptors. But what is not valid and leads to subsequent errors is to have zero descriptors. In that case, abort the probing.
--- drivers/dma/at_xdmac.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/dma/at_xdmac.c +5 -0
@@ -1893,6 +1893,11 @@ static int at_xdmac_alloc_chan_resourcesfor (i =0 ; i < init_nr_desc_per_channel; i++) { desc =at_xdmac_alloc_desc (chan,GFP_KERNEL );if (!desc) { +if (i ==0 ) { +dev_warn (chan2dev (chan), +"can't allocate any descriptors\n" ); +return -EIO ; + }dev_warn (chan2dev (chan),"only %d descriptors have been allocated\n" , i);break ;
Greg Kroah-Hartman
maintainerPATCH 109/112 dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit c132fe78ad7b4ce8b5d49a501a15c29d08eeb23a upstream.
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not needed anymore.
Add missing of_node_put() in to fix this.
--- drivers/dma/ti/dma-crossbar.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/ti/dma-crossbar.c +1 -0
@@ -268,6 +268,7 @@ static void *ti_dra7_xbar_route_allocatemutex_unlock (&xbar->mutex);dev_err (&pdev->dev,"Run out of free DMA requests\n" );kfree (map); +of_node_put (dma_spec->np);return ERR_PTR (-ENOMEM ); }set_bit (map->xbar_out, xbar->dma_inuse);
Greg Kroah-Hartman
maintainerPATCH 110/112 dmaengine: qcom: bam_dma: fix runtime PM underflow
In reply to Greg Kroah-HartmanFrom: Caleb Connolly <[email protected]>
commit 0ac9c3dd0d6fe293cd5044cfad10bec27d171e4e upstream.
Commit dbad41e7bb5f ("dmaengine: qcom: bam_dma: check if the runtime pm enabled") caused unbalanced pm_runtime_get/put() calls when the bam is controlled remotely. This commit reverts it and just enables pm_runtime in all cases, the clk_* functions already just nop when the clock is NULL.
Also clean up a bit by removing unnecessary bamclk null checks.
--- drivers/dma/qcom/bam_dma.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-)
drivers/dma/qcom/bam_dma.c +11 -28
@@ -558,14 +558,6 @@ static int bam_alloc_chan(struct dma_chareturn 0 ; } -static int bam_pm_runtime_get_sync (struct device *dev) -{ -if (pm_runtime_enabled (dev)) -return pm_runtime_get_sync (dev); - -return 0 ; -} -/** * bam_free_chan - Frees dma resources associated with specific channel * @chan: specified channel
@@ -581,7 +573,7 @@ static void bam_free_chan(struct dma_chaunsigned long flags;int ret; - ret =bam_pm_runtime_get_sync (bdev->dev); + ret =pm_runtime_get_sync (bdev->dev);if (ret <0 )return ;
@@ -784,7 +776,7 @@ static int bam_pause(struct dma_chan *chunsigned long flag;int ret; - ret =bam_pm_runtime_get_sync (bdev->dev); + ret =pm_runtime_get_sync (bdev->dev);if (ret <0 )return ret;
@@ -810,7 +802,7 @@ static int bam_resume(struct dma_chan *cunsigned long flag;int ret; - ret =bam_pm_runtime_get_sync (bdev->dev); + ret =pm_runtime_get_sync (bdev->dev);if (ret <0 )return ret;
@@ -919,7 +911,7 @@ static irqreturn_t bam_dma_irq(int irq,if (srcs &P_IRQ )tasklet_schedule (&bdev->task); - ret =bam_pm_runtime_get_sync (bdev->dev); + ret =pm_runtime_get_sync (bdev->dev);if (ret <0 )return IRQ_NONE ;
@@ -1037,7 +1029,7 @@ static void bam_start_dma(struct bam_chaif (!vd)return ; - ret =bam_pm_runtime_get_sync (bdev->dev); + ret =pm_runtime_get_sync (bdev->dev);if (ret <0 )return ;
@@ -1374,11 +1366,6 @@ static int bam_dma_probe(struct platformif (ret) goto err_unregister_dma; -if (!bdev->bamclk) { -pm_runtime_disable (&pdev->dev); -return 0 ; - } -pm_runtime_irq_safe (&pdev->dev);pm_runtime_set_autosuspend_delay (&pdev->dev,BAM_DMA_AUTOSUSPEND_DELAY );pm_runtime_use_autosuspend (&pdev->dev);
@@ -1462,10 +1449,8 @@ static int __maybe_unused bam_dma_suspen {struct bam_device *bdev =dev_get_drvdata (dev); -if (bdev->bamclk) { -pm_runtime_force_suspend (dev); -clk_unprepare (bdev->bamclk); - } +pm_runtime_force_suspend (dev); +clk_unprepare (bdev->bamclk);return 0 ; }
@@ -1475,13 +1460,11 @@ static int __maybe_unused bam_dma_resumestruct bam_device *bdev =dev_get_drvdata (dev);int ret; -if (bdev->bamclk) { - ret =clk_prepare (bdev->bamclk); -if (ret) -return ret; + ret =clk_prepare (bdev->bamclk); +if (ret) +return ret; -pm_runtime_force_resume (dev); - } +pm_runtime_force_resume (dev);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 111/112 dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
commit 615a4bfc426e11dba05c2cf343f9ac752fb381d2 upstream.
of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore.
--- drivers/dma/ti/dma-crossbar.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/dma/ti/dma-crossbar.c +4 -0
@@ -245,6 +245,7 @@ static void *ti_dra7_xbar_route_allocateif (dma_spec->args[0 ] >= xbar->xbar_requests) {dev_err (&pdev->dev,"Invalid XBAR request number: %d\n" , dma_spec->args[0 ]); +put_device (&pdev->dev);return ERR_PTR (-EINVAL ); }
@@ -252,12 +253,14 @@ static void *ti_dra7_xbar_route_allocate dma_spec->np =of_parse_phandle (ofdma->of_node,"dma-masters" ,0 );if (!dma_spec->np) {dev_err (&pdev->dev,"Can't get DMA master\n" ); +put_device (&pdev->dev);return ERR_PTR (-EINVAL ); } map =kzalloc (sizeof (*map),GFP_KERNEL );if (!map) {of_node_put (dma_spec->np); +put_device (&pdev->dev);return ERR_PTR (-ENOMEM ); }
@@ -269,6 +272,7 @@ static void *ti_dra7_xbar_route_allocatedev_err (&pdev->dev,"Run out of free DMA requests\n" );kfree (map);of_node_put (dma_spec->np); +put_device (&pdev->dev);return ERR_PTR (-ENOMEM ); }set_bit (map->xbar_out, xbar->dma_inuse);
Greg Kroah-Hartman
maintainerPATCH 112/112 dmaengine: idxd: force wq context cleanup on device disable path
In reply to Greg Kroah-HartmanFrom: Dave Jiang <[email protected]>
commit 44c4237cf3436bda2b185ff728123651ad133f69 upstream.
Testing shown that when a wq mode is setup to be dedicated and then torn down and reconfigured to shared, the wq configured end up being dedicated anyays. The root cause is when idxd_device_wqs_clear_state() gets called during idxd_driver removal, idxd_wq_disable_cleanup() does not get called vs when the wq driver is removed first. The check of wq state being "enabled" causes the cleanup to be bypassed. However, idxd_driver->remove() releases all wq drivers. So the wqs goes to "disabled" state and will never be "enabled". By that point, the driver has no idea if the wq was previously configured or clean. So force call idxd_wq_disable_cleanup() on all wqs always to make sure everything gets cleaned up.
--- drivers/dma/idxd/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/dma/idxd/device.c +1 -4
@@ -698,10 +698,7 @@ static void idxd_device_wqs_clear_state(for (i =0 ; i < idxd->max_wqs; i++) {struct idxd_wq *wq = idxd->wqs[i]; -if (wq->state ==IDXD_WQ_ENABLED ) { -idxd_wq_disable_cleanup (wq); - wq->state =IDXD_WQ_DISABLED ; - } +idxd_wq_disable_cleanup (wq);idxd_wq_device_reset_cleanup (wq); } }
Quoted 1 line · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release.
Running on a variety of machines & various configurations (server, desktop, laptop)) without any issues. \o/
Thanks!
Holger
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.18.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.18.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 489 pass: 489 fail: 0
Guenter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.18.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.18.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro’s test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.18.11-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.18.y
* git commit: 3c032a4d5696ca200b763ef36a7e3f8821f830ba
* git describe: v5.18.10-113-g3c032a4d5696
* test details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.18.y/build/v5.18.10-113-g3c032a4d5696
## Test Regressions (compared to v5.18.10)
No test regressions found.
## Metric Regressions (compared to v5.18.10)
No metric regressions found.
## Test Fixes (compared to v5.18.10)
No test fixes found.
## Metric Fixes (compared to v5.18.10)
No metric fixes found.
## Test result summary
total: 134124, pass: 122462, fail: 854, skip: 10112, xfail: 696
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 313 total, 310 passed, 3 failed
* arm64: 68 total, 68 passed, 0 failed
* i386: 57 total, 50 passed, 7 failed
* mips: 53 total, 50 passed, 3 failed
* parisc: 14 total, 14 passed, 0 failed
* powerpc: 65 total, 54 passed, 11 failed
* riscv: 32 total, 27 passed, 5 failed
* s390: 23 total, 20 passed, 3 failed
* sh: 26 total, 24 passed, 2 failed
* sparc: 14 total, 14 passed, 0 failed
* x86_64: 62 total, 60 passed, 2 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers-dma-buf
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-filesystems-binderfs
* kselftest-firmware
* kselftest-fpu
* kselftest-gpio
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-lib
* kselftest-membarrier
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* log-parser-boot
* log-parser-test
* ltp-cap_bounds
* ltp-commands
* ltp-containers
* ltp-controllers
* ltp-cpuhotplug
* ltp-crypto
* ltp-cve
* ltp-dio
* ltp-fcntl-locktests
* ltp-filecaps
* ltp-fs
* ltp-fs_bind
* ltp-fs_perms_simple
* ltp-fsx
* ltp-hugetlb
* ltp-io
* ltp-ipc
* ltp-math
* ltp-mm
* ltp-nptl
* ltp-open-posix-tests
* ltp-pty
* ltp-sched
* ltp-securebits
* ltp-smoke
* ltp-syscalls
* ltp-tracing
* network-basic-tests
* packetdrill
* perf
* perf/Zstd-perf.data-compression
* rcutorture
* ssuite
* v4l2-compliance
* vdso
--
Linaro LKFT
https://lkft.linaro.org
Hey Greg,
Ran tests and boot tested on my system, no regression found
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
Hi Greg,
5.18.11-rc1 tested.
Run tested on:
- Allwinner H6 (Tanix TX6)
- Intel Tiger Lake x86_64 (nuc11 i7-1165G7)
In addition - build tested for:
- Allwinner A64
- Allwinner H3
- Allwinner H5
- NXP iMX6
- NXP iMX8
- Qualcomm Dragonboard
- Rockchip RK3288
- Rockchip RK3328
- Rockchip RK3399pro
- Samsung Exynos
--
Rudi
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.11-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.18.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.18:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
130 tests: 130 pass, 0 failLinux version: 5.18.11-rc1-g3c032a4d5696
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Jon
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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.
Successfully cross-compiled for arm64 (bcm2711_defconfig, GCC 10.2.0) and powerpc (ps3_defconfig, GCC 12.1.0).
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Hi Greg,
Quoted 7 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.18.11 release. There are 112 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, 13 Jul 2022 09:05:28 +0000. Anything received after that time might be too late.
Build test (gcc version 12.1.1 20220706):
mips: 59 configs -> no failure
arm: 99 configs -> no failure
arm64: 3 configs -> no failurex86_64: 4 configs -> no failure
alpha allmodconfig -> no failure
csky allmodconfig -> no failure
powerpc allmodconfig -> no failure
riscv allmodconfig -> no failure
s390 allmodconfig -> no failure
xtensa allmodconfig -> no failure
Boot test:x86_64: Booted on my test laptop. No regression.x86_64: Booted on qemu. No regression. [1]
arm64: Booted on rpi4b (4GB model). No regression. [2]
mips: Booted on ci20 board. No regression. [3]
[1]. https://openqa.qa.codethink.co.uk/tests/1492
[2]. https://openqa.qa.codethink.co.uk/tests/1499
[3]. https://openqa.qa.codethink.co.uk/tests/1501
--
Regards
Sudip