From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD3BCC433EF for ; Thu, 13 Jan 2022 16:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236793AbiAMQf4 (ORCPT ); Thu, 13 Jan 2022 11:35:56 -0500 Received: from mail-bn8nam11on2078.outbound.protection.outlook.com ([40.107.236.78]:37917 "EHLO NAM11-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236806AbiAMQfv (ORCPT ); Thu, 13 Jan 2022 11:35:51 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kRlkvRX+7CCRov8v7NSVmp0qOEFSESkeX9u+/6rgxv69IPME1Djvl9xXLT9gYkJ0YQyGOB5cRWTI0CzMl3zP6ybBLXbun8PYrMIizIV+hGA2dSgOnUKpFKkqOgYPtwP7pqiM+9x9mC6JOBgZ8+6ltbD8tB8SFvqbiAnC1YBkzA6kg7ojTzKM9p2kWj1ktGcsA7+Aj+/hHmYOkjdCJIU2UmXac3gni6tJcFehlxdXpqUeaMcw1va6iMkdRDSdMG4DOR9etWfaRScu95t7rksqyqYhHbl3Cwvmv08KsN6nqPymAFdgd1Pw7iKjNLDRfoKEECYFsFMio2AlxcCXM4+Q5A== 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=RMthq7As3IApvnsSwEpDVZShNtIoE5+Th3bp3BWlFsw=; b=jLjVJ34NaMfZgoMCF/SmU7iXrqZKru6YlKbjMO0NwOnnhZSexl2RuptTuiObmRWw5deNZfeWZw464aqHkm6skZhBKbltPAZ0OzttPhgQHXfQ26mDkCrKW9aJGDMFQwaZLWzWTCFJlUcwTv4Bp58iF0YoUbAGOC5QHajMIfjcHqnDmr9QHvjH4f/CMHA76bGeatTYR6ygUAhJ8dEFD7JaQhqqORc+p70seJStrcnYkahY4VAqOYIhpZdXgfur1nYeb08tT9LQEbV6ZSpob1CG+uy2pxDJcM7q0LkgVGZpL9MinNNN+77b5ofHTq3ifqlj5VqIDZhpOhpMmNpRA9cwLA== 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=RMthq7As3IApvnsSwEpDVZShNtIoE5+Th3bp3BWlFsw=; b=uE678U5FaESVY/j87WyKVTjIDl724nBj6dpY320g0DSj1Cy81tlNKejvoMlvsqxoD8jHTzM57J5yjkSGIB3oY3hXBGqOmhoaH0hvp/hENPdBtFGltdZ4hjPOkb3VICYzDhptAV/jTipFHVv/HLaeAaA8SUQTiLT1QSC8gmXs7HE= Received: from MW4PR03CA0292.namprd03.prod.outlook.com (2603:10b6:303:b5::27) by BYAPR12MB2679.namprd12.prod.outlook.com (2603:10b6:a03:72::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Thu, 13 Jan 2022 16:35:47 +0000 Received: from CO1NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::39) by MW4PR03CA0292.outlook.office365.com (2603:10b6:303:b5::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10 via Frontend Transport; Thu, 13 Jan 2022 16:35:47 +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=SATLEXMB03.amd.com; Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT052.mail.protection.outlook.com (10.13.174.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4888.9 via Frontend Transport; Thu, 13 Jan 2022 16:35:47 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 13 Jan 2022 10:35:46 -0600 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.2375.17; Thu, 13 Jan 2022 10:35:45 -0600 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Thu, 13 Jan 2022 10:35:42 -0600 From: Ajit Kumar Pandey To: , CC: , , , , "Ajit Kumar Pandey" , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Mark Pearson , Mario Limonciello , Pierre-Louis Bossart , open list Subject: [PATCH v2 6/6] ASoC: amd: renoir: Add check for acp configuration flags. Date: Thu, 13 Jan 2022 22:03:48 +0530 Message-ID: <20220113163348.434108-7-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113163348.434108-1-AjitKumar.Pandey@amd.com> References: <20220113163348.434108-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5a4568a-2141-4ff0-612a-08d9d6b2c08c X-MS-TrafficTypeDiagnostic: BYAPR12MB2679:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tw6ArkgHRVw6B7Z5rILIcqpDHWQhahFUNxIEgEifo6B+y8C1272k1vSoVJ5dPG3+j2zgiP1KswaRM4qTE5/7lJSJ34RodKtkw0VkIcOpPgruRlxNTPqdrsnKDsOhaqc6XpR90qO3pWXbi24OcbqqszJqvKlVS9LClZjSmZzBCcnbeQaPOmyo1X+fi76KbrNK9zJNOUytubmOJfOVHHXD8K6+Ptfb+5iHvb/Ie8xaKVJ1BMqrMkk9ATshjCX6B9c9l0eTt9Mp/Vq8rSComXMajS3YzF101pFJ/Fgx5BROVkoqYaIGDazB+2J87yP0mYLOUX/RKIDaDIpQT54QSr12KN0UXR+NiJCA2Yi5gQed28cG/8/sFq2HvtoihPM1+PYutUZNR+BhR6QTiTqg8SG8cNdlONa6cCq8Ubpb/vTuxJDV4tS8MCiF9tSGQI9BVjWJV+DnuPFZk9nrOieuEvJQPlrWMhU0fvA+G9Ch8xqYJtFv96qR43E/bn0QZ9Mz8IR0iLWQfBoTr9fen2Xf7xs3GLbb37IpcB1I4NQ2CRahkdf9218SCXSRPR333w60Dj/TQ7R4PWlMrBn4V6D60+BTHL5lcTCEjce+0Qhe3glmtDSKavs93VDLO7otW/7et6QFFuIxKT8D1H3q6ab1hoeciKq/jjPmRcC5tdqlpQ6ElOQc633rqCRRKxEX8kitY9NqiHqVMjNziExYJqFr3pyRp/TLnsSRPm3tmvJbiSIDTjqR4sPmWd3zduWNpK7XzYMf6BCLPcdiO6ZbtlcOFfh4qOGxrPzyY4DcZHQOPHirBPs= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700002)(508600001)(70586007)(70206006)(86362001)(8676002)(7696005)(2906002)(4326008)(83380400001)(36860700001)(2616005)(336012)(47076005)(426003)(40460700001)(36756003)(81166007)(82310400004)(186003)(26005)(54906003)(316002)(5660300002)(8936002)(1076003)(110136005)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 16:35:47.0865 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5a4568a-2141-4ff0-612a-08d9d6b2c08c 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2679 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have SOF and generic ACP support enabled for Renoir platforms on some machines. Since we have same PCI id used for probing, add check for machine configuration flag to avoid conflict with newer pci drivers. Such machine flag has been initialized via dmi match on few Chrome machines. If no flag is specified probe and register older platform device. Signed-off-by: Ajit Kumar Pandey --- sound/soc/amd/renoir/rn-pci-acp3x.c | 7 ++++++- sound/soc/amd/renoir/rn_acp3x.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c index 7b8040e812a1..b3812b70f5f9 100644 --- a/sound/soc/amd/renoir/rn-pci-acp3x.c +++ b/sound/soc/amd/renoir/rn-pci-acp3x.c @@ -212,10 +212,15 @@ static int snd_rn_acp_probe(struct pci_dev *pci, acpi_integer dmic_status; #endif const struct dmi_system_id *dmi_id; - unsigned int irqflags; + unsigned int irqflags, flag; int ret, index; u32 addr; + /* Return if acp config flag is defined */ + flag = snd_amd_acp_find_config(pci); + if (flag) + return -ENODEV; + /* Renoir device check */ if (pci->revision != 0x01) return -ENODEV; diff --git a/sound/soc/amd/renoir/rn_acp3x.h b/sound/soc/amd/renoir/rn_acp3x.h index 14620399d766..ca586603d720 100644 --- a/sound/soc/amd/renoir/rn_acp3x.h +++ b/sound/soc/amd/renoir/rn_acp3x.h @@ -88,3 +88,6 @@ static inline void rn_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP_PHY_BASE_ADDRESS); } + +/* Machine configuration */ +int snd_amd_acp_find_config(struct pci_dev *pci); -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 9419AC433EF for ; Thu, 13 Jan 2022 16:37:24 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CD45C1FE7; Thu, 13 Jan 2022 17:36:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD45C1FE7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1642091842; bh=xNr9Uwot3B4ZCiOQ3YlgQ6ktffPcXuoKWFJkNUUkniE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=s4UEyPEp3p4Gk4kpnz4dNVK9C5Mw99qQTyZTx54xogHzLyB1mGGMsYASoxb1zDHFg whUaDZhrSJkn4vGLFn0JDMJNWiggxp+MWl4bpWAKtmrWoEzywYhL/d6Ap9u1UxuE17 UTqLe1F43/PsB443YUlLRTG45EFKylL8IMGF4EfI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9F5AFF8051E; Thu, 13 Jan 2022 17:35:59 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 090C9F80524; Thu, 13 Jan 2022 17:35:59 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2053.outbound.protection.outlook.com [40.107.243.53]) (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 97D8CF80520 for ; Thu, 13 Jan 2022 17:35:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 97D8CF80520 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="uE678U5F" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kRlkvRX+7CCRov8v7NSVmp0qOEFSESkeX9u+/6rgxv69IPME1Djvl9xXLT9gYkJ0YQyGOB5cRWTI0CzMl3zP6ybBLXbun8PYrMIizIV+hGA2dSgOnUKpFKkqOgYPtwP7pqiM+9x9mC6JOBgZ8+6ltbD8tB8SFvqbiAnC1YBkzA6kg7ojTzKM9p2kWj1ktGcsA7+Aj+/hHmYOkjdCJIU2UmXac3gni6tJcFehlxdXpqUeaMcw1va6iMkdRDSdMG4DOR9etWfaRScu95t7rksqyqYhHbl3Cwvmv08KsN6nqPymAFdgd1Pw7iKjNLDRfoKEECYFsFMio2AlxcCXM4+Q5A== 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=RMthq7As3IApvnsSwEpDVZShNtIoE5+Th3bp3BWlFsw=; b=jLjVJ34NaMfZgoMCF/SmU7iXrqZKru6YlKbjMO0NwOnnhZSexl2RuptTuiObmRWw5deNZfeWZw464aqHkm6skZhBKbltPAZ0OzttPhgQHXfQ26mDkCrKW9aJGDMFQwaZLWzWTCFJlUcwTv4Bp58iF0YoUbAGOC5QHajMIfjcHqnDmr9QHvjH4f/CMHA76bGeatTYR6ygUAhJ8dEFD7JaQhqqORc+p70seJStrcnYkahY4VAqOYIhpZdXgfur1nYeb08tT9LQEbV6ZSpob1CG+uy2pxDJcM7q0LkgVGZpL9MinNNN+77b5ofHTq3ifqlj5VqIDZhpOhpMmNpRA9cwLA== 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=RMthq7As3IApvnsSwEpDVZShNtIoE5+Th3bp3BWlFsw=; b=uE678U5FaESVY/j87WyKVTjIDl724nBj6dpY320g0DSj1Cy81tlNKejvoMlvsqxoD8jHTzM57J5yjkSGIB3oY3hXBGqOmhoaH0hvp/hENPdBtFGltdZ4hjPOkb3VICYzDhptAV/jTipFHVv/HLaeAaA8SUQTiLT1QSC8gmXs7HE= Received: from MW4PR03CA0292.namprd03.prod.outlook.com (2603:10b6:303:b5::27) by BYAPR12MB2679.namprd12.prod.outlook.com (2603:10b6:a03:72::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Thu, 13 Jan 2022 16:35:47 +0000 Received: from CO1NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::39) by MW4PR03CA0292.outlook.office365.com (2603:10b6:303:b5::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10 via Frontend Transport; Thu, 13 Jan 2022 16:35:47 +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=SATLEXMB03.amd.com; Received: from SATLEXMB03.amd.com (165.204.84.17) by CO1NAM11FT052.mail.protection.outlook.com (10.13.174.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4888.9 via Frontend Transport; Thu, 13 Jan 2022 16:35:47 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Thu, 13 Jan 2022 10:35:46 -0600 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.2375.17; Thu, 13 Jan 2022 10:35:45 -0600 Received: from chrome.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Thu, 13 Jan 2022 10:35:42 -0600 From: Ajit Kumar Pandey To: , Subject: [PATCH v2 6/6] ASoC: amd: renoir: Add check for acp configuration flags. Date: Thu, 13 Jan 2022 22:03:48 +0530 Message-ID: <20220113163348.434108-7-AjitKumar.Pandey@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220113163348.434108-1-AjitKumar.Pandey@amd.com> References: <20220113163348.434108-1-AjitKumar.Pandey@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5a4568a-2141-4ff0-612a-08d9d6b2c08c X-MS-TrafficTypeDiagnostic: BYAPR12MB2679:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tw6ArkgHRVw6B7Z5rILIcqpDHWQhahFUNxIEgEifo6B+y8C1272k1vSoVJ5dPG3+j2zgiP1KswaRM4qTE5/7lJSJ34RodKtkw0VkIcOpPgruRlxNTPqdrsnKDsOhaqc6XpR90qO3pWXbi24OcbqqszJqvKlVS9LClZjSmZzBCcnbeQaPOmyo1X+fi76KbrNK9zJNOUytubmOJfOVHHXD8K6+Ptfb+5iHvb/Ie8xaKVJ1BMqrMkk9ATshjCX6B9c9l0eTt9Mp/Vq8rSComXMajS3YzF101pFJ/Fgx5BROVkoqYaIGDazB+2J87yP0mYLOUX/RKIDaDIpQT54QSr12KN0UXR+NiJCA2Yi5gQed28cG/8/sFq2HvtoihPM1+PYutUZNR+BhR6QTiTqg8SG8cNdlONa6cCq8Ubpb/vTuxJDV4tS8MCiF9tSGQI9BVjWJV+DnuPFZk9nrOieuEvJQPlrWMhU0fvA+G9Ch8xqYJtFv96qR43E/bn0QZ9Mz8IR0iLWQfBoTr9fen2Xf7xs3GLbb37IpcB1I4NQ2CRahkdf9218SCXSRPR333w60Dj/TQ7R4PWlMrBn4V6D60+BTHL5lcTCEjce+0Qhe3glmtDSKavs93VDLO7otW/7et6QFFuIxKT8D1H3q6ab1hoeciKq/jjPmRcC5tdqlpQ6ElOQc633rqCRRKxEX8kitY9NqiHqVMjNziExYJqFr3pyRp/TLnsSRPm3tmvJbiSIDTjqR4sPmWd3zduWNpK7XzYMf6BCLPcdiO6ZbtlcOFfh4qOGxrPzyY4DcZHQOPHirBPs= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB03.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(40470700002)(508600001)(70586007)(70206006)(86362001)(8676002)(7696005)(2906002)(4326008)(83380400001)(36860700001)(2616005)(336012)(47076005)(426003)(40460700001)(36756003)(81166007)(82310400004)(186003)(26005)(54906003)(316002)(5660300002)(8936002)(1076003)(110136005)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 16:35:47.0865 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5a4568a-2141-4ff0-612a-08d9d6b2c08c 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2679 Cc: Pierre-Louis Bossart , Sunil-kumar.Dommati@amd.com, Ajit Kumar Pandey , open list , Basavaraj.Hiregoudar@amd.com, Takashi Iwai , Liam Girdwood , Mario Limonciello , Vijendar.Mukunda@amd.com, Alexander.Deucher@amd.com, Mark Pearson X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" We have SOF and generic ACP support enabled for Renoir platforms on some machines. Since we have same PCI id used for probing, add check for machine configuration flag to avoid conflict with newer pci drivers. Such machine flag has been initialized via dmi match on few Chrome machines. If no flag is specified probe and register older platform device. Signed-off-by: Ajit Kumar Pandey --- sound/soc/amd/renoir/rn-pci-acp3x.c | 7 ++++++- sound/soc/amd/renoir/rn_acp3x.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c index 7b8040e812a1..b3812b70f5f9 100644 --- a/sound/soc/amd/renoir/rn-pci-acp3x.c +++ b/sound/soc/amd/renoir/rn-pci-acp3x.c @@ -212,10 +212,15 @@ static int snd_rn_acp_probe(struct pci_dev *pci, acpi_integer dmic_status; #endif const struct dmi_system_id *dmi_id; - unsigned int irqflags; + unsigned int irqflags, flag; int ret, index; u32 addr; + /* Return if acp config flag is defined */ + flag = snd_amd_acp_find_config(pci); + if (flag) + return -ENODEV; + /* Renoir device check */ if (pci->revision != 0x01) return -ENODEV; diff --git a/sound/soc/amd/renoir/rn_acp3x.h b/sound/soc/amd/renoir/rn_acp3x.h index 14620399d766..ca586603d720 100644 --- a/sound/soc/amd/renoir/rn_acp3x.h +++ b/sound/soc/amd/renoir/rn_acp3x.h @@ -88,3 +88,6 @@ static inline void rn_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP_PHY_BASE_ADDRESS); } + +/* Machine configuration */ +int snd_amd_acp_find_config(struct pci_dev *pci); -- 2.25.1