Skip to contentSkip to conversation

net: remove the orphaned IBM eHEA driver

PATCH Applied David Christensen 3 participants 6 messages Jun 29 – Jul 2

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover net: remove the orphaned IBM eHEA driver

The IBM eHEA (Ethernet Host Ethernet Adapter) driver has been orphaned since April 2024 with no active maintainer stepping forward. This series removes the driver and associated references from the kernel tree.

The driver was marked as an Orphan on April 18, 2024:

commit 97ec32b583bb ("MAINTAINERS: eth: mark IBM eHEA as an Orphan")

In the 13 months since, no maintainer has stepped forward to take ownership.

The hardware was last supported on IBM POWER7 systems, which reached end-of-support in December 2020. The driver has received no functional updates since October 2022:

commit 0e7ce23a917a ("net: ehea: fix possible memory leak in ehea_register_port()")

And has only received mechanical API migrations affecting the entire kernel tree since that time.

David Christensen (2):
ehea: remove the ehea driver
powerpc: remove ehea driver references

 MAINTAINERS                                  |    5 -
 arch/powerpc/configs/ppc64_defconfig         |    1 -
 arch/powerpc/mm/mem.c                        |    6 -
 drivers/net/ethernet/ibm/Kconfig             |    9 -
 drivers/net/ethernet/ibm/Makefile            |    1 -
 drivers/net/ethernet/ibm/ehea/Makefile       |    7 -
 drivers/net/ethernet/ibm/ehea/ehea.h         |  477 ---
 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c |  277 --
 drivers/net/ethernet/ibm/ehea/ehea_hw.h      |  253 --
 drivers/net/ethernet/ibm/ehea/ehea_main.c    | 3581 ------------------
 drivers/net/ethernet/ibm/ehea/ehea_phyp.c    |  612 ---
 drivers/net/ethernet/ibm/ehea/ehea_phyp.h    |  433 ---
 drivers/net/ethernet/ibm/ehea/ehea_qmr.c     |  999 -----
 drivers/net/ethernet/ibm/ehea/ehea_qmr.h     |  390 --
 14 files changed, 7051 deletions(-)
 delete mode 100644 drivers/net/ethernet/ibm/ehea/Makefile
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_hw.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_main.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.h
Signature · 1 line
2.47.3
#1 lore raw

PATCH 1/2 ehea: remove the ehea driver

The IBM eHEA (Ethernet Host Ethernet Adapter) driver has been orphaned since April 2024 with no active maintainer. The hardware was last supported on IBM POWER7 systems which reached end-of-support in December 2020. The driver has received no functional updates since October 2022, with all subsequent changes being mechanical API migrations affecting the entire kernel tree.

A search of lore.kernel.org for the last 24 months reveals no user reports, no objections to the orphan status, and no maintenance discussions indicating active hardware deployment.

The code is preserved in git history and can be restored if a maintainer steps forward to take ownership.

---
 MAINTAINERS                                  |    5 -
 drivers/net/ethernet/ibm/Kconfig             |    9 -
 drivers/net/ethernet/ibm/Makefile            |    1 -
 drivers/net/ethernet/ibm/ehea/Makefile       |    7 -
 drivers/net/ethernet/ibm/ehea/ehea.h         |  477 ---
 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c |  277 --
 drivers/net/ethernet/ibm/ehea/ehea_hw.h      |  253 --
 drivers/net/ethernet/ibm/ehea/ehea_main.c    | 3581 ------------------
 drivers/net/ethernet/ibm/ehea/ehea_phyp.c    |  612 ---
 drivers/net/ethernet/ibm/ehea/ehea_phyp.h    |  433 ---
 drivers/net/ethernet/ibm/ehea/ehea_qmr.c     |  999 -----
 drivers/net/ethernet/ibm/ehea/ehea_qmr.h     |  390 --
 12 files changed, 7044 deletions(-)
 delete mode 100644 drivers/net/ethernet/ibm/ehea/Makefile
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_hw.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_main.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.h
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.c
 delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.h
MAINTAINERS +0 -5
index 15011f5752a9..ee4ee7b8e947 100644
@@ -9498,11 +9498,6 @@ S:	Orphan
 W:	http://aeschi.ch.eu.org/efs/
 F:	fs/efs/
 
-EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-L:	[email protected]
-S:	Orphan
-F:	drivers/net/ethernet/ibm/ehea/
-
 ELM327 CAN NETWORK DRIVER
 M:	Max Staudt <[email protected]>
 L:	[email protected]
drivers/net/ethernet/ibm/Kconfig +0 -9
index 4f4b23465c47..8e55faac2035 100644
@@ -42,15 +42,6 @@ config IBMVETH_KUNIT_TEST
 
 source "drivers/net/ethernet/ibm/emac/Kconfig"
 
-config EHEA
-	tristate "eHEA Ethernet support"
-	depends on IBMEBUS && SPARSEMEM
-	help
-	  This driver supports the IBM pSeries eHEA ethernet adapter.
-
-	  To compile the driver as a module, choose M here. The module
-	  will be called ehea.
-
 config IBMVNIC
 	tristate "IBM Virtual NIC support"
 	depends on PPC_PSERIES
drivers/net/ethernet/ibm/Makefile +0 -1
index 1d17d0c33d4d..c7e5d891c946 100644
@@ -6,4 +6,3 @@
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_IBMVNIC) += ibmvnic.o
 obj-$(CONFIG_IBM_EMAC) += emac/
-obj-$(CONFIG_EHEA) += ehea/
drivers/net/ethernet/ibm/ehea/Makefile deleted +0 -7
deleted file mode 100644
index 9e1e5c7aafe2..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the eHEA ethernet device driver for IBM eServer System p
-#
-ehea-y = ehea_main.o ehea_phyp.o ehea_qmr.o ehea_ethtool.o
-obj-$(CONFIG_EHEA) += ehea.o
-
drivers/net/ethernet/ibm/ehea/ehea.h deleted +0 -477

477 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_ethtool.c deleted +0 -277

277 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_hw.h deleted +0 -253

253 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_main.c deleted +0 -3581

1,956 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_phyp.c deleted +0 -612

612 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_phyp.h deleted +0 -433

433 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_qmr.c deleted +0 -999

999 lines not on this page · raw message

drivers/net/ethernet/ibm/ehea/ehea_qmr.h deleted +0 -390

390 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.47.3

Part of the diff is not shown here. View the raw message.

reviewer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH net-next 1/2] ehea: remove the ehea driver

Le 29/06/2026 à 23:13, David Christensen a écrit :

Quoted 9 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

The IBM eHEA (Ethernet Host Ethernet Adapter) driver has been orphaned since April 2024 with no active maintainer. The hardware was last supported on IBM POWER7 systems which reached end-of-support in December 2020. The driver has received no functional updates since October 2022, with all subsequent changes being mechanical API migrations affecting the entire kernel tree.

Quoted 8 lines

A search of lore.kernel.org for the last 24 months reveals no user reports, no objections to the orphan status, and no maintenance discussions indicating active hardware deployment.

The code is preserved in git history and can be restored if a maintainer steps forward to take ownership.

Quoted 7,155 lines
---
  MAINTAINERS                                  |    5 -
  drivers/net/ethernet/ibm/Kconfig             |    9 -
  drivers/net/ethernet/ibm/Makefile            |    1 -
  drivers/net/ethernet/ibm/ehea/Makefile       |    7 -
  drivers/net/ethernet/ibm/ehea/ehea.h         |  477 ---
  drivers/net/ethernet/ibm/ehea/ehea_ethtool.c |  277 --
  drivers/net/ethernet/ibm/ehea/ehea_hw.h      |  253 --
  drivers/net/ethernet/ibm/ehea/ehea_main.c    | 3581 ------------------
  drivers/net/ethernet/ibm/ehea/ehea_phyp.c    |  612 ---
  drivers/net/ethernet/ibm/ehea/ehea_phyp.h    |  433 ---
  drivers/net/ethernet/ibm/ehea/ehea_qmr.c     |  999 -----
  drivers/net/ethernet/ibm/ehea/ehea_qmr.h     |  390 --
  12 files changed, 7044 deletions(-)

delete mode 100644 drivers/net/ethernet/ibm/ehea/Makefile delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea.h delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_hw.h delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_main.c delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.c delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.h delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.c delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.h

MAINTAINERS +0 -5
index 15011f5752a9..ee4ee7b8e947 100644
@@ -9498,11 +9498,6 @@ S:       Orphan
  W:     http://aeschi.ch.eu.org/efs/
  F:     fs/efs/
 
-EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-L:     [email protected]
-S:     Orphan
-F:     drivers/net/ethernet/ibm/ehea/
-
  ELM327 CAN NETWORK DRIVER
  M:     Max Staudt <[email protected]>
  L:     [email protected]
drivers/net/ethernet/ibm/Kconfig +0 -9
index 4f4b23465c47..8e55faac2035 100644
@@ -42,15 +42,6 @@ config IBMVETH_KUNIT_TEST
 
  source "drivers/net/ethernet/ibm/emac/Kconfig"
 
-config EHEA
-       tristate "eHEA Ethernet support"
-       depends on IBMEBUS && SPARSEMEM
-       help
-         This driver supports the IBM pSeries eHEA ethernet adapter.
-
-         To compile the driver as a module, choose M here. The module
-         will be called ehea.
-
  config IBMVNIC
         tristate "IBM Virtual NIC support"
         depends on PPC_PSERIES
drivers/net/ethernet/ibm/Makefile +0 -1
index 1d17d0c33d4d..c7e5d891c946 100644
@@ -6,4 +6,3 @@
  obj-$(CONFIG_IBMVETH) += ibmveth.o
  obj-$(CONFIG_IBMVNIC) += ibmvnic.o
  obj-$(CONFIG_IBM_EMAC) += emac/
