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;
Subject: Re: [PATCH 03/13] ASoC: amd: add acp6x init/de-init functions
To:     "Gong, Richard" <richard.gong@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>
 <32f0e33d-0f9b-f27d-2fa8-63b493c2d9aa@amd.com>
From:   "Mukunda,Vijendar" <vijendar.mukunda@amd.com>
Message-ID: <f40c17a4-409f-1c39-5271-f19a6591ae56@amd.com>
Date:   Mon, 11 Oct 2021 17:10:42 +0530
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.13.0
In-Reply-To: <32f0e33d-0f9b-f27d-2fa8-63b493c2d9aa@amd.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SWozamVMMklmaWtyeXA1MG1GaEZVeHVXLzl5M1hxOU5IcU5qNitFN2VTbmZS?=
 =?utf-8?B?RU9SY0lnY0Vtb1RaWE81bksxTDBpbFFkWHFhWmhXTUlnMk82V0cwMno2ZEI0?=
 =?utf-8?B?SHFFVHFCaTFBMHNMV2pORC9YdlY0d21KYjlwSTYwalk3ZXpoYlE5VDB6VFMz?=
 =?utf-8?B?aXZuY1VNS3c2NEs5RU9INHQycGpLamxLOWdEWE16S0tTbmE4bExoNlBJakp1?=
 =?utf-8?B?SW52T3VhQktmdDN0TTJOdzMwMmlLSlBGL1RiLzdWZjIvYUJwL3NkRFQ1K3Fk?=
 =?utf-8?B?ZlFYQkRvQ0pZeVZLY1FNNlZtM1JtMVo2SjdwOU9nM2c4T1dld01FSXBJQlFL?=
 =?utf-8?B?amxaOWpiOUd0SmN6U3hkVStZbzNiUXA5T1pNYVpsUlVzeHQzdmMrYzMzMG1i?=
 =?utf-8?B?LzhqeVRIOXhYK2MyeU5qaFNFazR2eEQxMGhiSHBxWjN3TDVNTHBPdERuSTV1?=
 =?utf-8?B?MmY4K0JoY1JkcjE3bVBTV2ZVcU00QW5aZVFZMGZ6cnVkZS9oL3N2U2R0bGdy?=
 =?utf-8?B?d2N6T1lnOFl2NVlETjFqem1ieHBtd2VtelRkT2VqTTJNdThJbVNpMkZ4Tm1N?=
 =?utf-8?B?US9FT0tXekJnQU9hSWNjcDZ5VXR5RFNmcW5ocFc4Wnk0YUFzejF5RDlrdHdP?=
 =?utf-8?B?d0MweGJEUmlwZlZQRWh6d3FvUEFKTlZjVDJUeUtGbzBNdFNtMEVzSWlHQkYz?=
 =?utf-8?B?WUdSYVI2ODdZcE44T09rZkZXRzJmMFhzMDA0eHFJR2ZYVVdDOC9GZ2hwQm5N?=
 =?utf-8?B?azhxbVBPa3BUa29rNW1jUGJEb1ZycDl5YzJ5V1pZSDg4a3VDb3p4b1Z0MmxP?=
 =?utf-8?B?YnlVekRwNzRFM2NoUDRMQ3Ird1VGdE0xMUZ3d2ZVSURTanQ3c0FEMStVdUdQ?=
 =?utf-8?B?bHRhd1JIamVjdUlhTmlUN2k2Yzhia3BHcFVXU2pSQm1aZ0pzYlAzTXNTZ0k2?=
 =?utf-8?B?cDdQSENuMGZpTnZWa0F0dzM4Y2ZsMUNHZ3FsWGNTVC95TGlVRncxS2ZzVldi?=
 =?utf-8?B?Sm5vRXh4cllGNnR4NEZZQURwZkEwR25kaExMZXF4aDFPb0hITEUzdFE1MzFq?=
 =?utf-8?B?aGVRcTRlMy9JR2txMVFWdHg0Vm5SQTNSNTk1M2Jmd3dwQkpEdWNTaEk0VHVs?=
 =?utf-8?B?TmRkUW9SVzhhYmhHbWlMTXA1SWlTdGQycjFueVJwT2d5amNzdWgwbDhacnpE?=
 =?utf-8?B?Z01qVmV5R0hLTFFwc3RWbnp4RHQyNkFlazI1MU9HVlhIM2x4QzFxTW41dllv?=
 =?utf-8?B?bk1kVVFGY0FWT2VwbnhrbXEzeUE3MlFLZHUzMDFLRkJSUlVtR3VSejFFMUp4?=
 =?utf-8?B?Z0dzQVhiNStvc25ISzg3RXN3MHF5d2VCa2NjWDRqZERxM3BPaUluQTBRN1Qx?=
 =?utf-8?B?aDRWOUJzWk5rZEFkcWt6N1hHbTYxcHI3NzFNUmM0UHA5aE82bGdxZU1RUnhT?=
 =?utf-8?B?ME5ENUxXRkI5T3dtdFFMMVBYWnRhb3M3OFFNU2dVWjVQK1hadHo3OEIreVhv?=
 =?utf-8?B?ZGlMOWdnL005bGJsTkk1UWtZY3BpZnd3TVVEc3pkamljektkQTBlanlmSkVU?=
 =?utf-8?B?MFJub0VISzRXRGpOclhsU0NHZ252YnhqamNsd2tiK1FaR2lBZ3RuQVphVXFX?=
 =?utf-8?B?UzlzME4yYUx3a2xlZ2tWbnBZa09JRHdiczFyemYvWXRrYnMvSkp6cUZvdHkv?=
 =?utf-8?B?L0RaUjJKNC9OaTRqMFZ2eDZyd0NGRlFCRldOOTBDcHlZaGpRUGc4MDhHL1JD?=
 =?utf-8?Q?RXvZVqKwGWj6PztRPyQ0OEcDes61J2IE7ml9Wyf?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb12c2bb-41d1-47ee-41a3-08d98ca955ab
X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB4123.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 11:21:56.5588
 (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: 9UynnvQ54VFxbkOlJmBFd3hDBiJnJ4MhGq0bMEHryTKsArzj3td9k6RUcJGOggxa+GO7zhfW/Rd536T88ZkzaQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1849
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 10/11/21 4:36 PM, Gong, Richard wrote:
> 
> 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
Will fix it and post the new version.
>> +        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);
>>   }