Commit d091ec97 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-felix-psfp' 



Xiaoliang Yang says:

====================
net: dsa: felix: psfp support on vsc9959

VSC9959 hardware supports Per-Stream Filtering and Policing(PSFP).
This patch series add PSFP support on tc flower offload of ocelot
driver. Use chain 30000 to distinguish PSFP from VCAP blocks. Add gate
and police set to support PSFP in VSC9959 driver.

v6-v7 changes:
 - Add a patch to restrict psfp rules on ingress port.
 - Using stats.drops to show the packet count discarded by the rule.

v5->v6 changes:
 - Modify ocelot_mact_lookup() parameters.
 - Use parameters ssid and sfid instead of streamdata in
   ocelot_mact_learn_streamdata() function.
 - Serialize STREAMDATA and MAC table write.

v4->v5 changes:
 - Add MAC table lock patch, and move stream data write in
   ocelot_mact_learn_streamdata().
 - Add two sections of VCAP policers to Seville platform.

v3->v4 changes:
 - Introduce vsc9959_psfp_sfi_table_get() function in patch where it is
   used to fix compile warning.

v2->v3 changes:
 - Reorder first two patches. Export struct ocelot_mact_entry, then add
   ocelot_mact_lookup() and ocelot_mact_write() functions.
 - Add PSFP list to struct ocelot, and init it by using
   ocelot->ops->psfp_init().

v1->v2 changes:
 - Use tc flower offload of ocelot driver to support PSFP add and delete.
 - Add PSFP tables add/del functions in felix_vsc9959.c.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f6ef47e5 a7e13edf

drivers/net/dsa/ocelot/felix.c

+4 −0
Original line number Diff line number Diff line
@@ -989,6 +989,10 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) 
	ocelot->num_stats	= felix->info->num_stats;

	ocelot->num_mact_rows	= felix->info->num_mact_rows;

	ocelot->vcap		= felix->info->vcap;

	ocelot->vcap_pol.base	= felix->info->vcap_pol_base;

	ocelot->vcap_pol.max	= felix->info->vcap_pol_max;

	ocelot->vcap_pol.base2	= felix->info->vcap_pol_base2;

	ocelot->vcap_pol.max2	= felix->info->vcap_pol_max2;

	ocelot->ops		= felix->info->ops;

	ocelot->npi_inj_prefix	= OCELOT_TAG_PREFIX_SHORT;

	ocelot->npi_xtr_prefix	= OCELOT_TAG_PREFIX_SHORT;

drivers/net/dsa/ocelot/felix.h

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ struct felix_info { 
	int				num_ports;

	int				num_tx_queues;

	struct vcap_props		*vcap;

	u16				vcap_pol_base;

	u16				vcap_pol_max;

	u16				vcap_pol_base2;

	u16				vcap_pol_max2;

	int				switch_pci_bar;

	int				imdio_pci_bar;

	const struct ptp_clock_info	*ptp_caps;

drivers/net/dsa/ocelot/felix_vsc9959.c

+808 −10

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/ocelot/seville_vsc9953.c

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 
#define MSCC_MIIM_CMD_REGAD_SHIFT		20

#define MSCC_MIIM_CMD_PHYAD_SHIFT		25

#define MSCC_MIIM_CMD_VLD			BIT(31)

#define VSC9953_VCAP_POLICER_BASE		11

#define VSC9953_VCAP_POLICER_MAX		31

#define VSC9953_VCAP_POLICER_BASE2		120

#define VSC9953_VCAP_POLICER_MAX2		161



static const u32 vsc9953_ana_regmap[] = {

	REG(ANA_ADVLEARN,			0x00b500),
@@ -1172,6 +1176,10 @@ static const struct felix_info seville_info_vsc9953 = { 
	.stats_layout		= vsc9953_stats_layout,

	.num_stats		= ARRAY_SIZE(vsc9953_stats_layout),

	.vcap			= vsc9953_vcap_props,

	.vcap_pol_base		= VSC9953_VCAP_POLICER_BASE,

	.vcap_pol_max		= VSC9953_VCAP_POLICER_MAX,

	.vcap_pol_base2		= VSC9953_VCAP_POLICER_BASE2,

	.vcap_pol_max2		= VSC9953_VCAP_POLICER_MAX2,

	.num_mact_rows		= 2048,

	.num_ports		= 10,

	.num_tx_queues		= OCELOT_NUM_TC,

drivers/net/ethernet/mscc/ocelot.c

+78 −6

File changed.

Preview size limit exceeded, changes collapsed.