Commit 4d3ce21f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits)
  [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__
  [PARISC] Fix do_gettimeofday() hang
  [PARISC] Fix PCREL22F relocation problem for most modules
  [PARISC] Refactor show_regs in traps.c
  [PARISC] Add os_id_to_string helper
  [PARISC] OS_ID_LINUX == 0x0006
  [PARISC] Ensure Space ID hashing is turned off
  [PARISC] Match show_cache_info with reality
  [PARISC] Remove unused macro fixup_branch in syscall.S
  [PARISC] Add is_compat_task() helper
  [PARISC] Update Thibaut Varene's CREDITS entry
  [PARISC] Reduce data footprint in pdc_stable.c
  [PARISC] pdc_stable version 0.30
  [PARISC] Work around machines which do not support chassis warnings
  [PARISC] PDC_CHASSIS is implemented on all machines
  [PARISC] Remove unconditional #define PIC in syscall macros
  [PARISC] Use MFIA in current_text_addr on pa2.0 processors
  [PARISC] Remove dead function pc_in_user_space
  [PARISC] Test ioc_needs_fdc variable instead of open coding
  [PARISC] Fix gcc 4.1 warnings in sba_iommu.c
  ...
parents b026188e c1a7a755

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -3401,10 +3401,10 @@ S: Czech Republic 


N: Thibaut Varene

E: T-Bone@parisc-linux.org

W: http://www.parisc-linux.org/

W: http://www.parisc-linux.org/~varenet/

P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063

D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits

D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there

D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there

D: AD1889 sound driver

S: Paris, France

arch/parisc/kernel/cache.c

+19 −9
Original line number Diff line number Diff line
@@ -97,15 +97,17 @@ update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte) 
void

show_cache_info(struct seq_file *m)

{

	char buf[32];



	seq_printf(m, "I-cache\t\t: %ld KB\n", 

		cache_info.ic_size/1024 );

	seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %d-way associative)\n", 

	if (cache_info.dc_loop == 1)

		snprintf(buf, 32, "%lu-way associative", cache_info.dc_loop);

	seq_printf(m, "D-cache\t\t: %ld KB (%s%s, %s)\n",

		cache_info.dc_size/1024,

		(cache_info.dc_conf.cc_wt ? "WT":"WB"),

		(cache_info.dc_conf.cc_sh ? ", shared I/D":""),

		(cache_info.dc_conf.cc_assoc)

	);



		((cache_info.dc_loop == 1) ? "direct mapped" : buf));

	seq_printf(m, "ITLB entries\t: %ld\n" "DTLB entries\t: %ld%s\n",

		cache_info.it_size,

		cache_info.dt_size,
@@ -158,11 +160,11 @@ parisc_cache_init(void) 
		cache_info.dc_conf.cc_block,

		cache_info.dc_conf.cc_line,

		cache_info.dc_conf.cc_shift);

	printk("	wt %d sh %d cst %d assoc %d\n",

	printk("	wt %d sh %d cst %d hv %d\n",

		cache_info.dc_conf.cc_wt,

		cache_info.dc_conf.cc_sh,

		cache_info.dc_conf.cc_cst,

		cache_info.dc_conf.cc_assoc);

		cache_info.dc_conf.cc_hv);



	printk("IC  base 0x%lx stride 0x%lx count 0x%lx loop 0x%lx\n",

		cache_info.ic_base,
@@ -176,11 +178,11 @@ parisc_cache_init(void) 
		cache_info.ic_conf.cc_block,

		cache_info.ic_conf.cc_line,

		cache_info.ic_conf.cc_shift);

	printk("	wt %d sh %d cst %d assoc %d\n",

	printk("	wt %d sh %d cst %d hv %d\n",

		cache_info.ic_conf.cc_wt,

		cache_info.ic_conf.cc_sh,

		cache_info.ic_conf.cc_cst,

		cache_info.ic_conf.cc_assoc);

		cache_info.ic_conf.cc_hv);



	printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n",

		cache_info.dt_conf.tc_sh,
@@ -234,7 +236,8 @@ parisc_cache_init(void) 


void disable_sr_hashing(void)

{

	int srhash_type;

	int srhash_type, retval;

	unsigned long space_bits;



	switch (boot_cpu_data.cpu_type) {

	case pcx: /* We shouldn't get this far.  setup.c should prevent it. */
@@ -260,6 +263,13 @@ void disable_sr_hashing(void) 
	}



	disable_sr_hashing_asm(srhash_type);



	retval = pdc_spaceid_bits(&space_bits);

	/* If this procedure isn't implemented, don't panic. */

	if (retval < 0 && retval != PDC_BAD_OPTION)

		panic("pdc_spaceid_bits call failed.\n");

	if (space_bits != 0)

		panic("SpaceID hashing is still on!\n");

}



