Commit 6558b667 authored by Vinod Koul's avatar Vinod Koul
Browse files

soundwire: add override addr ops 



Platform firmware may have incorrect _ADR values causing the driver
probes to fail. Add the override_ops, which when configured will allow
for quirks based on DMI etc to override the addr values.

Co-developed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20210302075105.11515-2-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/slave.c

+7 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static bool find_slave(struct sdw_bus *bus, 
		       struct acpi_device *adev,

		       struct sdw_slave_id *id)

{

	unsigned long long addr;

	u64 addr;

	unsigned int link_id;

	acpi_status status;
@@ -108,6 +108,12 @@ static bool find_slave(struct sdw_bus *bus, 
		return false;

	}



	if (bus->ops->override_adr)

		addr = bus->ops->override_adr(bus, addr);



	if (!addr)

		return false;



	/* Extract link id from ADR, Bit 51 to 48 (included) */

	link_id = SDW_DISCO_LINK_ID(addr);

include/linux/soundwire/sdw.h

+3 −1
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ struct sdw_defer { 
/**

 * struct sdw_master_ops - Master driver ops

 * @read_prop: Read Master properties

 * @override_adr: Override value read from firmware (quirk for buggy firmware)

 * @xfer_msg: Transfer message callback

 * @xfer_msg_defer: Defer version of transfer message callback

 * @reset_page_addr: Reset the SCP page address registers
@@ -813,7 +814,8 @@ struct sdw_defer { 
 */

struct sdw_master_ops {

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



	u64 (*override_adr)

			(struct sdw_bus *bus, u64 addr);

	enum sdw_command_response (*xfer_msg)

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

	enum sdw_command_response (*xfer_msg_defer)