Commit dd0b9619 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: cadence: use directly bus sdw_defer structure 

Copying the bus sdw_defer structure into the Cadence internals leads
to using stale pointers and kernel oopses on errors. It's just simpler
and safer to use the bus sdw_defer structure directly.

Link: https://github.com/thesofproject/linux/issues/4056


Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230119073211.85979-4-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 45cb70f9

drivers/soundwire/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static inline int do_transfer_defer(struct sdw_bus *bus, 
	init_completion(&defer->complete);



	for (i = 0; i <= retry; i++) {

		resp = bus->ops->xfer_msg_defer(bus, msg, defer);

		resp = bus->ops->xfer_msg_defer(bus, msg);

		ret = find_response_code(resp);

		/* if cmd is ok or ignored return */

		if (ret == 0 || ret == -ENODATA)

drivers/soundwire/cadence_master.c

+8 −9
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ EXPORT_SYMBOL(cdns_xfer_msg); 


enum sdw_command_response

cdns_xfer_msg_defer(struct sdw_bus *bus,

		    struct sdw_msg *msg, struct sdw_defer *defer)

		    struct sdw_msg *msg)

{

	struct sdw_cdns *cdns = bus_to_cdns(bus);

	int cmd = 0, ret;
@@ -763,9 +763,6 @@ cdns_xfer_msg_defer(struct sdw_bus *bus, 
	if (ret)

		return SDW_CMD_FAIL_OTHER;



	cdns->defer = defer;

	cdns->defer->length = msg->len;



	return _cdns_xfer_msg(cdns, msg, cmd, 0, msg->len, true);

}

EXPORT_SYMBOL(cdns_xfer_msg_defer);
@@ -879,13 +876,15 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id) 
		return IRQ_NONE;



	if (int_status & CDNS_MCP_INT_RX_WL) {

		struct sdw_bus *bus = &cdns->bus;

		struct sdw_defer *defer = &bus->defer_msg;



		cdns_read_response(cdns);



		if (cdns->defer) {

			cdns_fill_msg_resp(cdns, cdns->defer->msg,

					   cdns->defer->length, 0);

			complete(&cdns->defer->complete);

			cdns->defer = NULL;

		if (defer && defer->msg) {

			cdns_fill_msg_resp(cdns, defer->msg,

					   defer->length, 0);

			complete(&defer->complete);

		} else {

			complete(&cdns->tx_complete);

		}

drivers/soundwire/cadence_master.h

+1 −4
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ struct sdw_cdns_dai_runtime { 
 * @instance: instance number

 * @response_buf: SoundWire response buffer

 * @tx_complete: Tx completion

 * @defer: Defer pointer

 * @ports: Data ports

 * @num_ports: Total number of data ports

 * @pcm: PCM streams
@@ -130,7 +129,6 @@ struct sdw_cdns { 
	u32 response_buf[CDNS_MCP_IP_MAX_CMD_LEN + 2];



	struct completion tx_complete;

	struct sdw_defer *defer;



	struct sdw_cdns_port *ports;

	int num_ports;
@@ -186,8 +184,7 @@ enum sdw_command_response 
cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg);



enum sdw_command_response

cdns_xfer_msg_defer(struct sdw_bus *bus,

		    struct sdw_msg *msg, struct sdw_defer *defer);

cdns_xfer_msg_defer(struct sdw_bus *bus, struct sdw_msg *msg);



u32 cdns_read_ping_status(struct sdw_bus *bus);

include/linux/soundwire/sdw.h

+1 −2
Original line number Diff line number Diff line
@@ -851,8 +851,7 @@ struct sdw_master_ops { 
	enum sdw_command_response (*xfer_msg)

			(struct sdw_bus *bus, struct sdw_msg *msg);

	enum sdw_command_response (*xfer_msg_defer)

			(struct sdw_bus *bus, struct sdw_msg *msg,

			struct sdw_defer *defer);

			(struct sdw_bus *bus, struct sdw_msg *msg);

	int (*set_bus_conf)(struct sdw_bus *bus,

			struct sdw_bus_params *params);

	int (*pre_bank_switch)(struct sdw_bus *bus);