| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9f8beb62-42db-47d9-bba6-f942a655217d@kernel.org>
Date: Wed, 21 Aug 2024 15:15:08 +0300
From: Roger Quadros <rogerq@...nel.org>
To: MD Danish Anwar <danishanwar@...com>,
Dan Carpenter <dan.carpenter@...aro.org>, Andrew Lunn <andrew@...n.ch>,
Jan Kiszka <jan.kiszka@...mens.com>, Vignesh Raghavendra <vigneshr@...com>,
Javier Carrasco <javier.carrasco.cruz@...il.com>,
Jacob Keller <jacob.e.keller@...el.com>, Diogo Ivo <diogo.ivo@...mens.com>,
Simon Horman <horms@...nel.org>, Richard Cochran <richardcochran@...il.com>,
Paolo Abeni <pabeni@...hat.com>, Jakub Kicinski <kuba@...nel.org>,
Eric Dumazet <edumazet@...gle.com>, "David S. Miller" <davem@...emloft.net>
Cc: linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, srk@...com
Subject: Re: [PATCH net-next v2 7/7] net: ti: icssg-prueth: Enable HSR Tx Tag
and Rx Tag offload
On 13/08/2024 10:42, MD Danish Anwar wrote:
> From: Ravi Gunasekaran <r-gunasekaran@...com>
>
> Add support to offload HSR Tx Tag Insertion and Rx Tag Removal
> and duplicate discard.
I can see code for Tx Tag insertion and RX tag removal.
Where are you doing duplicate discard in this patch?
>
> Signed-off-by: Ravi Gunasekaran <r-gunasekaran@...com>
> ---
> drivers/net/ethernet/ti/icssg/icssg_common.c | 3 +++
> drivers/net/ethernet/ti/icssg/icssg_config.c | 4 +++-
> drivers/net/ethernet/ti/icssg/icssg_config.h | 2 ++
> drivers/net/ethernet/ti/icssg/icssg_prueth.c | 11 ++++++++++-
> drivers/net/ethernet/ti/icssg/icssg_prueth.h | 1 +
> 5 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_common.c b/drivers/net/ethernet/ti/icssg/icssg_common.c
> index 2d6d8648f5a9..4eae4f9250c0 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_common.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_common.c
> @@ -721,6 +721,9 @@ enum netdev_tx icssg_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev
> if (prueth->is_hsr_offload_mode && (ndev->features & NETIF_F_HW_HSR_DUP))
> dst_tag_id = PRUETH_UNDIRECTED_PKT_DST_TAG;
>
> + if (prueth->is_hsr_offload_mode && (ndev->features & NETIF_F_HW_HSR_TAG_INS))
> + epib[1] |= PRUETH_UNDIRECTED_PKT_TAG_INS;
> +
> cppi5_desc_set_tags_ids(&first_desc->hdr, 0, dst_tag_id);
> k3_udma_glue_tx_dma_to_cppi5_addr(tx_chn->tx_chn, &buf_dma);
> cppi5_hdesc_attach_buf(first_desc, buf_dma, pkt_len, buf_dma, pkt_len);
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_config.c b/drivers/net/ethernet/ti/icssg/icssg_config.c
> index 2f485318c940..f061fa97a377 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_config.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_config.c
> @@ -531,7 +531,9 @@ static const struct icssg_r30_cmd emac_r32_bitmask[] = {
> {{EMAC_NONE, 0xffff4000, EMAC_NONE, EMAC_NONE}}, /* Preemption on Tx ENABLE*/
> {{EMAC_NONE, 0xbfff0000, EMAC_NONE, EMAC_NONE}}, /* Preemption on Tx DISABLE*/
> {{0xffff0010, EMAC_NONE, 0xffff0010, EMAC_NONE}}, /* VLAN AWARE*/
> - {{0xffef0000, EMAC_NONE, 0xffef0000, EMAC_NONE}} /* VLAN UNWARE*/
> + {{0xffef0000, EMAC_NONE, 0xffef0000, EMAC_NONE}}, /* VLAN UNWARE*/
> + {{0xffff2000, EMAC_NONE, EMAC_NONE, EMAC_NONE}}, /* HSR_RX_OFFLOAD_ENABLE */
> + {{0xdfff0000, EMAC_NONE, EMAC_NONE, EMAC_NONE}} /* HSR_RX_OFFLOAD_DISABLE */
> };
>
> int icssg_set_port_state(struct prueth_emac *emac,
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_config.h b/drivers/net/ethernet/ti/icssg/icssg_config.h
> index 1ac60283923b..92c2deaa3068 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_config.h
> +++ b/drivers/net/ethernet/ti/icssg/icssg_config.h
> @@ -80,6 +80,8 @@ enum icssg_port_state_cmd {
> ICSSG_EMAC_PORT_PREMPT_TX_DISABLE,
> ICSSG_EMAC_PORT_VLAN_AWARE_ENABLE,
> ICSSG_EMAC_PORT_VLAN_AWARE_DISABLE,
> + ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE,
> + ICSSG_EMAC_HSR_RX_OFFLOAD_DISABLE,
> ICSSG_EMAC_PORT_MAX_COMMANDS
> };
>
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> index 521e9f914459..582e72dd8f3f 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
> @@ -42,7 +42,9 @@
> #define DEFAULT_UNTAG_MASK 1
>
> #define NETIF_PRUETH_HSR_OFFLOAD (NETIF_F_HW_HSR_FWD | \
> - NETIF_F_HW_HSR_DUP)
> + NETIF_F_HW_HSR_DUP | \
> + NETIF_F_HW_HSR_TAG_INS | \
> + NETIF_F_HW_HSR_TAG_RM)
>
> /* CTRLMMR_ICSSG_RGMII_CTRL register bits */
> #define ICSSG_CTRL_RGMII_ID_MODE BIT(24)
> @@ -1032,6 +1034,13 @@ static void icssg_change_mode(struct prueth *prueth)
>
> for (mac = PRUETH_MAC0; mac < PRUETH_NUM_MACS; mac++) {
> emac = prueth->emac[mac];
> + if (prueth->is_hsr_offload_mode) {
> + if (emac->ndev->features & NETIF_F_HW_HSR_TAG_RM)
> + icssg_set_port_state(emac, ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE);
> + else
> + icssg_set_port_state(emac, ICSSG_EMAC_HSR_RX_OFFLOAD_DISABLE);
> + }
> +
> if (netif_running(emac->ndev)) {
> icssg_fdb_add_del(emac, eth_stp_addr, prueth->default_vlan,
> ICSSG_FDB_ENTRY_P0_MEMBERSHIP |
> diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
> index 6cb1dce8b309..246f1e41c13a 100644
> --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h
> +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
> @@ -58,6 +58,7 @@
> #define IEP_DEFAULT_CYCLE_TIME_NS 1000000 /* 1 ms */
>
> #define PRUETH_UNDIRECTED_PKT_DST_TAG 0
> +#define PRUETH_UNDIRECTED_PKT_TAG_INS BIT(30)
>
> /* Firmware status codes */
> #define ICSS_HS_FW_READY 0x55555555
--
cheers,
-roger
Powered by blists - more mailing lists