Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc: Merge machdep.h

Browse source 
A few things change for consistency between ppc32 and ppc64:
idle functions return void; *_get_boot_time functions return
unsigned long (i.e. time_t) rather than filling in a struct rtc_time
(since that's useful to the callers and easier for pmac to
generate); *_get_rtc_time and *_set_rtc_time functions take
a struct rtc_time; irq_canonicalize is gone; nvram_sync returns
void.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras 2005-10-19 23:11:21 +10:00
parent 7ed476d17f
commit 143a1dec7e
17 changed files with 177 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/powerpc/platforms/iseries/mf.c
View file

@ -32,6 +32,7 @@
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/bcd.h>
#include <linux/rtc.h>
#include <asm/time.h>
#include <asm/uaccess.h>
@ -1307,11 +1308,14 @@ int iSeries_set_rtc_time(struct rtc_time *tm)
return 0;
}
void iSeries_get_boot_time(struct rtc_time *tm)
unsigned long iSeries_get_boot_time(void)
{
if (piranha_simulator)
return;
struct rtc_time tm;
mf_get_boot_rtc(tm);
tm->tm_mon -= 1;
if (piranha_simulator)
return 0;
mf_get_boot_rtc(&tm);
return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
}

12
arch/powerpc/platforms/iseries/setup.c
View file

@ -73,8 +73,8 @@ extern void hvlog(char *fmt, ...);
extern void ppcdbg_initialize(void);
static void build_iSeries_Memory_Map(void);
static int iseries_shared_idle(void);
static int iseries_dedicated_idle(void);
static void iseries_shared_idle(void);
static void iseries_dedicated_idle(void);
#ifdef CONFIG_PCI
extern void iSeries_pci_final_fixup(void);
#else
@ -693,7 +693,7 @@ static void yield_shared_processor(void)
process_iSeries_events();
}
static int iseries_shared_idle(void)
static void iseries_shared_idle(void)
{
while (1) {
while (!need_resched() && !hvlpevent_is_pending()) {
@ -715,11 +715,9 @@ static int iseries_shared_idle(void)
schedule();
}
return 0;
}
static int iseries_dedicated_idle(void)
static void iseries_dedicated_idle(void)
{
long oldval;
@ -749,8 +747,6 @@ static int iseries_dedicated_idle(void)
ppc64_runlatch_on();
schedule();
}
return 0;
}
#ifndef CONFIG_PCI

2
arch/powerpc/platforms/iseries/setup.h
View file

@ -17,7 +17,7 @@
#ifndef __ISERIES_SETUP_H__
#define __ISERIES_SETUP_H__
extern void iSeries_get_boot_time(struct rtc_time *tm);
extern unsigned long iSeries_get_boot_time(void);
extern int iSeries_set_rtc_time(struct rtc_time *tm);
extern void iSeries_get_rtc_time(struct rtc_time *tm);

7
arch/powerpc/platforms/powermac/pmac.h
View file

@ -10,9 +10,12 @@
* pmac_* files. Mostly for use by pmac_setup
*/
struct rtc_time;
extern long pmac_time_init(void);
extern unsigned long pmac_get_rtc_time(void);
extern int pmac_set_rtc_time(unsigned long nowtime);
extern unsigned long pmac_get_boot_time(void);
extern void pmac_get_rtc_time(struct rtc_time *);
extern int pmac_set_rtc_time(struct rtc_time *);
extern void pmac_read_rtc_time(void);
extern void pmac_calibrate_decr(void);
extern void pmac_pcibios_fixup(void);

2
arch/powerpc/platforms/powermac/setup.c
View file

