Commit 38d22088 authored by Chengchang Tang's avatar Chengchang Tang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Remove support for HIP06 

HIP06 is no longer supported. In order to reduce unnecessary maintenance,
the code of HIP06 is removed.

Link: https://lore.kernel.org/r/20211220130558.61585-1-liangwenpeng@huawei.com


Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 36783dec

drivers/infiniband/hw/hns/Kconfig

+2 −15
Original line number Diff line number Diff line
@@ -5,22 +5,9 @@ config INFINIBAND_HNS 
	depends on ARM64 || (COMPILE_TEST && 64BIT)

	depends on (HNS_DSAF && HNS_ENET) || HNS3

	help

	  This is a RoCE/RDMA driver for the Hisilicon RoCE engine. The engine

	  is used in Hisilicon Hip06 and more further ICT SoC based on

	  platform device.

	  This is a RoCE/RDMA driver for the Hisilicon RoCE engine.



	  To compile HIP06 or HIP08 driver as module, choose M here.



config INFINIBAND_HNS_HIP06

	bool "Hisilicon Hip06 Family RoCE support"

	depends on INFINIBAND_HNS && HNS && HNS_DSAF && HNS_ENET

	depends on INFINIBAND_HNS=m || (HNS_DSAF=y && HNS_ENET=y)

	help

	  RoCE driver support for Hisilicon RoCE engine in Hisilicon Hip06 and

	  Hip07 SoC. These RoCE engines are platform devices.



	  To compile this driver, choose Y here: if INFINIBAND_HNS is m, this

	  module will be called hns-roce-hw-v1

	  To compile HIP08 driver as module, choose M here.



config INFINIBAND_HNS_HIP08

	bool "Hisilicon Hip08 Family RoCE support"

drivers/infiniband/hw/hns/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -9,11 +9,6 @@ hns-roce-objs := hns_roce_main.o hns_roce_cmd.o hns_roce_pd.o \ 
	hns_roce_ah.o hns_roce_hem.o hns_roce_mr.o hns_roce_qp.o \

	hns_roce_cq.o hns_roce_alloc.o hns_roce_db.o hns_roce_srq.o hns_roce_restrack.o



ifdef CONFIG_INFINIBAND_HNS_HIP06

hns-roce-hw-v1-objs := hns_roce_hw_v1.o $(hns-roce-objs)

obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v1.o

endif



ifdef CONFIG_INFINIBAND_HNS_HIP08

hns-roce-hw-v2-objs := hns_roce_hw_v2.o hns_roce_hw_v2_dfx.o $(hns-roce-objs)

obj-$(CONFIG_INFINIBAND_HNS) += hns-roce-hw-v2.o

drivers/infiniband/hw/hns/hns_roce_ah.c

+2 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
 * SOFTWARE.

 */



#include <linux/platform_device.h>

#include <linux/pci.h>

#include <rdma/ib_addr.h>

#include <rdma/ib_cache.h>
@@ -61,7 +60,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	struct hns_roce_ah *ah = to_hr_ah(ibah);

	int ret = 0;



	if (hr_dev->pci_dev->revision <= PCI_REVISION_ID_HIP08 && udata)

	if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08 && udata)

		return -EOPNOTSUPP;



	ah->av.port = rdma_ah_get_port_num(ah_attr);
@@ -80,7 +79,7 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr, 
	memcpy(ah->av.mac, ah_attr->roce.dmac, ETH_ALEN);



	/* HIP08 needs to record vlan info in Address Vector */

	if (hr_dev->pci_dev->revision <= PCI_REVISION_ID_HIP08) {

	if (hr_dev->pci_dev->revision == PCI_REVISION_ID_HIP08) {

		ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,

					      &ah->av.vlan_id, NULL);

		if (ret)

drivers/infiniband/hw/hns/hns_roce_alloc.c

+1 −2
Original line number Diff line number Diff line
@@ -31,10 +31,9 @@ 
 * SOFTWARE.

 */



#include <linux/platform_device.h>

#include <linux/vmalloc.h>

#include "hns_roce_device.h"

#include <rdma/ib_umem.h>

#include "hns_roce_device.h"



void hns_roce_buf_free(struct hns_roce_dev *hr_dev, struct hns_roce_buf *buf)

{

drivers/infiniband/hw/hns/hns_roce_cmd.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
 */



#include <linux/dmapool.h>

#include <linux/platform_device.h>

#include "hns_roce_common.h"

#include "hns_roce_device.h"

#include "hns_roce_cmd.h"