Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <32f0e33d-0f9b-f27d-2fa8-63b493c2d9aa@amd.com>
Date:   Mon, 11 Oct 2021 06:06:22 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.1.1
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions
Content-Language: en-US
To:     Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
        "broonie@kernel.org" <broonie@kernel.org>,
        "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
Cc:     "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "Hiregoudar, Basavaraj" <Basavaraj.Hiregoudar@amd.com>,
        "Dommati, Sunil-kumar" <Sunil-kumar.Dommati@amd.com>,
        "Limonciello, Mario" <Mario.Limonciello@amd.com>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Jaroslav Kysela <perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>,
        open list <linux-kernel@vger.kernel.org>
References: <20211011055621.13240-1-Vijendar.Mukunda@amd.com>
 <20211011055621.13240-4-Vijendar.Mukunda@amd.com>
From:   "Gong, Richard" <richard.gong@amd.com>
In-Reply-To: <20211011055621.13240-4-Vijendar.Mukunda@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b08vU2tNc3hqeFB4bW94MGtrSDJBaXE3SksxamZqdmFJRFIybWpnRVFJSzR4?=
 =?utf-8?B?RDFpRjlqcVNtUUFLVSs5ZUo0eXZZUzdWWVN1TTJNb1VQN0orTm1FaWRneVZu?=
 =?utf-8?B?VUJyNDcwWW51dVB4TzlPOHUxbjF0K2FxdnBSeEtCQUp6bE5yR21MNEN5TXFL?=
 =?utf-8?B?QXI0OXRwcElnY1k2N3U3Q2ZWZjVvbzdSOVZXbjY0amtoZDAyWFp2OFVmcVRs?=
 =?utf-8?B?T05aUitTMUZzRnRGQTFFWHVlV1V1Q3Q2TDNndkxxa1FKVTd2M3NhdTlxSzd3?=
 =?utf-8?B?UHdFdExNU3ByaGdhYmU5cklHTU1uM1FxQU1rUTRwc2VFRHNicHhVNC9qN1NP?=
 =?utf-8?B?Q1JjaytsK3RXOW5qZjJkejRGWjdVQUtIUXZHNjBqN3pNK2hoRFFobENsQUoy?=
 =?utf-8?B?ZDBDR05SUU13SE9VYUJobzlWM3VFMUxmKzg4RlRjQ2VzUS9VcDU0ZHdibXdJ?=
 =?utf-8?B?eDNEQVp2YnlYK21hUEUzL0UxNmVJUEpROWN5S3pNQU9tQ01lU01xZjAzMGRK?=
 =?utf-8?B?VWJmcnYwczNzWUNWd3BKd2lrbWV3TUxNbk0rVk5kVEJjd0wxckdLL2NLZFls?=
 =?utf-8?B?T3FOOEE4V250ZVZ1TmJxaURBYzNNaEJlbldRTUo5N0xzSSsxZXFteHFiUkpa?=
 =?utf-8?B?azhwTEhWQ3dxbTdna25IQzllNUJMNjlxUEJBbVRNT2VUMGxhV29ma0ttMEcr?=
 =?utf-8?B?VW1hcHRCN3V0eXhXWjZuSWpmMEc5MVBJbWhTbXByWmJiVVBETzVjS2xJZlI3?=
 =?utf-8?B?YWdjdkE5UXpqRzMxVXJqN25iNzdISHRlMHNGNjBhYjNGUjc0ZldFSGJqMW1x?=
 =?utf-8?B?azdGZkVEY0dHazJiVFBGYVlBWkpyMDMyZC9jc0RpZWVJMWV6dm9LdWszNDFC?=
 =?utf-8?B?Y0k0Z29iMy8zck11UXV0QWMzaVdlcGRYMC96UUNwOE1VVWVJbDdUT0JZekV1?=
 =?utf-8?B?cGtTRlNieDNCZG9OcTArRWdveEJ2Qm04aEt2QlBVWE5BWi9wL2VKZzFnSWtG?=
 =?utf-8?B?VHh3SzI2ZGg4Mkk4WjdlYllsSEFjNkQzbDFrb2JxOVpzSE8wY2FidWx5TGgr?=
 =?utf-8?B?Nzc2djNXbVFVNkZnckpBTnBVcklnd1c1dXNBc3JjdlI0TEtTQy94WG1Yd3RW?=
 =?utf-8?B?M3pGMzBCVkh6b2xVa0dsekxtZG4zTXBMSU9DV0U3Q1g0Zy9xYnZhWFFjOWxG?=
 =?utf-8?B?U2lSbWVzS2FYVGdrOW1BMFdlRFUybU9pRHEvalJjR2dQOENvc3VPcnpKOTNT?=
 =?utf-8?B?TlBhV0RTaittd3lqbUpEMmdnMGM1MUFzVjJBK05wN3F5eFpYNkNZMFUwM3JM?=
 =?utf-8?B?ZHEwaWUxRVMyT1N4QlUxbmhxMXQxVUpBTTZTUEk0M3JLenFYMERBSExtalhC?=
 =?utf-8?B?ZHo3SjA2dlVyekdPR2RMeTd2V3Zjc0tqV2NnazRQUnVFNm1DemdZQXhvQk95?=
 =?utf-8?B?cDFuOUl6QVJNYnpnZDZOMDNTWHA0NW1MVVkyZldZUkhYazZ6OVpPU3dNcUNH?=
 =?utf-8?B?MERWd05xN3FYWmxza2JtWHpGcGlqd3MwSHppcllIT0tBU01ORFlsZllsNnRO?=
 =?utf-8?B?NTlJSS9rQWd3d3E3d1J6N3EzSjFmeDBrR1VmcnpWZmphSTJKZENxR05JUmJs?=
 =?utf-8?B?TldQMDhwTiszdW11VGR6M0x1OGNOdEdOcXBJVERPQTkxZFpha3RwTXpRRklM?=
 =?utf-8?B?TFVnWVBmQVhWSFhiQVpqeDB2TmZyTG5hZi9VQUsxUGtNS1dzWTN3d1VMbjZL?=
 =?utf-8?Q?x1wgJB45eA509kaa6p3au9+r0inz4AVZyYUKrpb?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7022f197-d3ce-4974-67cf-08d98ca72a7a
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3565.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 11:06:25.1437
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: lXFL96W2bzbMZ94mJtX4voO8WaO7hJa7ht+QsULneucW4eF8nPlogXQsDQua+hiqR5texhYFHp8oyKGEQSAaQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3262
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 10/11/2021 12:56 AM, Vijendar Mukunda wrote:
> Add Yellow Carp platform ACP6x PCI driver init/deinit functions.
>
> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> ---
>   sound/soc/amd/yc/acp6x.h     |  12 ++++
>   sound/soc/amd/yc/pci-acp6x.c | 109 +++++++++++++++++++++++++++++++++++
>   2 files changed, 121 insertions(+)
>
> diff --git a/sound/soc/amd/yc/acp6x.h b/sound/soc/amd/yc/acp6x.h
> index 62a05db5e34c..76e9e860e9bb 100644
> --- a/sound/soc/amd/yc/acp6x.h
> +++ b/sound/soc/amd/yc/acp6x.h
> @@ -10,6 +10,18 @@
>   #define ACP_DEVICE_ID 0x15E2
>   #define ACP6x_PHY_BASE_ADDRESS 0x1240000
>   
> +#define ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK	0x00010001
> +#define ACP_PGFSM_CNTL_POWER_ON_MASK	1
> +#define ACP_PGFSM_CNTL_POWER_OFF_MASK	0
> +#define ACP_PGFSM_STATUS_MASK		3
> +#define ACP_POWERED_ON			0
> +#define ACP_POWER_ON_IN_PROGRESS	1
> +#define ACP_POWERED_OFF			2
> +#define ACP_POWER_OFF_IN_PROGRESS	3
> +
> +#define ACP_ERROR_MASK 0x20000000
> +#define ACP_EXT_INTR_STAT_CLEAR_MASK 0xFFFFFFFF
> +
>   static inline u32 acp6x_readl(void __iomem *base_addr)
>   {
>   	return readl(base_addr - ACP6x_PHY_BASE_ADDRESS);
> diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c
> index 2965e8b00314..56fd7cdbc442 100644
> --- a/sound/soc/amd/yc/pci-acp6x.c
> +++ b/sound/soc/amd/yc/pci-acp6x.c
> @@ -7,6 +7,7 @@
>   #include <linux/pci.h>
>   #include <linux/module.h>
>   #include <linux/io.h>
> +#include <linux/delay.h>
>   
>   #include "acp6x.h"
>   
> @@ -14,6 +15,103 @@ struct acp6x_dev_data {
>   	void __iomem *acp6x_base;
>   };
>   
> +static int acp6x_power_on(void __iomem *acp_base)
> +{
> +	u32 val;
> +	int timeout;
> +
> +	val = acp6x_readl(acp_base + ACP_PGFSM_STATUS);
> +
> +	if (val == 0)
s/val == 0/!val
> +		return val;
> +
> +	if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
> +		acp6x_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
> +	timeout = 0;
> +	while (++timeout < 500) {
> +		val = acp6x_readl(acp_base + ACP_PGFSM_STATUS);
> +		if (!val)
> +			return 0;
> +		udelay(1);
> +	}
> +	return -ETIMEDOUT;
> +}
> +
> +static int acp6x_reset(void __iomem *acp_base)
> +{
> +	u32 val;
> +	int timeout;
> +
> +	acp6x_writel(1, acp_base + ACP_SOFT_RESET);
> +	timeout = 0;
> +	while (++timeout < 500) {
> +		val = acp6x_readl(acp_base + ACP_SOFT_RESET);
> +		if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
> +			break;
> +		cpu_relax();
> +	}
> +	acp6x_writel(0, acp_base + ACP_SOFT_RESET);
> +	timeout = 0;
> +	while (++timeout < 500) {
> +		val = acp6x_readl(acp_base + ACP_SOFT_RESET);
> +		if (!val)
> +			return 0;
> +		cpu_relax();
> +	}
> +	return -ETIMEDOUT;
> +}
> +
> +static void acp6x_enable_interrupts(void __iomem *acp_base)
> +{
> +	acp6x_writel(0x01, acp_base + ACP_EXTERNAL_INTR_ENB);
> +}
> +
> +static void acp6x_disable_interrupts(void __iomem *acp_base)
> +{
> +	acp6x_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +
> +		     ACP_EXTERNAL_INTR_STAT);
> +	acp6x_writel(0x00, acp_base + ACP_EXTERNAL_INTR_CNTL);
> +	acp6x_writel(0x00, acp_base + ACP_EXTERNAL_INTR_ENB);
> +}
> +
> +static int acp6x_init(void __iomem *acp_base)
> +{
> +	int ret;
> +
> +	/* power on */
> +	ret = acp6x_power_on(acp_base);
> +	if (ret) {
> +		pr_err("ACP power on failed\n");
> +		return ret;
> +	}
> +	acp6x_writel(0x01, acp_base + ACP_CONTROL);
> +	/* Reset */
> +	ret = acp6x_reset(acp_base);
> +	if (ret) {
> +		pr_err("ACP reset failed\n");
> +		return ret;
> +	}
> +	acp6x_writel(0x03, acp_base + ACP_CLKMUX_SEL);
> +	acp6x_enable_interrupts(acp_base);
> +	return 0;
> +}
> +
> +static int acp6x_deinit(void __iomem *acp_base)
> +{
> +	int ret;
> +
> +	acp6x_disable_interrupts(acp_base);
> +	/* Reset */
> +	ret = acp6x_reset(acp_base);
> +	if (ret) {
> +		pr_err("ACP reset failed\n");
> +		return ret;
> +	}
> +	acp6x_writel(0x00, acp_base + ACP_CLKMUX_SEL);
> +	acp6x_writel(0x00, acp_base + ACP_CONTROL);
> +	return 0;
> +}
> +
>   static int snd_acp6x_probe(struct pci_dev *pci,
>   			   const struct pci_device_id *pci_id)
>   {
> @@ -52,6 +150,10 @@ static int snd_acp6x_probe(struct pci_dev *pci,
>   	}
>   	pci_set_master(pci);
>   	pci_set_drvdata(pci, adata);
> +	ret = acp6x_init(adata->acp6x_base);
> +	if (ret)
> +		goto release_regions;
> +
>   	return 0;
>   release_regions:
>   	pci_release_regions(pci);
> @@ -63,6 +165,13 @@ static int snd_acp6x_probe(struct pci_dev *pci,
>   
>   static void snd_acp6x_remove(struct pci_dev *pci)
>   {
> +	struct acp6x_dev_data *adata;
> +	int ret;
> +
> +	adata = pci_get_drvdata(pci);
> +	ret = acp6x_deinit(adata->acp6x_base);
> +	if (ret)
> +		dev_err(&pci->dev, "ACP de-init failed\n");
>   	pci_release_regions(pci);
>   	pci_disable_device(pci);
>   }