@ -562,7 +562,6 @@ void __init pmac_init(void)
ppc_md.setup_arch = pmac_setup_arch;
ppc_md.show_cpuinfo = pmac_show_cpuinfo;
ppc_md.show_percpuinfo = pmac_show_percpuinfo;
ppc_md.irq_canonicalize = NULL;
ppc_md.init_IRQ = pmac_pic_init;
ppc_md.get_irq = pmac_get_irq; /* Changed later on ... */
@ -578,6 +577,7 @@ void __init pmac_init(void)
ppc_md.time_init = pmac_time_init;
ppc_md.set_rtc_time = pmac_set_rtc_time;
ppc_md.get_rtc_time = pmac_get_rtc_time;
ppc_md.get_boot_time = pmac_get_boot_time;
ppc_md.calibrate_decr = pmac_calibrate_decr;
ppc_md.feature_call = pmac_do_feature_call;

24
arch/powerpc/platforms/powermac/time.c
View file

@ -77,8 +77,7 @@ pmac_time_init(void)
#endif
}
unsigned long
pmac_get_rtc_time(void)
unsigned long pmac_get_boot_time(void)
{
#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU)
struct adb_request req;
@ -118,20 +117,33 @@ pmac_get_rtc_time(void)
return 0;
}
int
pmac_set_rtc_time(unsigned long nowtime)
void pmac_get_rtc_time(struct rtc_time *tm)
{
unsigned long now;
now = pmac_get_boot_time();
to_tm(now, tm);
tm->tm_year -= 1900;
tm->tm_mon -= 1; /* month is 0-based */
}
int pmac_set_rtc_time(struct rtc_time *tm)
{
unsigned long nowtime;
#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU)
struct adb_request req;
#endif
nowtime = mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
nowtime += RTC_OFFSET;
switch (sys_ctrler) {
#ifdef CONFIG_ADB_CUDA
case SYS_CTRLER_CUDA:
if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
nowtime >> 24, nowtime >> 16, nowtime >> 8, nowtime) < 0)
nowtime >> 24, nowtime >> 16, nowtime >> 8,
nowtime) < 0)
return 0;
while (!req.complete)
cuda_poll();
@ -221,7 +233,7 @@ time_sleep_notify(struct pmu_sleep_notifier *self, int when)
case PBOOK_SLEEP_NOW:
do {
seq = read_seqbegin_irqsave(&xtime_lock, flags);
time_diff = xtime.tv_sec - pmac_get_rtc_time();
time_diff = xtime.tv_sec - pmac_get_boot_time();
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
break;
case PBOOK_WAKE:

10
arch/powerpc/platforms/pseries/setup.c
View file

@ -84,8 +84,8 @@ int fwnmi_active; /* TRUE if an FWNMI handler is present */
extern void pSeries_system_reset_exception(struct pt_regs *regs);
extern int pSeries_machine_check_exception(struct pt_regs *regs);
static int pseries_shared_idle(void);
static int pseries_dedicated_idle(void);
static void pseries_shared_idle(void);
static void pseries_dedicated_idle(void);
static volatile void __iomem * chrp_int_ack_special;
struct mpic *pSeries_mpic;
@ -488,7 +488,7 @@ static inline void dedicated_idle_sleep(unsigned int cpu)
}
}
static int pseries_dedicated_idle(void)
static void pseries_dedicated_idle(void)
{
long oldval;
struct paca_struct *lpaca = get_paca();
@ -544,7 +544,7 @@ static int pseries_dedicated_idle(void)
}
}
static int pseries_shared_idle(void)
static void pseries_shared_idle(void)
{
struct paca_struct *lpaca = get_paca();
unsigned int cpu = smp_processor_id();
@ -586,8 +586,6 @@ static int pseries_shared_idle(void)
if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
cpu_die();
}
return 0;
}
static int pSeries_pci_probe_mode(struct pci_bus *bus)

8
arch/ppc64/kernel/idle.c
View file

@ -31,7 +31,7 @@
extern void power4_idle(void);
int default_idle(void)
void default_idle(void)
{
long oldval;
unsigned int cpu = smp_processor_id();
@ -64,11 +64,9 @@ int default_idle(void)
if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
cpu_die();
}
return 0;
}
int native_idle(void)
void native_idle(void)
{
while (1) {
ppc64_runlatch_off();
@ -85,8 +83,6 @@ int native_idle(void)
system_state == SYSTEM_RUNNING)
cpu_die();
}
return 0;
}
void cpu_idle(void)

