net: Add support for Power over Ethernet (PoE)
Subsystems (8)
Kory Maincent
maintainerv6 cover net: Add support for Power over Ethernet (PoE)
From: Kory Maincent (Dent Project) <[email protected]>
This patch series aims at adding support for PoE (Power over Ethernet), based on the already existing support for PoDL (Power over Data Line) implementation. In addition, it adds support for two specific PoE controller, the Microchip PD692x0 and the TI TPS23881.
In detail:
- Patch 1 to 13 prepare net to support PoE devices.
- Patch 14 and 15 add PD692x0 PoE PSE controller driver and its binding.
- Patch 16 and 17 add TI TPS23881 PSE controller driver and its binding.
Changes in v6:
- TPS23881 fix firmware management release missing.
- Use pcdev device pointer as regulator consumer and provider.
- Rename of_legacy to no_of_pse_pi.
- Add kdoc, and separate functions for better readability.
- Add vpwr-supply regulator parent.
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Fix bindings nit.
- Add supported-polarity parameter to bindings.
- Fix yamllint binding errors.
- Remove the nested lock brought by the use of regulator framework.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Replaced sponsored-by tag by a simple sentence.
- Fix pse_pi node bindings.
- Add pse pi documentation written by Oleksij.
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Add patches to add Oleksij and myself to PSE MAINTAINERS.
- Add patches to add pse devlink.
- Add TI TPS23881 PSE controller driver with its binding.
- Replace pse_get_types helper by pse_has_podl and pse_has_c33
- Changed the PSE core bindings.
- Add a setup_pi_matrix callback.
- Register regulator for each PSE PI (Power Interface).
- Changed the PD692x0 bindings.
- Updated PD692x0 drivers to new bindings and PSE PI description.
- Updated PD692x0 drivers according to the reviews and made fixes.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Extract "firmware_loader: Expand Firmware upload error codes patches" to send it alone and get it merge in an immutable branch.
- Add "c33" prefix for PoE variables and enums.
- Enhance few comments.
- Add PSE Documentation.
- Make several changes in pd692x0 driver, mainly for readibility.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Kory Maincent (17):
MAINTAINERS: net: Add Oleksij to pse-pd maintainers
of: property: Add fw_devlink support for pse parent
net: pse-pd: Rectify and adapt the naming of admin_cotrol member of struct pse_control_config
ethtool: Expand Ethernet Power Equipment with c33 (PoE) alongside PoDL
net: pse-pd: Introduce PSE types enumeration
net: ethtool: pse-pd: Expand pse commands with the PSE PoE interface
netlink: specs: Modify pse attribute prefix
netlink: specs: Expand the pse netlink command with PoE interface
MAINTAINERS: Add myself to pse networking maintainer
net: pse-pd: Add support for PSE PIs
dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
net: pse-pd: Add support for setup_pi_matrix callback
net: pse-pd: Use regulator framework within PSE framework
dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
net: pse-pd: Add PD692x0 PSE controller driver
dt-bindings: net: pse-pd: Add bindings for TPS23881 PSE controller
net: pse-pd: Add TI TPS23881 PSE controller driver
.../bindings/net/pse-pd/microchip,pd692x0.yaml | 158 +++ .../bindings/net/pse-pd/pse-controller.yaml | 102 +- .../bindings/net/pse-pd/ti,tps23881.yaml | 93 ++ Documentation/netlink/specs/ethtool.yaml | 33 +- Documentation/networking/ethtool-netlink.rst | 20 + Documentation/networking/index.rst | 1 + Documentation/networking/pse-pd/index.rst | 10 + Documentation/networking/pse-pd/introduction.rst | 73 ++ Documentation/networking/pse-pd/pse-pi.rst | 302 +++++ MAINTAINERS | 8 + drivers/net/pse-pd/Kconfig | 20 + drivers/net/pse-pd/Makefile | 2 + drivers/net/pse-pd/pd692x0.c | 1223 ++++++++++++++++++++ drivers/net/pse-pd/pse_core.c | 511 +++++++- drivers/net/pse-pd/pse_regulator.c | 49 +- drivers/net/pse-pd/tps23881.c | 818 +++++++++++++ drivers/of/property.c | 2 + include/linux/pse-pd/pse.h | 86 +- include/uapi/linux/ethtool.h | 55 + include/uapi/linux/ethtool_netlink.h | 3 + net/ethtool/pse-pd.c | 60 +- 21 files changed, 3527 insertions(+), 102 deletions(-)
---
base-commit: f81d6cec4a4ed1b6580340a43ec68f3132423964
change-id: 20231024-feature_poe-139490e73403
Best regards,
Signature · 3 lines
K�ry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerPATCH v6 1/17 MAINTAINERS: net: Add Oleksij to pse-pd maintainers
From: Kory Maincent (Dent Project) <[email protected]>
Oleksij was the first to add support for pse-pd net subsystem. Add himself to the maintainers seems logical.
---
Changes in v3:
- New patch
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -17765,6 +17765,13 @@ F: include/net/psample.h F: include/uapi/linux/psample.h F: net/psample +PSE NETWORK DRIVER +M: Oleksij Rempel <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/net/pse-pd/ +F: drivers/net/pse-pd/ + PSTORE FILESYSTEM M: Kees Cook <[email protected]> R: Tony Luck <[email protected]>
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 01/17] MAINTAINERS: net: Add Oleksij to pse-pd maintainers
Quoted 7 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Oleksij was the first to add support for pse-pd net subsystem. Add himself to the maintainers seems logical.
Acked-by Oleksij Rempel <[email protected]>Signed-off-by Kory Maincent <[email protected]>
Andrew
Kory Maincent
maintainerPATCH v6 2/17 of: property: Add fw_devlink support for pse parent
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
This allows fw_devlink to create device links between consumers of a PSE and the supplier of the PSE.
---
Changes in v3:
- New patch
--- drivers/of/property.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/of/property.c +2 -0
@@ -1252,6 +1252,7 @@ DEFINE_SIMPLE_PROP(backlight, "backlight", NULL) DEFINE_SIMPLE_PROP(panel, "panel", NULL) DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells") DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL) +DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells") DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)DEFINE_SUFFIX_PROP (gpio,"-gpio" ,"#gpio-cells" )
@@ -1357,6 +1358,7 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_backlight, }, { .parse_prop = parse_panel, }, { .parse_prop = parse_msi_parent, }, + { .parse_prop = parse_pses, }, { .parse_prop = parse_gpio_compat, }, { .parse_prop = parse_interrupts, }, { .parse_prop = parse_regulators, },
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 3/17 net: pse-pd: Rectify and adapt the naming of admin_cotrol member of struct pse_control_config
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
In commit 18ff0bcda6d1 ("ethtool: add interface to interact with Ethernet Power Equipment"), the 'pse_control_config' structure was introduced, housing a single member labeled 'admin_cotrol' responsible for maintaining the operational state of the PoDL PSE functions.
A noticeable typographical error exists in the naming of this field ('cotrol' should be corrected to 'control'), which this commit aims to rectify.
Furthermore, with upcoming extensions of this structure to encompass PoE functionalities, the field is being renamed to 'podl_admin_state' to distinctly indicate that this state is tailored specifically for PoDL."
--- drivers/net/pse-pd/pse_regulator.c | 8 ++++---- include/linux/pse-pd/pse.h | 4 ++-- net/ethtool/pse-pd.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/pse-pd/pse_regulator.c +4 -4
@@ -31,10 +31,10 @@ pse_reg_ethtool_set_config(struct pse_controller_dev *pcdev, unsigned long id,struct pse_reg_priv *priv =to_pse_reg (pcdev);int ret; -if (priv->admin_state == config->admin_cotrol) +if (priv->admin_state == config->podl_admin_control)return 0 ; -switch (config->admin_cotrol) { +switch (config->podl_admin_control) {case ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED : ret =regulator_enable (priv->ps);break ;
@@ -43,14 +43,14 @@ pse_reg_ethtool_set_config(struct pse_controller_dev *pcdev, unsigned long id,break ;default :dev_err (pcdev->dev,"Unknown admin state %i\n" , - config->admin_cotrol); + config->podl_admin_control); ret = -ENOTSUPP ; }if (ret)return ret; - priv->admin_state = config->admin_cotrol; + priv->admin_state = config->podl_admin_control;return 0 ; }
include/linux/pse-pd/pse.h +2 -2
@@ -15,11 +15,11 @@ struct pse_controller_dev;/** * struct pse_control_config - PSE control/channel configuration. * -* @admin_cotrol: set PoDL PSE admin control as described in +* @podl_admin_control: set PoDL PSE admin control as described in * IEEE 802.3-2018 30.15.1.2.1 acPoDLPSEAdminControl */ struct pse_control_config { -enum ethtool_podl_pse_admin_state admin_cotrol; +enum ethtool_podl_pse_admin_state podl_admin_control; };/**
net/ethtool/pse-pd.c +1 -1
@@ -130,7 +130,7 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)struct phy_device *phydev;/* this values are already validated by the ethnl_pse_set_policy */ - config.admin_cotrol =nla_get_u32 (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ]); + config.podl_admin_control =nla_get_u32 (tb[ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ]); phydev = dev->phydev;if (!phydev) {
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 4/17 ethtool: Expand Ethernet Power Equipment with c33 (PoE) alongside PoDL
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
In the current PSE interface for Ethernet Power Equipment, support is limited to PoDL. This patch extends the interface to accommodate the objects specified in IEEE 802.3-2022 145.2 for Power sourcing Equipment (PSE).
The following objects are now supported and considered mandatory:
- IEEE 802.3-2022 30.9.1.1.5 aPSEPowerDetectionStatus
- IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState
- IEEE 802.3-2022 30.9.1.2.1 aPSEAdminControl
To avoid confusion between "PoDL PSE" and "PoE PSE", which have similar names but distinct values, we have followed the suggestion of Oleksij Rempel and Andrew Lunn to maintain separate naming schemes for each, using c33 (clause 33) prefix for "PoE PSE".
You can find more details in the discussion threads here:
https://lore.kernel.org/netdev/[email protected]/
https://lore.kernel.org/netdev/[email protected]/
---
Changes in v2:
- Rename all the PoE variables and enum with a c33 prefix.
- Add documentation, thanks to Oleksij for having written one.
Changes in v3:
- Fix documentation build warning.
--- Documentation/networking/index.rst | 1 + Documentation/networking/pse-pd/index.rst | 9 +++ Documentation/networking/pse-pd/introduction.rst | 73 ++++++++++++++++++++++++ include/linux/pse-pd/pse.h | 9 +++ include/uapi/linux/ethtool.h | 43 ++++++++++++++ include/uapi/linux/ethtool_netlink.h | 3 + 6 files changed, 138 insertions(+)
Documentation/networking/index.rst +1 -0
@@ -93,6 +93,7 @@ Contents: plip ppp_generic proc_net_tcp + pse-pd/index radiotap-headers rds regulatory
Documentation/networking/pse-pd/index.rst new file +9 -0
@@ -0,0 +1,9 @@ +.. SPDX-License-Identifier: GPL-2.0 + +Power Sourcing Equipment (PSE) Documentation +============================================ + +.. toctree:: + :maxdepth: 2 + + introduction
Documentation/networking/pse-pd/introduction.rst new file +73 -0
73 lines not on this page · raw message
include/linux/pse-pd/pse.h +9 -0
@@ -17,9 +17,12 @@ struct pse_controller_dev;* * @podl_admin_control: set PoDL PSE admin control as described in * IEEE 802.3-2018 30.15.1.2.1 acPoDLPSEAdminControl +* @c33_admin_control: set PSE admin control as described in +* IEEE 802.3-2022 30.9.1.2.1 acPSEAdminControl */ struct pse_control_config {enum ethtool_podl_pse_admin_state podl_admin_control; +enum ethtool_c33_pse_admin_state c33_admin_control; };/**
@@ -29,10 +32,16 @@ struct pse_control_config {* functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState * @podl_pw_status: power detection status of the PoDL PSE. * IEEE 802.3-2018 30.15.1.1.3 aPoDLPSEPowerDetectionStatus: +* @c33_admin_state: operational state of the PSE +* functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState +* @c33_pw_status: power detection status of the PSE. +* IEEE 802.3-2022 30.9.1.1.5 aPSEPowerDetectionStatus: */ struct pse_control_status {enum ethtool_podl_pse_admin_state podl_admin_state;enum ethtool_podl_pse_pw_d_status podl_pw_status; +enum ethtool_c33_pse_admin_state c33_admin_state; +enum ethtool_c33_pse_pw_d_status c33_pw_status; };/**
include/uapi/linux/ethtool.h +43 -0
49 lines not on this page · raw message
include/uapi/linux/ethtool_netlink.h +3 -0
@@ -895,6 +895,9 @@ enum {ETHTOOL_A_PODL_PSE_ADMIN_STATE ,/* u32 */ ETHTOOL_A_PODL_PSE_ADMIN_CONTROL ,/* u32 */ ETHTOOL_A_PODL_PSE_PW_D_STATUS ,/* u32 */ +ETHTOOL_A_C33_PSE_ADMIN_STATE ,/* u32 */ +ETHTOOL_A_C33_PSE_ADMIN_CONTROL ,/* u32 */ +ETHTOOL_A_C33_PSE_PW_D_STATUS ,/* u32 */ /* add new constants above here */ __ETHTOOL_A_PSE_CNT,
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 5/17 net: pse-pd: Introduce PSE types enumeration
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Introduce an enumeration to define PSE types (C33 or PoDL), utilizing a bitfield for potential future support of both types. Include 'pse_get_types' helper for external access to PSE type info.
---
Changes in v2:
- Rename PSE_POE to PSE_C33 to have naming consistency.
- Use "static inline" instead of simple static in the header
Changes in v3:
- Move the pse_type enum in uapi.
- Replace pse_get_types helper by pse_has_podl and pse_has_c33.
Changes in v5:
- Move the pse types enum in ethtool.
- Add ethtool prefix to the value.
Changes in v6:
- Fix a kdoc nit.
--- drivers/net/pse-pd/pse_core.c | 12 ++++++++++++ drivers/net/pse-pd/pse_regulator.c | 1 + include/linux/pse-pd/pse.h | 15 +++++++++++++++ include/uapi/linux/ethtool.h | 12 ++++++++++++ 4 files changed, 40 insertions(+)
drivers/net/pse-pd/pse_core.c +12 -0
@@ -312,3 +312,15 @@ int pse_ethtool_set_config(struct pse_control *psec,return err; }EXPORT_SYMBOL_GPL (pse_ethtool_set_config); + +bool pse_has_podl (struct pse_control *psec) +{ +return psec->pcdev->types ÐTOOL_PSE_PODL ; +} +EXPORT_SYMBOL_GPL (pse_has_podl); + +bool pse_has_c33 (struct pse_control *psec) +{ +return psec->pcdev->types ÐTOOL_PSE_C33 ; +} +EXPORT_SYMBOL_GPL (pse_has_c33);
drivers/net/pse-pd/pse_regulator.c +1 -0
@@ -116,6 +116,7 @@ pse_reg_probe(struct platform_device *pdev) priv->pcdev.owner =THIS_MODULE ; priv->pcdev.ops = &pse_reg_ops; priv->pcdev.dev = dev; + priv->pcdev.types =ETHTOOL_PSE_PODL ; ret =devm_pse_controller_register (dev, &priv->pcdev);if (ret) { dev_err(dev, "failed to register PSE controller (%pe)\n",
include/linux/pse-pd/pse.h +15 -0
@@ -77,6 +77,7 @@ struct pse_control;* device tree to id as given to the PSE control ops * @nr_lines: number of PSE controls in this controller device * @lock: Mutex for serialization access to the PSE controller +* @types: types of the PSE controller */ struct pse_controller_dev {const struct pse_controller_ops *ops;
@@ -89,6 +90,7 @@ struct pse_controller_dev { const struct of_phandle_args *pse_spec);unsigned int nr_lines;struct mutex lock; +enum ethtool_pse_types types; };#if IS_ENABLED (CONFIG_PSE_CONTROLLER )
@@ -108,6 +110,9 @@ int pse_ethtool_set_config(struct pse_control *psec,struct netlink_ext_ack *extack, const struct pse_control_config *config); +bool pse_has_podl (struct pse_control *psec); +bool pse_has_c33 (struct pse_control *psec); +#else static inline struct pse_control *of_pse_control_get (struct device_node *node)
@@ -133,6 +138,16 @@ static inline int pse_ethtool_set_config(struct pse_control *psec,return -ENOTSUPP ; } +static inline bool pse_has_podl (struct pse_control *psec) +{ +return false; +} + +static inline bool pse_has_c33 (struct pse_control *psec) +{ +return false; +} +#endif #endif
include/uapi/linux/ethtool.h +12 -0
@@ -752,6 +752,18 @@ enum ethtool_module_power_mode { ETHTOOL_MODULE_POWER_MODE_HIGH, }; +/** +* enum ethtool_pse_types - Types of PSE controller. +* @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown +* @ETHTOOL_PSE_PODL: PSE controller which support PoDL +* @ETHTOOL_PSE_C33: PSE controller which support Clause 33 (PoE) +*/ +enum ethtool_pse_types { +ETHTOOL_PSE_UNKNOWN =1 <<0 , +ETHTOOL_PSE_PODL =1 <<1 , +ETHTOOL_PSE_C33 =1 <<2 , +}; +/** * enum ethtool_c33_pse_admin_state - operational state of the PoDL PSE * functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 6/17 net: ethtool: pse-pd: Expand pse commands with the PSE PoE interface
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add PSE PoE interface support in the ethtool pse command.
---
Changes in v2:
- Follow the "c33" PoE prefix naming change.
Changes in v3:
- Replace the pse_get_types() helper by pse_has_podl() and pse_has_c33().
- Replace PoE to c33 in the netlink error log.
- Fix documentation build warning.
--- Documentation/networking/ethtool-netlink.rst | 20 ++++++++++ net/ethtool/pse-pd.c | 60 +++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 10 deletions(-)
Documentation/networking/ethtool-netlink.rst +20 -0
@@ -1717,6 +1717,10 @@ Kernel response contents: PSE functions ``ETHTOOL_A_PODL_PSE_PW_D_STATUS`` u32 power detection status of the PoDL PSE. + ``ETHTOOL_A_C33_PSE_ADMIN_STATE`` u32 Operational state of the PoE + PSE functions. + ``ETHTOOL_A_C33_PSE_PW_D_STATUS`` u32 power detection status of the + PoE PSE. ====================================== ====== ============================= When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` attribute identifies
@@ -1728,6 +1732,12 @@ aPoDLPSEAdminState. Possible values are: .. kernel-doc:: include/uapi/linux/ethtool.h :identifiers: ethtool_podl_pse_admin_state +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_STATE`` implementing +``IEEE 802.3-2022`` 30.9.1.1.2 aPSEAdminState. + +.. kernel-doc:: include/uapi/linux/ethtool.h + :identifiers: ethtool_c33_pse_admin_state + When set, the optional ``ETHTOOL_A_PODL_PSE_PW_D_STATUS`` attribute identifies the power detection status of the PoDL PSE. The status depend on internal PSE state machine and automatic PD classification support. This option is
@@ -1737,6 +1747,12 @@ Possible values are: .. kernel-doc:: include/uapi/linux/ethtool.h :identifiers: ethtool_podl_pse_pw_d_status +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_PW_D_STATUS`` implementing +``IEEE 802.3-2022`` 30.9.1.1.5 aPSEPowerDetectionStatus. + +.. kernel-doc:: include/uapi/linux/ethtool.h + :identifiers: ethtool_c33_pse_pw_d_status + PSE_SET =======
@@ -1747,6 +1763,7 @@ Request contents: ====================================== ====== ============================= ``ETHTOOL_A_PSE_HEADER`` nested request header ``ETHTOOL_A_PODL_PSE_ADMIN_CONTROL`` u32 Control PoDL PSE Admin state + ``ETHTOOL_A_C33_PSE_ADMIN_CONTROL`` u32 Control PSE Admin state ====================================== ====== ============================= When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_CONTROL`` attribute is used
@@ -1754,6 +1771,9 @@ to control PoDL PSE Admin functions. This option is implementing ``IEEE 802.3-2018`` 30.15.1.2.1 acPoDLPSEAdminControl. See ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` for supported values. +The same goes for ``ETHTOOL_A_C33_PSE_ADMIN_CONTROL`` implementing +``IEEE 802.3-2022`` 30.9.1.2.1 acPSEAdminControl. + RSS_GET =======
net/ethtool/pse-pd.c +50 -10
93 lines not on this page · raw message
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 7/17 netlink: specs: Modify pse attribute prefix
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Remove podl from the attribute prefix to prepare the support of PoE pse netlink spec.
---
Changes in v2:
- Add the ethtool auto generated code.
Changes in v3:
- Remove the ethtool auto generated code.
--- Documentation/netlink/specs/ethtool.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
Documentation/netlink/specs/ethtool.yaml +9 -9
@@ -878,17 +878,17 @@ attribute-sets: type: nest nested-attributes: header - - name: admin-state + name: podl-pse-admin-state type: u32 - name-prefix: ethtool-a-podl-pse- + name-prefix: ethtool-a- - - name: admin-control + name: podl-pse-admin-control type: u32 - name-prefix: ethtool-a-podl-pse- + name-prefix: ethtool-a- - - name: pw-d-status + name: podl-pse-pw-d-status type: u32 - name-prefix: ethtool-a-podl-pse- + name-prefix: ethtool-a- - name: rss attributes:
@@ -1571,9 +1571,9 @@ operations: reply: attributes: &pse - header - - admin-state - - admin-control - - pw-d-status + - podl-pse-admin-state + - podl-pse-admin-control + - podl-pse-pw-d-status dump: *pse-get-op - name: pse-set
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 8/17 netlink: specs: Expand the pse netlink command with PoE interface
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add the PoE pse attributes prefix to be able to use PoE interface.
Example usage:
./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do pse-get \
--json '{"header":{"dev-name":"eth0"}}'{'header': {'dev-index': 4, 'dev-name': 'eth0'},
'c33-pse-admin-state': 3,
'c33-pse-pw-d-status': 4}
./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do pse-set \
--json '{"header":{"dev-name":"eth0"},
"c33-pse-admin-control":3}'---
Changes in v2:
- Follow the "c33" PoE prefix naming change.
- Add the ethtool auto generated code.
Changes in v3:
- Remove the ethtool auto generated code.
--- Documentation/netlink/specs/ethtool.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/netlink/specs/ethtool.yaml +15 -0
@@ -889,6 +889,18 @@ attribute-sets: name: podl-pse-pw-d-status type: u32 name-prefix: ethtool-a- + - + name: c33-pse-admin-state + type: u32 + name-prefix: ethtool-a- + - + name: c33-pse-admin-control + type: u32 + name-prefix: ethtool-a- + - + name: c33-pse-pw-d-status + type: u32 + name-prefix: ethtool-a- - name: rss attributes:
@@ -1574,6 +1586,9 @@ operations: - podl-pse-admin-state - podl-pse-admin-control - podl-pse-pw-d-status + - c33-pse-admin-state + - c33-pse-admin-control + - c33-pse-pw-d-status dump: *pse-get-op - name: pse-set
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 9/17 MAINTAINERS: Add myself to pse networking maintainer
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
As I add support for PoE in PSE networking subsystem it seems legitimate to be added to the maintainers.
---
Changes in v3:
- New patch
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -17767,6 +17767,7 @@ F: net/psample PSE NETWORK DRIVER M: Oleksij Rempel <[email protected]> +M: Kory Maincent <[email protected]> L: [email protected] S: Maintained F: Documentation/devicetree/bindings/net/pse-pd/
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v6 10/17 net: pse-pd: Add support for PSE PIs
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
The Power Sourcing Equipment Power Interface (PSE PI) plays a pivotal role in the architecture of Power over Ethernet (PoE) systems. It is essentially a blueprint that outlines how one or multiple power sources are connected to the eight-pin modular jack, commonly known as the Ethernet RJ45 port. This connection scheme is crucial for enabling the delivery of power alongside data over Ethernet cables.
This patch adds support for getting the PSE controller node through PSE PI device subnode.
This supports adds a way to get the PSE PI id from the pse_pi devicetree subnode of a PSE controller node simply by reading the reg property.
---
Changes in v3:
- New patch.
Changes in v4:
- Add PSE PI documentation.
Changes in v5:
- Update PSE PI documentation.
Changes in v6:
- Add error messages.
- Add kdoc.
- Rename of_legacy to no_of_pse_pi.
- Create new function for readibility.
- Fix few nit.
--- Documentation/networking/pse-pd/index.rst | 1 + Documentation/networking/pse-pd/pse-pi.rst | 302 +++++++++++++++++++++++++++++ drivers/net/pse-pd/pse_core.c | 256 ++++++++++++++++++++---- include/linux/pse-pd/pse.h | 38 +++- 4 files changed, 558 insertions(+), 39 deletions(-)
Documentation/networking/pse-pd/index.rst +1 -0
@@ -7,3 +7,4 @@ Power Sourcing Equipment (PSE) Documentation :maxdepth: 2 introduction + pse-pi
Documentation/networking/pse-pd/pse-pi.rst new file +302 -0
302 lines not on this page · raw message
drivers/net/pse-pd/pse_core.c +221 -35
306 lines not on this page · raw message
include/linux/pse-pd/pse.h +34 -4
@@ -64,6 +64,36 @@ struct device_node;struct of_phandle_args ;struct pse_control ; +/* PSE PI pairset pinout can either be Alternative A or Alternative B */ +enum pse_pi_pairset_pinout { +ALTERNATIVE_A , +ALTERNATIVE_B , +}; + +/** +* struct pse_pi_pairset - PSE PI pairset entity describing the pinout +* alternative ant its phandle +* +* @pinout: description of the pinout alternative +* @np: device node pointer describing the pairset phandle +*/ +struct pse_pi_pairset { +enum pse_pi_pairset_pinout pinout; +struct device_node *np; +}; + +/** +* struct pse_pi - PSE PI (Power Interface) entity as described in +* IEEE 802.3-2022 145.2.4 +* +* @pairset: table of the PSE PI pinout alternative for the two pairset +* @np: device node pointer of the PSE PI node +*/ +struct pse_pi { +struct pse_pi_pairset pairset[2 ]; +struct device_node *np; +}; +/** * struct pse_controller_dev - PSE controller entity that might * provide multiple PSE controls
@@ -73,11 +103,11 @@ struct pse_control;* @pse_control_head: head of internal list of requested PSE controls * @dev: corresponding driver model device struct * @of_pse_n_cells: number of cells in PSE line specifiers -* @of_xlate: translation function to translate from specifier as found in the -* device tree to id as given to the PSE control ops * @nr_lines: number of PSE controls in this controller device * @lock: Mutex for serialization access to the PSE controller * @types: types of the PSE controller +* @pi: table of PSE PIs described in this controller device +* @of_legacy: flag set if the pse_pis devicetree node is not used */ struct pse_controller_dev {const struct pse_controller_ops *ops;
@@ -86,11 +116,11 @@ struct pse_controller_dev {struct list_head pse_control_head;struct device *dev;int of_pse_n_cells; -int (*of_xlate)(struct pse_controller_dev *pcdev, -const struct of_phandle_args *pse_spec);unsigned int nr_lines;struct mutex lock;enum ethtool_pse_types types; +struct pse_pi *pi; +bool no_of_pse_pi; };#if IS_ENABLED (CONFIG_PSE_CONTROLLER )
Signature · 1 line
2.25.1
Simon Horman
reviewerRe: [PATCH net-next v6 10/17] net: pse-pd: Add support for PSE PIs
Quoted 9 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
The Power Sourcing Equipment Power Interface (PSE PI) plays a pivotal role in the architecture of Power over Ethernet (PoE) systems. It is essentially a blueprint that outlines how one or multiple power sources are connected to the eight-pin modular jack, commonly known as the Ethernet RJ45 port. This connection scheme is crucial for enabling the delivery of power alongside data over Ethernet cables.
Quoted 7 lines
This patch adds support for getting the PSE controller node through PSE PI device subnode.
This supports adds a way to get the PSE PI id from the
pse_pidevicetree subnode of a PSE controller node simply by reading the reg property.Signed-off-by Kory Maincent <[email protected]>
Hi Kory,
Some minor documentation nits from my side.
Quoted 1 line
Documentation/networking/pse-pd/pse-pi.rst +0
-0
...
Quoted 2 lines
+Table 145\u20133\u2014PSE Pinout Alternatives
+-----------------------------------
When running make htmldocs I see the following warning:
Table 145\u20133\u2014PSE Pinout Alternatives
And the header is rendered as:
Table 145u20133u2014PSE Pinout Alternatives
I'm assuming my version of Sphinx doesn't understand the use of escape sequences for unicode characters here.
I have observed this with (I assume this is the relevant command):
$ sphinx-build --version sphinx-build 7.2.6
$ sphinx-build --version sphinx-build 6.2.1
...
Quoted 1 line
drivers/net/pse-pd/pse_core.c +0
-0
...
Quoted 9 lines
/**
- *of_pse_zero_xlate- dummy function for controllers with one only control
- * @pcdev: a pointer to the PSE controller device
- * @pse_spec: PSE line specifier as found in the device tree
- *
- * This static translation function is used by default ifof_xlatein
- * :c:type:pse_controller_devis not set. It is useful for all PSE
- * controllers with #pse-cells = <0>.
+ *of_load_pse_pi_pairset- load PSE PI pairsets pinout and polarity
nit: of_load_pse_pi_pairsets
Quoted 9 lines
+ * @node: a pointer of the device node
+ * @pi: a pointer of the PSE PI to fill
+ * @npairsets: the number of pairsets (1 or 2) used by the PI */drivers/net/pse-pd/pse_core.c +3
-2-static int of_pse_zero_xlate (struct pse_controller_dev *pcdev, -const struct of_phandle_args *pse_spec) +static int of_load_pse_pi_pairsets (struct device_node *node, +struct pse_pi *pi, +int npairsets)
...
Quoted 1 line
include/linux/pse-pd/pse.h +0
-0
...
include/linux/pse-pd/pse.h struct pse_control; · line 110
Quoted 11 lines
include/linux/pse-pd/pse.h +2
-2@@ -73,11 +103,11 @@ struct pse_control;* @pse_control_head: head of internal list of requested PSE controls * @dev: corresponding driver model device struct * @of_pse_n_cells: number of cells in PSE line specifiers -* @of_xlate: translation function to translate from specifier as found in the -* device tree to id as given to the PSE control ops * @nr_lines: number of PSE controls in this controller device * @lock: Mutex for serialization access to the PSE controller * @types: types of the PSE controller +* @pi: table of PSE PIs described in this controller device +* @of_legacy: flag set if the pse_pis devicetree node is not used
nit: it looks line the documentation didn't keep up with the
structure during development: @no_of_pse_pi should be documented instead of @of_legacy.
Quoted 15 lines
include/linux/pse-pd/pse.h +2
-2*/ struct pse_controller_dev {const struct pse_controller_ops *ops;@@ -86,11 +116,11 @@ struct pse_controller_dev {struct list_head pse_control_head;struct device *dev;int of_pse_n_cells; -int (*of_xlate)(struct pse_controller_dev *pcdev, -const struct of_phandle_args *pse_spec);unsigned int nr_lines;struct mutex lock;enum ethtool_pse_types types; +struct pse_pi *pi; +bool no_of_pse_pi; };
...
Simon Horman
reviewerRe: [PATCH net-next v6 10/17] net: pse-pd: Add support for PSE PIs
Quoted 2 lines · Simon Horman
Quoted 1 line · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
...
Quoted 4 lines
Quoted 1 line
include/linux/pse-pd/pse.h +0
-0...
Quoted 15 lines
include/linux/pse-pd/pse.h struct pse_control; · line 110
Quoted 11 lines
include/linux/pse-pd/pse.h +2
-2@@ -73,11 +103,11 @@ struct pse_control;* @pse_control_head: head of internal list of requested PSE controls * @dev: corresponding driver model device struct * @of_pse_n_cells: number of cells in PSE line specifiers -* @of_xlate: translation function to translate from specifier as found in the -* device tree to id as given to the PSE control ops * @nr_lines: number of PSE controls in this controller device * @lock: Mutex for serialization access to the PSE controller * @types: types of the PSE controller +* @pi: table of PSE PIs described in this controller device +* @of_legacy: flag set if the pse_pis devicetree node is not used nit: it looks line the documentation didn't keep up with the
structure during development: @no_of_pse_pi should be documented instead of @of_legacy.
There seem to be some similar minor problems in
[PATCH net-next v6 13/17] net: pse-pd: Use regulator framework within PSE framework
./scripts/kernel-doc -none is your friend here.
Quoted 19 lines
Quoted 16 lines
include/linux/pse-pd/pse.h +2
-2*/ struct pse_controller_dev {const struct pse_controller_ops *ops;@@ -86,11 +116,11 @@ struct pse_controller_dev {struct list_head pse_control_head;struct device *dev;int of_pse_n_cells; -int (*of_xlate)(struct pse_controller_dev *pcdev, -const struct of_phandle_args *pse_spec);unsigned int nr_lines;struct mutex lock;enum ethtool_pse_types types; +struct pse_pi *pi; +bool no_of_pse_pi; };...
Kory Maincent
maintainerRe: [PATCH net-next v6 10/17] net: pse-pd: Add support for PSE PIs
Quoted 27 lines · On Thu, 28 Mar 2024 10:40:11 +0000 Simon Horman <[email protected]> wrote:
Quoted 2 lines · Simon Horman
Quoted 1 line · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
...
Quoted 4 lines
Quoted 1 line
include/linux/pse-pd/pse.h +0
-0...
Quoted 16 lines
Quoted 5 lines
include/linux/pse-pd/pse.h +0
-1@@ -73,11 +103,11 @@ struct pse_control;* @pse_control_head: head of internal list of requested PSE controls * @dev: corresponding driver model device struct * @of_pse_n_cells: number of cells in PSE line specifiers -* @of_xlate: translation function to translate from specifier as found Quoted 7 lines
in the
- * device tree to id as given to the PSE control ops
* @nr_lines: number of PSE controls in this controller device
* @lock: Mutex for serialization access to the PSE controller
* @types: types of the PSE controller
+ * @pi: table of PSE PIs described in this controller device
+ * @of_legacy: flag set if thepse_pisdevicetree node is not usednit: it looks line the documentation didn't keep up with the
structure during development: @no_of_pse_pi should be documented instead of @of_legacy.
Quoted 5 lines
There seem to be some similar minor problems in
[PATCH net-next v6 13/17] net: pse-pd: Use regulator framework within PSE framework
./scripts/kernel-doc-none is your friend here.
Oh didn't know about it, thanks!
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v6 10/17] net: pse-pd: Add support for PSE PIs
In reply to Kory MaincentQuoted 4 lines
+.. code-block::
Documentation/networking/pse-pd/pse-pi.rst new file +3
-0+ + +-------------+ + | PSE PI |
Documentation/networking/pse-pd/pse-pi.rst line 177
Quoted 10 lines
Documentation/networking/pse-pd/pse-pi.rst new file +10
-0+ 8 -----+ +-------------+ + 7 -----+ Rail 1 | + 6 -----+------+----------------------+ + 5 -----+ | | + 4 -----+ / Rail 2 | PSE 1 + 3 -----+----? +-------------+ + 2 -----+----+---------? | + 1 -----+---? +-------------+ + | + +-------------+
Is ? a standard markup character? I don't remember seeing it used like this before.
Maybe offset the connection for pins 1 and 2 from that of 3. I mean:
Quoted 4 lines
+ 4 -----+ / Rail 2 | PSE 1 + 3 -----+----? +-------------+ + 2 -----+--------+-----? | + 1 -----+-------? +-------------+
You version is a little ambiguous, pins 1, 2 & 3 could be interconnected at the +. The text does however make it clear they are not, but i don't see any harm in making the diagram clearer.
Quoted 10 lines
drivers/net/pse-pd/pse_core.c +10
-0+static int of_load_single_pse_pi_pairset (struct device_node *node, +struct pse_pi *pi, +int pairset_num) +{ +struct device_node *pairset_np; +const char *name; +int ret; + + ret =of_property_read_string_index (node,"pairset-names" , + pairset_num, &name);
drivers/net/pse-pd/pse_core.c struct pse_control { · line 49
Quoted 10 lines
drivers/net/pse-pd/pse_core.c +10
-0+if (ret) +return ret; + +if (!strcmp (name,"alternative-a" )) { + pi->pairset[pairset_num].pinout =ALTERNATIVE_A ; + }else if (!strcmp (name,"alternative-b" )) { + pi->pairset[pairset_num].pinout =ALTERNATIVE_B ; + }else { +pr_err ("pse: wrong pairset-names value %s\n" , name); +return -EINVAL ;
Maybe include the node path in the error message? For a 24 port switch, it will help find a typo in one of the ports. I would do this for all error messages in this code.
Please add my Reviewed-by on the next version.
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 10/17] net: pse-pd: Add support for PSE PIs
Quoted 15 lines · On Thu, 28 Mar 2024 13:24:00 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 4 lines
+.. code-block::
Documentation/networking/pse-pd/pse-pi.rst new file +3
-0+ + +-------------+ + | PSE PI |Documentation/networking/pse-pd/pse-pi.rst line 177
Quoted 10 lines
Documentation/networking/pse-pd/pse-pi.rst new file +10
-0+ 8 -----+ +-------------+ + 7 -----+ Rail 1 | + 6 -----+------+----------------------+ + 5 -----+ | | + 4 -----+ / Rail 2 | PSE 1 + 3 -----+----? +-------------+ + 2 -----+----+---------? | + 1 -----+---? +-------------+ + | + +-------------+
Quoted 2 lines
Is ? a standard markup character? I don't remember seeing it used like this before.
It seems the Documentation copy-pasted from Oleksij mail bring me few weird characters.
I will fix it.
Quoted 16 lines
Quoted 16 lines
drivers/net/pse-pd/pse_core.c +16
-0+static int of_load_single_pse_pi_pairset (struct device_node *node, +struct pse_pi *pi, +int pairset_num) +{ +struct device_node *pairset_np; +const char *name; +int ret; + + ret =of_property_read_string_index (node,"pairset-names" , + pairset_num, &name); +if (ret) +return ret; + +if (!strcmp (name,"alternative-a" )) { + pi->pairset[pairset_num].pinout =ALTERNATIVE_A ; + }else if (!strcmp (name,"alternative-b" )) {
Quoted 8 lines
drivers/net/pse-pd/pse_core.c struct pse_control { · line 49
Quoted 4 lines
drivers/net/pse-pd/pse_core.c +4
-0+ pi->pairset[pairset_num].pinout =ALTERNATIVE_B ; + }else { +pr_err ("pse: wrong pairset-names value %s\n" , name); +return -EINVAL ;Maybe include the node path in the error message? For a 24 port switch, it will help find a typo in one of the ports. I would do this for all error messages in this code.
Ok, I will.
Thanks for your review!
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerPATCH v6 11/17 dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
PSE PI setup may encompass multiple PSE controllers or auxiliary circuits that collectively manage power delivery to one Ethernet port. Such configurations might support a range of PoE standards and require the capability to dynamically configure power delivery based on the operational mode (e.g., PoE2 versus PoE4) or specific requirements of connected devices. In these instances, a dedicated PSE PI node becomes essential for accurately documenting the system architecture. This node would serve to detail the interactions between different PSE controllers, the support for various PoE modes, and any additional logic required to coordinate power delivery across the network infrastructure.
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
---
Changes in v3:
- New patch
Changes in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit message
Changes in v5:
- Fix yamllint error.
- Replace underscore by dash in properties names.
- Add polarity-supported property.
Changes in v6:
- Reorder the pairset pinout table documentation to shrink the lines size.
- Remove pairset and polarity as required fields.
- Add vpwr-supply regulator supply.
--- .../bindings/net/pse-pd/pse-controller.yaml | 102 ++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +99 -3
@@ -13,6 +13,7 @@ description: Binding for the Power Sourcing Equipment (PSE) as defined in the maintainers: - Oleksij Rempel <[email protected]> + - Kory Maincent <[email protected]> properties: $nodename:
@@ -22,11 +23,106 @@ properties: description: Used to uniquely identify a PSE instance within an IC. Will be 0 on PSE nodes with only a single output and at least 1 on nodes - controlling several outputs. + controlling several outputs which are not described in the pse-pis + subnode. This property is deprecated, please use pse-pis instead. enum: [0, 1] -required: - - "#pse-cells" + pse-pis: + type: object + description: + Overview of the PSE PIs provided by the controller. + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties: + "^pse-pi@[0-9a-f]+$": + type: object + description: + PSE PI for power delivery via pairsets, compliant with IEEE + 802.3-2022, Section 145.2.4. Each pairset comprises a positive and + a negative VPSE pair, adhering to the pinout configurations + detailed in the standard. + See Documentation/networking/pse-pd/pse-pi.rst for details. + + properties: + reg: + description: + Address describing the PSE PI index. + maxItems: 1 + + "#pse-cells": + const: 0 + + pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section 145.2.4. + Valid values are "alternative-a" and "alternative-b". Each name + should correspond to a phandle in the 'pairset' property + pointing to the power supply for that pairset. + minItems: 1 + maxItems: 2 + items: + enum: + - alternative-a + - alternative-b + + pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------| + | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2 + + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1 + maxItems: 4 + items: + enum: + - MDI-X + - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI. + + required: + - reg + - "#pse-cells" + +oneOf: + - required: + - "#pse-cells" + - required: + - pse-pis additionalProperties: true
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 33 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
PSE PI setup may encompass multiple PSE controllers or auxiliary circuits that collectively manage power delivery to one Ethernet port. Such configurations might support a range of PoE standards and require the capability to dynamically configure power delivery based on the operational mode (e.g., PoE2 versus PoE4) or specific requirements of connected devices. In these instances, a dedicated PSE PI node becomes essential for accurately documenting the system architecture. This node would serve to detail the interactions between different PSE controllers, the support for various PoE modes, and any additional logic required to coordinate power delivery across the network infrastructure.
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
Signed-off-by Kory Maincent <[email protected]>---
Changes in v3:
- New patchChanges in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit messageChanges in v5:
- Fix yamllint error.
- Replace underscore by dash in properties names.
- Add polarity-supported property.
Quoted 8 lines
Changes in v6:
- Reorder the pairset pinout table documentation to shrink the lines size.
- Remove pairset and polarity as required fields.
- Add vpwr-supply regulator supply.--- .../bindings/net/pse-pd/pse-controller.yaml | 102 ++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-)
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
Warning: Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml references a file that doesn't exist: Documentation/networking/pse-pd/pse-pi.rst Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml: Documentation/networking/pse-pd/pse-pi.rst
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Andrew Lunn
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 23 lines · Rob Herring
Quoted 13 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
PSE PI setup may encompass multiple PSE controllers or auxiliary circuits that collectively manage power delivery to one Ethernet port. Such configurations might support a range of PoE standards and require the capability to dynamically configure power delivery based on the operational mode (e.g., PoE2 versus PoE4) or specific requirements of connected devices. In these instances, a dedicated PSE PI node becomes essential for accurately documenting the system architecture. This node would serve to detail the interactions between different PSE controllers, the support for various PoE modes, and any additional logic required to coordinate power delivery across the network infrastructure.
Quoted 5 lines
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
Signed-off-by Kory Maincent <[email protected]>---
My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):
Quoted 8 lines
yamllint warnings/errors:
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
Warning:Documentation/devicetree/bindings/net/pse-pd/pse-controller.yamlreferences a file that doesn't exist:Documentation/networking/pse-pd/pse-pi.rstDocumentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:Documentation/networking/pse-pd/pse-pi.rst
Is this a false positive?
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 29 lines · On Thu, 28 Mar 2024 13:32:09 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 28 lines · Rob Herring
Quoted 13 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
PSE PI setup may encompass multiple PSE controllers or auxiliary circuits that collectively manage power delivery to one Ethernet port. Such configurations might support a range of PoE standards and require the capability to dynamically configure power delivery based on the operational mode (e.g., PoE2 versus PoE4) or specific requirements of connected devices. In these instances, a dedicated PSE PI node becomes essential for accurately documenting the system architecture. This node would serve to detail the interactions between different PSE controllers, the support for various PoE modes, and any additional logic required to coordinate power delivery across the network infrastructure.
Quoted 5 lines
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
Signed-off-by Kory Maincent <[email protected]>---
My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):yamllint warnings/errors:
dtschema/dtc warnings/errors:
Quoted 8 lines
Quoted 6 lines
doc reference errors (make refcheckdocs):
Warning:Documentation/devicetree/bindings/net/pse-pd/pse-controller.yamlreferences a file that doesn't exist:Documentation/networking/pse-pd/pse-pi.rstDocumentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:Documentation/networking/pse-pd/pse-pi.rstIs this a false positive?
I suppose so as the file is added in the patch 10.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentQuoted 9 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +9
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B |
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 97
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------| + | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE |
Is it possible to avoid \u encoding? Ideally this documentation should be understandable without having to render it using a toolset. I just want to use less(1).
Or is this a email problem? Has something converted your UTF-8 file to this \u notation?
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 37 lines · On Thu, 28 Mar 2024 13:31:06 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 29 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +7
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table145\u20133)
+|-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) |+ |-----------|---------------|---------------|---------------|---------------|
(quoted diff) +4
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 |Negative VPSE | Positive VPSE |
+ | 5 | \u2014 | \u2014 |
Negative VPSE | Positive VPSE |(quoted diff) +2
-0+ | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 |Quoted 3 lines
Positive VPSE | Negative VPSE |
+ | 8 | \u2014 | \u2014 |
Positive VPSE | Negative VPSE |Is it possible to avoid \u encoding? Ideally this documentation should be understandable without having to render it using a toolset. I just want to use less(1).
Quoted 2 lines
Or is this a email problem? Has something converted your UTF-8 file to this \u notation?
It seems to come from the documentation I copied pasted from Oleksij mail. Will fix it.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Rob Herring
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentQuoted 94 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
PSE PI setup may encompass multiple PSE controllers or auxiliary circuits that collectively manage power delivery to one Ethernet port. Such configurations might support a range of PoE standards and require the capability to dynamically configure power delivery based on the operational mode (e.g., PoE2 versus PoE4) or specific requirements of connected devices. In these instances, a dedicated PSE PI node becomes essential for accurately documenting the system architecture. This node would serve to detail the interactions between different PSE controllers, the support for various PoE modes, and any additional logic required to coordinate power delivery across the network infrastructure.
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
Signed-off-by Kory Maincent <[email protected]>---
Changes in v3:
- New patchChanges in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit messageChanges in v5:
- Fix yamllint error.
- Replace underscore by dash in properties names.
- Add polarity-supported property.Changes in v6:
- Reorder the pairset pinout table documentation to shrink the lines size.
- Remove pairset and polarity as required fields.
- Add vpwr-supply regulator supply.--- .../bindings/net/pse-pd/pse-controller.yaml | 102 ++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +33
-3@@ -13,6 +13,7 @@ description: Binding for the Power Sourcing Equipment (PSE) as defined in the maintainers: - Oleksij Rempel <[email protected]> + - Kory Maincent <[email protected]> properties: $nodename:@@ -22,11 +23,106 @@ properties: description: Used to uniquely identify a PSE instance within an IC. Will be 0 on PSE nodes with only a single output and at least 1 on nodes - controlling several outputs. + controlling several outputs which are not described in the pse-pis + subnode. This property is deprecated, please use pse-pis instead. enum: [0, 1] -required: - - "#pse-cells" + pse-pis: + type: object + description: + Overview of the PSE PIs provided by the controller. + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties: + "^pse-pi@[0-9a-f]+$": + type: object + description: + PSE PI for power delivery via pairsets, compliant with IEEE + 802.3-2022, Section 145.2.4. Each pairset comprises a positive and + a negative VPSE pair, adhering to the pinout configurations + detailed in the standard. + See Documentation/networking/pse-pd/pse-pi.rst for details. + + properties: + reg: + description: + Address describing the PSE PI index.
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 69
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ maxItems: 1 + + "#pse-cells": + const: 0 + + pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section 145.2.4. + Valid values are "alternative-a" and "alternative-b". Each name
Don't state constraints in prose which are defined as schema constraints.
Quoted 20 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +20
-0+ should correspond to a phandle in the 'pairset' property + pointing to the power supply for that pairset. + minItems: 1 + maxItems: 2 + items: + enum: + - alternative-a + - alternative-b + + pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------|
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 99
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2
"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
As each entry is just a power rail, why can't the regulator binding be used here?
Quoted 6 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +6
-0+ + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 115
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ maxItems: 4 + items: + enum: + - MDI-X + - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI.
I don't see this being used anywhere.
Quoted 17 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ + required: + - reg + - "#pse-cells" + +oneOf: + - required: + - "#pse-cells" + - required: + - pse-pis additionalProperties: trueSignature · 2 lines
-- 2.25.1
Oleksij Rempel
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 26 lines · Rob Herring
Quoted 11 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +11
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------|Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 99
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 5 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
As each entry is just a power rail, why can't the regulator binding be used here?
I'm not against describing it consequent with regulator till the wire end, but right now I have no idea how it should be described by using regulator bindings. There are maximum 2 rails going in to PSE PI on one side and 4 rails with at least 5 combinations supported by standard on other side. Instead of inventing anything new, I suggested to describe supported output combinations by using IEEE 802.3 standard.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Rob Herring
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 33 lines · Oleksij Rempel
Quoted 26 lines · Rob Herring
Quoted 11 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +11
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------|Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 99
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 5 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
As each entry is just a power rail, why can't the regulator binding be used here?
Quoted 6 lines
I'm not against describing it consequent with regulator till the wire end, but right now I have no idea how it should be described by using regulator bindings. There are maximum 2 rails going in to PSE PI on one side and 4 rails with at least 5 combinations supported by standard on other side. Instead of inventing anything new, I suggested to describe supported output combinations by using IEEE 802.3 standard.
There's 4 combinations above, what's the 5th combination? SPE?
Seems to me you just describe the 2 rails going to the connector and then describe all the variations the connector supports. The PSE (h/w) has little to do with which variations are supported, right? For example, MDI-X vs. MDI support is determined by the PHY, right? Or it has to be supported by both the PHY and PSE?
Rob
Oleksij Rempel
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 34 lines · Rob Herring
Quoted 33 lines · Oleksij Rempel
Quoted 31 lines · Rob Herring
Quoted 11 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +11
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table 145\u20133) + |-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) | + |-----------|---------------|---------------|---------------|---------------|Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 99
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 5 | \u2014 | \u2014 | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + | 8 | \u2014 | \u2014 | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
As each entry is just a power rail, why can't the regulator binding be used here?
Quoted 8 lines
Quoted 6 lines
I'm not against describing it consequent with regulator till the wire end, but right now I have no idea how it should be described by using regulator bindings. There are maximum 2 rails going in to PSE PI on one side and 4 rails with at least 5 combinations supported by standard on other side. Instead of inventing anything new, I suggested to describe supported output combinations by using IEEE 802.3 standard.
There's 4 combinations above, what's the 5th combination? SPE?
The 5th combination is PoE4 where two rails are supplying power at same time.
First 4 variants for PoE: one or two positive rails are attached (but only one is used at same time) to pairs 1-2 or 3-4, or 5-6, or 7-8. Or support all of combinations if some advanced PSE PI is present. PSE PI is kind of MUX for regulators.
One more variant in case of PoE4: two positive rail are attached at same time, one to 1-2, second to 5-6. May be one more variant with opposite polarity, this will be the 6th combination.
Quoted 3 lines
Seems to me you just describe the 2 rails going to the connector and then describe all the variations the connector supports. The PSE (h/w) has little to do with which variations are supported, right?
No. In case of mutli-channel PSE, it needs to know if channels are attached to one port or to different ports. PSE is not only responsible to enable the power, it runs classification of devices attached to the port, so it will decide, which rail should be enabled.
Quoted 1 line
For example, MDI-X vs. MDI support is determined by the PHY, right?
Yes and No. Until PSE do not start supplying power, PHY will not be able to start communication with the remote PHY, so it will not be able to detect MDI/X configuration.
Polarity configuration is important for user space or user to get information about supported pin configuration and if possible, change the configuration.
Quoted 1 line
Or it has to be supported by both the PHY and PSE?
In most cases PSE and PHY work independently from each other, they just share same port. Potential exception are:
- in case data line should not be shared with power lines, we need to know what pins are used for power, this information would help to provide PHY configuration.
- in case PHY autoneg signals disturb PoE classification, we need to coordinate PHY and PSE states.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Rob HerringQuoted 10 lines · On Tue, 2 Apr 2024 08:26:37 -0500 Rob Herring <[email protected]> wrote:
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section145.2.4.
+ Valid values are "alternative-a" and "alternative-b". Each
nameDon't state constraints in prose which are defined as schema constraints.
Ok, I will remove the line.
Quoted 39 lines
Quoted 32 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +7
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table145\u20133)
+|-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) |+ |-----------|---------------|---------------|---------------|---------------|
(quoted diff) +4
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 |Negative VPSE | Positive VPSE |
+ | 5 | \u2014 | \u2014 |
Negative VPSE | Positive VPSE |(quoted diff) +2
-0+ | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 |Positive VPSE | Negative VPSE |
+ | 8 | \u2014 | \u2014 |
Positive VPSE | Negative VPSE |Review
Quoted 2 lines
(quoted diff) +2
-0+ minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 2 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
Theoretically if the RJ45 port binding was supported it would make more sense, but in reality it's not feasible as the PSE controller need this information in its init process.
The PSE controller reset all its port to apply a configuration so we can't do it when the consumer (RJ45) probe. It would reset the other ports if one consumer is probed later in the process.
Quoted 2 lines
As each entry is just a power rail, why can't the regulator binding be used here?
Olekisj already answered about it.
PSE PI is like a regulator but with few different features and more information like the pinout and the polarity, so we could not really fully rely on the regulator binding style.
Quoted 10 lines
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1 + maxItems: 4 + items: + enum: + - MDI-X
Quoted 8 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 115
Quoted 6 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +6
-0+ - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI.I don't see this being used anywhere.
Right, I forgot to add it to the PD692x0 and TPS23881 binding example!
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Rob Herring
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 58 lines · Kory Maincent
Quoted 10 lines · On Tue, 2 Apr 2024 08:26:37 -0500 Rob Herring <[email protected]> wrote:
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section145.2.4.
+ Valid values are "alternative-a" and "alternative-b". Each
nameDon't state constraints in prose which are defined as schema constraints.
Ok, I will remove the line.
Quoted 39 lines
Quoted 32 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +7
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply for the + corresponding pairset named in 'pairset-names'. This property + aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table145\u20133)
+|-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) |+ |-----------|---------------|---------------|---------------|---------------|
(quoted diff) +4
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 |Negative VPSE | Positive VPSE |
+ | 5 | \u2014 | \u2014 |
Negative VPSE | Positive VPSE |(quoted diff) +2
-0+ | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 |Positive VPSE | Negative VPSE |
+ | 8 | \u2014 | \u2014 |
Positive VPSE | Negative VPSE |Review
Quoted 2 lines
(quoted diff) +2
-0+ minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 2 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
Quoted 6 lines
Theoretically if the RJ45 port binding was supported it would make more sense, but in reality it's not feasible as the PSE controller need this information in its init process.
The PSE controller reset all its port to apply a configuration so we can't do it when the consumer (RJ45) probe. It would reset the other ports if one consumer is probed later in the process.
There is no reason other than convenience that all information some driver needs has to be in one node or one hierarchy of nodes. You can fetch anything from anywhere in the DT. It does feel like some of this belongs in a connector node. We often haven't described connectors in DT and stick connector properties in the controller node associated with the connector. Then as things get more complicated, it becomes a mess.
Quoted 27 lines
Quoted 2 lines
As each entry is just a power rail, why can't the regulator binding be used here?
Olekisj already answered about it.
PSE PI is like a regulator but with few different features and more information like the pinout and the polarity, so we could not really fully rely on the regulator binding style.Quoted 10 lines
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1 + maxItems: 4 + items: + enum: + - MDI-XQuoted 8 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 115
Quoted 6 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +6
-0+ - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI.I don't see this being used anywhere.
Quoted 1 line
Right, I forgot to add it to the PD692x0 and TPS23881 binding example!
But is this really common/generic? I would think input power rails would be chip specific.
Rob
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 68 lines · On Wed, 3 Apr 2024 09:31:42 -0500 Rob Herring <[email protected]> wrote:
Quoted 60 lines · Kory Maincent
Quoted 10 lines · On Tue, 2 Apr 2024 08:26:37 -0500 Rob Herring <[email protected]> wrote:
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section145.2.4.
+ Valid values are "alternative-a" and "alternative-b".
Each nameDon't state constraints in prose which are defined as schema constraints.
Ok, I will remove the line.
Quoted 41 lines
Quoted 34 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply forthe
+ corresponding pairset named in 'pairset-names'. This
property(quoted diff) +2
-0+ aligns with IEEE 802.3-2022, Section 33.2.3 and 145.2.4. + PSE Pinout Alternatives (as per IEEE 802.3-2022 Table145\u20133)
+|-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) |+ |-----------|---------------|---------------|---------------|---------------|
(quoted diff) +4
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 |Negative VPSE | Positive VPSE |
+ | 5 | \u2014 | \u2014 |
Negative VPSE | Positive VPSE |(quoted diff) +2
-0+ | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 |Positive VPSE | Negative VPSE |
+ | 8 | \u2014 | \u2014 |
Positive VPSE | Negative VPSE |Review
Quoted 2 lines
(quoted diff) +2
-0+ minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 2 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
Quoted 6 lines
Theoretically if the RJ45 port binding was supported it would make more sense, but in reality it's not feasible as the PSE controller need this information in its init process.
The PSE controller reset all its port to apply a configuration so we can't do it when the consumer (RJ45) probe. It would reset the other ports if one consumer is probed later in the process.
Quoted 6 lines
There is no reason other than convenience that all information some driver needs has to be in one node or one hierarchy of nodes. You can fetch anything from anywhere in the DT. It does feel like some of this belongs in a connector node. We often haven't described connectors in DT and stick connector properties in the controller node associated with the connector. Then as things get more complicated, it becomes a mess.
Right, we could indeed put all the informations of the pse_pi node in the future RJ45 port abstraction node. Then, this series will be put aside until we manage to have the port abstraction get merged.
I am not glad about this as it will stuck my work until then, but indeed removing this pse_pi wrapper node which is between the pse_controller node and the connector node seems cleaner.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 79 lines · On Thu, 4 Apr 2024 10:38:54 +0200 Kory Maincent <[email protected]>…
Quoted 69 lines · On Wed, 3 Apr 2024 09:31:42 -0500 Rob Herring <[email protected]> wrote:
Quoted 61 lines · Kory Maincent
Quoted 10 lines · On Tue, 2 Apr 2024 08:26:37 -0500 Rob Herring <[email protected]> wrote:
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairset-names: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Names of the pairsets as per IEEE 802.3-2022, Section145.2.4.
+ Valid values are "alternative-a" and "alternative-b".
Each nameDon't state constraints in prose which are defined as schema constraints.
Ok, I will remove the line.
Quoted 42 lines
Quoted 35 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ pairsets: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: + List of phandles, each pointing to the power supply forthe
+ corresponding pairset named in 'pairset-names'. This
property
+ aligns with IEEE 802.3-2022, Section 33.2.3 and
145.2.4.
+ PSE Pinout Alternatives (as per IEEE 802.3-2022 Table
145\u20133)
+|-----------|---------------|---------------|---------------|---------------| + | Conductor | Alternative A | Alternative A | Alternative B | Alternative B | + | | (MDI-X) | (MDI) | (X) | (S) |+ |-----------|---------------|---------------|---------------|---------------|
(quoted diff) +4
-0+ | 1 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 2 | Negative VPSE | Positive VPSE | \u2014 | \u2014 | + | 3 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 4 | \u2014 | \u2014 |Negative VPSE | Positive VPSE |
+ | 5 | \u2014 | \u2014 |
Negative VPSE | Positive VPSE |(quoted diff) +2
-0+ | 6 | Positive VPSE | Negative VPSE | \u2014 | \u2014 | + | 7 | \u2014 | \u2014 |Positive VPSE | Negative VPSE |
+ | 8 | \u2014 | \u2014 |
Positive VPSE | Negative VPSE |Review
Quoted 2 lines
(quoted diff) +2
-0+ minItems: 1 + maxItems: 2"pairsets" does not follow the normal design pattern of foos, foo-names, and #foo-cells. You could add #foo-cells I suppose, but what would cells convey? I don't think it's a good fit for what you need.
Quoted 2 lines
The other oddity is the number of entries and the names are fixed. That is usually defined per consumer.
Quoted 6 lines
Theoretically if the RJ45 port binding was supported it would make more sense, but in reality it's not feasible as the PSE controller need this information in its init process.
The PSE controller reset all its port to apply a configuration so we can't do it when the consumer (RJ45) probe. It would reset the other ports if one consumer is probed later in the process.Quoted 6 lines
There is no reason other than convenience that all information some driver needs has to be in one node or one hierarchy of nodes. You can fetch anything from anywhere in the DT. It does feel like some of this belongs in a connector node. We often haven't described connectors in DT and stick connector properties in the controller node associated with the connector. Then as things get more complicated, it becomes a mess.
Quoted 6 lines
Right, we could indeed put all the informations of the
pse_pinode in the future RJ45 port abstraction node. Then, this series will be put aside until we manage to have the port abstraction get merged.
I am not glad about this as it will stuck my work until then, but indeed removing thispse_piwrapper node which is between thepse_controllernode and the connector node seems cleaner.
After some new thought, I thinks it is quite similar on the devicetree side to have it in a pse_pi node or in the connector node.
Here are my agruments to continue using this pse_pi binding description:
- The connector abstraction is in its early work and won't really see a v1 soon while the PoE series got mainly all reviewed-by thanks to Andrew. This would stuck the PoE series until maybe one or two Linux version.
- It allows to use the "Power Interface" name like described in the standards.
- Even if this is in the PSE controller node, it is generic to all PSEs so it shouldn't become a mess.
- It allows to have the PSE controller and Power Interfaces parameters grouped together and it will be easier to read. May not really be an argument! ;)
- It will keep the logic of PoDL with the PHY using a single reference to the PSE PI through the pses parameter.
Is it okay for you to continue with it?
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Rob HerringQuoted 20 lines · On Wed, 3 Apr 2024 09:31:42 -0500 Rob Herring <[email protected]> wrote:
Quoted 20 lines
Quoted 19 lines
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +6
-0+ + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 115
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ maxItems: 4 + items: + enum: + - MDI-X + - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI.I don't see this being used anywhere.
Quoted 4 lines
Quoted 1 line
Right, I forgot to add it to the PD692x0 and TPS23881 binding example!
But is this really common/generic? I would think input power rails would be chip specific.
I think as each PSE PI are seen as a regulator we may want it generic to track each PI parent. Having the parent regulator described like that would force the devicetree to describe where the power come from.
In contrary, for example, on the pd692x0 controller the regulators are connected to the managers (PD69208) and not directly to the PIs. So the devicetree would not really fit the hardware. It is indeed chip specific but having described like that would be more simple.
If we decided to make it chip specific the core would have a callback to ask the driver to fill the regulator_init_data structure for each PI before registering the regulators. It is feasible.
Mmh in fact I am still unsure about the solution.
Oleksij as you were the first to push the idea. Have you more argument in mind to make it generic?
https://lore.kernel.org/netdev/[email protected]/
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Oleksij Rempel
maintainerRe: [PATCH net-next v6 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 40 lines · Kory Maincent
Quoted 20 lines · On Wed, 3 Apr 2024 09:31:42 -0500 Rob Herring <[email protected]> wrote:
Quoted 20 lines
Quoted 19 lines
Quoted 7 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +6
-0+ + polarity-supported: + $ref: /schemas/types.yaml#/definitions/string-array + description: + Polarity configuration supported by the PSE PI pairsets. + minItems: 1Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 115
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ maxItems: 4 + items: + enum: + - MDI-X + - MDI + - X + - S + + vpwr-supply: + description: Regulator power supply for the PSE PI.I don't see this being used anywhere.
Quoted 4 lines
Quoted 1 line
Right, I forgot to add it to the PD692x0 and TPS23881 binding example!
But is this really common/generic? I would think input power rails would be chip specific.
I think as each PSE PI are seen as a regulator we may want it generic to track each PI parent. Having the parent regulator described like that would force the devicetree to describe where the power come from.
In contrary, for example, on the pd692x0 controller the regulators are connected to the managers (PD69208) and not directly to the PIs. So the devicetree would not really fit the hardware. It is indeed chip specific but having described like that would be more simple.If we decided to make it chip specific the core would have a callback to ask the driver to fill the
regulator_init_datastructure for each PI before registering the regulators. It is feasible.
Quoted 5 lines
Mmh in fact I am still unsure about the solution.
Oleksij as you were the first to push the idea. Have you more argument in mind to make it generic?
https://lore.kernel.org/netdev/[email protected]/
There can be different, chip specific power consumer, for example the one which is feeding the PSE controller it self, but also there are common providers/consumers those which are used to feed PSE PIs. In case of pd692x0 based setup, the managers are actual regulator responsible to control power rails connected to PSE PIs, so managers should use this common provider. Not sure how TI is designed, but it will have same type of consumer to feed PSE PIs as well.
Regards,
Oleksij
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Kory Maincent
maintainerPATCH v6 12/17 net: pse-pd: Add support for setup_pi_matrix callback
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Implement setup_pi_matrix callback to configure the PSE PI matrix. This functionality is invoked before registering the PSE and following the core parsing of the pse_pis devicetree subnode.
---
Changes in v3:
- New patch
--- drivers/net/pse-pd/pse_core.c | 6 ++++++ include/linux/pse-pd/pse.h | 2 ++ 2 files changed, 8 insertions(+)
drivers/net/pse-pd/pse_core.c +6 -0
@@ -215,6 +215,12 @@ int pse_controller_register(struct pse_controller_dev *pcdev)if (ret)return ret; +if (pcdev->ops->setup_pi_matrix) { + ret = pcdev->ops->setup_pi_matrix (pcdev); +if (ret) +return ret; + } +mutex_lock (&pse_list_mutex);list_add (&pcdev->list, &pse_controller_list);mutex_unlock (&pse_list_mutex);
include/linux/pse-pd/pse.h +2 -0
@@ -49,6 +49,7 @@ struct pse_control_status {* * @ethtool_get_status: get PSE control status for ethtool interface * @ethtool_set_config: set PSE control configuration over ethtool interface +* @setup_pi_matrix: setup PI matrix of the PSE controller */ struct pse_controller_ops { int (*ethtool_get_status)(struct pse_controller_dev *pcdev,
@@ -57,6 +58,7 @@ struct pse_controller_ops {int (*ethtool_set_config)(struct pse_controller_dev *pcdev,unsigned long id,struct netlink_ext_ack *extack,const struct pse_control_config *config); +int (*setup_pi_matrix)(struct pse_controller_dev *pcdev); };struct module ;
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 12/17] net: pse-pd: Add support for setup_pi_matrix callback
Quoted 7 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Implement
setup_pi_matrixcallback to configure the PSE PI matrix. This functionality is invoked before registering the PSE and following the core parsing of thepse_pisdevicetree subnode.Signed-off-by Kory Maincent <[email protected]>
Andrew
Kory Maincent
maintainerPATCH v6 13/17 net: pse-pd: Use regulator framework within PSE framework
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Integrate the regulator framework to the PSE framework for enhanced access to features such as voltage, power measurement, and limits, which are akin to regulators. Additionally, PSE features like port priorities could potentially enhance the regulator framework. Note that this integration introduces some implementation complexity, including wrapper callbacks, but the potential benefits make it worthwhile.
Regulator are using enable counter with specific behavior. Two calls to regulator_disable will trigger kernel warnings. If the counter exceeds one, regulator_disable call won't disable the PSE PI. These behavior isn't suitable for PSE control.
Added a boolean 'enabled' state to prevent multiple calls to regulator_enable/disable. These calls will only be called from PSE framework as it won't have any regulator children, therefore no mutex are needed to safeguards this boolean.
regulator_get needs the consumer device pointer. Use PSE as regulator provider and consumer device until we have RJ45 ports represented in the Kernel.
---
Changes in v3:
- New patch
Changes in v4:
- Remove the nested lock as the regulator_enable/disable ops will only be called from the PSE framework. No need to protect the 'enabled' boolean.
- Update regulator to current instead of voltage.
Changes in v5:
- Update Kernel documentation.
- Fix errors management in pse_control_get_internal function.
Changes in v6:
- Rename enable flag to admin_state_enable
- Fix a podl issue in pse_set_config.
- Use the pcdev device pointer as consumer and provider until we get Linux RJ45 port abstraction.
- Add a missing devm_regulator_put due to the device being the consumer and the provider.
--- drivers/net/pse-pd/pse_core.c | 247 ++++++++++++++++++++++++++++++++++--- drivers/net/pse-pd/pse_regulator.c | 48 +++---- include/linux/pse-pd/pse.h | 18 ++- 3 files changed, 269 insertions(+), 44 deletions(-)
drivers/net/pse-pd/pse_core.c +229 -18
@@ -8,6 +8,8 @@#include <linux/device.h> #include <linux/of.h> #include <linux/pse-pd/pse.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> static DEFINE_MUTEX (pse_list_mutex);static LIST_HEAD (pse_controller_list);
@@ -16,12 +18,14 @@ static LIST_HEAD(pse_controller_list);* struct pse_control - a PSE control * @pcdev: a pointer to the PSE controller device * this PSE control belongs to +* @ps: PSE PI supply of the PSE control * @list: list entry for the pcdev's PSE controller list * @id: ID of the PSE line in the PSE controller device * @refcnt: Number of gets of this pse_control */ struct pse_control {struct pse_controller_dev *pcdev; +struct regulator *ps;struct list_head list;unsigned int id;struct kref refcnt;
@@ -126,6 +130,10 @@ static int of_load_pse_pis(struct pse_controller_dev *pcdev)if (!np)return -ENODEV ; + pcdev->pi =kcalloc (pcdev->nr_lines,sizeof (*pcdev->pi),GFP_KERNEL ); +if (!pcdev->pi) +return -ENOMEM ; + pis =of_get_child_by_name (np,"pse-pis" );if (!pis) {/* no description of PSE PIs */
@@ -133,10 +141,6 @@ static int of_load_pse_pis(struct pse_controller_dev *pcdev)return 0 ; } - pcdev->pi =kcalloc (pcdev->nr_lines,sizeof (*pcdev->pi),GFP_KERNEL ); -if (!pcdev->pi) -return -ENOMEM ; -for_each_child_of_node (pis, node) {struct pse_pi pi = {0 };u32 id;
@@ -197,13 +201,124 @@ static int of_load_pse_pis(struct pse_controller_dev *pcdev)return ret; } +static int pse_pi_is_enabled (struct regulator_dev *rdev) +{ +struct pse_controller_dev *pcdev =rdev_get_drvdata (rdev); +const struct pse_controller_ops *ops; +int id, ret; + + ops = pcdev->ops; +if (!ops->pi_is_enabled) +return -EOPNOTSUPP ; + + id =rdev_get_id (rdev); +mutex_lock (&pcdev->lock); + ret = ops->pi_is_enabled (pcdev, id); +mutex_unlock (&pcdev->lock); + +return ret; +} + +static int pse_pi_enable (struct regulator_dev *rdev) +{ +struct pse_controller_dev *pcdev =rdev_get_drvdata (rdev); +const struct pse_controller_ops *ops; +int id, ret; + + ops = pcdev->ops; +if (!ops->pi_enable) +return -EOPNOTSUPP ; + + id =rdev_get_id (rdev); +mutex_lock (&pcdev->lock); + ret = ops->pi_enable (pcdev, id); +if (!ret) + pcdev->pi[id].admin_state_enabled =1 ; +mutex_unlock (&pcdev->lock); + +return ret; +} + +static int pse_pi_disable (struct regulator_dev *rdev) +{ +struct pse_controller_dev *pcdev =rdev_get_drvdata (rdev); +const struct pse_controller_ops *ops; +int id, ret; + + ops = pcdev->ops; +if (!ops->pi_disable) +return -EOPNOTSUPP ; + + id =rdev_get_id (rdev); +mutex_lock (&pcdev->lock); + ret = ops->pi_disable (pcdev, id); +if (!ret) + pcdev->pi[id].admin_state_enabled =0 ; +mutex_unlock (&pcdev->lock); + +return ret; +} + +static const struct regulator_ops pse_pi_ops = { + .is_enabled = pse_pi_is_enabled, + .enable = pse_pi_enable, + .disable = pse_pi_disable, +}; + +static int +devm_pse_pi_regulator_register (struct pse_controller_dev *pcdev, +char *name,int id) +{ +struct regulator_init_data *rinit_data; +struct regulator_config rconfig = {0 }; +struct regulator_desc *rdesc; +struct regulator_dev *rdev; + + rinit_data =devm_kzalloc (pcdev->dev,sizeof (*rinit_data), +GFP_KERNEL ); +if (!rinit_data) +return -ENOMEM ; + + rdesc =devm_kzalloc (pcdev->dev,sizeof (*rdesc),GFP_KERNEL ); +if (!rdesc) +return -ENOMEM ; + +/* Regulator descriptor id have to be the same as its associated +* PSE PI id for the well functioning of the PSE controls. +*/ + rdesc->id = id; + rdesc->name = name; + rdesc->type =REGULATOR_CURRENT ; + rdesc->ops = &pse_pi_ops; + rdesc->owner = pcdev->owner; + + rinit_data->constraints.valid_ops_mask =REGULATOR_CHANGE_STATUS ; + rinit_data->supply_regulator ="vpwr" ; + + rconfig.dev = pcdev->dev; + rconfig.driver_data = pcdev; + rconfig.init_data = rinit_data; + + rdev =devm_regulator_register (pcdev->dev, rdesc, &rconfig); +if (IS_ERR (rdev)) { +dev_err_probe (pcdev->dev,PTR_ERR (rdev), +"Failed to register regulator\n" ); +return PTR_ERR (rdev); + } + + pcdev->pi[id].rdev = rdev; + +return 0 ; +} +/** * pse_controller_register - register a PSE controller device * @pcdev: a pointer to the initialized PSE controller device */ int pse_controller_register (struct pse_controller_dev *pcdev) { -int ret; +size_t reg_name_len; +int ret, i;mutex_init (&pcdev->lock);INIT_LIST_HEAD (&pcdev->pse_control_head);
@@ -221,6 +336,31 @@ int pse_controller_register(struct pse_controller_dev *pcdev)return ret; } +/* Each regulator name len is pcdev dev name + 7 char + +* int max digit number (10) + 1 +*/ + reg_name_len =strlen (dev_name (pcdev->dev)) +18 ; + +/* Register PI regulators */ +for (i =0 ; i < pcdev->nr_lines; i++) { +char *reg_name; + +/* Do not register regulator for PIs not described */ +if (!pcdev->no_of_pse_pi && !pcdev->pi[i].np) +continue ; + + reg_name =devm_kzalloc (pcdev->dev, reg_name_len,GFP_KERNEL ); +if (!reg_name) +return -ENOMEM ; + +snprintf (reg_name, reg_name_len,"pse-%s_pi%d" , +dev_name (pcdev->dev), i); + + ret =devm_pse_pi_regulator_register (pcdev, reg_name, i); +if (ret) +return ret; + } +mutex_lock (&pse_list_mutex);list_add (&pcdev->list, &pse_controller_list);mutex_unlock (&pse_list_mutex);
@@ -289,6 +429,10 @@ static void __pse_control_release(struct kref *kref)lockdep_assert_held (&pse_list_mutex); +if (psec->pcdev->pi[psec->id].admin_state_enabled) +regulator_disable (psec->ps); +devm_regulator_put (psec->ps); +module_put (psec->pcdev->owner);list_del (&psec->list);
@@ -321,6 +465,7 @@ static struct pse_control * pse_control_get_internal(struct pse_controller_dev *pcdev, unsigned int index) {struct pse_control *psec; +int ret;lockdep_assert_held (&pse_list_mutex);
@@ -336,16 +481,38 @@ pse_control_get_internal(struct pse_controller_dev *pcdev, unsigned int index)return ERR_PTR (-ENOMEM );if (!try_module_get (pcdev->owner)) { -kfree (psec); -return ERR_PTR (-ENODEV ); + ret = -ENODEV ; + goto free_psec; } + psec->ps =devm_regulator_get_exclusive (pcdev->dev, +rdev_get_name (pcdev->pi[index].rdev)); +if (IS_ERR (psec->ps)) { + ret =PTR_ERR (psec->ps); + goto put_module; + } + + ret =regulator_is_enabled (psec->ps); +if (ret <0 ) + goto regulator_put; + + pcdev->pi[index].admin_state_enabled = ret; + psec->pcdev = pcdev;list_add (&psec->list, &pcdev->pse_control_head); psec->id = index;kref_init (&psec->refcnt);return psec; + +regulator_put: +devm_regulator_put (psec->ps); +put_module: +module_put (pcdev->owner); +free_psec: +kfree (psec); + +return ERR_PTR (ret); }/**
@@ -476,6 +643,54 @@ int pse_ethtool_get_status(struct pse_control *psec, }EXPORT_SYMBOL_GPL (pse_ethtool_get_status); +static int pse_ethtool_c33_set_config (struct pse_control *psec, +const struct pse_control_config *config) +{ +int err =0 ; + +/* Look at admin_state_enabled status to not call regulator_enable +* or regulator_disable twice creating a regulator counter mismatch +*/ +switch (config->c33_admin_control) { +case ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED : +if (!psec->pcdev->pi[psec->id].admin_state_enabled) + err =regulator_enable (psec->ps); +break ; +case ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED : +if (psec->pcdev->pi[psec->id].admin_state_enabled) + err =regulator_disable (psec->ps); +break ; +default : + err = -EOPNOTSUPP ; + } + +return err; +} + +static int pse_ethtool_podl_set_config (struct pse_control *psec, +const struct pse_control_config *config) +{ +int err =0 ; + +/* Look at admin_state_enabled status to not call regulator_enable +* or regulator_disable twice creating a regulator counter mismatch +*/ +switch (config->podl_admin_control) { +case ETHTOOL_PODL_PSE_ADMIN_STATE_ENABLED : +if (!psec->pcdev->pi[psec->id].admin_state_enabled) + err =regulator_enable (psec->ps); +break ; +case ETHTOOL_PODL_PSE_ADMIN_STATE_DISABLED : +if (psec->pcdev->pi[psec->id].admin_state_enabled) + err =regulator_disable (psec->ps); +break ; +default : + err = -EOPNOTSUPP ; + } + +return err; +} +/** * pse_ethtool_set_config - set PSE control configuration * @psec: PSE control pointer
@@ -486,20 +701,16 @@ int pse_ethtool_set_config(struct pse_control *psec,struct netlink_ext_ack *extack, const struct pse_control_config *config) { - const struct pse_controller_ops *ops; -int err; + int err = 0; - ops = psec->pcdev->ops; - -if (!ops->ethtool_set_config) { -NL_SET_ERR_MSG (extack, -"PSE driver does not configuration" ); -return -EOPNOTSUPP ; +if (pse_has_c33 (psec)) { + err =pse_ethtool_c33_set_config (psec, config); +if (err) +return err; } -mutex_lock (&psec->pcdev->lock); - err = ops->ethtool_set_config (psec->pcdev, psec->id, extack, config); -mutex_unlock (&psec->pcdev->lock); +if (pse_has_podl (psec)) + err =pse_ethtool_podl_set_config (psec, config);return err; }
drivers/net/pse-pd/pse_regulator.c +27 -21
71 lines not on this page · raw message
include/linux/pse-pd/pse.h +13 -5
@@ -48,17 +48,20 @@ struct pse_control_status {* struct pse_controller_ops - PSE controller driver callbacks * * @ethtool_get_status: get PSE control status for ethtool interface -* @ethtool_set_config: set PSE control configuration over ethtool interface * @setup_pi_matrix: setup PI matrix of the PSE controller +* @pi_is_enabled: Return 1 if the PSE PI is enabled, 0 if not. +* May also return negative errno. +* @pi_enabled: Configure the PSE PI as enabled. +* @pi_disable: Configure the PSE PI as disabled. */ struct pse_controller_ops {int (*ethtool_get_status)(struct pse_controller_dev *pcdev,unsigned long id,struct netlink_ext_ack *extack,struct pse_control_status *status); -int (*ethtool_set_config)(struct pse_controller_dev *pcdev, -unsigned long id,struct netlink_ext_ack *extack, -const struct pse_control_config *config);int (*setup_pi_matrix)(struct pse_controller_dev *pcdev); +int (*pi_is_enabled)(struct pse_controller_dev *pcdev,int id); +int (*pi_enable)(struct pse_controller_dev *pcdev,int id); +int (*pi_disable)(struct pse_controller_dev *pcdev,int id); };struct module ;
@@ -90,10 +93,14 @@ struct pse_pi_pairset {* * @pairset: table of the PSE PI pinout alternative for the two pairset * @np: device node pointer of the PSE PI node +* @rdev: regulator represented by the PSE PI +* @enabled: PI enabled state */ struct pse_pi {struct pse_pi_pairset pairset[2 ];struct device_node *np; +struct regulator_dev *rdev; +bool admin_state_enabled; };/**
@@ -147,7 +154,8 @@ bool pse_has_c33(struct pse_control *psec);#else -static inline struct pse_control *of_pse_control_get (struct device_node *node) +static inline struct pse_control *of_pse_control_get (struct device *dev, +struct device_node *node) {return ERR_PTR (-ENOENT ); }
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 13/17] net: pse-pd: Use regulator framework within PSE framework
Quoted 18 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Integrate the regulator framework to the PSE framework for enhanced access to features such as voltage, power measurement, and limits, which are akin to regulators. Additionally, PSE features like port priorities could potentially enhance the regulator framework. Note that this integration introduces some implementation complexity, including wrapper callbacks, but the potential benefits make it worthwhile.
Regulator are using enable counter with specific behavior. Two calls to
regulator_disablewill trigger kernel warnings. If the counter exceeds one,regulator_disablecall won't disable the PSE PI. These behavior isn't suitable for PSE control.
Added a boolean 'enabled' state to prevent multiple calls to regulator_enable/disable. These calls will only be called from PSE framework as it won't have any regulator children, therefore no mutex are needed to safeguards this boolean.
Quoted 5 lines
regulator_getneeds the consumer device pointer. Use PSE as regulator provider and consumer device until we have RJ45 ports represented in the Kernel.Signed-off-by Kory Maincent <[email protected]>
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 13/17] net: pse-pd: Use regulator framework within PSE framework
In reply to Kory MaincentQuoted 18 lines · On Tue, 26 Mar 2024 15:04:50 +0100 Kory Maincent <[email protected]>…
From: Kory Maincent (Dent Project) <[email protected]>
Integrate the regulator framework to the PSE framework for enhanced access to features such as voltage, power measurement, and limits, which are akin to regulators. Additionally, PSE features like port priorities could potentially enhance the regulator framework. Note that this integration introduces some implementation complexity, including wrapper callbacks, but the potential benefits make it worthwhile.
Regulator are using enable counter with specific behavior. Two calls to
regulator_disablewill trigger kernel warnings. If the counter exceeds one,regulator_disablecall won't disable the PSE PI. These behavior isn't suitable for PSE control.
Added a boolean 'enabled' state to prevent multiple calls to regulator_enable/disable. These calls will only be called from PSE framework as it won't have any regulator children, therefore no mutex are needed to safeguards this boolean.
Quoted 3 lines
regulator_getneeds the consumer device pointer. Use PSE as regulator provider and consumer device until we have RJ45 ports represented in the Kernel.
Oleksij, could you verify this patch does not break pse_regulator driver?
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerPATCH v6 14/17 dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
---
Changes in v2:
- Enhance ports-matrix description.
- Replace additionalProperties by unevaluatedProperties.
- Drop i2c suffix.
Changes in v3:
- Remove ports-matrix parameter.
- Add description of all physical ports and managers.
- Add pse_pis subnode moving to the API of pse-controller binding.
- Remove the MAINTAINERS section for this driver as I will be maintaining all pse-pd subsystem.
Changes in v5:
- Remove defs used only once.
- Replace underscore by dash.
- Add description.
--- .../bindings/net/pse-pd/microchip,pd692x0.yaml | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+)
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +158 -0
@@ -0,0 +1,158 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/pse-pd/microchip,pd692x0.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip PD692x0 Power Sourcing Equipment controller + +maintainers: + - Kory Maincent <[email protected]> + +allOf: + - $ref: pse-controller.yaml# + +properties: + compatible: + enum: + - microchip,pd69200 + - microchip,pd69210 + - microchip,pd69220 + + reg: + maxItems: 1 + + managers: + type: object + description: + List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager + have 4 or 8 physical ports according to the chip version. No need to + specify the SPI chip select as it is automatically detected by the + PD692x0 PSE controller. The PSE managers have to be described from + the lowest chip select to the greatest one, which is the detection + behavior of the PD692x0 PSE controller. The PD692x0 support up to + 12 PSE managers which can expose up to 96 physical ports. All + physical ports available on a manager have to be described in the + incremental order even if they are not used. + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties: + "^manager@0[0-9]|1[0-2]$": + $ref: /schemas/graph.yaml#/properties/ports + description: + PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical + ports. + + properties: + reg: + description: + Incremental index of the PSE manager starting from 0, ranging + from lowest to highest chip select, up to 12. + maxItems: 1 + + patternProperties: + '^port@[0-7]$': + type: object + required: + - reg + + required: + - reg + +required: + - compatible + - reg + - pse-pis + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-pse@3c { + compatible = "microchip,pd69200"; + reg = <0x3c>; + + managers { + #address-cells = <1>; + #size-cells = <0>; + + manager@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + phys0: port@0 { + reg = <0>; + }; + + phys1: port@1 { + reg = <1>; + }; + + phys2: port@2 { + reg = <2>; + }; + + phys3: port@3 { + reg = <3>; + }; + }; + + manager@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + phys4: port@0 { + reg = <0>; + }; + + phys5: port@1 { + reg = <1>; + }; + + phys6: port@2 { + reg = <2>; + }; + + phys7: port@3 { + reg = <3>; + }; + }; + }; + + pse-pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse-pi@0 { + reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + polarity-supported = "MDI", "S"; + }; + pse_pi1: pse-pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>; + polarity-supported = "MDI"; + }; + }; + }; + };
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 6 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
Signed-off-by Kory Maincent <[email protected]>
Andrew
Rob Herring
maintainerRe: [PATCH net-next v6 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Kory MaincentQuoted 74 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
Signed-off-by Kory Maincent <[email protected]>---
Changes in v2:
- Enhance ports-matrix description.
- Replace additionalProperties by unevaluatedProperties.
- Drop i2c suffix.Changes in v3:
- Remove ports-matrix parameter.
- Add description of all physical ports and managers.
- Addpse_pissubnode moving to the API of pse-controller binding.
- Remove theMAINTAINERSsection for this driver as I will be maintaining all pse-pd subsystem.Changes in v5:
- Remove defs used only once.
- Replace underscore by dash.
- Add description.--- .../bindings/net/pse-pd/microchip,pd692x0.yaml | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+)Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +40
-0@@ -0,0 +1,158 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/pse-pd/microchip,pd692x0.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Microchip PD692x0 Power Sourcing Equipment controller + +maintainers: + - Kory Maincent <[email protected]> + +allOf: + - $ref: pse-controller.yaml# + +properties: + compatible: + enum: + - microchip,pd69200 + - microchip,pd69210 + - microchip,pd69220 + + reg: + maxItems: 1 + + managers: + type: object + description: + List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager + have 4 or 8 physical ports according to the chip version. No need to + specify the SPI chip select as it is automatically detected by the + PD692x0 PSE controller. The PSE managers have to be described from + the lowest chip select to the greatest one, which is the detection + behavior of the PD692x0 PSE controller. The PD692x0 support up to + 12 PSE managers which can expose up to 96 physical ports. All + physical ports available on a manager have to be described in the + incremental order even if they are not used. + + properties: + "#address-cells": + const: 1
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 50
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ + "#size-cells": + const: 0 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties: + "^manager@0[0-9]|1[0-2]$":
Unit-addresses are typically in hex.
Is 'manager' something specific to this device or should be common?
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 51
Quoted 1 line
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +1
-0+ $ref: /schemas/graph.yaml#/properties/ports
This is not using the graph binding. Furthermore, I don't want to see new cases of 'port' node names which are not graph nodes. We have it already with ethernet switches, but 'ethernet-port' is preferred over 'port'.
Why is this one 'managers' and the other device binding 'channels'?
Quoted 6 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +6
-0+ description: + PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical + ports. + + properties: + reg:
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 67
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ description: + Incremental index of the PSE manager starting from 0, ranging + from lowest to highest chip select, up to 12. + maxItems: 1 + + patternProperties: + '^port@[0-7]$': + type: object + required: + - reg
Any property you want is allowed in this node. You are missing 'additionalProperties'.
Quoted 69 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +69
-0+ + required: + - reg + +required: + - compatible + - reg + - pse-pis + +unevaluatedProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-pse@3c { + compatible = "microchip,pd69200"; + reg = <0x3c>; + + managers { + #address-cells = <1>; + #size-cells = <0>; + + manager@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + phys0: port@0 { + reg = <0>; + }; + + phys1: port@1 { + reg = <1>; + }; + + phys2: port@2 { + reg = <2>; + }; + + phys3: port@3 { + reg = <3>; + }; + }; + + manager@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + phys4: port@0 { + reg = <0>; + }; + + phys5: port@1 { + reg = <1>; + }; + + phys6: port@2 { + reg = <2>; + }; + + phys7: port@3 { + reg = <3>; + }; + }; + };
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 146
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ + pse-pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse-pi@0 { + reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>;
It is very strange that you are describing the connections within a device.
Quoted 16 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +12
-0+ polarity-supported = "MDI", "S"; + }; + pse_pi1: pse-pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>; + polarity-supported = "MDI"; + }; + }; + }; + };Signature · 2 lines
-- 2.25.1
Kory Maincent
maintainerRe: [PATCH net-next v6 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 6 lines · On Tue, 2 Apr 2024 08:28:34 -0500 Rob Herring <[email protected]> wrote:
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 50
Quoted 2 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +2
-0+ patternProperties: + "^manager@0[0-9]|1[0-2]$":Unit-addresses are typically in hex.
Is 'manager' something specific to this device or should be common?
Specific to this device.
Quoted 6 lines
Quoted 1 line
+ $ref: /schemas/graph.yaml#/properties/ports
This is not using the graph binding. Furthermore, I don't want to see new cases of 'port' node names which are not graph nodes. We have it already with ethernet switches, but 'ethernet-port' is preferred over 'port'.
Ok I will remove the ref then.
Quoted 1 line
Why is this one 'managers' and the other device binding 'channels'?
Here each manager can have up to 8 ports.
The ports in tps23881 are called channels in the datasheet but I can use the port naming for both if you prefer.
Quoted 11 lines
Quoted 11 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +11
-0+ description: + PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical + ports. + + properties: + reg: + description: + Incremental index of the PSE manager starting from 0, ranging + from lowest to highest chip select, up to 12. + maxItems: 1 +
Quoted 8 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 67
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ patternProperties: + '^port@[0-7]$': + type: object + required: + - regAny property you want is allowed in this node. You are missing 'additionalProperties'.
Indeed.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerPATCH v6 15/17 net: pse-pd: Add PD692x0 PSE controller driver
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add a new driver for the PD692x0 I2C Power Sourcing Equipment controller. This driver only support i2c communication for now.
---
Change in v2:
- Drop of_match_ptr
- Follow the "c33" PoE prefix naming change.
- Remove unused delay_recv variable. Then, remove struct pd692x0_msg_content which is similar to struct pd692x0_msg.
- Fix a weird sleep loop.
- Improve pd692x0_recv_msg for better readability.
- Fix a warning reported by Simon on a pd692x0_fw_write_line call.
Change in v3:
- Fix few nit.
- Change the return value of pd692x0_try_recv_msg function.
- Replace a dev_err() function to dev_err_probe().
- Replace pd692x0_update_matrix by the newly introduced setup_pi_matrix callback.
- Follow new bindings of managers subnode description.
- Update the pse ops with the newly introduced pi_enable, pi_is_enabled and pi_disable ones.
- Replace firmware version check by a softer one (< instead of =!).
- Rearrange the probe function, which had wrong ordering on error case between pcdcev registering and software version read.
- Fixed the probe function in the case it is call two times. The status won't be sent automatically on the second times so ask for it.
--- drivers/net/pse-pd/Kconfig | 11 + drivers/net/pse-pd/Makefile | 1 + drivers/net/pse-pd/pd692x0.c | 1223 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1235 insertions(+)
drivers/net/pse-pd/Kconfig +11 -0
@@ -20,4 +20,15 @@ config PSE_REGULATOR Sourcing Equipment without automatic classification support. For example for basic implementation of PoDL (802.3bu) specification. +config PSE_PD692X0 + tristate "PD692X0 PSE controller" + depends on I2C + select FW_UPLOAD + help + This module provides support for PD692x0 regulator based Ethernet + Power Sourcing Equipment. + + To compile this driver as a module, choose M here: the + module will be called pd692x0. + endif
drivers/net/pse-pd/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_PSE_CONTROLLER) += pse_core.o obj-$(CONFIG_PSE_REGULATOR) += pse_regulator.o +obj-$(CONFIG_PSE_PD692X0) += pd692x0.o
drivers/net/pse-pd/pd692x0.c new file +1223 -0
1,223 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 15/17] net: pse-pd: Add PD692x0 PSE controller driver
Quoted 6 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Add a new driver for the PD692x0 I2C Power Sourcing Equipment controller. This driver only support i2c communication for now.
Signed-off-by Kory Maincent <[email protected]>
Andrew
Kory Maincent
maintainerPATCH v6 16/17 dt-bindings: net: pse-pd: Add bindings for TPS23881 PSE controller
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add the TPS23881 I2C Power Sourcing Equipment controller device tree bindings documentation.
---
Change in v3:
- New patch.
Change in v4:
- Rename the file to ti,tps23881 as it support only this version of the PSE controller.
--- .../bindings/net/pse-pd/ti,tps23881.yaml | 93 ++++++++++++++++++++++ 1 file changed, 93 insertions(+)
Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml new file +93 -0
@@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/pse-pd/ti,tps23881.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: TI TPS23881 Power Sourcing Equipment controller + +maintainers: + - Kory Maincent <[email protected]> + +allOf: + - $ref: pse-controller.yaml# + +properties: + compatible: + enum: + - ti,tps23881 + + reg: + maxItems: 1 + + '#pse-cells': + const: 1 + + channels: + description: each set of 8 ports can be assigned to one physical + channels or two for PoE4. This parameter describes the configuration + of the ports conversion matrix that establishes relationship between + the logical ports and the physical channels. + type: object + + patternProperties: + '^channel@[0-7]$': + type: object + required: + - reg + +unevaluatedProperties: false + +required: + - compatible + - reg + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-pse@20 { + compatible = "ti,tps23881"; + reg = <0x20>; + + channels { + #address-cells = <1>; + #size-cells = <0>; + + phys0: channel@0 { + reg = <0>; + }; + + phys1: channel@1 { + reg = <1>; + }; + + phys2: channel@2 { + reg = <2>; + }; + }; + + pse-pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse-pi@0 { + reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + polarity-supported = "MDI", "S"; + }; + + pse_pi1: pse-pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>; + polarity-supported = "MDI"; + }; + }; + }; + };
Signature · 1 line
2.25.1
Re: [PATCH net-next v6 16/17] dt-bindings: net: pse-pd: Add bindings for TPS23881 PSE controller
Quoted 6 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Add the TPS23881 I2C Power Sourcing Equipment controller device tree bindings documentation.
Signed-off-by Kory Maincent <[email protected]>
Andrew
Kory Maincent
maintainerPATCH v6 17/17 net: pse-pd: Add TI TPS23881 PSE controller driver
In reply to Kory MaincentFrom: Kory Maincent (Dent Project) <[email protected]>
Add a new driver for the TI TPS23881 I2C Power Sourcing Equipment controller.
---
Change in v3:
- New patch.
Change in v6:
- Fix firmware management, release_firmware was missing.
--- drivers/net/pse-pd/Kconfig | 9 + drivers/net/pse-pd/Makefile | 1 + drivers/net/pse-pd/tps23881.c | 818 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 828 insertions(+)
drivers/net/pse-pd/Kconfig +9 -0
@@ -31,4 +31,13 @@ config PSE_PD692X0 To compile this driver as a module, choose M here: the module will be called pd692x0. +config PSE_TPS23881 + tristate "TPS23881 PSE controller" + depends on I2C + help + This module provides support for TPS23881 regulator based Ethernet + Power Sourcing Equipment. + + To compile this driver as a module, choose M here: the + module will be called tps23881. endif
drivers/net/pse-pd/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_PSE_CONTROLLER) += pse_core.o obj-$(CONFIG_PSE_REGULATOR) += pse_regulator.o obj-$(CONFIG_PSE_PD692X0) += pd692x0.o +obj-$(CONFIG_PSE_TPS23881) += tps23881.o
drivers/net/pse-pd/tps23881.c new file +818 -0
818 lines not on this page · raw message
Signature · 1 line
2.25.1
Andrew Lunn
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
Quoted 18 lines
drivers/net/pse-pd/tps23881.c new file +18
-0+static int +tps23881_get_unused_chan (struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ], +int port_cnt) +{ +bool used; +int i, j; + +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { + used = false; + +for (j =0 ; j < port_cnt; j++) { +if (port_matrix[j].hw_chan[0 ] == i) { + used = true; +break ; + } + +if (port_matrix[j].is_4p && + port_matrix[j].hw_chan[1 ] == i) {
drivers/net/pse-pd/tps23881.c line 367
Quoted 10 lines
drivers/net/pse-pd/tps23881.c new file +10
-0+ used = true; +break ; + } + } + +if (!used) +return i; + } + +return -1 ;
nitpick: Return -ENODEV.
drivers/net/pse-pd/tps23881.c line 437
Quoted 5 lines
drivers/net/pse-pd/tps23881.c new file +5
-0+while (cnt_4ch_grp1 <4 ) { + ret =tps23881_get_unused_chan (tmp_port_matrix, port_cnt); +if (ret <0 ) { +pr_err ("tps23881: port matrix issue, no chan available\n" ); +return -ENODEV ;
and then just returns ret.
drivers/net/pse-pd/tps23881.c line 533
Quoted 10 lines
drivers/net/pse-pd/tps23881.c new file +10
-0+static int +tps23881_set_ports_conf (struct tps23881_priv *priv, +struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ]) +{ +struct i2c_client *client = priv->client; +int i, ret; +u16 val; + +/* Set operating mode */ + ret =i2c_smbus_write_word_data (client,TPS23881_REG_OP_MODE ,0xaaaa );
Could you add some #defines here? This is semiauto i think?
Quoted 26 lines
drivers/net/pse-pd/tps23881.c new file +26
-0+if (ret) +return ret; + +/* Disable DC disconnect */ + ret =i2c_smbus_write_word_data (client,TPS23881_REG_DIS_EN ,0x0 ); +if (ret) +return ret; + +/* Set port power allocation */ + val =0 ; +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (!port_matrix[i].exist) +continue ; + +if (port_matrix[i].is_4p) + val |=0xf << ((port_matrix[i].lgcl_chan[0 ] /2 ) *4 ); +else + val |=0x3 << ((port_matrix[i].lgcl_chan[0 ] /2 ) *4 ); + } + ret =i2c_smbus_write_word_data (client,TPS23881_REG_PORT_POWER , val); +if (ret) +return ret; + +/* Enable detection and classification */ + val =0 ; +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) {
drivers/net/pse-pd/tps23881.c line 569
Quoted 10 lines
drivers/net/pse-pd/tps23881.c new file +10
-0+if (!port_matrix[i].exist) +continue ; + + val |=BIT (port_matrix[i].lgcl_chan[0 ]) | +BIT (port_matrix[i].lgcl_chan[0 ] +4 ); +if (port_matrix[i].is_4p) + val |=BIT (port_matrix[i].lgcl_chan[1 ]) | +BIT (port_matrix[i].lgcl_chan[1 ] +4 ); + } + ret =i2c_smbus_write_word_data (client,TPS23881_REG_DET_CLA_EN ,0xffff );
This looks odd. You calculate val, and then don't use it?
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
Quoted 6 lines · On Thu, 28 Mar 2024 17:17:43 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 4 lines
drivers/net/pse-pd/tps23881.c new file +3
-0+ +/* Set operating mode */ + ret = i2c_smbus_write_word_data(client, TPS23881_REG_OP_MODE,
0xaaaa);Could you add some #defines here? This is semiauto i think?
Yes
Quoted 8 lines
Quoted 8 lines
drivers/net/pse-pd/tps23881.c new file +8
-0+/* Enable detection and classification */ + val =0 ; +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (!port_matrix[i].exist) +continue ; + + val |=BIT (port_matrix[i].lgcl_chan[0 ]) | +BIT (port_matrix[i].lgcl_chan[0 ] +4 );
Quoted 8 lines
Quoted 6 lines
drivers/net/pse-pd/tps23881.c new file +5
-0+if (port_matrix[i].is_4p) + val |=BIT (port_matrix[i].lgcl_chan[1 ]) | +BIT (port_matrix[i].lgcl_chan[1 ] +4 ); + } + ret = i2c_smbus_write_word_data(client, TPS23881_REG_DET_CLA_EN,
0xffff);This looks odd. You calculate val, and then don't use it?
Oh indeed, you are right! Thanks for spotting the issue.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
In reply to Kory MaincentQuoted 715 lines · Kory Maincent
From: Kory Maincent (Dent Project) <[email protected]>
Add a new driver for the TI TPS23881 I2C Power Sourcing Equipment controller.
Signed-off-by Kory Maincent <[email protected]>---
Change in v3:
- New patch.Change in v6:
- Fix firmware management,release_firmwarewas missing.--- drivers/net/pse-pd/Kconfig | 9 + drivers/net/pse-pd/Makefile | 1 + drivers/net/pse-pd/tps23881.c | 818 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 828 insertions(+)drivers/net/pse-pd/Kconfig +9
-0@@ -31,4 +31,13 @@ config PSE_PD692X0 To compile this driver as a module, choose M here: the module will be called pd692x0. +config PSE_TPS23881 + tristate "TPS23881 PSE controller" + depends on I2C + help + This module provides support for TPS23881 regulator based Ethernet + Power Sourcing Equipment. + + To compile this driver as a module, choose M here: the + module will be called tps23881. endifdrivers/net/pse-pd/Makefile +1
-0@@ -5,3 +5,4 @@ obj-$(CONFIG_PSE_CONTROLLER) += pse_core.o obj-$(CONFIG_PSE_REGULATOR) += pse_regulator.o obj-$(CONFIG_PSE_PD692X0) += pd692x0.o +obj-$(CONFIG_PSE_TPS23881) += tps23881.odrivers/net/pse-pd/tps23881.c new file +663
-0@@ -0,0 +1,818 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Driver for the TI TPS23881 PoE PSE Controller driver (I2C bus) +* +* Copyright (c) 2023 Bootlin, Kory Maincent <[email protected]> +*/ + +#include <linux/delay.h> +#include <linux/firmware.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/pse-pd/pse.h> + +#define TPS23881_MAX_CHANS 8 + +#define TPS23881_REG_PW_STATUS 0x10 +#define TPS23881_REG_OP_MODE 0x12 +#define TPS23881_REG_DIS_EN 0x13 +#define TPS23881_REG_DET_CLA_EN 0x14 +#define TPS23881_REG_GEN_MASK 0x17 +#define TPS23881_REG_NBITACC BIT(5) +#define TPS23881_REG_PW_EN 0x19 +#define TPS23881_REG_PORT_MAP 0x26 +#define TPS23881_REG_PORT_POWER 0x29 +#define TPS23881_REG_POEPLUS 0x40 +#define TPS23881_REG_TPON BIT(0) +#define TPS23881_REG_FWREV 0x41 +#define TPS23881_REG_DEVID 0x43 +#define TPS23881_REG_SRAM_CTRL 0x60 +#define TPS23881_REG_SRAM_DATA 0x61 + +struct tps23881_port_desc { +u8 chan[2 ]; +bool is_4p; +}; + +struct tps23881_priv { +struct i2c_client *client; +struct pse_controller_dev pcdev; +struct device_node *np; +struct tps23881_port_desc port[TPS23881_MAX_CHANS ]; +}; + +static struct tps23881_priv *to_tps23881_priv (struct pse_controller_dev *pcdev) +{ + return container_of(pcdev, struct tps23881_priv, pcdev); +} + +static int tps23881_pi_enable (struct pse_controller_dev *pcdev,int id) +{ +struct tps23881_priv *priv =to_tps23881_priv (pcdev); +struct i2c_client *client = priv->client; +u8 chan; +u16 val; +int ret; + +if (id >=TPS23881_MAX_CHANS ) +return -ERANGE ; + + ret =i2c_smbus_read_word_data (client,TPS23881_REG_PW_STATUS ); +if (ret <0 ) +return ret; + + chan = priv->port[id].chan[0 ]; +if (chan <4 ) + val = (u16)(ret |BIT (chan)); +else + val = (u16)(ret |BIT (chan +4 )); + +if (priv->port[id].is_4p) { + chan = priv->port[id].chan[1 ]; +if (chan <4 ) + val |=BIT (chan); +else + val |=BIT (chan +4 ); + } + + ret =i2c_smbus_write_word_data (client,TPS23881_REG_PW_EN , val); +if (ret) +return ret; + +return 0 ; +} + +static int tps23881_pi_disable (struct pse_controller_dev *pcdev,int id) +{ +struct tps23881_priv *priv =to_tps23881_priv (pcdev); +struct i2c_client *client = priv->client; +u8 chan; +u16 val; +int ret; + +if (id >=TPS23881_MAX_CHANS ) +return -ERANGE ; + + ret =i2c_smbus_read_word_data (client,TPS23881_REG_PW_STATUS ); +if (ret <0 ) +return ret; + + chan = priv->port[id].chan[0 ]; +if (chan <4 ) + val = (u16)(ret |BIT (chan +4 )); +else + val = (u16)(ret |BIT (chan +8 )); + +if (priv->port[id].is_4p) { + chan = priv->port[id].chan[1 ]; +if (chan <4 ) + val |=BIT (chan +4 ); +else + val |=BIT (chan +8 ); + } + + ret =i2c_smbus_write_word_data (client,TPS23881_REG_PW_EN , val); +if (ret) +return ret; + +return 0 ; +} + +static int tps23881_pi_is_enabled (struct pse_controller_dev *pcdev,int id) +{ +struct tps23881_priv *priv =to_tps23881_priv (pcdev); +struct i2c_client *client = priv->client; +bool enabled; +u8 chan; +int ret; + + ret =i2c_smbus_read_word_data (client,TPS23881_REG_PW_STATUS ); +if (ret <0 ) +return ret; + + chan = priv->port[id].chan[0 ]; +if (chan <4 ) + enabled = ret &BIT (chan); +else + enabled = ret &BIT (chan +4 ); + +if (priv->port[id].is_4p) { + chan = priv->port[id].chan[1 ]; +if (chan <4 ) + enabled &= !!(ret &BIT (chan)); +else + enabled &= !!(ret &BIT (chan +4 )); + } + +/* Return enabled status only if both channel are on this state */ +return enabled; +} + +static int tps23881_ethtool_get_status (struct pse_controller_dev *pcdev, +unsigned long id, +struct netlink_ext_ack *extack, +struct pse_control_status *status) +{ +struct tps23881_priv *priv =to_tps23881_priv (pcdev); +struct i2c_client *client = priv->client; +bool enabled, delivering; +u8 chan; +int ret; + + ret =i2c_smbus_read_word_data (client,TPS23881_REG_PW_STATUS ); +if (ret <0 ) +return ret; + + chan = priv->port[id].chan[0 ]; +if (chan <4 ) { + enabled = ret &BIT (chan); + delivering = ret &BIT (chan +4 ); + }else { + enabled = ret &BIT (chan +4 ); + delivering = ret &BIT (chan +8 ); + } + +if (priv->port[id].is_4p) { + chan = priv->port[id].chan[1 ]; +if (chan <4 ) { + enabled &= !!(ret &BIT (chan)); + delivering &= !!(ret &BIT (chan +4 )); + }else { + enabled &= !!(ret &BIT (chan +4 )); + delivering &= !!(ret &BIT (chan +8 )); + } + } + +/* Return delivering status only if both channel are on this state */ +if (delivering) + status->c33_pw_status =ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING ; +else + status->c33_pw_status =ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED ; + +/* Return enabled status only if both channel are on this state */ +if (enabled) + status->c33_admin_state =ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED ; +else + status->c33_admin_state =ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED ; + +return 0 ; +} + +/* Parse managers subnode into a array of device node */ +static int +tps23881_get_of_channels (struct tps23881_priv *priv, +struct device_node *chan_node[TPS23881_MAX_CHANS ]) +{ +struct device_node *channels_node, *node; +int i, ret; + +if (!priv->np) +return -EINVAL ; + + channels_node =of_find_node_by_name (priv->np,"channels" ); +if (!channels_node) +return -EINVAL ; + +for_each_child_of_node (channels_node, node) { +u32 chan_id; + +if (!of_node_name_eq (node,"channel" )) +continue ; + + ret =of_property_read_u32 (node,"reg" , &chan_id); +if (ret) { + ret = -EINVAL ; + goto out; + } + +if (chan_id >=TPS23881_MAX_CHANS || chan_node[chan_id]) { +dev_err (&priv->client->dev, +"wrong number of port (%d)\n" , chan_id); + ret = -EINVAL ; + goto out; + } + +of_node_get (node); + chan_node[chan_id] = node; + } + +of_node_put (channels_node); +return 0 ; + +out: +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +of_node_put (chan_node[i]); + chan_node[i] =NULL ; + } + +of_node_put (node); +of_node_put (channels_node); +return ret; +} + +struct tps23881_port_matrix { +u8 pi_id; +u8 lgcl_chan[2 ]; +u8 hw_chan[2 ]; +bool is_4p; +bool exist; +}; + +static int +tps23881_match_channel (const struct pse_pi_pairset *pairset, +struct device_node *chan_node[TPS23881_MAX_CHANS ]) +{ +int i; + +/* Look on every channels */ +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (pairset->np == chan_node[i]) +return i; + } + +return -ENODEV ; +} + +static bool +tps23881_is_chan_free (struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ], +int chan) +{ +int i; + +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (port_matrix[i].exist && + (port_matrix[i].hw_chan[0 ] == chan || + port_matrix[i].hw_chan[1 ] == chan)) +return false; + } + +return true; +} + +/* Fill port matrix with the matching channels */ +static int +tps23881_match_port_matrix (struct pse_pi *pi,int pi_id, +struct device_node *chan_node[TPS23881_MAX_CHANS ], +struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ]) +{ +int ret; + +if (!pi->pairset[0 ].np) +return 0 ; + + ret =tps23881_match_channel (&pi->pairset[0 ], chan_node); +if (ret <0 ) +return ret; + +if (!tps23881_is_chan_free (port_matrix, ret)) { +pr_err ("tps23881: channel %d already used\n" , ret); +return -ENODEV ; + } + + port_matrix[pi_id].hw_chan[0 ] = ret; + port_matrix[pi_id].exist = true; + +if (!pi->pairset[1 ].np) +return 0 ; + + ret =tps23881_match_channel (&pi->pairset[1 ], chan_node); +if (ret <0 ) +return ret; + +if (!tps23881_is_chan_free (port_matrix, ret)) { +pr_err ("tps23881: channel %d already used\n" , ret); +return -ENODEV ; + } + +if (port_matrix[pi_id].hw_chan[0 ] /4 != ret /4 ) { +pr_err ("tps23881: 4-pair PSE can only be set within the same 4 ports group" ); +return -ENODEV ; + } + + port_matrix[pi_id].hw_chan[1 ] = ret; + port_matrix[pi_id].is_4p = true; + +return 0 ; +} + +static int +tps23881_get_unused_chan (struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ], +int port_cnt) +{ +bool used; +int i, j; + +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { + used = false; + +for (j =0 ; j < port_cnt; j++) { +if (port_matrix[j].hw_chan[0 ] == i) { + used = true; +break ; + } + +if (port_matrix[j].is_4p && + port_matrix[j].hw_chan[1 ] == i) { + used = true; +break ; + } + } + +if (!used) +return i; + } + +return -1 ; +} + +/* Sort the port matrix to following particular hardware ports matrix +* specification of the tps23881. The device has two 4-ports groups and +* each 4-pair powered device has to be configured to use two consecutive +* logical channel in each 4 ports group (1 and 2 or 3 and 4). Also the +* hardware matrix has to be fully configured even with unused chan to be +* valid. +*/ +static int +tps23881_sort_port_matrix (struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ]) +{ +struct tps23881_port_matrix tmp_port_matrix[TPS23881_MAX_CHANS ] = {0 }; +int i, ret, port_cnt =0 , cnt_4ch_grp1 =0 , cnt_4ch_grp2 =4 ; + +/* Configure 4p port matrix */ +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +int *cnt; + +if (!port_matrix[i].exist || !port_matrix[i].is_4p) +continue ; + +if (port_matrix[i].hw_chan[0 ] <4 ) + cnt = &cnt_4ch_grp1; +else + cnt = &cnt_4ch_grp2; + + tmp_port_matrix[port_cnt].exist = true; + tmp_port_matrix[port_cnt].is_4p = true; + tmp_port_matrix[port_cnt].pi_id = i; + tmp_port_matrix[port_cnt].hw_chan[0 ] = port_matrix[i].hw_chan[0 ]; + tmp_port_matrix[port_cnt].hw_chan[1 ] = port_matrix[i].hw_chan[1 ]; + +/* 4-pair ports have to be configured with consecutive +* logical channels 0 and 1, 2 and 3. +*/ + tmp_port_matrix[port_cnt].lgcl_chan[0 ] = (*cnt)++; + tmp_port_matrix[port_cnt].lgcl_chan[1 ] = (*cnt)++; + + port_cnt++; + } + +/* Configure 2p port matrix */ +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +int *cnt; + +if (!port_matrix[i].exist || port_matrix[i].is_4p) +continue ; + +if (port_matrix[i].hw_chan[0 ] <4 ) + cnt = &cnt_4ch_grp1; +else + cnt = &cnt_4ch_grp2; + + tmp_port_matrix[port_cnt].exist = true; + tmp_port_matrix[port_cnt].pi_id = i; + tmp_port_matrix[port_cnt].lgcl_chan[0 ] = (*cnt)++; + tmp_port_matrix[port_cnt].hw_chan[0 ] = port_matrix[i].hw_chan[0 ]; + + port_cnt++; + } + +/* Complete the rest of the first 4 port group matrix even if +* channels are unused +*/ +while (cnt_4ch_grp1 <4 ) { + ret =tps23881_get_unused_chan (tmp_port_matrix, port_cnt); +if (ret <0 ) { +pr_err ("tps23881: port matrix issue, no chan available\n" ); +return -ENODEV ; + } + +if (port_cnt >=TPS23881_MAX_CHANS ) { +pr_err ("tps23881: wrong number of channels\n" ); +return -ENODEV ; + } + tmp_port_matrix[port_cnt].lgcl_chan[0 ] = cnt_4ch_grp1; + tmp_port_matrix[port_cnt].hw_chan[0 ] = ret; + cnt_4ch_grp1++; + port_cnt++; + } + +/* Complete the rest of the second 4 port group matrix even if +* channels are unused +*/ +while (cnt_4ch_grp2 <8 ) { + ret =tps23881_get_unused_chan (tmp_port_matrix, port_cnt); +if (ret <0 ) { +pr_err ("tps23881: port matrix issue, no chan available\n" ); +return -ENODEV ; + } + +if (port_cnt >=TPS23881_MAX_CHANS ) { +pr_err ("tps23881: wrong number of channels\n" ); +return -ENODEV ; + } + tmp_port_matrix[port_cnt].lgcl_chan[0 ] = cnt_4ch_grp2; + tmp_port_matrix[port_cnt].hw_chan[0 ] = ret; + cnt_4ch_grp2++; + port_cnt++; + } + +memcpy (port_matrix, tmp_port_matrix,sizeof (tmp_port_matrix)); + +return port_cnt; +} + +/* Write port matrix to the hardware port matrix and the software port +* matrix. +*/ +static int +tps23881_write_port_matrix (struct tps23881_priv *priv, +struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ], +int port_cnt) +{ +struct i2c_client *client = priv->client; +u8 pi_id, lgcl_chan, hw_chan; +u16 val =0 ; +int i, ret; + +for (i =0 ; i < port_cnt; i++) { + pi_id = port_matrix[i].pi_id; + lgcl_chan = port_matrix[i].lgcl_chan[0 ]; + hw_chan = port_matrix[i].hw_chan[0 ] %4 ; + +/* Set software port matrix for existing ports */ +if (port_matrix[i].exist) + priv->port[pi_id].chan[0 ] = lgcl_chan; + +/* Set hardware port matrix for all ports */ + val |= hw_chan << (lgcl_chan *2 ); + +if (!port_matrix[i].is_4p) +continue ; + + lgcl_chan = port_matrix[i].lgcl_chan[1 ]; + hw_chan = port_matrix[i].hw_chan[1 ] %4 ; + +/* Set software port matrix for existing ports */ +if (port_matrix[i].exist) { + priv->port[pi_id].is_4p = true; + priv->port[pi_id].chan[1 ] = lgcl_chan; + } + +/* Set hardware port matrix for all ports */ + val |= hw_chan << (lgcl_chan *2 ); + } + +/* Write hardware ports matrix */ + ret =i2c_smbus_write_word_data (client,TPS23881_REG_PORT_MAP , val); +if (ret) +return ret; + +return 0 ; +} + +static int +tps23881_set_ports_conf (struct tps23881_priv *priv, +struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ]) +{ +struct i2c_client *client = priv->client; +int i, ret; +u16 val; + +/* Set operating mode */ + ret =i2c_smbus_write_word_data (client,TPS23881_REG_OP_MODE ,0xaaaa ); +if (ret) +return ret; + +/* Disable DC disconnect */ + ret =i2c_smbus_write_word_data (client,TPS23881_REG_DIS_EN ,0x0 ); +if (ret) +return ret; + +/* Set port power allocation */ + val =0 ; +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (!port_matrix[i].exist) +continue ; + +if (port_matrix[i].is_4p) + val |=0xf << ((port_matrix[i].lgcl_chan[0 ] /2 ) *4 ); +else + val |=0x3 << ((port_matrix[i].lgcl_chan[0 ] /2 ) *4 ); + } + ret =i2c_smbus_write_word_data (client,TPS23881_REG_PORT_POWER , val); +if (ret) +return ret; + +/* Enable detection and classification */ + val =0 ; +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { +if (!port_matrix[i].exist) +continue ; + + val |=BIT (port_matrix[i].lgcl_chan[0 ]) | +BIT (port_matrix[i].lgcl_chan[0 ] +4 ); +if (port_matrix[i].is_4p) + val |=BIT (port_matrix[i].lgcl_chan[1 ]) | +BIT (port_matrix[i].lgcl_chan[1 ] +4 ); + } + ret =i2c_smbus_write_word_data (client,TPS23881_REG_DET_CLA_EN ,0xffff ); +if (ret) +return ret; + +return 0 ; +} + +static int +tps23881_set_ports_matrix (struct tps23881_priv *priv, +struct device_node *chan_node[TPS23881_MAX_CHANS ]) +{ +struct tps23881_port_matrix port_matrix[TPS23881_MAX_CHANS ] = {0 }; +int i, ret; + +/* Update with values for every PSE PIs */ +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) { + ret =tps23881_match_port_matrix (&priv->pcdev.pi[i], i, + chan_node, port_matrix); +if (ret) +return ret; + } + + ret =tps23881_sort_port_matrix (port_matrix); +if (ret <0 ) +return ret; + + ret =tps23881_write_port_matrix (priv, port_matrix, ret); +if (ret) +return ret; + + ret =tps23881_set_ports_conf (priv, port_matrix); +if (ret) +return ret; + +return 0 ; +} + +static int tps23881_setup_pi_matrix (struct pse_controller_dev *pcdev) +{ +struct device_node *chan_node[TPS23881_MAX_CHANS ] = {NULL }; +struct tps23881_priv *priv =to_tps23881_priv (pcdev); +int ret, i; + + ret =tps23881_get_of_channels (priv, chan_node); +if (ret <0 ) { +dev_warn (&priv->client->dev, +"Unable to parse port-matrix, default matrix will be used\n" ); +return 0 ; + } + + ret =tps23881_set_ports_matrix (priv, chan_node); + +for (i =0 ; i <TPS23881_MAX_CHANS ; i++) +of_node_put (chan_node[i]); + +return ret; +} + +static const struct pse_controller_ops tps23881_ops = { + .setup_pi_matrix = tps23881_setup_pi_matrix, + .pi_enable = tps23881_pi_enable, + .pi_disable = tps23881_pi_disable, + .pi_is_enabled = tps23881_pi_is_enabled, + .ethtool_get_status = tps23881_ethtool_get_status, +}; + +static const char fw_parity_name[] ="ti/tps23881/tps23881-parity-14.bin" ; +static const char fw_sram_name[] ="ti/tps23881/tps23881-sram-14.bin" ; + +struct tps23881_fw_conf { +u8 reg; +u8 val; +}; + +static const struct tps23881_fw_conf tps23881_parity_flash_conf[] = { + {.reg =0x60 , .val =0x01 }, + {.reg =0x62 , .val =0x00 }, + {.reg =0x63 , .val =0x80 }, + {.reg =0x60 , .val =0xC4 }, + {.reg =0x1D , .val =0xBC }, + {.reg =0xD7 , .val =0x02 }, + {.reg =0x91 , .val =0x00 }, + {.reg =0x90 , .val =0x00 }, + {.reg =0xD7 , .val =0x00 }, + {.reg =0x1D , .val =0x00 }, + {/* sentinel */ } +}; + +static const struct tps23881_fw_conf tps23881_sram_flash_conf[] = { + {.reg =0x60 , .val =0xC5 }, + {.reg =0x62 , .val =0x00 }, + {.reg =0x63 , .val =0x80 }, + {.reg =0x60 , .val =0xC0 }, + {.reg =0x1D , .val =0xBC }, + {.reg =0xD7 , .val =0x02 },
drivers/net/pse-pd/tps23881.c line 673
Quoted 10 lines
drivers/net/pse-pd/tps23881.c new file +10
-0+ {.reg = 0x91, .val = 0x00}, + {.reg = 0x90, .val = 0x00}, + {.reg = 0xD7, .val = 0x00}, + {.reg = 0x1D, .val = 0x00}, + {/* sentinel */ } +}; + +static int tps23881_flash_fw_part (struct i2c_client *client, +const char *fw_name, +const struct tps23881_fw_conf *fw_conf)
Does the device actually have flash? Or is this just downloading to SRAM?
drivers/net/pse-pd/tps23881.c line 682
Quoted 9 lines
drivers/net/pse-pd/tps23881.c new file +9
-0+{ +const struct firmware *fw =NULL ; +int i, ret; + + ret =request_firmware (&fw, fw_name, &client->dev); +if (ret) +return ret; + +dev_info (&client->dev,"Flashing %s\n" , fw_name);
If this is a one-time thing whenever there is a new firmware version dropped into /lib/firmware, this would be O.K. However, if this happens every boot, i would use dev_dbg().
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
Quoted 6 lines · On Thu, 28 Mar 2024 17:24:17 +0100 Andrew Lunn <[email protected]> wrote:
drivers/net/pse-pd/tps23881.c line 673
Quoted 3 lines
drivers/net/pse-pd/tps23881.c new file +3
-0+static int tps23881_flash_fw_part (struct i2c_client *client, +const char *fw_name, +const struct tps23881_fw_conf *fw_conf)Does the device actually have flash? Or is this just downloading to SRAM?
It is downloading to SRAM.
Quoted 14 lines
drivers/net/pse-pd/tps23881.c line 682
Quoted 10 lines
drivers/net/pse-pd/tps23881.c new file +9
-0+{ +const struct firmware *fw =NULL ; +int i, ret; + + ret =request_firmware (&fw, fw_name, &client->dev); +if (ret) +return ret; + +dev_info (&client->dev,"Flashing %s\n" , fw_name);If this is a one-time thing whenever there is a new firmware version dropped into
/lib/firmware, this would be O.K. However, if this happens every boot, i would usedev_dbg().
Ok I will change to dev_dbg then.
Thanks!
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
Quoted 11 lines · Kory Maincent
Quoted 6 lines · On Thu, 28 Mar 2024 17:24:17 +0100 Andrew Lunn <[email protected]> wrote:
drivers/net/pse-pd/tps23881.c line 673
Quoted 3 lines
drivers/net/pse-pd/tps23881.c new file +3
-0+static int tps23881_flash_fw_part (struct i2c_client *client, +const char *fw_name, +const struct tps23881_fw_conf *fw_conf)Does the device actually have flash? Or is this just downloading to SRAM?
It is downloading to SRAM.
So maybe rename these functions.
Andrew
Kory Maincent
maintainerRe: [PATCH net-next v6 17/17] net: pse-pd: Add TI TPS23881 PSE controller driver
Quoted 12 lines · On Sat, 30 Mar 2024 15:52:49 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 11 lines · Kory Maincent
Quoted 7 lines · On Thu, 28 Mar 2024 17:24:17 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 4 lines
drivers/net/pse-pd/tps23881.c new file +3
-0+static int tps23881_flash_fw_part (struct i2c_client *client, +const char *fw_name, + const struct tps23881_fw_conf
*fw_conf)Does the device actually have flash? Or is this just downloading to SRAM?
Quoted 3 lines
Quoted 1 line
It is downloading to SRAM.
So maybe rename these functions.
Ok, I will.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com