Unverified Commit d1351c30 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: amd: ps: create platform devices based on acp config 



Based on ACP pin configuration and scanning child devices
under ACP pci device ACPI scope, platform device configuration
(pdev_config) and platform device count(pdev_count) will be
calculated.

Using pdev_config and pdev_count values, ACP PCI driver will
create platform devices for Pink Sardine platform.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://lore.kernel.org/r/20230612095903.2113464-2-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0a087781

sound/soc/amd/ps/acp63.h

+68 −5
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define ACP_DEVICE_ID 0x15E2

#define ACP63_REG_START		0x1240000

#define ACP63_REG_END		0x1250200

#define ACP63_DEVS		3

#define ACP63_DEVS		5



#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK	0x00010001

#define ACP_PGFSM_CNTL_POWER_ON_MASK	1
@@ -53,14 +53,53 @@ 
/* time in ms for runtime suspend delay */

#define ACP_SUSPEND_DELAY_MS	2000



#define ACP63_DMIC_ADDR		2

#define ACP63_PDM_MODE_DEVS		3

#define ACP63_PDM_DEV_MASK		1

#define ACP_DMIC_DEV	2



/* ACP63_PDM_MODE_DEVS corresponds to platform devices count for ACP PDM configuration */

#define ACP63_PDM_MODE_DEVS		3



/*

 * ACP63_SDW0_MODE_DEVS corresponds to platform devices count for

 * SW0 SoundWire manager instance configuration

 */

#define ACP63_SDW0_MODE_DEVS		2



/*

 * ACP63_SDW0_SDW1_MODE_DEVS corresponds to platform devices count for SW0 + SW1 SoundWire manager

 * instances configuration

 */

#define ACP63_SDW0_SDW1_MODE_DEVS	3



/*

 * ACP63_SDW0_PDM_MODE_DEVS corresponds to platform devices count for SW0 manager

 * instance + ACP PDM controller configuration

 */

#define ACP63_SDW0_PDM_MODE_DEVS	4



/*

 * ACP63_SDW0_SDW1_PDM_MODE_DEVS corresponds to platform devices count for

 * SW0 + SW1 SoundWire manager instances + ACP PDM controller configuration

 */

#define ACP63_SDW0_SDW1_PDM_MODE_DEVS   5

#define ACP63_DMIC_ADDR			2

#define ACP63_SDW_ADDR			5

#define AMD_SDW_MAX_MANAGERS		2



/* time in ms for acp timeout */

#define ACP_TIMEOUT		500



/* ACP63_PDM_DEV_CONFIG corresponds to platform device configuration for ACP PDM controller */

#define ACP63_PDM_DEV_CONFIG		BIT(0)



/* ACP63_SDW_DEV_CONFIG corresponds to platform device configuration for SDW manager instances */

#define ACP63_SDW_DEV_CONFIG		BIT(1)



/*

 * ACP63_SDW_PDM_DEV_CONFIG corresponds to platform device configuration for ACP PDM + SoundWire

 * manager instance combination.

 */

#define ACP63_SDW_PDM_DEV_CONFIG	GENMASK(1, 0)



enum acp_config {

	ACP_CONFIG_0 = 0,

	ACP_CONFIG_1,
@@ -95,14 +134,38 @@ struct pdm_dev_data { 
	struct snd_pcm_substream *capture_stream;

};



/**

 * struct acp63_dev_data - acp pci driver context

 * @acp63_base: acp mmio base

 * @res: resource

 * @pdev: array of child platform device node structures

 * @acp_lock: used to protect acp common registers

 * @sdw_fw_node: SoundWire controller fw node handle

 * @pdev_config: platform device configuration

 * @pdev_count: platform devices count

 * @pdm_dev_index: pdm platform device index

 * @sdw_manager_count: SoundWire manager instance count

 * @sdw0_dev_index: SoundWire Manager-0 platform device index

 * @sdw1_dev_index: SoundWire Manager-1 platform device index

 * @sdw_dma_dev_index: SoundWire DMA controller platform device index

 * @acp_reset: flag set to true when bus reset is applied across all

 * the active SoundWire manager instances

 */



struct acp63_dev_data {

