Commit db9d7d36 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: mvpp2: Split the PPv2 driver to a dedicated directory 



As the mvpp2 driver is growing, move this driver to a dedicated
directory and split it into several files.

Since this driver has a lot of register defines and structure
definitions, it can benefit from having all of this into a dedicated
header file, named mvpp2.h.

A good chunk of the mvpp2 code is dedicated to Header Parser handling, so
we introduce mvpp2_prs.h where all Header Parser definitions are located,
and mvpp2_prs.c containing the related code.

In the same way, mvpp2_cls.h and mvpp2_cls.c are created to contain
Classifier and RSS related code.

The former 'mvpp2.c' file is renamed 'mvpp2_main.c' so that we can keep
the driver binary named 'mvpp2'.

This commit is only about spliting the driver into multiple files and
doesn't introduce any new function, feature or fix besides removing
'static' keywords when needed.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Tested-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c431f89b

drivers/net/ethernet/marvell/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-$(CONFIG_MVMDIO) += mvmdio.o 
obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o

obj-$(CONFIG_MVNETA_BM) += mvneta_bm.o

obj-$(CONFIG_MVNETA) += mvneta.o

obj-$(CONFIG_MVPP2) += mvpp2.o

obj-$(CONFIG_MVPP2) += mvpp2/

obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SKY2) += sky2.o

drivers/net/ethernet/marvell/mvpp2/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for the Marvell PPv2 driver.

#

obj-$(CONFIG_MVPP2) := mvpp2.o



mvpp2-objs := mvpp2_main.o mvpp2_prs.o mvpp2_cls.o

drivers/net/ethernet/marvell/mvpp2/mvpp2.h

0 → 100644
+1046 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c

0 → 100644
+141 −0
Original line number Diff line number Diff line 
/*

 * RSS and Classifier helpers for Marvell PPv2 Network Controller

 *

 * Copyright (C) 2014 Marvell

 *

 * Marcin Wojtas <mw@semihalf.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#include "mvpp2.h"

#include "mvpp2_cls.h"



/* Update classification flow table registers */

static void mvpp2_cls_flow_write(struct mvpp2 *priv,

				 struct mvpp2_cls_flow_entry *fe)

{

	mvpp2_write(priv, MVPP2_CLS_FLOW_INDEX_REG, fe->index);

	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL0_REG,  fe->data[0]);

	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL1_REG,  fe->data[1]);

	mvpp2_write(priv, MVPP2_CLS_FLOW_TBL2_REG,  fe->data[2]);

}



/* Update classification lookup table register */

static void mvpp2_cls_lookup_write(struct mvpp2 *priv,

				   struct mvpp2_cls_lookup_entry *le)

{

	u32 val;



	val = (le->way << MVPP2_CLS_LKP_INDEX_WAY_OFFS) | le->lkpid;

	mvpp2_write(priv, MVPP2_CLS_LKP_INDEX_REG, val);

	mvpp2_write(priv, MVPP2_CLS_LKP_TBL_REG, le->data);

}



/* Classifier default initialization */

void mvpp2_cls_init(struct mvpp2 *priv)

{

	struct mvpp2_cls_lookup_entry le;

	struct mvpp2_cls_flow_entry fe;

	int index;



	/* Enable classifier */

	mvpp2_write(priv, MVPP2_CLS_MODE_REG, MVPP2_CLS_MODE_ACTIVE_MASK);



	/* Clear classifier flow table */

	memset(&fe.data, 0, sizeof(fe.data));

	for (index = 0; index < MVPP2_CLS_FLOWS_TBL_SIZE; index++) {

		fe.index = index;

		mvpp2_cls_flow_write(priv, &fe);

	}



	/* Clear classifier lookup table */

	le.data = 0;

	for (index = 0; index < MVPP2_CLS_LKP_TBL_SIZE; index++) {

		le.lkpid = index;

		le.way = 0;

		mvpp2_cls_lookup_write(priv, &le);



		le.way = 1;

		mvpp2_cls_lookup_write(priv, &le);

	}

}



void mvpp2_cls_port_config(struct mvpp2_port *port)