void flush_dcache_page(struct page *page)

arch/parisc/kernel/entry.S

+3 −3
Original line number Diff line number Diff line
@@ -1638,7 +1638,7 @@ dbit_trap_20w: 
	load32		PA(pa_dbit_lock),t0



dbit_spin_20w:

	ldcw            0(t0),t1

	LDCW		0(t0),t1

	cmpib,=         0,t1,dbit_spin_20w

	nop
@@ -1674,7 +1674,7 @@ dbit_trap_11: 
	load32		PA(pa_dbit_lock),t0



dbit_spin_11:

	ldcw            0(t0),t1

	LDCW		0(t0),t1

	cmpib,=         0,t1,dbit_spin_11

	nop
@@ -1714,7 +1714,7 @@ dbit_trap_20: 
	load32		PA(pa_dbit_lock),t0



dbit_spin_20:

	ldcw            0(t0),t1

	LDCW		0(t0),t1

	cmpib,=         0,t1,dbit_spin_20

	nop

arch/parisc/kernel/firmware.c

+41 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * Copyright 1999 The Puffin Group, (Alex deVries, David Kennedy)

 * Copyright 2003 Grant Grundler <grundler parisc-linux org>

 * Copyright 2003,2004 Ryan Bradetich <rbrad@parisc-linux.org>

 * Copyright 2004 Thibaut VARENE <varenet@parisc-linux.org>

 * Copyright 2004,2006 Thibaut VARENE <varenet@parisc-linux.org>

 *

 *    This program is free software; you can redistribute it and/or modify

 *    it under the terms of the GNU General Public License as published by
@@ -252,10 +252,8 @@ int pdc_pat_chassis_send_log(unsigned long state, unsigned long data) 
#endif



/**

 * pdc_chassis_disp - Updates display

 * pdc_chassis_disp - Updates chassis code

 * @retval: -1 on error, 0 on success

 *

 * Works on old PDC only (E class, others?)

 */

int pdc_chassis_disp(unsigned long disp)

{
@@ -268,6 +266,22 @@ int pdc_chassis_disp(unsigned long disp) 
	return retval;

}



/**

 * pdc_chassis_warn - Fetches chassis warnings

 * @retval: -1 on error, 0 on success

 */

int pdc_chassis_warn(unsigned long *warn)

{

	int retval = 0;



	spin_lock_irq(&pdc_lock);

	retval = mem_pdc_call(PDC_CHASSIS, PDC_CHASSIS_WARN, __pa(pdc_result));

	*warn = pdc_result[0];

	spin_unlock_irq(&pdc_lock);



	return retval;

}



/**

 * pdc_coproc_cfg - To identify coprocessors attached to the processor.

 * @pdc_coproc_info: Return buffer address.
@@ -393,7 +407,9 @@ int pdc_model_info(struct pdc_model *model) 
 * pdc_model_sysmodel - Get the system model name.

 * @name: A char array of at least 81 characters.

 *

 * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L)

 * Get system model name from PDC ROM (e.g. 9000/715 or 9000/778/B160L).

 * Using OS_ID_HPUX will return the equivalent of the 'modelname' command

 * on HP/UX.

 */

int pdc_model_sysmodel(char *name)

{
@@ -498,6 +514,26 @@ int pdc_cache_info(struct pdc_cache_info *cache_info) 
        return retval;

}



/**

 * pdc_spaceid_bits - Return whether Space ID hashing is turned on.

 * @space_bits: Should be 0, if not, bad mojo!

 *

 * Returns information about Space ID hashing.

 */

int pdc_spaceid_bits(unsigned long *space_bits)

{

	int retval;



	spin_lock_irq(&pdc_lock);

	pdc_result[0] = 0;

	retval = mem_pdc_call(PDC_CACHE, PDC_CACHE_RET_SPID, __pa(pdc_result), 0);

	convert_to_wide(pdc_result);

	*space_bits = pdc_result[0];

	spin_unlock_irq(&pdc_lock);



	return retval;

}



#ifndef CONFIG_PA20

/**

 * pdc_btlb_info - Return block TLB information.

arch/parisc/kernel/module.c

+50 −13
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ static inline int is_local(struct module *me, void *loc) 
	return is_init(me, loc) || is_core(me, loc);

}



static inline int is_local_section(struct module *me, void *loc, void *dot)

{

	return (is_init(me, loc) && is_init(me, dot)) ||

		(is_core(me, loc) && is_core(me, dot));

}





#ifndef __LP64__

struct got_entry {
@@ -364,8 +370,14 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value) 
}

#endif /* __LP64__ */



