From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BCCE502BE; Thu, 22 Aug 2024 08:04:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.249 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724313846; cv=none; b=dUHFVQIgWlbtQ68Shh+NDlkZoaM4abgSKMhkEw0HI8yDgYsY+OJjTzCZ3o3CxTTV9iC3xlo4Hmbp8DUZ8+kqnxEK9CfB6YexxV5uivYI0rc6EpsI/bE7JY0LZETjjZCYRBvEOs95quKS1/jN9AHJolqbyRAzj4peWJYjWgL8IqI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724313846; c=relaxed/simple; bh=jQXIUQU8oclfpT8g2UQUV9SwNeOego7paHr0Y2n4O8U=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=Sb6ykd0TxcZtHQx8TGtnSPtJ/bu9BUKPSdzu4XQPTPkQ1KzXyCedjm0HOR37aoe0DtNWWbkLkVehd3QtAQWiOVi6LyjlcwiI+LqJpRU1edeo50SWLbUI2N+VEddnRju6YdKZZOZvbdl/ZiqVncMuMs41HeBDPoQw6qJlWsMkLrI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=xD6S2x5K; arc=none smtp.client-ip=198.47.23.249 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="xD6S2x5K" Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 47M83hf7059704; Thu, 22 Aug 2024 03:03:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1724313823; bh=Sp+YdniZlKsd4wjck3WQS1rqiKWW/smYletrrpcJoD8=; h=Date:Subject:To:CC:References:From:In-Reply-To; b=xD6S2x5Ky5YKx7eVBlKlC/4KFP0M61ON0y+F3gyqC86ssp/5Cxdv+PbpydeO/gfkB kLTrfi2cdwQXo7oqb08iGoBrj8bXA4lEEtsBro79zyVvqVpeloQlJB5NysevSoybx2 sWro1aDEthshmFufXu+Ch1wZhLkcXlfCOfF/YtFQ= Received: from DFLE101.ent.ti.com (dfle101.ent.ti.com [10.64.6.22]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 47M83hIp082630 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Aug 2024 03:03:43 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 22 Aug 2024 03:03:40 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 22 Aug 2024 03:03:41 -0500 Received: from [10.24.69.25] (danish-tpc.dhcp.ti.com [10.24.69.25]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 47M83ZPn076512; Thu, 22 Aug 2024 03:03:36 -0500 Message-ID: Date: Thu, 22 Aug 2024 13:33:34 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v2 7/7] net: ti: icssg-prueth: Enable HSR Tx Tag and Rx Tag offload To: Roger Quadros , Dan Carpenter , Andrew Lunn , Jan Kiszka , Vignesh Raghavendra , Javier Carrasco , Jacob Keller , Diogo Ivo , Simon Horman , Richard Cochran , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" CC: , , , References: <20240813074233.2473876-1-danishanwar@ti.com> <20240813074233.2473876-8-danishanwar@ti.com> <9f8beb62-42db-47d9-bba6-f942a655217d@kernel.org> Content-Language: en-US From: MD Danish Anwar In-Reply-To: <9f8beb62-42db-47d9-bba6-f942a655217d@kernel.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 On 21/08/24 5:45 pm, Roger Quadros wrote: > > > On 13/08/2024 10:42, MD Danish Anwar wrote: >> From: Ravi Gunasekaran >> >> 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? > Roger, duplicate discard is done as part of RX tag removal and it is done by firmware. When driver sends the command ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE, firmware does RX tag removal as well as duplicate discard. Maybe I can modify the commit message to stated that duplicate discard is done as part of rx tag removal? >> >> Signed-off-by: Ravi Gunasekaran >> --- >> 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); Duplicate discard is done here ^^^^ >> + 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 > -- Thanks and Regards, Danish