Commit 43df5242 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Slightly bulky changes are seen at this time, mostly for dealing with
  the messed up Kconfig for ASoC Intel SOF stuff. The driver and its
  code was split to each module per platform now, which is far more
  straightforward. This should cover the randconfig problems, and more
  importantly, improve the actual device handling as well.

  Other than that, nothing particular stands out: the HDMI PCM
  assignment fix for Intel Tigerlake, MIPS n64 error handling fix, and
  the usual suspects, HD-audio / USB-audio quirks"

* tag 'sound-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board
  ALSA: hda/realtek: Add quirk for Intel NUC 10
  ALSA: hda/hdmi: let new platforms assign the pcm slot dynamically
  ALSA: hda/realtek: Add quirk for Clevo NH55RZQ
  ALSA: hda: intel-sdw-acpi: add missing include files
  ALSA: hda: move Intel SoundWire ACPI scan to dedicated module
  ASoC: SOF: Intel: SoundWire: simplify Kconfig
  ASoC: SOF: pci: move DSP_CONFIG use to platform-specific drivers
  ASoC: SOF: pci: split PCI into different drivers
  ASoC: SOF: ACPI: avoid reverse module dependency
  ASoC: soc-acpi: allow for partial match in parent name
  ALSA: hda: intel-nhlt: verify config type
  ALSA: hda: fix kernel-doc warnings
  ALSA: usb-audio: Fix Pioneer DJM devices URB_CONTROL request direction to set samplerate
  ALSA: usb-audio: use Corsair Virtuoso mapping for Corsair Virtuoso SE
  ALSA: hda/realtek: Enable headset mic of Acer SWIFT with ALC256
  ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits
  ALSA: usb-audio: Allow modifying parameters with succeeding hw_params calls
  ALSA: usb-audio: Drop bogus dB range in too low level
  ALSA: usb-audio: Don't abort even if the clock rate differs
  ...
parents f69d02e3 26af1772

drivers/soundwire/intel.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct sdw_intel { 
#endif

};



#define SDW_INTEL_QUIRK_MASK_BUS_DISABLE      BIT(1)



int intel_master_startup(struct platform_device *pdev);

int intel_master_process_wakeen_event(struct platform_device *pdev);

drivers/soundwire/intel_init.c

+0 −158
Original line number Diff line number Diff line
@@ -18,42 +18,12 @@ 
#include "cadence_master.h"

#include "intel.h"



#define SDW_LINK_TYPE		4 /* from Intel ACPI documentation */

#define SDW_MAX_LINKS		4

#define SDW_SHIM_LCAP		0x0

#define SDW_SHIM_BASE		0x2C000

#define SDW_ALH_BASE		0x2C800

#define SDW_LINK_BASE		0x30000

#define SDW_LINK_SIZE		0x10000



static int ctrl_link_mask;

module_param_named(sdw_link_mask, ctrl_link_mask, int, 0444);

MODULE_PARM_DESC(sdw_link_mask, "Intel link mask (one bit per link)");



static bool is_link_enabled(struct fwnode_handle *fw_node, int i)

{

	struct fwnode_handle *link;

	char name[32];

	u32 quirk_mask = 0;



	/* Find master handle */

	snprintf(name, sizeof(name),

		 "mipi-sdw-link-%d-subproperties", i);



	link = fwnode_get_named_child_node(fw_node, name);

	if (!link)

		return false;



	fwnode_property_read_u32(link,

				 "intel-quirk-mask",

				 &quirk_mask);



	if (quirk_mask & SDW_INTEL_QUIRK_MASK_BUS_DISABLE)

		return false;



	return true;

}



static int sdw_intel_cleanup(struct sdw_intel_ctx *ctx)

{

	struct sdw_intel_link_res *link = ctx->links;
@@ -81,74 +51,6 @@ static int sdw_intel_cleanup(struct sdw_intel_ctx *ctx) 
	return 0;

}



static int

sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)

