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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (33 commits)
  sparc32: Fix might-be-used-uninitialized warning in do_sparc_fault().
  sparc: Fix .size directive for do_int_load
  sparc64: Fix build errors with gcc-4.6.0
  sparc32,sun4m: percpu and global register definitions moved to irq.h
  sparc32: introduce build_device_irq
  sparc32: introduce sparc_irq_config
  sparc32: fix build with leon or floppy enabled
  sparc: convert to clocksource_register_hz/khz
  sparc64: Sharpen address space randomization calculations.
  sparc32: irq_32.c cleanup
  sparc32, sun4d: add comment in empty statement in sun4d_request_irq()
  sparc32,sun4d: drop unused code in sun4d_distribute_irqs()
  sparc32,sun4d: irq, smp files cleanup
  sparc32,sun4m: irq, smp files cleanup
  sparc32,sun4c: irq file cleanup
  sparc32: add irq + smp declarations to headers
  sparc32: remove tick14.c
  sparc32/leon: FPU-FSR only available when FPU present
  SPARC/LEON: power down instruction different of different LEONs
  sparc32: added U-Boot build target: uImage
  ...
parents 054cfaac c816be7b

arch/sparc/Kconfig

+34 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ config SPARC64 
	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_HARDIRQS_NO_DEPRECATED



config ARCH_DEFCONFIG

	string
@@ -460,6 +461,39 @@ config SPARC_LEON 
	  from www.gaisler.com. You can download a sparc-linux cross-compilation

	  toolchain at www.gaisler.com.



if SPARC_LEON

menu "U-Boot options"



config UBOOT_LOAD_ADDR

	hex "uImage Load Address"

	default 0x40004000

	---help---

	 U-Boot kernel load address, the address in physical address space

	 where u-boot will place the Linux kernel before booting it.

	 This address is normally the base address of main memory + 0x4000.



config UBOOT_FLASH_ADDR

	hex "uImage.o Load Address"

	default 0x00080000

	---help---

	 Optional setting only affecting the uImage.o ELF-image used to

	 download the uImage file to the target using a ELF-loader other than

	 U-Boot. It may for example be used to download an uImage to FLASH with

	 the GRMON utility before even starting u-boot.



config UBOOT_ENTRY_ADDR

	hex "uImage Entry Address"

	default 0xf0004000

	---help---

	 Do not change this unless you know what you're doing. This is

	 hardcoded by the SPARC32 and LEON port.



	 This is the virtual address u-boot jumps to when booting the Linux

	 Kernel.



endmenu

endif



endmenu



menu "Bus options (PCI etc.)"

arch/sparc/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ boot := arch/sparc/boot 
# Default target

all: zImage



image zImage tftpboot.img vmlinux.aout: vmlinux

image zImage uImage tftpboot.img vmlinux.aout: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



archclean:
@@ -102,6 +102,7 @@ ifeq ($(ARCH),sparc) 
define archhelp

  echo  '* image        - kernel image ($(boot)/image)'

  echo  '* zImage       - stripped kernel image ($(boot)/zImage)'

  echo  '  uImage       - U-Boot SPARC32 Image (only for LEON)'

  echo  '  tftpboot.img - image prepared for tftp'

endef

else

arch/sparc/boot/Makefile

+31 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


ROOT_IMG	:= /usr/src/root.img

ELFTOAOUT	:= elftoaout

MKIMAGE 	:= $(srctree)/scripts/mkuboot.sh



hostprogs-y	:= piggyback btfixupprep

targets		:= tftpboot.img btfix.o btfix.S image zImage vmlinux.aout
@@ -77,6 +78,36 @@ $(obj)/zImage: $(obj)/image 
$(obj)/vmlinux.aout: vmlinux FORCE

	$(call if_changed,elftoaout)

	@echo '  kernel: $@ is ready'

else



# The following lines make a readable image for U-Boot.

#  uImage   - Binary file read by U-boot

