From nobody Sun Feb 8 22:05:42 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F874C43219 for ; Fri, 25 Nov 2022 14:20:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229959AbiKYOUw (ORCPT ); Fri, 25 Nov 2022 09:20:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229585AbiKYOUr (ORCPT ); Fri, 25 Nov 2022 09:20:47 -0500 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B303C2315F for ; Fri, 25 Nov 2022 06:20:46 -0800 (PST) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AP8g14e009072; Fri, 25 Nov 2022 08:20:31 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=Klfy/J6HbCzr6VIo5CahWHKVbg4TpoR63IGt+03O3ZU=; b=LTL9sCj6d7N4D6jvhUAIa2KJA7sb3yJX6jGoocgthZdZcv2pWW7y/vMZownk5IEOsCAp lLsZFFPUS4f9Ih/Ttt1ulv6qVt8ba6TuosOe7jsR8hRRUZTeatSTQBgmFdwThLKm4YMR rcnwIWNE4doqdgB4qfad22FYiEZl2Ujt96dSOjSd3Fg0t2L/boCRqB0QazSDwWKWWG3u r0FInFF5xgUXBB70RYINpwRPeeLpLqQ9LN07xAGPLuUNrqrw9KyQqMWzq6blvwYW/wdg cjtedgU2sWoBqAYXLdqcGEp0bmt63WLNDEXNuE0045uzWBxgunWffCOciU2U7jQRRBn2 ng== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3kxvet7ccp-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Nov 2022 08:20:31 -0600 Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 25 Nov 2022 08:20:29 -0600 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.20 via Frontend Transport; Fri, 25 Nov 2022 08:20:29 -0600 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 37CA5B38; Fri, 25 Nov 2022 14:20:29 +0000 (UTC) From: Charles Keepax To: CC: , , , , , Subject: [PATCH v4 4/4] soundwire: stream: Move remaining register accesses over to no_pm Date: Fri, 25 Nov 2022 14:20:28 +0000 Message-ID: <20221125142028.1118618-5-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221125142028.1118618-1-ckeepax@opensource.cirrus.com> References: <20221125142028.1118618-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: LooFxkxWoUaNREqwQAfMgxTxqeMC4YcB X-Proofpoint-GUID: LooFxkxWoUaNREqwQAfMgxTxqeMC4YcB X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There is no need to play with the runtime reference everytime a register is accessed. All the remaining "pm" style register accesses trace back to 4 functions: sdw_prepare_stream sdw_deprepare_stream sdw_enable_stream sdw_disable_stream Any sensible implementation will need to hold a runtime reference across all those functions, it makes no sense to be allowing the device/bus to suspend whilst streams are being prepared/enabled. And certainly in the case of the all existing users, they all call these functions from hw_params/prepare/trigger/hw_free callbacks in ALSA, which will have already runtime resumed all the audio devices associated during the open callback. Reviewed-by: Pierre-Louis Bossart Signed-off-by: Charles Keepax --- No change since v3. drivers/soundwire/bus.c | 2 +- drivers/soundwire/stream.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index ef4878258afad..d87a188fcce1e 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1214,7 +1214,7 @@ int sdw_configure_dpn_intr(struct sdw_slave *slave, val &=3D ~SDW_DPN_INT_PORT_READY; } =20 - ret =3D sdw_update(slave, addr, (mask | SDW_DPN_INT_PORT_READY), val); + ret =3D sdw_update_no_pm(slave, addr, (mask | SDW_DPN_INT_PORT_READY), va= l); if (ret < 0) dev_err(&slave->dev, "SDW_DPN_INTMASK write failed:%d\n", val); diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index bd502368339e5..df3b36670df4c 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -81,14 +81,14 @@ static int _sdw_program_slave_port_params(struct sdw_bu= s *bus, } =20 /* Program DPN_OffsetCtrl2 registers */ - ret =3D sdw_write(slave, addr1, t_params->offset2); + ret =3D sdw_write_no_pm(slave, addr1, t_params->offset2); if (ret < 0) { dev_err(bus->dev, "DPN_OffsetCtrl2 register write failed\n"); return ret; } =20 /* Program DPN_BlockCtrl3 register */ - ret =3D sdw_write(slave, addr2, t_params->blk_pkg_mode); + ret =3D sdw_write_no_pm(slave, addr2, t_params->blk_pkg_mode); if (ret < 0) { dev_err(bus->dev, "DPN_BlockCtrl3 register write failed\n"); return ret; @@ -105,7 +105,7 @@ static int _sdw_program_slave_port_params(struct sdw_bu= s *bus, /* Program DPN_SampleCtrl2 register */ wbuf =3D FIELD_GET(SDW_DPN_SAMPLECTRL_HIGH, t_params->sample_interval - 1= ); =20 - ret =3D sdw_write(slave, addr3, wbuf); + ret =3D sdw_write_no_pm(slave, addr3, wbuf); if (ret < 0) { dev_err(bus->dev, "DPN_SampleCtrl2 register write failed\n"); return ret; @@ -115,7 +115,7 @@ static int _sdw_program_slave_port_params(struct sdw_bu= s *bus, wbuf =3D FIELD_PREP(SDW_DPN_HCTRL_HSTART, t_params->hstart); wbuf |=3D FIELD_PREP(SDW_DPN_HCTRL_HSTOP, t_params->hstop); =20 - ret =3D sdw_write(slave, addr4, wbuf); + ret =3D sdw_write_no_pm(slave, addr4, wbuf); if (ret < 0) dev_err(bus->dev, "DPN_HCtrl register write failed\n"); =20 @@ -163,7 +163,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, wbuf =3D FIELD_PREP(SDW_DPN_PORTCTRL_DATAMODE, p_params->data_mode); wbuf |=3D FIELD_PREP(SDW_DPN_PORTCTRL_FLOWMODE, p_params->flow_mode); =20 - ret =3D sdw_update(s_rt->slave, addr1, 0xF, wbuf); + ret =3D sdw_update_no_pm(s_rt->slave, addr1, 0xF, wbuf); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_PortCtrl register write failed for port %d\n", @@ -173,7 +173,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, =20 if (!dpn_prop->read_only_wordlength) { /* Program DPN_BlockCtrl1 register */ - ret =3D sdw_write(s_rt->slave, addr2, (p_params->bps - 1)); + ret =3D sdw_write_no_pm(s_rt->slave, addr2, (p_params->bps - 1)); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_BlockCtrl1 register write failed for port %d\n", @@ -184,7 +184,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, =20 /* Program DPN_SampleCtrl1 register */ wbuf =3D (t_params->sample_interval - 1) & SDW_DPN_SAMPLECTRL_LOW; - ret =3D sdw_write(s_rt->slave, addr3, wbuf); + ret =3D sdw_write_no_pm(s_rt->slave, addr3, wbuf); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_SampleCtrl1 register write failed for port %d\n", @@ -193,7 +193,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, } =20 /* Program DPN_OffsetCtrl1 registers */ - ret =3D sdw_write(s_rt->slave, addr4, t_params->offset1); + ret =3D sdw_write_no_pm(s_rt->slave, addr4, t_params->offset1); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_OffsetCtrl1 register write failed for port %d\n", @@ -203,7 +203,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, =20 /* Program DPN_BlockCtrl2 register*/ if (t_params->blk_grp_ctrl_valid) { - ret =3D sdw_write(s_rt->slave, addr5, t_params->blk_grp_ctrl); + ret =3D sdw_write_no_pm(s_rt->slave, addr5, t_params->blk_grp_ctrl); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_BlockCtrl2 reg write failed for port %d\n", @@ -214,7 +214,7 @@ static int sdw_program_slave_port_params(struct sdw_bus= *bus, =20 /* program DPN_LaneCtrl register */ if (slave_prop->lane_control_support) { - ret =3D sdw_write(s_rt->slave, addr6, t_params->lane_ctrl); + ret =3D sdw_write_no_pm(s_rt->slave, addr6, t_params->lane_ctrl); if (ret < 0) { dev_err(&s_rt->slave->dev, "DPN_LaneCtrl register write failed for port %d\n", @@ -319,9 +319,9 @@ static int sdw_enable_disable_slave_ports(struct sdw_bu= s *bus, * it is safe to reset this register */ if (en) - ret =3D sdw_write(s_rt->slave, addr, p_rt->ch_mask); + ret =3D sdw_write_no_pm(s_rt->slave, addr, p_rt->ch_mask); else - ret =3D sdw_write(s_rt->slave, addr, 0x0); + ret =3D sdw_write_no_pm(s_rt->slave, addr, 0x0); =20 if (ret < 0) dev_err(&s_rt->slave->dev, @@ -476,9 +476,9 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *= bus, addr =3D SDW_DPN_PREPARECTRL(p_rt->num); =20 if (prep) - ret =3D sdw_write(s_rt->slave, addr, p_rt->ch_mask); + ret =3D sdw_write_no_pm(s_rt->slave, addr, p_rt->ch_mask); else - ret =3D sdw_write(s_rt->slave, addr, 0x0); + ret =3D sdw_write_no_pm(s_rt->slave, addr, 0x0); =20 if (ret < 0) { dev_err(&s_rt->slave->dev, @@ -491,7 +491,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *= bus, wait_for_completion_timeout(port_ready, msecs_to_jiffies(dpn_prop->ch_prep_timeout)); =20 - val =3D sdw_read(s_rt->slave, SDW_DPN_PREPARESTATUS(p_rt->num)); + val =3D sdw_read_no_pm(s_rt->slave, SDW_DPN_PREPARESTATUS(p_rt->num)); if ((val < 0) || (val & p_rt->ch_mask)) { ret =3D (val < 0) ? val : -ETIMEDOUT; dev_err(&s_rt->slave->dev, --=20 2.30.2