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

Merge branch 'parisc-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "The PA-RISC updates for v3.11 include a gcc miscompilation fix,
  gzip-compressed vmlinuz support, a fix in the PCI code for ATI FireGL
  support on c8000 machines, a fix to prevent that %sr1 is being
  clobbered and a few smaller optimizations and documentation updates"

* 'parisc-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix gcc miscompilation in pa_memcpy()
  parisc: Ensure volatile space register %sr1 is not clobbered
  parisc: optimize mtsp(0,sr) inline assembly
  parisc: switch to gzip-compressed vmlinuz kernel
  parisc: document the shadow registers
  parisc: more capabilities info in /proc/cpuinfo
  parisc: fix LMMIO mismatch between PAT length and MASK register
parents 61e31291 5b879d78

Documentation/parisc/registers

+8 −0
Original line number Diff line number Diff line
@@ -77,6 +77,14 @@ PSW default E value 0 
Shadow Registers		used by interruption handler code

TOC enable bit			1



=========================================================================



The PA-RISC architecture defines 7 registers as "shadow registers".

Those are used in RETURN FROM INTERRUPTION AND RESTORE instruction to reduce

the state save and restore time by eliminating the need for general register

(GR) saves and restores in interruption handlers.

Shadow registers are the GRs 1, 8, 9, 16, 17, 24, and 25.



=========================================================================

Register usage notes, originally from John Marvin, with some additional

notes from Randolph Chung.

arch/parisc/Makefile

+11 −4
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
# Mike Shaver, Helge Deller and Martin K. Petersen

#



KBUILD_IMAGE := vmlinuz



KBUILD_DEFCONFIG := default_defconfig



NM		= sh $(srctree)/arch/parisc/nm
@@ -92,7 +94,7 @@ PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \ 
	else echo $(obj)/palo.conf; \

	fi)



palo: vmlinux

palo: vmlinuz

	@if test ! -x "$(PALO)"; then \

		echo 'ERROR: Please install palo first (apt-get install palo)';\

		echo 'or build it from source and install it somewhere in your $$PATH';\
@@ -107,10 +109,14 @@ palo: vmlinux 
	fi

	$(PALO) -f $(PALOCONF)



# Shorthands for known targets not supported by parisc, use vmlinux as default

Image zImage bzImage: vmlinux

# Shorthands for known targets not supported by parisc, use vmlinux/vmlinuz as default

Image: vmlinux

zImage bzImage: vmlinuz



vmlinuz: vmlinux

	@gzip -cf -9 $< > $@



install: vmlinux

install: vmlinuz

	sh $(src)/arch/parisc/install.sh \

			$(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
@@ -119,6 +125,7 @@ MRPROPER_FILES += palo.conf 


define archhelp

	@echo  '* vmlinux	- Uncompressed kernel image (./vmlinux)'

	@echo  '  vmlinuz	- Compressed kernel image (./vmlinuz)'

	@echo  '  palo		- Bootable image (./lifimage)'

	@echo  '  install	- Install kernel using'

	@echo  '		  (your) ~/bin/$(INSTALLKERNEL) or'

arch/parisc/defpalo.conf

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Most people using 'make palo' want a bootable file, usable for

# network or tape booting for example.

--init-tape=lifimage

--recoverykernel=vmlinux

--recoverykernel=vmlinuz



########## Pick your ROOT here! ##########

# You need at least one 'root='!
@@ -12,10 +12,10 @@ 
# If you want a root ramdisk, use the next 2 lines

#   (Edit the ramdisk image name!!!!)

--ramdisk=ram-disk-image-file

--commandline=0/vmlinux HOME=/ root=/dev/ram initrd=0/ramdisk

--commandline=0/vmlinuz HOME=/ root=/dev/ram initrd=0/ramdisk panic_timeout=60 panic=-1



# If you want NFS root, use the following command line (Edit the HOSTNAME!!!)

#--commandline=0/vmlinux HOME=/ root=/dev/nfs nfsroot=HOSTNAME ip=bootp

#--commandline=0/vmlinuz HOME=/ root=/dev/nfs nfsroot=HOSTNAME ip=bootp



# If you have root on a disk partition, use this (Edit the partition name!!!)

#--commandline=0/vmlinux HOME=/ root=/dev/sda1
 
#--commandline=0/vmlinuz HOME=/ root=/dev/sda1

arch/parisc/include/asm/special_insns.h

+6 −3
Original line number Diff line number Diff line
@@ -32,9 +32,12 @@ static inline void set_eiem(unsigned long val) 
	cr;				\

})



#define mtsp(gr, cr) \

#define mtsp(val, cr) \

	{ if (__builtin_constant_p(val) && ((val) == 0)) \

	 __asm__ __volatile__("mtsp %%r0,%0" : : "i" (cr) : "memory"); \

	else \

	 __asm__ __volatile__("mtsp %0,%1" \

		: /* no outputs */ \

		: "r" (gr), "i" (cr) : "memory")

		: "r" (val), "i" (cr) : "memory"); }



#endif /* __PARISC_SPECIAL_INSNS_H */

arch/parisc/include/asm/tlbflush.h

+3 −2
Original line number Diff line number Diff line
@@ -63,13 +63,14 @@ static inline void flush_tlb_mm(struct mm_struct *mm) 
static inline void flush_tlb_page(struct vm_area_struct *vma,

	unsigned long addr)

{

	unsigned long flags;

	unsigned long flags, sid;



	/* For one page, it's not worth testing the split_tlb variable */



	mb();

	mtsp(vma->vm_mm->context,1);

	sid = vma->vm_mm->context;

	purge_tlb_start(flags);

	mtsp(sid, 1);

	pdtlb(addr);

	pitlb(addr);

	purge_tlb_end(flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE