From 998911498597f3a057d73f7c78c075d830d22731 Mon Sep 17 00:00:00 2001 From: Frederic Barrat Date: Tue, 12 Mar 2019 21:35:15 +0100 Subject: npu2-opencapi: Fix adapter reset when using 2 adapters If two opencapi adapters are on the same obus, we may try to train the two links in parallel at boot time, when all the PCI links are being trained. Both links use the same i2c controller to handle the reset signal, so some care is needed to make sure resetting one doesn't interfere with the reset of the other. We need to keep track of the current state of the i2c controller (and use locking). This went mostly unnoticed as you need to have 2 opencapi cards on the same socket and links tended to train anyway because of the retries. Signed-off-by: Frederic Barrat Reviewed-by: Andrew Donnellan Signed-off-by: Stewart Smith --- hw/npu2-common.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'hw/npu2-common.c') diff --git a/hw/npu2-common.c b/hw/npu2-common.c index ec69953..3d0b636 100644 --- a/hw/npu2-common.c +++ b/hw/npu2-common.c @@ -182,6 +182,9 @@ static struct npu2 *setup_npu(struct dt_node *dn) npu->xscom_base = dt_get_address(dn, 0, NULL); npu->phb_index = dt_prop_get_u32(dn, "ibm,phb-index"); + init_lock(&npu->i2c_lock); + npu->i2c_pin_mode = ~0; // input mode by default + npu->i2c_pin_wr_state = ~0; // reset is active low if (platform.ocapi) { /* Find I2C port for handling device presence/reset */ snprintf(port_name, sizeof(port_name), "p8_%08x_e%dp%d", -- cgit v1.1