Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (b07019f2) · Commits · git / linux-net

arch/powerpc/configs/cell_defconfig

+25 −15

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y
		CONFIG_MMU=y
		CONFIG_GENERIC_HARDIRQS=y
		CONFIG_RWSEM_XCHGADD_ALGORITHM=y
		CONFIG_GENERIC_HWEIGHT=y
		CONFIG_GENERIC_CALIBRATE_DELAY=y
		CONFIG_PPC=y
		CONFIG_EARLY_PRINTK=y
		@@ -55,6 +56,7 @@ CONFIG_SYSCTL=y
		CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		# CONFIG_CPUSETS is not set
		# CONFIG_RELAY is not set
		CONFIG_INITRAMFS_SOURCE=""
		CONFIG_CC_OPTIMIZE_FOR_SIZE=y
		# CONFIG_EMBEDDED is not set
		@@ -69,10 +71,6 @@ CONFIG_BASE_FULL=y
		CONFIG_FUTEX=y
		CONFIG_EPOLL=y
		CONFIG_SHMEM=y
		CONFIG_CC_ALIGN_FUNCTIONS=0
		CONFIG_CC_ALIGN_LABELS=0
		CONFIG_CC_ALIGN_LOOPS=0
		CONFIG_CC_ALIGN_JUMPS=0
		CONFIG_SLAB=y
		# CONFIG_TINY_SHMEM is not set
		CONFIG_BASE_SMALL=0
		@@ -84,7 +82,6 @@ CONFIG_BASE_SMALL=0
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_MODULE_FORCE_UNLOAD is not set
		CONFIG_OBSOLETE_MODPARM=y
		# CONFIG_MODVERSIONS is not set
		# CONFIG_MODULE_SRCVERSION_ALL is not set
		CONFIG_KMOD=y
		@@ -93,6 +90,7 @@ CONFIG_STOP_MACHINE=y
		#
		# Block layer
		#
		# CONFIG_BLK_DEV_IO_TRACE is not set

		#
		# IO Schedulers
		@@ -126,6 +124,7 @@ CONFIG_RTAS_FLASH=y
		CONFIG_MMIO_NVRAM=y
		CONFIG_CELL_IIC=y
		# CONFIG_PPC_MPC106 is not set
		# CONFIG_PPC_970_NAP is not set
		# CONFIG_CPU_FREQ is not set
		# CONFIG_WANT_EARLY_SERIAL is not set

		@@ -167,7 +166,6 @@ CONFIG_HAVE_MEMORY_PRESENT=y
		CONFIG_SPARSEMEM_EXTREME=y
		# CONFIG_MEMORY_HOTPLUG is not set
		CONFIG_SPLIT_PTLOCK_CPUS=4
		CONFIG_MIGRATION=y
		# CONFIG_PPC_64K_PAGES is not set
		CONFIG_SCHED_SMT=y
		CONFIG_PROC_DEVICETREE=y
		@@ -184,7 +182,6 @@ CONFIG_GENERIC_ISA_DMA=y
		# CONFIG_PPC_INDIRECT_PCI is not set
		CONFIG_PCI=y
		CONFIG_PCI_DOMAINS=y
		CONFIG_PCI_LEGACY_PROC=y
		# CONFIG_PCI_DEBUG is not set

		#
		@@ -226,6 +223,7 @@ CONFIG_SYN_COOKIES=y
		# CONFIG_INET_AH is not set
		# CONFIG_INET_ESP is not set
		# CONFIG_INET_IPCOMP is not set
		# CONFIG_INET_XFRM_TUNNEL is not set
		CONFIG_INET_TUNNEL=y
		CONFIG_INET_DIAG=y
		CONFIG_INET_TCP_DIAG=y
		@@ -242,6 +240,7 @@ CONFIG_IPV6=y
		CONFIG_INET6_AH=m
		CONFIG_INET6_ESP=m
		CONFIG_INET6_IPCOMP=m
		CONFIG_INET6_XFRM_TUNNEL=m
		CONFIG_INET6_TUNNEL=m
		CONFIG_IPV6_TUNNEL=m
		CONFIG_NETFILTER=y
		@@ -632,6 +631,7 @@ CONFIG_SERIAL_NONSTANDARD=y
		#
		CONFIG_SERIAL_8250=y
		CONFIG_SERIAL_8250_CONSOLE=y
		CONFIG_SERIAL_8250_PCI=y
		CONFIG_SERIAL_8250_NR_UARTS=4
		CONFIG_SERIAL_8250_RUNTIME_UARTS=4
		# CONFIG_SERIAL_8250_EXTENDED is not set
		@@ -717,7 +717,6 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_I2C_PARPORT_LIGHT is not set
		# CONFIG_I2C_PROSAVAGE is not set
		# CONFIG_I2C_SAVAGE4 is not set
		# CONFIG_SCx200_ACB is not set
		# CONFIG_I2C_SIS5595 is not set
		# CONFIG_I2C_SIS630 is not set
		# CONFIG_I2C_SIS96X is not set
		@@ -736,9 +735,7 @@ CONFIG_I2C_ALGOBIT=y
		# CONFIG_SENSORS_PCF8574 is not set
		# CONFIG_SENSORS_PCA9539 is not set
		# 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
		@@ -765,10 +762,6 @@ CONFIG_I2C_ALGOBIT=y
		# Misc devices
		#

		#
		# Multimedia Capabilities Port drivers
		#

		#
		# Multimedia devices
		#
		@@ -817,6 +810,19 @@ CONFIG_USB_ARCH_HAS_EHCI=y
		#
		# CONFIG_MMC is not set

		#
		# LED devices
		#
		# CONFIG_NEW_LEDS is not set

		#
		# LED drivers
		#

		#
		# LED Triggers
		#

		#
		# InfiniBand support
		#
		@@ -833,6 +839,11 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
		# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
		#

		#
		# Real Time Clock
		#
		# CONFIG_RTC_CLASS is not set

		#
		# File systems
		#
		@@ -889,7 +900,6 @@ CONFIG_TMPFS=y
		CONFIG_HUGETLBFS=y
		CONFIG_HUGETLB_PAGE=y
		CONFIG_RAMFS=y
		# CONFIG_RELAYFS_FS is not set
		# CONFIG_CONFIGFS_FS is not set

		#

arch/powerpc/kernel/cputable.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@ extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
		PPC_FEATURE_SMT \| PPC_FEATURE_ICACHE_SNOOP)
		#define COMMON_USER_POWER5_PLUS (COMMON_USER_PPC64 \| PPC_FEATURE_POWER5_PLUS\|\
		PPC_FEATURE_SMT \| PPC_FEATURE_ICACHE_SNOOP)
		#define COMMON_USER_POWER6 (COMMON_USER_PPC64 \| PPC_FEATURE_ARCH_2_05 \|\
		PPC_FEATURE_SMT \| PPC_FEATURE_ICACHE_SNOOP)
		#define COMMON_USER_BOOKE (PPC_FEATURE_32 \| PPC_FEATURE_HAS_MMU \| \
		PPC_FEATURE_BOOKE)

		@@ -263,6 +265,20 @@ struct cpu_spec cpu_specs[] = {
		.oprofile_type = PPC_OPROFILE_POWER4,
		.platform = "power5+",
		},
		{ /* Power6 */
		.pvr_mask = 0xffff0000,
		.pvr_value = 0x003e0000,
		.cpu_name = "POWER6",
		.cpu_features = CPU_FTRS_POWER6,
		.cpu_user_features = COMMON_USER_POWER6,
		.icache_bsize = 128,
		.dcache_bsize = 128,
		.num_pmcs = 6,
		.cpu_setup = __setup_cpu_power4,
		.oprofile_cpu_type = "ppc64/power6",
		.oprofile_type = PPC_OPROFILE_POWER4,
		.platform = "power6",
		},
		{ /* Cell Broadband Engine */
		.pvr_mask = 0xffff0000,
		.pvr_value = 0x00700000,

arch/powerpc/kernel/module_64.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -191,11 +191,19 @@ int module_frob_arch_sections(Elf64_Ehdr *hdr,
		(void *)hdr
		+ sechdrs[sechdrs[i].sh_link].sh_offset);
		}
		if (!me->arch.stubs_section \|\| !me->arch.toc_section) {
		printk("%s: doesn't contain .toc or .stubs.\n", me->name);

		if (!me->arch.stubs_section) {
		printk("%s: doesn't contain .stubs.\n", me->name);
		return -ENOEXEC;
		}

		/* If we don't have a .toc, just use .stubs. We need to set r2
		to some reasonable value in case the module calls out to
		other functions via a stub, or if a function pointer escapes
		the module by some means. */
		if (!me->arch.toc_section)
		me->arch.toc_section = me->arch.stubs_section;

		/* Override the stubs size */
		sechdrs[me->arch.stubs_section].sh_size = get_stubs_size(hdr, sechdrs);
		return 0;
		@@ -342,7 +350,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
		break;

		case R_PPC64_TOC16:
		/* Subtact TOC pointer */
		/* Subtract TOC pointer */
		value -= my_r2(sechdrs, me);
		if (value + 0x8000 > 0xffff) {
		printk("%s: bad TOC16 relocation (%lu)\n",
		@@ -355,7 +363,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
		break;

		case R_PPC64_TOC16_DS:
		/* Subtact TOC pointer */
		/* Subtract TOC pointer */
		value -= my_r2(sechdrs, me);
		if ((value & 3) != 0 \|\| value + 0x8000 > 0xffff) {
		printk("%s: bad TOC16_DS relocation (%lu)\n",

arch/powerpc/kernel/prom_init.c

+108 −4

Original line number	Diff line number	Diff line
		@@ -636,10 +636,96 @@ static void __init early_cmdline_parse(void)

		#ifdef CONFIG_PPC_PSERIES
		/*
		* To tell the firmware what our capabilities are, we have to pass
		* it a fake 32-bit ELF header containing a couple of PT_NOTE sections
		* that contain structures that contain the actual values.
		* There are two methods for telling firmware what our capabilities are.
		* Newer machines have an "ibm,client-architecture-support" method on the
		* root node. For older machines, we have to call the "process-elf-header"
		* method in the /packages/elf-loader node, passing it a fake 32-bit
		* ELF header containing a couple of PT_NOTE sections that contain
		* structures that contain various information.
		*/

		/*
		* New method - extensible architecture description vector.
		*
		* Because the description vector contains a mix of byte and word
		* values, we declare it as an unsigned char array, and use this
		* macro to put word values in.
		*/
		#define W(x) ((x) >> 24) & 0xff, ((x) >> 16) & 0xff, \
		((x) >> 8) & 0xff, (x) & 0xff

		/* Option vector bits - generic bits in byte 1 */
		#define OV_IGNORE 0x80 /* ignore this vector */
		#define OV_CESSATION_POLICY 0x40 /* halt if unsupported option present*/

		/* Option vector 1: processor architectures supported */
		#define OV1_PPC_2_00 0x80 /* set if we support PowerPC 2.00 */
		#define OV1_PPC_2_01 0x40 /* set if we support PowerPC 2.01 */
		#define OV1_PPC_2_02 0x20 /* set if we support PowerPC 2.02 */
		#define OV1_PPC_2_03 0x10 /* set if we support PowerPC 2.03 */
		#define OV1_PPC_2_04 0x08 /* set if we support PowerPC 2.04 */
		#define OV1_PPC_2_05 0x04 /* set if we support PowerPC 2.05 */

		/* Option vector 2: Open Firmware options supported */
		#define OV2_REAL_MODE 0x20 /* set if we want OF in real mode */

		/* Option vector 3: processor options supported */
		#define OV3_FP 0x80 /* floating point */
		#define OV3_VMX 0x40 /* VMX/Altivec */

		/* Option vector 5: PAPR/OF options supported */
		#define OV5_LPAR 0x80 /* logical partitioning supported */
		#define OV5_SPLPAR 0x40 /* shared-processor LPAR supported */
		/* ibm,dynamic-reconfiguration-memory property supported */
		#define OV5_DRCONF_MEMORY 0x20
		#define OV5_LARGE_PAGES 0x10 /* large pages supported */

		/*
		* The architecture vector has an array of PVR mask/value pairs,
		* followed by # option vectors - 1, followed by the option vectors.
		*/
		static unsigned char ibm_architecture_vec[] = {
		W(0xfffe0000), W(0x003a0000), /* POWER5/POWER5+ */
		W(0xffff0000), W(0x003e0000), /* POWER6 */
		W(0xfffffffe), W(0x0f000001), /* all 2.04-compliant and earlier */
		5 - 1, /* 5 option vectors */

		/* option vector 1: processor architectures supported */
		3 - 1, /* length */
		0, /* don't ignore, don't halt */
		OV1_PPC_2_00 \| OV1_PPC_2_01 \| OV1_PPC_2_02 \| OV1_PPC_2_03 \|
		OV1_PPC_2_04 \| OV1_PPC_2_05,

		/* option vector 2: Open Firmware options supported */
		34 - 1, /* length */
		OV2_REAL_MODE,
		0, 0,
		W(0xffffffff), /* real_base */
		W(0xffffffff), /* real_size */
		W(0xffffffff), /* virt_base */
		W(0xffffffff), /* virt_size */
		W(0xffffffff), /* load_base */
		W(64), /* 128MB min RMA */
		W(0xffffffff), /* full client load */
		0, /* min RMA percentage of total RAM */
		48, /* max log_2(hash table size) */

		/* option vector 3: processor options supported */
		3 - 1, /* length */
		0, /* don't ignore, don't halt */
		OV3_FP \| OV3_VMX,

		/* option vector 4: IBM PAPR implementation */
		2 - 1, /* length */
		0, /* don't halt */

		/* option vector 5: PAPR/OF options */
		3 - 1, /* length */
		0, /* don't ignore, don't halt */
		OV5_LPAR \| OV5_SPLPAR \| OV5_LARGE_PAGES,
		};

		/* Old method - ELF header with PT_NOTE sections */
		static struct fake_elf {
		Elf32_Ehdr elfhdr;
		Elf32_Phdr phdr[2];
		@@ -728,8 +814,26 @@ static struct fake_elf {

		static void __init prom_send_capabilities(void)
		{
		ihandle elfloader;
		ihandle elfloader, root;
		prom_arg_t ret;

		root = call_prom("open", 1, 1, ADDR("/"));
		if (root != 0) {
		/* try calling the ibm,client-architecture-support method */
		if (call_prom_ret("call-method", 3, 2, &ret,
		ADDR("ibm,client-architecture-support"),
		ADDR(ibm_architecture_vec)) == 0) {
		/* the call exists... */
		if (ret)
		prom_printf("WARNING: ibm,client-architecture"
		"-support call FAILED!\n");
		call_prom("close", 1, 0, root);
		return;
		}
		call_prom("close", 1, 0, root);
		}

		/* no ibm,client-architecture-support call, try the old way */
		elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader"));
		if (elfloader == 0) {
		prom_printf("couldn't open /packages/elf-loader\n");

arch/powerpc/kernel/setup-common.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -516,3 +516,11 @@ void probe_machine(void)

		printk(KERN_INFO "Using %s machine description\n", ppc_md.name);
		}

		int check_legacy_ioport(unsigned long base_port)
		{
		if (ppc_md.check_legacy_ioport == NULL)
		return 0;
		return ppc_md.check_legacy_ioport(base_port);
		}
		EXPORT_SYMBOL(check_legacy_ioport);