From: Kory Maincent (Dent Project) <kory.maincent@xxxxxxxxxxx>
This patch expands the status information provided by ethtool for PSE c33
with current port priority and max port priority. It also adds a call to
pse_ethtool_set_prio(), pse_ethtool_set_prio_mode() and
pse_ethtool_set_discon_pol() to configure the PSE port priority, mode and
disconnection policy.
Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
---
Change in v3:
- Add disconnection policy.
Change in v2:
- Improve port priority documentation.
- Add port priority modes.
---
Documentation/networking/ethtool-netlink.rst | 77 ++++++++++++++++++++++++++++
include/uapi/linux/ethtool_netlink.h | 5 ++
net/ethtool/pse-pd.c | 66 ++++++++++++++++++++++++
3 files changed, 148 insertions(+)
diff --git a/Documentation/networking/ethtool-netlink.rst b/Documentation/networking/ethtool-netlink.rst
index 3573543ae5ad..b231641dd4a9 100644
--- a/Documentation/networking/ethtool-netlink.rst
+++ b/Documentation/networking/ethtool-netlink.rst
@@ -1768,6 +1768,15 @@ Kernel response contents:
configuration ranges.
``ETHTOOL_A_PSE_ID`` u32 Index of the PSE
``ETHTOOL_A_PSE_PW_D_ID`` u32 Index of the PSE power domain
+ ``ETHTOOL_A_C33_PSE_PRIO_SUPP_MODES`` u32 priority modes supported
+ ``ETHTOOL_A_C33_PSE_PRIO_MODE`` u32 priority mode of the PSE
+ currently configured
+ ``ETHTOOL_A_C33_PSE_PRIO_MAX`` u32 priority maximum configurable
+ on the PoE PSE
+ ``ETHTOOL_A_C33_PSE_PRIO`` u32 priority of the PoE PSE
+ currently configured
+ ``ETHTOOL_A_C33_PSE_DISCON_POL`` u32 disconnection policy
+ currently configured
========================================== ====== =============================
When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_STATE`` attribute identifies
@@ -1847,6 +1856,21 @@ controller.
The ``ETHTOOL_A_PSE_PW_D_ID`` attribute identifies the index of PSE power
domain.
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO_SUPP_MODES`` attribute
+identifies the priority mode supported by the C33 PSE.
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO_MODE`` attributes is used to
+identifies the currently configured C33 PSE priority mode.
+When set, the optional ``ETHTOOL_A_C33_PSE_DISCON_POL`` attributes is used to
+identifies the currently configured C33 PSE disconnection policy.
+For a description of C33 PSE priority modes and disconnection policy,
+see ``PSE_SET``.
+
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO_MAX`` attribute identifies
+the C33 PSE maximum priority value.
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO`` attributes is used to
+identifies the currently configured C33 PSE priority.
+For a description of C33 PSE priority attributes, see ``PSE_SET``.
+
PSE_SET
=======
@@ -1860,6 +1884,12 @@ Request contents:
``ETHTOOL_A_C33_PSE_ADMIN_CONTROL`` u32 Control PSE Admin state
``ETHTOOL_A_C33_PSE_AVAIL_PWR_LIMIT`` u32 Control PoE PSE available
power limit
+ ``ETHTOOL_A_C33_PSE_PRIO_MODE`` u32 Control priority mode of the
+ PoE PSE
+ ``ETHTOOL_A_C33_PSE_PRIO`` u32 Control priority of the
+ PoE PSE
+ ``ETHTOOL_A_C33_PSE_DISCON_POL`` u32 Control disconnection policy
+ of the PoE PSE
====================================== ====== =============================
When set, the optional ``ETHTOOL_A_PODL_PSE_ADMIN_CONTROL`` attribute is used
@@ -1882,6 +1912,53 @@ various existing products that document power consumption in watts rather than
classes. If power limit configuration based on classes is needed, the
conversion can be done in user space, for example by ethtool.
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO_MODE`` attributes is used to
+control the C33 PSE priority mode. The available mode are:
+
+1. Static Method:
+
+ This method involves distributing power based on PD classification. It’s
+ straightforward and stable, with the PSE core keeping track of the budget
+ and subtracting the power requested by each PD’s class.
+
+ Advantages: Every PD gets its promised power at any time, which guarantees
+ reliability.
+
+ Disadvantages: PD classification steps are large, meaning devices request
+ much more power than they actually need. As a result, the power supply may
+ only operate at, say, 50% capacity, which is inefficient and wastes money.
+
+2. Dynamic Method:
+
+ This method monitors the current consumption per port and subtracts it from
+ the available power budget. When the budget is exceeded, lower-priority
+ ports are shut down. This method is managed by the PSE controller itself.
+
+ Advantages: This method optimizes resource utilization, saving costs.
+
+ Disadvantages: Low-priority devices may experience instability.
+
+When set, the optional ``ETHTOOL_A_C33_PSE_PRIO`` attributes is used to
+control the C33 PSE priority. Allowed priority value are between zero
+and the value of ``ETHTOOL_A_C33_PSE_PRIO_MAX`` attribute.
+
+A lower value indicates a higher priority, meaning that a priority value
+of 0 corresponds to the highest port priority.
+Port priority serves two functions:
+
+ - Power-up Order: After a reset, ports are powered up in order of their
+ priority from highest to lowest. Ports with higher priority
+ (lower values) power up first.
+ - Shutdown Order: When the power budget is exceeded, ports with lower
+ priority (higher values) are turned off first.
+
+When set, the optional ``ETHTOOL_A_C33_PSE_DISCON_POL`` attributes is used
+to control the disconnection policy. When port are on the same priority
+the disconnection policy is used to specify the shutdown order.
+
+.. kernel-doc:: include/uapi/linux/ethtool.h
+ :identifiers: ethtool_pse_disconnection_policy
+
RSS_GET
=======
diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
index 088ad7b956fb..e668a91ed1ca 100644
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
@@ -973,6 +973,11 @@ enum {
ETHTOOL_A_C33_PSE_PW_LIMIT_RANGES, /* nest - _C33_PSE_PW_LIMIT_* */
ETHTOOL_A_PSE_ID, /* u32 */
ETHTOOL_A_PSE_PW_D_ID, /* u32 */
+ ETHTOOL_A_C33_PSE_PRIO_SUPP_MODES, /* u32 */
+ ETHTOOL_A_C33_PSE_PRIO_MODE, /* u32 */
+ ETHTOOL_A_C33_PSE_PRIO_MAX, /* u32 */
+ ETHTOOL_A_C33_PSE_PRIO, /* u32 */
+ ETHTOOL_A_C33_PSE_DISCON_POL, /* u32 */
/* add new constants above here */
__ETHTOOL_A_PSE_CNT,
diff --git a/net/ethtool/pse-pd.c b/net/ethtool/pse-pd.c
index d67803b67e76..f8253f4c69cc 100644
--- a/net/ethtool/pse-pd.c
+++ b/net/ethtool/pse-pd.c
@@ -112,6 +112,18 @@ static int pse_reply_size(const struct ethnl_req_info *req_base,
len += st->c33_pw_limit_nb_ranges *
(nla_total_size(0) +
nla_total_size(sizeof(u32)) * 2);
+ if (st->c33_prio_supp_modes)
+ /* _C33_PSE_PRIO_SUPP_MODES */
+ len += nla_total_size(sizeof(u32));
+ if (st->c33_prio_mode)
+ /* _C33_PSE_PRIO_MODE */
+ len += nla_total_size(sizeof(u32));
+ if (st->c33_prio_max)
+ /* _C33_PSE_PRIO_MAX + _C33_PSE_PRIO */
+ len += nla_total_size(sizeof(u32)) * 2;
+ if (st->c33_discon_pol)
+ /* _C33_PSE_DISCON_POL */
+ len += nla_total_size(sizeof(u32));
return len;
}
@@ -209,6 +221,24 @@ static int pse_fill_reply(struct sk_buff *skb,
pse_put_pw_limit_ranges(skb, st))
return -EMSGSIZE;
+ if (st->c33_prio_supp_modes > 0 &&
+ nla_put_u32(skb, ETHTOOL_A_C33_PSE_PRIO_SUPP_MODES,
+ st->c33_prio_supp_modes))
+ return -EMSGSIZE;
+
+ if (st->c33_prio_mode > 0 &&
+ nla_put_u32(skb, ETHTOOL_A_C33_PSE_PRIO_MODE, st->c33_prio_mode))
+ return -EMSGSIZE;
+
+ if (st->c33_prio_max > 0 &&
+ (nla_put_u32(skb, ETHTOOL_A_C33_PSE_PRIO_MAX, st->c33_prio_max) ||
+ nla_put_u32(skb, ETHTOOL_A_C33_PSE_PRIO, st->c33_prio)))
+ return -EMSGSIZE;
+
+ if (st->c33_discon_pol > 0 &&
+ nla_put_u32(skb, ETHTOOL_A_C33_PSE_DISCON_POL, st->c33_discon_pol))
+ return -EMSGSIZE;
+
return 0;
}
@@ -230,6 +260,13 @@ const struct nla_policy ethnl_pse_set_policy[ETHTOOL_A_PSE_MAX + 1] = {
NLA_POLICY_RANGE(NLA_U32, ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED,
ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED),
[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT] = { .type = NLA_U32 },
+ [ETHTOOL_A_C33_PSE_PRIO_MODE] =
+ NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PSE_PORT_PRIO_DISABLED,
+ ETHTOOL_PSE_PORT_PRIO_DYNAMIC),
+ [ETHTOOL_A_C33_PSE_PRIO] = { .type = NLA_U32 },
+ [ETHTOOL_A_C33_PSE_DISCON_POL] =
+ NLA_POLICY_RANGE(NLA_U32, ETHTOOL_PSE_DISCON_LRC,
+ ETHTOOL_PSE_DISCON_ROUND_ROBIN_IDX_LOWEST_FIRST),
};
static int
@@ -278,6 +315,35 @@ ethnl_set_pse(struct ethnl_req_info *req_info, struct genl_info *info)
if (ret)
return ret;
+ if (tb[ETHTOOL_A_C33_PSE_PRIO_MODE]) {
+ unsigned int prio_mode;
+
+ prio_mode = nla_get_u32(tb[ETHTOOL_A_C33_PSE_PRIO_MODE]);
+ ret = pse_ethtool_set_prio_mode(phydev->psec, info->extack,
+ prio_mode);
+ if (ret)
+ return ret;
+ }
+
+ if (tb[ETHTOOL_A_C33_PSE_DISCON_POL]) {
+ unsigned int pol;
+
+ pol = nla_get_u32(tb[ETHTOOL_A_C33_PSE_DISCON_POL]);
+ ret = pse_ethtool_set_discon_pol(phydev->psec, info->extack,
+ pol);
+ if (ret)
+ return ret;
+ }
+
+ if (tb[ETHTOOL_A_C33_PSE_PRIO]) {
+ unsigned int prio;
+
+ prio = nla_get_u32(tb[ETHTOOL_A_C33_PSE_PRIO]);
+ ret = pse_ethtool_set_prio(phydev->psec, info->extack, prio);
+ if (ret)
+ return ret;
+ }
+
if (tb[ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT]) {
unsigned int pw_limit;
--
2.34.1
