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

Commit f093182d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents d27ba47e 76c8e25b

arch/powerpc/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -404,6 +404,14 @@ config CPU_FREQ_PMAC 
	  this currently includes some models of iBook & Titanium

	  PowerBook.



config CPU_FREQ_PMAC64

	bool "Support for some Apple G5s"

	depends on CPU_FREQ && PMAC_SMU && PPC64

	select CPU_FREQ_TABLE

	help

	  This adds support for frequency switching on Apple iMac G5,

	  and some of the more recent desktop G5 machines as well.



config PPC601_SYNC_FIX

	bool "Workarounds for PPC601 bugs"

	depends on 6xx && (PPC_PREP || PPC_PMAC)
@@ -484,6 +492,7 @@ source "fs/Kconfig.binfmt" 
config FORCE_MAX_ZONEORDER

	int

	depends on PPC64

	default "9" if PPC_64K_PAGES

	default "13"



config MATH_EMULATION

arch/powerpc/configs/g5_defconfig

+206 −55
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:30:23 2005

# Linux kernel version: 2.6.14

# Mon Nov  7 13:37:59 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=y

CONFIG_POWER4=y

CONFIG_PPC_FPU=y

CONFIG_ALTIVEC=y

CONFIG_PPC_STD_MMU=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2



#

# Code maturity level options
@@ -67,30 +81,60 @@ CONFIG_MODVERSIONS=y 
CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_KMOD=y

CONFIG_STOP_MACHINE=y

CONFIG_SYSVIPC_COMPAT=y



#

# 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 is not set

# CONFIG_PPC_BPA is not set

CONFIG_PPC_PMAC=y

CONFIG_PPC_PMAC64=y

# CONFIG_PPC_MAPLE is not set

CONFIG_PPC=y

CONFIG_PPC64=y

# CONFIG_PPC_CELL is not set

CONFIG_PPC_OF=y

CONFIG_MPIC=y

CONFIG_ALTIVEC=y

CONFIG_KEXEC=y

CONFIG_U3_DART=y

CONFIG_PPC_PMAC64=y

CONFIG_BOOTX_TEXT=y

CONFIG_POWER4_ONLY=y

CONFIG_MPIC=y

# CONFIG_PPC_RTAS is not set

# CONFIG_MMIO_NVRAM is not set

# CONFIG_PPC_MPC106 is not set

CONFIG_GENERIC_TBSYNC=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set

CONFIG_CPU_FREQ_PMAC64=y

# 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=2

# CONFIG_HOTPLUG_CPU is not set

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

# CONFIG_NUMA is not set

CONFIG_ARCH_SELECT_MEMORY_MODEL=y

CONFIG_ARCH_FLATMEM_ENABLE=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -100,28 +144,21 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_NUMA is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_SCHED_SMT is not set

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_GENERIC_HARDIRQS=y

CONFIG_SECCOMP=y

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_MISC is not set

# CONFIG_HOTPLUG_CPU is not set

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 is not set

# CONFIG_PPC_INDIRECT_PCI is not set

CONFIG_PCI=y

CONFIG_PCI_DOMAINS=y

CONFIG_PCI_LEGACY_PROC=y
@@ -136,6 +173,7 @@ CONFIG_PCI_LEGACY_PROC=y 
# PCI Hotplug Support

#

# CONFIG_HOTPLUG_PCI is not set

CONFIG_KERNEL_START=0xc000000000000000



#

# Networking
@@ -276,6 +314,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
@@ -348,6 +390,11 @@ 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"

# CONFIG_ATA_OVER_ETH is not set



#
@@ -449,6 +496,7 @@ CONFIG_SCSI_SPI_ATTRS=y 
#

# 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
@@ -465,10 +513,12 @@ CONFIG_SCSI_SATA_SVW=y 
# CONFIG_SCSI_ATA_PIIX is not set

# CONFIG_SCSI_SATA_MV is not set

# CONFIG_SCSI_SATA_NV is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_PDC_ADMA is not set

# CONFIG_SCSI_SATA_QSTOR is not set

# CONFIG_SCSI_SATA_PROMISE is not set

# CONFIG_SCSI_SATA_SX4 is not set

# CONFIG_SCSI_SATA_SIL is not set

# CONFIG_SCSI_SATA_SIL24 is not set

# CONFIG_SCSI_SATA_SIS is not set

# CONFIG_SCSI_SATA_ULI is not set

# CONFIG_SCSI_SATA_VIA is not set
@@ -567,6 +617,9 @@ CONFIG_IEEE1394_RAWIO=y 
CONFIG_ADB_PMU=y

CONFIG_PMAC_SMU=y

CONFIG_THERM_PM72=y

CONFIG_WINDFARM=y

CONFIG_WINDFARM_PM81=y

CONFIG_WINDFARM_PM91=y



#

