On Fri, Dec 18, 2020 at 11:07 AM Ajit Khaparde <ajitkhapa...@gmail.com> wrote:
>
> As announced the deprecation notice during the 20.11 release,
> remove support for NetXtreme devices belonging to BCM573xx and
> BCM5740x families. Specifically the support for the following Broadcom
> PCI device IDs: 0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,
> 0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9 has been removed.
>
> Deprecation notice has been removed and release notes for 21.02 has
> been updated accordingly.
>
> Signed-off-by: Ajit Khaparde <ajit.khapa...@broadcom.com>
> Reviewed-by: Lance Richardson <lance.richard...@broadcom.com>
Patch applied to dpdk-next-net-brcm.
>
> ---
> doc/guides/nics/bnxt.rst | 2 +-
> doc/guides/rel_notes/deprecation.rst | 6 ------
> doc/guides/rel_notes/release_21_02.rst | 4 ++++
> drivers/net/bnxt/bnxt.h | 14 --------------
> drivers/net/bnxt/bnxt_ethdev.c | 14 --------------
> 5 files changed, 5 insertions(+), 35 deletions(-)
>
> diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst
> index 4cd8475e8..801ec3ca5 100644
> --- a/doc/guides/nics/bnxt.rst
> +++ b/doc/guides/nics/bnxt.rst
> @@ -6,7 +6,7 @@ BNXT Poll Mode Driver
>
> The Broadcom BNXT PMD (**librte_net_bnxt**) implements support for adapters
> based on Ethernet controllers and SoCs belonging to the Broadcom
> -BCM574XX/BCM575XX NetXtreme-E® Family of Ethernet Network Controllers,
> +BCM5741X/BCM575XX NetXtreme-E® Family of Ethernet Network Controllers,
> the Broadcom BCM588XX Stingray Family of Smart NIC Adapters, and the Broadcom
> StrataGX® BCM5873X Series of Communications Processors.
>
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index 2f498a0be..0fdaf37ed 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -121,12 +121,6 @@ Deprecation Notices
> will be limited to maximum 256 queues.
> Also compile time flag ``RTE_ETHDEV_QUEUE_STAT_CNTRS`` will be removed.
>
> -* Broadcom bnxt PMD: NetXtreme devices belonging to the ``BCM573xx and
> - BCM5740x`` families will no longer be supported as of DPDK 21.02.
> - Specifically the support for the following Broadcom PCI IDs will be removed
> - from the release: ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df,``
> - ``0x16d0, 0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9``.
> -
> * sched: To allow more traffic classes, flexible mapping of pipe queues to
> traffic classes, and subport level configuration of pipes and queues
> changes will be made to macros, data structures and API functions defined
> diff --git a/doc/guides/rel_notes/release_21_02.rst
> b/doc/guides/rel_notes/release_21_02.rst
> index 638f98168..706cbf8f0 100644
> --- a/doc/guides/rel_notes/release_21_02.rst
> +++ b/doc/guides/rel_notes/release_21_02.rst
> @@ -68,6 +68,10 @@ Removed Items
> Also, make sure to start the actual text at the margin.
> =======================================================
>
> +* Removed support for NetXtreme devices belonging to ``BCM573xx and
> + BCM5740x`` families. Specifically the support for the following Broadcom
> + PCI device IDs ``0x16c8, 0x16c9, 0x16ca, 0x16ce, 0x16cf, 0x16df, 0x16d0,``
> + ``0x16d1, 0x16d2, 0x16d4, 0x16d5, 0x16e7, 0x16e8, 0x16e9`` has been
> removed.
>
> API Changes
> -----------
> diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
> index ad7d59458..8374e9fad 100644
> --- a/drivers/net/bnxt/bnxt.h
> +++ b/drivers/net/bnxt/bnxt.h
> @@ -33,35 +33,21 @@
> #define BROADCOM_DEV_ID_STRATUS_NIC_VF2 0x1609
> #define BROADCOM_DEV_ID_STRATUS_NIC 0x1614
> #define BROADCOM_DEV_ID_57414_VF 0x16c1
> -#define BROADCOM_DEV_ID_57301 0x16c8
> -#define BROADCOM_DEV_ID_57302 0x16c9
> -#define BROADCOM_DEV_ID_57304_PF 0x16ca
> #define BROADCOM_DEV_ID_57304_VF 0x16cb
> #define BROADCOM_DEV_ID_57417_MF 0x16cc
> #define BROADCOM_DEV_ID_NS2 0x16cd
> -#define BROADCOM_DEV_ID_57311 0x16ce
> -#define BROADCOM_DEV_ID_57312 0x16cf
> -#define BROADCOM_DEV_ID_57402 0x16d0
> -#define BROADCOM_DEV_ID_57404 0x16d1
> -#define BROADCOM_DEV_ID_57406_PF 0x16d2
> #define BROADCOM_DEV_ID_57406_VF 0x16d3
> -#define BROADCOM_DEV_ID_57402_MF 0x16d4
> -#define BROADCOM_DEV_ID_57407_RJ45 0x16d5
> #define BROADCOM_DEV_ID_57412 0x16d6
> #define BROADCOM_DEV_ID_57414 0x16d7
> #define BROADCOM_DEV_ID_57416_RJ45 0x16d8
> #define BROADCOM_DEV_ID_57417_RJ45 0x16d9
> #define BROADCOM_DEV_ID_5741X_VF 0x16dc
> #define BROADCOM_DEV_ID_57412_MF 0x16de
> -#define BROADCOM_DEV_ID_57314 0x16df
> #define BROADCOM_DEV_ID_57317_RJ45 0x16e0
> #define BROADCOM_DEV_ID_5731X_VF 0x16e1
> #define BROADCOM_DEV_ID_57417_SFP 0x16e2
> #define BROADCOM_DEV_ID_57416_SFP 0x16e3
> #define BROADCOM_DEV_ID_57317_SFP 0x16e4
> -#define BROADCOM_DEV_ID_57404_MF 0x16e7
> -#define BROADCOM_DEV_ID_57406_MF 0x16e8
> -#define BROADCOM_DEV_ID_57407_SFP 0x16e9
> #define BROADCOM_DEV_ID_57407_MF 0x16ea
> #define BROADCOM_DEV_ID_57414_MF 0x16ec
> #define BROADCOM_DEV_ID_57416_MF 0x16ee
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index a3035def5..0788d263d 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -47,27 +47,13 @@ static const struct rte_pci_id bnxt_pci_id_map[] = {
> BROADCOM_DEV_ID_STRATUS_NIC_VF2) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_STRATUS_NIC)
> },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_VF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57301) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57302) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_PF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_VF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_NS2) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57402) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57404) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_PF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_VF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57402_MF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_RJ45)
> },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57404_MF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57406_MF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_SFP) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57407_MF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_5741X_VF) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_5731X_VF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57314) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57417_MF) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57311) },
> - { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57312) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57412) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414) },
> { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57416_RJ45)
> },
> --
> 2.21.1 (Apple Git-122.3)
>
--
Ajit Khaparde
