Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp9416595rwl; Wed, 11 Jan 2023 05:34:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXvgXYiElFx2QZqpXy50FFglTicO1ScTAdqcQtptS2RdsAhcvf7hn3g1XkdVOx20GmD8RUKI X-Received: by 2002:a17:90b:2292:b0:226:33fb:9bb5 with SMTP id kx18-20020a17090b229200b0022633fb9bb5mr43988861pjb.35.1673444046274; Wed, 11 Jan 2023 05:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673444046; cv=none; d=google.com; s=arc-20160816; b=XAo4VpI3NdyqukrGZ4rW3Vt+ZMVS8EdLsqX+oCx+R+kVqgkY63Z2YQ/9WaZ1/OIAUS CBJZdFAbuqZOFWKRc0UUKMcQUwEg+REW5BkHMdzo6RU32qc/JtP3NSceFzRNfJCz2/b6 F/5Ne3K28pVLd7tey6e2d/mEBbdHAJFyw4MT7IEU4c8l8JKreh6XBFCz5j6pkLhBGdq3 yo6RdFo2FEB2P+QtHGrF7Sw+uHvIqPPPSbog69Gord8nBIXeABQuS4/B/DSI7ckYPBtU Wc8jR3Ko0gZaVvCqrZhMP2kBBe9ldIoTTpYi5ez8M1RZZoC5B/pqqn7ym9/G5sJjfXns YxjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=bYnZjl02OOMejhfzADTSpLyLdLaVImocQORQWoovxU0=; b=yVxItE64dotJU5/Ikovp+DnmDuTSaDYI4RT66ccrI5RP/4my3Uiu389od3ARX0NzzV 6t8qKoXN8xQ+oUB/toJRi6pBtgb1hdUOh7GasR/l8e5vTsK2iq3BFnl6Mw6NnLN4hByM exHnbDaZjJPOuk/zk8DM+4jd/eFNnrzc9TmQwMbWfO1HtuCMFSxP/Gu5bq59RRo0JKLg sdirAHkplPcenkTq7BNp03uod5hO2axFLpv0nNXYjIlgbRIRPsEQmoROzoA9e75M1fIk pg0eEPQ0xYFuj4dOdAPvFYamUXnkQl0xpZpxJvNE8asyKGE8ANgk9FqoDVFy4qDR3Eeq Q3Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S9t+A86o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020a635d43000000b004774a855372si13197584pgm.694.2023.01.11.05.33.58; Wed, 11 Jan 2023 05:34:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=S9t+A86o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237682AbjAKNcm (ORCPT + 53 others); Wed, 11 Jan 2023 08:32:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237634AbjAKNcK (ORCPT ); Wed, 11 Jan 2023 08:32:10 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5E531BEB0 for ; Wed, 11 Jan 2023 05:28:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673443684; x=1704979684; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=k7MGDdueXV0hxglws6KfXGvJ46M4lOKkMqZznlffKp0=; b=S9t+A86oxov3tr/i1zbY83WKzfqCfLZeu8a4eGyJ9ZkylyTJg9ySRWkJ eF7tAxnAH0IBhPIpzme28SHSlwdj1EzBXfSF4I//MVfjaZvxejVww9uKo a+mOBeBZRR7NiKfNA3G5DOGaeS43zGd3SfwuP7WOj+fvbjS61S/a9cxWF d507+Jn0WxsJpzJ3zoBcPBh0RIeaZdBstMiCsJQ0j1NpvBByXLMCnLMOo +wwv50p9X0itsIJ9pbsNVgRR2xA/6ttTlOzo6sCe1M+u7kalVFTnixG5d IXEUDeSpZJOfJEDBoCC6NjTUL7kFTLbmr638aGNPKLi25bF6Lo5CR1o/i Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="409655472" X-IronPort-AV: E=Sophos;i="5.96,317,1665471600"; d="scan'208";a="409655472" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2023 05:27:13 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="831360000" X-IronPort-AV: E=Sophos;i="5.96,317,1665471600"; d="scan'208";a="831360000" Received: from aslawinx-mobl.ger.corp.intel.com (HELO [10.99.16.144]) ([10.99.16.144]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2023 05:27:08 -0800 Message-ID: Date: Wed, 11 Jan 2023 14:27:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH 01/19] ASoC: amd: ps: create platform devices based on acp config To: Vijendar Mukunda , broonie@kernel.org, vkoul@kernel.org, alsa-devel@alsa-project.org Cc: Mastan.Katragadda@amd.com, Sunil-kumar.Dommati@amd.com, open list , Basavaraj.Hiregoudar@amd.com, Takashi Iwai , Pierre-Louis Bossart , Liam Girdwood , Nathan Chancellor , Mario.Limonciello@amd.com, arungopal.kondaveeti@amd.com, Sanyog Kale , Bard Liao , Syed Saba Kareem References: <20230111090222.2016499-1-Vijendar.Mukunda@amd.com> <20230111090222.2016499-2-Vijendar.Mukunda@amd.com> Content-Language: en-US From: =?UTF-8?Q?Amadeusz_S=c5=82awi=c5=84ski?= In-Reply-To: <20230111090222.2016499-2-Vijendar.Mukunda@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 1/11/2023 10:02 AM, Vijendar Mukunda wrote: > Create platform devices for sdw controllers and PDM controller > based on ACP pin config selection and ACPI fw handle for > pink sardine platform. > > Signed-off-by: Vijendar Mukunda > Signed-off-by: Mastan Katragadda > --- > include/linux/soundwire/sdw_amd.h | 18 +++ > sound/soc/amd/ps/acp63.h | 24 ++- > sound/soc/amd/ps/pci-ps.c | 248 ++++++++++++++++++++++++++++-- > 3 files changed, 277 insertions(+), 13 deletions(-) > create mode 100644 include/linux/soundwire/sdw_amd.h > ... > diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c > index e86f23d97584..85154cf0b2a2 100644 > --- a/sound/soc/amd/ps/pci-ps.c > +++ b/sound/soc/amd/ps/pci-ps.c > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > > #include "acp63.h" > > @@ -134,12 +135,68 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id) > return IRQ_NONE; > } > > -static void get_acp63_device_config(u32 config, struct pci_dev *pci, > - struct acp63_dev_data *acp_data) > +static int sdw_amd_scan_controller(struct device *dev) > +{ > + struct acp63_dev_data *acp_data; > + struct fwnode_handle *link; > + char name[32]; > + u8 count = 0; > + u32 acp_sdw_power_mode = 0; > + int index; > + int ret; > + > + acp_data = dev_get_drvdata(dev); > + acp_data->acp_sdw_power_off = true; > + /* Found controller, find links supported */ > + ret = fwnode_property_read_u8_array((acp_data->sdw_fw_node), > + "mipi-sdw-master-count", &count, 1); > + > + if (ret) { > + dev_err(dev, > + "Failed to read mipi-sdw-master-count: %d\n", ret); > + return -EINVAL; > + } > + > + /* Check count is within bounds */ > + if (count > AMD_SDW_MAX_CONTROLLERS) { > + dev_err(dev, "Controller count %d exceeds max %d\n", > + count, AMD_SDW_MAX_CONTROLLERS); > + return -EINVAL; > + } > + > + if (!count) { > + dev_warn(dev, "No SoundWire controllers detected\n"); > + return -EINVAL; > + } > + dev_dbg(dev, "ACPI reports %d Soundwire Controller devices\n", count); > + acp_data->sdw_master_count = count; Double space before '='. > + for (index = 0; index < count; index++) { > + snprintf(name, sizeof(name), "mipi-sdw-link-%d-subproperties", index); > + link = fwnode_get_named_child_node(acp_data->sdw_fw_node, name); > + if (!link) { > + dev_err(dev, "Master node %s not found\n", name); > + return -EIO; > + } > + > + fwnode_property_read_u32(link, "amd-sdw-power-mode", > + &acp_sdw_power_mode); > + if (acp_sdw_power_mode != AMD_SDW_POWER_OFF_MODE) > + acp_data->acp_sdw_power_off = false; > + } > + return 0; > +} > + > +static int get_acp63_device_config(u32 config, struct pci_dev *pci, struct acp63_dev_data *acp_data) > { > struct acpi_device *dmic_dev; > + struct acpi_device *sdw_dev; > + struct device *dev; > const union acpi_object *obj; > bool is_dmic_dev = false; > + bool is_sdw_dev = false; > + int ret; > + > + dev = &pci->dev; > > dmic_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_DMIC_ADDR, 0); If you set dev above, you might as well use it throughout the function context? Like above in ACPI_COMPANION? > if (dmic_dev) { > @@ -149,22 +206,84 @@ static void get_acp63_device_config(u32 config, struct pci_dev *pci, > is_dmic_dev = true; > } > > + sdw_dev = acpi_find_child_device(ACPI_COMPANION(&pci->dev), ACP63_SDW_ADDR, 0); > + if (sdw_dev) { > + is_sdw_dev = true; > + acp_data->sdw_fw_node = acpi_fwnode_handle(sdw_dev); > + ret = sdw_amd_scan_controller(dev); Or just use &pci->dev here, so there is no need for separate variable?