lkml.org 
[lkml]   [2014]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] Fix e1000e with Intel 82572EI that has no hardware timestamp support
From
On Wed, Aug 6, 2014 at 11:10 PM, Koehrer Mathias (ETAS/ESW5)
<mathias.koehrer@etas.com> wrote:
> With the Intel 82527EI (driver: e1000e) there is an issue when running
> the ptpd2 program, that leads to a kernel oops. The reason is here that
> in e1000_xmit_frame() a work queue will be scheduled that has not been
> initialized in this case. The work queue "tx_hwstamp_work" will only be
> initialized if adapter->flags & FLAG_HAS_HW_TIMESTAMP set. This check
> is missing in e1000_xmit_frame().
>
> The following patch adds the missing check.
>
> Signed-off-by: Mathias Koehrer <mathias.koehrer@etas.com>
>
> ---
> drivers/net/ethernet/intel/e1000e/netdev.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Index: linux-3.12.26/drivers/net/ethernet/intel/e1000e/netdev.c
> ===================================================================
> --- linux-3.12.26.orig/drivers/net/ethernet/intel/e1000e/netdev.c 2014-08-04 10:56:56.000000000 +0200
> +++ linux-3.12.26/drivers/net/ethernet/intel/e1000e/netdev.c 2014-08-07 08:05:17.000000000 +0200
> @@ -5550,7 +5550,8 @@
> nr_frags);
> if (count) {
> if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
> - !adapter->tx_hwtstamp_skb)) {
> + !adapter->tx_hwtstamp_skb &&
> + (adapter->flags & FLAG_HAS_HW_TIMESTAMP))) {
> skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
> tx_flags |= E1000_TX_FLAGS_HWTSTAMP;
> adapter->tx_hwtstamp_skb = skb_get(skb);
>

So is this v2 of your patch? and you are ignoring Alex's last suggestion to do:

unlikely(skb->tx_flags & HW_TSTAMP) &&
(adapter->flags & HAS_HW_TSTAMP) &&
!adapter->tx_hwtstamp_skb

Just wondering....

--
Cheers,
Jeff


\
 
 \ /
  Last update: 2014-08-07 08:41    [W:0.044 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site