Commit 1e71017b authored by David S. Miller's avatar David S. Miller Committed by Jakub Kicinski
Browse files

Merge branch 'renesas-rzg3s-add-support-for-ethernet' 

Claudiu Beznea says:

====================
renesas: rzg3s: Add support for Ethernet

Series adds Ethernet support for Renesas RZ/G3S.
Along with it preparatory cleanups and fixes were included.
====================

Link: https://lore.kernel.org/r/20231207070700.4156557-1-claudiu.beznea.uj@bp.renesas.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 060baa9b 954fb2d2

include/uapi/linux/pkt_cls.h

+0 −47
Original line number Diff line number Diff line
@@ -280,37 +280,6 @@ struct tc_u32_pcnt { 


#define TC_U32_MAXDEPTH 8





/* RSVP filter */



enum {

	TCA_RSVP_UNSPEC,

	TCA_RSVP_CLASSID,

	TCA_RSVP_DST,

	TCA_RSVP_SRC,

	TCA_RSVP_PINFO,

	TCA_RSVP_POLICE,

	TCA_RSVP_ACT,

	__TCA_RSVP_MAX

};



#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )



struct tc_rsvp_gpi {

	__u32	key;

	__u32	mask;

	int	offset;

};



struct tc_rsvp_pinfo {

	struct tc_rsvp_gpi dpi;

	struct tc_rsvp_gpi spi;

	__u8	protocol;

	__u8	tunnelid;

	__u8	tunnelhdr;

	__u8	pad;

};



/* ROUTE filter */



enum {
@@ -341,22 +310,6 @@ enum { 


#define TCA_FW_MAX (__TCA_FW_MAX - 1)



/* TC index filter */



enum {

	TCA_TCINDEX_UNSPEC,

	TCA_TCINDEX_HASH,

	TCA_TCINDEX_MASK,

	TCA_TCINDEX_SHIFT,

	TCA_TCINDEX_FALL_THROUGH,

	TCA_TCINDEX_CLASSID,

	TCA_TCINDEX_POLICE,

	TCA_TCINDEX_ACT,

	__TCA_TCINDEX_MAX

};



#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)



/* Flow filter */



enum {

include/uapi/linux/pkt_sched.h

+0 −109
Original line number Diff line number Diff line
@@ -477,115 +477,6 @@ enum { 


#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)





/* CBQ section */



#define TC_CBQ_MAXPRIO		8

#define TC_CBQ_MAXLEVEL		8

#define TC_CBQ_DEF_EWMA		5



struct tc_cbq_lssopt {

	unsigned char	change;

	unsigned char	flags;

#define TCF_CBQ_LSS_BOUNDED	1

#define TCF_CBQ_LSS_ISOLATED	2

	unsigned char  	ewma_log;

	unsigned char  	level;

#define TCF_CBQ_LSS_FLAGS	1

#define TCF_CBQ_LSS_EWMA	2

#define TCF_CBQ_LSS_MAXIDLE	4

#define TCF_CBQ_LSS_MINIDLE	8

#define TCF_CBQ_LSS_OFFTIME	0x10

#define TCF_CBQ_LSS_AVPKT	0x20

	__u32		maxidle;

	__u32		minidle;

	__u32		offtime;

	__u32		avpkt;

};



struct tc_cbq_wrropt {

	unsigned char	flags;

	unsigned char	priority;

	unsigned char	cpriority;

	unsigned char	__reserved;

	__u32		allot;

	__u32		weight;

};



struct tc_cbq_ovl {

	unsigned char	strategy;

#define	TC_CBQ_OVL_CLASSIC	0

#define	TC_CBQ_OVL_DELAY	1

#define	TC_CBQ_OVL_LOWPRIO	2

#define	TC_CBQ_OVL_DROP		3

#define	TC_CBQ_OVL_RCLASSIC	4

	unsigned char	priority2;

	__u16		pad;

	__u32		penalty;

};



struct tc_cbq_police {

	unsigned char	police;

	unsigned char	__res1;

	unsigned short	__res2;

};



struct tc_cbq_fopt {

	__u32		split;

	__u32		defmap;

	__u32		defchange;

};



struct tc_cbq_xstats {

	__u32		borrows;

	__u32		overactions;

	__s32		avgidle;

	__s32		undertime;

};



enum {

	TCA_CBQ_UNSPEC,

	TCA_CBQ_LSSOPT,

	TCA_CBQ_WRROPT,

	TCA_CBQ_FOPT,

	TCA_CBQ_OVL_STRATEGY,

	TCA_CBQ_RATE,

	TCA_CBQ_RTAB,

	TCA_CBQ_POLICE,

	__TCA_CBQ_MAX,

};



#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)



/* dsmark section */



enum {

	TCA_DSMARK_UNSPEC,

	TCA_DSMARK_INDICES,

	TCA_DSMARK_DEFAULT_INDEX,

	TCA_DSMARK_SET_TC_INDEX,

	TCA_DSMARK_MASK,

	TCA_DSMARK_VALUE,

	__TCA_DSMARK_MAX,

};



#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)



/* ATM  section */



enum {

	TCA_ATM_UNSPEC,

	TCA_ATM_FD,		/* file/socket descriptor */

	TCA_ATM_PTR,		/* pointer to descriptor - later */

	TCA_ATM_HDR,		/* LL header */

	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */

	TCA_ATM_ADDR,		/* PVC address (for output only) */

	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */

	__TCA_ATM_MAX,

};



#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)



/* Network emulator */



enum {

tools/include/uapi/linux/pkt_cls.h

+0 −47
Original line number Diff line number Diff line
@@ -204,37 +204,6 @@ struct tc_u32_pcnt { 


#define TC_U32_MAXDEPTH 8





/* RSVP filter */



enum {

	TCA_RSVP_UNSPEC,

	TCA_RSVP_CLASSID,

	TCA_RSVP_DST,

	TCA_RSVP_SRC,

	TCA_RSVP_PINFO,

	TCA_RSVP_POLICE,

	TCA_RSVP_ACT,

	__TCA_RSVP_MAX

};



#define TCA_RSVP_MAX (__TCA_RSVP_MAX - 1 )



struct tc_rsvp_gpi {

	__u32	key;

	__u32	mask;

	int	offset;

};



struct tc_rsvp_pinfo {

	struct tc_rsvp_gpi dpi;

	struct tc_rsvp_gpi spi;

	__u8	protocol;

	__u8	tunnelid;

	__u8	tunnelhdr;

	__u8	pad;

};



/* ROUTE filter */



enum {
@@ -265,22 +234,6 @@ enum { 


#define TCA_FW_MAX (__TCA_FW_MAX - 1)



/* TC index filter */



enum {

	TCA_TCINDEX_UNSPEC,

	TCA_TCINDEX_HASH,

	TCA_TCINDEX_MASK,

	TCA_TCINDEX_SHIFT,

	TCA_TCINDEX_FALL_THROUGH,

	TCA_TCINDEX_CLASSID,

	TCA_TCINDEX_POLICE,

	TCA_TCINDEX_ACT,

	__TCA_TCINDEX_MAX

};



#define TCA_TCINDEX_MAX     (__TCA_TCINDEX_MAX - 1)



/* Flow filter */



enum {

tools/include/uapi/linux/pkt_sched.h

+0 −109
Original line number Diff line number Diff line
@@ -457,115 +457,6 @@ enum { 


#define TCA_HFSC_MAX (__TCA_HFSC_MAX - 1)





/* CBQ section */



#define TC_CBQ_MAXPRIO		8

#define TC_CBQ_MAXLEVEL		8

#define TC_CBQ_DEF_EWMA		5



struct tc_cbq_lssopt {

	unsigned char	change;

	unsigned char	flags;

#define TCF_CBQ_LSS_BOUNDED	1

#define TCF_CBQ_LSS_ISOLATED	2

	unsigned char  	ewma_log;

	unsigned char  	level;

#define TCF_CBQ_LSS_FLAGS	1

#define TCF_CBQ_LSS_EWMA	2

#define TCF_CBQ_LSS_MAXIDLE	4

#define TCF_CBQ_LSS_MINIDLE	8

#define TCF_CBQ_LSS_OFFTIME	0x10

#define TCF_CBQ_LSS_AVPKT	0x20

	__u32		maxidle;

	__u32		minidle;

	__u32		offtime;

	__u32		avpkt;

};



struct tc_cbq_wrropt {

	unsigned char	flags;

	unsigned char	priority;

	unsigned char	cpriority;

	unsigned char	__reserved;

	__u32		allot;

	__u32		weight;

};



struct tc_cbq_ovl {

	unsigned char	strategy;

#define	TC_CBQ_OVL_CLASSIC	0

#define	TC_CBQ_OVL_DELAY	1

#define	TC_CBQ_OVL_LOWPRIO	2

#define	TC_CBQ_OVL_DROP		3

#define	TC_CBQ_OVL_RCLASSIC	4

	unsigned char	priority2;

	__u16		pad;

	__u32		penalty;

};



struct tc_cbq_police {

	unsigned char	police;

	unsigned char	__res1;

	unsigned short	__res2;

};



struct tc_cbq_fopt {

	__u32		split;

	__u32		defmap;

	__u32		defchange;

};



struct tc_cbq_xstats {

	__u32		borrows;

	__u32		overactions;

	__s32		avgidle;

	__s32		undertime;

};



enum {

	TCA_CBQ_UNSPEC,

	TCA_CBQ_LSSOPT,

	TCA_CBQ_WRROPT,

	TCA_CBQ_FOPT,

	TCA_CBQ_OVL_STRATEGY,

	TCA_CBQ_RATE,

	TCA_CBQ_RTAB,

	TCA_CBQ_POLICE,

	__TCA_CBQ_MAX,

};



#define TCA_CBQ_MAX	(__TCA_CBQ_MAX - 1)



/* dsmark section */



enum {

	TCA_DSMARK_UNSPEC,

	TCA_DSMARK_INDICES,

	TCA_DSMARK_DEFAULT_INDEX,

	TCA_DSMARK_SET_TC_INDEX,

	TCA_DSMARK_MASK,

	TCA_DSMARK_VALUE,

	__TCA_DSMARK_MAX,

};



#define TCA_DSMARK_MAX (__TCA_DSMARK_MAX - 1)



/* ATM  section */



enum {

	TCA_ATM_UNSPEC,

	TCA_ATM_FD,		/* file/socket descriptor */

	TCA_ATM_PTR,		/* pointer to descriptor - later */

	TCA_ATM_HDR,		/* LL header */

	TCA_ATM_EXCESS,		/* excess traffic class (0 for CLP)  */

	TCA_ATM_ADDR,		/* PVC address (for output only) */

	TCA_ATM_STATE,		/* VC state (ATM_VS_*; for output only) */

	__TCA_ATM_MAX,

};



#define TCA_ATM_MAX	(__TCA_ATM_MAX - 1)



/* Network emulator */



enum {