#  uImage.o - object file of uImage for loading with a

#             flash programmer understanding ELF.



OBJCOPYFLAGS_image.bin := -S -O binary -R .note -R .comment

$(obj)/image.bin: $(obj)/image FORCE

	$(call if_changed,objcopy)



$(obj)/image.gz: $(obj)/image.bin

	$(call if_changed,gzip)



quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A sparc -O linux -T kernel \

               -C gzip -a $(CONFIG_UBOOT_LOAD_ADDR) \

	       -e $(CONFIG_UBOOT_ENTRY_ADDR) -n 'Linux-$(KERNELRELEASE)' \

               -d $< $@



quiet_cmd_uimage.o = UIMAGE.O $@

      cmd_uimage.o = $(LD) -Tdata $(CONFIG_UBOOT_FLASH_ADDR) \

                     -r -b binary $@ -o $@.o



targets += uImage

$(obj)/uImage: $(obj)/image.gz

	$(call if_changed,uimage)

	$(call if_changed,uimage.o)

	@echo '  Image $@ is ready'



endif



$(obj)/tftpboot.img: $(obj)/image $(obj)/piggyback System.map $(ROOT_IMG) FORCE

arch/sparc/include/asm/irq_64.h

+9 −9
Original line number Diff line number Diff line
@@ -33,34 +33,34 @@ 


/* The largest number of unique interrupt sources we support.

 * If this needs to ever be larger than 255, you need to change

 * the type of ino_bucket->virt_irq as appropriate.

 * the type of ino_bucket->irq as appropriate.

 *

 * ino_bucket->virt_irq allocation is made during {sun4v_,}build_irq().

 * ino_bucket->irq allocation is made during {sun4v_,}build_irq().

 */

#define NR_IRQS    255



extern void irq_install_pre_handler(int virt_irq,

extern void irq_install_pre_handler(int irq,

				    void (*func)(unsigned int, void *, void *),

				    void *arg1, void *arg2);

#define irq_canonicalize(irq)	(irq)

extern unsigned int build_irq(int inofixup, unsigned long iclr, unsigned long imap);

extern unsigned int sun4v_build_irq(u32 devhandle, unsigned int devino);

extern unsigned int sun4v_build_virq(u32 devhandle, unsigned int devino);

extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p,

extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *irq_p,

				    unsigned int msi_devino_start,

				    unsigned int msi_devino_end);

extern void sun4v_destroy_msi(unsigned int virt_irq);

extern unsigned int sun4u_build_msi(u32 portid, unsigned int *virt_irq_p,

extern void sun4v_destroy_msi(unsigned int irq);

extern unsigned int sun4u_build_msi(u32 portid, unsigned int *irq_p,

				    unsigned int msi_devino_start,

				    unsigned int msi_devino_end,

				    unsigned long imap_base,

				    unsigned long iclr_base);

extern void sun4u_destroy_msi(unsigned int virt_irq);

extern void sun4u_destroy_msi(unsigned int irq);



extern unsigned char virt_irq_alloc(unsigned int dev_handle,

extern unsigned char irq_alloc(unsigned int dev_handle,

				    unsigned int dev_ino);

#ifdef CONFIG_PCI_MSI

extern void virt_irq_free(unsigned int virt_irq);

extern void irq_free(unsigned int irq);

#endif



extern void __init init_IRQ(void);

arch/sparc/include/asm/leon.h

+0 −3
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu); 


extern unsigned int real_irq_entry[], smpleon_ticker[];

extern unsigned int patchme_maybe_smp_msg[];

extern unsigned long trapbase_cpu1[];

extern unsigned long trapbase_cpu2[];

extern unsigned long trapbase_cpu3[];

extern unsigned int t_nmi[], linux_trap_ipi15_leon[];

extern unsigned int linux_trap_ipi15_sun4m[];

CRA Git | Maintained and supported by SUSTech CRA and CCSE