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 DC5D5C46CD8 for ; Thu, 21 Dec 2023 16:44:41 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id BF02F868; Thu, 21 Dec 2023 17:44:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BF02F868 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1703177079; bh=HMdNywSAZfSjSugR4FE+3Y2J7vabtmdpKRNrrpSocdU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=HCnh1EyV0I3paeJovc6Xu7p7E7/Jlfj1krIWcZPrHe+iqZ2DP68da8V9IzRIwO3Wc orwzajl6RZXOTmNbDHK8VExUbU5ouLkcnqbFPhl4mhh/pQ/DNZUA+oJWfoJep+WgHE +FHMQEwZbNTo9MszN3Guih4JA4TALZdvPyNBbgHs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 41DF2F8057E; Thu, 21 Dec 2023 17:43:59 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D1743F80580; Thu, 21 Dec 2023 17:43:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A0A85F80124; Thu, 21 Dec 2023 17:38:53 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9926DF800D2 for ; Thu, 21 Dec 2023 17:38:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9926DF800D2 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=B3VG7w5b Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id DDCD261A09; Thu, 21 Dec 2023 16:38:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57E64C433C8; Thu, 21 Dec 2023 16:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703176725; bh=HMdNywSAZfSjSugR4FE+3Y2J7vabtmdpKRNrrpSocdU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=B3VG7w5bBN2UShWNRNdDg2SO7lXblJ1jRLHQpVLu0gL06rWJ5pvDgZOr3ba3kr/75 /7MsabqFrC3XZKGEoDCoqEhDNfq28Gxk98KviVTvT9LUq+xBY91nLYNZ9CxvfToAp2 UBzSO15X/MjTIThzAUKWuskpSoBX7xawXY2OyXusVSL5rtx1yfGlg2aScWB+GNG0li 7iQ9bylvPVAIVEZM7sYz1ANO1sBzNWJo49Mwfm+zx44w6q2rtOWgfd4mvVawESZF7I Bmd3nWAWbT49ki+ZBZKBaLrJt6BEU90yUxAb6zrhZ/jTeRwZgyej/ul/HW2GXmeoKU KKP3xo+o0/Cqg== Date: Thu, 21 Dec 2023 22:08:41 +0530 From: Vinod Koul To: Vijendar Mukunda Cc: broonie@kernel.org, alsa-devel@alsa-project.org, Basavaraj.Hiregoudar@amd.com, Sunil-kumar.Dommati@amd.com, pierre-louis.bossart@linux.intel.com, vinod.koul@intel.com, venkataprasad.potturu@amd.com, Bard Liao , Sanyog Kale , open list Subject: Re: [PATCH 04/12] drivers: soundwire: refactor soundwire pads enable Message-ID: References: <20231221073558.3181911-1-Vijendar.Mukunda@amd.com> <20231221073558.3181911-5-Vijendar.Mukunda@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231221073558.3181911-5-Vijendar.Mukunda@amd.com> Message-ID-Hash: GKJSUFDUDHIPA6DH7ZW4JD4JXW64OML7 X-Message-ID-Hash: GKJSUFDUDHIPA6DH7ZW4JD4JXW64OML7 X-MailFrom: vkoul@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: <> List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 21-12-23, 13:05, Vijendar Mukunda wrote: > As sdw pads enable sequence is executed only once, invoke it > from probe sequence. > > Program required pads for both manager instances > based on link_mask during probe sequence. This will avoid > acquiring mutex lock. something wrong with your editor to have this formatting, you can use upto 80 chars here! > Remove unnecessary delay after programming ACP_SW_PAD_KEEPER_EN > register. > > Signed-off-by: Vijendar Mukunda > --- > drivers/soundwire/amd_init.c | 45 +++++++++++++++++++++++++++++++++ > drivers/soundwire/amd_manager.c | 18 ------------- > 2 files changed, 45 insertions(+), 18 deletions(-) > > diff --git a/drivers/soundwire/amd_init.c b/drivers/soundwire/amd_init.c > index 5c9569d9ad01..b3b3c7266384 100644 > --- a/drivers/soundwire/amd_init.c > +++ b/drivers/soundwire/amd_init.c > @@ -15,6 +15,47 @@ > > #include "amd_init.h" > > +#define ACP_PAD_PULLDOWN_CTRL 0x0001448 > +#define ACP_SW_PAD_KEEPER_EN 0x0001454 > +#define AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7f9a > +#define AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7f9f > +#define AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK 0x7ffa > +#define AMD_SDW0_PAD_EN_MASK 1 > +#define AMD_SDW1_PAD_EN_MASK 0x10 > +#define AMD_SDW_PAD_EN_MASK (AMD_SDW0_PAD_EN_MASK | AMD_SDW1_PAD_EN_MASK) > + > +static int amd_enable_sdw_pads(void __iomem *mmio, u32 link_mask, struct device *dev) > +{ > + u32 val; > + u32 pad_keeper_en_mask, pad_pulldown_ctrl_mask; > + > + switch (link_mask) { > + case 1: > + pad_keeper_en_mask = AMD_SDW0_PAD_EN_MASK; > + pad_pulldown_ctrl_mask = AMD_SDW0_PAD_PULLDOWN_CTRL_ENABLE_MASK; > + break; > + case 2: > + pad_keeper_en_mask = AMD_SDW1_PAD_EN_MASK; > + pad_pulldown_ctrl_mask = AMD_SDW1_PAD_PULLDOWN_CTRL_ENABLE_MASK; > + break; > + case 3: > + pad_keeper_en_mask = AMD_SDW_PAD_EN_MASK; > + pad_pulldown_ctrl_mask = AMD_SDW_PAD_PULLDOWN_CTRL_ENABLE_MASK; > + break; > + default: > + dev_err(dev, "No SDW Links are enabled\n"); > + return -ENODEV; > + } > + > + val = readl(mmio + ACP_SW_PAD_KEEPER_EN); > + val |= pad_keeper_en_mask; > + writel(val, mmio + ACP_SW_PAD_KEEPER_EN); > + val = readl(mmio + ACP_PAD_PULLDOWN_CTRL); > + val &= pad_pulldown_ctrl_mask; > + writel(val, mmio + ACP_PAD_PULLDOWN_CTRL); updatel() local macro? > + return 0; > +} > + > static int sdw_amd_cleanup(struct sdw_amd_ctx *ctx) > { > int i; > @@ -37,6 +78,7 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res) > struct platform_device_info pdevinfo[2]; > u32 link_mask; > int count, index; > + int ret; > > if (!res) > return NULL; > @@ -50,6 +92,9 @@ static struct sdw_amd_ctx *sdw_amd_probe_controller(struct sdw_amd_res *res) > > count = res->count; > dev_dbg(&adev->dev, "Creating %d SDW Link devices\n", count); > + ret = amd_enable_sdw_pads(res->mmio_base, res->link_mask, res->parent); > + if (ret) > + return NULL; > > /* > * we need to alloc/free memory manually and can't use devm: > diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c > index c27b0b0f33a6..1427cccfc309 100644 > --- a/drivers/soundwire/amd_manager.c > +++ b/drivers/soundwire/amd_manager.c > @@ -26,23 +26,6 @@ > > #define to_amd_sdw(b) container_of(b, struct amd_sdw_manager, bus) > > -static void amd_enable_sdw_pads(struct amd_sdw_manager *amd_manager) > -{ > - u32 sw_pad_pulldown_val; > - u32 val; > - > - mutex_lock(amd_manager->acp_sdw_lock); > - val = readl(amd_manager->acp_mmio + ACP_SW_PAD_KEEPER_EN); > - val |= amd_manager->reg_mask->sw_pad_enable_mask; > - writel(val, amd_manager->acp_mmio + ACP_SW_PAD_KEEPER_EN); > - usleep_range(1000, 1500); > - > - sw_pad_pulldown_val = readl(amd_manager->acp_mmio + ACP_PAD_PULLDOWN_CTRL); > - sw_pad_pulldown_val &= amd_manager->reg_mask->sw_pad_pulldown_mask; > - writel(sw_pad_pulldown_val, amd_manager->acp_mmio + ACP_PAD_PULLDOWN_CTRL); > - mutex_unlock(amd_manager->acp_sdw_lock); so the code is copied from a GPL declared file to now and GPL + BSD one! Have you had lawyers look into this... why change one file license ? > -} > - > static int amd_init_sdw_manager(struct amd_sdw_manager *amd_manager) > { > u32 val; > @@ -872,7 +855,6 @@ int amd_sdw_manager_start(struct amd_sdw_manager *amd_manager) > > prop = &amd_manager->bus.prop; > if (!prop->hw_disabled) { > - amd_enable_sdw_pads(amd_manager); > ret = amd_init_sdw_manager(amd_manager); > if (ret) > return ret; > -- > 2.34.1 -- ~Vinod