{

	struct mvpp2_cls_lookup_entry le;

	u32 val;



	/* Set way for the port */

	val = mvpp2_read(port->priv, MVPP2_CLS_PORT_WAY_REG);

	val &= ~MVPP2_CLS_PORT_WAY_MASK(port->id);

	mvpp2_write(port->priv, MVPP2_CLS_PORT_WAY_REG, val);



	/* Pick the entry to be accessed in lookup ID decoding table

	 * according to the way and lkpid.

	 */

	le.lkpid = port->id;

	le.way = 0;

	le.data = 0;



	/* Set initial CPU queue for receiving packets */

	le.data &= ~MVPP2_CLS_LKP_TBL_RXQ_MASK;

	le.data |= port->first_rxq;



	/* Disable classification engines */

	le.data &= ~MVPP2_CLS_LKP_TBL_LOOKUP_EN_MASK;



	/* Update lookup ID table entry */

	mvpp2_cls_lookup_write(port->priv, &le);

}



/* Set CPU queue number for oversize packets */

void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port)

{

	u32 val;



	mvpp2_write(port->priv, MVPP2_CLS_OVERSIZE_RXQ_LOW_REG(port->id),

		    port->first_rxq & MVPP2_CLS_OVERSIZE_RXQ_LOW_MASK);



	mvpp2_write(port->priv, MVPP2_CLS_SWFWD_P2HQ_REG(port->id),

		    (port->first_rxq >> MVPP2_CLS_OVERSIZE_RXQ_LOW_BITS));



	val = mvpp2_read(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG);

	val |= MVPP2_CLS_SWFWD_PCTRL_MASK(port->id);

	mvpp2_write(port->priv, MVPP2_CLS_SWFWD_PCTRL_REG, val);

}



void mvpp22_init_rss(struct mvpp2_port *port)

{

	struct mvpp2 *priv = port->priv;

	int i;



	/* Set the table width: replace the whole classifier Rx queue number

	 * with the ones configured in RSS table entries.

	 */

	mvpp2_write(priv, MVPP22_RSS_INDEX, MVPP22_RSS_INDEX_TABLE(0));

	mvpp2_write(priv, MVPP22_RSS_WIDTH, 8);



	/* Loop through the classifier Rx Queues and map them to a RSS table.

	 * Map them all to the first table (0) by default.

	 */

	for (i = 0; i < MVPP2_CLS_RX_QUEUES; i++) {

		mvpp2_write(priv, MVPP22_RSS_INDEX, MVPP22_RSS_INDEX_QUEUE(i));

		mvpp2_write(priv, MVPP22_RSS_TABLE,

			    MVPP22_RSS_TABLE_POINTER(0));

	}



	/* Configure the first table to evenly distribute the packets across

	 * real Rx Queues. The table entries map a hash to an port Rx Queue.

	 */

	for (i = 0; i < MVPP22_RSS_TABLE_ENTRIES; i++) {

		u32 sel = MVPP22_RSS_INDEX_TABLE(0) |

			  MVPP22_RSS_INDEX_TABLE_ENTRY(i);

		mvpp2_write(priv, MVPP22_RSS_INDEX, sel);



		mvpp2_write(priv, MVPP22_RSS_TABLE_ENTRY, i % port->nrxqs);

	}



}

drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
/*

 * RSS and Classifier definitions for Marvell PPv2 Network Controller

 *

 * Copyright (C) 2014 Marvell

 *

 * Marcin Wojtas <mw@semihalf.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef _MVPP2_CLS_H_

#define _MVPP2_CLS_H_



/* Classifier constants */

#define MVPP2_CLS_FLOWS_TBL_SIZE	512

#define MVPP2_CLS_FLOWS_TBL_DATA_WORDS	3

#define MVPP2_CLS_LKP_TBL_SIZE		64

#define MVPP2_CLS_RX_QUEUES		256



/* RSS constants */

#define MVPP22_RSS_TABLE_ENTRIES	32



struct mvpp2_cls_flow_entry {

	u32 index;

	u32 data[MVPP2_CLS_FLOWS_TBL_DATA_WORDS];

};



struct mvpp2_cls_lookup_entry {

	u32 lkpid;

	u32 way;

	u32 data;

};



void mvpp22_init_rss(struct mvpp2_port *port);



void mvpp2_cls_init(struct mvpp2 *priv);



void mvpp2_cls_port_config(struct mvpp2_port *port);



void mvpp2_cls_oversize_rxq_set(struct mvpp2_port *port);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE