soundwire: intel: handle disabled links (395713d8) · Commits · 戴 / test

drivers/soundwire/intel.c

+22 −3

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@
		#define SDW_ALH_STRMZCFG_DMAT GENMASK(7, 0)
		#define SDW_ALH_STRMZCFG_CHN GENMASK(19, 16)

		#define SDW_INTEL_QUIRK_MASK_BUS_DISABLE BIT(1)

		enum intel_pdi_type {
		INTEL_PDI_IN = 0,
		INTEL_PDI_OUT = 1,
		@@ -944,6 +946,7 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
		struct sdw_master_prop *prop = &bus->prop;
		struct fwnode_handle *link;
		char name[32];
		u32 quirk_mask;

		/* Find master handle */
		snprintf(name, sizeof(name),
		@@ -958,6 +961,14 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)
		fwnode_property_read_u32(link,
		"intel-sdw-ip-clock",
		&prop->mclk_freq);

		fwnode_property_read_u32(link,
		"intel-quirk-mask",
		&quirk_mask);

		if (quirk_mask & SDW_INTEL_QUIRK_MASK_BUS_DISABLE)
		prop->hw_disabled = true;

		return 0;
		}

		@@ -1018,6 +1029,12 @@ static int intel_probe(struct platform_device *pdev)
		goto err_master_reg;
		}

		if (sdw->cdns.bus.prop.hw_disabled) {
		dev_info(&pdev->dev, "SoundWire master %d is disabled, ignoring\n",
		sdw->cdns.bus.link_id);
		return 0;
		}

		/* Initialize shim and controller */
		intel_link_power_up(sdw);
		intel_shim_init(sdw);
		@@ -1071,9 +1088,11 @@ static int intel_remove(struct platform_device *pdev)

		sdw = platform_get_drvdata(pdev);

		if (!sdw->cdns.bus.prop.hw_disabled) {
		intel_debugfs_exit(sdw);
		free_irq(sdw->res->irq, sdw);
		snd_soc_unregister_component(sdw->cdns.dev);
		}
		sdw_delete_bus_master(&sdw->cdns.bus);

		return 0;

+2 −0

Original line number	Diff line number	Diff line
		@@ -380,6 +380,7 @@ struct sdw_slave_prop {
		* @err_threshold: Number of times that software may retry sending a single
		* command
		* @mclk_freq: clock reference passed to SoundWire Master, in Hz.
		* @hw_disabled: if true, the Master is not functional, typically due to pin-mux
		*/
		struct sdw_master_prop {
		u32 revision;
		@@ -395,6 +396,7 @@ struct sdw_master_prop {
		bool dynamic_frame;
		u32 err_threshold;
		u32 mclk_freq;
		bool hw_disabled;
		};

		int sdw_master_read_prop(struct sdw_bus *bus);