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

ASoC: SOF: Intel: hda-mlink: add helper to check cmdsync 



This helper is an optimization where sync_go is only called when the
cmdsync field is actually set to a non-zero value.

Since this is also only used by SoundWire for now, only expose the
_unlocked version.

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-15-peter.ujfalusi@linux.intel.com


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

include/sound/hda-mlink.h

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ void hdac_bus_eml_sdw_sync_arm_unlocked(struct hdac_bus *bus, int sublink); 
int hdac_bus_eml_sync_go_unlocked(struct hdac_bus *bus, bool alt, int elid);

int hdac_bus_eml_sdw_sync_go_unlocked(struct hdac_bus *bus);



bool hdac_bus_eml_check_cmdsync_unlocked(struct hdac_bus *bus, bool alt, int elid);

bool hdac_bus_eml_sdw_check_cmdsync_unlocked(struct hdac_bus *bus);



int hdac_bus_eml_power_up(struct hdac_bus *bus, bool alt, int elid, int sublink);

int hdac_bus_eml_power_up_unlocked(struct hdac_bus *bus, bool alt, int elid, int sublink);
@@ -92,6 +95,12 @@ hdac_bus_eml_sync_go_unlocked(struct hdac_bus *bus, bool alt, int elid) { return 
static inline int

hdac_bus_eml_sdw_sync_go_unlocked(struct hdac_bus *bus) { return 0; }



static inline bool

hdac_bus_eml_check_cmdsync_unlocked(struct hdac_bus *bus, bool alt, int elid) { return false; }



static inline bool

hdac_bus_eml_sdw_check_cmdsync_unlocked(struct hdac_bus *bus) { return false; }



static inline int

hdac_bus_eml_power_up(struct hdac_bus *bus, bool alt, int elid, int sublink)

{

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

+38 −0
Original line number Diff line number Diff line
@@ -314,6 +314,15 @@ static void hdaml_link_sync_go(u32 __iomem *lsync) 
	writel(val, lsync);

}



static bool hdaml_link_check_cmdsync(u32 __iomem *lsync, u32 cmdsync_mask)

{

	u32 val;



	val = readl(lsync);



	return !!(val & cmdsync_mask);

}



/* END HDAML section */



static int hda_ml_alloc_h2link(struct hdac_bus *bus, int index)
@@ -562,6 +571,35 @@ int hdac_bus_eml_sdw_sync_go_unlocked(struct hdac_bus *bus) 
}

EXPORT_SYMBOL_NS(hdac_bus_eml_sdw_sync_go_unlocked, SND_SOC_SOF_HDA_MLINK);



bool hdac_bus_eml_check_cmdsync_unlocked(struct hdac_bus *bus, bool alt, int elid)

{

	struct hdac_ext2_link *h2link;

	struct hdac_ext_link *hlink;

	u32 cmdsync_mask;



	h2link = find_ext2_link(bus, alt, elid);

	if (!h2link)

		return 0;



	if (!h2link->lss)

		return 0;



	hlink = &h2link->hext_link;



	cmdsync_mask = GENMASK(AZX_REG_ML_LSYNC_CMDSYNC_SHIFT + h2link->slcount - 1,

			       AZX_REG_ML_LSYNC_CMDSYNC_SHIFT);



	return hdaml_link_check_cmdsync(hlink->ml_addr + AZX_REG_ML_LSYNC,

					cmdsync_mask);

}

EXPORT_SYMBOL_NS(hdac_bus_eml_check_cmdsync_unlocked, SND_SOC_SOF_HDA_MLINK);



bool hdac_bus_eml_sdw_check_cmdsync_unlocked(struct hdac_bus *bus)

{

	return hdac_bus_eml_check_cmdsync_unlocked(bus, true, AZX_REG_ML_LEPTR_ID_SDW);

}

EXPORT_SYMBOL_NS(hdac_bus_eml_sdw_check_cmdsync_unlocked, SND_SOC_SOF_HDA_MLINK);



static int hdac_bus_eml_power_up_base(struct hdac_bus *bus, bool alt, int elid, int sublink,

				      bool eml_lock)

{