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

ASoC: amd: ps: add acp pci driver hw_ops for acp6.3 platform 



Add ACP6.3 platform specific PCI driver hw_ops for acp init/de-init
sequence.

Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://patch.msgid.link/20250207062819.1527184-4-Vijendar.Mukunda@amd.com


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

sound/soc/amd/ps/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Pink Sardine platform Support

snd-pci-ps-y := pci-ps.o

snd-pci-ps-y := pci-ps.o ps-common.o

snd-ps-pdm-dma-y := ps-pdm-dma.o

snd-soc-ps-mach-y := ps-mach.o

snd-ps-sdw-dma-y := ps-sdw-dma.o

sound/soc/amd/ps/acp63.h

+32 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ 
#define SDW_MAX_BUFFER (SDW_PLAYBACK_MAX_PERIOD_SIZE * SDW_PLAYBACK_MAX_NUM_PERIODS)

#define SDW_MIN_BUFFER SDW_MAX_BUFFER



#define ACP_HW_OPS(acp_data, cb)	((acp_data)->hw_ops->cb)



enum acp_config {

	ACP_CONFIG_0 = 0,

	ACP_CONFIG_1,
@@ -213,10 +215,23 @@ struct sdw_dma_ring_buf_reg { 
	u32 pos_high_reg;

};



struct acp63_dev_data;



/**

 * struct acp_hw_ops - ACP PCI driver platform specific ops

 * @acp_init: ACP initialization

 * @acp_deinit: ACP de-initialization

 */

struct acp_hw_ops {

	int (*acp_init)(void __iomem *acp_base, struct device *dev);

