From 86cb715b7a23c7cfbc9525f16d9902d133f69430 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 13 Nov 2021 08:48:32 -0500 Subject: [PATCH] Fixes for 4.14 Signed-off-by: Sasha Levin --- ...t-increasing-bpf_jit_limit-above-max.patch | 71 +++++++++++++++ ...-return-values-of-the-probe-function.patch | 44 +++++++++ ...gative-value-when-pci_alloc_irq_vect.patch | 35 ++++++++ .../hyperv-vmbus-include-linux-bitops.h.patch | 45 ++++++++++ .../mmc-winbond-don-t-build-on-m68k.patch | 45 ++++++++++ ...a2xxx-fix-unmap-of-already-freed-sgl.patch | 90 +++++++++++++++++++ queue-4.14/series | 11 +++ ...e-netif_info-before-net_device-setup.patch | 66 ++++++++++++++ ...pl022-fix-microwire-full-duplex-mode.patch | 44 +++++++++ ...top-tx-queues-after-netif_device_det.patch | 34 +++++++ ...dog-fix-omap-watchdog-early-handling.patch | 44 +++++++++ ...stop-tx-queues-during-live-migration.patch | 67 ++++++++++++++ 12 files changed, 596 insertions(+) create mode 100644 queue-4.14/bpf-prevent-increasing-bpf_jit_limit-above-max.patch create mode 100644 queue-4.14/cavium-fix-return-values-of-the-probe-function.patch create mode 100644 queue-4.14/cavium-return-negative-value-when-pci_alloc_irq_vect.patch create mode 100644 queue-4.14/hyperv-vmbus-include-linux-bitops.h.patch create mode 100644 queue-4.14/mmc-winbond-don-t-build-on-m68k.patch create mode 100644 queue-4.14/scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch create mode 100644 queue-4.14/sfc-don-t-use-netif_info-before-net_device-setup.patch create mode 100644 queue-4.14/spi-spl022-fix-microwire-full-duplex-mode.patch create mode 100644 queue-4.14/vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch create mode 100644 queue-4.14/watchdog-fix-omap-watchdog-early-handling.patch create mode 100644 queue-4.14/xen-netfront-stop-tx-queues-during-live-migration.patch diff --git a/queue-4.14/bpf-prevent-increasing-bpf_jit_limit-above-max.patch b/queue-4.14/bpf-prevent-increasing-bpf_jit_limit-above-max.patch new file mode 100644 index 00000000000..e3d8d65dd7e --- /dev/null +++ b/queue-4.14/bpf-prevent-increasing-bpf_jit_limit-above-max.patch @@ -0,0 +1,71 @@ +From 38fd4ec804150a34e62f2081f1524bba08996862 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Oct 2021 15:25:53 +0100 +Subject: bpf: Prevent increasing bpf_jit_limit above max + +From: Lorenz Bauer + +[ Upstream commit fadb7ff1a6c2c565af56b4aacdd086b067eed440 ] + +Restrict bpf_jit_limit to the maximum supported by the arch's JIT. + +Signed-off-by: Lorenz Bauer +Signed-off-by: Alexei Starovoitov +Link: https://lore.kernel.org/bpf/20211014142554.53120-4-lmb@cloudflare.com +Signed-off-by: Sasha Levin +--- + include/linux/filter.h | 1 + + kernel/bpf/core.c | 4 +++- + net/core/sysctl_net_core.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/linux/filter.h b/include/linux/filter.h +index 5ca676d646529..7c0e616362f05 100644 +--- a/include/linux/filter.h ++++ b/include/linux/filter.h +@@ -730,6 +730,7 @@ extern int bpf_jit_enable; + extern int bpf_jit_harden; + extern int bpf_jit_kallsyms; + extern long bpf_jit_limit; ++extern long bpf_jit_limit_max; + + typedef void (*bpf_jit_fill_hole_t)(void *area, unsigned int size); + +diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c +index e7211b0fa27cf..485e319ba742a 100644 +--- a/kernel/bpf/core.c ++++ b/kernel/bpf/core.c +@@ -295,6 +295,7 @@ int bpf_jit_enable __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON); + int bpf_jit_harden __read_mostly; + int bpf_jit_kallsyms __read_mostly; + long bpf_jit_limit __read_mostly; ++long bpf_jit_limit_max __read_mostly; + + static __always_inline void + bpf_get_prog_addr_region(const struct bpf_prog *prog, +@@ -508,7 +509,8 @@ u64 __weak bpf_jit_alloc_exec_limit(void) + static int __init bpf_jit_charge_init(void) + { + /* Only used as heuristic here to derive limit. */ +- bpf_jit_limit = min_t(u64, round_up(bpf_jit_alloc_exec_limit() >> 2, ++ bpf_jit_limit_max = bpf_jit_alloc_exec_limit(); ++ bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 2, + PAGE_SIZE), LONG_MAX); + return 0; + } +diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c +index 069e3c4fcc447..ac1a32d5cad3c 100644 +--- a/net/core/sysctl_net_core.c ++++ b/net/core/sysctl_net_core.c +@@ -410,7 +410,7 @@ static struct ctl_table net_core_table[] = { + .mode = 0600, + .proc_handler = proc_dolongvec_minmax_bpf_restricted, + .extra1 = &long_one, +- .extra2 = &long_max, ++ .extra2 = &bpf_jit_limit_max, + }, + #endif + { +-- +2.33.0 + diff --git a/queue-4.14/cavium-fix-return-values-of-the-probe-function.patch b/queue-4.14/cavium-fix-return-values-of-the-probe-function.patch new file mode 100644 index 00000000000..ccd58ca3a1e --- /dev/null +++ b/queue-4.14/cavium-fix-return-values-of-the-probe-function.patch @@ -0,0 +1,44 @@ +From f21604381676acb0aed0a671d6eec1bd78d20fd4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Oct 2021 14:32:57 +0000 +Subject: cavium: Fix return values of the probe function + +From: Zheyu Ma + +[ Upstream commit c69b2f46876825c726bd8a97c7fa852d8932bc32 ] + +During the process of driver probing, the probe function should return < 0 +for failure, otherwise, the kernel will treat value > 0 as success. + +Signed-off-by: Zheyu Ma +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +index 98734a37b6f64..df1c4ba7e0c97 100644 +--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c ++++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c +@@ -1152,7 +1152,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) + if (ret < 0) { + netdev_err(nic->netdev, + "Req for #%d msix vectors failed\n", nic->num_vec); +- return 1; ++ return ret; + } + + sprintf(nic->irq_name[irq], "%s Mbox", "NICVF"); +@@ -1171,7 +1171,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic) + if (!nicvf_check_pf_ready(nic)) { + nicvf_disable_intr(nic, NICVF_INTR_MBOX, 0); + nicvf_unregister_interrupts(nic); +- return 1; ++ return -EIO; + } + + return 0; +-- +2.33.0 + diff --git a/queue-4.14/cavium-return-negative-value-when-pci_alloc_irq_vect.patch b/queue-4.14/cavium-return-negative-value-when-pci_alloc_irq_vect.patch new file mode 100644 index 00000000000..14e9aa95e1c --- /dev/null +++ b/queue-4.14/cavium-return-negative-value-when-pci_alloc_irq_vect.patch @@ -0,0 +1,35 @@ +From 358e4130c0918725d3d460a8e37885073d078b9d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Oct 2021 02:16:22 +0000 +Subject: cavium: Return negative value when pci_alloc_irq_vectors() fails + +From: Zheyu Ma + +[ Upstream commit b2cddb44bddc1a9c5949a978bb454bba863264db ] + +During the process of driver probing, the probe function should return < 0 +for failure, otherwise, the kernel will treat value > 0 as success. + +Signed-off-by: Zheyu Ma +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c +index 819f38a3225db..7f8ea16ad0d0a 100644 +--- a/drivers/net/ethernet/cavium/thunder/nic_main.c ++++ b/drivers/net/ethernet/cavium/thunder/nic_main.c +@@ -1128,7 +1128,7 @@ static int nic_register_interrupts(struct nicpf *nic) + dev_err(&nic->pdev->dev, + "Request for #%d msix vectors failed, returned %d\n", + nic->num_vec, ret); +- return 1; ++ return ret; + } + + /* Register mailbox interrupt handler */ +-- +2.33.0 + diff --git a/queue-4.14/hyperv-vmbus-include-linux-bitops.h.patch b/queue-4.14/hyperv-vmbus-include-linux-bitops.h.patch new file mode 100644 index 00000000000..03f5701a9d9 --- /dev/null +++ b/queue-4.14/hyperv-vmbus-include-linux-bitops.h.patch @@ -0,0 +1,45 @@ +From d714387e51a75e5581e383f838c759207621f8bf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Oct 2021 15:19:08 +0200 +Subject: hyperv/vmbus: include linux/bitops.h + +From: Arnd Bergmann + +[ Upstream commit 8017c99680fa65e1e8d999df1583de476a187830 ] + +On arm64 randconfig builds, hyperv sometimes fails with this +error: + +In file included from drivers/hv/hv_trace.c:3: +In file included from drivers/hv/hyperv_vmbus.h:16: +In file included from arch/arm64/include/asm/sync_bitops.h:5: +arch/arm64/include/asm/bitops.h:11:2: error: only can be included directly +In file included from include/asm-generic/bitops/hweight.h:5: +include/asm-generic/bitops/arch_hweight.h:9:9: error: implicit declaration of function '__sw_hweight32' [-Werror,-Wimplicit-function-declaration] +include/asm-generic/bitops/atomic.h:17:7: error: implicit declaration of function 'BIT_WORD' [-Werror,-Wimplicit-function-declaration] + +Include the correct header first. + +Signed-off-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20211018131929.2260087-1-arnd@kernel.org +Signed-off-by: Wei Liu +Signed-off-by: Sasha Levin +--- + drivers/hv/hyperv_vmbus.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h +index a166de6efd99c..0996a246c80bb 100644 +--- a/drivers/hv/hyperv_vmbus.h ++++ b/drivers/hv/hyperv_vmbus.h +@@ -26,6 +26,7 @@ + #define _HYPERV_VMBUS_H + + #include ++#include + #include + #include + #include +-- +2.33.0 + diff --git a/queue-4.14/mmc-winbond-don-t-build-on-m68k.patch b/queue-4.14/mmc-winbond-don-t-build-on-m68k.patch new file mode 100644 index 00000000000..a6d974b67c0 --- /dev/null +++ b/queue-4.14/mmc-winbond-don-t-build-on-m68k.patch @@ -0,0 +1,45 @@ +From 19789f51c554f1e70f5d52053d824548f17286fd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 17 Oct 2021 10:59:49 -0700 +Subject: mmc: winbond: don't build on M68K + +From: Randy Dunlap + +[ Upstream commit 162079f2dccd02cb4b6654defd32ca387dd6d4d4 ] + +The Winbond MMC driver fails to build on ARCH=m68k so prevent +that build config. Silences these build errors: + +../drivers/mmc/host/wbsd.c: In function 'wbsd_request_end': +../drivers/mmc/host/wbsd.c:212:28: error: implicit declaration of function 'claim_dma_lock' [-Werror=implicit-function-declaration] + 212 | dmaflags = claim_dma_lock(); +../drivers/mmc/host/wbsd.c:215:17: error: implicit declaration of function 'release_dma_lock'; did you mean 'release_task'? [-Werror=implicit-function-declaration] + 215 | release_dma_lock(dmaflags); + +Signed-off-by: Randy Dunlap +Cc: Pierre Ossman +Cc: Geert Uytterhoeven +Cc: Arnd Bergmann +Link: https://lore.kernel.org/r/20211017175949.23838-1-rdunlap@infradead.org +Signed-off-by: Ulf Hansson +Signed-off-by: Sasha Levin +--- + drivers/mmc/host/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig +index 9ed786935a306..61c022db0e96b 100644 +--- a/drivers/mmc/host/Kconfig ++++ b/drivers/mmc/host/Kconfig +@@ -397,7 +397,7 @@ config MMC_OMAP_HS + + config MMC_WBSD + tristate "Winbond W83L51xD SD/MMC Card Interface support" +- depends on ISA_DMA_API ++ depends on ISA_DMA_API && !M68K + help + This selects the Winbond(R) W83L51xD Secure digital and + Multimedia card Interface. +-- +2.33.0 + diff --git a/queue-4.14/scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch b/queue-4.14/scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch new file mode 100644 index 00000000000..38ae03ddbc5 --- /dev/null +++ b/queue-4.14/scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch @@ -0,0 +1,90 @@ +From 606c0b0d2b6ff61829a51142ca29da54dd962f18 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 18 Oct 2021 15:26:50 +0300 +Subject: scsi: qla2xxx: Fix unmap of already freed sgl + +From: Dmitry Bogdanov + +[ Upstream commit 4a8f71014b4d56c4fb287607e844c0a9f68f46d9 ] + +The sgl is freed in the target stack in target_release_cmd_kref() before +calling qlt_free_cmd() but there is an unmap of sgl in qlt_free_cmd() that +causes a panic if sgl is not yet DMA unmapped: + +NIP dma_direct_unmap_sg+0xdc/0x180 +LR dma_direct_unmap_sg+0xc8/0x180 +Call Trace: + ql_dbg_prefix+0x68/0xc0 [qla2xxx] (unreliable) + dma_unmap_sg_attrs+0x54/0xf0 + qlt_unmap_sg.part.19+0x54/0x1c0 [qla2xxx] + qlt_free_cmd+0x124/0x1d0 [qla2xxx] + tcm_qla2xxx_release_cmd+0x4c/0xa0 [tcm_qla2xxx] + target_put_sess_cmd+0x198/0x370 [target_core_mod] + transport_generic_free_cmd+0x6c/0x1b0 [target_core_mod] + tcm_qla2xxx_complete_free+0x6c/0x90 [tcm_qla2xxx] + +The sgl may be left unmapped in error cases of response sending. For +instance, qlt_rdy_to_xfer() maps sgl and exits when session is being +deleted keeping the sgl mapped. + +This patch removes use-after-free of the sgl and ensures that the sgl is +unmapped for any command that was not sent to firmware. + +Link: https://lore.kernel.org/r/20211018122650.11846-1-d.bogdanov@yadro.com +Reviewed-by: Himanshu Madhani +Signed-off-by: Dmitry Bogdanov +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/qla2xxx/qla_target.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c +index bd8f9b03386ad..cb2db1c1e9f2a 100644 +--- a/drivers/scsi/qla2xxx/qla_target.c ++++ b/drivers/scsi/qla2xxx/qla_target.c +@@ -3095,8 +3095,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, + "RESET-RSP online/active/old-count/new-count = %d/%d/%d/%d.\n", + vha->flags.online, qla2x00_reset_active(vha), + cmd->reset_count, qpair->chip_reset); +- spin_unlock_irqrestore(qpair->qp_lock_ptr, flags); +- return 0; ++ goto out_unmap_unlock; + } + + /* Does F/W have an IOCBs for this request */ +@@ -3218,10 +3217,6 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) + prm.sg = NULL; + prm.req_cnt = 1; + +- /* Calculate number of entries and segments required */ +- if (qlt_pci_map_calc_cnt(&prm) != 0) +- return -EAGAIN; +- + if (!qpair->fw_started || (cmd->reset_count != qpair->chip_reset) || + (cmd->sess && cmd->sess->deleted)) { + /* +@@ -3237,6 +3232,10 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd) + return 0; + } + ++ /* Calculate number of entries and segments required */ ++ if (qlt_pci_map_calc_cnt(&prm) != 0) ++ return -EAGAIN; ++ + spin_lock_irqsave(qpair->qp_lock_ptr, flags); + /* Does F/W have an IOCBs for this request */ + res = qlt_check_reserve_free_req(qpair, prm.req_cnt); +@@ -3671,9 +3670,6 @@ void qlt_free_cmd(struct qla_tgt_cmd *cmd) + + BUG_ON(cmd->cmd_in_wq); + +- if (cmd->sg_mapped) +- qlt_unmap_sg(cmd->vha, cmd); +- + if (!cmd->q_full) + qlt_decr_num_pend_cmds(cmd->vha); + +-- +2.33.0 + diff --git a/queue-4.14/series b/queue-4.14/series index fe25059f64a..e6400960ea1 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -17,3 +17,14 @@ alsa-timer-fix-use-after-free-problem.patch alsa-timer-unconditionally-unlink-slave-instances-too.patch fuse-fix-page-stealing.patch x86-irq-ensure-pi-wakeup-handler-is-unregistered-before-module-unload.patch +cavium-return-negative-value-when-pci_alloc_irq_vect.patch +scsi-qla2xxx-fix-unmap-of-already-freed-sgl.patch +cavium-fix-return-values-of-the-probe-function.patch +sfc-don-t-use-netif_info-before-net_device-setup.patch +hyperv-vmbus-include-linux-bitops.h.patch +mmc-winbond-don-t-build-on-m68k.patch +bpf-prevent-increasing-bpf_jit_limit-above-max.patch +xen-netfront-stop-tx-queues-during-live-migration.patch +spi-spl022-fix-microwire-full-duplex-mode.patch +watchdog-fix-omap-watchdog-early-handling.patch +vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch diff --git a/queue-4.14/sfc-don-t-use-netif_info-before-net_device-setup.patch b/queue-4.14/sfc-don-t-use-netif_info-before-net_device-setup.patch new file mode 100644 index 00000000000..48e6f298bc6 --- /dev/null +++ b/queue-4.14/sfc-don-t-use-netif_info-before-net_device-setup.patch @@ -0,0 +1,66 @@ +From aebed7a942815ce5d32e2bf344955b0fa67c8114 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 20 Oct 2021 00:40:16 +0200 +Subject: sfc: Don't use netif_info before net_device setup + +From: Erik Ekman + +[ Upstream commit bf6abf345dfa77786aca554bc58c64bd428ecb1d ] + +Use pci_info instead to avoid unnamed/uninitialized noise: + +[197088.688729] sfc 0000:01:00.0: Solarflare NIC detected +[197088.690333] sfc 0000:01:00.0: Part Number : SFN5122F +[197088.729061] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no SR-IOV VFs probed +[197088.729071] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no PTP support + +Inspired by fa44821a4ddd ("sfc: don't use netif_info et al before +net_device is registered") from Heiner Kallweit. + +Signed-off-by: Erik Ekman +Acked-by: Martin Habets +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/sfc/ptp.c | 4 ++-- + drivers/net/ethernet/sfc/siena_sriov.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c +index f226907926977..c50c1892e88da 100644 +--- a/drivers/net/ethernet/sfc/ptp.c ++++ b/drivers/net/ethernet/sfc/ptp.c +@@ -494,7 +494,7 @@ static int efx_ptp_get_attributes(struct efx_nic *efx) + } else if (rc == -EINVAL) { + fmt = MC_CMD_PTP_OUT_GET_ATTRIBUTES_SECONDS_NANOSECONDS; + } else if (rc == -EPERM) { +- netif_info(efx, probe, efx->net_dev, "no PTP support\n"); ++ pci_info(efx->pci_dev, "no PTP support\n"); + return rc; + } else { + efx_mcdi_display_error(efx, MC_CMD_PTP, sizeof(inbuf), +@@ -613,7 +613,7 @@ static int efx_ptp_disable(struct efx_nic *efx) + * should only have been called during probe. + */ + if (rc == -ENOSYS || rc == -EPERM) +- netif_info(efx, probe, efx->net_dev, "no PTP support\n"); ++ pci_info(efx->pci_dev, "no PTP support\n"); + else if (rc) + efx_mcdi_display_error(efx, MC_CMD_PTP, + MC_CMD_PTP_IN_DISABLE_LEN, +diff --git a/drivers/net/ethernet/sfc/siena_sriov.c b/drivers/net/ethernet/sfc/siena_sriov.c +index da7b94f346049..30d58f72725df 100644 +--- a/drivers/net/ethernet/sfc/siena_sriov.c ++++ b/drivers/net/ethernet/sfc/siena_sriov.c +@@ -1059,7 +1059,7 @@ void efx_siena_sriov_probe(struct efx_nic *efx) + return; + + if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count)) { +- netif_info(efx, probe, efx->net_dev, "no SR-IOV VFs probed\n"); ++ pci_info(efx->pci_dev, "no SR-IOV VFs probed\n"); + return; + } + if (count > 0 && count > max_vfs) +-- +2.33.0 + diff --git a/queue-4.14/spi-spl022-fix-microwire-full-duplex-mode.patch b/queue-4.14/spi-spl022-fix-microwire-full-duplex-mode.patch new file mode 100644 index 00000000000..a3bfa8eb241 --- /dev/null +++ b/queue-4.14/spi-spl022-fix-microwire-full-duplex-mode.patch @@ -0,0 +1,44 @@ +From fff57fea27d569304eee463993525f159fc687dd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Oct 2021 16:21:04 +0200 +Subject: spi: spl022: fix Microwire full duplex mode + +From: Thomas Perrot + +[ Upstream commit d81d0e41ed5fe7229a2c9a29d13bad288c7cf2d2 ] + +There are missing braces in the function that verify controller parameters, +then an error is always returned when the parameter to select Microwire +frames operation is used on devices allowing it. + +Signed-off-by: Thomas Perrot +Link: https://lore.kernel.org/r/20211022142104.1386379-1-thomas.perrot@bootlin.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-pl022.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c +index 4797c57f42630..6d849945e87a2 100644 +--- a/drivers/spi/spi-pl022.c ++++ b/drivers/spi/spi-pl022.c +@@ -1703,12 +1703,13 @@ static int verify_controller_parameters(struct pl022 *pl022, + return -EINVAL; + } + } else { +- if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) ++ if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) { + dev_err(&pl022->adev->dev, + "Microwire half duplex mode requested," + " but this is only available in the" + " ST version of PL022\n"); +- return -EINVAL; ++ return -EINVAL; ++ } + } + } + return 0; +-- +2.33.0 + diff --git a/queue-4.14/vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch b/queue-4.14/vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch new file mode 100644 index 00000000000..3e009ca0cff --- /dev/null +++ b/queue-4.14/vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch @@ -0,0 +1,34 @@ +From 0a7021e2cf0dbe9d4bcb51cf06a7092ae8d825a5 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Oct 2021 14:50:31 -0700 +Subject: vmxnet3: do not stop tx queues after netif_device_detach() + +From: Dongli Zhang + +[ Upstream commit 9159f102402a64ac85e676b75cc1f9c62c5b4b73 ] + +The netif_device_detach() conditionally stops all tx queues if the queues +are running. There is no need to call netif_tx_stop_all_queues() again. + +Signed-off-by: Dongli Zhang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/vmxnet3/vmxnet3_drv.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c +index 3628fd7e606fd..98fc34ea78ffe 100644 +--- a/drivers/net/vmxnet3/vmxnet3_drv.c ++++ b/drivers/net/vmxnet3/vmxnet3_drv.c +@@ -3623,7 +3623,6 @@ vmxnet3_suspend(struct device *device) + vmxnet3_free_intr_resources(adapter); + + netif_device_detach(netdev); +- netif_tx_stop_all_queues(netdev); + + /* Create wake-up filters. */ + pmConf = adapter->pm_conf; +-- +2.33.0 + diff --git a/queue-4.14/watchdog-fix-omap-watchdog-early-handling.patch b/queue-4.14/watchdog-fix-omap-watchdog-early-handling.patch new file mode 100644 index 00000000000..1722aa5e5fa --- /dev/null +++ b/queue-4.14/watchdog-fix-omap-watchdog-early-handling.patch @@ -0,0 +1,44 @@ +From f2dfcb210bb74840ccb8f6e0189336b143137c91 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 14 Oct 2021 12:22:29 +0200 +Subject: watchdog: Fix OMAP watchdog early handling + +From: Walter Stoll + +[ Upstream commit cd004d8299f1dc6cfa6a4eea8f94cb45eaedf070 ] + +TI's implementation does not service the watchdog even if the kernel +command line parameter omap_wdt.early_enable is set to 1. This patch +fixes the issue. + +Signed-off-by: Walter Stoll +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/88a8fe5229cd68fa0f1fd22f5d66666c1b7057a0.camel@duagon.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Signed-off-by: Sasha Levin +--- + drivers/watchdog/omap_wdt.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c +index 1b02bfa81b296..40c006ee8492d 100644 +--- a/drivers/watchdog/omap_wdt.c ++++ b/drivers/watchdog/omap_wdt.c +@@ -271,8 +271,12 @@ static int omap_wdt_probe(struct platform_device *pdev) + wdev->wdog.bootstatus = WDIOF_CARDRESET; + } + +- if (!early_enable) ++ if (early_enable) { ++ omap_wdt_start(&wdev->wdog); ++ set_bit(WDOG_HW_RUNNING, &wdev->wdog.status); ++ } else { + omap_wdt_disable(wdev); ++ } + + ret = watchdog_register_device(&wdev->wdog); + if (ret) { +-- +2.33.0 + diff --git a/queue-4.14/xen-netfront-stop-tx-queues-during-live-migration.patch b/queue-4.14/xen-netfront-stop-tx-queues-during-live-migration.patch new file mode 100644 index 00000000000..468e10a4d20 --- /dev/null +++ b/queue-4.14/xen-netfront-stop-tx-queues-during-live-migration.patch @@ -0,0 +1,67 @@ +From 5813ac9f7ec2ba7ffc26612973c792c965e2165b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 22 Oct 2021 16:31:39 -0700 +Subject: xen/netfront: stop tx queues during live migration + +From: Dongli Zhang + +[ Upstream commit 042b2046d0f05cf8124c26ff65dbb6148a4404fb ] + +The tx queues are not stopped during the live migration. As a result, the +ndo_start_xmit() may access netfront_info->queues which is freed by +talk_to_netback()->xennet_destroy_queues(). + +This patch is to netif_device_detach() at the beginning of xen-netfront +resuming, and netif_device_attach() at the end of resuming. + + CPU A CPU B + + talk_to_netback() + -> if (info->queues) + xennet_destroy_queues(info); + to free netfront_info->queues + + xennet_start_xmit() + to access netfront_info->queues + + -> err = xennet_create_queues(info, &num_queues); + +The idea is borrowed from virtio-net. + +Cc: Joe Jin +Signed-off-by: Dongli Zhang +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/xen-netfront.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c +index 1131397454bd4..89e6a50b53da5 100644 +--- a/drivers/net/xen-netfront.c ++++ b/drivers/net/xen-netfront.c +@@ -1441,6 +1441,10 @@ static int netfront_resume(struct xenbus_device *dev) + + dev_dbg(&dev->dev, "%s\n", dev->nodename); + ++ netif_tx_lock_bh(info->netdev); ++ netif_device_detach(info->netdev); ++ netif_tx_unlock_bh(info->netdev); ++ + xennet_disconnect_backend(info); + return 0; + } +@@ -1990,6 +1994,10 @@ static int xennet_connect(struct net_device *dev) + * domain a kick because we've probably just requeued some + * packets. + */ ++ netif_tx_lock_bh(np->netdev); ++ netif_device_attach(np->netdev); ++ netif_tx_unlock_bh(np->netdev); ++ + netif_carrier_on(np->netdev); + for (j = 0; j < num_queues; ++j) { + queue = &np->queues[j]; +-- +2.33.0 + -- 2.47.2