Unverified Commit 7af40717 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC/SoundWire: Simply interrupt enabling for Intel 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

It is more logical to couple interrupt enabling/disabling with
power-up/down sequences.
parents f5a0ea89 e0941775

drivers/soundwire/intel_ace2x.c

+7 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ static int intel_link_power_up(struct sdw_intel *sdw) 
				__func__, ret);

			goto out;

		}



		hdac_bus_eml_enable_interrupt_unlocked(sdw->link_res->hbus, true,

						       AZX_REG_ML_LEPTR_ID_SDW, true);

	}



	*shim_mask |= BIT(link_id);
@@ -201,6 +204,10 @@ static int intel_link_power_down(struct sdw_intel *sdw) 


	*shim_mask &= ~BIT(link_id);



	if (!*shim_mask)

		hdac_bus_eml_enable_interrupt_unlocked(sdw->link_res->hbus, true,

						       AZX_REG_ML_LEPTR_ID_SDW, false);



	ret = hdac_bus_eml_sdw_power_down_unlocked(sdw->link_res->hbus, link_id);

	if (ret < 0) {

		dev_err(sdw->cdns.dev, "%s: hdac_bus_eml_sdw_power_down failed: %d\n",

include/sound/hda-mlink.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ int hda_bus_ml_init(struct hdac_bus *bus); 
void hda_bus_ml_free(struct hdac_bus *bus);



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

void hdac_bus_eml_enable_interrupt_unlocked(struct hdac_bus *bus, bool alt, int elid, bool enable);

void hdac_bus_eml_enable_interrupt(struct hdac_bus *bus, bool alt, int elid, bool enable);

bool hdac_bus_eml_check_interrupt(struct hdac_bus *bus, bool alt, int elid);
@@ -71,6 +72,9 @@ static inline void hda_bus_ml_free(struct hdac_bus *bus) { } 
static inline int

hdac_bus_eml_get_count(struct hdac_bus *bus, bool alt, int elid) { return 0; }



static inline void

hdac_bus_eml_enable_interrupt_unlocked(struct hdac_bus *bus, bool alt, int elid, bool enable) { }



static inline void

hdac_bus_eml_enable_interrupt(struct hdac_bus *bus, bool alt, int elid, bool enable) { }

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

+0 −5
Original line number Diff line number Diff line
@@ -858,7 +858,6 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 


static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume)

{

	const struct sof_intel_dsp_desc *chip;

	int ret;



	/* display codec must be powered before link reset */
@@ -891,10 +890,6 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 
		hda_dsp_ctrl_ppcap_int_enable(sdev, true);

	}



	chip = get_chip_info(sdev->pdata);

	if (chip && chip->hw_ip_version >= SOF_INTEL_ACE_2_0)

		hda_sdw_int_enable(sdev, true);



cleanup:

	/* display codec can powered off after controller init */

	hda_codec_i915_display_power(sdev, false);

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

+18 −0
Original line number Diff line number Diff line
@@ -481,6 +481,24 @@ int hdac_bus_eml_get_count(struct hdac_bus *bus, bool alt, int elid) 
}

EXPORT_SYMBOL_NS(hdac_bus_eml_get_count, SND_SOC_SOF_HDA_MLINK);



void hdac_bus_eml_enable_interrupt_unlocked(struct hdac_bus *bus, bool alt, int elid, bool enable)

{

	struct hdac_ext2_link *h2link;

	struct hdac_ext_link *hlink;



	h2link = find_ext2_link(bus, alt, elid);

	if (!h2link)

		return;



	if (!h2link->intc)

		return;



	hlink = &h2link->hext_link;



	hdaml_link_enable_interrupt(hlink->ml_addr + AZX_REG_ML_LCTL, enable);

}

EXPORT_SYMBOL_NS(hdac_bus_eml_enable_interrupt_unlocked, SND_SOC_SOF_HDA_MLINK);



void hdac_bus_eml_enable_interrupt(struct hdac_bus *bus, bool alt, int elid, bool enable)

{

	struct hdac_ext2_link *h2link;

sound/soc/sof/intel/hda.c

+0 −2
Original line number Diff line number Diff line
@@ -866,8 +866,6 @@ int hda_dsp_probe(struct snd_sof_dev *sdev) 
			dev_err(sdev->dev, "could not startup SoundWire links\n");

			goto disable_pp_cap;

		}



		hda_sdw_int_enable(sdev, true);

	}



	init_waitqueue_head(&hdev->waitq);