Skip to content

Commit

Permalink
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…
Browse files Browse the repository at this point in the history 
…davem/sparc-2.6

Conflicts:

	arch/sparc/kernel/of_device.c
  • Loading branch information
David S. Miller committed Sep 8, 2008
2 parents d875a4b + 4d08461 commit 98d86c0
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 42 deletions.
8 changes: 6 additions & 2 deletions arch/sparc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions arch/sparc/boot/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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), \
Expand Down Expand Up @@ -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)
Expand Down
25 changes: 15 additions & 10 deletions arch/sparc/include/asm/smp_32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,34 +50,39 @@ 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)
{
xc1((smpfunc_t)func, (unsigned long)info);
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;
Expand Down
19 changes: 14 additions & 5 deletions arch/sparc/kernel/of_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

/*
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
16 changes: 10 additions & 6 deletions arch/sparc/kernel/sun4d_smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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"
Expand All @@ -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;
Expand All @@ -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);
Expand Down
12 changes: 8 additions & 4 deletions arch/sparc/kernel/sun4m_smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ static struct smp_funcall {
static DEFINE_SPINLOCK(cross_call_lock);

/* Cross calls must be serialized, at least currently. */
static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,
static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5)
unsigned long arg4)
{
register int ncpus = SUN4M_NCPUS;
unsigned long flags;
Expand All @@ -259,14 +259,14 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,
ccall_info.arg2 = arg2;
ccall_info.arg3 = arg3;
ccall_info.arg4 = arg4;
ccall_info.arg5 = arg5;
ccall_info.arg5 = 0;

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

cpu_clear(smp_processor_id(), mask);
cpus_and(mask, cpu_online_map, mask);
for(i = 0; i < ncpus; i++) {
if (cpu_isset(i, mask)) {
ccall_info.processors_in[i] = 0;
Expand All @@ -284,12 +284,16 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1,

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

i = 0;
do {
if (!cpu_isset(i, mask))
continue;
while(!ccall_info.processors_out[i])
barrier();
} while(++i < ncpus);
Expand Down
1 change: 1 addition & 0 deletions arch/sparc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ endmenu

config NUMA
bool "NUMA support"
depends on SMP

config NODES_SHIFT
int
Expand Down
20 changes: 14 additions & 6 deletions arch/sparc64/kernel/of_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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);
};

/*
Expand Down Expand Up @@ -179,8 +179,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;
}

Expand Down Expand Up @@ -272,17 +274,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;
Expand Down Expand Up @@ -510,10 +516,10 @@ 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(addr, 0);

if (use_1to1_mapping(pp)) {
result = of_read_addr(addr, na);
goto build_res;
Expand All @@ -538,6 +544,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;
Expand Down
14 changes: 6 additions & 8 deletions arch/sparc64/kernel/smp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ void smp_bogo(struct seq_file *m)
i, cpu_data(i).clock_tick);
}

static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);

extern void setup_sparc64_timer(void);

static volatile unsigned long callin_flag = 0;
Expand Down Expand Up @@ -120,9 +118,9 @@ void __cpuinit smp_callin(void)
while (!cpu_isset(cpuid, smp_commenced_mask))
rmb();

spin_lock(&call_lock);
ipi_call_lock();
cpu_set(cpuid, cpu_online_map);
spin_unlock(&call_lock);
ipi_call_unlock();

/* idle thread is expected to have preempt disabled */
preempt_disable();
Expand Down Expand Up @@ -1305,10 +1303,6 @@ int __cpu_disable(void)
c->core_id = 0;
c->proc_id = -1;

spin_lock(&call_lock);
cpu_clear(cpu, cpu_online_map);
spin_unlock(&call_lock);

smp_wmb();

/* Make sure no interrupts point to this cpu. */
Expand All @@ -1318,6 +1312,10 @@ int __cpu_disable(void)
mdelay(1);
local_irq_disable();

ipi_call_lock();
cpu_clear(cpu, cpu_online_map);
ipi_call_unlock();

return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion arch/sparc64/mm/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@ static int pavail_rescan_ents __initdata;
* memory list again, and make sure it provides at least as much
* memory as 'pavail' does.
*/
static void setup_valid_addr_bitmap_from_pavail(void)
static void __init setup_valid_addr_bitmap_from_pavail(void)
{
int i;

Expand Down

0 comments on commit 98d86c0

Please sign in to comment.