aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Barrat <fbarrat@linux.ibm.com>2019-03-12 21:35:11 +0100
committerStewart Smith <stewart@linux.ibm.com>2019-03-13 21:55:18 -0500
commit9f3cdff996564a7b72f515940dad045d14cd6763 (patch)
tree13b2650882ce2273e6ae89a13bdd25001858a80a
parente621b7b6795163d9f429d28fb120736fa4fad042 (diff)
downloadskiboot-9f3cdff996564a7b72f515940dad045d14cd6763.zip
skiboot-9f3cdff996564a7b72f515940dad045d14cd6763.tar.gz
skiboot-9f3cdff996564a7b72f515940dad045d14cd6763.tar.bz2
npu2-opencapi: Rename functions used to reset an adapter
This is really to avoid confusion with a later patch and clarify whether we're resetting the ODL or the adapter. Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Reviewed-by: Christophe Lombard <clombard@linux.vnet.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--hw/npu2-opencapi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c
index 6d642cd..9fe5efd 100644
--- a/hw/npu2-opencapi.c
+++ b/hw/npu2-opencapi.c
@@ -814,7 +814,7 @@ static void otl_enabletx(uint32_t gcid, uint32_t scom_base,
/* TODO: Abort if credits are zero */
}
-static void assert_reset(struct npu2_dev *dev)
+static void assert_adapter_reset(struct npu2_dev *dev)
{
uint8_t pin, data;
int rc;
@@ -869,7 +869,7 @@ err:
OCAPIERR(dev, "Error writing I2C reset signal: %d\n", rc);
}
-static void deassert_reset(struct npu2_dev *dev)
+static void deassert_adapter_reset(struct npu2_dev *dev)
{
uint8_t data;
int rc;
@@ -1164,14 +1164,14 @@ static int64_t npu2_opencapi_freset(struct pci_slot *slot)
/* fall-through */
case OCAPI_SLOT_FRESET_INIT:
reset_odl(chip_id, dev);
- assert_reset(dev);
+ assert_adapter_reset(dev);
pci_slot_set_state(slot,
OCAPI_SLOT_FRESET_ASSERT_DELAY);
/* assert for 5ms */
return pci_slot_set_sm_timeout(slot, msecs_to_tb(5));
case OCAPI_SLOT_FRESET_ASSERT_DELAY:
- deassert_reset(dev);
+ deassert_adapter_reset(dev);
pci_slot_set_state(slot,
OCAPI_SLOT_FRESET_DEASSERT_DELAY);
/* give another 5ms to device to be ready */