Merge tag 'soundwire-5.9-rc1' of... (575ec5e5) · Commits · 戴 / test

Documentation/driver-api/soundwire/stream.rst

+10 −1

Original line number	Diff line number	Diff line
		@@ -293,6 +293,10 @@ per stream. From ASoC DPCM framework, this stream state maybe linked to

		int sdw_alloc_stream(char * stream_name);

		The SoundWire core provides a sdw_startup_stream() helper function,
		typically called during a dailink .startup() callback, which performs
		stream allocation and sets the stream pointer for all DAIs
		connected to a stream.

		SDW_STREAM_CONFIGURED
		~~~~~~~~~~~~~~~~~~~~~
		@@ -509,6 +513,11 @@ In .shutdown() the data structure maintaining stream state are freed up.

		void sdw_release_stream(struct sdw_stream_runtime * stream);

		The SoundWire core provides a sdw_shutdown_stream() helper function,
		typically called during a dailink .shutdown() callback, which clears
		the stream pointer for all DAIS connected to a stream and releases the
		memory allocated for the stream.

		Not Supported
		=============

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -16014,8 +16014,9 @@ F: sound/soc/sof/

		SOUNDWIRE SUBSYSTEM
		M: Vinod Koul <vkoul@kernel.org>
		M: Sanyog Kale <sanyog.r.kale@intel.com>
		M: Bard Liao <yung-chuan.liao@linux.intel.com>
		R: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
		R: Sanyog Kale <sanyog.r.kale@intel.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Supported
		F: Documentation/driver-api/soundwire/

drivers/soundwire/Makefile

+5 −5

Original line number	Diff line number	Diff line
		@@ -4,22 +4,22 @@
		#

		#Bus Objs
		soundwire-bus-objs := bus_type.o bus.o master.o slave.o mipi_disco.o stream.o \
		soundwire-bus-y := bus_type.o bus.o master.o slave.o mipi_disco.o stream.o \
		sysfs_slave.o sysfs_slave_dpn.o
		obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o

		ifdef CONFIG_DEBUG_FS
		soundwire-bus-objs += debugfs.o
		soundwire-bus-y += debugfs.o
		endif

		#Cadence Objs
		soundwire-cadence-objs := cadence_master.o
		soundwire-cadence-y := cadence_master.o
		obj-$(CONFIG_SOUNDWIRE_CADENCE) += soundwire-cadence.o

		#Intel driver
		soundwire-intel-objs := intel.o intel_init.o
		soundwire-intel-y := intel.o intel_init.o
		obj-$(CONFIG_SOUNDWIRE_INTEL) += soundwire-intel.o

		#Qualcomm driver
		soundwire-qcom-objs := qcom.o
		soundwire-qcom-y := qcom.o
		obj-$(CONFIG_SOUNDWIRE_QCOM) += soundwire-qcom.o

drivers/soundwire/bus.c

+124 −6

Original line number	Diff line number	Diff line
		@@ -863,13 +863,13 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
		if (!slave->dev_num)
		continue;

		/* Identify if Slave(s) are available on Bus */
		is_slave = true;

		if (slave->status != SDW_SLAVE_ATTACHED &&
		slave->status != SDW_SLAVE_ALERT)
		continue;

		/* Identify if Slave(s) are available on Bus */
		is_slave = true;

		slave_mode = sdw_get_clk_stop_mode(slave);
		slave->curr_clk_stop_mode = slave_mode;

		@@ -900,6 +900,10 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus)
		return ret;
		}

		/* Don't need to inform slaves if there is no slave attached */
		if (!is_slave)
		return ret;

		/* Inform slaves that prep is done */
		list_for_each_entry(slave, &bus->slaves, node) {
		if (!slave->dev_num)
		@@ -985,13 +989,13 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)
		if (!slave->dev_num)
		continue;

		/* Identify if Slave(s) are available on Bus */
		is_slave = true;

		if (slave->status != SDW_SLAVE_ATTACHED &&
		slave->status != SDW_SLAVE_ALERT)
		continue;

		/* Identify if Slave(s) are available on Bus */
		is_slave = true;

		mode = slave->curr_clk_stop_mode;

		if (mode == SDW_CLK_STOP_MODE1) {
		@@ -1016,6 +1020,13 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus)
		if (is_slave && !simple_clk_stop)
		sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM);

		/*
		* Don't need to call slave callback function if there is no slave
		* attached
		*/
		if (!is_slave)
		return 0;

		list_for_each_entry(slave, &bus->slaves, node) {
		if (!slave->dev_num)
		continue;
		@@ -1059,12 +1070,119 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave,
		return ret;
		}

		static int sdw_slave_set_frequency(struct sdw_slave *slave)
		{
		u32 mclk_freq = slave->bus->prop.mclk_freq;
		u32 curr_freq = slave->bus->params.curr_dr_freq >> 1;
		unsigned int scale;
		u8 scale_index;
		u8 base;
		int ret;

		/*
		* frequency base and scale registers are required for SDCA
		* devices. They may also be used for 1.2+/non-SDCA devices,
		* but we will need a DisCo property to cover this case
		*/
		if (!slave->id.class_id)
		return 0;

		if (!mclk_freq) {
		dev_err(&slave->dev,
		"no bus MCLK, cannot set SDW_SCP_BUS_CLOCK_BASE\n");
		return -EINVAL;
		}

		/*
		* map base frequency using Table 89 of SoundWire 1.2 spec.
		* The order of the tests just follows the specification, this
		* is not a selection between possible values or a search for
		* the best value but just a mapping. Only one case per platform
		* is relevant.
		* Some BIOS have inconsistent values for mclk_freq but a
		* correct root so we force the mclk_freq to avoid variations.
		*/
		if (!(19200000 % mclk_freq)) {
		mclk_freq = 19200000;
		base = SDW_SCP_BASE_CLOCK_19200000_HZ;
		} else if (!(24000000 % mclk_freq)) {
		mclk_freq = 24000000;
		base = SDW_SCP_BASE_CLOCK_24000000_HZ;
		} else if (!(24576000 % mclk_freq)) {
		mclk_freq = 24576000;
		base = SDW_SCP_BASE_CLOCK_24576000_HZ;
		} else if (!(22579200 % mclk_freq)) {
		mclk_freq = 22579200;
		base = SDW_SCP_BASE_CLOCK_22579200_HZ;
		} else if (!(32000000 % mclk_freq)) {
		mclk_freq = 32000000;
		base = SDW_SCP_BASE_CLOCK_32000000_HZ;
		} else {
		dev_err(&slave->dev,
		"Unsupported clock base, mclk %d\n",
		mclk_freq);
		return -EINVAL;
		}

		if (mclk_freq % curr_freq) {
		dev_err(&slave->dev,
		"mclk %d is not multiple of bus curr_freq %d\n",
		mclk_freq, curr_freq);
		return -EINVAL;
		}

		scale = mclk_freq / curr_freq;

		/*
		* map scale to Table 90 of SoundWire 1.2 spec - and check
		* that the scale is a power of two and maximum 64
		*/
		scale_index = ilog2(scale);

		if (BIT(scale_index) != scale \|\| scale_index > 6) {
		dev_err(&slave->dev,
		"No match found for scale %d, bus mclk %d curr_freq %d\n",
		scale, mclk_freq, curr_freq);
		return -EINVAL;
		}
		scale_index++;

		ret = sdw_write(slave, SDW_SCP_BUS_CLOCK_BASE, base);
		if (ret < 0) {
		dev_err(&slave->dev,
		"SDW_SCP_BUS_CLOCK_BASE write failed:%d\n", ret);
		return ret;
		}

		/* initialize scale for both banks */
		ret = sdw_write(slave, SDW_SCP_BUSCLOCK_SCALE_B0, scale_index);
		if (ret < 0) {
		dev_err(&slave->dev,
		"SDW_SCP_BUSCLOCK_SCALE_B0 write failed:%d\n", ret);
		return ret;
		}
		ret = sdw_write(slave, SDW_SCP_BUSCLOCK_SCALE_B1, scale_index);
		if (ret < 0)
		dev_err(&slave->dev,
		"SDW_SCP_BUSCLOCK_SCALE_B1 write failed:%d\n", ret);

		dev_dbg(&slave->dev,
		"Configured bus base %d, scale %d, mclk %d, curr_freq %d\n",
		base, scale_index, mclk_freq, curr_freq);

		return ret;
		}

		static int sdw_initialize_slave(struct sdw_slave *slave)
		{
		struct sdw_slave_prop *prop = &slave->prop;
		int ret;
		u8 val;

		ret = sdw_slave_set_frequency(slave);
		if (ret < 0)
		return ret;

		/*
		* Set bus clash, parity and SCP implementation
		* defined interrupt mask

drivers/soundwire/bus_type.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -20,14 +20,16 @@
		static const struct sdw_device_id *
		sdw_get_device_id(struct sdw_slave slave, struct sdw_driver drv)
		{
		const struct sdw_device_id *id = drv->id_table;
		const struct sdw_device_id *id;

		while (id && id->mfg_id) {
		for (id = drv->id_table; id && id->mfg_id; id++)
		if (slave->id.mfg_id == id->mfg_id &&
		slave->id.part_id == id->part_id)
		slave->id.part_id == id->part_id &&
		(!id->sdw_version \|\|
		slave->id.sdw_version == id->sdw_version) &&
		(!id->class_id \|\|
		slave->id.class_id == id->class_id))
		return id;
		id++;
		}

		return NULL;
		}
		@@ -49,10 +51,11 @@ static int sdw_bus_match(struct device dev, struct device_driver ddrv)

		int sdw_slave_modalias(const struct sdw_slave slave, char buf, size_t size)
		{
		/* modalias is sdw:m<mfg_id>p<part_id> */
		/* modalias is sdw:m<mfg_id>p<part_id>v<version>c<class_id> */

		return snprintf(buf, size, "sdw:m%04Xp%04X\n",
		slave->id.mfg_id, slave->id.part_id);
		return snprintf(buf, size, "sdw:m%04Xp%04Xv%02Xc%02X\n",
		slave->id.mfg_id, slave->id.part_id,
		slave->id.sdw_version, slave->id.class_id);
		}

		int sdw_slave_uevent(struct device dev, struct kobj_uevent_env env)

Admin message