{

	struct acpi_device *adev;

	int ret, i;

	u8 count;



	if (acpi_bus_get_device(info->handle, &adev))

		return -EINVAL;



	/* Found controller, find links supported */

	count = 0;

	ret = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),

					    "mipi-sdw-master-count", &count, 1);



	/*

	 * In theory we could check the number of links supported in

	 * hardware, but in that step we cannot assume SoundWire IP is

	 * powered.

	 *

	 * In addition, if the BIOS doesn't even provide this

	 * 'master-count' property then all the inits based on link

	 * masks will fail as well.

	 *

	 * We will check the hardware capabilities in the startup() step

	 */



	if (ret) {

		dev_err(&adev->dev,

			"Failed to read mipi-sdw-master-count: %d\n", ret);

		return -EINVAL;

	}



	/* Check count is within bounds */

	if (count > SDW_MAX_LINKS) {

		dev_err(&adev->dev, "Link count %d exceeds max %d\n",

			count, SDW_MAX_LINKS);

		return -EINVAL;

	}



	if (!count) {

		dev_warn(&adev->dev, "No SoundWire links detected\n");

		return -EINVAL;

	}

	dev_dbg(&adev->dev, "ACPI reports %d SDW Link devices\n", count);



	info->count = count;

	info->link_mask = 0;



	for (i = 0; i < count; i++) {

		if (ctrl_link_mask && !(ctrl_link_mask & BIT(i))) {

			dev_dbg(&adev->dev,

				"Link %d masked, will not be enabled\n", i);

			continue;

		}



		if (!is_link_enabled(acpi_fwnode_handle(adev), i)) {

			dev_dbg(&adev->dev,

				"Link %d not selected in firmware\n", i);

			continue;

		}



		info->link_mask |= BIT(i);

	}



	return 0;

}



#define HDA_DSP_REG_ADSPIC2             (0x10)

#define HDA_DSP_REG_ADSPIS2             (0x14)

#define HDA_DSP_REG_ADSPIC2_SNDW        BIT(5)
@@ -357,66 +259,6 @@ sdw_intel_startup_controller(struct sdw_intel_ctx *ctx) 
	return 0;

}



static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level,

				     void *cdata, void **return_value)

{

	struct sdw_intel_acpi_info *info = cdata;

	struct acpi_device *adev;

	acpi_status status;

	u64 adr;



	status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL, &adr);

	if (ACPI_FAILURE(status))

		return AE_OK; /* keep going */



	if (acpi_bus_get_device(handle, &adev)) {

		pr_err("%s: Couldn't find ACPI handle\n", __func__);

		return AE_NOT_FOUND;

	}



	info->handle = handle;



	/*

	 * On some Intel platforms, multiple children of the HDAS

	 * device can be found, but only one of them is the SoundWire

	 * controller. The SNDW device is always exposed with

	 * Name(_ADR, 0x40000000), with bits 31..28 representing the

	 * SoundWire link so filter accordingly

	 */

	if (FIELD_GET(GENMASK(31, 28), adr) != SDW_LINK_TYPE)

		return AE_OK; /* keep going */



	/* device found, stop namespace walk */

	return AE_CTRL_TERMINATE;

}



/**

 * sdw_intel_acpi_scan() - SoundWire Intel init routine

 * @parent_handle: ACPI parent handle

 * @info: description of what firmware/DSDT tables expose

 *

 * This scans the namespace and queries firmware to figure out which

 * links to enable. A follow-up use of sdw_intel_probe() and

 * sdw_intel_startup() is required for creation of devices and bus

 * startup

 */

int sdw_intel_acpi_scan(acpi_handle *parent_handle,

			struct sdw_intel_acpi_info *info)

{

	acpi_status status;



	info->handle = NULL;

	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,

				     parent_handle, 1,

				     sdw_intel_acpi_cb,

				     NULL, info, NULL);

	if (ACPI_FAILURE(status) || info->handle == NULL)

		return -ENODEV;



	return sdw_intel_scan_controller(info);

}

EXPORT_SYMBOL_NS(sdw_intel_acpi_scan, SOUNDWIRE_INTEL_INIT);



/**

 * sdw_intel_probe() - SoundWire Intel probe routine

 * @res: resource data

include/linux/soundwire/sdw_intel.h

+2 −0
Original line number Diff line number Diff line
@@ -187,4 +187,6 @@ void sdw_intel_enable_irq(void __iomem *mmio_base, bool enable); 


irqreturn_t sdw_intel_thread(int irq, void *dev_id);



#define SDW_INTEL_QUIRK_MASK_BUS_DISABLE      BIT(1)



#endif

include/sound/intel-nhlt.h

+5 −0
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ struct nhlt_vendor_dmic_array_config { 
	/* TODO add vendor mic config */

} __packed;



enum {

	NHLT_CONFIG_TYPE_GENERIC = 0,

	NHLT_CONFIG_TYPE_MIC_ARRAY = 1

};



enum {

	NHLT_MIC_ARRAY_2CH_SMALL = 0xa,

	NHLT_MIC_ARRAY_2CH_BIG = 0xb,

include/sound/soc-acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ struct snd_soc_acpi_codecs { 
static inline bool snd_soc_acpi_sof_parent(struct device *dev)

{

	return dev->parent && dev->parent->driver && dev->parent->driver->name &&

		!strcmp(dev->parent->driver->name, "sof-audio-acpi");

		!strncmp(dev->parent->driver->name, "sof-audio-acpi", strlen("sof-audio-acpi"));

}



#endif