Commit f014699c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire fixes from Vinod Koul:
 "Two qcom driver fixes for broadcast completion reinit and check for
  outanding writes. And a lone Intel driver fix for clock stop timeout"

* tag 'soundwire-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: qcom: check for outanding writes before doing a read
  soundwire: qcom: reinit broadcast completion
  soundwire: intel: Initialize clock stop timeout
parents 8395ee62 49a46731

drivers/soundwire/intel.c

+1 −0
Original line number Diff line number Diff line
@@ -1513,6 +1513,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev, 


	bus->link_id = auxdev->id;

	bus->dev_num_ida_min = INTEL_DEV_NUM_IDA_MIN;

	bus->clk_stop_timeout = 1;



	sdw_cdns_probe(cdns);

drivers/soundwire/qcom.c

+9 −0
Original line number Diff line number Diff line
@@ -344,6 +344,9 @@ static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *swrm, u8 cmd_data, 
	if (swrm_wait_for_wr_fifo_avail(swrm))

		return SDW_CMD_FAIL_OTHER;



	if (cmd_id == SWR_BROADCAST_CMD_ID)

		reinit_completion(&swrm->broadcast);



	/* Its assumed that write is okay as we do not get any status back */

	swrm->reg_write(swrm, SWRM_CMD_FIFO_WR_CMD, val);
@@ -377,6 +380,12 @@ static int qcom_swrm_cmd_fifo_rd_cmd(struct qcom_swrm_ctrl *swrm, 


	val = swrm_get_packed_reg_val(&swrm->rcmd_id, len, dev_addr, reg_addr);



	/*

	 * Check for outstanding cmd wrt. write fifo depth to avoid

	 * overflow as read will also increase write fifo cnt.

	 */

	swrm_wait_for_wr_fifo_avail(swrm);



	/* wait for FIFO RD to complete to avoid overflow */

	usleep_range(100, 105);

	swrm->reg_write(swrm, SWRM_CMD_FIFO_RD_CMD, val);