The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 2eb9625a3a32251ecea470cd576659a3a03b4e59 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023082105-decade-shout-4b7c@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 2eb9625a3a32 ("qede: fix firmware halt over suspend and resume") 731815e720ae ("qede: Add support for handling the pcie errors.") ccc67ef50b90 ("qede: Error recovery process") f04e48dbfaf7 ("qede: Update link status only when interface is ready.") 149d3775f108 ("qede: Simplify the usage of qede-flags.") d25b859ccd61 ("qede: Add support for populating ethernet TLVs.") 91dfd02b2300 ("qede: Fix ref-cnt usage count") 3f2176dd7fe9 ("qede: fix spelling mistake: "registeration" -> "registration"") bd0b2e7fe611 ("net: xdp: make the stack take care of the tear down") 012bb8a8b5a2 ("nfp: bpf: drop support for cls_bpf with legacy actions") 43b45245e5a6 ("nfp: bpf: fall back to core NIC app if BPF not selected") 2c4197a041df ("nfp: reorganize the app table") f449657f8353 ("nfp: bpf: reject TC offload if XDP loaded") 3248f77fa3ee ("drivers/net: netronome: Convert timers to use timer_setup()") ee9133a845fe ("nfp: bpf: add stack write support") 70c78fc138b6 ("nfp: bpf: refactor nfp_bpf_check_ptr()") 90d97315b3e7 ("nfp: bpf: Convert ndo_setup_tc offloads to block callbacks") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 2eb9625a3a32251ecea470cd576659a3a03b4e59 Mon Sep 17 00:00:00 2001 From: Manish Chopra <manishc@xxxxxxxxxxx> Date: Wed, 16 Aug 2023 20:37:11 +0530 Subject: [PATCH] qede: fix firmware halt over suspend and resume While performing certain power-off sequences, PCI drivers are called to suspend and resume their underlying devices through PCI PM (power management) interface. However this NIC hardware does not support PCI PM suspend/resume operations so system wide suspend/resume leads to bad MFW (management firmware) state which causes various follow-up errors in driver when communicating with the device/firmware afterwards. To fix this driver implements PCI PM suspend handler to indicate unsupported operation to the PCI subsystem explicitly, thus avoiding system to go into suspended/standby mode. Without this fix device/firmware does not recover unless system is power cycled. Fixes: 2950219d87b0 ("qede: Add basic network device support") Signed-off-by: Manish Chopra <manishc@xxxxxxxxxxx> Signed-off-by: Alok Prasad <palok@xxxxxxxxxxx> Reviewed-by: John Meneghini <jmeneghi@xxxxxxxxxx> Reviewed-by: Simon Horman <horms@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230816150711.59035-1-manishc@xxxxxxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 4b004a728190..99df00c30b8c 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -176,6 +176,15 @@ static int qede_sriov_configure(struct pci_dev *pdev, int num_vfs_param) } #endif +static int __maybe_unused qede_suspend(struct device *dev) +{ + dev_info(dev, "Device does not support suspend operation\n"); + + return -EOPNOTSUPP; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(qede_pm_ops, qede_suspend, NULL); + static const struct pci_error_handlers qede_err_handler = { .error_detected = qede_io_error_detected, }; @@ -190,6 +199,7 @@ static struct pci_driver qede_pci_driver = { .sriov_configure = qede_sriov_configure, #endif .err_handler = &qede_err_handler, + .driver.pm = &qede_pm_ops, }; static struct qed_eth_cb_ops qede_ll_ops = {
