From: Michael Qiu Date: Mon, 26 Oct 2015 04:53:55 +0000 (+0800) Subject: fm10k: support Boulder Rapid device X-Git-Tag: spdx-start~8288 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=6bbf8c8f4de624a2252f3f1bd18c582527d8674b;p=dpdk.git fm10k: support Boulder Rapid device Boulder Rapid is Intel new NIC within fm10k family. This patch make DPDK driver support this new NIC. Signed-off-by: Michael Qiu Acked-by: Jing Chen Acked-by: Shaopeng He --- diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index 034bcffb51..89e4d5836f 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -20,6 +20,10 @@ New Features * **Added fm10k TSO support for both PF and VF.** +* **New NIC Boulder Rapid support.** + + Boulder Rapid is a new NIC of Intel's fm10k family. + * **Enhanced support for the Chelsio CXGBE driver.** * Added support for Jumbo Frames. diff --git a/drivers/net/fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h index d8f3da43ce..6852ef0bfa 100644 --- a/drivers/net/fm10k/base/fm10k_osdep.h +++ b/drivers/net/fm10k/base/fm10k_osdep.h @@ -44,6 +44,10 @@ POSSIBILITY OF SUCH DAMAGE. /* TODO: this does not look like it should be used... */ #define ERROR_REPORT2(v1, v2, v3) do { } while (0) +#ifndef BOULDER_RAPIDS_HW +#define BOULDER_RAPIDS_HW +#endif + #define STATIC static #define DEBUGFUNC(F) DEBUGOUT(F "\n"); #define DEBUGOUT(S, args...) PMD_DRV_LOG_RAW(DEBUG, S, ##args) diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h index 19892e1c86..93aa38ae73 100644 --- a/lib/librte_eal/common/include/rte_pci_dev_ids.h +++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h @@ -521,8 +521,10 @@ RTE_PCI_DEV_ID_DECL_I40E(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_10G_BASE_T4) /*************** Physical FM10K devices from fm10k_type.h ***************/ #define FM10K_DEV_ID_PF 0x15A4 +#define FM10K_DEV_ID_SDI_FM10420_QDA2 0x15D0 RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_PF) +RTE_PCI_DEV_ID_DECL_FM10K(PCI_VENDOR_ID_INTEL, FM10K_DEV_ID_SDI_FM10420_QDA2) /****************** Virtual IGB devices from e1000_hw.h ******************/