From patchwork Wed Feb 16 07:45:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Zhang X-Patchwork-Id: 107678 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6CEC1A00C5; Wed, 16 Feb 2022 08:48:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08842410FB; Wed, 16 Feb 2022 08:48:23 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id DB26D410F7 for ; Wed, 16 Feb 2022 08:48:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644997702; x=1676533702; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ugboCyISg/O+bOnxB+7925OIz3FnA91Cc/0x6W6ayPY=; b=gYLGAkPokhSa0Q0EGBeQAslmAnKrROlaRjL5cRADnJMKqB7tszfmAWJR 6dxETiAGTYimjwSsqSgHNYHnUWS01zcWKfPYB8kIinqJbw7P0hVgd9ueT hQB/nMCsXSugMaj0dr/8ltVlFkN3hA72wt072iyOLF1LvG6WMWzioGsPP cVxWGn/AnQgUrMMvqK9jzhl5FqbbHCMZSGyXle5YnAKQ4jbpfdUY5dzXx Lf5QJnOExotck8vJ7+qg21AT5cEzJ8AsTJoqvPL5a1SQO6OAUAe8+2CZD NJ8PLG+UJttrlsnHytCRKjTCGU5JIqwaxbi2IuDBXt9N6OEqZTXf8Cbgh g==; X-IronPort-AV: E=McAfee;i="6200,9189,10259"; a="237949792" X-IronPort-AV: E=Sophos;i="5.88,373,1635231600"; d="scan'208";a="237949792" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2022 23:48:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,373,1635231600"; d="scan'208";a="588261687" Received: from intel-odc-robin.cd.intel.com ([10.240.178.186]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2022 23:48:18 -0800 From: Robin Zhang To: dev@dpdk.org Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, junfeng.guo@intel.com, stevex.yang@intel.com, Robin Zhang Subject: [PATCH v2] net/ice/base: support E824S and E825 devices Date: Wed, 16 Feb 2022 07:45:16 +0000 Message-Id: <20220216074516.1077717-1-robinx.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211229092551.2646-1-robinx.zhang@intel.com> References: <20211229092551.2646-1-robinx.zhang@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add support for E824S and E825 family devices. Signed-off-by: Robin Zhang Acked-by: Qi Zhang --- doc/guides/rel_notes/release_22_03.rst | 4 ++++ drivers/net/ice/base/ice_common.c | 6 ++++++ drivers/net/ice/base/ice_devids.h | 13 +++++++++++++ drivers/net/ice/ice_ethdev.c | 6 ++++++ 4 files changed, 29 insertions(+) diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 41923f50e6..63df1c78da 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -118,6 +118,10 @@ New Features * Added PPPoL2TPv2oUDP FDIR distribute packets based on inner IP src/dst address and UDP/TCP src/dst port. +* **Updated the Intel ice driver.** + + * Added new device IDs to support E824S and E825 devices. + * **Updated Wangxun ngbe driver.** * Added support for devices of custom PHY interfaces. diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index ae55bebaa2..db87bacd97 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -167,6 +167,12 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) case ICE_DEV_ID_E823C_QSFP: case ICE_DEV_ID_E823C_SFP: case ICE_DEV_ID_E823C_SGMII: + case ICE_DEV_ID_E824S: + case ICE_DEV_ID_E825C_BACKPLANE: + case ICE_DEV_ID_E825C_QSFP: + case ICE_DEV_ID_E825C_SFP: + case ICE_DEV_ID_E825C_1GBE: + case ICE_DEV_ID_E825X: hw->mac_type = ICE_MAC_GENERIC; break; default: diff --git a/drivers/net/ice/base/ice_devids.h b/drivers/net/ice/base/ice_devids.h index e52bb71403..96f2528c5e 100644 --- a/drivers/net/ice/base/ice_devids.h +++ b/drivers/net/ice/base/ice_devids.h @@ -58,5 +58,18 @@ #define ICE_DEV_ID_E822L_10G_BASE_T 0x1899 /* Intel(R) Ethernet Connection E822-L 1GbE */ #define ICE_DEV_ID_E822L_SGMII 0x189A +/* Intel(R) Ethernet Connection E824-S */ +#define ICE_DEV_ID_E824S 0x0DBD +/* Intel(R) Ethernet Connection E825-C for backplane */ +#define ICE_DEV_ID_E825C_BACKPLANE 0x579C +/* Intel(R) Ethernet Connection E825-C for QSFP */ +#define ICE_DEV_ID_E825C_QSFP 0x579D +/* Intel(R) Ethernet Connection E825-C for SFP */ +#define ICE_DEV_ID_E825C_SFP 0x579E +/* Intel(R) Ethernet Connection E825-C 1GbE */ +#define ICE_DEV_ID_E825C_1GBE 0x579F +/* Intel(R) Ethernet Connection E825-X */ +#define ICE_DEV_ID_E825X 0x0DCD + #endif /* _ICE_DEVIDS_H_ */ diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 1a469afeac..13adcf90ed 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -196,6 +196,12 @@ static const struct rte_pci_id pci_id_ice_map[] = { { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_SFP) }, { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_10G_BASE_T) }, { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E822L_SGMII) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E824S) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_BACKPLANE) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_QSFP) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_SFP) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825C_1GBE) }, + { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E825X) }, { .vendor_id = 0, /* sentinel */ }, };