	int (*acp_deinit)(void __iomem *acp_base, struct device *dev);

};



/**

 * struct acp63_dev_data - acp pci driver context

 * @acp63_base: acp mmio base

 * @res: resource

 * @hw_ops: ACP pci driver platform-specific ops

 * @pdm_dev: ACP PDM controller platform device

 * @dmic_codec: platform device for DMIC Codec

 * sdw_dma_dev: platform device for SoundWire DMA controller
@@ -242,6 +257,7 @@ struct sdw_dma_ring_buf_reg { 
struct acp63_dev_data {

	void __iomem *acp63_base;

	struct resource *res;

	struct acp_hw_ops *hw_ops;

	struct platform_device *pdm_dev;

	struct platform_device *dmic_codec_dev;

	struct platform_device *sdw_dma_dev;
@@ -263,4 +279,20 @@ struct acp63_dev_data { 
	u16 acp63_sdw1_dma_intr_stat[ACP63_SDW1_DMA_MAX_STREAMS];

};



void acp63_hw_init_ops(struct acp_hw_ops *hw_ops);



static inline int acp_hw_init(struct acp63_dev_data *adata, struct device *dev)

{

	if (adata && adata->hw_ops && adata->hw_ops->acp_init)

		return ACP_HW_OPS(adata, acp_init)(adata->acp63_base, dev);

	return -EOPNOTSUPP;

}



static inline int acp_hw_deinit(struct acp63_dev_data *adata, struct device *dev)

{

	if (adata && adata->hw_ops && adata->hw_ops->acp_deinit)

		return ACP_HW_OPS(adata, acp_deinit)(adata->acp63_base, dev);

	return -EOPNOTSUPP;

}



int snd_amd_acp_find_config(struct pci_dev *pci);

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

+30 −88
Original line number Diff line number Diff line
@@ -21,87 +21,6 @@ 


#include "acp63.h"



static int acp63_power_on(void __iomem *acp_base)

{

	u32 val;



	val = readl(acp_base + ACP_PGFSM_STATUS);



	if (!val)

		return val;



	if ((val & ACP63_PGFSM_STATUS_MASK) != ACP63_POWER_ON_IN_PROGRESS)

		writel(ACP63_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);



	return readl_poll_timeout(acp_base + ACP_PGFSM_STATUS, val, !val, DELAY_US, ACP63_TIMEOUT);

}



static int acp63_reset(void __iomem *acp_base)

{

	u32 val;

	int ret;



	writel(1, acp_base + ACP_SOFT_RESET);



	ret = readl_poll_timeout(acp_base + ACP_SOFT_RESET, val,

				 val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK,

				 DELAY_US, ACP63_TIMEOUT);

	if (ret)

		return ret;



	writel(0, acp_base + ACP_SOFT_RESET);



	return readl_poll_timeout(acp_base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP63_TIMEOUT);

}



static void acp63_enable_interrupts(void __iomem *acp_base)

{

	writel(1, acp_base + ACP_EXTERNAL_INTR_ENB);

	writel(ACP_ERROR_IRQ, acp_base + ACP_EXTERNAL_INTR_CNTL);

}



static void acp63_disable_interrupts(void __iomem *acp_base)

{

	writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base + ACP_EXTERNAL_INTR_STAT);

	writel(0, acp_base + ACP_EXTERNAL_INTR_CNTL);

	writel(0, acp_base + ACP_EXTERNAL_INTR_ENB);

}



static int acp63_init(void __iomem *acp_base, struct device *dev)

{

	int ret;



	ret = acp63_power_on(acp_base);

	if (ret) {

		dev_err(dev, "ACP power on failed\n");

		return ret;

	}

	writel(0x01, acp_base + ACP_CONTROL);

	ret = acp63_reset(acp_base);

	if (ret) {

		dev_err(dev, "ACP reset failed\n");

		return ret;

	}

	acp63_enable_interrupts(acp_base);

	writel(0, acp_base + ACP_ZSC_DSP_CTRL);

	return 0;

}



static int acp63_deinit(void __iomem *acp_base, struct device *dev)

{

	int ret;



	acp63_disable_interrupts(acp_base);

	ret = acp63_reset(acp_base);

	if (ret) {

		dev_err(dev, "ACP reset failed\n");

		return ret;

	}

	writel(0, acp_base + ACP_CONTROL);

	writel(1, acp_base + ACP_ZSC_DSP_CTRL);

	return 0;

}



static irqreturn_t acp63_irq_thread(int irq, void *context)

{

	struct sdw_dma_dev_data *sdw_data;
@@ -540,11 +459,29 @@ static int create_acp63_platform_devs(struct pci_dev *pci, struct acp63_dev_data 
unregister_pdm_dev:

		platform_device_unregister(adata->pdm_dev);

de_init:

	if (acp63_deinit(adata->acp63_base, &pci->dev))

	if (acp_hw_deinit(adata, &pci->dev))

		dev_err(&pci->dev, "ACP de-init failed\n");

	return ret;

}



static int acp_hw_init_ops(struct acp63_dev_data *adata, struct pci_dev *pci)

{

	adata->hw_ops = devm_kzalloc(&pci->dev, sizeof(struct acp_hw_ops),

				     GFP_KERNEL);

	if (!adata->hw_ops)

		return -ENOMEM;



	switch (adata->acp_rev) {

	case ACP63_PCI_REV:

		acp63_hw_init_ops(adata->hw_ops);

		break;

	default:

		dev_err(&pci->dev, "ACP device not found\n");

		return -ENODEV;

	}

	return 0;

}



static int snd_acp63_probe(struct pci_dev *pci,

			   const struct pci_device_id *pci_id)

{
@@ -598,7 +535,12 @@ static int snd_acp63_probe(struct pci_dev *pci, 
	pci_set_master(pci);

	pci_set_drvdata(pci, adata);

	mutex_init(&adata->acp_lock);

	ret = acp63_init(adata->acp63_base, &pci->dev);

	ret = acp_hw_init_ops(adata, pci);

	if (ret) {

		dev_err(&pci->dev, "ACP hw ops init failed\n");

		goto release_regions;

	}

	ret = acp_hw_init(adata, &pci->dev);

	if (ret)

		goto release_regions;

	ret = devm_request_threaded_irq(&pci->dev, pci->irq, acp63_irq_handler,
@@ -632,7 +574,7 @@ static int snd_acp63_probe(struct pci_dev *pci, 
	pm_runtime_allow(&pci->dev);

	return 0;

de_init:

	if (acp63_deinit(adata->acp63_base, &pci->dev))

	if (acp_hw_deinit(adata, &pci->dev))

		dev_err(&pci->dev, "ACP de-init failed\n");

release_regions:

	pci_release_regions(pci);
@@ -677,7 +619,7 @@ static int __maybe_unused snd_acp63_suspend(struct device *dev) 
			return 0;

		}

	}

	ret = acp63_deinit(adata->acp63_base, dev);

	ret = acp_hw_deinit(adata, dev);

	if (ret)

		dev_err(dev, "ACP de-init failed\n");
@@ -694,7 +636,7 @@ static int __maybe_unused snd_acp63_runtime_resume(struct device *dev) 
		writel(0, adata->acp63_base + ACP_ZSC_DSP_CTRL);

		return 0;

	}

	ret = acp63_init(adata->acp63_base, dev);

	ret = acp_hw_init(adata, dev);

	if (ret) {

		dev_err(dev, "ACP init failed\n");

		return ret;
@@ -716,7 +658,7 @@ static int __maybe_unused snd_acp63_resume(struct device *dev) 
		return 0;

	}



	ret = acp63_init(adata->acp63_base, dev);

	ret = acp_hw_deinit(adata, dev);

	if (ret)

		dev_err(dev, "ACP init failed\n");
@@ -744,7 +686,7 @@ static void snd_acp63_remove(struct pci_dev *pci) 
	}

	if (adata->mach_dev)

		platform_device_unregister(adata->mach_dev);

	ret = acp63_deinit(adata->acp63_base, &pci->dev);

	ret = acp_hw_deinit(adata, &pci->dev);

	if (ret)

		dev_err(&pci->dev, "ACP de-init failed\n");

	pm_runtime_forbid(&pci->dev);

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

0 → 100644
+104 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * AMD ACP PCI driver callback routines for ACP6.3, ACP7.0 & ACP7.1

 * platforms.

 *

 * Copyright 2025 Advanced Micro Devices, Inc.

 * Authors: Vijendar Mukunda <Vijendar.Mukunda@amd.com>

 */



#include <linux/bitops.h>

#include <linux/delay.h>

#include <linux/export.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/platform_device.h>



#include "acp63.h"



static int acp63_power_on(void __iomem *acp_base)

{

	u32 val;



	val = readl(acp_base + ACP_PGFSM_STATUS);



	if (!val)

		return val;



	if ((val & ACP63_PGFSM_STATUS_MASK) != ACP63_POWER_ON_IN_PROGRESS)

		writel(ACP63_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);



	return readl_poll_timeout(acp_base + ACP_PGFSM_STATUS, val, !val, DELAY_US, ACP63_TIMEOUT);

}



static int acp63_reset(void __iomem *acp_base)

{

	u32 val;

	int ret;



	writel(1, acp_base + ACP_SOFT_RESET);



	ret = readl_poll_timeout(acp_base + ACP_SOFT_RESET, val,

				 val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK,

				 DELAY_US, ACP63_TIMEOUT);

	if (ret)

		return ret;



	writel(0, acp_base + ACP_SOFT_RESET);



	return readl_poll_timeout(acp_base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP63_TIMEOUT);

}



static void acp63_enable_interrupts(void __iomem *acp_base)

{

	writel(1, acp_base + ACP_EXTERNAL_INTR_ENB);

	writel(ACP_ERROR_IRQ, acp_base + ACP_EXTERNAL_INTR_CNTL);

}



static void acp63_disable_interrupts(void __iomem *acp_base)

{

	writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base + ACP_EXTERNAL_INTR_STAT);