-obj-$(CONFIG_EHEA) += ehea/
drivers/net/ethernet/ibm/ehea/Makefile deleted +0 -7
deleted file mode 100644
index 9e1e5c7aafe2..000000000000
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the eHEA ethernet device driver for IBM eServer System p
-#
-ehea-y = ehea_main.o ehea_phyp.o ehea_qmr.o ehea_ethtool.o
-obj-$(CONFIG_EHEA) += ehea.o
-
drivers/net/ethernet/ibm/ehea/ehea.h deleted +0 -477
deleted file mode 100644
index 208c440a602b..000000000000
@@ -1,477 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea.h
- *
- *  eHEA ethernet device driver for IBM eServer System p
- *
- *  (C) Copyright IBM Corp. 2006
- *
- *  Authors:
- *       Christoph Raisch <[email protected]>
- *       Jan-Bernd Themann <[email protected]>
- *       Thomas Klein <[email protected]>
- */
-
-#ifndef __EHEA_H__
-#define __EHEA_H__
-
-#include <linux/module.h>
-#include <linux/ethtool.h>
-#include <linux/vmalloc.h>
-#include <linux/if_vlan.h>
-#include <linux/platform_device.h>
-
-#include <asm/ibmebus.h>
-#include <asm/io.h>
-
-#define DRV_NAME       "ehea"
-#define DRV_VERSION    "EHEA_0107"
-
-/* eHEA capability flags */
-#define DLPAR_PORT_ADD_REM 1
-#define DLPAR_MEM_ADD      2
-#define DLPAR_MEM_REM      4
-#define EHEA_CAPABILITIES  (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD | DLPAR_MEM_REM)
-
-#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
-       | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
-
-#define EHEA_MAX_ENTRIES_RQ1 32767
-#define EHEA_MAX_ENTRIES_RQ2 16383
-#define EHEA_MAX_ENTRIES_RQ3 16383
-#define EHEA_MAX_ENTRIES_SQ  32767
-#define EHEA_MIN_ENTRIES_QP  127
-
-#define EHEA_SMALL_QUEUES
-
-#ifdef EHEA_SMALL_QUEUES
-#define EHEA_MAX_CQE_COUNT      1023
-#define EHEA_DEF_ENTRIES_SQ     1023
-#define EHEA_DEF_ENTRIES_RQ1    1023
-#define EHEA_DEF_ENTRIES_RQ2    1023
-#define EHEA_DEF_ENTRIES_RQ3    511
-#else
-#define EHEA_MAX_CQE_COUNT      4080
-#define EHEA_DEF_ENTRIES_SQ     4080
-#define EHEA_DEF_ENTRIES_RQ1    8160
-#define EHEA_DEF_ENTRIES_RQ2    2040
-#define EHEA_DEF_ENTRIES_RQ3    2040
-#endif
-
-#define EHEA_MAX_ENTRIES_EQ 20
-
-#define EHEA_SG_SQ  2
-#define EHEA_SG_RQ1 1
-#define EHEA_SG_RQ2 0
-#define EHEA_SG_RQ3 0
-
-#define EHEA_MAX_PACKET_SIZE    9022   /* for jumbo frames */
-#define EHEA_RQ2_PKT_SIZE       2048
-#define EHEA_L_PKT_SIZE         256    /* low latency */
-
-/* Send completion signaling */
-
-/* Protection Domain Identifier */
-#define EHEA_PD_ID        0xaabcdeff
-
-#define EHEA_RQ2_THRESHOLD        1
-#define EHEA_RQ3_THRESHOLD        4    /* use RQ3 threshold of 2048 bytes */
-
-#define EHEA_SPEED_10G         10000
-#define EHEA_SPEED_1G           1000
-#define EHEA_SPEED_100M          100
-#define EHEA_SPEED_10M            10
-#define EHEA_SPEED_AUTONEG         0
-
-/* Broadcast/Multicast registration types */
-#define EHEA_BCMC_SCOPE_ALL    0x08
-#define EHEA_BCMC_SCOPE_SINGLE 0x00
-#define EHEA_BCMC_MULTICAST    0x04
-#define EHEA_BCMC_BROADCAST    0x00
-#define EHEA_BCMC_UNTAGGED     0x02
-#define EHEA_BCMC_TAGGED       0x00
-#define EHEA_BCMC_VLANID_ALL   0x01
-#define EHEA_BCMC_VLANID_SINGLE        0x00
-
-#define EHEA_CACHE_LINE          128
-
-/* Memory Regions */
-#define EHEA_MR_ACC_CTRL       0x00800000
-
-#define EHEA_BUSMAP_START      0x8000000000000000ULL
-#define EHEA_INVAL_ADDR        0xFFFFFFFFFFFFFFFFULL
-#define EHEA_DIR_INDEX_SHIFT 13                   /* 8k Entries in 64k block */
-#define EHEA_TOP_INDEX_SHIFT (EHEA_DIR_INDEX_SHIFT * 2)
-#define EHEA_MAP_ENTRIES (1 << EHEA_DIR_INDEX_SHIFT)
-#define EHEA_MAP_SIZE (0x10000)                   /* currently fixed map size */
-#define EHEA_INDEX_MASK (EHEA_MAP_ENTRIES - 1)
-
-
-#define EHEA_WATCH_DOG_TIMEOUT 10*HZ
-
-/* utility functions */
-
-void ehea_dump(void *adr, int len, char *msg);
-
-#define EHEA_BMASK(pos, length) (((pos) << 16) + (length))
-
-#define EHEA_BMASK_IBM(from, to) (((63 - to) << 16) + ((to) - (from) + 1))
-
-#define EHEA_BMASK_SHIFTPOS(mask) (((mask) >> 16) & 0xffff)
-
-#define EHEA_BMASK_MASK(mask) \
-       (0xffffffffffffffffULL >> ((64 - (mask)) & 0xffff))
-
-#define EHEA_BMASK_SET(mask, value) \
-       ((EHEA_BMASK_MASK(mask) & ((u64)(value))) << EHEA_BMASK_SHIFTPOS(mask))
-
-#define EHEA_BMASK_GET(mask, value) \
-       (EHEA_BMASK_MASK(mask) & (((u64)(value)) >> EHEA_BMASK_SHIFTPOS(mask)))
-
-/*
- * Generic ehea page
- */
-struct ehea_page {
-       u8 entries[PAGE_SIZE];
-};
-
-/*
- * Generic queue in linux kernel virtual memory
- */
-struct hw_queue {
-       u64 current_q_offset;           /* current queue entry */
-       struct ehea_page **queue_pages; /* array of pages belonging to queue */
-       u32 qe_size;                    /* queue entry size */
-       u32 queue_length;               /* queue length allocated in bytes */
-       u32 pagesize;
-       u32 toggle_state;               /* toggle flag - per page */
-       u32 reserved;                   /* 64 bit alignment */
-};
-
-/*
- * For pSeries this is a 64bit memory address where
- * I/O memory is mapped into CPU address space
- */
-struct h_epa {
-       void __iomem *addr;
-};
-
-struct h_epa_user {
-       u64 addr;
-};
-
-struct h_epas {
-       struct h_epa kernel;    /* kernel space accessible resource,
-                                  set to 0 if unused */
-       struct h_epa_user user; /* user space accessible resource
-                                  set to 0 if unused */
-};
-
-/*
- * Memory map data structures
- */
-struct ehea_dir_bmap
-{
-       u64 ent[EHEA_MAP_ENTRIES];
-};
-struct ehea_top_bmap
-{
-       struct ehea_dir_bmap *dir[EHEA_MAP_ENTRIES];
-};
-struct ehea_bmap
-{
-       struct ehea_top_bmap *top[EHEA_MAP_ENTRIES];
-};
-
-struct ehea_qp;
-struct ehea_cq;
-struct ehea_eq;
-struct ehea_port;
-struct ehea_av;
-
-/*
- * Queue attributes passed to ehea_create_qp()
- */
-struct ehea_qp_init_attr {
-       /* input parameter */
-       u32 qp_token;           /* queue token */
-       u8 low_lat_rq1;
-       u8 signalingtype;       /* cqe generation flag */
-       u8 rq_count;            /* num of receive queues */
-       u8 eqe_gen;             /* eqe generation flag */
-       u16 max_nr_send_wqes;   /* max number of send wqes */
-       u16 max_nr_rwqes_rq1;   /* max number of receive wqes */
-       u16 max_nr_rwqes_rq2;
-       u16 max_nr_rwqes_rq3;
-       u8 wqe_size_enc_sq;
-       u8 wqe_size_enc_rq1;
-       u8 wqe_size_enc_rq2;
-       u8 wqe_size_enc_rq3;
-       u8 swqe_imm_data_len;   /* immediate data length for swqes */
-       u16 port_nr;
-       u16 rq2_threshold;
-       u16 rq3_threshold;
-       u64 send_cq_handle;
-       u64 recv_cq_handle;
-       u64 aff_eq_handle;
-
-       /* output parameter */
-       u32 qp_nr;
-       u16 act_nr_send_wqes;
-       u16 act_nr_rwqes_rq1;
-       u16 act_nr_rwqes_rq2;
-       u16 act_nr_rwqes_rq3;
-       u8 act_wqe_size_enc_sq;
-       u8 act_wqe_size_enc_rq1;
-       u8 act_wqe_size_enc_rq2;
-       u8 act_wqe_size_enc_rq3;
-       u32 nr_sq_pages;
-       u32 nr_rq1_pages;
-       u32 nr_rq2_pages;
-       u32 nr_rq3_pages;
-       u32 liobn_sq;
-       u32 liobn_rq1;
-       u32 liobn_rq2;
-       u32 liobn_rq3;
-};
-
-/*
- * Event Queue attributes, passed as parameter
- */
-struct ehea_eq_attr {
-       u32 type;
-       u32 max_nr_of_eqes;
-       u8 eqe_gen;        /* generate eqe flag */
-       u64 eq_handle;
-       u32 act_nr_of_eqes;
-       u32 nr_pages;
-       u32 ist1;          /* Interrupt service token */
-       u32 ist2;
-       u32 ist3;
-       u32 ist4;
-};
-
-
-/*
- * Event Queue
- */
-struct ehea_eq {
-       struct ehea_adapter *adapter;
-       struct hw_queue hw_queue;
-       u64 fw_handle;
-       struct h_epas epas;
-       spinlock_t spinlock;
-       struct ehea_eq_attr attr;
-};
-
-/*
- * HEA Queues
- */
-struct ehea_qp {
-       struct ehea_adapter *adapter;
-       u64 fw_handle;                  /* QP handle for firmware calls */
-       struct hw_queue hw_squeue;
-       struct hw_queue hw_rqueue1;
-       struct hw_queue hw_rqueue2;
-       struct hw_queue hw_rqueue3;
-       struct h_epas epas;
-       struct ehea_qp_init_attr init_attr;
-};
-
-/*
- * Completion Queue attributes
- */
-struct ehea_cq_attr {
-       /* input parameter */
-       u32 max_nr_of_cqes;
-       u32 cq_token;
-       u64 eq_handle;
-
-       /* output parameter */
-       u32 act_nr_of_cqes;
-       u32 nr_pages;
-};
-
-/*
- * Completion Queue
- */
-struct ehea_cq {
-       struct ehea_adapter *adapter;
-       u64 fw_handle;
-       struct hw_queue hw_queue;
-       struct h_epas epas;
-       struct ehea_cq_attr attr;
-};
-
-/*
- * Memory Region
- */
-struct ehea_mr {
-       struct ehea_adapter *adapter;
-       u64 handle;
-       u64 vaddr;
-       u32 lkey;
-};
-
-/*
- * Port state information
- */
-struct port_stats {
-       int poll_receive_errors;
-       int queue_stopped;
-       int err_tcp_cksum;
-       int err_ip_cksum;
-       int err_frame_crc;
-};
-
-#define EHEA_IRQ_NAME_SIZE 20
-
-/*
- * Queue SKB Array
- */
-struct ehea_q_skb_arr {
-       struct sk_buff **arr;           /* skb array for queue */
-       int len;                        /* array length */
-       int index;                      /* array index */
-       int os_skbs;                    /* rq2/rq3 only: outstanding skbs */
-};
-
-/*
- * Port resources
- */
-struct ehea_port_res {
-       struct napi_struct napi;
-       struct port_stats p_stats;
-       struct ehea_mr send_mr;         /* send memory region */
-       struct ehea_mr recv_mr;         /* receive memory region */
-       struct ehea_port *port;
-       char int_recv_name[EHEA_IRQ_NAME_SIZE];
-       char int_send_name[EHEA_IRQ_NAME_SIZE];
-       struct ehea_qp *qp;
-       struct ehea_cq *send_cq;
-       struct ehea_cq *recv_cq;
-       struct ehea_eq *eq;
-       struct ehea_q_skb_arr rq1_skba;
-       struct ehea_q_skb_arr rq2_skba;
-       struct ehea_q_skb_arr rq3_skba;
-       struct ehea_q_skb_arr sq_skba;
-       int sq_skba_size;
-       int swqe_refill_th;
-       atomic_t swqe_avail;
-       int swqe_ll_count;
-       u32 swqe_id_counter;
-       u64 tx_packets;
-       u64 tx_bytes;
-       u64 rx_packets;
-       u64 rx_bytes;
-       int sq_restart_flag;
-};
-
-
-#define EHEA_MAX_PORTS 16
-
-#define EHEA_NUM_PORTRES_FW_HANDLES    6  /* QP handle, SendCQ handle,
-                                            RecvCQ handle, EQ handle,
-                                            SendMR handle, RecvMR handle */
-#define EHEA_NUM_PORT_FW_HANDLES       1  /* EQ handle */
-#define EHEA_NUM_ADAPTER_FW_HANDLES    2  /* MR handle, NEQ handle */
-
-struct ehea_adapter {
-       u64 handle;
-       struct platform_device *ofdev;
-       struct ehea_port *port[EHEA_MAX_PORTS];
-       struct ehea_eq *neq;       /* notification event queue */
-       struct tasklet_struct neq_tasklet;
-       struct ehea_mr mr;
-       u32 pd;                    /* protection domain */
-       u64 max_mc_mac;            /* max number of multicast mac addresses */
-       int active_ports;
-       struct list_head list;
-};
-
-
-struct ehea_mc_list {
-       struct list_head list;
-       u64 macaddr;
-};
-
-/* kdump support */
-struct ehea_fw_handle_entry {
-       u64 adh;               /* Adapter Handle */
-       u64 fwh;               /* Firmware Handle */
-};
-
-struct ehea_fw_handle_array {
-       struct ehea_fw_handle_entry *arr;
-       int num_entries;
-       struct mutex lock;
-};
-
-struct ehea_bcmc_reg_entry {
-       u64 adh;               /* Adapter Handle */
-       u32 port_id;           /* Logical Port Id */
-       u8 reg_type;           /* Registration Type */
-       u64 macaddr;
-};
-
-struct ehea_bcmc_reg_array {
-       struct ehea_bcmc_reg_entry *arr;
-       int num_entries;
-       spinlock_t lock;
-};
-
-#define EHEA_PORT_UP 1
-#define EHEA_PORT_DOWN 0
-#define EHEA_PHY_LINK_UP 1
-#define EHEA_PHY_LINK_DOWN 0
-#define EHEA_MAX_PORT_RES 16
-struct ehea_port {
-       struct ehea_adapter *adapter;    /* adapter that owns this port */
-       struct net_device *netdev;
-       struct rtnl_link_stats64 stats;
-       struct ehea_port_res port_res[EHEA_MAX_PORT_RES];
-       struct platform_device  ofdev; /* Open Firmware Device */
-       struct ehea_mc_list *mc_list;    /* Multicast MAC addresses */
-       struct ehea_eq *qp_eq;
-       struct work_struct reset_task;
-       struct delayed_work stats_work;
-       struct mutex port_lock;
-       char int_aff_name[EHEA_IRQ_NAME_SIZE];
-       int allmulti;                    /* Indicates IFF_ALLMULTI state */
-       int promisc;                     /* Indicates IFF_PROMISC state */
-       int num_mcs;
-       int resets;
-       unsigned long flags;
-       u64 mac_addr;
-       u32 logical_port_id;
-       u32 port_speed;
-       u32 msg_enable;
-       u32 sig_comp_iv;
-       u32 state;
-       u8 phy_link;
-       u8 full_duplex;
-       u8 autoneg;
-       u8 num_def_qps;
-       wait_queue_head_t swqe_avail_wq;
-       wait_queue_head_t restart_wq;
-};
-
-struct port_res_cfg {
-       int max_entries_rcq;
-       int max_entries_scq;
-       int max_entries_sq;
-       int max_entries_rq1;
-       int max_entries_rq2;
-       int max_entries_rq3;
-};
-
-enum ehea_flag_bits {
-       __EHEA_STOP_XFER,
-       __EHEA_DISABLE_PORT_RESET
-};
-
-void ehea_set_ethtool_ops(struct net_device *netdev);
-int ehea_sense_port_attr(struct ehea_port *port);
-int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);
-
-#endif /* __EHEA_H__ */
drivers/net/ethernet/ibm/ehea/ehea_ethtool.c deleted +0 -277
deleted file mode 100644
index 1db5b6790a41..000000000000
@@ -1,277 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
- *
- *  eHEA ethernet device driver for IBM eServer System p
- *
- *  (C) Copyright IBM Corp. 2006
- *
- *  Authors:
- *       Christoph Raisch <[email protected]>
- *       Jan-Bernd Themann <[email protected]>
- *       Thomas Klein <[email protected]>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include "ehea.h"
-#include "ehea_phyp.h"
-
-static int ehea_get_link_ksettings(struct net_device *dev,
-                                  struct ethtool_link_ksettings *cmd)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       u32 supported, advertising;
-       u32 speed;
-       int ret;
-
-       ret = ehea_sense_port_attr(port);
-
-       if (ret)
-               return ret;
-
-       if (netif_carrier_ok(dev)) {
-               switch (port->port_speed) {
-               case EHEA_SPEED_10M:
-                       speed = SPEED_10;
-                       break;
-               case EHEA_SPEED_100M:
-                       speed = SPEED_100;
-                       break;
-               case EHEA_SPEED_1G:
-                       speed = SPEED_1000;
-                       break;
-               case EHEA_SPEED_10G:
-                       speed = SPEED_10000;
-                       break;
-               default:
-                       speed = -1;
-                       break; /* BUG */
-               }
-               cmd->base.duplex = port->full_duplex == 1 ?
-                                                    DUPLEX_FULL : DUPLEX_HALF;
-       } else {
-               speed = SPEED_UNKNOWN;
-               cmd->base.duplex = DUPLEX_UNKNOWN;
-       }
-       cmd->base.speed = speed;
-
-       if (cmd->base.speed == SPEED_10000) {
-               supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
-               advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_FIBRE);
-               cmd->base.port = PORT_FIBRE;
-       } else {
-               supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full
-                              | SUPPORTED_100baseT_Half | SUPPORTED_10baseT_Full
-                              | SUPPORTED_10baseT_Half | SUPPORTED_Autoneg
-                              | SUPPORTED_TP);
-               advertising = (ADVERTISED_1000baseT_Full | ADVERTISED_Autoneg
-                                | ADVERTISED_TP);
-               cmd->base.port = PORT_TP;
-       }
-
-       cmd->base.autoneg = port->autoneg == 1 ?
-               AUTONEG_ENABLE : AUTONEG_DISABLE;
-
-       ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.supported,
-                                               supported);
-       ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.advertising,
-                                               advertising);
-
-       return 0;
-}
-
-static int ehea_set_link_ksettings(struct net_device *dev,
-                                  const struct ethtool_link_ksettings *cmd)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       int ret = 0;
-       u32 sp;
-
-       if (cmd->base.autoneg == AUTONEG_ENABLE) {
-               sp = EHEA_SPEED_AUTONEG;
-               goto doit;
-       }
-
-       switch (cmd->base.speed) {
-       case SPEED_10:
-               if (cmd->base.duplex == DUPLEX_FULL)
-                       sp = H_SPEED_10M_F;
-               else
-                       sp = H_SPEED_10M_H;
-               break;
-
-       case SPEED_100:
-               if (cmd->base.duplex == DUPLEX_FULL)
-                       sp = H_SPEED_100M_F;
-               else
-                       sp = H_SPEED_100M_H;
-               break;
-
-       case SPEED_1000:
-               if (cmd->base.duplex == DUPLEX_FULL)
-                       sp = H_SPEED_1G_F;
-               else
-                       ret = -EINVAL;
-               break;
-
-       case SPEED_10000:
-               if (cmd->base.duplex == DUPLEX_FULL)
-                       sp = H_SPEED_10G_F;
-               else
-                       ret = -EINVAL;
-               break;
-
-       default:
-                       ret = -EINVAL;
-               break;
-       }
-
-       if (ret)
-               goto out;
-doit:
-       ret = ehea_set_portspeed(port, sp);
-
-       if (!ret)
-               netdev_info(dev,
-                           "Port speed successfully set: %dMbps %s Duplex\n",
-                           port->port_speed,
-                           port->full_duplex == 1 ? "Full" : "Half");
-out:
-       return ret;
-}
-
-static int ehea_nway_reset(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       int ret;
-
-       ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
-
-       if (!ret)
-               netdev_info(port->netdev,
-                           "Port speed successfully set: %dMbps %s Duplex\n",
-                           port->port_speed,
-                           port->full_duplex == 1 ? "Full" : "Half");
-       return ret;
-}
-
-static void ehea_get_drvinfo(struct net_device *dev,
-                              struct ethtool_drvinfo *info)
-{
-       strscpy(info->driver, DRV_NAME, sizeof(info->driver));
-       strscpy(info->version, DRV_VERSION, sizeof(info->version));
-}
-
-static u32 ehea_get_msglevel(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       return port->msg_enable;
-}
-
-static void ehea_set_msglevel(struct net_device *dev, u32 value)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       port->msg_enable = value;
-}
-
-static const char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
-       {"sig_comp_iv"},
-       {"swqe_refill_th"},
-       {"port resets"},
-       {"Receive errors"},
-       {"TCP cksum errors"},
-       {"IP cksum errors"},
-       {"Frame cksum errors"},
-       {"num SQ stopped"},
-       {"PR0 free_swqes"},
-       {"PR1 free_swqes"},
-       {"PR2 free_swqes"},
-       {"PR3 free_swqes"},
-       {"PR4 free_swqes"},
-       {"PR5 free_swqes"},
-       {"PR6 free_swqes"},
-       {"PR7 free_swqes"},
-       {"PR8 free_swqes"},
-       {"PR9 free_swqes"},
-       {"PR10 free_swqes"},
-       {"PR11 free_swqes"},
-       {"PR12 free_swqes"},
-       {"PR13 free_swqes"},
-       {"PR14 free_swqes"},
-       {"PR15 free_swqes"},
-};
-
-static void ehea_get_strings(struct net_device *dev, u32 stringset, u8 *data)
-{
-       if (stringset == ETH_SS_STATS) {
-               memcpy(data, &ehea_ethtool_stats_keys,
-                      sizeof(ehea_ethtool_stats_keys));
-       }
-}
-
-static int ehea_get_sset_count(struct net_device *dev, int sset)
-{
-       switch (sset) {
-       case ETH_SS_STATS:
-               return ARRAY_SIZE(ehea_ethtool_stats_keys);
-       default:
-               return -EOPNOTSUPP;
-       }
-}
-
-static void ehea_get_ethtool_stats(struct net_device *dev,
-                                    struct ethtool_stats *stats, u64 *data)
-{
-       int i, k, tmp;
-       struct ehea_port *port = netdev_priv(dev);
-
-       for (i = 0; i < ehea_get_sset_count(dev, ETH_SS_STATS); i++)
-               data[i] = 0;
-       i = 0;
-
-       data[i++] = port->sig_comp_iv;
-       data[i++] = port->port_res[0].swqe_refill_th;
-       data[i++] = port->resets;
-
-       for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-               tmp += port->port_res[k].p_stats.poll_receive_errors;
-       data[i++] = tmp;
-
-       for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-               tmp += port->port_res[k].p_stats.err_tcp_cksum;
-       data[i++] = tmp;
-
-       for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-               tmp += port->port_res[k].p_stats.err_ip_cksum;
-       data[i++] = tmp;
-
-       for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-               tmp += port->port_res[k].p_stats.err_frame_crc;
-       data[i++] = tmp;
-
-       for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-               tmp += port->port_res[k].p_stats.queue_stopped;
-       data[i++] = tmp;
-
-       for (k = 0; k < 16; k++)
-               data[i++] = atomic_read(&port->port_res[k].swqe_avail);
-}
-
-static const struct ethtool_ops ehea_ethtool_ops = {
-       .get_drvinfo = ehea_get_drvinfo,
-       .get_msglevel = ehea_get_msglevel,
-       .set_msglevel = ehea_set_msglevel,
-       .get_link = ethtool_op_get_link,
-       .get_strings = ehea_get_strings,
-       .get_sset_count = ehea_get_sset_count,
-       .get_ethtool_stats = ehea_get_ethtool_stats,
-       .nway_reset = ehea_nway_reset,          /* Restart autonegotiation */
-       .get_link_ksettings = ehea_get_link_ksettings,
-       .set_link_ksettings = ehea_set_link_ksettings,
-};
-
-void ehea_set_ethtool_ops(struct net_device *netdev)
-{
-       netdev->ethtool_ops = &ehea_ethtool_ops;
-}
drivers/net/ethernet/ibm/ehea/ehea_hw.h deleted +0 -253
deleted file mode 100644
index 590933a45d65..000000000000
@@ -1,253 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_hw.h
- *
- *  eHEA ethernet device driver for IBM eServer System p
- *
- *  (C) Copyright IBM Corp. 2006
- *
- *  Authors:
- *       Christoph Raisch <[email protected]>
- *       Jan-Bernd Themann <[email protected]>
- *       Thomas Klein <[email protected]>
- */
-
-#ifndef __EHEA_HW_H__
-#define __EHEA_HW_H__
-
-#define QPX_SQA_VALUE   EHEA_BMASK_IBM(48, 63)
-#define QPX_RQ1A_VALUE  EHEA_BMASK_IBM(48, 63)
-#define QPX_RQ2A_VALUE  EHEA_BMASK_IBM(48, 63)
-#define QPX_RQ3A_VALUE  EHEA_BMASK_IBM(48, 63)
-
-#define QPTEMM_OFFSET(x) offsetof(struct ehea_qptemm, x)
-
-struct ehea_qptemm {
-       u64 qpx_hcr;
-       u64 qpx_c;
-       u64 qpx_herr;
-       u64 qpx_aer;
-       u64 qpx_sqa;
-       u64 qpx_sqc;
-       u64 qpx_rq1a;
-       u64 qpx_rq1c;
-       u64 qpx_st;
-       u64 qpx_aerr;
-       u64 qpx_tenure;
-       u64 qpx_reserved1[(0x098 - 0x058) / 8];
-       u64 qpx_portp;
-       u64 qpx_reserved2[(0x100 - 0x0A0) / 8];
-       u64 qpx_t;
-       u64 qpx_sqhp;
-       u64 qpx_sqptp;
-       u64 qpx_reserved3[(0x140 - 0x118) / 8];
-       u64 qpx_sqwsize;
-       u64 qpx_reserved4[(0x170 - 0x148) / 8];
-       u64 qpx_sqsize;
-       u64 qpx_reserved5[(0x1B0 - 0x178) / 8];
-       u64 qpx_sigt;
-       u64 qpx_wqecnt;
-       u64 qpx_rq1hp;
-       u64 qpx_rq1ptp;
-       u64 qpx_rq1size;
-       u64 qpx_reserved6[(0x220 - 0x1D8) / 8];
-       u64 qpx_rq1wsize;
-       u64 qpx_reserved7[(0x240 - 0x228) / 8];
-       u64 qpx_pd;
-       u64 qpx_scqn;
-       u64 qpx_rcqn;
-       u64 qpx_aeqn;
-       u64 reserved49;
-       u64 qpx_ram;
-       u64 qpx_reserved8[(0x300 - 0x270) / 8];
-       u64 qpx_rq2a;
-       u64 qpx_rq2c;
-       u64 qpx_rq2hp;
-       u64 qpx_rq2ptp;
-       u64 qpx_rq2size;
-       u64 qpx_rq2wsize;
-       u64 qpx_rq2th;
-       u64 qpx_rq3a;
-       u64 qpx_rq3c;
-       u64 qpx_rq3hp;
-       u64 qpx_rq3ptp;
-       u64 qpx_rq3size;
-       u64 qpx_rq3wsize;
-       u64 qpx_rq3th;
-       u64 qpx_lpn;
-       u64 qpx_reserved9[(0x400 - 0x378) / 8];
-       u64 reserved_ext[(0x500 - 0x400) / 8];
-       u64 reserved2[(0x1000 - 0x500) / 8];
-};
-
-#define MRx_HCR_LPARID_VALID EHEA_BMASK_IBM(0, 0)
-
-#define MRMWMM_OFFSET(x) offsetof(struct ehea_mrmwmm, x)
-
-struct ehea_mrmwmm {
-       u64 mrx_hcr;
-       u64 mrx_c;
-       u64 mrx_herr;
-       u64 mrx_aer;
-       u64 mrx_pp;
-       u64 reserved1;
-       u64 reserved2;
-       u64 reserved3;
-       u64 reserved4[(0x200 - 0x40) / 8];
-       u64 mrx_ctl[64];
-};
-
-#define QPEDMM_OFFSET(x) offsetof(struct ehea_qpedmm, x)
-
-struct ehea_qpedmm {
-
-       u64 reserved0[(0x400) / 8];
-       u64 qpedx_phh;
-       u64 qpedx_ppsgp;
-       u64 qpedx_ppsgu;
-       u64 qpedx_ppdgp;
-       u64 qpedx_ppdgu;
-       u64 qpedx_aph;
-       u64 qpedx_apsgp;
-       u64 qpedx_apsgu;
-       u64 qpedx_apdgp;
-       u64 qpedx_apdgu;
-       u64 qpedx_apav;
-       u64 qpedx_apsav;
-       u64 qpedx_hcr;
-       u64 reserved1[4];
-       u64 qpedx_rrl0;
-       u64 qpedx_rrrkey0;
-       u64 qpedx_rrva0;
-       u64 reserved2;
-       u64 qpedx_rrl1;
-       u64 qpedx_rrrkey1;
-       u64 qpedx_rrva1;
-       u64 reserved3;
-       u64 qpedx_rrl2;
-       u64 qpedx_rrrkey2;
-       u64 qpedx_rrva2;
-       u64 reserved4;
-       u64 qpedx_rrl3;
-       u64 qpedx_rrrkey3;
-       u64 qpedx_rrva3;
-};
-
-#define CQX_FECADDER EHEA_BMASK_IBM(32, 63)
-#define CQX_FEC_CQE_CNT EHEA_BMASK_IBM(32, 63)
-#define CQX_N1_GENERATE_COMP_EVENT EHEA_BMASK_IBM(0, 0)
-#define CQX_EP_EVENT_PENDING EHEA_BMASK_IBM(0, 0)
-
-#define CQTEMM_OFFSET(x) offsetof(struct ehea_cqtemm, x)
-
-struct ehea_cqtemm {
-       u64 cqx_hcr;
-       u64 cqx_c;
-       u64 cqx_herr;
-       u64 cqx_aer;
-       u64 cqx_ptp;
-       u64 cqx_tp;
-       u64 cqx_fec;
-       u64 cqx_feca;
-       u64 cqx_ep;
-       u64 cqx_eq;
-       u64 reserved1;
-       u64 cqx_n0;
-       u64 cqx_n1;
-       u64 reserved2[(0x1000 - 0x60) / 8];
-};
-
-#define EQTEMM_OFFSET(x) offsetof(struct ehea_eqtemm, x)
-
-struct ehea_eqtemm {
-       u64 eqx_hcr;
-       u64 eqx_c;
-       u64 eqx_herr;
-       u64 eqx_aer;
-       u64 eqx_ptp;
-       u64 eqx_tp;
-       u64 eqx_ssba;
-       u64 eqx_psba;
-       u64 eqx_cec;
-       u64 eqx_meql;
-       u64 eqx_xisbi;
-       u64 eqx_xisc;
-       u64 eqx_it;
-};
-
-/*
- * These access functions will be changed when the dissuccsion about
- * the new access methods for POWER has settled.
- */
-
-static inline u64 epa_load(struct h_epa epa, u32 offset)
-{
-       return __raw_readq((void __iomem *)(epa.addr + offset));
-}
-
-static inline void epa_store(struct h_epa epa, u32 offset, u64 value)
-{
-       __raw_writeq(value, (void __iomem *)(epa.addr + offset));
-       epa_load(epa, offset);  /* synchronize explicitly to eHEA */
-}
-
-static inline void epa_store_acc(struct h_epa epa, u32 offset, u64 value)
-{
-       __raw_writeq(value, (void __iomem *)(epa.addr + offset));
-}
-
-#define epa_store_cq(epa, offset, value)\
-       epa_store(epa, CQTEMM_OFFSET(offset), value)
-#define epa_load_cq(epa, offset)\
-       epa_load(epa, CQTEMM_OFFSET(offset))
-
-static inline void ehea_update_sqa(struct ehea_qp *qp, u16 nr_wqes)
-{
-       struct h_epa epa = qp->epas.kernel;
-       epa_store_acc(epa, QPTEMM_OFFSET(qpx_sqa),
-                     EHEA_BMASK_SET(QPX_SQA_VALUE, nr_wqes));
-}
-
-static inline void ehea_update_rq3a(struct ehea_qp *qp, u16 nr_wqes)
-{
-       struct h_epa epa = qp->epas.kernel;
-       epa_store_acc(epa, QPTEMM_OFFSET(qpx_rq3a),
-                     EHEA_BMASK_SET(QPX_RQ1A_VALUE, nr_wqes));
-}
-
-static inline void ehea_update_rq2a(struct ehea_qp *qp, u16 nr_wqes)
-{
-       struct h_epa epa = qp->epas.kernel;
-       epa_store_acc(epa, QPTEMM_OFFSET(qpx_rq2a),
-                     EHEA_BMASK_SET(QPX_RQ2A_VALUE, nr_wqes));
-}
-
-static inline void ehea_update_rq1a(struct ehea_qp *qp, u16 nr_wqes)
-{
-       struct h_epa epa = qp->epas.kernel;
-       epa_store_acc(epa, QPTEMM_OFFSET(qpx_rq1a),
-                     EHEA_BMASK_SET(QPX_RQ3A_VALUE, nr_wqes));
-}
-
-static inline void ehea_update_feca(struct ehea_cq *cq, u32 nr_cqes)
-{
-       struct h_epa epa = cq->epas.kernel;
-       epa_store_acc(epa, CQTEMM_OFFSET(cqx_feca),
-                     EHEA_BMASK_SET(CQX_FECADDER, nr_cqes));
-}
-
-static inline void ehea_reset_cq_n1(struct ehea_cq *cq)
-{
-       struct h_epa epa = cq->epas.kernel;
-       epa_store_cq(epa, cqx_n1,
-                    EHEA_BMASK_SET(CQX_N1_GENERATE_COMP_EVENT, 1));
-}
-
-static inline void ehea_reset_cq_ep(struct ehea_cq *my_cq)
-{
-       struct h_epa epa = my_cq->epas.kernel;
-       epa_store_acc(epa, CQTEMM_OFFSET(cqx_ep),
-                     EHEA_BMASK_SET(CQX_EP_EVENT_PENDING, 0));
-}
-
-#endif /* __EHEA_HW_H__ */
drivers/net/ethernet/ibm/ehea/ehea_main.c deleted +0 -3581
deleted file mode 100644
index bfc8699a05b9..000000000000
@@ -1,3581 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- *  linux/drivers/net/ethernet/ibm/ehea/ehea_main.c
- *
- *  eHEA ethernet device driver for IBM eServer System p
- *
- *  (C) Copyright IBM Corp. 2006
- *
- *  Authors:
- *      Christoph Raisch <[email protected]>
- *      Jan-Bernd Themann <[email protected]>
- *      Thomas Klein <[email protected]>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/device.h>
-#include <linux/in.h>
-#include <linux/ip.h>
-#include <linux/tcp.h>
-#include <linux/udp.h>
-#include <linux/if.h>
-#include <linux/list.h>
-#include <linux/slab.h>
-#include <linux/if_ether.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-#include <linux/memory.h>
-#include <asm/kexec.h>
-#include <linux/mutex.h>
-#include <linux/prefetch.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-
-#include <net/ip.h>
-
-#include "ehea.h"
-#include "ehea_qmr.h"
-#include "ehea_phyp.h"
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Christoph Raisch <[email protected]>");
-MODULE_DESCRIPTION("IBM eServer HEA Driver");
-MODULE_VERSION(DRV_VERSION);
-
-
-static int msg_level = -1;
-static int rq1_entries = EHEA_DEF_ENTRIES_RQ1;
-static int rq2_entries = EHEA_DEF_ENTRIES_RQ2;
-static int rq3_entries = EHEA_DEF_ENTRIES_RQ3;
-static int sq_entries = EHEA_DEF_ENTRIES_SQ;
-static int use_mcs = 1;
-static int prop_carrier_state;
-
-module_param(msg_level, int, 0);
-module_param(rq1_entries, int, 0);
-module_param(rq2_entries, int, 0);
-module_param(rq3_entries, int, 0);
-module_param(sq_entries, int, 0);
-module_param(prop_carrier_state, int, 0);
-module_param(use_mcs, int, 0);
-
-MODULE_PARM_DESC(msg_level, "msg_level");
-MODULE_PARM_DESC(prop_carrier_state, "Propagate carrier state of physical "
-                "port to stack. 1:yes, 0:no.  Default = 0 ");
-MODULE_PARM_DESC(rq3_entries, "Number of entries for Receive Queue 3 "
-                "[2^x - 1], x = [7..14]. Default = "
-                __MODULE_STRING(EHEA_DEF_ENTRIES_RQ3) ")");
-MODULE_PARM_DESC(rq2_entries, "Number of entries for Receive Queue 2 "
-                "[2^x - 1], x = [7..14]. Default = "
-                __MODULE_STRING(EHEA_DEF_ENTRIES_RQ2) ")");
-MODULE_PARM_DESC(rq1_entries, "Number of entries for Receive Queue 1 "
-                "[2^x - 1], x = [7..14]. Default = "
-                __MODULE_STRING(EHEA_DEF_ENTRIES_RQ1) ")");
-MODULE_PARM_DESC(sq_entries, " Number of entries for the Send Queue  "
-                "[2^x - 1], x = [7..14]. Default = "
-                __MODULE_STRING(EHEA_DEF_ENTRIES_SQ) ")");
-MODULE_PARM_DESC(use_mcs, " Multiple receive queues, 1: enable, 0: disable, "
-                "Default = 1");
-
-static int port_name_cnt;
-static LIST_HEAD(adapter_list);
-static unsigned long ehea_driver_flags;
-static DEFINE_MUTEX(dlpar_mem_lock);
-static struct ehea_fw_handle_array ehea_fw_handles;
-static struct ehea_bcmc_reg_array ehea_bcmc_regs;
-
-
-static int ehea_probe_adapter(struct platform_device *dev);
-
-static void ehea_remove(struct platform_device *dev);
-
-static const struct of_device_id ehea_module_device_table[] = {
-       {
-               .name = "lhea",
-               .compatible = "IBM,lhea",
-       },
-       {
-               .type = "network",
-               .compatible = "IBM,lhea-ethernet",
-       },
-       {},
-};
-MODULE_DEVICE_TABLE(of, ehea_module_device_table);
-
-static const struct of_device_id ehea_device_table[] = {
-       {
-               .name = "lhea",
-               .compatible = "IBM,lhea",
-       },
-       {},
-};
-MODULE_DEVICE_TABLE(of, ehea_device_table);
-
-static struct platform_driver ehea_driver = {
-       .driver = {
-               .name = "ehea",
-               .owner = THIS_MODULE,
-               .of_match_table = ehea_device_table,
-       },
-       .probe = ehea_probe_adapter,
-       .remove = ehea_remove,
-};
-
-void ehea_dump(void *adr, int len, char *msg)
-{
-       int x;
-       unsigned char *deb = adr;
-       for (x = 0; x < len; x += 16) {
-               pr_info("%s adr=%p ofs=%04x %016llx %016llx\n",
-                       msg, deb, x, *((u64 *)&deb[0]), *((u64 *)&deb[8]));
-               deb += 16;
-       }
-}
-
-static void ehea_schedule_port_reset(struct ehea_port *port)
-{
-       if (!test_bit(__EHEA_DISABLE_PORT_RESET, &port->flags))
-               schedule_work(&port->reset_task);
-}
-
-static void ehea_update_firmware_handles(void)
-{
-       struct ehea_fw_handle_entry *arr = NULL;
-       struct ehea_adapter *adapter;
-       int num_adapters = 0;
-       int num_ports = 0;
-       int num_portres = 0;
-       int i = 0;
-       int num_fw_handles, k, l;
-
-       /* Determine number of handles */
-       mutex_lock(&ehea_fw_handles.lock);
-
-       list_for_each_entry(adapter, &adapter_list, list) {
-               num_adapters++;
-
-               for (k = 0; k < EHEA_MAX_PORTS; k++) {
-                       struct ehea_port *port = adapter->port[k];
-
-                       if (!port || (port->state != EHEA_PORT_UP))
-                               continue;
-
-                       num_ports++;
-                       num_portres += port->num_def_qps;
-               }
-       }
-
-       num_fw_handles = num_adapters * EHEA_NUM_ADAPTER_FW_HANDLES +
-                        num_ports * EHEA_NUM_PORT_FW_HANDLES +
-                        num_portres * EHEA_NUM_PORTRES_FW_HANDLES;
-
-       if (num_fw_handles) {
-               arr = kzalloc_objs(*arr, num_fw_handles);
-               if (!arr)
-                       goto out;  /* Keep the existing array */
-       } else
-               goto out_update;
-
-       list_for_each_entry(adapter, &adapter_list, list) {
-               if (num_adapters == 0)
-                       break;
-
-               for (k = 0; k < EHEA_MAX_PORTS; k++) {
-                       struct ehea_port *port = adapter->port[k];
-
-                       if (!port || (port->state != EHEA_PORT_UP) ||
-                           (num_ports == 0))
-                               continue;
-
-                       for (l = 0; l < port->num_def_qps; l++) {
-                               struct ehea_port_res *pr = &port->port_res[l];
-
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->qp->fw_handle;
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->send_cq->fw_handle;
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->recv_cq->fw_handle;
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->eq->fw_handle;
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->send_mr.handle;
-                               arr[i].adh = adapter->handle;
-                               arr[i++].fwh = pr->recv_mr.handle;
-                       }
-                       arr[i].adh = adapter->handle;
-                       arr[i++].fwh = port->qp_eq->fw_handle;
-                       num_ports--;
-               }
-
-               arr[i].adh = adapter->handle;
-               arr[i++].fwh = adapter->neq->fw_handle;
-
-               if (adapter->mr.handle) {
-                       arr[i].adh = adapter->handle;
-                       arr[i++].fwh = adapter->mr.handle;
-               }
-               num_adapters--;
-       }
-
-out_update:
-       kfree(ehea_fw_handles.arr);
-       ehea_fw_handles.arr = arr;
-       ehea_fw_handles.num_entries = i;
-out:
-       mutex_unlock(&ehea_fw_handles.lock);
-}
-
-static void ehea_update_bcmc_registrations(void)
-{
-       unsigned long flags;
-       struct ehea_bcmc_reg_entry *arr = NULL;
-       struct ehea_adapter *adapter;
-       struct ehea_mc_list *mc_entry;
-       int num_registrations = 0;
-       int i = 0;
-       int k;
-
-       spin_lock_irqsave(&ehea_bcmc_regs.lock, flags);
-
-       /* Determine number of registrations */
-       list_for_each_entry(adapter, &adapter_list, list)
-               for (k = 0; k < EHEA_MAX_PORTS; k++) {
-                       struct ehea_port *port = adapter->port[k];
-
-                       if (!port || (port->state != EHEA_PORT_UP))
-                               continue;
-
-                       num_registrations += 2; /* Broadcast registrations */
-
-                       list_for_each_entry(mc_entry, &port->mc_list->list,list)
-                               num_registrations += 2;
-               }
-
-       if (num_registrations) {
-               arr = kzalloc_objs(*arr, num_registrations, GFP_ATOMIC);
-               if (!arr)
-                       goto out;  /* Keep the existing array */
-       } else
-               goto out_update;
-
-       list_for_each_entry(adapter, &adapter_list, list) {
-               for (k = 0; k < EHEA_MAX_PORTS; k++) {
-                       struct ehea_port *port = adapter->port[k];
-
-                       if (!port || (port->state != EHEA_PORT_UP))
-                               continue;
-
-                       if (num_registrations == 0)
-                               goto out_update;
-
-                       arr[i].adh = adapter->handle;
-                       arr[i].port_id = port->logical_port_id;
-                       arr[i].reg_type = EHEA_BCMC_BROADCAST |
-                                         EHEA_BCMC_UNTAGGED;
-                       arr[i++].macaddr = port->mac_addr;
-
-                       arr[i].adh = adapter->handle;
-                       arr[i].port_id = port->logical_port_id;
-                       arr[i].reg_type = EHEA_BCMC_BROADCAST |
-                                         EHEA_BCMC_VLANID_ALL;
-                       arr[i++].macaddr = port->mac_addr;
-                       num_registrations -= 2;
-
-                       list_for_each_entry(mc_entry,
-                                           &port->mc_list->list, list) {
-                               if (num_registrations == 0)
-                                       goto out_update;
-
-                               arr[i].adh = adapter->handle;
-                               arr[i].port_id = port->logical_port_id;
-                               arr[i].reg_type = EHEA_BCMC_MULTICAST |
-                                                 EHEA_BCMC_UNTAGGED;
-                               if (mc_entry->macaddr == 0)
-                                       arr[i].reg_type |= EHEA_BCMC_SCOPE_ALL;
-                               arr[i++].macaddr = mc_entry->macaddr;
-
-                               arr[i].adh = adapter->handle;
-                               arr[i].port_id = port->logical_port_id;
-                               arr[i].reg_type = EHEA_BCMC_MULTICAST |
-                                                 EHEA_BCMC_VLANID_ALL;
-                               if (mc_entry->macaddr == 0)
-                                       arr[i].reg_type |= EHEA_BCMC_SCOPE_ALL;
-                               arr[i++].macaddr = mc_entry->macaddr;
-                               num_registrations -= 2;
-                       }
-               }
-       }
-
-out_update:
-       kfree(ehea_bcmc_regs.arr);
-       ehea_bcmc_regs.arr = arr;
-       ehea_bcmc_regs.num_entries = i;
-out:
-       spin_unlock_irqrestore(&ehea_bcmc_regs.lock, flags);
-}
-
-static void ehea_get_stats64(struct net_device *dev,
-                            struct rtnl_link_stats64 *stats)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       u64 rx_packets = 0, tx_packets = 0, rx_bytes = 0, tx_bytes = 0;
-       int i;
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               rx_packets += port->port_res[i].rx_packets;
-               rx_bytes   += port->port_res[i].rx_bytes;
-       }
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               tx_packets += port->port_res[i].tx_packets;
-               tx_bytes   += port->port_res[i].tx_bytes;
-       }
-
-       stats->tx_packets = tx_packets;
-       stats->rx_bytes = rx_bytes;
-       stats->tx_bytes = tx_bytes;
-       stats->rx_packets = rx_packets;
-
-       stats->multicast = port->stats.multicast;
-       stats->rx_errors = port->stats.rx_errors;
-}
-
-static void ehea_update_stats(struct work_struct *work)
-{
-       struct ehea_port *port =
-               container_of(work, struct ehea_port, stats_work.work);
-       struct net_device *dev = port->netdev;
-       struct rtnl_link_stats64 *stats = &port->stats;
-       struct hcp_ehea_port_cb2 *cb2;
-       u64 hret;
-
-       cb2 = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!cb2) {
-               netdev_err(dev, "No mem for cb2. Some interface statistics were not updated\n");
-               goto resched;
-       }
-
-       hret = ehea_h_query_ehea_port(port->adapter->handle,
-                                     port->logical_port_id,
-                                     H_PORT_CB2, H_PORT_CB2_ALL, cb2);
-       if (hret != H_SUCCESS) {
-               netdev_err(dev, "query_ehea_port failed\n");
-               goto out_herr;
-       }
-
-       if (netif_msg_hw(port))
-               ehea_dump(cb2, sizeof(*cb2), "net_device_stats");
-
-       stats->multicast = cb2->rxmcp;
-       stats->rx_errors = cb2->rxuerr;
-
-out_herr:
-       free_page((unsigned long)cb2);
-resched:
-       schedule_delayed_work(&port->stats_work,
-                             round_jiffies_relative(msecs_to_jiffies(1000)));
-}
-
-static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
-{
-       struct sk_buff **skb_arr_rq1 = pr->rq1_skba.arr;
-       struct net_device *dev = pr->port->netdev;
-       int max_index_mask = pr->rq1_skba.len - 1;
-       int fill_wqes = pr->rq1_skba.os_skbs + nr_of_wqes;
-       int adder = 0;
-       int i;
-
-       pr->rq1_skba.os_skbs = 0;
-
-       if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) {
-               if (nr_of_wqes > 0)
-                       pr->rq1_skba.index = index;
-               pr->rq1_skba.os_skbs = fill_wqes;
-               return;
-       }
-
-       for (i = 0; i < fill_wqes; i++) {
-               if (!skb_arr_rq1[index]) {
-                       skb_arr_rq1[index] = netdev_alloc_skb(dev,
-                                                             EHEA_L_PKT_SIZE);
-                       if (!skb_arr_rq1[index]) {
-                               pr->rq1_skba.os_skbs = fill_wqes - i;
-                               break;
-                       }
-               }
-               index--;
-               index &= max_index_mask;
-               adder++;
-       }
-
-       if (adder == 0)
-               return;
-
-       /* Ring doorbell */
-       ehea_update_rq1a(pr->qp, adder);
-}
-
-static void ehea_init_fill_rq1(struct ehea_port_res *pr, int nr_rq1a)
-{
-       struct sk_buff **skb_arr_rq1 = pr->rq1_skba.arr;
-       struct net_device *dev = pr->port->netdev;
-       int i;
-
-       if (nr_rq1a > pr->rq1_skba.len) {
-               netdev_err(dev, "NR_RQ1A bigger than skb array len\n");
-               return;
-       }
-
-       for (i = 0; i < nr_rq1a; i++) {
-               skb_arr_rq1[i] = netdev_alloc_skb(dev, EHEA_L_PKT_SIZE);
-               if (!skb_arr_rq1[i])
-                       break;
-       }
-       /* Ring doorbell */
-       ehea_update_rq1a(pr->qp, i - 1);
-}
-
-static int ehea_refill_rq_def(struct ehea_port_res *pr,
-                             struct ehea_q_skb_arr *q_skba, int rq_nr,
-                             int num_wqes, int wqe_type, int packet_size)
-{
-       struct net_device *dev = pr->port->netdev;
-       struct ehea_qp *qp = pr->qp;
-       struct sk_buff **skb_arr = q_skba->arr;
-       struct ehea_rwqe *rwqe;
-       int i, index, max_index_mask, fill_wqes;
-       int adder = 0;
-       int ret = 0;
-
-       fill_wqes = q_skba->os_skbs + num_wqes;
-       q_skba->os_skbs = 0;
-
-       if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) {
-               q_skba->os_skbs = fill_wqes;
-               return ret;
-       }
-
-       index = q_skba->index;
-       max_index_mask = q_skba->len - 1;
-       for (i = 0; i < fill_wqes; i++) {
-               u64 tmp_addr;
-               struct sk_buff *skb;
-
-               skb = netdev_alloc_skb_ip_align(dev, packet_size);
-               if (!skb) {
-                       q_skba->os_skbs = fill_wqes - i;
-                       if (q_skba->os_skbs == q_skba->len - 2) {
-                               netdev_info(pr->port->netdev,
-                                           "rq%i ran dry - no mem for skb\n",
-                                           rq_nr);
-                               ret = -ENOMEM;
-                       }
-                       break;
-               }
-
-               skb_arr[index] = skb;
-               tmp_addr = ehea_map_vaddr(skb->data);
-               if (tmp_addr == -1) {
-                       dev_consume_skb_any(skb);
-                       q_skba->os_skbs = fill_wqes - i;
-                       ret = 0;
-                       break;
-               }
-
-               rwqe = ehea_get_next_rwqe(qp, rq_nr);
-               rwqe->wr_id = EHEA_BMASK_SET(EHEA_WR_ID_TYPE, wqe_type)
-                           | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, index);
-               rwqe->sg_list[0].l_key = pr->recv_mr.lkey;
-               rwqe->sg_list[0].vaddr = tmp_addr;
-               rwqe->sg_list[0].len = packet_size;
-               rwqe->data_segments = 1;
-
-               index++;
-               index &= max_index_mask;
-               adder++;
-       }
-
-       q_skba->index = index;
-       if (adder == 0)
-               goto out;
-
-       /* Ring doorbell */
-       iosync();
-       if (rq_nr == 2)
-               ehea_update_rq2a(pr->qp, adder);
-       else
-               ehea_update_rq3a(pr->qp, adder);
-out:
-       return ret;
-}
-
-
-static int ehea_refill_rq2(struct ehea_port_res *pr, int nr_of_wqes)
-{
-       return ehea_refill_rq_def(pr, &pr->rq2_skba, 2,
-                                 nr_of_wqes, EHEA_RWQE2_TYPE,
-                                 EHEA_RQ2_PKT_SIZE);
-}
-
-
-static int ehea_refill_rq3(struct ehea_port_res *pr, int nr_of_wqes)
-{
-       return ehea_refill_rq_def(pr, &pr->rq3_skba, 3,
-                                 nr_of_wqes, EHEA_RWQE3_TYPE,
-                                 EHEA_MAX_PACKET_SIZE);
-}
-
-static inline int ehea_check_cqe(struct ehea_cqe *cqe, int *rq_num)
-{
-       *rq_num = (cqe->type & EHEA_CQE_TYPE_RQ) >> 5;
-       if ((cqe->status & EHEA_CQE_STAT_ERR_MASK) == 0)
-               return 0;
-       if (((cqe->status & EHEA_CQE_STAT_ERR_TCP) != 0) &&
-           (cqe->header_length == 0))
-               return 0;
-       return -EINVAL;
-}
-
-static inline void ehea_fill_skb(struct net_device *dev,
-                                struct sk_buff *skb, struct ehea_cqe *cqe,
-                                struct ehea_port_res *pr)
-{
-       int length = cqe->num_bytes_transfered - 4;     /*remove CRC */
-
-       skb_put(skb, length);
-       skb->protocol = eth_type_trans(skb, dev);
-
-       /* The packet was not an IPV4 packet so a complemented checksum was
-          calculated. The value is found in the Internet Checksum field. */
-       if (cqe->status & EHEA_CQE_BLIND_CKSUM) {
-               skb->ip_summed = CHECKSUM_COMPLETE;
-               skb->csum = csum_unfold(~cqe->inet_checksum_value);
-       } else
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-       skb_record_rx_queue(skb, pr - &pr->port->port_res[0]);
-}
-
-static inline struct sk_buff *get_skb_by_index(struct sk_buff **skb_array,
-                                              int arr_len,
-                                              struct ehea_cqe *cqe)
-{
-       int skb_index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id);
-       struct sk_buff *skb;
-       void *pref;
-       int x;
-
-       x = skb_index + 1;
-       x &= (arr_len - 1);
-
-       pref = skb_array[x];
-       if (pref) {
-               prefetchw(pref);
-               prefetchw(pref + EHEA_CACHE_LINE);
-
-               pref = (skb_array[x]->data);
-               prefetch(pref);
-               prefetch(pref + EHEA_CACHE_LINE);
-               prefetch(pref + EHEA_CACHE_LINE * 2);
-               prefetch(pref + EHEA_CACHE_LINE * 3);
-       }
-
-       skb = skb_array[skb_index];
-       skb_array[skb_index] = NULL;
-       return skb;
-}
-
-static inline struct sk_buff *get_skb_by_index_ll(struct sk_buff **skb_array,
-                                                 int arr_len, int wqe_index)
-{
-       struct sk_buff *skb;
-       void *pref;
-       int x;
-
-       x = wqe_index + 1;
-       x &= (arr_len - 1);
-
-       pref = skb_array[x];
-       if (pref) {
-               prefetchw(pref);
-               prefetchw(pref + EHEA_CACHE_LINE);
-
-               pref = (skb_array[x]->data);
-               prefetchw(pref);
-               prefetchw(pref + EHEA_CACHE_LINE);
-       }
-
-       skb = skb_array[wqe_index];
-       skb_array[wqe_index] = NULL;
-       return skb;
-}
-
-static int ehea_treat_poll_error(struct ehea_port_res *pr, int rq,
-                                struct ehea_cqe *cqe, int *processed_rq2,
-                                int *processed_rq3)
-{
-       struct sk_buff *skb;
-
-       if (cqe->status & EHEA_CQE_STAT_ERR_TCP)
-               pr->p_stats.err_tcp_cksum++;
-       if (cqe->status & EHEA_CQE_STAT_ERR_IP)
-               pr->p_stats.err_ip_cksum++;
-       if (cqe->status & EHEA_CQE_STAT_ERR_CRC)
-               pr->p_stats.err_frame_crc++;
-
-       if (rq == 2) {
-               *processed_rq2 += 1;
-               skb = get_skb_by_index(pr->rq2_skba.arr, pr->rq2_skba.len, cqe);
-               dev_kfree_skb(skb);
-       } else if (rq == 3) {
-               *processed_rq3 += 1;
-               skb = get_skb_by_index(pr->rq3_skba.arr, pr->rq3_skba.len, cqe);
-               dev_kfree_skb(skb);
-       }
-
-       if (cqe->status & EHEA_CQE_STAT_FAT_ERR_MASK) {
-               if (netif_msg_rx_err(pr->port)) {
-                       pr_err("Critical receive error for QP %d. Resetting port.\n",
-                              pr->qp->init_attr.qp_nr);
-                       ehea_dump(cqe, sizeof(*cqe), "CQE");
-               }
-               ehea_schedule_port_reset(pr->port);
-               return 1;
-       }
-
-       return 0;
-}
-
-static int ehea_proc_rwqes(struct net_device *dev,
-                          struct ehea_port_res *pr,
-                          int budget)
-{
-       struct ehea_port *port = pr->port;
-       struct ehea_qp *qp = pr->qp;
-       struct ehea_cqe *cqe;
-       struct sk_buff *skb;
-       struct sk_buff **skb_arr_rq1 = pr->rq1_skba.arr;
-       struct sk_buff **skb_arr_rq2 = pr->rq2_skba.arr;
-       struct sk_buff **skb_arr_rq3 = pr->rq3_skba.arr;
-       int skb_arr_rq1_len = pr->rq1_skba.len;
-       int skb_arr_rq2_len = pr->rq2_skba.len;
-       int skb_arr_rq3_len = pr->rq3_skba.len;
-       int processed, processed_rq1, processed_rq2, processed_rq3;
-       u64 processed_bytes = 0;
-       int wqe_index, last_wqe_index, rq, port_reset;
-
-       processed = processed_rq1 = processed_rq2 = processed_rq3 = 0;
-       last_wqe_index = 0;
-
-       cqe = ehea_poll_rq1(qp, &wqe_index);
-       while ((processed < budget) && cqe) {
-               ehea_inc_rq1(qp);
-               processed_rq1++;
-               processed++;
-               if (netif_msg_rx_status(port))
-                       ehea_dump(cqe, sizeof(*cqe), "CQE");
-
-               last_wqe_index = wqe_index;
-               rmb();
-               if (!ehea_check_cqe(cqe, &rq)) {
-                       if (rq == 1) {
-                               /* LL RQ1 */
-                               skb = get_skb_by_index_ll(skb_arr_rq1,
-                                                         skb_arr_rq1_len,
-                                                         wqe_index);
-                               if (unlikely(!skb)) {
-                                       netif_info(port, rx_err, dev,
-                                                 "LL rq1: skb=NULL\n");
-
-                                       skb = netdev_alloc_skb(dev,
-                                                              EHEA_L_PKT_SIZE);
-                                       if (!skb)
-                                               break;
-                               }
-                               skb_copy_to_linear_data(skb, ((char *)cqe) + 64,
-                                                cqe->num_bytes_transfered - 4);
-                               ehea_fill_skb(dev, skb, cqe, pr);
-                       } else if (rq == 2) {
-                               /* RQ2 */
-                               skb = get_skb_by_index(skb_arr_rq2,
-                                                      skb_arr_rq2_len, cqe);
-                               if (unlikely(!skb)) {
-                                       netif_err(port, rx_err, dev,
-                                                 "rq2: skb=NULL\n");
-                                       break;
-                               }
-                               ehea_fill_skb(dev, skb, cqe, pr);
-                               processed_rq2++;
-                       } else {
-                               /* RQ3 */
-                               skb = get_skb_by_index(skb_arr_rq3,
-                                                      skb_arr_rq3_len, cqe);
-                               if (unlikely(!skb)) {
-                                       netif_err(port, rx_err, dev,
-                                                 "rq3: skb=NULL\n");
-                                       break;
-                               }
-                               ehea_fill_skb(dev, skb, cqe, pr);
-                               processed_rq3++;
-                       }
-
-                       processed_bytes += skb->len;
-
-                       if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)
-                               __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
-                                                      cqe->vlan_tag);
-
-                       napi_gro_receive(&pr->napi, skb);
-               } else {
-                       pr->p_stats.poll_receive_errors++;
-                       port_reset = ehea_treat_poll_error(pr, rq, cqe,
-                                                          &processed_rq2,
-                                                          &processed_rq3);
-                       if (port_reset)
-                               break;
-               }
-               cqe = ehea_poll_rq1(qp, &wqe_index);
-       }
-
-       pr->rx_packets += processed;
-       pr->rx_bytes += processed_bytes;
-
-       ehea_refill_rq1(pr, last_wqe_index, processed_rq1);
-       ehea_refill_rq2(pr, processed_rq2);
-       ehea_refill_rq3(pr, processed_rq3);
-
-       return processed;
-}
-
-#define SWQE_RESTART_CHECK 0xdeadbeaff00d0000ull
-
-static void reset_sq_restart_flag(struct ehea_port *port)
-{
-       int i;
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               struct ehea_port_res *pr = &port->port_res[i];
-               pr->sq_restart_flag = 0;
-       }
-       wake_up(&port->restart_wq);
-}
-
-static void check_sqs(struct ehea_port *port)
-{
-       struct ehea_swqe *swqe;
-       int swqe_index;
-       int i;
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               struct ehea_port_res *pr = &port->port_res[i];
-               int ret;
-               swqe = ehea_get_swqe(pr->qp, &swqe_index);
-               memset(swqe, 0, SWQE_HEADER_SIZE);
-               atomic_dec(&pr->swqe_avail);
-
-               swqe->tx_control |= EHEA_SWQE_PURGE;
-               swqe->wr_id = SWQE_RESTART_CHECK;
-               swqe->tx_control |= EHEA_SWQE_SIGNALLED_COMPLETION;
-               swqe->tx_control |= EHEA_SWQE_IMM_DATA_PRESENT;
-               swqe->immediate_data_length = 80;
-
-               ehea_post_swqe(pr->qp, swqe);
-
-               ret = wait_event_timeout(port->restart_wq,
-                                        pr->sq_restart_flag == 0,
-                                        msecs_to_jiffies(100));
-
-               if (!ret) {
-                       pr_err("HW/SW queues out of sync\n");
-                       ehea_schedule_port_reset(pr->port);
-                       return;
-               }
-       }
-}
-
-
-static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
-{
-       struct sk_buff *skb;
-       struct ehea_cq *send_cq = pr->send_cq;
-       struct ehea_cqe *cqe;
-       int quota = my_quota;
-       int cqe_counter = 0;
-       int swqe_av = 0;
-       int index;
-       struct netdev_queue *txq = netdev_get_tx_queue(pr->port->netdev,
-                                               pr - &pr->port->port_res[0]);
-
-       cqe = ehea_poll_cq(send_cq);
-       while (cqe && (quota > 0)) {
-               ehea_inc_cq(send_cq);
-
-               cqe_counter++;
-               rmb();
-
-               if (cqe->wr_id == SWQE_RESTART_CHECK) {
-                       pr->sq_restart_flag = 1;
-                       swqe_av++;
-                       break;
-               }
-
-               if (cqe->status & EHEA_CQE_STAT_ERR_MASK) {
-                       pr_err("Bad send completion status=0x%04X\n",
-                              cqe->status);
-
-                       if (netif_msg_tx_err(pr->port))
-                               ehea_dump(cqe, sizeof(*cqe), "Send CQE");
-
-                       if (cqe->status & EHEA_CQE_STAT_RESET_MASK) {
-                               pr_err("Resetting port\n");
-                               ehea_schedule_port_reset(pr->port);
-                               break;
-                       }
-               }
-
-               if (netif_msg_tx_done(pr->port))
-                       ehea_dump(cqe, sizeof(*cqe), "CQE");
-
-               if (likely(EHEA_BMASK_GET(EHEA_WR_ID_TYPE, cqe->wr_id)
-                          == EHEA_SWQE2_TYPE)) {
-
-                       index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id);
-                       skb = pr->sq_skba.arr[index];
-                       dev_consume_skb_any(skb);
-                       pr->sq_skba.arr[index] = NULL;
-               }
-
-               swqe_av += EHEA_BMASK_GET(EHEA_WR_ID_REFILL, cqe->wr_id);
-               quota--;
-
-               cqe = ehea_poll_cq(send_cq);
-       }
-
-       ehea_update_feca(send_cq, cqe_counter);
-       atomic_add(swqe_av, &pr->swqe_avail);
-
-       if (unlikely(netif_tx_queue_stopped(txq) &&
-                    (atomic_read(&pr->swqe_avail) >= pr->swqe_refill_th))) {
-               __netif_tx_lock(txq, smp_processor_id());
-               if (netif_tx_queue_stopped(txq) &&
-                   (atomic_read(&pr->swqe_avail) >= pr->swqe_refill_th))
-                       netif_tx_wake_queue(txq);
-               __netif_tx_unlock(txq);
-       }
-
-       wake_up(&pr->port->swqe_avail_wq);
-
-       return cqe;
-}
-
-#define EHEA_POLL_MAX_CQES 65535
-
-static int ehea_poll(struct napi_struct *napi, int budget)
-{
-       struct ehea_port_res *pr = container_of(napi, struct ehea_port_res,
-                                               napi);
-       struct net_device *dev = pr->port->netdev;
-       struct ehea_cqe *cqe;
-       struct ehea_cqe *cqe_skb = NULL;
-       int wqe_index;
-       int rx = 0;
-
-       cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
-       rx += ehea_proc_rwqes(dev, pr, budget - rx);
-
-       while (rx != budget) {
-               napi_complete(napi);
-               ehea_reset_cq_ep(pr->recv_cq);
-               ehea_reset_cq_ep(pr->send_cq);
-               ehea_reset_cq_n1(pr->recv_cq);
-               ehea_reset_cq_n1(pr->send_cq);
-               rmb();
-               cqe = ehea_poll_rq1(pr->qp, &wqe_index);
-               cqe_skb = ehea_poll_cq(pr->send_cq);
-
-               if (!cqe && !cqe_skb)
-                       return rx;
-
-               if (!napi_schedule(napi))
-                       return rx;
-
-               cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
-               rx += ehea_proc_rwqes(dev, pr, budget - rx);
-       }
-
-       return rx;
-}
-
-static irqreturn_t ehea_recv_irq_handler(int irq, void *param)
-{
-       struct ehea_port_res *pr = param;
-
-       napi_schedule(&pr->napi);
-
-       return IRQ_HANDLED;
-}
-
-static irqreturn_t ehea_qp_aff_irq_handler(int irq, void *param)
-{
-       struct ehea_port *port = param;
-       struct ehea_eqe *eqe;
-       struct ehea_qp *qp;
-       u32 qp_token;
-       u64 resource_type, aer, aerr;
-       int reset_port = 0;
-
-       eqe = ehea_poll_eq(port->qp_eq);
-
-       while (eqe) {
-               qp_token = EHEA_BMASK_GET(EHEA_EQE_QP_TOKEN, eqe->entry);
-               pr_err("QP aff_err: entry=0x%llx, token=0x%x\n",
-                      eqe->entry, qp_token);
-
-               qp = port->port_res[qp_token].qp;
-
-               resource_type = ehea_error_data(port->adapter, qp->fw_handle,
-                                               &aer, &aerr);
-
-               if (resource_type == EHEA_AER_RESTYPE_QP) {
-                       if ((aer & EHEA_AER_RESET_MASK) ||
-                           (aerr & EHEA_AERR_RESET_MASK))
-                                reset_port = 1;
-               } else
-                       reset_port = 1;   /* Reset in case of CQ or EQ error */
-
-               eqe = ehea_poll_eq(port->qp_eq);
-       }
-
-       if (reset_port) {
-               pr_err("Resetting port\n");
-               ehea_schedule_port_reset(port);
-       }
-
-       return IRQ_HANDLED;
-}
-
-static struct ehea_port *ehea_get_port(struct ehea_adapter *adapter,
-                                      int logical_port)
-{
-       int i;
-
-       for (i = 0; i < EHEA_MAX_PORTS; i++)
-               if (adapter->port[i])
-                       if (adapter->port[i]->logical_port_id == logical_port)
-                               return adapter->port[i];
-       return NULL;
-}
-
-int ehea_sense_port_attr(struct ehea_port *port)
-{
-       int ret;
-       u64 hret;
-       struct hcp_ehea_port_cb0 *cb0;
-
-       /* may be called via ehea_neq_tasklet() */
-       cb0 = (void *)get_zeroed_page(GFP_ATOMIC);
-       if (!cb0) {
-               pr_err("no mem for cb0\n");
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       hret = ehea_h_query_ehea_port(port->adapter->handle,
-                                     port->logical_port_id, H_PORT_CB0,
-                                     EHEA_BMASK_SET(H_PORT_CB0_ALL, 0xFFFF),
-                                     cb0);
-       if (hret != H_SUCCESS) {
-               ret = -EIO;
-               goto out_free;
-       }
-
-       /* MAC address */
-       port->mac_addr = cb0->port_mac_addr << 16;
-
-       if (!is_valid_ether_addr((u8 *)&port->mac_addr)) {
-               ret = -EADDRNOTAVAIL;
-               goto out_free;
-       }
-
-       /* Port speed */
-       switch (cb0->port_speed) {
-       case H_SPEED_10M_H:
-               port->port_speed = EHEA_SPEED_10M;
-               port->full_duplex = 0;
-               break;
-       case H_SPEED_10M_F:
-               port->port_speed = EHEA_SPEED_10M;
-               port->full_duplex = 1;
-               break;
-       case H_SPEED_100M_H:
-               port->port_speed = EHEA_SPEED_100M;
-               port->full_duplex = 0;
-               break;
-       case H_SPEED_100M_F:
-               port->port_speed = EHEA_SPEED_100M;
-               port->full_duplex = 1;
-               break;
-       case H_SPEED_1G_F:
-               port->port_speed = EHEA_SPEED_1G;
-               port->full_duplex = 1;
-               break;
-       case H_SPEED_10G_F:
-               port->port_speed = EHEA_SPEED_10G;
-               port->full_duplex = 1;
-               break;
-       default:
-               port->port_speed = 0;
-               port->full_duplex = 0;
-               break;
-       }
-
-       port->autoneg = 1;
-       port->num_mcs = cb0->num_default_qps;
-
-       /* Number of default QPs */
-       if (use_mcs)
-               port->num_def_qps = cb0->num_default_qps;
-       else
-               port->num_def_qps = 1;
-
-       if (!port->num_def_qps) {
-               ret = -EINVAL;
-               goto out_free;
-       }
-
-       ret = 0;
-out_free:
-       if (ret || netif_msg_probe(port))
-               ehea_dump(cb0, sizeof(*cb0), "ehea_sense_port_attr");
-       free_page((unsigned long)cb0);
-out:
-       return ret;
-}
-
-int ehea_set_portspeed(struct ehea_port *port, u32 port_speed)
-{
-       struct hcp_ehea_port_cb4 *cb4;
-       u64 hret;
-       int ret = 0;
-
-       cb4 = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!cb4) {
-               pr_err("no mem for cb4\n");
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       cb4->port_speed = port_speed;
-
-       netif_carrier_off(port->netdev);
-
-       hret = ehea_h_modify_ehea_port(port->adapter->handle,
-                                      port->logical_port_id,
-                                      H_PORT_CB4, H_PORT_CB4_SPEED, cb4);
-       if (hret == H_SUCCESS) {
-               port->autoneg = port_speed == EHEA_SPEED_AUTONEG ? 1 : 0;
-
-               hret = ehea_h_query_ehea_port(port->adapter->handle,
-                                             port->logical_port_id,
-                                             H_PORT_CB4, H_PORT_CB4_SPEED,
-                                             cb4);
-               if (hret == H_SUCCESS) {
-                       switch (cb4->port_speed) {
-                       case H_SPEED_10M_H:
-                               port->port_speed = EHEA_SPEED_10M;
-                               port->full_duplex = 0;
-                               break;
-                       case H_SPEED_10M_F:
-                               port->port_speed = EHEA_SPEED_10M;
-                               port->full_duplex = 1;
-                               break;
-                       case H_SPEED_100M_H:
-                               port->port_speed = EHEA_SPEED_100M;
-                               port->full_duplex = 0;
-                               break;
-                       case H_SPEED_100M_F:
-                               port->port_speed = EHEA_SPEED_100M;
-                               port->full_duplex = 1;
-                               break;
-                       case H_SPEED_1G_F:
-                               port->port_speed = EHEA_SPEED_1G;
-                               port->full_duplex = 1;
-                               break;
-                       case H_SPEED_10G_F:
-                               port->port_speed = EHEA_SPEED_10G;
-                               port->full_duplex = 1;
-                               break;
-                       default:
-                               port->port_speed = 0;
-                               port->full_duplex = 0;
-                               break;
-                       }
-               } else {
-                       pr_err("Failed sensing port speed\n");
-                       ret = -EIO;
-               }
-       } else {
-               if (hret == H_AUTHORITY) {
-                       pr_info("Hypervisor denied setting port speed\n");
-                       ret = -EPERM;
-               } else {
-                       ret = -EIO;
-                       pr_err("Failed setting port speed\n");
-               }
-       }
-       if (!prop_carrier_state || (port->phy_link == EHEA_PHY_LINK_UP))
-               netif_carrier_on(port->netdev);
-
-       free_page((unsigned long)cb4);
-out:
-       return ret;
-}
-
-static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
-{
-       int ret;
-       u8 ec;
-       u8 portnum;
-       struct ehea_port *port;
-       struct net_device *dev;
-
-       ec = EHEA_BMASK_GET(NEQE_EVENT_CODE, eqe);
-       portnum = EHEA_BMASK_GET(NEQE_PORTNUM, eqe);
-       port = ehea_get_port(adapter, portnum);
-       if (!port) {
-               netdev_err(NULL, "unknown portnum %x\n", portnum);
-               return;
-       }
-       dev = port->netdev;
-
-       switch (ec) {
-       case EHEA_EC_PORTSTATE_CHG:     /* port state change */
-
-               if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
-                       if (!netif_carrier_ok(dev)) {
-                               ret = ehea_sense_port_attr(port);
-                               if (ret) {
-                                       netdev_err(dev, "failed resensing port attributes\n");
-                                       break;
-                               }
-
-                               netif_info(port, link, dev,
-                                          "Logical port up: %dMbps %s Duplex\n",
-                                          port->port_speed,
-                                          port->full_duplex == 1 ?
-                                          "Full" : "Half");
-
-                               netif_carrier_on(dev);
-                               netif_wake_queue(dev);
-                       }
-               } else
-                       if (netif_carrier_ok(dev)) {
-                               netif_info(port, link, dev,
-                                          "Logical port down\n");
-                               netif_carrier_off(dev);
-                               netif_tx_disable(dev);
-                       }
-
-               if (EHEA_BMASK_GET(NEQE_EXTSWITCH_PORT_UP, eqe)) {
-                       port->phy_link = EHEA_PHY_LINK_UP;
-                       netif_info(port, link, dev,
-                                  "Physical port up\n");
-                       if (prop_carrier_state)
-                               netif_carrier_on(dev);
-               } else {
-                       port->phy_link = EHEA_PHY_LINK_DOWN;
-                       netif_info(port, link, dev,
-                                  "Physical port down\n");
-                       if (prop_carrier_state)
-                               netif_carrier_off(dev);
-               }
-
-               if (EHEA_BMASK_GET(NEQE_EXTSWITCH_PRIMARY, eqe))
-                       netdev_info(dev,
-                                   "External switch port is primary port\n");
-               else
-                       netdev_info(dev,
-                                   "External switch port is backup port\n");
-
-               break;
-       case EHEA_EC_ADAPTER_MALFUNC:
-               netdev_err(dev, "Adapter malfunction\n");
-               break;
-       case EHEA_EC_PORT_MALFUNC:
-               netdev_info(dev, "Port malfunction\n");
-               netif_carrier_off(dev);
-               netif_tx_disable(dev);
-               break;
-       default:
-               netdev_err(dev, "unknown event code %x, eqe=0x%llX\n", ec, eqe);
-               break;
-       }
-}
-
-static void ehea_neq_tasklet(struct tasklet_struct *t)
-{
-       struct ehea_adapter *adapter = from_tasklet(adapter, t, neq_tasklet);
-       struct ehea_eqe *eqe;
-       u64 event_mask;
-
-       eqe = ehea_poll_eq(adapter->neq);
-       pr_debug("eqe=%p\n", eqe);
-
-       while (eqe) {
-               pr_debug("*eqe=%lx\n", (unsigned long) eqe->entry);
-               ehea_parse_eqe(adapter, eqe->entry);
-               eqe = ehea_poll_eq(adapter->neq);
-               pr_debug("next eqe=%p\n", eqe);
-       }
-
-       event_mask = EHEA_BMASK_SET(NELR_PORTSTATE_CHG, 1)
-                  | EHEA_BMASK_SET(NELR_ADAPTER_MALFUNC, 1)
-                  | EHEA_BMASK_SET(NELR_PORT_MALFUNC, 1);
-
-       ehea_h_reset_events(adapter->handle,
-                           adapter->neq->fw_handle, event_mask);
-}
-
-static irqreturn_t ehea_interrupt_neq(int irq, void *param)
-{
-       struct ehea_adapter *adapter = param;
-       tasklet_hi_schedule(&adapter->neq_tasklet);
-       return IRQ_HANDLED;
-}
-
-
-static int ehea_fill_port_res(struct ehea_port_res *pr)
-{
-       int ret;
-       struct ehea_qp_init_attr *init_attr = &pr->qp->init_attr;
-
-       ehea_init_fill_rq1(pr, pr->rq1_skba.len);
-
-       ret = ehea_refill_rq2(pr, init_attr->act_nr_rwqes_rq2 - 1);
-
-       ret |= ehea_refill_rq3(pr, init_attr->act_nr_rwqes_rq3 - 1);
-
-       return ret;
-}
-
-static int ehea_reg_interrupts(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct ehea_port_res *pr;
-       int i, ret;
-
-
-       snprintf(port->int_aff_name, EHEA_IRQ_NAME_SIZE - 1, "%s-aff",
-                dev->name);
-
-       ret = ibmebus_request_irq(port->qp_eq->attr.ist1,
-                                 ehea_qp_aff_irq_handler,
-                                 0, port->int_aff_name, port);
-       if (ret) {
-               netdev_err(dev, "failed registering irq for qp_aff_irq_handler:ist=%X\n",
-                          port->qp_eq->attr.ist1);
-               goto out_free_qpeq;
-       }
-
-       netif_info(port, ifup, dev,
-                  "irq_handle 0x%X for function qp_aff_irq_handler registered\n",
-                  port->qp_eq->attr.ist1);
-
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               pr = &port->port_res[i];
-               snprintf(pr->int_send_name, EHEA_IRQ_NAME_SIZE - 1,
-                        "%s-queue%d", dev->name, i);
-               ret = ibmebus_request_irq(pr->eq->attr.ist1,
-                                         ehea_recv_irq_handler,
-                                         0, pr->int_send_name, pr);
-               if (ret) {
-                       netdev_err(dev, "failed registering irq for ehea_queue port_res_nr:%d, ist=%X\n",
-                                  i, pr->eq->attr.ist1);
-                       goto out_free_req;
-               }
-               netif_info(port, ifup, dev,
-                          "irq_handle 0x%X for function ehea_queue_int %d registered\n",
-                          pr->eq->attr.ist1, i);
-       }
-out:
-       return ret;
-
-
-out_free_req:
-       while (--i >= 0) {
-               u32 ist = port->port_res[i].eq->attr.ist1;
-               ibmebus_free_irq(ist, &port->port_res[i]);
-       }
-
-out_free_qpeq:
-       ibmebus_free_irq(port->qp_eq->attr.ist1, port);
-       i = port->num_def_qps;
-
-       goto out;
-
-}
-
-static void ehea_free_interrupts(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct ehea_port_res *pr;
-       int i;
-
-       /* send */
-
-       for (i = 0; i < port->num_def_qps; i++) {
-               pr = &port->port_res[i];
-               ibmebus_free_irq(pr->eq->attr.ist1, pr);
-               netif_info(port, intr, dev,
-                          "free send irq for res %d with handle 0x%X\n",
-                          i, pr->eq->attr.ist1);
-       }
-
-       /* associated events */
-       ibmebus_free_irq(port->qp_eq->attr.ist1, port);
-       netif_info(port, intr, dev,
-                  "associated event interrupt for handle 0x%X freed\n",
-                  port->qp_eq->attr.ist1);
-}
-
-static int ehea_configure_port(struct ehea_port *port)
-{
-       int ret, i;
-       u64 hret, mask;
-       struct hcp_ehea_port_cb0 *cb0;
-
-       ret = -ENOMEM;
-       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!cb0)
-               goto out;
-
-       cb0->port_rc = EHEA_BMASK_SET(PXLY_RC_VALID, 1)
-                    | EHEA_BMASK_SET(PXLY_RC_IP_CHKSUM, 1)
-                    | EHEA_BMASK_SET(PXLY_RC_TCP_UDP_CHKSUM, 1)
-                    | EHEA_BMASK_SET(PXLY_RC_VLAN_XTRACT, 1)
-                    | EHEA_BMASK_SET(PXLY_RC_VLAN_TAG_FILTER,
-                                     PXLY_RC_VLAN_FILTER)
-                    | EHEA_BMASK_SET(PXLY_RC_JUMBO_FRAME, 1);
-
-       for (i = 0; i < port->num_mcs; i++)
-               if (use_mcs)
-                       cb0->default_qpn_arr[i] =
-                               port->port_res[i].qp->init_attr.qp_nr;
-               else
-                       cb0->default_qpn_arr[i] =
-                               port->port_res[0].qp->init_attr.qp_nr;
-
-       if (netif_msg_ifup(port))
-               ehea_dump(cb0, sizeof(*cb0), "ehea_configure_port");
-
-       mask = EHEA_BMASK_SET(H_PORT_CB0_PRC, 1)
-            | EHEA_BMASK_SET(H_PORT_CB0_DEFQPNARRAY, 1);
-
-       hret = ehea_h_modify_ehea_port(port->adapter->handle,
-                                      port->logical_port_id,
-                                      H_PORT_CB0, mask, cb0);
-       ret = -EIO;
-       if (hret != H_SUCCESS)
-               goto out_free;
-
-       ret = 0;
-
-out_free:
-       free_page((unsigned long)cb0);
-out:
-       return ret;
-}
-
-static int ehea_gen_smrs(struct ehea_port_res *pr)
-{
-       int ret;
-       struct ehea_adapter *adapter = pr->port->adapter;
-
-       ret = ehea_gen_smr(adapter, &adapter->mr, &pr->send_mr);
-       if (ret)
-               goto out;
-
-       ret = ehea_gen_smr(adapter, &adapter->mr, &pr->recv_mr);
-       if (ret)
-               goto out_free;
-
-       return 0;
-
-out_free:
-       ehea_rem_mr(&pr->send_mr);
-out:
-       pr_err("Generating SMRS failed\n");
-       return -EIO;
-}
-
-static int ehea_rem_smrs(struct ehea_port_res *pr)
-{
-       if ((ehea_rem_mr(&pr->send_mr)) ||
-           (ehea_rem_mr(&pr->recv_mr)))
-               return -EIO;
-       else
-               return 0;
-}
-
-static int ehea_init_q_skba(struct ehea_q_skb_arr *q_skba, int max_q_entries)
-{
-       int arr_size = sizeof(void *) * max_q_entries;
-
-       q_skba->arr = vzalloc(arr_size);
-       if (!q_skba->arr)
-               return -ENOMEM;
-
-       q_skba->len = max_q_entries;
-       q_skba->index = 0;
-       q_skba->os_skbs = 0;
-
-       return 0;
-}
-
-static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr,
-                             struct port_res_cfg *pr_cfg, int queue_token)
-{
-       struct ehea_adapter *adapter = port->adapter;
-       enum ehea_eq_type eq_type = EHEA_EQ;
-       struct ehea_qp_init_attr *init_attr = NULL;
-       int ret = -EIO;
-       u64 tx_bytes, rx_bytes, tx_packets, rx_packets;
-
-       tx_bytes = pr->tx_bytes;
-       tx_packets = pr->tx_packets;
-       rx_bytes = pr->rx_bytes;
-       rx_packets = pr->rx_packets;
-
-       memset(pr, 0, sizeof(struct ehea_port_res));
-
-       pr->tx_bytes = tx_bytes;
-       pr->tx_packets = tx_packets;
-       pr->rx_bytes = rx_bytes;
-       pr->rx_packets = rx_packets;
-
-       pr->port = port;
-
-       pr->eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0);
-       if (!pr->eq) {
-               pr_err("create_eq failed (eq)\n");
-               goto out_free;
-       }
-
-       pr->recv_cq = ehea_create_cq(adapter, pr_cfg->max_entries_rcq,
-                                    pr->eq->fw_handle,
-                                    port->logical_port_id);
-       if (!pr->recv_cq) {
-               pr_err("create_cq failed (cq_recv)\n");
-               goto out_free;
-       }
-
-       pr->send_cq = ehea_create_cq(adapter, pr_cfg->max_entries_scq,
-                                    pr->eq->fw_handle,
-                                    port->logical_port_id);
-       if (!pr->send_cq) {
-               pr_err("create_cq failed (cq_send)\n");
-               goto out_free;
-       }
-
-       if (netif_msg_ifup(port))
-               pr_info("Send CQ: act_nr_cqes=%d, Recv CQ: act_nr_cqes=%d\n",
-                       pr->send_cq->attr.act_nr_of_cqes,
-                       pr->recv_cq->attr.act_nr_of_cqes);
-
-       init_attr = kzalloc_obj(*init_attr);
-       if (!init_attr) {
-               ret = -ENOMEM;
-               pr_err("no mem for ehea_qp_init_attr\n");
-               goto out_free;
-       }
-
-       init_attr->low_lat_rq1 = 1;
-       init_attr->signalingtype = 1;   /* generate CQE if specified in WQE */
-       init_attr->rq_count = 3;
-       init_attr->qp_token = queue_token;
-       init_attr->max_nr_send_wqes = pr_cfg->max_entries_sq;
-       init_attr->max_nr_rwqes_rq1 = pr_cfg->max_entries_rq1;
-       init_attr->max_nr_rwqes_rq2 = pr_cfg->max_entries_rq2;
-       init_attr->max_nr_rwqes_rq3 = pr_cfg->max_entries_rq3;
-       init_attr->wqe_size_enc_sq = EHEA_SG_SQ;
-       init_attr->wqe_size_enc_rq1 = EHEA_SG_RQ1;
-       init_attr->wqe_size_enc_rq2 = EHEA_SG_RQ2;
-       init_attr->wqe_size_enc_rq3 = EHEA_SG_RQ3;
-       init_attr->rq2_threshold = EHEA_RQ2_THRESHOLD;
-       init_attr->rq3_threshold = EHEA_RQ3_THRESHOLD;
-       init_attr->port_nr = port->logical_port_id;
-       init_attr->send_cq_handle = pr->send_cq->fw_handle;
-       init_attr->recv_cq_handle = pr->recv_cq->fw_handle;
-       init_attr->aff_eq_handle = port->qp_eq->fw_handle;
-
-       pr->qp = ehea_create_qp(adapter, adapter->pd, init_attr);
-       if (!pr->qp) {
-               pr_err("create_qp failed\n");
-               ret = -EIO;
-               goto out_free;
-       }
-
-       if (netif_msg_ifup(port))
-               pr_info("QP: qp_nr=%d\n act_nr_snd_wqe=%d\n nr_rwqe_rq1=%d\n nr_rwqe_rq2=%d\n nr_rwqe_rq3=%d\n",
-                       init_attr->qp_nr,
-                       init_attr->act_nr_send_wqes,
-                       init_attr->act_nr_rwqes_rq1,
-                       init_attr->act_nr_rwqes_rq2,
-                       init_attr->act_nr_rwqes_rq3);
-
-       pr->sq_skba_size = init_attr->act_nr_send_wqes + 1;
-
-       ret = ehea_init_q_skba(&pr->sq_skba, pr->sq_skba_size);
-       ret |= ehea_init_q_skba(&pr->rq1_skba, init_attr->act_nr_rwqes_rq1 + 1);
-       ret |= ehea_init_q_skba(&pr->rq2_skba, init_attr->act_nr_rwqes_rq2 + 1);
-       ret |= ehea_init_q_skba(&pr->rq3_skba, init_attr->act_nr_rwqes_rq3 + 1);
-       if (ret)
-               goto out_free;
-
-       pr->swqe_refill_th = init_attr->act_nr_send_wqes / 10;
-       if (ehea_gen_smrs(pr) != 0) {
-               ret = -EIO;
-               goto out_free;
-       }
-
-       atomic_set(&pr->swqe_avail, init_attr->act_nr_send_wqes - 1);
-
-       kfree(init_attr);
-
-       netif_napi_add(pr->port->netdev, &pr->napi, ehea_poll);
-
-       ret = 0;
-       goto out;
-
-out_free:
-       kfree(init_attr);
-       vfree(pr->sq_skba.arr);
-       vfree(pr->rq1_skba.arr);
-       vfree(pr->rq2_skba.arr);
-       vfree(pr->rq3_skba.arr);
-       ehea_destroy_qp(pr->qp);
-       ehea_destroy_cq(pr->send_cq);
-       ehea_destroy_cq(pr->recv_cq);
-       ehea_destroy_eq(pr->eq);
-out:
-       return ret;
-}
-
-static int ehea_clean_portres(struct ehea_port *port, struct ehea_port_res *pr)
-{
-       int ret, i;
-
-       if (pr->qp)
-               netif_napi_del(&pr->napi);
-
-       ret = ehea_destroy_qp(pr->qp);
-
-       if (!ret) {
-               ehea_destroy_cq(pr->send_cq);
-               ehea_destroy_cq(pr->recv_cq);
-               ehea_destroy_eq(pr->eq);
-
-               for (i = 0; i < pr->rq1_skba.len; i++)
-                       dev_kfree_skb(pr->rq1_skba.arr[i]);
-
-               for (i = 0; i < pr->rq2_skba.len; i++)
-                       dev_kfree_skb(pr->rq2_skba.arr[i]);
-
-               for (i = 0; i < pr->rq3_skba.len; i++)
-                       dev_kfree_skb(pr->rq3_skba.arr[i]);
-
-               for (i = 0; i < pr->sq_skba.len; i++)
-                       dev_kfree_skb(pr->sq_skba.arr[i]);
-
-               vfree(pr->rq1_skba.arr);
-               vfree(pr->rq2_skba.arr);
-               vfree(pr->rq3_skba.arr);
-               vfree(pr->sq_skba.arr);
-               ret = ehea_rem_smrs(pr);
-       }
-       return ret;
-}
-
-static void write_swqe2_immediate(struct sk_buff *skb, struct ehea_swqe *swqe,
-                                 u32 lkey)
-{
-       int skb_data_size = skb_headlen(skb);
-       u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
-       struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
-       unsigned int immediate_len = SWQE2_MAX_IMM;
-
-       swqe->descriptors = 0;
-
-       if (skb_is_gso(skb)) {
-               swqe->tx_control |= EHEA_SWQE_TSO;
-               swqe->mss = skb_shinfo(skb)->gso_size;
-               /*
-                * For TSO packets we only copy the headers into the
-                * immediate area.
-                */
-               immediate_len = skb_tcp_all_headers(skb);
-       }
-
-       if (skb_is_gso(skb) || skb_data_size >= SWQE2_MAX_IMM) {
-               skb_copy_from_linear_data(skb, imm_data, immediate_len);
-               swqe->immediate_data_length = immediate_len;
-
-               if (skb_data_size > immediate_len) {
-                       sg1entry->l_key = lkey;
-                       sg1entry->len = skb_data_size - immediate_len;
-                       sg1entry->vaddr =
-                               ehea_map_vaddr(skb->data + immediate_len);
-                       swqe->descriptors++;
-               }
-       } else {
-               skb_copy_from_linear_data(skb, imm_data, skb_data_size);
-               swqe->immediate_data_length = skb_data_size;
-       }
-}
-
-static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
-                                   struct ehea_swqe *swqe, u32 lkey)
-{
-       struct ehea_vsgentry *sg_list, *sg1entry, *sgentry;
-       skb_frag_t *frag;
-       int nfrags, sg1entry_contains_frag_data, i;
-
-       nfrags = skb_shinfo(skb)->nr_frags;
-       sg1entry = &swqe->u.immdata_desc.sg_entry;
-       sg_list = (struct ehea_vsgentry *)&swqe->u.immdata_desc.sg_list;
-       sg1entry_contains_frag_data = 0;
-
-       write_swqe2_immediate(skb, swqe, lkey);
-
-       /* write descriptors */
-       if (nfrags > 0) {
-               if (swqe->descriptors == 0) {
-                       /* sg1entry not yet used */
-                       frag = &skb_shinfo(skb)->frags[0];
-
-                       /* copy sg1entry data */
-                       sg1entry->l_key = lkey;
-                       sg1entry->len = skb_frag_size(frag);
-                       sg1entry->vaddr =
-                               ehea_map_vaddr(skb_frag_address(frag));
-                       swqe->descriptors++;
-                       sg1entry_contains_frag_data = 1;
-               }
-
-               for (i = sg1entry_contains_frag_data; i < nfrags; i++) {
-
-                       frag = &skb_shinfo(skb)->frags[i];
-                       sgentry = &sg_list[i - sg1entry_contains_frag_data];
-
-                       sgentry->l_key = lkey;
-                       sgentry->len = skb_frag_size(frag);
-                       sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
-                       swqe->descriptors++;
-               }
-       }
-}
-
-static int ehea_broadcast_reg_helper(struct ehea_port *port, u32 hcallid)
-{
-       int ret = 0;
-       u64 hret;
-       u8 reg_type;
-
-       /* De/Register untagged packets */
-       reg_type = EHEA_BCMC_BROADCAST | EHEA_BCMC_UNTAGGED;
-       hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
-                                    port->logical_port_id,
-                                    reg_type, port->mac_addr, 0, hcallid);
-       if (hret != H_SUCCESS) {
-               pr_err("%sregistering bc address failed (tagged)\n",
-                      hcallid == H_REG_BCMC ? "" : "de");
-               ret = -EIO;
-               goto out_herr;
-       }
-
-       /* De/Register VLAN packets */
-       reg_type = EHEA_BCMC_BROADCAST | EHEA_BCMC_VLANID_ALL;
-       hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
-                                    port->logical_port_id,
-                                    reg_type, port->mac_addr, 0, hcallid);
-       if (hret != H_SUCCESS) {
-               pr_err("%sregistering bc address failed (vlan)\n",
-                      hcallid == H_REG_BCMC ? "" : "de");
-               ret = -EIO;
-       }
-out_herr:
-       return ret;
-}
-
-static int ehea_set_mac_addr(struct net_device *dev, void *sa)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct sockaddr *mac_addr = sa;
-       struct hcp_ehea_port_cb0 *cb0;
-       int ret;
-       u64 hret;
-
-       if (!is_valid_ether_addr(mac_addr->sa_data)) {
-               ret = -EADDRNOTAVAIL;
-               goto out;
-       }
-
-       cb0 = (void *)get_zeroed_page(GFP_KERNEL);
-       if (!cb0) {
-               pr_err("no mem for cb0\n");
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       memcpy(&(cb0->port_mac_addr), &(mac_addr->sa_data[0]), ETH_ALEN);
-
-       cb0->port_mac_addr = cb0->port_mac_addr >> 16;
-
-       hret = ehea_h_modify_ehea_port(port->adapter->handle,
-                                      port->logical_port_id, H_PORT_CB0,
-                                      EHEA_BMASK_SET(H_PORT_CB0_MAC, 1), cb0);
-       if (hret != H_SUCCESS) {
-               ret = -EIO;
-               goto out_free;
-       }
-
-       eth_hw_addr_set(dev, mac_addr->sa_data);
-
-       /* Deregister old MAC in pHYP */
-       if (port->state == EHEA_PORT_UP) {
-               ret = ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
-               if (ret)
-                       goto out_upregs;
-       }
-
-       port->mac_addr = cb0->port_mac_addr << 16;
-
-       /* Register new MAC in pHYP */
-       if (port->state == EHEA_PORT_UP) {
-               ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);
-               if (ret)
-                       goto out_upregs;
-       }
-
-       ret = 0;
-
-out_upregs:
-       ehea_update_bcmc_registrations();
-out_free:
-       free_page((unsigned long)cb0);
-out:
-       return ret;
-}
-
-static void ehea_promiscuous_error(u64 hret, int enable)
-{
-       if (hret == H_AUTHORITY)
-               pr_info("Hypervisor denied %sabling promiscuous mode\n",
-                       enable == 1 ? "en" : "dis");
-       else
-               pr_err("failed %sabling promiscuous mode\n",
-                      enable == 1 ? "en" : "dis");
-}
-
-static void ehea_promiscuous(struct net_device *dev, int enable)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct hcp_ehea_port_cb7 *cb7;
-       u64 hret;
-
-       if (enable == port->promisc)
-               return;
-
-       cb7 = (void *)get_zeroed_page(GFP_ATOMIC);
-       if (!cb7) {
-               pr_err("no mem for cb7\n");
-               goto out;
-       }
-
-       /* Modify Pxs_DUCQPN in CB7 */
-       cb7->def_uc_qpn = enable == 1 ? port->port_res[0].qp->fw_handle : 0;
-
-       hret = ehea_h_modify_ehea_port(port->adapter->handle,
-                                      port->logical_port_id,
-                                      H_PORT_CB7, H_PORT_CB7_DUCQPN, cb7);
-       if (hret) {
-               ehea_promiscuous_error(hret, enable);
-               goto out;
-       }
-
-       port->promisc = enable;
-out:
-       free_page((unsigned long)cb7);
-}
-
-static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr,
-                                    u32 hcallid)
-{
-       u64 hret;
-       u8 reg_type;
-
-       reg_type = EHEA_BCMC_MULTICAST | EHEA_BCMC_UNTAGGED;
-       if (mc_mac_addr == 0)
-               reg_type |= EHEA_BCMC_SCOPE_ALL;
-
-       hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
-                                    port->logical_port_id,
-                                    reg_type, mc_mac_addr, 0, hcallid);
-       if (hret)
-               goto out;
-
-       reg_type = EHEA_BCMC_MULTICAST | EHEA_BCMC_VLANID_ALL;
-       if (mc_mac_addr == 0)
-               reg_type |= EHEA_BCMC_SCOPE_ALL;
-
-       hret = ehea_h_reg_dereg_bcmc(port->adapter->handle,
-                                    port->logical_port_id,
-                                    reg_type, mc_mac_addr, 0, hcallid);
-out:
-       return hret;
-}
-
-static int ehea_drop_multicast_list(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct ehea_mc_list *mc_entry = port->mc_list;
-       struct list_head *pos;
-       struct list_head *temp;
-       int ret = 0;
-       u64 hret;
-
-       list_for_each_safe(pos, temp, &(port->mc_list->list)) {
-               mc_entry = list_entry(pos, struct ehea_mc_list, list);
-
-               hret = ehea_multicast_reg_helper(port, mc_entry->macaddr,
-                                                H_DEREG_BCMC);
-               if (hret) {
-                       pr_err("failed deregistering mcast MAC\n");
-                       ret = -EIO;
-               }
-
-               list_del(pos);
-               kfree(mc_entry);
-       }
-       return ret;
-}
-
-static void ehea_allmulti(struct net_device *dev, int enable)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       u64 hret;
-
-       if (!port->allmulti) {
-               if (enable) {
-                       /* Enable ALLMULTI */
-                       ehea_drop_multicast_list(dev);
-                       hret = ehea_multicast_reg_helper(port, 0, H_REG_BCMC);
-                       if (!hret)
-                               port->allmulti = 1;
-                       else
-                               netdev_err(dev,
-                                          "failed enabling IFF_ALLMULTI\n");
-               }
-       } else {
-               if (!enable) {
-                       /* Disable ALLMULTI */
-                       hret = ehea_multicast_reg_helper(port, 0, H_DEREG_BCMC);
-                       if (!hret)
-                               port->allmulti = 0;
-                       else
-                               netdev_err(dev,
-                                          "failed disabling IFF_ALLMULTI\n");
-               }
-       }
-}
-
-static void ehea_add_multicast_entry(struct ehea_port *port, u8 *mc_mac_addr)
-{
-       struct ehea_mc_list *ehea_mcl_entry;
-       u64 hret;
-
-       ehea_mcl_entry = kzalloc_obj(*ehea_mcl_entry, GFP_ATOMIC);
-       if (!ehea_mcl_entry)
-               return;
-
-       INIT_LIST_HEAD(&ehea_mcl_entry->list);
-
-       memcpy(&ehea_mcl_entry->macaddr, mc_mac_addr, ETH_ALEN);
-
-       hret = ehea_multicast_reg_helper(port, ehea_mcl_entry->macaddr,
-                                        H_REG_BCMC);
-       if (!hret)
-               list_add(&ehea_mcl_entry->list, &port->mc_list->list);
-       else {
-               pr_err("failed registering mcast MAC\n");
-               kfree(ehea_mcl_entry);
-       }
-}
-
-static void ehea_set_multicast_list(struct net_device *dev)
-{
-       struct ehea_port *port = netdev_priv(dev);
-       struct netdev_hw_addr *ha;
-       int ret;
-
-       ehea_promiscuous(dev, !!(dev->flags & IFF_PROMISC));
-
-       if (dev->flags & IFF_ALLMULTI) {
-               ehea_allmulti(dev, 1);
-               goto out;
-       }
-       ehea_allmulti(dev, 0);
-
-       if (!netdev_mc_empty(dev)) {
-               ret = ehea_drop_multicast_list(dev);
-               if (ret) {
-                       /* Dropping the current multicast list failed.
-                        * Enabling ALL_MULTI is the best we can do.
-                        */
-                       ehea_allmulti(dev, 1);
-               }
-
-               if (netdev_mc_count(dev) > port->adapter->max_mc_mac) {
-                       pr_info("Mcast registration limit reached (0x%llx). Use ALLMULTI!\n",
-                               port->adapter->max_mc_mac);
-                       goto out;
-               }
-
-               netdev_for_each_mc_addr(ha, dev)
-                       ehea_add_multicast_entry(port, ha->addr);
-
-       }
-out:
-       ehea_update_bcmc_registrations();
-}
-
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/ibm/ehea/ehea_phyp.c deleted +0 -612
deleted file mode 100644
index e63716e139f5..000000000000

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/ibm/ehea/ehea_phyp.h deleted +0 -433
deleted file mode 100644
index e8b56c103410..000000000000

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/ibm/ehea/ehea_qmr.c deleted +0 -999
deleted file mode 100644
index 60629a0032b2..000000000000

