Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65fcf557 authored by Dean Luick's avatar Dean Luick Committed by Greg Kroah-Hartman
Browse files

staging/rdma/hfi1: Always download SBus firmware 



B0 dual port parts require the SBus firmware to always be
downloaded.

Remove reset of the SBus Master spico.  It is not necessary
since the SBus firmware download already does that.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf70a775

drivers/staging/rdma/hfi1/firmware.c

+1 −1
Original line number Diff line number Diff line
@@ -1568,7 +1568,7 @@ int load_pcie_firmware(struct hfi1_devdata *dd) 
	/* both firmware loads below use the SBus */

	set_sbus_fast_mode(dd);



	if (fw_sbus_load && (dd->flags & HFI1_DO_INIT_ASIC)) {

	if (fw_sbus_load) {

		turn_off_spicos(dd, SPICO_SBUS);

		ret = load_sbus_firmware(dd, &fw_sbus);

		if (ret)

drivers/staging/rdma/hfi1/pcie.c

+1 −11
Original line number Diff line number Diff line
@@ -949,17 +949,7 @@ 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

		 */

		sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01,

			WRITE_SBUS_RECEIVER, 0x00000040);

		sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01,

			WRITE_SBUS_RECEIVER, 0x00000140);

	}

	/* the SBus download will reset the spico for thermal */



	/* step 3: download SBus Master firmware */

	/* step 4: download PCIe Gen3 SerDes firmware */