Unverified Commit 51ad856b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6932 net: enetc: deny offload of tc-based TSN features on VF interfaces 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ziyang Xuan <william.xuanziyang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PXZN7SA3UD7SLVNQ7K4DJKSWFSTQD2C2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9KHKJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/6932

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 29916de9 16c5f8b1

drivers/net/ethernet/freescale/enetc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ fsl-enetc-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o 


obj-$(CONFIG_FSL_ENETC_VF) += fsl-enetc-vf.o

fsl-enetc-vf-y := enetc_vf.o $(common-objs)

fsl-enetc-vf-$(CONFIG_FSL_ENETC_QOS) += enetc_qos.o



obj-$(CONFIG_FSL_ENETC_MDIO) += fsl-enetc-mdio.o

fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o

drivers/net/ethernet/freescale/enetc/enetc.c

+1 −20
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ int enetc_close(struct net_device *ndev) 
	return 0;

}



static int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)

int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	struct tc_mqprio_qopt *mqprio = type_data;
@@ -1615,25 +1615,6 @@ static int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data) 
	return 0;

}



int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,

		   void *type_data)

{

	switch (type) {

	case TC_SETUP_QDISC_MQPRIO:

		return enetc_setup_tc_mqprio(ndev, type_data);

	case TC_SETUP_QDISC_TAPRIO:

		return enetc_setup_tc_taprio(ndev, type_data);

	case TC_SETUP_QDISC_CBS:

		return enetc_setup_tc_cbs(ndev, type_data);

	case TC_SETUP_QDISC_ETF:

		return enetc_setup_tc_txtime(ndev, type_data);

	case TC_SETUP_BLOCK:

		return enetc_setup_tc_psfp(ndev, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



struct net_device_stats *enetc_get_stats(struct net_device *ndev)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ netdev_tx_t enetc_xmit(struct sk_buff *skb, struct net_device *ndev); 
struct net_device_stats *enetc_get_stats(struct net_device *ndev);

void enetc_set_features(struct net_device *ndev, netdev_features_t features);

int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd);

int enetc_setup_tc(struct net_device *ndev, enum tc_setup_type type,

		   void *type_data);

int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data);



/* ethtool */

void enetc_set_ethtool_ops(struct net_device *ndev);

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+20 −1
Original line number Diff line number Diff line
@@ -696,6 +696,25 @@ static int enetc_pf_set_features(struct net_device *ndev, 
	return 0;

}



static int enetc_pf_setup_tc(struct net_device *ndev, enum tc_setup_type type,

			     void *type_data)

{

	switch (type) {

	case TC_SETUP_QDISC_MQPRIO:

		return enetc_setup_tc_mqprio(ndev, type_data);

	case TC_SETUP_QDISC_TAPRIO:

		return enetc_setup_tc_taprio(ndev, type_data);

	case TC_SETUP_QDISC_CBS:

		return enetc_setup_tc_cbs(ndev, type_data);

	case TC_SETUP_QDISC_ETF:

		return enetc_setup_tc_txtime(ndev, type_data);

	case TC_SETUP_BLOCK:

		return enetc_setup_tc_psfp(ndev, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



static const struct net_device_ops enetc_ndev_ops = {

	.ndo_open		= enetc_open,

	.ndo_stop		= enetc_close,
@@ -710,7 +729,7 @@ static const struct net_device_ops enetc_ndev_ops = { 
	.ndo_set_vf_spoofchk	= enetc_pf_set_vf_spoofchk,

	.ndo_set_features	= enetc_pf_set_features,

	.ndo_do_ioctl		= enetc_ioctl,

	.ndo_setup_tc		= enetc_setup_tc,

	.ndo_setup_tc		= enetc_pf_setup_tc,

};



static void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,

drivers/net/ethernet/freescale/enetc/enetc_vf.c

+12 −1
Original line number Diff line number Diff line
@@ -93,6 +93,17 @@ static int enetc_vf_set_features(struct net_device *ndev, 
	return 0;

}



static int enetc_vf_setup_tc(struct net_device *ndev, enum tc_setup_type type,

			     void *type_data)

{

	switch (type) {

	case TC_SETUP_QDISC_MQPRIO:

		return enetc_setup_tc_mqprio(ndev, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



/* Probing/ Init */

static const struct net_device_ops enetc_ndev_ops = {

	.ndo_open		= enetc_open,
@@ -102,7 +113,7 @@ static const struct net_device_ops enetc_ndev_ops = { 
	.ndo_set_mac_address	= enetc_vf_set_mac_addr,

	.ndo_set_features	= enetc_vf_set_features,

	.ndo_do_ioctl		= enetc_ioctl,

	.ndo_setup_tc		= enetc_setup_tc,

	.ndo_setup_tc		= enetc_vf_setup_tc,

};



static void enetc_vf_netdev_setup(struct enetc_si *si, struct net_device *ndev,