IB/hfi1: Change SBus handling to use resource reservation

The SBus resource includes SBUS, PCIE, and THERM registers.
Change SBus handling to use the new ASIC resource reservation system.

Reviewed-by: Mitko Haralanov <mitko.haralanov@intel.com>
Reviewed-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index 98ebee4aac22ab1d76fc2a2618a19c2c7199555f..269c9775f7c6f7c90dfc5488f8a74d09df726615 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -14324,7 +14324,12 @@ static int thermal_init(struct hfi1_devdata *dd)
            !(dd->flags & HFI1_DO_INIT_ASIC))
                return ret;
 
-       acquire_hw_mutex(dd);
+       ret = acquire_chip_resource(dd, CR_SBUS, SBUS_TIMEOUT);
+       if (ret) {
+               THERM_FAILURE(dd, ret, "Acquire SBus");
+               return ret;
+       }
+
        dd_dev_info(dd, "Initializing thermal sensor\n");
        /* Disable polling of thermal readings */
        write_csr(dd, ASIC_CFG_THERM_POLL_EN, 0x0);
@@ -14372,7 +14377,7 @@ static int thermal_init(struct hfi1_devdata *dd)
        /* Enable polling of thermal readings */
        write_csr(dd, ASIC_CFG_THERM_POLL_EN, 0x1);
 done:
-       release_hw_mutex(dd);
+       release_chip_resource(dd, CR_SBUS);
        return ret;
 }
 

diff --git a/drivers/staging/rdma/hfi1/chip.h b/drivers/staging/rdma/hfi1/chip.h
index dc684bc11d273819814f85eae4bd914bfdc4f32b..311e6e8433994e628074f0d8ddf89d6ea1368937 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.h
+++ b/drivers/staging/rdma/hfi1/chip.h
@@ -669,6 +669,9 @@ bool check_chip_resource(struct hfi1_devdata *dd, u32 resource,
 void init_chip_resources(struct hfi1_devdata *dd);
 void finish_chip_resources(struct hfi1_devdata *dd);
 
+/* ms wait time for access to an SBus resoure */
+#define SBUS_TIMEOUT 4000 /* long enough for a FW download and SBR */
+
 void fabric_serdes_reset(struct hfi1_devdata *dd);
 int read_8051_data(struct hfi1_devdata *dd, u32 addr, u32 len, u64 *result);
 

diff --git a/drivers/staging/rdma/hfi1/firmware.c b/drivers/staging/rdma/hfi1/firmware.c
index 140dd8646cd0d94b562c6537958518fde51fbf95..1ea1ad84c784a514913070b8bfd2118fd1393764 100644 (file)
--- a/drivers/staging/rdma/hfi1/firmware.c
+++ b/drivers/staging/rdma/hfi1/firmware.c
@@ -1125,15 +1125,23 @@ static void turn_off_spicos(struct hfi1_devdata *dd, int flags)
  */
 void fabric_serdes_reset(struct hfi1_devdata *dd)
 {
+       int ret;
+
        if (!fw_fabric_serdes_load)
                return;
 
+       ret = acquire_chip_resource(dd, CR_SBUS, SBUS_TIMEOUT);
+       if (ret) {
+               dd_dev_err(dd,
+                          "Cannot acquire SBus resource to reset fabric SerDes - perhaps you should reboot\n");
+               return;
+       }
+       set_sbus_fast_mode(dd);
+
        if (is_ax(dd)) {
                /* A0 serdes do not work with a re-download */
                u8 ra = fabric_serdes_broadcast[dd->hfi1_id];
 
-               acquire_hw_mutex(dd);
-               set_sbus_fast_mode(dd);
                /* place SerDes in reset and disable SPICO */
                sbus_request(dd, ra, 0x07, WRITE_SBUS_RECEIVER, 0x00000011);
                /* wait 100 refclk cycles @ 156.25MHz => 640ns */
@@ -1142,26 +1150,20 @@ void fabric_serdes_reset(struct hfi1_devdata *dd)
                sbus_request(dd, ra, 0x07, WRITE_SBUS_RECEIVER, 0x00000010);
                /* turn SPICO enable on */
                sbus_request(dd, ra, 0x07, WRITE_SBUS_RECEIVER, 0x00000002);
-               clear_sbus_fast_mode(dd);
-               release_hw_mutex(dd);
-               return;
+       } else {
+               turn_off_spicos(dd, SPICO_FABRIC);
+               /*
+                * No need for firmware retry - what to download has already
+                * been decided.
+                * No need to pay attention to the load return - the only
+                * failure is a validation failure, which has already been
+                * checked by the initial download.
+                */
+               (void)load_fabric_serdes_firmware(dd, &fw_fabric);
        }
 
-       acquire_hw_mutex(dd);
-       set_sbus_fast_mode(dd);
-
-       turn_off_spicos(dd, SPICO_FABRIC);
-       /*
-        * No need for firmware retry - what to download has already been
-        * decided.
-        * No need to pay attention to the load return - the only failure
-        * is a validation failure, which has already been checked by the
-        * initial download.
-        */
-       (void)load_fabric_serdes_firmware(dd, &fw_fabric);
-
        clear_sbus_fast_mode(dd);
-       release_hw_mutex(dd);
+       release_chip_resource(dd, CR_SBUS);
 }
 
 /* Access to the SBus in this routine should probably be serialized */
@@ -1598,7 +1600,7 @@ int load_firmware(struct hfi1_devdata *dd)
        int ret;
 
        if (fw_fabric_serdes_load) {
-               ret = acquire_hw_mutex(dd);
+               ret = acquire_chip_resource(dd, CR_SBUS, SBUS_TIMEOUT);
                if (ret)
                        return ret;
 
@@ -1614,7 +1616,7 @@ int load_firmware(struct hfi1_devdata *dd)
                } while (retry_firmware(dd, ret));
 
                clear_sbus_fast_mode(dd);
-               release_hw_mutex(dd);
+               release_chip_resource(dd, CR_SBUS);
                if (ret)
                        return ret;
        }
