Commit 43510ef4 authored by Naveen Mamindlapalli's avatar Naveen Mamindlapalli Committed by David S. Miller
Browse files

octeontx2-nicvf: Add PTP hardware clock support to NIX VF 



This patch adds PTP PHC support to NIX VF interfaces. This enables
a VF to run PTP master/slave instance. PTP block being a shared
hardware resource it is recommended to avoid running multiple
PTP instances in the system which will impact the PTP clock
accuracy.

Signed-off-by: default avatarNaveen Mamindlapalli <naveenm@marvell.com>
Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarSunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffd2f89a

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c

+3 −0
Original line number Diff line number Diff line
@@ -730,6 +730,9 @@ static int rvu_cgx_ptp_rx_cfg(struct rvu *rvu, u16 pcifunc, bool enable) 
int rvu_mbox_handler_cgx_ptp_rx_enable(struct rvu *rvu, struct msg_req *req,

				       struct msg_rsp *rsp)

{

	if (!is_pf_cgxmapped(rvu, rvu_get_pf(req->hdr.pcifunc)))

		return -EPERM;



	return rvu_cgx_ptp_rx_cfg(rvu, req->hdr.pcifunc, true);

}

drivers/net/ethernet/marvell/octeontx2/nic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ obj-$(CONFIG_OCTEONTX2_VF) += rvu_nicvf.o 
rvu_nicpf-y := otx2_pf.o otx2_common.o otx2_txrx.o otx2_ethtool.o \

               otx2_ptp.o otx2_flows.o otx2_tc.o cn10k.o otx2_dmac_flt.o \

               otx2_devlink.o

rvu_nicvf-y := otx2_vf.o otx2_devlink.o

rvu_nicvf-y := otx2_vf.o otx2_devlink.o otx2_ptp.o



ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+3 −0
Original line number Diff line number Diff line
@@ -834,6 +834,9 @@ int otx2_open(struct net_device *netdev); 
int otx2_stop(struct net_device *netdev);

int otx2_set_real_num_queues(struct net_device *netdev,

			     int tx_queues, int rx_queues);

int otx2_ioctl(struct net_device *netdev, struct ifreq *req, int cmd);

int otx2_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr);



/* MCAM filter related APIs */

int otx2_mcam_flow_init(struct otx2_nic *pf);

int otx2vf_mcam_flow_init(struct otx2_nic *pfvf);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -1347,6 +1347,7 @@ static const struct ethtool_ops otx2vf_ethtool_ops = { 
	.get_pauseparam		= otx2_get_pauseparam,

	.set_pauseparam		= otx2_set_pauseparam,

	.get_link_ksettings     = otx2vf_get_link_ksettings,

	.get_ts_info		= otx2_get_ts_info,

};



void otx2vf_set_ethtool_ops(struct net_device *netdev)

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c

+4 −2
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static int otx2_config_hw_tx_tstamp(struct otx2_nic *pfvf, bool enable) 
	return 0;

}



static int otx2_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)

int otx2_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)

{

	struct otx2_nic *pfvf = netdev_priv(netdev);

	struct hwtstamp_config config;
@@ -2031,8 +2031,9 @@ static int otx2_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr) 
	return copy_to_user(ifr->ifr_data, &config,

			    sizeof(config)) ? -EFAULT : 0;

}

EXPORT_SYMBOL(otx2_config_hwtstamp);



static int otx2_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)

int otx2_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)

{

	struct otx2_nic *pfvf = netdev_priv(netdev);

	struct hwtstamp_config *cfg = &pfvf->tstamp;
@@ -2047,6 +2048,7 @@ static int otx2_ioctl(struct net_device *netdev, struct ifreq *req, int cmd) 
		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL(otx2_ioctl);



static int otx2_do_set_vf_mac(struct otx2_nic *pf, int vf, const u8 *mac)

{