From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo de Lara Subject: [PATCH] igb: fix IEEE1588 frame identification in i210 Date: Mon, 19 Oct 2015 14:20:03 +0100 Message-ID: <1445260803-210576-1-git-send-email-pablo.de.lara.guarch@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable To: dev@dpdk.org Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E45138E80 for ; Mon, 19 Oct 2015 15:20:08 +0200 (CEST) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- doc/guides/rel_notes/known_issues.rst | 19 ------------------- doc/guides/rel_notes/release_2_2.rst | 5 +++++ drivers/net/e1000/igb_rxtx.c | 15 +++++++++++---- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes= /known_issues.rst index b9a52d0..9f1fcdb 100644 --- a/doc/guides/rel_notes/known_issues.rst +++ b/doc/guides/rel_notes/known_issues.rst @@ -421,25 +421,6 @@ Intel=C2=AE QuickAssist Technology sample applicatio= n does not work on a 32-bit OS o All. =20 =20 -IEEE1588 support possibly not working with an Intel=C2=AE Ethernet Contr= oller I210 NIC -------------------------------------------------------------------------= --------- - -**Description**: - IEEE1588 support is not working with an Intel=C2=AE Ethernet Controll= er I210 NIC. - -**Implication**: - IEEE1588 packets are not forwarded correctly by the Intel=C2=AE Ether= net 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 ------------------------------------------------------------------------= ------------ =20 diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/= release_2_2.rst index 5687676..f623fdb 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -39,6 +39,11 @@ Drivers =20 Fixed issue with libvirt ``virsh destroy`` not killing the VM. =20 +* **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. =20 Libraries ~~~~~~~~~ diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 19905fd..ebc57cf 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -668,7 +668,7 @@ igb_rxd_pkt_info_to_pkt_type(uint16_t pkt_info) } =20 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 =3D ((hl_tp_rs & 0x0F) =3D=3D 0) ? 0 : PKT_RX_RSS_H= ASH; =20 @@ -678,7 +678,14 @@ rx_desc_hlen_type_rss_to_pkt_flags(uint32_t hl_tp_rs= ) 0, 0, 0, 0, }; =20 - pkt_flags |=3D ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07]; + struct rte_eth_dev dev =3D rte_eth_devices[rxq->port_id]; + struct e1000_hw *hw =3D 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 =3D=3D e1000_i210) + pkt_flags |=3D ip_pkt_etqf_map[(hl_tp_rs >> 12) & 0x07]; + else + pkt_flags |=3D ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07]; #endif =20 return pkt_flags; @@ -852,7 +859,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **r= x_pkts, /* Only valid if PKT_RX_VLAN_PKT set in pkt_flags */ rxm->vlan_tci =3D rte_le_to_cpu_16(rxd.wb.upper.vlan); =20 - pkt_flags =3D rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss); + pkt_flags =3D rx_desc_hlen_type_rss_to_pkt_flags(rxq, hlen_type_rss); pkt_flags =3D pkt_flags | rx_desc_status_to_pkt_flags(staterr); pkt_flags =3D pkt_flags | rx_desc_error_to_pkt_flags(staterr); rxm->ol_flags =3D pkt_flags; @@ -1088,7 +1095,7 @@ eth_igb_recv_scattered_pkts(void *rx_queue, struct = rte_mbuf **rx_pkts, */ first_seg->vlan_tci =3D rte_le_to_cpu_16(rxd.wb.upper.vlan); hlen_type_rss =3D rte_le_to_cpu_32(rxd.wb.lower.lo_dword.data); - pkt_flags =3D rx_desc_hlen_type_rss_to_pkt_flags(hlen_type_rss); + pkt_flags =3D rx_desc_hlen_type_rss_to_pkt_flags(rxq, hlen_type_rss); pkt_flags =3D pkt_flags | rx_desc_status_to_pkt_flags(staterr); pkt_flags =3D pkt_flags | rx_desc_error_to_pkt_flags(staterr); first_seg->ol_flags =3D pkt_flags; --=20 2.1.0