rpms/kernel/F-11 linux-2.6-x86-delay-tsc-barrier.patch, 1.2, 1.3 kernel.spec, 1.1686, 1.1687
Kyle McMartin
kyle at fedoraproject.org
Mon Aug 10 19:04:31 UTC 2009
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23288
Modified Files:
kernel.spec
Added Files:
linux-2.6-x86-delay-tsc-barrier.patch
Log Message:
linux-2.6-x86-delay-tsc-barrier.patch
linux-2.6-x86-delay-tsc-barrier.patch:
delay.c | 3 +++
1 file changed, 3 insertions(+)
Index: linux-2.6-x86-delay-tsc-barrier.patch
===================================================================
RCS file: linux-2.6-x86-delay-tsc-barrier.patch
diff -N linux-2.6-x86-delay-tsc-barrier.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-x86-delay-tsc-barrier.patch 10 Aug 2009 19:04:31 -0000 1.3
@@ -0,0 +1,69 @@
+From: Pallipadi, Venkatesh <venkatesh.pallipadi at intel.com>
+Date: Thu, 25 Jun 2009 23:44:31 +0000 (-0700)
+Subject: x86, delay: tsc based udelay should have rdtsc_barrier
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e888d7facd1f1460a638151036d15b6cfb3ccc74
+
+x86, delay: tsc based udelay should have rdtsc_barrier
+
+delay_tsc needs rdtsc_barrier to provide proper delay.
+
+Output from a test driver using hpet to cross check delay
+provided by udelay().
+
+Before:
+[ 86.794363] Expected delay 5us actual 4679ns
+[ 87.154362] Expected delay 5us actual 698ns
+[ 87.514162] Expected delay 5us actual 4539ns
+[ 88.653716] Expected delay 5us actual 4539ns
+[ 94.664106] Expected delay 10us actual 9638ns
+[ 95.049351] Expected delay 10us actual 10126ns
+[ 95.416110] Expected delay 10us actual 9568ns
+[ 95.799216] Expected delay 10us actual 9638ns
+[ 103.624104] Expected delay 10us actual 9707ns
+[ 104.020619] Expected delay 10us actual 768ns
+[ 104.419951] Expected delay 10us actual 9707ns
+
+After:
+[ 50.983320] Expected delay 5us actual 5587ns
+[ 51.261807] Expected delay 5us actual 5587ns
+[ 51.565715] Expected delay 5us actual 5657ns
+[ 51.861171] Expected delay 5us actual 5587ns
+[ 52.164704] Expected delay 5us actual 5726ns
+[ 52.487457] Expected delay 5us actual 5657ns
+[ 52.789338] Expected delay 5us actual 5726ns
+[ 57.119680] Expected delay 10us actual 10755ns
+[ 57.893997] Expected delay 10us actual 10615ns
+[ 58.261287] Expected delay 10us actual 10755ns
+[ 58.620505] Expected delay 10us actual 10825ns
+[ 58.941035] Expected delay 10us actual 10755ns
+[ 59.320903] Expected delay 10us actual 10615ns
+[ 61.306311] Expected delay 10us actual 10755ns
+[ 61.520542] Expected delay 10us actual 10615ns
+
+Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi at intel.com>
+Signed-off-by: H. Peter Anvin <hpa at zytor.com>
+---
+
+diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
+index f456860..ff485d3 100644
+--- a/arch/x86/lib/delay.c
++++ b/arch/x86/lib/delay.c
+@@ -55,8 +55,10 @@ static void delay_tsc(unsigned long loops)
+
+ preempt_disable();
+ cpu = smp_processor_id();
++ rdtsc_barrier();
+ rdtscl(bclock);
+ for (;;) {
++ rdtsc_barrier();
+ rdtscl(now);
+ if ((now - bclock) >= loops)
+ break;
+@@ -78,6 +80,7 @@ static void delay_tsc(unsigned long loops)
+ if (unlikely(cpu != smp_processor_id())) {
+ loops -= (now - bclock);
+ cpu = smp_processor_id();
++ rdtsc_barrier();
+ rdtscl(bclock);
+ }
+ }
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1686
retrieving revision 1.1687
diff -u -p -r1.1686 -r1.1687
--- kernel.spec 5 Aug 2009 16:07:43 -0000 1.1686
+++ kernel.spec 10 Aug 2009 19:04:31 -0000 1.1687
@@ -683,6 +683,7 @@ Patch11050: via-padlock-40-nano-ecb.patc
Patch11060: via-padlock-50-nano-cbc.patch
Patch11070: via-rng-enable-64bit.patch
Patch11080: via-sdmmc.patch
+Patch11081: linux-2.6-x86-delay-tsc-barrier.patch
# Commit a44a4a006b860476881ec0098c36584036e1cb91 fron net-next-2.6.git
Patch12000: linux-2.6-xfrm-export-gc_thresh.patch
@@ -1090,11 +1091,13 @@ ApplyPatch linux-2.6-hotfixes.patch
ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
+# VM patches
+
+# iommu patches
+
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
-ApplyPatch linux-2.6-missing-rfc2465-stats.patch
-
# Architecture patches
# x86(-64)
ApplyPatch linux-2.6-cpufreq-enable-acpi-pstates-on-via.patch
@@ -1106,6 +1109,7 @@ ApplyPatch via-padlock-40-nano-ecb.patch
ApplyPatch via-padlock-50-nano-cbc.patch
ApplyPatch via-rng-enable-64bit.patch
ApplyPatch via-sdmmc.patch
+ApplyPatch linux-2.6-x86-delay-tsc-barrier.patch
# Export xfrm[4|6] gc_thresh values to sysctl
ApplyPatch linux-2.6-xfrm-export-gc_thresh.patch
@@ -1140,12 +1144,12 @@ ApplyPatch linux-2.6-execshield.patch
#
# ext4
-#ApplyPatch linux-2.6-ext4-prealloc-fixes.patch
# xfs
# btrfs
-#ApplyPatch linux-2.6-btrfs-experimental-branch.patch
+
+# ecryptfs
# USB
@@ -1166,10 +1170,6 @@ ApplyPatch linux-2.6-debug-always-inline
#
# disable message signaled interrupts
ApplyPatch linux-2.6-defaults-pci_no_msi.patch
-# update the pciehp driver
-#ApplyPatch linux-2.6-pciehp-update.patch
-# default to enabling passively listening for hotplug events
-#ApplyPatch linux-2.6-defaults-pciehp.patch
#
# SCSI Bits.
@@ -1181,6 +1181,14 @@ ApplyPatch linux-2.6-defaults-alsa-hda-b
ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
# Networking
+#
+ApplyPatch linux-2.6-missing-rfc2465-stats.patch
+
+# neigh: fix state transition INCOMPLETE->FAILED via Netlink request
+ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
+
+# add ich9 lan
+ApplyPatch linux-2.6-e1000-ich9.patch
# Misc fixes
# The input layer spews crap no-one cares about.
@@ -1205,27 +1213,18 @@ ApplyPatch linux-2.6-silence-fbcon-logo.
# Changes to upstream defaults.
-
# ia64 ata quirk
ApplyPatch linux-2.6-ata-quirk.patch
-# rt2x00: back-port activity LED init patches
-#ApplyPatch linux-2.6-rt2x00-asus-leds.patch
-
# back-port scan result aging patches
#ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
# /dev/crash driver.
ApplyPatch linux-2.6-crash-driver.patch
-# neigh: fix state transition INCOMPLETE->FAILED via Netlink request
-ApplyPatch linux-2.6-neigh_-fix-state-transition-INCOMPLETE-_FAILED-via-Netlink-request.patch
-
# http://www.lirc.org/
ApplyPatch linux-2.6.29-lirc.patch
-ApplyPatch linux-2.6-e1000-ich9.patch
-
ApplyPatch agp-set_memory_ucwb.patch
# Nouveau DRM + drm fixes
#ApplyPatch drm-next.patch
@@ -1835,6 +1834,10 @@ fi
# and build.
%changelog
+* Mon Aug 10 2009 Kyle McMartin <kyle at redhat.com>
+- Patch sync-up with F-11-2.6.29.y:
+ - linux-2.6-x86-delay-tsc-barrier.patch
+
* Wed Aug 05 2009 Kyle McMartin <kyle at redhat.com>
- Update to released 2.6.30.4.
- Drop now-unneeded upstream reverts.
More information about the fedora-extras-commits
mailing list