Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d4af3093-a0d4-554d-5b16-438c81af4d14@amd.com>
Date:   Tue, 16 Aug 2022 12:18:37 +0530
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6.2 init/de-init functions
Content-Language: en-US
To:     =?UTF-8?Q?Amadeusz_S=c5=82awi=c5=84ski?= 
        <amadeuszx.slawinski@linux.intel.com>,
        Syed Saba kareem <Syed.SabaKareem@amd.com>,
        broonie@kernel.org, alsa-devel@alsa-project.org
Cc:     Sunil-kumar.Dommati@amd.com,
        open list <linux-kernel@vger.kernel.org>,
        Basavaraj.Hiregoudar@amd.com, Takashi Iwai <tiwai@suse.com>,
        Liam Girdwood <lgirdwood@gmail.com>, mario.limonciello@amd.com,
        Vijendar.Mukunda@amd.com
References: <20220812120731.788052-1-Syed.SabaKareem@amd.com>
 <20220812120731.788052-4-Syed.SabaKareem@amd.com>
 <08ef0e7e-bc7a-9db5-23a4-4fd4fb70dd9a@linux.intel.com>
From:   Syed Saba Kareem <ssabakar@amd.com>
In-Reply-To: <08ef0e7e-bc7a-9db5-23a4-4fd4fb70dd9a@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TWxKN0NDVHB5VFhYaVdZSjc2TStHdks5ZUVwalF2OXNZUDNUYlcvYWlrL3dy?=
 =?utf-8?B?ZjJGMmZjNHNPVzdEdTJWdU1va3d5SllieDF1czUvNzJ0c3laYXg0bWVkOUdm?=
 =?utf-8?B?VmlraDcwQytTa0VzN0ZTNzlGUHJ2MTJMWWFoUjh0ZDhpenNISngzUFZ1Mnoz?=
 =?utf-8?B?NXNHT29LZ0JaSUhWU0llMVgzNTR6TkVHalA1OXZqWW1MaTMyb21VZ1k1aXZN?=
 =?utf-8?B?dUZ2TFF6RTgwOE9MV3hRRzZRQnNMb1BxM1JxQWlGTmRRUU9HZCt5N09oYTYw?=
 =?utf-8?B?bE0yRTlVWFgrczhoOE1wcXd2TU9sbGxkQjRETTB0QThsMmc2YklxK1RyUkdG?=
 =?utf-8?B?UFU2YlAvcENIaE1HazVTa21zY2RvdkRBSURJVEtnbXNsT0NjMm5zNjNodmlp?=
 =?utf-8?B?Z3I1ZWJ2ODg5aHFYUHcxTnhmeG1ndlh0dWYrSmdVay92aVNnbGdJQUJnZFhJ?=
 =?utf-8?B?YjNKUm5iTndMVTl1STlsWXQ5QmN5UE8zZEVvd1R3dnZmSGFpVyt1VXVJUHJl?=
 =?utf-8?B?UXdiNmZIZmlvTGJ5YzlMM1hFVUhXYkRiUGhVVHV2d2YzMGVIcjBIb1NpSUxo?=
 =?utf-8?B?YmNrOWVpcTA3RzNaYnZhRTZuQk9RcExScjJXZExGbU1vNnhxQ1NCTS9uSVpt?=
 =?utf-8?B?Q1REb2o4MDNSbVc3NTVqSUtMM2trWmpZb2FMNENPV0lZSGJOVFJJV3pPUU9k?=
 =?utf-8?B?S0w0b2xDRzRsNll6ZDFWSitZVVhvcENEcitSOStuNXlSd1ZNakFMeVVEUU13?=
 =?utf-8?B?MzcyeGxrRTdyVHdVeGhxdk82VEphVW9vUWd1VFBXNkdoZnZBSE1td00vQzJ5?=
 =?utf-8?B?MlphWTBWZjBUNTM0TjBOb2xqYjVkS3Mvc2VFYzQwczR4UEtMRXo5WnJvTzV4?=
 =?utf-8?B?cVBtMVRPUlQzMVhvejROR0t1S3JPYXRnYlYxMVA1VXJaMksyQmxHK3F5eWM5?=
 =?utf-8?B?QVB2cWVoaUYvRFMyVld6T0FEZDI2b2hwNE54QkpxSjIxaEk2MFh1Z2dBMlRa?=
 =?utf-8?B?SmEwWHJLRVJVWnoxYThVd1BzK04vL29jd3VFQ2lvbmxUa0ZpVHpFYXQrODg0?=
 =?utf-8?B?TjVMWUpWZnBvVHJHZGZodWtkQUhFNWJMbGJBUEF6RmVnaFVUeG5wWmdHbFJT?=
 =?utf-8?B?TUhDNjdpd1V6M0NaVnhBeHNvTjhYWkdNMnFJQnEyeTJTWE5RK1RTYzhGenhL?=
 =?utf-8?B?TzdVeXBhRzl5SHhXQUdQSFVKdXFpNVFLTllhZnVRdUJxbHZwZVFPS3Mwam1p?=
 =?utf-8?B?U0o1T3RQT3hjZG96dDFuaGVJdkhmVVBEbUFQSjBia2hZQXNqMzFyRjdDR1o5?=
 =?utf-8?B?S2ZHZGs1clA3czBaNEtMRU5oNGhzbThOUGJrb1BJT1lvdW5wZUxhYmRaWm1p?=
 =?utf-8?B?dGxrRnBFVEZKeU5TZnFIOURYdUlxNE81eWdoKzc4YUFkajF3NWl2VUNXVHdM?=
 =?utf-8?B?S1ZBQ1ZtZUpYZ0E3bUhzZ2JLWTV4cTlmbnNCVHdVZ3MxZm96RzdEQ2Qxa1N4?=
 =?utf-8?B?eml2MSsyeHBqRXI1QjVKRmgvdit0REZhOW9iRHNheWIxMVhTTlNTT3FIQ1l1?=
 =?utf-8?B?OEw2N0pGT1YvRU9WWVZ0Ri9SY05ZRTd6Um5wNnVNV0xCNFFwWVowNWFEa0U0?=
 =?utf-8?B?a2ROblhqNFdzMDdkeHY5dnI0R3d3a3NhcFZnMU8vNmltTW05bGNuYitYOXZD?=
 =?utf-8?B?UG9WS3VqVWtsZ0JSSTZLOE1wam9BWjg1Sm1sVmlSRjdjM0V6bVM1WnFxa1ho?=
 =?utf-8?B?THZXWkJNSng3QUl4cWVoM1M1ZnNOSjB1R2JONmlpczJqZHhKNXUycEVjOWJo?=
 =?utf-8?B?aUp0cGFLMFFRODV5NXphR3U2cm1aNENSRDVFdUxLczhTTDdwSjZSVXQxVjU0?=
 =?utf-8?B?Qkw4VDFCK0tCYWx2bTJ5RHBGQnAxUjhuWmVkR2RkMzNEblRvZiszN1hYd3d5?=
 =?utf-8?B?d0ZGMVR2bENnaWJ4U1hBK0F0NDVPMjdJYlZvZGQrcUdEZ2s0TDMxdDZpWnI0?=
 =?utf-8?B?SjFLSDhZWlNLK3U3YVNvempvUVFQVXpsSE01QUhoMTBUNjdUWkVPSk9ONzRx?=
 =?utf-8?B?ZEd4TVovaVVlekl2OEpvWERYUmtvbHdNSVc0Qlh4NEZMWkdNemlDcEFxZ2w3?=
 =?utf-8?Q?aeUSEaRk1HPoueVAXwm20ohfJ?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 77973c8b-e2cd-4be9-acd1-08da7f539f20
