From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Richard Cochran <richardcochran@gmail.com>,
Jacob Keller <jacob.e.keller@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
"David S. Miller" <davem@davemloft.net>
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 [thread overview]
Message-ID: <20150708073239.239127866@linuxfoundation.org> (raw)
In-Reply-To: <20150708073238.785749886@linuxfoundation.org>
4.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Cochran <richardcochran@gmail.com>
[ 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 <richardcochran@gmail.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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 {
next prev parent reply other threads:[~2015-07-08 7:34 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 7:34 [PATCH 4.0 00/55] 4.0.8-stable review Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 01/55] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 02/55] netfilter: nft_rbtree: fix locking Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 03/55] ARM: clk-imx6q: refine satas parent Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 04/55] KVM: nSVM: Check for NRIPS support before updating control field Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 05/55] sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in softirq context Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 06/55] bridge: fix multicast router rlist endless loop Greg Kroah-Hartman
2015-07-08 7:34 ` Greg Kroah-Hartman [this message]
2015-07-08 7:34 ` [PATCH 4.0 08/55] net: dont wait for order-3 page allocation Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 09/55] sctp: fix ASCONF list handling Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 10/55] bridge: fix br_stp_set_bridge_priority race conditions Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 11/55] packet: read num_members once in packet_rcv_fanout() Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 12/55] packet: avoid out of bounds read in round robin fanout Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 13/55] neigh: do not modify unlinked entries Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 14/55] tcp: Do not call tcp_fastopen_reset_cipher from interrupt context Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 15/55] ip: report the original address of ICMP messages Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 16/55] net/mlx4_en: Release TX QP when destroying TX ring Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 17/55] net/mlx4_en: Wake TX queues only when theres enough room Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 18/55] net/mlx4_en: Fix wrong csum complete report when rxvlan offload is disabled Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 19/55] mlx4: Disable HA for SRIOV PF RoCE devices Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 20/55] net: phy: fix phy link up when limiting speed via device tree Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 21/55] bnx2x: fix lockdep splat Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 22/55] sctp: Fix race between OOTB responce and route removal Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 23/55] amd-xgbe: Add the __GFP_NOWARN flag to Rx buffer allocation Greg Kroah-Hartman
2015-07-08 7:34 ` [PATCH 4.0 24/55] net: mvneta: introduce compatible string "marvell, armada-xp-neta" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 25/55] ARM: mvebu: update Ethernet compatible string for Armada XP Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 26/55] net: mvneta: disable IP checksum with jumbo frames for Armada 370 Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 27/55] usb: gadget: f_fs: fix check in read operation Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 28/55] usb: gadget: f_fs: add extra check before unregister_gadget_item Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 29/55] crypto: talitos - avoid memleak in talitos_alg_alloc() Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 30/55] Revert "crypto: talitos - convert to use be16_add_cpu()" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 31/55] iommu/arm-smmu: Fix broken ATOS check Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 32/55] iommu/amd: Handle large pages correctly in free_pagetable Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 33/55] mmc: sdhci: fix low memory corruption Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 34/55] intel_pstate: set BYT MSR with wrmsrl_on_cpu() Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 35/55] selinux: fix setting of security labels on NFS Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 36/55] arm: KVM: force execution of HCPTR access on VM exit Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 37/55] ARM: kvm: psci: fix handling of unimplemented functions Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 38/55] ARM: tegra20: Store CPU "resettable" status in IRAM Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 39/55] ARM: mvebu: fix suspend to RAM on big-endian configurations Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 40/55] tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 41/55] powerpc/perf: Fix book3s kernel to userspace backtraces Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 42/55] x86/PCI: Use host bridge _CRS info on systems with >32 bit addressing Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 43/55] x86/PCI: Use host bridge _CRS info on Foxconn K8M890-8237A Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 44/55] KVM: mips: use id_to_memslot correctly Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 45/55] MIPS: Fix KVM guest fixmap address Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 46/55] KVM: s390: fix external call injection without sigp interpretation Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 47/55] s390/kdump: fix REGSET_VX_LOW vector register ELF notes Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 48/55] KVM: s390: virtio-ccw: dont overwrite config space values Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 51/55] fs: Fix S_NOSEC handling Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 52/55] fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge" Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 53/55] fs/ufs: restore s_lock mutex Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 54/55] vfs: Remove incorrect debugging WARN in prepend_path Greg Kroah-Hartman
2015-07-08 7:35 ` [PATCH 4.0 55/55] vfs: Ignore unlocked mounts in fs_fully_visible Greg Kroah-Hartman
2015-07-08 14:09 ` [PATCH 4.0 00/55] 4.0.8-stable review Guenter Roeck
2015-07-08 16:34 ` Shuah Khan
2015-07-09 4:21 ` Sudip Mukherjee
2015-07-10 17:31 ` Greg Kroah-Hartman
2015-07-11 9:47 ` Sudip Mukherjee
2015-07-11 11:03 ` Sudip Mukherjee
2015-07-11 12:51 ` Sudip Mukherjee
2015-07-11 14:39 ` Greg Kroah-Hartman
2015-07-10 16:05 ` Kevin Hilman
2015-07-10 17:34 ` Greg Kroah-Hartman
2015-07-10 18:53 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150708073239.239127866@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).