diff options
| -rw-r--r-- | hw/npu2-hw-procedures.c | 13 | ||||
| -rw-r--r-- | hw/npu2-opencapi.c | 7 | ||||
| -rw-r--r-- | include/npu2.h | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index ad1627a..8379cbb 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -1041,10 +1041,17 @@ void npu2_opencapi_phy_init(struct npu2_dev *dev) } } -void npu2_opencapi_phy_reset(struct npu2_dev *dev) +int npu2_opencapi_phy_reset(struct npu2_dev *dev) { - run_procedure(dev, 4); /* procedure_phy_reset */ - run_procedure(dev, 6); /* procedure_phy_rx_dccal */ + int rc; + + rc = run_procedure(dev, 4); /* procedure_phy_reset */ + if (rc != PROCEDURE_COMPLETE) + return -1; + rc = run_procedure(dev, 6); /* procedure_phy_rx_dccal */ + if (rc != PROCEDURE_COMPLETE) + return -1; + return 0; } void npu2_opencapi_phy_prbs31(struct npu2_dev *dev) diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c index ead6f5f..140b8ef 100644 --- a/hw/npu2-opencapi.c +++ b/hw/npu2-opencapi.c @@ -1187,6 +1187,7 @@ static int64_t npu2_opencapi_freset(struct pci_slot *slot) struct npu2_dev *dev = phb_to_npu2_dev_ocapi(slot->phb); uint32_t chip_id = dev->npu->chip_id; uint8_t presence = 1; + int rc; switch (slot->state) { case OCAPI_SLOT_NORMAL: @@ -1216,7 +1217,11 @@ static int64_t npu2_opencapi_freset(struct pci_slot *slot) return pci_slot_set_sm_timeout(slot, msecs_to_tb(5)); case OCAPI_SLOT_FRESET_ASSERT_DELAY: - npu2_opencapi_phy_reset(dev); + rc = npu2_opencapi_phy_reset(dev); + if (rc) { + OCAPIERR(dev, "FRESET: couldn't reset PHY state\n"); + return OPAL_HARDWARE; + } deassert_odl_reset(chip_id, dev->brick_index); deassert_adapter_reset(dev); pci_slot_set_state(slot, diff --git a/include/npu2.h b/include/npu2.h index 6b1063d..6171cd3 100644 --- a/include/npu2.h +++ b/include/npu2.h @@ -234,7 +234,7 @@ void npu2_clear_link_flag(struct npu2_dev *ndev, uint8_t flag); uint32_t reset_ntl(struct npu2_dev *ndev); extern int nv_zcal_nominal; void npu2_opencapi_phy_init(struct npu2_dev *dev); -void npu2_opencapi_phy_reset(struct npu2_dev *dev); +int npu2_opencapi_phy_reset(struct npu2_dev *dev); void npu2_opencapi_phy_prbs31(struct npu2_dev *dev); void npu2_opencapi_bump_ui_lane(struct npu2_dev *dev); int64_t npu2_freeze_status(struct phb *phb __unused, |