2
arch/ppc64/kernel/maple_setup.c
View file

@ -70,7 +70,7 @@
extern int maple_set_rtc_time(struct rtc_time *tm);
extern void maple_get_rtc_time(struct rtc_time *tm);
extern void maple_get_boot_time(struct rtc_time *tm);
extern unsigned long maple_get_boot_time(void);
extern void maple_calibrate_decr(void);
extern void maple_pci_init(void);
extern void maple_pcibios_fixup(void);

7
arch/ppc64/kernel/maple_time.c
View file

@ -156,8 +156,9 @@ int maple_set_rtc_time(struct rtc_time *tm)
return 0;
}
void __init maple_get_boot_time(struct rtc_time *tm)
unsigned long __init maple_get_boot_time(void)
{
struct rtc_time tm;
struct device_node *rtcs;
rtcs = find_compatible_devices("rtc", "pnpPNP,b00");
@ -170,6 +171,8 @@ void __init maple_get_boot_time(struct rtc_time *tm)
"legacy address (0x%x)\n", maple_rtc_addr);
}
maple_get_rtc_time(tm);
maple_get_rtc_time(&tm);
return mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday,
time->tm_hour, time->tm_min, time->tm_sec);
}

2
arch/ppc64/kernel/pmac.h
View file

@ -9,7 +9,7 @@
* pmac_* files. Mostly for use by pmac_setup
*/
extern void pmac_get_boot_time(struct rtc_time *tm);
extern unsigned long pmac_get_boot_time(void);
extern void pmac_get_rtc_time(struct rtc_time *tm);
extern int pmac_set_rtc_time(struct rtc_time *tm);
extern void pmac_read_rtc_time(void);

4
arch/ppc64/kernel/pmac_nvram.c
View file

@ -341,7 +341,7 @@ static int amd_write_bank(int bank, u8* datas)
}
static int core99_nvram_sync(void)
static void core99_nvram_sync(void)
{
struct core99_header* hdr99;
unsigned long flags;
@ -369,8 +369,6 @@ static int core99_nvram_sync(void)
printk("nvram: Error writing bank %d\n", core99_bank);
bail:
spin_unlock_irqrestore(&nv_lock, flags);
return 0;
}
int __init pmac_nvram_init(void)

21
arch/ppc64/kernel/pmac_time.c
View file

