From patchwork Thu Aug 8 16:57:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757957 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2069.outbound.protection.outlook.com [40.107.100.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E947A19066C; Thu, 8 Aug 2024 16:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136302; cv=fail; b=JoIXwGjH8v7sotrN7gYPhZGqKgF854iYhDk/ywDhddj1/NpcHCQLTFjfgMALPYdr6QIlgYWMwHQBDnQ/UHEoSo9UgZ/J2G1bwNcBunE9/2FbS9bj+Z5/3eFwHS9p74ZCxhk41Y0kQoCU8XCpsPT5dGQHd1PQBRAr3RPTszrZZhM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136302; c=relaxed/simple; bh=utFnCjXXq3dUZomEwbJIe/F8SDIZtbTlgz1KvAdmlz4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nGZYKqESAlZuL8sQFrG+iQ0zEKZXrBmFopL3tqtAEThsFXIygVPKOhYQptQOJGfuVAuw1PVmPWRpRGoXIWoFeiflDRNq6QqSnM7hqbw0ESHbYG06ydDeDccnppP7c/2tE3Vfkc10Rk9MuupL72oiSLKILHjcDGAHPragB08Z7nE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=vIITaTUn; arc=fail smtp.client-ip=40.107.100.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="vIITaTUn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R6tXx96CyhuBYqmLl+s52gg0X6CwY8V4I2u2qVDloJXAah6mA89byAKTNfkgYuJEt3BqHGXtfq7xCncT5JVgWZIzYqQ5UmYW5edjGvRurcRZdx50TCTswYNa1U5Yq83yqn8nUxNiO9oG4EbXE5YQXnMwvtWIZWMggy32xJfEN5BGXP81G+coqhgl4y0rcz3gWpMIv4kSPFRKPue5tjXrh+83loUceLW84LzrWDHvR2SRhVAkGzVALkTOTy6gVhibd69KI/I+XOXyrV5RXTrujuIy9aemz/1IPEcW7z7j8F97D3KL4mzP9TCW5f2HBqs1LWuc6mX1kPMcRcFFUT3EnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=aoOn35PB7tB6CN6MRHOsqsIBZ7eeJhHJe6rpmwRrJWE=; b=E27ie9trFtTtIrPb0640SUyPWtG5iDxDEQWnK7vcqZ7af4iLspprqx7szGvNAmv9K8XwBob90ZIwWur3ISxwXBnOVENsTpw9ghXxqzt2BbX17Qa1b4e0PZgQAQgoK0tCNOfg3MEjWoGy4KXRVjf2iIxPtxxXB2s0y2jjyLRN1buqVLYJDUC4sdUpVswwj07F4bVLQot6rW3D0Uq+pbTRCtrmZJgkkZD964Pvj2b8m9OJlWJyWl321QWLRKZ//mphGYIFIzt88JTK4ZzUM+cOPRUj4p4KcCoyqMmQieVxwjlTFVwnWsqDU7oIVRWgxWsn7tL84jB023L7hgRMT9mQbQ== 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 (0) 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=aoOn35PB7tB6CN6MRHOsqsIBZ7eeJhHJe6rpmwRrJWE=; b=vIITaTUn7pkslR6wJE/ZhXeXUjDRfwoFSZ0GqGO/twnf5QFXEiXmrU9ZNcplXb0Z4ROYULce1HRbyVfg3pk/1pbLNItxYkxIbR8YXlAvHzZdZ1K0qMdf75MSrTJWi7sLbf7p8VKG+R3fH3qk7jyO97CzUL2iMpbmb/cq3MyLgEY= Received: from BN9PR03CA0785.namprd03.prod.outlook.com (2603:10b6:408:13f::10) by PH7PR12MB9152.namprd12.prod.outlook.com (2603:10b6:510:2ec::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.33; Thu, 8 Aug 2024 16:58:17 +0000 Received: from BL6PEPF0001AB56.namprd02.prod.outlook.com (2603:10b6:408:13f:cafe::69) by BN9PR03CA0785.outlook.office365.com (2603:10b6:408:13f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.30 via Frontend Transport; Thu, 8 Aug 2024 16:58:16 +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 BL6PEPF0001AB56.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:16 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:11 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 1/8] ASoC: SOF: amd: Fix for incorrect acp error satus register offset Date: Thu, 8 Aug 2024 22:27:46 +0530 Message-ID: <20240808165753.3414464-2-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB56:EE_|PH7PR12MB9152:EE_ X-MS-Office365-Filtering-Correlation-Id: ded6d7e5-df66-4eb6-8a56-08dcb7cb4c63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: eeZwwl1ruc87VGeBeJ1+Enx6SiCsQHdtncuzwoXp528RjIXvstndNLYBLS9EzXXm+rGwmPfw6tt5WCVNPnNo3FwIo33JFCbT2PQFI8vygxxeFeZYfWEhIwyfnj/yBvIusPsbCamR6d+HtozgZopios+pgDPOtCFcqTbWQBgsYsE3McsIAYOnd71t+Z4W1v8hOmSjjVCx4I7w1I9ak6tHpYfExnJEtHvl940P6DuGFtPz6XTCDgokw8jmmunQUlGuO0lTE/9cwLHdsOWYvSVTfVWo04zmnmJi+NMneL23NAQIC0NJ65B0bjjxpiF4vmNtRJyGzMdH8TCzsN0ANE/M2EAxNZRzMvG5eoJZ1eIokapyQDdoujNyqFAc3uc5c9d2EnDBCHSSRlKzoD3HciRu8T+Ue7ml7aKiBjfT7tJk42ovxQYbMVg8qEP5ZnK+5Dfy8RZyi+YpBtWP6/Kt+l4449p5dbKwEGf8ezd8z3cH5ASbNUxmSKc/9eOP0GHI9gXlXVlwnT0z0PymFMa7ab1oWerwkykvovNu5dh+SFN571ghrja6OU+OrLaMLhnIUQN8wTZvoJinsk76v5EBLSenD7dKE3UnLraO/Eo86Z0B+qqytswjOkuR8fk3vlgSaFA4eBpuQ/0zgRxrq4ILFWXIiOfn6UcqO9GlGkzkM2E72eChT7P2anR//zOJckfJ2p4x91Vg7foWiYc0t8i6I9gznUJ8hSZWSWbNJNGafEurc3HCLmgbOzWSRXdztXFfY4jg24atIRB7UCfnS/I1J7vRCDfyG9QdsaqJ6sF+/UJyyai9yY+ADHwwyMLoLse8jBC6vswT/6AMO7YE0IEn7D6Qvdv90+WYabRoGjahAKp2leW2qKen/kkKlvZP5iZyR0KXnJ6/P8ko+D3VGr+iA0QIbbEzUWisR6rWbugpY9GA1NDgC79+YRTXmkgLqBzu+pfd1pv1RxD31EdKz8AOurmq2AOGQ6rtskawQezn/jh9EHW7/FQ95bCxubX1k5PKtLAgr+mle9a1IXXToHbg9dtngrlOsYK9J7lX6woeOrjc/rVSmD9jYkDaqKhwSe4YsKV+KWYT/E/IgbvbIuse5jITSwAWTh8yFWGL0LLFpvGVoHO1cCFHj3ZiFiooqsGjUrV7ZvNVVDWoNtcHz3idpgfGCqodJTShT3CLUC3LogvvPDvfTU4E71K1vg4Xx4rWU3oCKPciDH3J/2bisWU6WOyKBcEuqnay5N8sJD0trROuFhZ6ipok5J3SDEZjSIgH9ZUmzVFADejfCSAmAOouVJVxTh9kw2hoyOu2eBW5k5uGmeO5w2Rl6Iozv+UhRCdI8tQOeZ7XzUJYBbvMX3pv8mqXm6Lh9zIA5jqOnOu7CCeadPDY+DjOegS7kOGyZPfso73fWsZOk3COkPQcDnxLK9PGQ1BTxbBOH3NO23Ol1vgyZbl6Kte0Wz+mErcSMgZ1QOEy 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:(13230040)(7416014)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:16.6978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ded6d7e5-df66-4eb6-8a56-08dcb7cb4c63 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: BL6PEPF0001AB56.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9152 Adding 'dsp_intr_base' to ACP error status register offset in irq handler points to wrong register offset. ACP error status register offset got changed from ACP 6.0 onwards. Add 'acp_error_stat' descriptor field and update the value based on the ACP variant. Fixes: 0e44572a28a4 ("ASoC: SOF: amd: Add helper callbacks for ACP's DMA configuration") Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp-dsp-offset.h | 3 ++- sound/soc/sof/amd/acp.c | 5 +++-- sound/soc/sof/amd/acp.h | 1 + sound/soc/sof/amd/pci-acp63.c | 1 + sound/soc/sof/amd/pci-rmb.c | 1 + sound/soc/sof/amd/pci-rn.c | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h index 59afbe2e0f42..66968efda869 100644 --- a/sound/soc/sof/amd/acp-dsp-offset.h +++ b/sound/soc/sof/amd/acp-dsp-offset.h @@ -76,7 +76,8 @@ #define DSP_SW_INTR_CNTL_OFFSET 0x0 #define DSP_SW_INTR_STAT_OFFSET 0x4 #define DSP_SW_INTR_TRIG_OFFSET 0x8 -#define ACP_ERROR_STATUS 0x18C4 +#define ACP3X_ERROR_STATUS 0x18C4 +#define ACP6X_ERROR_STATUS 0x1A4C #define ACP3X_AXI2DAGB_SEM_0 0x1880 #define ACP5X_AXI2DAGB_SEM_0 0x1884 #define ACP6X_AXI2DAGB_SEM_0 0x1874 diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 7b122656efd1..d0b7d1c54248 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -92,6 +92,7 @@ static int config_dma_channel(struct acp_dev_data *adata, unsigned int ch, unsigned int idx, unsigned int dscr_count) { struct snd_sof_dev *sdev = adata->dev; + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int val, status; int ret; @@ -102,7 +103,7 @@ static int config_dma_channel(struct acp_dev_data *adata, unsigned int ch, val & (1 << ch), ACP_REG_POLL_INTERVAL, ACP_REG_POLL_TIMEOUT_US); if (ret < 0) { - status = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_ERROR_STATUS); + status = snd_sof_dsp_read(sdev, ACP_DSP_BAR, desc->acp_error_stat); val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_DMA_ERR_STS_0 + ch * sizeof(u32)); dev_err(sdev->dev, "ACP_DMA_ERR_STS :0x%x ACP_ERROR_STATUS :0x%x\n", val, status); @@ -404,7 +405,7 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->ext_intr_stat, ACP_ERROR_IRQ_MASK); snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW0_I2S_ERROR_REASON, 0); snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW1_I2S_ERROR_REASON, 0); - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_ERROR_STATUS, 0); + snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_error_stat, 0); irq_flag = 1; } diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index ec9170b3f068..6ac853ff6093 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -203,6 +203,7 @@ struct sof_amd_acp_desc { u32 probe_reg_offset; u32 reg_start_addr; u32 reg_end_addr; + u32 acp_error_stat; u32 sdw_max_link_count; u64 sdw_acpi_dev_addr; }; diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c index 54d42f83ce9e..c3da70549995 100644 --- a/sound/soc/sof/amd/pci-acp63.c +++ b/sound/soc/sof/amd/pci-acp63.c @@ -35,6 +35,7 @@ static const struct sof_amd_acp_desc acp63_chip_info = { .ext_intr_cntl = ACP6X_EXTERNAL_INTR_CNTL, .ext_intr_stat = ACP6X_EXT_INTR_STAT, .ext_intr_stat1 = ACP6X_EXT_INTR_STAT1, + .acp_error_stat = ACP6X_ERROR_STATUS, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c index 4bc30951f8b0..194b7ff37e9e 100644 --- a/sound/soc/sof/amd/pci-rmb.c +++ b/sound/soc/sof/amd/pci-rmb.c @@ -33,6 +33,7 @@ static const struct sof_amd_acp_desc rembrandt_chip_info = { .pgfsm_base = ACP6X_PGFSM_BASE, .ext_intr_stat = ACP6X_EXT_INTR_STAT, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, + .acp_error_stat = ACP6X_ERROR_STATUS, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, .fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL, diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c index e08875bdfa8b..bff2d979ea6a 100644 --- a/sound/soc/sof/amd/pci-rn.c +++ b/sound/soc/sof/amd/pci-rn.c @@ -33,6 +33,7 @@ static const struct sof_amd_acp_desc renoir_chip_info = { .pgfsm_base = ACP3X_PGFSM_BASE, .ext_intr_stat = ACP3X_EXT_INTR_STAT, .dsp_intr_base = ACP3X_DSP_SW_INTR_BASE, + .acp_error_stat = ACP3X_ERROR_STATUS, .sram_pte_offset = ACP3X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP3X_AXI2DAGB_SEM_0, .acp_clkmux_sel = ACP3X_CLKMUX_SEL, From patchwork Thu Aug 8 16:57:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757958 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2069.outbound.protection.outlook.com [40.107.92.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7A42A1917EF; Thu, 8 Aug 2024 16:58:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136308; cv=fail; b=PMDPAL/5aYPJVGx1ulB1cWi1OpVg4rWgVdXaQMC3f4Lt/Lu+udoGqft++P3F62lTXhP6Frk+aKOJjQ69qBIR00qbqraV9GhKAoImTUmSDVdbLgXHIBDZl9wxmGalurr5C5IVmmaC6m7m9GeVQDnQI76zUKAJsgA27xtew7yelJc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136308; c=relaxed/simple; bh=EYvWmbwapxhXRrApxnPn19zusiErRpPzHSu/Ib9cSag=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UoG58lAFfh6JuGSvniOWPAsHIivFnufVmxS4Ytx8o5dutcUQa893LJq44g9nI3JzW4JL5jLx8MspoNGVQesTBTza9bV+qy33XjwgEH4dfX5pMfSJstaUJVs0xldlTIasVDclp4G6w66+tcabhFJydz6FiCCFoyWt6gjwkf5DoGc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=kRRu9WCc; arc=fail smtp.client-ip=40.107.92.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="kRRu9WCc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Qwnfuz5yElhw6mV0bvuexrXU8ivrXLXvxAGMZGNTQs1pQPKvXMD6FNSJNwCWjzCYEgqcDzgf3Gazer6uXG8dn/cFk9qypARo/9tJnNHfdgyXwIO3VRADBdZMWyeosF3L5wsoraWIqPfYUy/Yb7vZhf5Sj4wVUJShv64gx6Me/x0dWe54cKM4sS2lvrDqR2RtLeAVBz/LT86hIwl5hAaFhgLX37J/otQvMWesrMVj1DJMVxDxx5lnyaY6kP4npBC7E2eVCTP+AOCICn5m4vBGYHzg4YdaEgThTrvpC4eIRkAxC1jnOQsrvyA1Npo/L6svsqq6SBz7jtdcXtxHGYbhbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=niKGXD7RG6SLE2Z/Fkk9hOW6fVU5W+mLoOggWoOsWho=; b=S0m823CM9mj/eShNj5rJ5mucYgDZ6m0HRzNYa5ULKEuU3U+zpHbIvcTtXpWR5Kn09/5v6/ParL1BUOHh0S9gk72FJxMtn0+iaynkY7WV9ck5fuV9KVnIZZJx+x19UfoswdAYhFg4ilr9LRv392ZWMCkxohFnbi6uNim9b+heaFZnPlAZ76xE5/Yt7xDKemH2ZORGG+8TBel5ryogcOTI8rR6T96ny1XhiWzsVIiIxm4q8STst0uU+c/lHase30IIDjA0hPqewdwKp2zdKVTbJZWS1d4K/7qYsuTD5ULjN6JwyuS+6IaTf4H1ss3MY+ECVJheAqVNRDFMJ51yQ1vhHA== 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 (0) 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=niKGXD7RG6SLE2Z/Fkk9hOW6fVU5W+mLoOggWoOsWho=; b=kRRu9WCca24vJNKhz4SbtYMxvKbM6JHTtC5FtDNMs4x/GbGVJymYWzatDabiQurjUTi+NKvFCx1vsrQqEBjg6M253ReXVOyiohNPGbJ22jNs9A5hxVsz3j91tftdUxdKd6TVCrFzRcNnVhl7KQfsnExKowkwnPtqLdd2dNCZwC4= Received: from MN2PR02CA0014.namprd02.prod.outlook.com (2603:10b6:208:fc::27) by LV2PR12MB6013.namprd12.prod.outlook.com (2603:10b6:408:171::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 16:58:22 +0000 Received: from BL6PEPF0001AB58.namprd02.prod.outlook.com (2603:10b6:208:fc:cafe::73) by MN2PR02CA0014.outlook.office365.com (2603:10b6:208:fc::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14 via Frontend Transport; Thu, 8 Aug 2024 16:58:22 +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 BL6PEPF0001AB58.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:22 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:16 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 2/8] ASoC: SOF: amd: fix for acp error reason registers wrong offset Date: Thu, 8 Aug 2024 22:27:47 +0530 Message-ID: <20240808165753.3414464-3-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB58:EE_|LV2PR12MB6013:EE_ X-MS-Office365-Filtering-Correlation-Id: e86d17f8-a62c-4aa7-c532-08dcb7cb4fbd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: rWAr5VKk+KWbFce8IMSz+i4KwU2RGqaJrqIofG1oaJ0EvWi3Euwpq1PrJda33lGc8yyFxBw2nw53iLa8ZBtagY4aS4rk++lcOHzxWqlwbtlrrgk35NxVAtlHc7unmD7KT1MXw4GsB1bzzrM3icCQ8bkCr8a1Ao4pQPkDslmMx2WZ6fu50SZlY/V7YLQ8jLGjB9kdtuiX3Ib2GeftnQnJ0LPahNGtt3KyQYQdGbmlAZBWGNTUQ4S2ToDLyMrKWk8o+PuCAdXkqIa8enJ7vzIGAutfsvKzai6gE7QGxgmiKQ4RCNcy2RBDa9/tlTh7eP7KyqaNCZPVrZ9UAst4ugl8Nb3hAGlz9IAOt2JjHYS6uEmYL2iax3Rpz7Pgl292q6qDEGFLQuZs5Lu9JNvLz1xHork8+GK1sfq0+szjXSGolN9ETLnMY83kRkxCaMpIONATRVSwftUB//LFHesd4NxU1lGDAyhFwFmjXwj2GXNdEJgVvnsSjcb1/3doRp8cJhxUggUUiG6HNikId/LDAuPJx6jiegP1SlRANrnhwJlkkS759HD+sbrXeIEqueWv/WbO+sy0/CoFrZp7M0uf6V9I9q+j73AqqOvapszGRtjqS+VvITX3z72yTn56TPGDCsefPS1kE6G6tzVoQO5GJ1QWTFDxUNWjSig8I6c8XRHRmrkOO0Ep+N1EQQUi6jYbfZVr8rkhHQDS3wDbBV9+ap+kgUZzHRqtcHPm39D2OtIw2I1T/g2qo88pMZQY0+hUdQeCrYwnJ1nGnL2eYe8W7SxDThoLk9NP7rSH1IPkZPyBudSmo/friakchdwYvaVuGWzvg2Bw5pA6V0vVXgGZebOmxZ+SfsbEIpk2AM0XoG9/hvuTOuV105gvk0izEFdk55Y4RyNQcwUIVvNcbs/+sj/bOH5D5K2QKZNiFC2i/G7SfoGtYIW2hJIZLc6SEHiJ+Dycohb5yow44XcXZZJM04oV183MsUN7TMDQVRCzS0ZylffagoeIoLm9K+oS2qTDgMGQqccsYrIahq57pBjc6Pcs29R2tLPMJmgxo4hUXKvqlEsEIWR/NE+M4qg4DW/eGghe6xO2YKJdjsTNIAPrhK0CChZq9mpu3yGOvuKlofaOOfs6tUc+/KSPqALw3gG1oUwdccpBtSDFoGa67t3ea5f0l6irl2ggs03ITEHOH5QpTHIt+rAFFT9CIOCnqPT7qS/7XRQ6Kq71asyLAeC7S9sXWgA2JJKhhHrfO31hJy/bfQlstUbCFk7K1oRCkzCfPFEH04HZIcseZYsvGMnhlqYMFVv63XxTZeq0QSw5p6geFj0gL4y0hZmkpCB5wTVTBNcRpjgrURDt2/91vuEAcLKC4h20IOY21HaExNaVe9GOzAzucZIx9LtKNStdVhkUnU/aoI03Zq5BppW9vk+gyx9JzrPtdZl5c9HscMk+Jd0uUTDG2YpnxmwXtwf6PohHtnVx 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:(13230040)(36860700013)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:22.3067 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e86d17f8-a62c-4aa7-c532-08dcb7cb4fbd 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: BL6PEPF0001AB58.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB6013 Fix the incorrect register offsets for acp error reason registers. Add 'acp_sw0_i2s_err_reason' as register field in acp descriptor structure and update the value based on the acp variant. ACP_SW1_ERROR_REASON register was added from Rembrandt platform onwards. Add conditional check for the same. Fixes: 96eb81851012 ("ASoC: SOF: amd: add interrupt handling for SoundWire manager devices") Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp-dsp-offset.h | 3 ++- sound/soc/sof/amd/acp.c | 5 +++-- sound/soc/sof/amd/acp.h | 1 + sound/soc/sof/amd/pci-acp63.c | 1 + sound/soc/sof/amd/pci-rmb.c | 1 + sound/soc/sof/amd/pci-rn.c | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h index 66968efda869..072b703f9b3f 100644 --- a/sound/soc/sof/amd/acp-dsp-offset.h +++ b/sound/soc/sof/amd/acp-dsp-offset.h @@ -83,7 +83,8 @@ #define ACP6X_AXI2DAGB_SEM_0 0x1874 /* ACP common registers to report errors related to I2S & SoundWire interfaces */ -#define ACP_SW0_I2S_ERROR_REASON 0x18B4 +#define ACP3X_SW_I2S_ERROR_REASON 0x18C8 +#define ACP6X_SW0_I2S_ERROR_REASON 0x18B4 #define ACP_SW1_I2S_ERROR_REASON 0x1A50 /* Registers from ACP_SHA block */ diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index d0b7d1c54248..9ce8b5ccb3d7 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -403,8 +403,9 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) if (val & ACP_ERROR_IRQ_MASK) { snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->ext_intr_stat, ACP_ERROR_IRQ_MASK); - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW0_I2S_ERROR_REASON, 0); - snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + ACP_SW1_I2S_ERROR_REASON, 0); + snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_sw0_i2s_err_reason, 0); + if (adata->pci_rev >= ACP_RMB_PCI_ID) + snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SW1_I2S_ERROR_REASON, 0); snd_sof_dsp_write(sdev, ACP_DSP_BAR, desc->acp_error_stat, 0); irq_flag = 1; } diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 6ac853ff6093..f6f0fcfeb691 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -204,6 +204,7 @@ struct sof_amd_acp_desc { u32 reg_start_addr; u32 reg_end_addr; u32 acp_error_stat; + u32 acp_sw0_i2s_err_reason; u32 sdw_max_link_count; u64 sdw_acpi_dev_addr; }; diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c index c3da70549995..e90658ba2bd7 100644 --- a/sound/soc/sof/amd/pci-acp63.c +++ b/sound/soc/sof/amd/pci-acp63.c @@ -36,6 +36,7 @@ static const struct sof_amd_acp_desc acp63_chip_info = { .ext_intr_stat = ACP6X_EXT_INTR_STAT, .ext_intr_stat1 = ACP6X_EXT_INTR_STAT1, .acp_error_stat = ACP6X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP6X_SW0_I2S_ERROR_REASON, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c index 194b7ff37e9e..a366f904e6f3 100644 --- a/sound/soc/sof/amd/pci-rmb.c +++ b/sound/soc/sof/amd/pci-rmb.c @@ -34,6 +34,7 @@ static const struct sof_amd_acp_desc rembrandt_chip_info = { .ext_intr_stat = ACP6X_EXT_INTR_STAT, .dsp_intr_base = ACP6X_DSP_SW_INTR_BASE, .acp_error_stat = ACP6X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP6X_SW0_I2S_ERROR_REASON, .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0, .fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL, diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c index bff2d979ea6a..2b7c53470ce8 100644 --- a/sound/soc/sof/amd/pci-rn.c +++ b/sound/soc/sof/amd/pci-rn.c @@ -34,6 +34,7 @@ static const struct sof_amd_acp_desc renoir_chip_info = { .ext_intr_stat = ACP3X_EXT_INTR_STAT, .dsp_intr_base = ACP3X_DSP_SW_INTR_BASE, .acp_error_stat = ACP3X_ERROR_STATUS, + .acp_sw0_i2s_err_reason = ACP3X_SW_I2S_ERROR_REASON, .sram_pte_offset = ACP3X_SRAM_PTE_OFFSET, .hw_semaphore_offset = ACP3X_AXI2DAGB_SEM_0, .acp_clkmux_sel = ACP3X_CLKMUX_SEL, From patchwork Thu Aug 8 16:57:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757959 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2084.outbound.protection.outlook.com [40.107.236.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5AFD191F70; Thu, 8 Aug 2024 16:58:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136313; cv=fail; b=qQMwj/PTYozZbTLeo/Sr/s07S4zIJDNdplEV9jLAnOwt5EUW3iOK5bvP07LTUC8blkfCj2FEPmy/KuilpOiuF0zMjMSrk9wvyZ03eWxR/ChQJE24tnAd47qqtqttKbW1wAOSp8RxDt7fykmv7bx2ERHJvASQ6ky6c3A/HL8vMn0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136313; c=relaxed/simple; bh=3Dcu6aJU8X/aJgTk736SCzyefoHjdCUG7aL9wcxERrk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s8mtwCLVYk6I+SJNMPjsOHGdJl4qeQ7w3Bypc4JC8YJbnIteAgAaim3Y4vb9Eh2XMxdqya1q/hJEhFo1lL3zNAxWv0I8+/8vGnDRln2SeOpoIZGeXQ1VOQHPFDegUvJLz9BWDXTFsIsvhsi3PT0mQGtoCmJF5jFzbJYK+1jIasQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=EzNrThNF; arc=fail smtp.client-ip=40.107.236.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="EzNrThNF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aSldk5ncTv4n0aBIGe3Cm2BVxBQCGxX/gvWpks+vmBfN2blu6Rjbxr/KnX58+DKnnIK7kCr5r6vTi4223kPLYabUUqkBaZnWYFZFNrFCy04tjMulZ8XyZcJHfTjDWWvxS8UXXNuilLttNxgdE+ZpFctzPl7bXKz9Iq51mnT/Hlp+StQ+SYdm3+CtG7zGCzqdVoVVIMiFarv9O1wpdGSCTkiFaFHjQLIpLxs/cYkQ7zjvNIq1TSTEVzIl11sH9YX5EvotlODR+fEg17CeusTyGz4oBIwPRmN4Wi0XKqanTuCieLL1FNh9LRUxhkrIlYYY00h58m/7H/VD99rLrLQ3Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=I2KCJG/+YUEu+WHixSrZZlPKZxJ6pb4opybJ0tKtTd4=; b=rqykIFEOEWZDyoE3gXusVrRK0C4SszWauoU0a6/5zSV4JdDbBehtjauuYB+zRKcXAmzvcMAEUV+WKEaOZaf6VJX2raCgmjlCguqTAqn5vet6jpfN0S2RfzrvVpxYmfpF5819L0tVrQZPtvi33oM7VCvikspheFG6XGXbQtRkhc/RteSWkJeYi1u76v6CJx2pK06XMFE/OzU0wLLuu8JxgH01W8ouFeSEFcEBb5kOYk5abSfgMkkycBerCCnwBFCHD5m26cJPJ1pBv8c7whV9LtUTA6ZWQ6o/Tmgn9Bw5JolqynU6zp14i5lX5aczM/23SjU79LtBgW6cSy1alWwuPw== 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 (0) 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=I2KCJG/+YUEu+WHixSrZZlPKZxJ6pb4opybJ0tKtTd4=; b=EzNrThNFt1tXRFuvHRiGOLjDHAJfciYsqRgVEXKBqy65IIqFBvJ15IRIJ81VK7QRWkfV7A+QNbesPDF2ltqpAgxzguz6/AbCSnaBU9mu3mNwZm7heorBfon8pCKVv0eQbiMjFNgkwhcDM66EzcvFrmmEcreVhc7U7Vz9ooYaoKc= Received: from BN9PR03CA0226.namprd03.prod.outlook.com (2603:10b6:408:f8::21) by CH3PR12MB8548.namprd12.prod.outlook.com (2603:10b6:610:165::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Thu, 8 Aug 2024 16:58:27 +0000 Received: from BL6PEPF0001AB53.namprd02.prod.outlook.com (2603:10b6:408:f8:cafe::ec) by BN9PR03CA0226.outlook.office365.com (2603:10b6:408:f8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.29 via Frontend Transport; Thu, 8 Aug 2024 16:58:27 +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 BL6PEPF0001AB53.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:27 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:22 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 3/8] ASoC: SOF: amd: move iram-dram fence register programming sequence Date: Thu, 8 Aug 2024 22:27:48 +0530 Message-ID: <20240808165753.3414464-4-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB53:EE_|CH3PR12MB8548:EE_ X-MS-Office365-Filtering-Correlation-Id: a84714e4-e8a9-4620-2654-08dcb7cb52d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: bKV+OQO2gn/MUaAu5SudUqR+DpNq7ZjyuhcJW4BEWdQvgJWf2vUBtPTYFm0TauKIFcTkfuvexQ9FPEk1rcs14NkQ6fKnC+Th71yUMAUQG93KE/5H/R61Wjvs691dTfc6ZZCO+6hCuGVNTBrowBShGgKKkL2QSJapPD2bgX1jO3JBaFvKnevNfIkx0CpJXprVGyLprVHn0PRKhL6mHJy/3ff87UgmYO1Hp89yBCsFlN2NR/q5bgBjPR0N977UWz6PIdr5CFd47dZbeZH5sl9miQUxo3WoOLa6Ql0HZTGlPdc7BRIaHHdK40gA2OjXKvsg6y8wJUxRkcEM3veU4a7ieqC7CojfBlV/6txeJbylG9CTNRbpljBpdL/gVwimpfX53J1LJrLwqoq5XJOUTVc+wdIG/Ia/LG4kDCvjFeZNHG4DlDubJWzfd9nErtfZOdjq5dh0ajR5Y8moE0GA9CgZxstfqtOKbogne6uNwJGsbvlTMEAN85hPCUOh5YPGkry5ywj71wWFLYGDUlZ9BIb/W9Do6doyYXWPw+AsKDaoA28KjG9GUCBQ0ZrhSU64D04fhnnyc9kKWCkhXBVjR3H6R5rr0UK8H3OL1pEdfwGRcOcQxnmx3vrPnE+dwhryCn9N3heKIm0+WK00mkXchPHB7xJDXfWimNNUS9nnHm/NQpsI3A3YC215kNRwoiROLKVNmcI/GydU99l9qVfIYtS6J9t0OTfdoX/FvETw3k2SffhmyZ/Rwdh/ulmBwKcUZ1AlTRj+9CqzqnZJzgKFdFidzMiU4htlKeMdwx2EoptAdn+yu4TKoTYKKByLS611Yny7ulfBr29qC4cRR94Ie6ZnC1SxiNQ2kQf8QhttjyGcwnWJawcGexORMW/b9Vx5zUmVgesLzBfendkop5msWvThGXjwDlXK6x8if8hxkKINknEzPg+fErBsjznFdCWFX28rkZTlZ5X6mOmO00iJPzZA5bXJ4KZC+TjzMTEHREc7OJKJKUIzm0yFKsGNkcrLeYMqEwilK9CJ9X6G/2UJkCkZ1a3rypUZIAJwxCgLrGJrsqQS0K4O+Cve6Yi/buMA3vmmrb7CE8qH7N7s1r6qlOdi3+Mfon03WNYLdEO5zEFBcYjsRSnKKOs+FEGTN0MabSHMgE22kMLHZxhqMLI/3K1j900b4+NxPz1M3wHp/2KusPgE0LRcXCOZ+ZElSqJuMsZ79RKcQECyT5PcrlMdm/ggkrpJMqxedenJX4EuQGKFCByT039jm4UwITLu5xrzEHTrF7FwjmFAsFJLrId3HN+i61BDFPPFhs/yC71kPRCSXkoq8E8hhqriysm1YUktvrdzgodz0PFGkHCcF70XYqJBu+nK9U558WBycRzyB+1AfkuSNM6gpWbf+keb10F8wLIEKID32PpQ/JsjLBjDvXQH0GzxZj3iHYVoGWcn5x7iFWzTf/+yPrIybjJlUa0rw1el 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:(13230040)(36860700013)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:27.4800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a84714e4-e8a9-4620-2654-08dcb7cb52d3 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: BL6PEPF0001AB53.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8548 As per design, ACP iram-dram fence register sequence should be initiated before triggering SHA dma. This ensures that IRAM size will programmed correctly before initiaing SHA dma. Fixes: 094d11768f74 ("ASoC: SOF: amd: Skip IRAM/DRAM size modification for Steam Deck OLED") Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 9ce8b5ccb3d7..d0ba641ba28c 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -264,6 +264,17 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_STRT_ADDR, start_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_DESTINATION_ADDR, dest_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_MSG_LENGTH, image_length); + + /* psp_send_cmd only required for vangogh platform (rev - 5) */ + if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { + /* Modify IRAM and DRAM size */ + ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); + if (ret) + return ret; + ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); + if (ret) + return ret; + } snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_CMD, ACP_SHA_RUN); ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_TRANSFER_BYTE_CNT, @@ -281,17 +292,6 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - /* psp_send_cmd only required for vangogh platform (rev - 5) */ - if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { - /* Modify IRAM and DRAM size */ - ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); - if (ret) - return ret; - ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | MBOX_ISREADY_FLAG); - if (ret) - return ret; - } - ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE, ACP_REG_POLL_INTERVAL, ACP_DMA_COMPLETE_TIMEOUT_US); From patchwork Thu Aug 8 16:57:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757960 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2078.outbound.protection.outlook.com [40.107.243.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6906B191F93; Thu, 8 Aug 2024 16:58:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136319; cv=fail; b=AyqX3W+ngNZDH102LaKj3pzUPMvE6r1bL93XfVpfxgVNwfvZSB6IiZuytpjKiyu9M8BhHvhBVybV3I8D4h9WGpzanSaJdKOXxO8O9I+wxvxkrIdnzcw4Dx5VCvt6imu5BXXit6sZ9bVuQkUdppoQyDX3CDwE7mZL1x3u2qR9m68= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136319; c=relaxed/simple; bh=IbvEYfxUpu8uJp6sM8KoJiMvrQ3grjF0UH/yg6pUjIk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AycQm2GVoM6xfrVYxTdgJbRmlgo2nkbynuYenOARc/642fkPxaUMaL3W+rLtQHaq4FJ2M7Nk4vDwVbJaPoq/LjYOnDAiHWC+kYg15tx8JCFz/T78gIDHbdq98pza636VPZLqssxoLIxuNc/KKOy+Sf3aue2JJesUfTYWE012YKQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=SJH3VywQ; arc=fail smtp.client-ip=40.107.243.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="SJH3VywQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eRrPUQR0CbI4GgfP0MM1XaCbNPcv1KlkVZ7gdAJu4rbq/1zMMIdHf61zDjPVoBdlMmUev3E2cXfLW2SQYRMN72gK6H2H4s7mzjc7fjk8BTgGZV3M+gOZZ/X1wp6b7jB7SXAWG7c8JOdkT6ZDivLm+6yOw574S8WMWMMvFAvRoqhPmKfV7moqGMY9K1UDME9I0L/HWKFhDsOnQzvO2/xnspAyI7HfIPSWV1Y5dVT+lqMw+it5534zKeUd1pVOnCDv4/0nHPF4/BfQ1cvrWrKrUogRz7xQvAUGVTuEYVb2ENqi4lt7kfLaYMC7vQy0Aq5NH/TXFoPzfjgZ3KRRNh+zIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=RTVy/S40reH6dPiVHmQp8KHQmxDvKLVFHwzi2x1SwAE=; b=A+sFhjNvKCf9tz6zVuEIAGaOWl87g8zHKgxwmQhYpVnEaOQM/YbePiWRgOnZGhYZ0Uqx82dtbUD87k6bJIEHOIQ61e2EoEoB0vSxmszandJsAHRAPHJM80jhGn61MQlvAOS81fHrTOgIO0CYdH0NG8Pfdi4pIBfFhsnWSr+KHkfojdgbVZS6AS6BTnmDjS38paHqeM3TsWDKNMVbHj/61lqNwNNRLHJ1Su3FKqT9h8eBtDMWfaX6A7vjSRR4eqNqd0o4TFQ06V+EpqjKTp72PD4lEPYpYtiT11WN3f1Xq/K6wAvtzKQ48JaLUwxb0QhCTtxivBlRwd8yETVUakhBlA== 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 (0) 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=RTVy/S40reH6dPiVHmQp8KHQmxDvKLVFHwzi2x1SwAE=; b=SJH3VywQIbFvUEcciYjs0NHyzlw62A51X1XAuwv890dSf7MKJuvQa6ReCh1gzLq7e00jgOOgxye4XrBBwM0faJQleE3o5VMD6C1cDk7RQKDAJIYrmZ81mtiIeK11mHHivb7uPXKSE5b26VSKxPC6jWnSrHrrYzI913JoVIIjmE4= Received: from BLAP220CA0002.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::7) by MW4PR12MB5601.namprd12.prod.outlook.com (2603:10b6:303:168::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.21; Thu, 8 Aug 2024 16:58:33 +0000 Received: from BL6PEPF0001AB52.namprd02.prod.outlook.com (2603:10b6:208:32c:cafe::f) by BLAP220CA0002.outlook.office365.com (2603:10b6:208:32c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15 via Frontend Transport; Thu, 8 Aug 2024 16:58:32 +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 BL6PEPF0001AB52.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:32 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:27 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 4/8] ASoC: SOF: amd: fix for acp init sequence Date: Thu, 8 Aug 2024 22:27:49 +0530 Message-ID: <20240808165753.3414464-5-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB52:EE_|MW4PR12MB5601:EE_ X-MS-Office365-Filtering-Correlation-Id: 6232405f-2c7b-4a34-33f8-08dcb7cb55f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: biatN/QS/OMH8rrO7augVO1rfvhrYjxju2VDSW4rj1xWnpeq3SrBrgI6A2VPKhn540yiJqU2zX1n2a6R/xjlFHTk42+hOHz2YRllf6toOCaGhetP7I52RKiVBnwo0R+XjKsXylCs7kVV8YMN7QY6azpwpJyWJe26Qcm5Now7XN0bBXqIBZWcQ/V68D35V0mMAaDZabwk3yGnFvsHeECrJeEi1lXV7AbnNsxmncMO6vgu3ErGDPZzLK3fzbgy750igYsA5UUjlbGfsNiOGSSl1Ymbi5iCW0L2lKD4J/bEOUcyHo6+7MITH271zvI3DVetf4eLKo3kjm1tYC1JmFOp73CrwijrpkGCuQA7Naw0xQ1m8exjto/YKKoL3GGScGDZXqRN763GZ2QBUplyWKAYg4I8efF2rNz1JcdgY6Oead2c06PyR+Pa+AgZtFLeRPGNaN3xk+GHySwTa2DgwhgHXAzb4ZsthnRN2tCEOnL8wiNmsBVc4SpTzwoIOM0A8JLqwX4Lm5n6lmFSmYfnw2ASC66Ou7uwXFIp65N1nw3/hVoNMNrUBs2V1zrtNU39l5hGwEwDTAYBEu9yBMcs52nWHYh8h7kiMNICnqW8PYX4qoaSWw42eXbUQEW2TlJzuTl+zAdFSgOOhayppYQM6lyhM4ckl/ZTJpHGCqpx9Wy23UEPLPUIZWVnSu60r7AwJ4nK8r5AeJpMk/GSalXODnwhrm71pz2tgmCCoXLHyVo0t3iccS30W1qkgWrBjPyNtCDnR9BJXHfaq+WOaQSYmM5p6jvrTK6iOH9Jz6wm0Cp4Mm+KIjEUbC3OzOYdakA0QNBQvY1pKAFZcyZYm7ks2FE+9jyvhCt8oR6FPCQ4duBbUYPPvNcvNSuJruGyaKw72N+mDmUOHrrvdApcB8XKDzz6hB1rV7p792AsOVFzqLuF1xuLn+Gmu4z5aOjnc9DwYeRJTVDLRSITKxMyP2jVIqmCWr4VSU8mbJbapDtLpQHlfb5oYGJajI1S2QhRrSWQju29idDL1QoFOc309LPtwsJGzhkyENhsnK2P04km3qdmsPM214IXQPIYVRhZnq7B9tWoEug8HR8C5cJGih5jSot9oWMxChraQJntA4f4mBqh0eM9pdeeYHHVnJSpdhAZUvNK63GXv5qn2jYiFSUZasTBKnTgbsdVH9DbSEuZyaQRAErsKH3pbKHbiSRUb7/Q2h4V/PA/IfAHBAgOCrojHfOomZ9Wij1A6eIXMxWBKPYj1dw55yAYEdKgX0ukO2FE4BWAMd9w4K1RP/YjJEE0bLJaPAOWIEsfZqIlDzrtHWslfvwjcGqxrMQkQ12NLNaiDeWjJLt4tCW7hIpH11ZS1BYxQFzV9OR2ATdMd82rh7dVMDe783KzhbQ7aW1HjW8aKQ3tCPJXs+rCkCJDGJdW9Ec0vN4qULCuKA4jffUyeB6xPv6Y2zMf31Z9wzrB1xtysgOk 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:(13230040)(7416014)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:32.7429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6232405f-2c7b-4a34-33f8-08dcb7cb55f6 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: BL6PEPF0001AB52.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB5601 When ACP is not powered on by default, acp power on sequence explicitly invoked by programming pgfsm control mask. Update ACP pgfsm control mask and status mask based on ACP variant. Fixes: 846aef1d7cc0 ("ASoC: SOF: amd: Add Renoir ACP HW support") Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp.c | 21 +++++++++++++++++++-- sound/soc/sof/amd/acp.h | 7 +++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index d0ba641ba28c..a9f32983b3af 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -430,8 +430,10 @@ static irqreturn_t acp_irq_handler(int irq, void *dev_id) static int acp_power_on(struct snd_sof_dev *sdev) { const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); + struct acp_dev_data *adata = sdev->pdata->hw_pdata; unsigned int base = desc->pgfsm_base; unsigned int val; + unsigned int acp_pgfsm_status_mask, acp_pgfsm_cntl_mask; int ret; val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, base + PGFSM_STATUS_OFFSET); @@ -439,9 +441,24 @@ static int acp_power_on(struct snd_sof_dev *sdev) if (val == ACP_POWERED_ON) return 0; - if (val & ACP_PGFSM_STATUS_MASK) + switch (adata->pci_rev) { + case ACP_RN_PCI_ID: + case ACP_VANGOGH_PCI_ID: + acp_pgfsm_status_mask = ACP3X_PGFSM_STATUS_MASK; + acp_pgfsm_cntl_mask = ACP3X_PGFSM_CNTL_POWER_ON_MASK; + break; + case ACP_RMB_PCI_ID: + case ACP63_PCI_ID: + acp_pgfsm_status_mask = ACP6X_PGFSM_STATUS_MASK; + acp_pgfsm_cntl_mask = ACP6X_PGFSM_CNTL_POWER_ON_MASK; + break; + default: + return -EINVAL; + } + + if (val & acp_pgfsm_status_mask) snd_sof_dsp_write(sdev, ACP_DSP_BAR, base + PGFSM_CONTROL_OFFSET, - ACP_PGFSM_CNTL_POWER_ON_MASK); + acp_pgfsm_cntl_mask); ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, base + PGFSM_STATUS_OFFSET, val, !val, ACP_REG_POLL_INTERVAL, ACP_REG_POLL_TIMEOUT_US); diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index f6f0fcfeb691..321c40cc6d50 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -25,8 +25,11 @@ #define ACP_REG_POLL_TIMEOUT_US 2000 #define ACP_DMA_COMPLETE_TIMEOUT_US 5000 -#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 -#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP3X_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP3X_PGFSM_STATUS_MASK 0x03 +#define ACP6X_PGFSM_CNTL_POWER_ON_MASK 0x07 +#define ACP6X_PGFSM_STATUS_MASK 0x0F + #define ACP_POWERED_ON 0x00 #define ACP_ASSERT_RESET 0x01 #define ACP_RELEASE_RESET 0x00 From patchwork Thu Aug 8 16:57:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757961 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2046.outbound.protection.outlook.com [40.107.220.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 449351917C1; Thu, 8 Aug 2024 16:58:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136323; cv=fail; b=Wr9rSZKhTPaw9vcwClHz99DDll/Of0XUMU9P0ksyTyVXA/0ir1xDQ394KLYaRnz8X7Lrt8i0P7+8P+bN6AZxbFFUJwvuJFpA2dH5OhnOQJPGrxqkNlSLk04QVDnL2QsF0wA9KsvgKjgjzG2fPW0GmL/bPetx7QXlpu0robWQ6Mc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136323; c=relaxed/simple; bh=mTm3MAKgh+w308d/h61q/miRKwKQ6+/Z5FzsQKtxiJU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aSJ9n1wuLZ0ERF+bZ+9Yqdh4YDQUrgxXSpWxafaqYGRc/z21ah0GpdjheOJyaScylWl0uaR04GqO3YTTvfh5YAqSiFuufXhFA81Myki7MHmc23c878UJixb71jW5jBoqwRc250sm0fK1bTZ6HsA62+9JuxiA/XWF0xVC3V5RR1I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=aQxuDfSn; arc=fail smtp.client-ip=40.107.220.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="aQxuDfSn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ngx7bmzxc0vrjUbneOQscD8eTGVbF9h21D2CPpzMK2mtme09sxS2phar2IDGgz8Xjqwg7xS/W3udEwSY14w0CuFvUgb1M+3/k5f8Lw4j4R7Tv8oVEDtEDos/TVvhb7NKLuJE93UkXYBFQzy6kn4DoOXh6S6zs5YTqyrEHODPzv4RVwYyuIDQ8q77ljAqITU9TPh9vI19TmhENuGuaaAYC+1zrO8DeYfSbnFJ7qstTNsOyRtYy/sS8y5SfutlJB3+LfdglPstrypuYp9RSm7BZw4LJfToW4JsY1Im1DUDnKXw8rmBFjO0CB9QzEiZcvNtYoDYT84bwwiClLtE3cRgQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=VcmZuvb5AQbGbL7i/i+v7liw89Xk0n11G1csEO6y+kk=; b=xAH9ttzd0zdLL0GISLywrF/TjtXfII3i5UW0E96k+FGFjIE4bnLmyM7+293exggmbrxKW2ZgNuxrh8KWJdrEyCxqZtFkQHE3+F3sx63/G2r/v16s5vMEMg07doio5hr7VCVH+5iLkUFolMq/RaQpKbp8aU+14X3XpqWgnhzEkAMIBiRDKq3rcMvl9IswwEXSw3ePvfPOLO/GcIb9QL06iOEcBUmP20FaTE173LE95twbnw/OzPwz7aytiVeWj23xw/8tMsQGxvDZ6m5szD8nN9J7c/NnsiXgrs8quDhTzMg7cyj/mh/S3lXz9pMEcrp83lifYwt28VALgjw+0PVTxg== 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 (0) 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=VcmZuvb5AQbGbL7i/i+v7liw89Xk0n11G1csEO6y+kk=; b=aQxuDfSnDLA8R8Skya95TglH2JI7VCz3QRXXKp9GGaFaiFr2s8UdkwsB5Ignv33RJDUIsAKAcRDUoj7OogBGw/5uGPDQyF02lxDRpdv31f9p/YRvzqNkLi1zNPtyDxWu9O5DLCFdVyrpbdlaRvHV29xKCLLwRZ8pP0POZvXeKHI= Received: from CH0PR03CA0217.namprd03.prod.outlook.com (2603:10b6:610:e7::12) by DM4PR12MB7646.namprd12.prod.outlook.com (2603:10b6:8:106::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 16:58:38 +0000 Received: from CH1PEPF0000AD7C.namprd04.prod.outlook.com (2603:10b6:610:e7:cafe::e0) by CH0PR03CA0217.outlook.office365.com (2603:10b6:610:e7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.30 via Frontend Transport; Thu, 8 Aug 2024 16:58:38 +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 CH1PEPF0000AD7C.mail.protection.outlook.com (10.167.244.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:38 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:32 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 5/8] ASoC: SOF: amd: update conditional check for cache register update Date: Thu, 8 Aug 2024 22:27:50 +0530 Message-ID: <20240808165753.3414464-6-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD7C:EE_|DM4PR12MB7646:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bd32f19-0fff-4401-fd21-08dcb7cb594f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: RNqv/x7X0sgj2RZEQarXK3q/Pi7q1vKrwH308yMZwwHKqAIER26wOZWAnctBsKMfx4VLgaPfXbHyiRUs3pmGrEOAiNlywbZLJeBo4EWLys//gPgkwZPCmz4b2/BbRByFDWgaTVdeir2mrpFzhkfw1hufjoA9MTdG53P49vsCQmTzfYSGBhtt7eHiRomwBn78I04dhOxL89vxAfUs5eikJYIdKYwCyrm+sC7cEwGRejMI/Go5kbIqBjkisBS/DpXI8qzj7ZWdDbfXbYHOELa4tYVoYt0hjUuwDh92wHR+PkbAwOmiM5BG4dpK2whLltfboq/XsgoIBOMYLFjbkavobC1s/fyunEUxsj3nwHF5BRf32GICSU4YhDDAWsp6F8zlo43uFc5hEgP6/hn2avMS8YfOwJhvyxD/d8jkcGhHGdONgHZpMtVXBtNIrxsbM4rMU/GETTMLrPRGAvKsRkjLopMeEtNCY1ZrGs5lXIWcIUaYzitl5znxrU6FIBo2yzoW1N/sxsl/E6I46eheHnFW6EC2jXdzG9gYlzV4XJue88fUMmq5Zt9irZj3uaJ9Zy8/MU1Yq6hURbrqJ7eEKceahRdQsZhQ86aQ+Es14oLD7CQDf4oWlGlutNK58RqJAjJgTuvydNlRHWjtS2DzHNlWXBeBzCIzqU5mpUrm2h3Ix7KE5OkJC0M8/Ut5pe/xjGJMUBzmnGy/X3RVqCyKtkuk3cA5BtDZohCE56ORrXceB+5hlRds3po8H9lC/USDbzCYCwySGQKVkQ7nLzV/5L/suqFbVv1qsQACzxOWoai1zR0JdETsSP1GuNR/DHETIq4tEROkz7SpjBAJPAtWUumEKCCZ6P4HBfMhN3CoK57q1dFZT7DCvkOP8Kw0xNDK+9jOzv97KtRRBdcz53wFf4ttpfyA+wOpvQXGgHwWskzm7KT7O61PkoisgJR0Z8tatFi7giYGVr+Zy4Viuozhm8CBvY9oKjlvbBN8uXyefow2YU6A8YpAPQ0AtyAeSoFLe+UqJXOoFBPqqNaXr7cpsqaAugypsddb9ngzV1ZTIjqqFlIz7pc3B1l31/89dnSn1qXw/TtcDjoPvPx89F3R5dhSqOUT9oHROU7UjFrCwnl7aXzezqrIPgG1NOfWCY4K6tdMZI9pGff3vodWtFwzQMxYmsWSGwLUglxZFmKuB6uBqy9ieY3le+LCzGqRKUrCVh9nOY7ySJxb7GACJ5CX2WSbpHYEwc7I0VUbYyCNla8t6wL7Q2pJORtC3taDCUktvbUvizbnRRAgi6g4Xe7ulFwmBG+ErTARzMC3xnRbf3B9nhV49L+qtXoGQtDWiJjJe1rU+UFYcIwHhF8PcaJ/hhyDtiecgkK5rkdZE0GlzBNEnK/gJ4zBKFWRD29eymf1JhioFg1vc24Oh/jwX9Pws94i4N/8Crfuf+BcaZr0zEFwfxe+oiQh6V/LY6ETVpmgPi05 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:(13230040)(82310400026)(36860700013)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:38.3488 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8bd32f19-0fff-4401-fd21-08dcb7cb594f 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: CH1PEPF0000AD7C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7646 Instead of desc->rev, use acp pci revision id(pci_rev) for cache register conditional check. Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/amd/acp-loader.c b/sound/soc/sof/amd/acp-loader.c index 2d5e58846499..19f10dd77e4b 100644 --- a/sound/soc/sof/amd/acp-loader.c +++ b/sound/soc/sof/amd/acp-loader.c @@ -219,7 +219,7 @@ int acp_dsp_pre_fw_run(struct snd_sof_dev *sdev) dev_err(sdev->dev, "acp dma transfer status: %d\n", ret); } - if (desc->rev > 3) { + if (adata->pci_rev > ACP_RN_PCI_ID) { /* Cache Window enable */ snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_DSP0_CACHE_OFFSET0, desc->sram_pte_offset); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_DSP0_CACHE_SIZE0, SRAM1_SIZE | BIT(31)); From patchwork Thu Aug 8 16:57:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757962 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F6FB1917C7; Thu, 8 Aug 2024 16:58:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136328; cv=fail; b=BmlW4RU7tvDh9GsUOa1cXzj2ASou3tzg4/5j85rq6E7FX4Tx/Mv+MgKYrjkb4qhwv0qNdG98KnrD9BdP+EsaS1IyqpyytRmG7BD8VKfUepoQPX3Wsn6SQdNnUhZJyqWI+EMAkc0fklRwN8kgHz5kN5UqEKqOoc8TltlfWIq9I3A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136328; c=relaxed/simple; bh=Yyh6nCD6uVaoGEFI0zqZzXeuR2btH2C6BgofcihcDmI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=V1CVS+yN6zPQei5/sJd34h0v3g49MdBUXmSLoPJ/lPlzYsyfzxx/wQPL5iS6JVGGR2JI0bBRHLsCGgDjL04JRiRvVIyO16rbltE5zXScXI1TBp68tAiBsanm5fFucc0KQ9x//4+zIqNS4BRcrtkwGNqv/UqwaX07tNQgkfv5f7U= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Qlq6m0b6; arc=fail smtp.client-ip=40.107.237.88 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Qlq6m0b6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P70PnH46ZFgJoCHPcRp9l5QonDD4iNgIqfKNxtfvv5kfMtsk/2bPInFRkpSavdvAx3g7eJYJhdnKJIs/2WTfGD9V1p/XcPSDBq8p3frfsING6yNwqrDWbPWxRaxSSlOkRh0Nxd8fJA4aIKMmn+Aa7rjyDO5rqEmQT8DwsckOsal1VOH0ZK491J3AxpNixbxxI3JLCYhez/guH7600uH+R6RbdRaT6fVEPZZ8lfjYXUt/yPULuht6dB2HalBiDozY/uTsl8ij2cp2baDgIhg3rmHJL83f79sWbTkWTpVJNbnhTJr7HLGQoQSQDZRFbCE94hUhaVpBybR1SCgtSnliPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=a+POgkQwJwZYUqG1jCGpOn1i7TKe6P4D3ciPqtPdWC8=; b=Z+uNvBnmm8y9hLf7WR2A/CH+q10oS9z3taRCX1cBpWcHskY4rD8vCmXmHtCClmIiLYUNBd5TqP70Z0ilDyITZpafvYmmJ6Ur8nnjwtzhSCxIN23/6nZEKaxapd2OozQ+GK6lI+BnxMH/T+r4T7WhWLrT1yCR1vRahoh+b8KayYgPnJ+ic9y6aHt8sxJhcWlL4/YmOwf0Ij/TR09BZraKelXVveAp/TaiQrVHq3G0y59kHnZ7053EbnLHOXI24aknoSK4G5vX+Ev0/Y9GbOcM1fK/5J3EBcuSr3Pq71wNvYMQg52RZdAc+hEXMo/A2WI1EgQdaLJDNgXJTKZXHYxnGA== 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 (0) 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=a+POgkQwJwZYUqG1jCGpOn1i7TKe6P4D3ciPqtPdWC8=; b=Qlq6m0b6qUCvgDVgGWZSgKsuffRx6Ai06V0hcC+PIZ09UiNkFHGzrDV4poFZhrFiWoOzDJ7Tri4t431Zg4yw3+doVft1dGkJJwev2hFOCNJv4M2wPNzSkmu7rRd4N1tP3WfZQfKXNY2GO14VhmrGC+8yPufst4DnA4hvNlCyrRs= Received: from CH2PR15CA0005.namprd15.prod.outlook.com (2603:10b6:610:51::15) by MW6PR12MB8958.namprd12.prod.outlook.com (2603:10b6:303:240::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.33; Thu, 8 Aug 2024 16:58:43 +0000 Received: from CH1PEPF0000AD81.namprd04.prod.outlook.com (2603:10b6:610:51:cafe::72) by CH2PR15CA0005.outlook.office365.com (2603:10b6:610:51::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14 via Frontend Transport; Thu, 8 Aug 2024 16:58:43 +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 CH1PEPF0000AD81.mail.protection.outlook.com (10.167.244.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:43 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:37 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 6/8] ASoC: SOF: amd: modify psp send command conditional checks Date: Thu, 8 Aug 2024 22:27:51 +0530 Message-ID: <20240808165753.3414464-7-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD81:EE_|MW6PR12MB8958:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ef40d4d-8763-41d3-1ed2-08dcb7cb5c3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: mVb1Cr7/3rcI1TJrbDFtf0lD4H7ylMSW3JewDk7D6NJ0+ScMgpxcFwk6gqqjcnzf6GDHF7gJdCApDS51Jfl8y+fNilhNHahNwoEnhEzzCOCvnOMUuwjpguWSExnTDZhpA2GbTdFmMdEzl8izorkDEcE3eLEd18twBVfxd7AlPcM/ETThL59yA6ns/PQ0rIMg8YWeuS7KASf4jjo9wJBpBiB9pVHCHlQzGH131VXqK9Az6SBABqq0gjxE+2pE3V0dz7ycugd8/jQLStQUBb1MY6T5afdVj6dvYvfPCVS/YfGk69pW2YUfh/IoDHoZuqSXCZqbTp3VkOAjJ4cpP1lhZcRc7jIHARkq3mh8nWNrDgPL+cJa/sP60MRfrkgpNjtKNEKzR2vjcHAWA/aJlqwKlYYvzRm5/rySi5GahPFo/UkldE/vPniQGcW8V/WMWTpmqeHgyY3pd7doYIxcnqp25bmEBXUk5hzOTqrAJy1qlPaCusnKkkQ+TfO9Pqagc/IfSLrEn9MO1sZ9gGyP88Nasw1qq01VkSU6i6yM/eHZyUIPvJnVx/1N6qyLrZn5GcXsvH4mKUQQMuNg0CAzf5I+K+qXsQmhKt7M8GoMHex2E4wPHstRQhrgyGDDZvJEk9vXuC5OzwcDavp7ToaUi13B0N91VVAIqnUh6w5qsCFllpowsM3m9ArQz1XA22F2t15rK2EI1NHqQyUt/bSavtccGsW3cNPTc6MfYjdUS+KowUJ3A22lprSoY/KKMZ3YI3xVBxFKTPwh2tcbAVzzI8sNGgbUkJ1Ob2D9KRhDGq8d2SGiKlpcY8RmS/JL85tmRqPWiiMP0mhhlrfexqfgavvku0Q9Wm2Akhi/7SaDK0XoPIfV9IxJLAsXuQWWKF/i417/BRLQZlrOkngudUfzFEJYUKZc1PP1wyA2aLABD57Ebje2yjtkB5HOEhhpzfeXH8lsHrJv6Mkz3GntuQzR0QFvT5U2V9kdryXL0rwqhMnMp9SI2n4RixNBUb4C7bn3Ua1kCsuvBgs8Bss5DxSJrdAJ8cGfdmVedV7dDadjTouNgLyVaYwrGpR/j6+PJfixzLDBqXXtw87/fmhgiob7oQfyhCVNT0FZ8W1P774jnqE0YAjh/9SMIUc57oL0w/M4umJYRdoAeqpDrl9odJY0MhGfWixfSjktruwCK0Rnt+7tpOjqtctZKzrOItcsjDujp48F6nEqbKCnACT5FKgxknP2J7rW2SuVd28pUOOrllvc6C3fV8SCO5Vc1bgelpspOcO4iQ7klOc+O0mvPqshjFUb9udKk+ideGwsUV5HKcut3VkTNDebe3tqvUDig16FPIn48/z1vcUjYdulONTH2Fqqr+NlWXQgHthghshdAF44xRoU0gD/rhddVDKAIcQq3M3Rw3/Up3oq46VeChW2hN5aCkeHCFE1lcuIJV/+akjDMxlQ99O2Os/bRBu2NeawL3/H 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:(13230040)(7416014)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:43.2452 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ef40d4d-8763-41d3-1ed2-08dcb7cb5c3b 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: CH1PEPF0000AD81.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8958 Modify psp send command conditional checks for Renoir and Vangogh platforms by replacing desc->rev with acp pci revision id for that platform. Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index a9f32983b3af..a85f5eb54239 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -236,7 +236,6 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, unsigned int image_length) { struct snd_sof_dev *sdev = adata->dev; - const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int tx_count, fw_qualifier, val; int ret; @@ -265,8 +264,9 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_DMA_DESTINATION_ADDR, dest_addr); snd_sof_dsp_write(sdev, ACP_DSP_BAR, ACP_SHA_MSG_LENGTH, image_length); - /* psp_send_cmd only required for vangogh platform (rev - 5) */ - if (desc->rev == 5 && !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { + /* psp_send_cmd only required for vangogh platform */ + if (adata->pci_rev == ACP_VANGOGH_PCI_ID && + !(adata->quirks && adata->quirks->skip_iram_dram_size_mod)) { /* Modify IRAM and DRAM size */ ret = psp_send_cmd(adata, MBOX_ACP_IRAM_DRAM_FENCE_COMMAND | IRAM_DRAM_FENCE_2); if (ret) @@ -285,8 +285,8 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - /* psp_send_cmd only required for renoir platform (rev - 3) */ - if (desc->rev == 3) { + /* psp_send_cmd only required for renoir platform*/ + if (adata->pci_rev == ACP_RN_PCI_ID) { ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); if (ret) return ret; From patchwork Thu Aug 8 16:57:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757963 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2078.outbound.protection.outlook.com [40.107.236.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4E981917C7; Thu, 8 Aug 2024 16:58:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136335; cv=fail; b=gCE4LwmxxIBAiDS+u5wCN1NBvVMbyJSR83hFOY7qlRvuFXC9H2TJ7kyHujEc39n2ZjYOx8L2ebZ2rYuDubWieVhmuRmBHgbOFhMw/B8CKHF00euMmTg7tJt+Gf/vHGwH4k/Noyvvd0jZGP1a7NPBu6ArzrblOJx7R462xgBskW0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136335; c=relaxed/simple; bh=ieV+xBrhkWPYSpApUkwfDqYXotPUkyJV9b3CxxMkmO0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mskqHMsmjBIni85WT4QQ+5iXhHzvw60+/SF98zXlU31+I3uYRjbuBfqI0/I47m5iWQw4qvxzmxtJ7OERs7zu5TQMkE1cOEzulrNl5kU1DY1ZzqDJvUM8JHZTJEn00R5tf1D0qMDHgNPuCzPX4kjQZAJeOIcHhB1MvT+o30F9nOE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=OCrpH4/A; arc=fail smtp.client-ip=40.107.236.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="OCrpH4/A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AjmS/UFaOceB5L6ZHCj6bHCvTxdlPI9ci6UePPxOih4V25mmXRCOX+49ebm6wJgPtxYfjt3CB9lfFPKIXX5uipAniJo6NQTmDLO6OHlZvJNmKCs0cgJ2It0BEHIV6p6sLRNhN82ybOWYg4bPpKpfzLZz24VsMpe6vMe86/U5uqcCs9NkzpAmj9nsxk2qgP4oad6MtG5yv+6NCLPFAdJ7k1wwLI8fro5eafU4cCEN2RVcs9RxPaR5x/kNZxCx/slZukuTqajyemxmwYF8eW3VIea9XB/bO+kX1iSc9uKRxdD+OV4xNFJH/ZNzGs68Zw9jGWEoYP3/QkYR20wisNmsXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sxkBInJSWtS/+2b8sbBeUAK9a3OMWSIdNo6kSvk5wFo=; b=u5+vkpNroakhWx/Wd2qOTowxrtrSpKIJwfR4XTHs0Lc11rzs9pTOn0IaMrjFiu17pkiun5WGA6XHcSHtiG1MjoJwNXbi4OjDO7QZoXAm0RM8LsMZNv2SdLnqzYnm8K36NSyHqKphUxi0pg3EAuppWOFSKWOn1O5JNt7NXgC1LCDUGtZWPB9tUtZec0A/wqgDlsnp11kCVLraR3LSG52rYQmmPYhmGngV1qFG2P6c0/t0pLibkSFbBS8tSartbcQ5/iYYAWcnFJAqrlf1Inv6ibc9Ns2QaOsG33NkHItCzJCy3Srs6VUMRbNd+klZjSYuri4cCAj3x1IgOHFvveV60g== 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 (0) 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=sxkBInJSWtS/+2b8sbBeUAK9a3OMWSIdNo6kSvk5wFo=; b=OCrpH4/ASmQAHPAJY8tTmPW610YCulAdKtYqVRlfdFZoxFUyojoyK9u2HQXQb1mK0MTTgOupu4fUFhyNvkDTSCnArIQB5sBz+r1j6qSvhI6gsdu3pQl+cY9QnQtK/ypqHUSW9w7YbZ35Q3i3AILHyej2k7Yp2FV0U3NgCcG7200= Received: from CH0PR03CA0403.namprd03.prod.outlook.com (2603:10b6:610:11b::13) by DM4PR12MB7574.namprd12.prod.outlook.com (2603:10b6:8:10e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.27; Thu, 8 Aug 2024 16:58:50 +0000 Received: from CH1PEPF0000AD80.namprd04.prod.outlook.com (2603:10b6:610:11b:cafe::58) by CH0PR03CA0403.outlook.office365.com (2603:10b6:610:11b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.30 via Frontend Transport; Thu, 8 Aug 2024 16:58:50 +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 CH1PEPF0000AD80.mail.protection.outlook.com (10.167.244.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:49 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:43 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 7/8] ASoC: SOF: amd: remove unused variable from sof_amd_acp_desc structure Date: Thu, 8 Aug 2024 22:27:52 +0530 Message-ID: <20240808165753.3414464-8-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD80:EE_|DM4PR12MB7574:EE_ X-MS-Office365-Filtering-Correlation-Id: b2344d57-62ec-45b3-01b2-08dcb7cb6010 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: PW49MkeFRxOCZsl+rYLoWMTS0J+jxm2NvqJPsBRIq7zwz/kB1PpTlEOSorM++T9Pivs/NJmUFq3DGu9EcryXti4fvAcQj09r+TgN04LxBBIpGa9J9igq3oTXVkUC2UtB11ev/e1tjUmisaADYoqc1MtP/QOz+fyzNgkojbELp3gtPgrMNQfV9NV+CEDRpAUphCPae8BNLJtVUzNoFiTwF+cyfTm54/2YUYX48m18dFQgV5WcgJchxOCmvC+nfTWwsx4WlWZCvSvl78qB5oWnWRhb6eZCx/aipFCkfDbvI2TEzb6yA668OxUoE3FcgeaU1hstmAKoW2+DTLN+AXuRpJUgwKaMX56eSvjiWIifL/CA1bHEHhU3jYGsyxwKV39zQrfwF18cWTDnaC0p++URb7Giu+Q/747xWVX6fc8UV9Nss80ROSOX5lAEiM94mn8d/8ubq2AE1XkDc+akttjysaDvkdXHflhN3djrrbcgzm7zrgY1MNHKt86FhnmNNq3Yku1pQQdxJNwSrUYxrhA3JVUYwt7VBlffYPrvMHa6zbofyNUKc284FBJzICgOpqmNnjLukVozRjTPhUmuTAEntVSD2DVj68uQz2nC+g7/T52XwIHed8f1PnK2Yqb2/ZsnkU9FelfYb+rbXe8cjbOLDoeMAJhzZYu7waEEIcODYC/NupNpnJgGl0+aMNyuV4uACUAeUY8RQKyi/zQhSYs1KTVEDz6Zj3trTPxzuxvGYYksmFpnAe7el3XC8Y8jStUE+no3vYmLasqq+ryyXzInD5k1KB8PyhlVaAEh1g7eTaEE+Dp98IYQz9krAO8dG7FfLtMOk3XbI4uj7l8+mT4L5GPw6jZIGL3/LFt2LCFasqEJX2nPhCa3q98vZUg2JNOww4BrLJlNPZw65YMtWV0KfteyGTb9gtsC/vcyyMYhwbLhLVIejsDQaEnkFd6lKgsR5vArj4lI5hS06mFob067evqi/nb/oDod3SY6vz7tPevhW3akZznyAx7Yi3DgMX9BlSP2WYeRUl7kEN4jEQjTQsLK4hFfKoFQeXW8/BnAMiiHjgInfyzduVebwFEFJMoK2bOwjGG3sbs9Y20LBTDDdASzA/TUYRgE9+LsDGjKXsoPD7/uBN49hO0Qc2hbxxe2804X6jp6ubjmKL8fcU//4MoKSldw05CfY1Nvmm9hLa9nCHRHxYJpEwWdOa9lPCRNLxjhnsd95jMCPF1J/UI2e/REdU74DnmitaoQtnRF6lB9CMUBjSb7eCRyZsrSQgBr5j2uIw+zi58WwmNlPyEZpSegETVBkj2Ku/kEjB2r5nddLdhqY98BQPuxmjig6GbSrulJmVmlZvDCuvG3TiR3AI/k0MY9eWsKA8ScYbY+vZ4oA/xv1TBw6iUra/EhahXOhb/e1sgCJiIoq0ZrRolrhZkSfqEk2s6a9dFG1TUt5jHDjvgVIXg18husdSvK3o33 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:(13230040)(36860700013)(7416014)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:49.6736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2344d57-62ec-45b3-01b2-08dcb7cb6010 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: CH1PEPF0000AD80.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7574 Remove unused structure member 'rev' from sof_amd_acp_desc structure. Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/sof/amd/acp.h | 1 - sound/soc/sof/amd/pci-acp63.c | 1 - sound/soc/sof/amd/pci-rmb.c | 1 - sound/soc/sof/amd/pci-rn.c | 1 - sound/soc/sof/amd/pci-vangogh.c | 1 - 5 files changed, 5 deletions(-) diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h index 321c40cc6d50..11def07efc0f 100644 --- a/sound/soc/sof/amd/acp.h +++ b/sound/soc/sof/amd/acp.h @@ -190,7 +190,6 @@ struct acp_dsp_stream { }; struct sof_amd_acp_desc { - unsigned int rev; const char *name; unsigned int host_bridge_id; u32 pgfsm_base; diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c index e90658ba2bd7..b54ed61b79ed 100644 --- a/sound/soc/sof/amd/pci-acp63.c +++ b/sound/soc/sof/amd/pci-acp63.c @@ -28,7 +28,6 @@ #define ACP6x_REG_END 0x125C000 static const struct sof_amd_acp_desc acp63_chip_info = { - .rev = 6, .host_bridge_id = HOST_BRIDGE_ACP63, .pgfsm_base = ACP6X_PGFSM_BASE, .ext_intr_enb = ACP6X_EXTERNAL_INTR_ENB, diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c index a366f904e6f3..c45256bf4fda 100644 --- a/sound/soc/sof/amd/pci-rmb.c +++ b/sound/soc/sof/amd/pci-rmb.c @@ -28,7 +28,6 @@ #define ACP6X_FUTURE_REG_ACLK_0 0x1854 static const struct sof_amd_acp_desc rembrandt_chip_info = { - .rev = 6, .host_bridge_id = HOST_BRIDGE_RMB, .pgfsm_base = ACP6X_PGFSM_BASE, .ext_intr_stat = ACP6X_EXT_INTR_STAT, diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c index 2b7c53470ce8..386a0f1e7ee0 100644 --- a/sound/soc/sof/amd/pci-rn.c +++ b/sound/soc/sof/amd/pci-rn.c @@ -28,7 +28,6 @@ #define ACP3X_FUTURE_REG_ACLK_0 0x1860 static const struct sof_amd_acp_desc renoir_chip_info = { - .rev = 3, .host_bridge_id = HOST_BRIDGE_CZN, .pgfsm_base = ACP3X_PGFSM_BASE, .ext_intr_stat = ACP3X_EXT_INTR_STAT, diff --git a/sound/soc/sof/amd/pci-vangogh.c b/sound/soc/sof/amd/pci-vangogh.c index eba580840100..cb845f81795e 100644 --- a/sound/soc/sof/amd/pci-vangogh.c +++ b/sound/soc/sof/amd/pci-vangogh.c @@ -26,7 +26,6 @@ #define ACP5X_FUTURE_REG_ACLK_0 0x1864 static const struct sof_amd_acp_desc vangogh_chip_info = { - .rev = 5, .name = "vangogh", .host_bridge_id = HOST_BRIDGE_VGH, .pgfsm_base = ACP5X_PGFSM_BASE, From patchwork Thu Aug 8 16:57:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mukunda,Vijendar" X-Patchwork-Id: 13757964 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061.outbound.protection.outlook.com [40.107.94.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1B331922FD; Thu, 8 Aug 2024 16:58:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136341; cv=fail; b=ELObwFYNHBFptoh2x3rqwc3aWHzLBGmSkIqzbUFH7psov7bNCE9OrZde2l/yaZRPFal932gPL1KhrdtbzvFw4Sj9tW/Th+ZsM9IZO1tC61i0VHbQv8Og+256eWHYfGAPzPaS8wTLPthjJh1r9CWAfER2WRHlnNKG7mN3HFLpDmQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723136341; c=relaxed/simple; bh=QxszdzAXMtanwDxUmQhoRcJ8Iy1ocp7vJQhlv0/g38U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ChwRg9JtG4+VmtGHTbJSG6KJXEUknmUwMyYmAsB8b7wS1M3ipWZc0qI7ozFPwhIPafHPQ/KqAQkigXmgM2TNDB2kUsQ8acLi/epW251sVDakiulatfPYL0cZlpR1XRukXzSZ5a9UpdHRzQKYSR5QP50n+/hHbGZ+QJ4zGlQrmGA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=PASi9naL; arc=fail smtp.client-ip=40.107.94.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="PASi9naL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I9jesXCd/OAnw5Tb/v1WX3Hz3ftweFEglKlvI2gipJMbY9zsy1JJkEg2GWbt7ZBccXWkVlr8T1ZiQ8HR6WOM8WikKqsBufiFS+SZAtMOi5q8BXDJe+yTwzxC8wvzVFQxhYve+eb7ymLMLkYhRQ+5WXouUf7976PJdnomT6YKQn11U/LvQLj/oVbloJT75KLs/4BdKghvu6+b73vaXiHZy5pW0gt07FQB5ka8lXuezFibVXO38xuhrqEDo3bQFd0aRb0jv2OLUp+TD83i9HADcm6DuIVmY+2iWWhCPHzis5G4spX5oTJlf0YtqbH5Eu/2FdIoPGW3A4zD0hNN1uecfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=UBNfv35Z9aYp/a4IbdRFX7G0RUSMVnZLZzGXQqLX6hc=; b=owLgg+L38fRRozt6fa01f4HgX48zBlN1lKTU61F6k+eb3sYJcR+M+FHHjLDw8ByQjtKxJihcddHdmlPedvO3UtDi0QpWZ75ryln5DQrmjDZUenaFoHO9BP33DIFxZj1ImaLp5Au23LSUxxOl6vKk9MacxYnKt7/HE6nOy65D9WcUlworHMYU8o94vxkWznQtjDK2f4qgqkOHiUufSEXPQXdxThM+Ri4y7BU2bCGsggWC7VMyxwwAlANmScNBF7D4wjYMukZUqAi08Zr4RZrh1DD7vaJ7oJ4NmaHl2gOPPRSdW+F7yORFWiIb/d4+JYc21jRMJBKe8S6DBXD48gtBRw== 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 (0) 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=UBNfv35Z9aYp/a4IbdRFX7G0RUSMVnZLZzGXQqLX6hc=; b=PASi9naLVukdrDSW+TQ3pkJw1UGXT9UPnrx+8fIZBFD9doMQJU5UXWuzqRdfVwNewnu6zKBQ6EIJlk8uu8th/yo8vdysAd5z7WS3WvfHM3LrXWMkxlKl0WT7cVsaMB+OdxL7WU0HLmRG6VbhuI186w3vIlTh9ZyS7CbRD10KyBY= Received: from CY5PR19CA0052.namprd19.prod.outlook.com (2603:10b6:930:1a::17) by PH0PR12MB5631.namprd12.prod.outlook.com (2603:10b6:510:144::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.22; Thu, 8 Aug 2024 16:58:54 +0000 Received: from CH1PEPF0000AD82.namprd04.prod.outlook.com (2603:10b6:930:1a:cafe::c6) by CY5PR19CA0052.outlook.office365.com (2603:10b6:930:1a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15 via Frontend Transport; Thu, 8 Aug 2024 16:58:54 +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 CH1PEPF0000AD82.mail.protection.outlook.com (10.167.244.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7849.8 via Frontend Transport; Thu, 8 Aug 2024 16:58:54 +0000 Received: from vijendar-X570-GAMING-X.amd.com (10.180.168.240) 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.39; Thu, 8 Aug 2024 11:58:48 -0500 From: Vijendar Mukunda To: CC: , , , , , , , , , , , , , , , , Vijendar Mukunda Subject: [PATCH RESEND 8/8] ASoC: amd: acp: Convert comma to semicolon Date: Thu, 8 Aug 2024 22:27:53 +0530 Message-ID: <20240808165753.3414464-9-Vijendar.Mukunda@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> References: <20240808165753.3414464-1-Vijendar.Mukunda@amd.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000AD82:EE_|PH0PR12MB5631:EE_ X-MS-Office365-Filtering-Correlation-Id: 6aaa1210-e87e-4d39-dfa8-08dcb7cb62c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: LUo2iKPYpf9PrHo19/aMjymkQkT9Q6+peoswE2IJ8fg4M8V4eDQerq0MltChvsY+hdoJDtWYxXKlOpSEj7r7Hi+t1CGFU1lVP4//yY2ajkMZDwjgiL/0yBV2wx+FcG5GzEmGz67jDCzALcrhl2ZKlBphD7aIsUOHwJDLOc4T79CL5lAPyBhd0sQbKlq1KKsW0kkOYsGvNTZuCpSxTx9vlcLF+zvNVylYIE5HZefjOU6Q0If1niaOdFCJTXiIvFJjpgCyg4LtXK9W9jk67istrThBguyy+XTfaitYqRwf6VQWe/6NoUuh8AImEeudQPjvtN4pszj6/ZM16XrbxpyoAD766OMn8i1svjDFkDo+5pI7BeoBjszPn9N0mt/aT4SELe+xHVcULitygYZmLTkK2ipIucHx4oA1DY9lEDi7VOcFy6UK2Z1ziLgWWe2zkf3MCnx04sTR1oTINUQdFBC/V5SCAg7yhzKJPq6zrFAhksh/wHfNELSStw7C9trQa/Y/KCExcOyx3KJOPav2liWohM8Wrcd7xqOtrAn/p5MW07e3E7O1M1yu4lv76qA86SiPsyg/39vI8EQPN/YyJnfW080hwGb4DkvjVRjONtVDzBGm+jmrWayxrSkIt62hwxO/kSAbEIQAHdUQwzDqB+BEL9R8ZqewIwh5sl85IUrFqdxgXi09fbOjiaMmbvIQFG4BGU3FWowjmlaWRVvtXjHWI4RebYxWDF8TWx2G04UcGayEPvwT38msZjbS4S1KKjFK/1VErZLUWv0MYFt7wMRM4oT6RYlblzTG9VJqho08/9OMdMhoreZNmXCN3fNXlj878dj2zv6BcCJpxiwmOjFHCvTyQ+cZxwfjvJ0h485ohpYuCsN28+8cvYq0HvOLETW0Y/4UQfeV0QPvM3YdHOnVBMsp16K0c8m21BUdXTQaG3/FzM6isgWJ2cp3Nd/2OMv3KNOV9nJ5sR3rAsmqhc6t4HODWe8FhcFOV3ifk/WQj+/pZzwe2qqVT3SKTLpD0AOKWLEumcgckRcYHRgrMW7xR9pk9gezyyeUb6XaMsOzSZA7RIV5xFheEge7K+ti53zNL2QoZVZ9Zfjh063tZ64S1Y5SzP0n9P4CNj+tgZOA2mybyXiUrxQ9h5NDzX/hMqYDW0921y7YPRyep9KZTZyVaWrmHzpUgKgVMGjh4cdRbfbAo6evLGXtD7LWIKcCjNhx+5GHQxczmulbn2Gm8mJou8QLVKoNahV05F6wroSgGMoKBtzi7L6JxJXS7KQxduiS3W4l5DitNP1dSGZNiVGWJCKI85/oTFnEYHSMKbnxcQ0VJ5/lZxPE8QQFcZT209+JSxLRWMXEz7uTuRbXFhLFTHiiK0XzKbMrsKUN/XzcgEk3/DGq+AUX/hJ2BGOntbczzy4LvgLJaa1GWEaKLyfks76JXHQHdr4bjsW1dl7eHXWUmTx0bM5E98ZJowKM1KxN 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:(13230040)(36860700013)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2024 16:58:54.2406 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6aaa1210-e87e-4d39-dfa8-08dcb7cb62c8 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: CH1PEPF0000AD82.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB5631 Replace a comma between expression statements by a semicolon. Signed-off-by: Vijendar Mukunda Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart --- sound/soc/amd/acp/acp-sdw-sof-mach.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c index 3419675e45a9..0995b40d15f3 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -657,9 +657,9 @@ static int mc_probe(struct platform_device *pdev) ctx->private = amd_ctx; card = &ctx->card; card->dev = &pdev->dev; - card->name = "amd-soundwire", - card->owner = THIS_MODULE, - card->late_probe = asoc_sdw_card_late_probe, + card->name = "amd-soundwire"; + card->owner = THIS_MODULE; + card->late_probe = asoc_sdw_card_late_probe; snd_soc_card_set_drvdata(card, ctx);