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 AFEEBC77B75 for ; Mon, 22 May 2023 18:34:28 +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 7DB08206; Mon, 22 May 2023 20:33:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7DB08206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1684780466; bh=YbFK8GUrMIrpRbbx+GNGUXtzCx238UspxqLc+WIumjQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=t6Y9rcI6HXbt9rpG/+RHTsWbxe4SqoUAMTc2bLbHCK5qmyDKoiMHNbgEn9KciiF2Y yeKdvg7AOUxtxTp/mqDcJsNUy49mHIqD+REUt4wnrxpEsRZ2P6697TEbg3G7iqn0Vo cDhWyTCmJSCi6vlGdoRPXzoBPI1vCVEkI0hnQXQY= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C9BC0F8057D; Mon, 22 May 2023 20:32:31 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 5FEE8F8056F; Mon, 22 May 2023 20:32:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7A075F8056F; Mon, 22 May 2023 20:32:27 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 5D67BF8024E for ; Mon, 22 May 2023 20:32:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5D67BF8024E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=nFQansrG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684780333; x=1716316333; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=YbFK8GUrMIrpRbbx+GNGUXtzCx238UspxqLc+WIumjQ=; b=nFQansrGd85EbwWxIDYgFPkEZd+a1rDYi9FZcV6MwC/zhiPXmvngzI0g TQ2vnnR89qKgU/t16qIfmPcGsqDTz7DQ0yBuRuzZj8+U68Zra/E2XEt8B ZA5e6z6yhD/pxUNisU17eMEeLB2usakpwXzG652nE5ClQEmfUAisrTCLE CYuuP4MRrTVQIqAxaMP5DMUQDJGhEkWUWIE5bN+/8/Si4QZ1kvHOK5I92 1y1tB49xxoJ4yY7SZKb66qiX6YGK1RJc7YVU2K5mg02ocTZSAwuI86p4T CC1C/NB6KQBtGN4klz6sp5VGDMJo6fuzGro0s6/UvJJLqbp3p3JbIfwEI A==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="356235110" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="356235110" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 11:31:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="697740834" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="697740834" Received: from ljgreene-mobl.amr.corp.intel.com (HELO [10.209.124.121]) ([10.209.124.121]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 11:31:45 -0700 Message-ID: <134a2efd-648a-fb4b-4b61-154173b97f04@linux.intel.com> Date: Mon, 22 May 2023 11:26:53 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.11.0 Subject: Re: [PATCH V2 2/9] ASoC: amd: ps: handle SoundWire interrupts in acp pci driver Content-Language: en-US To: Vijendar Mukunda , broonie@kernel.org Cc: alsa-devel@alsa-project.org, Basavaraj.Hiregoudar@amd.com, Sunil-kumar.Dommati@amd.com, Mastan.Katragadda@amd.com, Arungopal.kondaveeti@amd.com, mario.limonciello@amd.com, Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Syed Saba Kareem , open list References: <20230522133122.166841-1-Vijendar.Mukunda@amd.com> <20230522133122.166841-3-Vijendar.Mukunda@amd.com> From: Pierre-Louis Bossart In-Reply-To: <20230522133122.166841-3-Vijendar.Mukunda@amd.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Message-ID-Hash: KZOG2HV2GUU4EPTR6VN4XYEKBAGD2WJV X-Message-ID-Hash: KZOG2HV2GUU4EPTR6VN4XYEKBAGD2WJV X-MailFrom: pierre-louis.bossart@linux.intel.com 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.8 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 5/22/23 08:31, Vijendar Mukunda wrote: > Handle SoundWire manager related interrupts in ACP PCI driver > interrupt handler and schedule SoundWire manager work queue for > further processing. > > Signed-off-by: Vijendar Mukunda > --- > sound/soc/amd/ps/acp63.h | 4 ++++ > sound/soc/amd/ps/pci-ps.c | 43 ++++++++++++++++++++++++++++++++++----- > 2 files changed, 42 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h > index 95bb1cef900a..d296059be4f0 100644 > --- a/sound/soc/amd/ps/acp63.h > +++ b/sound/soc/amd/ps/acp63.h > @@ -88,6 +88,10 @@ > /* time in ms for acp timeout */ > #define ACP_TIMEOUT 500 > > +#define ACP_SDW0_STAT BIT(21) > +#define ACP_SDW1_STAT BIT(2) > +#define ACP_ERROR_IRQ BIT(29) > + > enum acp_config { > ACP_CONFIG_0 = 0, > ACP_CONFIG_1, > diff --git a/sound/soc/amd/ps/pci-ps.c b/sound/soc/amd/ps/pci-ps.c > index 02caae6968ad..26514e340a33 100644 > --- a/sound/soc/amd/ps/pci-ps.c > +++ b/sound/soc/amd/ps/pci-ps.c > @@ -56,6 +56,7 @@ static int acp63_reset(void __iomem *acp_base) > static void acp63_enable_interrupts(void __iomem *acp_base) > { > writel(1, acp_base + ACP_EXTERNAL_INTR_ENB); > + writel(ACP_ERROR_IRQ, acp_base + ACP_EXTERNAL_INTR_CNTL); you may want to comment on why you don't have a read-modify-write approach for something that looks generic and not limited to a single error bit? > } > > static void acp63_disable_interrupts(void __iomem *acp_base) > @@ -102,23 +103,55 @@ static irqreturn_t acp63_irq_handler(int irq, void *dev_id) > { > struct acp63_dev_data *adata; > struct pdm_dev_data *ps_pdm_data; > - u32 val; > + struct amd_sdw_manager *amd_manager; > + u32 ext_intr_stat, ext_intr_stat1; > + u16 irq_flag = 0; > u16 pdev_index; > > adata = dev_id; > if (!adata) > return IRQ_NONE; > + ext_intr_stat = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT); > + if (ext_intr_stat & ACP_SDW0_STAT) { > + writel(ACP_SDW0_STAT, adata->acp63_base + ACP_EXTERNAL_INTR_STAT); [1] this is confusing, if this is w1c, should this be: writel(ext_intr_stat, adata->acp63_base + ACP_EXTERNAL_INTR_STAT); Otherwise you may be clearing fields that have not been set? > + pdev_index = adata->sdw0_dev_index; > + amd_manager = dev_get_drvdata(&adata->pdev[pdev_index]->dev); > + if (amd_manager) > + schedule_work(&amd_manager->amd_sdw_irq_thread); > + irq_flag = 1; > + } > > - val = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT); > - if (val & BIT(PDM_DMA_STAT)) { > + ext_intr_stat1 = readl(adata->acp63_base + ACP_EXTERNAL_INTR_STAT1); > + if (ext_intr_stat1 & ACP_SDW1_STAT) { > + writel(ACP_SDW1_STAT, adata->acp63_base + ACP_EXTERNAL_INTR_STAT1); same comment here. > + pdev_index = adata->sdw1_dev_index; > + amd_manager = dev_get_drvdata(&adata->pdev[pdev_index]->dev); > + if (amd_manager) > + schedule_work(&amd_manager->amd_sdw_irq_thread); > + irq_flag = 1; > + } > + > + if (ext_intr_stat & ACP_ERROR_IRQ) { > + writel(ACP_ERROR_IRQ, adata->acp63_base + ACP_EXTERNAL_INTR_STAT); [2] and this is even move confusing because you may end-up writing twice to the same adata->acp63_base + ACP_EXTERNAL_INTR_STAT with [1] and [2], so the previous write writel(ACP_SDW0_STAT, adata->acp63_base + ACP_EXTERNAL_INTR_STAT); may have cleared the register already. Something looks wrong here? > + /* TODO: Report SoundWire Manager instance errors */ > + writel(0, adata->acp63_base + ACP_SW0_I2S_ERROR_REASON); > + writel(0, adata->acp63_base + ACP_SW1_I2S_ERROR_REASON); > + writel(0, adata->acp63_base + ACP_ERROR_STATUS); > + irq_flag = 1; > + } > + > + if (ext_intr_stat & BIT(PDM_DMA_STAT)) { > pdev_index = adata->pdm_dev_index; > ps_pdm_data = dev_get_drvdata(&adata->pdev[pdev_index]->dev); > writel(BIT(PDM_DMA_STAT), adata->acp63_base + ACP_EXTERNAL_INTR_STAT); > if (ps_pdm_data->capture_stream) > snd_pcm_period_elapsed(ps_pdm_data->capture_stream); > - return IRQ_HANDLED; > + irq_flag = 1; > } > - return IRQ_NONE; > + if (irq_flag) > + return IRQ_HANDLED; > + else > + return IRQ_NONE; > } > > static int sdw_amd_scan_controller(struct device *dev)