# Network device support
@@ -603,6 +656,7 @@ CONFIG_SUNGEM=y 
# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_NET_PCI is not set

# CONFIG_FEC_8XX is not set



#

# Ethernet (1000 Mbit)
@@ -768,6 +822,7 @@ CONFIG_MAX_RAW_DEVS=256 
# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -820,6 +875,7 @@ CONFIG_I2C_PMAC_SMU=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
@@ -876,10 +932,9 @@ CONFIG_FB_OF=y 
# CONFIG_FB_ASILIANT is not set

# CONFIG_FB_IMSTT is not set

# CONFIG_FB_VGA16 is not set

# CONFIG_FB_NVIDIA is not set

CONFIG_FB_RIVA=y

# CONFIG_FB_RIVA_I2C is not set

# CONFIG_FB_RIVA_DEBUG is not set

CONFIG_FB_NVIDIA=y

CONFIG_FB_NVIDIA_I2C=y

# CONFIG_FB_RIVA is not set

# CONFIG_FB_MATROX is not set

# CONFIG_FB_RADEON_OLD is not set

CONFIG_FB_RADEON=y
@@ -924,7 +979,96 @@ CONFIG_LCD_DEVICE=y 
#

# Sound

#

# CONFIG_SOUND is not set

CONFIG_SOUND=m



#

# Advanced Linux Sound Architecture

#

CONFIG_SND=m

CONFIG_SND_TIMER=m

CONFIG_SND_PCM=m

CONFIG_SND_HWDEP=m

CONFIG_SND_RAWMIDI=m

CONFIG_SND_SEQUENCER=m

# CONFIG_SND_SEQ_DUMMY is not set

CONFIG_SND_OSSEMUL=y

CONFIG_SND_MIXER_OSS=m

CONFIG_SND_PCM_OSS=m

CONFIG_SND_SEQUENCER_OSS=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

CONFIG_SND_GENERIC_DRIVER=y



#

# Generic devices

#

# CONFIG_SND_DUMMY is not set

# CONFIG_SND_VIRMIDI is not set

# CONFIG_SND_MTPAV is not set

# CONFIG_SND_SERIAL_U16550 is not set

# CONFIG_SND_MPU401 is not set



#

# PCI devices

#

# CONFIG_SND_ALI5451 is not set

# CONFIG_SND_ATIIXP is not set

# CONFIG_SND_ATIIXP_MODEM is not set

# CONFIG_SND_AU8810 is not set

# CONFIG_SND_AU8820 is not set

# CONFIG_SND_AU8830 is not set

# CONFIG_SND_AZT3328 is not set

# CONFIG_SND_BT87X is not set

# CONFIG_SND_CS46XX is not set

# CONFIG_SND_CS4281 is not set

# CONFIG_SND_EMU10K1 is not set

# CONFIG_SND_EMU10K1X is not set

# CONFIG_SND_CA0106 is not set

# CONFIG_SND_KORG1212 is not set

# CONFIG_SND_MIXART is not set

# CONFIG_SND_NM256 is not set

# CONFIG_SND_RME32 is not set

# CONFIG_SND_RME96 is not set

# CONFIG_SND_RME9652 is not set

# CONFIG_SND_HDSP is not set

# CONFIG_SND_HDSPM is not set

# CONFIG_SND_TRIDENT is not set

# CONFIG_SND_YMFPCI is not set

# CONFIG_SND_AD1889 is not set

# CONFIG_SND_ALS4000 is not set

# CONFIG_SND_CMIPCI is not set

# CONFIG_SND_ENS1370 is not set

# CONFIG_SND_ENS1371 is not set

# CONFIG_SND_ES1938 is not set

# CONFIG_SND_ES1968 is not set

# CONFIG_SND_MAESTRO3 is not set

# CONFIG_SND_FM801 is not set

# CONFIG_SND_ICE1712 is not set

# CONFIG_SND_ICE1724 is not set

# CONFIG_SND_INTEL8X0 is not set

# CONFIG_SND_INTEL8X0M is not set

# CONFIG_SND_SONICVIBES is not set

# CONFIG_SND_VIA82XX is not set

# CONFIG_SND_VIA82XX_MODEM is not set

# CONFIG_SND_VX222 is not set

# CONFIG_SND_HDA_INTEL is not set



#

# ALSA PowerMac devices

#

CONFIG_SND_POWERMAC=m

CONFIG_SND_POWERMAC_AUTO_DRC=y



#

# USB devices

#

CONFIG_SND_USB_AUDIO=m

# CONFIG_SND_USB_USX2Y is not set



#

# Open Sound System

#

# CONFIG_SOUND_PRIME is not set



#

# USB support
@@ -958,12 +1102,16 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
#

# USB Device Class drivers

#

# CONFIG_USB_BLUETOOTH_TTY is not set

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=y



#

# 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
@@ -1074,6 +1222,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y 
CONFIG_USB_SERIAL_KLSI=m

