[kernel] r12554 - in dists/sid/linux-2.6/debian: . config/ia64 patches/bugfix/ia64 patches/series
Dann Frazier
dannf at alioth.debian.org
Sat Jan 10 00:50:13 UTC 2009
Author: dannf
Date: Sat Jan 10 00:50:12 2009
New Revision: 12554
Log:
[ia64] Add RTC class driver for EFI
Added:
dists/sid/linux-2.6/debian/patches/bugfix/ia64/add-efi-rtc-class-driver.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/config/ia64/config
dists/sid/linux-2.6/debian/patches/series/13
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog (original)
+++ dists/sid/linux-2.6/debian/changelog Sat Jan 10 00:50:12 2009
@@ -6,6 +6,7 @@
* cciss: Add PCI ids for P711m and p712m
* Fix buffer underflow in the ib700wdt watchdog driver (CVE-2008-5702)
* [sparc] Enable CONFIG_FB_XVR500, CONFIG_FB_XVR2500 (Closes: #508108)
+ * [ia64] Add RTC class driver for EFI
[ Bastian Blank ]
* Fix multicast in atl1e driver. (closes: #509097)
@@ -34,7 +35,7 @@
- Add missing calls to plat_unmap_dma_mem.
- Only write c0_framemask on CPUs which have this register.
- -- dann frazier <dannf at debian.org> Tue, 06 Jan 2009 11:00:38 -0700
+ -- dann frazier <dannf at debian.org> Fri, 09 Jan 2009 16:14:42 -0700
linux-2.6 (2.6.26-12) unstable; urgency=high
Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config (original)
+++ dists/sid/linux-2.6/debian/config/ia64/config Sat Jan 10 00:50:12 2009
@@ -92,7 +92,6 @@
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
-CONFIG_EFI_RTC=y
CONFIG_DTLK=m
CONFIG_APPLICOM=m
CONFIG_RAW_DRIVER=m
@@ -685,6 +684,11 @@
CONFIG_I82092=m
##
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_DRV_EFI=y
+
+##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_ARCMSR=m
Added: dists/sid/linux-2.6/debian/patches/bugfix/ia64/add-efi-rtc-class-driver.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/ia64/add-efi-rtc-class-driver.patch Sat Jan 10 00:50:12 2009
@@ -0,0 +1,345 @@
+diff -urpN linux-source-2.6.26.orig/arch/ia64/kernel/time.c linux-source-2.6.26/arch/ia64/kernel/time.c
+--- linux-source-2.6.26.orig/arch/ia64/kernel/time.c 2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/arch/ia64/kernel/time.c 2009-01-09 15:51:31.000000000 -0700
+@@ -20,6 +20,7 @@
+ #include <linux/efi.h>
+ #include <linux/timex.h>
+ #include <linux/clocksource.h>
++#include <linux/platform_device.h>
+
+ #include <asm/machvec.h>
+ #include <asm/delay.h>
+@@ -380,6 +381,23 @@ static struct irqaction timer_irqaction
+ .name = "timer"
+ };
+
++struct platform_device rtc_efi_dev = {
++ .name = "rtc-efi",
++ .id = -1,
++};
++
++static int __init rtc_init(void)
++{
++ int ret;
++ ret = platform_device_register(&rtc_efi_dev);
++ if (ret < 0)
++ printk(KERN_ERR "unable to register rtc device...\n");
++
++ /* not necessarily an error */
++ return 0;
++}
++module_init(rtc_init);
++
+ void __init
+ time_init (void)
+ {
+diff -urpN linux-source-2.6.26.orig/drivers/rtc/Kconfig linux-source-2.6.26/drivers/rtc/Kconfig
+--- linux-source-2.6.26.orig/drivers/rtc/Kconfig 2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/drivers/rtc/Kconfig 2009-01-09 15:51:31.000000000 -0700
+@@ -367,6 +367,16 @@ config RTC_DRV_DS1742
+ This driver can also be built as a module. If so, the module
+ will be called rtc-ds1742.
+
++config RTC_DRV_EFI
++ tristate "EFI RTC"
++ depends on IA64
++ help
++ If you say yes here you will get support for the EFI
++ Real Time Clock.
++
++ This driver can also be built as a module. If so, the module
++ will be called rtc-efi.
++
+ config RTC_DRV_STK17TA8
+ tristate "Simtek STK17TA8"
+ depends on RTC_CLASS
+diff -urpN linux-source-2.6.26.orig/drivers/rtc/Makefile linux-source-2.6.26/drivers/rtc/Makefile
+--- linux-source-2.6.26.orig/drivers/rtc/Makefile 2008-07-13 15:51:29.000000000 -0600
++++ linux-source-2.6.26/drivers/rtc/Makefile 2009-01-09 15:51:51.000000000 -0700
+@@ -30,6 +30,7 @@ obj-$(CONFIG_RTC_DRV_DS1511) += rtc-ds15
+ obj-$(CONFIG_RTC_DRV_DS1553) += rtc-ds1553.o
+ obj-$(CONFIG_RTC_DRV_DS1672) += rtc-ds1672.o
+ obj-$(CONFIG_RTC_DRV_DS1742) += rtc-ds1742.o
++obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o
+ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o
+ obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o
+ obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o
+diff -urpN linux-source-2.6.26.orig/drivers/rtc/rtc-efi.c linux-source-2.6.26/drivers/rtc/rtc-efi.c
+--- linux-source-2.6.26.orig/drivers/rtc/rtc-efi.c 1969-12-31 17:00:00.000000000 -0700
++++ linux-source-2.6.26/drivers/rtc/rtc-efi.c 2009-01-09 15:51:31.000000000 -0700
+@@ -0,0 +1,275 @@
++/*
++ * rtc-efi: RTC Class Driver for EFI-based systems
++ *
++ * Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
++ *
++ * Author: dann frazier <dannf at hp.com>
++ * Based on efirtc.c by Stephane Eranian
++ *
++ * 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; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/time.h>
++#include <linux/platform_device.h>
++
++#include <linux/efi.h>
++
++#define EFI_ISDST (EFI_TIME_ADJUST_DAYLIGHT|EFI_TIME_IN_DAYLIGHT)
++/*
++ * EFI Epoch is 1/1/1998
++ */
++#define EFI_RTC_EPOCH 1998
++
++#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))
++
++struct efi_rtc {
++ struct rtc_device *rtc;
++ spinlock_t lock;
++};
++
++static const unsigned short int __mon_yday[2][13] =
++{
++ /* Normal years. */
++ { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
++ /* Leap years. */
++ { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
++};
++
++/*
++ * returns day of the year [0-365]
++ */
++static inline int
++compute_yday(efi_time_t *eft)
++{
++ /* efi_time_t.month is in the [1-12] so, we need -1 */
++ return rtc_year_days(eft->day - 1, eft->month - 1, eft->year);
++}
++/*
++ * returns day of the week [0-6] 0=Sunday
++ *
++ * Don't try to provide a year that's before 1998, please !
++ */
++static int
++compute_wday(efi_time_t *eft)
++{
++ int y;
++ int ndays = 0;
++
++ if (eft->year < 1998) {
++ printk(KERN_ERR "efirtc: EFI year < 1998, invalid date\n");
++ return -1;
++ }
++
++ for (y = EFI_RTC_EPOCH; y < eft->year; y++)
++ ndays += 365 + (LEAP_YEAR(y) ? 1 : 0);
++
++ ndays += compute_yday(eft);
++
++ /*
++ * 4=1/1/1998 was a Thursday
++ */
++ return (ndays + 4) % 7;
++}
++
++static void
++convert_to_efi_time(struct rtc_time *wtime, efi_time_t *eft)
++{
++
++ eft->year = wtime->tm_year + 1900;
++ eft->month = wtime->tm_mon + 1;
++ eft->day = wtime->tm_mday;
++ eft->hour = wtime->tm_hour;
++ eft->minute = wtime->tm_min;
++ eft->second = wtime->tm_sec;
++ eft->nanosecond = 0;
++ eft->daylight = wtime->tm_isdst ? EFI_ISDST : 0;
++ eft->timezone = EFI_UNSPECIFIED_TIMEZONE;
++}
++
++static void
++convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
++{
++ memset(wtime, 0, sizeof(*wtime));
++ wtime->tm_sec = eft->second;
++ wtime->tm_min = eft->minute;
++ wtime->tm_hour = eft->hour;
++ wtime->tm_mday = eft->day;
++ wtime->tm_mon = eft->month - 1;
++ wtime->tm_year = eft->year - 1900;
++
++ /* day of the week [0-6], Sunday=0 */
++ wtime->tm_wday = compute_wday(eft);
++
++ /* day in the year [1-365]*/
++ wtime->tm_yday = compute_yday(eft);
++
++
++ switch (eft->daylight & EFI_ISDST) {
++ case EFI_ISDST:
++ wtime->tm_isdst = 1;
++ break;
++ case EFI_TIME_ADJUST_DAYLIGHT:
++ wtime->tm_isdst = 0;
++ break;
++ default:
++ wtime->tm_isdst = -1;
++ }
++}
++
++static int efi_read_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
++{
++ efi_time_t eft;
++ efi_status_t status;
++
++ lock_kernel();
++
++ /*
++ * As of EFI v1.10, this call always returns an unsupported status
++ */
++ status = efi.get_wakeup_time((efi_bool_t *)&wkalrm->enabled,
++ (efi_bool_t *)&wkalrm->pending, &eft);
++
++ unlock_kernel();
++
++ if (status != EFI_SUCCESS)
++ return -EINVAL;
++
++ convert_from_efi_time(&eft, &wkalrm->time);
++
++ return rtc_valid_tm(&wkalrm->time);
++}
++
++static int efi_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
++{
++ efi_time_t eft;
++ efi_status_t status;
++
++ convert_to_efi_time(&wkalrm->time, &eft);
++
++ lock_kernel();
++
++ /*
++ * XXX Fixme:
++ * As of EFI 0.92 with the firmware I have on my
++ * machine this call does not seem to work quite
++ * right
++ *
++ * As of v1.10, this call always returns an unsupported status
++ */
++ status = efi.set_wakeup_time((efi_bool_t)wkalrm->enabled, &eft);
++
++ unlock_kernel();
++
++ printk(KERN_WARNING "write status is %d\n", (int)status);
++
++ return status == EFI_SUCCESS ? 0 : -EINVAL;
++}
++
++static int efi_read_time(struct device *dev, struct rtc_time *tm)
++{
++ efi_status_t status;
++ efi_time_t eft;
++ efi_time_cap_t cap;
++
++ lock_kernel();
++
++ status = efi.get_time(&eft, &cap);
++
++ unlock_kernel();
++
++ if (status != EFI_SUCCESS) {
++ /* should never happen */
++ printk(KERN_ERR "efitime: can't read time\n");
++ return -EINVAL;
++ }
++
++ convert_from_efi_time(&eft, tm);
++
++ return rtc_valid_tm(tm);
++}
++
++static int efi_set_time(struct device *dev, struct rtc_time *tm)
++{
++ efi_status_t status;
++ efi_time_t eft;
++
++ convert_to_efi_time(tm, &eft);
++
++ lock_kernel();
++
++ status = efi.set_time(&eft);
++
++ unlock_kernel();
++
++ return status == EFI_SUCCESS ? 0 : -EINVAL;
++}
++
++static const struct rtc_class_ops efi_rtc_ops = {
++ .read_time = efi_read_time,
++ .set_time = efi_set_time,
++ .read_alarm = efi_read_alarm,
++ .set_alarm = efi_set_alarm,
++};
++
++static int __devinit efi_rtc_probe(struct platform_device *dev)
++{
++ struct rtc_device *rtc;
++
++ rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
++ if (!rtc)
++ return -ENOMEM;
++
++ rtc = rtc_device_register("rtc-efi", &dev->dev, &efi_rtc_ops,
++ THIS_MODULE);
++ if (IS_ERR(rtc)) {
++ int err = PTR_ERR(rtc);
++ kfree(rtc);
++ return err;
++ }
++
++ platform_set_drvdata(dev, rtc);
++
++ return 0;
++}
++
++static int __devexit efi_rtc_remove(struct platform_device *dev)
++{
++ struct rtc_device *rtc = platform_get_drvdata(dev);
++
++ rtc_device_unregister(rtc);
++ kfree(rtc);
++
++ return 0;
++}
++
++static struct platform_driver efi_rtc_driver = {
++ .driver = {
++ .name = "rtc-efi",
++ .owner = THIS_MODULE,
++ },
++ .probe = efi_rtc_probe,
++ .remove = __devexit_p(efi_rtc_remove),
++};
++
++static int __init efi_rtc_init(void)
++{
++ return platform_driver_probe(&efi_rtc_driver, efi_rtc_probe);
++}
++
++static void __exit efi_rtc_exit(void)
++{
++ platform_driver_unregister(&efi_rtc_driver);
++}
++
++module_init(efi_rtc_init);
++module_exit(efi_rtc_exit);
++
++MODULE_AUTHOR("dann frazier <dannf at hp.com>");
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("EFI RTC driver");
Modified: dists/sid/linux-2.6/debian/patches/series/13
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/13 (original)
+++ dists/sid/linux-2.6/debian/patches/series/13 Sat Jan 10 00:50:12 2009
@@ -18,3 +18,4 @@
+ bugfix/mips/mips64r2-fix-buggy-arch-swab64.patch
+ bugfix/mips/add-missing-plat_unmap_dma_mem.patch
+ bugfix/mips/write-c0_framemask-only-when-supported.patch
++ bugfix/ia64/add-efi-rtc-class-driver.patch
More information about the Kernel-svn-changes
mailing list