diff options
| author | Shai Malin <smalin@marvell.com> | 2021-08-22 22:21:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-08 08:49:00 +0200 |
| commit | cf50d02e474be9f0d6f2fed9aecf4dc90cc6e729 (patch) | |
| tree | c80a00d398aaadf1841c5a66ec66ec312eaaa3e5 | |
| parent | 2177c4943e40e6f04a78e506faaacda0384e3e89 (diff) | |
| download | linux-stable-cf50d02e474be9f0d6f2fed9aecf4dc90cc6e729.tar.gz linux-stable-cf50d02e474be9f0d6f2fed9aecf4dc90cc6e729.tar.bz2 linux-stable-cf50d02e474be9f0d6f2fed9aecf4dc90cc6e729.zip | |
qed: Fix the VF msix vectors flow
[ Upstream commit b0cd08537db8d2fbb227cdb2e5835209db295a24 ]
For VFs we should return with an error in case we didn't get the exact
number of msix vectors as we requested.
Not doing that will lead to a crash when starting queues for this VF.
Signed-off-by: Prabhakar Kushwaha <pkushwaha@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Shai Malin <smalin@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index 5bd58c65e163..6bb9ec98a12b 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -616,7 +616,12 @@ static int qed_enable_msix(struct qed_dev *cdev, rc = cnt; } - if (rc > 0) { + /* For VFs, we should return with an error in case we didn't get the + * exact number of msix vectors as we requested. + * Not doing that will lead to a crash when starting queues for + * this VF. + */ + if ((IS_PF(cdev) && rc > 0) || (IS_VF(cdev) && rc == cnt)) { /* MSI-x configuration was achieved */ int_params->out.int_mode = QED_INT_MODE_MSIX; int_params->out.num_vectors = rc; |