Merge tag 'char-misc-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (fc0c8146) · Commits · 戴 / test

drivers/hwtracing/intel_th/core.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ static int intel_th_remove(struct device *dev)
		th->thdev[i] = NULL;
		}

		if (lowest >= 0)
		th->num_thdevs = lowest;
		}

		@@ -487,7 +488,7 @@ static const struct intel_th_subdevice {
		.flags = IORESOURCE_MEM,
		},
		{
		.start = TH_MMIO_SW,
		.start = 1, /* use resource[1] */
		.end = 0,
		.flags = IORESOURCE_MEM,
		},
		@@ -580,6 +581,7 @@ intel_th_subdevice_alloc(struct intel_th *th,
		struct intel_th_device *thdev;
		struct resource res[3];
		unsigned int req = 0;
		bool is64bit = false;
		int r, err;

		thdev = intel_th_device_alloc(th, subdev->type, subdev->name,
		@@ -589,12 +591,18 @@ intel_th_subdevice_alloc(struct intel_th *th,

		thdev->drvdata = th->drvdata;

		for (r = 0; r < th->num_resources; r++)
		if (th->resource[r].flags & IORESOURCE_MEM_64) {
		is64bit = true;
		break;
		}

		memcpy(res, subdev->res,
		sizeof(struct resource) * subdev->nres);

		for (r = 0; r < subdev->nres; r++) {
		struct resource *devres = th->resource;
		int bar = TH_MMIO_CONFIG;
		int bar = 0; /* cut subdevices' MMIO from resource[0] */

		/*
		* Take .end == 0 to mean 'take the whole bar',
		@@ -603,6 +611,8 @@ intel_th_subdevice_alloc(struct intel_th *th,
		*/
		if (!res[r].end && res[r].flags == IORESOURCE_MEM) {
		bar = res[r].start;
		if (is64bit)
		bar *= 2;
		res[r].start = 0;
		res[r].end = resource_size(&devres[bar]) - 1;
		}

drivers/hwtracing/intel_th/pci.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x18e1),
		.driver_data = (kernel_ulong_t)&intel_th_2x,
		},
		{
		/* Ice Lake PCH */
		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x34a6),
		.driver_data = (kernel_ulong_t)&intel_th_2x,
		},
		{ 0 },
		};

drivers/soundwire/stream.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -899,9 +899,10 @@ static void sdw_release_master_stream(struct sdw_stream_runtime *stream)
		struct sdw_master_runtime *m_rt = stream->m_rt;
		struct sdw_slave_runtime s_rt, _s_rt;

		list_for_each_entry_safe(s_rt, _s_rt,
		&m_rt->slave_rt_list, m_rt_node)
		sdw_stream_remove_slave(s_rt->slave, stream);
		list_for_each_entry_safe(s_rt, _s_rt, &m_rt->slave_rt_list, m_rt_node) {
		sdw_slave_port_release(s_rt->slave->bus, s_rt->slave, stream);
		sdw_release_slave_stream(s_rt->slave, stream);
		}

		list_del(&m_rt->bus_node);
		}
		@@ -1112,7 +1113,7 @@ int sdw_stream_add_master(struct sdw_bus *bus,
		"Master runtime config failed for stream:%s",
		stream->name);
		ret = -ENOMEM;
		goto error;
		goto unlock;
		}

		ret = sdw_config_stream(bus->dev, stream, stream_config, false);
		@@ -1123,11 +1124,11 @@ int sdw_stream_add_master(struct sdw_bus *bus,
		if (ret)
		goto stream_error;

		stream->state = SDW_STREAM_CONFIGURED;
		goto unlock;

		stream_error:
		sdw_release_master_stream(stream);
		error:
		unlock:
		mutex_unlock(&bus->bus_lock);
		return ret;
		}
		@@ -1141,6 +1142,10 @@ EXPORT_SYMBOL(sdw_stream_add_master);
		* @stream: SoundWire stream
		* @port_config: Port configuration for audio stream
		* @num_ports: Number of ports
		*
		* It is expected that Slave is added before adding Master
		* to the Stream.
		*
		*/
		int sdw_stream_add_slave(struct sdw_slave *slave,
		struct sdw_stream_config *stream_config,
		@@ -1186,6 +1191,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
		if (ret)
		goto stream_error;

		/*
		* Change stream state to CONFIGURED on first Slave add.
		* Bus is not aware of number of Slave(s) in a stream at this
		* point so cannot depend on all Slave(s) to be added in order to
		* change stream state to CONFIGURED.
		*/
		stream->state = SDW_STREAM_CONFIGURED;
		goto error;

Admin message