@ -21,6 +21,7 @@
#include <linux/adb.h>
#include <linux/pmu.h>
#include <linux/interrupt.h>
#include <linux/rtc.h>
#include <asm/sections.h>
#include <asm/prom.h>
@ -135,23 +136,13 @@ int pmac_set_rtc_time(struct rtc_time *tm)
}
}
void __init pmac_get_boot_time(struct rtc_time *tm)
unsigned long __init pmac_get_boot_time(void)
{
pmac_get_rtc_time(tm);
struct rtc_time tm;
#ifdef disabled__CONFIG_NVRAM
s32 delta = 0;
int dst;
delta = ((s32)pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0x9)) << 16;
delta |= ((s32)pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0xa)) << 8;
delta |= pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0xb);
if (delta & 0x00800000UL)
delta |= 0xFF000000UL;
dst = ((pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0x8) & 0x80) != 0);
printk("GMT Delta read from XPRAM: %d minutes, DST: %s\n", delta/60,
dst ? "on" : "off");
#endif
pmac_get_rtc_time(&tm);
return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
}
/*

1
arch/ppc64/kernel/rtas-proc.c
View file

@ -23,6 +23,7 @@
#include <linux/init.h>
#include <linux/seq_file.h>
#include <linux/bitops.h>
#include <linux/rtc.h>
#include <asm/uaccess.h>
#include <asm/processor.h>

11
arch/ppc64/kernel/rtc.c
View file

@ -265,7 +265,7 @@ static int rtc_read_proc(char *page, char **start, off_t off,
#ifdef CONFIG_PPC_RTAS
#define MAX_RTC_WAIT 5000 /* 5 sec */
#define RTAS_CLOCK_BUSY (-2)
void rtas_get_boot_time(struct rtc_time *rtc_tm)
unsigned long rtas_get_boot_time(void)
{
int ret[8];
int error, wait_time;
@ -285,15 +285,10 @@ void rtas_get_boot_time(struct rtc_time *rtc_tm)
if (error != 0 && printk_ratelimit()) {
printk(KERN_WARNING "error: reading the clock failed (%d)\n",
error);
return;
return 0;
}
rtc_tm->tm_sec = ret[5];
rtc_tm->tm_min = ret[4];
rtc_tm->tm_hour = ret[3];
rtc_tm->tm_mday = ret[2];
rtc_tm->tm_mon = ret[1] - 1;
rtc_tm->tm_year = ret[0] - 1900;
return mktime(ret[0], ret[1], ret[2], ret[3], ret[4], ret[5]);
}
/* NOTE: get_rtc_time will get an error if executed in interrupt context

121
include/asm-ppc64/machdep.h → include/asm-powerpc/machdep.h
View file

@ -1,6 +1,6 @@
#ifdef __KERNEL__
#ifndef _PPC64_MACHDEP_H
#define _PPC64_MACHDEP_H
#ifdef __KERNEL__
/*
* This program is free software; you can redistribute it and/or
@ -16,6 +16,11 @@
#include <asm/setup.h>
/* We export this macro for external modules like Alsa to know if
* ppc_md.feature_call is implemented or not
*/
#define CONFIG_PPC_HAS_FEATURE_CALLS
struct pt_regs;
struct pci_bus;
struct device_node;
@ -39,6 +44,7 @@ struct smp_ops_t {
#endif
struct machdep_calls {
#ifdef CONFIG_PPC64
void (*hpte_invalidate)(unsigned long slot,
unsigned long va,
int large,
@ -74,6 +80,7 @@ struct machdep_calls {
void (*iommu_dev_setup)(struct pci_dev *dev);
void (*iommu_bus_setup)(struct pci_bus *bus);
void (*irq_bus_setup)(struct pci_bus *bus);
#endif
int (*probe)(int platform);
void (*setup_arch)(void);
@ -86,6 +93,7 @@ struct machdep_calls {
void (*cpu_irq_down)(int secondary);
/* PCI stuff */
/* Called after scanning the bus, before allocating resources */
void (*pcibios_fixup)(void);
int (*pci_probe_mode)(struct pci_bus *);
@ -95,9 +103,13 @@ struct machdep_calls {
void (*panic)(char *str);
void (*cpu_die)(void);
long (*time_init)(void); /* Optional, may be NULL */
int (*set_rtc_time)(struct rtc_time *);
void (*get_rtc_time)(struct rtc_time *);
void (*get_boot_time)(struct rtc_time *);
unsigned long (*get_boot_time)(void);
unsigned char (*rtc_read_val)(int addr);
void (*rtc_write_val)(int addr, unsigned char val);
void (*calibrate_decr)(void);
@ -109,7 +121,7 @@ struct machdep_calls {
ssize_t (*nvram_write)(char *buf, size_t count, loff_t *index);
ssize_t (*nvram_read)(char *buf, size_t count, loff_t *index);
ssize_t (*nvram_size)(void);
int (*nvram_sync)(void);
void (*nvram_sync)(void);
/* Exception handlers */
void (*system_reset_exception)(struct pt_regs *regs);
@ -134,14 +146,100 @@ struct machdep_calls {
pgprot_t vma_prot);
/* Idle loop for this platform, leave empty for default idle loop */
int (*idle_loop)(void);
void (*idle_loop)(void);
/* Function to enable pmcs for this platform, called once per cpu. */
/* Function to enable performance monitor counters for this
platform, called once per cpu. */
void (*enable_pmcs)(void);
#ifdef CONFIG_PPC32 /* XXX for now */
/* Optional, may be NULL. */
int (*show_cpuinfo)(struct seq_file *m);
int (*show_percpuinfo)(struct seq_file *m, int i);
/* A general init function, called by ppc_init in init/main.c.
May be NULL. */
void (*init)(void);
void (*idle)(void);
void (*power_save)(void);
void (*heartbeat)(void);
unsigned long heartbeat_reset;
unsigned long heartbeat_count;
unsigned long (*find_end_of_memory)(void);
void (*setup_io_mappings)(void);
void (*early_serial_map)(void);
void (*kgdb_map_scc)(void);
unsigned char (*nvram_read_val)(int addr);
void (*nvram_write_val)(int addr, unsigned char val);
/*
* optional PCI "hooks"
*/
/* Called after PPC generic resource fixup to perform
machine specific fixups */
void (*pcibios_fixup_resources)(struct pci_dev *);
/* Called for each PCI bus in the system when it's probed */
void (*pcibios_fixup_bus)(struct pci_bus *);
/* Called when pci_enable_device() is called (initial=0) or
* when a device with no assigned resource is found (initial=1).
* Returns 0 to allow assignment/enabling of the device. */
int (*pcibios_enable_device_hook)(struct pci_dev *, int initial);
/* For interrupt routing */
unsigned char (*pci_swizzle)(struct pci_dev *, unsigned char *);
int (*pci_map_irq)(struct pci_dev *, unsigned char, unsigned char);
/* Called in indirect_* to avoid touching devices */
int (*pci_exclude_device)(unsigned char, unsigned char);
/* Called at then very end of pcibios_init() */
void (*pcibios_after_init)(void);
/* this is for modules, since _machine can be a define -- Cort */
int ppc_machine;
#ifdef CONFIG_KEXEC
/* Called to shutdown machine specific hardware not already controlled
* by other drivers.
* XXX Should we move this one out of kexec scope?
*/
void (*machine_shutdown)(void);
/* Called to do the minimal shutdown needed to run a kexec'd kernel
* to run successfully.
* XXX Should we move this one out of kexec scope?
*/
void (*machine_crash_shutdown)(void);
/* Called to do what every setup is needed on image and the
* reboot code buffer. Returns 0 on success.
* Provide your own (maybe dummy) implementation if your platform
* claims to support kexec.
*/
int (*machine_kexec_prepare)(struct kimage *image);
/* Called to handle any machine specific cleanup on image */
void (*machine_kexec_cleanup)(struct kimage *image);
/* Called to perform the _real_ kexec.
* Do NOT allocate memory or fail here. We are past the point of
* no return.
*/
void (*machine_kexec)(struct kimage *image);
#endif /* CONFIG_KEXEC */
#endif /* CONFIG_PPC32 */
};
extern int default_idle(void);
extern int native_idle(void);
extern void default_idle(void);
extern void native_idle(void);
extern struct machdep_calls ppc_md;
extern char cmd_line[COMMAND_LINE_SIZE];
@ -161,6 +259,13 @@ extern sys_ctrler_t sys_ctrler;
#endif /* CONFIG_PPC_PMAC */
extern void setup_pci_ptrs(void);
#ifdef CONFIG_SMP
/* Poor default implementations */
extern void __devinit smp_generic_give_timebase(void);
extern void __devinit smp_generic_take_timebase(void);
#endif /* CONFIG_SMP */
/* Functions to produce codes on the leds.
@ -180,5 +285,5 @@ static inline void log_error(char *buf, unsigned int err_type, int fatal)
ppc_md.log_error(buf, err_type, fatal);
}
#endif /* _PPC64_MACHDEP_H */
#endif /* __KERNEL__ */
#endif /* _PPC64_MACHDEP_H */

2
include/asm-powerpc/rtas.h
View file

@ -190,7 +190,7 @@ extern void rtas_progress(char *s, unsigned short hex);
extern void rtas_initialize(void);
struct rtc_time;
extern void rtas_get_boot_time(struct rtc_time *rtc_time);
extern unsigned long rtas_get_boot_time(void);
extern void rtas_get_rtc_time(struct rtc_time *rtc_time);
extern int rtas_set_rtc_time(struct rtc_time *rtc_time);