Skip to content

Commit 1e18ec3

Browse files
emuslndavem330
authored andcommitted
pds_core: add attempts to fix broken PCI
If we see a 0xff value from a PCI register read, we know that the PCI connection is broken, possibly by a low level reset that didn't go through the nice pci_error_handlers path. Make use of the PCI cleanup code that we already have from the reset handlers and add some detection and attempted recovery from a broken PCI connection. Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Reviewed-by: Brett Creeley <brett.creeley@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ffa5585 commit 1e18ec3

3 files changed

Lines changed: 19 additions & 2 deletions

File tree

drivers/net/ethernet/amd/pds_core/core.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,18 @@ void pdsc_fw_up(struct pdsc *pdsc)
578578
pdsc_teardown(pdsc, PDSC_TEARDOWN_RECOVERY);
579579
}
580580

581+
static void pdsc_check_pci_health(struct pdsc *pdsc)
582+
{
583+
u8 fw_status = ioread8(&pdsc->info_regs->fw_status);
584+
585+
/* is PCI broken? */
586+
if (fw_status != PDS_RC_BAD_PCI)
587+
return;
588+
589+
pdsc_reset_prepare(pdsc->pdev);
590+
pdsc_reset_done(pdsc->pdev);
591+
}
592+
581593
void pdsc_health_thread(struct work_struct *work)
582594
{
583595
struct pdsc *pdsc = container_of(work, struct pdsc, health_work);
@@ -604,6 +616,8 @@ void pdsc_health_thread(struct work_struct *work)
604616
pdsc_fw_down(pdsc);
605617
}
606618

619+
pdsc_check_pci_health(pdsc);
620+
607621
pdsc->fw_generation = pdsc->fw_status & PDS_CORE_FW_STS_F_GENERATION;
608622

609623
out_unlock:

drivers/net/ethernet/amd/pds_core/core.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ int pdsc_devcmd_reset(struct pdsc *pdsc);
283283
int pdsc_dev_reinit(struct pdsc *pdsc);
284284
int pdsc_dev_init(struct pdsc *pdsc);
285285

286+
void pdsc_reset_prepare(struct pci_dev *pdev);
287+
void pdsc_reset_done(struct pci_dev *pdev);
288+
286289
int pdsc_intr_alloc(struct pdsc *pdsc, char *name,
287290
irq_handler_t handler, void *data);
288291
void pdsc_intr_free(struct pdsc *pdsc, int index);

drivers/net/ethernet/amd/pds_core/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static void pdsc_remove(struct pci_dev *pdev)
445445
devlink_free(dl);
446446
}
447447

448-
static void pdsc_reset_prepare(struct pci_dev *pdev)
448+
void pdsc_reset_prepare(struct pci_dev *pdev)
449449
{
450450
struct pdsc *pdsc = pci_get_drvdata(pdev);
451451

@@ -457,7 +457,7 @@ static void pdsc_reset_prepare(struct pci_dev *pdev)
457457
pci_disable_device(pdev);
458458
}
459459

460-
static void pdsc_reset_done(struct pci_dev *pdev)
460+
void pdsc_reset_done(struct pci_dev *pdev)
461461
{
462462
struct pdsc *pdsc = pci_get_drvdata(pdev);
463463
struct device *dev = pdsc->dev;

0 commit comments

Comments
 (0)