From nobody Wed Dec 17 14:10:54 2025 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58083239E80; Mon, 13 Oct 2025 14:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760364367; cv=none; b=KHdJF65/2hGTljhaGn59eJEd0zo1x+G829/JhxEqe4HrxgCJ3sMd9CP2gB8Wel8DeisftYKt1A1sWx7cgZvbvgqp3nhWTNlqbkguEZiHiGZ2HyU9KcFbI80jPyWhlcgKA6t+YQ6m/5IHFIZD1pY+9Mb+7a2i4X3jwzd/fYu3vrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760364367; c=relaxed/simple; bh=tNsziVE5jYmSzOlHEZMMW4TRI1XMUGMM9Y7NuVWByXU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JX5mLw9M3rInK0dU10sTZwtKD3DAUR79qKLt7PFFYx10wY5TFpu2UXgc26AYAhxMaVkH7s4Y+47/oFb1QYDkq/ZIpkn+AMLMonT0VfqhYBBKqhYHe/dXp0OyJfvi2x/2WHe/saUvai8br+QrQvawEbuZp5b2fWOIDvbPkOpsAUg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=acC1oXwI; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="acC1oXwI" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id C5CBDC093B0; Mon, 13 Oct 2025 14:05:44 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id B9A81606C6; Mon, 13 Oct 2025 14:06:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8EB6C102F2270; Mon, 13 Oct 2025 16:06:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1760364362; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=tJvJirWplQIw8ej0XBKEq1dHZhTM0oTZfWGk4430Hpw=; b=acC1oXwImlbb6JlilhHcJuDsw356TfJQHzvDFBL5/edzRORxAEELLmMU2Og9+h1VDBL6oo HLWkIRkVtit6jBu8pvFmjiOlTT5Dy4g+0jNIaUhkwhrY1V621WOPqLum94CrruNDYpkSzt sy97XIzZPWNhPuI2hMQuo3S4TrsfzrPhHZ8mI0TKVJnFaYO1SvxKb0RWYKzXEaSo6i47AW vMC02rpG617srebTUM6lpXvnhH9hBHtg6+q5AGB9L4yYPMFGafzXPlohAUVp7+iyMQhGew p75mGg1R8rG1wxkMsoR7qwan0+mWkp4980RRhqyb/ci/G154gyHKn4GfPamRqg== From: Kory Maincent Date: Mon, 13 Oct 2025 16:05:32 +0200 Subject: [PATCH net-next v2 2/3] net: pse-pd: pd692x0: Separate configuration parsing from hardware setup Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251013-feature_pd692x0_reboot_keep_conf-v2-2-68ab082a93dd@bootlin.com> References: <20251013-feature_pd692x0_reboot_keep_conf-v2-0-68ab082a93dd@bootlin.com> In-Reply-To: <20251013-feature_pd692x0_reboot_keep_conf-v2-0-68ab082a93dd@bootlin.com> To: Oleksij Rempel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Thomas Petazzoni , kernel@pengutronix.de, Dent Project , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kory Maincent X-Mailer: b4 0.15-dev-8cb71 X-Last-TLS-Session-Version: TLSv1.3 From: Kory Maincent (Dent Project) Cache the port matrix configuration in driver private data to enable PSE controller reconfiguration. This refactoring separates device tree parsing from hardware configuration application, allowing settings to be reapplied without reparsing the device tree. This refactoring is a prerequisite for preserving PSE configuration across reboots to prevent power disruption to connected devices. Signed-off-by: Kory Maincent Reviewed-by: Simon Horman --- drivers/net/pse-pd/pd692x0.c | 115 ++++++++++++++++++++++++++++-----------= ---- 1 file changed, 76 insertions(+), 39 deletions(-) diff --git a/drivers/net/pse-pd/pd692x0.c b/drivers/net/pse-pd/pd692x0.c index 055e925c853e..782b1abf94cb 100644 --- a/drivers/net/pse-pd/pd692x0.c +++ b/drivers/net/pse-pd/pd692x0.c @@ -85,6 +85,11 @@ enum { PD692X0_MSG_CNT }; =20 +struct pd692x0_matrix { + u8 hw_port_a; + u8 hw_port_b; +}; + struct pd692x0_priv { struct i2c_client *client; struct pse_controller_dev pcdev; @@ -101,6 +106,8 @@ struct pd692x0_priv { enum ethtool_c33_pse_admin_state admin_state[PD692X0_MAX_PIS]; struct regulator_dev *manager_reg[PD692X0_MAX_MANAGERS]; int manager_pw_budget[PD692X0_MAX_MANAGERS]; + int nmanagers; + struct pd692x0_matrix *port_matrix; }; =20 /* Template list of communication messages. The non-null bytes defined here @@ -809,11 +816,6 @@ struct pd692x0_manager { int nports; }; =20 -struct pd692x0_matrix { - u8 hw_port_a; - u8 hw_port_b; -}; - static int pd692x0_of_get_ports_manager(struct pd692x0_priv *priv, struct pd692x0_manager *manager, @@ -903,7 +905,8 @@ pd692x0_of_get_managers(struct pd692x0_priv *priv, } =20 of_node_put(managers_node); - return nmanagers; + priv->nmanagers =3D nmanagers; + return 0; =20 out: for (i =3D 0; i < nmanagers; i++) { @@ -963,8 +966,7 @@ pd692x0_register_manager_regulator(struct device *dev, = char *reg_name, =20 static int pd692x0_register_managers_regulator(struct pd692x0_priv *priv, - const struct pd692x0_manager *manager, - int nmanagers) + const struct pd692x0_manager *manager) { struct device *dev =3D &priv->client->dev; size_t reg_name_len; @@ -975,7 +977,7 @@ pd692x0_register_managers_regulator(struct pd692x0_priv= *priv, */ reg_name_len =3D strlen(dev_name(dev)) + 23; =20 - for (i =3D 0; i < nmanagers; i++) { + for (i =3D 0; i < priv->nmanagers; i++) { static const char * const regulators[] =3D { "vaux5", "vaux3p3" }; struct regulator_dev *rdev; char *reg_name; @@ -1008,10 +1010,14 @@ pd692x0_register_managers_regulator(struct pd692x0_= priv *priv, } =20 static int -pd692x0_conf_manager_power_budget(struct pd692x0_priv *priv, int id, int p= w) +pd692x0_conf_manager_power_budget(struct pd692x0_priv *priv, int id) { struct pd692x0_msg msg, buf; - int ret, pw_mW =3D pw / 1000; + int ret, pw_mW; + + pw_mW =3D priv->manager_pw_budget[id] / 1000; + if (!pw_mW) + return 0; =20 msg =3D pd692x0_msg_template_list[PD692X0_MSG_GET_POWER_BANK]; msg.data[0] =3D id; @@ -1032,11 +1038,11 @@ pd692x0_conf_manager_power_budget(struct pd692x0_pr= iv *priv, int id, int pw) } =20 static int -pd692x0_configure_managers(struct pd692x0_priv *priv, int nmanagers) +pd692x0_req_managers_pw_budget(struct pd692x0_priv *priv) { int i, ret; =20 - for (i =3D 0; i < nmanagers; i++) { + for (i =3D 0; i < priv->nmanagers; i++) { struct regulator *supply =3D priv->manager_reg[i]->supply; int pw_budget; =20 @@ -1053,7 +1059,18 @@ pd692x0_configure_managers(struct pd692x0_priv *priv= , int nmanagers) return ret; =20 priv->manager_pw_budget[i] =3D pw_budget; - ret =3D pd692x0_conf_manager_power_budget(priv, i, pw_budget); + } + + return 0; +} + +static int +pd692x0_configure_managers(struct pd692x0_priv *priv) +{ + int i, ret; + + for (i =3D 0; i < priv->nmanagers; i++) { + ret =3D pd692x0_conf_manager_power_budget(priv, i); if (ret < 0) return ret; } @@ -1101,10 +1118,9 @@ pd692x0_set_port_matrix(const struct pse_pi_pairset = *pairset, =20 static int pd692x0_set_ports_matrix(struct pd692x0_priv *priv, - const struct pd692x0_manager *manager, - int nmanagers, - struct pd692x0_matrix port_matrix[PD692X0_MAX_PIS]) + const struct pd692x0_manager *manager) { + struct pd692x0_matrix *port_matrix =3D priv->port_matrix; struct pse_controller_dev *pcdev =3D &priv->pcdev; int i, ret; =20 @@ -1117,7 +1133,7 @@ pd692x0_set_ports_matrix(struct pd692x0_priv *priv, /* Update with values for every PSE PIs */ for (i =3D 0; i < pcdev->nr_lines; i++) { ret =3D pd692x0_set_port_matrix(&pcdev->pi[i].pairset[0], - manager, nmanagers, + manager, priv->nmanagers, &port_matrix[i]); if (ret) { dev_err(&priv->client->dev, @@ -1126,7 +1142,7 @@ pd692x0_set_ports_matrix(struct pd692x0_priv *priv, } =20 ret =3D pd692x0_set_port_matrix(&pcdev->pi[i].pairset[1], - manager, nmanagers, + manager, priv->nmanagers, &port_matrix[i]); if (ret) { dev_err(&priv->client->dev, @@ -1139,9 +1155,9 @@ pd692x0_set_ports_matrix(struct pd692x0_priv *priv, } =20 static int -pd692x0_write_ports_matrix(struct pd692x0_priv *priv, - const struct pd692x0_matrix port_matrix[PD692X0_MAX_PIS]) +pd692x0_write_ports_matrix(struct pd692x0_priv *priv) { + struct pd692x0_matrix *port_matrix =3D priv->port_matrix; struct pd692x0_msg msg, buf; int ret, i; =20 @@ -1166,13 +1182,32 @@ pd692x0_write_ports_matrix(struct pd692x0_priv *pri= v, return 0; } =20 +static int pd692x0_hw_conf_init(struct pd692x0_priv *priv) +{ + int ret; + + /* Is PD692x0 ready to be configured? */ + if (priv->fw_state !=3D PD692X0_FW_OK && + priv->fw_state !=3D PD692X0_FW_COMPLETE) + return 0; + + ret =3D pd692x0_configure_managers(priv); + if (ret) + return ret; + + ret =3D pd692x0_write_ports_matrix(priv); + if (ret) + return ret; + + return 0; +} + static void pd692x0_of_put_managers(struct pd692x0_priv *priv, - struct pd692x0_manager *manager, - int nmanagers) + struct pd692x0_manager *manager) { int i, j; =20 - for (i =3D 0; i < nmanagers; i++) { + for (i =3D 0; i < priv->nmanagers; i++) { for (j =3D 0; j < manager[i].nports; j++) of_node_put(manager[i].port_node[j]); of_node_put(manager[i].node); @@ -1201,48 +1236,50 @@ static void pd692x0_managers_free_pw_budget(struct = pd692x0_priv *priv) static int pd692x0_setup_pi_matrix(struct pse_controller_dev *pcdev) { struct pd692x0_priv *priv =3D to_pd692x0_priv(pcdev); - struct pd692x0_matrix port_matrix[PD692X0_MAX_PIS]; + struct pd692x0_matrix *port_matrix; struct pd692x0_manager *manager; - int ret, nmanagers; - - /* Should we flash the port matrix */ - if (priv->fw_state !=3D PD692X0_FW_OK && - priv->fw_state !=3D PD692X0_FW_COMPLETE) - return 0; + int ret; =20 manager =3D kcalloc(PD692X0_MAX_MANAGERS, sizeof(*manager), GFP_KERNEL); if (!manager) return -ENOMEM; =20 + port_matrix =3D devm_kcalloc(&priv->client->dev, PD692X0_MAX_PIS, + sizeof(*port_matrix), GFP_KERNEL); + if (!port_matrix) { + ret =3D -ENOMEM; + goto err_free_manager; + } + priv->port_matrix =3D port_matrix; + ret =3D pd692x0_of_get_managers(priv, manager); if (ret < 0) goto err_free_manager; =20 - nmanagers =3D ret; - ret =3D pd692x0_register_managers_regulator(priv, manager, nmanagers); + ret =3D pd692x0_register_managers_regulator(priv, manager); if (ret) goto err_of_managers; =20 - ret =3D pd692x0_configure_managers(priv, nmanagers); + ret =3D pd692x0_req_managers_pw_budget(priv); if (ret) goto err_of_managers; =20 - ret =3D pd692x0_set_ports_matrix(priv, manager, nmanagers, port_matrix); + ret =3D pd692x0_set_ports_matrix(priv, manager); if (ret) goto err_managers_req_pw; =20 - ret =3D pd692x0_write_ports_matrix(priv, port_matrix); + ret =3D pd692x0_hw_conf_init(priv); if (ret) goto err_managers_req_pw; =20 - pd692x0_of_put_managers(priv, manager, nmanagers); + pd692x0_of_put_managers(priv, manager); kfree(manager); return 0; =20 err_managers_req_pw: pd692x0_managers_free_pw_budget(priv); err_of_managers: - pd692x0_of_put_managers(priv, manager, nmanagers); + pd692x0_of_put_managers(priv, manager); err_free_manager: kfree(manager); return ret; @@ -1647,7 +1684,7 @@ static enum fw_upload_err pd692x0_fw_poll_complete(st= ruct fw_upload *fwl) return FW_UPLOAD_ERR_FW_INVALID; } =20 - ret =3D pd692x0_setup_pi_matrix(&priv->pcdev); + ret =3D pd692x0_hw_conf_init(priv); if (ret < 0) { dev_err(&client->dev, "Error configuring ports matrix (%pe)\n", ERR_PTR(ret)); --=20 2.43.0