Lines of this file are not shown. View the raw message.

drivers/net/ethernet/ibm/ehea/ehea_qmr.h deleted +0 -391
deleted file mode 100644
index 7c7cccd820f7..000000000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2.47.3

Part of the diff is not shown here. View the raw message.

#3 lore raw

PATCH 2/2 powerpc: remove ehea driver references

In reply to David Christensen

Follow-on cleanup after the removal of the IBM eHEA driver in commit f721e8ffa92a ("ehea: remove the ehea driver").

Remove the CONFIG_IBM_EHEA entry from ppc64_defconfig and the EXPORT_SYMBOL_GPL(walk_system_ram_range) export from arch/powerpc/mm/mem.c that was only needed by the ehea driver.

---
 arch/powerpc/configs/ppc64_defconfig | 1 -
 arch/powerpc/mm/mem.c                | 6 ------
 2 files changed, 7 deletions(-)
arch/powerpc/configs/ppc64_defconfig +0 -1
index f795b74602ec..1eb8e3457e8b 100644
@@ -210,7 +210,6 @@ CONFIG_BNX2X=m
 CONFIG_CHELSIO_T1=m
 CONFIG_BE2NET=m
 CONFIG_IBMVETH=m
-CONFIG_EHEA=m
 CONFIG_IBMVNIC=m
 CONFIG_E100=y
 CONFIG_E1000=y
arch/powerpc/mm/mem.c +0 -6
index 4c1afab91996..b617b69452cd 100644
@@ -371,12 +371,6 @@ int devmem_is_allowed(unsigned long pfn)
 }
 #endif /* CONFIG_STRICT_DEVMEM */
 
-/*
- * This is defined in kernel/resource.c but only powerpc needs to export it, for
- * the EHEA driver. Drop this when drivers/net/ethernet/ibm/ehea is removed.
- */
-EXPORT_SYMBOL_GPL(walk_system_ram_range);
-
 #ifdef CONFIG_EXECMEM
 static struct execmem_info execmem_info __ro_after_init;
 
Signature · 1 line
2.47.3
reviewer Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH net-next 2/2] powerpc: remove ehea driver references

Le 29/06/2026 à 23:13, David Christensen a écrit :

Quoted 10 lines

[Vous ne recevez pas souvent de courriers de [email protected]. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ]

Follow-on cleanup after the removal of the IBM eHEA driver in commit f721e8ffa92a ("ehea: remove the ehea driver").

Remove the CONFIG_IBM_EHEA entry from ppc64_defconfig and the EXPORT_SYMBOL_GPL(walk_system_ram_range) export from arch/powerpc/mm/mem.c that was only needed by the ehea driver.

Quoted 37 lines
---
  arch/powerpc/configs/ppc64_defconfig | 1 -
  arch/powerpc/mm/mem.c                | 6 ------
  2 files changed, 7 deletions(-)
