5.10.14-rc1 review
Subsystems (2)
Greg Kroah-Hartman
maintainercover 5.10.14-rc1 review
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +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.10.14-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.10.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.10.14-rc1
Peter Zijlstra <[email protected]>
workqueue: Restrict affinity change to rescuer
Peter Zijlstra <[email protected]>
kthread: Extract KTHREAD_IS_PER_CPU
Gayatri Kammela <[email protected]>
x86/cpu: Add another Alder Lake CPU to the Intel family
Josh Poimboeuf <[email protected]>
objtool: Don't fail the kernel build on fatal errors
Oded Gabbay <[email protected]>
habanalabs: disable FW events on device removal
Oded Gabbay <[email protected]>
habanalabs: fix backward compatibility of idle check
Ofir Bitton <[email protected]>
habanalabs: zero pci counters packet before submit to FW
Vladimir Stempen <[email protected]>
drm/amd/display: Fixed corruptions on HPDRX link loss restore
Nicholas Kazlauskas <[email protected]>
drm/amd/display: Use hardware sequencer functions for PG control
Bing Guo <[email protected]>
drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping
Aric Cyr <[email protected]>
drm/amd/display: Allow PSTATE chnage when no displays are enabled
Jake Wang <[email protected]>
drm/amd/display: Update dram_clock_change_latency for DCN2.1
Michael Ellerman <[email protected]>
selftests/powerpc: Only test lwm/stmw on big endian
Jeannie Stevenson <[email protected]>
platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control
Chaitanya Kulkarni <[email protected]>
nvmet: set right status on error in id-ns handler
Klaus Jensen <[email protected]>
nvme-pci: allow use of cmb on v1.4 controllers
Chao Leng <[email protected]>
nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
Chao Leng <[email protected]>
nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
Revanth Rajashekar <[email protected]>
nvme: check the PRINFO bit before deciding the host buffer length
lianzhi chang <[email protected]>
udf: fix the problem that the disc content is not displayed
Sowjanya Komatineni <[email protected]>
i2c: tegra: Create i2c_writesl_vi() to use with VI I2C for filling TX FIFO
Kai-Chuan Hsieh <[email protected]>
ALSA: hda: Add Cometlake-R PCI ID
Brian King <[email protected]>
scsi: ibmvfc: Set default timeout to avoid crash during migration
Felix Fietkau <[email protected]>
mac80211: fix encryption key selection for 802.3 xmit
Felix Fietkau <[email protected]>
mac80211: fix fast-rx encryption check
Shayne Chen <[email protected]>
mac80211: fix incorrect strlen of .write in debugfs
Josh Poimboeuf <[email protected]>
objtool: Don't add empty symbols to the rbtree
Kai Vehmanen <[email protected]>
ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid
Kai-Heng Feng <[email protected]>
ASoC: SOF: Intel: hda: Resume codec to do jack detection
Dinghao Liu <[email protected]>
scsi: fnic: Fix memleak in vnic_dev_init_devcmd2
Javed Hasan <[email protected]>
scsi: libfc: Avoid invoking response handler twice if ep is already completed
Martin Wilck <[email protected]>
scsi: scsi_transport_srp: Don't block target in failfast state
Peter Zijlstra <[email protected]>
x86: __always_inline __{rd,wr}msr()Peter Zijlstra <[email protected]>
locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP
Oded Gabbay <[email protected]>
habanalabs: fix dma_addr passed to dma_mmap_coherent
Arnold Gozum <[email protected]>
platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
Hans de Goede <[email protected]>
platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
Srinivas Pandruvada <[email protected]>
tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency
Srinivas Pandruvada <[email protected]>
tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency
Tony Lindgren <[email protected]>
phy: cpcap-usb: Fix warning for missing regulator_disable
Nadav Amit <[email protected]>
iommu/vt-d: Do not use flush-queue when caching-mode is on
Nick Desaulniers <[email protected]>
ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD
Mike Rapoport <[email protected]>
Revert "x86/setup: don't remove E820_TYPE_RAM for pfn 0"
Catalin Marinas <[email protected]>
arm64: Do not pass tagged addresses to __is_lm_address()
Vincenzo Frascino <[email protected]>
arm64: Fix kernel address detection of __is_lm_address()
Robin Murphy <[email protected]>
arm64: dts: meson: Describe G12b GPU as coherent
Robin Murphy <[email protected]>
drm/panfrost: Support cache-coherent integrations
Robin Murphy <[email protected]>
iommu/io-pgtable-arm: Support coherency for Mali LPAE
Lijun Pan <[email protected]>
ibmvnic: Ensure that CRQ entry read are correctly ordered
Rasmus Villemoes <[email protected]>
net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP
Pan Bian <[email protected]>
net: dsa: bcm_sf2: put device node before return
Ido Schimmel <[email protected]>
mlxsw: spectrum_span: Do not overwrite policer configuration
Voon Weifeng <[email protected]>
stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
Kevin Hao <[email protected]>
net: octeontx2: Make sure the buffer is 128 byte aligned
Pan Bian <[email protected]>
net: fec: put child node on error path
Pan Bian <[email protected]>
net: stmmac: dwmac-intel-plat: remove config data on error
Marek Vasut <[email protected]>
net: dsa: microchip: Adjust reset release timing to match reference reset circuit
-------------
Diffstat:
Makefile | 4 +- arch/arm/mm/Kconfig | 1 + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++ arch/arm64/include/asm/memory.h | 10 ++--- arch/arm64/mm/physaddr.c | 2 +- arch/x86/include/asm/intel-family.h | 1 + arch/x86/include/asm/msr.h | 4 +- arch/x86/kernel/setup.c | 20 +++++----- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 6 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 18 +++++++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 ++++- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/panfrost/panfrost_device.h | 1 + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + drivers/i2c/busses/i2c-tegra.c | 22 ++++++++++- drivers/iommu/intel/iommu.c | 5 +++ drivers/iommu/io-pgtable-arm.c | 11 +++++- drivers/misc/habanalabs/common/device.c | 9 +++++ drivers/misc/habanalabs/common/firmware_if.c | 5 +++ drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 + drivers/misc/habanalabs/gaudi/gaudi.c | 3 +- drivers/misc/habanalabs/goya/goya.c | 3 +- drivers/net/dsa/bcm_sf2.c | 8 +++- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 3 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 +++ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 +- .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 +++ .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 + drivers/nvme/host/core.c | 17 ++++++++- drivers/nvme/host/pci.c | 14 +++++++ drivers/nvme/host/rdma.c | 15 ++++++-- drivers/nvme/host/tcp.c | 14 +++++-- drivers/nvme/target/admin-cmd.c | 8 +++- drivers/phy/motorola/phy-cpcap-usb.c | 19 +++++++--- drivers/platform/x86/intel-vbtn.c | 6 +++ drivers/platform/x86/thinkpad_acpi.c | 1 + drivers/platform/x86/touchscreen_dmi.c | 18 +++++++++ drivers/scsi/fnic/vnic_dev.c | 8 ++-- drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- drivers/scsi/libfc/fc_exch.c | 16 +++++++- drivers/scsi/scsi_transport_srp.c | 9 ++++- fs/udf/super.c | 7 ++-- include/linux/kthread.h | 3 ++ include/linux/nvme.h | 6 +++ kernel/kthread.c | 27 ++++++++++++- kernel/locking/lockdep.c | 7 +++- kernel/smpboot.c | 1 + kernel/workqueue.c | 9 ++--- net/mac80211/debugfs.c | 44 ++++++++++------------ net/mac80211/rx.c | 2 + net/mac80211/tx.c | 27 +++++++------ net/switchdev/switchdev.c | 23 ++++++----- sound/pci/hda/hda_intel.c | 6 +++ sound/pci/hda/patch_hdmi.c | 1 + sound/soc/sof/intel/hda-codec.c | 3 +- tools/objtool/check.c | 14 +++---- tools/objtool/elf.c | 7 ++++ tools/power/x86/intel-speed-select/isst-config.c | 32 ++++++++++++++++ .../powerpc/alignment/alignment_handler.c | 5 ++- 65 files changed, 427 insertions(+), 135 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/57 net: dsa: microchip: Adjust reset release timing to match reference reset circuit
From: Marek Vasut <[email protected]>
commit 1c45ba93d34cd6af75228f34d0675200c81738b5 upstream.
KSZ8794CNX datasheet section 8.0 RESET CIRCUIT describes recommended circuit for interfacing with CPU/FPGA reset consisting of 10k pullup resistor and 10uF capacitor to ground. This circuit takes ~100 ms to rise enough to release the reset.
For maximum supply voltage VDDIO=3.3V VIH=2.0V R=10kR C=10uF that is
VDDIO - VIH
t = R * C * -ln( ------------- ) = 10000*0.00001*-(-0.93)=0.093 s
VDDIO
so we need ~95 ms for the reset to really de-assert, and then the original 100us for the switch itself to come out of reset. Simply msleep() for 100 ms which fits the constraint with a bit of extra space.
--- drivers/net/dsa/microchip/ksz_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/microchip/ksz_common.c +1 -1
@@ -400,7 +400,7 @@ int ksz_switch_register(struct ksz_device *dev,gpiod_set_value_cansleep (dev->reset_gpio,1 );usleep_range (10000 ,12000 );gpiod_set_value_cansleep (dev->reset_gpio,0 ); -usleep_range (100 ,1000 ); +msleep (100 ); }mutex_init (&dev->dev_mutex);
Signature · 1 line
2.30.0
Greg Kroah-Hartman
maintainerPATCH 2/57 net: stmmac: dwmac-intel-plat: remove config data on error
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
commit 3765d86ffcd346913c372d69cdc05dc8d56119ac upstream.
Remove the config data when rate setting fails.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c +2 -2
@@ -129,7 +129,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"Failed to set tx_clk\n" ); -return ret; + goto err_remove_config_dt; } } }
@@ -143,7 +143,7 @@ static int intel_eth_plat_probe(struct platform_device *pdev)if (ret) {dev_err (&pdev->dev,"Failed to set clk_ptp_ref\n" ); -return ret; + goto err_remove_config_dt; } } }
Signature · 1 line
2.30.0
Greg Kroah-Hartman
maintainerPATCH 3/57 net: fec: put child node on error path
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
commit 0607a2cddb60f4548b55e28ac56a8d73493a45bb upstream.
Also decrement the reference count of child device on error path.
--- drivers/net/ethernet/freescale/fec_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +2 -1
@@ -2165,9 +2165,9 @@ static int fec_enet_mii_init(struct platform_device *pdev) fep->mii_bus->parent = &pdev->dev; err =of_mdiobus_register (fep->mii_bus, node); -of_node_put (node);if (err) goto err_out_free_mdiobus; +of_node_put (node); mii_cnt++;
@@ -2180,6 +2180,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) err_out_free_mdiobus:mdiobus_free (fep->mii_bus); err_out: +of_node_put (node);return err; }
Signature · 1 line
2.30.0
Greg Kroah-Hartman
maintainerPATCH 4/57 net: octeontx2: Make sure the buffer is 128 byte aligned
In reply to Greg Kroah-HartmanFrom: Kevin Hao <[email protected]>
commit db2805150a0f27c00ad286a29109397a7723adad upstream.
The octeontx2 hardware needs the buffer to be 128 byte aligned. But in the current implementation of napi_alloc_frag(), it can't guarantee the return address is 128 byte aligned even the request size is a multiple of 128 bytes, so we have to request an extra 128 bytes and use the PTR_ALIGN() to make sure that the buffer is aligned correctly.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +2 -1
@@ -473,10 +473,11 @@ dma_addr_t __otx2_alloc_rbuf(struct otx2dma_addr_t iova;u8 *buf; - buf =napi_alloc_frag (pool->rbsize); + buf =napi_alloc_frag (pool->rbsize +OTX2_ALIGN );if (unlikely (!buf))return -ENOMEM ; + buf =PTR_ALIGN (buf,OTX2_ALIGN ); iova =dma_map_single_attrs (pfvf->dev, buf, pool->rbsize,DMA_FROM_DEVICE ,DMA_ATTR_SKIP_CPU_SYNC );if (unlikely (dma_mapping_error (pfvf->dev, iova))) {
Re: [PATCH 5.10 04/57] net: octeontx2: Make sure the buffer is 128 byte aligned
Hi!
Quoted 10 lines
commit
db2805150a0f27c00ad286a29109397a7723adadupstream.The octeontx2 hardware needs the buffer to be 128 byte aligned. But in the current implementation of
napi_alloc_frag(), it can't guarantee the return address is 128 byte aligned even the request size is a multiple of 128 bytes, so we have to request an extra 128 bytes and use thePTR_ALIGN()to make sure that the buffer is aligned correctly.+++
b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c dma_addr_t __otx2_alloc_rbuf(struct otx2 · line 480
Quoted 9 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +2
-1@@ -473,10 +473,11 @@ dma_addr_t __otx2_alloc_rbuf(struct otx2dma_addr_t iova;u8 *buf; - buf =napi_alloc_frag (pool->rbsize); + buf =napi_alloc_frag (pool->rbsize +OTX2_ALIGN );if (unlikely (!buf))return -ENOMEM ; + buf =PTR_ALIGN (buf,OTX2_ALIGN );
So we allocate a buffer, then change it, and then pass modified pointer to the page_frag_free(buf); in the error path. That... can't be right, right?
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c dma_addr_t __otx2_alloc_rbuf(struct otx2 · line 483
Quoted 3 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0
-0iova =dma_map_single_attrs (pfvf->dev, buf, pool->rbsize,DMA_FROM_DEVICE ,DMA_ATTR_SKIP_CPU_SYNC );if (unlikely (dma_mapping_error (pfvf->dev, iova))) {
BTW otx2_alloc_rbuf and __otx2_alloc_rbuf should probably return s64, as they return negative error code...
Best regards,
Pavel
Signature · 1 line
http://www.livejournal.com/~pavelmachek
Re: [PATCH 5.10 04/57] net: octeontx2: Make sure the buffer is 128 byte aligned
Quoted 20 lines · Pavel Machek
Hi!
Quoted 18 lines
commit
db2805150a0f27c00ad286a29109397a7723adadupstream.The octeontx2 hardware needs the buffer to be 128 byte aligned. But in the current implementation of
napi_alloc_frag(), it can't guarantee the return address is 128 byte aligned even the request size is a multiple of 128 bytes, so we have to request an extra 128 bytes and use thePTR_ALIGN()to make sure that the buffer is aligned correctly.+++
b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.cdrivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1
-1@@ -473,10 +473,11 @@ dma_addr_t __otx2_alloc_rbuf(struct otx2dma_addr_t iova;u8 *buf; - buf =napi_alloc_frag (pool->rbsize); + buf =napi_alloc_frag (pool->rbsize +OTX2_ALIGN );if (unlikely (!buf))return -ENOMEM ;
Quoted 5 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c dma_addr_t __otx2_alloc_rbuf(struct otx2 · line 480
Quoted 1 line
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +1
-0+ buf =PTR_ALIGN (buf,OTX2_ALIGN );So we allocate a buffer, then change it, and then pass modified pointer to the
page_frag_free(buf); in the error path. That... can't be right, right?
It doesn't matter. It will work as far as the address we passed to page_frag_free() is in the range of buf ~ (buf + rbsize).
Quoted 7 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c dma_addr_t __otx2_alloc_rbuf(struct otx2 · line 483
Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +0
-0iova =dma_map_single_attrs (pfvf->dev, buf, pool->rbsize,DMA_FROM_DEVICE ,DMA_ATTR_SKIP_CPU_SYNC );if (unlikely (dma_mapping_error (pfvf->dev, iova))) {BTW
otx2_alloc_rbufand__otx2_alloc_rbufshould probably return s64, as they return negative error code...
It does seem buggy to return dma_addr_t for these two functions, I will cook up a patch to fix this issue.
Thanks,
Kevin
Quoted 6 lines
Best regards,
PavelSignature · 1 line
http://www.livejournal.com/~pavelmachek
Greg Kroah-Hartman
maintainerPATCH 5/57 stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressing
In reply to Greg Kroah-HartmanFrom: Voon Weifeng <[email protected]>
commit 7cfc4486e7ea25bd405df162d9c131ee5d4c6c93 upstream.
Fix an issue where dump stack is printed and Reset Adapter occurs when PSE0 GbE or/and PSE1 GbE is/are enabled. EHL PSE0 GbE and PSE1 GbE use 32 bits DMA addressing whereas EHL PCH GbE uses 64 bits DMA addressing.
[ 25.535095] ------------[ cut here ]------------ [ 25.540276] NETDEV WATCHDOG: enp0s29f2 (intel-eth-pci): transmit queue 2 timed out [ 25.548749] WARNING: CPU: 2 PID: 0 at net/sched/sch_generic.c:443 dev_watchdog+0x259/0x260 [ 25.558004] Modules linked in: 8021q bnep bluetooth ecryptfs snd_hda_codec_hdmi intel_gpy marvell intel_ishtp_loader intel_ishtp_hid iTCO_wdt mei_hdcp iTCO_vendor_support x86_pkg_temp_thermal kvm_intel dwmac_intel stmmac kvm igb pcs_xpcs irqbypass phylink snd_hda_intel intel_rapl_msr pcspkr dca snd_hda_codec i915 i2c_i801 i2c_smbus libphy intel_ish_ipc snd_hda_core mei_me intel_ishtp mei spi_dw_pci 8250_lpss spi_dw thermal dw_dmac_core parport_pc tpm_crb tpm_tis parport tpm_tis_core tpm intel_pmc_core sch_fq_codel uhid fuse configfs snd_sof_pci snd_sof_intel_byt snd_sof_intel_ipc snd_sof_intel_hda_common snd_sof_xtensa_dsp snd_sof snd_soc_acpi_intel_match snd_soc_acpi snd_intel_dspcfg ledtrig_audio snd_soc_core snd_compress ac97_bus snd_pcm snd_timer snd soundcore [ 25.633795] CPU: 2 PID: 0 Comm: swapper/2 Tainted: G U 5.11.0-rc4-intel-lts-MISMAIL5+ #5 [ 25.644306] Hardware name: Intel Corporation Elkhart Lake Embedded Platform/ElkhartLake LPDDR4x T4 RVP1, BIOS EHLSFWI1.R00.2434.A00.2010231402 10/23/2020 [ 25.659674] RIP: 0010:dev_watchdog+0x259/0x260 [ 25.664650] Code: e8 3b 6b 60 ff eb 98 4c 89 ef c6 05 ec e7 bf 00 01 e8 fb e5 fa ff 89 d9 4c 89 ee 48 c7 c7 78 31 d2 9e 48 89 c2 e8 79 1b 18 00 <0f> 0b e9 77 ff ff ff 0f 1f 44 00 00 48 c7 47 08 00 00 00 00 48 c7 [ 25.685647] RSP: 0018:ffffb7ca80160eb8 EFLAGS: 00010286 [ 25.691498] RAX: 0000000000000000 RBX: 0000000000000002 RCX: 0000000000000103 [ 25.699483] RDX: 0000000080000103 RSI: 00000000000000f6 RDI: 00000000ffffffff [ 25.707465] RBP: ffff985709ce0440 R08: 0000000000000000 R09: c0000000ffffefff [ 25.715455] R10: ffffb7ca80160cf0 R11: ffffb7ca80160ce8 R12: ffff985709ce039c [ 25.723438] R13: ffff985709ce0000 R14: 0000000000000008 R15: ffff9857068af940 [ 25.731425] FS: 0000000000000000(0000) GS:ffff985864300000(0000) knlGS:0000000000000000 [ 25.740481] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 25.746913] CR2: 00005567f8bb76b8 CR3: 00000001f8e0a000 CR4: 0000000000350ee0 [ 25.754900] Call Trace: [ 25.757631] <IRQ> [ 25.759891] ? qdisc_put_unlocked+0x30/0x30 [ 25.764565] ? qdisc_put_unlocked+0x30/0x30 [ 25.769245] call_timer_fn+0x2e/0x140 [ 25.773346] run_timer_softirq+0x1f3/0x430 [ 25.777932] ? __hrtimer_run_queues+0x12c/0x2c0 [ 25.783005] ? ktime_get+0x3e/0xa0 [ 25.786812] __do_softirq+0xa6/0x2ef [ 25.790816] asm_call_irq_on_stack+0xf/0x20 [ 25.795501] </IRQ> [ 25.797852] do_softirq_own_stack+0x5d/0x80 [ 25.802538] irq_exit_rcu+0x94/0xb0 [ 25.806475] sysvec_apic_timer_interrupt+0x42/0xc0 [ 25.811836] asm_sysvec_apic_timer_interrupt+0x12/0x20 [ 25.817586] RIP: 0010:cpuidle_enter_state+0xd9/0x370 [ 25.823142] Code: 85 c0 0f 8f 0a 02 00 00 31 ff e8 22 d5 7e ff 45 84 ff 74 12 9c 58 f6 c4 02 0f 85 47 02 00 00 31 ff e8 7b a0 84 ff fb 45 85 f6 <0f> 88 ab 00 00 00 49 63 ce 48 2b 2c 24 48 89 c8 48 6b d1 68 48 c1 [ 25.844140] RSP: 0018:ffffb7ca800f7e80 EFLAGS: 00000206 [ 25.849996] RAX: ffff985864300000 RBX: 0000000000000003 RCX: 000000000000001f [ 25.857975] RDX: 00000005f2028ea8 RSI: ffffffff9ec5907f RDI: ffffffff9ec62a5d [ 25.865961] RBP: 00000005f2028ea8 R08: 0000000000000000 R09: 0000000000029d00 [ 25.873947] R10: 000000137b0e0508 R11: ffff9858643294e4 R12: ffff9858643336d0 [ 25.881935] R13: ffffffff9ef74b00 R14: 0000000000000003 R15: 0000000000000000 [ 25.889918] cpuidle_enter+0x29/0x40 [ 25.893922] do_idle+0x24a/0x290 [ 25.897536] cpu_startup_entry+0x19/0x20 [ 25.901930] start_secondary+0x128/0x160 [ 25.906326] secondary_startup_64_no_verify+0xb0/0xbb [ 25.911983] ---[ end trace b4c0c8195d0ba61f ]--- [ 25.917193] intel-eth-pci 0000:00:1d.2 enp0s29f2: Reset adapter.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +2 -0
@@ -375,6 +375,7 @@ static int ehl_pse0_common_data(struct pci_dev *pdev, struct plat_stmmacenet_data *plat) { plat->bus_id =2 ; + plat->addr64 =32 ;return ehl_common_data (pdev, plat); }
@@ -406,6 +407,7 @@ static int ehl_pse1_common_data(struct pci_dev *pdev, struct plat_stmmacenet_data *plat) { plat->bus_id =3 ; + plat->addr64 =32 ;return ehl_common_data (pdev, plat); }
Signature · 1 line
2.30.0
Greg Kroah-Hartman
maintainerPATCH 6/57 mlxsw: spectrum_span: Do not overwrite policer configuration
In reply to Greg Kroah-HartmanFrom: Ido Schimmel <[email protected]>
commit b6f6881aaf2344bf35a4221810737abe5fd210af upstream.
The purpose of the delayed work in the SPAN module is to potentially update the destination port and various encapsulation parameters of SPAN agents that point to a VLAN device or a GRE tap. The destination port can change following the insertion of a new route, for example.
SPAN agents that point to a physical port or the CPU port are static and never change throughout the lifetime of the SPAN agent. Therefore, skip over them in the delayed work.
This fixes an issue where the delayed work overwrites the policer that was set on a SPAN agent pointing to the CPU. Modifying the delayed work to inherit the original policer configuration is error-prone, as the same will be needed for any new parameter.
--- drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 ++++++ drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + 2 files changed, 7 insertions(+)
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +6 -0
@@ -157,6 +157,7 @@ mlxsw_sp1_span_entry_cpu_deconfigure(struct mlxsw_sp_span_entry *span_entry)static const struct mlxsw_sp_span_entry_ops mlxsw_sp1_span_entry_ops_cpu = { + .is_static = true, .can_handle = mlxsw_sp1_span_cpu_can_handle, .parms_set = mlxsw_sp1_span_entry_cpu_parms, .configure = mlxsw_sp1_span_entry_cpu_configure,
@@ -214,6 +215,7 @@ mlxsw_sp_span_entry_phys_deconfigure(struct mlxsw_sp_span_entry *span_entry)static const struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_phys = { + .is_static = true, .can_handle = mlxsw_sp_port_dev_check, .parms_set = mlxsw_sp_span_entry_phys_parms, .configure = mlxsw_sp_span_entry_phys_configure,
@@ -721,6 +723,7 @@ mlxsw_sp2_span_entry_cpu_deconfigure(struct mlxsw_sp_span_entry *span_entry)static const struct mlxsw_sp_span_entry_ops mlxsw_sp2_span_entry_ops_cpu = { + .is_static = true, .can_handle = mlxsw_sp2_span_cpu_can_handle, .parms_set = mlxsw_sp2_span_entry_cpu_parms, .configure = mlxsw_sp2_span_entry_cpu_configure,
@@ -1036,6 +1039,9 @@ static void mlxsw_sp_span_respin_work(struct work_struct *work)if (!refcount_read (&curr->ref_count))continue ; +if (curr->ops->is_static) +continue ; + err = curr->ops->parms_set (mlxsw_sp, curr->to_dev, &sparms);if (err)continue ;
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h +1 -0
@@ -60,6 +60,7 @@ struct mlxsw_sp_span_entry { };struct mlxsw_sp_span_entry_ops { +bool is_static;bool (*can_handle)(const struct net_device *to_dev); int (*parms_set)(struct mlxsw_sp *mlxsw_sp, const struct net_device *to_dev,
Signature · 1 line
2.30.0
Greg Kroah-Hartman
maintainerPATCH 7/57 net: dsa: bcm_sf2: put device node before return
In reply to Greg Kroah-HartmanFrom: Pan Bian <[email protected]>
commit cf3c46631e1637582f517a574c77cd6c05793817 upstream.
Put the device node dn before return error code on failure path.
--- drivers/net/dsa/bcm_sf2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/dsa/bcm_sf2.c +6 -2
@@ -509,15 +509,19 @@ static int bcm_sf2_mdio_register(struct/* Find our integrated MDIO bus node */ dn =of_find_compatible_node (NULL ,NULL ,"brcm,unimac-mdio" ); priv->master_mii_bus =of_mdio_find_bus (dn); -if (!priv->master_mii_bus) +if (!priv->master_mii_bus) { +of_node_put (dn);return -EPROBE_DEFER ; + }get_device (&priv->master_mii_bus->dev); priv->master_mii_dn = dn; priv->slave_mii_bus =devm_mdiobus_alloc (ds->dev); -if (!priv->slave_mii_bus) +if (!priv->slave_mii_bus) { +of_node_put (dn);return -ENOMEM ; + } priv->slave_mii_bus->priv = priv; priv->slave_mii_bus->name ="sf2 slave mii" ;
Greg Kroah-Hartman
maintainerPATCH 8/57 net: switchdev: dont set port_obj_info->handled true when -EOPNOTSUPP
In reply to Greg Kroah-HartmanFrom: Rasmus Villemoes <[email protected]>
commit 20776b465c0c249f5e5b5b4fe077cd24ef1cda86 upstream.
It's not true that switchdev_port_obj_notify() only inspects the ->handled field of "struct switchdev_notifier_port_obj_info" if call_switchdev_blocking_notifiers() returns 0 - there's a WARN_ON() triggering for a non-zero return combined with ->handled not being true. But the real problem here is that -EOPNOTSUPP is not being properly handled.
The wrapper functions switchdev_handle_port_obj_add() et al change a return value of -EOPNOTSUPP to 0, and the treatment of ->handled in switchdev_port_obj_notify() seems to be designed to change that back to -EOPNOTSUPP in case nobody actually acted on the notifier (i.e., everybody returned -EOPNOTSUPP).
Currently, as soon as some device down the stack passes the check_cb() check, ->handled gets set to true, which means that switchdev_port_obj_notify() cannot actually ever return -EOPNOTSUPP.
This, for example, means that the detection of hardware offload support in the MRP code is broken: switchdev_port_obj_add() used by br_mrp_switchdev_send_ring_test() always returns 0, so since the MRP code thinks the generation of MRP test frames has been offloaded, no such frames are actually put on the wire. Similarly, br_mrp_switchdev_set_ring_role() also always returns 0, causing mrp->ring_role_offloaded to be set to 1.
To fix this, continue to set ->handled true if any callback returns success or any error distinct from -EOPNOTSUPP. But if all the callbacks return -EOPNOTSUPP, make sure that ->handled stays false, so the logic in switchdev_port_obj_notify() can propagate that information.
--- net/switchdev/switchdev.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
net/switchdev/switchdev.c +13 -10
@@ -460,10 +460,11 @@ static int __switchdev_handle_port_obj_a extack =switchdev_notifier_info_to_extack (&port_obj_info->info);if (check_cb (dev)) { -/* This flag is only checked if the return value is success. */ - port_obj_info->handled = true; -return add_cb (dev, port_obj_info->obj, port_obj_info->trans, - extack); + err =add_cb (dev, port_obj_info->obj, port_obj_info->trans, + extack); +if (err != -EOPNOTSUPP ) + port_obj_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@ -515,9 +516,10 @@ static int __switchdev_handle_port_obj_dint err = -EOPNOTSUPP ;if (check_cb (dev)) { -/* This flag is only checked if the return value is success. */ - port_obj_info->handled = true; -return del_cb (dev, port_obj_info->obj); + err =del_cb (dev, port_obj_info->obj); +if (err != -EOPNOTSUPP ) + port_obj_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
@@ -568,9 +570,10 @@ static int __switchdev_handle_port_attr_int err = -EOPNOTSUPP ;if (check_cb (dev)) { - port_attr_info->handled = true; -return set_cb (dev, port_attr_info->attr, - port_attr_info->trans); + err =set_cb (dev, port_attr_info->attr, port_attr_info->trans); +if (err != -EOPNOTSUPP ) + port_attr_info->handled = true; +return err; }/* Switch ports might be stacked under e.g. a LAG. Ignore the
Greg Kroah-Hartman
maintainerPATCH 9/57 ibmvnic: Ensure that CRQ entry read are correctly ordered
In reply to Greg Kroah-HartmanFrom: Lijun Pan <[email protected]>
commit e41aec79e62fa50f940cf222d1e9577f14e149dc upstream.
Ensure that received Command-Response Queue (CRQ) entries are properly read in order by the driver. dma_rmb barrier has been added before accessing the CRQ descriptor to ensure the entire descriptor is read before processing.
--- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/ibm/ibmvnic.c +6 -0
@@ -4979,6 +4979,12 @@ static void ibmvnic_tasklet(struct tasklwhile (!done) {/* Pull all the valid messages off the CRQ */ while ((crq =ibmvnic_next_crq (adapter)) !=NULL ) { +/* This barrier makes sure ibmvnic_next_crq()'s +* crq->generic.first & IBMVNIC_CRQ_CMD_RSP is loaded +* before ibmvnic_handle_crq()'s +* switch(gen_crq->first) and switch(gen_crq->cmd). +*/ +dma_rmb ();ibmvnic_handle_crq (crq, adapter); crq->generic.first =0 ; }
Greg Kroah-Hartman
maintainerPATCH 10/57 iommu/io-pgtable-arm: Support coherency for Mali LPAE
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 728da60da7c1ec1e21ae64648e376666de3c279c upstream.
Midgard GPUs have ACE-Lite master interfaces which allows systems to integrate them in an I/O-coherent manner. It seems that from the GPU's viewpoint, the rest of the system is its outer shareable domain, and so even when snoop signals are wired up, they are only emitted for outer shareable accesses. As such, setting the TTBR_SHARE_OUTER bit does indeed get coherent pagetable walks working nicely for the coherent T620 in the Arm Juno SoC.
--- drivers/iommu/io-pgtable-arm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/iommu/io-pgtable-arm.c +10 -1
@@ -417,7 +417,13 @@ static arm_lpae_iopte arm_lpae_prot_to_p << ARM_LPAE_PTE_ATTRINDX_SHIFT); } -if (prot &IOMMU_CACHE ) +/* +* Also Mali has its own notions of shareability wherein its Inner +* domain covers the cores within the GPU, and its Outer domain is +* "outside the GPU" (i.e. either the Inner or System domain in CPU +* terms, depending on coherency). +*/ +if (prot &IOMMU_CACHE && data->iop.fmt !=ARM_MALI_LPAE ) pte |=ARM_LPAE_PTE_SH_IS ;else pte |=ARM_LPAE_PTE_SH_OS ;
@@ -1021,6 +1027,9 @@ arm_mali_lpae_alloc_pgtable(struct io_pg cfg->arm_mali_lpae_cfg.transtab =virt_to_phys (data->pgd) |ARM_MALI_LPAE_TTBR_READ_INNER |ARM_MALI_LPAE_TTBR_ADRMODE_TABLE ; +if (cfg->coherent_walk) + cfg->arm_mali_lpae_cfg.transtab |=ARM_MALI_LPAE_TTBR_SHARE_OUTER ; +return &data->iop; out_free_data:
Greg Kroah-Hartman
maintainerPATCH 11/57 drm/panfrost: Support cache-coherent integrations
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 268af50f38b1f2199a2e85e38073d7a25c20190c upstream.
When the GPU's ACE-Lite interface is fully wired up and capable of snooping CPU caches, it may be described as "dma-coherent" in devicetree, which will already inform the DMA layer not to perform unnecessary cache maintenance. However, we still need to ensure that the GPU uses the appropriate cacheable outer-shareable attributes in order to generate the requisite snoop signals, and that CPU mappings don't create a mismatch by using a non-cacheable type either.
--- drivers/gpu/drm/panfrost/panfrost_device.h | 1 + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 ++ drivers/gpu/drm/panfrost/panfrost_gem.c | 2 ++ drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + 4 files changed, 6 insertions(+)
drivers/gpu/drm/panfrost/panfrost_device.h +1 -0
@@ -88,6 +88,7 @@ struct panfrost_device {/* pm_domains for devices with more than one. */ struct device *pm_domain_devs[MAX_PM_DOMAINS ];struct device_link *pm_domain_links[MAX_PM_DOMAINS ]; +bool coherent;struct panfrost_features features;const struct panfrost_compatible *comp;
drivers/gpu/drm/panfrost/panfrost_drv.c +2 -0
@@ -587,6 +587,8 @@ static int panfrost_probe(struct platforif (!pfdev->comp)return -ENODEV ; + pfdev->coherent =device_get_dma_attr (&pdev->dev) ==DEV_DMA_COHERENT ; +/* Allocate and initialze the DRM device. */ ddev =drm_dev_alloc (&panfrost_drm_driver, &pdev->dev);if (IS_ERR (ddev))
drivers/gpu/drm/panfrost/panfrost_gem.c +2 -0
@@ -218,6 +218,7 @@ static const struct drm_gem_object_funcs*/ struct drm_gem_object *panfrost_gem_create_object (struct drm_device *dev,size_t size) { +struct panfrost_device *pfdev = dev->dev_private;struct panfrost_gem_object *obj; obj =kzalloc (sizeof (*obj),GFP_KERNEL );
@@ -227,6 +228,7 @@ struct drm_gem_object *panfrost_gem_creaINIT_LIST_HEAD (&obj->mappings.list);mutex_init (&obj->mappings.lock); obj->base.base.funcs = &panfrost_gem_funcs; + obj->base.map_cached = pfdev->coherent;return &obj->base.base; }
drivers/gpu/drm/panfrost/panfrost_mmu.c +1 -0
@@ -371,6 +371,7 @@ int panfrost_mmu_pgtable_alloc(struct pa .pgsize_bitmap = SZ_4K | SZ_2M, .ias = FIELD_GET(0xff, pfdev->features.mmu_features), .oas = FIELD_GET(0xff00, pfdev->features.mmu_features), + .coherent_walk = pfdev->coherent, .tlb = &mmu_tlb_ops, .iommu_dev = pfdev->dev, };
Greg Kroah-Hartman
maintainerPATCH 12/57 arm64: dts: meson: Describe G12b GPU as coherent
In reply to Greg Kroah-HartmanFrom: Robin Murphy <[email protected]>
commit 03544505cb10ddc73df3b6176e71cdb366834134 upstream.
According to a downstream commit I found in the Khadas vendor kernel, the GPU on G12b is wired up for ACE-lite, so (now that Panfrost knows how to handle this properly) we should describe it as such. Otherwise the mismatch leads to all manner of fun with mismatched attributes and inadvertently snooping stale data from caches, which would account for at least some of the brokenness observed on this platform.
--- arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +4 -0
@@ -135,3 +135,7 @@ }; }; }; + +&mali { + dma-coherent; +};
Greg Kroah-Hartman
maintainerPATCH 13/57 arm64: Fix kernel address detection of __is_lm_address()
In reply to Greg Kroah-HartmanFrom: Vincenzo Frascino <[email protected]>
commit 519ea6f1c82fcdc9842908155ae379de47818778 upstream.
Currently, the __is_lm_address() check just masks out the top 12 bits of the address, but if they are 0, it still yields a true result. This has as a side effect that virt_addr_valid() returns true even for invalid virtual addresses (e.g. 0x0).
Fix the detection checking that it's actually a kernel address starting at PAGE_OFFSET.
--- arch/arm64/include/asm/memory.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/include/asm/memory.h +4 -4
@@ -238,11 +238,11 @@ static inline const void *__tag_set(cons/* -* The linear kernel range starts at the bottom of the virtual address -* space. Testing the top bit for the start of the region is a -* sufficient check and avoids having to worry about the tag. +* Check whether an arbitrary address is within the linear map, which +* lives in the [PAGE_OFFSET, PAGE_END) interval at the bottom of the +* kernel's TTBR1 address range. */ -#define __is_lm_address (addr) (!(((u64)addr) & BIT(vabits_actual - 1))) +#define __is_lm_address (addr) (((u64)(addr) ^ PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))#define __lm_to_phys (addr) (((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)#define __kimg_to_phys (addr) ((addr) - kimage_voffset)
Greg Kroah-Hartman
maintainerPATCH 14/57 arm64: Do not pass tagged addresses to __is_lm_address()
In reply to Greg Kroah-HartmanFrom: Catalin Marinas <[email protected]>
commit 91cb2c8b072e00632adf463b78b44f123d46a0fa upstream.
Commit 519ea6f1c82f ("arm64: Fix kernel address detection of __is_lm_address()") fixed the incorrect validation of addresses below PAGE_OFFSET. However, it no longer allowed tagged addresses to be passed to virt_addr_valid().
Fix this by explicitly resetting the pointer tag prior to invoking __is_lm_address(). This is consistent with the __lm_to_phys() macro.
--- arch/arm64/include/asm/memory.h | 2 +- arch/arm64/mm/physaddr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/memory.h +1 -1
@@ -323,7 +323,7 @@ static inline void *phys_to_virt(phys_ad#endif /* !CONFIG_SPARSEMEM_VMEMMAP || CONFIG_DEBUG_VIRTUAL */ #define virt_addr_valid (addr) ({ \ - __typeof__(addr) __addr = addr; \ + __typeof__(addr) __addr = __tag_reset(addr); \ __is_lm_address(__addr) && pfn_valid(virt_to_pfn(__addr)); \ })
arch/arm64/mm/physaddr.c +1 -1
@@ -9,7 +9,7 @@phys_addr_t __virt_to_phys (unsigned long x) { -WARN (!__is_lm_address (x), +WARN (!__is_lm_address (__tag_reset (x)),"virt_to_phys used for non-linear address: %pK (%pS)\n" , (void *)x, (void *)x);
Greg Kroah-Hartman
maintainerPATCH 15/57 Revert "x86/setup: dont remove E820_TYPE_RAM for pfn 0"
In reply to Greg Kroah-HartmanFrom: Mike Rapoport <[email protected]>
commit 5c279c4cf206e03995e04fd3404fa95ffd243a97 upstream.
This reverts commit bde9cfa3afe4324ec251e4af80ebf9b7afaf7afe.
Changing the first memory page type from E820_TYPE_RESERVED to E820_TYPE_RAM makes it a part of "System RAM" resource rather than a reserved resource and this in turn causes devmem_is_allowed() to treat is as area that can be accessed but it is filled with zeroes instead of the actual data as previously.
The change in /dev/mem output causes lilo to fail as was reported at slakware users forum, and probably other legacy applications will experience similar problems.
--- arch/x86/kernel/setup.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
arch/x86/kernel/setup.c +11 -9
@@ -666,6 +666,17 @@ static void __init trim_platform_memory_static void __init trim_bios_range (void ) {/* +* A special case is the first 4Kb of memory; +* This is a BIOS owned area, not kernel ram, but generally +* not listed as such in the E820 table. +* +* This typically reserves additional memory (64KiB by default) +* since some BIOSes are known to corrupt low memory. See the +* Kconfig help text for X86_RESERVE_LOW. +*/ +e820__range_update (0 ,PAGE_SIZE ,E820_TYPE_RAM ,E820_TYPE_RESERVED ); + +/* * special case: Some BIOSes report the PC BIOS * area (640Kb -> 1Mb) as RAM even though it is not. * take them out.
@@ -722,15 +733,6 @@ early_param("reservelow", parse_reservelstatic void __init trim_low_memory_range (void ) { -/* -* A special case is the first 4Kb of memory; -* This is a BIOS owned area, not kernel ram, but generally -* not listed as such in the E820 table. -* -* This typically reserves additional memory (64KiB by default) -* since some BIOSes are known to corrupt low memory. See the -* Kconfig help text for X86_RESERVE_LOW. -*/ memblock_reserve (0 ,ALIGN (reserve_low,PAGE_SIZE )); }
Greg Kroah-Hartman
maintainerPATCH 16/57 ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD
In reply to Greg Kroah-HartmanFrom: Nick Desaulniers <[email protected]>
commit 28187dc8ebd938d574edfc6d9e0f9c51c21ff3f4 upstream.
LLD does not yet support any big endian architectures. Make this config non-selectable when using LLD until LLD is fixed.
--- arch/arm/mm/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mm/Kconfig +1 -0
@@ -743,6 +743,7 @@ config SWP_EMULATE config CPU_BIG_ENDIAN bool "Build big-endian kernel" depends on ARCH_SUPPORTS_BIG_ENDIAN + depends on !LD_IS_LLD help Say Y if you plan on running a kernel in big-endian mode. Note that your board must be properly built and your board
Greg Kroah-Hartman
maintainerPATCH 17/57 iommu/vt-d: Do not use flush-queue when caching-mode is on
In reply to Greg Kroah-HartmanFrom: Nadav Amit <[email protected]>
commit 29b32839725f8c89a41cb6ee054c85f3116ea8b5 upstream.
When an Intel IOMMU is virtualized, and a physical device is passed-through to the VM, changes of the virtual IOMMU need to be propagated to the physical IOMMU. The hypervisor therefore needs to monitor PTE mappings in the IOMMU page-tables. Intel specifications provide "caching-mode" capability that a virtual IOMMU uses to report that the IOMMU is virtualized and a TLB flush is needed after mapping to allow the hypervisor to propagate virtual IOMMU mappings to the physical IOMMU. To the best of my knowledge no real physical IOMMU reports "caching-mode" as turned on.
Synchronizing the virtual and the physical IOMMU tables is expensive if the hypervisor is unaware which PTEs have changed, as the hypervisor is required to walk all the virtualized tables and look for changes. Consequently, domain flushes are much more expensive than page-specific flushes on virtualized IOMMUs with passthrough devices. The kernel therefore exploited the "caching-mode" indication to avoid domain flushing and use page-specific flushing in virtualized environments. See commit 78d5f0f500e6 ("intel-iommu: Avoid global flushes with caching mode.")
This behavior changed after commit 13cf01744608 ("iommu/vt-d: Make use of iova deferred flushing"). Now, when batched TLB flushing is used (the default), full TLB domain flushes are performed frequently, requiring the hypervisor to perform expensive synchronization between the virtual TLB and the physical one.
Getting batched TLB flushes to use page-specific invalidations again in such circumstances is not easy, since the TLB invalidation scheme assumes that "full" domain TLB flushes are performed for scalability.
Disable batched TLB flushes when caching-mode is on, as the performance benefit from using batched TLB invalidations is likely to be much smaller than the overhead of the virtual-to-physical IOMMU page-tables synchronization.
--- drivers/iommu/intel/iommu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/iommu/intel/iommu.c +5 -0
@@ -3350,6 +3350,11 @@ static int __init init_dmars(void)if (!ecap_pass_through (iommu->ecap)) hw_pass_through =0 ; + +if (!intel_iommu_strict &&cap_caching_mode (iommu->cap)) { +pr_warn ("Disable batched IOTLB flush due to virtualization" ); + intel_iommu_strict =1 ; + }intel_svm_check (iommu); }
Greg Kroah-Hartman
maintainerPATCH 18/57 phy: cpcap-usb: Fix warning for missing regulator_disable
In reply to Greg Kroah-HartmanFrom: Tony Lindgren <[email protected]>
[ Upstream commit 764257d9069a9c19758b626cc1ba4ae079335d9e ]
On deferred probe, we will get the following splat:
cpcap-usb-phy cpcap-usb-phy.0: could not initialize VBUS or ID IIO: -517
WARNING: CPU: 0 PID: 21 at drivers/regulator/core.c:2123 regulator_put+0x68/0x78
...
(regulator_put) from [<c068ebf0>] (release_nodes+0x1b4/0x1fc) (release_nodes) from [<c068a9a4>] (really_probe+0x104/0x4a0) (really_probe) from [<c068b034>] (driver_probe_device+0x58/0xb4)
--- drivers/phy/motorola/phy-cpcap-usb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/phy/motorola/phy-cpcap-usb.c +13 -6
@@ -662,35 +662,42 @@ static int cpcap_usb_phy_probe(struct platform_device *pdev) generic_phy =devm_phy_create (ddata->dev,NULL , &ops);if (IS_ERR (generic_phy)) { error =PTR_ERR (generic_phy); -return PTR_ERR (generic_phy); + goto out_reg_disable; }phy_set_drvdata (generic_phy, ddata); phy_provider =devm_of_phy_provider_register (ddata->dev, of_phy_simple_xlate); -if (IS_ERR (phy_provider)) -return PTR_ERR (phy_provider); +if (IS_ERR (phy_provider)) { + error =PTR_ERR (phy_provider); + goto out_reg_disable; + } error =cpcap_usb_init_optional_pins (ddata);if (error) -return error; + goto out_reg_disable;cpcap_usb_init_optional_gpios (ddata); error =cpcap_usb_init_iio (ddata);if (error) -return error; + goto out_reg_disable; error =cpcap_usb_init_interrupts (pdev, ddata);if (error) -return error; + goto out_reg_disable;usb_add_phy_dev (&ddata->phy);atomic_set (&ddata->active,1 );schedule_delayed_work (&ddata->detect_work,msecs_to_jiffies (1 ));return 0 ; + +out_reg_disable: +regulator_disable (ddata->vusb); + +return error; }static int cpcap_usb_phy_remove (struct platform_device *pdev)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 19/57 tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
[ Upstream commit f981dc171c04c6cf5a35c712543b231ebf805832 ]
When BIOS disables turbo, The scaling_max_freq in cpufreq sysfs will be limited to config level 0 base frequency. But when user selects a higher config levels, this will result in higher base frequency. But since scaling_max_freq is still old base frequency, the performance will still be limited. So when the turbo is disabled and cpufreq base_frequency is higher than scaling_max_freq, update the scaling_max_freq to the base_frequency.
--- .../x86/intel-speed-select/isst-config.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
tools/power/x86/intel-speed-select/isst-config.c +21 -0
@@ -1245,6 +1245,8 @@ static void dump_isst_config(int arg)isst_ctdp_display_information_end (outf); } +static void adjust_scaling_max_from_base_freq (int cpu); +static void set_tdp_level_for_cpu (int cpu,void *arg1,void *arg2,void *arg3,void *arg4) {
@@ -1263,6 +1265,9 @@ static void set_tdp_level_for_cpu(int cpu, void *arg1, void *arg2, void *arg3,int pkg_id =get_physical_package_id (cpu);int die_id =get_physical_die_id (cpu); +/* Wait for updated base frequencies */ +usleep (2000 ); +fprintf (stderr,"Option is set to online/offline\n" ); ctdp_level.core_cpumask_size =alloc_cpu_set (&ctdp_level.core_cpumask);
@@ -1279,6 +1284,7 @@ static void set_tdp_level_for_cpu(int cpu, void *arg1, void *arg2, void *arg3,if (CPU_ISSET_S (i, ctdp_level.core_cpumask_size, ctdp_level.core_cpumask)) {fprintf (stderr,"online cpu %d\n" , i);set_cpu_online_offline (i,1 ); +adjust_scaling_max_from_base_freq (i); }else {fprintf (stderr,"offline cpu %d\n" , i);set_cpu_online_offline (i,0 );
@@ -1436,6 +1442,21 @@ static int set_cpufreq_scaling_min_max(int cpu, int max, int freq)return 0 ; } +static int no_turbo (void ) +{ +return parse_int_file (0 ,"/sys/devices/system/cpu/intel_pstate/no_turbo" ); +} + +static void adjust_scaling_max_from_base_freq (int cpu) +{ +int base_freq, scaling_max_freq; + + scaling_max_freq =parse_int_file (0 ,"/sys/devices/system/cpu/cpu%d/cpufreq/scaling_max_freq" , cpu); + base_freq =get_cpufreq_base_freq (cpu); +if (scaling_max_freq < base_freq ||no_turbo ()) +set_cpufreq_scaling_min_max (cpu,1 , base_freq); +} +static int set_clx_pbf_cpufreq_scaling_min_max (int cpu) {struct isst_pkg_ctdp_level_info *ctdp_level;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 20/57 tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
[ Upstream commit bbaa2e95e23e74791dd75b90d5ad9aad535acc6e ]
In some case when BIOS disabled turbo, cpufreq cpuinfo_max_freq can be lower than base_frequency at higher config level. So, in that case set scaling_min_freq to base_frequency.
--- tools/power/x86/intel-speed-select/isst-config.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/power/x86/intel-speed-select/isst-config.c +11 -0
@@ -1457,6 +1457,16 @@ static void adjust_scaling_max_from_base_freq(int cpu)set_cpufreq_scaling_min_max (cpu,1 , base_freq); } +static void adjust_scaling_min_from_base_freq (int cpu) +{ +int base_freq, scaling_min_freq; + + scaling_min_freq =parse_int_file (0 ,"/sys/devices/system/cpu/cpu%d/cpufreq/scaling_min_freq" , cpu); + base_freq =get_cpufreq_base_freq (cpu); +if (scaling_min_freq < base_freq) +set_cpufreq_scaling_min_max (cpu,0 , base_freq); +} +static int set_clx_pbf_cpufreq_scaling_min_max (int cpu) {struct isst_pkg_ctdp_level_info *ctdp_level;
@@ -1554,6 +1564,7 @@ static void set_scaling_min_to_cpuinfo_max(int cpu)continue ;set_cpufreq_scaling_min_max_from_cpuinfo (i,1 ,0 ); +adjust_scaling_min_from_base_freq (i); } }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 21/57 platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 46c54cf2706122c37497896d56d67b0c0aca2ede ]
The Estar Beauty HD (MID 7316R) tablet uses a Goodix touchscreen, with the X and Y coordinates swapped compared to the LCD panel.
Add a touchscreen_dmi entry for this adding a "touchscreen-swapped-x-y" device-property to the i2c-client instantiated for this device before the driver binds.
This is the first entry of a Goodix touchscreen to touchscreen_dmi.c, so far DMI quirks for Goodix touchscreen's have been added directly to drivers/input/touchscreen/goodix.c. Currently there are 3 DMI tables in goodix.c:
1. rotated_screen[] for devices where the touchscreen is rotated 180 degrees vs the LCD panel
2. inverted_x_screen[] for devices where the X axis is inverted
3. nine_bytes_report[] for devices which use a non standard touch report size
Arguably only 3. really needs to be inside the driver and the other 2 cases are better handled through the generic touchscreen DMI quirk mechanism from touchscreen_dmi.c, which allows adding device-props to any i2c-client. Esp. now that goodix.c is using the generic touchscreen_properties code.
Alternative to the approach from this patch we could add a 4th dmi_system_id table for devices with swapped-x-y axis to goodix.c, but that seems undesirable.
--- drivers/platform/x86/touchscreen_dmi.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/platform/x86/touchscreen_dmi.c +18 -0
@@ -263,6 +263,16 @@ static const struct ts_dmi_data digma_citi_e200_data = { .properties = digma_citi_e200_props, }; +static const struct property_entry estar_beauty_hd_props[] = { +PROPERTY_ENTRY_BOOL ("touchscreen-swapped-x-y" ), + { } +}; + +static const struct ts_dmi_data estar_beauty_hd_data = { + .acpi_name ="GDIX1001:00" , + .properties = estar_beauty_hd_props, +}; +static const struct property_entry gp_electronic_t701_props[] = {PROPERTY_ENTRY_U32 ("touchscreen-size-x" ,960 ),PROPERTY_ENTRY_U32 ("touchscreen-size-y" ,640 ),
@@ -942,6 +952,14 @@ const struct dmi_system_id touchscreen_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), }, }, + { +/* Estar Beauty HD (MID 7316R) */ + .driver_data = (void *)&estar_beauty_hd_data, + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Estar" ), + DMI_MATCH(DMI_PRODUCT_NAME, "eSTAR BEAUTY HD Intel Quad core"), + }, + }, {/* GP-electronic T701 */ .driver_data = (void *)&gp_electronic_t701_data,
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 22/57 platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
In reply to Greg Kroah-HartmanFrom: Arnold Gozum <[email protected]>
[ Upstream commit fcd38f178b785623c0325958225744f0d8a075c0 ]
The Dell Inspiron 7352 is a 2-in-1 model that has chassis-type "Notebook". Add this model to the dmi_switches_allow_list.
--- drivers/platform/x86/intel-vbtn.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/platform/x86/intel-vbtn.c +6 -0
@@ -216,6 +216,12 @@ static const struct dmi_system_id dmi_switches_allow_list[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Switch SA5-271"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7352"), + }, + }, {}/* Array terminator */ };
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 23/57 habanalabs: fix dma_addr passed to dma_mmap_coherent
In reply to Greg Kroah-HartmanFrom: Oded Gabbay <[email protected]>
[ Upstream commit a9d4ef643430d638de1910377f50e0d492d85a43 ]
When doing dma_alloc_coherent in the driver, we add a certain hard-coded offset to the DMA address before returning to the callee function. This offset is needed when our device use this DMA address to perform outbound transactions to the host.
However, if we want to map the DMA'able memory to the user via dma_mmap_coherent(), we need to pass the original dma address, without this offset. Otherwise, we will get erronouos mapping.
--- drivers/misc/habanalabs/gaudi/gaudi.c | 3 ++- drivers/misc/habanalabs/goya/goya.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +2 -1
@@ -3119,7 +3119,8 @@ static int gaudi_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma, vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP |VM_DONTCOPY |VM_NORESERVE ; - rc =dma_mmap_coherent (hdev->dev, vma, cpu_addr, dma_addr, size); + rc =dma_mmap_coherent (hdev->dev, vma, cpu_addr, + (dma_addr -HOST_PHYS_BASE ), size);if (rc)dev_err (hdev->dev,"dma_mmap_coherent error %d" , rc);
drivers/misc/habanalabs/goya/goya.c +2 -1
@@ -2675,7 +2675,8 @@ static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma, vma->vm_flags |=VM_IO |VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP |VM_DONTCOPY |VM_NORESERVE ; - rc =dma_mmap_coherent (hdev->dev, vma, cpu_addr, dma_addr, size); + rc =dma_mmap_coherent (hdev->dev, vma, cpu_addr, + (dma_addr -HOST_PHYS_BASE ), size);if (rc)dev_err (hdev->dev,"dma_mmap_coherent error %d" , rc);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 24/57 locking/lockdep: Avoid noinstr warning for DEBUG_LOCKDEP
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 77ca93a6b1223e210e58e1000c09d8d420403c94 ]
vmlinux.o: warning: objtool: lock_is_held_type()+0x60: call to check_flags.part.0() leaves .noinstr.text section
--- kernel/locking/lockdep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/locking/lockdep.c +6 -1
@@ -5271,12 +5271,15 @@ static void __lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie cookie/* * Check whether we follow the irq-flags state precisely: */ -static void check_flags (unsigned long flags) +static noinstr void check_flags(unsigned long flags) {#if defined(CONFIG_PROVE_LOCKING ) && defined(CONFIG_DEBUG_LOCKDEP )if (!debug_locks)return ; +/* Get the warning out.. */ +instrumentation_begin (); +if (irqs_disabled_flags (flags)) {if (DEBUG_LOCKS_WARN_ON (lockdep_hardirqs_enabled ())) {printk ("possible reason: unannotated irqs-off.\n" );
@@ -5304,6 +5307,8 @@ static void check_flags(unsigned long flags)if (!debug_locks)print_irqtrace_events (current); + +instrumentation_end ();#endif }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 25/57 x86: __always_inline __{rd,wr}msr()
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 66a425011c61e71560c234492d204e83cfb73d1d ]
When the compiler choses to not inline the trivial MSR helpers:
vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0xce: call to __wrmsr.constprop.14() leaves .noinstr.text section
--- arch/x86/include/asm/msr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/msr.h +2 -2
@@ -86,7 +86,7 @@ static inline void do_trace_rdpmc(unsigned int msr, u64 val, int failed) {}* think of extending them - you will be slapped with a stinking trout or a frozen * shark will reach you, wherever you are! You've been warned. */ -static inline unsigned long long notrace __rdmsr (unsigned int msr) +static __always_inline unsigned long long __rdmsr (unsigned int msr) {DECLARE_ARGS (val, low, high);
@@ -98,7 +98,7 @@ static inline unsigned long long notrace __rdmsr(unsigned int msr)return EAX_EDX_VAL (val, low, high); } -static inline void notrace __wrmsr(unsigned int msr, u32 low, u32 high) +static __always_inline void __wrmsr(unsigned int msr, u32 low, u32 high) { asmvolatile ("1: wrmsr\n" "2:\n"
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 26/57 scsi: scsi_transport_srp: Dont block target in failfast state
In reply to Greg Kroah-HartmanFrom: Martin Wilck <[email protected]>
[ Upstream commit 72eeb7c7151302ef007f1acd018cbf6f30e50321 ]
If the port is in SRP_RPORT_FAIL_FAST state when srp_reconnect_rport() is entered, a transition to SDEV_BLOCK would be illegal, and a kernel WARNING would be triggered. Skip scsi_target_block() in this case.
--- drivers/scsi/scsi_transport_srp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/scsi_transport_srp.c +8 -1
@@ -541,7 +541,14 @@ int srp_reconnect_rport(struct srp_rport *rport) res =mutex_lock_interruptible (&rport->mutex);if (res) goto out; -scsi_target_block (&shost->shost_gendev); +if (rport->state !=SRP_RPORT_FAIL_FAST ) +/* +* sdev state must be SDEV_TRANSPORT_OFFLINE, transition +* to SDEV_BLOCK is illegal. Calling scsi_target_unblock() +* later is ok though, scsi_internal_device_unblock_nowait() +* treats SDEV_TRANSPORT_OFFLINE like SDEV_BLOCK. +*/ +scsi_target_block (&shost->shost_gendev); res = rport->state !=SRP_RPORT_LOST ? i->f->reconnect (rport) : -ENODEV ;pr_debug ("%s (state %d): transport.reconnect() returned %d\n" ,dev_name (&shost->shost_gendev), rport->state, res);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 27/57 scsi: libfc: Avoid invoking response handler twice if ep is already completed
In reply to Greg Kroah-HartmanFrom: Javed Hasan <[email protected]>
[ Upstream commit b2b0f16fa65e910a3ec8771206bb49ee87a54ac5 ]
A race condition exists between the response handler getting called because of exchange_mgr_reset() (which clears out all the active XIDs) and the response we get via an interrupt.
Sequence of events:
rport ba0200: Port timeout, state PLOGI
rport ba0200: Port entered PLOGI state from PLOGI state
xid 1052: Exchange timer armed : 20000 msecs xid timer armed here
rport ba0200: Received LOGO request while in state PLOGI rport ba0200: Delete port
rport ba0200: work event 3
rport ba0200: lld callback ev 3
bnx2fc: rport_event_hdlr: event = 3, port_id = 0xba0200
bnx2fc: ba0200 - rport not created Yet!!
/* Here we reset any outstanding exchanges before freeing rport using the exch_mgr_reset() */ xid 1052: Exchange timer canceled
/* Here we got two responses for one xid */ xid 1052: invoking resp(), esb 20000000 state 3 xid 1052: invoking resp(), esb 20000000 state 3 xid 1052: fc_rport_plogi_resp() : ep->resp_active 2 xid 1052: fc_rport_plogi_resp() : ep->resp_active 2
Skip the response if the exchange is already completed.
--- drivers/scsi/libfc/fc_exch.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/scsi/libfc/fc_exch.c +14 -2
@@ -1624,8 +1624,13 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp) rc =fc_exch_done_locked (ep);WARN_ON (fc_seq_exch (sp) != ep);spin_unlock_bh (&ep->ex_lock); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + } }/*
@@ -1644,6 +1649,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)if (!fc_invoke_resp (ep, sp, fp))fc_frame_free (fp); +skip_resp:fc_exch_release (ep);return ; rel:
@@ -1900,10 +1906,16 @@ static void fc_exch_reset(struct fc_exch *ep)fc_exch_hold (ep); -if (!rc) +if (!rc) {fc_exch_delete (ep); + }else { +FC_EXCH_DBG (ep,"ep is completed already," +"hence skip calling the resp\n" ); + goto skip_resp; + }fc_invoke_resp (ep, sp,ERR_PTR (-FC_EX_CLOSED )); +skip_resp:fc_seq_set_resp (sp,NULL , ep->arg);fc_exch_release (ep); }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 28/57 scsi: fnic: Fix memleak in vnic_dev_init_devcmd2
In reply to Greg Kroah-HartmanFrom: Dinghao Liu <[email protected]>
[ Upstream commit d6e3ae76728ccde49271d9f5acfebbea0c5625a3 ]
When ioread32() returns 0xFFFFFFFF, we should execute cleanup functions like other error handling paths before returning.
--- drivers/scsi/fnic/vnic_dev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/fnic/vnic_dev.c +5 -3
@@ -444,7 +444,8 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) fetch_index =ioread32 (&vdev->devcmd2->wq.ctrl->fetch_index);if (fetch_index ==0xFFFFFFFF ) {/* check for hardware gone */ pr_err ("error in devcmd2 init" ); -return -ENODEV ; + err = -ENODEV ; + goto err_free_wq; }/*
@@ -460,7 +461,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) err =vnic_dev_alloc_desc_ring (vdev, &vdev->devcmd2->results_ring,DEVCMD2_RING_SIZE ,DEVCMD2_DESC_SIZE );if (err) - goto err_free_wq; + goto err_disable_wq; vdev->devcmd2->result = (struct devcmd2_result *) vdev->devcmd2->results_ring.descs;
@@ -481,8 +482,9 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) err_free_desc_ring:vnic_dev_free_desc_ring (vdev, &vdev->devcmd2->results_ring); -err_free_wq: +err_disable_wq:vnic_wq_disable (&vdev->devcmd2->wq); +err_free_wq:vnic_wq_free (&vdev->devcmd2->wq); err_free_devcmd2:kfree (vdev->devcmd2);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 29/57 ASoC: SOF: Intel: hda: Resume codec to do jack detection
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
[ Upstream commit bcd7059abc19e6ec5b2260dff6a008fb99c4eef9 ]
Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval.
This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the difference is SOF unconditionally resumes the codec.
--- sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/sof/intel/hda-codec.c +1 -2
@@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev)* has been recorded in STATESTS */ if (codec->jacktbl.used) -schedule_delayed_work (&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); }#else void hda_codec_jack_wake_enable (struct snd_sof_dev *sdev) {}
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 30/57 ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid
In reply to Greg Kroah-HartmanFrom: Kai Vehmanen <[email protected]>
[ Upstream commit 5e941fc033e411118fb3a7d9e0b97f8cf702cd39 ]
Add HD Audio PCI ID and HDMI codec vendor ID for Intel AlderLake-P.
--- sound/pci/hda/hda_intel.c | 3 +++ sound/pci/hda/patch_hdmi.c | 1 + 2 files changed, 4 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -2507,6 +2507,9 @@ static const struct pci_device_id azx_ids[] = {/* Alderlake-S */ { PCI_DEVICE(0x8086, 0x7ad0), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* Alderlake-P */ + { PCI_DEVICE(0x8086, 0x51c8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Elkhart Lake */ { PCI_DEVICE(0x8086, 0x4b55), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
sound/pci/hda/patch_hdmi.c +1 -0
@@ -4349,6 +4349,7 @@ HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI", patch_i915_icl_hdmi),HDA_CODEC_ENTRY (0x80862812 ,"Tigerlake HDMI" , patch_i915_tgl_hdmi),HDA_CODEC_ENTRY (0x80862814 ,"DG1 HDMI" , patch_i915_tgl_hdmi),HDA_CODEC_ENTRY (0x80862815 ,"Alderlake HDMI" , patch_i915_tgl_hdmi), +HDA_CODEC_ENTRY (0x8086281c ,"Alderlake-P HDMI" , patch_i915_tgl_hdmi),HDA_CODEC_ENTRY (0x80862816 ,"Rocketlake HDMI" , patch_i915_tgl_hdmi),HDA_CODEC_ENTRY (0x8086281a ,"Jasperlake HDMI" , patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI", patch_i915_icl_hdmi),
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 31/57 objtool: Dont add empty symbols to the rbtree
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit a2e38dffcd93541914aba52b30c6a52acca35201 ]
Building with the Clang assembler shows the following warning:
arch/x86/kernel/ftrace_64.o: warning: objtool: missing symbol for insn at offset 0x16
The Clang assembler strips section symbols. That ends up giving objtool's find_func_containing() much more test coverage than normal. Turns out, find_func_containing() doesn't work so well for overlapping symbols:
2: 000000000000000e 0 NOTYPE LOCAL DEFAULT 2 fgraph_trace
3: 000000000000000f 0 NOTYPE LOCAL DEFAULT 2 trace
4: 0000000000000000 165 FUNC GLOBAL DEFAULT 2 __fentry__
5: 000000000000000e 0 NOTYPE GLOBAL DEFAULT 2 ftrace_stubThe zero-length NOTYPE symbols are inside __fentry__(), confusing the rbtree search for any __fentry__() offset coming after a NOTYPE.
Try to avoid this problem by not adding zero-length symbols to the rbtree. They're rare and aren't needed in the rbtree anyway.
One caveat, this actually might not end up being the right fix. Non-empty overlapping symbols, if they exist, could have the same problem. But that would need bigger changes, let's see if we can get away with the easy fix for now.
--- tools/objtool/elf.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/objtool/elf.c +7 -0
@@ -425,6 +425,13 @@ static int read_symbols(struct elf *elf)list_add (&sym->list, entry);elf_hash_add (elf->symbol_hash, &sym->hash, sym->idx);elf_hash_add (elf->symbol_name_hash, &sym->name_hash,str_hash (sym->name)); + +/* +* Don't store empty STT_NOTYPE symbols in the rbtree. They +* can exist within a function, confusing the sorting. +*/ +if (!sym->len) +rb_erase (&sym->node, &sym->sec->symbol_tree); }if (stats)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 32/57 mac80211: fix incorrect strlen of .write in debugfs
In reply to Greg Kroah-HartmanFrom: Shayne Chen <[email protected]>
[ Upstream commit 6020d534fa012b80c6d13811dc4d2dfedca2e403 ]
This fixes strlen mismatch problems happening in some .write callbacks of debugfs.
When trying to configure airtime_flags in debugfs, an error appeared:
ash: write error: Invalid argument
The error is returned from kstrtou16() since a wrong length makes it miss the real end of input string. To fix this, use count as the string length, and set proper end of string for a char buffer.
The debug print is shown - airtime_flags_write: count = 2, len = 8, where the actual length is 2, but "len = strlen(buf)" gets 8.
Also cleanup the other similar cases for the sake of consistency.
--- net/mac80211/debugfs.c | 44 +++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 24 deletions(-)
net/mac80211/debugfs.c +20 -24
@@ -120,18 +120,17 @@ static ssize_t aqm_write(struct file *file, {struct ieee80211_local *local = file->private_data;char buf[100 ]; -size_t len; -if (count >sizeof (buf)) +if (count >=sizeof (buf))return -EINVAL ;if (copy_from_user (buf, user_buf, count))return -EFAULT ; - buf[sizeof (buf) -1 ] ='\0' ; - len =strlen (buf); -if (len >0 && buf[len-1 ] =='\n' ) - buf[len-1 ] =0 ; +if (count && buf[count -1 ] =='\n' ) + buf[count -1 ] ='\0' ; +else + buf[count] ='\0' ;if (sscanf (buf,"fq_limit %u" , &local->fq.limit) ==1 )return count;
@@ -177,18 +176,17 @@ static ssize_t airtime_flags_write(struct file *file, {struct ieee80211_local *local = file->private_data;char buf[16 ]; -size_t len; -if (count >sizeof (buf)) +if (count >=sizeof (buf))return -EINVAL ;if (copy_from_user (buf, user_buf, count))return -EFAULT ; - buf[sizeof (buf) -1 ] =0 ; - len =strlen (buf); -if (len >0 && buf[len -1 ] =='\n' ) - buf[len -1 ] =0 ; +if (count && buf[count -1 ] =='\n' ) + buf[count -1 ] ='\0' ; +else + buf[count] ='\0' ;if (kstrtou16 (buf,0 , &local->airtime_flags))return -EINVAL ;
@@ -237,20 +235,19 @@ static ssize_t aql_txq_limit_write(struct file *file, {struct ieee80211_local *local = file->private_data;char buf[100 ]; -size_t len;u32 ac, q_limit_low, q_limit_high, q_limit_low_old, q_limit_high_old;struct sta_info *sta; -if (count >sizeof (buf)) +if (count >=sizeof (buf))return -EINVAL ;if (copy_from_user (buf, user_buf, count))return -EFAULT ; - buf[sizeof (buf) -1 ] =0 ; - len =strlen (buf); -if (len >0 && buf[len -1 ] =='\n' ) - buf[len -1 ] =0 ; +if (count && buf[count -1 ] =='\n' ) + buf[count -1 ] ='\0' ; +else + buf[count] ='\0' ;if (sscanf (buf,"%u %u %u" , &ac, &q_limit_low, &q_limit_high) !=3 )return -EINVAL ;
@@ -306,18 +303,17 @@ static ssize_t force_tx_status_write(struct file *file, {struct ieee80211_local *local = file->private_data;char buf[3 ]; -size_t len; -if (count >sizeof (buf)) +if (count >=sizeof (buf))return -EINVAL ;if (copy_from_user (buf, user_buf, count))return -EFAULT ; - buf[sizeof (buf) -1 ] ='\0' ; - len =strlen (buf); -if (len >0 && buf[len -1 ] =='\n' ) - buf[len -1 ] =0 ; +if (count && buf[count -1 ] =='\n' ) + buf[count -1 ] ='\0' ; +else + buf[count] ='\0' ;if (buf[0 ] =='0' && buf[1 ] =='\0' ) local->force_tx_status =0 ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 33/57 mac80211: fix fast-rx encryption check
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit 622d3b4e39381262da7b18ca1ed1311df227de86 ]
When using WEP, the default unicast key needs to be selected, instead of the STA PTK.
--- net/mac80211/rx.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/rx.c +2 -0
@@ -4191,6 +4191,8 @@ void ieee80211_check_fast_rx(struct sta_info *sta)rcu_read_lock (); key =rcu_dereference (sta->ptk[sta->ptk_idx]); +if (!key) + key =rcu_dereference (sdata->default_unicast_key);if (key) {switch (key->conf.cipher) {case WLAN_CIPHER_SUITE_TKIP :
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 34/57 mac80211: fix encryption key selection for 802.3 xmit
In reply to Greg Kroah-HartmanFrom: Felix Fietkau <[email protected]>
[ Upstream commit b101dd2d22f45d203010b40c739df346a0cbebef ]
When using WEP, the default unicast key needs to be selected, instead of the STA PTK.
--- net/mac80211/tx.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
net/mac80211/tx.c +15 -12
@@ -4278,7 +4278,6 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb,struct ethhdr *ehdr = (struct ethhdr *)skb->data;struct ieee80211_key *key;struct sta_info *sta; -bool offload = true;if (unlikely (skb->len <ETH_HLEN )) {kfree_skb (skb);
@@ -4294,18 +4293,22 @@ netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb,if (unlikely (IS_ERR_OR_NULL (sta) || !sta->uploaded || !test_sta_flag (sta,WLAN_STA_AUTHORIZED ) || - sdata->control_port_protocol == ehdr->h_proto)) - offload = false; -else if ((key =rcu_dereference (sta->ptk[sta->ptk_idx])) && - (!(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE ) || - key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP )) - offload = false; - -if (offload) -ieee80211_8023_xmit (sdata, dev, sta, key, skb); -else -ieee80211_subif_start_xmit (skb, dev); + sdata->control_port_protocol == ehdr->h_proto)) + goto skip_offload; + + key =rcu_dereference (sta->ptk[sta->ptk_idx]); +if (!key) + key =rcu_dereference (sdata->default_unicast_key); + +if (key && (!(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE ) || + key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP )) + goto skip_offload; + +ieee80211_8023_xmit (sdata, dev, sta, key, skb); + goto out; +skip_offload: +ieee80211_subif_start_xmit (skb, dev); out:rcu_read_unlock ();
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 35/57 scsi: ibmvfc: Set default timeout to avoid crash during migration
In reply to Greg Kroah-HartmanFrom: Brian King <[email protected]>
[ Upstream commit 764907293edc1af7ac857389af9dc858944f53dc ]
While testing live partition mobility, we have observed occasional crashes of the Linux partition. What we've seen is that during the live migration, for specific configurations with large amounts of memory, slow network links, and workloads that are changing memory a lot, the partition can end up being suspended for 30 seconds or longer. This resulted in the following scenario:
CPU 0 CPU 1
------------------------------- ----------------------------------scsi_queue_rq migration_store
-> blk_mq_start_request -> rtas_ibm_suspend_me
-> blk_add_timer -> on_each_cpu(rtas_percpu_suspend_me
_______________________________________V
|
V
-> IPI from CPU 1
-> rtas_percpu_suspend_me
-> __rtas_suspend_last_cpu-- Linux partition suspended for > 30 seconds --
-> for_each_online_cpu(cpu)
plpar_hcall_norets(H_PROD
-> scsi_dispatch_cmd
-> scsi_times_out
-> scsi_abort_command
-> queue_delayed_work -> ibmvfc_queuecommand_lck
-> ibmvfc_send_event
-> ibmvfc_send_crq
- returns H_CLOSED
<- returns SCSI_MLQUEUE_HOST_BUSY
-> __blk_mq_requeue_request
-> scmd_eh_abort_handler
-> scsi_try_to_abort_cmd
- returns SUCCESS
-> scsi_queue_insertNormally, the SCMD_STATE_COMPLETE bit would protect against the command completion and the timeout, but that doesn't work here, since we don't check that at all in the SCSI_MLQUEUE_HOST_BUSY path.
In this case we end up calling scsi_queue_insert on a request that has already been queued, or possibly even freed, and we crash.
The patch below simply increases the default I/O timeout to avoid this race condition. This is also the timeout value that nearly all IBM SAN storage recommends setting as the default value.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/ibmvscsi/ibmvfc.c +3 -1
@@ -2957,8 +2957,10 @@ static int ibmvfc_slave_configure(struct scsi_device *sdev)unsigned long flags =0 ;spin_lock_irqsave (shost->host_lock, flags); -if (sdev->type ==TYPE_DISK ) +if (sdev->type ==TYPE_DISK ) { sdev->allow_restart =1 ; +blk_queue_rq_timeout (sdev->request_queue,120 *HZ ); + }spin_unlock_irqrestore (shost->host_lock, flags);return 0 ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 36/57 ALSA: hda: Add Cometlake-R PCI ID
In reply to Greg Kroah-HartmanFrom: Kai-Chuan Hsieh <[email protected]>
[ Upstream commit f84d3a1ec375e46a55cc3ba85c04272b24bd3921 ]
Add HD Audio Device PCI ID for the Intel Cometlake-R platform
--- sound/pci/hda/hda_intel.c | 3 +++ 1 file changed, 3 insertions(+)
sound/pci/hda/hda_intel.c +3 -0
@@ -2484,6 +2484,9 @@ static const struct pci_device_id azx_ids[] = {/* CometLake-S */ { PCI_DEVICE(0x8086, 0xa3f0), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, + /* CometLake-R */ + { PCI_DEVICE(0x8086, 0xf0c8), + .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Icelake */ { PCI_DEVICE(0x8086, 0x34c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 37/57 i2c: tegra: Create i2c_writesl_vi() to use with VI I2C for filling TX FIFO
In reply to Greg Kroah-HartmanFrom: Sowjanya Komatineni <[email protected]>
[ Upstream commit 2f3a0828d46166d4e7df227479ed31766ee67e4a ]
VI I2C controller has known hardware bug where immediate multiple writes to TX_FIFO register gets stuck.
Recommended software work around is to read I2C register after each write to TX_FIFO register to flush out the data.
This patch implements this work around for VI I2C controller.
--- drivers/i2c/busses/i2c-tegra.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-tegra.c +21 -1
@@ -326,6 +326,8 @@ static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val, unsigned int reg)/* read back register to make sure that register writes completed */ if (reg !=I2C_TX_FIFO )readl_relaxed (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg)); +else if (i2c_dev->is_vi) +readl_relaxed (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev,I2C_INT_STATUS )); }static u32 i2c_readl (struct tegra_i2c_dev *i2c_dev,unsigned int reg)
@@ -339,6 +341,21 @@ static void i2c_writesl(struct tegra_i2c_dev *i2c_dev, void *data,writesl (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg), data, len); } +static void i2c_writesl_vi (struct tegra_i2c_dev *i2c_dev,void *data, +unsigned int reg,unsigned int len) +{ +u32 *data32 = data; + +/* +* VI I2C controller has known hardware bug where writes get stuck +* when immediate multiple writes happen to TX_FIFO register. +* Recommended software work around is to read I2C register after +* each write to TX_FIFO register to flush out the data. +*/ +while (len--) +i2c_writel (i2c_dev, *data32++, reg); +} +static void i2c_readsl (struct tegra_i2c_dev *i2c_dev,void *data,unsigned int reg,unsigned int len) {
@@ -811,7 +828,10 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) i2c_dev->msg_buf_remaining = buf_remaining; i2c_dev->msg_buf = buf + words_to_transfer *BYTES_PER_FIFO_WORD ; -i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer); +if (i2c_dev->is_vi) +i2c_writesl_vi (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer); +else +i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer); buf += words_to_transfer *BYTES_PER_FIFO_WORD ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 38/57 udf: fix the problem that the disc content is not displayed
In reply to Greg Kroah-HartmanFrom: lianzhi chang <[email protected]>
[ Upstream commit 5cdc4a6950a883594e9640b1decb3fcf6222a594 ]
When the capacity of the disc is too large (assuming the 4.7G specification), the disc (UDF file system) will be burned multiple times in the windows (Multisession Usage). When the remaining capacity of the CD is less than 300M (estimated value, for reference only), open the CD in the Linux system, the content of the CD is displayed as blank (the kernel will say "No VRS found"). Windows can display the contents of the CD normally.
Through analysis, in the "fs/udf/super.c": udf_check_vsd function, the actual value of VSD_MAX_SECTOR_OFFSET may be much larger than 0x800000. According to the current code logic, it is found that the type of sbi->s_session is "__s32",
when the remaining capacity of the disc is less than 300M
(take a set of test values: sector=3154903040, sbi->s_session=1540464, sb->s_blocksize_bits=11 ), the calculation result of "sbi->s_session << sb->s_blocksize_bits"
will overflow. Therefore, it is necessary to convert the
type of s_session to "loff_t" (when udf_check_vsd starts, assign a value to _sector, which is also converted in this way), so that the result will not overflow, and then the content of the disc can be displayed normally.
--- fs/udf/super.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/udf/super.c +4 -3
@@ -705,6 +705,7 @@ static int udf_check_vsd(struct super_block *sb)struct buffer_head *bh =NULL ;int nsr =0 ;struct udf_sb_info *sbi; +loff_t session_offset; sbi =UDF_SB (sb);if (sb->s_blocksize <sizeof (struct volStructDesc ))
@@ -712,7 +713,8 @@ static int udf_check_vsd(struct super_block *sb)else sectorsize = sb->s_blocksize; - sector += (((loff_t )sbi->s_session) << sb->s_blocksize_bits); + session_offset = (loff_t )sbi->s_session << sb->s_blocksize_bits; + sector += session_offset; udf_debug("Starting at sector %u (%lu byte sectors)\n", (unsigned int)(sector >> sb->s_blocksize_bits),
@@ -757,8 +759,7 @@ static int udf_check_vsd(struct super_block *sb)if (nsr >0 )return 1 ; -else if (!bh && sector - (sbi->s_session << sb->s_blocksize_bits) == -VSD_FIRST_SECTOR_OFFSET ) +else if (!bh && sector - session_offset ==VSD_FIRST_SECTOR_OFFSET )return -1 ;else return 0 ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 39/57 nvme: check the PRINFO bit before deciding the host buffer length
In reply to Greg Kroah-HartmanFrom: Revanth Rajashekar <[email protected]>
[ Upstream commit 4d6b1c95b974761c01cbad92321b82232b66d2a2 ]
According to NVMe spec v1.4, section 8.3.1, the PRINFO bit and the metadata size play a vital role in deteriming the host buffer size.
If PRIFNO bit is set and MS==8, the host doesn't add the metadata buffer, instead the controller adds it.
--- drivers/nvme/host/core.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +15 -2
@@ -1489,8 +1489,21 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) } length = (io.nblocks +1 ) << ns->lba_shift; - meta_len = (io.nblocks +1 ) * ns->ms; - metadata =nvme_to_user_ptr (io.metadata); + +if ((io.control &NVME_RW_PRINFO_PRACT ) && + ns->ms ==sizeof (struct t10_pi_tuple )) { +/* +* Protection information is stripped/inserted by the +* controller. +*/ +if (nvme_to_user_ptr (io.metadata)) +return -EINVAL ; + meta_len =0 ; + metadata =NULL ; + }else { + meta_len = (io.nblocks +1 ) * ns->ms; + metadata =nvme_to_user_ptr (io.metadata); + }if (ns->features &NVME_NS_EXT_LBAS ) { length += meta_len;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 40/57 nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
In reply to Greg Kroah-HartmanFrom: Chao Leng <[email protected]>
[ Upstream commit 7674073b2ed35ac951a49c425dec6b39d5a57140 ]
A crash happens when inject completing request long time(nearly 30s). Each name space has a request queue, when inject completing request long time, multi request queues may have time out requests at the same time, nvme_rdma_timeout will execute concurrently. Multi requests in different request queues may be queued in the same rdma queue, multi nvme_rdma_timeout may call nvme_rdma_stop_queue at the same time. The first nvme_rdma_timeout will clear NVME_RDMA_Q_LIVE and continue stopping the rdma queue(drain qp), but the others check NVME_RDMA_Q_LIVE is already cleared, and then directly complete the requests, complete request before the qp is fully drained may lead to a use-after-free condition.
Add a multex lock to serialize nvme_rdma_stop_queue.
--- drivers/nvme/host/rdma.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/nvme/host/rdma.c +11 -4
@@ -97,6 +97,7 @@ struct nvme_rdma_queue {struct completion cm_done;bool pi_support;int cq_size; +struct mutex queue_lock; };struct nvme_rdma_ctrl {
@@ -579,6 +580,7 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl,int ret; queue = &ctrl->queues[idx]; +mutex_init (&queue->queue_lock); queue->ctrl = ctrl;if (idx && ctrl->ctrl.max_integrity_segments) queue->pi_support = true;
@@ -598,7 +600,8 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl,if (IS_ERR (queue->cm_id)) {dev_info (ctrl->ctrl.device,"failed to create CM ID: %ld\n" ,PTR_ERR (queue->cm_id)); -return PTR_ERR (queue->cm_id); + ret =PTR_ERR (queue->cm_id); + goto out_destroy_mutex; }if (ctrl->ctrl.opts->mask &NVMF_OPT_HOST_TRADDR )
@@ -628,6 +631,8 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl, out_destroy_cm_id:rdma_destroy_id (queue->cm_id);nvme_rdma_destroy_queue_ib (queue); +out_destroy_mutex: +mutex_destroy (&queue->queue_lock);return ret; }
@@ -639,9 +644,10 @@ static void __nvme_rdma_stop_queue(struct nvme_rdma_queue *queue)static void nvme_rdma_stop_queue (struct nvme_rdma_queue *queue) { -if (!test_and_clear_bit (NVME_RDMA_Q_LIVE , &queue->flags)) -return ; -__nvme_rdma_stop_queue (queue); +mutex_lock (&queue->queue_lock); +if (test_and_clear_bit (NVME_RDMA_Q_LIVE , &queue->flags)) +__nvme_rdma_stop_queue (queue); +mutex_unlock (&queue->queue_lock); }static void nvme_rdma_free_queue (struct nvme_rdma_queue *queue)
@@ -651,6 +657,7 @@ static void nvme_rdma_free_queue(struct nvme_rdma_queue *queue)nvme_rdma_destroy_queue_ib (queue);rdma_destroy_id (queue->cm_id); +mutex_destroy (&queue->queue_lock); }static void nvme_rdma_free_io_queues (struct nvme_rdma_ctrl *ctrl)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 41/57 nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
In reply to Greg Kroah-HartmanFrom: Chao Leng <[email protected]>
[ Upstream commit 9ebbfe495ecd2e51bc92ac21ed5817c3b9e223ce ]
Each name space has a request queue, if complete request long time, multi request queues may have time out requests at the same time, nvme_tcp_timeout will execute concurrently. Multi requests in different request queues may be queued in the same tcp queue, multi nvme_tcp_timeout may call nvme_tcp_stop_queue at the same time. The first nvme_tcp_stop_queue will clear NVME_TCP_Q_LIVE and continue stopping the tcp queue(cancel io_work), but the others check NVME_TCP_Q_LIVE is already cleared, and then directly complete the requests, complete request before the io work is completely canceled may lead to a use-after-free condition.
Add a multex lock to serialize nvme_tcp_stop_queue.
--- drivers/nvme/host/tcp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/nvme/host/tcp.c +10 -4
@@ -76,6 +76,7 @@ struct nvme_tcp_queue {struct work_struct io_work;int io_cpu; +struct mutex queue_lock;struct mutex send_mutex;struct llist_head req_list;struct list_head send_list;
@@ -1219,6 +1220,7 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid)sock_release (queue->sock);kfree (queue->pdu); +mutex_destroy (&queue->queue_lock); }static int nvme_tcp_init_connection (struct nvme_tcp_queue *queue)
@@ -1380,6 +1382,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,struct nvme_tcp_queue *queue = &ctrl->queues[qid];int ret, rcv_pdu_size; +mutex_init (&queue->queue_lock); queue->ctrl = ctrl;init_llist_head (&queue->req_list);INIT_LIST_HEAD (&queue->send_list);
@@ -1398,7 +1401,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,if (ret) {dev_err (nctrl->device,"failed to create socket: %d\n" , ret); -return ret; + goto err_destroy_mutex; }/* Single syn retry */
@@ -1507,6 +1510,8 @@ err_crypto: err_sock:sock_release (queue->sock); queue->sock =NULL ; +err_destroy_mutex: +mutex_destroy (&queue->queue_lock);return ret; }
@@ -1534,9 +1539,10 @@ static void nvme_tcp_stop_queue(struct nvme_ctrl *nctrl, int qid)struct nvme_tcp_ctrl *ctrl =to_tcp_ctrl (nctrl);struct nvme_tcp_queue *queue = &ctrl->queues[qid]; -if (!test_and_clear_bit (NVME_TCP_Q_LIVE , &queue->flags)) -return ; -__nvme_tcp_stop_queue (queue); +mutex_lock (&queue->queue_lock); +if (test_and_clear_bit (NVME_TCP_Q_LIVE , &queue->flags)) +__nvme_tcp_stop_queue (queue); +mutex_unlock (&queue->queue_lock); }static int nvme_tcp_start_queue (struct nvme_ctrl *nctrl,int idx)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 42/57 nvme-pci: allow use of cmb on v1.4 controllers
In reply to Greg Kroah-HartmanFrom: Klaus Jensen <[email protected]>
[ Upstream commit 20d3bb92e84d417b0494a3b6867f0c86713db257 ]
Since NVMe v1.4 the Controller Memory Buffer must be explicitly enabled by the host.
--- drivers/nvme/host/pci.c | 14 ++++++++++++++ include/linux/nvme.h | 6 ++++++ 2 files changed, 20 insertions(+)
drivers/nvme/host/pci.c +14 -0
@@ -23,6 +23,7 @@#include <linux/t10-pi.h> #include <linux/types.h> #include <linux/io-64-nonatomic-lo-hi.h> +#include <linux/io-64-nonatomic-hi-lo.h> #include <linux/sed-opal.h> #include <linux/pci-p2pdma.h>
@@ -1825,6 +1826,9 @@ static void nvme_map_cmb(struct nvme_dev *dev)if (dev->cmb_size)return ; +if (NVME_CAP_CMBS (dev->ctrl.cap)) +writel (NVME_CMBMSC_CRE , dev->bar +NVME_REG_CMBMSC ); + dev->cmbsz =readl (dev->bar +NVME_REG_CMBSZ );if (!dev->cmbsz)return ;
@@ -1838,6 +1842,16 @@ static void nvme_map_cmb(struct nvme_dev *dev)if (offset > bar_size)return ; +/* +* Tell the controller about the host side address mapping the CMB, +* and enable CMB decoding for the NVMe 1.4+ scheme: +*/ +if (NVME_CAP_CMBS (dev->ctrl.cap)) { +hi_lo_writeq (NVME_CMBMSC_CRE |NVME_CMBMSC_CMSE | + (pci_bus_address (pdev, bar) + offset), + dev->bar +NVME_REG_CMBMSC ); + } +/* * Controllers may support a CMB size larger than their BAR, * for example, due to being behind a bridge. Reduce the CMB to
include/linux/nvme.h +6 -0
@@ -116,6 +116,9 @@ enum {NVME_REG_BPMBL =0x0048 ,/* Boot Partition Memory Buffer * Location */ +NVME_REG_CMBMSC =0x0050 ,/* Controller Memory Buffer Memory +* Space Control +*/ NVME_REG_PMRCAP =0x0e00 ,/* Persistent Memory Capabilities */ NVME_REG_PMRCTL =0x0e04 ,/* Persistent Memory Region Control */ NVME_REG_PMRSTS = 0x0e08, /* Persistent Memory Region Status */
@@ -135,6 +138,7 @@ enum {#define NVME_CAP_CSS (cap) (((cap) >> 37) & 0xff)#define NVME_CAP_MPSMIN (cap) (((cap) >> 48) & 0xf)#define NVME_CAP_MPSMAX (cap) (((cap) >> 52) & 0xf) +#define NVME_CAP_CMBS (cap) (((cap) >> 57) & 0x1)#define NVME_CMB_BIR (cmbloc) ((cmbloc) & 0x7)#define NVME_CMB_OFST (cmbloc) (((cmbloc) >> 12) & 0xfffff)
@@ -192,6 +196,8 @@ enum {NVME_CSTS_SHST_OCCUR =1 <<2 ,NVME_CSTS_SHST_CMPLT =2 <<2 ,NVME_CSTS_SHST_MASK =3 <<2 , +NVME_CMBMSC_CRE =1 <<0 , + NVME_CMBMSC_CMSE = 1 << 1, }; struct nvme_id_power_state {
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 43/57 nvmet: set right status on error in id-ns handler
In reply to Greg Kroah-HartmanFrom: Chaitanya Kulkarni <[email protected]>
[ Upstream commit bffcd507780ea614b5543c66f2e37ce0d55cd449 ]
The function nvmet_execute_identify_ns() doesn't set the status if call to nvmet_find_namespace() fails. In that case we set the status of the request to the value return by the nvmet_copy_sgl().
Set the status to NVME_SC_INVALID_NS and adjust the code such that request will have the right status on nvmet_find_namespace() failure.
Without this patch :-
NVME Identify Namespace 3:
nsze : 0
ncap : 0
nuse : 0
nsfeat : 0
nlbaf : 0
flbas : 0
mc : 0
dpc : 0
dps : 0
nmic : 0
rescap : 0
fpi : 0
dlfeat : 0
nawun : 0
nawupf : 0
nacwu : 0
nabsn : 0
nabo : 0
nabspf : 0
noiob : 0
nvmcap : 0
mssrl : 0
mcl : 0
msrc : 0
nsattr : 0
nvmsetid: 0
anagrpid: 0
endgid : 0
nguid : 00000000000000000000000000000000
eui64 : 0000000000000000
lbaf 0 : ms:0 lbads:0 rp:0 (in use)
With this patch-series :-feb3b88b501e (HEAD -> nvme-5.11) nvmet: remove extra variable in identify ns 6302aa67210a nvmet: remove extra variable in id-desclist ed57951da453 nvmet: remove extra variable in smart log nsid be384b8c24dc nvmet: set right status on error in id-ns handler
NVMe status: INVALID_NS: The namespace or the format of that namespace is invalid(0xb)
--- drivers/nvme/target/admin-cmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/nvme/target/admin-cmd.c +6 -2
@@ -487,8 +487,10 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)/* return an all zeroed buffer if we can't find an active namespace */ ns =nvmet_find_namespace (ctrl, req->cmd->identify.nsid); -if (!ns) +if (!ns) { + status =NVME_SC_INVALID_NS ; goto done; + }nvmet_ns_revalidate (ns);
@@ -541,7 +543,9 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req) id->nsattr |= (1 <<0 );nvmet_put_namespace (ns); done: - status =nvmet_copy_to_sgl (req,0 , id,sizeof (*id)); +if (!status) + status =nvmet_copy_to_sgl (req,0 , id,sizeof (*id)); +kfree (id); out:nvmet_req_complete (req, status);
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 44/57 platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control
In reply to Greg Kroah-HartmanFrom: Jeannie Stevenson <[email protected]>
[ Upstream commit 173aac2fef96972e42d33c0e1189e6f756a0d719 ]
This commit enables dual fan control for the new Lenovo P53 and P73 laptop models.
--- drivers/platform/x86/thinkpad_acpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/thinkpad_acpi.c +1 -0
@@ -8782,6 +8782,7 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = {TPACPI_Q_LNV3 ('N' ,'1' ,'T' ,TPACPI_FAN_2CTL ),/* P71 */ TPACPI_Q_LNV3 ('N' ,'1' ,'U' ,TPACPI_FAN_2CTL ),/* P51 */ TPACPI_Q_LNV3 ('N' ,'2' ,'C' ,TPACPI_FAN_2CTL ),/* P52 / P72 */ +TPACPI_Q_LNV3 ('N' ,'2' ,'N' ,TPACPI_FAN_2CTL ),/* P53 / P73 */ TPACPI_Q_LNV3 ('N' ,'2' ,'E' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (1st gen) */ TPACPI_Q_LNV3 ('N' ,'2' ,'O' ,TPACPI_FAN_2CTL ),/* P1 / X1 Extreme (2nd gen) */ TPACPI_Q_LNV3('N', '2', 'V', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (3nd gen) */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 45/57 selftests/powerpc: Only test lwm/stmw on big endian
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit dd3a44c06f7b4f14e90065bf05d62c255b20005f ]
Newer binutils (>= 2.36) refuse to assemble lmw/stmw when building in little endian mode. That breaks compilation of our alignment handler test:
/tmp/cco4l14N.s: Assembler messages:
/tmp/cco4l14N.s:1440: Error: lmw' invalid when little-endian /tmp/cco4l14N.s:1814: Error: stmw' invalid when little-endian
make[2]: *** [../../lib.mk:139: /output/kselftest/powerpc/alignment/alignment_handler] Error 1
These tests do pass on little endian machines, as the kernel will still emulate those instructions even when running little endian (which is arguably a kernel bug).
But we don't really need to test that case, so ifdef those instructions out to get the alignment test building again.
--- .../testing/selftests/powerpc/alignment/alignment_handler.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/testing/selftests/powerpc/alignment/alignment_handler.c +4 -1
@@ -443,7 +443,6 @@ int test_alignment_handler_integer(void)LOAD_DFORM_TEST (ldu);LOAD_XFORM_TEST (ldx);LOAD_XFORM_TEST (ldux); -LOAD_DFORM_TEST (lmw);STORE_DFORM_TEST (stb);STORE_XFORM_TEST (stbx);STORE_DFORM_TEST (stbu);
@@ -462,7 +461,11 @@ int test_alignment_handler_integer(void)STORE_XFORM_TEST (stdx);STORE_DFORM_TEST (stdu);STORE_XFORM_TEST (stdux); + +#ifdef __BIG_ENDIAN__ +LOAD_DFORM_TEST (lmw);STORE_DFORM_TEST (stmw); +#endif return rc; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 46/57 drm/amd/display: Update dram_clock_change_latency for DCN2.1
In reply to Greg Kroah-HartmanFrom: Jake Wang <[email protected]>
[ Upstream commit 901c1ec05ef277ce9d43cb806a225b28b3efe89a ]
[WHY]
dram clock change latencies get updated using ddr4 latency table, but does that update does not happen before validation. This value should not be the default and should be number received from df for better mode support.
This may cause a PState hang on high refresh panels with short vblanks such as on 1080p 360hz or 300hz panels.
[HOW]
Update latency from 23.84 to 11.72.
--- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1 -1
@@ -295,7 +295,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn2_1_soc = { .num_banks = 8, .num_chans = 4, .vmm_page_size_bytes = 4096, - .dram_clock_change_latency_us = 23.84, + .dram_clock_change_latency_us = 11.72, .return_bus_width_bytes = 64, .dispclk_dppclk_vco_speed_mhz = 3600, .xfc_bus_transport_time_us = 4,
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 47/57 drm/amd/display: Allow PSTATE chnage when no displays are enabled
In reply to Greg Kroah-HartmanFrom: Aric Cyr <[email protected]>
[ Upstream commit 8bc3d461d0a95bbcc2a0a908bbadc87e198a86a8 ]
[Why]
When no displays are currently enabled, display driver should not disallow PSTATE switching.
[How]
Allow PSTATE switching if either the active configuration supports it, or there are no active displays.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +4 -2
@@ -239,6 +239,7 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,struct dmcu *dmcu = clk_mgr_base->ctx->dc->res_pool->dmcu;bool force_reset = false;bool update_uclk = false; +bool p_state_change_support;if (dc->work_arounds.skip_clock_update || !clk_mgr->smu_present)return ;
@@ -279,8 +280,9 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base, clk_mgr_base->clks.socclk_khz = new_clocks->socclk_khz; clk_mgr_base->clks.prev_p_state_change_support = clk_mgr_base->clks.p_state_change_support; -if (should_update_pstate_support (safe_to_lower, new_clocks->p_state_change_support, clk_mgr_base->clks.p_state_change_support)) { - clk_mgr_base->clks.p_state_change_support = new_clocks->p_state_change_support; + p_state_change_support = new_clocks->p_state_change_support || (display_count ==0 ); +if (should_update_pstate_support (safe_to_lower, p_state_change_support, clk_mgr_base->clks.p_state_change_support)) { + clk_mgr_base->clks.p_state_change_support = p_state_change_support;/* to disable P-State switching, set UCLK min = max */ if (!clk_mgr_base->clks.p_state_change_support)
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 48/57 drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping
In reply to Greg Kroah-HartmanFrom: Bing Guo <[email protected]>
[ Upstream commit 4716a7c50c5c66d6ddc42401e1e0ba13b492e105 ]
Why:
Function decide_dp_link_settings() loops infinitely when required bandwidth can't be supported.
How:
Check the required bandwidth against verified_link_cap before trying to find a link setting for it.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +3 -0
@@ -2375,6 +2375,9 @@ static bool decide_dp_link_settings(struct dc_link *link, struct dc_link_setting initial_link_setting;uint32_t link_bw; +if (req_bw >dc_link_bandwidth_kbps (link, &link->verified_link_cap)) +return false; +/* search for the minimum link setting that: * 1. is supported according to the link training result * 2. could support the b/w requested by the timing
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 49/57 drm/amd/display: Use hardware sequencer functions for PG control
In reply to Greg Kroah-HartmanFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit c74f865f14318217350aa33363577cb95b06eb82 ]
[Why & How]
These can differ per ASIC or not be present. Don't call the dcn20 ones directly but rather the ones defined by the ASIC init table.
--- .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 18 ++++++++++++++---- .../gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 +++++++-- 2 files changed, 21 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +14 -4
@@ -646,8 +646,13 @@ static void power_on_plane(if (REG (DC_IP_REQUEST_CNTL )) {REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,1 ); - hws->funcs.dpp_pg_control (hws, plane_id, true); - hws->funcs.hubp_pg_control (hws, plane_id, true); + +if (hws->funcs.dpp_pg_control) + hws->funcs.dpp_pg_control (hws, plane_id, true); + +if (hws->funcs.hubp_pg_control) + hws->funcs.hubp_pg_control (hws, plane_id, true); +REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,0 ); DC_LOG_DEBUG(
@@ -1079,8 +1084,13 @@ void dcn10_plane_atomic_power_down(struct dc *dc,if (REG (DC_IP_REQUEST_CNTL )) {REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,1 ); - hws->funcs.dpp_pg_control (hws, dpp->inst, false); - hws->funcs.hubp_pg_control (hws, hubp->inst, false); + +if (hws->funcs.dpp_pg_control) + hws->funcs.dpp_pg_control (hws, dpp->inst, false); + +if (hws->funcs.hubp_pg_control) + hws->funcs.hubp_pg_control (hws, hubp->inst, false); + dpp->funcs->dpp_reset (dpp);REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,0 );
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +7 -2
@@ -1069,8 +1069,13 @@ static void dcn20_power_on_plane(if (REG (DC_IP_REQUEST_CNTL )) {REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,1 ); -dcn20_dpp_pg_control (hws, pipe_ctx->plane_res.dpp->inst, true); -dcn20_hubp_pg_control (hws, pipe_ctx->plane_res.hubp->inst, true); + +if (hws->funcs.dpp_pg_control) + hws->funcs.dpp_pg_control (hws, pipe_ctx->plane_res.dpp->inst, true); + +if (hws->funcs.hubp_pg_control) + hws->funcs.hubp_pg_control (hws, pipe_ctx->plane_res.hubp->inst, true); +REG_SET (DC_IP_REQUEST_CNTL ,0 ,IP_REQUEST_EN ,0 ); DC_LOG_DEBUG(
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 50/57 drm/amd/display: Fixed corruptions on HPDRX link loss restore
In reply to Greg Kroah-HartmanFrom: Vladimir Stempen <[email protected]>
[ Upstream commit 4b08d8c78360241d270396a9de6eb774e88acd00 ]
[why]
Heavy corruption or blank screen reported on wake, with 6k display connected and FEC enabled
[how]
When Disable/Enable stream for display pipes on HPDRX, DC should take into account ODM split pipes.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -2
@@ -3023,14 +3023,14 @@ bool dc_link_handle_hpd_rx_irq(struct dc_link *link, union hpd_irq_data *out_hpdfor (i =0 ; i <MAX_PIPES ; i++) { pipe_ctx = &link->dc->current_state->res_ctx.pipe_ctx[i];if (pipe_ctx && pipe_ctx->stream && !pipe_ctx->stream->dpms_off && - pipe_ctx->stream->link == link) + pipe_ctx->stream->link == link && !pipe_ctx->prev_odm_pipe)core_link_disable_stream (pipe_ctx); }for (i =0 ; i <MAX_PIPES ; i++) { pipe_ctx = &link->dc->current_state->res_ctx.pipe_ctx[i];if (pipe_ctx && pipe_ctx->stream && !pipe_ctx->stream->dpms_off && - pipe_ctx->stream->link == link) + pipe_ctx->stream->link == link && !pipe_ctx->prev_odm_pipe)core_link_enable_stream (link->dc->current_state, pipe_ctx); }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 51/57 habanalabs: zero pci counters packet before submit to FW
In reply to Greg Kroah-HartmanFrom: Ofir Bitton <[email protected]>
[ Upstream commit 9354f1b421f76f8368be13954f87d07bcbd6fffe ]
Driver does not zero some pci counters packets before sending to FW. This causes an out of sync PI/CI between driver and FW.
--- drivers/misc/habanalabs/common/firmware_if.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/misc/habanalabs/common/firmware_if.c +5 -0
@@ -385,6 +385,10 @@ int hl_fw_cpucp_pci_counters_get(struct hl_device *hdev, } counters->rx_throughput = result; +memset (&pkt,0 ,sizeof (pkt)); + pkt.ctl =cpu_to_le32 (CPUCP_PACKET_PCIE_THROUGHPUT_GET << +CPUCP_PKT_CTL_OPCODE_SHIFT ); +/* Fetch PCI tx counter */ pkt.index =cpu_to_le32 (cpucp_pcie_throughput_tx); rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),
@@ -397,6 +401,7 @@ int hl_fw_cpucp_pci_counters_get(struct hl_device *hdev, counters->tx_throughput = result;/* Fetch PCI replay counter */ +memset (&pkt,0 ,sizeof (pkt)); pkt.ctl =cpu_to_le32 (CPUCP_PACKET_PCIE_REPLAY_CNT_GET <<CPUCP_PKT_CTL_OPCODE_SHIFT );
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 52/57 habanalabs: fix backward compatibility of idle check
In reply to Greg Kroah-HartmanFrom: Oded Gabbay <[email protected]>
[ Upstream commit f8abaf379bfe19600f96ae79a6759eb37039ae05 ]
Need to take the lower 32 bits of the driver's 64-bit idle mask and put it in the legacy 32-bit variable that the userspace reads to know the idle mask.
--- drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/habanalabs/common/habanalabs_ioctl.c +2 -0
@@ -133,6 +133,8 @@ static int hw_idle(struct hl_device *hdev, struct hl_info_args *args) hw_idle.is_idle = hdev->asic_funcs->is_device_idle (hdev, &hw_idle.busy_engines_mask_ext,NULL ); + hw_idle.busy_engines_mask = +lower_32_bits (hw_idle.busy_engines_mask_ext);return copy_to_user (out, &hw_idle,min ((size_t ) max_size,sizeof (hw_idle))) ? -EFAULT :0 ;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 53/57 habanalabs: disable FW events on device removal
In reply to Greg Kroah-HartmanFrom: Oded Gabbay <[email protected]>
[ Upstream commit 2dc4a6d79168e7e426e8ddf8e7219c9ffd13b2b1 ]
When device is removed, we need to make sure the F/W won't send us any more events because during the remove process we disable the interrupts.
--- drivers/misc/habanalabs/common/device.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/misc/habanalabs/common/device.c +9 -0
@@ -1425,6 +1425,15 @@ void hl_device_fini(struct hl_device *hdev) } } +/* Disable PCI access from device F/W so it won't send us additional +* interrupts. We disable MSI/MSI-X at the halt_engines function and we +* can't have the F/W sending us interrupts after that. We need to +* disable the access here because if the device is marked disable, the +* message won't be send. Also, in case of heartbeat, the device CPU is +* marked as disable so this message won't be sent +*/ +hl_fw_send_pci_access_msg (hdev,CPUCP_PACKET_DISABLE_PCI_ACCESS ); +/* Mark device as disabled */ hdev->disabled = true;
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 54/57 objtool: Dont fail the kernel build on fatal errors
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit 655cf86548a3938538642a6df27dd359e13c86bd ]
This is basically a revert of commit 644592d32837 ("objtool: Fail the kernel build on fatal errors").
That change turned out to be more trouble than it's worth. Failing the build is an extreme measure which sometimes gets too much attention and blocks CI build testing.
These fatal-type warnings aren't yet as rare as we'd hope, due to the ever-increasing matrix of supported toolchains/plugins and their fast-changing nature as of late.
Also, there are more people (and bots) looking for objtool warnings than ever before, so even non-fatal warnings aren't likely to be ignored for long.
--- tools/objtool/check.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
tools/objtool/check.c +5 -9
@@ -2921,14 +2921,10 @@ int check(struct objtool_file *file) warnings += ret; out: -if (ret <0 ) { -/* -* Fatal error. The binary is corrupt or otherwise broken in -* some way, or objtool itself is broken. Fail the kernel -* build. -*/ -return ret; - } - +/* +* For now, don't fail the kernel build on fatal warnings. These +* errors are still fairly common due to the growing matrix of +* supported toolchains and their recent pace of change. +*/ return 0 ; }
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 55/57 x86/cpu: Add another Alder Lake CPU to the Intel family
In reply to Greg Kroah-HartmanFrom: Gayatri Kammela <[email protected]>
[ Upstream commit 6e1239c13953f3c2a76e70031f74ddca9ae57cd3 ]
Add Alder Lake mobile CPU model number to Intel family.
--- arch/x86/include/asm/intel-family.h | 1 + 1 file changed, 1 insertion(+)
arch/x86/include/asm/intel-family.h +1 -0
@@ -97,6 +97,7 @@#define INTEL_FAM6_LAKEFIELD 0x8A#define INTEL_FAM6_ALDERLAKE 0x97 +#define INTEL_FAM6_ALDERLAKE_L 0x9A/* "Small Core" Processors (Atom) */
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 56/57 kthread: Extract KTHREAD_IS_PER_CPU
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit ac687e6e8c26181a33270efd1a2e2241377924b0 ]
There is a need to distinguish geniune per-cpu kthreads from kthreads that happen to have a single CPU affinity.
Geniune per-cpu kthreads are kthreads that are CPU affine for correctness, these will obviously have PF_KTHREAD set, but must also have PF_NO_SETAFFINITY set, lest userspace modify their affinity and ruins things.
However, these two things are not sufficient, PF_NO_SETAFFINITY is also set on other tasks that have their affinities controlled through other means, like for instance workqueues.
Therefore another bit is needed; it turns out kthread_create_per_cpu() already has such a bit: KTHREAD_IS_PER_CPU, which is used to make kthread_park()/kthread_unpark() work correctly.
Expose this flag and remove the implicit setting of it from kthread_create_on_cpu(); the io_uring usage of it seems dubious at best.
--- include/linux/kthread.h | 3 +++ kernel/kthread.c | 27 ++++++++++++++++++++++++++- kernel/smpboot.c | 1 + 3 files changed, 30 insertions(+), 1 deletion(-)
include/linux/kthread.h +3 -0
@@ -33,6 +33,9 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),unsigned int cpu, const char *namefmt); +void kthread_set_per_cpu (struct task_struct *k,int cpu); +bool kthread_is_per_cpu (struct task_struct *k); +/** * kthread_run - create and wake a thread. * @threadfn: the function to run until signal_pending(current).
kernel/kthread.c +26 -1
@@ -493,11 +493,36 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),return p;kthread_bind (p, cpu);/* CPU hotplug need to bind once again when unparking the thread. */ -set_bit (KTHREAD_IS_PER_CPU , &to_kthread (p)->flags);to_kthread (p)->cpu = cpu;return p; } +void kthread_set_per_cpu (struct task_struct *k,int cpu) +{ +struct kthread *kthread =to_kthread (k); +if (!kthread) +return ; + +WARN_ON_ONCE (!(k->flags &PF_NO_SETAFFINITY )); + +if (cpu <0 ) { +clear_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +return ; + } + + kthread->cpu = cpu; +set_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +} + +bool kthread_is_per_cpu (struct task_struct *k) +{ +struct kthread *kthread =to_kthread (k); +if (!kthread) +return false; + +return test_bit (KTHREAD_IS_PER_CPU , &kthread->flags); +} +/** * kthread_unpark - unpark a thread created by kthread_create(). * @k: thread created by kthread_create().
kernel/smpboot.c +1 -0
@@ -188,6 +188,7 @@ __smpboot_create_thread(struct smp_hotplug_thread *ht, unsigned int cpu)kfree (td);return PTR_ERR (tsk); } +kthread_set_per_cpu (tsk, cpu);/* * Park the thread so that it could start right on the CPU * when it is available.
Signature · 1 line
2.27.0
Greg Kroah-Hartman
maintainerPATCH 57/57 workqueue: Restrict affinity change to rescuer
In reply to Greg Kroah-HartmanFrom: Peter Zijlstra <[email protected]>
[ Upstream commit 640f17c82460e9724fd256f0a1f5d99e7ff0bda4 ]
create_worker() will already set the right affinity using kthread_bind_mask(), this means only the rescuer will need to change it's affinity.
Howveer, while in cpu-hot-unplug a regular task is not allowed to run on online&&!active as it would be pushed away quite agressively. We need KTHREAD_IS_PER_CPU to survive in that environment.
Therefore set the affinity after getting that magic flag.
--- kernel/workqueue.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
kernel/workqueue.c +3 -6
@@ -1845,12 +1845,6 @@ static void worker_attach_to_pool(struct worker *worker, {mutex_lock (&wq_pool_attach_mutex); -/* -* set_cpus_allowed_ptr() will fail if the cpumask doesn't have any -* online CPUs. It'll be re-applied when any of the CPUs come up. -*/ -set_cpus_allowed_ptr (worker->task, pool->attrs->cpumask); -/* * The wq_pool_attach_mutex ensures %POOL_DISASSOCIATED remains * stable across this function. See the comments above the flag
@@ -1859,6 +1853,9 @@ static void worker_attach_to_pool(struct worker *worker,if (pool->flags &POOL_DISASSOCIATED ) worker->flags |=WORKER_UNBOUND ; +if (worker->rescue_wq) +set_cpus_allowed_ptr (worker->task, pool->attrs->cpumask); +list_add_tail (&worker->node, &pool->workers); worker->pool = pool;
Signature · 1 line
2.27.0
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.14 release. There are 57 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.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Greg Kroah-Hartman
maintainerQuoted 7 lines · Pavel Machek
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.14 release. There are 57 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.
Quoted 5 lines
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-5.10.y
Tested-by Pavel Machek (CIP) <[email protected]>
Thanks for testing some of these and letting me know.
greg k-h
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +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.10.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my machine(x86_64) without any dmesg regression. The compilation uses the default Debian .config(From kernel 4.19.0-14-amd64), followed by olddefconfig.
Best regards
---
Igor Matheus Andrade Torrente
Quoted 251 lines
-------------
Pseudo-Shortlog of commits:Greg Kroah-Hartman <[email protected]>
Linux 5.10.14-rc1Peter Zijlstra <[email protected]>
workqueue: Restrict affinity change to rescuerPeter Zijlstra <[email protected]>
kthread: ExtractKTHREAD_IS_PER_CPUGayatri Kammela <[email protected]>
x86/cpu: Add another Alder Lake CPU to the Intel familyJosh Poimboeuf <[email protected]>
objtool: Don't fail the kernel build on fatal errorsOded Gabbay <[email protected]>
habanalabs: disable FW events on device removalOded Gabbay <[email protected]>
habanalabs: fix backward compatibility of idle checkOfir Bitton <[email protected]>
habanalabs: zero pci counters packet before submit to FWVladimir Stempen <[email protected]>
drm/amd/display: Fixed corruptions on HPDRX link loss restoreNicholas Kazlauskas <[email protected]>
drm/amd/display: Use hardware sequencer functions for PG controlBing Guo <[email protected]>
drm/amd/display: Change functiondecide_dp_link_settingsto avoid infinite loopingAric Cyr <[email protected]>
drm/amd/display: Allow PSTATE chnage when no displays are enabledJake Wang <[email protected]>
drm/amd/display: Updatedram_clock_change_latencyfor DCN2.1Michael Ellerman <[email protected]>
selftests/powerpc: Only test lwm/stmw on big endianJeannie Stevenson <[email protected]>
platform/x86:thinkpad_acpi: Add P53/73 firmware tofan_quirk_tablefor dual fan controlChaitanya Kulkarni <[email protected]>
nvmet: set right status on error in id-ns handlerKlaus Jensen <[email protected]>
nvme-pci: allow use of cmb on v1.4 controllersChao Leng <[email protected]>
nvme-tcp: avoid request double completion for concurrentnvme_tcp_timeoutChao Leng <[email protected]>
nvme-rdma: avoid request double completion for concurrentnvme_rdma_timeoutRevanth Rajashekar <[email protected]>
nvme: check the PRINFO bit before deciding the host buffer lengthlianzhi chang <[email protected]>
udf: fix the problem that the disc content is not displayedSowjanya Komatineni <[email protected]>
i2c: tegra: Createi2c_writesl_vi()to use with VI I2C for filling TX FIFOKai-Chuan Hsieh <[email protected]>
ALSA: hda: Add Cometlake-R PCI IDBrian King <[email protected]>
scsi: ibmvfc: Set default timeout to avoid crash during migrationFelix Fietkau <[email protected]>
mac80211: fix encryption key selection for 802.3 xmitFelix Fietkau <[email protected]>
mac80211: fix fast-rx encryption checkShayne Chen <[email protected]>
mac80211: fix incorrect strlen of .write in debugfsJosh Poimboeuf <[email protected]>
objtool: Don't add empty symbols to the rbtreeKai Vehmanen <[email protected]>
ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vidKai-Heng Feng <[email protected]>
ASoC: SOF: Intel: hda: Resume codec to do jack detectionDinghao Liu <[email protected]>
scsi: fnic: Fix memleak invnic_dev_init_devcmd2Javed Hasan <[email protected]>
scsi: libfc: Avoid invoking response handler twice if ep is already completedMartin Wilck <[email protected]>
scsi:scsi_transport_srp: Don't block target in failfast statePeter Zijlstra <[email protected]>
x86: __always_inline __{rd,wr}msr()Peter Zijlstra <[email protected]>
locking/lockdep: Avoid noinstr warning forDEBUG_LOCKDEPOded Gabbay <[email protected]>
habanalabs: fixdma_addrpassed todma_mmap_coherentArnold Gozum <[email protected]>
platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352Hans de Goede <[email protected]>
platform/x86:touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tabletSrinivas Pandruvada <[email protected]>
tools/power/x86/intel-speed-select: Set higher ofcpuinfo_max_freqorbase_frequencySrinivas Pandruvada <[email protected]>
tools/power/x86/intel-speed-select: Setscaling_max_freqtobase_frequencyTony Lindgren <[email protected]>
phy: cpcap-usb: Fix warning for missingregulator_disableNadav Amit <[email protected]>
iommu/vt-d: Do not use flush-queue when caching-mode is onNick Desaulniers <[email protected]>
ARM: 9025/1:Kconfig:CPU_BIG_ENDIANdepends on !LD_IS_LLDMike Rapoport <[email protected]>
Revert "x86/setup: don't removeE820_TYPE_RAMfor pfn 0"Catalin Marinas <[email protected]>
arm64: Do not pass tagged addresses to__is_lm_address()Vincenzo Frascino <[email protected]>
arm64: Fix kernel address detection of__is_lm_address()Robin Murphy <[email protected]>
arm64: dts: meson: Describe G12b GPU as coherentRobin Murphy <[email protected]>
drm/panfrost: Support cache-coherent integrationsRobin Murphy <[email protected]>
iommu/io-pgtable-arm: Support coherency for Mali LPAELijun Pan <[email protected]>
ibmvnic: Ensure that CRQ entry read are correctly orderedRasmus Villemoes <[email protected]>
net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPPPan Bian <[email protected]>
net: dsa:bcm_sf2: put device node before returnIdo Schimmel <[email protected]>
mlxsw:spectrum_span: Do not overwrite policer configurationVoon Weifeng <[email protected]>
stmmac: intel: Configure EHL PSE0 GbE and PSE1 GbE to 32 bits DMA addressingKevin Hao <[email protected]>
net: octeontx2: Make sure the buffer is 128 byte alignedPan Bian <[email protected]>
net: fec: put child node on error pathPan Bian <[email protected]>
net: stmmac: dwmac-intel-plat: remove config data on errorMarek Vasut <[email protected]>
net: dsa: microchip: Adjust reset release timing to match reference reset circuit-------------
Diffstat:
Makefile | 4 +- arch/arm/mm/Kconfig | 1 + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 ++ arch/arm64/include/asm/memory.h | 10 ++--- arch/arm64/mm/physaddr.c | 2 +- arch/x86/include/asm/intel-family.h | 1 + arch/x86/include/asm/msr.h | 4 +- arch/x86/kernel/setup.c | 20 +++++----- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 6 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 7 +++- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 18 +++++++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 ++++- .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 2 +- drivers/gpu/drm/panfrost/panfrost_device.h | 1 + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + drivers/i2c/busses/i2c-tegra.c | 22 ++++++++++- drivers/iommu/intel/iommu.c | 5 +++ drivers/iommu/io-pgtable-arm.c | 11 +++++- drivers/misc/habanalabs/common/device.c | 9 +++++ drivers/misc/habanalabs/common/firmware_if.c | 5 +++ drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 + drivers/misc/habanalabs/gaudi/gaudi.c | 3 +- drivers/misc/habanalabs/goya/goya.c | 3 +- drivers/net/dsa/bcm_sf2.c | 8 +++- drivers/net/dsa/microchip/ksz_common.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 3 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 +++ .../ethernet/marvell/octeontx2/nic/otx2_common.c | 3 +- .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 +++ .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 + drivers/nvme/host/core.c | 17 ++++++++- drivers/nvme/host/pci.c | 14 +++++++ drivers/nvme/host/rdma.c | 15 ++++++-- drivers/nvme/host/tcp.c | 14 +++++-- drivers/nvme/target/admin-cmd.c | 8 +++- drivers/phy/motorola/phy-cpcap-usb.c | 19 +++++++--- drivers/platform/x86/intel-vbtn.c | 6 +++ drivers/platform/x86/thinkpad_acpi.c | 1 + drivers/platform/x86/touchscreen_dmi.c | 18 +++++++++ drivers/scsi/fnic/vnic_dev.c | 8 ++-- drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- drivers/scsi/libfc/fc_exch.c | 16 +++++++- drivers/scsi/scsi_transport_srp.c | 9 ++++- fs/udf/super.c | 7 ++-- include/linux/kthread.h | 3 ++ include/linux/nvme.h | 6 +++ kernel/kthread.c | 27 ++++++++++++- kernel/locking/lockdep.c | 7 +++- kernel/smpboot.c | 1 + kernel/workqueue.c | 9 ++--- net/mac80211/debugfs.c | 44 ++++++++++------------ net/mac80211/rx.c | 2 + net/mac80211/tx.c | 27 +++++++------ net/switchdev/switchdev.c | 23 ++++++----- sound/pci/hda/hda_intel.c | 6 +++ sound/pci/hda/patch_hdmi.c | 1 + sound/soc/sof/intel/hda-codec.c | 3 +- tools/objtool/check.c | 14 +++---- tools/objtool/elf.c | 7 ++++ tools/power/x86/intel-speed-select/isst-config.c | 32 ++++++++++++++++ .../powerpc/alignment/alignment_handler.c | 5 ++- 65 files changed, 427 insertions(+), 135 deletions(-)
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +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.10.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.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.
Summary
------------------------------------------------------------------------
kernel: 5.10.14-rc1
git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
git branch: linux-5.10.y
git commit: 58d18d6d116af323f12152b2e84a9e859a6d52dd
git describe: v5.10.13-58-g58d18d6d116a
Test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.10.y/build/v5.10.13-58-g58d18d6d116a
No regressions (compared to build v5.10.13)
No fixes (compared to build v5.10.13)
Ran 59907 total tests in the following environments and test suites.
Environments
--------------
- arc
- arm
- arm64
- dragonboard-410c
- hi6220-hikey
- i386
- juno-r2
- juno-r2-compat
- juno-r2-kasan
- mips
- nxp-ls2088
- nxp-ls2088-64k_page_size
- parisc
- powerpc
- qemu-arm-clang
- qemu-arm64-clang
- qemu-arm64-kasan
- qemu-i386-clang
- qemu-x86_64-clang
- qemu-x86_64-kasan
- qemu-x86_64-kcsan
- qemu_arm
- qemu_arm64
- qemu_arm64-compat
- qemu_i386
- qemu_x86_64
- qemu_x86_64-compat
- riscv
- s390
- sh
- sparc
- x15
- x86
- x86-kasan
- x86_64
Test Suites
-----------
* build
* linux-log-parser
* install-android-platform-tools-r2600
* kselftest-bpf
* kselftest-lib
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-tc-testing
* kvm-unit-tests
* libhugetlbfs
* ltp-commands-tests
* ltp-containers-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fs-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* v4l2-compliance
* fwts
* kselftest-
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kvm
* kselftest-livepatch
* kselftest-ptrace
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* network-basic-tests
* kselftest-android
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-kexec
* kselftest-lkdtm
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-timens
* kselftest-timers
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* ltp-cap_bounds-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-open-posix-tests
* perf
* kselftest-tmpfs
* kunit
* rcutorture
* kselftest-vsyscall-mode-native-
* kselftest-vsyscall-mode-none-
* ssuite
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0
Guenter
Greg Kroah-Hartman
maintainerQuoted 10 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +0000. Anything received after that time might be too late.
Quoted 6 lines
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 427 pass: 427 fail: 0Tested-by Guenter Roeck <[email protected]>
Great, thanks for testing!
Hi Greg,
Le 05/02/2021 à 04:06, Greg Kroah-Hartman a écrit :
Quoted 4 lines
This is the start of the stable review cycle for the 5.10.14 release. There are 57 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
Compiled and booted on my machine(x86_64) without any dmesg regression.
Thanks,
Signature · 4 lines
Jean-Denis Girard SysNux Systèmes Linux en Polynésie française https://www.sysnux.pf/ Tél: +689 40.50.10.40 / GSM: +689 87.797.527
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +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.10.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
12 builds: 12 pass, 0 fail
26 boots: 26 pass, 0 fail
65 tests: 65 pass, 0 failLinux version: 5.10.14-rc1-g58d18d6d116a
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra20-ventana,
tegra210-p2371-2180, tegra210-p3450-0000,
tegra30-cardhu-a04Jon
Greg Kroah-Hartman
maintainerQuoted 26 lines · Jon Hunter
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.10.14 release. There are 57 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sun, 07 Feb 2021 14:06:42 +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.10.14-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.10.y
and the diffstat can be found below.thanks,
greg k-h
All tests passing for Tegra ...
Test results for stable-v5.10:
12 builds: 12 pass, 0 fail 26 boots: 26 pass, 0 fail 65 tests: 65 pass, 0 fail
Quoted 7 lines
Linux version: 5.10.14-rc1-g58d18d6d116a
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,tegra194-p2972-0000, tegra20-ventana, tegra210-p2371-2180, tegra210-p3450-0000, tegra30-cardhu-a04Tested-by Jon Hunter <[email protected]>
Thanks for testing them all and letting me know.
greg k-h