Unverified Commit 87a6ddc0 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-mlink: program SoundWire LSDIID registers 



Each SoundWire peripheral can be programmed from the manager side
either with a regular command FIFO, or with the HDaudio CORB/RIRB
DMA-based mechanism. The mapping between SoundWire peripheral and SDI
address is handled with the LSDIID register.

This mapping only works of course if each peripheral has a unique
address across all links. This has already been enforced in previous
Intel contributions allowing for an IDA-based solution for the device
number allocation.

The checks on the dev_num are handled at the SoundWire level, but the
locking is handled at the hda-mlink level.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20230404104127.5629-16-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d56d2058

include/sound/hda-mlink.h

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ int hdac_bus_eml_power_down_unlocked(struct hdac_bus *bus, bool alt, int elid, i 
int hdac_bus_eml_sdw_power_up_unlocked(struct hdac_bus *bus, int sublink);

int hdac_bus_eml_sdw_power_down_unlocked(struct hdac_bus *bus, int sublink);



int hdac_bus_eml_sdw_set_lsdiid(struct hdac_bus *bus, int sublink, int dev_num);



void hda_bus_ml_put_all(struct hdac_bus *bus);

void hda_bus_ml_reset_losidv(struct hdac_bus *bus);

int hda_bus_ml_resume(struct hdac_bus *bus);
@@ -131,6 +133,9 @@ hdac_bus_eml_sdw_power_up_unlocked(struct hdac_bus *bus, int sublink) { return 0 
static inline int

hdac_bus_eml_sdw_power_down_unlocked(struct hdac_bus *bus, int sublink) { return 0; }



static inline int

hdac_bus_eml_sdw_set_lsdiid(struct hdac_bus *bus, int sublink, int dev_num) { return 0; }



static inline void hda_bus_ml_put_all(struct hdac_bus *bus) { }

static inline void hda_bus_ml_reset_losidv(struct hdac_bus *bus) { }

static inline int hda_bus_ml_resume(struct hdac_bus *bus) { return 0; }

sound/soc/sof/intel/hda-mlink.c

+30 −0
Original line number Diff line number Diff line
@@ -323,6 +323,16 @@ static bool hdaml_link_check_cmdsync(u32 __iomem *lsync, u32 cmdsync_mask) 
	return !!(val & cmdsync_mask);

}



static void hdaml_link_set_lsdiid(u32 __iomem *lsdiid, int dev_num)

{

	u32 val;



	val = readl(lsdiid);

	val |= BIT(dev_num);



	writel(val, lsdiid);

}



/* END HDAML section */



static int hda_ml_alloc_h2link(struct hdac_bus *bus, int index)
@@ -698,6 +708,26 @@ int hdac_bus_eml_sdw_power_down_unlocked(struct hdac_bus *bus, int sublink) 
}

EXPORT_SYMBOL_NS(hdac_bus_eml_sdw_power_down_unlocked, SND_SOC_SOF_HDA_MLINK);



int hdac_bus_eml_sdw_set_lsdiid(struct hdac_bus *bus, int sublink, int dev_num)

{

	struct hdac_ext2_link *h2link;

	struct hdac_ext_link *hlink;



	h2link = find_ext2_link(bus, true, AZX_REG_ML_LEPTR_ID_SDW);

	if (!h2link)

		return -ENODEV;



	hlink = &h2link->hext_link;



	mutex_lock(&h2link->eml_lock);



	hdaml_link_set_lsdiid(hlink->ml_addr + AZX_REG_ML_LSDIID_OFFSET(sublink), dev_num);



	mutex_unlock(&h2link->eml_lock);



	return 0;

} EXPORT_SYMBOL_NS(hdac_bus_eml_sdw_set_lsdiid, SND_SOC_SOF_HDA_MLINK);



void hda_bus_ml_put_all(struct hdac_bus *bus)

{

	struct hdac_ext_link *hlink;