	writel(0, acp_base + ACP_EXTERNAL_INTR_CNTL);

	writel(0, acp_base + ACP_EXTERNAL_INTR_ENB);

}



static int acp63_init(void __iomem *acp_base, struct device *dev)

{

	int ret;



	ret = acp63_power_on(acp_base);

	if (ret) {

		dev_err(dev, "ACP power on failed\n");

		return ret;

	}

	writel(0x01, acp_base + ACP_CONTROL);

	ret = acp63_reset(acp_base);

	if (ret) {

		dev_err(dev, "ACP reset failed\n");

		return ret;

	}

	acp63_enable_interrupts(acp_base);

	writel(0, acp_base + ACP_ZSC_DSP_CTRL);

	return 0;

}



static int acp63_deinit(void __iomem *acp_base, struct device *dev)

{

	int ret;



	acp63_disable_interrupts(acp_base);

	ret = acp63_reset(acp_base);

	if (ret) {

		dev_err(dev, "ACP reset failed\n");

		return ret;

	}

	writel(0, acp_base + ACP_CONTROL);

	writel(1, acp_base + ACP_ZSC_DSP_CTRL);

	return 0;

}



void acp63_hw_init_ops(struct acp_hw_ops *hw_ops)

{

	hw_ops->acp_init = acp63_init;

	hw_ops->acp_deinit = acp63_deinit;

}