net: Add support for Power over Ethernet (PoE)
Subsystems (9)
Kory Maincent
maintainerv4 cover net: Add support for Power over Ethernet (PoE)
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.
This patch series is sponsored by Dent Project
<[email protected]>.
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 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]
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 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]
---
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 | 157 +++ .../bindings/net/pse-pd/pse-controller.yaml | 84 +- .../bindings/net/pse-pd/ti,tps23881.yaml | 111 ++ 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 | 275 +++++ MAINTAINERS | 8 + drivers/net/mdio/fwnode_mdio.c | 29 +- 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 | 491 +++++++- 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 | 89 +- include/uapi/linux/ethtool.h | 43 + include/uapi/linux/ethtool_netlink.h | 3 + include/uapi/linux/pse.h | 23 + net/ethtool/pse-pd.c | 60 +- 23 files changed, 3504 insertions(+), 120 deletions(-)
---
base-commit: 069f62e4e393fc9ffa2f0da501155fbdce7e2605
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 v4 1/17 MAINTAINERS: net: Add Oleksij to pse-pd maintainers
Oleksij was the first to add support for pse-pd net subsystem. Add himself to the maintainers seems logical.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -17682,6 +17682,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
Kory Maincent
maintainerPATCH v4 2/17 of: property: Add fw_devlink support for pse parent
In reply to Kory MaincentThis allows fw_devlink to create device links between consumers of a PSE and the supplier of the PSE.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
--- drivers/of/property.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/of/property.c +2 -0
@@ -1269,6 +1269,7 @@ DEFINE_SIMPLE_PROP(leds, "leds", NULL) DEFINE_SIMPLE_PROP(backlight, "backlight", NULL) DEFINE_SIMPLE_PROP(panel, "panel", NULL) DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells") +DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells") DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)DEFINE_SUFFIX_PROP (gpio,"-gpio" ,"#gpio-cells" )
@@ -1359,6 +1360,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 v4 3/17 net: pse-pd: Rectify and adapt the naming of admin_cotrol member of struct pse_control_config
In reply to Kory MaincentIn 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."
This patch is sponsored by Dent Project <[email protected]>.
--- 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 v4 4/17 ethtool: Expand Ethernet Power Equipment with c33 (PoE) alongside PoDL
In reply to Kory MaincentIn 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]/
This patch is sponsored by Dent Project <[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
@@ -92,6 +92,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 v4 5/17 net: pse-pd: Introduce PSE types enumeration
In reply to Kory MaincentIntroduce 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.
This patch is sponsored by Dent Project <[email protected]>.
---
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.
--- drivers/net/pse-pd/pse_core.c | 12 ++++++++++++ drivers/net/pse-pd/pse_regulator.c | 1 + include/linux/pse-pd/pse.h | 16 ++++++++++++++++ include/uapi/linux/pse.h | 23 +++++++++++++++++++++++ 4 files changed, 52 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 &PSE_PODL ; +} +EXPORT_SYMBOL_GPL (pse_has_podl); + +bool pse_has_c33 (struct pse_control *psec) +{ +return psec->pcdev->types &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 =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 +16 -0
@@ -8,6 +8,7 @@#include <linux/ethtool.h> #include <linux/list.h> #include <uapi/linux/ethtool.h> +#include <uapi/linux/pse.h> struct phy_device ;struct pse_controller_dev ;
@@ -77,6 +78,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 +91,7 @@ struct pse_controller_dev { const struct of_phandle_args *pse_spec);unsigned int nr_lines;struct mutex lock; +u32 types; };#if IS_ENABLED (CONFIG_PSE_CONTROLLER )
@@ -108,6 +111,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 +139,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/pse.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Userspace API for Power Sourcing Equipment +* +* Copyright (c) 2023 Bootlin, Kory Maincent <[email protected]> +*/ +#ifndef _PSE_CONTROLLER_H +#define _PSE_CONTROLLER_H + +/** +* enum - Types of PSE controller. +* +* @PSE_UNKNOWN: Type of PSE controller is unknown +* @PSE_PODL: PSE controller which support PoDL +* @PSE_C33: PSE controller which support Clause 33 (PoE) +*/ +enum { +PSE_UNKNOWN =1 <<0 , +PSE_PODL =1 <<1 , +PSE_C33 =1 <<2 , +}; + +#endif /* _PSE_CONTROLLER_H */
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 3 lines · On Thu, 15 Feb 2024 17:02:46 +0100 Kory Maincent wrote:
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.
I haven't read the series, just noticed this breaks the build:
error: ../include/uapi/linux/pse.h: missing "WITH Linux-syscall-note" for SPDX-License-Identifier
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
Quoted 1 line
This patch is sponsored by Dent Project <[email protected]>
side-note: no objections to the line but for accounting purposes (i.e. when we generate development stats) we use the Author / From line exclusively. So it'd be easier to compute stats of things funded by Dent if you used:
From: Kory Maincent (Dent Project) <[email protected]>
but that's entirely up to you :)
Köry Maincent
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 9 lines · On Thu, 15 Feb 2024 10:58:46 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 3 lines · On Thu, 15 Feb 2024 17:02:46 +0100 Kory Maincent wrote:
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.I haven't read the series, just noticed this breaks the build:
error:
../include/uapi/linux/pse.h: missing "WITH Linux-syscall-note" for SPDX-License-Identifier
By curiosity how do you get that error?
Is it with C=1? I didn't faced it with W=1.
C=1 is broken for several architecture like arm64, indeed I forgot to run it.
Quoted 2 lines
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
We might use it in pse core if capabilities between PoE and PoDL differ but I am not sure about it.
Do you prefer to move it to ethtool header and add prefix ETHTOOL_ to the enum values?
Quoted 10 lines
Quoted 1 line
This patch is sponsored by Dent Project <[email protected]>
side-note: no objections to the line but for accounting purposes (i.e. when we generate development stats) we use the Author / From line exclusively. So it'd be easier to compute stats of things funded by Dent if you used:
From: Kory Maincent (Dent Project) <[email protected]>
but that's entirely up to you :)
Does adding the line side to the SOB in the commit message is sufficient or should I modify the git send email config?
Regard,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Jakub Kicinski
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 5 lines · On Fri, 16 Feb 2024 10:42:11 +0100 Köry Maincent wrote:
Quoted 5 lines · On Thu, 15 Feb 2024 17:02:46 +0100 Kory Maincent wrote:
Quoted 3 lines
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.
Quoted 8 lines
Quoted 4 lines
I haven't read the series, just noticed this breaks the build:
error:
../include/uapi/linux/pse.h: missing "WITH Linux-syscall-note" for SPDX-License-IdentifierBy curiosity how do you get that error?
Is it with C=1? I didn't faced it with W=1.
C=1 is broken for several architecture like arm64, indeed I forgot to run it.
Not 100% sure, TBH, I suspect it's somehow enabled by allmodconfig. I don't think it's a C=1 thing because our clang build doesn't do C=1 and it also hit it.
Quoted 7 lines
Quoted 2 lines
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
We might use it in pse core if capabilities between PoE and PoDL differ but I am not sure about it.
Do you prefer to move it to ethtool header and add prefixETHTOOL_to the enum values?
I don't know enough to have an opinion :) Whatever you end up doing, it's probably worth documenting the reason for the choice in the commit message?
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
This patch is sponsored by Dent Project <[email protected]>
side-note: no objections to the line but for accounting purposes (i.e. when we generate development stats) we use the Author / From line exclusively. So it'd be easier to compute stats of things funded by Dent if you used:
Quoted 6 lines
Quoted 3 lines
From: Kory Maincent (Dent Project) <[email protected]>
but that's entirely up to you :)
Does adding the line side to the SOB in the commit message is sufficient or should I modify the git send email config?
I think you can sed -i s/// the patches? When the From in the email file doesn't match your git config IIUC git will include the from line in the body and pick it up from them. IOW it will work. The scripts look at git author so s-o-b won't do much.
Köry Maincent
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 11 lines · On Fri, 16 Feb 2024 17:36:38 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 7 lines
Quoted 2 lines
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
We might use it in pse core if capabilities between PoE and PoDL differ but I am not sure about it.
Do you prefer to move it to ethtool header and add prefixETHTOOL_to the enum values?I don't know enough to have an opinion :) Whatever you end up doing, it's probably worth documenting the reason for the choice in the commit message?
Mmh, I am still not sure of the best choice on this. I think I will move it to ethtool as you suggested.
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
Quoted 2 lines
This patch is sponsored by Dent Project
<[email protected]>side-note: no objections to the line but for accounting purposes (i.e. when we generate development stats) we use the Author / From line exclusively. So it'd be easier to compute stats of things funded by Dent if you used:
From: Kory Maincent (Dent Project) <[email protected]>
but that's entirely up to you :)
Quoted 7 lines
Quoted 2 lines
Does adding the line side to the SOB in the commit message is sufficient or should I modify the git send email config?
I think you can sed -i s/// the patches? When the From in the email file doesn't match your git config IIUC git will include the from line in the body and pick it up from them. IOW it will work. The scripts look at git author so s-o-b won't do much.
Ok, I will stick to the simple sentence then. ;)
Thanks for the information!
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 10 lines · Köry Maincent
Quoted 8 lines · On Fri, 16 Feb 2024 17:36:38 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 7 lines
Quoted 2 lines
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
We might use it in pse core if capabilities between PoE and PoDL differ but I am not sure about it.
Do you prefer to move it to ethtool header and add prefixETHTOOL_to the enum values?
Quoted 6 lines
Quoted 3 lines
I don't know enough to have an opinion :) Whatever you end up doing, it's probably worth documenting the reason for the choice in the commit message?
Mmh, I am still not sure of the best choice on this. I think I will move it to ethtool as you suggested.
kAPI is hard to change. So it is worth thinking about it.
Can you think of any possible kAPI not using ethtool netlink? Its not going to be ioctl. We generally don't export new things in /sysfs if we have netlink, etc.
So to me, it is only going to be used be the ethtool API, so i would follow the usual conventions for ethtool.
Andrew
Köry Maincent
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
Quoted 18 lines · On Mon, 19 Feb 2024 16:44:34 +0100 Andrew Lunn <[email protected]> wrote:
Quoted 10 lines · Köry Maincent
Quoted 8 lines · On Fri, 16 Feb 2024 17:36:38 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 7 lines
Quoted 2 lines
but why the separate header? Is it going to be used in other parts of uAPI than just in ethtool?
We might use it in pse core if capabilities between PoE and PoDL differ but I am not sure about it.
Do you prefer to move it to ethtool header and add prefixETHTOOL_to the enum values?Quoted 6 lines
Quoted 3 lines
I don't know enough to have an opinion :) Whatever you end up doing, it's probably worth documenting the reason for the choice in the commit message?
Mmh, I am still not sure of the best choice on this. I think I will move it to ethtool as you suggested.
Quoted 8 lines
kAPI is hard to change. So it is worth thinking about it.
Can you think of any possible kAPI not using ethtool netlink? Its not going to be ioctl. We generally don't export new things in /sysfs if we have netlink, etc.
So to me, it is only going to be used be the ethtool API, so i would follow the usual conventions for ethtool.
Oops sorry forgot to reply to you.
Indeed I reached to the same conclusion on my side.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Rob Herring
maintainerRe: [PATCH net-next v4 05/17] net: pse-pd: Introduce PSE types enumeration
In reply to Jakub KicinskiQuoted 11 lines · Jakub Kicinski
Quoted 10 lines · On Fri, 16 Feb 2024 10:42:11 +0100 Köry Maincent wrote:
Quoted 9 lines · On Thu, 15 Feb 2024 17:02:46 +0100 Kory Maincent wrote:
Quoted 3 lines
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.I haven't read the series, just noticed this breaks the build:
error:
../include/uapi/linux/pse.h: missing "WITH Linux-syscall-note" for SPDX-License-Identifier
Quoted 7 lines
Quoted 3 lines
By curiosity how do you get that error?
Is it with C=1? I didn't faced it with W=1.
C=1 is broken for several architecture like arm64, indeed I forgot to run it.Not 100% sure, TBH, I suspect it's somehow enabled by allmodconfig. I don't think it's a C=1 thing because our clang build doesn't do C=1 and it also hit it.
Probably from scripts/spdxcheck.py? IIRC, it has some dependencies which have to be installed to enable it.
Rob
Kory Maincent
maintainerPATCH v4 6/17 net: ethtool: pse-pd: Expand pse commands with the PSE PoE interface
In reply to Kory MaincentAdd PSE PoE interface support in the ethtool pse command.
This patch is sponsored by Dent Project <[email protected]>.
---
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 v4 7/17 netlink: specs: Modify pse attribute prefix
In reply to Kory MaincentRemove podl from the attribute prefix to prepare the support of PoE pse netlink spec.
This patch is sponsored by Dent Project <[email protected]>.
---
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 v4 8/17 netlink: specs: Expand the pse netlink command with PoE interface
In reply to Kory MaincentAdd 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}'This patch is sponsored by Dent Project <[email protected]>.
---
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 v4 9/17 MAINTAINERS: Add myself to pse networking maintainer
In reply to Kory MaincentAs I add support for PoE in PSE networking subsystem it seems legitimate to be added to the maintainers.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -17684,6 +17684,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 v4 10/17 net: pse-pd: Add support for PSE PIs
In reply to Kory MaincentAdd 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.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
--- Documentation/networking/pse-pd/index.rst | 1 + Documentation/networking/pse-pd/pse-pi.rst | 275 +++++++++++++++++++++++++++++ drivers/net/pse-pd/pse_core.c | 223 ++++++++++++++++++----- include/linux/pse-pd/pse.h | 38 +++- 4 files changed, 493 insertions(+), 44 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 +275 -0
275 lines not on this page · raw message
drivers/net/pse-pd/pse_core.c +183 -40
268 lines not on this page · raw message
include/linux/pse-pd/pse.h +34 -4
@@ -65,6 +65,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
@@ -74,11 +104,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;
@@ -87,11 +117,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;u32 types; +struct pse_pi *pi; +bool of_legacy; };#if IS_ENABLED (CONFIG_PSE_CONTROLLER )
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v4 11/17 dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentPSE 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.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
Changes in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit message
--- .../bindings/net/pse-pd/pse-controller.yaml | 84 +++++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +81 -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,88 @@ 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 + + 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–3) + | Conductor | Alternative A (MDI-X) | Alternative A (MDI) | Alternative B(X) | Alternative B(S) | + |-----------|-----------------------|---------------------|------------------|------------------| + | 1 | Negative VPSE | Positive VPSE | — | — | + | 2 | Negative VPSE | Positive VPSE | — | — | + | 3 | Positive VPSE | Negative VPSE | — | — | + | 4 | — | — | Negative VPSE | Positive VPSE | + | 5 | — | — | Negative VPSE | Positive VPSE | + | 6 | Positive VPSE | Negative VPSE | — | — | + | 7 | — | — | Positive VPSE | Negative VPSE | + | 8 | — | — | Positive VPSE | Negative VPSE | + minItems: 1 + maxItems: 2 + + required: + - reg + - "#pse-cells" + - pairset-names + - pairsets + +oneOf: + - required: + - "#pse-cells" + - required: + - pse_pis additionalProperties: true
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 22 lines · Kory Maincent
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.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
Changes in v3:
- New patch
Quoted 9 lines
Changes in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit message--- .../bindings/net/pse-pd/pse-controller.yaml | 84 +++++++++++++++++++++- 1 file changed, 81 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:./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:74:19: [error] string value is redundantly quoted with any quotes (quoted-strings) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:75:19: [error] string value is redundantly quoted with any quotes (quoted-strings) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:84:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:86:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:87:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:88:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:89:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:90:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:91:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:92:111: [warning] line too long (111 > 110 characters) (line-length) ./Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml:93:111: [warning] line too long (111 > 110 characters) (line-length)
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.
Köry Maincent
maintainerRe: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 33 lines · On Thu, 15 Feb 2024 12:46:16 -0600 Rob Herring <[email protected]> wrote:
Quoted 22 lines · Kory Maincent
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.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
Changes in v3:
- New patchQuoted 9 lines
Changes in v4:
- Remove $def
- Fix pairset-names item list
- Upgrade few properties description
- Update the commit message--- .../bindings/net/pse-pd/pse-controller.yaml | 84+++++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-)
Quoted 2 lines
My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):
Weird, I don't get your errors even with dt-schema up to date. Maybe I have version mismatch in other tools.
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Köry Maincent
maintainerRe: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 36 lines · On Fri, 16 Feb 2024 09:56:16 +0100 Köry Maincent <[email protected]>…
Quoted 33 lines · On Thu, 15 Feb 2024 12:46:16 -0600 Rob Herring <[email protected]> wrote:
Quoted 31 lines · Kory Maincent
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.
This patch is sponsored by Dent Project <[email protected]>.
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 message--- .../bindings/net/pse-pd/pse-controller.yaml | 84+++++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-)
Quoted 5 lines
Quoted 2 lines
My bot found errors running 'make DT_CHECKER_FLAGS=-m
dt_binding_check' on your patch (DT_CHECKER_FLAGSis new in v5.13):Weird, I don't get your errors even with dt-schema up to date. Maybe I have version mismatch in other tools.
Ah found it! I had yamllint not up to date.
Sorry for the noise.
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Rob Herring
maintainerRe: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentQuoted 11 lines · Kory Maincent
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 2 lines
The old usage of "#pse-cells" is unsuficient as it carries only the PSE PI index information.
Every time I read this sentence I'm just going to ask why not add more data besides index to the cells?
This all still looks pretty much the same. I guess there was explanation in the long response on the last version, but I haven't had time to digest it and won't until I'm back next week at the earliest.
Rob
Re: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
In reply to Kory MaincentQuoted 45 lines · Kory Maincent
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.
This patch is sponsored by Dent Project <[email protected]>.
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 message--- .../bindings/net/pse-pd/pse-controller.yaml | 84 +++++++++++++++++++++- 1 file changed, 81 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +1
-0@@ -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,88 @@ properties: description:
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 30
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +3
-3Used 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:
How did this appear here? Underscores are no allowed.
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 31
Quoted 1 line
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +1
-0+ type: object
Missing description.
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 44
Quoted 13 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +13
-0+ + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + required: + - "#address-cells" + - "#size-cells" + + patternProperties:
No underscores.
Quoted 21 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +21
-0+ "^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:
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 75
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +10
-0+ 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"
No need for quotes.
I believe you did not test it, so I will skip reviewing the rest.
Best regards,
Krzysztof
Köry Maincent
maintainerRe: [PATCH net-next v4 11/17] dt-bindings: net: pse-pd: Add another way of describing several PSE PIs
Quoted 5 lines · On Sat, 17 Feb 2024 15:01:55 +0100 Krzysztof Kozlowski…
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 30
Quoted 3 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +1
-2-required: - - "#pse-cells" + pse_pis:How did this appear here? Underscores are no allowed.
Didn't know that, sorry.
Indeed it is written in the dts-coding-style.rst, sorry for the error.
Quoted 5 lines
Quoted 2 lines
+ type: object
Missing description.
Ah indeed.
Quoted 6 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml properties: · line 75
Quoted 4 lines
Documentation/devicetree/bindings/net/pse-pd/pse-controller.yaml +4
-0+ items: + enum: + - "alternative-a" + - "alternative-b"No need for quotes.
Yes I saw that warning with yamllint up to date and have fixed it with for the next version.
Quoted 1 line
I believe you did not test it, so I will skip reviewing the rest.
I tested it and did not face any error due to the underscore with "make DT_CHECKER_FLAGS=-m dt_binding_check DT_SCHEMA_FILES=pse-controller.yaml" Did I miss something in the test options?
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Kory Maincent
maintainerPATCH v4 12/17 net: pse-pd: Add support for setup_pi_matrix callback
In reply to Kory MaincentImplement 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.
This patch is sponsored by Dent Project <[email protected]>.
---
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
@@ -178,6 +178,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
@@ -50,6 +50,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,
@@ -58,6 +59,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
Kory Maincent
maintainerPATCH v4 13/17 net: pse-pd: Use regulator framework within PSE framework
In reply to Kory MaincentIntegrate 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 and nested locks, 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. PSE mutex safeguards this boolean. However, ethtool command or regulator sysfs framework can set/get this boolean, leading to nested locking. The PSE nested lock function is a copy of regulator_lock_nested function, ensuring no issues with its usage.
regulator_get uses the consumer device pointer therefore of_pse_control_get is modified accordingly to pass the PSE consumer device alongside its device node.
This patch is sponsored by Dent Project <[email protected]>.
---
Changes in v3:
- New patch
--- drivers/net/mdio/fwnode_mdio.c | 29 ++-- drivers/net/pse-pd/pse_core.c | 264 ++++++++++++++++++++++++++++++++++--- drivers/net/pse-pd/pse_regulator.c | 48 ++++--- include/linux/pse-pd/pse.h | 20 ++- 4 files changed, 302 insertions(+), 59 deletions(-)
drivers/net/mdio/fwnode_mdio.c +14 -15
@@ -17,19 +17,17 @@ MODULE_LICENSE("GPL");MODULE_DESCRIPTION ("FWNODE MDIO bus (Ethernet PHY) accessors" );static struct pse_control * -fwnode_find_pse_control (struct fwnode_handle *fwnode) +dev_find_pse_control (struct device *dev) {struct pse_control *psec; -struct device_node *np;if (!IS_ENABLED (CONFIG_PSE_CONTROLLER ))return NULL ; - np =to_of_node (fwnode); -if (!np) +if (!dev->of_node)return NULL ; - psec =of_pse_control_get (np); + psec =of_pse_control_get (dev, dev->of_node);if (PTR_ERR (psec) == -ENOENT )return NULL ;
@@ -120,15 +118,9 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,u32 phy_id;int rc; - psec =fwnode_find_pse_control (child); -if (IS_ERR (psec)) -return PTR_ERR (psec); - mii_ts =fwnode_find_mii_timestamper (child); -if (IS_ERR (mii_ts)) { - rc =PTR_ERR (mii_ts); - goto clean_pse; - } +if (IS_ERR (mii_ts)) +return PTR_ERR (mii_ts); is_c45 =fwnode_device_is_compatible (child,"ethernet-phy-ieee802.3-c45" );if (is_c45 ||fwnode_get_phy_id (child, &phy_id))
@@ -161,6 +153,12 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus, goto clean_phy; } + psec =dev_find_pse_control (&phy->mdio.dev); +if (IS_ERR (psec)) { + rc =PTR_ERR (psec); + goto unregister_phy; + } + phy->psec = psec;/* phy->mii_ts may already be defined by the PHY driver. A
@@ -172,12 +170,13 @@ int fwnode_mdiobus_register_phy(struct mii_bus *bus,return 0 ; +unregister_phy: +if (is_acpi_node (child) ||is_of_node (child)) +phy_device_remove (phy); clean_phy:phy_device_free (phy); clean_mii_ts:unregister_mii_timestamper (mii_ts); -clean_pse: -pse_control_put (psec);return rc; }
drivers/net/pse-pd/pse_core.c +246 -18
354 lines not on this page · raw message
drivers/net/pse-pd/pse_regulator.c +27 -21
71 lines not on this page · raw message
include/linux/pse-pd/pse.h +15 -5
@@ -56,10 +56,10 @@ 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 ;
@@ -91,10 +91,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 enabled; };/**
@@ -108,6 +112,8 @@ struct pse_pi {* @of_pse_n_cells: number of cells in PSE line specifiers * @nr_lines: number of PSE controls in this controller device * @lock: Mutex for serialization access to the PSE controller +* @lock_owner: current owner of the mutex +* @ref_cnt: mutex's reference count * @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
@@ -121,6 +127,8 @@ struct pse_controller_dev {int of_pse_n_cells;unsigned int nr_lines;struct mutex lock; +struct task_struct *lock_owner; +int ref_cnt;u32 types;struct pse_pi *pi;bool of_legacy;
@@ -133,7 +141,8 @@ struct device;int devm_pse_controller_register (struct device *dev,struct pse_controller_dev *pcdev); -struct pse_control *of_pse_control_get (struct device_node *node); +struct pse_control *of_pse_control_get (struct device *dev, +struct device_node *node);void pse_control_put (struct pse_control *psec); int pse_ethtool_get_status(struct pse_control *psec,
@@ -148,7 +157,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
Kory Maincent
maintainerPATCH v4 14/17 dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Kory MaincentAdd the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[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.
- 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.
--- .../bindings/net/pse-pd/microchip,pd692x0.yaml | 157 +++++++++++++++++++++ 1 file changed, 157 insertions(+)
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +157 -0
@@ -0,0 +1,157 @@ +# 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: + $ref: "#/$defs/managers" + 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. + +required: + - compatible + - reg + - pse_pis + +$defs: + manager: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + reg: + maxItems: 1 + + patternProperties: + '^port@[0-7]$': + type: object + required: + - reg + + required: + - reg + + managers: + type: object + + properties: + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + patternProperties: + "^manager@0[0-9]|1[0-2]$": + $ref: "#/$defs/manager" + + required: + - "#address-cells" + - "#size-cells" + +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>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>; + }; + }; + }; + };
Signature · 1 line
2.25.1
Oleksij Rempel
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;
According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Probably this kind of property is a good fit:
polarity-supported = "MDI-X", "MDI", "X", "S";
- Except of polarity, we have alternative-b variant with direct or phantom feeding (No idea if it is proper description). Theoretically, this difference would affect electrical rating specifications.
For example direct path for alternate-b (10/100Mbit only), would have higher rating as the path over coils/magnetics. Practically, vendors do not make different ratings for this paths, so no need to care about it for now until someone will be able to provide good reason.
Here is example of RJ45 connector with integrated magnetics with PoE support where alternative-a feed over magnetics and alternative-b is feed directly:
https://www.te.com/commerce/DocumentDelivery/DDEController?Action=srchrtrv&DocNm=5-2337992-4&DocType=Customer+Drawing&DocLang=English&PartCntxt=5-2337992-4&DocFormat=pdf
(the last topic is more an answer to my self and for archive :))
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 |
Köry Maincent
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 35 lines · On Sat, 17 Feb 2024 13:14:29 +0100 Oleksij Rempel <[email protected]>…
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative
Quoted 8 lines
or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Mmh not sure we want to support broken cases that does not follow the spec. Should we?
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Andrew Lunn
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 2 lines
Mmh not sure we want to support broken cases that does not follow the spec. Should we?
We should specify the properties a device following the spec should use. These are the common properties we expect all devices should be using.
Broken devices can however have additional properties, defined in their own binding. And if we see a pattern for broken properties, we could pull them out into a -broken.yaml binding, which the broken devices could share.
Andrew
Köry Maincent
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Oleksij RempelQuoted 44 lines · On Sat, 17 Feb 2024 13:14:29 +0100 Oleksij Rempel <[email protected]>…
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Quoted 2 lines
Probably this kind of property is a good fit:
polarity-supported = "MDI-X", "MDI", "X", "S";
This property should be on the PD side.
Isn't it better to name it "polarity-provided" for each PSE PIs binding? What do you think?
We agreed that it is mainly for ethtool to show the polarity of a PI, right?
Regards,
Signature · 3 lines
Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com
Oleksij Rempel
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 47 lines · Köry Maincent
Quoted 44 lines · On Sat, 17 Feb 2024 13:14:29 +0100 Oleksij Rempel <[email protected]>…
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Quoted 4 lines
Quoted 2 lines
Probably this kind of property is a good fit:
polarity-supported = "MDI-X", "MDI", "X", "S";This property should be on the PD side.
Probably. Right now we are on PSE side.
Quoted 2 lines
Isn't it better to name it "polarity-provided" for each PSE PIs binding? What do you think?
Yes, this suggestion was directed for PSE PI nodes.
In the PHY world, we use "supported" capabilities for what HW can actually do and "advertised" for how the HW is configured.
If we use word "provided", i would interpret it as subset of "supported", which at the end is a user space policy.
Since I'm not native englisch speaker, my feeling can be wrong. So, any one with stronger opinion may have here other preferences.
Quoted 1 line
We agreed that it is mainly for ethtool to show the polarity of a PI, right?
We have two kind of information here:
- polarity supported by HW. PSE PI may support more then one.
- actually configured polarity.
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 v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Oleksij RempelQuoted 44 lines · Oleksij Rempel
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Quoted 2 lines
Probably this kind of property is a good fit:
polarity-supported = "MDI-X", "MDI", "X", "S";
Where does that live? Looks like a property of the consumers defined in the provider. Generally, that's not the right way for DT. I'll say it again, I think you should be expanding #pse-cells (>1), not getting rid of them (==0).
Rob
Oleksij Rempel
maintainerRe: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
Quoted 45 lines · Rob Herring
Quoted 44 lines · Oleksij Rempel
Quoted 7 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
Signed-off-by Kory Maincent <[email protected]>---
...
Quoted 5 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +5
-0+ pse_pis { + #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 153
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ reg = <0>; + #pse-cells = <0>; + pairset-names = "alternative-a", "alternative-b"; + pairsets = <&phys0>, <&phys1>; + }; + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>;According to latest discussions, PSE PI nodes will need some additional, board specific, information:
- this controller do not implements polarity switching, we need to know what polarity is implemented on this board. The 802.3 spec provide not really consistent names for polarity configurations:
- Alternative A MDI-X
- Alternative A MDI
- Alternative B X
- Alternative B S
The board may implement one of polarity configurations per alternative or have additional helpers to switch them without using PSE controller.
Even if specification explicitly say:
"The PD shall be implemented to be insensitive to the polarity of the power
supply and shall be able to operate per the PD Mode A column and the PD Mode B column in Table 33–13"
it is possible to find reports like this:
https://community.ui.com/questions/M5-cant-take-reversed-power-polarity-/d834d9a8-579d-4f08-80b1-623806cc5070
Quoted 5 lines
Quoted 2 lines
Probably this kind of property is a good fit:
polarity-supported = "MDI-X", "MDI", "X", "S";Where does that live? Looks like a property of the consumers defined in the provider. Generally, that's not the right way for DT.
This is property of PSE PI (Power Interface)
Ethernet PHY --\
PSE (provider) ----> PSE PI (consumer of multiple PSE's) ----> Physial port
PSE - provides power lines.
PSE PI - switches (or not) power lines in different configurations. This is different part of the board/system. PSE PI can have combination or one of following configurations: "MDI-X", "MDI", "X", "S"; This is not something what PSE actually do. PSE PI and PSE are described in IEEE802.3 specification.
Quoted 3 lines
I'll say it
again, I think you should be expanding #pse-cells (>1), not getting rid of them (==0).
Did you took time to read my last explanation? Sorry for making it long description, this topic is a bit complex.
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 |
Re: [PATCH net-next v4 14/17] dt-bindings: net: pse-pd: Add bindings for PD692x0 PSE controller
In reply to Kory MaincentQuoted 62 lines · Kory Maincent
Add the PD692x0 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
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.--- .../bindings/net/pse-pd/microchip,pd692x0.yaml | 157 +++++++++++++++++++++ 1 file changed, 157 insertions(+)Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +33
-0@@ -0,0 +1,157 @@ +# 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: + $ref: "#/$defs/managers" + 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
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 43
Quoted 10 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +10
-0+ 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. + +required: + - compatible + - reg + - pse_pis + +$defs:
Why do you need defs for it? You use it only in one place.
...
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 45
Quoted 2 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +2
-0+ + pse_pis {
Again... no underscores in node names.
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml line 143
Quoted 4 lines
Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml new file +4
-0+ #address-cells = <1>; + #size-cells = <0>; + + pse_pi0: pse_pi@0 {
Just compile your DTS with W=2.
Best regards,
Krzysztof
Kory Maincent
maintainerPATCH v4 15/17 net: pse-pd: Add PD692x0 PSE controller driver
In reply to Kory MaincentAdd a new driver for the PD692x0 I2C Power Sourcing Equipment controller. This driver only support i2c communication for now.
This patch is sponsored by Dent Project <[email protected]>.
---
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
Kory Maincent
maintainerPATCH v4 16/17 dt-bindings: net: pse-pd: Add bindings for TPS23881 PSE controller
In reply to Kory MaincentAdd the TPS23881 I2C Power Sourcing Equipment controller device tree bindings documentation.
This patch is sponsored by Dent Project <[email protected]>.
---
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 | 111 +++++++++++++++++++++ 1 file changed, 111 insertions(+)
Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml new file +111 -0
@@ -0,0 +1,111 @@ +# 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>; + }; + + phys3: channel@3 { + reg = <3>; + }; + + phys4: channel@4 { + reg = <4>; + }; + + phys5: channel@5 { + reg = <5>; + }; + + phys6: channel@6 { + reg = <6>; + }; + + phys7: channel@7 { + reg = <7>; + }; + }; + + 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>; + }; + + pse_pi1: pse_pi@1 { + reg = <1>; + #pse-cells = <0>; + pairset-names = "alternative-a"; + pairsets = <&phys2>; + }; + }; + }; + };
Signature · 1 line
2.25.1
Kory Maincent
maintainerPATCH v4 17/17 net: pse-pd: Add TI TPS23881 PSE controller driver
In reply to Kory MaincentAdd a new driver for the TI TPS23881 I2C Power Sourcing Equipment controller.
This patch is sponsored by Dent Project <[email protected]>.
---
Change in v3:
- New patch.
--- 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