From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Belloni Date: Wed, 23 Oct 2019 15:23:01 +0000 Subject: Re: [PATCH 1/2] rtc/ia64: remove legacy efirtc driver Message-Id: <20191023152301.GQ3125@piout.net> List-Id: References: <20191023150311.844123-1-arnd@arndb.de> In-Reply-To: <20191023150311.844123-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Arnd Bergmann Cc: Greg Kroah-Hartman , linux-rtc@vger.kernel.org, Alessandro Zummo , linux-ia64@vger.kernel.org, Fenghua Yu , Tony Luck , Stephane Eranian , linux-kernel@vger.kernel.org On 23/10/2019 17:01:58+0200, Arnd Bergmann wrote: > There are two EFI RTC drivers, the original drivers/char/efirtc.c > driver and the more modern drivers/rtc/rtc-efi.c. >=20 > Both implement the same interface, but the new one does so > in a more portable way. >=20 > Move everything over to that one and remove the old one. >=20 > Cc: linux-ia64@vger.kernel.org > Cc: Fenghua Yu > Cc: Tony Luck > Cc: Stephane Eranian > Signed-off-by: Arnd Bergmann Acked-by: Alexandre Belloni > --- > This was last discussed in early 2018 in > https://lore.kernel.org/lkml/CAK8P3a0QZNY+K+V1HG056xCerz=3D_L2jh5UfZ+2LWk= Dqkw5Zznw@mail.gmail.com/ >=20 > Nobody ever replied there, so let's try this instead. > If there is any reason to keep the driver after all, > please let us know. > --- > arch/ia64/configs/bigsur_defconfig | 3 +- > arch/ia64/configs/generic_defconfig | 3 +- > arch/ia64/configs/gensparse_defconfig | 3 +- > arch/ia64/configs/tiger_defconfig | 3 +- > arch/ia64/configs/zx1_defconfig | 3 +- > drivers/char/Kconfig | 4 - > drivers/char/Makefile | 1 - > drivers/char/efirtc.c | 366 -------------------------- > include/linux/miscdevice.h | 2 +- > 9 files changed, 11 insertions(+), 377 deletions(-) > delete mode 100644 drivers/char/efirtc.c >=20 > diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsu= r_defconfig > index b630bd7351c4..f3ba813a5b80 100644 > --- a/arch/ia64/configs/bigsur_defconfig > +++ b/arch/ia64/configs/bigsur_defconfig > @@ -57,7 +57,8 @@ CONFIG_SERIAL_8250_CONSOLE=3Dy > CONFIG_SERIAL_8250_EXTENDED=3Dy > CONFIG_SERIAL_8250_SHARE_IRQ=3Dy > # CONFIG_HW_RANDOM is not set > -CONFIG_EFI_RTC=3Dy > +CONFIG_RTC_CLASS=3Dy > +CONFIG_RTC_DRV_EFI=3Dy > CONFIG_I2C=3Dy > CONFIG_I2C_CHARDEV=3Dy > CONFIG_AGP=3Dm > diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/gene= ric_defconfig > index 661d90b3e148..cb267a07c57f 100644 > --- a/arch/ia64/configs/generic_defconfig > +++ b/arch/ia64/configs/generic_defconfig > @@ -94,7 +94,8 @@ CONFIG_SERIAL_8250_NR_UARTS=3D6 > CONFIG_SERIAL_8250_EXTENDED=3Dy > CONFIG_SERIAL_8250_SHARE_IRQ=3Dy > # CONFIG_HW_RANDOM is not set > -CONFIG_EFI_RTC=3Dy > +CONFIG_RTC_CLASS=3Dy > +CONFIG_RTC_DRV_EFI=3Dy > CONFIG_RAW_DRIVER=3Dm > CONFIG_HPET=3Dy > CONFIG_AGP=3Dm > diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/ge= nsparse_defconfig > index 7844e6a956a4..7e25f2f031b6 100644 > --- a/arch/ia64/configs/gensparse_defconfig > +++ b/arch/ia64/configs/gensparse_defconfig > @@ -82,7 +82,8 @@ CONFIG_SERIAL_8250_NR_UARTS=3D6 > CONFIG_SERIAL_8250_EXTENDED=3Dy > CONFIG_SERIAL_8250_SHARE_IRQ=3Dy > # CONFIG_HW_RANDOM is not set > -CONFIG_EFI_RTC=3Dy > +CONFIG_RTC_CLASS=3Dy > +CONFIG_RTC_DRV_EFI=3Dy > CONFIG_RAW_DRIVER=3Dm > CONFIG_HPET=3Dy > CONFIG_AGP=3Dm > diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_= defconfig > index 1d6e2a01452b..3f486d5bdc2d 100644 > --- a/arch/ia64/configs/tiger_defconfig > +++ b/arch/ia64/configs/tiger_defconfig > @@ -86,7 +86,8 @@ CONFIG_SERIAL_8250_NR_UARTS=3D6 > CONFIG_SERIAL_8250_EXTENDED=3Dy > CONFIG_SERIAL_8250_SHARE_IRQ=3Dy > # CONFIG_HW_RANDOM is not set > -CONFIG_EFI_RTC=3Dy > +CONFIG_RTC_CLASS=3Dy > +CONFIG_RTC_DRV_EFI=3Dy > CONFIG_RAW_DRIVER=3Dm > CONFIG_HPET=3Dy > CONFIG_AGP=3Dm > diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defc= onfig > index 8c92e095f8bb..70788a500448 100644 > --- a/arch/ia64/configs/zx1_defconfig > +++ b/arch/ia64/configs/zx1_defconfig > @@ -69,7 +69,8 @@ CONFIG_SERIAL_8250_NR_UARTS=3D8 > CONFIG_SERIAL_8250_EXTENDED=3Dy > CONFIG_SERIAL_8250_SHARE_IRQ=3Dy > # CONFIG_HW_RANDOM is not set > -CONFIG_EFI_RTC=3Dy > +CONFIG_RTC_CLASS=3Dy > +CONFIG_RTC_DRV_EFI=3Dy > CONFIG_I2C_CHARDEV=3Dy > CONFIG_AGP=3Dy > CONFIG_AGP_HP_ZX1=3Dy > diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig > index df0fc997dc3e..dabbf3f519c6 100644 > --- a/drivers/char/Kconfig > +++ b/drivers/char/Kconfig > @@ -297,10 +297,6 @@ config JS_RTC > To compile this driver as a module, choose M here: the > module will be called js-rtc. > =20 > -config EFI_RTC > - bool "EFI Real Time Clock Services" > - depends on IA64 > - > endif # RTC_LIB > =20 > config DTLK > diff --git a/drivers/char/Makefile b/drivers/char/Makefile > index 7c5ea6f9df14..abe3138b1f5a 100644 > --- a/drivers/char/Makefile > +++ b/drivers/char/Makefile > @@ -22,7 +22,6 @@ obj-$(CONFIG_APPLICOM) +=3D applicom.o > obj-$(CONFIG_SONYPI) +=3D sonypi.o > obj-$(CONFIG_RTC) +=3D rtc.o > obj-$(CONFIG_HPET) +=3D hpet.o > -obj-$(CONFIG_EFI_RTC) +=3D efirtc.o > obj-$(CONFIG_XILINX_HWICAP) +=3D xilinx_hwicap/ > obj-$(CONFIG_NVRAM) +=3D nvram.o > obj-$(CONFIG_TOSHIBA) +=3D toshiba.o > diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c > deleted file mode 100644 > index 4f73064d0c6f..000000000000 > --- a/drivers/char/efirtc.c > +++ /dev/null > @@ -1,366 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0-only > -/* > - * EFI Time Services Driver for Linux > - * > - * Copyright (C) 1999 Hewlett-Packard Co > - * Copyright (C) 1999 Stephane Eranian > - * > - * Based on skeleton from the drivers/char/rtc.c driver by P. Gortmaker > - * > - * This code provides an architected & portable interface to the real ti= me > - * clock by using EFI instead of direct bit fiddling. The functionalitie= s are=20 > - * quite different from the rtc.c driver. The only way to talk to the de= vice=20 > - * is by using ioctl(). There is a /proc interface which provides the ra= w=20 > - * information. > - * > - * Please note that we have kept the API as close as possible to the > - * legacy RTC. The standard /sbin/hwclock program should work normally=20 > - * when used to get/set the time. > - * > - * NOTES: > - * - Locking is required for safe execution of EFI calls with regards > - * to interrupts and SMP. > - * > - * TODO (December 1999): > - * - provide the API to set/get the WakeUp Alarm (different from the > - * rtc.c alarm). > - * - SMP testing > - * - Add module support > - */ > - > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > -#include > - > - > -#define EFI_RTC_VERSION "0.4" > - > -#define EFI_ISDST (EFI_TIME_ADJUST_DAYLIGHT|EFI_TIME_IN_DAYLIGHT) > -/* > - * EFI Epoch is 1/1/1998 > - */ > -#define EFI_RTC_EPOCH 1998 > - > -static DEFINE_SPINLOCK(efi_rtc_lock); > - > -static long efi_rtc_ioctl(struct file *file, unsigned int cmd, > - unsigned long arg); > - > -#define is_leap(year) \ > - ((year) % 4 =3D 0 && ((year) % 100 !=3D 0 || (year) % 400 =3D = 0)) > - > -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. */ =20 > - { 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 __mon_yday[is_leap(eft->year)][eft->month-1]+ eft->day -1; > -} > -/* > - * returns day of the week [0-6] 0=3DSunday > - * > - * Don't try to provide a year that's before 1998, please ! > - */ > -static int > -compute_wday(efi_time_t *eft) > -{ > - int y; > - int ndays =3D 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 +=3D 365 + (is_leap(y) ? 1 : 0); > - } > - ndays +=3D compute_yday(eft); > - > - /* > - * 4=3D1/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 =3D wtime->tm_year + 1900; > - eft->month =3D wtime->tm_mon + 1;=20 > - eft->day =3D wtime->tm_mday; > - eft->hour =3D wtime->tm_hour; > - eft->minute =3D wtime->tm_min; > - eft->second =3D wtime->tm_sec; > - eft->nanosecond =3D 0;=20 > - eft->daylight =3D wtime->tm_isdst ? EFI_ISDST: 0; > - eft->timezone =3D 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 =3D eft->second; > - wtime->tm_min =3D eft->minute; > - wtime->tm_hour =3D eft->hour; > - wtime->tm_mday =3D eft->day; > - wtime->tm_mon =3D eft->month - 1; > - wtime->tm_year =3D eft->year - 1900; > - > - /* day of the week [0-6], Sunday=3D0 */ > - wtime->tm_wday =3D compute_wday(eft); > - > - /* day in the year [1-365]*/ > - wtime->tm_yday =3D compute_yday(eft); > - > - > - switch (eft->daylight & EFI_ISDST) { > - case EFI_ISDST: > - wtime->tm_isdst =3D 1; > - break; > - case EFI_TIME_ADJUST_DAYLIGHT: > - wtime->tm_isdst =3D 0; > - break; > - default: > - wtime->tm_isdst =3D -1; > - } > -} > - > -static long efi_rtc_ioctl(struct file *file, unsigned int cmd, > - unsigned long arg) > -{ > - > - efi_status_t status; > - unsigned long flags; > - efi_time_t eft; > - efi_time_cap_t cap; > - struct rtc_time wtime; > - struct rtc_wkalrm __user *ewp; > - unsigned char enabled, pending; > - > - switch (cmd) { > - case RTC_UIE_ON: > - case RTC_UIE_OFF: > - case RTC_PIE_ON: > - case RTC_PIE_OFF: > - case RTC_AIE_ON: > - case RTC_AIE_OFF: > - case RTC_ALM_SET: > - case RTC_ALM_READ: > - case RTC_IRQP_READ: > - case RTC_IRQP_SET: > - case RTC_EPOCH_READ: > - case RTC_EPOCH_SET: > - return -EINVAL; > - > - case RTC_RD_TIME: > - spin_lock_irqsave(&efi_rtc_lock, flags); > - > - status =3D efi.get_time(&eft, &cap); > - > - spin_unlock_irqrestore(&efi_rtc_lock,flags); > - > - if (status !=3D EFI_SUCCESS) { > - /* should never happen */ > - printk(KERN_ERR "efitime: can't read time\n"); > - return -EINVAL; > - } > - > - convert_from_efi_time(&eft, &wtime); > - > - return copy_to_user((void __user *)arg, &wtime, > - sizeof (struct rtc_time)) ? - EFAULT : 0; > - > - case RTC_SET_TIME: > - > - if (!capable(CAP_SYS_TIME)) return -EACCES; > - > - if (copy_from_user(&wtime, (struct rtc_time __user *)arg, > - sizeof(struct rtc_time)) ) > - return -EFAULT; > - > - convert_to_efi_time(&wtime, &eft); > - > - spin_lock_irqsave(&efi_rtc_lock, flags); > - > - status =3D efi.set_time(&eft); > - > - spin_unlock_irqrestore(&efi_rtc_lock,flags); > - > - return status =3D EFI_SUCCESS ? 0 : -EINVAL; > - > - case RTC_WKALM_SET: > - > - if (!capable(CAP_SYS_TIME)) return -EACCES; > - > - ewp =3D (struct rtc_wkalrm __user *)arg; > - > - if ( get_user(enabled, &ewp->enabled) > - || copy_from_user(&wtime, &ewp->time, sizeof(struct rtc_time)) ) > - return -EFAULT; > - > - convert_to_efi_time(&wtime, &eft); > - > - spin_lock_irqsave(&efi_rtc_lock, flags); > - /* > - * XXX Fixme: > - * As of EFI 0.92 with the firmware I have on my > - * machine this call does not seem to work quite > - * right > - */ > - status =3D efi.set_wakeup_time((efi_bool_t)enabled, &eft); > - > - spin_unlock_irqrestore(&efi_rtc_lock,flags); > - > - return status =3D EFI_SUCCESS ? 0 : -EINVAL; > - > - case RTC_WKALM_RD: > - > - spin_lock_irqsave(&efi_rtc_lock, flags); > - > - status =3D efi.get_wakeup_time((efi_bool_t *)&enabled, (efi_bool_t *)= &pending, &eft); > - > - spin_unlock_irqrestore(&efi_rtc_lock,flags); > - > - if (status !=3D EFI_SUCCESS) return -EINVAL; > - > - ewp =3D (struct rtc_wkalrm __user *)arg; > - > - if ( put_user(enabled, &ewp->enabled) > - || put_user(pending, &ewp->pending)) return -EFAULT; > - > - convert_from_efi_time(&eft, &wtime); > - > - return copy_to_user(&ewp->time, &wtime, > - sizeof(struct rtc_time)) ? -EFAULT : 0; > - } > - return -ENOTTY; > -} > - > -/* > - * The various file operations we support. > - */ > - > -static const struct file_operations efi_rtc_fops =3D { > - .owner =3D THIS_MODULE, > - .unlocked_ioctl =3D efi_rtc_ioctl, > - .llseek =3D no_llseek, > -}; > - > -static struct miscdevice efi_rtc_dev=3D { > - EFI_RTC_MINOR, > - "efirtc", > - &efi_rtc_fops > -}; > - > -/* > - * We export RAW EFI information to /proc/driver/efirtc > - */ > -static int efi_rtc_proc_show(struct seq_file *m, void *v) > -{ > - efi_time_t eft, alm; > - efi_time_cap_t cap; > - efi_bool_t enabled, pending;=09 > - unsigned long flags; > - > - memset(&eft, 0, sizeof(eft)); > - memset(&alm, 0, sizeof(alm)); > - memset(&cap, 0, sizeof(cap)); > - > - spin_lock_irqsave(&efi_rtc_lock, flags); > - > - efi.get_time(&eft, &cap); > - efi.get_wakeup_time(&enabled, &pending, &alm); > - > - spin_unlock_irqrestore(&efi_rtc_lock,flags); > - > - seq_printf(m, > - "Time : %u:%u:%u.%09u\n" > - "Date : %u-%u-%u\n" > - "Daylight : %u\n", > - eft.hour, eft.minute, eft.second, eft.nanosecond,=20 > - eft.year, eft.month, eft.day, > - eft.daylight); > - > - if (eft.timezone =3D EFI_UNSPECIFIED_TIMEZONE) > - seq_puts(m, "Timezone : unspecified\n"); > - else > - /* XXX fixme: convert to string? */ > - seq_printf(m, "Timezone : %u\n", eft.timezone); > - =09 > - > - seq_printf(m, > - "Alarm Time : %u:%u:%u.%09u\n" > - "Alarm Date : %u-%u-%u\n" > - "Alarm Daylight : %u\n" > - "Enabled : %s\n" > - "Pending : %s\n", > - alm.hour, alm.minute, alm.second, alm.nanosecond,=20 > - alm.year, alm.month, alm.day,=20 > - alm.daylight, > - enabled =3D 1 ? "yes" : "no", > - pending =3D 1 ? "yes" : "no"); > - > - if (eft.timezone =3D EFI_UNSPECIFIED_TIMEZONE) > - seq_puts(m, "Timezone : unspecified\n"); > - else > - /* XXX fixme: convert to string? */ > - seq_printf(m, "Timezone : %u\n", alm.timezone); > - > - /* > - * now prints the capabilities > - */ > - seq_printf(m, > - "Resolution : %u\n" > - "Accuracy : %u\n" > - "SetstoZero : %u\n", > - cap.resolution, cap.accuracy, cap.sets_to_zero); > - > - return 0; > -} > -static int __init=20 > -efi_rtc_init(void) > -{ > - int ret; > - struct proc_dir_entry *dir; > - > - printk(KERN_INFO "EFI Time Services Driver v%s\n", EFI_RTC_VERSION); > - > - ret =3D misc_register(&efi_rtc_dev); > - if (ret) { > - printk(KERN_ERR "efirtc: can't misc_register on minor=3D%d\n", > - EFI_RTC_MINOR); > - return ret; > - } > - > - dir =3D proc_create_single("driver/efirtc", 0, NULL, efi_rtc_proc_show); > - if (dir =3D NULL) { > - printk(KERN_ERR "efirtc: can't create /proc/driver/efirtc.\n"); > - misc_deregister(&efi_rtc_dev); > - return -1; > - } > - return 0; > -} > -device_initcall(efi_rtc_init); > - > -/* > -MODULE_LICENSE("GPL"); > -*/ > diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h > index 3247a3dc7934..4ab05916046c 100644 > --- a/include/linux/miscdevice.h > +++ b/include/linux/miscdevice.h > @@ -25,7 +25,7 @@ > #define TEMP_MINOR 131 /* Temperature Sensor */ > #define APM_MINOR_DEV 134 > #define RTC_MINOR 135 > -#define EFI_RTC_MINOR 136 /* EFI Time services */ > +/*#define EFI_RTC_MINOR 136 was EFI Time services */ > #define VHCI_MINOR 137 > #define SUN_OPENPROM_MINOR 139 > #define DMAPI_MINOR 140 /* unused */ > --=20 > 2.20.0 >=20 --=20 Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com