From abfc4459c99d2c87e11f2cd67f8c069a03cfe143 Mon Sep 17 00:00:00 2001 From: Easwar Hariharan Date: Mon, 26 Oct 2015 10:28:46 -0400 Subject: staging/rdma/hfi1: Load SBus firmware once per ASIC Using fw_sbus_load to control SBus firmware load doesn't scale across multiple HFI1 cards in a single system. This patch ensures that the SBus firmware is loaded once per ASIC. Reviewed-by: Dean Luick Reviewed-by: Dennis Dalessandro Signed-off-by: Easwar Hariharan Signed-off-by: Ira Weiny Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rdma/hfi1/pcie.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/staging/rdma/hfi1/pcie.c') diff --git a/drivers/staging/rdma/hfi1/pcie.c b/drivers/staging/rdma/hfi1/pcie.c index 3b50cdda1c0a..a956044459a2 100644 --- a/drivers/staging/rdma/hfi1/pcie.c +++ b/drivers/staging/rdma/hfi1/pcie.c @@ -947,15 +947,16 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd) } retry: + if (therm) { - /* toggle SPICO_ENABLE to get back to the state - just after the firmware load */ + /* + * toggle SPICO_ENABLE to get back to the state + * just after the firmware load + */ sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01, WRITE_SBUS_RECEIVER, 0x00000040); sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01, WRITE_SBUS_RECEIVER, 0x00000140); - dd_dev_info(dd, "%s: toggle SPICO_ENABLE to reset the bus\n", - __func__); } /* step 3: download SBus Master firmware */ @@ -1198,6 +1199,7 @@ retry: /* clear the DC reset */ write_csr(dd, CCE_DC_CTRL, 0); + /* Set the LED off */ if (is_a0(dd)) setextled(dd, 0); -- cgit v1.2.3-59-g8ed1b