Merge pull request #8 from etantilov/idpf-update-00768

Intel official release 0.0.768

Author: etantilov

idpf.spec

@@ -1,6 +1,6 @@
 Name: idpf
 Summary: Infrastructure Data Path Function Linux Driver
-Version: 0.0.766
+Version: 0.0.768
 Release: %{?dist}
 Source: %{name}-%{version}.tar.gz
 Vendor: Intel Corporation

idpf/pci.updates

@@ -9,7 +9,7 @@
 #             (numerical order).
 #
 8086  Intel Corporation
-        1452  Smart Network Adapter ES2000
-        145c  Smart Network Adapter ES2000 Virtual Function
+        1452  Infrastructure Data Path Function
+        145c  Infrastructure Data Path Function
         0dd5  SIOV Virtual Function
 

idpf/src/idpf.h

@@ -52,7 +52,7 @@ struct idpf_rss_data;
 #endif /* CONFIG_IOMMU_BYPASS */
 
 #define IDPF_DRV_NAME "idpf"
-#define IDPF_DRV_VER "0.0.766"
+#define IDPF_DRV_VER "0.0.768"
 
 #define IDPF_M(m, s)	((m) << (s))
 

idpf/src/idpf_ethtool.c

@@ -1611,8 +1611,13 @@ static void idpf_get_drvinfo(struct net_device *netdev,
  *
  * Set the Tx/Rx timestamp filters
  */
+#ifdef HAVE_ETHTOOL_KERNEL_TS_INFO
+static void idpf_set_timestamp_filters(struct idpf_vport *vport,
+				       struct kernel_ethtool_ts_info *info)
+#else
 static void idpf_set_timestamp_filters(struct idpf_vport *vport,
 				       struct ethtool_ts_info *info)
+#endif /* HAVE_ETHTOOL_KERNEL_TS_INFO */
 {
 	if (vport->adapter->ptp.tx_tstamp_access == IDPF_PTP_NONE ||
 	    !vport->tx_tstamp_caps)
@@ -1634,8 +1639,13 @@ static void idpf_set_timestamp_filters(struct idpf_vport *vport,
  * @netdev: network interface device structure
  * @info: ethtool timestamping info structure
  */
+#ifdef HAVE_ETHTOOL_KERNEL_TS_INFO
+static int idpf_get_ts_info(struct net_device *netdev,
+			    struct kernel_ethtool_ts_info *info)
+#else
 static int idpf_get_ts_info(struct net_device *netdev,
 			    struct ethtool_ts_info *info)
+#endif /* HAVE_ETHTOOL_KERNEL_TS_INFO */
 {
 	struct idpf_adapter *adapter = idpf_netdev_to_adapter(netdev);
 	struct idpf_vport *vport;

idpf/src/idpf_lib.c

@@ -1799,7 +1799,7 @@ void idpf_tstamp_task(struct work_struct *work)
 
 	vport = container_of(work, struct idpf_vport, tstamp_task);
 
-	idpf_ptp_get_tx_tstamp(vport);
+	idpf_ptp_get_tx_tstamp_mb(vport);
 }
 
 /**

idpf/src/idpf_main.c

@@ -263,6 +263,9 @@ static int idpf_cfg_hw(struct idpf_adapter *adapter)
 	return 0;
 }
 
+static struct lock_class_key idpf_pf_init_ctrl_lock_key;
+static struct lock_class_key idpf_pf_work_lock_key;
+
 /**
  * idpf_probe - Device initialization routine
  * @pdev: PCI device information struct
@@ -312,9 +315,24 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	adapter->req_tx_splitq = true;
 	adapter->req_rx_splitq = true;
 
+	mutex_init(&adapter->init_ctrl_lock);
+	mutex_init(&adapter->vport_ctrl_lock);
+	mutex_init(&adapter->vector_lock);
+	mutex_init(&adapter->queue_lock);
+
+	INIT_DELAYED_WORK(&adapter->init_task, idpf_init_task);
+	INIT_DELAYED_WORK(&adapter->serv_task, idpf_service_task);
+	INIT_DELAYED_WORK(&adapter->mbx_task, idpf_mbx_task);
+	INIT_DELAYED_WORK(&adapter->stats_task, idpf_statistics_task);
+	INIT_DELAYED_WORK(&adapter->vc_event_task, idpf_vc_event_task);
+
 	switch (ent->device) {
 	case IDPF_DEV_ID_PF:
 		idpf_dev_ops_init(adapter);
+		lockdep_set_class(&adapter->init_ctrl_lock,
+				  &idpf_pf_init_ctrl_lock_key);
+		lockdep_init_map(&adapter->vc_event_task.work.lockdep_map,
+				 "idpf-PF-vc-work", &idpf_pf_work_lock_key, 0);
 		break;
 	case IDPF_DEV_ID_VF:
 		idpf_vf_dev_ops_init(adapter);
@@ -439,16 +457,6 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	adapter->adi_info.vdcm_init_ok = (adapter->dev_ops.vdcm_init &&
 			adapter->dev_ops.vdcm_init(adapter->pdev) == 0);
 #endif /* CONFIG_VFIO_MDEV && HAVE_PASID_SUPPORT */
-	mutex_init(&adapter->init_ctrl_lock);
-	mutex_init(&adapter->vport_ctrl_lock);
-	mutex_init(&adapter->vector_lock);
-	mutex_init(&adapter->queue_lock);
-
-	INIT_DELAYED_WORK(&adapter->init_task, idpf_init_task);
-	INIT_DELAYED_WORK(&adapter->serv_task, idpf_service_task);
-	INIT_DELAYED_WORK(&adapter->mbx_task, idpf_mbx_task);
-	INIT_DELAYED_WORK(&adapter->stats_task, idpf_statistics_task);
-	INIT_DELAYED_WORK(&adapter->vc_event_task, idpf_vc_event_task);
 
 	adapter->dev_ops.reg_ops.reset_reg_init(adapter);
 	set_bit(IDPF_HR_DRV_LOAD, adapter->flags);

idpf/src/idpf_ptp.c

@@ -624,19 +624,20 @@ u64 idpf_ptp_tstamp_extend_32b_to_64b(u64 cached_phc_time, u32 in_timestamp)
  * time stored in the device private PTP structure as the basis for timestamp
  * extension.
  */
-u64 idpf_ptp_extend_ts(struct idpf_adapter *adapter, u32 in_tstamp)
+u64 idpf_ptp_extend_ts(struct idpf_adapter *adapter, u64 in_tstamp)
 {
 	unsigned long discard_time;
-	u64 ticks;
+	u32 tstamp;
 
 	discard_time = adapter->ptp.cached_phc_jiffies + msecs_to_jiffies(2000);
 
 	if (time_is_before_jiffies(discard_time))
 		return 0;
 
-	ticks =  idpf_ptp_tstamp_extend_32b_to_64b(adapter->ptp.cached_phc_time,
-						   in_tstamp);
-	return ticks;
+	tstamp = lower_32_bits(in_tstamp);
+
+	return idpf_ptp_tstamp_extend_32b_to_64b(adapter->ptp.cached_phc_time,
+						 tstamp);
 }
 
 /**
@@ -654,6 +655,7 @@ s8 idpf_ptp_request_ts(struct idpf_vport *vport, struct sk_buff *skb)
 {
 	struct idpf_ptp_tx_tstamp *ptp_tx_tstamp;
 	struct list_head *head;
+	unsigned long flags;
 	u8 idx = -1;
 
 	if (!vport->tx_tstamp_caps)
@@ -665,24 +667,102 @@ s8 idpf_ptp_request_ts(struct idpf_vport *vport, struct sk_buff *skb)
 		return idx;
 
 	/* Get the index from the free latches list */
-	mutex_lock(&vport->tx_tstamp_caps->lock_free);
+	spin_lock_irqsave(&vport->tx_tstamp_caps->lock_free, flags);
 	ptp_tx_tstamp = list_first_entry(head, struct idpf_ptp_tx_tstamp,
 					 list_member);
 	list_del(&ptp_tx_tstamp->list_member);
-	mutex_unlock(&vport->tx_tstamp_caps->lock_free);
+	spin_unlock_irqrestore(&vport->tx_tstamp_caps->lock_free, flags);
 
 	ptp_tx_tstamp->skb = skb_get(skb);
 	skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
 
 	/* Move the element to the used latches list */
-	mutex_lock(&vport->tx_tstamp_caps->lock_in_use);
+	spin_lock_irqsave(&vport->tx_tstamp_caps->lock_in_use, flags);
 	list_add(&ptp_tx_tstamp->list_member,
 		 &vport->tx_tstamp_caps->latches_in_use);
-	mutex_unlock(&vport->tx_tstamp_caps->lock_in_use);
+	spin_unlock_irqrestore(&vport->tx_tstamp_caps->lock_in_use, flags);
 
 	return ptp_tx_tstamp->idx;
 }
 
+/**
+ * idpf_ptp_get_tx_tstamp - Read the Tx timestamp value
+ * @vport: Virtual port structure
+ *
+ * Read the Tx timestamp value directly - through BAR registers - and provide
+ * it back to the skb.
+ *
+ * Return: 0 on success, negative error code on failure.
+ */
+int idpf_ptp_get_tx_tstamp(struct idpf_vport *vport)
+{
+	struct idpf_ptp_vport_tx_tstamp_caps *tx_tstamp_caps;
+	u32 tstamp_lo, tstamp_hi, offset_lo, offset_hi;
+	struct skb_shared_hwtstamps shhwtstamps = {};
+	struct idpf_ptp_tx_tstamp *ptp_tx_tstamp;
+	struct idpf_ptp_tx_tstamp_status *status;
+	u64 tstamp, extended_tstamp;
+	u8 tstamp_ns_lo_bit, valid;
+	struct list_head *head;
+	bool idx_found = false;
+	unsigned long flags;
+	u16 i;
+
+	tx_tstamp_caps = vport->tx_tstamp_caps;
+	head =  &tx_tstamp_caps->latches_in_use;
+
+	/* Find a proper idx on the used-latches list */
+	spin_lock_irqsave(&tx_tstamp_caps->lock_in_use, flags);
+	list_for_each_entry(ptp_tx_tstamp, head, list_member) {
+		for (i = 0; i < tx_tstamp_caps->num_entries; i++) {
+			status = &tx_tstamp_caps->tx_tstamp_status[i];
+			if (status->skb == ptp_tx_tstamp->skb  &&
+			    status->state == IDPF_PTP_REQUEST) {
+				status->state = IDPF_PTP_READ_VALUE;
+				list_del(&ptp_tx_tstamp->list_member);
+				idx_found = true;
+				break;
+			}
+		}
+
+		if (idx_found)
+			break;
+	}
+	spin_unlock_irqrestore(&tx_tstamp_caps->lock_in_use, flags);
+
+	if (!idx_found)
+		return -EACCES;
+
+	offset_lo = ptp_tx_tstamp->tx_latch_reg_offset_l;
+	offset_hi = ptp_tx_tstamp->tx_latch_reg_offset_h;
+
+	tstamp_lo = readl(idpf_get_reg_addr(vport->adapter, offset_lo));
+	tstamp_hi = readl(idpf_get_reg_addr(vport->adapter, offset_hi));
+	tstamp = (u64)tstamp_hi << 32 | tstamp_lo;
+	valid = tstamp & IDPF_PTP_VALID_BIT;
+
+	if (!valid)
+		return -EIO;
+
+	/* Move tstamp value to skip ns part and the valid bit */
+	tstamp_ns_lo_bit = tx_tstamp_caps->tstamp_ns_lo_bit;
+	tstamp >>= tstamp_ns_lo_bit + 1;
+
+	extended_tstamp = idpf_ptp_extend_ts(vport->adapter, tstamp);
+
+	shhwtstamps.hwtstamp = ns_to_ktime(extended_tstamp);
+	skb_tstamp_tx(ptp_tx_tstamp->skb, &shhwtstamps);
+	dev_kfree_skb_any(ptp_tx_tstamp->skb);
+
+	/* Free the latch index */
+	status->state = IDPF_PTP_FREE;
+	spin_lock_irqsave(&tx_tstamp_caps->lock_free, flags);
+	list_add(&ptp_tx_tstamp->list_member, &tx_tstamp_caps->latches_free);
+	spin_unlock_irqrestore(&tx_tstamp_caps->lock_free, flags);
+
+	return 0;
+}
+
 /**
  * idpf_set_rx_tstamp - Enable or disable Rx timestamping
  * @vport: Virtual port structure
@@ -694,7 +774,7 @@ static void idpf_ptp_set_rx_tstamp(struct idpf_vport *vport, bool on)
 	u16 i;
 
 	access = vport->adapter->ptp.tx_tstamp_access;
-	if (access != IDPF_PTP_MAILBOX)
+	if (access == IDPF_PTP_NONE)
 		return;
 
 	for (i = 0; i < vport->dflt_grp.q_grp.num_rxq; i++)
@@ -887,6 +967,7 @@ static void idpf_ptp_release_tstamp(struct idpf_adapter *adapter)
 {
 	struct idpf_ptp_tx_tstamp *ptp_tx_tstamp, *tmp;
 	struct list_head *head;
+	unsigned long flags;
 	int i;
 
 	idpf_for_each_vport(adapter, i) {
@@ -898,28 +979,28 @@ static void idpf_ptp_release_tstamp(struct idpf_adapter *adapter)
 		cancel_work_sync(&vport->tstamp_task);
 
 		/* Remove list with free latches */
-		mutex_lock(&vport->tx_tstamp_caps->lock_free);
+		spin_lock_irqsave(&vport->tx_tstamp_caps->lock_free, flags);
 
 		head = &vport->tx_tstamp_caps->latches_free;
 		list_for_each_entry_safe(ptp_tx_tstamp, tmp, head, list_member) {
 			list_del(&ptp_tx_tstamp->list_member);
 			kfree(ptp_tx_tstamp);
 		}
 
-		mutex_unlock(&vport->tx_tstamp_caps->lock_free);
-		mutex_destroy(&vport->tx_tstamp_caps->lock_free);
+		spin_unlock_irqrestore(&vport->tx_tstamp_caps->lock_free,
+				       flags);
 
 		/* Remove list with latches in use */
-		mutex_lock(&vport->tx_tstamp_caps->lock_in_use);
+		spin_lock_irqsave(&vport->tx_tstamp_caps->lock_in_use, flags);
 
 		head = &vport->tx_tstamp_caps->latches_in_use;
 		list_for_each_entry_safe(ptp_tx_tstamp, tmp, head, list_member) {
 			list_del(&ptp_tx_tstamp->list_member);
 			kfree(ptp_tx_tstamp);
 		}
 
-		mutex_unlock(&vport->tx_tstamp_caps->lock_in_use);
-		mutex_destroy(&vport->tx_tstamp_caps->lock_in_use);
+		spin_unlock_irqrestore(&vport->tx_tstamp_caps->lock_in_use,
+				       flags);
 
 		kfree(vport->tx_tstamp_caps->tx_tstamp_status);
 		kfree(vport->tx_tstamp_caps);

idpf/src/idpf_ptp.h

@@ -10,6 +10,8 @@
 #include <linux/ptp_clock_kernel.h>
 #include <linux/ptp_classify.h>
 
+#define IDPF_PTP_VALID_BIT BIT(0)
+
 enum idpf_ptp_access {
 	IDPF_PTP_NONE = 0,
 	IDPF_PTP_DIRECT,
@@ -110,8 +112,8 @@ struct idpf_ptp_vport_tx_tstamp_caps {
 	u32 vport_id;
 	u16 num_entries;
 	u8 tstamp_ns_lo_bit;
-	struct mutex lock_in_use; /* lock to used latches list */
-	struct mutex lock_free; /* lock to free latches list */
+	spinlock_t lock_in_use; /* lock to used latches list */
+	spinlock_t lock_free; /* lock to free latches list */
 	struct list_head latches_free;
 	struct list_head latches_in_use;
 	struct idpf_ptp_tx_tstamp_status *tx_tstamp_status;
@@ -175,11 +177,12 @@ int idpf_ptp_get_cross_time(struct idpf_adapter *adapter,
 int idpf_ptp_set_dev_clk_time(struct idpf_adapter *adapter, u64 time);
 int idpf_ptp_adj_dev_clk_fine(struct idpf_adapter *adapter, u64 incval);
 int idpf_ptp_adj_dev_clk_time(struct idpf_adapter *adapter, s64 delta);
+int idpf_ptp_get_tx_tstamp_mb(struct idpf_vport *vport);
 int idpf_ptp_get_tx_tstamp(struct idpf_vport *vport);
 int idpf_ptp_get_ts_config(struct idpf_vport *vport, struct ifreq *ifr);
 int idpf_ptp_set_ts_config(struct idpf_vport *vport, struct ifreq *ifr);
 s8 idpf_ptp_request_ts(struct idpf_vport *vport, struct sk_buff *skb);
-u64 idpf_ptp_extend_ts(struct idpf_adapter *adapter, u32 in_tstamp);
+u64 idpf_ptp_extend_ts(struct idpf_adapter *adapter, u64 in_tstamp);
 u64 idpf_ptp_tstamp_extend_32b_to_64b(u64 cached_phc_time, u32 in_timestamp);
 #else /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
 static inline int idpf_ptp_get_caps(struct idpf_adapter *adapter)
@@ -232,6 +235,11 @@ static inline int idpf_ptp_adj_dev_clk_time(struct idpf_adapter *adapter,
 	return -EOPNOTSUPP;
 }
 
+static inline int idpf_ptp_get_tx_tstamp_mb(struct idpf_vport *vport)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline int idpf_ptp_get_tx_tstamp(struct idpf_vport *vport)
 {
 	return -EOPNOTSUPP;
@@ -256,7 +264,7 @@ static inline s8 idpf_ptp_request_ts(struct idpf_vport *vport,
 }
 
 static inline u64 idpf_ptp_extend_ts(struct idpf_adapter *adapter,
-				     u32 in_tstamp)
+				     u64 in_tstamp)
 {
 	return 0;
 }
@@ -266,5 +274,6 @@ static inline u64 idpf_ptp_tstamp_extend_32b_to_64b(u64 cached_phc_time,
 {
 	return 0;
 }
+
 #endif /* IS_ENABLED(CONFIG_PTP_1588_CLOCK) */
 #endif /* _IDPF_PTP_H_ */