	void __iomem *acp63_base;

	struct resource *res;

	struct platform_device *pdev[ACP63_DEVS];

	struct mutex acp_lock; /* protect shared registers */

	u16 pdev_mask;

	struct fwnode_handle *sdw_fw_node;

	u16 pdev_config;

	u16 pdev_count;

	u16 pdm_dev_index;

	u8 sdw_manager_count;

	u16 sdw0_dev_index;

	u16 sdw1_dev_index;

	u16 sdw_dma_dev_index;

	bool acp_reset;

};



int snd_amd_acp_find_config(struct pci_dev *pci);

sound/soc/amd/ps/pci-ps.c

+255 −16
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/pci.h>

#include <linux/bitops.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/delay.h>
@@ -15,6 +16,7 @@ 
#include <sound/pcm_params.h>

#include <linux/pm_runtime.h>

#include <linux/iopoll.h>

#include <linux/soundwire/sdw_amd.h>



#include "acp63.h"
@@ -119,37 +121,164 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id) 
	return IRQ_NONE;

}



static void get_acp63_device_config(u32 config, struct pci_dev *pci,

				    struct acp63_dev_data *acp_data)

static int sdw_amd_scan_controller(struct device *dev)

{

	struct acp63_dev_data *acp_data;

	struct fwnode_handle *link;

	char name[32];

	u32 sdw_manager_bitmap;

	u8 count = 0;

	u32 acp_sdw_power_mode = 0;

	int index;

	int ret;



	acp_data = dev_get_drvdata(dev);

	/*

	 * Current implementation is based on MIPI DisCo 2.0 spec.

	 * Found controller, find links supported.

	 */

	ret = fwnode_property_read_u32_array((acp_data->sdw_fw_node), "mipi-sdw-manager-list",

					     &sdw_manager_bitmap, 1);



	if (ret) {

		dev_err(dev, "Failed to read mipi-sdw-manager-list: %d\n", ret);

		return -EINVAL;

	}

	count = hweight32(sdw_manager_bitmap);

	/* Check count is within bounds */

	if (count > AMD_SDW_MAX_MANAGERS) {

		dev_err(dev, "Manager count %d exceeds max %d\n", count, AMD_SDW_MAX_MANAGERS);

		return -EINVAL;

	}



	if (!count) {

		dev_dbg(dev, "No SoundWire Managers detected\n");

		return -EINVAL;

	}

	dev_dbg(dev, "ACPI reports %d SoundWire Manager devices\n", count);

	acp_data->sdw_manager_count = count;

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

		snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", index);

		link = fwnode_get_named_child_node(acp_data->sdw_fw_node, name);

		if (!link) {

			dev_err(dev, "Manager node %s not found\n", name);

			return -EIO;

		}



		ret = fwnode_property_read_u32(link, "amd-sdw-power-mode", &acp_sdw_power_mode);

		if (ret)

			return ret;

		/*

		 * when SoundWire configuration is selected from acp pin config,

		 * based on manager instances count, acp init/de-init sequence should be

		 * executed as part of PM ops only when Bus reset is applied for the active

		 * SoundWire manager instances.

		 */

		if (acp_sdw_power_mode != AMD_SDW_POWER_OFF_MODE) {

			acp_data->acp_reset = false;

			return 0;

		}

	}

	return 0;

}



static int get_acp63_device_config(u32 config, struct pci_dev *pci, struct acp63_dev_data *acp_data)

