From 544ce7ef2b8c926cbdd7a23c0f796c1fb157c096 Mon Sep 17 00:00:00 2001 From: Frederic Barrat Date: Wed, 9 Oct 2019 21:38:02 +0200 Subject: [PATCH] npu2-opencapi: Make sure the PCI slot has the proper ID The PCI slot created for the opencapi PHB didn't have its ID properly defined because it was created before we assign an ID to the PHB. Simply switch the PCI slot creation and PHB registration calls to fix it. Reviewed-by: Christophe Lombard Reviewed-by: Andrew Donnellan Signed-off-by: Frederic Barrat Signed-off-by: Oliver O'Halloran --- hw/npu2-opencapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c index 9a391bb01461..504c9208f3b1 100644 --- a/hw/npu2-opencapi.c +++ b/hw/npu2-opencapi.c @@ -1704,6 +1704,8 @@ static void setup_device(struct npu2_dev *dev) set_fence_control(dev->npu->chip_id, dev->npu->xscom_base, dev->brick_index, 0b00); + pci_register_phb(&dev->phb_ocapi, OPAL_DYNAMIC_PHB_ID); + if (npu2_ocapi_training_state != NPU2_TRAIN_DEFAULT) { setup_debug_training_state(dev); } else { @@ -1717,7 +1719,6 @@ static void setup_device(struct npu2_dev *dev) prlog(PR_ERR, "OCAPI: Cannot create PHB slot\n"); } } - pci_register_phb(&dev->phb_ocapi, OPAL_DYNAMIC_PHB_ID); return; }