[PRE-REVIEW PATCH 06/16] net: mvpp2: Prepare to use the new tasklet API

Romain Perier
2019-09-29T16:32:04Z

From: Romain Perier <romain.perier@viveris.fr>

The future tasklet API will no longer allow to pass an arbitrary
"unsigned long" data parameter. The tasklet data structure will need to
be embedded into a data structure that will be retrieved from the tasklet
handler. Currently, there are no ways to retrieve the "struct mvpp2_port
*" from a given "struct mvpp2_port_pcpu *". This commit adds a new field
to get the address of the main port for each pcpu context.

Signed-off-by: Romain Perier <romain.perier@gmail.com>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 +
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 543a310ec102..ca61eb601f15 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -835,6 +835,7 @@ struct mvpp2_port_pcpu {
struct hrtimer tx_done_timer;
struct net_device *dev;
bool timer_scheduled;
+ struct mvpp2_port *port;
};

struct mvpp2_queue_vector {
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index 111b3b8239e1..6cdd68866263 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -5353,6 +5353,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
err = -ENOMEM;
goto err_free_txq_pcpu;
}
+ port->pcpu->port = port;

if (!port->has_tx_irqs) {
for (thread = 0; thread < priv->nthreads; thread++) {
--
2.23.0