arch/powerpc/configs/ppc64_defconfig +0 -1
index f795b74602ec..1eb8e3457e8b 100644
@@ -210,7 +210,6 @@ CONFIG_BNX2X=m
  CONFIG_CHELSIO_T1=m
  CONFIG_BE2NET=m
  CONFIG_IBMVETH=m
-CONFIG_EHEA=m
  CONFIG_IBMVNIC=m
  CONFIG_E100=y
  CONFIG_E1000=y
arch/powerpc/mm/mem.c +0 -7
index 4c1afab91996..b617b69452cd 100644
@@ -371,12 +371,6 @@ int devmem_is_allowed(unsigned long pfn)
  }
  #endif /* CONFIG_STRICT_DEVMEM */
 
-/*
- * This is defined in kernel/resource.c but only powerpc needs to export it, for
- * the EHEA driver. Drop this when drivers/net/ethernet/ibm/ehea is removed.
- */
-EXPORT_SYMBOL_GPL(walk_system_ram_range);
-
  #ifdef CONFIG_EXECMEM
  static struct execmem_info execmem_info __ro_after_init;
 
--

2.47.3

#5 lore raw
In reply to David Christensen
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Quoted 9 lines · On Mon, 29 Jun 2026 16:13:41 -0500 you wrote:

The IBM eHEA (Ethernet Host Ethernet Adapter) driver has been orphaned since April 2024 with no active maintainer stepping forward. This series removes the driver and associated references from the kernel tree.

The driver was marked as an Orphan on April 18, 2024:

commit 97ec32b583bb ("MAINTAINERS: eth: mark IBM eHEA as an Orphan")

[...]

Here is the summary with links:
- [net-next,1/2] ehea: remove the ehea driver

    https://git.kernel.org/netdev/net-next/c/eb56577ae9a5
  - [net-next,2/2] powerpc: remove ehea driver references
    https://git.kernel.org/netdev/net-next/c/4bbb6f594070

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html