From patchwork Mon Oct 19 13:20:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 7743 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7027B8E83; Mon, 19 Oct 2015 15:20:10 +0200 (CEST) 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) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 19 Oct 2015 06:20:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,702,1437462000"; d="scan'208";a="583765832" Received: from sie-lab-214-036.ir.intel.com (HELO sie-lab-214-174.ir.intel.com) ([10.237.214.36]) by FMSMGA003.fm.intel.com with ESMTP; 19 Oct 2015 06:20:04 -0700 From: Pablo de Lara To: dev@dpdk.org Date: Mon, 19 Oct 2015 14:20:03 +0100 Message-Id: <1445260803-210576-1-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] igb: fix IEEE1588 frame identification in i210 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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 Acked-by: John McNamara Acked-by: Wenzhuo Lu --- 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® 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 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 Fixed issue with libvirt ``virsh destroy`` not killing the VM. +* **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. 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) } 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; @@ -678,7 +678,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; @@ -852,7 +859,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; @@ -1088,7 +1095,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;