Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (98d86c09) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sparc/Makefile

+6 −2

Original line number	Diff line number	Diff line
		@@ -52,20 +52,24 @@ endif
		export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o

		# Default target
		all: image
		all: zImage

		boot := arch/sparc/boot

		image tftpboot.img: vmlinux
		image zImage tftpboot.img: vmlinux
		$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

		archclean:
		$(Q)$(MAKE) $(clean)=$(boot)

		# This is the image used for packaging
		KBUILD_IMAGE := $(boot)/zImage

		CLEAN_FILES += arch/$(ARCH)/boot/System.map

		# Don't use tabs in echo arguments.
		define archhelp
		echo '* image - kernel image ($(boot)/image)'
		echo '* zImage - stripped kernel image ($(boot)/zImage)'
		echo ' tftpboot.img - image prepared for tftp'
		endef

arch/sparc/boot/Makefile

+6 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ quiet_cmd_sysmap = SYSMAP $(obj)/System.map
		cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap
		quiet_cmd_image = LD $@
		cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@
		quiet_cmd_strip = STRIP $@
		cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@


		define rule_image
		$(if $($(quiet)cmd_image), \
		@@ -49,6 +52,9 @@ LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \
		$(obj)/image: $(obj)/btfix.o FORCE
		$(call if_changed_rule,image)

		$(obj)/zImage: $(obj)/image
		$(call if_changed,strip)

		$(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE
		$(call if_changed,elftoaout)
		$(call if_changed,piggy)

arch/sparc/include/asm/smp_32.h

+15 −10

Original line number	Diff line number	Diff line
		@@ -50,27 +50,24 @@ struct seq_file;
		void smp_bogo(struct seq_file *);
		void smp_info(struct seq_file *);

		BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long)
		BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long)
		BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void)
		BTFIXUPDEF_BLACKBOX(hard_smp_processor_id)
		BTFIXUPDEF_BLACKBOX(load_current)

		#define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5)
		#define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4)

		static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }
		static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); }
		static inline void xc1(smpfunc_t func, unsigned long arg1)
		{ smp_cross_call(func, arg1, 0, 0, 0, 0); }
		{ smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); }
		static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)
		{ smp_cross_call(func, arg1, arg2, 0, 0, 0); }
		{ smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); }
		static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,
		unsigned long arg3)
		{ smp_cross_call(func, arg1, arg2, arg3, 0, 0); }
		{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); }
		static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
		unsigned long arg3, unsigned long arg4)
		{ smp_cross_call(func, arg1, arg2, arg3, arg4, 0); }
		static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2,
		unsigned long arg3, unsigned long arg4, unsigned long arg5)
		{ smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); }
		{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); }

		static inline int smp_call_function(void (func)(void info), void *info, int wait)
		{
		@@ -78,6 +75,14 @@ static inline int smp_call_function(void (func)(void info), void *info, int wa
		return 0;
		}

		static inline int smp_call_function_single(int cpuid, void (func) (void info),
		void *info, int wait)
		{
		smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid),
		(unsigned long) info, 0, 0, 0);
		return 0;
		}

		static inline int cpu_logical_map(int cpu)
		{
		return cpu;

arch/sparc/kernel/of_device.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ struct of_bus {
		int addrc, int sizec);
		int (map)(u32 addr, const u32 *range,
		int na, int ns, int pna);
		unsigned int (get_flags)(const u32 addr);
		unsigned long (get_flags)(const u32 addr, unsigned long);
		};

		/*
		@@ -153,8 +153,10 @@ static int of_bus_default_map(u32 addr, const u32 range,
		return 0;
		}

		static unsigned int of_bus_default_get_flags(const u32 *addr)
		static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags)
		{
		if (flags)
		return flags;
		return IORESOURCE_MEM;
		}

		@@ -217,17 +219,21 @@ static int of_bus_pci_map(u32 addr, const u32 range,
		return 0;
		}

		static unsigned int of_bus_pci_get_flags(const u32 *addr)
		static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags)
		{
		unsigned int flags = 0;
		u32 w = addr[0];

		/* For PCI, we override whatever child busses may have used. */
		flags = 0;
		switch((w >> 24) & 0x03) {
		case 0x01:
		flags \|= IORESOURCE_IO;
		break;

		case 0x02: /* 32 bits */
		case 0x03: /* 64 bits */
		flags \|= IORESOURCE_MEM;
		break;
		}
		if (w & 0x40000000)
		flags \|= IORESOURCE_PREFETCH;
		@@ -406,10 +412,11 @@ static void __init build_device_resources(struct of_device *op,
		int pna, pns;

		size = of_read_addr(reg + na, ns);
		flags = bus->get_flags(reg);

		memcpy(addr, reg, na * 4);

		flags = bus->get_flags(reg, 0);

		if (use_1to1_mapping(pp)) {
		result = of_read_addr(addr, na);
		goto build_res;
		@@ -434,6 +441,8 @@ static void __init build_device_resources(struct of_device *op,
		dna, dns, pna))
		break;

		flags = pbus->get_flags(addr, flags);

		dna = pna;
		dns = pns;
		dbus = pbus;

arch/sparc/kernel/sun4d_smp.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -261,8 +261,9 @@ static struct smp_funcall {
		static DEFINE_SPINLOCK(cross_call_lock);

		/* Cross calls must be serialized, at least currently. */
		void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,
		unsigned long arg3, unsigned long arg4, unsigned long arg5)
		static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
		unsigned long arg2, unsigned long arg3,
		unsigned long arg4)
		{
		if(smp_processors_ready) {
		register int high = smp_highest_cpu;
		@@ -277,7 +278,7 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,
		register unsigned long a2 asm("i2") = arg2;
		register unsigned long a3 asm("i3") = arg3;
		register unsigned long a4 asm("i4") = arg4;
		register unsigned long a5 asm("i5") = arg5;
		register unsigned long a5 asm("i5") = 0;

		__asm__ __volatile__(
		"std %0, [%6]\n\t"
		@@ -289,11 +290,10 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,

		/* Init receive/complete mapping, plus fire the IPI's off. */
		{
		cpumask_t mask;
		register int i;

		mask = cpumask_of_cpu(hard_smp4d_processor_id());
		cpus_andnot(mask, cpu_online_map, mask);
		cpu_clear(smp_processor_id(), mask);
		cpus_and(mask, cpu_online_map, mask);
		for(i = 0; i <= high; i++) {
		if (cpu_isset(i, mask)) {
		ccall_info.processors_in[i] = 0;
		@@ -308,12 +308,16 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,

		i = 0;
		do {
		if (!cpu_isset(i, mask))
		continue;
		while(!ccall_info.processors_in[i])
		barrier();
		} while(++i <= high);

		i = 0;
		do {
		if (!cpu_isset(i, mask))
		continue;
		while(!ccall_info.processors_out[i])
		barrier();
		} while(++i <= high);