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 X-Spam-Level: X-Spam-Status: No, score=-7.4 required=3.0 tests=DATE_IN_PAST_12_24, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 371CDCA9EB6 for ; Wed, 23 Oct 2019 17:57:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CF2121A4A for ; Wed, 23 Oct 2019 17:57:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732808AbfJWR54 (ORCPT ); Wed, 23 Oct 2019 13:57:56 -0400 Received: from mga02.intel.com ([134.134.136.20]:46634 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732626AbfJWR5z (ORCPT ); Wed, 23 Oct 2019 13:57:55 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Oct 2019 10:57:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,221,1569308400"; d="scan'208";a="196854544" Received: from kmaklai-mobl2.amr.corp.intel.com (HELO [10.252.137.221]) ([10.252.137.221]) by fmsmga008.fm.intel.com with ESMTP; 23 Oct 2019 10:57:52 -0700 Subject: Re: [alsa-devel] [PATCH v2 4/5] soundwire: intel/cadence: add flag for interrupt enable To: Vinod Koul Cc: alsa-devel@alsa-project.org, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ranjani Sridharan , broonie@kernel.org, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale , Bard liao , Rander Wang References: <20190916190952.32388-1-pierre-louis.bossart@linux.intel.com> <20190916190952.32388-5-pierre-louis.bossart@linux.intel.com> <20191021041404.GY2654@vkoul-mobl> <8ba388e7-e344-068b-b233-8d96903abf6b@linux.intel.com> <20191022045518.GJ2654@vkoul-mobl> From: Pierre-Louis Bossart Message-ID: Date: Tue, 22 Oct 2019 15:41:55 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191022045518.GJ2654@vkoul-mobl> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/21/19 11:55 PM, Vinod Koul wrote: > On 21-10-19, 05:26, Pierre-Louis Bossart wrote: >> On 10/20/19 11:14 PM, Vinod Koul wrote: >>> On 16-09-19, 14:09, Pierre-Louis Bossart wrote: >>>> Prepare for future PM support and fix error handling by disabling >>>> interrupts as needed. >>>> >>>> Signed-off-by: Pierre-Louis Bossart >>>> --- >>>> drivers/soundwire/cadence_master.c | 18 ++++++++++++------ >>>> drivers/soundwire/cadence_master.h | 2 +- >>>> drivers/soundwire/intel.c | 12 +++++++----- >>>> 3 files changed, 20 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c >>>> index 5f900cf2acb9..a71df99ca18f 100644 >>>> --- a/drivers/soundwire/cadence_master.c >>>> +++ b/drivers/soundwire/cadence_master.c >>>> @@ -819,14 +819,17 @@ EXPORT_SYMBOL(sdw_cdns_exit_reset); >>>> * sdw_cdns_enable_interrupt() - Enable SDW interrupts and update config >>>> * @cdns: Cadence instance >>>> */ >>>> -int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) >>>> +int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state) >>>> { >>>> - u32 mask; >>>> + u32 slave_intmask0 = 0; >>>> + u32 slave_intmask1 = 0; >>>> + u32 mask = 0; >>>> + >>>> + if (!state) >>>> + goto update_masks; >>>> - cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK0, >>>> - CDNS_MCP_SLAVE_INTMASK0_MASK); >>>> - cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1, >>>> - CDNS_MCP_SLAVE_INTMASK1_MASK); >>>> + slave_intmask0 = CDNS_MCP_SLAVE_INTMASK0_MASK; >>>> + slave_intmask1 = CDNS_MCP_SLAVE_INTMASK1_MASK; >>>> /* enable detection of all slave state changes */ >>>> mask = CDNS_MCP_INT_SLAVE_MASK; >>>> @@ -849,6 +852,9 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) >>>> if (interrupt_mask) /* parameter override */ >>>> mask = interrupt_mask; >>>> +update_masks: >>>> + cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK0, slave_intmask0); >>>> + cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1, slave_intmask1); >>>> cdns_writel(cdns, CDNS_MCP_INTMASK, mask); >>>> /* commit changes */ >>>> diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h >>>> index 1a67728c5000..302351808098 100644 >>>> --- a/drivers/soundwire/cadence_master.h >>>> +++ b/drivers/soundwire/cadence_master.h >>>> @@ -162,7 +162,7 @@ int sdw_cdns_init(struct sdw_cdns *cdns); >>>> int sdw_cdns_pdi_init(struct sdw_cdns *cdns, >>>> struct sdw_cdns_stream_config config); >>>> int sdw_cdns_exit_reset(struct sdw_cdns *cdns); >>>> -int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns); >>>> +int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state); >>>> #ifdef CONFIG_DEBUG_FS >>>> void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root); >>>> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c >>>> index cdb3243e8823..08530c136c5f 100644 >>>> --- a/drivers/soundwire/intel.c >>>> +++ b/drivers/soundwire/intel.c >>>> @@ -1036,7 +1036,7 @@ static int intel_probe(struct platform_device *pdev) >>>> ret = sdw_add_bus_master(&sdw->cdns.bus); >>>> if (ret) { >>>> dev_err(&pdev->dev, "sdw_add_bus_master fail: %d\n", ret); >>>> - goto err_master_reg; >>>> + return ret; >>> >>> I am not sure I like this line change, before this IIRC the function and >>> single place of return, so changing this doesn't seem to improve >>> anything here..? >> >> Doing a goto to do a return is not very nice either. > > Hrmm, isn't that what you are doing few lines below. The point here is > that this line of change here doesnt change anything, doesnt improve > anything so why change :) I knew there was a reason.. the existing code on your soundwire/next branch mixes goto and return, so I chose to use a return for the first case as well. ret = sdw_add_bus_master(&sdw->cdns.bus); if (ret) { dev_err(&pdev->dev, "sdw_add_bus_master fail: %d\n", ret); goto err_master_reg; >>> changed to return ret; } if (sdw->cdns.bus.prop.hw_disabled) { dev_info(&pdev->dev, "SoundWire master %d is disabled, ignoring\n", sdw->cdns.bus.link_id); return 0; } > >> I can change this, but it doesn't really matter: this entire code will be >> removed anyways to get rid of platform_devices and the probe itself will be >> split in two. >> >>> >>>> } >>>> if (sdw->cdns.bus.prop.hw_disabled) { >>>> @@ -1067,7 +1067,7 @@ static int intel_probe(struct platform_device *pdev) >>>> goto err_init; >>>> } >>>> - ret = sdw_cdns_enable_interrupt(&sdw->cdns); >>>> + ret = sdw_cdns_enable_interrupt(&sdw->cdns, true); >>>> if (ret < 0) { >>>> dev_err(sdw->cdns.dev, "cannot enable interrupts\n"); >>>> goto err_init; >>>> @@ -1076,7 +1076,7 @@ static int intel_probe(struct platform_device *pdev) >>>> ret = sdw_cdns_exit_reset(&sdw->cdns); >>>> if (ret < 0) { >>>> dev_err(sdw->cdns.dev, "unable to exit bus reset sequence\n"); >>>> - goto err_init; >>>> + goto err_interrupt; >>>> } >>>> /* Register DAIs */ >>>> @@ -1084,18 +1084,19 @@ static int intel_probe(struct platform_device *pdev) >>>> if (ret) { >>>> dev_err(sdw->cdns.dev, "DAI registration failed: %d\n", ret); >>>> snd_soc_unregister_component(sdw->cdns.dev); >>>> - goto err_dai; >>>> + goto err_interrupt; >>>> } >>>> intel_debugfs_init(sdw); >>>> return 0; >>>> +err_interrupt: >>>> + sdw_cdns_enable_interrupt(&sdw->cdns, false); >>>> err_dai: >>> >>> Isn't this unused now? > > ??? you missed this. fixed. 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 X-Spam-Level: X-Spam-Status: No, score=-7.4 required=3.0 tests=DATE_IN_PAST_12_24, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8B4FCA9EB7 for ; Wed, 23 Oct 2019 17:58:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 66A3B21929 for ; Wed, 23 Oct 2019 17:58:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="goMEf+uy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 66A3B21929 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 56C2B1615; Wed, 23 Oct 2019 19:58:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 56C2B1615 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1571853533; bh=DA1hqzMVWNksRoCkcITe/TJlcYfdw4x0jyKToKmxWoI=; h=To:References:From:Date:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=goMEf+uyv6T5xjXE9tJduuKU0kAt0gE7GjpHd/kemNyHuYaYLoviruyD+7H6m2UtZ r29OI3tl8m3u/r5bp+7QzH+XooQuOpwIvQ2syc5WrnqoyU/JkBUNyXfpEfXStSW8um DG61rGciVEgR5P4015nf8pZB4kPLh4RxmpsDlDI4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C12BAF80321; Wed, 23 Oct 2019 19:58:02 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C3AF5F80368; Wed, 23 Oct 2019 19:58:00 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 B1456F80112 for ; Wed, 23 Oct 2019 19:57:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B1456F80112 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Oct 2019 10:57:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,221,1569308400"; d="scan'208";a="196854544" Received: from kmaklai-mobl2.amr.corp.intel.com (HELO [10.252.137.221]) ([10.252.137.221]) by fmsmga008.fm.intel.com with ESMTP; 23 Oct 2019 10:57:52 -0700 To: Vinod Koul References: <20190916190952.32388-1-pierre-louis.bossart@linux.intel.com> <20190916190952.32388-5-pierre-louis.bossart@linux.intel.com> <20191021041404.GY2654@vkoul-mobl> <8ba388e7-e344-068b-b233-8d96903abf6b@linux.intel.com> <20191022045518.GJ2654@vkoul-mobl> From: Pierre-Louis Bossart Message-ID: Date: Tue, 22 Oct 2019 15:41:55 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191022045518.GJ2654@vkoul-mobl> Content-Language: en-US Cc: alsa-devel@alsa-project.org, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ranjani Sridharan , broonie@kernel.org, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale , Bard liao , Rander Wang Subject: Re: [alsa-devel] [PATCH v2 4/5] soundwire: intel/cadence: add flag for interrupt enable X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 10/21/19 11:55 PM, Vinod Koul wrote: > On 21-10-19, 05:26, Pierre-Louis Bossart wrote: >> On 10/20/19 11:14 PM, Vinod Koul wrote: >>> On 16-09-19, 14:09, Pierre-Louis Bossart wrote: >>>> Prepare for future PM support and fix error handling by disabling >>>> interrupts as needed. >>>> >>>> Signed-off-by: Pierre-Louis Bossart >>>> --- >>>> drivers/soundwire/cadence_master.c | 18 ++++++++++++------ >>>> drivers/soundwire/cadence_master.h | 2 +- >>>> drivers/soundwire/intel.c | 12 +++++++----- >>>> 3 files changed, 20 insertions(+), 12 deletions(-) >>>> >>>> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c >>>> index 5f900cf2acb9..a71df99ca18f 100644 >>>> --- a/drivers/soundwire/cadence_master.c >>>> +++ b/drivers/soundwire/cadence_master.c >>>> @@ -819,14 +819,17 @@ EXPORT_SYMBOL(sdw_cdns_exit_reset); >>>> * sdw_cdns_enable_interrupt() - Enable SDW interrupts and update config >>>> * @cdns: Cadence instance >>>> */ >>>> -int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) >>>> +int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state) >>>> { >>>> - u32 mask; >>>> + u32 slave_intmask0 = 0; >>>> + u32 slave_intmask1 = 0; >>>> + u32 mask = 0; >>>> + >>>> + if (!state) >>>> + goto update_masks; >>>> - cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK0, >>>> - CDNS_MCP_SLAVE_INTMASK0_MASK); >>>> - cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1, >>>> - CDNS_MCP_SLAVE_INTMASK1_MASK); >>>> + slave_intmask0 = CDNS_MCP_SLAVE_INTMASK0_MASK; >>>> + slave_intmask1 = CDNS_MCP_SLAVE_INTMASK1_MASK; >>>> /* enable detection of all slave state changes */ >>>> mask = CDNS_MCP_INT_SLAVE_MASK; >>>> @@ -849,6 +852,9 @@ int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns) >>>> if (interrupt_mask) /* parameter override */ >>>> mask = interrupt_mask; >>>> +update_masks: >>>> + cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK0, slave_intmask0); >>>> + cdns_writel(cdns, CDNS_MCP_SLAVE_INTMASK1, slave_intmask1); >>>> cdns_writel(cdns, CDNS_MCP_INTMASK, mask); >>>> /* commit changes */ >>>> diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h >>>> index 1a67728c5000..302351808098 100644 >>>> --- a/drivers/soundwire/cadence_master.h >>>> +++ b/drivers/soundwire/cadence_master.h >>>> @@ -162,7 +162,7 @@ int sdw_cdns_init(struct sdw_cdns *cdns); >>>> int sdw_cdns_pdi_init(struct sdw_cdns *cdns, >>>> struct sdw_cdns_stream_config config); >>>> int sdw_cdns_exit_reset(struct sdw_cdns *cdns); >>>> -int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns); >>>> +int sdw_cdns_enable_interrupt(struct sdw_cdns *cdns, bool state); >>>> #ifdef CONFIG_DEBUG_FS >>>> void sdw_cdns_debugfs_init(struct sdw_cdns *cdns, struct dentry *root); >>>> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c >>>> index cdb3243e8823..08530c136c5f 100644 >>>> --- a/drivers/soundwire/intel.c >>>> +++ b/drivers/soundwire/intel.c >>>> @@ -1036,7 +1036,7 @@ static int intel_probe(struct platform_device *pdev) >>>> ret = sdw_add_bus_master(&sdw->cdns.bus); >>>> if (ret) { >>>> dev_err(&pdev->dev, "sdw_add_bus_master fail: %d\n", ret); >>>> - goto err_master_reg; >>>> + return ret; >>> >>> I am not sure I like this line change, before this IIRC the function and >>> single place of return, so changing this doesn't seem to improve >>> anything here..? >> >> Doing a goto to do a return is not very nice either. > > Hrmm, isn't that what you are doing few lines below. The point here is > that this line of change here doesnt change anything, doesnt improve > anything so why change :) I knew there was a reason.. the existing code on your soundwire/next branch mixes goto and return, so I chose to use a return for the first case as well. ret = sdw_add_bus_master(&sdw->cdns.bus); if (ret) { dev_err(&pdev->dev, "sdw_add_bus_master fail: %d\n", ret); goto err_master_reg; >>> changed to return ret; } if (sdw->cdns.bus.prop.hw_disabled) { dev_info(&pdev->dev, "SoundWire master %d is disabled, ignoring\n", sdw->cdns.bus.link_id); return 0; } > >> I can change this, but it doesn't really matter: this entire code will be >> removed anyways to get rid of platform_devices and the probe itself will be >> split in two. >> >>> >>>> } >>>> if (sdw->cdns.bus.prop.hw_disabled) { >>>> @@ -1067,7 +1067,7 @@ static int intel_probe(struct platform_device *pdev) >>>> goto err_init; >>>> } >>>> - ret = sdw_cdns_enable_interrupt(&sdw->cdns); >>>> + ret = sdw_cdns_enable_interrupt(&sdw->cdns, true); >>>> if (ret < 0) { >>>> dev_err(sdw->cdns.dev, "cannot enable interrupts\n"); >>>> goto err_init; >>>> @@ -1076,7 +1076,7 @@ static int intel_probe(struct platform_device *pdev) >>>> ret = sdw_cdns_exit_reset(&sdw->cdns); >>>> if (ret < 0) { >>>> dev_err(sdw->cdns.dev, "unable to exit bus reset sequence\n"); >>>> - goto err_init; >>>> + goto err_interrupt; >>>> } >>>> /* Register DAIs */ >>>> @@ -1084,18 +1084,19 @@ static int intel_probe(struct platform_device *pdev) >>>> if (ret) { >>>> dev_err(sdw->cdns.dev, "DAI registration failed: %d\n", ret); >>>> snd_soc_unregister_component(sdw->cdns.dev); >>>> - goto err_dai; >>>> + goto err_interrupt; >>>> } >>>> intel_debugfs_init(sdw); >>>> return 0; >>>> +err_interrupt: >>>> + sdw_cdns_enable_interrupt(&sdw->cdns, false); >>>> err_dai: >>> >>> Isn't this unused now? > > ??? you missed this. fixed. _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel