* [PATCH v6 net-next 1/7] net: ethernet: am65-cpsw: Build am65-cpsw-qos only if required
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling Roger Quadros
` (5 subsequent siblings)
6 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Roger Quadros
Build am65-cpsw-qos only if CONFIG_TI_AM65_CPSW_TAS is enabled.
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/Makefile | 3 ++-
drivers/net/ethernet/ti/am65-cpsw-qos.c | 12 ------------
drivers/net/ethernet/ti/am65-cpsw-qos.h | 26 +++++++++++++++++++++++++
3 files changed, 28 insertions(+), 13 deletions(-)
Changelog:
v6: initial commit
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
index 27de1d697134..9d7cd84d1e2d 100644
--- a/drivers/net/ethernet/ti/Makefile
+++ b/drivers/net/ethernet/ti/Makefile
@@ -26,7 +26,8 @@ keystone_netcp_ethss-y := netcp_ethss.o netcp_sgmii.o netcp_xgbepcsr.o cpsw_ale.
obj-$(CONFIG_TI_K3_CPPI_DESC_POOL) += k3-cppi-desc-pool.o
obj-$(CONFIG_TI_K3_AM65_CPSW_NUSS) += ti-am65-cpsw-nuss.o
-ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o am65-cpsw-qos.o
+ti-am65-cpsw-nuss-y := am65-cpsw-nuss.o cpsw_sl.o am65-cpsw-ethtool.o cpsw_ale.o
+ti-am65-cpsw-nuss-$(CONFIG_TI_AM65_CPSW_TAS) += am65-cpsw-qos.o
ti-am65-cpsw-nuss-$(CONFIG_TI_K3_AM65_CPSW_SWITCHDEV) += am65-cpsw-switchdev.o
obj-$(CONFIG_TI_K3_AM65_CPTS) += am65-cpts.o
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 9ac2ff05d501..4bc611cc4aad 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -571,9 +571,6 @@ static int am65_cpsw_setup_taprio(struct net_device *ndev, void *type_data)
taprio->cmd != TAPRIO_CMD_DESTROY)
return -EOPNOTSUPP;
- if (!IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS))
- return -ENODEV;
-
if (!netif_running(ndev)) {
dev_err(&ndev->dev, "interface is down, link speed unknown\n");
return -ENETDOWN;
@@ -599,9 +596,6 @@ static int am65_cpsw_tc_query_caps(struct net_device *ndev, void *type_data)
case TC_SETUP_QDISC_TAPRIO: {
struct tc_taprio_caps *caps = base->caps;
- if (!IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS))
- return -EOPNOTSUPP;
-
caps->gate_mask_per_txq = true;
return 0;
@@ -806,9 +800,6 @@ void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
{
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
- if (!IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS))
- return;
-
am65_cpsw_est_link_up(ndev, link_speed);
port->qos.link_down_time = 0;
}
@@ -817,9 +808,6 @@ void am65_cpsw_qos_link_down(struct net_device *ndev)
{
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
- if (!IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS))
- return;
-
if (!port->qos.link_down_time)
port->qos.link_down_time = ktime_get();
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.h b/drivers/net/ethernet/ti/am65-cpsw-qos.h
index 0cc2a3b3d7f9..898f13a4a112 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.h
@@ -31,11 +31,37 @@ struct am65_cpsw_qos {
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
};
+#if IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS)
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
void *type_data);
void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed);
void am65_cpsw_qos_link_down(struct net_device *ndev);
int am65_cpsw_qos_ndo_tx_p0_set_maxrate(struct net_device *ndev, int queue, u32 rate_mbps);
void am65_cpsw_qos_tx_p0_rate_init(struct am65_cpsw_common *common);
+#else
+static inline int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev,
+ enum tc_setup_type type,
+ void *type_data)
+{
+ return -EOPNOTSUPP;
+}
+
+static inline void am65_cpsw_qos_link_up(struct net_device *ndev,
+ int link_speed)
+{ }
+
+static inline void am65_cpsw_qos_link_down(struct net_device *ndev)
+{ }
+
+static inline int am65_cpsw_qos_ndo_tx_p0_set_maxrate(struct net_device *ndev,
+ int queue,
+ u32 rate_mbps)
+{
+ return 0;
+}
+
+static inline void am65_cpsw_qos_tx_p0_rate_init(struct am65_cpsw_common *common)
+{ }
+#endif
#endif /* AM65_CPSW_QOS_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 1/7] net: ethernet: am65-cpsw: Build am65-cpsw-qos only if required Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 22:56 ` Vladimir Oltean
2023-11-20 14:01 ` [PATCH v6 net-next 3/7] net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration Roger Quadros
` (4 subsequent siblings)
6 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Roger Quadros
Handle offloading commands using switch-case in
am65_cpsw_setup_taprio().
Move checks to am65_cpsw_taprio_replace().
Use NL_SET_ERR_MSG_MOD for error messages.
Change error message from "Failed to set cycle time extension"
to "cycle time extension not supported"
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-qos.c | 149 +++++++++++-------------
1 file changed, 70 insertions(+), 79 deletions(-)
Changelog:
v6: initial commit
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 4bc611cc4aad..3539fb31541b 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -428,7 +428,7 @@ static void am65_cpsw_stop_est(struct net_device *ndev)
am65_cpsw_timer_stop(ndev);
}
-static void am65_cpsw_purge_est(struct net_device *ndev)
+static void am65_cpsw_taprio_destroy(struct net_device *ndev)
{
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
@@ -441,29 +441,66 @@ static void am65_cpsw_purge_est(struct net_device *ndev)
port->qos.est_admin = NULL;
}
-static int am65_cpsw_configure_taprio(struct net_device *ndev,
- struct am65_cpsw_est *est_new)
+static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
+ struct tc_taprio_qopt_offload *to)
+{
+ int i;
+
+ *to = *from;
+ for (i = 0; i < from->num_entries; i++)
+ to->entries[i] = from->entries[i];
+}
+
+static int am65_cpsw_taprio_replace(struct net_device *ndev,
+ struct tc_taprio_qopt_offload *taprio)
{
struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
+ struct netlink_ext_ack *extack = taprio->mqprio.extack;
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
struct am65_cpts *cpts = common->cpts;
int ret = 0, tact = TACT_PROG;
+ struct am65_cpsw_est *est_new;
- am65_cpsw_est_update_state(ndev);
+ if (!netif_running(ndev)) {
+ NL_SET_ERR_MSG_MOD(extack, "interface is down, link speed unknown\n");
+ return -ENETDOWN;
+ }
- if (est_new->taprio.cmd == TAPRIO_CMD_DESTROY) {
- am65_cpsw_stop_est(ndev);
- return ret;
+ if (common->pf_p0_rx_ptype_rrobin) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n");
+ return -EINVAL;
+ }
+
+ if (port->qos.link_speed == SPEED_UNKNOWN)
+ return -ENOLINK;
+
+ if (taprio->cycle_time_extension) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "cycle time extension not supported");
+ return -EOPNOTSUPP;
}
+ est_new = devm_kzalloc(&ndev->dev,
+ struct_size(est_new, taprio.entries, taprio->num_entries),
+ GFP_KERNEL);
+ if (!est_new)
+ return -ENOMEM;
+
+ am65_cpsw_cp_taprio(taprio, &est_new->taprio);
+
+ am65_cpsw_est_update_state(ndev);
+
ret = am65_cpsw_est_check_scheds(ndev, est_new);
if (ret < 0)
- return ret;
+ goto fail;
tact = am65_cpsw_timer_act(ndev, est_new);
if (tact == TACT_NEED_STOP) {
- dev_err(&ndev->dev,
- "Can't toggle estf timer, stop taprio first");
- return -EINVAL;
+ NL_SET_ERR_MSG_MOD(extack,
+ "Can't toggle estf timer, stop taprio first");
+ ret = -EINVAL;
+ goto fail;
}
if (tact == TACT_PROG)
@@ -476,62 +513,24 @@ static int am65_cpsw_configure_taprio(struct net_device *ndev,
am65_cpsw_est_set_sched_list(ndev, est_new);
am65_cpsw_port_est_assign_buf_num(ndev, est_new->buf);
- am65_cpsw_est_set(ndev, est_new->taprio.cmd == TAPRIO_CMD_REPLACE);
+ am65_cpsw_est_set(ndev, 1);
if (tact == TACT_PROG) {
ret = am65_cpsw_timer_set(ndev, est_new);
if (ret) {
- dev_err(&ndev->dev, "Failed to set cycle time");
- return ret;
+ NL_SET_ERR_MSG_MOD(extack,
+ "Failed to set cycle time");
+ goto fail;
}
}
- return ret;
-}
-
-static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
- struct tc_taprio_qopt_offload *to)
-{
- int i;
-
- *to = *from;
- for (i = 0; i < from->num_entries; i++)
- to->entries[i] = from->entries[i];
-}
-
-static int am65_cpsw_set_taprio(struct net_device *ndev, void *type_data)
-{
- struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
- struct tc_taprio_qopt_offload *taprio = type_data;
- struct am65_cpsw_est *est_new;
- int ret = 0;
-
- if (taprio->cycle_time_extension) {
- dev_err(&ndev->dev, "Failed to set cycle time extension");
- return -EOPNOTSUPP;
- }
-
- est_new = devm_kzalloc(&ndev->dev,
- struct_size(est_new, taprio.entries, taprio->num_entries),
- GFP_KERNEL);
- if (!est_new)
- return -ENOMEM;
-
- am65_cpsw_cp_taprio(taprio, &est_new->taprio);
- ret = am65_cpsw_configure_taprio(ndev, est_new);
- if (!ret) {
- if (taprio->cmd == TAPRIO_CMD_REPLACE) {
- devm_kfree(&ndev->dev, port->qos.est_admin);
+ devm_kfree(&ndev->dev, port->qos.est_admin);
+ port->qos.est_admin = est_new;
- port->qos.est_admin = est_new;
- } else {
- devm_kfree(&ndev->dev, est_new);
- am65_cpsw_purge_est(ndev);
- }
- } else {
- devm_kfree(&ndev->dev, est_new);
- }
+ return 0;
+fail:
+ devm_kfree(&ndev->dev, est_new);
return ret;
}
@@ -558,34 +557,26 @@ static void am65_cpsw_est_link_up(struct net_device *ndev, int link_speed)
return;
purge_est:
- am65_cpsw_purge_est(ndev);
+ am65_cpsw_taprio_destroy(ndev);
}
static int am65_cpsw_setup_taprio(struct net_device *ndev, void *type_data)
{
- struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
struct tc_taprio_qopt_offload *taprio = type_data;
- struct am65_cpsw_common *common = port->common;
-
- if (taprio->cmd != TAPRIO_CMD_REPLACE &&
- taprio->cmd != TAPRIO_CMD_DESTROY)
- return -EOPNOTSUPP;
-
- if (!netif_running(ndev)) {
- dev_err(&ndev->dev, "interface is down, link speed unknown\n");
- return -ENETDOWN;
- }
-
- if (common->pf_p0_rx_ptype_rrobin) {
- dev_err(&ndev->dev,
- "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n");
- return -EINVAL;
+ int err = 0;
+
+ switch (taprio->cmd) {
+ case TAPRIO_CMD_REPLACE:
+ err = am65_cpsw_taprio_replace(ndev, taprio);
+ break;
+ case TAPRIO_CMD_DESTROY:
+ am65_cpsw_taprio_destroy(ndev);
+ break;
+ default:
+ err = -EOPNOTSUPP;
}
- if (port->qos.link_speed == SPEED_UNKNOWN)
- return -ENOLINK;
-
- return am65_cpsw_set_taprio(ndev, type_data);
+ return err;
}
static int am65_cpsw_tc_query_caps(struct net_device *ndev, void *type_data)
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling
2023-11-20 14:01 ` [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling Roger Quadros
@ 2023-11-20 22:56 ` Vladimir Oltean
2023-11-21 9:23 ` Roger Quadros
0 siblings, 1 reply; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-20 22:56 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On Mon, Nov 20, 2023 at 04:01:42PM +0200, Roger Quadros wrote:
> -static int am65_cpsw_configure_taprio(struct net_device *ndev,
> - struct am65_cpsw_est *est_new)
> +static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
> + struct tc_taprio_qopt_offload *to)
> +{
> + int i;
> +
> + *to = *from;
> + for (i = 0; i < from->num_entries; i++)
> + to->entries[i] = from->entries[i];
> +}
I think I mentioned this before: have you looked at taprio_offload_get()
and taprio_offload_put()?
> +
> +static int am65_cpsw_taprio_replace(struct net_device *ndev,
> + struct tc_taprio_qopt_offload *taprio)
> {
> struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
> + struct netlink_ext_ack *extack = taprio->mqprio.extack;
> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
> struct am65_cpts *cpts = common->cpts;
> int ret = 0, tact = TACT_PROG;
> + struct am65_cpsw_est *est_new;
>
> - am65_cpsw_est_update_state(ndev);
> + if (!netif_running(ndev)) {
> + NL_SET_ERR_MSG_MOD(extack, "interface is down, link speed unknown\n");
The extack message doesn't need a \n.
> + return -ENETDOWN;
> + }
>
> - if (est_new->taprio.cmd == TAPRIO_CMD_DESTROY) {
> - am65_cpsw_stop_est(ndev);
> - return ret;
> + if (common->pf_p0_rx_ptype_rrobin) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n");
Also here.
> + return -EINVAL;
> + }
> +
> + if (port->qos.link_speed == SPEED_UNKNOWN)
> + return -ENOLINK;
> +
> + if (taprio->cycle_time_extension) {
> + NL_SET_ERR_MSG_MOD(extack,
> + "cycle time extension not supported");
Here it's ok.
> + return -EOPNOTSUPP;
> }
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling
2023-11-20 22:56 ` Vladimir Oltean
@ 2023-11-21 9:23 ` Roger Quadros
2023-11-21 11:11 ` Roger Quadros
0 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-21 9:23 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On 21/11/2023 00:56, Vladimir Oltean wrote:
> On Mon, Nov 20, 2023 at 04:01:42PM +0200, Roger Quadros wrote:
>> -static int am65_cpsw_configure_taprio(struct net_device *ndev,
>> - struct am65_cpsw_est *est_new)
>> +static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
>> + struct tc_taprio_qopt_offload *to)
>> +{
>> + int i;
>> +
>> + *to = *from;
>> + for (i = 0; i < from->num_entries; i++)
>> + to->entries[i] = from->entries[i];
>> +}
>
> I think I mentioned this before: have you looked at taprio_offload_get()
> and taprio_offload_put()?
I'm sorry that I missed this. I'll take a look.
>
>> +
>> +static int am65_cpsw_taprio_replace(struct net_device *ndev,
>> + struct tc_taprio_qopt_offload *taprio)
>> {
>> struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
>> + struct netlink_ext_ack *extack = taprio->mqprio.extack;
>> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
>> struct am65_cpts *cpts = common->cpts;
>> int ret = 0, tact = TACT_PROG;
>> + struct am65_cpsw_est *est_new;
>>
>> - am65_cpsw_est_update_state(ndev);
>> + if (!netif_running(ndev)) {
>> + NL_SET_ERR_MSG_MOD(extack, "interface is down, link speed unknown\n");
>
> The extack message doesn't need a \n.
OK.
>
>> + return -ENETDOWN;
>> + }
>>
>> - if (est_new->taprio.cmd == TAPRIO_CMD_DESTROY) {
>> - am65_cpsw_stop_est(ndev);
>> - return ret;
>> + if (common->pf_p0_rx_ptype_rrobin) {
>> + NL_SET_ERR_MSG_MOD(extack,
>> + "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n");
>
> Also here.
>
>> + return -EINVAL;
>> + }
>> +
>> + if (port->qos.link_speed == SPEED_UNKNOWN)
>> + return -ENOLINK;
>> +
>> + if (taprio->cycle_time_extension) {
>> + NL_SET_ERR_MSG_MOD(extack,
>> + "cycle time extension not supported");
>
> Here it's ok.
>
>> + return -EOPNOTSUPP;
>> }
Thanks for the detailed review!
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling
2023-11-21 9:23 ` Roger Quadros
@ 2023-11-21 11:11 ` Roger Quadros
0 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-21 11:11 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On 21/11/2023 11:23, Roger Quadros wrote:
>
>
> On 21/11/2023 00:56, Vladimir Oltean wrote:
>> On Mon, Nov 20, 2023 at 04:01:42PM +0200, Roger Quadros wrote:
>>> -static int am65_cpsw_configure_taprio(struct net_device *ndev,
>>> - struct am65_cpsw_est *est_new)
>>> +static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
>>> + struct tc_taprio_qopt_offload *to)
>>> +{
>>> + int i;
>>> +
>>> + *to = *from;
>>> + for (i = 0; i < from->num_entries; i++)
>>> + to->entries[i] = from->entries[i];
>>> +}
>>
>> I think I mentioned this before: have you looked at taprio_offload_get()
>> and taprio_offload_put()?
>
> I'm sorry that I missed this. I'll take a look.
Now I recollect. You mentioned this in a different series review
https://lore.kernel.org/all/20231011102536.r65xyzmh5kap2cf2@skbuf/
Since this patch is more trivial cleanups I will do the
taprio_offload_get/free() change to a separate patch.
>
>>
>>> +
>>> +static int am65_cpsw_taprio_replace(struct net_device *ndev,
>>> + struct tc_taprio_qopt_offload *taprio)
>>> {
>>> struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
>>> + struct netlink_ext_ack *extack = taprio->mqprio.extack;
>>> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
>>> struct am65_cpts *cpts = common->cpts;
>>> int ret = 0, tact = TACT_PROG;
>>> + struct am65_cpsw_est *est_new;
>>>
>>> - am65_cpsw_est_update_state(ndev);
>>> + if (!netif_running(ndev)) {
>>> + NL_SET_ERR_MSG_MOD(extack, "interface is down, link speed unknown\n");
>>
>> The extack message doesn't need a \n.
>
> OK.
>
>>
>>> + return -ENETDOWN;
>>> + }
>>>
>>> - if (est_new->taprio.cmd == TAPRIO_CMD_DESTROY) {
>>> - am65_cpsw_stop_est(ndev);
>>> - return ret;
>>> + if (common->pf_p0_rx_ptype_rrobin) {
>>> + NL_SET_ERR_MSG_MOD(extack,
>>> + "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n");
>>
>> Also here.
>>
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (port->qos.link_speed == SPEED_UNKNOWN)
>>> + return -ENOLINK;
>>> +
>>> + if (taprio->cycle_time_extension) {
>>> + NL_SET_ERR_MSG_MOD(extack,
>>> + "cycle time extension not supported");
>>
>> Here it's ok.
>>
>>> + return -EOPNOTSUPP;
>>> }
>
> Thanks for the detailed review!
>
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v6 net-next 3/7] net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 1/7] net: ethernet: am65-cpsw: Build am65-cpsw-qos only if required Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 2/7] net: ethernet: am65-cpsw: cleanup TAPRIO handling Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 4/7] net: ethernet: am65-cpsw: Move register definitions to header file Roger Quadros
` (3 subsequent siblings)
6 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Roger Quadros
Move this code to the end to avoid forward declaration.
No functional change.
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-qos.c | 66 ++++++++++++-------------
1 file changed, 33 insertions(+), 33 deletions(-)
v6: no change
v5: no change
v4: initial commit
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 3539fb31541b..2d083eaea442 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -772,39 +772,6 @@ static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_blo
port, port, true);
}
-int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
- void *type_data)
-{
- switch (type) {
- case TC_QUERY_CAPS:
- return am65_cpsw_tc_query_caps(ndev, type_data);
- case TC_SETUP_QDISC_TAPRIO:
- return am65_cpsw_setup_taprio(ndev, type_data);
- case TC_SETUP_BLOCK:
- return am65_cpsw_qos_setup_tc_block(ndev, type_data);
- default:
- return -EOPNOTSUPP;
- }
-}
-
-void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
-{
- struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
-
- am65_cpsw_est_link_up(ndev, link_speed);
- port->qos.link_down_time = 0;
-}
-
-void am65_cpsw_qos_link_down(struct net_device *ndev)
-{
- struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
-
- if (!port->qos.link_down_time)
- port->qos.link_down_time = ktime_get();
-
- port->qos.link_speed = SPEED_UNKNOWN;
-}
-
static u32
am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
{
@@ -916,3 +883,36 @@ void am65_cpsw_qos_tx_p0_rate_init(struct am65_cpsw_common *common)
host->port_base + AM65_CPSW_PN_REG_PRI_CIR(tx_ch));
}
}
+
+int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
+ void *type_data)
+{
+ switch (type) {
+ case TC_QUERY_CAPS:
+ return am65_cpsw_tc_query_caps(ndev, type_data);
+ case TC_SETUP_QDISC_TAPRIO:
+ return am65_cpsw_setup_taprio(ndev, type_data);
+ case TC_SETUP_BLOCK:
+ return am65_cpsw_qos_setup_tc_block(ndev, type_data);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+
+ am65_cpsw_est_link_up(ndev, link_speed);
+ port->qos.link_down_time = 0;
+}
+
+void am65_cpsw_qos_link_down(struct net_device *ndev)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+
+ if (!port->qos.link_down_time)
+ port->qos.link_down_time = ktime_get();
+
+ port->qos.link_speed = SPEED_UNKNOWN;
+}
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v6 net-next 4/7] net: ethernet: am65-cpsw: Move register definitions to header file
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
` (2 preceding siblings ...)
2023-11-20 14:01 ` [PATCH v6 net-next 3/7] net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode Roger Quadros
` (2 subsequent siblings)
6 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Roger Quadros
Move register definitions to header file. No functional change.
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-qos.c | 35 -------------------------
drivers/net/ethernet/ti/am65-cpsw-qos.h | 35 +++++++++++++++++++++++++
2 files changed, 35 insertions(+), 35 deletions(-)
Changelog:
v6: initial commit
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 2d083eaea442..f0fb11dd9c98 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -15,41 +15,6 @@
#include "am65-cpts.h"
#include "cpsw_ale.h"
-#define AM65_CPSW_REG_CTL 0x004
-#define AM65_CPSW_PN_REG_CTL 0x004
-#define AM65_CPSW_PN_REG_FIFO_STATUS 0x050
-#define AM65_CPSW_PN_REG_EST_CTL 0x060
-#define AM65_CPSW_PN_REG_PRI_CIR(pri) (0x140 + 4 * (pri))
-
-/* AM65_CPSW_REG_CTL register fields */
-#define AM65_CPSW_CTL_EST_EN BIT(18)
-
-/* AM65_CPSW_PN_REG_CTL register fields */
-#define AM65_CPSW_PN_CTL_EST_PORT_EN BIT(17)
-
-/* AM65_CPSW_PN_REG_EST_CTL register fields */
-#define AM65_CPSW_PN_EST_ONEBUF BIT(0)
-#define AM65_CPSW_PN_EST_BUFSEL BIT(1)
-#define AM65_CPSW_PN_EST_TS_EN BIT(2)
-#define AM65_CPSW_PN_EST_TS_FIRST BIT(3)
-#define AM65_CPSW_PN_EST_ONEPRI BIT(4)
-#define AM65_CPSW_PN_EST_TS_PRI_MSK GENMASK(7, 5)
-
-/* AM65_CPSW_PN_REG_FIFO_STATUS register fields */
-#define AM65_CPSW_PN_FST_TX_PRI_ACTIVE_MSK GENMASK(7, 0)
-#define AM65_CPSW_PN_FST_TX_E_MAC_ALLOW_MSK GENMASK(15, 8)
-#define AM65_CPSW_PN_FST_EST_CNT_ERR BIT(16)
-#define AM65_CPSW_PN_FST_EST_ADD_ERR BIT(17)
-#define AM65_CPSW_PN_FST_EST_BUFACT BIT(18)
-
-/* EST FETCH COMMAND RAM */
-#define AM65_CPSW_FETCH_RAM_CMD_NUM 0x80
-#define AM65_CPSW_FETCH_CNT_MSK GENMASK(21, 8)
-#define AM65_CPSW_FETCH_CNT_MAX (AM65_CPSW_FETCH_CNT_MSK >> 8)
-#define AM65_CPSW_FETCH_CNT_OFFSET 8
-#define AM65_CPSW_FETCH_ALLOW_MSK GENMASK(7, 0)
-#define AM65_CPSW_FETCH_ALLOW_MAX AM65_CPSW_FETCH_ALLOW_MSK
-
enum timer_act {
TACT_PROG, /* need program timer */
TACT_NEED_STOP, /* need stop first */
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.h b/drivers/net/ethernet/ti/am65-cpsw-qos.h
index 898f13a4a112..d8bccfd48532 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.h
@@ -31,6 +31,41 @@ struct am65_cpsw_qos {
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
};
+#define AM65_CPSW_REG_CTL 0x004
+#define AM65_CPSW_PN_REG_CTL 0x004
+#define AM65_CPSW_PN_REG_FIFO_STATUS 0x050
+#define AM65_CPSW_PN_REG_EST_CTL 0x060
+#define AM65_CPSW_PN_REG_PRI_CIR(pri) (0x140 + 4 * (pri))
+
+/* AM65_CPSW_REG_CTL register fields */
+#define AM65_CPSW_CTL_EST_EN BIT(18)
+
+/* AM65_CPSW_PN_REG_CTL register fields */
+#define AM65_CPSW_PN_CTL_EST_PORT_EN BIT(17)
+
+/* AM65_CPSW_PN_REG_EST_CTL register fields */
+#define AM65_CPSW_PN_EST_ONEBUF BIT(0)
+#define AM65_CPSW_PN_EST_BUFSEL BIT(1)
+#define AM65_CPSW_PN_EST_TS_EN BIT(2)
+#define AM65_CPSW_PN_EST_TS_FIRST BIT(3)
+#define AM65_CPSW_PN_EST_ONEPRI BIT(4)
+#define AM65_CPSW_PN_EST_TS_PRI_MSK GENMASK(7, 5)
+
+/* AM65_CPSW_PN_REG_FIFO_STATUS register fields */
+#define AM65_CPSW_PN_FST_TX_PRI_ACTIVE_MSK GENMASK(7, 0)
+#define AM65_CPSW_PN_FST_TX_E_MAC_ALLOW_MSK GENMASK(15, 8)
+#define AM65_CPSW_PN_FST_EST_CNT_ERR BIT(16)
+#define AM65_CPSW_PN_FST_EST_ADD_ERR BIT(17)
+#define AM65_CPSW_PN_FST_EST_BUFACT BIT(18)
+
+/* EST FETCH COMMAND RAM */
+#define AM65_CPSW_FETCH_RAM_CMD_NUM 0x80
+#define AM65_CPSW_FETCH_CNT_MSK GENMASK(21, 8)
+#define AM65_CPSW_FETCH_CNT_MAX (AM65_CPSW_FETCH_CNT_MSK >> 8)
+#define AM65_CPSW_FETCH_CNT_OFFSET 8
+#define AM65_CPSW_FETCH_ALLOW_MSK GENMASK(7, 0)
+#define AM65_CPSW_FETCH_ALLOW_MAX AM65_CPSW_FETCH_ALLOW_MSK
+
#if IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS)
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
void *type_data);
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
` (3 preceding siblings ...)
2023-11-20 14:01 ` [PATCH v6 net-next 4/7] net: ethernet: am65-cpsw: Move register definitions to header file Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 23:03 ` Vladimir Oltean
2023-11-20 14:01 ` [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support Roger Quadros
2023-11-20 14:01 ` [PATCH v6 net-next 7/7] net: ethernet: ti: am65-cpsw: add sw tx/rx irq coalescing based on hrtimers Roger Quadros
6 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Grygorii Strashko, Roger Quadros
From: Grygorii Strashko <grygorii.strashko@ti.com>
This patch adds MQPRIO Qdisc offload in full 'channel' mode which allows
not only setting up pri:tc mapping, but also configuring TX shapers
(rate-limiting) on external port FIFOs.
The MQPRIO Qdisc offload is expected to work with or without VLAN/priority
tagged packets.
The CPSW external Port FIFO has 8 Priority queues. The rate-limit can be
set for each of these priority queues. Which Priority queue a packet is
assigned to depends on PN_REG_TX_PRI_MAP register which maps header
priority to switch priority.
The header priority of a packet is assigned via the RX_PRI_MAP_REG which
maps packet priority to header priority.
The packet priority is either the VLAN priority (for VLAN tagged packets)
or the thread/channel offset.
For simplicity, we assign the same priority queue to all queues of a
Traffic Class so it can be rate-limited correctly.
Configuration example:
ethtool -L eth1 tx 5
ethtool --set-priv-flags eth1 p0-rx-ptype-rrobin off
tc qdisc add dev eth1 parent root handle 100: mqprio num_tc 3 \
map 0 0 1 2 0 0 0 0 0 0 0 0 0 0 0 0 \
queues 1@0 1@1 1@2 hw 1 mode channel \
shaper bw_rlimit min_rate 0 100mbit 200mbit max_rate 0 101mbit 202mbit
tc qdisc replace dev eth2 handle 100: parent root mqprio num_tc 1 \
map 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 queues 1@0 hw 1
ip link add link eth1 name eth1.100 type vlan id 100
ip link set eth1.100 type vlan egress 0:0 1:1 2:2 3:3 4:4 5:5 6:6 7:7
In the above example two ports share the same TX CPPI queue 0 for low
priority traffic. 3 traffic classes are defined for eth1 and mapped to:
TC0 - low priority, TX CPPI queue 0 -> ext Port 1 fifo0, no rate limit
TC1 - prio 2, TX CPPI queue 1 -> ext Port 1 fifo1, CIR=100Mbit/s, EIR=1Mbit/s
TC2 - prio 3, TX CPPI queue 2 -> ext Port 1 fifo2, CIR=200Mbit/s, EIR=2Mbit/s
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 3 +
drivers/net/ethernet/ti/am65-cpsw-qos.c | 274 +++++++++++++++++++++--
drivers/net/ethernet/ti/am65-cpsw-qos.h | 20 ++
3 files changed, 284 insertions(+), 13 deletions(-)
v6:
- fixed typo in comment "packet_priorit"->"packet_priority"
- don't call netif_set_real_num_tx_queues() from am65_cpsw_reset_tc_mqprio()
- reset TX queue priorities to zero at init. AM65_CPSW_PN_REG_TX_PRI_MAP = 0
- don't ignore return value in am65_cpsw_setup_mqprio()
v5:
- fix warning at NL_SET_ERR_MSG_FMT_MOD()
v4:
- use macro TO_MBPS()
- use bool for 'shaper_en'
- split code movement into separate patch
- drop rate vs link speed check as mqprio can be set at link down
- call am65_cpsw_reset_tc_mqprio() after pm_runtime_get_sync()
v2:
- clean up commit message
- avoid forward declarations
- use tc_mqprio_qopt_offload :: extack for error message reporting
- avoid unnecessary mqprio->qopt.hw == 0 checks
- set struct tc_mqprio_caps :: validate_queue_counts = true and get rid of
am65_cpsw_mqprio_verify()
- do not modify AM65_CPSW_P0_REG_RX_PRI_MAP register.
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 7992a76ed4d8..38bcbe4b9b98 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2127,6 +2127,9 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
dev_err(dev, "Use random MAC address\n");
}
}
+
+ /* Reset all Queue priorities to 0 */
+ writel(0, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
}
of_node_put(node);
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index f0fb11dd9c98..60f625e1350b 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -15,12 +15,250 @@
#include "am65-cpts.h"
#include "cpsw_ale.h"
+#define TO_MBPS(x) ((x) * 8 / 1000000)
+
enum timer_act {
TACT_PROG, /* need program timer */
TACT_NEED_STOP, /* need stop first */
TACT_SKIP_PROG, /* just buffer can be updated */
};
+static u32
+am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
+{
+ u32 ir;
+
+ bus_freq /= 1000000;
+ ir = DIV_ROUND_UP(((u64)rate_mbps * 32768), bus_freq);
+ return ir;
+}
+
+static void am65_cpsw_tx_pn_shaper_reset(struct am65_cpsw_port *port)
+{
+ int prio;
+
+ for (prio = 0; prio < AM65_CPSW_PN_FIFO_PRIO_NUM; prio++) {
+ writel(0, port->port_base + AM65_CPSW_PN_REG_PRI_CIR(prio));
+ writel(0, port->port_base + AM65_CPSW_PN_REG_PRI_EIR(prio));
+ }
+}
+
+static void am65_cpsw_tx_pn_shaper_apply(struct am65_cpsw_port *port)
+{
+ struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
+ struct am65_cpsw_common *common = port->common;
+ struct tc_mqprio_qopt_offload *mqprio;
+ bool enable, shaper_susp = false;
+ u32 rate_mbps;
+ int tc, prio;
+
+ mqprio = &p_mqprio->mqprio_hw;
+ /* takes care of no link case as well */
+ if (p_mqprio->max_rate_total > port->qos.link_speed)
+ shaper_susp = true;
+
+ am65_cpsw_tx_pn_shaper_reset(port);
+
+ enable = p_mqprio->shaper_en && !shaper_susp;
+ if (!enable)
+ return;
+
+ /* Rate limit is specified per Traffic Class but
+ * for CPSW, rate limit can be applied per priority
+ * at port FIFO.
+ *
+ * We have assigned the same priority (TCn) to all queues
+ * of a Traffic Class so they share the same shaper
+ * bandwidth.
+ */
+ for (tc = 0; tc < mqprio->qopt.num_tc; tc++) {
+ prio = tc;
+
+ rate_mbps = TO_MBPS(mqprio->min_rate[tc]);
+ rate_mbps = am65_cpsw_qos_tx_rate_calc(rate_mbps,
+ common->bus_freq);
+ writel(rate_mbps,
+ port->port_base + AM65_CPSW_PN_REG_PRI_CIR(prio));
+
+ rate_mbps = 0;
+
+ if (mqprio->max_rate[tc]) {
+ rate_mbps = mqprio->max_rate[tc] - mqprio->min_rate[tc];
+ rate_mbps = TO_MBPS(rate_mbps);
+ rate_mbps = am65_cpsw_qos_tx_rate_calc(rate_mbps,
+ common->bus_freq);
+ }
+
+ writel(rate_mbps,
+ port->port_base + AM65_CPSW_PN_REG_PRI_EIR(prio));
+ }
+}
+
+static int am65_cpsw_mqprio_verify_shaper(struct am65_cpsw_port *port,
+ struct tc_mqprio_qopt_offload *mqprio)
+{
+ struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
+ struct netlink_ext_ack *extack = mqprio->extack;
+ u64 min_rate_total = 0, max_rate_total = 0;
+ u32 min_rate_msk = 0, max_rate_msk = 0;
+ bool has_min_rate, has_max_rate;
+ int num_tc, i;
+
+ if (!(mqprio->flags & TC_MQPRIO_F_SHAPER))
+ return 0;
+
+ if (mqprio->shaper != TC_MQPRIO_SHAPER_BW_RATE)
+ return 0;
+
+ has_min_rate = !!(mqprio->flags & TC_MQPRIO_F_MIN_RATE);
+ has_max_rate = !!(mqprio->flags & TC_MQPRIO_F_MAX_RATE);
+
+ if (!has_min_rate && has_max_rate) {
+ NL_SET_ERR_MSG_MOD(extack, "min_rate is required with max_rate");
+ return -EOPNOTSUPP;
+ }
+
+ if (!has_min_rate)
+ return 0;
+
+ num_tc = mqprio->qopt.num_tc;
+
+ for (i = num_tc - 1; i >= 0; i--) {
+ u32 ch_msk;
+
+ if (mqprio->min_rate[i])
+ min_rate_msk |= BIT(i);
+ min_rate_total += mqprio->min_rate[i];
+
+ if (has_max_rate) {
+ if (mqprio->max_rate[i])
+ max_rate_msk |= BIT(i);
+ max_rate_total += mqprio->max_rate[i];
+
+ if (!mqprio->min_rate[i] && mqprio->max_rate[i]) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "TX tc%d rate max>0 but min=0\n",
+ i);
+ return -EINVAL;
+ }
+
+ if (mqprio->max_rate[i] &&
+ mqprio->max_rate[i] < mqprio->min_rate[i]) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "TX tc%d rate min(%llu)>max(%llu)\n",
+ i, mqprio->min_rate[i],
+ mqprio->max_rate[i]);
+ return -EINVAL;
+ }
+ }
+
+ ch_msk = GENMASK(num_tc - 1, i);
+ if ((min_rate_msk & BIT(i)) && (min_rate_msk ^ ch_msk)) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Min rate must be set sequentially hi->lo tx_rate_msk%x\n",
+ min_rate_msk);
+ return -EINVAL;
+ }
+
+ if ((max_rate_msk & BIT(i)) && (max_rate_msk ^ ch_msk)) {
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Max rate must be set sequentially hi->lo tx_rate_msk%x\n",
+ max_rate_msk);
+ return -EINVAL;
+ }
+ }
+
+ min_rate_total = TO_MBPS(min_rate_total);
+ max_rate_total = TO_MBPS(max_rate_total);
+
+ p_mqprio->shaper_en = true;
+ p_mqprio->max_rate_total = max_t(u64, min_rate_total, max_rate_total);
+
+ return 0;
+}
+
+static void am65_cpsw_reset_tc_mqprio(struct net_device *ndev)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
+
+ p_mqprio->shaper_en = false;
+ p_mqprio->max_rate_total = 0;
+
+ am65_cpsw_tx_pn_shaper_reset(port);
+ netdev_reset_tc(ndev);
+
+ /* Reset all Queue priorities to 0 */
+ writel(0, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
+}
+
+static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
+ struct tc_mqprio_qopt_offload *mqprio = type_data;
+ struct am65_cpsw_common *common = port->common;
+ struct tc_mqprio_qopt *qopt = &mqprio->qopt;
+ int i, tc, offset, count, prio, ret;
+ u8 num_tc = qopt->num_tc;
+ u32 tx_prio_map = 0;
+
+ memcpy(&p_mqprio->mqprio_hw, mqprio, sizeof(*mqprio));
+
+ ret = pm_runtime_get_sync(common->dev);
+ if (ret < 0) {
+ pm_runtime_put_noidle(common->dev);
+ return ret;
+ }
+
+ if (!num_tc) {
+ am65_cpsw_reset_tc_mqprio(ndev);
+ ret = -EINVAL;
+ goto exit_put;
+ }
+
+ ret = am65_cpsw_mqprio_verify_shaper(port, mqprio);
+ if (ret)
+ goto exit_put;
+
+ netdev_set_num_tc(ndev, num_tc);
+
+ /* Multiple Linux priorities can map to a Traffic Class
+ * A Traffic Class can have multiple contiguous Queues,
+ * Queues get mapped to Channels (thread_id),
+ * if not VLAN tagged, thread_id is used as packet_priority
+ * if VLAN tagged. VLAN priority is used as packet_priority
+ * packet_priority gets mapped to header_priority in p0_rx_pri_map,
+ * header_priority gets mapped to switch_priority in pn_tx_pri_map.
+ * As p0_rx_pri_map is left at defaults (0x76543210), we can
+ * assume that Queue_n gets mapped to header_priority_n. We can then
+ * set the switch priority in pn_tx_pri_map.
+ */
+
+ for (tc = 0; tc < num_tc; tc++) {
+ prio = tc;
+
+ /* For simplicity we assign the same priority (TCn) to
+ * all queues of a Traffic Class.
+ */
+ for (i = qopt->offset[tc]; i < qopt->offset[tc] + qopt->count[tc]; i++)
+ tx_prio_map |= prio << (4 * i);
+
+ count = qopt->count[tc];
+ offset = qopt->offset[tc];
+ netdev_set_tc_queue(ndev, tc, count, offset);
+ }
+
+ writel(tx_prio_map, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
+
+ am65_cpsw_tx_pn_shaper_apply(port);
+
+exit_put:
+ pm_runtime_put(common->dev);
+
+ return ret;
+}
+
static int am65_cpsw_port_est_enabled(struct am65_cpsw_port *port)
{
return port->qos.est_oper || port->qos.est_admin;
@@ -404,6 +642,8 @@ static void am65_cpsw_taprio_destroy(struct net_device *ndev)
port->qos.est_oper = NULL;
port->qos.est_admin = NULL;
+
+ am65_cpsw_reset_tc_mqprio(ndev);
}
static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from,
@@ -452,6 +692,10 @@ static int am65_cpsw_taprio_replace(struct net_device *ndev,
if (!est_new)
return -ENOMEM;
+ ret = am65_cpsw_setup_mqprio(ndev, &taprio->mqprio);
+ if (ret)
+ return ret;
+
am65_cpsw_cp_taprio(taprio, &est_new->taprio);
am65_cpsw_est_update_state(ndev);
@@ -495,6 +739,7 @@ static int am65_cpsw_taprio_replace(struct net_device *ndev,
return 0;
fail:
+ am65_cpsw_reset_tc_mqprio(ndev);
devm_kfree(&ndev->dev, est_new);
return ret;
}
@@ -505,7 +750,6 @@ static void am65_cpsw_est_link_up(struct net_device *ndev, int link_speed)
ktime_t cur_time;
s64 delta;
- port->qos.link_speed = link_speed;
if (!am65_cpsw_port_est_enabled(port))
return;
@@ -549,6 +793,14 @@ static int am65_cpsw_tc_query_caps(struct net_device *ndev, void *type_data)
struct tc_query_caps_base *base = type_data;
switch (base->type) {
+ case TC_SETUP_QDISC_MQPRIO: {
+ struct tc_mqprio_caps *caps = base->caps;
+
+ caps->validate_queue_counts = true;
+
+ return 0;
+ }
+
case TC_SETUP_QDISC_TAPRIO: {
struct tc_taprio_caps *caps = base->caps;
@@ -737,16 +989,6 @@ static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_blo
port, port, true);
}
-static u32
-am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
-{
- u32 ir;
-
- bus_freq /= 1000000;
- ir = DIV_ROUND_UP(((u64)rate_mbps * 32768), bus_freq);
- return ir;
-}
-
static void
am65_cpsw_qos_tx_p0_rate_apply(struct am65_cpsw_common *common,
int tx_ch, u32 rate_mbps)
@@ -857,6 +1099,8 @@ int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
return am65_cpsw_tc_query_caps(ndev, type_data);
case TC_SETUP_QDISC_TAPRIO:
return am65_cpsw_setup_taprio(ndev, type_data);
+ case TC_SETUP_QDISC_MQPRIO:
+ return am65_cpsw_setup_mqprio(ndev, type_data);
case TC_SETUP_BLOCK:
return am65_cpsw_qos_setup_tc_block(ndev, type_data);
default:
@@ -868,6 +1112,9 @@ void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
{
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ port->qos.link_speed = link_speed;
+ am65_cpsw_tx_pn_shaper_apply(port);
+
am65_cpsw_est_link_up(ndev, link_speed);
port->qos.link_down_time = 0;
}
@@ -876,8 +1123,9 @@ void am65_cpsw_qos_link_down(struct net_device *ndev)
{
struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ port->qos.link_speed = SPEED_UNKNOWN;
+ am65_cpsw_tx_pn_shaper_apply(port);
+
if (!port->qos.link_down_time)
port->qos.link_down_time = ktime_get();
-
- port->qos.link_speed = SPEED_UNKNOWN;
}
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.h b/drivers/net/ethernet/ti/am65-cpsw-qos.h
index d8bccfd48532..a0f9fa2eb2aa 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.h
@@ -9,6 +9,7 @@
#include <net/pkt_sched.h>
struct am65_cpsw_common;
+struct am65_cpsw_port;
struct am65_cpsw_est {
int buf;
@@ -16,6 +17,12 @@ struct am65_cpsw_est {
struct tc_taprio_qopt_offload taprio;
};
+struct am65_cpsw_mqprio {
+ struct tc_mqprio_qopt_offload mqprio_hw;
+ u64 max_rate_total;
+ bool shaper_en;
+};
+
struct am65_cpsw_ale_ratelimit {
unsigned long cookie;
u64 rate_packet_ps;
@@ -26,6 +33,7 @@ struct am65_cpsw_qos {
struct am65_cpsw_est *est_oper;
ktime_t link_down_time;
int link_speed;
+ struct am65_cpsw_mqprio mqprio;
struct am65_cpsw_ale_ratelimit ale_bc_ratelimit;
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
@@ -36,6 +44,15 @@ struct am65_cpsw_qos {
#define AM65_CPSW_PN_REG_FIFO_STATUS 0x050
#define AM65_CPSW_PN_REG_EST_CTL 0x060
#define AM65_CPSW_PN_REG_PRI_CIR(pri) (0x140 + 4 * (pri))
+#define AM65_CPSW_P0_REG_PRI_EIR(pri) (0x160 + 4 * (pri))
+
+#define AM65_CPSW_PN_REG_CTL 0x004
+#define AM65_CPSW_PN_REG_TX_PRI_MAP 0x018
+#define AM65_CPSW_PN_REG_RX_PRI_MAP 0x020
+#define AM65_CPSW_PN_REG_FIFO_STATUS 0x050
+#define AM65_CPSW_PN_REG_EST_CTL 0x060
+#define AM65_CPSW_PN_REG_PRI_CIR(pri) (0x140 + 4 * (pri))
+#define AM65_CPSW_PN_REG_PRI_EIR(pri) (0x160 + 4 * (pri))
/* AM65_CPSW_REG_CTL register fields */
#define AM65_CPSW_CTL_EST_EN BIT(18)
@@ -66,6 +83,9 @@ struct am65_cpsw_qos {
#define AM65_CPSW_FETCH_ALLOW_MSK GENMASK(7, 0)
#define AM65_CPSW_FETCH_ALLOW_MAX AM65_CPSW_FETCH_ALLOW_MSK
+/* number of priority queues per port FIFO */
+#define AM65_CPSW_PN_FIFO_PRIO_NUM 8
+
#if IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS)
int am65_cpsw_qos_ndo_setup_tc(struct net_device *ndev, enum tc_setup_type type,
void *type_data);
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode
2023-11-20 14:01 ` [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode Roger Quadros
@ 2023-11-20 23:03 ` Vladimir Oltean
2023-11-21 9:25 ` Roger Quadros
0 siblings, 1 reply; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-20 23:03 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel,
Grygorii Strashko
On Mon, Nov 20, 2023 at 04:01:45PM +0200, Roger Quadros wrote:
> +static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
> +{
> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
> + struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
> + struct tc_mqprio_qopt_offload *mqprio = type_data;
> + struct am65_cpsw_common *common = port->common;
> + struct tc_mqprio_qopt *qopt = &mqprio->qopt;
> + int i, tc, offset, count, prio, ret;
> + u8 num_tc = qopt->num_tc;
> + u32 tx_prio_map = 0;
> +
> + memcpy(&p_mqprio->mqprio_hw, mqprio, sizeof(*mqprio));
> +
> + ret = pm_runtime_get_sync(common->dev);
> + if (ret < 0) {
> + pm_runtime_put_noidle(common->dev);
> + return ret;
> + }
> +
> + if (!num_tc) {
> + am65_cpsw_reset_tc_mqprio(ndev);
> + ret = -EINVAL;
num_tc == 0 is what signals the deletion of the mqprio qdisc.
Why return -EINVAL?
> + goto exit_put;
> + }
> +
> + ret = am65_cpsw_mqprio_verify_shaper(port, mqprio);
> + if (ret)
> + goto exit_put;
> +
> + netdev_set_num_tc(ndev, num_tc);
> +
> + /* Multiple Linux priorities can map to a Traffic Class
> + * A Traffic Class can have multiple contiguous Queues,
> + * Queues get mapped to Channels (thread_id),
> + * if not VLAN tagged, thread_id is used as packet_priority
> + * if VLAN tagged. VLAN priority is used as packet_priority
> + * packet_priority gets mapped to header_priority in p0_rx_pri_map,
> + * header_priority gets mapped to switch_priority in pn_tx_pri_map.
> + * As p0_rx_pri_map is left at defaults (0x76543210), we can
> + * assume that Queue_n gets mapped to header_priority_n. We can then
> + * set the switch priority in pn_tx_pri_map.
> + */
> +
> + for (tc = 0; tc < num_tc; tc++) {
> + prio = tc;
> +
> + /* For simplicity we assign the same priority (TCn) to
> + * all queues of a Traffic Class.
> + */
> + for (i = qopt->offset[tc]; i < qopt->offset[tc] + qopt->count[tc]; i++)
> + tx_prio_map |= prio << (4 * i);
> +
> + count = qopt->count[tc];
> + offset = qopt->offset[tc];
> + netdev_set_tc_queue(ndev, tc, count, offset);
> + }
> +
> + writel(tx_prio_map, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
> +
> + am65_cpsw_tx_pn_shaper_apply(port);
> +
> +exit_put:
> + pm_runtime_put(common->dev);
> +
> + return ret;
> +}
> +
> static int am65_cpsw_port_est_enabled(struct am65_cpsw_port *port)
> {
> return port->qos.est_oper || port->qos.est_admin;
> @@ -737,16 +989,6 @@ static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_blo
> port, port, true);
> }
>
> -static u32
> -am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
> -{
> - u32 ir;
> -
> - bus_freq /= 1000000;
> - ir = DIV_ROUND_UP(((u64)rate_mbps * 32768), bus_freq);
> - return ir;
> -}
> -
Insufficient code movement in the previous patch?
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode
2023-11-20 23:03 ` Vladimir Oltean
@ 2023-11-21 9:25 ` Roger Quadros
0 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-21 9:25 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel,
Grygorii Strashko
On 21/11/2023 01:03, Vladimir Oltean wrote:
> On Mon, Nov 20, 2023 at 04:01:45PM +0200, Roger Quadros wrote:
>> +static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
>> +{
>> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
>> + struct am65_cpsw_mqprio *p_mqprio = &port->qos.mqprio;
>> + struct tc_mqprio_qopt_offload *mqprio = type_data;
>> + struct am65_cpsw_common *common = port->common;
>> + struct tc_mqprio_qopt *qopt = &mqprio->qopt;
>> + int i, tc, offset, count, prio, ret;
>> + u8 num_tc = qopt->num_tc;
>> + u32 tx_prio_map = 0;
>> +
>> + memcpy(&p_mqprio->mqprio_hw, mqprio, sizeof(*mqprio));
>> +
>> + ret = pm_runtime_get_sync(common->dev);
>> + if (ret < 0) {
>> + pm_runtime_put_noidle(common->dev);
>> + return ret;
>> + }
>> +
>> + if (!num_tc) {
>> + am65_cpsw_reset_tc_mqprio(ndev);
>> + ret = -EINVAL;
>
> num_tc == 0 is what signals the deletion of the mqprio qdisc.
> Why return -EINVAL?
Right. I'll drop the -EINVAL.
>
>> + goto exit_put;
>> + }
>> +
>> + ret = am65_cpsw_mqprio_verify_shaper(port, mqprio);
>> + if (ret)
>> + goto exit_put;
>> +
>> + netdev_set_num_tc(ndev, num_tc);
>> +
>> + /* Multiple Linux priorities can map to a Traffic Class
>> + * A Traffic Class can have multiple contiguous Queues,
>> + * Queues get mapped to Channels (thread_id),
>> + * if not VLAN tagged, thread_id is used as packet_priority
>> + * if VLAN tagged. VLAN priority is used as packet_priority
>> + * packet_priority gets mapped to header_priority in p0_rx_pri_map,
>> + * header_priority gets mapped to switch_priority in pn_tx_pri_map.
>> + * As p0_rx_pri_map is left at defaults (0x76543210), we can
>> + * assume that Queue_n gets mapped to header_priority_n. We can then
>> + * set the switch priority in pn_tx_pri_map.
>> + */
>> +
>> + for (tc = 0; tc < num_tc; tc++) {
>> + prio = tc;
>> +
>> + /* For simplicity we assign the same priority (TCn) to
>> + * all queues of a Traffic Class.
>> + */
>> + for (i = qopt->offset[tc]; i < qopt->offset[tc] + qopt->count[tc]; i++)
>> + tx_prio_map |= prio << (4 * i);
>> +
>> + count = qopt->count[tc];
>> + offset = qopt->offset[tc];
>> + netdev_set_tc_queue(ndev, tc, count, offset);
>> + }
>> +
>> + writel(tx_prio_map, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
>> +
>> + am65_cpsw_tx_pn_shaper_apply(port);
>> +
>> +exit_put:
>> + pm_runtime_put(common->dev);
>> +
>> + return ret;
>> +}
>> +
>> static int am65_cpsw_port_est_enabled(struct am65_cpsw_port *port)
>> {
>> return port->qos.est_oper || port->qos.est_admin;
>> @@ -737,16 +989,6 @@ static int am65_cpsw_qos_setup_tc_block(struct net_device *ndev, struct flow_blo
>> port, port, true);
>> }
>>
>> -static u32
>> -am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
>> -{
>> - u32 ir;
>> -
>> - bus_freq /= 1000000;
>> - ir = DIV_ROUND_UP(((u64)rate_mbps * 32768), bus_freq);
>> - return ir;
>> -}
>> -
>
> Insufficient code movement in the previous patch?
Let me move it to patch 3.
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
` (4 preceding siblings ...)
2023-11-20 14:01 ` [PATCH v6 net-next 5/7] net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
2023-11-20 23:26 ` Vladimir Oltean
2023-11-20 14:01 ` [PATCH v6 net-next 7/7] net: ethernet: ti: am65-cpsw: add sw tx/rx irq coalescing based on hrtimers Roger Quadros
6 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Roger Quadros
Add driver support for viewing / changing the MAC Merge sublayer
parameters and seeing the verification state machine's current state
via ethtool.
As hardware does not support interrupt notification for verification
events we resort to polling on link up. On link up we try a couple of
times for verification success and if unsuccessful then give up.
The Frame Preemption feature is described in the Technical Reference
Manual [1] in section:
12.3.1.4.6.7 Intersperced Express Traffic (IET – P802.3br/D2.0)
Due to Silicon Errata i2208 [2] we set limit min IET fragment size to 124.
[1] AM62x TRM - https://www.ti.com/lit/ug/spruiv7a/spruiv7a.pdf
[2] AM62x Silicon Errata - https://www.ti.com/lit/er/sprz487c/sprz487c.pdf
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 155 +++++++++++++++
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +
drivers/net/ethernet/ti/am65-cpsw-nuss.h | 5 +
drivers/net/ethernet/ti/am65-cpsw-qos.c | 200 ++++++++++++++++++++
drivers/net/ethernet/ti/am65-cpsw-qos.h | 103 ++++++++++
5 files changed, 465 insertions(+)
Changelog:
v6:
- get mutex around am65_cpsw_iet_commit_preemptible_tcs() in
am65_cpsw_iet_change_preemptible_tcs()
- use "preemption" instead of "pre-emption"
- call am65_cpsw_setup_mqprio() from within am65_cpsw_setup_taprio()
- Now works with kselftest except the last test which fails
root@am62xx:~/kselftest# ./run_kselftest.sh -t net/forwarding:ethtool_mm.sh
# TEST: Manual configuration with verification: eth0 to eth1 [ OK ]
# TEST: Manual configuration with verification: eth1 to eth0 [ OK ]
# TEST: Manual configuration without verification: eth0 to eth1 [ OK ]
# TEST: Manual configuration without verification: eth1 to eth0 [ OK ]
# TEST: Manual configuration with failed verification: eth0 to eth1 [ OK ]
# TEST: Manual configuration with failed verification: eth1 to eth0 [ OK ]
# Warning: Stopping lldpad.service, but it can still be activated by:
# lldpad.socket
# TEST: LLDP [FAIL]
# eth0 pMAC TX is not active
v5:
- No change
v4:
- Rebase and include in the same series as mqprio support.
v3:
- Rebase on top of v6.6-rc1 and mqprio support [1]
- Support ethtool_ops :: get_mm_stats()
- drop unused variables cmn_ctrl and verify_cnt
- make am65_cpsw_iet_link_state_update() and
am65_cpsw_iet_change_preemptible_tcs() static
[1] https://lore.kernel.org/all/20230918075358.5878-1-rogerq@kernel.org/
v2:
- Use proper control bits for PMAC enable (AM65_CPSW_PN_CTL_IET_PORT_EN)
and TX enable (AM65_CPSW_PN_IET_MAC_PENABLE)
- Common IET Enable (AM65_CPSW_CTL_IET_EN) is set if any port has
AM65_CPSW_PN_CTL_IET_PORT_EN set.
- Fix workaround for erratum i2208. i.e. Limit rx_min_frag_size to 124
- Fix am65_cpsw_iet_get_verify_timeout_ms() to default to timeout for
1G link if link is inactive.
- resize the RX FIFO based on pmac_enabled, not tx_enabled.
diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
index b9e1d568604b..6af00640e99c 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
@@ -11,6 +11,7 @@
#include <linux/pm_runtime.h>
#include "am65-cpsw-nuss.h"
+#include "am65-cpsw-qos.h"
#include "cpsw_ale.h"
#include "am65-cpts.h"
@@ -740,6 +741,157 @@ static int am65_cpsw_set_ethtool_priv_flags(struct net_device *ndev, u32 flags)
return 0;
}
+static void am65_cpsw_port_iet_rx_enable(struct am65_cpsw_port *port, bool enable)
+{
+ u32 val;
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
+ if (enable)
+ val |= AM65_CPSW_PN_CTL_IET_PORT_EN;
+ else
+ val &= ~AM65_CPSW_PN_CTL_IET_PORT_EN;
+
+ writel(val, port->port_base + AM65_CPSW_PN_REG_CTL);
+ am65_cpsw_iet_common_enable(port->common);
+}
+
+static void am65_cpsw_port_iet_tx_enable(struct am65_cpsw_port *port, bool enable)
+{
+ u32 val;
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ if (enable)
+ val |= AM65_CPSW_PN_IET_MAC_PENABLE;
+ else
+ val &= ~AM65_CPSW_PN_IET_MAC_PENABLE;
+
+ writel(val, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+}
+
+static int am65_cpsw_get_mm(struct net_device *ndev, struct ethtool_mm_state *state)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ struct am65_cpsw_ndev_priv *priv = netdev_priv(ndev);
+ u32 port_ctrl, iet_ctrl, iet_status;
+ u32 add_frag_size;
+
+ mutex_lock(&priv->mm_lock);
+
+ iet_ctrl = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ port_ctrl = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
+
+ state->tx_enabled = !!(iet_ctrl & AM65_CPSW_PN_IET_MAC_PENABLE);
+ state->pmac_enabled = !!(port_ctrl & AM65_CPSW_PN_CTL_IET_PORT_EN);
+
+ iet_status = readl(port->port_base + AM65_CPSW_PN_REG_IET_STATUS);
+
+ if (iet_ctrl & AM65_CPSW_PN_IET_MAC_DISABLEVERIFY)
+ state->verify_status = ETHTOOL_MM_VERIFY_STATUS_DISABLED;
+ else if (iet_status & AM65_CPSW_PN_MAC_VERIFIED)
+ state->verify_status = ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED;
+ else if (iet_status & AM65_CPSW_PN_MAC_VERIFY_FAIL)
+ state->verify_status = ETHTOOL_MM_VERIFY_STATUS_FAILED;
+ else
+ state->verify_status = ETHTOOL_MM_VERIFY_STATUS_UNKNOWN;
+
+ add_frag_size = AM65_CPSW_PN_IET_MAC_GET_ADDFRAGSIZE(iet_ctrl);
+ state->tx_min_frag_size = ethtool_mm_frag_size_add_to_min(add_frag_size);
+
+ /* Errata i2208: RX min fragment size cannot be less than 124 */
+ state->rx_min_frag_size = 124;
+
+ /* FPE active if common tx_enabled and verification success or disabled (forced) */
+ state->tx_active = state->tx_enabled &&
+ (state->verify_status == ETHTOOL_MM_VERIFY_STATUS_SUCCEEDED ||
+ state->verify_status == ETHTOOL_MM_VERIFY_STATUS_DISABLED);
+ state->verify_enabled = !(iet_ctrl & AM65_CPSW_PN_IET_MAC_DISABLEVERIFY);
+
+ state->verify_time = port->qos.iet.verify_time_ms;
+ state->max_verify_time = am65_cpsw_iet_get_verify_timeout_ms(AM65_CPSW_PN_MAC_VERIFY_CNT_MASK,
+ port);
+ mutex_unlock(&priv->mm_lock);
+
+ return 0;
+}
+
+static int am65_cpsw_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
+ struct netlink_ext_ack *extack)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ struct am65_cpsw_ndev_priv *priv = netdev_priv(ndev);
+ struct am65_cpsw_iet *iet = &port->qos.iet;
+ u32 val, add_frag_size;
+ int err;
+
+ err = ethtool_mm_frag_size_min_to_add(cfg->tx_min_frag_size, &add_frag_size, extack);
+ if (err)
+ return err;
+
+ mutex_lock(&priv->mm_lock);
+
+ if (cfg->pmac_enabled) {
+ /* change TX & RX FIFO MAX_BLKS as per TRM recommendation */
+ if (!iet->original_max_blks)
+ iet->original_max_blks = readl(port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
+
+ writel(AM65_CPSW_PN_TX_RX_MAX_BLKS_IET,
+ port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
+ } else {
+ /* restore RX & TX FIFO MAX_BLKS */
+ if (iet->original_max_blks) {
+ writel(iet->original_max_blks,
+ port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
+ }
+ }
+
+ am65_cpsw_port_iet_rx_enable(port, cfg->pmac_enabled);
+ am65_cpsw_port_iet_tx_enable(port, cfg->tx_enabled);
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ if (cfg->verify_enabled) {
+ val &= ~AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
+ /* Reset Verify state machine. Verification won't start here.
+ * Verification will be done once link-up.
+ */
+ val |= AM65_CPSW_PN_IET_MAC_LINKFAIL;
+ } else {
+ val |= AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
+ /* Clear LINKFAIL to allow verify/response packets */
+ val &= ~AM65_CPSW_PN_IET_MAC_LINKFAIL;
+ }
+
+ val &= ~AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK;
+ val |= AM65_CPSW_PN_IET_MAC_SET_ADDFRAGSIZE(add_frag_size);
+ writel(val, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+
+ /* verify_timeout_count can only be set at valid link */
+ if (cfg->verify_time > 0)
+ port->qos.iet.verify_time_ms = cfg->verify_time;
+ else
+ port->qos.iet.verify_time_ms = 10;
+
+ /* enable/disable preemption based on link status */
+ am65_cpsw_iet_commit_preemptible_tcs(port);
+
+ mutex_unlock(&priv->mm_lock);
+
+ return 0;
+}
+
+static void am65_cpsw_get_mm_stats(struct net_device *ndev,
+ struct ethtool_mm_stats *s)
+{
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+ void __iomem *base = port->stat_base;
+
+ s->MACMergeFrameAssOkCount = readl(base + AM65_CPSW_STATN_IET_RX_ASSEMBLY_OK);
+ s->MACMergeFrameAssErrorCount = readl(base + AM65_CPSW_STATN_IET_RX_ASSEMBLY_ERROR);
+ s->MACMergeFrameSmdErrorCount = readl(base + AM65_CPSW_STATN_IET_RX_SMD_ERROR);
+ s->MACMergeFragCountRx = readl(base + AM65_CPSW_STATN_IET_RX_FRAG);
+ s->MACMergeFragCountTx = readl(base + AM65_CPSW_STATN_IET_TX_FRAG);
+ s->MACMergeHoldCount = readl(base + AM65_CPSW_STATN_IET_TX_HOLD);
+}
+
const struct ethtool_ops am65_cpsw_ethtool_ops_slave = {
.begin = am65_cpsw_ethtool_op_begin,
.complete = am65_cpsw_ethtool_op_complete,
@@ -769,4 +921,7 @@ const struct ethtool_ops am65_cpsw_ethtool_ops_slave = {
.get_eee = am65_cpsw_get_eee,
.set_eee = am65_cpsw_set_eee,
.nway_reset = am65_cpsw_nway_reset,
+ .get_mm = am65_cpsw_get_mm,
+ .set_mm = am65_cpsw_set_mm,
+ .get_mm_stats = am65_cpsw_get_mm_stats,
};
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 38bcbe4b9b98..594f95c9415c 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2194,6 +2194,8 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx)
ndev_priv = netdev_priv(port->ndev);
ndev_priv->port = port;
ndev_priv->msg_enable = AM65_CPSW_DEBUG;
+ mutex_init(&ndev_priv->mm_lock);
+ port->qos.link_speed = SPEED_UNKNOWN;
SET_NETDEV_DEV(port->ndev, dev);
eth_hw_addr_set(port->ndev, port->slave.mac_addr);
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
index f3dad2ab9828..1e4a045057fc 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
@@ -145,6 +145,7 @@ struct am65_cpsw_common {
bool pf_p0_rx_ptype_rrobin;
struct am65_cpts *cpts;
int est_enabled;
+ bool iet_enabled;
bool is_emac_mode;
u16 br_members;
@@ -170,6 +171,10 @@ struct am65_cpsw_ndev_priv {
struct am65_cpsw_port *port;
struct am65_cpsw_ndev_stats __percpu *stats;
bool offload_fwd_mark;
+ /* Serialize access to MAC Merge state between ethtool requests
+ * and link state updates
+ */
+ struct mutex mm_lock;
};
#define am65_ndev_to_priv(ndev) \
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
index 60f625e1350b..8443c13c9ff6 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
@@ -4,9 +4,11 @@
*
* quality of service module includes:
* Enhanced Scheduler Traffic (EST - P802.1Qbv/D2.2)
+ * Interspersed Express Traffic (IET - P802.3br/D2.0)
*/
#include <linux/pm_runtime.h>
+#include <linux/units.h>
#include <linux/time.h>
#include <net/pkt_cls.h>
@@ -23,6 +25,8 @@ enum timer_act {
TACT_SKIP_PROG, /* just buffer can be updated */
};
+static void am65_cpsw_iet_change_preemptible_tcs(struct am65_cpsw_port *port, u8 preemptible_tcs);
+
static u32
am65_cpsw_qos_tx_rate_calc(u32 rate_mbps, unsigned long bus_freq)
{
@@ -190,6 +194,8 @@ static void am65_cpsw_reset_tc_mqprio(struct net_device *ndev)
/* Reset all Queue priorities to 0 */
writel(0, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
+
+ am65_cpsw_iet_change_preemptible_tcs(port, 0);
}
static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
@@ -252,6 +258,7 @@ static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
writel(tx_prio_map, port->port_base + AM65_CPSW_PN_REG_TX_PRI_MAP);
am65_cpsw_tx_pn_shaper_apply(port);
+ am65_cpsw_iet_change_preemptible_tcs(port, mqprio->preemptible_tcs);
exit_put:
pm_runtime_put(common->dev);
@@ -259,6 +266,196 @@ static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
return ret;
}
+static int am65_cpsw_iet_set_verify_timeout_count(struct am65_cpsw_port *port)
+{
+ int verify_time_ms = port->qos.iet.verify_time_ms;
+ int link_speed = port->qos.link_speed;
+ u32 val;
+
+ if (WARN_ON(link_speed == SPEED_UNKNOWN))
+ return -ENODEV;
+
+ /* The number of wireside clocks contained in the verify
+ * timeout counter. The default is 0x1312d0
+ * (10ms at 125Mhz in 1G mode).
+ */
+ val = 125 * HZ_PER_MHZ; /* assuming 125MHz wireside clock */
+
+ val /= MILLIHZ_PER_HZ; /* count per ms timeout */
+ val *= verify_time_ms; /* count for timeout ms */
+ if (link_speed < SPEED_1000)
+ val <<= 1; /* FIXME: Is this correct? */
+
+ if (val > AM65_CPSW_PN_MAC_VERIFY_CNT_MASK)
+ return -EINVAL;
+
+ writel(val, port->port_base + AM65_CPSW_PN_REG_IET_VERIFY);
+
+ return 0;
+}
+
+unsigned int am65_cpsw_iet_get_verify_timeout_ms(u32 count, struct am65_cpsw_port *port)
+{
+ int link_speed = port->qos.link_speed;
+ u32 val = 125 * HZ_PER_MHZ; /* assuming 125MHz wireside clock */
+ unsigned int timeout_ms;
+
+ if (link_speed == SPEED_UNKNOWN)
+ link_speed = SPEED_1000;
+
+ val /= MILLIHZ_PER_HZ; /* count per ms timeout */
+
+ timeout_ms = count / val;
+
+ if (link_speed < SPEED_1000)
+ timeout_ms >>= 1; /* FIXME: Is this correct? */
+
+ return timeout_ms;
+}
+
+static int am65_cpsw_iet_verify_wait(struct am65_cpsw_port *port)
+{
+ u32 ctrl, status;
+ int try;
+
+ try = 20;
+ do {
+ /* Reset the verify state machine by writing 1
+ * to LINKFAIL
+ */
+ ctrl = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ ctrl |= AM65_CPSW_PN_IET_MAC_LINKFAIL;
+ writel(ctrl, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+
+ /* Clear MAC_LINKFAIL bit to start Verify. */
+ ctrl = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ ctrl &= ~AM65_CPSW_PN_IET_MAC_LINKFAIL;
+ writel(ctrl, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+
+ msleep(port->qos.iet.verify_time_ms);
+
+ status = readl(port->port_base + AM65_CPSW_PN_REG_IET_STATUS);
+ if (status & AM65_CPSW_PN_MAC_VERIFIED)
+ return 0;
+
+ if (status & AM65_CPSW_PN_MAC_VERIFY_FAIL) {
+ netdev_dbg(port->ndev,
+ "MAC Merge verify failed, trying again\n");
+ continue;
+ }
+
+ if (status & AM65_CPSW_PN_MAC_RESPOND_ERR) {
+ netdev_dbg(port->ndev, "MAC Merge respond error\n");
+ return -ENODEV;
+ }
+
+ if (status & AM65_CPSW_PN_MAC_VERIFY_ERR) {
+ netdev_dbg(port->ndev, "MAC Merge verify error\n");
+ return -ENODEV;
+ }
+ } while (try-- > 0);
+
+ netdev_dbg(port->ndev, "MAC Merge verify timeout\n");
+ return -ETIMEDOUT;
+}
+
+static void am65_cpsw_iet_set_preempt_mask(struct am65_cpsw_port *port, u8 preemptible_tcs)
+{
+ u32 val;
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ val &= ~AM65_CPSW_PN_IET_MAC_PREMPT_MASK;
+ val |= AM65_CPSW_PN_IET_MAC_SET_PREEMPT(preemptible_tcs);
+ writel(val, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+}
+
+/* enable common IET_ENABLE only if at least 1 port has rx IET enabled.
+ * UAPI doesn't allow tx enable without rx enable.
+ */
+void am65_cpsw_iet_common_enable(struct am65_cpsw_common *common)
+{
+ struct am65_cpsw_port *port;
+ bool rx_enable = false;
+ u32 val;
+ int i;
+
+ for (i = 0; i < common->port_num; i++) {
+ port = &common->ports[i];
+ val = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
+ rx_enable = !!(val & AM65_CPSW_PN_CTL_IET_PORT_EN);
+ if (rx_enable)
+ break;
+ }
+
+ val = readl(common->cpsw_base + AM65_CPSW_REG_CTL);
+
+ if (rx_enable)
+ val |= AM65_CPSW_CTL_IET_EN;
+ else
+ val &= ~AM65_CPSW_CTL_IET_EN;
+
+ writel(val, common->cpsw_base + AM65_CPSW_REG_CTL);
+ common->iet_enabled = rx_enable;
+}
+
+/* CPSW does not have an IRQ to notify changes to the MAC Merge TX status
+ * (active/inactive), but the preemptible traffic classes should only be
+ * committed to hardware once TX is active. Resort to polling.
+ */
+void am65_cpsw_iet_commit_preemptible_tcs(struct am65_cpsw_port *port)
+{
+ u8 preemptible_tcs = 0;
+ int err;
+ u32 val;
+
+ if (port->qos.link_speed == SPEED_UNKNOWN)
+ return;
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
+ if (!(val & AM65_CPSW_PN_CTL_IET_PORT_EN))
+ return;
+
+ /* update common IET enable */
+ am65_cpsw_iet_common_enable(port->common);
+
+ /* update verify count */
+ err = am65_cpsw_iet_set_verify_timeout_count(port);
+ if (err) {
+ netdev_err(port->ndev, "couldn't set verify count: %d\n", err);
+ return;
+ }
+
+ val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
+ if (!(val & AM65_CPSW_PN_IET_MAC_DISABLEVERIFY)) {
+ err = am65_cpsw_iet_verify_wait(port);
+ if (err)
+ return;
+ }
+
+ preemptible_tcs = port->qos.iet.preemptible_tcs;
+ am65_cpsw_iet_set_preempt_mask(port, preemptible_tcs);
+}
+
+static void am65_cpsw_iet_change_preemptible_tcs(struct am65_cpsw_port *port, u8 preemptible_tcs)
+{
+ struct am65_cpsw_ndev_priv *priv = am65_ndev_to_priv(port->ndev);
+
+ port->qos.iet.preemptible_tcs = preemptible_tcs;
+ mutex_lock(&priv->mm_lock);
+ am65_cpsw_iet_commit_preemptible_tcs(port);
+ mutex_unlock(&priv->mm_lock);
+}
+
+static void am65_cpsw_iet_link_state_update(struct net_device *ndev)
+{
+ struct am65_cpsw_ndev_priv *priv = am65_ndev_to_priv(ndev);
+ struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
+
+ mutex_lock(&priv->mm_lock);
+ am65_cpsw_iet_commit_preemptible_tcs(port);
+ mutex_unlock(&priv->mm_lock);
+}
+
static int am65_cpsw_port_est_enabled(struct am65_cpsw_port *port)
{
return port->qos.est_oper || port->qos.est_admin;
@@ -735,6 +932,7 @@ static int am65_cpsw_taprio_replace(struct net_device *ndev,
devm_kfree(&ndev->dev, port->qos.est_admin);
port->qos.est_admin = est_new;
+ am65_cpsw_iet_change_preemptible_tcs(port, taprio->mqprio.preemptible_tcs);
return 0;
@@ -1114,6 +1312,7 @@ void am65_cpsw_qos_link_up(struct net_device *ndev, int link_speed)
port->qos.link_speed = link_speed;
am65_cpsw_tx_pn_shaper_apply(port);
+ am65_cpsw_iet_link_state_update(ndev);
am65_cpsw_est_link_up(ndev, link_speed);
port->qos.link_down_time = 0;
@@ -1125,6 +1324,7 @@ void am65_cpsw_qos_link_down(struct net_device *ndev)
port->qos.link_speed = SPEED_UNKNOWN;
am65_cpsw_tx_pn_shaper_apply(port);
+ am65_cpsw_iet_link_state_update(ndev);
if (!port->qos.link_down_time)
port->qos.link_down_time = ktime_get();
diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.h b/drivers/net/ethernet/ti/am65-cpsw-qos.h
index a0f9fa2eb2aa..349f7030fc27 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-qos.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-qos.h
@@ -23,6 +23,12 @@ struct am65_cpsw_mqprio {
bool shaper_en;
};
+struct am65_cpsw_iet {
+ u8 preemptible_tcs;
+ u32 original_max_blks;
+ int verify_time_ms;
+};
+
struct am65_cpsw_ale_ratelimit {
unsigned long cookie;
u64 rate_packet_ps;
@@ -34,6 +40,7 @@ struct am65_cpsw_qos {
ktime_t link_down_time;
int link_speed;
struct am65_cpsw_mqprio mqprio;
+ struct am65_cpsw_iet iet;
struct am65_cpsw_ale_ratelimit ale_bc_ratelimit;
struct am65_cpsw_ale_ratelimit ale_mc_ratelimit;
@@ -119,4 +126,100 @@ static inline void am65_cpsw_qos_tx_p0_rate_init(struct am65_cpsw_common *common
{ }
#endif
+void am65_cpsw_iet_commit_preemptible_tcs(struct am65_cpsw_port *port);
+unsigned int am65_cpsw_iet_get_verify_timeout_ms(u32 count, struct am65_cpsw_port *port);
+void am65_cpsw_iet_common_enable(struct am65_cpsw_common *common);
+
+#define AM65_CPSW_REG_CTL 0x004
+#define AM65_CPSW_PN_REG_CTL 0x004
+#define AM65_CPSW_PN_REG_MAX_BLKS 0x008
+#define AM65_CPSW_PN_REG_TX_PRI_MAP 0x018
+#define AM65_CPSW_PN_REG_RX_PRI_MAP 0x020
+#define AM65_CPSW_PN_REG_IET_CTRL 0x040
+#define AM65_CPSW_PN_REG_IET_STATUS 0x044
+#define AM65_CPSW_PN_REG_IET_VERIFY 0x048
+#define AM65_CPSW_PN_REG_FIFO_STATUS 0x050
+#define AM65_CPSW_PN_REG_EST_CTL 0x060
+#define AM65_CPSW_PN_REG_PRI_CIR(pri) (0x140 + 4 * (pri))
+#define AM65_CPSW_PN_REG_PRI_EIR(pri) (0x160 + 4 * (pri))
+
+/* AM65_CPSW_REG_CTL register fields */
+#define AM65_CPSW_CTL_IET_EN BIT(17)
+#define AM65_CPSW_CTL_EST_EN BIT(18)
+
+/* AM65_CPSW_PN_REG_CTL register fields */
+#define AM65_CPSW_PN_CTL_IET_PORT_EN BIT(16)
+#define AM65_CPSW_PN_CTL_EST_PORT_EN BIT(17)
+
+/* AM65_CPSW_PN_REG_EST_CTL register fields */
+#define AM65_CPSW_PN_EST_ONEBUF BIT(0)
+#define AM65_CPSW_PN_EST_BUFSEL BIT(1)
+#define AM65_CPSW_PN_EST_TS_EN BIT(2)
+#define AM65_CPSW_PN_EST_TS_FIRST BIT(3)
+#define AM65_CPSW_PN_EST_ONEPRI BIT(4)
+#define AM65_CPSW_PN_EST_TS_PRI_MSK GENMASK(7, 5)
+
+/* AM65_CPSW_PN_REG_IET_CTRL register fields */
+#define AM65_CPSW_PN_IET_MAC_PENABLE BIT(0)
+#define AM65_CPSW_PN_IET_MAC_DISABLEVERIFY BIT(2)
+#define AM65_CPSW_PN_IET_MAC_LINKFAIL BIT(3)
+#define AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK GENMASK(10, 8)
+#define AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_OFFSET 8
+#define AM65_CPSW_PN_IET_MAC_PREMPT_MASK GENMASK(23, 16)
+#define AM65_CPSW_PN_IET_MAC_PREMPT_OFFSET 16
+
+#define AM65_CPSW_PN_IET_MAC_SET_ADDFRAGSIZE(n) (((n) << AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_OFFSET) & \
+ AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK)
+#define AM65_CPSW_PN_IET_MAC_GET_ADDFRAGSIZE(n) (((n) & AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK) >> \
+ AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_OFFSET)
+#define AM65_CPSW_PN_IET_MAC_SET_PREEMPT(n) (((n) << AM65_CPSW_PN_IET_MAC_PREMPT_OFFSET) & \
+ AM65_CPSW_PN_IET_MAC_PREMPT_MASK)
+#define AM65_CPSW_PN_IET_MAC_GET_PREEMPT(n) (((n) & AM65_CPSW_PN_IET_MAC_PREMPT_MASK) >> \
+ AM65_CPSW_PN_IET_MAC_PREMPT_OFFSET)
+
+/* AM65_CPSW_PN_REG_IET_STATUS register fields */
+#define AM65_CPSW_PN_MAC_STATUS GENMASK(3, 0)
+#define AM65_CPSW_PN_MAC_VERIFIED BIT(0)
+#define AM65_CPSW_PN_MAC_VERIFY_FAIL BIT(1)
+#define AM65_CPSW_PN_MAC_RESPOND_ERR BIT(2)
+#define AM65_CPSW_PN_MAC_VERIFY_ERR BIT(3)
+
+/* AM65_CPSW_PN_REG_IET_VERIFY register fields */
+#define AM65_CPSW_PN_MAC_VERIFY_CNT_MASK GENMASK(23, 0)
+#define AM65_CPSW_PN_MAC_GET_VERIFY_CNT(n) ((n) & AM65_CPSW_PN_MAC_VERIFY_CNT_MASK)
+/* 10 msec converted to NSEC */
+#define AM65_CPSW_IET_VERIFY_CNT_MS (10)
+#define AM65_CPSW_IET_VERIFY_CNT_NS (AM65_CPSW_IET_VERIFY_CNT_MS * \
+ NSEC_PER_MSEC)
+
+/* AM65_CPSW_PN_REG_FIFO_STATUS register fields */
+#define AM65_CPSW_PN_FST_TX_PRI_ACTIVE_MSK GENMASK(7, 0)
+#define AM65_CPSW_PN_FST_TX_E_MAC_ALLOW_MSK GENMASK(15, 8)
+#define AM65_CPSW_PN_FST_EST_CNT_ERR BIT(16)
+#define AM65_CPSW_PN_FST_EST_ADD_ERR BIT(17)
+#define AM65_CPSW_PN_FST_EST_BUFACT BIT(18)
+
+/* EST FETCH COMMAND RAM */
+#define AM65_CPSW_FETCH_RAM_CMD_NUM 0x80
+#define AM65_CPSW_FETCH_CNT_MSK GENMASK(21, 8)
+#define AM65_CPSW_FETCH_CNT_MAX (AM65_CPSW_FETCH_CNT_MSK >> 8)
+#define AM65_CPSW_FETCH_CNT_OFFSET 8
+#define AM65_CPSW_FETCH_ALLOW_MSK GENMASK(7, 0)
+#define AM65_CPSW_FETCH_ALLOW_MAX AM65_CPSW_FETCH_ALLOW_MSK
+
+/* AM65_CPSW_PN_REG_MAX_BLKS fields for IET and No IET cases */
+/* 7 blocks for pn_rx_max_blks, 13 for pn_tx_max_blks*/
+#define AM65_CPSW_PN_TX_RX_MAX_BLKS_IET 0xD07
+
+/* Slave IET Stats. register offsets */
+#define AM65_CPSW_STATN_IET_RX_ASSEMBLY_ERROR 0x140
+#define AM65_CPSW_STATN_IET_RX_ASSEMBLY_OK 0x144
+#define AM65_CPSW_STATN_IET_RX_SMD_ERROR 0x148
+#define AM65_CPSW_STATN_IET_RX_FRAG 0x14c
+#define AM65_CPSW_STATN_IET_TX_HOLD 0x150
+#define AM65_CPSW_STATN_IET_TX_FRAG 0x154
+
+/* number of priority queues per port FIFO */
+#define AM65_CPSW_PN_FIFO_PRIO_NUM 8
+
#endif /* AM65_CPSW_QOS_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-20 14:01 ` [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support Roger Quadros
@ 2023-11-20 23:26 ` Vladimir Oltean
2023-11-21 11:02 ` Roger Quadros
2023-11-21 11:48 ` Roger Quadros
0 siblings, 2 replies; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-20 23:26 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On Mon, Nov 20, 2023 at 04:01:46PM +0200, Roger Quadros wrote:
> Changelog:
>
> v6:
> - get mutex around am65_cpsw_iet_commit_preemptible_tcs() in
> am65_cpsw_iet_change_preemptible_tcs()
> - use "preemption" instead of "pre-emption"
> - call am65_cpsw_setup_mqprio() from within am65_cpsw_setup_taprio()
> - Now works with kselftest except the last test which fails
>
> root@am62xx:~/kselftest# ./run_kselftest.sh -t net/forwarding:ethtool_mm.sh
> # TEST: Manual configuration with verification: eth0 to eth1 [ OK ]
> # TEST: Manual configuration with verification: eth1 to eth0 [ OK ]
> # TEST: Manual configuration without verification: eth0 to eth1 [ OK ]
> # TEST: Manual configuration without verification: eth1 to eth0 [ OK ]
> # TEST: Manual configuration with failed verification: eth0 to eth1 [ OK ]
> # TEST: Manual configuration with failed verification: eth1 to eth0 [ OK ]
> # Warning: Stopping lldpad.service, but it can still be activated by:
> # lldpad.socket
> # TEST: LLDP [FAIL]
> # eth0 pMAC TX is not active
Interesting, but why?
Could you disable all tests except the one that fails, then re-run with
verbose shell output, spawn a child interactive shell right after the
command that fails, run it by hand without the grep (copying it from the
verbose output just one line above) and see what output it gives,
compared to what it should?
diff --git a/tools/testing/selftests/net/forwarding/ethtool_mm.sh b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
index 39e736f30322..2340051742b6 100755
--- a/tools/testing/selftests/net/forwarding/ethtool_mm.sh
+++ b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
@@ -2,12 +2,6 @@
# SPDX-License-Identifier: GPL-2.0
ALL_TESTS="
- manual_with_verification_h1_to_h2
- manual_with_verification_h2_to_h1
- manual_without_verification_h1_to_h2
- manual_without_verification_h2_to_h1
- manual_failed_verification_h1_to_h2
- manual_failed_verification_h2_to_h1
lldp
"
@@ -170,6 +164,8 @@ lldp()
{
RET=0
+ set -x
+
systemctl start lldpad
# Configure the interfaces to receive and transmit LLDPDUs
@@ -185,6 +181,10 @@ lldp()
lldptool -i $h1 -t -n -V addEthCaps | \
grep -q "Preemption capability active"
+
+ set +x
+ bash
+
check_err "$?" "$h1 pMAC TX is not active"
lldptool -i $h2 -t -n -V addEthCaps | \
You have the openlldp compiled from the master branch so that it has
preemption/MAC merge support, right? We just "require_command lldptool"
but we don't probe for this functionality, as opposed to tc and ethtool.
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
> index b9e1d568604b..6af00640e99c 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
> @@ -740,6 +741,157 @@ static int am65_cpsw_set_ethtool_priv_flags(struct net_device *ndev, u32 flags)
> return 0;
> }
>
> +static int am65_cpsw_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
> + struct netlink_ext_ack *extack)
> +{
> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
> + struct am65_cpsw_ndev_priv *priv = netdev_priv(ndev);
> + struct am65_cpsw_iet *iet = &port->qos.iet;
> + u32 val, add_frag_size;
> + int err;
> +
> + err = ethtool_mm_frag_size_min_to_add(cfg->tx_min_frag_size, &add_frag_size, extack);
> + if (err)
> + return err;
> +
> + mutex_lock(&priv->mm_lock);
> +
> + if (cfg->pmac_enabled) {
> + /* change TX & RX FIFO MAX_BLKS as per TRM recommendation */
> + if (!iet->original_max_blks)
> + iet->original_max_blks = readl(port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
> +
> + writel(AM65_CPSW_PN_TX_RX_MAX_BLKS_IET,
> + port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
> + } else {
> + /* restore RX & TX FIFO MAX_BLKS */
> + if (iet->original_max_blks) {
else {
if ()
}
can be written as
else if () {
}
> + writel(iet->original_max_blks,
> + port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
> + }
> + }
> +
> + am65_cpsw_port_iet_rx_enable(port, cfg->pmac_enabled);
> + am65_cpsw_port_iet_tx_enable(port, cfg->tx_enabled);
> +
> + val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
> + if (cfg->verify_enabled) {
> + val &= ~AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
> + /* Reset Verify state machine. Verification won't start here.
> + * Verification will be done once link-up.
> + */
> + val |= AM65_CPSW_PN_IET_MAC_LINKFAIL;
> + } else {
> + val |= AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
> + /* Clear LINKFAIL to allow verify/response packets */
> + val &= ~AM65_CPSW_PN_IET_MAC_LINKFAIL;
> + }
> +
> + val &= ~AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK;
> + val |= AM65_CPSW_PN_IET_MAC_SET_ADDFRAGSIZE(add_frag_size);
> + writel(val, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
> +
> + /* verify_timeout_count can only be set at valid link */
> + if (cfg->verify_time > 0)
> + port->qos.iet.verify_time_ms = cfg->verify_time;
> + else
> + port->qos.iet.verify_time_ms = 10;
> +
> + /* enable/disable preemption based on link status */
> + am65_cpsw_iet_commit_preemptible_tcs(port);
> +
> + mutex_unlock(&priv->mm_lock);
> +
> + return 0;
> +}
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
> index 60f625e1350b..8443c13c9ff6 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
> @@ -4,9 +4,11 @@
> *
> * quality of service module includes:
> * Enhanced Scheduler Traffic (EST - P802.1Qbv/D2.2)
> + * Interspersed Express Traffic (IET - P802.3br/D2.0)
> */
>
> #include <linux/pm_runtime.h>
> +#include <linux/units.h>
If this was ordered alphabetically, u comes after t.
> #include <linux/time.h>
> #include <net/pkt_cls.h>
>
> @@ -259,6 +266,196 @@ static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
> return ret;
> }
>
> +static int am65_cpsw_iet_set_verify_timeout_count(struct am65_cpsw_port *port)
> +{
> + int verify_time_ms = port->qos.iet.verify_time_ms;
> + int link_speed = port->qos.link_speed;
> + u32 val;
> +
> + if (WARN_ON(link_speed == SPEED_UNKNOWN))
> + return -ENODEV;
> +
> + /* The number of wireside clocks contained in the verify
> + * timeout counter. The default is 0x1312d0
> + * (10ms at 125Mhz in 1G mode).
> + */
> + val = 125 * HZ_PER_MHZ; /* assuming 125MHz wireside clock */
> +
> + val /= MILLIHZ_PER_HZ; /* count per ms timeout */
> + val *= verify_time_ms; /* count for timeout ms */
> + if (link_speed < SPEED_1000)
> + val <<= 1; /* FIXME: Is this correct? */
Is there any way to find out and remove the FIXME? Like running the
selftest at SPEED_100?
> +
> + if (val > AM65_CPSW_PN_MAC_VERIFY_CNT_MASK)
> + return -EINVAL;
> +
> + writel(val, port->port_base + AM65_CPSW_PN_REG_IET_VERIFY);
> +
> + return 0;
> +}
> +
> +/* CPSW does not have an IRQ to notify changes to the MAC Merge TX status
> + * (active/inactive), but the preemptible traffic classes should only be
> + * committed to hardware once TX is active. Resort to polling.
> + */
> +void am65_cpsw_iet_commit_preemptible_tcs(struct am65_cpsw_port *port)
> +{
> + u8 preemptible_tcs = 0;
I don't think the zero-initialization helps, since the value is later
unconditionally overwritten.
> + int err;
> + u32 val;
> +
> + if (port->qos.link_speed == SPEED_UNKNOWN)
> + return;
> +
> + val = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
> + if (!(val & AM65_CPSW_PN_CTL_IET_PORT_EN))
> + return;
> +
> + /* update common IET enable */
> + am65_cpsw_iet_common_enable(port->common);
> +
> + /* update verify count */
> + err = am65_cpsw_iet_set_verify_timeout_count(port);
> + if (err) {
> + netdev_err(port->ndev, "couldn't set verify count: %d\n", err);
> + return;
> + }
> +
> + val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
> + if (!(val & AM65_CPSW_PN_IET_MAC_DISABLEVERIFY)) {
> + err = am65_cpsw_iet_verify_wait(port);
> + if (err)
> + return;
> + }
> +
> + preemptible_tcs = port->qos.iet.preemptible_tcs;
> + am65_cpsw_iet_set_preempt_mask(port, preemptible_tcs);
> +}
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-20 23:26 ` Vladimir Oltean
@ 2023-11-21 11:02 ` Roger Quadros
2023-11-21 11:53 ` Vladimir Oltean
2023-11-21 11:48 ` Roger Quadros
1 sibling, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-21 11:02 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On 21/11/2023 01:26, Vladimir Oltean wrote:
> On Mon, Nov 20, 2023 at 04:01:46PM +0200, Roger Quadros wrote:
>> Changelog:
>>
>> v6:
>> - get mutex around am65_cpsw_iet_commit_preemptible_tcs() in
>> am65_cpsw_iet_change_preemptible_tcs()
>> - use "preemption" instead of "pre-emption"
>> - call am65_cpsw_setup_mqprio() from within am65_cpsw_setup_taprio()
>> - Now works with kselftest except the last test which fails
>>
>> root@am62xx:~/kselftest# ./run_kselftest.sh -t net/forwarding:ethtool_mm.sh
>> # TEST: Manual configuration with verification: eth0 to eth1 [ OK ]
>> # TEST: Manual configuration with verification: eth1 to eth0 [ OK ]
>> # TEST: Manual configuration without verification: eth0 to eth1 [ OK ]
>> # TEST: Manual configuration without verification: eth1 to eth0 [ OK ]
>> # TEST: Manual configuration with failed verification: eth0 to eth1 [ OK ]
>> # TEST: Manual configuration with failed verification: eth1 to eth0 [ OK ]
>> # Warning: Stopping lldpad.service, but it can still be activated by:
>> # lldpad.socket
>> # TEST: LLDP [FAIL]
>> # eth0 pMAC TX is not active
>
> Interesting, but why?
>
> Could you disable all tests except the one that fails, then re-run with
> verbose shell output, spawn a child interactive shell right after the
> command that fails, run it by hand without the grep (copying it from the
> verbose output just one line above) and see what output it gives,
> compared to what it should?
>
> diff --git a/tools/testing/selftests/net/forwarding/ethtool_mm.sh b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
> index 39e736f30322..2340051742b6 100755
> --- a/tools/testing/selftests/net/forwarding/ethtool_mm.sh
> +++ b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
> @@ -2,12 +2,6 @@
> # SPDX-License-Identifier: GPL-2.0
>
> ALL_TESTS="
> - manual_with_verification_h1_to_h2
> - manual_with_verification_h2_to_h1
> - manual_without_verification_h1_to_h2
> - manual_without_verification_h2_to_h1
> - manual_failed_verification_h1_to_h2
> - manual_failed_verification_h2_to_h1
> lldp
> "
>
> @@ -170,6 +164,8 @@ lldp()
> {
> RET=0
>
> + set -x
> +
> systemctl start lldpad
>
> # Configure the interfaces to receive and transmit LLDPDUs
> @@ -185,6 +181,10 @@ lldp()
>
> lldptool -i $h1 -t -n -V addEthCaps | \
> grep -q "Preemption capability active"
> +
> + set +x
> + bash
> +
> check_err "$?" "$h1 pMAC TX is not active"
>
> lldptool -i $h2 -t -n -V addEthCaps | \
>
> You have the openlldp compiled from the master branch so that it has
> preemption/MAC merge support, right? We just "require_command lldptool"
> but we don't probe for this functionality, as opposed to tc and ethtool.
Yes I'm using openlldp master.
So I just dumped the "ethtool --show-mm" right before the "lldptool -i $h1 -t -n -V addEthCaps"
and this is what I see
# MAC Merge layer state for eth0:
# pMAC enabled: on
# TX enabled: off
# TX active: off
# TX minimum fragment size: 252
# RX minimum fragment size: 124
# Verify enabled: off
# Verify time: 10
# Max verify time: 134
# Verification status: DISABLED
#
# MAC Merge layer state for eth1:
# pMAC enabled: on
# TX enabled: off
# TX active: off
# TX minimum fragment size: 124
# RX minimum fragment size: 124
# Verify enabled: off
# Verify time: 10
# Max verify time: 134
# Verification status: DISABLED
#
# Additional Ethernet Capabilities TLV
# Preemption capability supported
# Preemption capability not enabled
# Preemption capability not active
# Additional fragment size: 3 (252 octets)
# Additional Ethernet Capabilities TLV
# Preemption capability supported
# Preemption capability not enabled
# Preemption capability not active
# Additional fragment size: 1 (124 octets)
# Warning: Stopping lldpad.service, but it can still be activated by:
# lldpad.socket
# TEST: LLDP [FAIL]
If I add the following lines at the beginning of lldp() routine,
then it works.
lldp()
{
RET=0
+ ethtool --set-mm $h1 tx-enabled on verify-enabled on
+ ethtool --set-mm $h2 tx-enabled on verify-enabled on
...
}
Is lldp supposed to turn on tx-enabled and verify-enabled for us
or it is test scritps responsibility?
The test fails later at "addFragSize 0", but that is because we don't
support RX fragment size 60 due to errata.
If I skip that test then all the rest of the tests pass.
>
>> diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
>> index b9e1d568604b..6af00640e99c 100644
>> --- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
>> +++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
>> @@ -740,6 +741,157 @@ static int am65_cpsw_set_ethtool_priv_flags(struct net_device *ndev, u32 flags)
>> return 0;
>> }
>>
>> +static int am65_cpsw_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
>> + struct netlink_ext_ack *extack)
>> +{
>> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
>> + struct am65_cpsw_ndev_priv *priv = netdev_priv(ndev);
>> + struct am65_cpsw_iet *iet = &port->qos.iet;
>> + u32 val, add_frag_size;
>> + int err;
>> +
>> + err = ethtool_mm_frag_size_min_to_add(cfg->tx_min_frag_size, &add_frag_size, extack);
>> + if (err)
>> + return err;
>> +
>> + mutex_lock(&priv->mm_lock);
>> +
>> + if (cfg->pmac_enabled) {
>> + /* change TX & RX FIFO MAX_BLKS as per TRM recommendation */
>> + if (!iet->original_max_blks)
>> + iet->original_max_blks = readl(port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
>> +
>> + writel(AM65_CPSW_PN_TX_RX_MAX_BLKS_IET,
>> + port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
>> + } else {
>> + /* restore RX & TX FIFO MAX_BLKS */
>> + if (iet->original_max_blks) {
>
> else {
> if ()
> }
>
> can be written as
>
> else if () {
> }
ok.
>
>> + writel(iet->original_max_blks,
>> + port->port_base + AM65_CPSW_PN_REG_MAX_BLKS);
>> + }
>> + }
>> +
>> + am65_cpsw_port_iet_rx_enable(port, cfg->pmac_enabled);
>> + am65_cpsw_port_iet_tx_enable(port, cfg->tx_enabled);
>> +
>> + val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
>> + if (cfg->verify_enabled) {
>> + val &= ~AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
>> + /* Reset Verify state machine. Verification won't start here.
>> + * Verification will be done once link-up.
>> + */
>> + val |= AM65_CPSW_PN_IET_MAC_LINKFAIL;
>> + } else {
>> + val |= AM65_CPSW_PN_IET_MAC_DISABLEVERIFY;
>> + /* Clear LINKFAIL to allow verify/response packets */
>> + val &= ~AM65_CPSW_PN_IET_MAC_LINKFAIL;
>> + }
>> +
>> + val &= ~AM65_CPSW_PN_IET_MAC_MAC_ADDFRAGSIZE_MASK;
>> + val |= AM65_CPSW_PN_IET_MAC_SET_ADDFRAGSIZE(add_frag_size);
>> + writel(val, port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
>> +
>> + /* verify_timeout_count can only be set at valid link */
>> + if (cfg->verify_time > 0)
>> + port->qos.iet.verify_time_ms = cfg->verify_time;
>> + else
>> + port->qos.iet.verify_time_ms = 10;
>> +
>> + /* enable/disable preemption based on link status */
>> + am65_cpsw_iet_commit_preemptible_tcs(port);
>> +
>> + mutex_unlock(&priv->mm_lock);
>> +
>> + return 0;
>> +}
>> diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> index 60f625e1350b..8443c13c9ff6 100644
>> --- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> @@ -4,9 +4,11 @@
>> *
>> * quality of service module includes:
>> * Enhanced Scheduler Traffic (EST - P802.1Qbv/D2.2)
>> + * Interspersed Express Traffic (IET - P802.3br/D2.0)
>> */
>>
>> #include <linux/pm_runtime.h>
>> +#include <linux/units.h>
>
> If this was ordered alphabetically, u comes after t.
>
ok.
>> #include <linux/time.h>
>> #include <net/pkt_cls.h>
>>
>> @@ -259,6 +266,196 @@ static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
>> return ret;
>> }
>>
>> +static int am65_cpsw_iet_set_verify_timeout_count(struct am65_cpsw_port *port)
>> +{
>> + int verify_time_ms = port->qos.iet.verify_time_ms;
>> + int link_speed = port->qos.link_speed;
>> + u32 val;
>> +
>> + if (WARN_ON(link_speed == SPEED_UNKNOWN))
>> + return -ENODEV;
>> +
>> + /* The number of wireside clocks contained in the verify
>> + * timeout counter. The default is 0x1312d0
>> + * (10ms at 125Mhz in 1G mode).
>> + */
>> + val = 125 * HZ_PER_MHZ; /* assuming 125MHz wireside clock */
>> +
>> + val /= MILLIHZ_PER_HZ; /* count per ms timeout */
>> + val *= verify_time_ms; /* count for timeout ms */
>> + if (link_speed < SPEED_1000)
>> + val <<= 1; /* FIXME: Is this correct? */
>
> Is there any way to find out and remove the FIXME? Like running the
> selftest at SPEED_100?
I will give this a try.
>
>> +
>> + if (val > AM65_CPSW_PN_MAC_VERIFY_CNT_MASK)
>> + return -EINVAL;
>> +
>> + writel(val, port->port_base + AM65_CPSW_PN_REG_IET_VERIFY);
>> +
>> + return 0;
>> +}
>> +
>> +/* CPSW does not have an IRQ to notify changes to the MAC Merge TX status
>> + * (active/inactive), but the preemptible traffic classes should only be
>> + * committed to hardware once TX is active. Resort to polling.
>> + */
>> +void am65_cpsw_iet_commit_preemptible_tcs(struct am65_cpsw_port *port)
>> +{
>> + u8 preemptible_tcs = 0;
>
> I don't think the zero-initialization helps, since the value is later
> unconditionally overwritten.
OK, will drop it.
>
>> + int err;
>> + u32 val;
>> +
>> + if (port->qos.link_speed == SPEED_UNKNOWN)
>> + return;
>> +
>> + val = readl(port->port_base + AM65_CPSW_PN_REG_CTL);
>> + if (!(val & AM65_CPSW_PN_CTL_IET_PORT_EN))
>> + return;
>> +
>> + /* update common IET enable */
>> + am65_cpsw_iet_common_enable(port->common);
>> +
>> + /* update verify count */
>> + err = am65_cpsw_iet_set_verify_timeout_count(port);
>> + if (err) {
>> + netdev_err(port->ndev, "couldn't set verify count: %d\n", err);
>> + return;
>> + }
>> +
>> + val = readl(port->port_base + AM65_CPSW_PN_REG_IET_CTRL);
>> + if (!(val & AM65_CPSW_PN_IET_MAC_DISABLEVERIFY)) {
>> + err = am65_cpsw_iet_verify_wait(port);
>> + if (err)
>> + return;
>> + }
>> +
>> + preemptible_tcs = port->qos.iet.preemptible_tcs;
>> + am65_cpsw_iet_set_preempt_mask(port, preemptible_tcs);
>> +}
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-21 11:02 ` Roger Quadros
@ 2023-11-21 11:53 ` Vladimir Oltean
2023-11-30 11:49 ` Roger Quadros
0 siblings, 1 reply; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-21 11:53 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On Tue, Nov 21, 2023 at 01:02:50PM +0200, Roger Quadros wrote:
> Yes I'm using openlldp master.
>
> So I just dumped the "ethtool --show-mm" right before the "lldptool -i $h1 -t -n -V addEthCaps"
> and this is what I see
>
> # MAC Merge layer state for eth0:
> # pMAC enabled: on
> # TX enabled: off
> # TX active: off
> # TX minimum fragment size: 252
> # RX minimum fragment size: 124
> # Verify enabled: off
> # Verify time: 10
> # Max verify time: 134
> # Verification status: DISABLED
> #
> # MAC Merge layer state for eth1:
> # pMAC enabled: on
> # TX enabled: off
> # TX active: off
> # TX minimum fragment size: 124
> # RX minimum fragment size: 124
> # Verify enabled: off
> # Verify time: 10
> # Max verify time: 134
> # Verification status: DISABLED
> #
> # Additional Ethernet Capabilities TLV
> # Preemption capability supported
> # Preemption capability not enabled
> # Preemption capability not active
> # Additional fragment size: 3 (252 octets)
> # Additional Ethernet Capabilities TLV
> # Preemption capability supported
> # Preemption capability not enabled
> # Preemption capability not active
> # Additional fragment size: 1 (124 octets)
> # Warning: Stopping lldpad.service, but it can still be activated by:
> # lldpad.socket
> # TEST: LLDP [FAIL]
>
>
> If I add the following lines at the beginning of lldp() routine,
> then it works.
>
> lldp()
> {
> RET=0
>
> + ethtool --set-mm $h1 tx-enabled on verify-enabled on
> + ethtool --set-mm $h2 tx-enabled on verify-enabled on
> ...
> }
>
> Is lldp supposed to turn on tx-enabled and verify-enabled for us
> or it is test scritps responsibility?
lldpad should absolutely do that.
https://github.com/intel/openlldp/blob/master/lldp_8023.c#L701
Try to see what goes on and if there isn't, in fact, an error during the
netlink communication with the kernel.
Edit /usr/local/lib/systemd/system/lldpad.service:
ExecStart=/usr/local/sbin/lldpad -t -V 7
~~~~~
increases log level
Then run:
$ systemctl daemon-reload
$ journalctl -u lldpad.service -f &
$ ./ethtool_mm.sh eno0 swp0
During the test you should see:
lldpad[4764]: eno0: Link partner preemption capability supported
lldpad[4764]: eno0: Link partner preemption capability not enabled
lldpad[4764]: eno0: Link partner preemption capability not active
lldpad[4764]: eno0: Link partner minimum fragment size: 252 octets
lldpad[4764]: eno0: initiating MM verification with a retry interval of 127 ms...
lldpad[4764]: rxProcessFrame: allocated TLV 0 was not stored! 0xaaaafd7cfbe0
lldpad[4764]: swp0: Link partner preemption capability supported
lldpad[4764]: swp0: Link partner preemption capability not enabled
lldpad[4764]: swp0: Link partner preemption capability not active
lldpad[4764]: swp0: Link partner minimum fragment size: 60 octets
lldpad[4764]: swp0: initiating MM verification with a retry interval of 128 ms...
lldpad[4764]: rxProcessFrame: allocated TLV 0 was not stored! 0xaaaafd7cfd30
>
> The test fails later at "addFragSize 0", but that is because we don't
> support RX fragment size 60 due to errata.
> If I skip that test then all the rest of the tests pass.
Hmm, yeah, the test is dumb. lldpad has this logic, so if we request 0
it should still advertise 1.
if (config_add_frag_size < add_frag_size) {
LLDPAD_WARN("%s: Configured addFragSize (%d) smaller than the minimum value requested by kernel (%d). Using the latter\n",
bd->ifname, config_add_frag_size, add_frag_size);
config_add_frag_size = add_frag_size;
}
I guess that logic does engage, but the selftest doesn't expect that it
will, because it expects that lldpad will report back exactly the
requested value - and it will report the true value instead.
Luckily I know what to do here, see the patch below.
From 0ed218345f16a0f2c0efd5eba1838ccb3d8e4921 Mon Sep 17 00:00:00 2001
From: Vladimir Oltean <vladimir.oltean@nxp.com>
Date: Tue, 21 Nov 2023 13:42:14 +0200
Subject: [PATCH] selftests: forwarding: ethtool_mm: support devices with
higher rx-min-frag-size
Some devices have errata due to which they cannot report ETH_ZLEN (60)
in the rx-min-frag-size. This was foreseen of course, and lldpad has
logic that when we request it to advertise addFragSize 0, it will round
it up to the lowest value that is _actually_ supported by the hardware.
The problem is that the selftest expects lldpad to report back to us the
same value as we requested.
Make the selftest smarter by figuring out on its own what is a
reasonable value to expect.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
.../selftests/net/forwarding/ethtool_mm.sh | 37 ++++++++++++++++++-
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/net/forwarding/ethtool_mm.sh b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
index 39e736f30322..6212913f4ad1 100755
--- a/tools/testing/selftests/net/forwarding/ethtool_mm.sh
+++ b/tools/testing/selftests/net/forwarding/ethtool_mm.sh
@@ -155,15 +155,48 @@ manual_failed_verification_h2_to_h1()
manual_failed_verification $h2 $h1
}
+smallest_supported_add_frag_size()
+{
+ local iface=$1
+ local rx_min_frag_size=
+
+ rx_min_frag_size=$(ethtool --json --show-mm $iface | \
+ jq '.[]."rx-min-frag-size"')
+
+ if [ $rx_min_frag_size -le 60 ]; then
+ echo 0
+ elif [ $rx_min_frag_size -le 124 ]; then
+ echo 1
+ elif [ $rx_min_frag_size -le 188 ]; then
+ echo 2
+ elif [ $rx_min_frag_size -le 252 ]; then
+ echo 3
+ else
+ echo "$iface: RX min frag size $rx_min_frag_size cannot be advertised over LLDP"
+ exit 1
+ fi
+}
+
+expected_add_frag_size()
+{
+ local iface=$1
+ local requested=$2
+ local min=$(smallest_supported_add_frag_size $iface)
+
+ [ $requested -le $min ] && echo $min || echo $requested
+}
+
lldp_change_add_frag_size()
{
local add_frag_size=$1
+ local pattern=
lldptool -T -i $h1 -V addEthCaps addFragSize=$add_frag_size >/dev/null
# Wait for TLVs to be received
sleep 2
- lldptool -i $h2 -t -n -V addEthCaps | \
- grep -q "Additional fragment size: $add_frag_size"
+ pattern=$(printf "Additional fragment size: %d" \
+ $(expected_add_frag_size $h1 $add_frag_size))
+ lldptool -i $h2 -t -n -V addEthCaps | grep -q "$pattern"
}
lldp()
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-21 11:53 ` Vladimir Oltean
@ 2023-11-30 11:49 ` Roger Quadros
2023-11-30 13:22 ` Vladimir Oltean
0 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-30 11:49 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
Hi Vladimir,
On 21/11/2023 13:53, Vladimir Oltean wrote:
> On Tue, Nov 21, 2023 at 01:02:50PM +0200, Roger Quadros wrote:
>> Yes I'm using openlldp master.
>>
>> So I just dumped the "ethtool --show-mm" right before the "lldptool -i $h1 -t -n -V addEthCaps"
>> and this is what I see
>>
>> # MAC Merge layer state for eth0:
>> # pMAC enabled: on
>> # TX enabled: off
>> # TX active: off
>> # TX minimum fragment size: 252
>> # RX minimum fragment size: 124
>> # Verify enabled: off
>> # Verify time: 10
>> # Max verify time: 134
>> # Verification status: DISABLED
>> #
>> # MAC Merge layer state for eth1:
>> # pMAC enabled: on
>> # TX enabled: off
>> # TX active: off
>> # TX minimum fragment size: 124
>> # RX minimum fragment size: 124
>> # Verify enabled: off
>> # Verify time: 10
>> # Max verify time: 134
>> # Verification status: DISABLED
>> #
>> # Additional Ethernet Capabilities TLV
>> # Preemption capability supported
>> # Preemption capability not enabled
>> # Preemption capability not active
>> # Additional fragment size: 3 (252 octets)
>> # Additional Ethernet Capabilities TLV
>> # Preemption capability supported
>> # Preemption capability not enabled
>> # Preemption capability not active
>> # Additional fragment size: 1 (124 octets)
>> # Warning: Stopping lldpad.service, but it can still be activated by:
>> # lldpad.socket
>> # TEST: LLDP [FAIL]
>>
>>
>> If I add the following lines at the beginning of lldp() routine,
>> then it works.
>>
>> lldp()
>> {
>> RET=0
>>
>> + ethtool --set-mm $h1 tx-enabled on verify-enabled on
>> + ethtool --set-mm $h2 tx-enabled on verify-enabled on
>> ...
>> }
>>
>> Is lldp supposed to turn on tx-enabled and verify-enabled for us
>> or it is test scritps responsibility?
>
> lldpad should absolutely do that.
> https://github.com/intel/openlldp/blob/master/lldp_8023.c#L701
>
> Try to see what goes on and if there isn't, in fact, an error during the
> netlink communication with the kernel.
>
> Edit /usr/local/lib/systemd/system/lldpad.service:
> ExecStart=/usr/local/sbin/lldpad -t -V 7
> ~~~~~
> increases log level
> Then run:
>
> $ systemctl daemon-reload
> $ journalctl -u lldpad.service -f &
> $ ./ethtool_mm.sh eno0 swp0
>
> During the test you should see:
>
> lldpad[4764]: eno0: Link partner preemption capability supported
> lldpad[4764]: eno0: Link partner preemption capability not enabled
> lldpad[4764]: eno0: Link partner preemption capability not active
> lldpad[4764]: eno0: Link partner minimum fragment size: 252 octets
> lldpad[4764]: eno0: initiating MM verification with a retry interval of 127 ms...
> lldpad[4764]: rxProcessFrame: allocated TLV 0 was not stored! 0xaaaafd7cfbe0
> lldpad[4764]: swp0: Link partner preemption capability supported
> lldpad[4764]: swp0: Link partner preemption capability not enabled
> lldpad[4764]: swp0: Link partner preemption capability not active
> lldpad[4764]: swp0: Link partner minimum fragment size: 60 octets
> lldpad[4764]: swp0: initiating MM verification with a retry interval of 128 ms...
> lldpad[4764]: rxProcessFrame: allocated TLV 0 was not stored! 0xaaaafd7cfd30
>
Thanks for the debug instructions. Indeed lldpad tries to enable MM TX and the
network drivers set_mm() hook gets called and returns success but still
lldpad sees some error.
I've also confirmed that ethnl_set_mm() runs successfully and returns 1.
I suppose something is going wrong in user-space with libnl?
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability supported
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not enabled
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not active
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner minimum fragment size: 124 octets
Nov 21 11:50:02 am62xx lldpad[708]: eth0: initiating MM verification with a retry interval of 134 ms...
Nov 21 11:50:02 am62xx lldpad[708]: ethtool: kernel reports: integer out of range
full debug log is below.
--
cheers,
-roger
root@am62xx:~/kselftest# ./run_kselftest.sh -t net/forwarding:ethtool_mm.sh
[ 207.146038] kselftest: Running tests in net/forwarding
TAP version 13
1..1
# timeout set to 0
# selftests: net/forwarding: ethtool_mm.sh
# Error: Exclusivity flag on, cannot modify.
Nov 21 11:49:54 am62xx systemd[1]: Started lldpad.service - Link Layer Discovery Protocol Agent Daemon..
Nov 21 11:49:54 am62xx lldpad[708]: setsockopt nearest_bridge: Invalid argument
Nov 21 11:49:54 am62xx lldpad[708]: setsockopt nearest_bridge: Invalid argument
Nov 21 11:49:54 am62xx lldpad[708]: setsockopt nearest_bridge: Invalid argument
Nov 21 11:49:54 am62xx lldpad[708]: setsockopt nearest_bridge: Invalid argument
Nov 21 11:49:54 am62xx lldpad[708]: using fd 3 from systemd
Nov 21 11:49:54 am62xx lldpad[708]: event_iface_init_user_space(484): socket 4.
Nov 21 11:49:54 am62xx lldpad[708]: mand_register:done
Nov 21 11:49:54 am62xx lldpad[708]: basman_register:done
Nov 21 11:49:54 am62xx lldpad[708]: dcbx_register: dcbx register done
Nov 21 11:49:54 am62xx lldpad[708]: med_register:done
Nov 21 11:49:54 am62xx lldpad[708]: ieee8023_register:done
Nov 21 11:49:54 am62xx lldpad[708]: evb_register:done
Nov 21 11:49:54 am62xx lldpad[708]: evb22_register:done
Nov 21 11:49:54 am62xx lldpad[708]: vdp_register: done
Nov 21 11:49:54 am62xx lldpad[708]: vdp22_register:done
Nov 21 11:49:54 am62xx lldpad[708]: ecp22_register: done
Nov 21 11:49:54 am62xx lldpad[708]: ieee8021qaz_register: ieee8021qaz_register SUCCESS
Nov 21 11:49:54 am62xx lldpad[708]: can0 mac:00:00:00:00:00:00 perm:00:00:00:00:00:00 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: Failed to open register layer 2 access to ETH_P_LLDP
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: Error adding device can0
Nov 21 11:49:54 am62xx lldpad[708]: can1 mac:00:00:00:00:00:00 perm:00:00:00:00:00:00 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: Failed to open register layer 2 access to ETH_P_LLDP
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: Error adding device can1
Nov 21 11:49:54 am62xx lldpad[708]: can2 mac:00:00:00:00:00:00 perm:00:00:00:00:00:00 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: Failed to open register layer 2 access to ETH_P_LLDP
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: Error adding device can2
Nov 21 11:49:54 am62xx lldpad[708]: can3 mac:00:00:00:00:00:00 perm:00:00:00:00:00:00 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: Failed to open register layer 2 access to ETH_P_LLDP
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: Error adding device can3
Nov 21 11:49:54 am62xx lldpad[708]: eth0 mac:78:db:2f:e5:74:d3 perm:78:db:2f:e5:74:d3 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: eth0 MAC address is 78:db:2f:e5:74:d3
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth0.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth0 (01:80:C2:00:00:0E).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 0 agents on if eth0.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth0.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth0 (01:80:C2:00:00:03).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: agent->adminStatus = disabled.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 1 agents on if eth0.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth0.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth0 (01:80:C2:00:00:00).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: agent->adminStatus = disabled.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 2 agents on if eth0.
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade68e3f0.
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:49:54 am62xx lldpad[708]: mand_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:49:54 am62xx lldpad[708]: med_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: ieee8023_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: evb_ifup:eth0 agent 2 called
Nov 21 11:49:54 am62xx lldpad[708]: evb_init_tlv:eth0 agent 2 EVB tx is currently disabled
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth0 agent 2 loading EVB policy for fmode failed, using default (128)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth0 agent 2 loading EVB policy for capabilities failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth0 agent 2 loading EVB policy for rte failed, using default (15)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth0 agent 2 loading EVB policy for vsis failed, using default (3295)
Nov 21 11:49:54 am62xx lldpad[708]: evb_ifup:eth0 agent 2 added
Nov 21 11:49:54 am62xx lldpad[708]: evb22_ifup:eth0 agent 2 called
Nov 21 11:49:54 am62xx lldpad[708]: evb22_init_tlv:eth0 agent 2 EVB tx is currently disabled
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_string:eth0 agent 2 loading EVB policy for evbmode failed, using default (2)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_evbmode:eth0 agent 2 policy evbmode station(0x2)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for vdprwd failed, using default (20)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth0 agent 2 policy vdprwd 20
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for evbrrreq failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_rrreq:eth0 agent 2 policy evbrrreq false
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for evbgpid failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_gid:eth0 agent 2 policy evbgpid false
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for ecpretries failed, using default (3)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_retries:eth0 agent 2 policy ecpretries 3
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for ecprte failed, using default (8)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth0 agent 2 policy ecprte 8
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth0 agent 2 loading EVB policy for vdprka failed, using default (20)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth0 agent 2 policy vdprka 20
Nov 21 11:49:54 am62xx lldpad[708]: evb22_ifup:eth0 agent 2 added
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade68e320.
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:49:54 am62xx lldpad[708]: mand_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:49:54 am62xx lldpad[708]: med_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: ieee8023_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade68e250.
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:49:54 am62xx lldpad[708]: mand_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:49:54 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:49:54 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:49:54 am62xx lldpad[708]: med_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: ieee8023_ifup:port eth0 added
Nov 21 11:49:54 am62xx lldpad[708]: get_dcbx_hw: eth0: nlmsg_find_attr failed, no GDCBX support
Nov 21 11:49:54 am62xx lldpad[708]: eth1 mac:70:ff:76:1d:8d:c4 perm:70:ff:76:1d:8d:c4 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:54 am62xx lldpad[708]: eth1 MAC address is 70:ff:76:1d:8d:c4
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth1.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth1 (01:80:C2:00:00:0E).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 0 agents on if eth1.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth1.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth1 (01:80:C2:00:00:03).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: agent->adminStatus = disabled.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 1 agents on if eth1.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: creating new agent for port eth1.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: creating new agent for eth1 (01:80:C2:00:00:00).
Nov 21 11:49:54 am62xx lldpad[708]: lldp_init_agent: agent->adminStatus = disabled.
Nov 21 11:49:54 am62xx lldpad[708]: lldp_add_agent: 2 agents on if eth1.
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade6943b0.
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: mand_bld_ttl_tlv:eth1:done:type=3 length=2 ttl=120
Nov 21 11:49:54 am62xx lldpad[708]: mand_ifup:port eth1 added
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth1:Port Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysname_tlv:eth1:System Name disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth1:System Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth1:System Capabilities disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth1:Management Address disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_ifup:port eth1 added
Nov 21 11:49:54 am62xx lldpad[708]: med_bld_tlv:eth1:LLDP-MED is not enabled
Nov 21 11:49:54 am62xx lldpad[708]: med_ifup:port eth1 added
Nov 21 11:49:54 am62xx lldpad[708]: ieee8023_ifup:port eth1 added
Nov 21 11:49:54 am62xx lldpad[708]: evb_ifup:eth1 agent 2 called
Nov 21 11:49:54 am62xx lldpad[708]: evb_init_tlv:eth1 agent 2 EVB tx is currently disabled
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth1 agent 2 loading EVB policy for fmode failed, using default (128)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth1 agent 2 loading EVB policy for capabilities failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth1 agent 2 loading EVB policy for rte failed, using default (15)
Nov 21 11:49:54 am62xx lldpad[708]: evb_conf_string:eth1 agent 2 loading EVB policy for vsis failed, using default (3295)
Nov 21 11:49:54 am62xx lldpad[708]: evb_ifup:eth1 agent 2 added
Nov 21 11:49:54 am62xx lldpad[708]: evb22_ifup:eth1 agent 2 called
Nov 21 11:49:54 am62xx lldpad[708]: evb22_init_tlv:eth1 agent 2 EVB tx is currently disabled
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_string:eth1 agent 2 loading EVB policy for evbmode failed, using default (2)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_evbmode:eth1 agent 2 policy evbmode station(0x2)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for vdprwd failed, using default (20)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth1 agent 2 policy vdprwd 20
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for evbrrreq failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_rrreq:eth1 agent 2 policy evbrrreq false
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for evbgpid failed, using default (0)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_gid:eth1 agent 2 policy evbgpid false
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for ecpretries failed, using default (3)
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_retries:eth1 agent 2 policy ecpretries 3
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for ecprte failed, using default (8)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth1 agent 2 policy ecprte 8
Nov 21 11:49:54 am62xx lldpad[708]: evb22_conf_int:eth1 agent 2 loading EVB policy for vdprka failed, using default (20)
Nov 21 11:49:54 am62xx lldpad[708]: exponent:eth1 agent 2 policy vdprka 20
Nov 21 11:49:54 am62xx lldpad[708]: evb22_ifup:eth1 agent 2 added
Nov 21 11:49:54 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade6942e0.
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:54 am62xx lldpad[708]: mand_bld_ttl_tlv:eth1:done:type=3 length=2 ttl=120
Nov 21 11:49:54 am62xx lldpad[708]: mand_ifup:port eth1 added
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth1:Port Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysname_tlv:eth1:System Name disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth1:System Description disabled
Nov 21 11:49:54 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth1:System Capabilities disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth1:Management Address disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: med_bld_tlv:eth1:LLDP-MED is not enabled
Nov 21 11:49:55 am62xx lldpad[708]: med_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: ieee8023_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: init_ports: calling ifup for agent 0xaaaade694210.
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: mand_bld_ttl_tlv:eth1:done:type=3 length=2 ttl=120
Nov 21 11:49:55 am62xx lldpad[708]: mand_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth1:Port Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysname_tlv:eth1:System Name disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth1:System Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth1:System Capabilities disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth1:Management Address disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:49:55 am62xx lldpad[708]: Adapter eth1 does not support DCB.
Nov 21 11:49:55 am62xx lldpad[708]: med_bld_tlv:eth1:LLDP-MED is not enabled
Nov 21 11:49:55 am62xx lldpad[708]: med_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: ieee8023_ifup:port eth1 added
Nov 21 11:49:55 am62xx lldpad[708]: get_dcbx_hw: eth1: nlmsg_find_attr failed, no GDCBX support
Nov 21 11:49:55 am62xx lldpad[708]: eth2 mac:70:ff:76:1d:8d:c5 perm:70:ff:76:1d:8d:c5 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:55 am62xx lldpad[708]: eth2 MAC address is 70:ff:76:1d:8d:c5
Nov 21 11:49:55 am62xx lldpad[708]: eth3 mac:70:ff:76:1d:8d:c6 perm:70:ff:76:1d:8d:c6 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:55 am62xx lldpad[708]: eth3 MAC address is 70:ff:76:1d:8d:c6
Nov 21 11:49:55 am62xx lldpad[708]: eth4 mac:70:ff:76:1d:8d:c7 perm:70:ff:76:1d:8d:c7 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:55 am62xx lldpad[708]: eth4 MAC address is 70:ff:76:1d:8d:c7
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:49:55 am62xx lldpad[708]: evb22_start_modules:eth1 START role:2
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_start:eth1 start ecp
Nov 21 11:49:55 am62xx lldpad[708]: eth1 mac:70:ff:76:1d:8d:c4 perm:70:ff:76:1d:8d:c4 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:55 am62xx lldpad[708]: eth1 MAC address is 70:ff:76:1d:8d:c4
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_create:eth1 create ecp data
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_set_rx_state:eth1 state ECP22_RX_BEGIN
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_rx_change_state:eth1 state change ECP22_RX_BEGIN -> ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_es_wait:eth1 state ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_set_rx_state:eth1 state ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth1 state change ECP22_TX_BEGIN -> ECP22_TX_INIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth1 state ECP22_TX_INIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth1 state change ECP22_TX_INIT -> ECP22_TX_WAIT_FORREQ
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth1 state ECP22_TX_WAIT_FORREQ
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_es_waitforreq:eth1 seqno 0x1
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth1 state change ECP22_TX_WAIT_FORREQ -> ECP22_TX_WAIT_ONDATA
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth1 state ECP22_TX_WAIT_ONDATA
Nov 21 11:49:55 am62xx lldpad[708]: vdp22_start:eth1 start vdp
Nov 21 11:49:55 am62xx lldpad[708]: vdp22_create:eth1 role:2
Nov 21 11:49:55 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth1 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:49:55 am62xx lldpad[708]: mand_bld_ttl_tlv:eth1:done:type=3 length=2 ttl=120
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth1:Port Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysname_tlv:eth1:System Name disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth1:System Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth1:System Capabilities disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth1:Management Address disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_gettlv:eth1: failed
Nov 21 11:49:55 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:49:55 am62xx lldpad[708]: Adapter eth1 does not support DCB.
Nov 21 11:49:55 am62xx lldpad[708]: config.c: eth1 dcb mode is OFF.
Nov 21 11:49:55 am62xx lldpad[708]: med_bld_tlv:eth1:LLDP-MED is not enabled
Nov 21 11:49:55 am62xx lldpad[708]: med_gettlv:eth1: failed
Nov 21 11:49:55 am62xx lldpad[708]: evb22_start_modules:eth0 START role:2
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_start:eth0 start ecp
Nov 21 11:49:55 am62xx lldpad[708]: eth0 mac:78:db:2f:e5:74:d3 perm:78:db:2f:e5:74:d3 san:ff:ff:ff:ff:ff:ff
Nov 21 11:49:55 am62xx lldpad[708]: eth0 MAC address is 78:db:2f:e5:74:d3
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_create:eth0 create ecp data
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_set_rx_state:eth0 state ECP22_RX_BEGIN
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_rx_change_state:eth0 state change ECP22_RX_BEGIN -> ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_es_wait:eth0 state ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_set_rx_state:eth0 state ECP22_RX_WAIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth0 state change ECP22_TX_BEGIN -> ECP22_TX_INIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth0 state ECP22_TX_INIT
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth0 state change ECP22_TX_INIT -> ECP22_TX_WAIT_FORREQ
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth0 state ECP22_TX_WAIT_FORREQ
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_es_waitforreq:eth0 seqno 0x1
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_change_state:eth0 state change ECP22_TX_WAIT_FORREQ -> ECP22_TX_WAIT_ONDATA
Nov 21 11:49:55 am62xx lldpad[708]: ecp22_tx_run_sm:eth0 state ECP22_TX_WAIT_ONDATA
Nov 21 11:49:55 am62xx lldpad[708]: vdp22_start:eth0 start vdp
Nov 21 11:49:55 am62xx lldpad[708]: vdp22_create:eth0 role:2
Nov 21 11:49:55 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:49:55 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:49:55 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:49:55 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:49:55 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:49:55 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability supported
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not enabled
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not active
Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner minimum fragment size: 124 octets
Nov 21 11:50:02 am62xx lldpad[708]: eth0: initiating MM verification with a retry interval of 134 ms...
Nov 21 11:50:02 am62xx lldpad[708]: ethtool: kernel reports: integer out of range
Nov 21 11:50:02 am62xx lldpad[708]: rxProcessFrame: allocated TLV 0 was not stored! 0xaaaade698510
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:50:02 am62xx lldpad[708]: arg_path "tlvid00120f07.addFragSize"
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:50:02 am62xx lldpad[708]: arg_path "tlvid00120f07.addFragSize"
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:50:02 am62xx lldpad[708]: arg_path "tlvid00120f07.addFragSize"
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:02 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:02 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:02 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:02 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:02 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:02 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:02 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
# Warning: Stopping lldpad.service, but it can still be activated by:
# lldpad.socket
# TEST: LLDP [FAIL]
# eth0 pMAC TX is not active
[ 223.838009] am65-cpsw-nuss 46000000.ethernet eth0: Link is Down
# Error: Cannot delete qdisc with handle of zero.
not ok 1 selftests: net/forwarding: ethtool_mm.sh # exit=1
root@am62xx:~/kselftest# Nov 21 11:50:05 am62xx systemd[1]: Stopping lldpad.service - Link Layer Discovery Protocol Agent Daemon....
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:05 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: set_config_setting(577):
Nov 21 11:50:05 am62xx lldpad[708]: arg_path "tlvid00120f07.addFragSize"
Nov 21 11:50:05 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:05 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: eth0: Configured addFragSize (0) smaller than the minimum value requested by kernel (1). Using the latter
Nov 21 11:50:05 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:05 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: eth0: Configured addFragSize (0) smaller than the minimum value requested by kernel (1). Using the latter
Nov 21 11:50:05 am62xx lldpad[708]: mibConstrInfoLLDPDU: port eth0 mac 01:80:C2:00:00:0E type 0.
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_portdesc_tlv:eth0:Port Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysname_tlv:eth0:System Name disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_sysdesc_tlv:eth0:System Description disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_syscaps_tlv:eth0:System Capabilities disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_bld_manaddr_tlv:eth0:Management Address disabled
Nov 21 11:50:05 am62xx lldpad[708]: basman_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: med_bld_tlv:eth0:LLDP-MED is not enabled
Nov 21 11:50:05 am62xx lldpad[708]: med_gettlv:eth0: failed
Nov 21 11:50:05 am62xx lldpad[708]: eth0: Configured addFragSize (0) smaller than the minimum value requested by kernel (1). Using the latter
Nov 21 11:50:05 am62xx lldpad[708]: Signal 15 received - terminating
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth4 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth4 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: Send shutdown frame on port eth4
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth3 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth3 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: Send shutdown frame on port eth3
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth2 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth2 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: Send shutdown frame on port eth2
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth1 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth1 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: Send shutdown frame on port eth1
Nov 21 11:50:05 am62xx lldpad[708]: mibConstrShutdownLLDPDU: mac 01:80:C2:00:00:0E.
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth1:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: send_msg: sendto = 32
Nov 21 11:50:05 am62xx lldpad[708]: Adapter eth0 does not support DCB.
Nov 21 11:50:05 am62xx lldpad[708]: config.c: eth0 dcb mode is OFF.
Nov 21 11:50:05 am62xx lldpad[708]: Send shutdown frame on port eth0
Nov 21 11:50:05 am62xx lldpad[708]: mibConstrShutdownLLDPDU: mac 01:80:C2:00:00:0E.
Nov 21 11:50:05 am62xx lldpad[708]: mand_bld_ttl_tlv:eth0:done:type=3 length=2 ttl=120
Nov 21 11:50:05 am62xx lldpad[708]: mand_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: basman_unregister:done
Nov 21 1[ 224.608232] am65-cpsw-nuss c000000.ethernet eth1: Link is Down
1:50:05 am62xx lldpad[708]: dcbx_unregister: unregister dcbx complete.
Nov 21 11:50:05 am62xx lldpad[708]: med_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: ieee8023_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: evb_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: evb22_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: vdp_unregister: done
Nov 21 11:50:05 am62xx lldpad[708]: vdp22_unregister:done
Nov 21 11:50:05 am62xx lldpad[708]: ecp22_remove:eth0 remove ecp
Nov 21 11:50:05 am62xx lldpad[708]: ecp22_remove:eth1 remove ecp
Nov 21 11:50:05 am62xx lldpad[708]: ecp22_unregister: done
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth4
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth4
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth3
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth3
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth2
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth2
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth1
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth1
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth0
Nov 21 11:50:05 am62xx lldpad[708]: In remove_port: Found port eth0
Nov 21 11:50:05 am62xx systemd[1]: lldpad.service: Deactivated successfully.
Nov 21 11:50:05 am62xx systemd[1]: Stopped lldpad.service - Link Layer Discovery Protocol Agent Daemon..
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-30 11:49 ` Roger Quadros
@ 2023-11-30 13:22 ` Vladimir Oltean
2023-11-30 14:23 ` Roger Quadros
0 siblings, 1 reply; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-30 13:22 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On Thu, Nov 30, 2023 at 01:49:03PM +0200, Roger Quadros wrote:
> Thanks for the debug instructions. Indeed lldpad tries to enable MM TX and the
> network drivers set_mm() hook gets called and returns success but still
> lldpad sees some error.
>
> I've also confirmed that ethnl_set_mm() runs successfully and returns 1.
> I suppose something is going wrong in user-space with libnl?
>
> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability supported
> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not enabled
> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not active
> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner minimum fragment size: 124 octets
> Nov 21 11:50:02 am62xx lldpad[708]: eth0: initiating MM verification with a retry interval of 134 ms...
> Nov 21 11:50:02 am62xx lldpad[708]: ethtool: kernel reports: integer out of range
>
>
> full debug log is below.
Ah, you got confused. Openlldp issues multiple ETHTOOL_MSG_MM_SET
netlink messages. What you observe is that one of them succeeds, and
then another one returns -ERANGE before even calling the driver's
set_mm() method.
And that comes from here in net/ethtool/mm.c:
149 const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1] = {
150 » [ETHTOOL_A_MM_HEADER]» » = NLA_POLICY_NESTED(ethnl_header_policy),
151 » [ETHTOOL_A_MM_VERIFY_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
152 » [ETHTOOL_A_MM_VERIFY_TIME]» = NLA_POLICY_RANGE(NLA_U32, 1, 128), // <---- here
153 » [ETHTOOL_A_MM_TX_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
154 » [ETHTOOL_A_MM_PMAC_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
155 » [ETHTOOL_A_MM_TX_MIN_FRAG_SIZE]»= NLA_POLICY_RANGE(NLA_U32, 60, 252),
156 };
You are reporting in .get_mm() a maximum verify time which is larger
than the core ethtool is willing to accept in a further .set_mm() call.
And openlldp will try to max out on the verify time. Hence the -ERANGE.
The range I chose for the policy comes from 802.3-2018 clause 30.14.1.6,
which says that the aMACMergeVerifyTime variable has a range between 1
and 128 ms inclusive.
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-30 13:22 ` Vladimir Oltean
@ 2023-11-30 14:23 ` Roger Quadros
2023-11-30 21:19 ` Vladimir Oltean
0 siblings, 1 reply; 21+ messages in thread
From: Roger Quadros @ 2023-11-30 14:23 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On 30/11/2023 15:22, Vladimir Oltean wrote:
> On Thu, Nov 30, 2023 at 01:49:03PM +0200, Roger Quadros wrote:
>> Thanks for the debug instructions. Indeed lldpad tries to enable MM TX and the
>> network drivers set_mm() hook gets called and returns success but still
>> lldpad sees some error.
>>
>> I've also confirmed that ethnl_set_mm() runs successfully and returns 1.
>> I suppose something is going wrong in user-space with libnl?
>>
>> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability supported
>> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not enabled
>> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner preemption capability not active
>> Nov 21 11:50:02 am62xx lldpad[708]: eth0: Link partner minimum fragment size: 124 octets
>> Nov 21 11:50:02 am62xx lldpad[708]: eth0: initiating MM verification with a retry interval of 134 ms...
>> Nov 21 11:50:02 am62xx lldpad[708]: ethtool: kernel reports: integer out of range
>>
>>
>> full debug log is below.
>
> Ah, you got confused. Openlldp issues multiple ETHTOOL_MSG_MM_SET
> netlink messages. What you observe is that one of them succeeds, and
> then another one returns -ERANGE before even calling the driver's
> set_mm() method.
>
> And that comes from here in net/ethtool/mm.c:
>
> 149 const struct nla_policy ethnl_mm_set_policy[ETHTOOL_A_MM_MAX + 1] = {
> 150 » [ETHTOOL_A_MM_HEADER]» » = NLA_POLICY_NESTED(ethnl_header_policy),
> 151 » [ETHTOOL_A_MM_VERIFY_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
> 152 » [ETHTOOL_A_MM_VERIFY_TIME]» = NLA_POLICY_RANGE(NLA_U32, 1, 128), // <---- here
> 153 » [ETHTOOL_A_MM_TX_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
> 154 » [ETHTOOL_A_MM_PMAC_ENABLED]» = NLA_POLICY_MAX(NLA_U8, 1),
> 155 » [ETHTOOL_A_MM_TX_MIN_FRAG_SIZE]»= NLA_POLICY_RANGE(NLA_U32, 60, 252),
> 156 };
>
> You are reporting in .get_mm() a maximum verify time which is larger
> than the core ethtool is willing to accept in a further .set_mm() call.
> And openlldp will try to max out on the verify time. Hence the -ERANGE.
You are spot on on this. Thanks. :)
>
> The range I chose for the policy comes from 802.3-2018 clause 30.14.1.6,
> which says that the aMACMergeVerifyTime variable has a range between 1
> and 128 ms inclusive.
I forced driver state->max_verify_time = 128; and now that -ERANGE
error is gone and the lldp test case passes.
I also applied your patch to ethtool_mm.sh and don't see the error with
'addFragSize 0' anymore
Should I include your patch in the next revision of this series?
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-30 14:23 ` Roger Quadros
@ 2023-11-30 21:19 ` Vladimir Oltean
0 siblings, 0 replies; 21+ messages in thread
From: Vladimir Oltean @ 2023-11-30 21:19 UTC (permalink / raw)
To: Roger Quadros
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On Thu, Nov 30, 2023 at 04:23:49PM +0200, Roger Quadros wrote:
> Should I include your patch in the next revision of this series?
Yeah, please do.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
2023-11-20 23:26 ` Vladimir Oltean
2023-11-21 11:02 ` Roger Quadros
@ 2023-11-21 11:48 ` Roger Quadros
1 sibling, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-21 11:48 UTC (permalink / raw)
To: Vladimir Oltean
Cc: davem, edumazet, kuba, pabeni, s-vadapalli, r-gunasekaran,
vigneshr, srk, horms, p-varis, netdev, linux-kernel
On 21/11/2023 01:26, Vladimir Oltean wrote:
> On Mon, Nov 20, 2023 at 04:01:46PM +0200, Roger Quadros wrote:
>> Changelog:
>>
>> v6:
>> - get mutex around am65_cpsw_iet_commit_preemptible_tcs() in
>> am65_cpsw_iet_change_preemptible_tcs()
>> - use "preemption" instead of "pre-emption"
>> - call am65_cpsw_setup_mqprio() from within am65_cpsw_setup_taprio()
>> - Now works with kselftest except the last test which fails
>>
<snip>
>> diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> index 60f625e1350b..8443c13c9ff6 100644
>> --- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
>> @@ -4,9 +4,11 @@
>> *
>> * quality of service module includes:
>> * Enhanced Scheduler Traffic (EST - P802.1Qbv/D2.2)
>> + * Interspersed Express Traffic (IET - P802.3br/D2.0)
>> */
>>
>> #include <linux/pm_runtime.h>
>> +#include <linux/units.h>
>
> If this was ordered alphabetically, u comes after t.
>
>> #include <linux/time.h>
>> #include <net/pkt_cls.h>
>>
>> @@ -259,6 +266,196 @@ static int am65_cpsw_setup_mqprio(struct net_device *ndev, void *type_data)
>> return ret;
>> }
>>
>> +static int am65_cpsw_iet_set_verify_timeout_count(struct am65_cpsw_port *port)
>> +{
>> + int verify_time_ms = port->qos.iet.verify_time_ms;
>> + int link_speed = port->qos.link_speed;
>> + u32 val;
>> +
>> + if (WARN_ON(link_speed == SPEED_UNKNOWN))
>> + return -ENODEV;
>> +
>> + /* The number of wireside clocks contained in the verify
>> + * timeout counter. The default is 0x1312d0
>> + * (10ms at 125Mhz in 1G mode).
>> + */
>> + val = 125 * HZ_PER_MHZ; /* assuming 125MHz wireside clock */
>> +
>> + val /= MILLIHZ_PER_HZ; /* count per ms timeout */
>> + val *= verify_time_ms; /* count for timeout ms */
>> + if (link_speed < SPEED_1000)
>> + val <<= 1; /* FIXME: Is this correct? */
>
> Is there any way to find out and remove the FIXME? Like running the
> selftest at SPEED_100?
I checked at SPEED_100 without the above if condition and it works so I'll
drop it in next revision.
>
>> +
>> + if (val > AM65_CPSW_PN_MAC_VERIFY_CNT_MASK)
>> + return -EINVAL;
>> +
>> + writel(val, port->port_base + AM65_CPSW_PN_REG_IET_VERIFY);
>> +
>> + return 0;
>> +}
>> +
--
cheers,
-roger
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v6 net-next 7/7] net: ethernet: ti: am65-cpsw: add sw tx/rx irq coalescing based on hrtimers
2023-11-20 14:01 [PATCH v6 net-next 0/7] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing Roger Quadros
` (5 preceding siblings ...)
2023-11-20 14:01 ` [PATCH v6 net-next 6/7] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support Roger Quadros
@ 2023-11-20 14:01 ` Roger Quadros
6 siblings, 0 replies; 21+ messages in thread
From: Roger Quadros @ 2023-11-20 14:01 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: vladimir.oltean, s-vadapalli, r-gunasekaran, vigneshr, srk, horms,
p-varis, netdev, linux-kernel, Grygorii Strashko, Roger Quadros
From: Grygorii Strashko <grygorii.strashko@ti.com>
Add SW IRQ coalescing based on hrtimers for TX and RX data path which
can be enabled by ethtool commands:
- RX coalescing
ethtool -C eth1 rx-usecs 50
- TX coalescing can be enabled per TX queue
- by default enables coalesing for TX0
ethtool -C eth1 tx-usecs 50
- configure TX0
ethtool -Q eth0 queue_mask 1 --coalesce tx-usecs 100
- configure TX1
ethtool -Q eth0 queue_mask 2 --coalesce tx-usecs 100
- configure TX0 and TX1
ethtool -Q eth0 queue_mask 3 --coalesce tx-usecs 100 --coalesce tx-usecs 100
show configuration for TX0 and TX1:
ethtool -Q eth0 queue_mask 3 --show-coalesce
Comparing to gro_flush_timeout and napi_defer_hard_irqs, this patch
allows to enable IRQ coalesing for RX path separately.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Roger Quadros <rogerq@kernel.org>
---
drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 79 +++++++++++++++++++++
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 59 ++++++++++++---
drivers/net/ethernet/ti/am65-cpsw-nuss.h | 4 ++
3 files changed, 134 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
index 6af00640e99c..0685420368d1 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c
@@ -892,6 +892,80 @@ static void am65_cpsw_get_mm_stats(struct net_device *ndev,
s->MACMergeHoldCount = readl(base + AM65_CPSW_STATN_IET_TX_HOLD);
}
+static int am65_cpsw_get_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal,
+ struct kernel_ethtool_coalesce *kernel_coal,
+ struct netlink_ext_ack *extack)
+{
+ struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
+ struct am65_cpsw_tx_chn *tx_chn;
+
+ tx_chn = &common->tx_chns[0];
+
+ coal->rx_coalesce_usecs = common->rx_pace_timeout / 1000;
+ coal->tx_coalesce_usecs = tx_chn->tx_pace_timeout / 1000;
+
+ return 0;
+}
+
+static int am65_cpsw_get_per_queue_coalesce(struct net_device *ndev, u32 queue,
+ struct ethtool_coalesce *coal)
+{
+ struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
+ struct am65_cpsw_tx_chn *tx_chn;
+
+ if (queue >= AM65_CPSW_MAX_TX_QUEUES)
+ return -EINVAL;
+
+ tx_chn = &common->tx_chns[queue];
+
+ coal->tx_coalesce_usecs = tx_chn->tx_pace_timeout / 1000;
+
+ return 0;
+}
+
+static int am65_cpsw_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *coal,
+ struct kernel_ethtool_coalesce *kernel_coal,
+ struct netlink_ext_ack *extack)
+{
+ struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
+ struct am65_cpsw_tx_chn *tx_chn;
+
+ tx_chn = &common->tx_chns[0];
+
+ if (coal->rx_coalesce_usecs && coal->rx_coalesce_usecs < 20)
+ return -EINVAL;
+
+ if (coal->tx_coalesce_usecs && coal->tx_coalesce_usecs < 20)
+ return -EINVAL;
+
+ common->rx_pace_timeout = coal->rx_coalesce_usecs * 1000;
+ tx_chn->tx_pace_timeout = coal->tx_coalesce_usecs * 1000;
+
+ return 0;
+}
+
+static int am65_cpsw_set_per_queue_coalesce(struct net_device *ndev, u32 queue,
+ struct ethtool_coalesce *coal)
+{
+ struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
+ struct am65_cpsw_tx_chn *tx_chn;
+
+ if (queue >= AM65_CPSW_MAX_TX_QUEUES)
+ return -EINVAL;
+
+ tx_chn = &common->tx_chns[queue];
+
+ if (coal->tx_coalesce_usecs && coal->tx_coalesce_usecs < 20) {
+ dev_info(common->dev, "defaulting to min value of 20us for tx-usecs for tx-%u\n",
+ queue);
+ coal->tx_coalesce_usecs = 20;
+ }
+
+ tx_chn->tx_pace_timeout = coal->tx_coalesce_usecs * 1000;
+
+ return 0;
+}
+
const struct ethtool_ops am65_cpsw_ethtool_ops_slave = {
.begin = am65_cpsw_ethtool_op_begin,
.complete = am65_cpsw_ethtool_op_complete,
@@ -910,6 +984,11 @@ const struct ethtool_ops am65_cpsw_ethtool_ops_slave = {
.get_ts_info = am65_cpsw_get_ethtool_ts_info,
.get_priv_flags = am65_cpsw_get_ethtool_priv_flags,
.set_priv_flags = am65_cpsw_set_ethtool_priv_flags,
+ .supported_coalesce_params = ETHTOOL_COALESCE_USECS,
+ .get_coalesce = am65_cpsw_get_coalesce,
+ .set_coalesce = am65_cpsw_set_coalesce,
+ .get_per_queue_coalesce = am65_cpsw_get_per_queue_coalesce,
+ .set_per_queue_coalesce = am65_cpsw_set_per_queue_coalesce,
.get_link = ethtool_op_get_link,
.get_link_ksettings = am65_cpsw_get_link_ksettings,
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 594f95c9415c..2fce480fb59a 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -596,8 +596,10 @@ static int am65_cpsw_nuss_common_stop(struct am65_cpsw_common *common)
msecs_to_jiffies(1000));
if (!i)
dev_err(common->dev, "tx timeout\n");
- for (i = 0; i < common->tx_ch_num; i++)
+ for (i = 0; i < common->tx_ch_num; i++) {
napi_disable(&common->tx_chns[i].napi_tx);
+ hrtimer_cancel(&common->tx_chns[i].tx_hrtimer);
+ }
for (i = 0; i < common->tx_ch_num; i++) {
k3_udma_glue_reset_tx_chn(common->tx_chns[i].tx_chn,
@@ -616,6 +618,7 @@ static int am65_cpsw_nuss_common_stop(struct am65_cpsw_common *common)
}
napi_disable(&common->napi_rx);
+ hrtimer_cancel(&common->rx_hrtimer);
for (i = 0; i < AM65_CPSW_MAX_RX_FLOWS; i++)
k3_udma_glue_reset_rx_chn(common->rx_chns.rx_chn, i,
@@ -885,6 +888,15 @@ static int am65_cpsw_nuss_rx_packets(struct am65_cpsw_common *common,
return ret;
}
+static enum hrtimer_restart am65_cpsw_nuss_rx_timer_callback(struct hrtimer *timer)
+{
+ struct am65_cpsw_common *common =
+ container_of(timer, struct am65_cpsw_common, rx_hrtimer);
+
+ enable_irq(common->rx_chns.irq);
+ return HRTIMER_NORESTART;
+}
+
static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget)
{
struct am65_cpsw_common *common = am65_cpsw_napi_to_common(napi_rx);
@@ -912,7 +924,13 @@ static int am65_cpsw_nuss_rx_poll(struct napi_struct *napi_rx, int budget)
if (num_rx < budget && napi_complete_done(napi_rx, num_rx)) {
if (common->rx_irq_disabled) {
common->rx_irq_disabled = false;
- enable_irq(common->rx_chns.irq);
+ if (unlikely(common->rx_pace_timeout)) {
+ hrtimer_start(&common->rx_hrtimer,
+ ns_to_ktime(common->rx_pace_timeout),
+ HRTIMER_MODE_REL_PINNED);
+ } else {
+ enable_irq(common->rx_chns.irq);
+ }
}
}
@@ -968,7 +986,7 @@ static void am65_cpsw_nuss_tx_wake(struct am65_cpsw_tx_chn *tx_chn, struct net_d
}
static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common,
- int chn, unsigned int budget)
+ int chn, unsigned int budget, bool *tdown)
{
struct device *dev = common->dev;
struct am65_cpsw_tx_chn *tx_chn;
@@ -991,6 +1009,7 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common,
if (cppi5_desc_is_tdcm(desc_dma)) {
if (atomic_dec_and_test(&common->tdown_cnt))
complete(&common->tdown_complete);
+ *tdown = true;
break;
}
@@ -1013,7 +1032,7 @@ static int am65_cpsw_nuss_tx_compl_packets(struct am65_cpsw_common *common,
}
static int am65_cpsw_nuss_tx_compl_packets_2g(struct am65_cpsw_common *common,
- int chn, unsigned int budget)
+ int chn, unsigned int budget, bool *tdown)
{
struct device *dev = common->dev;
struct am65_cpsw_tx_chn *tx_chn;
@@ -1034,6 +1053,7 @@ static int am65_cpsw_nuss_tx_compl_packets_2g(struct am65_cpsw_common *common,
if (cppi5_desc_is_tdcm(desc_dma)) {
if (atomic_dec_and_test(&common->tdown_cnt))
complete(&common->tdown_complete);
+ *tdown = true;
break;
}
@@ -1059,21 +1079,40 @@ static int am65_cpsw_nuss_tx_compl_packets_2g(struct am65_cpsw_common *common,
return num_tx;
}
+static enum hrtimer_restart am65_cpsw_nuss_tx_timer_callback(struct hrtimer *timer)
+{
+ struct am65_cpsw_tx_chn *tx_chns =
+ container_of(timer, struct am65_cpsw_tx_chn, tx_hrtimer);
+
+ enable_irq(tx_chns->irq);
+ return HRTIMER_NORESTART;
+}
+
static int am65_cpsw_nuss_tx_poll(struct napi_struct *napi_tx, int budget)
{
struct am65_cpsw_tx_chn *tx_chn = am65_cpsw_napi_to_tx_chn(napi_tx);
+ bool tdown = false;
int num_tx;
if (AM65_CPSW_IS_CPSW2G(tx_chn->common))
- num_tx = am65_cpsw_nuss_tx_compl_packets_2g(tx_chn->common, tx_chn->id, budget);
+ num_tx = am65_cpsw_nuss_tx_compl_packets_2g(tx_chn->common, tx_chn->id,
+ budget, &tdown);
else
- num_tx = am65_cpsw_nuss_tx_compl_packets(tx_chn->common, tx_chn->id, budget);
+ num_tx = am65_cpsw_nuss_tx_compl_packets(tx_chn->common,
+ tx_chn->id, budget, &tdown);
if (num_tx >= budget)
return budget;
- if (napi_complete_done(napi_tx, num_tx))
- enable_irq(tx_chn->irq);
+ if (napi_complete_done(napi_tx, num_tx)) {
+ if (unlikely(tx_chn->tx_pace_timeout && !tdown)) {
+ hrtimer_start(&tx_chn->tx_hrtimer,
+ ns_to_ktime(tx_chn->tx_pace_timeout),
+ HRTIMER_MODE_REL_PINNED);
+ } else {
+ enable_irq(tx_chn->irq);
+ }
+ }
return 0;
}
@@ -1705,6 +1744,8 @@ static int am65_cpsw_nuss_ndev_add_tx_napi(struct am65_cpsw_common *common)
netif_napi_add_tx(common->dma_ndev, &tx_chn->napi_tx,
am65_cpsw_nuss_tx_poll);
+ hrtimer_init(&tx_chn->tx_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
+ tx_chn->tx_hrtimer.function = &am65_cpsw_nuss_tx_timer_callback;
ret = devm_request_irq(dev, tx_chn->irq,
am65_cpsw_nuss_tx_irq,
@@ -1930,6 +1971,8 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common)
netif_napi_add(common->dma_ndev, &common->napi_rx,
am65_cpsw_nuss_rx_poll);
+ hrtimer_init(&common->rx_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
+ common->rx_hrtimer.function = &am65_cpsw_nuss_rx_timer_callback;
ret = devm_request_irq(dev, rx_chn->irq,
am65_cpsw_nuss_rx_irq,
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
index 1e4a045057fc..7da0492dc091 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
@@ -75,6 +75,8 @@ struct am65_cpsw_tx_chn {
struct k3_cppi_desc_pool *desc_pool;
struct k3_udma_glue_tx_channel *tx_chn;
spinlock_t lock; /* protect TX rings in multi-port mode */
+ struct hrtimer tx_hrtimer;
+ unsigned long tx_pace_timeout;
int irq;
u32 id;
u32 descs_num;
@@ -138,6 +140,8 @@ struct am65_cpsw_common {
struct napi_struct napi_rx;
bool rx_irq_disabled;
+ struct hrtimer rx_hrtimer;
+ unsigned long rx_pace_timeout;
u32 nuss_ver;
u32 cpsw_ver;
--
2.34.1
^ permalink raw reply related [flat|nested] 21+ messages in thread