You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'cris-for-linus' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson: "No major changes here, but fixes some compile errors for CRIS, some small style issues, some documentation and as a bonus nukes a couple of obsolete rtc-files and related code." * tag 'cris-for-linus' of git://jni.nu/cris: cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile CRIS: Remove legacy RTC drivers cris/mm/fault.c: Port OOM changes to do_page_fault cris:fix the wrong function declear CRIS: Add _sdata to vmlinux.lds.S cris: posix_types.h, include asm-generic/posix_types.h CRIS: Update documentation cris/arch-v32: cryptocop: Use kzalloc net:removed the unused variable cris:removed the unused variable CRISv32: Correct name of read_mostly section.
This commit is contained in:
Linus Torvalds
File diff suppressed because it is too large
Load Diff
@@ -1,380 +0,0 @@
|
||||
/*
|
||||
* PCF8563 RTC
|
||||
*
|
||||
* From Phillips' datasheet:
|
||||
*
|
||||
* The PCF8563 is a CMOS real-time clock/calendar optimized for low power
|
||||
* consumption. A programmable clock output, interrupt output and voltage
|
||||
* low detector are also provided. All address and data are transferred
|
||||
* serially via two-line bidirectional I2C-bus. Maximum bus speed is
|
||||
* 400 kbits/s. The built-in word address register is incremented
|
||||
* automatically after each written or read byte.
|
||||
*
|
||||
* Copyright (c) 2002-2007, Axis Communications AB
|
||||
* All rights reserved.
|
||||
*
|
||||
* Author: Tobias Anderberg <tobiasa@axis.com>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/ioctl.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/bcd.h>
|
||||
#include <linux/mutex.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/rtc.h>
|
||||
|
||||
#include "i2c.h"
|
||||
|
||||
#define PCF8563_MAJOR 121 /* Local major number. */
|
||||
#define DEVICE_NAME "rtc" /* Name which is registered in /proc/devices. */
|
||||
#define PCF8563_NAME "PCF8563"
|
||||
#define DRIVER_VERSION "$Revision: 1.24 $"
|
||||
|
||||
/* I2C bus slave registers. */
|
||||
#define RTC_I2C_READ 0xa3
|
||||
#define RTC_I2C_WRITE 0xa2
|
||||
|
||||
/* Two simple wrapper macros, saves a few keystrokes. */
|
||||
#define rtc_read(x) i2c_readreg(RTC_I2C_READ, x)
|
||||
#define rtc_write(x,y) i2c_writereg(RTC_I2C_WRITE, x, y)
|
||||
|
||||
static DEFINE_MUTEX(pcf8563_mutex);
|
||||
static DEFINE_MUTEX(rtc_lock); /* Protect state etc */
|
||||
|
||||
static const unsigned char days_in_month[] =
|
||||
{ 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
|
||||
|
||||
static long pcf8563_unlocked_ioctl(struct file *, unsigned int, unsigned long);
|
||||
|
||||
/* Cache VL bit value read at driver init since writing the RTC_SECOND
|
||||
* register clears the VL status.
|
||||
*/
|
||||
static int voltage_low;
|
||||
|
||||
static const struct file_operations pcf8563_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.unlocked_ioctl = pcf8563_unlocked_ioctl,
|
||||
.llseek = noop_llseek,
|
||||
};
|
||||
|
||||
unsigned char
|
||||
pcf8563_readreg(int reg)
|
||||
{
|
||||
unsigned char res = rtc_read(reg);
|
||||
|
||||
/* The PCF8563 does not return 0 for unimplemented bits. */
|
||||
switch (reg) {
|
||||
case RTC_SECONDS:
|
||||
case RTC_MINUTES:
|
||||
res &= 0x7F;
|
||||
break;
|
||||
case RTC_HOURS:
|
||||
case RTC_DAY_OF_MONTH:
|
||||
res &= 0x3F;
|
||||
break;
|
||||
case RTC_WEEKDAY:
|
||||
res &= 0x07;
|
||||
break;
|
||||
case RTC_MONTH:
|
||||
res &= 0x1F;
|
||||
break;
|
||||
case RTC_CONTROL1:
|
||||
res &= 0xA8;
|
||||
break;
|
||||
case RTC_CONTROL2:
|
||||
res &= 0x1F;
|
||||
break;
|
||||
case RTC_CLOCKOUT_FREQ:
|
||||
case RTC_TIMER_CONTROL:
|
||||
res &= 0x83;
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
void
|
||||
pcf8563_writereg(int reg, unsigned char val)
|
||||
{
|
||||
rtc_write(reg, val);
|
||||
}
|
||||
|
||||
void
|
||||
get_rtc_time(struct rtc_time *tm)
|
||||
{
|
||||
tm->tm_sec = rtc_read(RTC_SECONDS);
|
||||
tm->tm_min = rtc_read(RTC_MINUTES);
|
||||
tm->tm_hour = rtc_read(RTC_HOURS);
|
||||
tm->tm_mday = rtc_read(RTC_DAY_OF_MONTH);
|
||||
tm->tm_wday = rtc_read(RTC_WEEKDAY);
|
||||
tm->tm_mon = rtc_read(RTC_MONTH);
|
||||
tm->tm_year = rtc_read(RTC_YEAR);
|
||||
|
||||
if (tm->tm_sec & 0x80) {
|
||||
printk(KERN_ERR "%s: RTC Voltage Low - reliable date/time "
|
||||
"information is no longer guaranteed!\n", PCF8563_NAME);
|
||||
}
|
||||
|
||||
tm->tm_year = bcd2bin(tm->tm_year) +
|
||||
((tm->tm_mon & 0x80) ? 100 : 0);
|
||||
tm->tm_sec &= 0x7F;
|
||||
tm->tm_min &= 0x7F;
|
||||
tm->tm_hour &= 0x3F;
|
||||
tm->tm_mday &= 0x3F;
|
||||
tm->tm_wday &= 0x07; /* Not coded in BCD. */
|
||||
tm->tm_mon &= 0x1F;
|
||||
|
||||
tm->tm_sec = bcd2bin(tm->tm_sec);
|
||||
tm->tm_min = bcd2bin(tm->tm_min);
|
||||
tm->tm_hour = bcd2bin(tm->tm_hour);
|
||||
tm->tm_mday = bcd2bin(tm->tm_mday);
|
||||
tm->tm_mon = bcd2bin(tm->tm_mon);
|
||||
tm->tm_mon--; /* Month is 1..12 in RTC but 0..11 in linux */
|
||||
}
|
||||
|
||||
int __init
|
||||
pcf8563_init(void)
|
||||
{
|
||||
static int res;
|
||||
static int first = 1;
|
||||
|
||||
if (!first)
|
||||
return res;
|
||||
first = 0;
|
||||
|
||||
/* Initiate the i2c protocol. */
|
||||
res = i2c_init();
|
||||
if (res < 0) {
|
||||
printk(KERN_CRIT "pcf8563_init: Failed to init i2c.\n");
|
||||
return res;
|
||||
}
|
||||
|
||||
/*
|
||||
* First of all we need to reset the chip. This is done by
|
||||
* clearing control1, control2 and clk freq and resetting
|
||||
* all alarms.
|
||||
*/
|
||||
if (rtc_write(RTC_CONTROL1, 0x00) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_CONTROL2, 0x00) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_CLOCKOUT_FREQ, 0x00) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_TIMER_CONTROL, 0x03) < 0)
|
||||
goto err;
|
||||
|
||||
/* Reset the alarms. */
|
||||
if (rtc_write(RTC_MINUTE_ALARM, 0x80) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_HOUR_ALARM, 0x80) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_DAY_ALARM, 0x80) < 0)
|
||||
goto err;
|
||||
|
||||
if (rtc_write(RTC_WEEKDAY_ALARM, 0x80) < 0)
|
||||
goto err;
|
||||
|
||||
/* Check for low voltage, and warn about it. */
|
||||
if (rtc_read(RTC_SECONDS) & 0x80) {
|
||||
voltage_low = 1;
|
||||
printk(KERN_WARNING "%s: RTC Voltage Low - reliable "
|
||||
"date/time information is no longer guaranteed!\n",
|
||||
PCF8563_NAME);
|
||||
}
|
||||
|
||||
return res;
|
||||
|
||||
err:
|
||||
printk(KERN_INFO "%s: Error initializing chip.\n", PCF8563_NAME);
|
||||
res = -1;
|
||||
return res;
|
||||
}
|
||||
|
||||
void __exit
|
||||
pcf8563_exit(void)
|
||||
{
|
||||
unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME);
|
||||
}
|
||||
|
||||
/*
|
||||
* ioctl calls for this driver. Why return -ENOTTY upon error? Because
|
||||
* POSIX says so!
|
||||
*/
|
||||
static int pcf8563_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
/* Some sanity checks. */
|
||||
if (_IOC_TYPE(cmd) != RTC_MAGIC)
|
||||
return -ENOTTY;
|
||||
|
||||
if (_IOC_NR(cmd) > RTC_MAX_IOCTL)
|
||||
return -ENOTTY;
|
||||
|
||||
switch (cmd) {
|
||||
case RTC_RD_TIME:
|
||||
{
|
||||
struct rtc_time tm;
|
||||
|
||||
mutex_lock(&rtc_lock);
|
||||
memset(&tm, 0, sizeof tm);
|
||||
get_rtc_time(&tm);
|
||||
|
||||
if (copy_to_user((struct rtc_time *) arg, &tm,
|
||||
sizeof tm)) {
|
||||
mutex_unlock(&rtc_lock);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
mutex_unlock(&rtc_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
case RTC_SET_TIME:
|
||||
{
|
||||
int leap;
|
||||
int year;
|
||||
int century;
|
||||
struct rtc_time tm;
|
||||
|
||||
memset(&tm, 0, sizeof tm);
|
||||
if (!capable(CAP_SYS_TIME))
|
||||
return -EPERM;
|
||||
|
||||
if (copy_from_user(&tm, (struct rtc_time *) arg, sizeof tm))
|
||||
return -EFAULT;
|
||||
|
||||
/* Convert from struct tm to struct rtc_time. */
|
||||
tm.tm_year += 1900;
|
||||
tm.tm_mon += 1;
|
||||
|
||||
/*
|
||||
* Check if tm.tm_year is a leap year. A year is a leap
|
||||
* year if it is divisible by 4 but not 100, except
|
||||
* that years divisible by 400 _are_ leap years.
|
||||
*/
|
||||
year = tm.tm_year;
|
||||
leap = (tm.tm_mon == 2) &&
|
||||
((year % 4 == 0 && year % 100 != 0) || year % 400 == 0);
|
||||
|
||||
/* Perform some sanity checks. */
|
||||
if ((tm.tm_year < 1970) ||
|
||||
(tm.tm_mon > 12) ||
|
||||
(tm.tm_mday == 0) ||
|
||||
(tm.tm_mday > days_in_month[tm.tm_mon] + leap) ||
|
||||
(tm.tm_wday >= 7) ||
|
||||
(tm.tm_hour >= 24) ||
|
||||
(tm.tm_min >= 60) ||
|
||||
(tm.tm_sec >= 60))
|
||||
return -EINVAL;
|
||||
|
||||
century = (tm.tm_year >= 2000) ? 0x80 : 0;
|
||||
tm.tm_year = tm.tm_year % 100;
|
||||
|
||||
tm.tm_year = bin2bcd(tm.tm_year);
|
||||
tm.tm_mon = bin2bcd(tm.tm_mon);
|
||||
tm.tm_mday = bin2bcd(tm.tm_mday);
|
||||
tm.tm_hour = bin2bcd(tm.tm_hour);
|
||||
tm.tm_min = bin2bcd(tm.tm_min);
|
||||
tm.tm_sec = bin2bcd(tm.tm_sec);
|
||||
tm.tm_mon |= century;
|
||||
|
||||
mutex_lock(&rtc_lock);
|
||||
|
||||
rtc_write(RTC_YEAR, tm.tm_year);
|
||||
rtc_write(RTC_MONTH, tm.tm_mon);
|
||||
rtc_write(RTC_WEEKDAY, tm.tm_wday); /* Not coded in BCD. */
|
||||
rtc_write(RTC_DAY_OF_MONTH, tm.tm_mday);
|
||||
rtc_write(RTC_HOURS, tm.tm_hour);
|
||||
rtc_write(RTC_MINUTES, tm.tm_min);
|
||||
rtc_write(RTC_SECONDS, tm.tm_sec);
|
||||
|
||||
mutex_unlock(&rtc_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
case RTC_VL_READ:
|
||||
if (voltage_low) {
|
||||
printk(KERN_ERR "%s: RTC Voltage Low - "
|
||||
"reliable date/time information is no "
|
||||
"longer guaranteed!\n", PCF8563_NAME);
|
||||
}
|
||||
|
||||
if (copy_to_user((int *) arg, &voltage_low, sizeof(int)))
|
||||
return -EFAULT;
|
||||
return 0;
|
||||
|
||||
case RTC_VL_CLR:
|
||||
{
|
||||
/* Clear the VL bit in the seconds register in case
|
||||
* the time has not been set already (which would
|
||||
* have cleared it). This does not really matter
|
||||
* because of the cached voltage_low value but do it
|
||||
* anyway for consistency. */
|
||||
|
||||
int ret = rtc_read(RTC_SECONDS);
|
||||
|
||||
rtc_write(RTC_SECONDS, (ret & 0x7F));
|
||||
|
||||
/* Clear the cached value. */
|
||||
voltage_low = 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
default:
|
||||
return -ENOTTY;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&pcf8563_mutex);
|
||||
ret = pcf8563_ioctl(filp, cmd, arg);
|
||||
mutex_unlock(&pcf8563_mutex);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __init pcf8563_register(void)
|
||||
{
|
||||
if (pcf8563_init() < 0) {
|
||||
printk(KERN_INFO "%s: Unable to initialize Real-Time Clock "
|
||||
"Driver, %s\n", PCF8563_NAME, DRIVER_VERSION);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) {
|
||||
printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n",
|
||||
PCF8563_NAME, PCF8563_MAJOR);
|
||||
return -1;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "%s Real-Time Clock Driver, %s\n", PCF8563_NAME,
|
||||
DRIVER_VERSION);
|
||||
|
||||
/* Check for low voltage, and warn about it. */
|
||||
if (voltage_low) {
|
||||
printk(KERN_WARNING "%s: RTC Voltage Low - reliable date/time "
|
||||
"information is no longer guaranteed!\n", PCF8563_NAME);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
module_init(pcf8563_register);
|
||||
module_exit(pcf8563_exit);
|
||||
@@ -21,8 +21,6 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/rtc.h>
|
||||
|
||||
|
||||
#include <arch/svinto.h>
|
||||
#include <asm/fasttimer.h>
|
||||
|
||||
@@ -264,7 +264,7 @@ static int write_register (int regno, char *val);
|
||||
|
||||
/* Write a value to a specified register in the stack of a thread other
|
||||
than the current thread. */
|
||||
static write_stack_register (int thread_id, int regno, char *valptr);
|
||||
static int write_stack_register(int thread_id, int regno, char *valptr);
|
||||
|
||||
/* Read a value from a specified register in the register image. Returns the
|
||||
status of the read operation. The register value is returned in valptr. */
|
||||
|
||||
@@ -19,16 +19,12 @@
|
||||
#include <asm/signal.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/rtc.h>
|
||||
#include <asm/irq_regs.h>
|
||||
|
||||
/* define this if you need to use print_timestamp */
|
||||
/* it will make jiffies at 96 hz instead of 100 hz though */
|
||||
#undef USE_CASCADE_TIMERS
|
||||
|
||||
extern int set_rtc_mmss(unsigned long nowtime);
|
||||
extern int have_rtc;
|
||||
|
||||
unsigned long get_ns_in_jiffie(void)
|
||||
{
|
||||
unsigned char timer_count, t1;
|
||||
@@ -203,11 +199,6 @@ time_init(void)
|
||||
*/
|
||||
loops_per_usec = 50;
|
||||
|
||||
if(RTC_INIT() < 0)
|
||||
have_rtc = 0;
|
||||
else
|
||||
have_rtc = 1;
|
||||
|
||||
/* Setup the etrax timers
|
||||
* Base frequency is 25000 hz, divider 250 -> 100 HZ
|
||||
* In normal mode, we use timer0, so timer1 is free. In cascade
|
||||
|
||||
@@ -2,8 +2,5 @@
|
||||
# Makefile for Etrax-specific library files..
|
||||
#
|
||||
|
||||
|
||||
EXTRA_AFLAGS := -traditional
|
||||
|
||||
lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o
|
||||
|
||||
|
||||
@@ -1394,11 +1394,10 @@ static int create_md5_pad(int alloc_flag, unsigned long long hashed_length, char
|
||||
|
||||
if (padlen < MD5_MIN_PAD_LENGTH) padlen += MD5_BLOCK_LENGTH;
|
||||
|
||||
p = kmalloc(padlen, alloc_flag);
|
||||
p = kzalloc(padlen, alloc_flag);
|
||||
if (!p) return -ENOMEM;
|
||||
|
||||
*p = 0x80;
|
||||
memset(p+1, 0, padlen - 1);
|
||||
|
||||
DEBUG(printk("create_md5_pad: hashed_length=%lld bits == %lld bytes\n", bit_length, hashed_length));
|
||||
|
||||
@@ -1426,11 +1425,10 @@ static int create_sha1_pad(int alloc_flag, unsigned long long hashed_length, cha
|
||||
|
||||
if (padlen < SHA1_MIN_PAD_LENGTH) padlen += SHA1_BLOCK_LENGTH;
|
||||
|
||||
p = kmalloc(padlen, alloc_flag);
|
||||
p = kzalloc(padlen, alloc_flag);
|
||||
if (!p) return -ENOMEM;
|
||||
|
||||
*p = 0x80;
|
||||
memset(p+1, 0, padlen - 1);
|
||||
|
||||
DEBUG(printk("create_sha1_pad: hashed_length=%lld bits == %lld bytes\n", bit_length, hashed_length));
|
||||
|
||||
|
||||
@@ -114,8 +114,6 @@ void user_disable_single_step(struct task_struct *child)
|
||||
void
|
||||
ptrace_disable(struct task_struct *child)
|
||||
{
|
||||
unsigned long tmp;
|
||||
|
||||
/* Deconfigure SPC and S-bit. */
|
||||
user_disable_single_step(child);
|
||||
put_reg(child, PT_SPC, 0);
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <asm/signal.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/rtc.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/irq_regs.h>
|
||||
|
||||
@@ -67,7 +66,6 @@ unsigned long timer_regs[NR_CPUS] =
|
||||
};
|
||||
|
||||
extern int set_rtc_mmss(unsigned long nowtime);
|
||||
extern int have_rtc;
|
||||
|
||||
#ifdef CONFIG_CPU_FREQ
|
||||
static int
|
||||
@@ -265,11 +263,6 @@ void __init time_init(void)
|
||||
*/
|
||||
loops_per_usec = 50;
|
||||
|
||||
if(RTC_INIT() < 0)
|
||||
have_rtc = 0;
|
||||
else
|
||||
have_rtc = 1;
|
||||
|
||||
/* Start CPU local timer. */
|
||||
cris_timer_init();
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#define L1_CACHE_BYTES 32
|
||||
#define L1_CACHE_SHIFT 5
|
||||
|
||||
#define __read_mostly __attribute__((__section__(".data.read_mostly")))
|
||||
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
|
||||
|
||||
void flush_dma_list(dma_descr_data *descr);
|
||||
void flush_dma_descr(dma_descr_data *descr, int flush_buf);
|
||||
|
||||
@@ -6,5 +6,4 @@ header-y += arch-v32/
|
||||
header-y += ethernet.h
|
||||
header-y += etraxgpio.h
|
||||
header-y += rs485.h
|
||||
header-y += rtc.h
|
||||
header-y += sync_serial.h
|
||||
|
||||
@@ -33,4 +33,6 @@ typedef int __kernel_ptrdiff_t;
|
||||
typedef unsigned short __kernel_old_dev_t;
|
||||
#define __kernel_old_dev_t __kernel_old_dev_t
|
||||
|
||||
#include <asm-generic/posix_types.h>
|
||||
|
||||
#endif /* __ARCH_CRIS_POSIX_TYPES_H */
|
||||
|
||||
@@ -1,107 +0,0 @@
|
||||
|
||||
#ifndef __RTC_H__
|
||||
#define __RTC_H__
|
||||
|
||||
#ifdef CONFIG_ETRAX_DS1302
|
||||
/* Dallas DS1302 clock/calendar register numbers. */
|
||||
# define RTC_SECONDS 0
|
||||
# define RTC_MINUTES 1
|
||||
# define RTC_HOURS 2
|
||||
# define RTC_DAY_OF_MONTH 3
|
||||
# define RTC_MONTH 4
|
||||
# define RTC_WEEKDAY 5
|
||||
# define RTC_YEAR 6
|
||||
# define RTC_CONTROL 7
|
||||
|
||||
/* Bits in CONTROL register. */
|
||||
# define RTC_CONTROL_WRITEPROTECT 0x80
|
||||
# define RTC_TRICKLECHARGER 8
|
||||
|
||||
/* Bits in TRICKLECHARGER register TCS TCS TCS TCS DS DS RS RS. */
|
||||
# define RTC_TCR_PATTERN 0xA0 /* 1010xxxx */
|
||||
# define RTC_TCR_1DIOD 0x04 /* xxxx01xx */
|
||||
# define RTC_TCR_2DIOD 0x08 /* xxxx10xx */
|
||||
# define RTC_TCR_DISABLED 0x00 /* xxxxxx00 Disabled */
|
||||
# define RTC_TCR_2KOHM 0x01 /* xxxxxx01 2KOhm */
|
||||
# define RTC_TCR_4KOHM 0x02 /* xxxxxx10 4kOhm */
|
||||
# define RTC_TCR_8KOHM 0x03 /* xxxxxx11 8kOhm */
|
||||
|
||||
#elif defined(CONFIG_ETRAX_PCF8563)
|
||||
/* I2C bus slave registers. */
|
||||
# define RTC_I2C_READ 0xa3
|
||||
# define RTC_I2C_WRITE 0xa2
|
||||
|
||||
/* Phillips PCF8563 registers. */
|
||||
# define RTC_CONTROL1 0x00 /* Control/Status register 1. */
|
||||
# define RTC_CONTROL2 0x01 /* Control/Status register 2. */
|
||||
# define RTC_CLOCKOUT_FREQ 0x0d /* CLKOUT frequency. */
|
||||
# define RTC_TIMER_CONTROL 0x0e /* Timer control. */
|
||||
# define RTC_TIMER_CNTDOWN 0x0f /* Timer countdown. */
|
||||
|
||||
/* BCD encoded clock registers. */
|
||||
# define RTC_SECONDS 0x02
|
||||
# define RTC_MINUTES 0x03
|
||||
# define RTC_HOURS 0x04
|
||||
# define RTC_DAY_OF_MONTH 0x05
|
||||
# define RTC_WEEKDAY 0x06 /* Not coded in BCD! */
|
||||
# define RTC_MONTH 0x07
|
||||
# define RTC_YEAR 0x08
|
||||
# define RTC_MINUTE_ALARM 0x09
|
||||
# define RTC_HOUR_ALARM 0x0a
|
||||
# define RTC_DAY_ALARM 0x0b
|
||||
# define RTC_WEEKDAY_ALARM 0x0c
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ETRAX_DS1302
|
||||
extern unsigned char ds1302_readreg(int reg);
|
||||
extern void ds1302_writereg(int reg, unsigned char val);
|
||||
extern int ds1302_init(void);
|
||||
# define CMOS_READ(x) ds1302_readreg(x)
|
||||
# define CMOS_WRITE(val,reg) ds1302_writereg(reg,val)
|
||||
# define RTC_INIT() ds1302_init()
|
||||
#elif defined(CONFIG_ETRAX_PCF8563)
|
||||
extern unsigned char pcf8563_readreg(int reg);
|
||||
extern void pcf8563_writereg(int reg, unsigned char val);
|
||||
extern int pcf8563_init(void);
|
||||
# define CMOS_READ(x) pcf8563_readreg(x)
|
||||
# define CMOS_WRITE(val,reg) pcf8563_writereg(reg,val)
|
||||
# define RTC_INIT() pcf8563_init()
|
||||
#else
|
||||
/* No RTC configured so we shouldn't try to access any. */
|
||||
# define CMOS_READ(x) 42
|
||||
# define CMOS_WRITE(x,y)
|
||||
# define RTC_INIT() (-1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The struct used to pass data via the following ioctl. Similar to the
|
||||
* struct tm in <time.h>, but it needs to be here so that the kernel
|
||||
* source is self contained, allowing cross-compiles, etc. etc.
|
||||
*/
|
||||
struct rtc_time {
|
||||
int tm_sec;
|
||||
int tm_min;
|
||||
int tm_hour;
|
||||
int tm_mday;
|
||||
int tm_mon;
|
||||
int tm_year;
|
||||
int tm_wday;
|
||||
int tm_yday;
|
||||
int tm_isdst;
|
||||
};
|
||||
|
||||
/* ioctl() calls that are permitted to the /dev/rtc interface. */
|
||||
#define RTC_MAGIC 'p'
|
||||
/* Read RTC time. */
|
||||
#define RTC_RD_TIME _IOR(RTC_MAGIC, 0x09, struct rtc_time)
|
||||
/* Set RTC time. */
|
||||
#define RTC_SET_TIME _IOW(RTC_MAGIC, 0x0a, struct rtc_time)
|
||||
#define RTC_SET_CHARGE _IOW(RTC_MAGIC, 0x0b, int)
|
||||
/* Voltage low detector */
|
||||
#define RTC_VL_READ _IOR(RTC_MAGIC, 0x13, int)
|
||||
/* Clear voltage low information */
|
||||
#define RTC_VL_CLR _IO(RTC_MAGIC, 0x14)
|
||||
#define RTC_MAX_IOCTL 0x14
|
||||
|
||||
#endif /* __RTC_H__ */
|
||||
+7
-69
@@ -21,7 +21,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include <asm/rtc.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/param.h>
|
||||
@@ -32,7 +31,8 @@
|
||||
#include <linux/profile.h>
|
||||
#include <linux/sched.h> /* just for sched_clock() - funny that */
|
||||
|
||||
int have_rtc; /* used to remember if we have an RTC or not */;
|
||||
|
||||
#define D(x)
|
||||
|
||||
#define TICK_SIZE tick
|
||||
|
||||
@@ -50,78 +50,16 @@ u32 arch_gettimeoffset(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* BUG: This routine does not handle hour overflow properly; it just
|
||||
* sets the minutes. Usually you'll only notice that after reboot!
|
||||
*/
|
||||
|
||||
int set_rtc_mmss(unsigned long nowtime)
|
||||
{
|
||||
int retval = 0;
|
||||
int real_seconds, real_minutes, cmos_minutes;
|
||||
|
||||
printk(KERN_DEBUG "set_rtc_mmss(%lu)\n", nowtime);
|
||||
|
||||
if(!have_rtc)
|
||||
return 0;
|
||||
|
||||
cmos_minutes = CMOS_READ(RTC_MINUTES);
|
||||
cmos_minutes = bcd2bin(cmos_minutes);
|
||||
|
||||
/*
|
||||
* since we're only adjusting minutes and seconds,
|
||||
* don't interfere with hour overflow. This avoids
|
||||
* messing with unknown time zones but requires your
|
||||
* RTC not to be off by more than 15 minutes
|
||||
*/
|
||||
real_seconds = nowtime % 60;
|
||||
real_minutes = nowtime / 60;
|
||||
if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
|
||||
real_minutes += 30; /* correct for half hour time zone */
|
||||
real_minutes %= 60;
|
||||
|
||||
if (abs(real_minutes - cmos_minutes) < 30) {
|
||||
real_seconds = bin2bcd(real_seconds);
|
||||
real_minutes = bin2bcd(real_minutes);
|
||||
CMOS_WRITE(real_seconds,RTC_SECONDS);
|
||||
CMOS_WRITE(real_minutes,RTC_MINUTES);
|
||||
} else {
|
||||
printk_once(KERN_NOTICE
|
||||
"set_rtc_mmss: can't update from %d to %d\n",
|
||||
cmos_minutes, real_minutes);
|
||||
retval = -1;
|
||||
}
|
||||
|
||||
return retval;
|
||||
D(printk(KERN_DEBUG "set_rtc_mmss(%lu)\n", nowtime));
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* grab the time from the RTC chip */
|
||||
|
||||
unsigned long
|
||||
get_cmos_time(void)
|
||||
unsigned long get_cmos_time(void)
|
||||
{
|
||||
unsigned int year, mon, day, hour, min, sec;
|
||||
if(!have_rtc)
|
||||
return 0;
|
||||
|
||||
sec = CMOS_READ(RTC_SECONDS);
|
||||
min = CMOS_READ(RTC_MINUTES);
|
||||
hour = CMOS_READ(RTC_HOURS);
|
||||
day = CMOS_READ(RTC_DAY_OF_MONTH);
|
||||
mon = CMOS_READ(RTC_MONTH);
|
||||
year = CMOS_READ(RTC_YEAR);
|
||||
|
||||
sec = bcd2bin(sec);
|
||||
min = bcd2bin(min);
|
||||
hour = bcd2bin(hour);
|
||||
day = bcd2bin(day);
|
||||
mon = bcd2bin(mon);
|
||||
year = bcd2bin(year);
|
||||
|
||||
if ((year += 1900) < 1970)
|
||||
year += 100;
|
||||
|
||||
return mktime(year, mon, day, hour, min, sec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -132,7 +70,7 @@ int update_persistent_clock(struct timespec now)
|
||||
|
||||
void read_persistent_clock(struct timespec *ts)
|
||||
{
|
||||
ts->tv_sec = get_cmos_time();
|
||||
ts->tv_sec = 0;
|
||||
ts->tv_nsec = 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ SECTIONS
|
||||
|
||||
EXCEPTION_TABLE(4)
|
||||
|
||||
_sdata = .;
|
||||
RODATA
|
||||
|
||||
. = ALIGN (4);
|
||||
|
||||
+26
-5
@@ -58,6 +58,8 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
|
||||
struct vm_area_struct * vma;
|
||||
siginfo_t info;
|
||||
int fault;
|
||||
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
|
||||
((writeaccess & 1) ? FAULT_FLAG_WRITE : 0);
|
||||
|
||||
D(printk(KERN_DEBUG
|
||||
"Page fault for %lX on %X at %lX, prot %d write %d\n",
|
||||
@@ -115,6 +117,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
|
||||
if (in_atomic() || !mm)
|
||||
goto no_context;
|
||||
|
||||
retry:
|
||||
down_read(&mm->mmap_sem);
|
||||
vma = find_vma(mm, address);
|
||||
if (!vma)
|
||||
@@ -163,7 +166,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
|
||||
* the fault.
|
||||
*/
|
||||
|
||||
fault = handle_mm_fault(mm, vma, address, (writeaccess & 1) ? FAULT_FLAG_WRITE : 0);
|
||||
fault = handle_mm_fault(mm, vma, address, flags);
|
||||
|
||||
if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
|
||||
return;
|
||||
|
||||
if (unlikely(fault & VM_FAULT_ERROR)) {
|
||||
if (fault & VM_FAULT_OOM)
|
||||
goto out_of_memory;
|
||||
@@ -171,10 +178,24 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
|
||||
goto do_sigbus;
|
||||
BUG();
|
||||
}
|
||||
if (fault & VM_FAULT_MAJOR)
|
||||
tsk->maj_flt++;
|
||||
else
|
||||
tsk->min_flt++;
|
||||
|
||||
if (flags & FAULT_FLAG_ALLOW_RETRY) {
|
||||
if (fault & VM_FAULT_MAJOR)
|
||||
tsk->maj_flt++;
|
||||
else
|
||||
tsk->min_flt++;
|
||||
if (fault & VM_FAULT_RETRY) {
|
||||
flags &= ~FAULT_FLAG_ALLOW_RETRY;
|
||||
|
||||
/*
|
||||
* No need to up_read(&mm->mmap_sem) as we would
|
||||
* have already released it in __lock_page_or_retry
|
||||
* in mm/filemap.c.
|
||||
*/
|
||||
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
|
||||
up_read(&mm->mmap_sem);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user