From patchwork Thu Jun 22 15:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Saba Kareem, Syed" X-Patchwork-Id: 13289302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15B91EB64DC for ; Thu, 22 Jun 2023 15:26:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 968731EF; Thu, 22 Jun 2023 17:26:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 968731EF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1687447614; bh=eltY1OWYNCjxmVW0SKgtTKFGtqDk7DrsWkH2wF9b3YM=; h=From:To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=cxKeKqXW8vqjQhWKhk3KKhaqMweJgbXMe0bipkz1GX2DwJ3oLL0A+cYvF8pXeTqQ8 PzblUF/bOd1bORO6WXZqWK9vMrt98iFD5q9lMsjPdVepAlWlD3PiLJGce4dOi9bylX jpMQKm5UFWJ04MLVNgh5RvJ+f7lIhb9O0zX0DC7A= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 17EE0F805A0; Thu, 22 Jun 2023 17:25:22 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id B32CCF80132; Thu, 22 Jun 2023 17:25:21 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F08D3F8059F; Thu, 22 Jun 2023 17:25:17 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe59::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E915DF8051E for ; Thu, 22 Jun 2023 17:25:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E915DF8051E Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key, unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=Y3PmUcNY ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YNbE9rsQUI0CgMVdAxy/jyFUNX1uZyd/slh/fsOk3VzW2Up5bgFgAWZLAW9u1+8PLrQk4+NKWnuXrLUGtdUjGWO08Rt/gcercES1qgQWvZkgjRij4kFXuVeyrdZpnzQdj8ZTVm4YQxF2CqB8mB9jIxZgJFMIAlSAagUernxZx0Mi/ppOGBVKTcBUKwSkfKGoRpXiXKpXxFplKindleTpOXdIoQj3bWhY8WoKdljb7clCaPpYhvmtxjbx6fX6lSFY0DHPkoq8jYzEu0PYalIMXnYOWPr0FFUAum8r+Ah3g8L9mIfDAUbDwN82LRyl3Vj4gxGJUv3QyVbvyyOiS8c2FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eTi+jNwx22Rw4e2bVwgKMy2ba0IycMTYdowrOqOEbg4=; b=gOjexJ0zOIrg/vCSZG8SaQx3/+fQww8iI1oOE8rQAIQbH7vCaC8P/dbdu+WOtV0KXLcOSJzjUVgpbznIVdZrqfiPRIgFAy7MDIXxiefSiScBoSqbma+plqTyHkEi6+bGhIvlXTiAW6/e4mgRIxZK80WVPG22dRizRMR7HoaHZO2vgDJ2WBc8/l13HkaVcwDZH3Irixwfprh53HaD6tt2wUV78I0gtAkp29FL5JC/An8nAfhbF/OFwDZQ0m/WJm/axUorfn2XlJ9iVYBACtP+QJ9m+zT93z+ddhQdK8WEbKGaM992I97sOJoIgxGo1AkW2TFfq8XrjMjYiTsW0qG1Sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eTi+jNwx22Rw4e2bVwgKMy2ba0IycMTYdowrOqOEbg4=; b=Y3PmUcNYBrJltL1hLvUK9G8MLNm4i4od45GDgUyE9wxnQ8VGYFJ+96KE/3kmU0ZLO2ATY6FQexO4yZs7yZC+OM9lsrtAYM9LakWGiZv5yW06h8D9wLQ/a6Nm6BjACjzDbz87jS3pU5i1t+bGCCT8TFFsKhkNzKUyJAJWrvfmAfE= Received: from BY3PR05CA0001.namprd05.prod.outlook.com (2603:10b6:a03:254::6) by BL0PR12MB5011.namprd12.prod.outlook.com (2603:10b6:208:1c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Thu, 22 Jun 2023 15:25:08 +0000 Received: from CO1PEPF000042AD.namprd03.prod.outlook.com (2603:10b6:a03:254:cafe::91) by BY3PR05CA0001.outlook.office365.com (2603:10b6:a03:254::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.9 via Frontend Transport; Thu, 22 Jun 2023 15:25:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000042AD.mail.protection.outlook.com (10.167.243.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6521.17 via Frontend Transport; Thu, 22 Jun 2023 15:25:07 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 22 Jun 2023 10:25:03 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 22 Jun 2023 10:25:03 -0500 Received: from amd-B450M-DS3H.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.23 via Frontend Transport; Thu, 22 Jun 2023 10:24:59 -0500 From: Syed Saba Kareem To: , CC: , , , Syed Saba Kareem , "V Sujith Kumar Reddy" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Nicolas Ferre , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Venkata Prasad Potturu , Ajit Kumar Pandey , open list Subject: [PATCH 03/11] ASoC: amd: acp: add acp i2s master clock generation for rembrandt platform Date: Thu, 22 Jun 2023 20:53:42 +0530 Message-ID: <20230622152406.3709231-5-Syed.SabaKareem@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230622152406.3709231-1-Syed.SabaKareem@amd.com> References: <20230622152406.3709231-1-Syed.SabaKareem@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AD:EE_|BL0PR12MB5011:EE_ X-MS-Office365-Filtering-Correlation-Id: 226b9a0d-ed15-4c3c-c098-08db7334dc76 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5DY7rXqJYUbeFPYAa41dMMoH+3rnF5QK2dRVWBNZlYEsInq4V7isffjZinqVmoLc1ReVDLUHCMEo/PY1p9MT2ITFRz7aJYGxWG35Ol6z/p49V4iCymx04y8pKzuEkCpmMJRV+PsJ2FjQSVQLRUeBm+UkvYbm8lo1fBkDmCDJtoJ1DDvV9DV0lc68jqOog8Nm5YhYUlzy1KSMhVY4dK6Z8TGk/3iducFjBKg7CzpiQu/H0paUlVEPoeIZJboTjIjW87Xzt3F/wZGLLmm43K1GLAhL6vfWurY17LKy/FncyH/aX+DUCEo4Rcuk2FO4bFgOAY29y/lDqmnQ9jAYBQLd8vLNNuaV5gD5W3Lgo4QTf3t7oMv/nAt3/dGD+2OrBB7akXNw7n+j0YThQx4QsLIz6N88JCKWoNBPRJa29cX3qLODaR20hGODeJUQgiBQR6OdNhqWJM1mKqMspJSZr+38+tsMuEJDGlPesComyKkyvHSZTvA3uWDC61RK+6kGYf02+joML0/d3Idx9foAOyIRM6xDZQqckM8m556VhSWCnB0J5zWjuNwsFV52IPoAAVPq5iiTMTGafPg/S80YWfDiOlGqu/JHIMDSRtqJMvux8S4G0lChKE+z7wfhYFGKWGVHbTJhGkhpUnQGOO9ghH9gO4SDqwlTuK/sJULJY8Y2R2CTh4UyubPvQbT2yE/xyvKPvQKB0qXyKa0J1Cws0kL4bqNjCxADx1VKjwK5CDRIUPgplwKFfteF75pkTg/OYxUNPawFWHarTUdCSpXs7RD1IQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(396003)(376002)(136003)(346002)(451199021)(36840700001)(40470700004)(46966006)(47076005)(5660300002)(2906002)(1076003)(40480700001)(8936002)(8676002)(186003)(41300700001)(26005)(40460700003)(2616005)(336012)(7696005)(478600001)(82310400005)(356005)(82740400003)(81166007)(36860700001)(83380400001)(426003)(70586007)(70206006)(4326008)(86362001)(54906003)(110136005)(36756003)(6666004)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2023 15:25:07.5758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 226b9a0d-ed15-4c3c-c098-08db7334dc76 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000042AD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB5011 Message-ID-Hash: B32U4FFBIQG34QVS4MC2Y2SIZ6KD3YGW X-Message-ID-Hash: B32U4FFBIQG34QVS4MC2Y2SIZ6KD3YGW X-MailFrom: Syed.SabaKareem@amd.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add acp i2s master clock generation logic for rembrandt platform. Signed-off-by: V Sujith Kumar Reddy Signed-off-by: Syed Saba Kareem --- sound/soc/amd/acp/acp-legacy-common.c | 19 +++++++++++++++++++ sound/soc/amd/acp/acp-rembrandt.c | 26 ++++++++++++++++++++++++++ sound/soc/amd/acp/amd.h | 3 +++ 3 files changed, 48 insertions(+) diff --git a/sound/soc/amd/acp/acp-legacy-common.c b/sound/soc/amd/acp/acp-legacy-common.c index 5b7000eae693..4302d8db88a4 100644 --- a/sound/soc/amd/acp/acp-legacy-common.c +++ b/sound/soc/amd/acp/acp-legacy-common.c @@ -13,6 +13,7 @@ */ #include "amd.h" +#include #include static int acp_power_on(struct acp_chip_info *chip) @@ -96,4 +97,22 @@ int acp_deinit(void __iomem *base) } EXPORT_SYMBOL_NS_GPL(acp_deinit, SND_SOC_ACP_COMMON); +int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data) +{ + pci_write_config_dword(dev, 0x60, smn_addr); + pci_write_config_dword(dev, 0x64, data); + return 0; +} +EXPORT_SYMBOL_NS_GPL(smn_write, SND_SOC_ACP_COMMON); + +int smn_read(struct pci_dev *dev, u32 smn_addr) +{ + u32 data; + + pci_write_config_dword(dev, 0x60, smn_addr); + pci_read_config_dword(dev, 0x64, &data); + return data; +} +EXPORT_SYMBOL_NS_GPL(smn_read, SND_SOC_ACP_COMMON); + MODULE_LICENSE("Dual BSD/GPL"); diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c index 59b1653b8479..83515ee753f3 100644 --- a/sound/soc/amd/acp/acp-rembrandt.c +++ b/sound/soc/amd/acp/acp-rembrandt.c @@ -19,11 +19,17 @@ #include #include #include +#include #include "amd.h" #define DRV_NAME "acp_asoc_rembrandt" +#define MP1_C2PMSG_69 0x3B10A14 +#define MP1_C2PMSG_85 0x3B10A54 +#define MP1_C2PMSG_93 0x3B10A74 +#define HOST_BRIDGE_ID 0x14B5 + static struct acp_resource rsrc = { .offset = 0, .no_of_ctrls = 2, @@ -160,6 +166,25 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = { }, }; +int acp6x_master_clock_generate(struct device *dev) +{ + int data = 0; + struct pci_dev *smn_dev; + + smn_dev = pci_get_device(PCI_VENDOR_ID_AMD, HOST_BRIDGE_ID, NULL); + if (!smn_dev) { + dev_err(dev, "Failed to get host bridge device\n"); + return -ENODEV; + } + + smn_write(smn_dev, MP1_C2PMSG_93, 0); + smn_write(smn_dev, MP1_C2PMSG_85, 0xC4); + smn_write(smn_dev, MP1_C2PMSG_69, 0x4); + read_poll_timeout(smn_read, data, data, DELAY_US, + ACP_TIMEOUT, false, smn_dev, MP1_C2PMSG_93); + return 0; +} + static void acp6x_enable_interrupts(struct acp_dev_data *adata) { struct acp_resource *rsrc = adata->rsrc; @@ -228,6 +253,7 @@ static int rembrandt_audio_probe(struct platform_device *pdev) acp_machine_select(adata); dev_set_drvdata(dev, adata); + acp6x_master_clock_generate(dev); acp6x_enable_interrupts(adata); acp_platform_register(dev); diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h index 83c9a3ba8584..96bd87290eee 100644 --- a/sound/soc/amd/acp/amd.h +++ b/sound/soc/amd/acp/amd.h @@ -187,6 +187,9 @@ int acp_platform_unregister(struct device *dev); int acp_machine_select(struct acp_dev_data *adata); +int smn_read(struct pci_dev *dev, u32 smn_addr); +int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data); + int acp_init(struct acp_chip_info *chip); int acp_deinit(void __iomem *base); /* Machine configuration */