X-MS-Exchange-CrossTenant-AuthSource: MN2PR12MB3661.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 06:50:35.9140
 (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: h2a4xfotvd1NR02TG5a9EBitkNB7SiK/7scN+yqHiaYkshQ0xKyKPZKAmUcnZ1IkCFuHF2Q5AcI3ktMT+cGx5g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4435
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 8/12/22 19:49, Amadeusz Sławiński wrote:
> [CAUTION: External Email]
>
> On 8/12/2022 2:07 PM, Syed Saba kareem wrote:
>> Add Pink Sardine platform ACP6.2 PCI driver init/deinit functions.
>>
>> Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
>> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
>> ---
>>   sound/soc/amd/ps/acp62.h  |  12 +++++
>>   sound/soc/amd/ps/pci-ps.c | 109 ++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 121 insertions(+)
>>
>> diff --git a/sound/soc/amd/ps/acp62.h b/sound/soc/amd/ps/acp62.h
>> index e91762240c93..8e734f190b11 100644
>> --- a/sound/soc/amd/ps/acp62.h
>> +++ b/sound/soc/amd/ps/acp62.h
>> @@ -10,6 +10,18 @@
>>   #define ACP_DEVICE_ID 0x15E2
>>   #define ACP62_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 acp62_readl(void __iomem *base_addr)
>>   {
>>       return readl(base_addr - ACP62_PHY_BASE_ADDRESS);
>> diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c
>> index 25169797275c..2014f415af15 100644
>> --- a/sound/soc/amd/ps/pci-ps.c
>> +++ b/sound/soc/amd/ps/pci-ps.c
>> @@ -8,6 +8,7 @@
>>   #include <linux/pci.h>
>>   #include <linux/module.h>
>>   #include <linux/io.h>
>> +#include <linux/delay.h>
>>
>>   #include "acp62.h"
>>
>> @@ -15,6 +16,103 @@ struct acp62_dev_data {
>>       void __iomem *acp62_base;
>>   };
>>
>> +static int acp62_power_on(void __iomem *acp_base)
>> +{
>> +     u32 val;
>> +     int timeout;
>> +
>> +     val = acp62_readl(acp_base + ACP_PGFSM_STATUS);
>> +
>> +     if (!val)
>> +             return val;
>> +
>> +     if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
>> +             acp62_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + 
>> ACP_PGFSM_CONTROL);
>> +     timeout = 0;
>> +     while (++timeout < 500) {
>> +             val = acp62_readl(acp_base + ACP_PGFSM_STATUS);
>> +             if (!val)
>> +                     return 0;
>> +             udelay(1);
>> +     }
>> +     return -ETIMEDOUT;
>> +}
>> +
>> +static int acp62_reset(void __iomem *acp_base)
>> +{
>> +     u32 val;
>> +     int timeout;
>> +
>> +     acp62_writel(1, acp_base + ACP_SOFT_RESET);
>> +     timeout = 0;
>> +     while (++timeout < 500) {
>> +             val = acp62_readl(acp_base + ACP_SOFT_RESET);
>> +             if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK)
>> +                     break;
>> +             cpu_relax();
>> +     }
>> +     acp62_writel(0, acp_base + ACP_SOFT_RESET);
>> +     timeout = 0;
>> +     while (++timeout < 500) {
>> +             val = acp62_readl(acp_base + ACP_SOFT_RESET);
>> +             if (!val)
>> +                     return 0;
>> +             cpu_relax();
>> +     }
>> +     return -ETIMEDOUT;
>> +}
>> +
>> +static void acp62_enable_interrupts(void __iomem *acp_base)
>> +{
>> +     acp62_writel(0x01, acp_base + ACP_EXTERNAL_INTR_ENB);
>
> In function before you just write decimal 1 and 0, and here and later in
> patch you use hex values? Should probably be consistent.
>
Will fix it.
>> +}
>> +
>> +static void acp62_disable_interrupts(void __iomem *acp_base)
>> +{
>> +     acp62_writel(ACP_EXT_INTR_STAT_CLEAR_MASK, acp_base +
>> +                  ACP_EXTERNAL_INTR_STAT);
>> +     acp62_writel(0x00, acp_base + ACP_EXTERNAL_INTR_CNTL);
>> +     acp62_writel(0x00, acp_base + ACP_EXTERNAL_INTR_ENB);
>> +}
>> +
>> +static int acp62_init(void __iomem *acp_base)
>> +{
>> +     int ret;
>> +
>> +     /* power on */
> Unnecessary comment? Called function name is already self explanatory,
> no need to repeat it.
Will remove it.
>> +     ret = acp62_power_on(acp_base);
>> +     if (ret) {
>> +             pr_err("ACP power on failed\n");
>> +             return ret;
>> +     }
>> +     acp62_writel(0x01, acp_base + ACP_CONTROL);
>> +     /* Reset */
> Same here?
Will remove it.
>> +     ret = acp62_reset(acp_base);
>> +     if (ret) {
>> +             pr_err("ACP reset failed\n");
>> +             return ret;
>> +     }
>> +     acp62_writel(0x03, acp_base + ACP_CLKMUX_SEL);
>> +     acp62_enable_interrupts(acp_base);
>> +     return 0;
>> +}
>> +
>> +static int acp62_deinit(void __iomem *acp_base)
>> +{
>> +     int ret;
>> +
>> +     acp62_disable_interrupts(acp_base);
>> +     /* Reset */
> Again
Will remove it.
>> +     ret = acp62_reset(acp_base);
>> +     if (ret) {
>> +             pr_err("ACP reset failed\n");
>> +             return ret;
>> +     }
>> +     acp62_writel(0x00, acp_base + ACP_CLKMUX_SEL);
>> +     acp62_writel(0x00, acp_base + ACP_CONTROL);
>> +     return 0;
>> +}
>> +
>>   static int snd_acp62_probe(struct pci_dev *pci,
>>                          const struct pci_device_id *pci_id)
>>   {
>> @@ -56,6 +154,10 @@ static int snd_acp62_probe(struct pci_dev *pci,
>>       }
>>       pci_set_master(pci);
>>       pci_set_drvdata(pci, adata);
>> +     ret = acp62_init(adata->acp62_base);
>> +     if (ret)
>> +             goto release_regions;
>> +
>>       return 0;
>>   release_regions:
>>       pci_release_regions(pci);
>> @@ -67,6 +169,13 @@ static int snd_acp62_probe(struct pci_dev *pci,
>>
>>   static void snd_acp62_remove(struct pci_dev *pci)
>>   {
>> +     struct acp62_dev_data *adata;
>> +     int ret;
>> +
>> +     adata = pci_get_drvdata(pci);
>> +     ret = acp62_deinit(adata->acp62_base);
>> +     if (ret)
>> +             dev_err(&pci->dev, "ACP de-init failed\n");
>>       pci_release_regions(pci);
>>       pci_disable_device(pci);
>>   }
>