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: <6acfaa80-f8f0-4735-40c5-2b91fa0a14ed@amd.com>
Date:   Mon, 11 Oct 2021 06:04:30 -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?eThNb1ZiRmZ4NHM0SnNpR2UrTnQxSnZsSDZEM2hwdFVRT2t2dmU5Um9ZaG5I?=
 =?utf-8?B?aGY2aUVkR1VTMHVWQzdHUUo0T1FlZjEwVmtKaVUzbVdVeE1qK2Q5Sm1sY3VY?=
 =?utf-8?B?dVMzU0pzRlMyNGdoYThrdDVHTk1kbWhhVnd4L0hPRVJsdWxSaDQ2TmdRQkdX?=
 =?utf-8?B?ajVVTDJwNWJlRkJMRll2aUR2U3JFZkVuUk9ac1c5V2hlZ2lNMng1S1QrL3R1?=
 =?utf-8?B?QW51OW1uc3NCTkh5dVBmWmhBQnRJbnI0V3V2eUJ3Um9WMG42TjJ5ZUFnQlA1?=
 =?utf-8?B?YnZ0V1BKdXpkQVBURm1XRFRTdlJ2UWFFVi92VmFpVExWT0Rqa25EdHUzMmxo?=
 =?utf-8?B?dlVDcUd5c1BkYWFnb1Iwa05wR1ZUamI3NGFxVlpFOHR6V1NhT25aTlRnQmsr?=
 =?utf-8?B?ZjAraHhSd1lYaktEclRqS2hlVGloSWF3TEd0cHQ4VEZuc0k4ZXNJVnIzZHJ0?=
 =?utf-8?B?QzJMTjVhMFJGaHFIWHFhMU5KQit5WWpwSXhNWlp0SnlWYVJDZEEzZG1XRVJW?=
 =?utf-8?B?ZnFZNVJ1QzlxNVZyckZ2YWYvbHpHRWdkMWgyWXpXRW04MmRWLzBZenRLN0xl?=
 =?utf-8?B?eE9EUGZRcVorcTNaWk03amRYeUFkVFJRYjVDMHFaenAzMWxpSk8xSUVmNE9D?=
 =?utf-8?B?Q3QrS1N4ZWxBYmM1RTJxNlRNVnN3SUxIbUtUN05YQkxPVGpidms2N2NGYzhO?=
 =?utf-8?B?cW9LQTZyMGE0aCt2blZCS01kd1NicThpR3hRMkR6M2pBTW8ybFBleGVEUzJW?=
 =?utf-8?B?V3dmVHNTaitVc3hiNk9JRDJENzVLTXd0dGNObHYxU08xKzgyRFVPUjE1V2xp?=
 =?utf-8?B?bTRrdTVRQzhNYzdESEl6NngxWGpVVGlNNTV4dkU2UTl2VVBEWW9pSk9BN1lO?=
 =?utf-8?B?K2RBS2pLQnpWd3RObHJUa2crNFg5NG1ZeGw4aEpkNHF5czd4bXBLTFhTTnRU?=
 =?utf-8?B?a0Jud2JNeW4yZEkvY09jK3Y2QUdVMktNZ0NrdHdwUmhJbFBOdFRaSE9EVy9v?=
 =?utf-8?B?L3FUeVhSYTIvb1hnMUthWFJBenhjZW8zaGJwdjFvL2MwNHpCY2JuTjJUTnN3?=
 =?utf-8?B?eVRTTERtWXcyTEZtaHQyb2VLNTBqVUFkWnllZXJjZ2twRTAxaUlpMCtHREta?=
 =?utf-8?B?b21WNE55alk3T3pNTjFVZmNoSFNVSWtoSVhuQTVXV2xjVG83bmorK0hhdElX?=
 =?utf-8?B?U1pRR3Y3YTBRV05HMkFoTHZuaTg3L2FQYWxpT2tEdlZKUHBsWXFZNGxMMTVD?=
 =?utf-8?B?QjhxUVI1TzNXRC9TYS82T2J0dURtL3QwcEJYeXl4QkJid3U2WmNmclpJZUVs?=
 =?utf-8?B?NDBINEhNbVBoLzhGY3JkKzM1NzUrNi8wYURndFRleXhqekRvSDVHeDlveWJr?=
 =?utf-8?B?VkYyem41UUxYY0E5cFdLU3Z6R1hOWDN2NDFyUllzM2Uxa1QydWIzY2JvVng1?=
 =?utf-8?B?bWNZZGJNMUl4RVVhR1FsbnE5Y09RRmp6YjhwaCtEbjcwVlI4eWk0aWpFMzBa?=
 =?utf-8?B?VXpRM1h0ZEhMdkRNdVR3UHp1YjM0Z1V1aU15bVZ1ZkhyYi9SK0tiM21taHNP?=
 =?utf-8?B?RlFGYXVReEZDVS80OE1EM0w0LzNLS3FJa3VvbjhHWURBRkcweWk3VFJDS2Rm?=
 =?utf-8?B?blVpS0praC9hSVRvODFaaTJ5KzRCNzh1NVgyODIyVzJZNUpVbnFEbnBlSmpI?=
 =?utf-8?B?dWRvRWQ3aW9hQXdYNWhCNXMrY3MraGRiUzUvazNqd29pZ0wvbndwNHZjSmYz?=
 =?utf-8?Q?SnrS8h2EbI5aD8nbMCJTlIRyuZ8YJY5DNfp2h5T?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a4f36a2-83e2-4058-39d2-08d98ca6e83c
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:04:34.0235
 (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: OVipFfDhf/RfAAaCN4DRPMfttTwiBaTn4ro4B4flawYivQ/rW8qJIxOlHTUet7NxQqJ4K2Sf5ywIs0errEMk1Q==
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);
>   }