enum elf_stub_type {

	ELF_STUB_GOT,

	ELF_STUB_MILLI,

	ELF_STUB_DIRECT,

};



static Elf_Addr get_stub(struct module *me, unsigned long value, long addend,

	int millicode, int init_section)

	enum elf_stub_type stub_type, int init_section)

{

	unsigned long i;

	struct stub_entry *stub;
@@ -396,7 +408,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, 
	stub->insns[1] |= reassemble_17(rrsel(value, addend) / 4);



#else

/* for 64-bit we have two kinds of stubs:

/* for 64-bit we have three kinds of stubs:

 * for normal function calls:

 * 	ldd 0(%dp),%dp

 * 	ldd 10(%dp), %r1
@@ -408,18 +420,23 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, 
 * 	ldo 0(%r1), %r1

 * 	ldd 10(%r1), %r1

 * 	bve,n (%r1)

 *

 * for direct branches (jumps between different section of the

 * same module):

 *	ldil 0, %r1

 *	ldo 0(%r1), %r1

 *	bve,n (%r1)

 */

	if (!millicode)

	{

	switch (stub_type) {

	case ELF_STUB_GOT:

		stub->insns[0] = 0x537b0000;	/* ldd 0(%dp),%dp	*/

		stub->insns[1] = 0x53610020;	/* ldd 10(%dp),%r1	*/

		stub->insns[2] = 0xe820d000;	/* bve (%r1)		*/

		stub->insns[3] = 0x537b0030;	/* ldd 18(%dp),%dp	*/



		stub->insns[0] |= reassemble_14(get_got(me, value, addend) & 0x3fff);

	}

	else

	{

		break;

	case ELF_STUB_MILLI:

		stub->insns[0] = 0x20200000;	/* ldil 0,%r1		*/

		stub->insns[1] = 0x34210000;	/* ldo 0(%r1), %r1	*/

		stub->insns[2] = 0x50210020;	/* ldd 10(%r1),%r1	*/
@@ -427,7 +444,17 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, 


		stub->insns[0] |= reassemble_21(lrsel(value, addend));

		stub->insns[1] |= reassemble_14(rrsel(value, addend));

		break;

	case ELF_STUB_DIRECT:

		stub->insns[0] = 0x20200000;    /* ldil 0,%r1           */

		stub->insns[1] = 0x34210000;    /* ldo 0(%r1), %r1      */

		stub->insns[2] = 0xe820d002;    /* bve,n (%r1)          */



		stub->insns[0] |= reassemble_21(lrsel(value, addend));

		stub->insns[1] |= reassemble_14(rrsel(value, addend));

		break;

	}



#endif



	return (Elf_Addr)stub;
@@ -539,14 +566,14 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
			break;

		case R_PARISC_PCREL17F:

			/* 17-bit PC relative address */

			val = get_stub(me, val, addend, 0, is_init(me, loc));

			val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));

			val = (val - dot - 8)/4;

			CHECK_RELOC(val, 17)

			*loc = (*loc & ~0x1f1ffd) | reassemble_17(val);

			break;

		case R_PARISC_PCREL22F:

			/* 22-bit PC relative address; only defined for pa20 */

			val = get_stub(me, val, addend, 0, is_init(me, loc));

			val = get_stub(me, val, addend, ELF_STUB_GOT, is_init(me, loc));

			DEBUGP("STUB FOR %s loc %lx+%lx at %lx\n", 

			       strtab + sym->st_name, (unsigned long)loc, addend, 

			       val)
@@ -643,13 +670,23 @@ int apply_relocate_add(Elf_Shdr *sechdrs, 
			       strtab + sym->st_name,

			       loc, val);

			/* can we reach it locally? */

			if(!is_local(me, (void *)val)) {

				if (strncmp(strtab + sym->st_name, "$$", 2)

			if(!is_local_section(me, (void *)val, (void *)dot)) {



				if (is_local(me, (void *)val))

					/* this is the case where the

					 * symbol is local to the

					 * module, but in a different

					 * section, so stub the jump

					 * in case it's more than 22

					 * bits away */

					val = get_stub(me, val, addend, ELF_STUB_DIRECT,

						       is_init(me, loc));

				else if (strncmp(strtab + sym->st_name, "$$", 2)

				    == 0)

					val = get_stub(me, val, addend, 1,

					val = get_stub(me, val, addend, ELF_STUB_MILLI,

						       is_init(me, loc));

				else

					val = get_stub(me, val, addend, 0,

					val = get_stub(me, val, addend, ELF_STUB_GOT,

						       is_init(me, loc));

			}

			DEBUGP("STUB FOR %s loc %lx, val %lx+%lx at %lx\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE