UPDATED x86/mrst: add vrtc driver which serves as a wall clock device
Subsystems (2)
PATCH 1/2 UPDATED x86/mrst: add vrtc driver which serves as a wall clock device
(Please discard original pair of rtc patches)
From: Feng Tang <[email protected]>
Moorestown platform doesn't have a m146818 RTC device like traditional x86 PC, but a firmware emulated virtual RTC device(vrtc), which provides some basic RTC functions like get/set time. vrtc serves as the only wall clock device on Moorestown platform.
Signed-off-by Feng Tang <[email protected]>
Signed-off-by Jacob Pan <[email protected]>
Signed-off-by Alan Cox <[email protected]>
---
arch/x86/include/asm/fixmap.h | 4 + arch/x86/include/asm/mrst-vrtc.h | 9 +++ arch/x86/include/asm/mrst.h | 10 +++ arch/x86/platform/mrst/Makefile | 1 arch/x86/platform/mrst/mrst.c | 6 -- arch/x86/platform/mrst/vrtc.c | 120 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 arch/x86/include/asm/mrst-vrtc.h create mode 100644 arch/x86/platform/mrst/vrtc.c
arch/x86/include/asm/fixmap.h +4 -0
@@ -117,6 +117,10 @@ enum fixed_addresses {FIX_TEXT_POKE1 ,/* reserve 2 pages for text_poke() */ FIX_TEXT_POKE0 ,/* first page is last, because allocation is backward */ __end_of_permanent_fixed_addresses, + +#ifdef CONFIG_X86_MRST + FIX_LNW_VRTC, +#endif/* * 256 temporary boot-time mappings, used by early_ioremap(), * before ioremap() is functional.
arch/x86/include/asm/mrst-vrtc.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef _MRST_VRTC_H +#define _MRST_VRTC_H + +extern unsigned char vrtc_cmos_read (unsigned char reg); +extern void vrtc_cmos_write (unsigned char val,unsigned char reg); +extern unsigned long vrtc_get_time (void ); +extern int vrtc_set_mmss (unsigned long nowtime); + +#endif
arch/x86/include/asm/mrst.h +9 -1
@@ -14,7 +14,9 @@#include <linux/sfi.h> extern int pci_mrst_init (void ); -int __init sfi_parse_mrtc (struct sfi_table_header *table); +extern int __init sfi_parse_mrtc (struct sfi_table_header *table); +extern int sfi_mrtc_num; +extern struct sfi_rtc_table_entry sfi_mrtc_array[];/* * Medfield is the follow-up of Moorestown, it combines two chip solution into
@@ -54,4 +56,10 @@ extern void hsu_early_console_init(void);extern void intel_scu_devices_create (void );extern void intel_scu_devices_destroy (void ); +/* VRTC timer */ +#define MRST_VRTC_MAP_SZ (1024) +/*#define MRST_VRTC_PGOFFSET (0xc00) */ + +extern void mrst_rtc_init (void ); +#endif /* _ASM_X86_MRST_H */
arch/x86/platform/mrst/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_X86_MRST) += mrst.o +obj-$(CONFIG_X86_MRST) += vrtc.o
arch/x86/platform/mrst/mrst.c +0 -6
@@ -37,7 +37,6 @@#include <asm/apb_timer.h> #include <asm/reboot.h> -/* * the clockevent devices on Moorestown/Medfield can be APBT or LAPIC clock, * cmdline option x86_mrst_timer can be used to override the configuration
@@ -242,11 +241,6 @@ void __init mrst_time_init(void)apbt_time_init (); } -void __init mrst_rtc_init (void ) -{ -sfi_table_parse (SFI_SIG_MRTC ,NULL ,NULL , sfi_parse_mrtc); -} -void __cpuinit mrst_arch_setup (void ) {if (boot_cpu_data.x86 ==6 && boot_cpu_data.x86_model ==0x27 )
arch/x86/platform/mrst/vrtc.c new file +120 -0
120 lines not on this page · raw message
PATCH 2/2 (UPDATED) vrtc: add drivers/rtc/rtc-mrst.c
From: Feng Tang <[email protected]>
Provide the standard kernel rtc driver interface on top of the vrtc layer added in the previous patch.
Signed-off-by Feng Tang <[email protected]>
[Fixed swapped arguments on IPC]
Signed-off-by Arjan van de Ven <[email protected]>
[Cleaned up and the device creation moved to arch/x86/platform]
Signed-off-by Alan Cox <[email protected]>
---
arch/x86/platform/mrst/vrtc.c | 46 +++ drivers/rtc/Kconfig | 12 + drivers/rtc/Makefile | 1 drivers/rtc/rtc-mrst.c | 578 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 637 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-mrst.c
arch/x86/platform/mrst/vrtc.c +46 -0
@@ -20,6 +20,7 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/sfi.h> +#include <linux/platform_device.h> #include <asm/mrst.h> #include <asm/mrst-vrtc.h>
@@ -118,3 +119,48 @@ void __init mrst_rtc_init(void) x86_platform.get_wallclock = vrtc_get_time; x86_platform.set_wallclock = vrtc_set_mmss; } + +/* +* The Moorestown platform has a memory mapped virtual RTC device that emulates +* the programming interface of the RTC. +*/ + +static struct resource vrtc_resources[] = { + [0 ] = { + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .flags =IORESOURCE_IRQ , + } +}; + +static struct platform_device vrtc_device = { + .name ="rtc_mrst" , + .id =-1 , + .resource = vrtc_resources, + .num_resources =ARRAY_SIZE (vrtc_resources), +}; + +/* Register the RTC device if appropriate */ +static int __init mrst_device_create (void ) +{ +/* No Moorestown, no device */ +if (!mrst_identify_cpu ()) +return -ENODEV ; +/* No timer, no device */ +if (!sfi_mrtc_num) +return -ENODEV ; + +/* iomem resource */ + vrtc_resources[0 ].start = sfi_mrtc_array[0 ].phys_addr; + vrtc_resources[0 ].end = sfi_mrtc_array[0 ].phys_addr + +MRST_VRTC_MAP_SZ ; +/* irq resource */ + vrtc_resources[1 ].start = sfi_mrtc_array[0 ].irq; + vrtc_resources[1 ].end = sfi_mrtc_array[0 ].irq; + +platform_device_register (&vrtc_device); +return 0 ; +} + +module_init (mrst_device_create);
drivers/rtc/Kconfig +12 -0
@@ -463,6 +463,18 @@ config RTC_DRV_CMOS This driver can also be built as a module. If so, the module will be called rtc-cmos. +config RTC_DRV_VRTC + tristate "Virtual RTC for Moorestown platforms" + depends on X86_MRST + default y if X86_MRST + + help + Say "yes" here to get direct support for the real time clock + found on Moorestown platforms. The VRTC is a emulated RTC that + derives its clock source from a real RTC in the PMIC. The MC146818 + style programming interface is mostly conserved, but any + updates are done via IPC calls to the system controller FW. + config RTC_DRV_DS1216 tristate "Dallas DS1216" depends on SNI_RM
drivers/rtc/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o obj-$(CONFIG_RTC_DRV_COH901331) += rtc-coh901331.o obj-$(CONFIG_RTC_DRV_DAVINCI) += rtc-davinci.o obj-$(CONFIG_RTC_DRV_DM355EVM) += rtc-dm355evm.o +obj-$(CONFIG_RTC_DRV_VRTC) += rtc-mrst.o obj-$(CONFIG_RTC_DRV_DS1216) += rtc-ds1216.o obj-$(CONFIG_RTC_DRV_DS1286) += rtc-ds1286.o obj-$(CONFIG_RTC_DRV_DS1302) += rtc-ds1302.o
drivers/rtc/rtc-mrst.c new file +578 -0
578 lines not on this page · raw message