From patchwork Wed Nov 3 00:07:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1550057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=eG0h6+bS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkRtW6nP5z9sRN for ; Wed, 3 Nov 2021 11:08:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mi3oo-0004PB-W5; Wed, 03 Nov 2021 00:07:55 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mi3oe-0004DW-JS for kernel-team@lists.ubuntu.com; Wed, 03 Nov 2021 00:07:44 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2F9C93F1A7 for ; Wed, 3 Nov 2021 00:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1635898064; bh=x4HRTga6b9vU5LrB5cxBKS4Mkya0aMB2sBemir5h7kU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eG0h6+bSuhz9LICkcKGDwIQmUq817NfGHK7bbNthB/MpU3wwscg2eCADTj52Kp5DB qu6gVVLDl8iEUUA1CQ5W90NIK1TwLT/56wnFlz+56ofZk4+NDDdgox6AYSuS3q2NHY LP4MCXbkT32j72if71QyXhRbzeUIC5TWuhSv78b4OyhhrA2qgLW7yomfiFXcSddJRC kMqdNgwdXjsgLVDzWg1DRdpLC5EGC24c+D46HJeRISudwfbf54zrQn4IBuqLbBylQE NdXtrhukgUY3MisHsEN3RCst3NN1lO8uyyFi7axUXrlqQLj0mcROD8TsU7/M7Whv4A Rtt2dG4jAAQbg== Received: by mail-pf1-f198.google.com with SMTP id s22-20020a056a0008d600b00480fea2e96cso392795pfu.7 for ; Tue, 02 Nov 2021 17:07:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x4HRTga6b9vU5LrB5cxBKS4Mkya0aMB2sBemir5h7kU=; b=tk+1BuIjFpwXij+nivrE933NF4d3d/hrOKRSWv6A3/zYTRdR6uoI84AQUdwxzbZU1F jrhsNYTVgSuL0Z0/Kb2wfs/+E2BYwtPo232T3L52BrlxMHHlAfVjUOvcavyop9bWOcwm pchISyaCdzwxYUhDuiNpPFX07BnjrOBafVmXeexRaCEwS+FqeJM5l95W2yh/EOX/HqMf 4XAuOOgZMPMY7ciJJUX4NGUTfQwzyCbMmKsUwNplwiblLtQxCXZkx3zeRjFP4+qkPnpw HO+jxajh5UPUuREUspjqZCFv3n3LFSgfRJc45RiOfFrH/3e6CQRYqc8zJLPiBHeE6wpI 1z7g== X-Gm-Message-State: AOAM533LPN1cz+zhvMmgTlhf8p14d0C61KazWqv41siZZiImIeDwqL7z CPYvHyweKPS/EGWf7lPe+1RpZnkKZ/8jIQuZ2VSns5Dhi7BAHzNmcUIGjV83gF3+an2O6Shw375 Bb2THgu06H/AoUTCWZEMZaH45w0+3c437ogQTT6ek4g== X-Received: by 2002:a17:90b:3ec8:: with SMTP id rm8mr10875150pjb.100.1635898062353; Tue, 02 Nov 2021 17:07:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxm5zPVyHlemhGBJuXAOU8XEIdc7w9u3y51TAOn/TLNH14L1BnakqMq1jKjOPIuLpFDPVJtog== X-Received: by 2002:a17:90b:3ec8:: with SMTP id rm8mr10875118pjb.100.1635898061963; Tue, 02 Nov 2021 17:07:41 -0700 (PDT) Received: from canonical.com (node-1w7jr9yebujeq5th4a1ypmek0.ipv6.telus.net. [2001:56a:78ed:fb00::430]) by smtp.gmail.com with ESMTPSA id gn1sm187830pjb.34.2021.11.02.17.07.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 17:07:41 -0700 (PDT) From: Alex Hung To: kernel-team@lists.ubuntu.com Subject: [PATCH 02/14][SRU][OEM-5.14] ASoC: amd: add Yellow Carp ACP PCI driver Date: Tue, 2 Nov 2021 18:07:26 -0600 Message-Id: <20211103000738.267442-3-alex.hung@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103000738.267442-1-alex.hung@canonical.com> References: <20211103000738.267442-1-alex.hung@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Vijendar Mukunda BugLink: https://bugs.launchpad.net/bugs/1949245 ACP is a PCI audio device. This patch adds PCI driver to bind to this device and get PCI resources. Signed-off-by: Vijendar Mukunda Link: https://lore.kernel.org/r/20211018112044.1705805-3-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown (cherry picked from commit c62442bd5d9f86575d74c77b891ef0df9e3cb6dd linux-next) Signed-off-by: Alex Hung --- sound/soc/amd/yc/acp6x.h | 21 +++++++++++ sound/soc/amd/yc/pci-acp6x.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 sound/soc/amd/yc/acp6x.h create mode 100644 sound/soc/amd/yc/pci-acp6x.c diff --git a/sound/soc/amd/yc/acp6x.h b/sound/soc/amd/yc/acp6x.h new file mode 100644 index 0000000..62a05db --- /dev/null +++ b/sound/soc/amd/yc/acp6x.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * AMD ALSA SoC PDM Driver + * + * Copyright (C) 2021 Advanced Micro Devices, Inc. All rights reserved. + */ + +#include "acp6x_chip_offset_byte.h" + +#define ACP_DEVICE_ID 0x15E2 +#define ACP6x_PHY_BASE_ADDRESS 0x1240000 + +static inline u32 acp6x_readl(void __iomem *base_addr) +{ + return readl(base_addr - ACP6x_PHY_BASE_ADDRESS); +} + +static inline void acp6x_writel(u32 val, void __iomem *base_addr) +{ + writel(val, base_addr - ACP6x_PHY_BASE_ADDRESS); +} diff --git a/sound/soc/amd/yc/pci-acp6x.c b/sound/soc/amd/yc/pci-acp6x.c new file mode 100644 index 0000000..5c11832 --- /dev/null +++ b/sound/soc/amd/yc/pci-acp6x.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * AMD Yellow Carp ACP PCI Driver + * + * Copyright 2021 Advanced Micro Devices, Inc. + */ + +#include +#include +#include + +#include "acp6x.h" + +struct acp6x_dev_data { + void __iomem *acp6x_base; +}; + +static int snd_acp6x_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + struct acp6x_dev_data *adata; + int ret; + u32 addr; + + /* Yellow Carp device check */ + if (pci->revision != 0x60) + return -ENODEV; + + if (pci_enable_device(pci)) { + dev_err(&pci->dev, "pci_enable_device failed\n"); + return -ENODEV; + } + + ret = pci_request_regions(pci, "AMD ACP3x audio"); + if (ret < 0) { + dev_err(&pci->dev, "pci_request_regions failed\n"); + goto disable_pci; + } + + adata = devm_kzalloc(&pci->dev, sizeof(struct acp6x_dev_data), + GFP_KERNEL); + if (!adata) { + ret = -ENOMEM; + goto release_regions; + } + + addr = pci_resource_start(pci, 0); + adata->acp6x_base = devm_ioremap(&pci->dev, addr, + pci_resource_len(pci, 0)); + if (!adata->acp6x_base) { + ret = -ENOMEM; + goto release_regions; + } + pci_set_master(pci); + pci_set_drvdata(pci, adata); + return 0; +release_regions: + pci_release_regions(pci); +disable_pci: + pci_disable_device(pci); + + return ret; +} + +static void snd_acp6x_remove(struct pci_dev *pci) +{ + pci_release_regions(pci); + pci_disable_device(pci); +} + +static const struct pci_device_id snd_acp6x_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_AMD, ACP_DEVICE_ID), + .class = PCI_CLASS_MULTIMEDIA_OTHER << 8, + .class_mask = 0xffffff }, + { 0, }, +}; +MODULE_DEVICE_TABLE(pci, snd_acp6x_ids); + +static struct pci_driver yc_acp6x_driver = { + .name = KBUILD_MODNAME, + .id_table = snd_acp6x_ids, + .probe = snd_acp6x_probe, + .remove = snd_acp6x_remove, +}; + +module_pci_driver(yc_acp6x_driver); + +MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); +MODULE_DESCRIPTION("AMD ACP Yellow Carp PCI driver"); +MODULE_LICENSE("GPL v2");