CONFIG_USB_SERIAL_KOBIL_SCT=m

CONFIG_USB_SERIAL_MCT_U232=m

# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set

CONFIG_USB_SERIAL_PL2303=m

# CONFIG_USB_SERIAL_HP4X is not set

CONFIG_USB_SERIAL_SAFE=m
@@ -1310,6 +1459,20 @@ CONFIG_NLS_ISO8859_15=y 
# CONFIG_NLS_KOI8_U is not set

CONFIG_NLS_UTF8=y



#

# 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



#

# Profiling support

#
@@ -1331,12 +1494,14 @@ 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 is not set

# CONFIG_KPROBES is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUGGER is not set

# CONFIG_PPCDBG is not set

CONFIG_IRQSTACKS=y

CONFIG_BOOTX_TEXT=y



#

# Security options
@@ -1376,17 +1541,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/misc_64.S

+70 −0
Original line number Diff line number Diff line
@@ -603,6 +603,76 @@ _GLOBAL(real_writeb) 
	blr

#endif /* defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE) */



/*

 * SCOM access functions for 970 (FX only for now)

 *

 * unsigned long scom970_read(unsigned int address);

 * void scom970_write(unsigned int address, unsigned long value);

 *

 * The address passed in is the 24 bits register address. This code

 * is 970 specific and will not check the status bits, so you should

 * know what you are doing.

 */

_GLOBAL(scom970_read)

	/* interrupts off */

	mfmsr	r4

	ori	r0,r4,MSR_EE

	xori	r0,r0,MSR_EE

	mtmsrd	r0,1



	/* rotate 24 bits SCOM address 8 bits left and mask out it's low 8 bits

	 * (including parity). On current CPUs they must be 0'd,

	 * and finally or in RW bit

	 */

	rlwinm	r3,r3,8,0,15

	ori	r3,r3,0x8000



	/* do the actual scom read */

	sync

	mtspr	SPRN_SCOMC,r3

	isync

	mfspr	r3,SPRN_SCOMD

	isync

	mfspr	r0,SPRN_SCOMC

	isync



	/* XXX:	fixup result on some buggy 970's (ouch ! we lost a bit, bah

	 * that's the best we can do). Not implemented yet as we don't use

	 * the scom on any of the bogus CPUs yet, but may have to be done

	 * ultimately

	 */



	/* restore interrupts */

	mtmsrd	r4,1

	blr





_GLOBAL(scom970_write)

	/* interrupts off */

	mfmsr	r5

	ori	r0,r5,MSR_EE

	xori	r0,r0,MSR_EE

	mtmsrd	r0,1



	/* rotate 24 bits SCOM address 8 bits left and mask out it's low 8 bits

	 * (including parity). On current CPUs they must be 0'd.

	 */



	rlwinm	r3,r3,8,0,15



	sync

	mtspr	SPRN_SCOMD,r4      /* write data */

	isync

	mtspr	SPRN_SCOMC,r3      /* write command */

	isync

	mfspr	3,SPRN_SCOMC

	isync



	/* restore interrupts */

	mtmsrd	r5,1

	blr





/*

 * Create a kernel thread

 *   kernel_thread(fn, arg, flags)

arch/powerpc/kernel/process.c

+1 −3
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ 
#include <asm/processor.h>

#include <asm/mmu.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#ifdef CONFIG_PPC64

#include <asm/firmware.h>

#include <asm/time.h>

#include <asm/machdep.h>

#endif



extern unsigned long _get_SP(void);
@@ -203,10 +203,8 @@ int dump_spe(struct pt_regs *regs, elf_vrregset_t *evrregs) 


int set_dabr(unsigned long dabr)

{

#ifdef CONFIG_PPC64

	if (ppc_md.set_dabr)

		return ppc_md.set_dabr(dabr);

#endif



	mtspr(SPRN_DABR, dabr);

	return 0;

arch/powerpc/kernel/prom.c

+18 −3
Original line number Diff line number Diff line
@@ -1974,14 +1974,29 @@ EXPORT_SYMBOL(get_property); 
/*

 * Add a property to a node

 */

void prom_add_property(struct device_node* np, struct property* prop)

int prom_add_property(struct device_node* np, struct property* prop)

{

	struct property **next = &np->properties;

	struct property **next;



	prop->next = NULL;	

	while (*next)

	write_lock(&devtree_lock);

	next = &np->properties;

	while (*next) {

		if (strcmp(prop->name, (*next)->name) == 0) {

			/* duplicate ! don't insert it */

			write_unlock(&devtree_lock);

			return -1;

		}

		next = &(*next)->next;

	}

	*next = prop;

	write_unlock(&devtree_lock);



	/* try to add to proc as well if it was initialized */

	if (np->pde)

		proc_device_tree_add_prop(np->pde, prop);



	return 0;

}



/* I quickly hacked that one, check against spec ! */