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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 CCE05CA9EA5 for ; Mon, 21 Oct 2019 04:17:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98DA4205ED for ; Mon, 21 Oct 2019 04:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571631427; bh=oAJWQkb7MV1r6HoF3G5xg9smm71+/TpMQrUOwUHVAz4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=M/NQEKQzp5n1Ljmn54Hg/oF6fLcCZc20pPC2eCZ75TFIwmK7OR3pOEh39dBIZ52Vw k3G92RdJcNaOwoLsFDNqiHF+Kjl/cl0TDGPo5dg0aA7Fal6qJxwK1SZDpWP/dpWenH o1Z0ygwZDMzNQGUfUh/6KKz5gvSazMji0f3r7IyQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbfJUEOL (ORCPT ); Mon, 21 Oct 2019 00:14:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:40154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725497AbfJUEOL (ORCPT ); Mon, 21 Oct 2019 00:14:11 -0400 Received: from localhost (unknown [122.167.89.206]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 00D3722466; Mon, 21 Oct 2019 04:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571631250; bh=oAJWQkb7MV1r6HoF3G5xg9smm71+/TpMQrUOwUHVAz4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Kv4QVhywrNXj/X7MB/sFHTwmoAYAaxd3FBJZz8PjMgSNgrTsDMTrop8ocf36JUpjE iFeRR8kefULnHjt1/zdcUM4YvcswBSGbIEcxxPQogDimFi1q5hSd+RWecdILRp+HDi PbstyO9hefmm/JNPqmv8rbl/Jr5OepZwYU8yGjy8= Date: Mon, 21 Oct 2019 09:44:04 +0530 From: Vinod Koul To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com, srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com, Bard liao , Rander Wang , Ranjani Sridharan , Sanyog Kale Subject: Re: [PATCH v2 4/5] soundwire: intel/cadence: add flag for interrupt enable Message-ID: <20191021041404.GY2654@vkoul-mobl> References: <20190916190952.32388-1-pierre-louis.bossart@linux.intel.com> <20190916190952.32388-5-pierre-louis.bossart@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190916190952.32388-5-pierre-louis.bossart@linux.intel.com> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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..? > } > > 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? > free_irq(sdw->res->irq, sdw); > err_init: > sdw_delete_bus_master(&sdw->cdns.bus); > -err_master_reg: > return ret; > } > > @@ -1107,6 +1108,7 @@ static int intel_remove(struct platform_device *pdev) > > if (!sdw->cdns.bus.prop.hw_disabled) { > intel_debugfs_exit(sdw); > + sdw_cdns_enable_interrupt(&sdw->cdns, false); > free_irq(sdw->res->irq, sdw); > snd_soc_unregister_component(sdw->cdns.dev); > } > -- > 2.20.1 -- ~Vinod