qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-26 07:40:37 +02:00
Code

work around the remaining race condition in the tsc sched stuff

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2503 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2005-11-15 19:24:51 +00:00
parent c24381f99e
commit 3b5e2d2368
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openwrt/target/linux/linux-2.4/patches/ar7/006-sched_use_tsc.patch
View File

@ -1,7 +1,7 @@
diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
--- linux.old/arch/mips/kernel/time.c 2005-11-14 11:06:38.661262000 +0100 --- linux.old/arch/mips/kernel/time.c 2005-11-14 11:06:38.661262000 +0100
+++ linux.dev/arch/mips/kernel/time.c 2005-11-15 15:21:17.890005500 +0100 +++ linux.dev/arch/mips/kernel/time.c 2005-11-15 20:02:50.059676750 +0100
@@ -151,6 +151,20 @@ @@ -151,6 +151,27 @@
unsigned int (*mips_hpt_read)(void); unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int); void (*mips_hpt_init)(unsigned int);
@ -10,19 +10,26 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+ return timerhi; + return timerhi;
+} +}
+ +
+static __u64 tscll_last = 0;
+
+extern __u64 get_tscll(void) +extern __u64 get_tscll(void)
+{ +{
+ __u32 c = read_c0_count();
+ __u64 h = (__u64) timerhi; + __u64 h = (__u64) timerhi;
+ h += (c < timerlo); + __u32 c = read_c0_count();
+
+ h <<= 32; + h <<= 32;
+ h += c; + h += c;
+
+ while (h < tscll_last)
+ h += (((__u64) 1) << 32);
+
+ tscll_last = h;
+ return h; + return h;
+} +}
/* /*
* timeofday services, for syscalls. * timeofday services, for syscalls.
@@ -761,3 +775,5 @@ @@ -761,3 +782,5 @@
EXPORT_SYMBOL(to_tm); EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time); EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time); EXPORT_SYMBOL(rtc_get_time);

17
openwrt/target/linux/linux-2.4/patches/brcm/007-sched_use_tsc.patch
View File

@ -1,7 +1,7 @@
diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
--- linux.old/arch/mips/kernel/time.c 2005-11-14 11:06:38.661262000 +0100 --- linux.old/arch/mips/kernel/time.c 2005-11-14 11:06:38.661262000 +0100
+++ linux.dev/arch/mips/kernel/time.c 2005-11-15 15:21:17.890005500 +0100 +++ linux.dev/arch/mips/kernel/time.c 2005-11-15 20:02:50.059676750 +0100
@@ -151,6 +151,20 @@ @@ -151,6 +151,27 @@
unsigned int (*mips_hpt_read)(void); unsigned int (*mips_hpt_read)(void);
void (*mips_hpt_init)(unsigned int); void (*mips_hpt_init)(unsigned int);
@ -10,19 +10,26 @@ diff -urN linux.old/arch/mips/kernel/time.c linux.dev/arch/mips/kernel/time.c
+ return timerhi; + return timerhi;
+} +}
+ +
+static __u64 tscll_last = 0;
+
+extern __u64 get_tscll(void) +extern __u64 get_tscll(void)
+{ +{
+ __u32 c = read_c0_count();
+ __u64 h = (__u64) timerhi; + __u64 h = (__u64) timerhi;
+ h += (c < timerlo); + __u32 c = read_c0_count();
+
+ h <<= 32; + h <<= 32;
+ h += c; + h += c;
+
+ while (h < tscll_last)
+ h += (((__u64) 1) << 32);
+
+ tscll_last = h;
+ return h; + return h;
+} +}
/* /*
* timeofday services, for syscalls. * timeofday services, for syscalls.
@@ -761,3 +775,5 @@ @@ -761,3 +782,5 @@
EXPORT_SYMBOL(to_tm); EXPORT_SYMBOL(to_tm);
EXPORT_SYMBOL(rtc_set_time); EXPORT_SYMBOL(rtc_set_time);
EXPORT_SYMBOL(rtc_get_time); EXPORT_SYMBOL(rtc_get_time);