Commit 5cb8805d authored by Milena Olech's avatar Milena Olech Committed by Tony Nguyen
Browse files

idpf: negotiate PTP capabilities and get PTP clock 



PTP capabilities are negotiated using virtchnl command. Add get
capabilities function, direct access to read the PTP clock.
Set initial PTP capabilities exposed to the stack.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarMilena Olech <milena.olech@intel.com>
Tested-by: default avatarWillem de Bruijn <willemb@google.com>
Tested-by: default avatarMina Almasry <almasrymina@google.com>
Tested-by: default avatarSamuel Salin <Samuel.salin@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent c5d0607f

drivers/net/ethernet/intel/idpf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ idpf-y := \ 
	idpf_vf_dev.o



idpf-$(CONFIG_IDPF_SINGLEQ)	+= idpf_singleq_txrx.o



idpf-$(CONFIG_PTP_1588_CLOCK)	+= idpf_ptp.o

idpf-$(CONFIG_PTP_1588_CLOCK)	+= idpf_virtchnl_ptp.o

drivers/net/ethernet/intel/idpf/idpf.h

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ struct idpf_vport_max_q { 
 * @mb_intr_reg_init: Mailbox interrupt register initialization

 * @reset_reg_init: Reset register initialization

 * @trigger_reset: Trigger a reset to occur

 * @ptp_reg_init: PTP register initialization

 */

struct idpf_reg_ops {

	void (*ctlq_reg_init)(struct idpf_ctlq_create_info *cq);
@@ -197,6 +198,7 @@ struct idpf_reg_ops { 
	void (*reset_reg_init)(struct idpf_adapter *adapter);

	void (*trigger_reset)(struct idpf_adapter *adapter,

			      enum idpf_flags trig_cause);

	void (*ptp_reg_init)(const struct idpf_adapter *adapter);

};



/**

drivers/net/ethernet/intel/idpf/idpf_dev.c

+14 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "idpf.h"

#include "idpf_lan_pf_regs.h"

#include "idpf_virtchnl.h"

#include "idpf_ptp.h"



#define IDPF_PF_ITR_IDX_SPACING		0x4
@@ -148,6 +149,18 @@ static void idpf_trigger_reset(struct idpf_adapter *adapter, 
	       idpf_get_reg_addr(adapter, PFGEN_CTRL));

}



/**

 * idpf_ptp_reg_init - Initialize required registers

 * @adapter: Driver specific private structure

 *

 * Set the bits required for enabling shtime and cmd execution

 */

static void idpf_ptp_reg_init(const struct idpf_adapter *adapter)

{

	adapter->ptp->cmd.shtime_enable_mask = PF_GLTSYN_CMD_SYNC_SHTIME_EN_M;

	adapter->ptp->cmd.exec_cmd_mask = PF_GLTSYN_CMD_SYNC_EXEC_CMD_M;

}



/**

 * idpf_reg_ops_init - Initialize register API function pointers

 * @adapter: Driver specific private structure
@@ -159,6 +172,7 @@ static void idpf_reg_ops_init(struct idpf_adapter *adapter) 
	adapter->dev_ops.reg_ops.mb_intr_reg_init = idpf_mb_intr_reg_init;

	adapter->dev_ops.reg_ops.reset_reg_init = idpf_reset_reg_init;

	adapter->dev_ops.reg_ops.trigger_reset = idpf_trigger_reset;

	adapter->dev_ops.reg_ops.ptp_reg_init = idpf_ptp_reg_init;

}



/**

drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ 
#define PF_FW_ATQH_ATQH_M		GENMASK(9, 0)

#define PF_FW_ATQT			(PF_FW_BASE + 0x24)



/* Timesync registers */

#define PF_GLTSYN_CMD_SYNC_EXEC_CMD_M	GENMASK(1, 0)

#define PF_GLTSYN_CMD_SYNC_SHTIME_EN_M	BIT(2)



/* Interrupts */

#define PF_GLINT_BASE			0x08900000

#define PF_GLINT_DYN_CTL(_INT)		(PF_GLINT_BASE + ((_INT) * 0x1000))

drivers/net/ethernet/intel/idpf/idpf_ptp.c

+170 −0
Original line number Diff line number Diff line
@@ -4,6 +4,163 @@ 
#include "idpf.h"

#include "idpf_ptp.h"



/**

 * idpf_ptp_get_access - Determine the access type of the PTP features

 * @adapter: Driver specific private structure

 * @direct: Capability that indicates the direct access

 * @mailbox: Capability that indicates the mailbox access

 *

 * Return: the type of supported access for the PTP feature.

 */

static enum idpf_ptp_access

idpf_ptp_get_access(const struct idpf_adapter *adapter, u32 direct, u32 mailbox)

{

	if (adapter->ptp->caps & direct)

		return IDPF_PTP_DIRECT;

	else if (adapter->ptp->caps & mailbox)

		return IDPF_PTP_MAILBOX;

	else

		return IDPF_PTP_NONE;

}



/**

 * idpf_ptp_get_features_access - Determine the access type of PTP features

 * @adapter: Driver specific private structure

 *

 * Fulfill the adapter structure with type of the supported PTP features

 * access.

 */

void idpf_ptp_get_features_access(const struct idpf_adapter *adapter)

{

	struct idpf_ptp *ptp = adapter->ptp;

	u32 direct, mailbox;



	/* Get the device clock time */

	direct = VIRTCHNL2_CAP_PTP_GET_DEVICE_CLK_TIME;

	mailbox = VIRTCHNL2_CAP_PTP_GET_DEVICE_CLK_TIME_MB;

	ptp->get_dev_clk_time_access = idpf_ptp_get_access(adapter,

							   direct,

							   mailbox);

}



/**

 * idpf_ptp_enable_shtime - Enable shadow time and execute a command

 * @adapter: Driver specific private structure

 */

static void idpf_ptp_enable_shtime(struct idpf_adapter *adapter)

{

	u32 shtime_enable, exec_cmd;



	/* Get offsets */

	shtime_enable = adapter->ptp->cmd.shtime_enable_mask;

	exec_cmd = adapter->ptp->cmd.exec_cmd_mask;



	/* Set the shtime en and the sync field */

	writel(shtime_enable, adapter->ptp->dev_clk_regs.cmd_sync);

	writel(exec_cmd | shtime_enable, adapter->ptp->dev_clk_regs.cmd_sync);

}



/**

 * idpf_ptp_read_src_clk_reg_direct - Read directly the main timer value

 * @adapter: Driver specific private structure

 * @sts: Optional parameter for holding a pair of system timestamps from

 *	 the system clock. Will be ignored when NULL is given.

 *

 * Return: the device clock time.

 */

static u64 idpf_ptp_read_src_clk_reg_direct(struct idpf_adapter *adapter,

					    struct ptp_system_timestamp *sts)

{

	struct idpf_ptp *ptp = adapter->ptp;

	u32 hi, lo;



	spin_lock(&ptp->read_dev_clk_lock);



	/* Read the system timestamp pre PHC read */

	ptp_read_system_prets(sts);



	idpf_ptp_enable_shtime(adapter);



	/* Read the system timestamp post PHC read */

	ptp_read_system_postts(sts);



	lo = readl(ptp->dev_clk_regs.dev_clk_ns_l);

	hi = readl(ptp->dev_clk_regs.dev_clk_ns_h);



	spin_unlock(&ptp->read_dev_clk_lock);



	return ((u64)hi << 32) | lo;

}



/**

 * idpf_ptp_read_src_clk_reg - Read the main timer value

 * @adapter: Driver specific private structure

 * @src_clk: Returned main timer value in nanoseconds unit

 * @sts: Optional parameter for holding a pair of system timestamps from

 *	 the system clock. Will be ignored if NULL is given.

 *

 * Return: the device clock time on success, -errno otherwise.

 */

static int idpf_ptp_read_src_clk_reg(struct idpf_adapter *adapter, u64 *src_clk,

				     struct ptp_system_timestamp *sts)

{

	switch (adapter->ptp->get_dev_clk_time_access) {

	case IDPF_PTP_NONE:

		return -EOPNOTSUPP;

	case IDPF_PTP_DIRECT:

		*src_clk = idpf_ptp_read_src_clk_reg_direct(adapter, sts);

		break;

	default:

		return -EOPNOTSUPP;

	}



	return 0;

}



/**

 * idpf_ptp_gettimex64 - Get the time of the clock

 * @info: the driver's PTP info structure

 * @ts: timespec64 structure to hold the current time value

 * @sts: Optional parameter for holding a pair of system timestamps from

 *	 the system clock. Will be ignored if NULL is given.

 *

 * Return: the device clock value in ns, after converting it into a timespec

 * struct on success, -errno otherwise.

 */

static int idpf_ptp_gettimex64(struct ptp_clock_info *info,

			       struct timespec64 *ts,

			       struct ptp_system_timestamp *sts)

{

	struct idpf_adapter *adapter = idpf_ptp_info_to_adapter(info);

	u64 time_ns;

	int err;



	err = idpf_ptp_read_src_clk_reg(adapter, &time_ns, sts);

	if (err)

		return -EACCES;



	*ts = ns_to_timespec64(time_ns);



	return 0;

}



/**

 * idpf_ptp_set_caps - Set PTP capabilities

 * @adapter: Driver specific private structure

 *

 * This function sets the PTP functions.

 */

static void idpf_ptp_set_caps(const struct idpf_adapter *adapter)

{

	struct ptp_clock_info *info = &adapter->ptp->info;



	snprintf(info->name, sizeof(info->name), "%s-%s-clk",

		 KBUILD_MODNAME, pci_name(adapter->pdev));



	info->owner = THIS_MODULE;

	info->gettimex64 = idpf_ptp_gettimex64;

}



/**

 * idpf_ptp_create_clock - Create PTP clock device for userspace

 * @adapter: Driver specific private structure
@@ -16,6 +173,8 @@ static int idpf_ptp_create_clock(const struct idpf_adapter *adapter) 
{

	struct ptp_clock *clock;



	idpf_ptp_set_caps(adapter);



	/* Attempt to register the clock before enabling the hardware. */

	clock = ptp_clock_register(&adapter->ptp->info,

				   &adapter->pdev->dev);
@@ -56,10 +215,21 @@ int idpf_ptp_init(struct idpf_adapter *adapter) 
	/* add a back pointer to adapter */

	adapter->ptp->adapter = adapter;



	if (adapter->dev_ops.reg_ops.ptp_reg_init)

		adapter->dev_ops.reg_ops.ptp_reg_init(adapter);



	err = idpf_ptp_get_caps(adapter);

	if (err) {

		pci_err(adapter->pdev, "Failed to get PTP caps err %d\n", err);

		goto free_ptp;

	}



	err = idpf_ptp_create_clock(adapter);

	if (err)

		goto free_ptp;



	spin_lock_init(&adapter->ptp->read_dev_clk_lock);



	pci_dbg(adapter->pdev, "PTP init successful\n");



	return 0;