Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3136254c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] powerpc: kill ppc64 rtc.c, use genrtc instead 



This moves the rtas RTC callbacks to rtas-rtc.c in arch/powerpc/kernel,
and kills the rest of arch/ppc64/kernel/rtc.c which was just a duplicate
of the genrtc functionality. Also enable build of genrtc for
CONFIG_PPC64 (it just works are we already have the required callbacks)
and enable it in all defconfigs.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0c37ec2a

arch/powerpc/configs/pseries_defconfig

+131 −75
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc4

# Thu Oct 20 08:32:17 2005

# Linux kernel version: 2.6.15-rc1

# Mon Nov 14 15:27:00 2005

#

CONFIG_PPC64=y

CONFIG_64BIT=y

CONFIG_PPC_MERGE=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_PPC=y

CONFIG_EARLY_PRINTK=y

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_FORCE_MAX_ZONEORDER=13



#

# Processor support

#

# CONFIG_POWER4_ONLY is not set

CONFIG_POWER3=y

CONFIG_POWER4=y

CONFIG_PPC_FPU=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_SMP=y

CONFIG_NR_CPUS=128



#

# Code maturity level options
@@ -68,75 +83,103 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_SYSVIPC_COMPAT=y



#

# Block layer

#



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# Platform support

#

# CONFIG_PPC_ISERIES is not set

CONFIG_PPC_MULTIPLATFORM=y

# CONFIG_PPC_ISERIES is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_APUS is not set

CONFIG_PPC_PSERIES=y

# CONFIG_PPC_BPA is not set

# CONFIG_PPC_PMAC is not set

# CONFIG_PPC_MAPLE is not set

CONFIG_PPC=y

CONFIG_PPC64=y

# CONFIG_PPC_CELL is not set

CONFIG_PPC_OF=y

CONFIG_XICS=y

# CONFIG_U3_DART is not set

CONFIG_MPIC=y

CONFIG_ALTIVEC=y

CONFIG_PPC_SPLPAR=y

CONFIG_KEXEC=y

CONFIG_PPC_RTAS=y

CONFIG_RTAS_ERROR_LOGGING=y

CONFIG_RTAS_PROC=y

CONFIG_RTAS_FLASH=m

# CONFIG_MMIO_NVRAM is not set

CONFIG_IBMVIO=y

# CONFIG_U3_DART is not set

# CONFIG_BOOTX_TEXT is not set

# CONFIG_POWER4_ONLY is not set

# CONFIG_PPC_MPC106 is not set

# CONFIG_GENERIC_TBSYNC is not set

# CONFIG_CPU_FREQ is not set

# CONFIG_WANT_EARLY_SERIAL is not set



#

# Kernel options

#

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT_BKL is not set

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_IOMMU_VMERGE=y

CONFIG_SMP=y

CONFIG_NR_CPUS=128

CONFIG_HOTPLUG_CPU=y

CONFIG_KEXEC=y

# CONFIG_IRQ_ALL_CPUS is not set

CONFIG_PPC_SPLPAR=y

CONFIG_EEH=y

CONFIG_SCANLOG=m

CONFIG_LPARCFG=y

CONFIG_NUMA=y

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y

CONFIG_ARCH_SPARSEMEM_ENABLE=y

CONFIG_ARCH_SPARSEMEM_DEFAULT=y

CONFIG_SELECT_MEMORY_MODEL=y

# CONFIG_FLATMEM_MANUAL is not set

CONFIG_DISCONTIGMEM_MANUAL=y

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_DISCONTIGMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

CONFIG_SPARSEMEM_MANUAL=y

CONFIG_SPARSEMEM=y

CONFIG_NEED_MULTIPLE_NODES=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

# CONFIG_MEMORY_HOTPLUG is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y

CONFIG_NODES_SPAN_OTHER_NODES=y

CONFIG_NUMA=y

# CONFIG_PPC_64K_PAGES is not set

CONFIG_SCHED_SMT=y

CONFIG_PREEMPT_NONE=y

# CONFIG_PREEMPT_VOLUNTARY is not set

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT_BKL is not set

# CONFIG_HZ_100 is not set

CONFIG_HZ_250=y

# CONFIG_HZ_1000 is not set

CONFIG_HZ=250

CONFIG_EEH=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_PPC_RTAS=y

CONFIG_RTAS_PROC=y

CONFIG_RTAS_FLASH=m

CONFIG_SCANLOG=m

CONFIG_LPARCFG=y

CONFIG_SECCOMP=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

CONFIG_HOTPLUG_CPU=y

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set

# CONFIG_PM is not set

CONFIG_SECCOMP=y

CONFIG_ISA_DMA_API=y



#

# Bus Options

# Bus options

#

CONFIG_GENERIC_ISA_DMA=y

CONFIG_PPC_I8259=y

# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_LEGACY_PROC=y
@@ -156,6 +199,7 @@ CONFIG_HOTPLUG_PCI=m 
# CONFIG_HOTPLUG_PCI_SHPC is not set

CONFIG_HOTPLUG_PCI_RPA=m

CONFIG_HOTPLUG_PCI_RPA_DLPAR=m

CONFIG_KERNEL_START=0xc000000000000000



#

# Networking
@@ -197,6 +241,10 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set



#

# Core Netfilter Configuration

#

CONFIG_NETFILTER_NETLINK=y

CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m
@@ -299,6 +347,10 @@ CONFIG_LLC=y 
# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y
@@ -368,14 +420,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16 
CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CDROM_PKTCDVD is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#
@@ -473,6 +517,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m 
#

# SCSI low-level drivers

#

# CONFIG_ISCSI_TCP is not set

# CONFIG_BLK_DEV_3W_XXXX_RAID is not set

# CONFIG_SCSI_3W_9XXX is not set

# CONFIG_SCSI_ACARD is not set
@@ -559,6 +604,7 @@ CONFIG_DM_MULTIPATH_EMC=m 
#

# Macintosh device drivers

#

# CONFIG_WINDFARM is not set



#

# Network device support
@@ -645,7 +691,6 @@ CONFIG_IXGB=m 
# CONFIG_IXGB_NAPI is not set

CONFIG_S2IO=m

# CONFIG_S2IO_NAPI is not set

# CONFIG_2BUFF_MODE is not set



#

# Token Ring devices
@@ -674,6 +719,7 @@ CONFIG_PPP_ASYNC=m 
CONFIG_PPP_SYNC_TTY=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

# CONFIG_PPP_MPPE is not set

CONFIG_PPPOE=m

# CONFIG_SLIP is not set

# CONFIG_NET_FC is not set
@@ -784,6 +830,8 @@ CONFIG_HVCS=m 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_GEN_RTC_X is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set
@@ -801,6 +849,7 @@ CONFIG_MAX_RAW_DEVS=1024 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -852,6 +901,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -893,7 +943,6 @@ CONFIG_FB=y 
CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_SOFT_CURSOR=y

CONFIG_FB_MACMODES=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_TILEBLITTING=y
@@ -905,6 +954,7 @@ CONFIG_FB_OF=y 
# CONFIG_FB_ASILIANT is not set

# CONFIG_FB_IMSTT is not set

# CONFIG_FB_VGA16 is not set

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_NVIDIA is not set

# CONFIG_FB_RIVA is not set

CONFIG_FB_MATROX=y
@@ -927,7 +977,6 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_FB_VOODOO1 is not set

# CONFIG_FB_CYBLA is not set

# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set



#
@@ -936,6 +985,7 @@ CONFIG_FB_RADEON_I2C=y 
# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

# CONFIG_FONTS is not set

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y
@@ -990,12 +1040,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
#

# USB Device Class drivers

#

# CONFIG_USB_BLUETOOTH_TTY is not set

# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#



#

# may also be needed; see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1106,6 +1159,7 @@ CONFIG_INFINIBAND_MTHCA=m 
# CONFIG_INFINIBAND_MTHCA_DEBUG is not set

CONFIG_INFINIBAND_IPOIB=m

# CONFIG_INFINIBAND_IPOIB_DEBUG is not set

# CONFIG_INFINIBAND_SRP is not set



#

# SN Devices
@@ -1288,10 +1342,25 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_UTF8 is not set



#

# Profiling support

# Library routines

#

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m



#

# Instrumentation Support

#

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

# CONFIG_KPROBES is not set



#

# Kernel hacking
@@ -1308,14 +1377,15 @@ CONFIG_DETECT_SOFTLOCKUP=y 
# CONFIG_DEBUG_KOBJECT is not set

# CONFIG_DEBUG_INFO is not set

CONFIG_DEBUG_FS=y

# CONFIG_DEBUG_VM is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_KPROBES is not set

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUGGER=y

CONFIG_XMON=y

CONFIG_XMON_DEFAULT=y

# CONFIG_PPCDBG is not set

CONFIG_IRQSTACKS=y

# CONFIG_BOOTX_TEXT is not set



#

# Security options
@@ -1355,17 +1425,3 @@ CONFIG_CRYPTO_TEST=m 
#

# Hardware crypto devices

#
 


#

# Library routines

#

CONFIG_CRC_CCITT=m

# CONFIG_CRC16 is not set

CONFIG_CRC32=y

CONFIG_LIBCRC32C=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_PPC_OF) += of_device.o 
procfs-$(CONFIG_PPC64)		:= proc_ppc64.o

obj-$(CONFIG_PROC_FS)		+= $(procfs-y)

rtaspci-$(CONFIG_PPC64)		:= rtas_pci.o

obj-$(CONFIG_PPC_RTAS)		+= rtas.o $(rtaspci-y)

obj-$(CONFIG_PPC_RTAS)		+= rtas.o rtas-rtc.o $(rtaspci-y)

obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o

obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o

obj-$(CONFIG_LPARCFG)		+= lparcfg.o

arch/powerpc/kernel/rtas-rtc.c

0 → 100644
+105 −0
Original line number Diff line number Diff line 
#include <linux/kernel.h>

#include <linux/time.h>

#include <linux/timer.h>

#include <linux/init.h>

#include <linux/rtc.h>

#include <linux/delay.h>

#include <asm/prom.h>

#include <asm/rtas.h>

#include <asm/time.h>





#define MAX_RTC_WAIT 5000	/* 5 sec */

#define RTAS_CLOCK_BUSY (-2)

unsigned long __init rtas_get_boot_time(void)

{

	int ret[8];

	int error, wait_time;

	unsigned long max_wait_tb;



	max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;

	do {

		error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);

		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {

			wait_time = rtas_extended_busy_delay_time(error);

			/* This is boot time so we spin. */

			udelay(wait_time*1000);

			error = RTAS_CLOCK_BUSY;

		}

	} while (error == RTAS_CLOCK_BUSY && (get_tb() < max_wait_tb));



	if (error != 0 && printk_ratelimit()) {

		printk(KERN_WARNING "error: reading the clock failed (%d)\n",

			error);

		return 0;

	}



	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

 * and if a delay is needed to read the clock.  In this case we just

 * silently return without updating rtc_tm.

 */

void rtas_get_rtc_time(struct rtc_time *rtc_tm)

{

        int ret[8];

	int error, wait_time;

	unsigned long max_wait_tb;



	max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;

	do {

		error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);

		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {

			if (in_interrupt() && printk_ratelimit()) {

				memset(&rtc_tm, 0, sizeof(struct rtc_time));

				printk(KERN_WARNING "error: reading clock"

				       " would delay interrupt\n");

				return;	/* delay not allowed */

			}

			wait_time = rtas_extended_busy_delay_time(error);

			msleep(wait_time);

			error = RTAS_CLOCK_BUSY;

		}

	} while (error == RTAS_CLOCK_BUSY && (get_tb() < max_wait_tb));



        if (error != 0 && printk_ratelimit()) {

                printk(KERN_WARNING "error: reading the clock failed (%d)\n",

		       error);

		return;

        }



	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;

}



int rtas_set_rtc_time(struct rtc_time *tm)

{

	int error, wait_time;

	unsigned long max_wait_tb;



	max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;

	do {

	        error = rtas_call(rtas_token("set-time-of-day"), 7, 1, NULL,

				  tm->tm_year + 1900, tm->tm_mon + 1,

				  tm->tm_mday, tm->tm_hour, tm->tm_min,

				  tm->tm_sec, 0);

		if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {

			if (in_interrupt())

				return 1;	/* probably decrementer */

			wait_time = rtas_extended_busy_delay_time(error);

			msleep(wait_time);

			error = RTAS_CLOCK_BUSY;

		}

	} while (error == RTAS_CLOCK_BUSY && (get_tb() < max_wait_tb));



        if (error != 0 && printk_ratelimit())

                printk(KERN_WARNING "error: setting the clock failed (%d)\n",

		       error);



        return 0;

}

arch/powerpc/platforms/powermac/time.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static unsigned long smu_get_time(void) 
#define smu_set_rtc_time(tm, spin)	0

#endif



unsigned long pmac_get_boot_time(void)

unsigned long __init pmac_get_boot_time(void)

{

	/* Get the time from the RTC, used only at boot time */

	switch (sys_ctrler) {

arch/ppc64/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ endif 


obj-y               +=	idle.o dma.o \

			align.o \

			rtc.o \

			iommu.o



pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o