Skip to content

W
White Rabbit Switch - Software
Commit 15f14d49 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kernel modules: adapt to 2.6.39 tstamp interface

parent 10426b79
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 22 deletions
kernel/wr_nic/nic-core.c
View file @ 15f14d49
......@@ -16,6 +16,7 @@
#include <linux/etherdevice.h>
#include <linux/errno.h>
#include <linux/spinlock.h>
#include <linux/net_tstamp.h>
#include <asm/unaligned.h>
#include "wr-nic.h"
......@@ -147,7 +148,7 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct wrn_ep *ep = netdev_priv(dev);
struct wrn_dev *wrn = ep->wrn;
union skb_shared_tx *shtx = skb_tx(skb);
struct skb_shared_info *info = skb_shinfo(skb);
unsigned long flags;
int desc;
int id;
......@@ -185,7 +186,7 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
//netif_stop_queue(dev); /* Queue stopped until tx is over (FIXME?) */
/* FIXME: check the WRN_EP_STAMPING_TX flag and its meaning */
if (shtx->hardware) {
if (info->tx_flags & SKBTX_HW_TSTAMP) {
/* hardware timestamping is enabled */
do_stamp = 1;
}
......@@ -267,6 +268,7 @@ static void __wrn_rx_descriptor(struct wrn_dev *wrn, int desc)
int epnum, off, len;
u32 ts_r, ts_f;
struct skb_shared_hwtstamps *hwts;
struct timespec ts;
u32 counter_ppsg; /* PPS generator nanosecond counter */
u32 utc;
s32 cntr_diff;
......@@ -327,18 +329,19 @@ static void __wrn_rx_descriptor(struct wrn_dev *wrn, int desc)
if(counter_ppsg < REFCLK_FREQ/4 && ts_r > 3*REFCLK_FREQ/4)
utc--;
hwts->hwtstamp.tv.sec = (s32)utc & 0x7fffffff;
ts.tv_sec = (s32)utc & 0x7fffffff;
cntr_diff = (ts_r & 0xf) - ts_f;
/* the bit says the rising edge cnter is 1tick ahead */
if(cntr_diff == 1 || cntr_diff == (-0xf))
hwts->hwtstamp.tv.sec |= 0x80000000;
hwts->hwtstamp.tv.nsec = ts_r * 8; /* scale to nanoseconds */
ts.tv_sec |= 0x80000000;
ts.tv_nsec = ts_r * 8; /* scale to nanoseconds */
pr_debug("Timestamp: %d:%d, ahead = %d\n",
hwts->hwtstamp.tv.sec & 0x7fffffff,
hwts->hwtstamp.tv.nsec & 0x7fffffff,
hwts->hwtstamp.tv.sec & 0x80000000 ? 1 :0);
pr_debug("Timestamp: %li:%li, ahead = %d\n",
ts.tv_sec & 0x7fffffff,
ts.tv_nsec & 0x7fffffff,
ts.tv_sec & 0x80000000 ? 1 :0);
hwts->hwtstamp = timespec_to_ktime(ts);
skb->protocol = eth_type_trans(skb, dev);
skb->ip_summed = CHECKSUM_UNNECESSARY;
dev->last_rx = jiffies;
......@@ -368,7 +371,8 @@ static void wrn_tx_interrupt(struct wrn_dev *wrn)
{
struct wrn_txd *tx;
struct sk_buff *skb;
union skb_shared_tx *shtx;
struct skb_shared_info *info;
u32 reg;
int i;
......@@ -381,11 +385,11 @@ static void wrn_tx_interrupt(struct wrn_dev *wrn)
return; /* no more */
skb = wrn->skb_desc[i].skb;
shtx = skb_tx(skb);
info = skb_shinfo(skb);
if (shtx->hardware) {
if (info->tx_flags & SKBTX_HW_TSTAMP) {
/* hardware timestamping is enabled */
shtx->in_progress = 1;
info->tx_flags |= SKBTX_IN_PROGRESS;
pr_debug("%s: %i -- in progress\n", __func__, __LINE__);
wrn_tstamp_find_skb(wrn, i);
/* It has been freed if found; otherwise keep it */
......
kernel/wr_nic/timestamp.c
View file @ 15f14d49
......@@ -20,6 +20,7 @@ void wrn_tstamp_find_skb(struct wrn_dev *wrn, int desc)
{
struct skb_shared_hwtstamps *hwts;
struct sk_buff *skb = wrn->skb_desc[desc].skb;
struct timespec ts;
int id = wrn->skb_desc[desc].id;
u32 counter_ppsg; /* PPS generator nanosecond counter */
u32 utc;
......@@ -41,8 +42,9 @@ void wrn_tstamp_find_skb(struct wrn_dev *wrn, int desc)
if(counter_ppsg > 3*REFCLK_FREQ/4 && wrn->ts_buf[i].ts < REFCLK_FREQ/4)
utc--;
hwts->hwtstamp.tv.sec = (s32)utc & 0x7fffffff;
hwts->hwtstamp.tv.nsec = wrn->ts_buf[i].ts * 8; /* scale to nsecs */
ts.tv_sec = (s32)utc & 0x7fffffff;
ts.tv_nsec = wrn->ts_buf[i].ts * 8; /* scale to nsecs */
hwts->hwtstamp = timespec_to_ktime(ts);
skb_tstamp_tx(skb, hwts);
dev_kfree_skb_irq(skb);
......@@ -52,17 +54,18 @@ void wrn_tstamp_find_skb(struct wrn_dev *wrn, int desc)
}
/* This function records the timestamp in a list -- called from interrupt */
static int record_tstamp(struct wrn_dev *wrn, u32 ts, u32 idreg)
static int record_tstamp(struct wrn_dev *wrn, u32 tsval, u32 idreg)
{
int port_id = TXTSU_TSF_R1_PID_R(idreg);
int frame_id = TXTSU_TSF_R1_FID_R(idreg);
struct skb_shared_hwtstamps *hwts;
struct timespec ts;
struct sk_buff *skb;
u32 utc, counter_ppsg; /* PPS generator nanosecond counter */
int i; /* FIXME: use list for faster access */
/*printk("%s: Got TS: %x pid %d fid %d\n", __func__,
ts, port_id, frame_id);*/
tsval, port_id, frame_id);*/
/* First of all look if the skb is already pending */
for (i = 0; i < WRN_NR_DESC; i++)
......@@ -75,11 +78,12 @@ static int record_tstamp(struct wrn_dev *wrn, u32 ts, u32 idreg)
hwts = skb_hwtstamps(skb);
wrn_ppsg_read_time(wrn, &counter_ppsg, &utc);
if(counter_ppsg < (ts & 0xfffffff))
if(counter_ppsg < (tsval & 0xfffffff))
utc--;
hwts->hwtstamp.tv.sec = (s32)utc & 0x7fffffff;
hwts->hwtstamp.tv.nsec = (ts & 0xfffffff) * 8; /* scale to nanoseconds */
ts.tv_sec = (s32)utc & 0x7fffffff;
ts.tv_nsec = (tsval & 0xfffffff) * 8; /* scale to nanoseconds */
hwts->hwtstamp = timespec_to_ktime(ts);
skb_tstamp_tx(skb, hwts);
dev_kfree_skb_irq(skb);
wrn->skb_desc[i].skb = 0;
......@@ -95,7 +99,7 @@ static int record_tstamp(struct wrn_dev *wrn, u32 ts, u32 idreg)
return -ENOMEM;
}
pr_debug("%s: save to slot %i\n", __func__, i);
wrn->ts_buf[i].ts = ts;
wrn->ts_buf[i].ts = tsval;
wrn->ts_buf[i].port_id = port_id;
wrn->ts_buf[i].frame_id = frame_id;
wrn->ts_buf[i].valid = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment