From 1ce6591e238a1c7a1884049c40aa33326d1657ea Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Mon, 19 Oct 2015 14:20:03 +0100 Subject: [PATCH] igb: fix ieee1588 frame identification in i210 Fixed issue where the flag PKT_RX_IEEE1588_PTP was not being set in Intel I210 NIC, as EtherType in RX descriptor is in bits 8:10 of Packet Type and not in the default bits 0:2. Fixes known issue "IEEE1588 support possibly not working with an Intel Ethernet Controller I210 NIC" Signed-off-by: Pablo de Lara Acked-by: John McNamara Acked-by: Wenzhuo Lu --- doc/guides/rel_notes/known_issues.rst | 19 ------------------- doc/guides/rel_notes/release_2_2.rst | 6 ++++++ drivers/net/e1000/igb_rxtx.c | 15 +++++++++++---- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst index b9a52d0d25..9f1fcdbb3a 100644 --- a/doc/guides/rel_notes/known_issues.rst +++ b/doc/guides/rel_notes/known_issues.rst @@ -421,25 +421,6 @@ Intel® QuickAssist Technology sample application does not work on a 32-bit OS o All. -IEEE1588 support possibly not working with an Intel® Ethernet Controller I210 NIC ---------------------------------------------------------------------------------- - -**Description**: - IEEE1588 support is not working with an Intel® Ethernet Controller I210 NIC. - -**Implication**: - IEEE1588 packets are not forwarded correctly by the Intel® Ethernet Controller I210 NIC. - -**Resolution/Workaround**: - There is no workaround available. - -**Affected Environment/Platform**: - All. - -**Driver/Module**: - IGB Poll Mode Driver - - Differences in how different Intel NICs handle maximum packet length for jumbo frame ------------------------------------------------------------------------------------ diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index 834ac43aad..128f956c0a 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -29,6 +29,12 @@ EAL Drivers ~~~~~~~ +* **igb: Fixed IEEE1588 frame identification in I210.** + + Fixed issue where the flag PKT_RX_IEEE1588_PTP was not being set + in Intel I210 NIC, as EtherType in RX descriptor is in bits 8:10 of + Packet Type and not in the default bits 0:2. + * **ixgbe: Fixed issue with X550 DCB.** Fixed a DCB issue with x550 where for 8 TCs (Traffic Classes), if a packet diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 2b8a1c893e..66bc3f0b17 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -714,7 +714,7 @@ igb_rxd_pkt_info_to_pkt_type(uint16_t pkt_info) } static inline uint64_t -rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs) +rx_desc_hlen_type_rss_to_pkt_flags(struct igb_rx_queue *rxq, uint32_t hl_tp_rs) { uint64_t pkt_flags = ((hl_tp_rs & 0x0F) == 0) ? 0 : PKT_RX_RSS_HASH; @@ -724,7 +724,14 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs) 0, 0, 0, 0, }; - pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07]; + struct rte_eth_dev dev = rte_eth_devices[rxq->port_id]; + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev.data->dev_private); + + /* EtherType is in bits 8:10 in Packet Type, and not in the default 0:2 */ + if (hw->mac.type == e1000_i210) + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 12) & 0x07]; + else + pkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07]; #endif return pkt_flags; @@ -898,7 +905,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan); - pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss); + pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(rxq, hlen_type_rss); pkt_flags = pkt_flags | rx_desc_status_to_pkt_flags(staterr); pkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr); rxm->ol_flags = pkt_flags; @@ -1134,7 +1141,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, */ first_seg->vlan_tci = rte_le_to_cpu_16(rxd.wb.upper.vlan); hlen_type_rss = rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data); - pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss); + pkt_flags = rx_desc_hlen_type_rss_to_pkt_flags(rxq, hlen_type_rss); pkt_flags = pkt_flags | rx_desc_status_to_pkt_flags(staterr); pkt_flags = pkt_flags | rx_desc_error_to_pkt_flags(staterr); first_seg->ol_flags = pkt_flags; -- 2.20.1