rebase patches on top of Ubuntu-5.4.0-90.101
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
d930563013
commit
ced00e40e2
@ -75,7 +75,7 @@ index 623eed9d3009..cc43987a3238 100644
|
||||
Safety option to keep boot IRQs enabled. This
|
||||
should never be necessary.
|
||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||
index e0fe975bedd5..9434da9dba02 100644
|
||||
index 76f8ecd4e3f0..de76601eb079 100644
|
||||
--- a/drivers/pci/quirks.c
|
||||
+++ b/drivers/pci/quirks.c
|
||||
@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
|
||||
@ -185,8 +185,8 @@ index e0fe975bedd5..9434da9dba02 100644
|
||||
/*
|
||||
* Decoding should be disabled for a PCI device during BAR sizing to avoid
|
||||
* conflict. But doing so may cause problems on host bridge and perhaps other
|
||||
@@ -4926,6 +5026,8 @@ static const struct pci_dev_acs_enabled {
|
||||
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
|
||||
@@ -4944,6 +5044,8 @@ static const struct pci_dev_acs_enabled {
|
||||
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
|
||||
/* APM X-Gene */
|
||||
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },
|
||||
+ /* Enable overrides for missing ACS capabilities */
|
||||
|
@ -1,34 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Bunk <bunk@kernel.org>
|
||||
Date: Sun, 12 Sep 2021 22:05:23 +0300
|
||||
Subject: [PATCH] bnx2x: Fix enabling network interfaces without VFs
|
||||
|
||||
This function is called to enable SR-IOV when available,
|
||||
not enabling interfaces without VFs was a regression.
|
||||
|
||||
Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()")
|
||||
Signed-off-by: Adrian Bunk <bunk@kernel.org>
|
||||
Reported-by: YunQiang Su <wzssyqa@gmail.com>
|
||||
Tested-by: YunQiang Su <wzssyqa@gmail.com>
|
||||
Cc: stable@vger.kernel.org
|
||||
Acked-by: Shai Malin <smalin@marvell.com>
|
||||
Link: https://lore.kernel.org/r/20210912190523.27991-1-bunk@kernel.org
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||||
---
|
||||
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
|
||||
index f255fd0b16db..6fbf735fca31 100644
|
||||
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
|
||||
@@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,
|
||||
|
||||
/* SR-IOV capability was enabled but there are no VFs*/
|
||||
if (iov->total == 0) {
|
||||
- err = -EINVAL;
|
||||
+ err = 0;
|
||||
goto failed;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user