License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2008-03-26 16:11:55 +08:00
|
|
|
/* time.c: UltraSparc timer and TOD clock support.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
2008-03-26 16:11:55 +08:00
|
|
|
* Copyright (C) 1997, 2008 David S. Miller (davem@davemloft.net)
|
2005-04-17 06:20:36 +08:00
|
|
|
* Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
|
|
|
|
*
|
|
|
|
* Based largely on code which is:
|
|
|
|
*
|
|
|
|
* Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/errno.h>
|
2011-07-23 01:18:16 +08:00
|
|
|
#include <linux/export.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/param.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/timex.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/ioport.h>
|
|
|
|
#include <linux/mc146818rtc.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/profile.h>
|
|
|
|
#include <linux/bcd.h>
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <linux/cpufreq.h>
|
|
|
|
#include <linux/percpu.h>
|
2008-08-29 12:06:27 +08:00
|
|
|
#include <linux/rtc/m48t59.h>
|
2007-02-22 22:24:10 +08:00
|
|
|
#include <linux/kernel_stat.h>
|
2007-03-06 07:28:37 +08:00
|
|
|
#include <linux/clockchips.h>
|
|
|
|
#include <linux/clocksource.h>
|
2008-08-29 12:06:27 +08:00
|
|
|
#include <linux/platform_device.h>
|
2010-04-07 19:41:33 +08:00
|
|
|
#include <linux/ftrace.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#include <asm/oplib.h>
|
|
|
|
#include <asm/timer.h>
|
2009-03-28 11:21:18 +08:00
|
|
|
#include <asm/irq.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/io.h>
|
2006-06-30 06:28:05 +08:00
|
|
|
#include <asm/prom.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/starfire.h>
|
|
|
|
#include <asm/smp.h>
|
|
|
|
#include <asm/sections.h>
|
|
|
|
#include <asm/cpudata.h>
|
2016-12-25 03:46:01 +08:00
|
|
|
#include <linux/uaccess.h>
|
2006-10-09 18:51:14 +08:00
|
|
|
#include <asm/irq_regs.h>
|
2017-06-13 04:41:47 +08:00
|
|
|
#include <asm/cacheflush.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-03-26 16:11:55 +08:00
|
|
|
#include "entry.h"
|
2017-06-13 04:41:46 +08:00
|
|
|
#include "kernel.h"
|
2008-03-26 16:11:55 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
DEFINE_SPINLOCK(rtc_lock);
|
|
|
|
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
unsigned int __read_mostly vdso_fix_stick;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
unsigned long profile_pc(struct pt_regs *regs)
|
|
|
|
{
|
|
|
|
unsigned long pc = instruction_pointer(regs);
|
|
|
|
|
|
|
|
if (in_lock_functions(pc))
|
|
|
|
return regs->u_regs[UREG_RETPC];
|
|
|
|
return pc;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(profile_pc);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void tick_disable_protection(void)
|
|
|
|
{
|
|
|
|
/* Set things up so user can access tick register for profiling
|
|
|
|
* purposes. Also workaround BB_ERRATA_1 by doing a dummy
|
|
|
|
* read back of %tick after writing it.
|
|
|
|
*/
|
|
|
|
__asm__ __volatile__(
|
|
|
|
" ba,pt %%xcc, 1f\n"
|
|
|
|
" nop\n"
|
|
|
|
" .align 64\n"
|
|
|
|
"1: rd %%tick, %%g2\n"
|
|
|
|
" add %%g2, 6, %%g2\n"
|
|
|
|
" andn %%g2, %0, %%g2\n"
|
|
|
|
" wrpr %%g2, 0, %%tick\n"
|
|
|
|
" rdpr %%tick, %%g0"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (TICK_PRIV_BIT)
|
|
|
|
: "g2");
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static void tick_disable_irq(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
__asm__ __volatile__(
|
|
|
|
" ba,pt %%xcc, 1f\n"
|
2007-03-06 07:28:37 +08:00
|
|
|
" nop\n"
|
2005-04-17 06:20:36 +08:00
|
|
|
" .align 64\n"
|
2007-03-06 07:28:37 +08:00
|
|
|
"1: wr %0, 0x0, %%tick_cmpr\n"
|
2005-04-17 06:20:36 +08:00
|
|
|
" rd %%tick_cmpr, %%g0"
|
|
|
|
: /* no outputs */
|
2007-03-06 07:28:37 +08:00
|
|
|
: "r" (TICKCMP_IRQ_BIT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tick_init_tick(void)
|
|
|
|
{
|
|
|
|
tick_disable_protection();
|
|
|
|
tick_disable_irq();
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
static unsigned long long tick_get_tick(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long ret;
|
|
|
|
|
|
|
|
__asm__ __volatile__("rd %%tick, %0\n\t"
|
|
|
|
"mov %0, %0"
|
|
|
|
: "=r" (ret));
|
|
|
|
|
|
|
|
return ret & ~TICK_PRIV_BIT;
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static int tick_add_compare(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
unsigned long orig_tick, new_tick, new_compare;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
__asm__ __volatile__("rd %%tick, %0"
|
|
|
|
: "=r" (orig_tick));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
orig_tick &= ~TICKCMP_IRQ_BIT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Workaround for Spitfire Errata (#54 I think??), I discovered
|
|
|
|
* this via Sun BugID 4008234, mentioned in Solaris-2.5.1 patch
|
|
|
|
* number 103640.
|
|
|
|
*
|
|
|
|
* On Blackbird writes to %tick_cmpr can fail, the
|
|
|
|
* workaround seems to be to execute the wr instruction
|
|
|
|
* at the start of an I-cache line, and perform a dummy
|
|
|
|
* read back from %tick_cmpr right after writing to it. -DaveM
|
|
|
|
*/
|
2007-03-06 07:28:37 +08:00
|
|
|
__asm__ __volatile__("ba,pt %%xcc, 1f\n\t"
|
|
|
|
" add %1, %2, %0\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
".align 64\n"
|
|
|
|
"1:\n\t"
|
|
|
|
"wr %0, 0, %%tick_cmpr\n\t"
|
2007-03-06 07:28:37 +08:00
|
|
|
"rd %%tick_cmpr, %%g0\n\t"
|
|
|
|
: "=r" (new_compare)
|
|
|
|
: "r" (orig_tick), "r" (adj));
|
|
|
|
|
|
|
|
__asm__ __volatile__("rd %%tick, %0"
|
|
|
|
: "=r" (new_tick));
|
|
|
|
new_tick &= ~TICKCMP_IRQ_BIT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
return ((long)(new_tick - (orig_tick+adj))) > 0L;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static unsigned long tick_add_tick(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
unsigned long new_tick;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Also need to handle Blackbird bug here too. */
|
|
|
|
__asm__ __volatile__("rd %%tick, %0\n\t"
|
2007-03-06 07:28:37 +08:00
|
|
|
"add %0, %1, %0\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
"wrpr %0, 0, %%tick\n\t"
|
2007-03-06 07:28:37 +08:00
|
|
|
: "=&r" (new_tick)
|
|
|
|
: "r" (adj));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return new_tick;
|
|
|
|
}
|
|
|
|
|
2017-06-15 22:40:59 +08:00
|
|
|
/* Searches for cpu clock frequency with given cpuid in OpenBoot tree */
|
|
|
|
static unsigned long cpuid_to_freq(phandle node, int cpuid)
|
|
|
|
{
|
|
|
|
bool is_cpu_node = false;
|
|
|
|
unsigned long freq = 0;
|
|
|
|
char type[128];
|
|
|
|
|
|
|
|
if (!node)
|
|
|
|
return freq;
|
|
|
|
|
|
|
|
if (prom_getproperty(node, "device_type", type, sizeof(type)) != -1)
|
|
|
|
is_cpu_node = (strcmp(type, "cpu") == 0);
|
|
|
|
|
2017-06-26 07:27:06 +08:00
|
|
|
/* try upa-portid then cpuid to get cpuid, see prom_64.c */
|
|
|
|
if (is_cpu_node && (prom_getint(node, "upa-portid") == cpuid ||
|
2017-06-15 22:40:59 +08:00
|
|
|
prom_getint(node, "cpuid") == cpuid))
|
|
|
|
freq = prom_getintdefault(node, "clock-frequency", 0);
|
|
|
|
if (!freq)
|
|
|
|
freq = cpuid_to_freq(prom_getchild(node), cpuid);
|
|
|
|
if (!freq)
|
|
|
|
freq = cpuid_to_freq(prom_getsibling(node), cpuid);
|
|
|
|
|
|
|
|
return freq;
|
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
static unsigned long tick_get_frequency(void)
|
|
|
|
{
|
2017-06-15 22:40:59 +08:00
|
|
|
return cpuid_to_freq(prom_root_node, hard_smp_processor_id());
|
2017-06-13 04:41:45 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:44 +08:00
|
|
|
static struct sparc64_tick_ops tick_operations __cacheline_aligned = {
|
2007-03-06 07:28:37 +08:00
|
|
|
.name = "tick",
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_tick = tick_init_tick,
|
2007-03-06 07:28:37 +08:00
|
|
|
.disable_irq = tick_disable_irq,
|
2005-04-17 06:20:36 +08:00
|
|
|
.get_tick = tick_get_tick,
|
|
|
|
.add_tick = tick_add_tick,
|
|
|
|
.add_compare = tick_add_compare,
|
2017-06-13 04:41:45 +08:00
|
|
|
.get_frequency = tick_get_frequency,
|
2005-04-17 06:20:36 +08:00
|
|
|
.softint_mask = 1UL << 0,
|
|
|
|
};
|
|
|
|
|
2005-11-08 06:10:10 +08:00
|
|
|
struct sparc64_tick_ops *tick_ops __read_mostly = &tick_operations;
|
2009-01-09 08:58:20 +08:00
|
|
|
EXPORT_SYMBOL(tick_ops);
|
2005-11-08 06:10:10 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static void stick_disable_irq(void)
|
|
|
|
{
|
|
|
|
__asm__ __volatile__(
|
|
|
|
"wr %0, 0x0, %%asr25"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (TICKCMP_IRQ_BIT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void stick_init_tick(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2006-02-12 15:14:59 +08:00
|
|
|
/* Writes to the %tick and %stick register are not
|
|
|
|
* allowed on sun4v. The Hypervisor controls that
|
|
|
|
* bit, per-strand.
|
|
|
|
*/
|
|
|
|
if (tlb_type != hypervisor) {
|
|
|
|
tick_disable_protection();
|
2007-03-06 07:28:37 +08:00
|
|
|
tick_disable_irq();
|
2006-02-12 15:14:59 +08:00
|
|
|
|
|
|
|
/* Let the user get at STICK too. */
|
|
|
|
__asm__ __volatile__(
|
|
|
|
" rd %%asr24, %%g2\n"
|
|
|
|
" andn %%g2, %0, %%g2\n"
|
|
|
|
" wr %%g2, 0, %%asr24"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (TICK_PRIV_BIT)
|
|
|
|
: "g1", "g2");
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
stick_disable_irq();
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
static unsigned long long stick_get_tick(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long ret;
|
|
|
|
|
|
|
|
__asm__ __volatile__("rd %%asr24, %0"
|
|
|
|
: "=r" (ret));
|
|
|
|
|
|
|
|
return ret & ~TICK_PRIV_BIT;
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static unsigned long stick_add_tick(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
unsigned long new_tick;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
__asm__ __volatile__("rd %%asr24, %0\n\t"
|
2007-03-06 07:28:37 +08:00
|
|
|
"add %0, %1, %0\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
"wr %0, 0, %%asr24\n\t"
|
2007-03-06 07:28:37 +08:00
|
|
|
: "=&r" (new_tick)
|
|
|
|
: "r" (adj));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
return new_tick;
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static int stick_add_compare(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
unsigned long orig_tick, new_tick;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
__asm__ __volatile__("rd %%asr24, %0"
|
|
|
|
: "=r" (orig_tick));
|
|
|
|
orig_tick &= ~TICKCMP_IRQ_BIT;
|
|
|
|
|
|
|
|
__asm__ __volatile__("wr %0, 0, %%asr25"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (orig_tick + adj));
|
|
|
|
|
|
|
|
__asm__ __volatile__("rd %%asr24, %0"
|
|
|
|
: "=r" (new_tick));
|
|
|
|
new_tick &= ~TICKCMP_IRQ_BIT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
return ((long)(new_tick - (orig_tick+adj))) > 0L;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
static unsigned long stick_get_frequency(void)
|
|
|
|
{
|
2017-06-15 22:40:58 +08:00
|
|
|
return prom_getintdefault(prom_root_node, "stick-frequency", 0);
|
2017-06-13 04:41:45 +08:00
|
|
|
}
|
|
|
|
|
2005-07-11 06:45:11 +08:00
|
|
|
static struct sparc64_tick_ops stick_operations __read_mostly = {
|
2007-03-06 07:28:37 +08:00
|
|
|
.name = "stick",
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_tick = stick_init_tick,
|
2007-03-06 07:28:37 +08:00
|
|
|
.disable_irq = stick_disable_irq,
|
2005-04-17 06:20:36 +08:00
|
|
|
.get_tick = stick_get_tick,
|
|
|
|
.add_tick = stick_add_tick,
|
|
|
|
.add_compare = stick_add_compare,
|
2017-06-13 04:41:45 +08:00
|
|
|
.get_frequency = stick_get_frequency,
|
2005-04-17 06:20:36 +08:00
|
|
|
.softint_mask = 1UL << 16,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* On Hummingbird the STICK/STICK_CMPR register is implemented
|
|
|
|
* in I/O space. There are two 64-bit registers each, the
|
|
|
|
* first holds the low 32-bits of the value and the second holds
|
|
|
|
* the high 32-bits.
|
|
|
|
*
|
|
|
|
* Since STICK is constantly updating, we have to access it carefully.
|
|
|
|
*
|
|
|
|
* The sequence we use to read is:
|
2006-01-18 07:21:01 +08:00
|
|
|
* 1) read high
|
|
|
|
* 2) read low
|
|
|
|
* 3) read high again, if it rolled re-read both low and high again.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Writing STICK safely is also tricky:
|
|
|
|
* 1) write low to zero
|
|
|
|
* 2) write high
|
|
|
|
* 3) write low
|
|
|
|
*/
|
|
|
|
static unsigned long __hbird_read_stick(void)
|
|
|
|
{
|
|
|
|
unsigned long ret, tmp1, tmp2, tmp3;
|
2006-01-18 07:21:01 +08:00
|
|
|
unsigned long addr = HBIRD_STICK_ADDR+8;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-01-18 07:21:01 +08:00
|
|
|
__asm__ __volatile__("ldxa [%1] %5, %2\n"
|
|
|
|
"1:\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
"sub %1, 0x8, %1\n\t"
|
2006-01-18 07:21:01 +08:00
|
|
|
"ldxa [%1] %5, %3\n\t"
|
|
|
|
"add %1, 0x8, %1\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
"ldxa [%1] %5, %4\n\t"
|
|
|
|
"cmp %4, %2\n\t"
|
2006-01-18 07:21:01 +08:00
|
|
|
"bne,a,pn %%xcc, 1b\n\t"
|
|
|
|
" mov %4, %2\n\t"
|
|
|
|
"sllx %4, 32, %4\n\t"
|
2005-04-17 06:20:36 +08:00
|
|
|
"or %3, %4, %0\n\t"
|
|
|
|
: "=&r" (ret), "=&r" (addr),
|
|
|
|
"=&r" (tmp1), "=&r" (tmp2), "=&r" (tmp3)
|
|
|
|
: "i" (ASI_PHYS_BYPASS_EC_E), "1" (addr));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __hbird_write_stick(unsigned long val)
|
|
|
|
{
|
|
|
|
unsigned long low = (val & 0xffffffffUL);
|
|
|
|
unsigned long high = (val >> 32UL);
|
|
|
|
unsigned long addr = HBIRD_STICK_ADDR;
|
|
|
|
|
|
|
|
__asm__ __volatile__("stxa %%g0, [%0] %4\n\t"
|
|
|
|
"add %0, 0x8, %0\n\t"
|
|
|
|
"stxa %3, [%0] %4\n\t"
|
|
|
|
"sub %0, 0x8, %0\n\t"
|
|
|
|
"stxa %2, [%0] %4"
|
|
|
|
: "=&r" (addr)
|
|
|
|
: "0" (addr), "r" (low), "r" (high),
|
|
|
|
"i" (ASI_PHYS_BYPASS_EC_E));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __hbird_write_compare(unsigned long val)
|
|
|
|
{
|
|
|
|
unsigned long low = (val & 0xffffffffUL);
|
|
|
|
unsigned long high = (val >> 32UL);
|
|
|
|
unsigned long addr = HBIRD_STICKCMP_ADDR + 0x8UL;
|
|
|
|
|
|
|
|
__asm__ __volatile__("stxa %3, [%0] %4\n\t"
|
|
|
|
"sub %0, 0x8, %0\n\t"
|
|
|
|
"stxa %2, [%0] %4"
|
|
|
|
: "=&r" (addr)
|
|
|
|
: "0" (addr), "r" (low), "r" (high),
|
|
|
|
"i" (ASI_PHYS_BYPASS_EC_E));
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static void hbtick_disable_irq(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
__hbird_write_compare(TICKCMP_IRQ_BIT);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static void hbtick_init_tick(void)
|
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
tick_disable_protection();
|
|
|
|
|
|
|
|
/* XXX This seems to be necessary to 'jumpstart' Hummingbird
|
|
|
|
* XXX into actually sending STICK interrupts. I think because
|
|
|
|
* XXX of how we store %tick_cmpr in head.S this somehow resets the
|
|
|
|
* XXX {TICK + STICK} interrupt mux. -DaveM
|
|
|
|
*/
|
|
|
|
__hbird_write_stick(__hbird_read_stick());
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
hbtick_disable_irq();
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
static unsigned long long hbtick_get_tick(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
return __hbird_read_stick() & ~TICK_PRIV_BIT;
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static unsigned long hbtick_add_tick(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long val;
|
|
|
|
|
|
|
|
val = __hbird_read_stick() + adj;
|
|
|
|
__hbird_write_stick(val);
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static int hbtick_add_compare(unsigned long adj)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
unsigned long val = __hbird_read_stick();
|
|
|
|
unsigned long val2;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
val &= ~TICKCMP_IRQ_BIT;
|
|
|
|
val += adj;
|
2005-04-17 06:20:36 +08:00
|
|
|
__hbird_write_compare(val);
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
val2 = __hbird_read_stick() & ~TICKCMP_IRQ_BIT;
|
|
|
|
|
|
|
|
return ((long)(val2 - val)) > 0L;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
static unsigned long hbtick_get_frequency(void)
|
|
|
|
{
|
2017-06-15 22:40:58 +08:00
|
|
|
return prom_getintdefault(prom_root_node, "stick-frequency", 0);
|
2017-06-13 04:41:45 +08:00
|
|
|
}
|
|
|
|
|
2005-07-11 06:45:11 +08:00
|
|
|
static struct sparc64_tick_ops hbtick_operations __read_mostly = {
|
2007-03-06 07:28:37 +08:00
|
|
|
.name = "hbtick",
|
2005-04-17 06:20:36 +08:00
|
|
|
.init_tick = hbtick_init_tick,
|
2007-03-06 07:28:37 +08:00
|
|
|
.disable_irq = hbtick_disable_irq,
|
2005-04-17 06:20:36 +08:00
|
|
|
.get_tick = hbtick_get_tick,
|
|
|
|
.add_tick = hbtick_add_tick,
|
|
|
|
.add_compare = hbtick_add_compare,
|
2017-06-13 04:41:45 +08:00
|
|
|
.get_frequency = hbtick_get_frequency,
|
2005-04-17 06:20:36 +08:00
|
|
|
.softint_mask = 1UL << 0,
|
|
|
|
};
|
|
|
|
|
2008-08-29 13:16:15 +08:00
|
|
|
unsigned long cmos_regs;
|
|
|
|
EXPORT_SYMBOL(cmos_regs);
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2008-09-12 14:39:11 +08:00
|
|
|
static struct resource rtc_cmos_resource;
|
2008-08-29 13:16:15 +08:00
|
|
|
|
|
|
|
static struct platform_device rtc_cmos_device = {
|
|
|
|
.name = "rtc_cmos",
|
|
|
|
.id = -1,
|
|
|
|
.resource = &rtc_cmos_resource,
|
|
|
|
.num_resources = 1,
|
|
|
|
};
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2012-12-22 06:03:26 +08:00
|
|
|
static int rtc_probe(struct platform_device *op)
|
2006-06-23 10:12:03 +08:00
|
|
|
{
|
2008-08-29 13:16:15 +08:00
|
|
|
struct resource *r;
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
printk(KERN_INFO "%s: RTC regs at 0x%llx\n",
|
2010-04-14 07:12:29 +08:00
|
|
|
op->dev.of_node->full_name, op->resource[0].start);
|
2007-05-12 12:18:50 +08:00
|
|
|
|
2008-08-29 13:16:15 +08:00
|
|
|
/* The CMOS RTC driver only accepts IORESOURCE_IO, so cons
|
|
|
|
* up a fake resource so that the probe works for all cases.
|
|
|
|
* When the RTC is behind an ISA bus it will have IORESOURCE_IO
|
|
|
|
* already, whereas when it's behind EBUS is will be IORESOURCE_MEM.
|
|
|
|
*/
|
|
|
|
|
|
|
|
r = &rtc_cmos_resource;
|
|
|
|
r->flags = IORESOURCE_IO;
|
|
|
|
r->name = op->resource[0].name;
|
|
|
|
r->start = op->resource[0].start;
|
|
|
|
r->end = op->resource[0].end;
|
|
|
|
|
|
|
|
cmos_regs = op->resource[0].start;
|
|
|
|
return platform_device_register(&rtc_cmos_device);
|
|
|
|
}
|
|
|
|
|
2011-03-31 08:37:56 +08:00
|
|
|
static const struct of_device_id rtc_match[] = {
|
2008-08-29 13:16:15 +08:00
|
|
|
{
|
|
|
|
.name = "rtc",
|
|
|
|
.compatible = "m5819",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "rtc",
|
|
|
|
.compatible = "isa-m5819p",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "rtc",
|
|
|
|
.compatible = "isa-m5823p",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.name = "rtc",
|
|
|
|
.compatible = "ds1287",
|
|
|
|
},
|
|
|
|
{},
|
|
|
|
};
|
|
|
|
|
2011-02-23 11:01:33 +08:00
|
|
|
static struct platform_driver rtc_driver = {
|
2008-08-29 13:16:15 +08:00
|
|
|
.probe = rtc_probe,
|
2010-04-14 07:13:02 +08:00
|
|
|
.driver = {
|
|
|
|
.name = "rtc",
|
|
|
|
.of_match_table = rtc_match,
|
2008-08-29 13:16:15 +08:00
|
|
|
},
|
|
|
|
};
|
2006-06-30 05:39:40 +08:00
|
|
|
|
2008-08-29 12:54:34 +08:00
|
|
|
static struct platform_device rtc_bq4802_device = {
|
|
|
|
.name = "rtc-bq4802",
|
|
|
|
.id = -1,
|
|
|
|
.num_resources = 1,
|
|
|
|
};
|
|
|
|
|
2012-12-22 06:03:26 +08:00
|
|
|
static int bq4802_probe(struct platform_device *op)
|
2008-08-29 13:16:15 +08:00
|
|
|
{
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
printk(KERN_INFO "%s: BQ4802 regs at 0x%llx\n",
|
2010-04-14 07:12:29 +08:00
|
|
|
op->dev.of_node->full_name, op->resource[0].start);
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2008-08-29 12:54:34 +08:00
|
|
|
rtc_bq4802_device.resource = &op->resource[0];
|
|
|
|
return platform_device_register(&rtc_bq4802_device);
|
2006-06-23 10:12:03 +08:00
|
|
|
}
|
|
|
|
|
2011-03-31 08:37:56 +08:00
|
|
|
static const struct of_device_id bq4802_match[] = {
|
2006-06-30 05:36:52 +08:00
|
|
|
{
|
2008-08-29 12:06:27 +08:00
|
|
|
.name = "rtc",
|
2008-08-29 13:16:15 +08:00
|
|
|
.compatible = "bq4802",
|
2008-08-29 12:06:27 +08:00
|
|
|
},
|
2008-10-31 13:58:06 +08:00
|
|
|
{},
|
2008-08-29 12:06:27 +08:00
|
|
|
};
|
|
|
|
|
2011-02-23 11:01:33 +08:00
|
|
|
static struct platform_driver bq4802_driver = {
|
2008-08-29 13:16:15 +08:00
|
|
|
.probe = bq4802_probe,
|
2010-04-14 07:13:02 +08:00
|
|
|
.driver = {
|
|
|
|
.name = "bq4802",
|
|
|
|
.of_match_table = bq4802_match,
|
2006-06-30 05:36:52 +08:00
|
|
|
},
|
2008-08-29 12:06:27 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static unsigned char mostek_read_byte(struct device *dev, u32 ofs)
|
|
|
|
{
|
|
|
|
struct platform_device *pdev = to_platform_device(dev);
|
2008-10-30 06:35:24 +08:00
|
|
|
void __iomem *regs = (void __iomem *) pdev->resource[0].start;
|
|
|
|
|
|
|
|
return readb(regs + ofs);
|
2008-08-29 12:06:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mostek_write_byte(struct device *dev, u32 ofs, u8 val)
|
|
|
|
{
|
|
|
|
struct platform_device *pdev = to_platform_device(dev);
|
2008-10-30 06:35:24 +08:00
|
|
|
void __iomem *regs = (void __iomem *) pdev->resource[0].start;
|
|
|
|
|
2008-08-29 12:06:27 +08:00
|
|
|
writeb(val, regs + ofs);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct m48t59_plat_data m48t59_data = {
|
|
|
|
.read_byte = mostek_read_byte,
|
|
|
|
.write_byte = mostek_write_byte,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct platform_device m48t59_rtc = {
|
|
|
|
.name = "rtc-m48t59",
|
|
|
|
.id = 0,
|
|
|
|
.num_resources = 1,
|
|
|
|
.dev = {
|
|
|
|
.platform_data = &m48t59_data,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2012-12-22 06:03:26 +08:00
|
|
|
static int mostek_probe(struct platform_device *op)
|
2008-08-29 12:06:27 +08:00
|
|
|
{
|
2010-04-14 07:12:29 +08:00
|
|
|
struct device_node *dp = op->dev.of_node;
|
2008-08-29 12:06:27 +08:00
|
|
|
|
|
|
|
/* On an Enterprise system there can be multiple mostek clocks.
|
|
|
|
* We should only match the one that is on the central FHC bus.
|
|
|
|
*/
|
|
|
|
if (!strcmp(dp->parent->name, "fhc") &&
|
|
|
|
strcmp(dp->parent->parent->name, "central") != 0)
|
|
|
|
return -ENODEV;
|
|
|
|
|
2009-01-07 05:19:28 +08:00
|
|
|
printk(KERN_INFO "%s: Mostek regs at 0x%llx\n",
|
2008-08-29 12:06:27 +08:00
|
|
|
dp->full_name, op->resource[0].start);
|
|
|
|
|
|
|
|
m48t59_rtc.resource = &op->resource[0];
|
|
|
|
return platform_device_register(&m48t59_rtc);
|
|
|
|
}
|
|
|
|
|
2011-03-31 08:37:56 +08:00
|
|
|
static const struct of_device_id mostek_match[] = {
|
2006-06-30 05:36:52 +08:00
|
|
|
{
|
2008-08-29 12:06:27 +08:00
|
|
|
.name = "eeprom",
|
2006-06-30 05:36:52 +08:00
|
|
|
},
|
|
|
|
{},
|
|
|
|
};
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2011-02-23 11:01:33 +08:00
|
|
|
static struct platform_driver mostek_driver = {
|
2008-08-29 12:06:27 +08:00
|
|
|
.probe = mostek_probe,
|
2010-04-14 07:13:02 +08:00
|
|
|
.driver = {
|
|
|
|
.name = "mostek",
|
|
|
|
.of_match_table = mostek_match,
|
2007-10-11 14:27:34 +08:00
|
|
|
},
|
2006-06-30 05:36:52 +08:00
|
|
|
};
|
2006-06-23 10:12:03 +08:00
|
|
|
|
2008-08-29 16:34:27 +08:00
|
|
|
static struct platform_device rtc_sun4v_device = {
|
|
|
|
.name = "rtc-sun4v",
|
|
|
|
.id = -1,
|
|
|
|
};
|
|
|
|
|
2008-08-29 16:35:19 +08:00
|
|
|
static struct platform_device rtc_starfire_device = {
|
|
|
|
.name = "rtc-starfire",
|
|
|
|
.id = -1,
|
|
|
|
};
|
|
|
|
|
2006-06-30 05:36:52 +08:00
|
|
|
static int __init clock_init(void)
|
2006-06-23 10:12:03 +08:00
|
|
|
{
|
2008-08-29 16:35:19 +08:00
|
|
|
if (this_is_starfire)
|
|
|
|
return platform_device_register(&rtc_starfire_device);
|
|
|
|
|
2008-08-29 16:34:27 +08:00
|
|
|
if (tlb_type == hypervisor)
|
|
|
|
return platform_device_register(&rtc_sun4v_device);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-02-23 11:01:33 +08:00
|
|
|
(void) platform_driver_register(&rtc_driver);
|
|
|
|
(void) platform_driver_register(&mostek_driver);
|
|
|
|
(void) platform_driver_register(&bq4802_driver);
|
2008-08-29 12:06:27 +08:00
|
|
|
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-06-30 05:36:52 +08:00
|
|
|
/* Must be after subsys_initcall() so that busses are probed. Must
|
|
|
|
* be before device_initcall() because things like the RTC driver
|
|
|
|
* need to see the clock registers.
|
|
|
|
*/
|
|
|
|
fs_initcall(clock_init);
|
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
/* Return true if this is Hummingbird, aka Ultra-IIe */
|
|
|
|
static bool is_hummingbird(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2017-06-13 04:41:45 +08:00
|
|
|
unsigned long ver, manuf, impl;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
__asm__ __volatile__ ("rdpr %%ver, %0"
|
|
|
|
: "=&r" (ver));
|
|
|
|
manuf = ((ver >> 48) & 0xffff);
|
|
|
|
impl = ((ver >> 32) & 0xffff);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
return (manuf == 0x17 && impl == 0x13);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct freq_table {
|
|
|
|
unsigned long clock_tick_ref;
|
|
|
|
unsigned int ref_freq;
|
|
|
|
};
|
2006-02-18 04:33:13 +08:00
|
|
|
static DEFINE_PER_CPU(struct freq_table, sparc64_freq_table) = { 0, 0 };
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
unsigned long sparc64_get_clock_tick(unsigned int cpu)
|
|
|
|
{
|
|
|
|
struct freq_table *ft = &per_cpu(sparc64_freq_table, cpu);
|
|
|
|
|
|
|
|
if (ft->clock_tick_ref)
|
|
|
|
return ft->clock_tick_ref;
|
|
|
|
return cpu_data(cpu).clock_tick;
|
|
|
|
}
|
2009-01-09 08:58:20 +08:00
|
|
|
EXPORT_SYMBOL(sparc64_get_clock_tick);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
|
|
|
|
|
|
static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct cpufreq_freqs *freq = data;
|
|
|
|
unsigned int cpu = freq->cpu;
|
|
|
|
struct freq_table *ft = &per_cpu(sparc64_freq_table, cpu);
|
|
|
|
|
|
|
|
if (!ft->ref_freq) {
|
|
|
|
ft->ref_freq = freq->old;
|
|
|
|
ft->clock_tick_ref = cpu_data(cpu).clock_tick;
|
|
|
|
}
|
|
|
|
if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) ||
|
2014-03-19 13:54:58 +08:00
|
|
|
(val == CPUFREQ_POSTCHANGE && freq->old > freq->new)) {
|
2005-04-17 06:20:36 +08:00
|
|
|
cpu_data(cpu).clock_tick =
|
|
|
|
cpufreq_scale(ft->clock_tick_ref,
|
|
|
|
ft->ref_freq,
|
|
|
|
freq->new);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct notifier_block sparc64_cpufreq_notifier_block = {
|
|
|
|
.notifier_call = sparc64_cpufreq_notifier
|
|
|
|
};
|
|
|
|
|
2008-07-24 07:21:07 +08:00
|
|
|
static int __init register_sparc64_cpufreq_notifier(void)
|
|
|
|
{
|
|
|
|
|
|
|
|
cpufreq_register_notifier(&sparc64_cpufreq_notifier_block,
|
|
|
|
CPUFREQ_TRANSITION_NOTIFIER);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
core_initcall(register_sparc64_cpufreq_notifier);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif /* CONFIG_CPU_FREQ */
|
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
static int sparc64_next_event(unsigned long delta,
|
|
|
|
struct clock_event_device *evt)
|
|
|
|
{
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
return tick_operations.add_compare(delta) ? -ETIME : 0;
|
2007-03-06 07:28:37 +08:00
|
|
|
}
|
|
|
|
|
2015-07-16 19:26:29 +08:00
|
|
|
static int sparc64_timer_shutdown(struct clock_event_device *evt)
|
|
|
|
{
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
tick_operations.disable_irq();
|
2015-07-16 19:26:29 +08:00
|
|
|
return 0;
|
2007-03-06 07:28:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct clock_event_device sparc64_clockevent = {
|
2015-07-16 19:26:29 +08:00
|
|
|
.features = CLOCK_EVT_FEAT_ONESHOT,
|
|
|
|
.set_state_shutdown = sparc64_timer_shutdown,
|
|
|
|
.set_next_event = sparc64_next_event,
|
|
|
|
.rating = 100,
|
|
|
|
.shift = 30,
|
|
|
|
.irq = -1,
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
2007-03-06 07:28:37 +08:00
|
|
|
static DEFINE_PER_CPU(struct clock_event_device, sparc64_events);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-04-07 19:41:33 +08:00
|
|
|
void __irq_entry timer_interrupt(int irq, struct pt_regs *regs)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-03-06 07:28:37 +08:00
|
|
|
struct pt_regs *old_regs = set_irq_regs(regs);
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
unsigned long tick_mask = tick_operations.softint_mask;
|
2007-03-06 07:28:37 +08:00
|
|
|
int cpu = smp_processor_id();
|
|
|
|
struct clock_event_device *evt = &per_cpu(sparc64_events, cpu);
|
|
|
|
|
|
|
|
clear_softint(tick_mask);
|
|
|
|
|
|
|
|
irq_enter();
|
|
|
|
|
2010-04-07 08:38:52 +08:00
|
|
|
local_cpu_data().irq0_irqs++;
|
2014-02-24 05:40:15 +08:00
|
|
|
kstat_incr_irq_this_cpu(0);
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
if (unlikely(!evt->event_handler)) {
|
|
|
|
printk(KERN_WARNING
|
|
|
|
"Spurious SPARC64 timer interrupt on cpu %d\n", cpu);
|
|
|
|
} else
|
|
|
|
evt->event_handler(evt);
|
|
|
|
|
|
|
|
irq_exit();
|
|
|
|
|
|
|
|
set_irq_regs(old_regs);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-12-22 06:03:26 +08:00
|
|
|
void setup_sparc64_timer(void)
|
2007-03-06 07:28:37 +08:00
|
|
|
{
|
|
|
|
struct clock_event_device *sevt;
|
|
|
|
unsigned long pstate;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-06 07:28:37 +08:00
|
|
|
/* Guarantee that the following sequences execute
|
|
|
|
* uninterrupted.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2007-03-06 07:28:37 +08:00
|
|
|
__asm__ __volatile__("rdpr %%pstate, %0\n\t"
|
|
|
|
"wrpr %0, %1, %%pstate"
|
|
|
|
: "=r" (pstate)
|
|
|
|
: "i" (PSTATE_IE));
|
|
|
|
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
tick_operations.init_tick();
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
/* Restore PSTATE_IE. */
|
|
|
|
__asm__ __volatile__("wrpr %0, 0x0, %%pstate"
|
|
|
|
: /* no outputs */
|
|
|
|
: "r" (pstate));
|
|
|
|
|
sparc: Replace __get_cpu_var uses
__get_cpu_var() is used for multiple purposes in the kernel source. One of
them is address calculation via the form &__get_cpu_var(x). This calculates
the address for the instance of the percpu variable of the current processor
based on an offset.
Other use cases are for storing and retrieving data from the current
processors percpu area. __get_cpu_var() can be used as an lvalue when
writing data or on the right side of an assignment.
__get_cpu_var() is defined as :
#define __get_cpu_var(var) (*this_cpu_ptr(&(var)))
__get_cpu_var() always only does an address determination. However, store
and retrieve operations could use a segment prefix (or global register on
other platforms) to avoid the address calculation.
this_cpu_write() and this_cpu_read() can directly take an offset into a
percpu area and use optimized assembly code to read and write per cpu
variables.
This patch converts __get_cpu_var into either an explicit address
calculation using this_cpu_ptr() or into a use of this_cpu operations that
use the offset. Thereby address calculations are avoided and less registers
are used when code is generated.
At the end of the patch set all uses of __get_cpu_var have been removed so
the macro is removed too.
The patch set includes passes over all arches as well. Once these operations
are used throughout then specialized macros can be defined in non -x86
arches as well in order to optimize per cpu access by f.e. using a global
register that may be set to the per cpu base.
Transformations done to __get_cpu_var()
1. Determine the address of the percpu instance of the current processor.
DEFINE_PER_CPU(int, y);
int *x = &__get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(&y);
2. Same as #1 but this time an array structure is involved.
DEFINE_PER_CPU(int, y[20]);
int *x = __get_cpu_var(y);
Converts to
int *x = this_cpu_ptr(y);
3. Retrieve the content of the current processors instance of a per cpu
variable.
DEFINE_PER_CPU(int, y);
int x = __get_cpu_var(y)
Converts to
int x = __this_cpu_read(y);
4. Retrieve the content of a percpu struct
DEFINE_PER_CPU(struct mystruct, y);
struct mystruct x = __get_cpu_var(y);
Converts to
memcpy(&x, this_cpu_ptr(&y), sizeof(x));
5. Assignment to a per cpu variable
DEFINE_PER_CPU(int, y)
__get_cpu_var(y) = x;
Converts to
__this_cpu_write(y, x);
6. Increment/Decrement etc of a per cpu variable
DEFINE_PER_CPU(int, y);
__get_cpu_var(y)++
Converts to
__this_cpu_inc(y)
Cc: sparclinux@vger.kernel.org
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
2014-08-18 01:30:54 +08:00
|
|
|
sevt = this_cpu_ptr(&sparc64_events);
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
memcpy(sevt, &sparc64_clockevent, sizeof(*sevt));
|
2008-12-13 18:50:26 +08:00
|
|
|
sevt->cpumask = cpumask_of(smp_processor_id());
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
clockevents_register_device(sevt);
|
|
|
|
}
|
|
|
|
|
2007-05-18 13:55:26 +08:00
|
|
|
#define SPARC64_NSEC_PER_CYC_SHIFT 10UL
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
static struct clocksource clocksource_tick = {
|
|
|
|
.rating = 100,
|
|
|
|
.mask = CLOCKSOURCE_MASK(64),
|
|
|
|
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
|
|
|
|
};
|
|
|
|
|
2007-07-14 17:23:37 +08:00
|
|
|
static unsigned long tb_ticks_per_usec __read_mostly;
|
|
|
|
|
|
|
|
void __delay(unsigned long loops)
|
|
|
|
{
|
2017-06-13 04:41:48 +08:00
|
|
|
unsigned long bclock = get_tick();
|
2007-07-14 17:23:37 +08:00
|
|
|
|
2017-06-13 04:41:48 +08:00
|
|
|
while ((get_tick() - bclock) < loops)
|
|
|
|
;
|
2007-07-14 17:23:37 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__delay);
|
|
|
|
|
|
|
|
void udelay(unsigned long usecs)
|
|
|
|
{
|
|
|
|
__delay(tb_ticks_per_usec * usecs);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(udelay);
|
|
|
|
|
2016-12-22 03:32:01 +08:00
|
|
|
static u64 clocksource_tick_read(struct clocksource *cs)
|
2009-04-22 03:24:00 +08:00
|
|
|
{
|
2017-06-13 04:41:48 +08:00
|
|
|
return get_tick();
|
2009-04-22 03:24:00 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:47 +08:00
|
|
|
static void __init get_tick_patch(void)
|
|
|
|
{
|
|
|
|
unsigned int *addr, *instr, i;
|
|
|
|
struct get_tick_patch *p;
|
|
|
|
|
|
|
|
if (tlb_type == spitfire && is_hummingbird())
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (p = &__get_tick_patch; p < &__get_tick_patch_end; p++) {
|
|
|
|
instr = (tlb_type == spitfire) ? p->tick : p->stick;
|
|
|
|
addr = (unsigned int *)(unsigned long)p->addr;
|
|
|
|
for (i = 0; i < GET_TICK_NINSTR; i++) {
|
|
|
|
addr[i] = instr[i];
|
|
|
|
/* ensure that address is modified before flush */
|
|
|
|
wmb();
|
|
|
|
flushi(&addr[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
static void init_tick_ops(struct sparc64_tick_ops *ops)
|
|
|
|
{
|
|
|
|
unsigned long freq, quotient, tick;
|
|
|
|
|
|
|
|
freq = ops->get_frequency();
|
|
|
|
quotient = clocksource_hz2mult(freq, SPARC64_NSEC_PER_CYC_SHIFT);
|
|
|
|
tick = ops->get_tick();
|
|
|
|
|
|
|
|
ops->offset = (tick * quotient) >> SPARC64_NSEC_PER_CYC_SHIFT;
|
|
|
|
ops->ticks_per_nsec_quotient = quotient;
|
|
|
|
ops->frequency = freq;
|
|
|
|
tick_operations = *ops;
|
2017-06-13 04:41:47 +08:00
|
|
|
get_tick_patch();
|
2017-06-13 04:41:45 +08:00
|
|
|
}
|
|
|
|
|
2017-06-13 04:41:46 +08:00
|
|
|
void __init time_init_early(void)
|
2007-03-06 07:28:37 +08:00
|
|
|
{
|
2017-06-13 04:41:45 +08:00
|
|
|
if (tlb_type == spitfire) {
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
if (is_hummingbird()) {
|
2017-06-13 04:41:45 +08:00
|
|
|
init_tick_ops(&hbtick_operations);
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
clocksource_tick.archdata.vclock_mode = VCLOCK_NONE;
|
|
|
|
} else {
|
2017-06-13 04:41:45 +08:00
|
|
|
init_tick_ops(&tick_operations);
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
clocksource_tick.archdata.vclock_mode = VCLOCK_TICK;
|
|
|
|
vdso_fix_stick = 1;
|
|
|
|
}
|
2017-06-13 04:41:45 +08:00
|
|
|
} else {
|
|
|
|
init_tick_ops(&stick_operations);
|
vDSO for sparc
Following patch is based on work done by Nick Alcock on 64-bit vDSO for sparc
in Oracle linux. I have extended it to include support for 32-bit vDSO for sparc
on 64-bit kernel.
vDSO for sparc is based on the X86 implementation. This patch
provides vDSO support for both 64-bit and 32-bit programs on 64-bit kernel.
vDSO will be disabled on 32-bit linux kernel on sparc.
*) vclock_gettime.c contains all the vdso functions. Since data page is mapped
before the vdso code page, the pointer to data page is got by subracting offset
from an address in the vdso code page. The return address stored in
%i7 is used for this purpose.
*) During compilation, both 32-bit and 64-bit vdso images are compiled and are
converted into raw bytes by vdso2c program to be ready for mapping into the
process. 32-bit images are compiled only if CONFIG_COMPAT is enabled. vdso2c
generates two files vdso-image-64.c and vdso-image-32.c which contains the
respective vDSO image in C structure.
*) During vdso initialization, required number of vdso pages are allocated and
raw bytes are copied into the pages.
*) During every exec, these pages are mapped into the process through
arch_setup_additional_pages and the location of mapping is passed on to the
process through aux vector AT_SYSINFO_EHDR which is used by glibc.
*) A new update_vsyscall routine for sparc is added to keep the data page in
vdso updated.
*) As vDSO cannot contain dynamically relocatable references, a new version of
cpu_relax is added for the use of vDSO.
This change also requires a putback to glibc to use vDSO. For testing,
programs planning to try vDSO can be compiled against the generated
vdso(64/32).so in the source.
Testing:
========
[root@localhost ~]# cat vdso_test.c
int main() {
struct timespec tv_start, tv_end;
struct timeval tv_tmp;
int i;
int count = 1 * 1000 * 10000;
long long diff;
clock_gettime(0, &tv_start);
for (i = 0; i < count; i++)
gettimeofday(&tv_tmp, NULL);
clock_gettime(0, &tv_end);
diff = (long long)(tv_end.tv_sec -
tv_start.tv_sec)*(1*1000*1000*1000);
diff += (tv_end.tv_nsec - tv_start.tv_nsec);
printf("Start sec: %d\n", tv_start.tv_sec);
printf("End sec : %d\n", tv_end.tv_sec);
printf("%d cycles in %lld ns = %f ns/cycle\n", count, diff,
(double)diff / (double)count);
return 0;
}
[root@localhost ~]# cc vdso_test.c -o t32_without_fix -m32 -lrt
[root@localhost ~]# ./t32_without_fix
Start sec: 1502396130
End sec : 1502396140
10000000 cycles in 9565148528 ns = 956.514853 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t32_with_fix -m32 ./vdso32.so.dbg
[root@localhost ~]# ./t32_with_fix
Start sec: 1502396168
End sec : 1502396169
10000000 cycles in 798141262 ns = 79.814126 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_without_fix -m64 -lrt
[root@localhost ~]# ./t64_without_fix
Start sec: 1502396208
End sec : 1502396218
10000000 cycles in 9846091800 ns = 984.609180 ns/cycle
[root@localhost ~]# cc vdso_test.c -o t64_with_fix -m64 ./vdso64.so.dbg
[root@localhost ~]# ./t64_with_fix
Start sec: 1502396257
End sec : 1502396257
10000000 cycles in 380984048 ns = 38.098405 ns/cycle
V1 to V2 Changes:
=================
Added hot patching code to switch the read stick instruction to read
tick instruction based on the hardware.
V2 to V3 Changes:
=================
Merged latest changes from sparc-next and moved the initialization
of clocksource_tick.archdata.vclock_mode to time_init_early. Disabled
queued spinlock and rwlock configuration when simulating 32-bit config
to compile 32-bit VDSO.
V3 to V4 Changes:
=================
Hardcoded the page size as 8192 in linker script for both 64-bit and
32-bit binaries. Removed unused variables in vdso2c.h. Added -mv8plus flag to
Makefile to prevent the generation of relocation entries for __lshrdi3 in 32-bit
vdso binary.
Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Signed-off-by: Nagarathnam Muthusamy <nagarathnam.muthusamy@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-09-21 23:05:31 +08:00
|
|
|
clocksource_tick.archdata.vclock_mode = VCLOCK_STICK;
|
2017-06-13 04:41:45 +08:00
|
|
|
}
|
2017-06-13 04:41:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void __init time_init(void)
|
|
|
|
{
|
|
|
|
unsigned long freq;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-06-13 04:41:45 +08:00
|
|
|
freq = tick_operations.frequency;
|
2008-09-12 14:39:11 +08:00
|
|
|
tb_ticks_per_usec = freq / USEC_PER_SEC;
|
2007-07-14 17:23:37 +08:00
|
|
|
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
clocksource_tick.name = tick_operations.name;
|
2009-04-22 03:24:00 +08:00
|
|
|
clocksource_tick.read = clocksource_tick_read;
|
2007-03-06 07:28:37 +08:00
|
|
|
|
2011-02-24 05:08:21 +08:00
|
|
|
clocksource_register_hz(&clocksource_tick, freq);
|
2007-03-06 07:28:37 +08:00
|
|
|
printk("clocksource: mult[%x] shift[%d]\n",
|
|
|
|
clocksource_tick.mult, clocksource_tick.shift);
|
|
|
|
|
sparc64: access tick function from variable
In timer_64.c tick functions are access via pointer (tick_ops), every time
clock is read, there is one extra load to get to the function.
This patch optimizes it, by accessing functions pointer from value.
Current ched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x250 ], %g1 ! <tick_ops>
ldx [ %g1 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x300 ], %g1 ! <timer_ticks_per_nsec_quotient>
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
New sched_clock():
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x340 ], %g1
call %g1
nop
sethi %hi(0xb9b400), %g1
ldx [ %g1 + 0x378 ], %g1
mulx %o0, %g1, %g1
rett %i7 + 8
srlx %g1, 0xa, %o0
Before three loads, now two loads.
Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Steven Sistare <steven.sistare@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-13 04:41:42 +08:00
|
|
|
sparc64_clockevent.name = tick_operations.name;
|
2009-12-11 17:27:29 +08:00
|
|
|
clockevents_calc_mult_shift(&sparc64_clockevent, freq, 4);
|
2007-03-06 07:28:37 +08:00
|
|
|
|
|
|
|
sparc64_clockevent.max_delta_ns =
|
2008-03-26 16:11:55 +08:00
|
|
|
clockevent_delta2ns(0x7fffffffffffffffUL, &sparc64_clockevent);
|
2017-03-31 03:56:47 +08:00
|
|
|
sparc64_clockevent.max_delta_ticks = 0x7fffffffffffffffUL;
|
2007-03-06 07:28:37 +08:00
|
|
|
sparc64_clockevent.min_delta_ns =
|
|
|
|
clockevent_delta2ns(0xF, &sparc64_clockevent);
|
2017-03-31 03:56:47 +08:00
|
|
|
sparc64_clockevent.min_delta_ticks = 0xF;
|
2007-03-06 07:28:37 +08:00
|
|
|
|
2009-12-11 18:05:05 +08:00
|
|
|
printk("clockevent: mult[%x] shift[%d]\n",
|
2007-03-06 07:28:37 +08:00
|
|
|
sparc64_clockevent.mult, sparc64_clockevent.shift);
|
|
|
|
|
|
|
|
setup_sparc64_timer();
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
unsigned long long sched_clock(void)
|
|
|
|
{
|
2017-06-13 04:41:44 +08:00
|
|
|
unsigned long quotient = tick_operations.ticks_per_nsec_quotient;
|
|
|
|
unsigned long offset = tick_operations.offset;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2017-06-13 04:41:48 +08:00
|
|
|
/* Use barrier so the compiler emits the loads first and overlaps load
|
|
|
|
* latency with reading tick, because reading %tick/%stick is a
|
|
|
|
* post-sync instruction that will flush and restart subsequent
|
|
|
|
* instructions after it commits.
|
|
|
|
*/
|
|
|
|
barrier();
|
|
|
|
|
|
|
|
return ((get_tick() * quotient) >> SPARC64_NSEC_PER_CYC_SHIFT) - offset;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2012-12-22 06:03:26 +08:00
|
|
|
int read_current_timer(unsigned long *timer_val)
|
2008-02-06 17:36:42 +08:00
|
|
|
{
|
2017-06-13 04:41:48 +08:00
|
|
|
*timer_val = get_tick();
|
2008-02-06 17:36:42 +08:00
|
|
|
return 0;
|
|
|
|
}
|