@@ -1995,7 +1997,7 @@ int get_platform_config_field(struct hfi1_devdata *dd,
  * Download the firmware needed for the Gen3 PCIe SerDes.  An update
  * to the SBus firmware is needed before updating the PCIe firmware.
  *
- * Note: caller must be holding the HW mutex.
+ * Note: caller must be holding the SBus resource.
  */
 int load_pcie_firmware(struct hfi1_devdata *dd)
 {

diff --git a/drivers/staging/rdma/hfi1/pcie.c b/drivers/staging/rdma/hfi1/pcie.c
index 1adfa8bfaf2bd54145531a7bf50e0b2e263fb449..42a409f1644955a449dd58f08630aafcb02583e6 100644 (file)
--- a/drivers/staging/rdma/hfi1/pcie.c
+++ b/drivers/staging/rdma/hfi1/pcie.c
@@ -773,7 +773,7 @@ static int load_eq_table(struct hfi1_devdata *dd, const u8 eq[11][3], u8 fs,
 /*
  * Steps to be done after the PCIe firmware is downloaded and
  * before the SBR for the Pcie Gen3.
- * The hardware mutex is already being held.
+ * The SBus resource is already being held.
  */
 static void pcie_post_steps(struct hfi1_devdata *dd)
 {
@@ -1012,10 +1012,13 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
                goto done_no_mutex;
        }
 
-       /* hold the HW mutex across the firmware download and SBR */
-       ret = acquire_hw_mutex(dd);
-       if (ret)
+       /* hold the SBus resource across the firmware download and SBR */
+       ret = acquire_chip_resource(dd, CR_SBUS, SBUS_TIMEOUT);
+       if (ret) {
+               dd_dev_err(dd, "%s: unable to acquire SBus resource\n",
+                          __func__);
                return ret;
+       }
 
        /* make sure thermal polling is not causing interrupts */
        therm = read_csr(dd, ASIC_CFG_THERM_POLL_EN);
@@ -1324,7 +1327,7 @@ done:
                dd_dev_info(dd, "%s: Re-enable therm polling\n",
                            __func__);
        }
-       release_hw_mutex(dd);
+       release_chip_resource(dd, CR_SBUS);
 done_no_mutex:
        /* return no error if it is OK to be at current speed */
        if (ret && !return_error) {