tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc architecture fixes from Helge Deller:

- Include the upper 5 address bits when inserting TLB entries on a
64-bit kernel.

On physical machines those are ignored, but in qemu it's nice to have
them included and to be correct.

- Stop the 64-bit kernel and show a warning if someone tries to boot on
a machine with a 32-bit CPU

- Fix a "no previous prototype" warning in parport-gsc

* tag 'parisc-for-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Prevent booting 64-bit kernels on PA1.x machines
parport: gsc: mark init function static
parisc/pgtable: Do not drop upper 5 address bits of physical address

Linus Torvalds b57b17e8 4eeee663

+6 -8
+3 -4
arch/parisc/kernel/entry.S
··· 475 475 * to a CPU TLB 4k PFN (4k => 12 bits to shift) */ 476 476 #define PAGE_ADD_SHIFT (PAGE_SHIFT-12) 477 477 #define PAGE_ADD_HUGE_SHIFT (REAL_HPAGE_SHIFT-12) 478 + #define PFN_START_BIT (63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT) 478 479 479 480 /* Drop prot bits and convert to page addr for iitlbt and idtlbt */ 480 481 .macro convert_for_tlb_insert20 pte,tmp 481 482 #ifdef CONFIG_HUGETLB_PAGE 482 483 copy \pte,\tmp 483 - extrd,u \tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\ 484 - 64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte 484 + extrd,u \tmp,PFN_START_BIT,PFN_START_BIT+1,\pte 485 485 486 486 depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\ 487 487 (63-58)+PAGE_ADD_SHIFT,\pte ··· 489 489 depdi _HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\ 490 490 (63-58)+PAGE_ADD_HUGE_SHIFT,\pte 491 491 #else /* Huge pages disabled */ 492 - extrd,u \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\ 493 - 64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte 492 + extrd,u \pte,PFN_START_BIT,PFN_START_BIT+1,\pte 494 493 depdi _PAGE_SIZE_ENCODING_DEFAULT,63,\ 495 494 (63-58)+PAGE_ADD_SHIFT,\pte 496 495 #endif
+2 -3
arch/parisc/kernel/head.S
··· 70 70 stw,ma %arg2,4(%r1) 71 71 stw,ma %arg3,4(%r1) 72 72 73 - #if !defined(CONFIG_64BIT) && defined(CONFIG_PA20) 74 - /* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU 75 - * and halt kernel if we detect a PA1.x CPU. */ 73 + #if defined(CONFIG_PA20) 74 + /* check for 64-bit capable CPU as required by current kernel */ 76 75 ldi 32,%r10 77 76 mtctl %r10,%cr11 78 77 .level 2.0
+1 -1
drivers/parport/parport_gsc.c
··· 392 392 .remove = __exit_p(parport_remove_chip), 393 393 }; 394 394 395 - int parport_gsc_init(void) 395 + static int parport_gsc_init(void) 396 396 { 397 397 return register_parisc_driver(&parport_driver); 398 398 }