From nobody Thu Dec 18 00:47:05 2025 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 3C5EBC83F18 for ; Tue, 29 Aug 2023 22:02:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238942AbjH2WBy (ORCPT ); Tue, 29 Aug 2023 18:01:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238638AbjH2WBd (ORCPT ); Tue, 29 Aug 2023 18:01:33 -0400 Received: from mail.mutex.one (mail.mutex.one [62.77.152.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA601122 for ; Tue, 29 Aug 2023 15:01:30 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.mutex.one (Postfix) with ESMTP id 63A5E16C0056; Wed, 30 Aug 2023 01:01:29 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at mail.mutex.one Received: from mail.mutex.one ([127.0.0.1]) by localhost (mail.mutex.one [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PNOUSkh30e1l; Wed, 30 Aug 2023 01:01:28 +0300 (EEST) From: Marian Postevca DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mutex.one; s=default; t=1693346488; bh=WdCCn6IEol8aJUkjka8g/S8DjEGq58vP7C1WeChmXKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mzO8dV0XTEbnYzYfhq0XLYBpaqgk5a2qja47ZIWOAhsNeQDC8ng5FF1Q8iLYtvKa2 BO7fMHODtmUjmez8Q0GkalWIHab7rU9+VaPhO5uubggf50U9SnshZ7umzs9iCb6+Ji xOSEd2nH69sdZTbHkqXTCD9Qr5D14p355GEO3MGY= To: Liam Girdwood , Takashi Iwai , Mark Brown , Jaroslav Kysela Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, Marian Postevca Subject: [PATCH v3 4/5] ASoC: amd: acp: Add support for splitting the codec specific code from the ACP driver Date: Wed, 30 Aug 2023 01:01:15 +0300 Message-ID: <20230829220116.1159-5-posteuca@mutex.one> In-Reply-To: <20230829220116.1159-1-posteuca@mutex.one> References: <20230829220116.1159-1-posteuca@mutex.one> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This commit adds support for splitting more complicated machine drivers, that need special handling, from the generic ACP code. By adding support for callbacks to configure and handle codec specific implementation details, we can split them in separate files that don't clutter the ACP code. Signed-off-by: Marian Postevca --- sound/soc/amd/acp/acp-legacy-mach.c | 82 +++++++++++++++++++++++++---- sound/soc/amd/acp/acp-mach.h | 66 +++++++++++++++++++++++ 2 files changed, 137 insertions(+), 11 deletions(-) diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-le= gacy-mach.c index 6d57d17ddfd7..ba39b4dcdd6d 100644 --- a/sound/soc/amd/acp/acp-legacy-mach.c +++ b/sound/soc/amd/acp/acp-legacy-mach.c @@ -75,6 +75,33 @@ static struct acp_card_drvdata rt5682s_rt1019_rmb_data = =3D { .tdm_mode =3D false, }; =20 +static bool acp_asoc_init_ops(struct acp_card_drvdata *priv) +{ + return false; +} + +static int acp_asoc_suspend_pre(struct snd_soc_card *card) +{ + int ret; + + ret =3D acp_ops_suspend_pre(card); + if (ret =3D=3D 1) + return 0; + else + return ret; +} + +static int acp_asoc_resume_post(struct snd_soc_card *card) +{ + int ret; + + ret =3D acp_ops_resume_post(card); + if (ret =3D=3D 1) + return 0; + else + return ret; +} + static int acp_asoc_probe(struct platform_device *pdev) { struct snd_soc_card *card =3D NULL; @@ -83,35 +110,68 @@ static int acp_asoc_probe(struct platform_device *pdev) struct acp_card_drvdata *acp_card_drvdata; int ret; =20 - if (!pdev->id_entry) - return -EINVAL; + if (!pdev->id_entry) { + ret =3D -EINVAL; + goto out; + } =20 card =3D devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); - if (!card) - return -ENOMEM; + if (!card) { + ret =3D -ENOMEM; + goto out; + } =20 + card->drvdata =3D (struct acp_card_drvdata *)pdev->id_entry->driver_data; + acp_card_drvdata =3D card->drvdata; + acp_card_drvdata->acpi_mach =3D (struct snd_soc_acpi_mach *)pdev->dev.pla= tform_data; card->dev =3D dev; card->owner =3D THIS_MODULE; card->name =3D pdev->id_entry->name; - card->drvdata =3D (struct acp_card_drvdata *)pdev->id_entry->driver_data; - /* Widgets and controls added per-codec in acp-mach-common.c */ =20 - acp_card_drvdata =3D card->drvdata; + acp_asoc_init_ops(card->drvdata); + + /* If widgets and controls are not set in specific callback, + * they will be added per-codec in acp-mach-common.c + */ + ret =3D acp_ops_configure_widgets(card); + if (ret < 0) { + dev_err(&pdev->dev, + "Cannot configure widgets for card (%s): %d\n", + card->name, ret); + goto out; + } + card->suspend_pre =3D acp_asoc_suspend_pre; + card->resume_post =3D acp_asoc_resume_post; + + ret =3D acp_ops_probe(card); + if (ret < 0) { + dev_err(&pdev->dev, + "Cannot probe card (%s): %d\n", + card->name, ret); + goto out; + } + dmi_id =3D dmi_first_match(acp_quirk_table); if (dmi_id && dmi_id->driver_data) acp_card_drvdata->tdm_mode =3D dmi_id->driver_data; =20 - acp_legacy_dai_links_create(card); + ret =3D acp_legacy_dai_links_create(card); + if (ret) { + dev_err(&pdev->dev, + "Cannot create dai links for card (%s): %d\n", + card->name, ret); + goto out; + } =20 ret =3D devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "devm_snd_soc_register_card(%s) failed: %d\n", card->name, ret); - return ret; + goto out; } - - return 0; +out: + return ret; } =20 static const struct platform_device_id board_ids[] =3D { diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h index 2b3ec6594023..8cc33926e66b 100644 --- a/sound/soc/amd/acp/acp-mach.h +++ b/sound/soc/amd/acp/acp-mach.h @@ -20,6 +20,10 @@ =20 #define TDM_CHANNELS 8 =20 +#define ACP_OPS(priv, cb) ((priv)->ops.cb) + +#define acp_get_drvdata(card) ((struct acp_card_drvdata *)(card)->drvdata) + enum be_id { HEADSET_BE_ID =3D 0, AMP_BE_ID, @@ -50,6 +54,14 @@ enum platform_end_point { REMBRANDT, }; =20 +struct acp_mach_ops { + int (*probe)(struct snd_soc_card *card); + int (*configure_link)(struct snd_soc_card *card, struct snd_soc_dai_link = *dai_link); + int (*configure_widgets)(struct snd_soc_card *card); + int (*suspend_pre)(struct snd_soc_card *card); + int (*resume_post)(struct snd_soc_card *card); +}; + struct acp_card_drvdata { unsigned int hs_cpu_id; unsigned int amp_cpu_id; @@ -61,6 +73,9 @@ struct acp_card_drvdata { unsigned int platform; struct clk *wclk; struct clk *bclk; + struct acp_mach_ops ops; + struct snd_soc_acpi_mach *acpi_mach; + void *mach_priv; bool soc_mclk; bool tdm_mode; }; @@ -69,4 +84,55 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *car= d); int acp_legacy_dai_links_create(struct snd_soc_card *card); extern const struct dmi_system_id acp_quirk_table[]; =20 +static inline int acp_ops_probe(struct snd_soc_card *card) +{ + int ret =3D 1; + struct acp_card_drvdata *priv =3D acp_get_drvdata(card); + + if (ACP_OPS(priv, probe)) + ret =3D ACP_OPS(priv, probe)(card); + return ret; +} + +static inline int acp_ops_configure_link(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link) +{ + int ret =3D 1; + struct acp_card_drvdata *priv =3D acp_get_drvdata(card); + + if (ACP_OPS(priv, configure_link)) + ret =3D ACP_OPS(priv, configure_link)(card, dai_link); + return ret; +} + +static inline int acp_ops_configure_widgets(struct snd_soc_card *card) +{ + int ret =3D 1; + struct acp_card_drvdata *priv =3D acp_get_drvdata(card); + + if (ACP_OPS(priv, configure_widgets)) + ret =3D ACP_OPS(priv, configure_widgets)(card); + return ret; +} + +static inline int acp_ops_suspend_pre(struct snd_soc_card *card) +{ + int ret =3D 1; + struct acp_card_drvdata *priv =3D acp_get_drvdata(card); + + if (ACP_OPS(priv, suspend_pre)) + ret =3D ACP_OPS(priv, suspend_pre)(card); + return ret; +} + +static inline int acp_ops_resume_post(struct snd_soc_card *card) +{ + int ret =3D 1; + struct acp_card_drvdata *priv =3D acp_get_drvdata(card); + + if (ACP_OPS(priv, resume_post)) + ret =3D ACP_OPS(priv, resume_post)(card); + return ret; +} + #endif --=20 2.41.0