47997d756a
A deadlock was introduced on x86 in commit ef68c8f87e
("x86:
Serialize EFI time accesses on rtc_lock") because efi_get_time()
and friends can be called with rtc_lock already held by
read_persistent_time(), e.g.:
timekeeping_init()
read_persistent_clock() <-- acquire rtc_lock
efi_get_time()
phys_efi_get_time() <-- acquire rtc_lock <DEADLOCK>
To fix this let's push the locking down into the get_wallclock()
and set_wallclock() implementations. Only the clock
implementations that access the x86 RTC directly need to acquire
rtc_lock, so it makes sense to push the locking down into the
rtc, vrtc and efi code.
The virtualization implementations don't require rtc_lock to be
held because they provide their own serialization.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Acked-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Avi Kivity <avi@redhat.com> [for the virtualization aspect]
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
169 lines
3.9 KiB
C
169 lines
3.9 KiB
C
/*
|
|
* vrtc.c: Driver for virtual RTC device on Intel MID platform
|
|
*
|
|
* (C) Copyright 2009 Intel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; version 2
|
|
* of the License.
|
|
*
|
|
* Note:
|
|
* VRTC is emulated by system controller firmware, the real HW
|
|
* RTC is located in the PMIC device. SCU FW shadows PMIC RTC
|
|
* in a memory mapped IO space that is visible to the host IA
|
|
* processor.
|
|
*
|
|
* This driver is based on RTC CMOS driver.
|
|
*/
|
|
|
|
#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>
|
|
#include <asm/time.h>
|
|
#include <asm/fixmap.h>
|
|
|
|
static unsigned char __iomem *vrtc_virt_base;
|
|
|
|
unsigned char vrtc_cmos_read(unsigned char reg)
|
|
{
|
|
unsigned char retval;
|
|
|
|
/* vRTC's registers range from 0x0 to 0xD */
|
|
if (reg > 0xd || !vrtc_virt_base)
|
|
return 0xff;
|
|
|
|
lock_cmos_prefix(reg);
|
|
retval = __raw_readb(vrtc_virt_base + (reg << 2));
|
|
lock_cmos_suffix(reg);
|
|
return retval;
|
|
}
|
|
EXPORT_SYMBOL_GPL(vrtc_cmos_read);
|
|
|
|
void vrtc_cmos_write(unsigned char val, unsigned char reg)
|
|
{
|
|
if (reg > 0xd || !vrtc_virt_base)
|
|
return;
|
|
|
|
lock_cmos_prefix(reg);
|
|
__raw_writeb(val, vrtc_virt_base + (reg << 2));
|
|
lock_cmos_suffix(reg);
|
|
}
|
|
EXPORT_SYMBOL_GPL(vrtc_cmos_write);
|
|
|
|
unsigned long vrtc_get_time(void)
|
|
{
|
|
u8 sec, min, hour, mday, mon;
|
|
unsigned long flags;
|
|
u32 year;
|
|
|
|
spin_lock_irqsave(&rtc_lock, flags);
|
|
|
|
while ((vrtc_cmos_read(RTC_FREQ_SELECT) & RTC_UIP))
|
|
cpu_relax();
|
|
|
|
sec = vrtc_cmos_read(RTC_SECONDS);
|
|
min = vrtc_cmos_read(RTC_MINUTES);
|
|
hour = vrtc_cmos_read(RTC_HOURS);
|
|
mday = vrtc_cmos_read(RTC_DAY_OF_MONTH);
|
|
mon = vrtc_cmos_read(RTC_MONTH);
|
|
year = vrtc_cmos_read(RTC_YEAR);
|
|
|
|
spin_unlock_irqrestore(&rtc_lock, flags);
|
|
|
|
/* vRTC YEAR reg contains the offset to 1960 */
|
|
year += 1960;
|
|
|
|
printk(KERN_INFO "vRTC: sec: %d min: %d hour: %d day: %d "
|
|
"mon: %d year: %d\n", sec, min, hour, mday, mon, year);
|
|
|
|
return mktime(year, mon, mday, hour, min, sec);
|
|
}
|
|
|
|
/* Only care about the minutes and seconds */
|
|
int vrtc_set_mmss(unsigned long nowtime)
|
|
{
|
|
int real_sec, real_min;
|
|
unsigned long flags;
|
|
int vrtc_min;
|
|
|
|
spin_lock_irqsave(&rtc_lock, flags);
|
|
vrtc_min = vrtc_cmos_read(RTC_MINUTES);
|
|
|
|
real_sec = nowtime % 60;
|
|
real_min = nowtime / 60;
|
|
if (((abs(real_min - vrtc_min) + 15)/30) & 1)
|
|
real_min += 30;
|
|
real_min %= 60;
|
|
|
|
vrtc_cmos_write(real_sec, RTC_SECONDS);
|
|
vrtc_cmos_write(real_min, RTC_MINUTES);
|
|
spin_unlock_irqrestore(&rtc_lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void __init mrst_rtc_init(void)
|
|
{
|
|
unsigned long vrtc_paddr;
|
|
|
|
sfi_table_parse(SFI_SIG_MRTC, NULL, NULL, sfi_parse_mrtc);
|
|
|
|
vrtc_paddr = sfi_mrtc_array[0].phys_addr;
|
|
if (!sfi_mrtc_num || !vrtc_paddr)
|
|
return;
|
|
|
|
vrtc_virt_base = (void __iomem *)set_fixmap_offset_nocache(FIX_LNW_VRTC,
|
|
vrtc_paddr);
|
|
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;
|
|
|
|
return platform_device_register(&vrtc_device);
|
|
}
|
|
|
|
module_init(mrst_device_create);
|