Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934843AbbGHIFj (ORCPT ); Wed, 8 Jul 2015 04:05:39 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:43298 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933897AbbGHHgU (ORCPT ); Wed, 8 Jul 2015 03:36:20 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Richard Cochran , Jacob Keller , Jeff Kirsher , "David S. Miller" Subject: [PATCH 4.0 07/55] net: igb: fix the start time for periodic output signals Date: Wed, 8 Jul 2015 00:34:42 -0700 Message-Id: <20150708073239.239127866@linuxfoundation.org> X-Mailer: git-send-email 2.4.5 In-Reply-To: <20150708073238.785749886@linuxfoundation.org> References: <20150708073238.785749886@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1806 Lines: 45 4.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Richard Cochran [ Upstream commit 58c98be137830d34b79024cc5dc95ef54fcd7ffe ] When programming the start of a periodic output, the code wrongly places the seconds value into the "low" register and the nanoseconds into the "high" register. Even though this is backwards, it slipped through my testing, because the re-arming code in the interrupt service routine is correct, and the signal does appear starting with the second edge. This patch fixes the issue by programming the registers correctly. Signed-off-by: Richard Cochran Reviewed-by: Jacob Keller Acked-by: Jeff Kirsher Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/igb/igb_ptp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -540,8 +540,8 @@ static int igb_ptp_feature_enable_i210(s igb->perout[i].start.tv_nsec = rq->perout.start.nsec; igb->perout[i].period.tv_sec = ts.tv_sec; igb->perout[i].period.tv_nsec = ts.tv_nsec; - wr32(trgttiml, rq->perout.start.sec); - wr32(trgttimh, rq->perout.start.nsec); + wr32(trgttimh, rq->perout.start.sec); + wr32(trgttiml, rq->perout.start.nsec); tsauxc |= tsauxc_mask; tsim |= tsim_mask; } else { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/