Commit d57847dc authored by Daniel Jurgens's avatar Daniel Jurgens Committed by David S. Miller

net/mlx5: Fix wait_vital for VFs and remove fixed sleep

The device ID for VFs is in a different location than PFs. This results
in the poll always timing out for VFs. There's no good way to read the
VF device ID without using the PF's configuration space.  Switch to waiting
for the health poll to start incrementing. Also remove the 1s sleep
at the beginning.

fixes: 89d44f0a ('net/mlx5_core: Add pci error handlers to mlx5_core
driver')
Signed-off-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5adff6a0
...@@ -1422,46 +1422,31 @@ void mlx5_disable_device(struct mlx5_core_dev *dev) ...@@ -1422,46 +1422,31 @@ void mlx5_disable_device(struct mlx5_core_dev *dev)
mlx5_pci_err_detected(dev->pdev, 0); mlx5_pci_err_detected(dev->pdev, 0);
} }
/* wait for the device to show vital signs. For now we check /* wait for the device to show vital signs by waiting
* that we can read the device ID and that the health buffer * for the health counter to start counting.
* shows a non zero value which is different than 0xffffffff
*/ */
static void wait_vital(struct pci_dev *pdev) static int wait_vital(struct pci_dev *pdev)
{ {
struct mlx5_core_dev *dev = pci_get_drvdata(pdev); struct mlx5_core_dev *dev = pci_get_drvdata(pdev);
struct mlx5_core_health *health = &dev->priv.health; struct mlx5_core_health *health = &dev->priv.health;
const int niter = 100; const int niter = 100;
u32 last_count = 0;
u32 count; u32 count;
u16 did;
int i; int i;
/* Wait for firmware to be ready after reset */
msleep(1000);
for (i = 0; i < niter; i++) {
if (pci_read_config_word(pdev, 2, &did)) {
dev_warn(&pdev->dev, "failed reading config word\n");
break;
}
if (did == pdev->device) {
dev_info(&pdev->dev, "device ID correctly read after %d iterations\n", i);
break;
}
msleep(50);
}
if (i == niter)
dev_warn(&pdev->dev, "%s-%d: could not read device ID\n", __func__, __LINE__);
for (i = 0; i < niter; i++) { for (i = 0; i < niter; i++) {
count = ioread32be(health->health_counter); count = ioread32be(health->health_counter);
if (count && count != 0xffffffff) { if (count && count != 0xffffffff) {
if (last_count && last_count != count) {
dev_info(&pdev->dev, "Counter value 0x%x after %d iterations\n", count, i); dev_info(&pdev->dev, "Counter value 0x%x after %d iterations\n", count, i);
break; return 0;
}
last_count = count;
} }
msleep(50); msleep(50);
} }
if (i == niter) return -ETIMEDOUT;
dev_warn(&pdev->dev, "%s-%d: could not read device ID\n", __func__, __LINE__);
} }
static void mlx5_pci_resume(struct pci_dev *pdev) static void mlx5_pci_resume(struct pci_dev *pdev)
...@@ -1473,7 +1458,11 @@ static void mlx5_pci_resume(struct pci_dev *pdev) ...@@ -1473,7 +1458,11 @@ static void mlx5_pci_resume(struct pci_dev *pdev)
dev_info(&pdev->dev, "%s was called\n", __func__); dev_info(&pdev->dev, "%s was called\n", __func__);
pci_save_state(pdev); pci_save_state(pdev);
wait_vital(pdev); err = wait_vital(pdev);
if (err) {
dev_err(&pdev->dev, "%s: wait_vital timed out\n", __func__);
return;
}
err = mlx5_load_one(dev, priv); err = mlx5_load_one(dev, priv);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment