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

Merge tag 'parisc-for-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "Fixes:

   - When we added basic vDSO support in kernel 5.18 we introduced a bug
     which prevented a mmap() of graphic card memory. This is because we
     used the DMB (data memory break trap bit) page flag as special-bit,
     but missed to clear that bit when loading the TLB.

   - Graphics card memory size was not correctly aligned

   - Spelling fixes (from Colin Ian King)

  Enhancements:

   - PDC console (which uses firmware calls) now rewritten as early
     console

   - Reduced size of alternative tables"

* tag 'parisc-for-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix spelling mistake "mis-match" -> "mismatch" in eisa driver
  parisc: Fix userspace graphics card breakage due to pgtable special bit
  parisc: fbdev/stifb: Align graphics memory size to 4MB
  parisc: Convert PDC console to an early console
  parisc: Reduce kernel size by packing alternative tables
parents ebdca8ec 34314cd6

arch/parisc/include/asm/alternative.h

+12 −9
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 


struct alt_instr {

	s32 orig_offset;	/* offset to original instructions */

	s32 len;		/* end of original instructions */

	u32 cond;		/* see ALT_COND_XXX */

	s16 len;		/* end of original instructions */

	u16 cond;		/* see ALT_COND_XXX */

	u32 replacement;	/* replacement instruction or code */

};

} __packed;



void set_kernel_text_rw(int enable_read_write);

void apply_alternatives_all(void);
@@ -35,8 +35,9 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 
/* Alternative SMP implementation. */

#define ALTERNATIVE(cond, replacement)		"!0:"	\

	".section .altinstructions, \"aw\"	!"	\

	".word (0b-4-.), 1, " __stringify(cond) ","	\

		__stringify(replacement) "	!"	\

	".word (0b-4-.)				!"	\

	".hword 1, " __stringify(cond) "	!"	\

	".word " __stringify(replacement) "	!"	\

	".previous"



#else
@@ -44,15 +45,17 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 
/* to replace one single instructions by a new instruction */

#define ALTERNATIVE(from, to, cond, replacement)\

	.section .altinstructions, "aw"	!	\

	.word (from - .), (to - from)/4	!	\

	.word cond, replacement		!	\

	.word (from - .)		!	\

	.hword (to - from)/4, cond	!	\

	.word replacement		!	\

	.previous



/* to replace multiple instructions by new code */

#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\

	.section .altinstructions, "aw"	!	\

	.word (from - .), -num_instructions !	\

	.word cond, (new_instr_ptr - .)	!	\

	.word (from - .)		!	\

	.hword -num_instructions, cond	!	\

	.word (new_instr_ptr - .)	!	\

	.previous



#endif  /*  __ASSEMBLY__  */

arch/parisc/include/asm/pdc.h

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ extern unsigned long parisc_pat_pdc_cap; /* PDC capabilities (PAT) */ 
#define PDC_TYPE_SYSTEM_MAP	 1 /* 32-bit, but supports PDC_SYSTEM_MAP */

#define PDC_TYPE_SNAKE		 2 /* Doesn't support SYSTEM_MAP */



void pdc_console_init(void);	/* in pdc_console.c */

void pdc_console_restart(void);



void setup_pdc(void);		/* in inventory.c */



/* wrapper-functions from pdc.c */

arch/parisc/include/asm/pgtable.h

+6 −1
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ extern void __update_cache(pte_t pte); 
#define _PAGE_PRESENT_BIT  22   /* (0x200) Software: translation valid */

#define _PAGE_HPAGE_BIT    21   /* (0x400) Software: Huge Page */

#define _PAGE_USER_BIT     20   /* (0x800) Software: User accessible page */

#ifdef CONFIG_HUGETLB_PAGE

#define _PAGE_SPECIAL_BIT  _PAGE_DMB_BIT  /* DMB feature is currently unused */

#else

#define _PAGE_SPECIAL_BIT  _PAGE_HPAGE_BIT /* use unused HUGE PAGE bit */

#endif



/* N.B. The bits are defined in terms of a 32 bit word above, so the */

/*      following macro is ok for both 32 and 64 bit.                */
@@ -219,7 +224,7 @@ extern void __update_cache(pte_t pte); 
#define _PAGE_PRESENT  (1 << xlate_pabit(_PAGE_PRESENT_BIT))

#define _PAGE_HUGE     (1 << xlate_pabit(_PAGE_HPAGE_BIT))

#define _PAGE_USER     (1 << xlate_pabit(_PAGE_USER_BIT))

#define _PAGE_SPECIAL  (_PAGE_DMB)

#define _PAGE_SPECIAL  (1 << xlate_pabit(_PAGE_SPECIAL_BIT))



#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | _PAGE_DIRTY | _PAGE_ACCESSED)

#define _PAGE_CHG_MASK	(PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_SPECIAL)

arch/parisc/kernel/alternative.c

+4 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start, 
	struct alt_instr *entry;

	int index = 0, applied = 0;

	int num_cpus = num_online_cpus();

	u32 cond_check;

	u16 cond_check;



	cond_check = ALT_COND_ALWAYS |

		((num_cpus == 1) ? ALT_COND_NO_SMP : 0) |
@@ -45,8 +45,9 @@ void __init_or_module apply_alternatives(struct alt_instr *start, 


	for (entry = start; entry < end; entry++, index++) {



		u32 *from, cond, replacement;

		s32 len;

		u32 *from, replacement;

		u16 cond;

		s16 len;



		from = (u32 *)((ulong)&entry->orig_offset + entry->orig_offset);

		len = entry->len;

arch/parisc/kernel/entry.S

+8 −0
Original line number Diff line number Diff line
@@ -499,6 +499,10 @@ 
	 * Finally, _PAGE_READ goes in the top bit of PL1 (so we

	 * trigger an access rights trap in user space if the user

	 * tries to read an unreadable page */

#if _PAGE_SPECIAL_BIT == _PAGE_DMB_BIT

	/* need to drop DMB bit, as it's used as SPECIAL flag */

	depi		0,_PAGE_SPECIAL_BIT,1,\pte

#endif

	depd            \pte,8,7,\prot



	/* PAGE_USER indicates the page can be read with user privileges,
@@ -529,6 +533,10 @@ 
	 * makes the tlb entry for the differently formatted pa11

	 * insertion instructions */

	.macro		make_insert_tlb_11	spc,pte,prot

#if _PAGE_SPECIAL_BIT == _PAGE_DMB_BIT

	/* need to drop DMB bit, as it's used as SPECIAL flag */

	depi		0,_PAGE_SPECIAL_BIT,1,\pte

#endif

	zdep		\spc,30,15,\prot

	dep		\pte,8,7,\prot

	extru,=		\pte,_PAGE_NO_CACHE_BIT,1,%r0