{

	struct acpi_device *dmic_dev;

	struct acpi_device *sdw_dev;

	const union acpi_object *obj;

	bool is_dmic_dev = false;

	bool is_sdw_dev = false;

	int ret;



	dmic_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_DMIC_ADDR, 0);

	if (dmic_dev) {

		/* is_dmic_dev flag will be set when ACP PDM controller device exists */

		if (!acpi_dev_get_property(dmic_dev, "acp-audio-device-type",

					   ACPI_TYPE_INTEGER, &obj) &&

					   obj->integer.value == ACP_DMIC_DEV)

			is_dmic_dev = true;

	}



	sdw_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_SDW_ADDR, 0);

	if (sdw_dev) {

		acp_data->sdw_fw_node = acpi_fwnode_handle(sdw_dev);

		ret = sdw_amd_scan_controller(&pci->dev);

		/* is_sdw_dev flag will be set when SoundWire Manager device exists */

		if (!ret)

			is_sdw_dev = true;

	}

	if (!is_dmic_dev && !is_sdw_dev)

		return -ENODEV;

	dev_dbg(&pci->dev, "Audio Mode %d\n", config);

	switch (config) {

	case ACP_CONFIG_0:

	case ACP_CONFIG_1:

	case ACP_CONFIG_4:

	case ACP_CONFIG_5:

	case ACP_CONFIG_10:

	case ACP_CONFIG_11:

		if (is_dmic_dev) {

			acp_data->pdev_config = ACP63_PDM_DEV_CONFIG;

			acp_data->pdev_count = ACP63_PDM_MODE_DEVS;

		}

		break;

	case ACP_CONFIG_2:

	case ACP_CONFIG_3:

	case ACP_CONFIG_9:

	case ACP_CONFIG_15:

		dev_dbg(&pci->dev, "Audio Mode %d\n", config);

		if (is_sdw_dev) {

			switch (acp_data->sdw_manager_count) {

			case 1:

				acp_data->pdev_config = ACP63_SDW_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_MODE_DEVS;

				break;

			case 2:

				acp_data->pdev_config = ACP63_SDW_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_SDW1_MODE_DEVS;

				break;

			default:

		if (is_dmic_dev) {

			acp_data->pdev_mask = ACP63_PDM_DEV_MASK;

				return -EINVAL;

			}

		}

		break;

	case ACP_CONFIG_6:

	case ACP_CONFIG_7:

	case ACP_CONFIG_12:

	case ACP_CONFIG_8:

	case ACP_CONFIG_13:

	case ACP_CONFIG_14:

		if (is_dmic_dev && is_sdw_dev) {

			switch (acp_data->sdw_manager_count) {

			case 1:

				acp_data->pdev_config = ACP63_SDW_PDM_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_PDM_MODE_DEVS;

				break;

			case 2:

				acp_data->pdev_config = ACP63_SDW_PDM_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_SDW1_PDM_MODE_DEVS;

				break;

			default:

				return -EINVAL;

			}

		} else if (is_dmic_dev) {

			acp_data->pdev_config = ACP63_PDM_DEV_CONFIG;

			acp_data->pdev_count = ACP63_PDM_MODE_DEVS;

		} else if (is_sdw_dev) {

			switch (acp_data->sdw_manager_count) {

			case 1:

				acp_data->pdev_config = ACP63_SDW_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_MODE_DEVS;

				break;

			case 2:

				acp_data->pdev_config = ACP63_SDW_DEV_CONFIG;

				acp_data->pdev_count = ACP63_SDW0_SDW1_MODE_DEVS;

				break;

			default:

				return -EINVAL;

			}

		}

		break;

	default:

		break;

	}

	return 0;

}



static void acp63_fill_platform_dev_info(struct platform_device_info *pdevinfo,
@@ -173,6 +302,7 @@ static void acp63_fill_platform_dev_info(struct platform_device_info *pdevinfo, 


static int create_acp63_platform_devs(struct pci_dev *pci, struct acp63_dev_data *adata, u32 addr)

{

	struct acp_sdw_pdata *sdw_pdata;

	struct platform_device_info pdevinfo[ACP63_DEVS];

	struct device *parent;

	int index;
@@ -180,9 +310,9 @@ static int create_acp63_platform_devs(struct pci_dev *pci, struct acp63_dev_data 


	parent = &pci->dev;

	dev_dbg(&pci->dev,

		"%s pdev_mask:0x%x pdev_count:0x%x\n", __func__, adata->pdev_mask,

		"%s pdev_config:0x%x pdev_count:0x%x\n", __func__, adata->pdev_config,

		adata->pdev_count);

	if (adata->pdev_mask) {

	if (adata->pdev_config) {

		adata->res = devm_kzalloc(&pci->dev, sizeof(struct resource), GFP_KERNEL);

		if (!adata->res) {

			ret = -ENOMEM;
@@ -194,8 +324,8 @@ static int create_acp63_platform_devs(struct pci_dev *pci, struct acp63_dev_data 
		memset(&pdevinfo, 0, sizeof(pdevinfo));

	}



	switch (adata->pdev_mask) {

	case ACP63_PDM_DEV_MASK:

	switch (adata->pdev_config) {

	case ACP63_PDM_DEV_CONFIG:

		adata->pdm_dev_index  = 0;

		acp63_fill_platform_dev_info(&pdevinfo[0], parent, NULL, "acp_ps_pdm_dma",

					     0, adata->res, 1, NULL, 0);
@@ -204,8 +334,104 @@ static int create_acp63_platform_devs(struct pci_dev *pci, struct acp63_dev_data 
		acp63_fill_platform_dev_info(&pdevinfo[2], parent, NULL, "acp_ps_mach",

					     0, NULL, 0, NULL, 0);

		break;

	case ACP63_SDW_DEV_CONFIG:

		if (adata->pdev_count == ACP63_SDW0_MODE_DEVS) {

			sdw_pdata = devm_kzalloc(&pci->dev, sizeof(struct acp_sdw_pdata),

						 GFP_KERNEL);

			if (!sdw_pdata) {

				ret = -ENOMEM;

				goto de_init;

			}



			sdw_pdata->instance = 0;

			sdw_pdata->acp_sdw_lock = &adata->acp_lock;

			adata->sdw0_dev_index = 0;

			adata->sdw_dma_dev_index = 1;

			acp63_fill_platform_dev_info(&pdevinfo[0], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 0, adata->res, 1,

						     sdw_pdata, sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[1], parent, NULL, "amd_ps_sdw_dma",

						     0, adata->res, 1, NULL, 0);

		} else if (adata->pdev_count == ACP63_SDW0_SDW1_MODE_DEVS) {

			sdw_pdata = devm_kzalloc(&pci->dev, sizeof(struct acp_sdw_pdata) * 2,

						 GFP_KERNEL);

			if (!sdw_pdata) {

				ret = -ENOMEM;

				goto de_init;

			}



			sdw_pdata[0].instance = 0;

			sdw_pdata[1].instance = 1;

			sdw_pdata[0].acp_sdw_lock = &adata->acp_lock;

			sdw_pdata[1].acp_sdw_lock = &adata->acp_lock;

			sdw_pdata->acp_sdw_lock = &adata->acp_lock;

			adata->sdw0_dev_index = 0;

			adata->sdw1_dev_index = 1;

			adata->sdw_dma_dev_index = 2;

			acp63_fill_platform_dev_info(&pdevinfo[0], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 0, adata->res, 1,

						     &sdw_pdata[0], sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[1], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 1, adata->res, 1,

						     &sdw_pdata[1], sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[2], parent, NULL, "amd_ps_sdw_dma",

						     0, adata->res, 1, NULL, 0);

		}

		break;

	case ACP63_SDW_PDM_DEV_CONFIG:

		if (adata->pdev_count == ACP63_SDW0_PDM_MODE_DEVS) {

			sdw_pdata = devm_kzalloc(&pci->dev, sizeof(struct acp_sdw_pdata),

						 GFP_KERNEL);

			if (!sdw_pdata) {

				ret = -ENOMEM;

				goto de_init;

			}



			sdw_pdata->instance = 0;

			sdw_pdata->acp_sdw_lock = &adata->acp_lock;

			adata->pdm_dev_index = 0;

			adata->sdw0_dev_index = 1;

			adata->sdw_dma_dev_index = 2;

			acp63_fill_platform_dev_info(&pdevinfo[0], parent, NULL, "acp_ps_pdm_dma",

						     0, adata->res, 1, NULL, 0);

			acp63_fill_platform_dev_info(&pdevinfo[1], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 0, adata->res, 1,

						     sdw_pdata, sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[2], parent, NULL, "amd_ps_sdw_dma",

						     0, adata->res, 1, NULL, 0);

			acp63_fill_platform_dev_info(&pdevinfo[3], parent, NULL, "dmic-codec",

						     0, NULL, 0, NULL, 0);

		} else if (adata->pdev_count == ACP63_SDW0_SDW1_PDM_MODE_DEVS) {

			sdw_pdata = devm_kzalloc(&pci->dev, sizeof(struct acp_sdw_pdata) * 2,

						 GFP_KERNEL);

			if (!sdw_pdata) {

				ret = -ENOMEM;

				goto de_init;

			}

			sdw_pdata[0].instance = 0;

			sdw_pdata[1].instance = 1;

			sdw_pdata[0].acp_sdw_lock = &adata->acp_lock;

			sdw_pdata[1].acp_sdw_lock = &adata->acp_lock;

			adata->pdm_dev_index = 0;

			adata->sdw0_dev_index = 1;

			adata->sdw1_dev_index = 2;

			adata->sdw_dma_dev_index = 3;

			acp63_fill_platform_dev_info(&pdevinfo[0], parent, NULL, "acp_ps_pdm_dma",

						     0, adata->res, 1, NULL, 0);

			acp63_fill_platform_dev_info(&pdevinfo[1], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 0, adata->res, 1,

						     &sdw_pdata[0], sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[2], parent, adata->sdw_fw_node,

						     "amd_sdw_manager", 1, adata->res, 1,

						     &sdw_pdata[1], sizeof(struct acp_sdw_pdata));

			acp63_fill_platform_dev_info(&pdevinfo[3], parent, NULL, "amd_ps_sdw_dma",

						     0, adata->res, 1, NULL, 0);

			acp63_fill_platform_dev_info(&pdevinfo[4], parent, NULL, "dmic-codec",

						     0, NULL, 0, NULL, 0);

		}

		break;

	default:

		dev_dbg(&pci->dev, "No PDM devices found\n");

		dev_dbg(&pci->dev, "No PDM or SoundWire manager devices found\n");

		return 0;

	}
@@ -276,6 +502,13 @@ static int snd_acp63_probe(struct pci_dev *pci, 
		ret = -ENOMEM;

		goto release_regions;

	}

	/*

	 * By default acp_reset flag is set to true. i.e acp_deinit() and acp_init()

	 * will be invoked for all ACP configurations during suspend/resume callbacks.

	 * This flag should be set to false only when SoundWire manager power mode

	 * set to ClockStopMode.

	 */

	adata->acp_reset = true;

	pci_set_master(pci);

	pci_set_drvdata(pci, adata);

	mutex_init(&adata->acp_lock);
@@ -289,12 +522,18 @@ static int snd_acp63_probe(struct pci_dev *pci, 
		goto de_init;

	}

	val = readl(adata->acp63_base + ACP_PIN_CONFIG);

	get_acp63_device_config(val, pci, adata);

	ret = get_acp63_device_config(val, pci, adata);

	/* ACP PCI driver probe should be continued even PDM or SoundWire Devices are not found */

	if (ret) {

		dev_err(&pci->dev, "get acp device config failed:%d\n", ret);

		goto skip_pdev_creation;

	}

	ret = create_acp63_platform_devs(pci, adata, addr);

	if (ret < 0) {

		dev_err(&pci->dev, "ACP platform devices creation failed\n");

		goto de_init;

	}

skip_pdev_creation:

	pm_runtime_set_autosuspend_delay(&pci->dev, ACP_SUSPEND_DELAY_MS);

	pm_runtime_use_autosuspend(&pci->dev);

	pm_runtime_put_noidle(&pci->dev);