* [PATCH net-next v6 1/6] pds_core: add support for quiet devcmd failures
From: Nikhil P. Rao @ 2026-06-29 23:01 UTC (permalink / raw)
To: netdev
Cc: kuba, brett.creeley, eric.joyner, andrew+netdev, davem, edumazet,
pabeni, jacob.e.keller
In-Reply-To: <20260629230200.82092-1-nikhil.rao@amd.com>
From: Brett Creeley <brett.creeley@amd.com>
Currently there aren't any use-cases that require special handling
on whether or not to print devcmd failures. Specifically
non-generic failures, i.e. not supported failures. Add support to
allow these messages to be suppressed. This will be used when
adding support to negotiate PDS_CORE_IDENTITY_VERSION_2.
Signed-off-by: Brett Creeley <brett.creeley@amd.com>
---
drivers/net/ethernet/amd/pds_core/dev.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c
index bded6b33289c..dd9989cfe6b3 100644
--- a/drivers/net/ethernet/amd/pds_core/dev.c
+++ b/drivers/net/ethernet/amd/pds_core/dev.c
@@ -126,7 +126,8 @@ static const char *pdsc_devcmd_str(int opcode)
}
}
-static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds)
+static int __pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds,
+ const bool do_msg)
{
struct device *dev = pdsc->dev;
unsigned long start_time;
@@ -179,7 +180,7 @@ static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds)
status = pdsc_devcmd_status(pdsc);
err = pdsc_err_to_errno(status);
- if (err && err != -EAGAIN)
+ if (do_msg && err && err != -EAGAIN)
dev_err(dev, "DEVCMD %d %s failed, status=%d err %d %pe\n",
opcode, pdsc_devcmd_str(opcode), status, err,
ERR_PTR(err));
@@ -187,8 +188,9 @@ static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds)
return err;
}
-int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
- union pds_core_dev_comp *comp, int max_seconds)
+static int __pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
+ union pds_core_dev_comp *comp, int max_seconds,
+ const bool do_msg)
{
int err;
@@ -197,7 +199,7 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
memcpy_toio(&pdsc->cmd_regs->cmd, cmd, sizeof(*cmd));
pdsc_devcmd_dbell(pdsc);
- err = pdsc_devcmd_wait(pdsc, cmd->opcode, max_seconds);
+ err = __pdsc_devcmd_wait(pdsc, cmd->opcode, max_seconds, do_msg);
if ((err == -ENXIO || err == -ETIMEDOUT) && pdsc->wq)
queue_work(pdsc->wq, &pdsc->health_work);
@@ -207,6 +209,12 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
return err;
}
+int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
+ union pds_core_dev_comp *comp, int max_seconds)
+{
+ return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, true);
+}
+
int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,
union pds_core_dev_comp *comp, int max_seconds)
{
--
2.43.0
^ permalink raw reply related
* Re: [RFC PATCH net-next] netpoll: hold RCU while walking napi_list
From: Jakub Kicinski @ 2026-06-29 22:58 UTC (permalink / raw)
To: Breno Leitao
Cc: Runyu Xiao, davem, edumazet, pabeni, horms, sashal, bigeasy,
netdev, linux-kernel, jianhao.xu
In-Reply-To: <akJSi1g0F2k9a3cs@gmail.com>
On Mon, 29 Jun 2026 04:17:10 -0700 Breno Leitao wrote:
> > Sure, sorry for not including it in the RFC. The warning was from the
> > reviewed reproducer used for the CONFIG_PROVE_RCU_LIST triage, not from
> > a production crash. The relevant part of the dmesg is:
>
> Reading it, it does not come from the kernel's netpoll code at
> all -- it comes from an out-of-tree module (!?)
Yes, like Breno says, we need an in-kernel path that can trigger the
issue. Out-of-tree reproducers can be useful to validate the fix, but
they are not useful to prove that a problem actually exists.
We try to avoid defensive programming in the kernel.
^ permalink raw reply
* Re: [PATCH iwl-next v5 2/2] ice: implement symmetric RSS hash configuration
From: Jakub Kicinski @ 2026-06-29 22:53 UTC (permalink / raw)
To: Loktionov, Aleksandr
Cc: intel-wired-lan@lists.osuosl.org, Nguyen, Anthony L,
netdev@vger.kernel.org
In-Reply-To: <IA3PR11MB8986053B156CBA043045A525E5E82@IA3PR11MB8986.namprd11.prod.outlook.com>
On Mon, 29 Jun 2026 14:10:08 +0000 Loktionov, Aleksandr wrote:
> I understood on TEID; I will drop the ethtool core patch.
>
> One question before respinning the ice feature patch: ice GTP RSS profiles
> include TEID in the hardware hash fields. Since TEID is not generally
> symmetric across UL/DL, should the driver:
>
> 1. report RXH_GTP_TEID honestly and let the core reject symmetric-xor
> when GTP flow types are part of the preflight check;
>
> 2. hide RXH_GTP_TEID while symmetric-xor is enabled, even though that
> misrepresents the hardware hash input;
>
> 3. reject symmetric-xor for configurations where GTP profiles include
> TEID; or
>
> 4. change/program the ice GTP profile, if possible, to exclude TEID
> under symmetric-xor?
>
> My preference is (1) or (3), but I do not want to encode the wrong uAPI
> semantics.
Do you have access to any GTP experts?
If your customers want the TEID in the symmetric hash then they
probably know better what makes sense than me after reading about it
for 1 minute.
We may just need a better commit message on the first patch "TEID is
intrinsically symmetric" is not true.
Or maybe the driver / profiles are not doing the right thing.
Please dig deeper.
^ permalink raw reply
* Re: [PATCH net-next v2] ipv6: honor per-interface proxy_ndp in forward and NA paths
From: Jakub Kicinski @ 2026-06-29 22:46 UTC (permalink / raw)
To: Chenguang Zhao, Chenguang Zhao
Cc: Nicolas Dichtel, dsahern, idosch, davem, edumazet, pabeni, horms,
netdev
In-Reply-To: <dd26c96a-8c9b-4dc3-8eb8-a1c6a8842aab@6wind.com>
On Mon, 29 Jun 2026 15:59:00 +0200 Nicolas Dichtel wrote:
> Le 29/06/2026 à 08:18, Chenguang Zhao a écrit :
> > ndisc_recv_ns() has always checked both devconf_all and idev->cnf for
> > proxy_ndp, but ip6_forward() and ndisc_recv_na() only looked at the
> > global setting. The original commit left XXX comments in these paths
> > likely because idev was not available there at the time; ip6_forward()
> > now obtains idev from IP6CB(skb)->iif.
> >
> > Honor per-interface proxy_ndp in both places to match the NS path and
> > allow setups that only enable proxy_ndp on specific interfaces.
> >
> > In ip6_forward(), idev is looked up via the ingress interface (iif) while
> > pneigh_lookup() uses skb->dev. For ND packets this is correct because
> > vrf_ip6_rcv() does not modify skb->dev for neighbour discovery frames,
> > so both refer to the ingress interface.
> >
> > Signed-off-by: Chenguang Zhao <zhaochenguang@kylinos.cn>
> > ---
> > v2:
> > Per Ido's review, the following changes were made in v2:
> > - Target net-next instead of net
> > - Drop Fixes tag
> > - Expand commit message: XXX comment history, idev vs skb->dev for ND packets
> > - Fix subject prefix
> >
> > v1:
> > - https://lore.kernel.org/all/20260623085600.396401-1-zhaochenguang@kylinos.cn/
> >
> > net/ipv6/ip6_output.c | 4 ++--
> > net/ipv6/ndisc.c | 4 ++--
> > 2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
> > index 368e4fa3b43c..c4ca4a813479 100644
> > --- a/net/ipv6/ip6_output.c
> > +++ b/net/ipv6/ip6_output.c
> > @@ -579,8 +579,8 @@ int ip6_forward(struct sk_buff *skb)
> > return -ETIMEDOUT;
> > }
> >
> > - /* XXX: idev->cnf.proxy_ndp? */
> > - if (READ_ONCE(net->ipv6.devconf_all->proxy_ndp) &&
> > + if ((READ_ONCE(net->ipv6.devconf_all->proxy_ndp) ||
> > + (idev && READ_ONCE(idev->cnf.proxy_ndp))) &&
> As stated by Ido, this changes a 20 years old user-visible behavior. It suddenly
> may enable proxy NDP on a system.
> I was thinking that this kind of change was prohibited.
Chenguang Zhao, is this a change you find useful or are you just
acting on an AI-generated port about inconsistency in behavior?
Could you please explain your use case / deployment scenario?
^ permalink raw reply
* Re: [PATCH] net: stmmac: fix missed le32_to_cpu()
From: Jakub Kicinski @ 2026-06-29 22:44 UTC (permalink / raw)
To: Ben Dooks
Cc: Maxime Chevallier, Andrew Lunn, David S. Miller, Eric Dumazet,
Paolo Abeni, Maxime Coquelin, Alexandre Torgue,
Russell King (Oracle), netdev, linux-stm32, linux-arm-kernel,
linux-kernel
In-Reply-To: <74e05f3d-39a6-4a4c-8bc3-d4f23a54ef69@codethink.co.uk>
On Mon, 29 Jun 2026 12:11:08 +0100 Ben Dooks wrote:
> On 25/06/2026 08:07, Maxime Chevallier wrote:
> > Ben, what's this "prototype" sparse ? a custom tool of yours that
> > you used to find that ?
>
> I have an RFC to add variadic and thus also printf/scanf formatting
> to sparse. This is waiting on review after the original got re-worked
> to add scanf and a few other bug-fixed and shuffles.
>
> Ref: https://marc.info/?l=linux-sparse&m=178185274600679&w=2
Ah, makes sense. This most definitely need to be part of the commit
message.
^ permalink raw reply
* Re: [PATCH net v2] net/sched: cake: reject overhead values that underflow length
From: Jakub Kicinski @ 2026-06-29 22:42 UTC (permalink / raw)
To: Samuel Moelius
Cc: Toke Høiland-Jørgensen, Jamal Hadi Salim, Jiri Pirko,
David S. Miller, Eric Dumazet, Paolo Abeni, Simon Horman,
moderated list:CAKE QDISC, open list:TC subsystem, open list
In-Reply-To: <CAE+C+Da2-t1t76M6T9p=s6frGgOwj8LpOtVxBnmWa6kVHx9kpw@mail.gmail.com>
On Mon, 29 Jun 2026 14:44:28 -0400 Samuel Moelius wrote:
> On Mon, Jun 29, 2026 at 1:24 PM Samuel Moelius
> <sam.moelius@trailofbits.com> wrote:
> >
> > On Sat, Jun 13, 2026 at 5:26 PM Jakub Kicinski <kuba@kernel.org> wrote:
> > >
> > > On Tue, 9 Jun 2026 23:29:36 +0000 Samuel Moelius wrote:
> [...]
> > >
> > > Both Sashiko's complain - these values are neither safe nor sufficient.
> > >
> > > How was the -64 chosen? It looks suspiciously close the min ethernet
> > > frame length.
> >
> > That's how it was chosen. But as you've shown, it was not a good choice.
> >
> > I would like to submit a revised patch that does the check on the
> > datapath, as you suggested. Should I send that patch? Or would you
> > prefer to wait for a response from Toke?
>
> Apologies. I just noticed Toke did reply. Should I send a patch
> consistent with what he suggested?
Yes please
^ permalink raw reply
* Re: [PATCH net-next] Documentation: networking: Add a test plan for ethtool pause validation
From: Jakub Kicinski @ 2026-06-29 22:40 UTC (permalink / raw)
To: Maxime Chevallier
Cc: Andrew Lunn, davem, Eric Dumazet, Paolo Abeni, Simon Horman,
Russell King, Heiner Kallweit, Jonathan Corbet, Shuah Khan,
Oleksij Rempel, Vladimir Oltean, Florian Fainelli,
thomas.petazzoni, netdev, linux-kernel, linux-doc
In-Reply-To: <01e3d32b-6d50-4179-8e2f-25cdf8ff6c32@bootlin.com>
On Mon, 29 Jun 2026 17:24:51 +0200 Maxime Chevallier wrote:
> On 6/28/26 01:46, Andrew Lunn wrote:
> > On Sat, Jun 27, 2026 at 02:30:28PM -0700, Jakub Kicinski wrote:
> >> The common way of checking prereqs in the tests is to call a function
> >> called require_xyz() which then raises a skip. At a quick glance - the
> >> rss_api and xdp_metadata are good tests to get a sense of the usual format.
> >
> > The counter example is the ksft_disruptive() decorator.
> >
> > Pythons own unittest framework makes use of decorators to skip
> > tests. Its the Pythonic way.
Problem is vast majority of our developers do not know "Pythonic" ways.
And bash tests for HW are an absolute pile of impossible to debug
dookie. Half of the time bash doesn't print anything when test fails,
so good luck figuring out what happened on someone else's setup 10%
of the time :|
I'm hoping to strike a balance with keeping Python relatively dumb,
and pulling as many people as possible away form bash.
> So maybe in the end, we can try to have something a bit less python-y, while still
> using extensive documentation using sphynx doc format ?
>
> Let me send a V2 with the full test list, we'll see how much scaffolding
> we can build for ethtool testing, and how. I suspect that running/skipping based on
> the device's capabilities is going to be used throughout lots of tests
> beyond pause.
>
> For now the important part is to get that test list right, and iterate on the
> test implementation once we agree on what to test, why and how.
Maybe we should step back and figure out the full story for the
self-documentation thing. The good tests under tools...drivers/net
already have module and test-case level doc. So we can come up with
a way of extracting that and weaving that into NIPA? That way we are
all on the same page?
How should the test info be presented? I think it'd fit best in here:
https://netdev.bots.linux.dev/devices.html ? Or do you have something
else in mind?
^ permalink raw reply
* Re: [PATCH net-deletions] net: remove ax25 and amateur radio (hamradio) subsystem
From: Jakub Kicinski @ 2026-06-29 22:29 UTC (permalink / raw)
To: Jiri Slaby
Cc: davem, netdev, edumazet, pabeni, andrew+netdev, horms, corbet,
skhan, federico.vaga, carlos.bilbao, avadhut.naik, alexs,
si.yanteng, dzm91, 2023002089, tsbogend, dsahern, jani.nikula,
mchehab+huawei, gregkh, tytso, herbert, ebiggers, johannes.berg,
geert, pablo, tglx, mashiro.chen, mingo, dqfext, jreuter, sdf,
pkshih, enelsonmoore, mkl, toke, kees, crossd, jlayton,
wangliang74, aha310510, takamitz, kuniyu, linux-doc, linux-mips
In-Reply-To: <8458cf47-43f3-4328-bc6a-9aac31f1acf4@kernel.org>
On Mon, 29 Jun 2026 07:24:51 +0200 Jiri Slaby wrote:
> And net-tools are broken by the uapi/linux/rose.h removal:
> rose.c:39:10: fatal error: linux/rose.h: No such file or directory
> at:
> https://github.com/ecki/net-tools/blob/2ab3c5efdb5c220bc9a649fded56c361136bff1a/lib/rose.c#L39
Looks like the code for rose is already well separated from the rest.
Should we just ask net-tools to delete it? Or do you feel strongly
about restoring the now-defunct header?
^ permalink raw reply
* [PATCH net-next v4] net: mana: Add Interrupt Moderation support
From: Haiyang Zhang @ 2026-06-29 21:36 UTC (permalink / raw)
To: linux-hyperv, netdev, K. Y. Srinivasan, Haiyang Zhang, Wei Liu,
Dexuan Cui, Long Li, Andrew Lunn, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Konstantin Taranov, Simon Horman,
Erni Sri Satya Vennela, Dipayaan Roy, Aditya Garg, Breno Leitao,
linux-kernel, linux-rdma
Cc: paulros
From: Haiyang Zhang <haiyangz@microsoft.com>
Add Static and Dynamic Interrupt Moderation (DIM) support for
Rx and Tx.
Update queue creation procedure with new data struct with the related
settings.
Add functions to collect stat for DIM, and workers to update DIM data
and settings.
Update ethtool handler to get/set the moderation settings from a user.
To avoid detach/re-attach ops, ring DIM doorbell to change settings
at run time.
By default, adaptive-rx/tx (DIM) are enabled if supported by HW.
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: Simon Horman <horms@kernel.org>
---
v4:
Fixed tx stat, concurrency, and mb issues from Simon's review.
v3:
Updated to avoid detach/re-attach ops as suggested by Paolo.
v2:
Updated with comments from Jedrzej.
---
drivers/net/ethernet/microsoft/Kconfig | 1 +
.../net/ethernet/microsoft/mana/gdma_main.c | 29 +++
drivers/net/ethernet/microsoft/mana/mana_en.c | 171 ++++++++++++++++++
.../ethernet/microsoft/mana/mana_ethtool.c | 167 ++++++++++++++++-
include/net/mana/gdma.h | 24 ++-
include/net/mana/mana.h | 54 ++++++
6 files changed, 437 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig
index 3f36ee6a8ece..e9be18c92ca5 100644
--- a/drivers/net/ethernet/microsoft/Kconfig
+++ b/drivers/net/ethernet/microsoft/Kconfig
@@ -21,6 +21,7 @@ config MICROSOFT_MANA
depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN)
depends on PCI_HYPERV
select AUXILIARY_BUS
+ select DIMLIB
select PAGE_POOL
select NET_SHAPER
help
diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index e8b7ffb47eb9..aef3b77229c1 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
/* Copyright (c) 2021, Microsoft Corporation. */
+#include <linux/bitfield.h>
#include <linux/debugfs.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -466,6 +467,7 @@ static int mana_gd_disable_queue(struct gdma_queue *queue)
#define DOORBELL_OFFSET_RQ 0x400
#define DOORBELL_OFFSET_CQ 0x800
#define DOORBELL_OFFSET_EQ 0xFF8
+#define DOORBELL_OFFSET_DIM 0x820
static void mana_gd_ring_doorbell(struct gdma_context *gc, u32 db_index,
enum gdma_queue_type q_type, u32 qid,
@@ -506,6 +508,16 @@ static void mana_gd_ring_doorbell(struct gdma_context *gc, u32 db_index,
addr += DOORBELL_OFFSET_SQ;
break;
+ case GDMA_DIM:
+ e.dim.id = qid;
+ e.dim.mod_usec = FIELD_GET(MANA_INTR_MODR_USEC_MAX, tail_ptr);
+ e.dim.mod_usec_vld = !!(tail_ptr & MANA_INTR_MODR_USEC_VLD);
+ e.dim.mod_comps = FIELD_GET(MANA_INTR_MODR_COMP_MASK, tail_ptr);
+ e.dim.mod_comps_vld = num_req;
+
+ addr += DOORBELL_OFFSET_DIM;
+ break;
+
default:
WARN_ON(1);
return;
@@ -540,6 +552,23 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit)
}
EXPORT_SYMBOL_NS(mana_gd_ring_cq, "NET_MANA");
+void mana_gd_ring_dim(struct gdma_queue *cq, u32 mod_usec, bool mod_usec_vld,
+ u32 mod_comps, bool mod_comps_vld)
+{
+ struct gdma_context *gc = cq->gdma_dev->gdma_context;
+ u32 dim_val;
+
+ /* Convert the DIM values to doorbell parameters */
+ dim_val = FIELD_PREP(MANA_INTR_MODR_USEC_MAX, mod_usec) |
+ FIELD_PREP(MANA_INTR_MODR_COMP_MASK, mod_comps);
+ if (mod_usec_vld)
+ dim_val |= MANA_INTR_MODR_USEC_VLD;
+
+ mana_gd_ring_doorbell(gc, cq->gdma_dev->doorbell, GDMA_DIM, cq->id,
+ dim_val, mod_comps_vld);
+}
+EXPORT_SYMBOL_NS(mana_gd_ring_dim, "NET_MANA");
+
#define MANA_SERVICE_PERIOD 10
static void mana_serv_rescan(struct pci_dev *pdev)
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 7438ea6b3f26..9391e9564605 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1591,6 +1591,9 @@ int mana_create_wq_obj(struct mana_port_context *apc,
mana_gd_init_req_hdr(&req.hdr, MANA_CREATE_WQ_OBJ,
sizeof(req), sizeof(resp));
+
+ req.hdr.req.msg_version = GDMA_MESSAGE_V3;
+ req.hdr.resp.msg_version = GDMA_MESSAGE_V2;
req.vport = vport;
req.wq_type = wq_type;
req.wq_gdma_region = wq_spec->gdma_region;
@@ -1599,6 +1602,9 @@ int mana_create_wq_obj(struct mana_port_context *apc,
req.cq_size = cq_spec->queue_size;
req.cq_moderation_ctx_id = cq_spec->modr_ctx_id;
req.cq_parent_qid = cq_spec->attached_eq;
+ req.req_cq_moderation = cq_spec->req_cq_moderation;
+ req.cq_moderation_comp = cq_spec->cq_moderation_comp;
+ req.cq_moderation_usec = cq_spec->cq_moderation_usec;
err = mana_send_request(apc->ac, &req, sizeof(req), &resp,
sizeof(resp));
@@ -1856,6 +1862,7 @@ static void mana_poll_tx_cq(struct mana_cq *cq)
struct gdma_posted_wqe_info *wqe_info;
unsigned int pkt_transmitted = 0;
unsigned int wqe_unit_cnt = 0;
+ unsigned int tx_bytes = 0;
struct mana_txq *txq = cq->txq;
struct mana_port_context *apc;
struct netdev_queue *net_txq;
@@ -1937,6 +1944,8 @@ static void mana_poll_tx_cq(struct mana_cq *cq)
mana_unmap_skb(skb, apc);
+ tx_bytes += skb->len;
+
napi_consume_skb(skb, cq->budget);
pkt_transmitted++;
@@ -1967,6 +1976,10 @@ static void mana_poll_tx_cq(struct mana_cq *cq)
if (atomic_sub_return(pkt_transmitted, &txq->pending_sends) < 0)
WARN_ON_ONCE(1);
+ /* Feed DIM with the completion rate observed here, in NAPI context. */
+ cq->tx_dim_pkts += pkt_transmitted;
+ cq->tx_dim_bytes += tx_bytes;
+
cq->work_done = pkt_transmitted;
}
@@ -2318,6 +2331,119 @@ static void mana_poll_rx_cq(struct mana_cq *cq)
xdp_do_flush();
}
+static void mana_rx_dim_work(struct work_struct *work)
+{
+ struct dim *dim = container_of(work, struct dim, work);
+ struct dim_cq_moder cur_moder;
+ struct mana_cq *cq;
+
+ cur_moder = net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
+ cq = container_of(dim, struct mana_cq, dim);
+
+ cur_moder.usec = min_t(u16, cur_moder.usec, MANA_INTR_MODR_USEC_MAX);
+ cur_moder.pkts = min_t(u16, cur_moder.pkts, MANA_INTR_MODR_COMP_MAX);
+
+ mana_gd_ring_dim(cq->gdma_cq, cur_moder.usec, true,
+ cur_moder.pkts, true);
+
+ dim->state = DIM_START_MEASURE;
+}
+
+static void mana_tx_dim_work(struct work_struct *work)
+{
+ struct dim *dim = container_of(work, struct dim, work);
+ struct dim_cq_moder cur_moder;
+ struct mana_cq *cq;
+
+ cur_moder = net_dim_get_tx_moderation(dim->mode, dim->profile_ix);
+ cq = container_of(dim, struct mana_cq, dim);
+
+ cur_moder.usec = min_t(u16, cur_moder.usec, MANA_INTR_MODR_USEC_MAX);
+ cur_moder.pkts = min_t(u16, cur_moder.pkts, MANA_INTR_MODR_COMP_MAX);
+
+ mana_gd_ring_dim(cq->gdma_cq, cur_moder.usec, true,
+ cur_moder.pkts, true);
+
+ dim->state = DIM_START_MEASURE;
+}
+
+/* The caller must update apc->rx/tx_dim_enabled before disabling and
+ * after enabling. And synchronize_net() before draining the DIM work,
+ * so that NAPI cannot observe a stale flag.
+ */
+int mana_dim_change(struct mana_cq *cq, bool enable)
+{
+ bool is_rx = cq->type == MANA_CQ_TYPE_RX;
+ struct mana_port_context *apc;
+ work_func_t work_func;
+ u32 usec, comp;
+
+ if (is_rx) {
+ apc = netdev_priv(cq->rxq->ndev);
+ usec = apc->intr_modr_rx_usec;
+ comp = apc->intr_modr_rx_comp;
+ work_func = mana_rx_dim_work;
+ } else {
+ apc = netdev_priv(cq->txq->ndev);
+ usec = apc->intr_modr_tx_usec;
+ comp = apc->intr_modr_tx_comp;
+ work_func = mana_tx_dim_work;
+ }
+
+ /* On enable, zero the DIM state so net_dim() starts measuring from
+ * scratch.
+ * On disable, drain any pending DIM work and restore the static
+ * moderation values.
+ */
+ if (enable) {
+ memset(&cq->dim, 0, sizeof(cq->dim));
+ cq->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+ INIT_WORK(&cq->dim.work, work_func);
+ } else {
+ cancel_work_sync(&cq->dim.work);
+ mana_gd_ring_dim(cq->gdma_cq, usec, true, comp, true);
+ }
+
+ return 0;
+}
+
+static void mana_update_rx_dim(struct mana_cq *cq)
+{
+ struct mana_port_context *apc = netdev_priv(cq->rxq->ndev);
+ struct dim_sample dim_sample = {};
+ struct mana_rxq *rxq = cq->rxq;
+
+ /* Pairs with smp_store_release() in mana_set_coalesce(): observing the
+ * enable flag set guarantees the DIM (re)initialization is visible.
+ */
+ if (!smp_load_acquire(&apc->rx_dim_enabled))
+ return;
+
+ dim_update_sample(READ_ONCE(cq->dim_event_ctr), rxq->stats.packets,
+ rxq->stats.bytes, &dim_sample);
+ net_dim(&cq->dim, &dim_sample);
+}
+
+static void mana_update_tx_dim(struct mana_cq *cq)
+{
+ struct mana_port_context *apc = netdev_priv(cq->txq->ndev);
+ struct dim_sample dim_sample = {};
+
+ /* Pairs with smp_store_release() in mana_set_coalesce(): observing the
+ * enable flag set guarantees the DIM (re)initialization is visible.
+ */
+ if (!smp_load_acquire(&apc->tx_dim_enabled))
+ return;
+
+ /* cq->tx_dim_pkts/bytes are accumulated in mana_poll_tx_cq(), in the
+ * same NAPI context as this read, so they track the hardware
+ * completion rate and need no u64_stats_sync protection.
+ */
+ dim_update_sample(READ_ONCE(cq->dim_event_ctr), cq->tx_dim_pkts,
+ cq->tx_dim_bytes, &dim_sample);
+ net_dim(&cq->dim, &dim_sample);
+}
+
static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
{
struct mana_cq *cq = context;
@@ -2336,6 +2462,15 @@ static int mana_cq_handler(void *context, struct gdma_queue *gdma_queue)
if (w < cq->budget) {
mana_gd_ring_cq(gdma_queue, SET_ARM_BIT);
cq->work_done_since_doorbell = 0;
+
+ /* Update DIM before napi_complete_done() to prevent running
+ * net_dim() concurrently.
+ */
+ if (cq->type == MANA_CQ_TYPE_RX)
+ mana_update_rx_dim(cq);
+ else
+ mana_update_tx_dim(cq);
+
napi_complete_done(&cq->napi, w);
} else if (cq->work_done_since_doorbell >=
(cq->gdma_cq->queue_size / COMP_ENTRY_SIZE) * 4) {
@@ -2368,6 +2503,7 @@ static void mana_schedule_napi(void *context, struct gdma_queue *gdma_queue)
{
struct mana_cq *cq = context;
+ WRITE_ONCE(cq->dim_event_ctr, cq->dim_event_ctr + 1);
napi_schedule_irqoff(&cq->napi);
}
@@ -2410,6 +2546,7 @@ static void mana_destroy_txq(struct mana_port_context *apc)
if (apc->tx_qp[i]->txq.napi_initialized) {
napi_synchronize(napi);
napi_disable_locked(napi);
+ cancel_work_sync(&apc->tx_qp[i]->tx_cq.dim.work);
netif_napi_del_locked(napi);
apc->tx_qp[i]->txq.napi_initialized = false;
}
@@ -2543,6 +2680,11 @@ static int mana_create_txq(struct mana_port_context *apc,
cq_spec.modr_ctx_id = 0;
cq_spec.attached_eq = cq->gdma_cq->cq.parent->id;
+ /* DIM setting can be changed at runtime */
+ cq_spec.req_cq_moderation = true;
+ cq_spec.cq_moderation_usec = apc->intr_modr_tx_usec;
+ cq_spec.cq_moderation_comp = apc->intr_modr_tx_comp;
+
err = mana_create_wq_obj(apc, apc->port_handle, GDMA_SQ,
&wq_spec, &cq_spec,
&apc->tx_qp[i]->tx_object);
@@ -2573,6 +2715,13 @@ static int mana_create_txq(struct mana_port_context *apc,
set_bit(NAPI_STATE_NO_BUSY_POLL, &cq->napi.state);
netif_napi_add_locked(net, &cq->napi, mana_poll);
+
+ /* Initialize the DIM work before enabling NAPI, so that a poll
+ * cannot reach net_dim() with an uninitialized cq->dim.work.
+ */
+ INIT_WORK(&cq->dim.work, mana_tx_dim_work);
+ cq->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+
napi_enable_locked(&cq->napi);
txq->napi_initialized = true;
@@ -2610,6 +2759,7 @@ static void mana_destroy_rxq(struct mana_port_context *apc,
napi_synchronize(napi);
napi_disable_locked(napi);
+ cancel_work_sync(&rxq->rx_cq.dim.work);
netif_napi_del_locked(napi);
}
@@ -2848,6 +2998,11 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
cq_spec.modr_ctx_id = 0;
cq_spec.attached_eq = cq->gdma_cq->cq.parent->id;
+ /* DIM setting can be changed at runtime */
+ cq_spec.req_cq_moderation = true;
+ cq_spec.cq_moderation_usec = apc->intr_modr_rx_usec;
+ cq_spec.cq_moderation_comp = apc->intr_modr_rx_comp;
+
err = mana_create_wq_obj(apc, apc->port_handle, GDMA_RQ,
&wq_spec, &cq_spec, &rxq->rxobj);
if (err)
@@ -2880,6 +3035,12 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc,
WARN_ON(xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, MEM_TYPE_PAGE_POOL,
rxq->page_pool));
+ /* Initialize the DIM work before enabling NAPI, so that a poll
+ * cannot reach net_dim() with an uninitialized cq->dim.work.
+ */
+ INIT_WORK(&cq->dim.work, mana_rx_dim_work);
+ cq->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+
napi_enable_locked(&cq->napi);
mana_gd_ring_cq(cq->gdma_cq, SET_ARM_BIT);
@@ -3546,6 +3707,16 @@ static int mana_probe_port(struct mana_context *ac, int port_idx,
apc->link_cfg_error = 1;
apc->cqe_coalescing_enable = 0;
+ /* Initialize interrupt moderation settings if supported by HW */
+ if (gc->pf_cap_flags1 & GDMA_PF_CAP_FLAG_1_DYN_INTERRUPT_MODERATION) {
+ apc->intr_modr_rx_usec = MANA_INTR_MODR_USEC_DEF;
+ apc->intr_modr_rx_comp = MANA_INTR_MODR_COMP_DEF;
+ apc->intr_modr_tx_usec = MANA_INTR_MODR_USEC_DEF;
+ apc->intr_modr_tx_comp = MANA_INTR_MODR_COMP_DEF;
+ apc->rx_dim_enabled = MANA_ADAPTIVE_RX_DEF;
+ apc->tx_dim_enabled = MANA_ADAPTIVE_TX_DEF;
+ }
+
mutex_init(&apc->vport_mutex);
apc->vport_use_count = 0;
diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index 881df597d7f9..9e31e2595ae3 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -419,6 +419,15 @@ static int mana_get_coalesce(struct net_device *ndev,
!kernel_coal->rx_cqe_nsecs)
kernel_coal->rx_cqe_nsecs = MANA_RX_CQE_NSEC_DEF;
+ ec->rx_coalesce_usecs = apc->intr_modr_rx_usec;
+ ec->rx_max_coalesced_frames = apc->intr_modr_rx_comp;
+
+ ec->tx_coalesce_usecs = apc->intr_modr_tx_usec;
+ ec->tx_max_coalesced_frames = apc->intr_modr_tx_comp;
+
+ ec->use_adaptive_rx_coalesce = apc->rx_dim_enabled;
+ ec->use_adaptive_tx_coalesce = apc->tx_dim_enabled;
+
return 0;
}
@@ -428,9 +437,34 @@ static int mana_set_coalesce(struct net_device *ndev,
struct netlink_ext_ack *extack)
{
struct mana_port_context *apc = netdev_priv(ndev);
- u8 saved_cqe_coalescing_enable;
+ struct {
+ u16 intr_modr_rx_usec;
+ u16 intr_modr_rx_comp;
+ u16 intr_modr_tx_usec;
+ u16 intr_modr_tx_comp;
+ u8 cqe_coalescing_enable;
+ bool rx_dim_enabled;
+ bool tx_dim_enabled;
+ } saved;
+ bool modr_changed = false;
+ bool dim_changed = false;
+ struct gdma_context *gc;
int err;
+ gc = apc->ac->gdma_dev->gdma_context;
+
+ /* Both static and dynamic interrupt moderation (DIM) rely on the
+ * same HW capability advertised by the PF.
+ */
+ if ((ec->use_adaptive_rx_coalesce || ec->use_adaptive_tx_coalesce ||
+ ec->rx_coalesce_usecs || ec->tx_coalesce_usecs ||
+ ec->rx_max_coalesced_frames || ec->tx_max_coalesced_frames) &&
+ !(gc->pf_cap_flags1 & GDMA_PF_CAP_FLAG_1_DYN_INTERRUPT_MODERATION)) {
+ NL_SET_ERR_MSG(extack,
+ "Interrupt Moderation is not supported by HW");
+ return -EOPNOTSUPP;
+ }
+
if (kernel_coal->rx_cqe_frames != 1 &&
kernel_coal->rx_cqe_frames != MANA_RXCOMP_OOB_NUM_PPI) {
NL_SET_ERR_MSG_FMT(extack,
@@ -440,18 +474,129 @@ static int mana_set_coalesce(struct net_device *ndev,
return -EINVAL;
}
- saved_cqe_coalescing_enable = apc->cqe_coalescing_enable;
+ if (ec->rx_coalesce_usecs > MANA_INTR_MODR_USEC_MAX ||
+ ec->tx_coalesce_usecs > MANA_INTR_MODR_USEC_MAX) {
+ NL_SET_ERR_MSG_FMT(extack,
+ "coalesce usecs must be <= %lu",
+ MANA_INTR_MODR_USEC_MAX);
+ return -EINVAL;
+ }
+
+ if (ec->rx_max_coalesced_frames > MANA_INTR_MODR_COMP_MAX ||
+ ec->tx_max_coalesced_frames > MANA_INTR_MODR_COMP_MAX) {
+ NL_SET_ERR_MSG_FMT(extack,
+ "coalesce frames must be <= %lu",
+ MANA_INTR_MODR_COMP_MAX);
+ return -EINVAL;
+ }
+
+ if (ec->rx_coalesce_usecs != apc->intr_modr_rx_usec ||
+ ec->rx_max_coalesced_frames != apc->intr_modr_rx_comp ||
+ ec->tx_coalesce_usecs != apc->intr_modr_tx_usec ||
+ ec->tx_max_coalesced_frames != apc->intr_modr_tx_comp)
+ modr_changed = true;
+
+ saved.intr_modr_rx_usec = apc->intr_modr_rx_usec;
+ saved.intr_modr_rx_comp = apc->intr_modr_rx_comp;
+ saved.intr_modr_tx_usec = apc->intr_modr_tx_usec;
+ saved.intr_modr_tx_comp = apc->intr_modr_tx_comp;
+
+ apc->intr_modr_rx_usec = ec->rx_coalesce_usecs;
+ apc->intr_modr_rx_comp = ec->rx_max_coalesced_frames;
+ apc->intr_modr_tx_usec = ec->tx_coalesce_usecs;
+ apc->intr_modr_tx_comp = ec->tx_max_coalesced_frames;
+
+ if (!!ec->use_adaptive_rx_coalesce != apc->rx_dim_enabled ||
+ !!ec->use_adaptive_tx_coalesce != apc->tx_dim_enabled)
+ dim_changed = true;
+
+ saved.rx_dim_enabled = apc->rx_dim_enabled;
+ saved.tx_dim_enabled = apc->tx_dim_enabled;
+
+ saved.cqe_coalescing_enable = apc->cqe_coalescing_enable;
apc->cqe_coalescing_enable =
kernel_coal->rx_cqe_frames == MANA_RXCOMP_OOB_NUM_PPI;
- if (!apc->port_is_up)
+ if (!apc->port_is_up) {
+ WRITE_ONCE(apc->rx_dim_enabled, !!ec->use_adaptive_rx_coalesce);
+ WRITE_ONCE(apc->tx_dim_enabled, !!ec->use_adaptive_tx_coalesce);
return 0;
+ }
- err = mana_config_rss(apc, TRI_STATE_TRUE, false, false);
- if (err)
- apc->cqe_coalescing_enable = saved_cqe_coalescing_enable;
+ if (apc->cqe_coalescing_enable != saved.cqe_coalescing_enable) {
+ /* CQE coalescing setting is applied via RSS configuration. */
+ err = mana_config_rss(apc, TRI_STATE_TRUE, false, false);
+ if (err) {
+ netdev_err(ndev, "Change CQE coalescing failed: %d\n",
+ err);
+ apc->cqe_coalescing_enable =
+ saved.cqe_coalescing_enable;
+ apc->intr_modr_rx_usec = saved.intr_modr_rx_usec;
+ apc->intr_modr_rx_comp = saved.intr_modr_rx_comp;
+ apc->intr_modr_tx_usec = saved.intr_modr_tx_usec;
+ apc->intr_modr_tx_comp = saved.intr_modr_tx_comp;
+ return err;
+ }
+ }
- return err;
+ if (modr_changed || dim_changed) {
+ bool new_rx_dim = !!ec->use_adaptive_rx_coalesce;
+ bool new_tx_dim = !!ec->use_adaptive_tx_coalesce;
+ bool disable_rx_dim = saved.rx_dim_enabled && !new_rx_dim;
+ bool disable_tx_dim = saved.tx_dim_enabled && !new_tx_dim;
+ bool enable_rx_dim = !saved.rx_dim_enabled && new_rx_dim;
+ bool enable_tx_dim = !saved.tx_dim_enabled && new_tx_dim;
+ int q;
+
+ /* On disable: clear the per-port flag first and
+ * synchronize_net() so any in-flight NAPI poll observes
+ * the new value and will not schedule further DIM work;
+ * then drain pending work and restore the static
+ * moderation values.
+ */
+ if (disable_rx_dim)
+ WRITE_ONCE(apc->rx_dim_enabled, false);
+ if (disable_tx_dim)
+ WRITE_ONCE(apc->tx_dim_enabled, false);
+ if (disable_rx_dim || disable_tx_dim)
+ synchronize_net();
+
+ for (q = 0; q < apc->num_queues; q++) {
+ struct mana_cq *rx_cq = &apc->rxqs[q]->rx_cq;
+ struct mana_cq *tx_cq = &apc->tx_qp[q]->tx_cq;
+
+ if (disable_rx_dim)
+ mana_dim_change(rx_cq, false);
+ else if (enable_rx_dim)
+ mana_dim_change(rx_cq, true);
+ else if (!new_rx_dim && modr_changed)
+ mana_gd_ring_dim(rx_cq->gdma_cq,
+ apc->intr_modr_rx_usec, true,
+ apc->intr_modr_rx_comp, true);
+
+ if (disable_tx_dim)
+ mana_dim_change(tx_cq, false);
+ else if (enable_tx_dim)
+ mana_dim_change(tx_cq, true);
+ else if (!new_tx_dim && modr_changed)
+ mana_gd_ring_dim(tx_cq->gdma_cq,
+ apc->intr_modr_tx_usec, true,
+ apc->intr_modr_tx_comp, true);
+ }
+
+ /* Publish the enable flag with release semantics so a
+ * concurrent NAPI poll that observes it set also sees the DIM
+ * (re)init done by mana_dim_change() above.
+ */
+ if (enable_rx_dim)
+ /* pairs with smp_load_acquire() in mana_update_rx_dim() */
+ smp_store_release(&apc->rx_dim_enabled, true);
+ if (enable_tx_dim)
+ /* pairs with smp_load_acquire() in mana_update_tx_dim() */
+ smp_store_release(&apc->tx_dim_enabled, true);
+ }
+
+ return 0;
}
/* mana_set_channels - change the number of queues on a port
@@ -595,7 +740,13 @@ static int mana_get_link_ksettings(struct net_device *ndev,
}
const struct ethtool_ops mana_ethtool_ops = {
- .supported_coalesce_params = ETHTOOL_COALESCE_RX_CQE_FRAMES,
+ .supported_coalesce_params = ETHTOOL_COALESCE_RX_CQE_FRAMES |
+ ETHTOOL_COALESCE_RX_USECS |
+ ETHTOOL_COALESCE_RX_MAX_FRAMES |
+ ETHTOOL_COALESCE_TX_USECS |
+ ETHTOOL_COALESCE_TX_MAX_FRAMES |
+ ETHTOOL_COALESCE_USE_ADAPTIVE_RX |
+ ETHTOOL_COALESCE_USE_ADAPTIVE_TX,
.op_needs_rtnl = ETHTOOL_OP_NEEDS_RTNL_SCHANNELS |
ETHTOOL_OP_NEEDS_RTNL_SRINGPARAM |
ETHTOOL_OP_NEEDS_RTNL_GLINK,
diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h
index 0c395917b214..8529cef0d7c4 100644
--- a/include/net/mana/gdma.h
+++ b/include/net/mana/gdma.h
@@ -47,6 +47,7 @@ enum gdma_queue_type {
GDMA_RQ,
GDMA_CQ,
GDMA_EQ,
+ GDMA_DIM,
};
enum gdma_work_request_flags {
@@ -126,6 +127,17 @@ union gdma_doorbell_entry {
u64 tail_ptr : 31;
u64 arm : 1;
} eq;
+
+ struct {
+ u64 id : 24;
+ u64 reserved : 8;
+ u64 mod_usec : 10;
+ u64 reserve1 : 5;
+ u64 mod_usec_vld : 1;
+ u64 mod_comps : 8;
+ u64 reserve2 : 7;
+ u64 mod_comps_vld: 1;
+ } dim;
}; /* HW DATA */
struct gdma_msg_hdr {
@@ -502,6 +514,9 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit);
int mana_schedule_serv_work(struct gdma_context *gc, enum gdma_eqe_type type);
+void mana_gd_ring_dim(struct gdma_queue *cq, u32 mod_usec, bool mod_usec_vld,
+ u32 mod_comps, bool mod_comps_vld);
+
struct gdma_wqe {
u32 reserved :24;
u32 last_vbytes :8;
@@ -650,6 +665,9 @@ enum {
/* Driver supports self recovery on Hardware Channel timeouts */
#define GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECOVERY BIT(25)
+/* Driver supports dynamic interrupt moderation - DIM */
+#define GDMA_DRV_CAP_FLAG_1_DYN_INTERRUPT_MODERATION BIT(28)
+
#define GDMA_DRV_CAP_FLAGS1 \
(GDMA_DRV_CAP_FLAG_1_EQ_SHARING_MULTI_VPORT | \
GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX | \
@@ -665,7 +683,8 @@ enum {
GDMA_DRV_CAP_FLAG_1_PROBE_RECOVERY | \
GDMA_DRV_CAP_FLAG_1_HANDLE_STALL_SQ_RECOVERY | \
GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECOVERY | \
- GDMA_DRV_CAP_FLAG_1_EQ_MSI_UNSHARE_MULTI_VPORT)
+ GDMA_DRV_CAP_FLAG_1_EQ_MSI_UNSHARE_MULTI_VPORT | \
+ GDMA_DRV_CAP_FLAG_1_DYN_INTERRUPT_MODERATION)
#define GDMA_DRV_CAP_FLAGS2 0
@@ -701,6 +720,9 @@ struct gdma_verify_ver_req {
u8 os_ver_str4[128];
}; /* HW DATA */
+/* HW supports dynamic interrupt moderation - DIM */
+#define GDMA_PF_CAP_FLAG_1_DYN_INTERRUPT_MODERATION BIT(15)
+
struct gdma_verify_ver_resp {
struct gdma_resp_hdr hdr;
u64 gdma_protocol_ver;
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 13c87baf018e..df4c4a3f68fa 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -4,6 +4,7 @@
#ifndef _MANA_H
#define _MANA_H
+#include <linux/dim.h>
#include <net/xdp.h>
#include <net/net_shaper.h>
@@ -64,6 +65,19 @@ enum TRI_STATE {
/* Maximum number of packets per coalesced CQE */
#define MANA_RXCOMP_OOB_NUM_PPI 4
+/* Default/max interrupt moderation settings */
+#define MANA_INTR_MODR_USEC_DEF 0
+#define MANA_INTR_MODR_COMP_DEF 0
+
+#define MANA_ADAPTIVE_RX_DEF true
+#define MANA_ADAPTIVE_TX_DEF true
+
+/* DIM doorbell value field layout */
+#define MANA_INTR_MODR_USEC_MAX GENMASK(9, 0)
+#define MANA_INTR_MODR_USEC_VLD BIT(15)
+#define MANA_INTR_MODR_COMP_MAX GENMASK(7, 0)
+#define MANA_INTR_MODR_COMP_MASK GENMASK(23, 16)
+
/* Update this count whenever the respective structures are changed */
#define MANA_STATS_RX_COUNT (6 + MANA_RXCOMP_OOB_NUM_PPI - 1)
#define MANA_STATS_TX_COUNT 11
@@ -297,6 +311,17 @@ struct mana_cq {
int work_done;
int work_done_since_doorbell;
int budget;
+
+ /* DIM - Dynamic Interrupt Moderation */
+ struct dim dim;
+ u16 dim_event_ctr;
+
+ /* Cumulative TX completions fed to DIM. Updated and read only in
+ * NAPI context (mana_poll_tx_cq() / mana_update_tx_dim()), so they
+ * measure the hardware completion rate and need no u64_stats_sync.
+ */
+ u64 tx_dim_pkts;
+ u64 tx_dim_bytes;
};
struct mana_recv_buf_oob {
@@ -573,6 +598,15 @@ struct mana_port_context {
u8 cqe_coalescing_enable;
u32 cqe_coalescing_timeout_ns;
+ /* Interrupt moderation settings */
+ u16 intr_modr_rx_usec;
+ u16 intr_modr_rx_comp;
+ u16 intr_modr_tx_usec;
+ u16 intr_modr_tx_comp;
+
+ bool rx_dim_enabled;
+ bool tx_dim_enabled;
+
struct mana_ethtool_stats eth_stats;
struct mana_ethtool_phy_stats phy_stats;
@@ -598,6 +632,8 @@ int mana_alloc_queues(struct net_device *ndev);
int mana_attach(struct net_device *ndev);
int mana_detach(struct net_device *ndev, bool from_close);
+int mana_dim_change(struct mana_cq *cq, bool enable);
+
int mana_probe(struct gdma_dev *gd, bool resuming);
void mana_remove(struct gdma_dev *gd, bool suspending);
@@ -633,6 +669,9 @@ struct mana_obj_spec {
u32 queue_size;
u32 attached_eq;
u32 modr_ctx_id;
+ u8 req_cq_moderation;
+ u16 cq_moderation_comp;
+ u16 cq_moderation_usec;
};
enum mana_command_code {
@@ -764,6 +803,15 @@ struct mana_create_wqobj_req {
u32 cq_size;
u32 cq_moderation_ctx_id;
u32 cq_parent_qid;
+
+ /* V2 */
+ u8 allow_rqwqe_chain;
+
+ /* V3 */
+ u8 req_cq_moderation;
+ u16 cq_moderation_comp;
+ u16 cq_moderation_usec;
+ u8 reserved2[2];
}; /* HW DATA */
struct mana_create_wqobj_resp {
@@ -771,6 +819,12 @@ struct mana_create_wqobj_resp {
u32 wq_id;
u32 cq_id;
mana_handle_t wq_obj;
+
+ /* V2 */
+ u16 cq_moderation_comp;
+ u16 cq_moderation_usec;
+ u8 cq_moderation_enabled;
+ u8 reserved1[3];
}; /* HW DATA */
/* Destroy WQ Object */
--
2.34.1
^ permalink raw reply related
* Re: [PATCH net v2 2/2] pds_core: fix use-after-free on workqueue during remove
From: Harshitha Ramamurthy @ 2026-06-29 21:32 UTC (permalink / raw)
To: Nikhil P. Rao
Cc: netdev, kuba, brett.creeley, eric.joyner, andrew+netdev, davem,
edumazet, pabeni
In-Reply-To: <20260629200358.2626129-3-nikhil.rao@amd.com>
On Mon, Jun 29, 2026 at 1:04 PM Nikhil P. Rao <nikhil.rao@amd.com> wrote:
>
> In pdsc_remove(), the workqueue is destroyed before pdsc_teardown()
> is called. This ordering allows two paths to queue work on the
> destroyed workqueue:
>
> 1. If pdsc_teardown() -> pdsc_devcmd_reset() times out, the error
> path in pdsc_devcmd_locked() queues health_work.
>
> 2. A NotifyQ event can trigger the ISR and queue work before free_irq()
> is called in pdsc_teardown().
>
> Fix problem 1 by moving destroy_workqueue() after pdsc_teardown(),
> ensuring the workqueue exists when health_work may be queued during
> teardown.
>
> Fix problem 2 by adding cancel_work_sync() in pdsc_qcq_free() after
> free_irq(). This ensures no new ISR can queue work, and any
> already-queued work is drained before freeing the qcq. Work draining
> during teardown may race with intx becoming invalid, so skip returning
> interrupt credits if intx is no longer assigned.
>
> Also change pdsc_core_uninit() to free adminqcq before notifyqcq,
> since adminqcq's work accesses notifyqcq via pdsc_process_notifyq().
> This ensures notifyqcq remains valid while adminqcq's work drains.
Code LGTM but wonder if this change could be split into a separate patch.
>
> Fixes: 01ba61b55b20 ("pds_core: Add adminq processing and commands")
> Reported-by: Sashiko AI Review <sashiko-bot@kernel.org>
> Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com>
> ---
> drivers/net/ethernet/amd/pds_core/adminq.c | 15 +++++++++++----
> drivers/net/ethernet/amd/pds_core/core.c | 14 ++++++++++----
> drivers/net/ethernet/amd/pds_core/main.c | 5 +++--
> 3 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ethernet/amd/pds_core/adminq.c
> index 097bb092bdb8..c0d9b7e6b8c3 100644
> --- a/drivers/net/ethernet/amd/pds_core/adminq.c
> +++ b/drivers/net/ethernet/amd/pds_core/adminq.c
> @@ -77,6 +77,7 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq)
> unsigned long irqflags;
> int nq_work = 0;
> int aq_work = 0;
> + int intx;
>
> /* Don't process AdminQ when it's not up */
> if (!pdsc_adminq_inc_if_up(pdsc)) {
> @@ -121,10 +122,16 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq)
> qcq->accum_work += aq_work;
>
> credits:
> - /* Return the interrupt credits, one for each completion */
> - pds_core_intr_credits(&pdsc->intr_ctrl[qcq->intx],
> - nq_work + aq_work,
> - PDS_CORE_INTR_CRED_REARM);
> + /* Return the interrupt credits, one for each completion.
> + * Use READ_ONCE to get a single consistent copy of intx since it can
> + * be set to PDS_CORE_INTR_INDEX_NOT_ASSIGNED concurrently during
> + * teardown, and skip the credits if so.
> + */
> + intx = READ_ONCE(qcq->intx);
> + if (intx != PDS_CORE_INTR_INDEX_NOT_ASSIGNED)
> + pds_core_intr_credits(&pdsc->intr_ctrl[intx],
> + nq_work + aq_work,
> + PDS_CORE_INTR_CRED_REARM);
> refcount_dec(&pdsc->adminq_refcnt);
> }
>
> diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
> index 1074a022a52f..570c0cd7339e 100644
> --- a/drivers/net/ethernet/amd/pds_core/core.c
> +++ b/drivers/net/ethernet/amd/pds_core/core.c
> @@ -110,7 +110,8 @@ static void pdsc_qcq_intr_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)
> return;
>
> pdsc_intr_free(pdsc, qcq->intx);
> - qcq->intx = PDS_CORE_INTR_INDEX_NOT_ASSIGNED;
> + /* Pairs with READ_ONCE in pdsc_process_adminq() */
> + WRITE_ONCE(qcq->intx, PDS_CORE_INTR_INDEX_NOT_ASSIGNED);
> }
>
> static int pdsc_qcq_intr_alloc(struct pdsc *pdsc, struct pdsc_qcq *qcq)
> @@ -145,6 +146,10 @@ void pdsc_qcq_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)
>
> pdsc_qcq_intr_free(pdsc, qcq);
>
> + /* Drain any work queued by ISR before it was freed above */
> + if (qcq->work.func)
> + cancel_work_sync(&qcq->work);
> +
> if (qcq->q_base)
> dma_free_coherent(dev, qcq->q_size,
> qcq->q_base, qcq->q_base_pa);
> @@ -304,8 +309,11 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,
>
> static void pdsc_core_uninit(struct pdsc *pdsc)
> {
> - pdsc_qcq_free(pdsc, &pdsc->notifyqcq);
> + /* Free adminqcq first: its work accesses notifyqcq, so we must
> + * disable its IRQ and drain its work before freeing notifyqcq.
> + */
> pdsc_qcq_free(pdsc, &pdsc->adminqcq);
> + pdsc_qcq_free(pdsc, &pdsc->notifyqcq);
>
> if (pdsc->kern_dbpage) {
> iounmap(pdsc->kern_dbpage);
> @@ -479,8 +487,6 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing)
> {
> if (!pdsc->pdev->is_virtfn)
> pdsc_devcmd_reset(pdsc);
> - if (pdsc->adminqcq.work.func)
> - cancel_work_sync(&pdsc->adminqcq.work);
>
> pci_clear_master(pdsc->pdev);
>
> diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
> index 22db78343eb0..638b9c7a509d 100644
> --- a/drivers/net/ethernet/amd/pds_core/main.c
> +++ b/drivers/net/ethernet/amd/pds_core/main.c
> @@ -435,8 +435,6 @@ static void pdsc_remove(struct pci_dev *pdev)
> pdsc_auxbus_dev_del(pdsc, pdsc, &pdsc->padev);
>
> timer_shutdown_sync(&pdsc->wdtimer);
> - if (pdsc->wq)
> - destroy_workqueue(pdsc->wq);
>
> mutex_lock(&pdsc->config_lock);
> set_bit(PDSC_S_STOPPING_DRIVER, &pdsc->state);
> @@ -444,6 +442,9 @@ static void pdsc_remove(struct pci_dev *pdev)
> pdsc_stop(pdsc);
> pdsc_teardown(pdsc, PDSC_TEARDOWN_REMOVING);
> mutex_unlock(&pdsc->config_lock);
> +
> + if (pdsc->wq)
> + destroy_workqueue(pdsc->wq);
> mutex_destroy(&pdsc->config_lock);
> mutex_destroy(&pdsc->devcmd_lock);
>
> --
> 2.43.0
>
>
^ permalink raw reply
* Re: [PATCH net v2 1/2] pds_core: fix deadlock between reset thread and remove
From: Harshitha Ramamurthy @ 2026-06-29 21:30 UTC (permalink / raw)
To: Nikhil P. Rao
Cc: netdev, kuba, brett.creeley, eric.joyner, andrew+netdev, davem,
edumazet, pabeni
In-Reply-To: <20260629200358.2626129-2-nikhil.rao@amd.com>
On Mon, Jun 29, 2026 at 1:04 PM Nikhil P. Rao <nikhil.rao@amd.com> wrote:
>
> pci_reset_function() acquires device_lock before performing the reset.
> pdsc_remove() is called by the PCI core with device_lock already held.
> If pdsc_pci_reset_thread() is running when pdsc_remove() is called,
> destroy_workqueue() will block waiting for the work to complete, while
> the work is blocked waiting for device_lock - deadlock.
>
> Use pci_try_reset_function() which uses pci_dev_trylock() internally.
> This acquires both the device lock and the PCI config access lock
> without blocking - if either lock is contended, it returns -EAGAIN
> immediately. This avoids the deadlock while also ensuring proper
> config space access serialization during the reset.
>
> The pci_dev_get/put calls are also removed as they were unnecessary -
> the driver-owned workqueue is destroyed in pdsc_remove(), guaranteeing
> the work completes before remove returns. The PCI core holds its
> reference to pci_dev throughout the entire unbind sequence.
>
> Fixes: 81665adf25d2 ("pds_core: Fix pdsc_check_pci_health function to use work thread")
> Reported-by: Sashiko AI Review <sashiko-bot@kernel.org>
> Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com>
Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
> ---
> drivers/net/ethernet/amd/pds_core/core.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
> index 38a2446571af..1074a022a52f 100644
> --- a/drivers/net/ethernet/amd/pds_core/core.c
> +++ b/drivers/net/ethernet/amd/pds_core/core.c
> @@ -606,9 +606,10 @@ void pdsc_pci_reset_thread(struct work_struct *work)
> struct pdsc *pdsc = container_of(work, struct pdsc, pci_reset_work);
> struct pci_dev *pdev = pdsc->pdev;
>
> - pci_dev_get(pdev);
> - pci_reset_function(pdev);
> - pci_dev_put(pdev);
> + /* Use try variant to avoid deadlock with pdsc_remove().
> + * If lock is contended, the watchdog timer will retry.
> + */
> + pci_try_reset_function(pdev);
> }
>
> static void pdsc_check_pci_health(struct pdsc *pdsc)
> --
> 2.43.0
>
>
^ permalink raw reply
* RE: [EXTERNAL] Re: [PATCH net-next v4] net: mana: Add Interrupt Moderation support
From: Haiyang Zhang @ 2026-06-29 21:23 UTC (permalink / raw)
To: Jakub Kicinski, Haiyang Zhang
Cc: linux-hyperv@vger.kernel.org, netdev@vger.kernel.org,
KY Srinivasan, Wei Liu, Dexuan Cui, Long Li, Andrew Lunn,
David S. Miller, Eric Dumazet, Paolo Abeni, Konstantin Taranov,
Simon Horman, Shradha Gupta, Erni Sri Satya Vennela, Dipayaan Roy,
Aditya Garg, Breno Leitao, linux-kernel@vger.kernel.org,
linux-rdma@vger.kernel.org, Paul Rosswurm
In-Reply-To: <20260615185449.6a496c1f@kernel.org>
> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Monday, June 15, 2026 9:55 PM
> To: Haiyang Zhang <haiyangz@linux.microsoft.com>
> Cc: linux-hyperv@vger.kernel.org; netdev@vger.kernel.org; KY Srinivasan
> <kys@microsoft.com>; Haiyang Zhang <haiyangz@microsoft.com>; Wei Liu
> <wei.liu@kernel.org>; Dexuan Cui <DECUI@microsoft.com>; Long Li
> <longli@microsoft.com>; Andrew Lunn <andrew+netdev@lunn.ch>; David S.
> Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Paolo
> Abeni <pabeni@redhat.com>; Konstantin Taranov <kotaranov@microsoft.com>;
> Simon Horman <horms@kernel.org>; Shradha Gupta
> <shradhagupta@linux.microsoft.com>; Erni Sri Satya Vennela
> <ernis@linux.microsoft.com>; Dipayaan Roy
> <dipayanroy@linux.microsoft.com>; Aditya Garg
> <gargaditya@linux.microsoft.com>; Breno Leitao <leitao@debian.org>; linux-
> kernel@vger.kernel.org; linux-rdma@vger.kernel.org; Paul Rosswurm
> <paulros@microsoft.com>
> Subject: [EXTERNAL] Re: [PATCH net-next v4] net: mana: Add Interrupt
> Moderation support
>
> On Sat, 13 Jun 2026 13:57:54 -0700 Haiyang Zhang wrote:
> > Add Static and Dynamic Interrupt Moderation (DIM) support for
> > Rx and Tx.
> > Update queue creation procedure with new data struct with the related
> > settings.
> > Add functions to collect stat for DIM, and workers to update DIM data
> > and settings.
> > Update ethtool handler to get/set the moderation settings from a user.
> > To avoid detach/re-attach ops, ring DIM doorbell to change settings
> > at run time.
> > By default, adaptive-rx/tx (DIM) are enabled if supported by HW.
>
> The merge window has started and we need to start working on our PRs.
> This will need to be reposted after 7.2-rc1 is tagged, sorry
Sure I will repost it.
- Haiyang
^ permalink raw reply
* [PATCH net-next 1/2] ehea: remove the ehea driver
From: David Christensen @ 2026-06-29 21:13 UTC (permalink / raw)
To: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: netdev, linuxppc-dev, linux-kernel, David Christensen
In-Reply-To: <20260629211343.3712775-1-drc@linux.ibm.com>
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.
Signed-off-by: David Christensen <drc@linux.ibm.com>
---
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
diff --git a/MAINTAINERS b/MAINTAINERS
index 15011f5752a9..ee4ee7b8e947 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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: netdev@vger.kernel.org
-S: Orphan
-F: drivers/net/ethernet/ibm/ehea/
-
ELM327 CAN NETWORK DRIVER
M: Max Staudt <max@enpas.org>
L: linux-can@vger.kernel.org
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index 4f4b23465c47..8e55faac2035 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -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
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
index 1d17d0c33d4d..c7e5d891c946 100644
--- a/drivers/net/ethernet/ibm/Makefile
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -6,4 +6,3 @@
obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_IBMVNIC) += ibmvnic.o
obj-$(CONFIG_IBM_EMAC) += emac/
-obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ethernet/ibm/ehea/Makefile b/drivers/net/ethernet/ibm/ehea/Makefile
deleted file mode 100644
index 9e1e5c7aafe2..000000000000
--- a/drivers/net/ethernet/ibm/ehea/Makefile
+++ /dev/null
@@ -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
-
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
deleted file mode 100644
index 208c440a602b..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea.h
+++ /dev/null
@@ -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 <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#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__ */
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
deleted file mode 100644
index 1db5b6790a41..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
+++ /dev/null
@@ -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 <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#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;
-}
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_hw.h b/drivers/net/ethernet/ibm/ehea/ehea_hw.h
deleted file mode 100644
index 590933a45d65..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_hw.h
+++ /dev/null
@@ -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 <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#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__ */
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
deleted file mode 100644
index bfc8699a05b9..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ /dev/null
@@ -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 <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#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 <raisch@de.ibm.com>");
-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();
-}
-
-static void xmit_common(struct sk_buff *skb, struct ehea_swqe *swqe)
-{
- swqe->tx_control |= EHEA_SWQE_IMM_DATA_PRESENT | EHEA_SWQE_CRC;
-
- if (vlan_get_protocol(skb) != htons(ETH_P_IP))
- return;
-
- if (skb->ip_summed == CHECKSUM_PARTIAL)
- swqe->tx_control |= EHEA_SWQE_IP_CHECKSUM;
-
- swqe->ip_start = skb_network_offset(skb);
- swqe->ip_end = swqe->ip_start + ip_hdrlen(skb) - 1;
-
- switch (ip_hdr(skb)->protocol) {
- case IPPROTO_UDP:
- if (skb->ip_summed == CHECKSUM_PARTIAL)
- swqe->tx_control |= EHEA_SWQE_TCP_CHECKSUM;
-
- swqe->tcp_offset = swqe->ip_end + 1 +
- offsetof(struct udphdr, check);
- break;
-
- case IPPROTO_TCP:
- if (skb->ip_summed == CHECKSUM_PARTIAL)
- swqe->tx_control |= EHEA_SWQE_TCP_CHECKSUM;
-
- swqe->tcp_offset = swqe->ip_end + 1 +
- offsetof(struct tcphdr, check);
- break;
- }
-}
-
-static void ehea_xmit2(struct sk_buff *skb, struct net_device *dev,
- struct ehea_swqe *swqe, u32 lkey)
-{
- swqe->tx_control |= EHEA_SWQE_DESCRIPTORS_PRESENT;
-
- xmit_common(skb, swqe);
-
- write_swqe2_data(skb, dev, swqe, lkey);
-}
-
-static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
- struct ehea_swqe *swqe)
-{
- u8 *imm_data = &swqe->u.immdata_nodesc.immediate_data[0];
-
- xmit_common(skb, swqe);
-
- if (!skb->data_len)
- skb_copy_from_linear_data(skb, imm_data, skb->len);
- else
- skb_copy_bits(skb, 0, imm_data, skb->len);
-
- swqe->immediate_data_length = skb->len;
- dev_consume_skb_any(skb);
-}
-
-static netdev_tx_t ehea_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
- struct ehea_port *port = netdev_priv(dev);
- struct ehea_swqe *swqe;
- u32 lkey;
- int swqe_index;
- struct ehea_port_res *pr;
- struct netdev_queue *txq;
-
- pr = &port->port_res[skb_get_queue_mapping(skb)];
- txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
-
- swqe = ehea_get_swqe(pr->qp, &swqe_index);
- memset(swqe, 0, SWQE_HEADER_SIZE);
- atomic_dec(&pr->swqe_avail);
-
- if (skb_vlan_tag_present(skb)) {
- swqe->tx_control |= EHEA_SWQE_VLAN_INSERT;
- swqe->vlan_tag = skb_vlan_tag_get(skb);
- }
-
- pr->tx_packets++;
- pr->tx_bytes += skb->len;
-
- if (skb->len <= SWQE3_MAX_IMM) {
- u32 sig_iv = port->sig_comp_iv;
- u32 swqe_num = pr->swqe_id_counter;
- ehea_xmit3(skb, dev, swqe);
- swqe->wr_id = EHEA_BMASK_SET(EHEA_WR_ID_TYPE, EHEA_SWQE3_TYPE)
- | EHEA_BMASK_SET(EHEA_WR_ID_COUNT, swqe_num);
- if (pr->swqe_ll_count >= (sig_iv - 1)) {
- swqe->wr_id |= EHEA_BMASK_SET(EHEA_WR_ID_REFILL,
- sig_iv);
- swqe->tx_control |= EHEA_SWQE_SIGNALLED_COMPLETION;
- pr->swqe_ll_count = 0;
- } else
- pr->swqe_ll_count += 1;
- } else {
- swqe->wr_id =
- EHEA_BMASK_SET(EHEA_WR_ID_TYPE, EHEA_SWQE2_TYPE)
- | EHEA_BMASK_SET(EHEA_WR_ID_COUNT, pr->swqe_id_counter)
- | EHEA_BMASK_SET(EHEA_WR_ID_REFILL, 1)
- | EHEA_BMASK_SET(EHEA_WR_ID_INDEX, pr->sq_skba.index);
- pr->sq_skba.arr[pr->sq_skba.index] = skb;
-
- pr->sq_skba.index++;
- pr->sq_skba.index &= (pr->sq_skba.len - 1);
-
- lkey = pr->send_mr.lkey;
- ehea_xmit2(skb, dev, swqe, lkey);
- swqe->tx_control |= EHEA_SWQE_SIGNALLED_COMPLETION;
- }
- pr->swqe_id_counter += 1;
-
- netif_info(port, tx_queued, dev,
- "post swqe on QP %d\n", pr->qp->init_attr.qp_nr);
- if (netif_msg_tx_queued(port))
- ehea_dump(swqe, 512, "swqe");
-
- if (unlikely(test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))) {
- netif_tx_stop_queue(txq);
- swqe->tx_control |= EHEA_SWQE_PURGE;
- }
-
- ehea_post_swqe(pr->qp, swqe);
-
- if (unlikely(atomic_read(&pr->swqe_avail) <= 1)) {
- pr->p_stats.queue_stopped++;
- netif_tx_stop_queue(txq);
- }
-
- return NETDEV_TX_OK;
-}
-
-static int ehea_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)
-{
- struct ehea_port *port = netdev_priv(dev);
- struct ehea_adapter *adapter = port->adapter;
- struct hcp_ehea_port_cb1 *cb1;
- int index;
- u64 hret;
- int err = 0;
-
- cb1 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb1) {
- pr_err("no mem for cb1\n");
- err = -ENOMEM;
- goto out;
- }
-
- hret = ehea_h_query_ehea_port(adapter->handle, port->logical_port_id,
- H_PORT_CB1, H_PORT_CB1_ALL, cb1);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_port failed\n");
- err = -EINVAL;
- goto out;
- }
-
- index = (vid / 64);
- cb1->vlan_filter[index] |= ((u64)(0x8000000000000000 >> (vid & 0x3F)));
-
- hret = ehea_h_modify_ehea_port(adapter->handle, port->logical_port_id,
- H_PORT_CB1, H_PORT_CB1_ALL, cb1);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_port failed\n");
- err = -EINVAL;
- }
-out:
- free_page((unsigned long)cb1);
- return err;
-}
-
-static int ehea_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid)
-{
- struct ehea_port *port = netdev_priv(dev);
- struct ehea_adapter *adapter = port->adapter;
- struct hcp_ehea_port_cb1 *cb1;
- int index;
- u64 hret;
- int err = 0;
-
- cb1 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb1) {
- pr_err("no mem for cb1\n");
- err = -ENOMEM;
- goto out;
- }
-
- hret = ehea_h_query_ehea_port(adapter->handle, port->logical_port_id,
- H_PORT_CB1, H_PORT_CB1_ALL, cb1);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_port failed\n");
- err = -EINVAL;
- goto out;
- }
-
- index = (vid / 64);
- cb1->vlan_filter[index] &= ~((u64)(0x8000000000000000 >> (vid & 0x3F)));
-
- hret = ehea_h_modify_ehea_port(adapter->handle, port->logical_port_id,
- H_PORT_CB1, H_PORT_CB1_ALL, cb1);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_port failed\n");
- err = -EINVAL;
- }
-out:
- free_page((unsigned long)cb1);
- return err;
-}
-
-static int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
-{
- int ret = -EIO;
- u64 hret;
- u16 dummy16 = 0;
- u64 dummy64 = 0;
- struct hcp_modify_qp_cb0 *cb0;
-
- cb0 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb0) {
- ret = -ENOMEM;
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF), cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (1)\n");
- goto out;
- }
-
- cb0->qp_ctl_reg = H_QP_CR_STATE_INITIALIZED;
- hret = ehea_h_modify_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_QP_CTL_REG, 1), cb0,
- &dummy64, &dummy64, &dummy16, &dummy16);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_qp failed (1)\n");
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF), cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (2)\n");
- goto out;
- }
-
- cb0->qp_ctl_reg = H_QP_CR_ENABLED | H_QP_CR_STATE_INITIALIZED;
- hret = ehea_h_modify_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_QP_CTL_REG, 1), cb0,
- &dummy64, &dummy64, &dummy16, &dummy16);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_qp failed (2)\n");
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF), cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (3)\n");
- goto out;
- }
-
- cb0->qp_ctl_reg = H_QP_CR_ENABLED | H_QP_CR_STATE_RDY2SND;
- hret = ehea_h_modify_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_QP_CTL_REG, 1), cb0,
- &dummy64, &dummy64, &dummy16, &dummy16);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_qp failed (3)\n");
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF), cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (4)\n");
- goto out;
- }
-
- ret = 0;
-out:
- free_page((unsigned long)cb0);
- return ret;
-}
-
-static int ehea_port_res_setup(struct ehea_port *port, int def_qps)
-{
- int ret, i;
- struct port_res_cfg pr_cfg, pr_cfg_small_rx;
- enum ehea_eq_type eq_type = EHEA_EQ;
-
- port->qp_eq = ehea_create_eq(port->adapter, eq_type,
- EHEA_MAX_ENTRIES_EQ, 1);
- if (!port->qp_eq) {
- ret = -EINVAL;
- pr_err("ehea_create_eq failed (qp_eq)\n");
- goto out_kill_eq;
- }
-
- pr_cfg.max_entries_rcq = rq1_entries + rq2_entries + rq3_entries;
- pr_cfg.max_entries_scq = sq_entries * 2;
- pr_cfg.max_entries_sq = sq_entries;
- pr_cfg.max_entries_rq1 = rq1_entries;
- pr_cfg.max_entries_rq2 = rq2_entries;
- pr_cfg.max_entries_rq3 = rq3_entries;
-
- pr_cfg_small_rx.max_entries_rcq = 1;
- pr_cfg_small_rx.max_entries_scq = sq_entries;
- pr_cfg_small_rx.max_entries_sq = sq_entries;
- pr_cfg_small_rx.max_entries_rq1 = 1;
- pr_cfg_small_rx.max_entries_rq2 = 1;
- pr_cfg_small_rx.max_entries_rq3 = 1;
-
- for (i = 0; i < def_qps; i++) {
- ret = ehea_init_port_res(port, &port->port_res[i], &pr_cfg, i);
- if (ret)
- goto out_clean_pr;
- }
- for (i = def_qps; i < def_qps; i++) {
- ret = ehea_init_port_res(port, &port->port_res[i],
- &pr_cfg_small_rx, i);
- if (ret)
- goto out_clean_pr;
- }
-
- return 0;
-
-out_clean_pr:
- while (--i >= 0)
- ehea_clean_portres(port, &port->port_res[i]);
-
-out_kill_eq:
- ehea_destroy_eq(port->qp_eq);
- return ret;
-}
-
-static int ehea_clean_all_portres(struct ehea_port *port)
-{
- int ret = 0;
- int i;
-
- for (i = 0; i < port->num_def_qps; i++)
- ret |= ehea_clean_portres(port, &port->port_res[i]);
-
- ret |= ehea_destroy_eq(port->qp_eq);
-
- return ret;
-}
-
-static void ehea_remove_adapter_mr(struct ehea_adapter *adapter)
-{
- if (adapter->active_ports)
- return;
-
- ehea_rem_mr(&adapter->mr);
-}
-
-static int ehea_add_adapter_mr(struct ehea_adapter *adapter)
-{
- if (adapter->active_ports)
- return 0;
-
- return ehea_reg_kernel_mr(adapter, &adapter->mr);
-}
-
-static int ehea_up(struct net_device *dev)
-{
- int ret, i;
- struct ehea_port *port = netdev_priv(dev);
-
- if (port->state == EHEA_PORT_UP)
- return 0;
-
- ret = ehea_port_res_setup(port, port->num_def_qps);
- if (ret) {
- netdev_err(dev, "port_res_failed\n");
- goto out;
- }
-
- /* Set default QP for this port */
- ret = ehea_configure_port(port);
- if (ret) {
- netdev_err(dev, "ehea_configure_port failed. ret:%d\n", ret);
- goto out_clean_pr;
- }
-
- ret = ehea_reg_interrupts(dev);
- if (ret) {
- netdev_err(dev, "reg_interrupts failed. ret:%d\n", ret);
- goto out_clean_pr;
- }
-
- for (i = 0; i < port->num_def_qps; i++) {
- ret = ehea_activate_qp(port->adapter, port->port_res[i].qp);
- if (ret) {
- netdev_err(dev, "activate_qp failed\n");
- goto out_free_irqs;
- }
- }
-
- for (i = 0; i < port->num_def_qps; i++) {
- ret = ehea_fill_port_res(&port->port_res[i]);
- if (ret) {
- netdev_err(dev, "out_free_irqs\n");
- goto out_free_irqs;
- }
- }
-
- ret = ehea_broadcast_reg_helper(port, H_REG_BCMC);
- if (ret) {
- ret = -EIO;
- goto out_free_irqs;
- }
-
- port->state = EHEA_PORT_UP;
-
- ret = 0;
- goto out;
-
-out_free_irqs:
- ehea_free_interrupts(dev);
-
-out_clean_pr:
- ehea_clean_all_portres(port);
-out:
- if (ret)
- netdev_info(dev, "Failed starting. ret=%i\n", ret);
-
- ehea_update_bcmc_registrations();
- ehea_update_firmware_handles();
-
- return ret;
-}
-
-static void port_napi_disable(struct ehea_port *port)
-{
- int i;
-
- for (i = 0; i < port->num_def_qps; i++)
- napi_disable(&port->port_res[i].napi);
-}
-
-static void port_napi_enable(struct ehea_port *port)
-{
- int i;
-
- for (i = 0; i < port->num_def_qps; i++)
- napi_enable(&port->port_res[i].napi);
-}
-
-static int ehea_open(struct net_device *dev)
-{
- int ret;
- struct ehea_port *port = netdev_priv(dev);
-
- mutex_lock(&port->port_lock);
-
- netif_info(port, ifup, dev, "enabling port\n");
-
- netif_carrier_off(dev);
-
- ret = ehea_up(dev);
- if (!ret) {
- port_napi_enable(port);
- netif_tx_start_all_queues(dev);
- }
-
- mutex_unlock(&port->port_lock);
- schedule_delayed_work(&port->stats_work,
- round_jiffies_relative(msecs_to_jiffies(1000)));
-
- return ret;
-}
-
-static int ehea_down(struct net_device *dev)
-{
- int ret;
- struct ehea_port *port = netdev_priv(dev);
-
- if (port->state == EHEA_PORT_DOWN)
- return 0;
-
- ehea_drop_multicast_list(dev);
- ehea_allmulti(dev, 0);
- ehea_broadcast_reg_helper(port, H_DEREG_BCMC);
-
- ehea_free_interrupts(dev);
-
- port->state = EHEA_PORT_DOWN;
-
- ehea_update_bcmc_registrations();
-
- ret = ehea_clean_all_portres(port);
- if (ret)
- netdev_info(dev, "Failed freeing resources. ret=%i\n", ret);
-
- ehea_update_firmware_handles();
-
- return ret;
-}
-
-static int ehea_stop(struct net_device *dev)
-{
- int ret;
- struct ehea_port *port = netdev_priv(dev);
-
- netif_info(port, ifdown, dev, "disabling port\n");
-
- set_bit(__EHEA_DISABLE_PORT_RESET, &port->flags);
- cancel_work_sync(&port->reset_task);
- cancel_delayed_work_sync(&port->stats_work);
- mutex_lock(&port->port_lock);
- netif_tx_stop_all_queues(dev);
- port_napi_disable(port);
- ret = ehea_down(dev);
- mutex_unlock(&port->port_lock);
- clear_bit(__EHEA_DISABLE_PORT_RESET, &port->flags);
- return ret;
-}
-
-static void ehea_purge_sq(struct ehea_qp *orig_qp)
-{
- struct ehea_qp qp = *orig_qp;
- struct ehea_qp_init_attr *init_attr = &qp.init_attr;
- struct ehea_swqe *swqe;
- int wqe_index;
- int i;
-
- for (i = 0; i < init_attr->act_nr_send_wqes; i++) {
- swqe = ehea_get_swqe(&qp, &wqe_index);
- swqe->tx_control |= EHEA_SWQE_PURGE;
- }
-}
-
-static void ehea_flush_sq(struct ehea_port *port)
-{
- int i;
-
- for (i = 0; i < port->num_def_qps; i++) {
- struct ehea_port_res *pr = &port->port_res[i];
- int swqe_max = pr->sq_skba_size - 2 - pr->swqe_ll_count;
- int ret;
-
- ret = wait_event_timeout(port->swqe_avail_wq,
- atomic_read(&pr->swqe_avail) >= swqe_max,
- msecs_to_jiffies(100));
-
- if (!ret) {
- pr_err("WARNING: sq not flushed completely\n");
- break;
- }
- }
-}
-
-static int ehea_stop_qps(struct net_device *dev)
-{
- struct ehea_port *port = netdev_priv(dev);
- struct ehea_adapter *adapter = port->adapter;
- struct hcp_modify_qp_cb0 *cb0;
- int ret = -EIO;
- int dret;
- int i;
- u64 hret;
- u64 dummy64 = 0;
- u16 dummy16 = 0;
-
- cb0 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb0) {
- ret = -ENOMEM;
- goto out;
- }
-
- for (i = 0; i < (port->num_def_qps); i++) {
- struct ehea_port_res *pr = &port->port_res[i];
- struct ehea_qp *qp = pr->qp;
-
- /* Purge send queue */
- ehea_purge_sq(qp);
-
- /* Disable queue pair */
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF),
- cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (1)\n");
- goto out;
- }
-
- cb0->qp_ctl_reg = (cb0->qp_ctl_reg & H_QP_CR_RES_STATE) << 8;
- cb0->qp_ctl_reg &= ~H_QP_CR_ENABLED;
-
- hret = ehea_h_modify_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_QP_CTL_REG,
- 1), cb0, &dummy64,
- &dummy64, &dummy16, &dummy16);
- if (hret != H_SUCCESS) {
- pr_err("modify_ehea_qp failed (1)\n");
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF),
- cb0);
- if (hret != H_SUCCESS) {
- pr_err("query_ehea_qp failed (2)\n");
- goto out;
- }
-
- /* deregister shared memory regions */
- dret = ehea_rem_smrs(pr);
- if (dret) {
- pr_err("unreg shared memory region failed\n");
- goto out;
- }
- }
-
- ret = 0;
-out:
- free_page((unsigned long)cb0);
-
- return ret;
-}
-
-static void ehea_update_rqs(struct ehea_qp *orig_qp, struct ehea_port_res *pr)
-{
- struct ehea_qp qp = *orig_qp;
- struct ehea_qp_init_attr *init_attr = &qp.init_attr;
- struct ehea_rwqe *rwqe;
- struct sk_buff **skba_rq2 = pr->rq2_skba.arr;
- struct sk_buff **skba_rq3 = pr->rq3_skba.arr;
- struct sk_buff *skb;
- u32 lkey = pr->recv_mr.lkey;
-
-
- int i;
- int index;
-
- for (i = 0; i < init_attr->act_nr_rwqes_rq2 + 1; i++) {
- rwqe = ehea_get_next_rwqe(&qp, 2);
- rwqe->sg_list[0].l_key = lkey;
- index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, rwqe->wr_id);
- skb = skba_rq2[index];
- if (skb)
- rwqe->sg_list[0].vaddr = ehea_map_vaddr(skb->data);
- }
-
- for (i = 0; i < init_attr->act_nr_rwqes_rq3 + 1; i++) {
- rwqe = ehea_get_next_rwqe(&qp, 3);
- rwqe->sg_list[0].l_key = lkey;
- index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, rwqe->wr_id);
- skb = skba_rq3[index];
- if (skb)
- rwqe->sg_list[0].vaddr = ehea_map_vaddr(skb->data);
- }
-}
-
-static int ehea_restart_qps(struct net_device *dev)
-{
- struct ehea_port *port = netdev_priv(dev);
- struct ehea_adapter *adapter = port->adapter;
- int ret = 0;
- int i;
-
- struct hcp_modify_qp_cb0 *cb0;
- u64 hret;
- u64 dummy64 = 0;
- u16 dummy16 = 0;
-
- cb0 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb0)
- return -ENOMEM;
-
- for (i = 0; i < (port->num_def_qps); i++) {
- struct ehea_port_res *pr = &port->port_res[i];
- struct ehea_qp *qp = pr->qp;
-
- ret = ehea_gen_smrs(pr);
- if (ret) {
- netdev_err(dev, "creation of shared memory regions failed\n");
- goto out;
- }
-
- ehea_update_rqs(qp, pr);
-
- /* Enable queue pair */
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF),
- cb0);
- if (hret != H_SUCCESS) {
- netdev_err(dev, "query_ehea_qp failed (1)\n");
- ret = -EFAULT;
- goto out;
- }
-
- cb0->qp_ctl_reg = (cb0->qp_ctl_reg & H_QP_CR_RES_STATE) << 8;
- cb0->qp_ctl_reg |= H_QP_CR_ENABLED;
-
- hret = ehea_h_modify_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_QP_CTL_REG,
- 1), cb0, &dummy64,
- &dummy64, &dummy16, &dummy16);
- if (hret != H_SUCCESS) {
- netdev_err(dev, "modify_ehea_qp failed (1)\n");
- ret = -EFAULT;
- goto out;
- }
-
- hret = ehea_h_query_ehea_qp(adapter->handle, 0, qp->fw_handle,
- EHEA_BMASK_SET(H_QPCB0_ALL, 0xFFFF),
- cb0);
- if (hret != H_SUCCESS) {
- netdev_err(dev, "query_ehea_qp failed (2)\n");
- ret = -EFAULT;
- goto out;
- }
-
- /* refill entire queue */
- ehea_refill_rq1(pr, pr->rq1_skba.index, 0);
- ehea_refill_rq2(pr, 0);
- ehea_refill_rq3(pr, 0);
- }
-out:
- free_page((unsigned long)cb0);
-
- return ret;
-}
-
-static void ehea_reset_port(struct work_struct *work)
-{
- int ret;
- struct ehea_port *port =
- container_of(work, struct ehea_port, reset_task);
- struct net_device *dev = port->netdev;
-
- mutex_lock(&dlpar_mem_lock);
- port->resets++;
- mutex_lock(&port->port_lock);
- netif_tx_disable(dev);
-
- port_napi_disable(port);
-
- ehea_down(dev);
-
- ret = ehea_up(dev);
- if (ret)
- goto out;
-
- ehea_set_multicast_list(dev);
-
- netif_info(port, timer, dev, "reset successful\n");
-
- port_napi_enable(port);
-
- netif_tx_wake_all_queues(dev);
-out:
- mutex_unlock(&port->port_lock);
- mutex_unlock(&dlpar_mem_lock);
-}
-
-static void ehea_rereg_mrs(void)
-{
- int ret, i;
- struct ehea_adapter *adapter;
-
- pr_info("LPAR memory changed - re-initializing driver\n");
-
- list_for_each_entry(adapter, &adapter_list, list)
- if (adapter->active_ports) {
- /* Shutdown all ports */
- for (i = 0; i < EHEA_MAX_PORTS; i++) {
- struct ehea_port *port = adapter->port[i];
- struct net_device *dev;
-
- if (!port)
- continue;
-
- dev = port->netdev;
-
- if (dev->flags & IFF_UP) {
- mutex_lock(&port->port_lock);
- netif_tx_disable(dev);
- ehea_flush_sq(port);
- ret = ehea_stop_qps(dev);
- if (ret) {
- mutex_unlock(&port->port_lock);
- goto out;
- }
- port_napi_disable(port);
- mutex_unlock(&port->port_lock);
- }
- reset_sq_restart_flag(port);
- }
-
- /* Unregister old memory region */
- ret = ehea_rem_mr(&adapter->mr);
- if (ret) {
- pr_err("unregister MR failed - driver inoperable!\n");
- goto out;
- }
- }
-
- clear_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
-
- list_for_each_entry(adapter, &adapter_list, list)
- if (adapter->active_ports) {
- /* Register new memory region */
- ret = ehea_reg_kernel_mr(adapter, &adapter->mr);
- if (ret) {
- pr_err("register MR failed - driver inoperable!\n");
- goto out;
- }
-
- /* Restart all ports */
- for (i = 0; i < EHEA_MAX_PORTS; i++) {
- struct ehea_port *port = adapter->port[i];
-
- if (port) {
- struct net_device *dev = port->netdev;
-
- if (dev->flags & IFF_UP) {
- mutex_lock(&port->port_lock);
- ret = ehea_restart_qps(dev);
- if (!ret) {
- check_sqs(port);
- port_napi_enable(port);
- netif_tx_wake_all_queues(dev);
- } else {
- netdev_err(dev, "Unable to restart QPS\n");
- }
- mutex_unlock(&port->port_lock);
- }
- }
- }
- }
- pr_info("re-initializing driver complete\n");
-out:
- return;
-}
-
-static void ehea_tx_watchdog(struct net_device *dev, unsigned int txqueue)
-{
- struct ehea_port *port = netdev_priv(dev);
-
- if (netif_carrier_ok(dev) &&
- !test_bit(__EHEA_STOP_XFER, &ehea_driver_flags))
- ehea_schedule_port_reset(port);
-}
-
-static int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
-{
- struct hcp_query_ehea *cb;
- u64 hret;
- int ret;
-
- cb = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb) {
- ret = -ENOMEM;
- goto out;
- }
-
- hret = ehea_h_query_ehea(adapter->handle, cb);
-
- if (hret != H_SUCCESS) {
- ret = -EIO;
- goto out_herr;
- }
-
- adapter->max_mc_mac = cb->max_mc_mac - 1;
- ret = 0;
-
-out_herr:
- free_page((unsigned long)cb);
-out:
- return ret;
-}
-
-static int ehea_get_jumboframe_status(struct ehea_port *port, int *jumbo)
-{
- struct hcp_ehea_port_cb4 *cb4;
- u64 hret;
- int ret = 0;
-
- *jumbo = 0;
-
- /* (Try to) enable *jumbo frames */
- cb4 = (void *)get_zeroed_page(GFP_KERNEL);
- if (!cb4) {
- pr_err("no mem for cb4\n");
- ret = -ENOMEM;
- goto out;
- } else {
- hret = ehea_h_query_ehea_port(port->adapter->handle,
- port->logical_port_id,
- H_PORT_CB4,
- H_PORT_CB4_JUMBO, cb4);
- if (hret == H_SUCCESS) {
- if (cb4->jumbo_frame)
- *jumbo = 1;
- else {
- cb4->jumbo_frame = 1;
- hret = ehea_h_modify_ehea_port(port->adapter->
- handle,
- port->
- logical_port_id,
- H_PORT_CB4,
- H_PORT_CB4_JUMBO,
- cb4);
- if (hret == H_SUCCESS)
- *jumbo = 1;
- }
- } else
- ret = -EINVAL;
-
- free_page((unsigned long)cb4);
- }
-out:
- return ret;
-}
-
-static ssize_t log_port_id_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
- return sprintf(buf, "%d", port->logical_port_id);
-}
-
-static DEVICE_ATTR_RO(log_port_id);
-
-static void logical_port_release(struct device *dev)
-{
- struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
- of_node_put(port->ofdev.dev.of_node);
-}
-
-static struct device *ehea_register_port(struct ehea_port *port,
- struct device_node *dn)
-{
- int ret;
-
- port->ofdev.dev.of_node = of_node_get(dn);
- port->ofdev.dev.parent = &port->adapter->ofdev->dev;
- port->ofdev.dev.bus = &ibmebus_bus_type;
-
- dev_set_name(&port->ofdev.dev, "port%d", port_name_cnt++);
- port->ofdev.dev.release = logical_port_release;
-
- ret = of_device_register(&port->ofdev);
- if (ret) {
- pr_err("failed to register device. ret=%d\n", ret);
- put_device(&port->ofdev.dev);
- goto out;
- }
-
- ret = device_create_file(&port->ofdev.dev, &dev_attr_log_port_id);
- if (ret) {
- pr_err("failed to register attributes, ret=%d\n", ret);
- goto out_unreg_of_dev;
- }
-
- return &port->ofdev.dev;
-
-out_unreg_of_dev:
- of_device_unregister(&port->ofdev);
-out:
- return NULL;
-}
-
-static void ehea_unregister_port(struct ehea_port *port)
-{
- device_remove_file(&port->ofdev.dev, &dev_attr_log_port_id);
- of_device_unregister(&port->ofdev);
-}
-
-static const struct net_device_ops ehea_netdev_ops = {
- .ndo_open = ehea_open,
- .ndo_stop = ehea_stop,
- .ndo_start_xmit = ehea_start_xmit,
- .ndo_get_stats64 = ehea_get_stats64,
- .ndo_set_mac_address = ehea_set_mac_addr,
- .ndo_validate_addr = eth_validate_addr,
- .ndo_set_rx_mode = ehea_set_multicast_list,
- .ndo_vlan_rx_add_vid = ehea_vlan_rx_add_vid,
- .ndo_vlan_rx_kill_vid = ehea_vlan_rx_kill_vid,
- .ndo_tx_timeout = ehea_tx_watchdog,
-};
-
-static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
- u32 logical_port_id,
- struct device_node *dn)
-{
- int ret;
- struct net_device *dev;
- struct ehea_port *port;
- struct device *port_dev;
- int jumbo;
-
- /* allocate memory for the port structures */
- dev = alloc_etherdev_mq(sizeof(struct ehea_port), EHEA_MAX_PORT_RES);
-
- if (!dev) {
- ret = -ENOMEM;
- goto out_err;
- }
-
- port = netdev_priv(dev);
-
- mutex_init(&port->port_lock);
- port->state = EHEA_PORT_DOWN;
- port->sig_comp_iv = sq_entries / 10;
-
- port->adapter = adapter;
- port->netdev = dev;
- port->logical_port_id = logical_port_id;
-
- port->msg_enable = netif_msg_init(msg_level, EHEA_MSG_DEFAULT);
-
- port->mc_list = kzalloc_obj(struct ehea_mc_list);
- if (!port->mc_list) {
- ret = -ENOMEM;
- goto out_free_ethdev;
- }
-
- INIT_LIST_HEAD(&port->mc_list->list);
-
- ret = ehea_sense_port_attr(port);
- if (ret)
- goto out_free_mc_list;
-
- netif_set_real_num_rx_queues(dev, port->num_def_qps);
- netif_set_real_num_tx_queues(dev, port->num_def_qps);
-
- port_dev = ehea_register_port(port, dn);
- if (!port_dev)
- goto out_free_mc_list;
-
- SET_NETDEV_DEV(dev, port_dev);
-
- /* initialize net_device structure */
- eth_hw_addr_set(dev, (u8 *)&port->mac_addr);
-
- dev->netdev_ops = &ehea_netdev_ops;
- ehea_set_ethtool_ops(dev);
-
- dev->hw_features = NETIF_F_SG | NETIF_F_TSO |
- NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX;
- dev->features = NETIF_F_SG | NETIF_F_TSO |
- NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
- NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
- NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM;
- dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |
- NETIF_F_IP_CSUM;
- dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
-
- /* MTU range: 68 - 9022 */
- dev->min_mtu = ETH_MIN_MTU;
- dev->max_mtu = EHEA_MAX_PACKET_SIZE;
-
- INIT_WORK(&port->reset_task, ehea_reset_port);
- INIT_DELAYED_WORK(&port->stats_work, ehea_update_stats);
-
- init_waitqueue_head(&port->swqe_avail_wq);
- init_waitqueue_head(&port->restart_wq);
-
- ret = register_netdev(dev);
- if (ret) {
- pr_err("register_netdev failed. ret=%d\n", ret);
- goto out_unreg_port;
- }
-
- ret = ehea_get_jumboframe_status(port, &jumbo);
- if (ret)
- netdev_err(dev, "failed determining jumbo frame status\n");
-
- netdev_info(dev, "Jumbo frames are %sabled\n",
- jumbo == 1 ? "en" : "dis");
-
- adapter->active_ports++;
-
- return port;
-
-out_unreg_port:
- ehea_unregister_port(port);
-
-out_free_mc_list:
- kfree(port->mc_list);
-
-out_free_ethdev:
- free_netdev(dev);
-
-out_err:
- pr_err("setting up logical port with id=%d failed, ret=%d\n",
- logical_port_id, ret);
- return NULL;
-}
-
-static void ehea_shutdown_single_port(struct ehea_port *port)
-{
- struct ehea_adapter *adapter = port->adapter;
-
- cancel_work_sync(&port->reset_task);
- cancel_delayed_work_sync(&port->stats_work);
- unregister_netdev(port->netdev);
- ehea_unregister_port(port);
- kfree(port->mc_list);
- free_netdev(port->netdev);
- adapter->active_ports--;
-}
-
-static int ehea_setup_ports(struct ehea_adapter *adapter)
-{
- struct device_node *lhea_dn;
- struct device_node *eth_dn;
-
- const u32 *dn_log_port_id;
- int i = 0;
-
- lhea_dn = adapter->ofdev->dev.of_node;
- for_each_child_of_node(lhea_dn, eth_dn) {
- dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
- NULL);
- if (!dn_log_port_id) {
- pr_err("bad device node: eth_dn name=%pOF\n", eth_dn);
- continue;
- }
-
- if (ehea_add_adapter_mr(adapter)) {
- pr_err("creating MR failed\n");
- of_node_put(eth_dn);
- return -EIO;
- }
-
- adapter->port[i] = ehea_setup_single_port(adapter,
- *dn_log_port_id,
- eth_dn);
- if (adapter->port[i])
- netdev_info(adapter->port[i]->netdev,
- "logical port id #%d\n", *dn_log_port_id);
- else
- ehea_remove_adapter_mr(adapter);
-
- i++;
- }
- return 0;
-}
-
-static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
- u32 logical_port_id)
-{
- struct device_node *lhea_dn;
- struct device_node *eth_dn;
- const u32 *dn_log_port_id;
-
- lhea_dn = adapter->ofdev->dev.of_node;
- for_each_child_of_node(lhea_dn, eth_dn) {
- dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
- NULL);
- if (dn_log_port_id)
- if (*dn_log_port_id == logical_port_id)
- return eth_dn;
- }
-
- return NULL;
-}
-
-static ssize_t probe_port_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- struct ehea_adapter *adapter = dev_get_drvdata(dev);
- struct ehea_port *port;
- struct device_node *eth_dn = NULL;
- int i;
-
- u32 logical_port_id;
-
- sscanf(buf, "%d", &logical_port_id);
-
- port = ehea_get_port(adapter, logical_port_id);
-
- if (port) {
- netdev_info(port->netdev, "adding port with logical port id=%d failed: port already configured\n",
- logical_port_id);
- return -EINVAL;
- }
-
- eth_dn = ehea_get_eth_dn(adapter, logical_port_id);
-
- if (!eth_dn) {
- pr_info("no logical port with id %d found\n", logical_port_id);
- return -EINVAL;
- }
-
- if (ehea_add_adapter_mr(adapter)) {
- pr_err("creating MR failed\n");
- of_node_put(eth_dn);
- return -EIO;
- }
-
- port = ehea_setup_single_port(adapter, logical_port_id, eth_dn);
-
- of_node_put(eth_dn);
-
- if (port) {
- for (i = 0; i < EHEA_MAX_PORTS; i++)
- if (!adapter->port[i]) {
- adapter->port[i] = port;
- break;
- }
-
- netdev_info(port->netdev, "added: (logical port id=%d)\n",
- logical_port_id);
- } else {
- ehea_remove_adapter_mr(adapter);
- return -EIO;
- }
-
- return (ssize_t) count;
-}
-
-static ssize_t remove_port_store(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
-{
- struct ehea_adapter *adapter = dev_get_drvdata(dev);
- struct ehea_port *port;
- int i;
- u32 logical_port_id;
-
- sscanf(buf, "%d", &logical_port_id);
-
- port = ehea_get_port(adapter, logical_port_id);
-
- if (port) {
- netdev_info(port->netdev, "removed: (logical port id=%d)\n",
- logical_port_id);
-
- ehea_shutdown_single_port(port);
-
- for (i = 0; i < EHEA_MAX_PORTS; i++)
- if (adapter->port[i] == port) {
- adapter->port[i] = NULL;
- break;
- }
- } else {
- pr_err("removing port with logical port id=%d failed. port not configured.\n",
- logical_port_id);
- return -EINVAL;
- }
-
- ehea_remove_adapter_mr(adapter);
-
- return (ssize_t) count;
-}
-
-static DEVICE_ATTR_WO(probe_port);
-static DEVICE_ATTR_WO(remove_port);
-
-static int ehea_create_device_sysfs(struct platform_device *dev)
-{
- int ret = device_create_file(&dev->dev, &dev_attr_probe_port);
- if (ret)
- goto out;
-
- ret = device_create_file(&dev->dev, &dev_attr_remove_port);
- if (ret)
- device_remove_file(&dev->dev, &dev_attr_probe_port);
-out:
- return ret;
-}
-
-static void ehea_remove_device_sysfs(struct platform_device *dev)
-{
- device_remove_file(&dev->dev, &dev_attr_probe_port);
- device_remove_file(&dev->dev, &dev_attr_remove_port);
-}
-
-static int ehea_reboot_notifier(struct notifier_block *nb,
- unsigned long action, void *unused)
-{
- if (action == SYS_RESTART) {
- pr_info("Reboot: freeing all eHEA resources\n");
- ibmebus_unregister_driver(&ehea_driver);
- }
- return NOTIFY_DONE;
-}
-
-static struct notifier_block ehea_reboot_nb = {
- .notifier_call = ehea_reboot_notifier,
-};
-
-static int ehea_mem_notifier(struct notifier_block *nb,
- unsigned long action, void *data)
-{
- int ret = NOTIFY_BAD;
- struct memory_notify *arg = data;
-
- mutex_lock(&dlpar_mem_lock);
-
- switch (action) {
- case MEM_CANCEL_OFFLINE:
- pr_info("memory offlining canceled");
- fallthrough; /* re-add canceled memory block */
-
- case MEM_ONLINE:
- pr_info("memory is going online");
- set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
- if (ehea_add_sect_bmap(arg->start_pfn, arg->nr_pages))
- goto out_unlock;
- ehea_rereg_mrs();
- break;
-
- case MEM_GOING_OFFLINE:
- pr_info("memory is going offline");
- set_bit(__EHEA_STOP_XFER, &ehea_driver_flags);
- if (ehea_rem_sect_bmap(arg->start_pfn, arg->nr_pages))
- goto out_unlock;
- ehea_rereg_mrs();
- break;
-
- default:
- break;
- }
-
- ehea_update_firmware_handles();
- ret = NOTIFY_OK;
-
-out_unlock:
- mutex_unlock(&dlpar_mem_lock);
- return ret;
-}
-
-static struct notifier_block ehea_mem_nb = {
- .notifier_call = ehea_mem_notifier,
-};
-
-static void ehea_crash_handler(void)
-{
- int i;
-
- if (ehea_fw_handles.arr)
- for (i = 0; i < ehea_fw_handles.num_entries; i++)
- ehea_h_free_resource(ehea_fw_handles.arr[i].adh,
- ehea_fw_handles.arr[i].fwh,
- FORCE_FREE);
-
- if (ehea_bcmc_regs.arr)
- for (i = 0; i < ehea_bcmc_regs.num_entries; i++)
- ehea_h_reg_dereg_bcmc(ehea_bcmc_regs.arr[i].adh,
- ehea_bcmc_regs.arr[i].port_id,
- ehea_bcmc_regs.arr[i].reg_type,
- ehea_bcmc_regs.arr[i].macaddr,
- 0, H_DEREG_BCMC);
-}
-
-static atomic_t ehea_memory_hooks_registered;
-
-/* Register memory hooks on probe of first adapter */
-static int ehea_register_memory_hooks(void)
-{
- int ret = 0;
-
- if (atomic_inc_return(&ehea_memory_hooks_registered) > 1)
- return 0;
-
- ret = ehea_create_busmap();
- if (ret) {
- pr_info("ehea_create_busmap failed\n");
- goto out;
- }
-
- ret = register_reboot_notifier(&ehea_reboot_nb);
- if (ret) {
- pr_info("register_reboot_notifier failed\n");
- goto out;
- }
-
- ret = register_memory_notifier(&ehea_mem_nb);
- if (ret) {
- pr_info("register_memory_notifier failed\n");
- goto out2;
- }
-
- ret = crash_shutdown_register(ehea_crash_handler);
- if (ret) {
- pr_info("crash_shutdown_register failed\n");
- goto out3;
- }
-
- return 0;
-
-out3:
- unregister_memory_notifier(&ehea_mem_nb);
-out2:
- unregister_reboot_notifier(&ehea_reboot_nb);
-out:
- atomic_dec(&ehea_memory_hooks_registered);
- return ret;
-}
-
-static void ehea_unregister_memory_hooks(void)
-{
- /* Only remove the hooks if we've registered them */
- if (atomic_read(&ehea_memory_hooks_registered) == 0)
- return;
-
- unregister_reboot_notifier(&ehea_reboot_nb);
- if (crash_shutdown_unregister(ehea_crash_handler))
- pr_info("failed unregistering crash handler\n");
- unregister_memory_notifier(&ehea_mem_nb);
-}
-
-static int ehea_probe_adapter(struct platform_device *dev)
-{
- struct ehea_adapter *adapter;
- const u64 *adapter_handle;
- int ret;
- int i;
-
- ret = ehea_register_memory_hooks();
- if (ret)
- return ret;
-
- if (!dev || !dev->dev.of_node) {
- pr_err("Invalid ibmebus device probed\n");
- return -EINVAL;
- }
-
- adapter = devm_kzalloc(&dev->dev, sizeof(*adapter), GFP_KERNEL);
- if (!adapter) {
- ret = -ENOMEM;
- dev_err(&dev->dev, "no mem for ehea_adapter\n");
- goto out;
- }
-
- list_add(&adapter->list, &adapter_list);
-
- adapter->ofdev = dev;
-
- adapter_handle = of_get_property(dev->dev.of_node, "ibm,hea-handle",
- NULL);
- if (adapter_handle)
- adapter->handle = *adapter_handle;
-
- if (!adapter->handle) {
- dev_err(&dev->dev, "failed getting handle for adapter"
- " '%pOF'\n", dev->dev.of_node);
- ret = -ENODEV;
- goto out_free_ad;
- }
-
- adapter->pd = EHEA_PD_ID;
-
- platform_set_drvdata(dev, adapter);
-
-
- /* initialize adapter and ports */
- /* get adapter properties */
- ret = ehea_sense_adapter_attr(adapter);
- if (ret) {
- dev_err(&dev->dev, "sense_adapter_attr failed: %d\n", ret);
- goto out_free_ad;
- }
-
- adapter->neq = ehea_create_eq(adapter,
- EHEA_NEQ, EHEA_MAX_ENTRIES_EQ, 1);
- if (!adapter->neq) {
- ret = -EIO;
- dev_err(&dev->dev, "NEQ creation failed\n");
- goto out_free_ad;
- }
-
- tasklet_setup(&adapter->neq_tasklet, ehea_neq_tasklet);
-
- ret = ehea_create_device_sysfs(dev);
- if (ret)
- goto out_kill_eq;
-
- ret = ehea_setup_ports(adapter);
- if (ret) {
- dev_err(&dev->dev, "setup_ports failed\n");
- goto out_rem_dev_sysfs;
- }
-
- ret = ibmebus_request_irq(adapter->neq->attr.ist1,
- ehea_interrupt_neq, 0,
- "ehea_neq", adapter);
- if (ret) {
- dev_err(&dev->dev, "requesting NEQ IRQ failed\n");
- goto out_shutdown_ports;
- }
-
- /* Handle any events that might be pending. */
- tasklet_hi_schedule(&adapter->neq_tasklet);
-
- ret = 0;
- goto out;
-
-out_shutdown_ports:
- for (i = 0; i < EHEA_MAX_PORTS; i++)
- if (adapter->port[i]) {
- ehea_shutdown_single_port(adapter->port[i]);
- adapter->port[i] = NULL;
- }
-
-out_rem_dev_sysfs:
- ehea_remove_device_sysfs(dev);
-
-out_kill_eq:
- ehea_destroy_eq(adapter->neq);
-
-out_free_ad:
- list_del(&adapter->list);
-
-out:
- ehea_update_firmware_handles();
-
- return ret;
-}
-
-static void ehea_remove(struct platform_device *dev)
-{
- struct ehea_adapter *adapter = platform_get_drvdata(dev);
- int i;
-
- for (i = 0; i < EHEA_MAX_PORTS; i++)
- if (adapter->port[i]) {
- ehea_shutdown_single_port(adapter->port[i]);
- adapter->port[i] = NULL;
- }
-
- ehea_remove_device_sysfs(dev);
-
- ibmebus_free_irq(adapter->neq->attr.ist1, adapter);
- tasklet_kill(&adapter->neq_tasklet);
-
- ehea_destroy_eq(adapter->neq);
- ehea_remove_adapter_mr(adapter);
- list_del(&adapter->list);
-
- ehea_update_firmware_handles();
-}
-
-static int check_module_parm(void)
-{
- int ret = 0;
-
- if ((rq1_entries < EHEA_MIN_ENTRIES_QP) ||
- (rq1_entries > EHEA_MAX_ENTRIES_RQ1)) {
- pr_info("Bad parameter: rq1_entries\n");
- ret = -EINVAL;
- }
- if ((rq2_entries < EHEA_MIN_ENTRIES_QP) ||
- (rq2_entries > EHEA_MAX_ENTRIES_RQ2)) {
- pr_info("Bad parameter: rq2_entries\n");
- ret = -EINVAL;
- }
- if ((rq3_entries < EHEA_MIN_ENTRIES_QP) ||
- (rq3_entries > EHEA_MAX_ENTRIES_RQ3)) {
- pr_info("Bad parameter: rq3_entries\n");
- ret = -EINVAL;
- }
- if ((sq_entries < EHEA_MIN_ENTRIES_QP) ||
- (sq_entries > EHEA_MAX_ENTRIES_SQ)) {
- pr_info("Bad parameter: sq_entries\n");
- ret = -EINVAL;
- }
-
- return ret;
-}
-
-static ssize_t capabilities_show(struct device_driver *drv, char *buf)
-{
- return sprintf(buf, "%d", EHEA_CAPABILITIES);
-}
-
-static DRIVER_ATTR_RO(capabilities);
-
-static int __init ehea_module_init(void)
-{
- int ret;
-
- pr_info("IBM eHEA ethernet device driver (Release %s)\n", DRV_VERSION);
-
- memset(&ehea_fw_handles, 0, sizeof(ehea_fw_handles));
- memset(&ehea_bcmc_regs, 0, sizeof(ehea_bcmc_regs));
-
- mutex_init(&ehea_fw_handles.lock);
- spin_lock_init(&ehea_bcmc_regs.lock);
-
- ret = check_module_parm();
- if (ret)
- goto out;
-
- ret = ibmebus_register_driver(&ehea_driver);
- if (ret) {
- pr_err("failed registering eHEA device driver on ebus\n");
- goto out;
- }
-
- ret = driver_create_file(&ehea_driver.driver,
- &driver_attr_capabilities);
- if (ret) {
- pr_err("failed to register capabilities attribute, ret=%d\n",
- ret);
- goto out2;
- }
-
- return ret;
-
-out2:
- ibmebus_unregister_driver(&ehea_driver);
-out:
- return ret;
-}
-
-static void __exit ehea_module_exit(void)
-{
- driver_remove_file(&ehea_driver.driver, &driver_attr_capabilities);
- ibmebus_unregister_driver(&ehea_driver);
- ehea_unregister_memory_hooks();
- kfree(ehea_fw_handles.arr);
- kfree(ehea_bcmc_regs.arr);
- ehea_destroy_busmap();
-}
-
-module_init(ehea_module_init);
-module_exit(ehea_module_exit);
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
deleted file mode 100644
index e63716e139f5..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
+++ /dev/null
@@ -1,612 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
- *
- * eHEA ethernet device driver for IBM eServer System p
- *
- * (C) Copyright IBM Corp. 2006
- *
- * Authors:
- * Christoph Raisch <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include "ehea_phyp.h"
-
-
-static inline u16 get_order_of_qentries(u16 queue_entries)
-{
- u8 ld = 1; /* logarithmus dualis */
- while (((1U << ld) - 1) < queue_entries)
- ld++;
- return ld - 1;
-}
-
-/* Defines for H_CALL H_ALLOC_RESOURCE */
-#define H_ALL_RES_TYPE_QP 1
-#define H_ALL_RES_TYPE_CQ 2
-#define H_ALL_RES_TYPE_EQ 3
-#define H_ALL_RES_TYPE_MR 5
-#define H_ALL_RES_TYPE_MW 6
-
-static long ehea_plpar_hcall_norets(unsigned long opcode,
- unsigned long arg1,
- unsigned long arg2,
- unsigned long arg3,
- unsigned long arg4,
- unsigned long arg5,
- unsigned long arg6,
- unsigned long arg7)
-{
- long ret;
- int i, sleep_msecs;
-
- for (i = 0; i < 5; i++) {
- ret = plpar_hcall_norets(opcode, arg1, arg2, arg3, arg4,
- arg5, arg6, arg7);
-
- if (H_IS_LONG_BUSY(ret)) {
- sleep_msecs = get_longbusy_msecs(ret);
- msleep_interruptible(sleep_msecs);
- continue;
- }
-
- if (ret < H_SUCCESS)
- pr_err("opcode=%lx ret=%lx"
- " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
- " arg5=%lx arg6=%lx arg7=%lx\n",
- opcode, ret,
- arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-
- return ret;
- }
-
- return H_BUSY;
-}
-
-static long ehea_plpar_hcall9(unsigned long opcode,
- unsigned long *outs, /* array of 9 outputs */
- unsigned long arg1,
- unsigned long arg2,
- unsigned long arg3,
- unsigned long arg4,
- unsigned long arg5,
- unsigned long arg6,
- unsigned long arg7,
- unsigned long arg8,
- unsigned long arg9)
-{
- long ret;
- int i, sleep_msecs;
- u8 cb_cat;
-
- for (i = 0; i < 5; i++) {
- ret = plpar_hcall9(opcode, outs,
- arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9);
-
- if (H_IS_LONG_BUSY(ret)) {
- sleep_msecs = get_longbusy_msecs(ret);
- msleep_interruptible(sleep_msecs);
- continue;
- }
-
- cb_cat = EHEA_BMASK_GET(H_MEHEAPORT_CAT, arg2);
-
- if ((ret < H_SUCCESS) && !(((ret == H_AUTHORITY)
- && (opcode == H_MODIFY_HEA_PORT))
- && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO)
- || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7)
- && (arg3 == H_PORT_CB7_DUCQPN)))))
- pr_err("opcode=%lx ret=%lx"
- " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
- " arg5=%lx arg6=%lx arg7=%lx arg8=%lx"
- " arg9=%lx"
- " out1=%lx out2=%lx out3=%lx out4=%lx"
- " out5=%lx out6=%lx out7=%lx out8=%lx"
- " out9=%lx\n",
- opcode, ret,
- arg1, arg2, arg3, arg4, arg5,
- arg6, arg7, arg8, arg9,
- outs[0], outs[1], outs[2], outs[3], outs[4],
- outs[5], outs[6], outs[7], outs[8]);
- return ret;
- }
-
- return H_BUSY;
-}
-
-u64 ehea_h_query_ehea_qp(const u64 adapter_handle, const u8 qp_category,
- const u64 qp_handle, const u64 sel_mask, void *cb_addr)
-{
- return ehea_plpar_hcall_norets(H_QUERY_HEA_QP,
- adapter_handle, /* R4 */
- qp_category, /* R5 */
- qp_handle, /* R6 */
- sel_mask, /* R7 */
- __pa(cb_addr), /* R8 */
- 0, 0);
-}
-
-/* input param R5 */
-#define H_ALL_RES_QP_EQPO EHEA_BMASK_IBM(9, 11)
-#define H_ALL_RES_QP_QPP EHEA_BMASK_IBM(12, 12)
-#define H_ALL_RES_QP_RQR EHEA_BMASK_IBM(13, 15)
-#define H_ALL_RES_QP_EQEG EHEA_BMASK_IBM(16, 16)
-#define H_ALL_RES_QP_LL_QP EHEA_BMASK_IBM(17, 17)
-#define H_ALL_RES_QP_DMA128 EHEA_BMASK_IBM(19, 19)
-#define H_ALL_RES_QP_HSM EHEA_BMASK_IBM(20, 21)
-#define H_ALL_RES_QP_SIGT EHEA_BMASK_IBM(22, 23)
-#define H_ALL_RES_QP_TENURE EHEA_BMASK_IBM(48, 55)
-#define H_ALL_RES_QP_RES_TYP EHEA_BMASK_IBM(56, 63)
-
-/* input param R9 */
-#define H_ALL_RES_QP_TOKEN EHEA_BMASK_IBM(0, 31)
-#define H_ALL_RES_QP_PD EHEA_BMASK_IBM(32, 63)
-
-/* input param R10 */
-#define H_ALL_RES_QP_MAX_SWQE EHEA_BMASK_IBM(4, 7)
-#define H_ALL_RES_QP_MAX_R1WQE EHEA_BMASK_IBM(12, 15)
-#define H_ALL_RES_QP_MAX_R2WQE EHEA_BMASK_IBM(20, 23)
-#define H_ALL_RES_QP_MAX_R3WQE EHEA_BMASK_IBM(28, 31)
-/* Max Send Scatter Gather Elements */
-#define H_ALL_RES_QP_MAX_SSGE EHEA_BMASK_IBM(37, 39)
-#define H_ALL_RES_QP_MAX_R1SGE EHEA_BMASK_IBM(45, 47)
-/* Max Receive SG Elements RQ1 */
-#define H_ALL_RES_QP_MAX_R2SGE EHEA_BMASK_IBM(53, 55)
-#define H_ALL_RES_QP_MAX_R3SGE EHEA_BMASK_IBM(61, 63)
-
-/* input param R11 */
-#define H_ALL_RES_QP_SWQE_IDL EHEA_BMASK_IBM(0, 7)
-/* max swqe immediate data length */
-#define H_ALL_RES_QP_PORT_NUM EHEA_BMASK_IBM(48, 63)
-
-/* input param R12 */
-#define H_ALL_RES_QP_TH_RQ2 EHEA_BMASK_IBM(0, 15)
-/* Threshold RQ2 */
-#define H_ALL_RES_QP_TH_RQ3 EHEA_BMASK_IBM(16, 31)
-/* Threshold RQ3 */
-
-/* output param R6 */
-#define H_ALL_RES_QP_ACT_SWQE EHEA_BMASK_IBM(0, 15)
-#define H_ALL_RES_QP_ACT_R1WQE EHEA_BMASK_IBM(16, 31)
-#define H_ALL_RES_QP_ACT_R2WQE EHEA_BMASK_IBM(32, 47)
-#define H_ALL_RES_QP_ACT_R3WQE EHEA_BMASK_IBM(48, 63)
-
-/* output param, R7 */
-#define H_ALL_RES_QP_ACT_SSGE EHEA_BMASK_IBM(0, 7)
-#define H_ALL_RES_QP_ACT_R1SGE EHEA_BMASK_IBM(8, 15)
-#define H_ALL_RES_QP_ACT_R2SGE EHEA_BMASK_IBM(16, 23)
-#define H_ALL_RES_QP_ACT_R3SGE EHEA_BMASK_IBM(24, 31)
-#define H_ALL_RES_QP_ACT_SWQE_IDL EHEA_BMASK_IBM(32, 39)
-
-/* output param R8,R9 */
-#define H_ALL_RES_QP_SIZE_SQ EHEA_BMASK_IBM(0, 31)
-#define H_ALL_RES_QP_SIZE_RQ1 EHEA_BMASK_IBM(32, 63)
-#define H_ALL_RES_QP_SIZE_RQ2 EHEA_BMASK_IBM(0, 31)
-#define H_ALL_RES_QP_SIZE_RQ3 EHEA_BMASK_IBM(32, 63)
-
-/* output param R11,R12 */
-#define H_ALL_RES_QP_LIOBN_SQ EHEA_BMASK_IBM(0, 31)
-#define H_ALL_RES_QP_LIOBN_RQ1 EHEA_BMASK_IBM(32, 63)
-#define H_ALL_RES_QP_LIOBN_RQ2 EHEA_BMASK_IBM(0, 31)
-#define H_ALL_RES_QP_LIOBN_RQ3 EHEA_BMASK_IBM(32, 63)
-
-u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
- struct ehea_qp_init_attr *init_attr, const u32 pd,
- u64 *qp_handle, struct h_epas *h_epas)
-{
- u64 hret;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- u64 allocate_controls =
- EHEA_BMASK_SET(H_ALL_RES_QP_EQPO, init_attr->low_lat_rq1 ? 1 : 0)
- | EHEA_BMASK_SET(H_ALL_RES_QP_QPP, 0)
- | EHEA_BMASK_SET(H_ALL_RES_QP_RQR, 6) /* rq1 & rq2 & rq3 */
- | EHEA_BMASK_SET(H_ALL_RES_QP_EQEG, 0) /* EQE gen. disabled */
- | EHEA_BMASK_SET(H_ALL_RES_QP_LL_QP, init_attr->low_lat_rq1)
- | EHEA_BMASK_SET(H_ALL_RES_QP_DMA128, 0)
- | EHEA_BMASK_SET(H_ALL_RES_QP_HSM, 0)
- | EHEA_BMASK_SET(H_ALL_RES_QP_SIGT, init_attr->signalingtype)
- | EHEA_BMASK_SET(H_ALL_RES_QP_RES_TYP, H_ALL_RES_TYPE_QP);
-
- u64 r9_reg = EHEA_BMASK_SET(H_ALL_RES_QP_PD, pd)
- | EHEA_BMASK_SET(H_ALL_RES_QP_TOKEN, init_attr->qp_token);
-
- u64 max_r10_reg =
- EHEA_BMASK_SET(H_ALL_RES_QP_MAX_SWQE,
- get_order_of_qentries(init_attr->max_nr_send_wqes))
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R1WQE,
- get_order_of_qentries(init_attr->max_nr_rwqes_rq1))
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R2WQE,
- get_order_of_qentries(init_attr->max_nr_rwqes_rq2))
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R3WQE,
- get_order_of_qentries(init_attr->max_nr_rwqes_rq3))
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_SSGE, init_attr->wqe_size_enc_sq)
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R1SGE,
- init_attr->wqe_size_enc_rq1)
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R2SGE,
- init_attr->wqe_size_enc_rq2)
- | EHEA_BMASK_SET(H_ALL_RES_QP_MAX_R3SGE,
- init_attr->wqe_size_enc_rq3);
-
- u64 r11_in =
- EHEA_BMASK_SET(H_ALL_RES_QP_SWQE_IDL, init_attr->swqe_imm_data_len)
- | EHEA_BMASK_SET(H_ALL_RES_QP_PORT_NUM, init_attr->port_nr);
- u64 threshold =
- EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ2, init_attr->rq2_threshold)
- | EHEA_BMASK_SET(H_ALL_RES_QP_TH_RQ3, init_attr->rq3_threshold);
-
- hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
- outs,
- adapter_handle, /* R4 */
- allocate_controls, /* R5 */
- init_attr->send_cq_handle, /* R6 */
- init_attr->recv_cq_handle, /* R7 */
- init_attr->aff_eq_handle, /* R8 */
- r9_reg, /* R9 */
- max_r10_reg, /* R10 */
- r11_in, /* R11 */
- threshold); /* R12 */
-
- *qp_handle = outs[0];
- init_attr->qp_nr = (u32)outs[1];
-
- init_attr->act_nr_send_wqes =
- (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_SWQE, outs[2]);
- init_attr->act_nr_rwqes_rq1 =
- (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R1WQE, outs[2]);
- init_attr->act_nr_rwqes_rq2 =
- (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R2WQE, outs[2]);
- init_attr->act_nr_rwqes_rq3 =
- (u16)EHEA_BMASK_GET(H_ALL_RES_QP_ACT_R3WQE, outs[2]);
-
- init_attr->act_wqe_size_enc_sq = init_attr->wqe_size_enc_sq;
- init_attr->act_wqe_size_enc_rq1 = init_attr->wqe_size_enc_rq1;
- init_attr->act_wqe_size_enc_rq2 = init_attr->wqe_size_enc_rq2;
- init_attr->act_wqe_size_enc_rq3 = init_attr->wqe_size_enc_rq3;
-
- init_attr->nr_sq_pages =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_SQ, outs[4]);
- init_attr->nr_rq1_pages =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ1, outs[4]);
- init_attr->nr_rq2_pages =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ2, outs[5]);
- init_attr->nr_rq3_pages =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_SIZE_RQ3, outs[5]);
-
- init_attr->liobn_sq =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_SQ, outs[7]);
- init_attr->liobn_rq1 =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ1, outs[7]);
- init_attr->liobn_rq2 =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ2, outs[8]);
- init_attr->liobn_rq3 =
- (u32)EHEA_BMASK_GET(H_ALL_RES_QP_LIOBN_RQ3, outs[8]);
-
- if (!hret)
- hcp_epas_ctor(h_epas, outs[6], outs[6]);
-
- return hret;
-}
-
-u64 ehea_h_alloc_resource_cq(const u64 adapter_handle,
- struct ehea_cq_attr *cq_attr,
- u64 *cq_handle, struct h_epas *epas)
-{
- u64 hret;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
- outs,
- adapter_handle, /* R4 */
- H_ALL_RES_TYPE_CQ, /* R5 */
- cq_attr->eq_handle, /* R6 */
- cq_attr->cq_token, /* R7 */
- cq_attr->max_nr_of_cqes, /* R8 */
- 0, 0, 0, 0); /* R9-R12 */
-
- *cq_handle = outs[0];
- cq_attr->act_nr_of_cqes = outs[3];
- cq_attr->nr_pages = outs[4];
-
- if (!hret)
- hcp_epas_ctor(epas, outs[5], outs[6]);
-
- return hret;
-}
-
-/* Defines for H_CALL H_ALLOC_RESOURCE */
-#define H_ALL_RES_TYPE_QP 1
-#define H_ALL_RES_TYPE_CQ 2
-#define H_ALL_RES_TYPE_EQ 3
-#define H_ALL_RES_TYPE_MR 5
-#define H_ALL_RES_TYPE_MW 6
-
-/* input param R5 */
-#define H_ALL_RES_EQ_NEQ EHEA_BMASK_IBM(0, 0)
-#define H_ALL_RES_EQ_NON_NEQ_ISN EHEA_BMASK_IBM(6, 7)
-#define H_ALL_RES_EQ_INH_EQE_GEN EHEA_BMASK_IBM(16, 16)
-#define H_ALL_RES_EQ_RES_TYPE EHEA_BMASK_IBM(56, 63)
-/* input param R6 */
-#define H_ALL_RES_EQ_MAX_EQE EHEA_BMASK_IBM(32, 63)
-
-/* output param R6 */
-#define H_ALL_RES_EQ_LIOBN EHEA_BMASK_IBM(32, 63)
-
-/* output param R7 */
-#define H_ALL_RES_EQ_ACT_EQE EHEA_BMASK_IBM(32, 63)
-
-/* output param R8 */
-#define H_ALL_RES_EQ_ACT_PS EHEA_BMASK_IBM(32, 63)
-
-/* output param R9 */
-#define H_ALL_RES_EQ_ACT_EQ_IST_C EHEA_BMASK_IBM(30, 31)
-#define H_ALL_RES_EQ_ACT_EQ_IST_1 EHEA_BMASK_IBM(40, 63)
-
-/* output param R10 */
-#define H_ALL_RES_EQ_ACT_EQ_IST_2 EHEA_BMASK_IBM(40, 63)
-
-/* output param R11 */
-#define H_ALL_RES_EQ_ACT_EQ_IST_3 EHEA_BMASK_IBM(40, 63)
-
-/* output param R12 */
-#define H_ALL_RES_EQ_ACT_EQ_IST_4 EHEA_BMASK_IBM(40, 63)
-
-u64 ehea_h_alloc_resource_eq(const u64 adapter_handle,
- struct ehea_eq_attr *eq_attr, u64 *eq_handle)
-{
- u64 hret, allocate_controls;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- /* resource type */
- allocate_controls =
- EHEA_BMASK_SET(H_ALL_RES_EQ_RES_TYPE, H_ALL_RES_TYPE_EQ)
- | EHEA_BMASK_SET(H_ALL_RES_EQ_NEQ, eq_attr->type ? 1 : 0)
- | EHEA_BMASK_SET(H_ALL_RES_EQ_INH_EQE_GEN, !eq_attr->eqe_gen)
- | EHEA_BMASK_SET(H_ALL_RES_EQ_NON_NEQ_ISN, 1);
-
- hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
- outs,
- adapter_handle, /* R4 */
- allocate_controls, /* R5 */
- eq_attr->max_nr_of_eqes, /* R6 */
- 0, 0, 0, 0, 0, 0); /* R7-R10 */
-
- *eq_handle = outs[0];
- eq_attr->act_nr_of_eqes = outs[3];
- eq_attr->nr_pages = outs[4];
- eq_attr->ist1 = outs[5];
- eq_attr->ist2 = outs[6];
- eq_attr->ist3 = outs[7];
- eq_attr->ist4 = outs[8];
-
- return hret;
-}
-
-u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat,
- const u64 qp_handle, const u64 sel_mask,
- void *cb_addr, u64 *inv_attr_id, u64 *proc_mask,
- u16 *out_swr, u16 *out_rwr)
-{
- u64 hret;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- hret = ehea_plpar_hcall9(H_MODIFY_HEA_QP,
- outs,
- adapter_handle, /* R4 */
- (u64) cat, /* R5 */
- qp_handle, /* R6 */
- sel_mask, /* R7 */
- __pa(cb_addr), /* R8 */
- 0, 0, 0, 0); /* R9-R12 */
-
- *inv_attr_id = outs[0];
- *out_swr = outs[3];
- *out_rwr = outs[4];
- *proc_mask = outs[5];
-
- return hret;
-}
-
-u64 ehea_h_register_rpage(const u64 adapter_handle, const u8 pagesize,
- const u8 queue_type, const u64 resource_handle,
- const u64 log_pageaddr, u64 count)
-{
- u64 reg_control;
-
- reg_control = EHEA_BMASK_SET(H_REG_RPAGE_PAGE_SIZE, pagesize)
- | EHEA_BMASK_SET(H_REG_RPAGE_QT, queue_type);
-
- return ehea_plpar_hcall_norets(H_REGISTER_HEA_RPAGES,
- adapter_handle, /* R4 */
- reg_control, /* R5 */
- resource_handle, /* R6 */
- log_pageaddr, /* R7 */
- count, /* R8 */
- 0, 0); /* R9-R10 */
-}
-
-u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle,
- const u64 vaddr_in, const u32 access_ctrl, const u32 pd,
- struct ehea_mr *mr)
-{
- u64 hret;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- hret = ehea_plpar_hcall9(H_REGISTER_SMR,
- outs,
- adapter_handle , /* R4 */
- orig_mr_handle, /* R5 */
- vaddr_in, /* R6 */
- (((u64)access_ctrl) << 32ULL), /* R7 */
- pd, /* R8 */
- 0, 0, 0, 0); /* R9-R12 */
-
- mr->handle = outs[0];
- mr->lkey = (u32)outs[2];
-
- return hret;
-}
-
-u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle)
-{
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- return ehea_plpar_hcall9(H_DISABLE_AND_GET_HEA,
- outs,
- adapter_handle, /* R4 */
- H_DISABLE_GET_EHEA_WQE_P, /* R5 */
- qp_handle, /* R6 */
- 0, 0, 0, 0, 0, 0); /* R7-R12 */
-}
-
-u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle,
- u64 force_bit)
-{
- return ehea_plpar_hcall_norets(H_FREE_RESOURCE,
- adapter_handle, /* R4 */
- res_handle, /* R5 */
- force_bit,
- 0, 0, 0, 0); /* R7-R10 */
-}
-
-u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
- const u64 length, const u32 access_ctrl,
- const u32 pd, u64 *mr_handle, u32 *lkey)
-{
- u64 hret;
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
-
- hret = ehea_plpar_hcall9(H_ALLOC_HEA_RESOURCE,
- outs,
- adapter_handle, /* R4 */
- 5, /* R5 */
- vaddr, /* R6 */
- length, /* R7 */
- (((u64) access_ctrl) << 32ULL), /* R8 */
- pd, /* R9 */
- 0, 0, 0); /* R10-R12 */
-
- *mr_handle = outs[0];
- *lkey = (u32)outs[2];
- return hret;
-}
-
-u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle,
- const u8 pagesize, const u8 queue_type,
- const u64 log_pageaddr, const u64 count)
-{
- if ((count > 1) && (log_pageaddr & ~PAGE_MASK)) {
- pr_err("not on pageboundary\n");
- return H_PARAMETER;
- }
-
- return ehea_h_register_rpage(adapter_handle, pagesize,
- queue_type, mr_handle,
- log_pageaddr, count);
-}
-
-u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr)
-{
- u64 hret, cb_logaddr;
-
- cb_logaddr = __pa(cb_addr);
-
- hret = ehea_plpar_hcall_norets(H_QUERY_HEA,
- adapter_handle, /* R4 */
- cb_logaddr, /* R5 */
- 0, 0, 0, 0, 0); /* R6-R10 */
-#ifdef DEBUG
- ehea_dump(cb_addr, sizeof(struct hcp_query_ehea), "hcp_query_ehea");
-#endif
- return hret;
-}
-
-u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num,
- const u8 cb_cat, const u64 select_mask,
- void *cb_addr)
-{
- u64 port_info;
- u64 cb_logaddr = __pa(cb_addr);
- u64 arr_index = 0;
-
- port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
- | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num);
-
- return ehea_plpar_hcall_norets(H_QUERY_HEA_PORT,
- adapter_handle, /* R4 */
- port_info, /* R5 */
- select_mask, /* R6 */
- arr_index, /* R7 */
- cb_logaddr, /* R8 */
- 0, 0); /* R9-R10 */
-}
-
-u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
- const u8 cb_cat, const u64 select_mask,
- void *cb_addr)
-{
- unsigned long outs[PLPAR_HCALL9_BUFSIZE];
- u64 port_info;
- u64 arr_index = 0;
- u64 cb_logaddr = __pa(cb_addr);
-
- port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
- | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num);
-#ifdef DEBUG
- ehea_dump(cb_addr, sizeof(struct hcp_ehea_port_cb0), "Before HCALL");
-#endif
- return ehea_plpar_hcall9(H_MODIFY_HEA_PORT,
- outs,
- adapter_handle, /* R4 */
- port_info, /* R5 */
- select_mask, /* R6 */
- arr_index, /* R7 */
- cb_logaddr, /* R8 */
- 0, 0, 0, 0); /* R9-R12 */
-}
-
-u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num,
- const u8 reg_type, const u64 mc_mac_addr,
- const u16 vlan_id, const u32 hcall_id)
-{
- u64 r5_port_num, r6_reg_type, r7_mc_mac_addr, r8_vlan_id;
- u64 mac_addr = mc_mac_addr >> 16;
-
- r5_port_num = EHEA_BMASK_SET(H_REGBCMC_PN, port_num);
- r6_reg_type = EHEA_BMASK_SET(H_REGBCMC_REGTYPE, reg_type);
- r7_mc_mac_addr = EHEA_BMASK_SET(H_REGBCMC_MACADDR, mac_addr);
- r8_vlan_id = EHEA_BMASK_SET(H_REGBCMC_VLANID, vlan_id);
-
- return ehea_plpar_hcall_norets(hcall_id,
- adapter_handle, /* R4 */
- r5_port_num, /* R5 */
- r6_reg_type, /* R6 */
- r7_mc_mac_addr, /* R7 */
- r8_vlan_id, /* R8 */
- 0, 0); /* R9-R12 */
-}
-
-u64 ehea_h_reset_events(const u64 adapter_handle, const u64 neq_handle,
- const u64 event_mask)
-{
- return ehea_plpar_hcall_norets(H_RESET_EVENTS,
- adapter_handle, /* R4 */
- neq_handle, /* R5 */
- event_mask, /* R6 */
- 0, 0, 0, 0); /* R7-R12 */
-}
-
-u64 ehea_h_error_data(const u64 adapter_handle, const u64 ressource_handle,
- void *rblock)
-{
- return ehea_plpar_hcall_norets(H_ERROR_DATA,
- adapter_handle, /* R4 */
- ressource_handle, /* R5 */
- __pa(rblock), /* R6 */
- 0, 0, 0, 0); /* R7-R12 */
-}
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
deleted file mode 100644
index e8b56c103410..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * linux/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
- *
- * eHEA ethernet device driver for IBM eServer System p
- *
- * (C) Copyright IBM Corp. 2006
- *
- * Authors:
- * Christoph Raisch <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#ifndef __EHEA_PHYP_H__
-#define __EHEA_PHYP_H__
-
-#include <linux/delay.h>
-#include <asm/hvcall.h>
-#include "ehea.h"
-#include "ehea_hw.h"
-
-/* Some abbreviations used here:
- *
- * hcp_* - structures, variables and functions releated to Hypervisor Calls
- */
-
-/* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */
-#define EHEA_MAX_RPAGE 512
-
-/* Notification Event Queue (NEQ) Entry bit masks */
-#define NEQE_EVENT_CODE EHEA_BMASK_IBM(2, 7)
-#define NEQE_PORTNUM EHEA_BMASK_IBM(32, 47)
-#define NEQE_PORT_UP EHEA_BMASK_IBM(16, 16)
-#define NEQE_EXTSWITCH_PORT_UP EHEA_BMASK_IBM(17, 17)
-#define NEQE_EXTSWITCH_PRIMARY EHEA_BMASK_IBM(18, 18)
-#define NEQE_PLID EHEA_BMASK_IBM(16, 47)
-
-/* Notification Event Codes */
-#define EHEA_EC_PORTSTATE_CHG 0x30
-#define EHEA_EC_ADAPTER_MALFUNC 0x32
-#define EHEA_EC_PORT_MALFUNC 0x33
-
-/* Notification Event Log Register (NELR) bit masks */
-#define NELR_PORT_MALFUNC EHEA_BMASK_IBM(61, 61)
-#define NELR_ADAPTER_MALFUNC EHEA_BMASK_IBM(62, 62)
-#define NELR_PORTSTATE_CHG EHEA_BMASK_IBM(63, 63)
-
-static inline void hcp_epas_ctor(struct h_epas *epas, u64 paddr_kernel,
- u64 paddr_user)
-{
- /* To support 64k pages we must round to 64k page boundary */
- epas->kernel.addr = ioremap((paddr_kernel & PAGE_MASK), PAGE_SIZE) +
- (paddr_kernel & ~PAGE_MASK);
- epas->user.addr = paddr_user;
-}
-
-static inline void hcp_epas_dtor(struct h_epas *epas)
-{
- if (epas->kernel.addr)
- iounmap((void __iomem *)((u64)epas->kernel.addr & PAGE_MASK));
-
- epas->user.addr = 0;
- epas->kernel.addr = 0;
-}
-
-struct hcp_modify_qp_cb0 {
- u64 qp_ctl_reg; /* 00 */
- u32 max_swqe; /* 02 */
- u32 max_rwqe; /* 03 */
- u32 port_nb; /* 04 */
- u32 reserved0; /* 05 */
- u64 qp_aer; /* 06 */
- u64 qp_tenure; /* 08 */
-};
-
-/* Hcall Query/Modify Queue Pair Control Block 0 Selection Mask Bits */
-#define H_QPCB0_ALL EHEA_BMASK_IBM(0, 5)
-#define H_QPCB0_QP_CTL_REG EHEA_BMASK_IBM(0, 0)
-#define H_QPCB0_MAX_SWQE EHEA_BMASK_IBM(1, 1)
-#define H_QPCB0_MAX_RWQE EHEA_BMASK_IBM(2, 2)
-#define H_QPCB0_PORT_NB EHEA_BMASK_IBM(3, 3)
-#define H_QPCB0_QP_AER EHEA_BMASK_IBM(4, 4)
-#define H_QPCB0_QP_TENURE EHEA_BMASK_IBM(5, 5)
-
-/* Queue Pair Control Register Status Bits */
-#define H_QP_CR_ENABLED 0x8000000000000000ULL /* QP enabled */
- /* QP States: */
-#define H_QP_CR_STATE_RESET 0x0000010000000000ULL /* Reset */
-#define H_QP_CR_STATE_INITIALIZED 0x0000020000000000ULL /* Initialized */
-#define H_QP_CR_STATE_RDY2RCV 0x0000030000000000ULL /* Ready to recv */
-#define H_QP_CR_STATE_RDY2SND 0x0000050000000000ULL /* Ready to send */
-#define H_QP_CR_STATE_ERROR 0x0000800000000000ULL /* Error */
-#define H_QP_CR_RES_STATE 0x0000007F00000000ULL /* Resultant state */
-
-struct hcp_modify_qp_cb1 {
- u32 qpn; /* 00 */
- u32 qp_asyn_ev_eq_nb; /* 01 */
- u64 sq_cq_handle; /* 02 */
- u64 rq_cq_handle; /* 04 */
- /* sgel = scatter gather element */
- u32 sgel_nb_sq; /* 06 */
- u32 sgel_nb_rq1; /* 07 */
- u32 sgel_nb_rq2; /* 08 */
- u32 sgel_nb_rq3; /* 09 */
-};
-
-/* Hcall Query/Modify Queue Pair Control Block 1 Selection Mask Bits */
-#define H_QPCB1_ALL EHEA_BMASK_IBM(0, 7)
-#define H_QPCB1_QPN EHEA_BMASK_IBM(0, 0)
-#define H_QPCB1_ASYN_EV_EQ_NB EHEA_BMASK_IBM(1, 1)
-#define H_QPCB1_SQ_CQ_HANDLE EHEA_BMASK_IBM(2, 2)
-#define H_QPCB1_RQ_CQ_HANDLE EHEA_BMASK_IBM(3, 3)
-#define H_QPCB1_SGEL_NB_SQ EHEA_BMASK_IBM(4, 4)
-#define H_QPCB1_SGEL_NB_RQ1 EHEA_BMASK_IBM(5, 5)
-#define H_QPCB1_SGEL_NB_RQ2 EHEA_BMASK_IBM(6, 6)
-#define H_QPCB1_SGEL_NB_RQ3 EHEA_BMASK_IBM(7, 7)
-
-struct hcp_query_ehea {
- u32 cur_num_qps; /* 00 */
- u32 cur_num_cqs; /* 01 */
- u32 cur_num_eqs; /* 02 */
- u32 cur_num_mrs; /* 03 */
- u32 auth_level; /* 04 */
- u32 max_num_qps; /* 05 */
- u32 max_num_cqs; /* 06 */
- u32 max_num_eqs; /* 07 */
- u32 max_num_mrs; /* 08 */
- u32 reserved0; /* 09 */
- u32 int_clock_freq; /* 10 */
- u32 max_num_pds; /* 11 */
- u32 max_num_addr_handles; /* 12 */
- u32 max_num_cqes; /* 13 */
- u32 max_num_wqes; /* 14 */
- u32 max_num_sgel_rq1wqe; /* 15 */
- u32 max_num_sgel_rq2wqe; /* 16 */
- u32 max_num_sgel_rq3wqe; /* 17 */
- u32 mr_page_size; /* 18 */
- u32 reserved1; /* 19 */
- u64 max_mr_size; /* 20 */
- u64 reserved2; /* 22 */
- u32 num_ports; /* 24 */
- u32 reserved3; /* 25 */
- u32 reserved4; /* 26 */
- u32 reserved5; /* 27 */
- u64 max_mc_mac; /* 28 */
- u64 ehea_cap; /* 30 */
- u32 max_isn_per_eq; /* 32 */
- u32 max_num_neq; /* 33 */
- u64 max_num_vlan_ids; /* 34 */
- u32 max_num_port_group; /* 36 */
- u32 max_num_phys_port; /* 37 */
-
-};
-
-/* Hcall Query/Modify Port Control Block defines */
-#define H_PORT_CB0 0
-#define H_PORT_CB1 1
-#define H_PORT_CB2 2
-#define H_PORT_CB3 3
-#define H_PORT_CB4 4
-#define H_PORT_CB5 5
-#define H_PORT_CB6 6
-#define H_PORT_CB7 7
-
-struct hcp_ehea_port_cb0 {
- u64 port_mac_addr;
- u64 port_rc;
- u64 reserved0;
- u32 port_op_state;
- u32 port_speed;
- u32 ext_swport_op_state;
- u32 neg_tpf_prpf;
- u32 num_default_qps;
- u32 reserved1;
- u64 default_qpn_arr[16];
-};
-
-/* Hcall Query/Modify Port Control Block 0 Selection Mask Bits */
-#define H_PORT_CB0_ALL EHEA_BMASK_IBM(0, 7) /* Set all bits */
-#define H_PORT_CB0_MAC EHEA_BMASK_IBM(0, 0) /* MAC address */
-#define H_PORT_CB0_PRC EHEA_BMASK_IBM(1, 1) /* Port Recv Control */
-#define H_PORT_CB0_DEFQPNARRAY EHEA_BMASK_IBM(7, 7) /* Default QPN Array */
-
-/* Hcall Query Port: Returned port speed values */
-#define H_SPEED_10M_H 1 /* 10 Mbps, Half Duplex */
-#define H_SPEED_10M_F 2 /* 10 Mbps, Full Duplex */
-#define H_SPEED_100M_H 3 /* 100 Mbps, Half Duplex */
-#define H_SPEED_100M_F 4 /* 100 Mbps, Full Duplex */
-#define H_SPEED_1G_F 6 /* 1 Gbps, Full Duplex */
-#define H_SPEED_10G_F 8 /* 10 Gbps, Full Duplex */
-
-/* Port Receive Control Status Bits */
-#define PXLY_RC_VALID EHEA_BMASK_IBM(49, 49)
-#define PXLY_RC_VLAN_XTRACT EHEA_BMASK_IBM(50, 50)
-#define PXLY_RC_TCP_6_TUPLE EHEA_BMASK_IBM(51, 51)
-#define PXLY_RC_UDP_6_TUPLE EHEA_BMASK_IBM(52, 52)
-#define PXLY_RC_TCP_3_TUPLE EHEA_BMASK_IBM(53, 53)
-#define PXLY_RC_TCP_2_TUPLE EHEA_BMASK_IBM(54, 54)
-#define PXLY_RC_LLC_SNAP EHEA_BMASK_IBM(55, 55)
-#define PXLY_RC_JUMBO_FRAME EHEA_BMASK_IBM(56, 56)
-#define PXLY_RC_FRAG_IP_PKT EHEA_BMASK_IBM(57, 57)
-#define PXLY_RC_TCP_UDP_CHKSUM EHEA_BMASK_IBM(58, 58)
-#define PXLY_RC_IP_CHKSUM EHEA_BMASK_IBM(59, 59)
-#define PXLY_RC_MAC_FILTER EHEA_BMASK_IBM(60, 60)
-#define PXLY_RC_UNTAG_FILTER EHEA_BMASK_IBM(61, 61)
-#define PXLY_RC_VLAN_TAG_FILTER EHEA_BMASK_IBM(62, 63)
-
-#define PXLY_RC_VLAN_FILTER 2
-#define PXLY_RC_VLAN_PERM 0
-
-
-#define H_PORT_CB1_ALL 0x8000000000000000ULL
-
-struct hcp_ehea_port_cb1 {
- u64 vlan_filter[64];
-};
-
-#define H_PORT_CB2_ALL 0xFFE0000000000000ULL
-
-struct hcp_ehea_port_cb2 {
- u64 rxo;
- u64 rxucp;
- u64 rxufd;
- u64 rxuerr;
- u64 rxftl;
- u64 rxmcp;
- u64 rxbcp;
- u64 txo;
- u64 txucp;
- u64 txmcp;
- u64 txbcp;
-};
-
-struct hcp_ehea_port_cb3 {
- u64 vlan_bc_filter[64];
- u64 vlan_mc_filter[64];
- u64 vlan_un_filter[64];
- u64 port_mac_hash_array[64];
-};
-
-#define H_PORT_CB4_ALL 0xF000000000000000ULL
-#define H_PORT_CB4_JUMBO 0x1000000000000000ULL
-#define H_PORT_CB4_SPEED 0x8000000000000000ULL
-
-struct hcp_ehea_port_cb4 {
- u32 port_speed;
- u32 pause_frame;
- u32 ens_port_op_state;
- u32 jumbo_frame;
- u32 ens_port_wrap;
-};
-
-/* Hcall Query/Modify Port Control Block 5 Selection Mask Bits */
-#define H_PORT_CB5_RCU 0x0001000000000000ULL
-#define PXS_RCU EHEA_BMASK_IBM(61, 63)
-
-struct hcp_ehea_port_cb5 {
- u64 prc; /* 00 */
- u64 uaa; /* 01 */
- u64 macvc; /* 02 */
- u64 xpcsc; /* 03 */
- u64 xpcsp; /* 04 */
- u64 pcsid; /* 05 */
- u64 xpcsst; /* 06 */
- u64 pthlb; /* 07 */
- u64 pthrb; /* 08 */
- u64 pqu; /* 09 */
- u64 pqd; /* 10 */
- u64 prt; /* 11 */
- u64 wsth; /* 12 */
- u64 rcb; /* 13 */
- u64 rcm; /* 14 */
- u64 rcu; /* 15 */
- u64 macc; /* 16 */
- u64 pc; /* 17 */
- u64 pst; /* 18 */
- u64 ducqpn; /* 19 */
- u64 mcqpn; /* 20 */
- u64 mma; /* 21 */
- u64 pmc0h; /* 22 */
- u64 pmc0l; /* 23 */
- u64 lbc; /* 24 */
-};
-
-#define H_PORT_CB6_ALL 0xFFFFFE7FFFFF8000ULL
-
-struct hcp_ehea_port_cb6 {
- u64 rxo; /* 00 */
- u64 rx64; /* 01 */
- u64 rx65; /* 02 */
- u64 rx128; /* 03 */
- u64 rx256; /* 04 */
- u64 rx512; /* 05 */
- u64 rx1024; /* 06 */
- u64 rxbfcs; /* 07 */
- u64 rxime; /* 08 */
- u64 rxrle; /* 09 */
- u64 rxorle; /* 10 */
- u64 rxftl; /* 11 */
- u64 rxjab; /* 12 */
- u64 rxse; /* 13 */
- u64 rxce; /* 14 */
- u64 rxrf; /* 15 */
- u64 rxfrag; /* 16 */
- u64 rxuoc; /* 17 */
- u64 rxcpf; /* 18 */
- u64 rxsb; /* 19 */
- u64 rxfd; /* 20 */
- u64 rxoerr; /* 21 */
- u64 rxaln; /* 22 */
- u64 ducqpn; /* 23 */
- u64 reserved0; /* 24 */
- u64 rxmcp; /* 25 */
- u64 rxbcp; /* 26 */
- u64 txmcp; /* 27 */
- u64 txbcp; /* 28 */
- u64 txo; /* 29 */
- u64 tx64; /* 30 */
- u64 tx65; /* 31 */
- u64 tx128; /* 32 */
- u64 tx256; /* 33 */
- u64 tx512; /* 34 */
- u64 tx1024; /* 35 */
- u64 txbfcs; /* 36 */
- u64 txcpf; /* 37 */
- u64 txlf; /* 38 */
- u64 txrf; /* 39 */
- u64 txime; /* 40 */
- u64 txsc; /* 41 */
- u64 txmc; /* 42 */
- u64 txsqe; /* 43 */
- u64 txdef; /* 44 */
- u64 txlcol; /* 45 */
- u64 txexcol; /* 46 */
- u64 txcse; /* 47 */
- u64 txbor; /* 48 */
-};
-
-#define H_PORT_CB7_DUCQPN 0x8000000000000000ULL
-
-struct hcp_ehea_port_cb7 {
- u64 def_uc_qpn;
-};
-
-u64 ehea_h_query_ehea_qp(const u64 adapter_handle,
- const u8 qp_category,
- const u64 qp_handle, const u64 sel_mask,
- void *cb_addr);
-
-u64 ehea_h_modify_ehea_qp(const u64 adapter_handle,
- const u8 cat,
- const u64 qp_handle,
- const u64 sel_mask,
- void *cb_addr,
- u64 *inv_attr_id,
- u64 *proc_mask, u16 *out_swr, u16 *out_rwr);
-
-u64 ehea_h_alloc_resource_eq(const u64 adapter_handle,
- struct ehea_eq_attr *eq_attr, u64 *eq_handle);
-
-u64 ehea_h_alloc_resource_cq(const u64 adapter_handle,
- struct ehea_cq_attr *cq_attr,
- u64 *cq_handle, struct h_epas *epas);
-
-u64 ehea_h_alloc_resource_qp(const u64 adapter_handle,
- struct ehea_qp_init_attr *init_attr,
- const u32 pd,
- u64 *qp_handle, struct h_epas *h_epas);
-
-#define H_REG_RPAGE_PAGE_SIZE EHEA_BMASK_IBM(48, 55)
-#define H_REG_RPAGE_QT EHEA_BMASK_IBM(62, 63)
-
-u64 ehea_h_register_rpage(const u64 adapter_handle,
- const u8 pagesize,
- const u8 queue_type,
- const u64 resource_handle,
- const u64 log_pageaddr, u64 count);
-
-#define H_DISABLE_GET_EHEA_WQE_P 1
-#define H_DISABLE_GET_SQ_WQE_P 2
-#define H_DISABLE_GET_RQC 3
-
-u64 ehea_h_disable_and_get_hea(const u64 adapter_handle, const u64 qp_handle);
-
-#define FORCE_FREE 1
-#define NORMAL_FREE 0
-
-u64 ehea_h_free_resource(const u64 adapter_handle, const u64 res_handle,
- u64 force_bit);
-
-u64 ehea_h_alloc_resource_mr(const u64 adapter_handle, const u64 vaddr,
- const u64 length, const u32 access_ctrl,
- const u32 pd, u64 *mr_handle, u32 *lkey);
-
-u64 ehea_h_register_rpage_mr(const u64 adapter_handle, const u64 mr_handle,
- const u8 pagesize, const u8 queue_type,
- const u64 log_pageaddr, const u64 count);
-
-u64 ehea_h_register_smr(const u64 adapter_handle, const u64 orig_mr_handle,
- const u64 vaddr_in, const u32 access_ctrl, const u32 pd,
- struct ehea_mr *mr);
-
-u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr);
-
-/* output param R5 */
-#define H_MEHEAPORT_CAT EHEA_BMASK_IBM(40, 47)
-#define H_MEHEAPORT_PN EHEA_BMASK_IBM(48, 63)
-
-u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num,
- const u8 cb_cat, const u64 select_mask,
- void *cb_addr);
-
-u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
- const u8 cb_cat, const u64 select_mask,
- void *cb_addr);
-
-#define H_REGBCMC_PN EHEA_BMASK_IBM(48, 63)
-#define H_REGBCMC_REGTYPE EHEA_BMASK_IBM(60, 63)
-#define H_REGBCMC_MACADDR EHEA_BMASK_IBM(16, 63)
-#define H_REGBCMC_VLANID EHEA_BMASK_IBM(52, 63)
-
-u64 ehea_h_reg_dereg_bcmc(const u64 adapter_handle, const u16 port_num,
- const u8 reg_type, const u64 mc_mac_addr,
- const u16 vlan_id, const u32 hcall_id);
-
-u64 ehea_h_reset_events(const u64 adapter_handle, const u64 neq_handle,
- const u64 event_mask);
-
-u64 ehea_h_error_data(const u64 adapter_handle, const u64 ressource_handle,
- void *rblock);
-
-#endif /* __EHEA_PHYP_H__ */
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
deleted file mode 100644
index 60629a0032b2..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ /dev/null
@@ -1,999 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
- *
- * eHEA ethernet device driver for IBM eServer System p
- *
- * (C) Copyright IBM Corp. 2006
- *
- * Authors:
- * Christoph Raisch <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include "ehea.h"
-#include "ehea_phyp.h"
-#include "ehea_qmr.h"
-
-static struct ehea_bmap *ehea_bmap;
-
-static void *hw_qpageit_get_inc(struct hw_queue *queue)
-{
- void *retvalue = hw_qeit_get(queue);
-
- queue->current_q_offset += queue->pagesize;
- if (queue->current_q_offset > queue->queue_length) {
- queue->current_q_offset -= queue->pagesize;
- retvalue = NULL;
- } else if (((u64) retvalue) & (EHEA_PAGESIZE-1)) {
- pr_err("not on pageboundary\n");
- retvalue = NULL;
- }
- return retvalue;
-}
-
-static int hw_queue_ctor(struct hw_queue *queue, const u32 nr_of_pages,
- const u32 pagesize, const u32 qe_size)
-{
- int pages_per_kpage = PAGE_SIZE / pagesize;
- int i, k;
-
- if ((pagesize > PAGE_SIZE) || (!pages_per_kpage)) {
- pr_err("pagesize conflict! kernel pagesize=%d, ehea pagesize=%d\n",
- (int)PAGE_SIZE, (int)pagesize);
- return -EINVAL;
- }
-
- queue->queue_length = nr_of_pages * pagesize;
- queue->queue_pages = kmalloc_array(nr_of_pages, sizeof(void *),
- GFP_KERNEL);
- if (!queue->queue_pages)
- return -ENOMEM;
-
- /*
- * allocate pages for queue:
- * outer loop allocates whole kernel pages (page aligned) and
- * inner loop divides a kernel page into smaller hea queue pages
- */
- i = 0;
- while (i < nr_of_pages) {
- u8 *kpage = (u8 *)get_zeroed_page(GFP_KERNEL);
- if (!kpage)
- goto out_nomem;
- for (k = 0; k < pages_per_kpage && i < nr_of_pages; k++) {
- (queue->queue_pages)[i] = (struct ehea_page *)kpage;
- kpage += pagesize;
- i++;
- }
- }
-
- queue->current_q_offset = 0;
- queue->qe_size = qe_size;
- queue->pagesize = pagesize;
- queue->toggle_state = 1;
-
- return 0;
-out_nomem:
- for (i = 0; i < nr_of_pages; i += pages_per_kpage) {
- if (!(queue->queue_pages)[i])
- break;
- free_page((unsigned long)(queue->queue_pages)[i]);
- }
- return -ENOMEM;
-}
-
-static void hw_queue_dtor(struct hw_queue *queue)
-{
- int pages_per_kpage;
- int i, nr_pages;
-
- if (!queue || !queue->queue_pages)
- return;
-
- pages_per_kpage = PAGE_SIZE / queue->pagesize;
-
- nr_pages = queue->queue_length / queue->pagesize;
-
- for (i = 0; i < nr_pages; i += pages_per_kpage)
- free_page((unsigned long)(queue->queue_pages)[i]);
-
- kfree(queue->queue_pages);
-}
-
-struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
- int nr_of_cqe, u64 eq_handle, u32 cq_token)
-{
- struct ehea_cq *cq;
- u64 hret, rpage;
- u32 counter;
- int ret;
- void *vpage;
-
- cq = kzalloc_obj(*cq);
- if (!cq)
- goto out_nomem;
-
- cq->attr.max_nr_of_cqes = nr_of_cqe;
- cq->attr.cq_token = cq_token;
- cq->attr.eq_handle = eq_handle;
-
- cq->adapter = adapter;
-
- hret = ehea_h_alloc_resource_cq(adapter->handle, &cq->attr,
- &cq->fw_handle, &cq->epas);
- if (hret != H_SUCCESS) {
- pr_err("alloc_resource_cq failed\n");
- goto out_freemem;
- }
-
- ret = hw_queue_ctor(&cq->hw_queue, cq->attr.nr_pages,
- EHEA_PAGESIZE, sizeof(struct ehea_cqe));
- if (ret)
- goto out_freeres;
-
- for (counter = 0; counter < cq->attr.nr_pages; counter++) {
- vpage = hw_qpageit_get_inc(&cq->hw_queue);
- if (!vpage) {
- pr_err("hw_qpageit_get_inc failed\n");
- goto out_kill_hwq;
- }
-
- rpage = __pa(vpage);
- hret = ehea_h_register_rpage(adapter->handle,
- 0, EHEA_CQ_REGISTER_ORIG,
- cq->fw_handle, rpage, 1);
- if (hret < H_SUCCESS) {
- pr_err("register_rpage_cq failed ehea_cq=%p hret=%llx counter=%i act_pages=%i\n",
- cq, hret, counter, cq->attr.nr_pages);
- goto out_kill_hwq;
- }
-
- if (counter == (cq->attr.nr_pages - 1)) {
- vpage = hw_qpageit_get_inc(&cq->hw_queue);
-
- if ((hret != H_SUCCESS) || (vpage)) {
- pr_err("registration of pages not complete hret=%llx\n",
- hret);
- goto out_kill_hwq;
- }
- } else {
- if (hret != H_PAGE_REGISTERED) {
- pr_err("CQ: registration of page failed hret=%llx\n",
- hret);
- goto out_kill_hwq;
- }
- }
- }
-
- hw_qeit_reset(&cq->hw_queue);
- ehea_reset_cq_ep(cq);
- ehea_reset_cq_n1(cq);
-
- return cq;
-
-out_kill_hwq:
- hw_queue_dtor(&cq->hw_queue);
-
-out_freeres:
- ehea_h_free_resource(adapter->handle, cq->fw_handle, FORCE_FREE);
-
-out_freemem:
- kfree(cq);
-
-out_nomem:
- return NULL;
-}
-
-static u64 ehea_destroy_cq_res(struct ehea_cq *cq, u64 force)
-{
- u64 hret;
- u64 adapter_handle = cq->adapter->handle;
-
- /* deregister all previous registered pages */
- hret = ehea_h_free_resource(adapter_handle, cq->fw_handle, force);
- if (hret != H_SUCCESS)
- return hret;
-
- hw_queue_dtor(&cq->hw_queue);
- kfree(cq);
-
- return hret;
-}
-
-int ehea_destroy_cq(struct ehea_cq *cq)
-{
- u64 hret, aer, aerr;
- if (!cq)
- return 0;
-
- hcp_epas_dtor(&cq->epas);
- hret = ehea_destroy_cq_res(cq, NORMAL_FREE);
- if (hret == H_R_STATE) {
- ehea_error_data(cq->adapter, cq->fw_handle, &aer, &aerr);
- hret = ehea_destroy_cq_res(cq, FORCE_FREE);
- }
-
- if (hret != H_SUCCESS) {
- pr_err("destroy CQ failed\n");
- return -EIO;
- }
-
- return 0;
-}
-
-struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
- const enum ehea_eq_type type,
- const u32 max_nr_of_eqes, const u8 eqe_gen)
-{
- int ret, i;
- u64 hret, rpage;
- void *vpage;
- struct ehea_eq *eq;
-
- eq = kzalloc_obj(*eq);
- if (!eq)
- return NULL;
-
- eq->adapter = adapter;
- eq->attr.type = type;
- eq->attr.max_nr_of_eqes = max_nr_of_eqes;
- eq->attr.eqe_gen = eqe_gen;
- spin_lock_init(&eq->spinlock);
-
- hret = ehea_h_alloc_resource_eq(adapter->handle,
- &eq->attr, &eq->fw_handle);
- if (hret != H_SUCCESS) {
- pr_err("alloc_resource_eq failed\n");
- goto out_freemem;
- }
-
- ret = hw_queue_ctor(&eq->hw_queue, eq->attr.nr_pages,
- EHEA_PAGESIZE, sizeof(struct ehea_eqe));
- if (ret) {
- pr_err("can't allocate eq pages\n");
- goto out_freeres;
- }
-
- for (i = 0; i < eq->attr.nr_pages; i++) {
- vpage = hw_qpageit_get_inc(&eq->hw_queue);
- if (!vpage) {
- pr_err("hw_qpageit_get_inc failed\n");
- hret = H_RESOURCE;
- goto out_kill_hwq;
- }
-
- rpage = __pa(vpage);
-
- hret = ehea_h_register_rpage(adapter->handle, 0,
- EHEA_EQ_REGISTER_ORIG,
- eq->fw_handle, rpage, 1);
-
- if (i == (eq->attr.nr_pages - 1)) {
- /* last page */
- vpage = hw_qpageit_get_inc(&eq->hw_queue);
- if ((hret != H_SUCCESS) || (vpage))
- goto out_kill_hwq;
-
- } else {
- if (hret != H_PAGE_REGISTERED)
- goto out_kill_hwq;
-
- }
- }
-
- hw_qeit_reset(&eq->hw_queue);
- return eq;
-
-out_kill_hwq:
- hw_queue_dtor(&eq->hw_queue);
-
-out_freeres:
- ehea_h_free_resource(adapter->handle, eq->fw_handle, FORCE_FREE);
-
-out_freemem:
- kfree(eq);
- return NULL;
-}
-
-struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq)
-{
- struct ehea_eqe *eqe;
- unsigned long flags;
-
- spin_lock_irqsave(&eq->spinlock, flags);
- eqe = hw_eqit_eq_get_inc_valid(&eq->hw_queue);
- spin_unlock_irqrestore(&eq->spinlock, flags);
-
- return eqe;
-}
-
-static u64 ehea_destroy_eq_res(struct ehea_eq *eq, u64 force)
-{
- u64 hret;
- unsigned long flags;
-
- spin_lock_irqsave(&eq->spinlock, flags);
-
- hret = ehea_h_free_resource(eq->adapter->handle, eq->fw_handle, force);
- spin_unlock_irqrestore(&eq->spinlock, flags);
-
- if (hret != H_SUCCESS)
- return hret;
-
- hw_queue_dtor(&eq->hw_queue);
- kfree(eq);
-
- return hret;
-}
-
-int ehea_destroy_eq(struct ehea_eq *eq)
-{
- u64 hret, aer, aerr;
- if (!eq)
- return 0;
-
- hcp_epas_dtor(&eq->epas);
-
- hret = ehea_destroy_eq_res(eq, NORMAL_FREE);
- if (hret == H_R_STATE) {
- ehea_error_data(eq->adapter, eq->fw_handle, &aer, &aerr);
- hret = ehea_destroy_eq_res(eq, FORCE_FREE);
- }
-
- if (hret != H_SUCCESS) {
- pr_err("destroy EQ failed\n");
- return -EIO;
- }
-
- return 0;
-}
-
-/* allocates memory for a queue and registers pages in phyp */
-static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
- int nr_pages, int wqe_size, int act_nr_sges,
- struct ehea_adapter *adapter, int h_call_q_selector)
-{
- u64 hret, rpage;
- int ret, cnt;
- void *vpage;
-
- ret = hw_queue_ctor(hw_queue, nr_pages, EHEA_PAGESIZE, wqe_size);
- if (ret)
- return ret;
-
- for (cnt = 0; cnt < nr_pages; cnt++) {
- vpage = hw_qpageit_get_inc(hw_queue);
- if (!vpage) {
- pr_err("hw_qpageit_get_inc failed\n");
- goto out_kill_hwq;
- }
- rpage = __pa(vpage);
- hret = ehea_h_register_rpage(adapter->handle,
- 0, h_call_q_selector,
- qp->fw_handle, rpage, 1);
- if (hret < H_SUCCESS) {
- pr_err("register_rpage_qp failed\n");
- goto out_kill_hwq;
- }
- }
- hw_qeit_reset(hw_queue);
- return 0;
-
-out_kill_hwq:
- hw_queue_dtor(hw_queue);
- return -EIO;
-}
-
-static inline u32 map_wqe_size(u8 wqe_enc_size)
-{
- return 128 << wqe_enc_size;
-}
-
-struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter,
- u32 pd, struct ehea_qp_init_attr *init_attr)
-{
- int ret;
- u64 hret;
- struct ehea_qp *qp;
- u32 wqe_size_in_bytes_sq, wqe_size_in_bytes_rq1;
- u32 wqe_size_in_bytes_rq2, wqe_size_in_bytes_rq3;
-
-
- qp = kzalloc_obj(*qp);
- if (!qp)
- return NULL;
-
- qp->adapter = adapter;
-
- hret = ehea_h_alloc_resource_qp(adapter->handle, init_attr, pd,
- &qp->fw_handle, &qp->epas);
- if (hret != H_SUCCESS) {
- pr_err("ehea_h_alloc_resource_qp failed\n");
- goto out_freemem;
- }
-
- wqe_size_in_bytes_sq = map_wqe_size(init_attr->act_wqe_size_enc_sq);
- wqe_size_in_bytes_rq1 = map_wqe_size(init_attr->act_wqe_size_enc_rq1);
- wqe_size_in_bytes_rq2 = map_wqe_size(init_attr->act_wqe_size_enc_rq2);
- wqe_size_in_bytes_rq3 = map_wqe_size(init_attr->act_wqe_size_enc_rq3);
-
- ret = ehea_qp_alloc_register(qp, &qp->hw_squeue, init_attr->nr_sq_pages,
- wqe_size_in_bytes_sq,
- init_attr->act_wqe_size_enc_sq, adapter,
- 0);
- if (ret) {
- pr_err("can't register for sq ret=%x\n", ret);
- goto out_freeres;
- }
-
- ret = ehea_qp_alloc_register(qp, &qp->hw_rqueue1,
- init_attr->nr_rq1_pages,
- wqe_size_in_bytes_rq1,
- init_attr->act_wqe_size_enc_rq1,
- adapter, 1);
- if (ret) {
- pr_err("can't register for rq1 ret=%x\n", ret);
- goto out_kill_hwsq;
- }
-
- if (init_attr->rq_count > 1) {
- ret = ehea_qp_alloc_register(qp, &qp->hw_rqueue2,
- init_attr->nr_rq2_pages,
- wqe_size_in_bytes_rq2,
- init_attr->act_wqe_size_enc_rq2,
- adapter, 2);
- if (ret) {
- pr_err("can't register for rq2 ret=%x\n", ret);
- goto out_kill_hwr1q;
- }
- }
-
- if (init_attr->rq_count > 2) {
- ret = ehea_qp_alloc_register(qp, &qp->hw_rqueue3,
- init_attr->nr_rq3_pages,
- wqe_size_in_bytes_rq3,
- init_attr->act_wqe_size_enc_rq3,
- adapter, 3);
- if (ret) {
- pr_err("can't register for rq3 ret=%x\n", ret);
- goto out_kill_hwr2q;
- }
- }
-
- qp->init_attr = *init_attr;
-
- return qp;
-
-out_kill_hwr2q:
- hw_queue_dtor(&qp->hw_rqueue2);
-
-out_kill_hwr1q:
- hw_queue_dtor(&qp->hw_rqueue1);
-
-out_kill_hwsq:
- hw_queue_dtor(&qp->hw_squeue);
-
-out_freeres:
- ehea_h_disable_and_get_hea(adapter->handle, qp->fw_handle);
- ehea_h_free_resource(adapter->handle, qp->fw_handle, FORCE_FREE);
-
-out_freemem:
- kfree(qp);
- return NULL;
-}
-
-static u64 ehea_destroy_qp_res(struct ehea_qp *qp, u64 force)
-{
- u64 hret;
- struct ehea_qp_init_attr *qp_attr = &qp->init_attr;
-
-
- ehea_h_disable_and_get_hea(qp->adapter->handle, qp->fw_handle);
- hret = ehea_h_free_resource(qp->adapter->handle, qp->fw_handle, force);
- if (hret != H_SUCCESS)
- return hret;
-
- hw_queue_dtor(&qp->hw_squeue);
- hw_queue_dtor(&qp->hw_rqueue1);
-
- if (qp_attr->rq_count > 1)
- hw_queue_dtor(&qp->hw_rqueue2);
- if (qp_attr->rq_count > 2)
- hw_queue_dtor(&qp->hw_rqueue3);
- kfree(qp);
-
- return hret;
-}
-
-int ehea_destroy_qp(struct ehea_qp *qp)
-{
- u64 hret, aer, aerr;
- if (!qp)
- return 0;
-
- hcp_epas_dtor(&qp->epas);
-
- hret = ehea_destroy_qp_res(qp, NORMAL_FREE);
- if (hret == H_R_STATE) {
- ehea_error_data(qp->adapter, qp->fw_handle, &aer, &aerr);
- hret = ehea_destroy_qp_res(qp, FORCE_FREE);
- }
-
- if (hret != H_SUCCESS) {
- pr_err("destroy QP failed\n");
- return -EIO;
- }
-
- return 0;
-}
-
-static inline int ehea_calc_index(unsigned long i, unsigned long s)
-{
- return (i >> s) & EHEA_INDEX_MASK;
-}
-
-static inline int ehea_init_top_bmap(struct ehea_top_bmap *ehea_top_bmap,
- int dir)
-{
- if (!ehea_top_bmap->dir[dir]) {
- ehea_top_bmap->dir[dir] =
- kzalloc_obj(struct ehea_dir_bmap);
- if (!ehea_top_bmap->dir[dir])
- return -ENOMEM;
- }
- return 0;
-}
-
-static inline int ehea_init_bmap(struct ehea_bmap *ehea_bmap, int top, int dir)
-{
- if (!ehea_bmap->top[top]) {
- ehea_bmap->top[top] =
- kzalloc_obj(struct ehea_top_bmap);
- if (!ehea_bmap->top[top])
- return -ENOMEM;
- }
- return ehea_init_top_bmap(ehea_bmap->top[top], dir);
-}
-
-static DEFINE_MUTEX(ehea_busmap_mutex);
-static unsigned long ehea_mr_len;
-
-#define EHEA_BUSMAP_ADD_SECT 1
-#define EHEA_BUSMAP_REM_SECT 0
-
-static void ehea_rebuild_busmap(void)
-{
- u64 vaddr = EHEA_BUSMAP_START;
- int top, dir, idx;
-
- for (top = 0; top < EHEA_MAP_ENTRIES; top++) {
- struct ehea_top_bmap *ehea_top;
- int valid_dir_entries = 0;
-
- if (!ehea_bmap->top[top])
- continue;
- ehea_top = ehea_bmap->top[top];
- for (dir = 0; dir < EHEA_MAP_ENTRIES; dir++) {
- struct ehea_dir_bmap *ehea_dir;
- int valid_entries = 0;
-
- if (!ehea_top->dir[dir])
- continue;
- valid_dir_entries++;
- ehea_dir = ehea_top->dir[dir];
- for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) {
- if (!ehea_dir->ent[idx])
- continue;
- valid_entries++;
- ehea_dir->ent[idx] = vaddr;
- vaddr += EHEA_SECTSIZE;
- }
- if (!valid_entries) {
- ehea_top->dir[dir] = NULL;
- kfree(ehea_dir);
- }
- }
- if (!valid_dir_entries) {
- ehea_bmap->top[top] = NULL;
- kfree(ehea_top);
- }
- }
-}
-
-static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)
-{
- unsigned long i, start_section, end_section;
-
- if (!nr_pages)
- return 0;
-
- if (!ehea_bmap) {
- ehea_bmap = kzalloc_obj(struct ehea_bmap);
- if (!ehea_bmap)
- return -ENOMEM;
- }
-
- start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
- end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
- /* Mark entries as valid or invalid only; address is assigned later */
- for (i = start_section; i < end_section; i++) {
- u64 flag;
- int top = ehea_calc_index(i, EHEA_TOP_INDEX_SHIFT);
- int dir = ehea_calc_index(i, EHEA_DIR_INDEX_SHIFT);
- int idx = i & EHEA_INDEX_MASK;
-
- if (add) {
- int ret = ehea_init_bmap(ehea_bmap, top, dir);
- if (ret)
- return ret;
- flag = 1; /* valid */
- ehea_mr_len += EHEA_SECTSIZE;
- } else {
- if (!ehea_bmap->top[top])
- continue;
- if (!ehea_bmap->top[top]->dir[dir])
- continue;
- flag = 0; /* invalid */
- ehea_mr_len -= EHEA_SECTSIZE;
- }
-
- ehea_bmap->top[top]->dir[dir]->ent[idx] = flag;
- }
- ehea_rebuild_busmap(); /* Assign contiguous addresses for mr */
- return 0;
-}
-
-int ehea_add_sect_bmap(unsigned long pfn, unsigned long nr_pages)
-{
- int ret;
-
- mutex_lock(&ehea_busmap_mutex);
- ret = ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
- mutex_unlock(&ehea_busmap_mutex);
- return ret;
-}
-
-int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages)
-{
- int ret;
-
- mutex_lock(&ehea_busmap_mutex);
- ret = ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_REM_SECT);
- mutex_unlock(&ehea_busmap_mutex);
- return ret;
-}
-
-static int ehea_is_hugepage(unsigned long pfn)
-{
- if (pfn & EHEA_HUGEPAGE_PFN_MASK)
- return 0;
-
- if (page_shift(pfn_to_page(pfn)) != EHEA_HUGEPAGESHIFT)
- return 0;
-
- return 1;
-}
-
-static int ehea_create_busmap_callback(unsigned long initial_pfn,
- unsigned long total_nr_pages, void *arg)
-{
- int ret;
- unsigned long pfn, start_pfn, end_pfn, nr_pages;
-
- if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)
- return ehea_update_busmap(initial_pfn, total_nr_pages,
- EHEA_BUSMAP_ADD_SECT);
-
- /* Given chunk is >= 16GB -> check for hugepages */
- start_pfn = initial_pfn;
- end_pfn = initial_pfn + total_nr_pages;
- pfn = start_pfn;
-
- while (pfn < end_pfn) {
- if (ehea_is_hugepage(pfn)) {
- /* Add mem found in front of the hugepage */
- nr_pages = pfn - start_pfn;
- ret = ehea_update_busmap(start_pfn, nr_pages,
- EHEA_BUSMAP_ADD_SECT);
- if (ret)
- return ret;
-
- /* Skip the hugepage */
- pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);
- start_pfn = pfn;
- } else
- pfn += (EHEA_SECTSIZE / PAGE_SIZE);
- }
-
- /* Add mem found behind the hugepage(s) */
- nr_pages = pfn - start_pfn;
- return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
-}
-
-int ehea_create_busmap(void)
-{
- int ret;
-
- mutex_lock(&ehea_busmap_mutex);
- ehea_mr_len = 0;
- ret = walk_system_ram_range(0, 1ULL << MAX_PHYSMEM_BITS, NULL,
- ehea_create_busmap_callback);
- mutex_unlock(&ehea_busmap_mutex);
- return ret;
-}
-
-void ehea_destroy_busmap(void)
-{
- int top, dir;
- mutex_lock(&ehea_busmap_mutex);
- if (!ehea_bmap)
- goto out_destroy;
-
- for (top = 0; top < EHEA_MAP_ENTRIES; top++) {
- if (!ehea_bmap->top[top])
- continue;
-
- for (dir = 0; dir < EHEA_MAP_ENTRIES; dir++) {
- if (!ehea_bmap->top[top]->dir[dir])
- continue;
-
- kfree(ehea_bmap->top[top]->dir[dir]);
- }
-
- kfree(ehea_bmap->top[top]);
- }
-
- kfree(ehea_bmap);
- ehea_bmap = NULL;
-out_destroy:
- mutex_unlock(&ehea_busmap_mutex);
-}
-
-u64 ehea_map_vaddr(void *caddr)
-{
- int top, dir, idx;
- unsigned long index, offset;
-
- if (!ehea_bmap)
- return EHEA_INVAL_ADDR;
-
- index = __pa(caddr) >> SECTION_SIZE_BITS;
- top = (index >> EHEA_TOP_INDEX_SHIFT) & EHEA_INDEX_MASK;
- if (!ehea_bmap->top[top])
- return EHEA_INVAL_ADDR;
-
- dir = (index >> EHEA_DIR_INDEX_SHIFT) & EHEA_INDEX_MASK;
- if (!ehea_bmap->top[top]->dir[dir])
- return EHEA_INVAL_ADDR;
-
- idx = index & EHEA_INDEX_MASK;
- if (!ehea_bmap->top[top]->dir[dir]->ent[idx])
- return EHEA_INVAL_ADDR;
-
- offset = (unsigned long)caddr & (EHEA_SECTSIZE - 1);
- return ehea_bmap->top[top]->dir[dir]->ent[idx] | offset;
-}
-
-static inline void *ehea_calc_sectbase(int top, int dir, int idx)
-{
- unsigned long ret = idx;
- ret |= dir << EHEA_DIR_INDEX_SHIFT;
- ret |= top << EHEA_TOP_INDEX_SHIFT;
- return __va(ret << SECTION_SIZE_BITS);
-}
-
-static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
- struct ehea_adapter *adapter,
- struct ehea_mr *mr)
-{
- void *pg;
- u64 j, m, hret;
- unsigned long k = 0;
- u64 pt_abs = __pa(pt);
-
- void *sectbase = ehea_calc_sectbase(top, dir, idx);
-
- for (j = 0; j < (EHEA_PAGES_PER_SECTION / EHEA_MAX_RPAGE); j++) {
-
- for (m = 0; m < EHEA_MAX_RPAGE; m++) {
- pg = sectbase + ((k++) * EHEA_PAGESIZE);
- pt[m] = __pa(pg);
- }
- hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0,
- 0, pt_abs, EHEA_MAX_RPAGE);
-
- if ((hret != H_SUCCESS) &&
- (hret != H_PAGE_REGISTERED)) {
- ehea_h_free_resource(adapter->handle, mr->handle,
- FORCE_FREE);
- pr_err("register_rpage_mr failed\n");
- return hret;
- }
- }
- return hret;
-}
-
-static u64 ehea_reg_mr_sections(int top, int dir, u64 *pt,
- struct ehea_adapter *adapter,
- struct ehea_mr *mr)
-{
- u64 hret = H_SUCCESS;
- int idx;
-
- for (idx = 0; idx < EHEA_MAP_ENTRIES; idx++) {
- if (!ehea_bmap->top[top]->dir[dir]->ent[idx])
- continue;
-
- hret = ehea_reg_mr_section(top, dir, idx, pt, adapter, mr);
- if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
- return hret;
- }
- return hret;
-}
-
-static u64 ehea_reg_mr_dir_sections(int top, u64 *pt,
- struct ehea_adapter *adapter,
- struct ehea_mr *mr)
-{
- u64 hret = H_SUCCESS;
- int dir;
-
- for (dir = 0; dir < EHEA_MAP_ENTRIES; dir++) {
- if (!ehea_bmap->top[top]->dir[dir])
- continue;
-
- hret = ehea_reg_mr_sections(top, dir, pt, adapter, mr);
- if ((hret != H_SUCCESS) && (hret != H_PAGE_REGISTERED))
- return hret;
- }
- return hret;
-}
-
-int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr)
-{
- int ret;
- u64 *pt;
- u64 hret;
- u32 acc_ctrl = EHEA_MR_ACC_CTRL;
-
- unsigned long top;
-
- pt = (void *)get_zeroed_page(GFP_KERNEL);
- if (!pt) {
- pr_err("no mem\n");
- ret = -ENOMEM;
- goto out;
- }
-
- hret = ehea_h_alloc_resource_mr(adapter->handle, EHEA_BUSMAP_START,
- ehea_mr_len, acc_ctrl, adapter->pd,
- &mr->handle, &mr->lkey);
-
- if (hret != H_SUCCESS) {
- pr_err("alloc_resource_mr failed\n");
- ret = -EIO;
- goto out;
- }
-
- if (!ehea_bmap) {
- ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
- pr_err("no busmap available\n");
- ret = -EIO;
- goto out;
- }
-
- for (top = 0; top < EHEA_MAP_ENTRIES; top++) {
- if (!ehea_bmap->top[top])
- continue;
-
- hret = ehea_reg_mr_dir_sections(top, pt, adapter, mr);
- if((hret != H_PAGE_REGISTERED) && (hret != H_SUCCESS))
- break;
- }
-
- if (hret != H_SUCCESS) {
- ehea_h_free_resource(adapter->handle, mr->handle, FORCE_FREE);
- pr_err("registering mr failed\n");
- ret = -EIO;
- goto out;
- }
-
- mr->vaddr = EHEA_BUSMAP_START;
- mr->adapter = adapter;
- ret = 0;
-out:
- free_page((unsigned long)pt);
- return ret;
-}
-
-int ehea_rem_mr(struct ehea_mr *mr)
-{
- u64 hret;
-
- if (!mr || !mr->adapter)
- return -EINVAL;
-
- hret = ehea_h_free_resource(mr->adapter->handle, mr->handle,
- FORCE_FREE);
- if (hret != H_SUCCESS) {
- pr_err("destroy MR failed\n");
- return -EIO;
- }
-
- return 0;
-}
-
-int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
- struct ehea_mr *shared_mr)
-{
- u64 hret;
-
- hret = ehea_h_register_smr(adapter->handle, old_mr->handle,
- old_mr->vaddr, EHEA_MR_ACC_CTRL,
- adapter->pd, shared_mr);
- if (hret != H_SUCCESS)
- return -EIO;
-
- shared_mr->adapter = adapter;
-
- return 0;
-}
-
-static void print_error_data(u64 *data)
-{
- int length;
- u64 type = EHEA_BMASK_GET(ERROR_DATA_TYPE, data[2]);
- u64 resource = data[1];
-
- length = EHEA_BMASK_GET(ERROR_DATA_LENGTH, data[0]);
-
- if (length > EHEA_PAGESIZE)
- length = EHEA_PAGESIZE;
-
- if (type == EHEA_AER_RESTYPE_QP)
- pr_err("QP (resource=%llX) state: AER=0x%llX, AERR=0x%llX, port=%llX\n",
- resource, data[6], data[12], data[22]);
- else if (type == EHEA_AER_RESTYPE_CQ)
- pr_err("CQ (resource=%llX) state: AER=0x%llX\n",
- resource, data[6]);
- else if (type == EHEA_AER_RESTYPE_EQ)
- pr_err("EQ (resource=%llX) state: AER=0x%llX\n",
- resource, data[6]);
-
- ehea_dump(data, length, "error data");
-}
-
-u64 ehea_error_data(struct ehea_adapter *adapter, u64 res_handle,
- u64 *aer, u64 *aerr)
-{
- unsigned long ret;
- u64 *rblock;
- u64 type = 0;
-
- rblock = (void *)get_zeroed_page(GFP_KERNEL);
- if (!rblock) {
- pr_err("Cannot allocate rblock memory\n");
- goto out;
- }
-
- ret = ehea_h_error_data(adapter->handle, res_handle, rblock);
-
- if (ret == H_SUCCESS) {
- type = EHEA_BMASK_GET(ERROR_DATA_TYPE, rblock[2]);
- *aer = rblock[6];
- *aerr = rblock[12];
- print_error_data(rblock);
- } else if (ret == H_R_STATE) {
- pr_err("No error data available: %llX\n", res_handle);
- } else
- pr_err("Error data could not be fetched: %llX\n", res_handle);
-
- free_page((unsigned long)rblock);
-out:
- return type;
-}
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
deleted file mode 100644
index 7c7cccd820f7..000000000000
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * linux/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
- *
- * eHEA ethernet device driver for IBM eServer System p
- *
- * (C) Copyright IBM Corp. 2006
- *
- * Authors:
- * Christoph Raisch <raisch@de.ibm.com>
- * Jan-Bernd Themann <themann@de.ibm.com>
- * Thomas Klein <tklein@de.ibm.com>
- */
-
-#ifndef __EHEA_QMR_H__
-#define __EHEA_QMR_H__
-
-#include <linux/prefetch.h>
-#include "ehea.h"
-#include "ehea_hw.h"
-
-/*
- * page size of ehea hardware queues
- */
-
-#define EHEA_PAGESHIFT 12
-#define EHEA_PAGESIZE (1UL << EHEA_PAGESHIFT)
-#define EHEA_SECTSIZE (1UL << 24)
-#define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
-#define EHEA_HUGEPAGESHIFT 34
-#define EHEA_HUGEPAGE_SIZE (1UL << EHEA_HUGEPAGESHIFT)
-#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)
-
-#if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
-#error eHEA module cannot work if kernel sectionsize < ehea sectionsize
-#endif
-
-/* Some abbreviations used here:
- *
- * WQE - Work Queue Entry
- * SWQE - Send Work Queue Entry
- * RWQE - Receive Work Queue Entry
- * CQE - Completion Queue Entry
- * EQE - Event Queue Entry
- * MR - Memory Region
- */
-
-/* Use of WR_ID field for EHEA */
-#define EHEA_WR_ID_COUNT EHEA_BMASK_IBM(0, 19)
-#define EHEA_WR_ID_TYPE EHEA_BMASK_IBM(20, 23)
-#define EHEA_SWQE2_TYPE 0x1
-#define EHEA_SWQE3_TYPE 0x2
-#define EHEA_RWQE2_TYPE 0x3
-#define EHEA_RWQE3_TYPE 0x4
-#define EHEA_WR_ID_INDEX EHEA_BMASK_IBM(24, 47)
-#define EHEA_WR_ID_REFILL EHEA_BMASK_IBM(48, 63)
-
-struct ehea_vsgentry {
- u64 vaddr;
- u32 l_key;
- u32 len;
-};
-
-/* maximum number of sg entries allowed in a WQE */
-#define EHEA_MAX_WQE_SG_ENTRIES 252
-#define SWQE2_MAX_IMM (0xD0 - 0x30)
-#define SWQE3_MAX_IMM 224
-
-/* tx control flags for swqe */
-#define EHEA_SWQE_CRC 0x8000
-#define EHEA_SWQE_IP_CHECKSUM 0x4000
-#define EHEA_SWQE_TCP_CHECKSUM 0x2000
-#define EHEA_SWQE_TSO 0x1000
-#define EHEA_SWQE_SIGNALLED_COMPLETION 0x0800
-#define EHEA_SWQE_VLAN_INSERT 0x0400
-#define EHEA_SWQE_IMM_DATA_PRESENT 0x0200
-#define EHEA_SWQE_DESCRIPTORS_PRESENT 0x0100
-#define EHEA_SWQE_WRAP_CTL_REC 0x0080
-#define EHEA_SWQE_WRAP_CTL_FORCE 0x0040
-#define EHEA_SWQE_BIND 0x0020
-#define EHEA_SWQE_PURGE 0x0010
-
-/* sizeof(struct ehea_swqe) less the union */
-#define SWQE_HEADER_SIZE 32
-
-struct ehea_swqe {
- u64 wr_id;
- u16 tx_control;
- u16 vlan_tag;
- u8 reserved1;
- u8 ip_start;
- u8 ip_end;
- u8 immediate_data_length;
- u8 tcp_offset;
- u8 reserved2;
- u16 reserved2b;
- u8 wrap_tag;
- u8 descriptors; /* number of valid descriptors in WQE */
- u16 reserved3;
- u16 reserved4;
- u16 mss;
- u32 reserved5;
- union {
- /* Send WQE Format 1 */
- struct {
- struct ehea_vsgentry sg_list[EHEA_MAX_WQE_SG_ENTRIES];
- } no_immediate_data;
-
- /* Send WQE Format 2 */
- struct {
- struct ehea_vsgentry sg_entry;
- /* 0x30 */
- u8 immediate_data[SWQE2_MAX_IMM];
- /* 0xd0 */
- struct ehea_vsgentry sg_list[EHEA_MAX_WQE_SG_ENTRIES-1];
- } immdata_desc __packed;
-
- /* Send WQE Format 3 */
- struct {
- u8 immediate_data[SWQE3_MAX_IMM];
- } immdata_nodesc;
- } u;
-};
-
-struct ehea_rwqe {
- u64 wr_id; /* work request ID */
- u8 reserved1[5];
- u8 data_segments;
- u16 reserved2;
- u64 reserved3;
- u64 reserved4;
- struct ehea_vsgentry sg_list[EHEA_MAX_WQE_SG_ENTRIES];
-};
-
-#define EHEA_CQE_VLAN_TAG_XTRACT 0x0400
-
-#define EHEA_CQE_TYPE_RQ 0x60
-#define EHEA_CQE_STAT_ERR_MASK 0x700F
-#define EHEA_CQE_STAT_FAT_ERR_MASK 0xF
-#define EHEA_CQE_BLIND_CKSUM 0x8000
-#define EHEA_CQE_STAT_ERR_TCP 0x4000
-#define EHEA_CQE_STAT_ERR_IP 0x2000
-#define EHEA_CQE_STAT_ERR_CRC 0x1000
-
-/* Defines which bad send cqe stati lead to a port reset */
-#define EHEA_CQE_STAT_RESET_MASK 0x0002
-
-struct ehea_cqe {
- u64 wr_id; /* work request ID from WQE */
- u8 type;
- u8 valid;
- u16 status;
- u16 reserved1;
- u16 num_bytes_transfered;
- u16 vlan_tag;
- u16 inet_checksum_value;
- u8 reserved2;
- u8 header_length;
- u16 reserved3;
- u16 page_offset;
- u16 wqe_count;
- u32 qp_token;
- u32 timestamp;
- u32 reserved4;
- u64 reserved5[3];
-};
-
-#define EHEA_EQE_VALID EHEA_BMASK_IBM(0, 0)
-#define EHEA_EQE_IS_CQE EHEA_BMASK_IBM(1, 1)
-#define EHEA_EQE_IDENTIFIER EHEA_BMASK_IBM(2, 7)
-#define EHEA_EQE_QP_CQ_NUMBER EHEA_BMASK_IBM(8, 31)
-#define EHEA_EQE_QP_TOKEN EHEA_BMASK_IBM(32, 63)
-#define EHEA_EQE_CQ_TOKEN EHEA_BMASK_IBM(32, 63)
-#define EHEA_EQE_KEY EHEA_BMASK_IBM(32, 63)
-#define EHEA_EQE_PORT_NUMBER EHEA_BMASK_IBM(56, 63)
-#define EHEA_EQE_EQ_NUMBER EHEA_BMASK_IBM(48, 63)
-#define EHEA_EQE_SM_ID EHEA_BMASK_IBM(48, 63)
-#define EHEA_EQE_SM_MECH_NUMBER EHEA_BMASK_IBM(48, 55)
-#define EHEA_EQE_SM_PORT_NUMBER EHEA_BMASK_IBM(56, 63)
-
-#define EHEA_AER_RESTYPE_QP 0x8
-#define EHEA_AER_RESTYPE_CQ 0x4
-#define EHEA_AER_RESTYPE_EQ 0x3
-
-/* Defines which affiliated errors lead to a port reset */
-#define EHEA_AER_RESET_MASK 0xFFFFFFFFFEFFFFFFULL
-#define EHEA_AERR_RESET_MASK 0xFFFFFFFFFFFFFFFFULL
-
-struct ehea_eqe {
- u64 entry;
-};
-
-#define ERROR_DATA_LENGTH EHEA_BMASK_IBM(52, 63)
-#define ERROR_DATA_TYPE EHEA_BMASK_IBM(0, 7)
-
-static inline void *hw_qeit_calc(struct hw_queue *queue, u64 q_offset)
-{
- struct ehea_page *current_page;
-
- if (q_offset >= queue->queue_length)
- q_offset -= queue->queue_length;
- current_page = (queue->queue_pages)[q_offset >> EHEA_PAGESHIFT];
- return ¤t_page->entries[q_offset & (EHEA_PAGESIZE - 1)];
-}
-
-static inline void *hw_qeit_get(struct hw_queue *queue)
-{
- return hw_qeit_calc(queue, queue->current_q_offset);
-}
-
-static inline void hw_qeit_inc(struct hw_queue *queue)
-{
- queue->current_q_offset += queue->qe_size;
- if (queue->current_q_offset >= queue->queue_length) {
- queue->current_q_offset = 0;
- /* toggle the valid flag */
- queue->toggle_state = (~queue->toggle_state) & 1;
- }
-}
-
-static inline void *hw_qeit_get_inc(struct hw_queue *queue)
-{
- void *retvalue = hw_qeit_get(queue);
- hw_qeit_inc(queue);
- return retvalue;
-}
-
-static inline void *hw_qeit_get_inc_valid(struct hw_queue *queue)
-{
- struct ehea_cqe *retvalue = hw_qeit_get(queue);
- u8 valid = retvalue->valid;
- void *pref;
-
- if ((valid >> 7) == (queue->toggle_state & 1)) {
- /* this is a good one */
- hw_qeit_inc(queue);
- pref = hw_qeit_calc(queue, queue->current_q_offset);
- prefetch(pref);
- prefetch(pref + 128);
- } else
- retvalue = NULL;
- return retvalue;
-}
-
-static inline void *hw_qeit_get_valid(struct hw_queue *queue)
-{
- struct ehea_cqe *retvalue = hw_qeit_get(queue);
- void *pref;
- u8 valid;
-
- pref = hw_qeit_calc(queue, queue->current_q_offset);
- prefetch(pref);
- prefetch(pref + 128);
- prefetch(pref + 256);
- valid = retvalue->valid;
- if (!((valid >> 7) == (queue->toggle_state & 1)))
- retvalue = NULL;
- return retvalue;
-}
-
-static inline void *hw_qeit_reset(struct hw_queue *queue)
-{
- queue->current_q_offset = 0;
- return hw_qeit_get(queue);
-}
-
-static inline void *hw_qeit_eq_get_inc(struct hw_queue *queue)
-{
- u64 last_entry_in_q = queue->queue_length - queue->qe_size;
- void *retvalue;
-
- retvalue = hw_qeit_get(queue);
- queue->current_q_offset += queue->qe_size;
- if (queue->current_q_offset > last_entry_in_q) {
- queue->current_q_offset = 0;
- queue->toggle_state = (~queue->toggle_state) & 1;
- }
- return retvalue;
-}
-
-static inline void *hw_eqit_eq_get_inc_valid(struct hw_queue *queue)
-{
- void *retvalue = hw_qeit_get(queue);
- u32 qe = *(u8 *)retvalue;
- if ((qe >> 7) == (queue->toggle_state & 1))
- hw_qeit_eq_get_inc(queue);
- else
- retvalue = NULL;
- return retvalue;
-}
-
-static inline struct ehea_rwqe *ehea_get_next_rwqe(struct ehea_qp *qp,
- int rq_nr)
-{
- struct hw_queue *queue;
-
- if (rq_nr == 1)
- queue = &qp->hw_rqueue1;
- else if (rq_nr == 2)
- queue = &qp->hw_rqueue2;
- else
- queue = &qp->hw_rqueue3;
-
- return hw_qeit_get_inc(queue);
-}
-
-static inline struct ehea_swqe *ehea_get_swqe(struct ehea_qp *my_qp,
- int *wqe_index)
-{
- struct hw_queue *queue = &my_qp->hw_squeue;
- struct ehea_swqe *wqe_p;
-
- *wqe_index = (queue->current_q_offset) >> (7 + EHEA_SG_SQ);
- wqe_p = hw_qeit_get_inc(&my_qp->hw_squeue);
-
- return wqe_p;
-}
-
-static inline void ehea_post_swqe(struct ehea_qp *my_qp, struct ehea_swqe *swqe)
-{
- iosync();
- ehea_update_sqa(my_qp, 1);
-}
-
-static inline struct ehea_cqe *ehea_poll_rq1(struct ehea_qp *qp, int *wqe_index)
-{
- struct hw_queue *queue = &qp->hw_rqueue1;
-
- *wqe_index = (queue->current_q_offset) >> (7 + EHEA_SG_RQ1);
- return hw_qeit_get_valid(queue);
-}
-
-static inline void ehea_inc_cq(struct ehea_cq *cq)
-{
- hw_qeit_inc(&cq->hw_queue);
-}
-
-static inline void ehea_inc_rq1(struct ehea_qp *qp)
-{
- hw_qeit_inc(&qp->hw_rqueue1);
-}
-
-static inline struct ehea_cqe *ehea_poll_cq(struct ehea_cq *my_cq)
-{
- return hw_qeit_get_valid(&my_cq->hw_queue);
-}
-
-#define EHEA_CQ_REGISTER_ORIG 0
-#define EHEA_EQ_REGISTER_ORIG 0
-
-enum ehea_eq_type {
- EHEA_EQ = 0, /* event queue */
- EHEA_NEQ /* notification event queue */
-};
-
-struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
- enum ehea_eq_type type,
- const u32 length, const u8 eqe_gen);
-
-int ehea_destroy_eq(struct ehea_eq *eq);
-
-struct ehea_eqe *ehea_poll_eq(struct ehea_eq *eq);
-
-struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter, int cqe,
- u64 eq_handle, u32 cq_token);
-
-int ehea_destroy_cq(struct ehea_cq *cq);
-
-struct ehea_qp *ehea_create_qp(struct ehea_adapter *adapter, u32 pd,
- struct ehea_qp_init_attr *init_attr);
-
-int ehea_destroy_qp(struct ehea_qp *qp);
-
-int ehea_reg_kernel_mr(struct ehea_adapter *adapter, struct ehea_mr *mr);
-
-int ehea_gen_smr(struct ehea_adapter *adapter, struct ehea_mr *old_mr,
- struct ehea_mr *shared_mr);
-
-int ehea_rem_mr(struct ehea_mr *mr);
-
-u64 ehea_error_data(struct ehea_adapter *adapter, u64 res_handle,
- u64 *aer, u64 *aerr);
-
-int ehea_add_sect_bmap(unsigned long pfn, unsigned long nr_pages);
-int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages);
-int ehea_create_busmap(void);
-void ehea_destroy_busmap(void);
-u64 ehea_map_vaddr(void *caddr);
-
-#endif /* __EHEA_QMR_H__ */
--
2.47.3
^ permalink raw reply related
* [PATCH net-next 2/2] powerpc: remove ehea driver references
From: David Christensen @ 2026-06-29 21:13 UTC (permalink / raw)
To: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: netdev, linuxppc-dev, linux-kernel, David Christensen
In-Reply-To: <20260629211343.3712775-1-drc@linux.ibm.com>
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.
Signed-off-by: David Christensen <drc@linux.ibm.com>
---
arch/powerpc/configs/ppc64_defconfig | 1 -
arch/powerpc/mm/mem.c | 6 ------
2 files changed, 7 deletions(-)
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index f795b74602ec..1eb8e3457e8b 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -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
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 4c1afab91996..b617b69452cd 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -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
^ permalink raw reply related
* [PATCH net-next 0/2] net: remove the orphaned IBM eHEA driver
From: David Christensen @ 2026-06-29 21:13 UTC (permalink / raw)
To: David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michael Ellerman, Nicholas Piggin, Christophe Leroy
Cc: netdev, linuxppc-dev, linux-kernel, David Christensen
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
--
2.47.3
^ permalink raw reply
* Re: [PATCH net] netfilter: nf_nat_masquerade: recalculate TCP TS offset when port is randomized
From: kernel test robot @ 2026-06-29 21:10 UTC (permalink / raw)
To: xietangxin, Pablo Neira Ayuso, Florian Westphal, Phil Sutter,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman
Cc: oe-kbuild-all, gaoxingwang, huyizhen, netfilter-devel, coreteam,
netdev, linux-kernel, stable
In-Reply-To: <20260629093408.3927103-1-xietangxin@h-partners.com>
Hi xietangxin,
kernel test robot noticed the following build errors:
[auto build test ERROR on net/main]
url: https://github.com/intel-lab-lkp/linux/commits/xietangxin/netfilter-nf_nat_masquerade-recalculate-TCP-TS-offset-when-port-is-randomized/20260629-173037
base: net/main
patch link: https://lore.kernel.org/r/20260629093408.3927103-1-xietangxin%40h-partners.com
patch subject: [PATCH net] netfilter: nf_nat_masquerade: recalculate TCP TS offset when port is randomized
config: arm-randconfig-004-20260630 (https://download.01.org/0day-ci/archive/20260630/202606300522.3jMZ6dLb-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 8.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260630/202606300522.3jMZ6dLb-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202606300522.3jMZ6dLb-lkp@intel.com/
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "secure_tcpv6_seq_and_ts_off" [net/netfilter/nf_nat.ko] undefined!
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply
* [syzbot] [usb?] KASAN: slab-use-after-free Read in uea_upload_pre_firmware
From: syzbot @ 2026-06-29 21:09 UTC (permalink / raw)
To: 3chas3, castet.matthieu, gregkh, linux-atm-general, linux-kernel,
linux-usb, netdev, stf_xl, syzkaller-bugs
Hello,
syzbot found the following issue on:
HEAD commit: 3d5670d672ae Add linux-next specific files for 20260626
git tree: linux-next
console output: https://syzkaller.appspot.com/x/log.txt?x=10b76dfe580000
kernel config: https://syzkaller.appspot.com/x/.config?x=2bb8183b2d472f18
dashboard link: https://syzkaller.appspot.com/bug?extid=3d45d763d18796f97412
compiler: Debian clang version 22.1.8 (++20260613092233+e80beda6e255-1~exp1~20260613092250.77), Debian LLD 22.1.8
syz repro: https://syzkaller.appspot.com/x/repro.syz?x=15fa0e1c580000
C reproducer: https://syzkaller.appspot.com/x/repro.c?x=13519391580000
Downloadable assets:
disk image: https://storage.googleapis.com/syzbot-assets/a96151aa0055/disk-3d5670d6.raw.xz
vmlinux: https://storage.googleapis.com/syzbot-assets/cdb70a1a6c6c/vmlinux-3d5670d6.xz
kernel image: https://storage.googleapis.com/syzbot-assets/3ffb9df12cc1/bzImage-3d5670d6.xz
IMPORTANT: if you fix the issue, please add the following tag to the commit:
Reported-by: syzbot+3d45d763d18796f97412@syzkaller.appspotmail.com
==================================================================
BUG: KASAN: slab-use-after-free in __intf_to_usbdev include/linux/usb.h:752 [inline]
BUG: KASAN: slab-use-after-free in uea_upload_pre_firmware+0x8d/0x640 drivers/usb/atm/ueagle-atm.c:598
Read of size 8 at addr ffff88802b0710b8 by task kworker/0:2/1664
CPU: 0 UID: 0 PID: 1664 Comm: kworker/0:2 Not tainted syzkaller #0 PREEMPT_{RT,(full)}
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/09/2026
Workqueue: events request_firmware_work_func
Call Trace:
<TASK>
dump_stack_lvl+0xe8/0x150 lib/dump_stack.c:120
print_address_description+0x55/0x1e0 mm/kasan/report.c:378
print_report+0x58/0x70 mm/kasan/report.c:482
kasan_report+0x117/0x150 mm/kasan/report.c:595
__intf_to_usbdev include/linux/usb.h:752 [inline]
uea_upload_pre_firmware+0x8d/0x640 drivers/usb/atm/ueagle-atm.c:598
request_firmware_work_func+0xf7/0x2d0 drivers/base/firmware_loader/main.c:1164
process_one_work+0x93a/0x12b0 kernel/workqueue.c:3326
process_scheduled_works kernel/workqueue.c:3409 [inline]
worker_thread+0xb05/0x10d0 kernel/workqueue.c:3490
kthread+0x388/0x470 kernel/kthread.c:436
ret_from_fork+0x514/0xb70 arch/x86/kernel/process.c:158
ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245
</TASK>
Allocated by task 5937:
kasan_save_stack mm/kasan/common.c:57 [inline]
kasan_save_track+0x3e/0x80 mm/kasan/common.c:78
poison_kmalloc_redzone mm/kasan/common.c:398 [inline]
__kasan_kmalloc+0x93/0xb0 mm/kasan/common.c:415
kasan_kmalloc include/linux/kasan.h:263 [inline]
__kmalloc_cache_noprof+0x3d2/0x6b0 mm/slub.c:5515
_kmalloc_noprof include/linux/slab.h:969 [inline]
_kzalloc_noprof include/linux/slab.h:1290 [inline]
usb_set_configuration+0x3cc/0x2180 drivers/usb/core/message.c:2096
usb_generic_driver_probe+0x8d/0x150 drivers/usb/core/generic.c:250
usb_probe_device+0x1c3/0x3b0 drivers/usb/core/driver.c:291
call_driver_probe drivers/base/dd.c:-1 [inline]
really_probe+0x254/0xae0 drivers/base/dd.c:706
__driver_probe_device+0x1e8/0x360 drivers/base/dd.c:868
driver_probe_device+0x4f/0x240 drivers/base/dd.c:898
__device_attach_driver+0x270/0x410 drivers/base/dd.c:1026
bus_for_each_drv+0x25b/0x2f0 drivers/base/bus.c:500
__device_attach+0x2c7/0x450 drivers/base/dd.c:1098
device_initial_probe+0xa1/0xd0 drivers/base/dd.c:1153
bus_probe_device+0x12d/0x220 drivers/base/bus.c:620
device_add+0x7d7/0xb80 drivers/base/core.c:3772
usb_new_device+0x98d/0x1610 drivers/usb/core/hub.c:2695
hub_port_connect drivers/usb/core/hub.c:5567 [inline]
hub_port_connect_change drivers/usb/core/hub.c:5707 [inline]
port_event drivers/usb/core/hub.c:5871 [inline]
hub_event+0x28cf/0x4cf0 drivers/usb/core/hub.c:5953
---
This report is generated by a bot. It may contain errors.
See https://goo.gl/tpsmEJ for more information about syzbot.
syzbot engineers can be reached at syzkaller@googlegroups.com.
syzbot will keep track of this issue. See:
https://goo.gl/tpsmEJ#status for how to communicate with syzbot.
If the report is already addressed, let syzbot know by replying with:
#syz fix: exact-commit-title
If you want syzbot to run the reproducer, reply with:
#syz test: git://repo/address.git branch-or-commit-hash
If you attach or paste a git patch, syzbot will apply it before testing.
If you want to overwrite report's subsystems, reply with:
#syz set subsystems: new-subsystem
(See the list of subsystem names on the web dashboard)
If the report is a duplicate of another one, reply with:
#syz dup: exact-subject-of-another-report
If you want to undo deduplication, reply with:
#syz undup
^ permalink raw reply
* RE: [PATCH net] net: qualcomm: rmnet: validate MAP frame length before ingress parsing
From: subash.a.kasiviswanathan @ 2026-06-29 20:19 UTC (permalink / raw)
To: 'Xiang Mei', sean.tranchetti, netdev
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, linux-kernel,
bestswngs
In-Reply-To: <20260628075205.62280-1-xmei5@asu.edu>
> -----Original Message-----
> From: Xiang Mei <xmei5@asu.edu>
> Each guard uses pskb_may_pull() before its read. The MAPv4 check uses
> ntohs(pkt_len) (== payload + pad) directly rather than the derived len, so
it is
> unaffected by the u16 underflow in len when pad > pkt_len. Well-formed
> frames always carry the header/trailer they declare, so only malformed
> packets are dropped; this mirrors the length check rmnet_map_deaggregate()
> already performs on the deaggregation path.
>
> @@ -61,6 +61,9 @@ __rmnet_map_ingress_handler(struct sk_buff *skb,
> u16 len, pad;
> u8 mux_id;
>
> + if (!pskb_may_pull(skb, sizeof(*map_header)))
> + goto free_skb;
> +
> if (map_header->flags & MAP_CMD_FLAG) {
> /* Packet contains a MAP command (not data) */
> if (port->data_format &
> RMNET_FLAGS_INGRESS_MAP_COMMANDS) @@ -84,11 +87,19 @@
> __rmnet_map_ingress_handler(struct sk_buff *skb,
>
> if ((port->data_format & RMNET_FLAGS_INGRESS_MAP_CKSUMV5)
> &&
> (map_header->flags & MAP_NEXT_HEADER_FLAG)) {
> + if (!pskb_may_pull(skb, sizeof(*map_header) +
> + sizeof(struct
> rmnet_map_v5_csum_header)))
> + goto free_skb;
> if (rmnet_map_process_next_hdr_packet(skb, len))
> goto free_skb;
> skb_pull(skb, sizeof(*map_header));
> rmnet_set_skb_proto(skb);
> } else {
> + if (port->data_format &
> RMNET_FLAGS_INGRESS_MAP_CKSUMV4 &&
> + !pskb_may_pull(skb, sizeof(*map_header) +
> + ntohs(map_header->pkt_len) +
> + sizeof(struct
rmnet_map_dl_csum_trailer)))
> + goto free_skb;
> /* Subtract MAP header */
> skb_pull(skb, sizeof(*map_header));
> rmnet_set_skb_proto(skb);
> --
> 2.43.0
The patch seems fine at a high level. However, it ends up adding duplicate
checks for the deagg path which is the commonly used path.
Perhaps you can try something similar to the following which adds all the
relevant checks of the deagg path to the no agg path as well.
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
index 9f3479500f85..086874b673c6 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
@@ -126,7 +126,8 @@ rmnet_map_ingress_handler(struct sk_buff *skb,
consume_skb(skb);
} else {
- __rmnet_map_ingress_handler(skb, port);
+ if (rmnet_map_validate_packet_len(skb, port))
+ __rmnet_map_ingress_handler(skb, port);
}
}
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
index b70284095568..46495b7966f3 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h
@@ -59,5 +59,7 @@ void rmnet_map_tx_aggregate_init(struct rmnet_port *port);
void rmnet_map_tx_aggregate_exit(struct rmnet_port *port);
void rmnet_map_update_ul_agg_config(struct rmnet_port *port, u32 size,
u32 count, u32 time);
+u32 rmnet_map_validate_packet_len(struct sk_buff *skb,
+ struct rmnet_port *port);
#endif /* _RMNET_MAP_H_ */
diff --git a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
index 8b4640c5d61e..1729b73249f7 100644
--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
+++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c
@@ -333,24 +333,16 @@ struct rmnet_map_header
*rmnet_map_add_map_header(struct sk_buff *skb,
return map_header;
}
-/* Deaggregates a single packet
- * A whole new buffer is allocated for each portion of an aggregated frame.
- * Caller should keep calling deaggregate() on the source skb until 0 is
- * returned, indicating that there are no more packets to deaggregate.
Caller
- * is responsible for freeing the original skb.
- */
-struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,
- struct rmnet_port *port)
-{
+u32 rmnet_map_validate_packet_len(struct sk_buff *skb,
+ struct rmnet_port *port) {
struct rmnet_map_v5_csum_header *next_hdr = NULL;
struct rmnet_map_header *maph;
void *data = skb->data;
- struct sk_buff *skbn;
u8 nexthdr_type;
u32 packet_len;
if (skb->len == 0)
- return NULL;
+ goto err1;
maph = (struct rmnet_map_header *)skb->data;
packet_len = ntohs(maph->pkt_len) + sizeof(*maph);
@@ -364,24 +356,48 @@ struct sk_buff *rmnet_map_deaggregate(struct sk_buff
*skb,
next_hdr = data + sizeof(*maph);
else
/* Mapv5 data pkt without csum hdr is
invalid */
- return NULL;
+ goto err1;
}
}
if (((int)skb->len - (int)packet_len) < 0)
- return NULL;
+ goto err1;
/* Some hardware can send us empty frames. Catch them */
if (!maph->pkt_len)
- return NULL;
+ goto err1;
if (next_hdr) {
nexthdr_type = u8_get_bits(next_hdr->header_info,
MAPV5_HDRINFO_HDR_TYPE_FMASK);
if (nexthdr_type != RMNET_MAP_HEADER_TYPE_CSUM_OFFLOAD)
- return NULL;
+ goto err1;
}
+ goto err0;
+
+err1:
+ packet_len = 0;
+err0:
+ return packet_len;
+}
+
+/* Deaggregates a single packet
+ * A whole new buffer is allocated for each portion of an aggregated frame.
+ * Caller should keep calling deaggregate() on the source skb until 0 is
+ * returned, indicating that there are no more packets to deaggregate.
Caller
+ * is responsible for freeing the original skb.
+ */
+struct sk_buff *rmnet_map_deaggregate(struct sk_buff *skb,
+ struct rmnet_port *port)
+{
+ struct sk_buff *skbn;
+ u32 packet_len;
+
+ packet_len = rmnet_map_validate_packet_len(skb, port);
+ if (!packet_len)
+ return NULL;
+
skbn = alloc_skb(packet_len + RMNET_MAP_DEAGGR_SPACING, GFP_ATOMIC);
if (!skbn)
return NULL;
^ permalink raw reply related
* [PATCH net v2 1/2] pds_core: fix deadlock between reset thread and remove
From: Nikhil P. Rao @ 2026-06-29 20:03 UTC (permalink / raw)
To: netdev
Cc: kuba, brett.creeley, eric.joyner, andrew+netdev, davem, edumazet,
pabeni, Nikhil P. Rao
In-Reply-To: <20260629200358.2626129-1-nikhil.rao@amd.com>
pci_reset_function() acquires device_lock before performing the reset.
pdsc_remove() is called by the PCI core with device_lock already held.
If pdsc_pci_reset_thread() is running when pdsc_remove() is called,
destroy_workqueue() will block waiting for the work to complete, while
the work is blocked waiting for device_lock - deadlock.
Use pci_try_reset_function() which uses pci_dev_trylock() internally.
This acquires both the device lock and the PCI config access lock
without blocking - if either lock is contended, it returns -EAGAIN
immediately. This avoids the deadlock while also ensuring proper
config space access serialization during the reset.
The pci_dev_get/put calls are also removed as they were unnecessary -
the driver-owned workqueue is destroyed in pdsc_remove(), guaranteeing
the work completes before remove returns. The PCI core holds its
reference to pci_dev throughout the entire unbind sequence.
Fixes: 81665adf25d2 ("pds_core: Fix pdsc_check_pci_health function to use work thread")
Reported-by: Sashiko AI Review <sashiko-bot@kernel.org>
Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com>
---
drivers/net/ethernet/amd/pds_core/core.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
index 38a2446571af..1074a022a52f 100644
--- a/drivers/net/ethernet/amd/pds_core/core.c
+++ b/drivers/net/ethernet/amd/pds_core/core.c
@@ -606,9 +606,10 @@ void pdsc_pci_reset_thread(struct work_struct *work)
struct pdsc *pdsc = container_of(work, struct pdsc, pci_reset_work);
struct pci_dev *pdev = pdsc->pdev;
- pci_dev_get(pdev);
- pci_reset_function(pdev);
- pci_dev_put(pdev);
+ /* Use try variant to avoid deadlock with pdsc_remove().
+ * If lock is contended, the watchdog timer will retry.
+ */
+ pci_try_reset_function(pdev);
}
static void pdsc_check_pci_health(struct pdsc *pdsc)
--
2.43.0
^ permalink raw reply related
* [PATCH net v2 0/2] pds_core: fix use-after-free on workqueue during remove
From: Nikhil P. Rao @ 2026-06-29 20:03 UTC (permalink / raw)
To: netdev
Cc: kuba, brett.creeley, eric.joyner, andrew+netdev, davem, edumazet,
pabeni, Nikhil P. Rao
This series fixes a use-after-free on the workqueue during driver remove.
Patch 1 fixes a pre-existing deadlock between the PCI reset worker and
pdsc_remove() that was identified during review of v1.
Patch 2 is the reworked UAF fix that moves destroy_workqueue() after
pdsc_teardown() and adds proper work synchronization.
v2:
- Fix deadlock between pci_reset_thread and remove (new patch 1/2)
found by sashiko AI review of v1
- Rework UAF fix: move destroy_workqueue() after pdsc_teardown()
instead of setting wq to NULL (addresses NULL deref found by sashiko)
- Add cancel_work_sync() after free_irq() to drain ISR-queued work
- Reorder adminqcq/notifyqcq freeing to avoid accessing freed notifyqcq
v1: https://lore.kernel.org/netdev/20260610025952.196470-1-nikhil.rao@amd.com/
Nikhil P. Rao (2):
pds_core: fix deadlock between reset thread and remove
pds_core: fix use-after-free on workqueue during remove
drivers/net/ethernet/amd/pds_core/adminq.c | 15 +++++++++++----
drivers/net/ethernet/amd/pds_core/core.c | 21 ++++++++++++++-------
drivers/net/ethernet/amd/pds_core/main.c | 5 +++--
3 files changed, 28 insertions(+), 13 deletions(-)
--
2.43.0
^ permalink raw reply
* [PATCH net v2 2/2] pds_core: fix use-after-free on workqueue during remove
From: Nikhil P. Rao @ 2026-06-29 20:03 UTC (permalink / raw)
To: netdev
Cc: kuba, brett.creeley, eric.joyner, andrew+netdev, davem, edumazet,
pabeni, Nikhil P. Rao
In-Reply-To: <20260629200358.2626129-1-nikhil.rao@amd.com>
In pdsc_remove(), the workqueue is destroyed before pdsc_teardown()
is called. This ordering allows two paths to queue work on the
destroyed workqueue:
1. If pdsc_teardown() -> pdsc_devcmd_reset() times out, the error
path in pdsc_devcmd_locked() queues health_work.
2. A NotifyQ event can trigger the ISR and queue work before free_irq()
is called in pdsc_teardown().
Fix problem 1 by moving destroy_workqueue() after pdsc_teardown(),
ensuring the workqueue exists when health_work may be queued during
teardown.
Fix problem 2 by adding cancel_work_sync() in pdsc_qcq_free() after
free_irq(). This ensures no new ISR can queue work, and any
already-queued work is drained before freeing the qcq. Work draining
during teardown may race with intx becoming invalid, so skip returning
interrupt credits if intx is no longer assigned.
Also change pdsc_core_uninit() to free adminqcq before notifyqcq,
since adminqcq's work accesses notifyqcq via pdsc_process_notifyq().
This ensures notifyqcq remains valid while adminqcq's work drains.
Fixes: 01ba61b55b20 ("pds_core: Add adminq processing and commands")
Reported-by: Sashiko AI Review <sashiko-bot@kernel.org>
Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com>
---
drivers/net/ethernet/amd/pds_core/adminq.c | 15 +++++++++++----
drivers/net/ethernet/amd/pds_core/core.c | 14 ++++++++++----
drivers/net/ethernet/amd/pds_core/main.c | 5 +++--
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ethernet/amd/pds_core/adminq.c
index 097bb092bdb8..c0d9b7e6b8c3 100644
--- a/drivers/net/ethernet/amd/pds_core/adminq.c
+++ b/drivers/net/ethernet/amd/pds_core/adminq.c
@@ -77,6 +77,7 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq)
unsigned long irqflags;
int nq_work = 0;
int aq_work = 0;
+ int intx;
/* Don't process AdminQ when it's not up */
if (!pdsc_adminq_inc_if_up(pdsc)) {
@@ -121,10 +122,16 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq)
qcq->accum_work += aq_work;
credits:
- /* Return the interrupt credits, one for each completion */
- pds_core_intr_credits(&pdsc->intr_ctrl[qcq->intx],
- nq_work + aq_work,
- PDS_CORE_INTR_CRED_REARM);
+ /* Return the interrupt credits, one for each completion.
+ * Use READ_ONCE to get a single consistent copy of intx since it can
+ * be set to PDS_CORE_INTR_INDEX_NOT_ASSIGNED concurrently during
+ * teardown, and skip the credits if so.
+ */
+ intx = READ_ONCE(qcq->intx);
+ if (intx != PDS_CORE_INTR_INDEX_NOT_ASSIGNED)
+ pds_core_intr_credits(&pdsc->intr_ctrl[intx],
+ nq_work + aq_work,
+ PDS_CORE_INTR_CRED_REARM);
refcount_dec(&pdsc->adminq_refcnt);
}
diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c
index 1074a022a52f..570c0cd7339e 100644
--- a/drivers/net/ethernet/amd/pds_core/core.c
+++ b/drivers/net/ethernet/amd/pds_core/core.c
@@ -110,7 +110,8 @@ static void pdsc_qcq_intr_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)
return;
pdsc_intr_free(pdsc, qcq->intx);
- qcq->intx = PDS_CORE_INTR_INDEX_NOT_ASSIGNED;
+ /* Pairs with READ_ONCE in pdsc_process_adminq() */
+ WRITE_ONCE(qcq->intx, PDS_CORE_INTR_INDEX_NOT_ASSIGNED);
}
static int pdsc_qcq_intr_alloc(struct pdsc *pdsc, struct pdsc_qcq *qcq)
@@ -145,6 +146,10 @@ void pdsc_qcq_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)
pdsc_qcq_intr_free(pdsc, qcq);
+ /* Drain any work queued by ISR before it was freed above */
+ if (qcq->work.func)
+ cancel_work_sync(&qcq->work);
+
if (qcq->q_base)
dma_free_coherent(dev, qcq->q_size,
qcq->q_base, qcq->q_base_pa);
@@ -304,8 +309,11 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,
static void pdsc_core_uninit(struct pdsc *pdsc)
{
- pdsc_qcq_free(pdsc, &pdsc->notifyqcq);
+ /* Free adminqcq first: its work accesses notifyqcq, so we must
+ * disable its IRQ and drain its work before freeing notifyqcq.
+ */
pdsc_qcq_free(pdsc, &pdsc->adminqcq);
+ pdsc_qcq_free(pdsc, &pdsc->notifyqcq);
if (pdsc->kern_dbpage) {
iounmap(pdsc->kern_dbpage);
@@ -479,8 +487,6 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing)
{
if (!pdsc->pdev->is_virtfn)
pdsc_devcmd_reset(pdsc);
- if (pdsc->adminqcq.work.func)
- cancel_work_sync(&pdsc->adminqcq.work);
pci_clear_master(pdsc->pdev);
diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c
index 22db78343eb0..638b9c7a509d 100644
--- a/drivers/net/ethernet/amd/pds_core/main.c
+++ b/drivers/net/ethernet/amd/pds_core/main.c
@@ -435,8 +435,6 @@ static void pdsc_remove(struct pci_dev *pdev)
pdsc_auxbus_dev_del(pdsc, pdsc, &pdsc->padev);
timer_shutdown_sync(&pdsc->wdtimer);
- if (pdsc->wq)
- destroy_workqueue(pdsc->wq);
mutex_lock(&pdsc->config_lock);
set_bit(PDSC_S_STOPPING_DRIVER, &pdsc->state);
@@ -444,6 +442,9 @@ static void pdsc_remove(struct pci_dev *pdev)
pdsc_stop(pdsc);
pdsc_teardown(pdsc, PDSC_TEARDOWN_REMOVING);
mutex_unlock(&pdsc->config_lock);
+
+ if (pdsc->wq)
+ destroy_workqueue(pdsc->wq);
mutex_destroy(&pdsc->config_lock);
mutex_destroy(&pdsc->devcmd_lock);
--
2.43.0
^ permalink raw reply related
* [PATCH net-next v3 5/5] selftest: Add tests for useful handling of LSM denials on SCM_RIGHTS
From: Jori Koolstra @ 2026-06-29 19:43 UTC (permalink / raw)
To: Christian Brauner, Aleksa Sarai, Kuniyuki Iwashima,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman
Cc: netdev, linux-fsdevel, linux-kernel, Jori Koolstra
In-Reply-To: <20260629194327.2270798-1-jkoolstra@xs4all.nl>
Tests SCM_RIGHTS fd passing on a socket with the new socket option
SO_RIGHTS_NOTRUNC turned on.
The test uses the following Smack labels:
"Sender" - label for the sending process
"Receiver" - label for the receiving process
"SecretX" - labels for the files being passed
Socket communication (Sender <-> Receiver) is always allowed.
The tests control whether Receiver can access "SecretX"-labeled fds.
When the LSM blocks an fd, we should see a sentinel that corresponds to
the error returned by the LSM, such as -EACCES.
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
---
.../testing/selftests/net/af_unix/.gitignore | 3 +
tools/testing/selftests/net/af_unix/Makefile | 4 +
.../selftests/net/af_unix/scm_rights_denial.c | 20 ++
.../selftests/net/af_unix/scm_rights_denial.h | 38 ++++
.../net/af_unix/scm_rights_denial.sh | 174 ++++++++++++++++
.../net/af_unix/scm_rights_denial_receiver.c | 195 ++++++++++++++++++
.../net/af_unix/scm_rights_denial_sender.c | 126 +++++++++++
7 files changed, 560 insertions(+)
create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial.c
create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial.h
create mode 100755 tools/testing/selftests/net/af_unix/scm_rights_denial.sh
create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_receiver.c
create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_sender.c
diff --git a/tools/testing/selftests/net/af_unix/.gitignore b/tools/testing/selftests/net/af_unix/.gitignore
index 240b26740c9e..2e14b025a6e8 100644
--- a/tools/testing/selftests/net/af_unix/.gitignore
+++ b/tools/testing/selftests/net/af_unix/.gitignore
@@ -3,6 +3,9 @@ msg_oob
scm_inq
scm_pidfd
scm_rights
+scm_rights_denial
+scm_rights_denial_receiver
+scm_rights_denial_sender
so_peek_off
unix_connect
unix_connreset
diff --git a/tools/testing/selftests/net/af_unix/Makefile b/tools/testing/selftests/net/af_unix/Makefile
index 4c0375e28bbe..86c5588caf28 100644
--- a/tools/testing/selftests/net/af_unix/Makefile
+++ b/tools/testing/selftests/net/af_unix/Makefile
@@ -11,9 +11,13 @@ TEST_GEN_PROGS := \
scm_inq \
scm_pidfd \
scm_rights \
+ scm_rights_denial \
so_peek_off \
unix_connect \
unix_connreset \
# end of TEST_GEN_PROGS
+TEST_GEN_FILES := scm_rights_denial_sender scm_rights_denial_receiver
+TEST_FILES := scm_rights_denial.sh
+
include ../../lib.mk
diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial.c b/tools/testing/selftests/net/af_unix/scm_rights_denial.c
new file mode 100644
index 000000000000..3566f1d28b9a
--- /dev/null
+++ b/tools/testing/selftests/net/af_unix/scm_rights_denial.c
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <stdlib.h>
+#include <sys/wait.h>
+
+#include "kselftest_harness.h"
+
+TEST(scm_rights_denial)
+{
+ int ret = system("./scm_rights_denial.sh");
+
+ ASSERT_NE(-1, ret);
+ ASSERT_TRUE(WIFEXITED(ret));
+
+ if (WEXITSTATUS(ret) == KSFT_SKIP)
+ SKIP(return, "scm_rights_denial.sh prerequisites not met");
+
+ EXPECT_EQ(0, WEXITSTATUS(ret));
+}
+
+TEST_HARNESS_MAIN
diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial.h b/tools/testing/selftests/net/af_unix/scm_rights_denial.h
new file mode 100644
index 000000000000..2ecdf2b8b973
--- /dev/null
+++ b/tools/testing/selftests/net/af_unix/scm_rights_denial.h
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifndef SO_RIGHTS_NOTRUNC
+#define SO_RIGHTS_NOTRUNC 85
+#endif
+
+#define CMSG_IS_SCM_RIGHTS(cmsg) ({ \
+ typeof(cmsg) _cmsg = (cmsg); \
+ _cmsg && \
+ _cmsg->cmsg_level == SOL_SOCKET && \
+ _cmsg->cmsg_type == SCM_RIGHTS; \
+})
+
+#define MIN(a, b) ({ \
+ typeof(a) _a = (a); \
+ typeof(b) _b = (b); \
+ _a < _b ? _a : _b; \
+})
+
+#define MAX_FDS 10
+
+static inline int read_current_label(char *label, size_t size)
+{
+ int fd = open("/proc/self/attr/current", O_RDONLY);
+ if (fd < 0)
+ return fd;
+
+ ssize_t r = read(fd, label, size - 1);
+ close(fd);
+ if (r < 0)
+ return r;
+
+ label[r] = '\0';
+
+ return 0;
+}
diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial.sh b/tools/testing/selftests/net/af_unix/scm_rights_denial.sh
new file mode 100755
index 000000000000..74cafe1dfc62
--- /dev/null
+++ b/tools/testing/selftests/net/af_unix/scm_rights_denial.sh
@@ -0,0 +1,174 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+#
+# scm_rights_denial.sh - Test SCM_RIGHTS fd passing using Smack LSM blocking
+#
+# Must be run as root on a kernel with Smack enabled (security=smack).
+# Requires: capsh (libcap), setfattr/getfattr (attr)
+#
+# We use the following Smack labels:
+# "Sender" - label for the sending process
+# "Receiver" - label for the receiving process
+# "SecretX" - labels for the files being passed
+#
+# Socket communication (Sender <-> Receiver) is always allowed.
+# The tests control whether Receiver can access "SecretX"-labeled fds.
+#
+
+set -e
+
+readonly KSFT_SKIP=4
+
+readonly SENDER="./scm_rights_denial_sender"
+readonly RECEIVER="./scm_rights_denial_receiver"
+
+readonly TESTDIR="$(mktemp -d)"
+readonly SOCK="$TESTDIR/scm_test.sock"
+readonly TESTFILE1="$TESTDIR/secret_1"
+readonly TESTFILE2="$TESTDIR/secret_2"
+
+trap 'rm -rf "$TESTDIR"' EXIT
+
+run_tests() {
+
+ preflight
+ setup
+
+ run_test "TEST 1" \
+ "Receiver should NOT have access to Secret1." \
+ "Receiver Secret1 ---
+Receiver Secret2 ---" \
+ "$TESTFILE1" \
+ "BLOCKED"
+
+ run_test "TEST 2" \
+ "Receiver should have access to Secret1." \
+ "Receiver Secret1 r--
+Receiver Secret2 ---" \
+ "$TESTFILE1" \
+ "PASSED"
+
+ run_test "TEST 3" \
+ "Receiver should have access to Secret2, but NOT Secret1." \
+ "Receiver Secret1 ---
+Receiver Secret2 r--" \
+ "$TESTFILE1 $TESTFILE2" \
+ "BLOCKED PASSED"
+}
+
+run_test() {
+ local name="$1"
+ local description="$2"
+ local rules="$3"
+ local files="$4"
+ local expected="$5"
+
+ echo ""
+ echo "$name: $description"
+ echo "Rules:"
+ echo "$rules"
+ echo "Expected: $expected"
+ echo ""
+
+ while IFS= read -r rule; do
+ [ -n "$rule" ] && echo "$rule" > /sys/fs/smackfs/load2
+ done <<< "$rules"
+
+ local output status last_line
+ output=$(send_fds "$SOCK" $files)
+ status=$?
+ echo "$output"
+ last_line=$(echo "$output" | tail -n 1 | xargs)
+
+ if [ "$status" -ne 0 ]; then
+ echo "TEST FAILED: receiver returned $status"
+ return 1
+ fi
+
+ if [[ "$last_line" == "$expected" ]]; then
+ echo "TEST PASSED: outcome was $expected as expected"
+ return 0
+ else
+ echo "TEST FAILED: expected $expected, got '$last_line'"
+ return 1
+ fi
+}
+
+setup() {
+
+ printf "Secret 1" > "$TESTFILE1"
+ printf "Secret 2" > "$TESTFILE2"
+
+ setfattr -n security.SMACK64 -v "Secret1" "$TESTFILE1"
+ setfattr -n security.SMACK64 -v "Secret2" "$TESTFILE2"
+ setfattr -n security.SMACK64 -v "Tmp" /tmp
+ setfattr -n security.SMACK64 -v "Tmp" "$TESTDIR"
+
+ echo "Sender Receiver -w-" > /sys/fs/smackfs/load2
+ echo "Receiver Sender -w-" > /sys/fs/smackfs/load2
+ echo "Sender Tmp rwx" > /sys/fs/smackfs/load2
+ echo "Receiver Tmp rwx" > /sys/fs/smackfs/load2
+ echo "Sender Secret1 r--" > /sys/fs/smackfs/load2
+ echo "Sender Secret2 r--" > /sys/fs/smackfs/load2
+}
+
+send_fds() {
+
+ local sk="$1"
+ shift
+ local files="$*"
+
+ (
+ echo "Receiver" > /proc/self/attr/current
+ exec capsh --drop=cap_mac_override,cap_mac_admin -- -c "$RECEIVER $sk"
+ ) &
+ local recv_pid=$!
+ sleep 1
+
+ (
+ echo "Sender" > /proc/self/attr/current
+ exec capsh --drop=cap_mac_override,cap_mac_admin -- -c "$SENDER $sk $files"
+ ) || true
+
+ local recv_status=0
+ wait "$recv_pid" || recv_status=$?
+
+ if [ "$recv_status" -ne 0 ]; then
+ echo "receiver exited with $recv_status"
+ fi
+ return "$recv_status"
+}
+
+preflight() {
+
+ if [ "$(id -u)" -ne 0 ]; then
+ echo "SKIP: must be run as root"
+ exit $KSFT_SKIP
+ fi
+
+ if ! grep -q smack /sys/kernel/security/lsm 2>/dev/null; then
+ echo "SKIP: Smack is not active"
+ echo " Check: cat /sys/kernel/security/lsm"
+ echo " Boot with: security=smack"
+ exit $KSFT_SKIP
+ fi
+
+ if ! mountpoint -q /sys/fs/smackfs 2>/dev/null; then
+ echo "Mounting smackfs..."
+ mount -t smackfs smackfs /sys/fs/smackfs
+ fi
+
+ if ! command -v capsh &>/dev/null; then
+ echo "SKIP: capsh not found (install libcap)"
+ exit $KSFT_SKIP
+ fi
+
+ if [ ! -x "$SENDER" ] || [ ! -x "$RECEIVER" ]; then
+ echo "ERROR: $SENDER / $RECEIVER not built (run 'make' first)"
+ exit 1
+ fi
+
+}
+
+run_tests
diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial_receiver.c b/tools/testing/selftests/net/af_unix/scm_rights_denial_receiver.c
new file mode 100644
index 000000000000..2965980f96ef
--- /dev/null
+++ b/tools/testing/selftests/net/af_unix/scm_rights_denial_receiver.c
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/*
+ * scm_rights_denial_receiver.c - Receive fds over a Unix socket via SCM_RIGHTS
+ *
+ * Usage: ./scm_rights_denial_receiver <socket_path>
+ *
+ * Listens on the given Unix socket path, accepts a connection, and
+ * attempts to receive file descriptors via SCM_RIGHTS. Reports
+ * whether the fds were delivered or blocked.
+ *
+ * Used for testing LSM (Smack) blocking of fd passing.
+ */
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/xattr.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include "scm_rights_denial.h"
+
+#define RECV_LOG(fmt, ...) printf("receiver: " fmt, ##__VA_ARGS__)
+#define RECV_ERR(fmt, ...) fprintf(stderr, "receiver: " fmt, ##__VA_ARGS__)
+
+static int recv_fds(int sock, int *fds)
+{
+ char buf[1];
+ char ctrl[CMSG_SPACE(MAX_FDS * sizeof(int))];
+
+ struct iovec iov = {
+ .iov_base = buf,
+ .iov_len = sizeof(buf),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = ctrl,
+ .msg_controllen = sizeof(ctrl),
+ };
+
+ ssize_t bytes_read = recvmsg(sock, &msg, 0);
+ if (bytes_read < 0) {
+ perror("receiver: recvmsg");
+ return -1;
+ }
+ if (bytes_read == 0) {
+ RECV_ERR("connection closed, no data received\n");
+ return -1;
+ }
+
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+ if (!CMSG_IS_SCM_RIGHTS(cmsg)) {
+ RECV_ERR("no SCM_RIGHTS in control message\n");
+ return -1;
+ }
+
+ int num_fd_slots = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
+ memcpy(fds, CMSG_DATA(cmsg), num_fd_slots * sizeof(int));
+
+ RECV_LOG("got %d fd slot(s):", num_fd_slots);
+ for (int i = 0; i < num_fd_slots ; i++) {
+ if (fds[i] < 0)
+ printf(" %s", strerrorname_np(-fds[i]));
+ else
+ printf(" %d", fds[i]);
+ }
+ putchar('\n');
+
+ return num_fd_slots;
+}
+
+static inline int print_current_label(void)
+{
+ char label[256];
+ if (!read_current_label(label, sizeof(label))) {
+ RECV_LOG("running with Smack label '%s'\n", label);
+ return 0;
+ }
+ return -1;
+}
+
+int main(int argc, char *argv[])
+{
+ if (argc != 2) {
+ fprintf(stderr, "Usage: %s <socket_path>\n", argv[0]);
+ return -1;
+ }
+
+ if (print_current_label()) {
+ RECV_ERR("cannot read process Smack label");
+ return -1;
+ }
+
+ int listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (listen_sock < 0) {
+ perror("receiver: socket");
+ return -1;
+ }
+
+ struct sockaddr_un addr = {};
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, argv[1], sizeof(addr.sun_path) - 1);
+
+ /* Remove any stale socket file */
+ unlink(argv[1]);
+
+ if (bind(listen_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ perror("receiver: bind");
+ return -1;
+ }
+
+ if (listen(listen_sock, 1) < 0) {
+ perror("receiver: listen");
+ return -1;
+ }
+
+ RECV_LOG("listening on '%s'\n", argv[1]);
+
+ int conn_sock = accept(listen_sock, NULL, NULL);
+ if (conn_sock < 0) {
+ perror("receiver: accept");
+ return -1;
+ }
+
+ RECV_LOG("connection accepted\n");
+
+ int one = 1;
+ if (setsockopt(conn_sock, SOL_SOCKET, SO_RIGHTS_NOTRUNC,
+ &one, sizeof(one)) < 0) {
+ perror("receiver: setsockopt(SO_RIGHTS_NOTRUNC)");
+ goto out_sock;
+ }
+
+ /* Try to receive the fds */
+ int fds[MAX_FDS];
+ int num_fds = recv_fds(conn_sock, fds);
+ if (num_fds < 0)
+ goto out_sock;
+
+ /* Try to use the received fds -- read and print their contents */
+ RECV_LOG("attempting to read from received fds...\n");
+ int i;
+ for (i = 0; i < num_fds; ++i) {
+ char readbuf[256];
+
+ if (fds[i] < 0) {
+ RECV_LOG("fd in position %i blocked\n", i);
+ continue;
+ } else if (fds[i] == 0) {
+ RECV_LOG("bad fd in position %i\n", i);
+ goto out_recv;
+ }
+
+ ssize_t n = read(fds[i], readbuf, sizeof(readbuf) - 1);
+ if (n < 0) {
+ perror("receiver: read from received fd");
+ goto out_recv;
+ }
+
+ readbuf[n] = '\0';
+ RECV_LOG("read %zd bytes from fd at position %i: '%s'\n", n, i, readbuf);
+ }
+
+ RECV_LOG("final result:\n");
+ for (int j = 0; j < num_fds; ++j) {
+ if (fds[j] < 0) {
+ printf("BLOCKED");
+ } else {
+ printf("PASSED");
+ close(fds[j]);
+ }
+ putchar(' ');
+ }
+
+ close(conn_sock);
+ close(listen_sock);
+ unlink(argv[1]);
+ return 0;
+
+out_recv:
+ for (int j = 0; j < num_fds; ++j) {
+ if (fds[j] > 0)
+ close(fds[j]);
+ }
+
+out_sock:
+ close(conn_sock);
+ close(listen_sock);
+ unlink(argv[1]);
+ return -1;
+}
diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial_sender.c b/tools/testing/selftests/net/af_unix/scm_rights_denial_sender.c
new file mode 100644
index 000000000000..9742eb25f0b5
--- /dev/null
+++ b/tools/testing/selftests/net/af_unix/scm_rights_denial_sender.c
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/*
+ * scm_rights_denial_sender.c - Send fds over a Unix socket via SCM_RIGHTS
+ *
+ * Usage: ./scm_rights_denial_sender <socket_path> <file_to_send> [<file_to_send>...]
+ *
+ * Opens the specified files and sends their fds to a receiver connected
+ * on the given Unix socket path. Used for testing LSM blocking of fd
+ * passing.
+ */
+
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include "scm_rights_denial.h"
+
+#define SEND_LOG(fmt, ...) fprintf(stdout, "sender: " fmt, ##__VA_ARGS__)
+#define SEND_ERR(fmt, ...) fprintf(stderr, "sender: " fmt, ##__VA_ARGS__)
+
+static int send_fds(int sock, int *fds, int num_fds)
+{
+ if (num_fds > MAX_FDS)
+ return -1;
+
+ char buf[1] = { 'X' };
+ char ctrl[CMSG_SPACE(MAX_FDS * sizeof(int))] = { 0 };
+
+ struct iovec iov = {
+ .iov_base = buf,
+ .iov_len = sizeof(buf),
+ };
+ struct msghdr msg = {
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = ctrl,
+ .msg_controllen = CMSG_SPACE(num_fds * sizeof(int)),
+ };
+
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ cmsg->cmsg_len = CMSG_LEN(num_fds * sizeof(int));
+ memcpy(CMSG_DATA(cmsg), fds, num_fds * sizeof(int));
+
+ ssize_t bytes_send = sendmsg(sock, &msg, 0);
+ if (bytes_send < 0) {
+ perror("sender: sendmsg");
+ return -1;
+ }
+
+ return 0;
+}
+
+static inline int print_current_label(void)
+{
+ char label[256];
+ if (!read_current_label(label, sizeof(label))) {
+ SEND_LOG("running with Smack label '%s'\n", label);
+ return 0;
+ }
+ return -1;
+}
+
+int main(int argc, char *argv[])
+{
+ if (argc < 3 || argc > 2 + MAX_FDS) {
+ fprintf(stderr, "Usage: %s <socket_path> <file_to_send> [<file_to_send>...]\\n",
+ argv[0]);
+ fprintf(stderr, "Up to a maximum of %d files", MAX_FDS);
+ return -1;
+ }
+
+ if (print_current_label()) {
+ SEND_ERR("cannot read process Smack label");
+ return -1;
+ }
+
+ int sock = socket(AF_UNIX, SOCK_STREAM, 0);
+ if (sock < 0) {
+ perror("sender: socket");
+ return -1;
+ }
+
+ struct sockaddr_un addr = {};
+ addr.sun_family = AF_UNIX;
+ strncpy(addr.sun_path, argv[1], sizeof(addr.sun_path) - 1);
+
+ if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ perror("sender: connect");
+ goto out_sock;
+ }
+
+ SEND_LOG("connected to '%s'\n", argv[1]);
+
+ int num_files = argc - 2;
+ int fds[MAX_FDS];
+ int i;
+ for (i = 0; i < num_files; i++) {
+ fds[i] = open(argv[2 + i], O_RDONLY);
+ if (fds[i] < 0) {
+ perror("sender: open file");
+ goto out_opened;
+ }
+ SEND_LOG("opened '%s' as fd %d\n", argv[2 + i], fds[i]);
+ }
+
+ if (send_fds(sock, fds, num_files) < 0)
+ goto out_opened;
+
+ SEND_LOG("fds successfully sent:");
+ for (int j = 0; j < num_files; j++)
+ printf(" %d", fds[j]);
+ putchar('\n');
+
+out_opened:
+ for (int j = 0; j < i; j++)
+ close(fds[j]);
+out_sock:
+ close(sock);
+ return -1;
+}
--
2.54.0
^ permalink raw reply related
* [PATCH net-next v3 4/5] net: af_unix: replace copy_from_sockptr() with copy_safe_from_sockptr()
From: Jori Koolstra @ 2026-06-29 19:43 UTC (permalink / raw)
To: Christian Brauner, Aleksa Sarai, Kuniyuki Iwashima,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman
Cc: netdev, linux-fsdevel, linux-kernel, Jori Koolstra
In-Reply-To: <20260629194327.2270798-1-jkoolstra@xs4all.nl>
Replace deprecated call to copy_from_sockptr() with
copy_safe_from_sockptr().
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
---
net/unix/af_unix.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 83274ce18e06..07a0b07cd65f 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -933,6 +933,7 @@ static int unix_setsockopt(struct socket *sock, int level, int optname,
{
struct unix_sock *u = unix_sk(sock->sk);
struct sock *sk = sock->sk;
+ int error;
int val;
if (level != SOL_SOCKET)
@@ -941,11 +942,9 @@ static int unix_setsockopt(struct socket *sock, int level, int optname,
if (!unix_custom_sockopt(optname))
return sock_setsockopt(sock, level, optname, optval, optlen);
- if (optlen != sizeof(int))
- return -EINVAL;
-
- if (copy_from_sockptr(&val, optval, sizeof(val)))
- return -EFAULT;
+ error = copy_safe_from_sockptr(&val, sizeof(val), optval, optlen);
+ if (error)
+ return error;
switch (optname) {
case SO_INQ:
--
2.54.0
^ permalink raw reply related
* [PATCH net-next v3 3/5] net: af_unix: useful handling of LSM denials on SCM_RIGHTS
From: Jori Koolstra @ 2026-06-29 19:43 UTC (permalink / raw)
To: Christian Brauner, Aleksa Sarai, Kuniyuki Iwashima,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman
Cc: netdev, linux-fsdevel, linux-kernel, Jori Koolstra
In-Reply-To: <20260629194327.2270798-1-jkoolstra@xs4all.nl>
Right now if some LSM such as Smack denies an AF_UNIX socket peer to
receive an SCM_RIGHTS fd, the SCM_RIGHTS fd array will be cut short at
that point, and MSG_CTRUNC is set on return of recvmsg(). This is
highly problematic behaviour, because it leaves the receiver
wondering what happened. As per man page MSG_CTRUNC is supposed to
indicate that the control buffer was sized too short, but suddenly
a permission error might result in the exact same flag being set.
Moreover, the receiver has no chance to determine how many fds got
originally sent and how many were suppressed.[1]
Add a SO_RIGHTS_NOTRUNC option to UNIX sockets to enable more useful
handling of LSM denials when receiving SCM_RIGHTS messages: instead of
truncating the message at the first blocked fd, keep every fd slot
and store the LSM errno in the blocked slot.
[1]: https://github.com/uapi-group/kernel-features#useful-handling-of-lsm-denials-on-scm_rights
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
---
include/net/af_unix.h | 1 +
include/net/scm.h | 15 +++++++++++----
include/uapi/asm-generic/socket.h | 3 +++
net/compat.c | 4 ++--
net/core/scm.c | 16 +++++++++++-----
net/unix/af_unix.c | 9 +++++++++
6 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 34f53dde65ce..bb1b3dee02e8 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -49,6 +49,7 @@ struct unix_sock {
struct scm_stat scm_stat;
int inq_len;
bool recvmsg_inq;
+ bool scm_rights_notrunc;
#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
struct sk_buff *oob_skb;
#endif
diff --git a/include/net/scm.h b/include/net/scm.h
index c52519669349..761cda0803fb 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -50,8 +50,8 @@ struct scm_cookie {
#endif
};
-void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm);
-void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm);
+void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm, bool notrunc);
+void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm, bool notrunc);
int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm);
void __scm_destroy(struct scm_cookie *scm);
struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl);
@@ -108,11 +108,18 @@ void scm_recv_unix(struct socket *sock, struct msghdr *msg,
struct scm_cookie *scm, int flags);
static inline int scm_recv_one_fd(struct file *f, int __user *ufd,
- unsigned int flags)
+ unsigned int flags, bool notrunc)
{
+ bool filtered;
+ int error;
+
if (!ufd)
return -EFAULT;
- return receive_fd(f, ufd, flags);
+
+ error = receive_fd_filtered(f, ufd, flags, &filtered);
+ if (filtered && notrunc)
+ return put_user(error, ufd);
+ return error;
}
#endif /* __LINUX_NET_SCM_H */
diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
index 53b5a8c002b1..c5fb2ee96830 100644
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
@@ -150,6 +150,9 @@
#define SO_INQ 84
#define SCM_INQ SO_INQ
+#define SO_RIGHTS_NOTRUNC 85
+#define SCM_RIGHTS_NOTRUNC SO_RIGHTS_NOTRUNC
+
#if !defined(__KERNEL__)
#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
diff --git a/net/compat.c b/net/compat.c
index d68cf9c3aad5..6bdf4a2c9077 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -286,7 +286,7 @@ static int scm_max_fds_compat(struct msghdr *msg)
return (msg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
}
-void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm)
+void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm, bool notrunc)
{
struct compat_cmsghdr __user *cm =
(struct compat_cmsghdr __user *)msg->msg_control_user;
@@ -296,7 +296,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm)
int err = 0, i;
for (i = 0; i < fdmax; i++) {
- err = scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags);
+ err = scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags, notrunc);
if (err < 0)
break;
}
diff --git a/net/core/scm.c b/net/core/scm.c
index a73b1eb30fd2..55bab203281a 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -351,7 +351,7 @@ static int scm_max_fds(struct msghdr *msg)
return (msg->msg_controllen - sizeof(struct cmsghdr)) / sizeof(int);
}
-void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
+void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm, bool notrunc)
{
struct cmsghdr __user *cm =
(__force struct cmsghdr __user *)msg->msg_control_user;
@@ -365,12 +365,12 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
return;
if (msg->msg_flags & MSG_CMSG_COMPAT) {
- scm_detach_fds_compat(msg, scm);
+ scm_detach_fds_compat(msg, scm, notrunc);
return;
}
for (i = 0; i < fdmax; i++) {
- err = scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags);
+ err = scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags, notrunc);
if (err < 0)
break;
}
@@ -542,8 +542,14 @@ void scm_recv_unix(struct socket *sock, struct msghdr *msg,
if (!__scm_recv_common(sock->sk, msg, scm, flags))
return;
- if (scm->fp)
- scm_detach_fds(msg, scm);
+ if (scm->fp) {
+ struct unix_sock *u;
+ bool notrunc;
+
+ u = unix_sk(sock->sk);
+ notrunc = READ_ONCE(u->scm_rights_notrunc);
+ scm_detach_fds(msg, scm, notrunc);
+ }
if (sock->sk->sk_scm_pidfd)
scm_pidfd_recv(msg, scm);
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index f7a9d55eee8a..83274ce18e06 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -921,6 +921,7 @@ static bool unix_custom_sockopt(int optname)
{
switch (optname) {
case SO_INQ:
+ case SO_RIGHTS_NOTRUNC:
return true;
default:
return false;
@@ -956,6 +957,14 @@ static int unix_setsockopt(struct socket *sock, int level, int optname,
WRITE_ONCE(u->recvmsg_inq, val);
break;
+
+ case SO_RIGHTS_NOTRUNC:
+ if (val > 1 || val < 0)
+ return -EINVAL;
+
+ WRITE_ONCE(u->scm_rights_notrunc, val);
+ break;
+
default:
return -ENOPROTOOPT;
}
--
2.54.0
^ permalink raw reply related
* [PATCH net-next v3 2/5] vfs: add function receive_fd_filtered() that makes LSM filtering explicit
From: Jori Koolstra @ 2026-06-29 19:43 UTC (permalink / raw)
To: Christian Brauner, Aleksa Sarai, Kuniyuki Iwashima,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman
Cc: netdev, linux-fsdevel, linux-kernel, Jori Koolstra
In-Reply-To: <20260629194327.2270798-1-jkoolstra@xs4all.nl>
To prepare for filtering LSM blocked fds received with SCM_RIGHTS, we
first need to know when a received fd was filtered. Currently,
receive_fd() relays the error returned by security_file_receive(). As
there is no strict convention about what errnos this LSM hook can
return, the caller of receive_fd() has no robust way of knowing whether
an error is returned because the LSM blocked the fd, or because of some
other failure (put_user, FD_PREPARE, etc.)
Fix this by adding receive_fd_filtered() which carries an out-argument
that is set only on LSM error.
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
---
fs/file.c | 48 +++++++++++++++++++++++++++++---------------
include/linux/file.h | 2 ++
2 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 628ca07dc4b1..2bc22cc69e84 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -1367,6 +1367,25 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
return err;
}
+static int __receive_fd(struct file *file, int __user *ufd, unsigned int o_flags)
+{
+ int error;
+
+ FD_PREPARE(fdf, o_flags, file);
+ if (fdf.err)
+ return fdf.err;
+ get_file(file);
+
+ if (ufd) {
+ error = put_user(fd_prepare_fd(fdf), ufd);
+ if (error)
+ return error;
+ }
+
+ __receive_sock(fd_prepare_file(fdf));
+ return fd_publish(fdf);
+}
+
/**
* receive_fd() - Install received file into file descriptor table
* @file: struct file that was received from another process
@@ -1384,27 +1403,24 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
*/
int receive_fd(struct file *file, int __user *ufd, unsigned int o_flags)
{
- int error;
-
- error = security_file_receive(file);
+ int error = security_file_receive(file);
if (error)
return error;
+ return __receive_fd(file, ufd, o_flags);
+}
+EXPORT_SYMBOL_GPL(receive_fd);
- FD_PREPARE(fdf, o_flags, file);
- if (fdf.err)
- return fdf.err;
- get_file(file);
-
- if (ufd) {
- error = put_user(fd_prepare_fd(fdf), ufd);
- if (error)
- return error;
+int receive_fd_filtered(struct file *file, int __user *ufd, unsigned int o_flags,
+ bool *filtered)
+{
+ int error = security_file_receive(file);
+ if (error) {
+ *filtered = true;
+ return error;
}
-
- __receive_sock(fd_prepare_file(fdf));
- return fd_publish(fdf);
+ *filtered = false;
+ return __receive_fd(file, ufd, o_flags);
}
-EXPORT_SYMBOL_GPL(receive_fd);
int receive_fd_replace(int new_fd, struct file *file, unsigned int o_flags)
{
diff --git a/include/linux/file.h b/include/linux/file.h
index 27484b444d31..748f08470bb4 100644
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -119,6 +119,8 @@ DEFINE_FREE(fput, struct file *, if (!IS_ERR_OR_NULL(_T)) fput(_T))
extern void fd_install(unsigned int fd, struct file *file);
int receive_fd(struct file *file, int __user *ufd, unsigned int o_flags);
+int receive_fd_filtered(struct file *file, int __user *ufd, unsigned int o_flags,
+ bool *filtered);
int receive_fd_replace(int new_fd, struct file *file, unsigned int o_flags);
--
2.54.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox