Commit 35f79d0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc updates from Helge Deller:
 "There is one noteable patch, which allows the parisc kernel to use the
  same MADV_xxx constants as the other architectures going forward. With
  that change only alpha has one entry left (MADV_DONTNEED is 6 vs 4 on
  others) which is different. To prevent an ABI breakage, a wrapper is
  included which translates old MADV values to the new ones, so existing
  userspace isn't affected. Reason for that patch is, that some
  applications wrongly used the standard MADV_xxx values even on some
  non-x86 platforms and as such those programs failed to run correctly
  on parisc (examples are qemu-user, tor browser and boringssl).

  Then the kgdb console and the LED code received some fixes, and some
  0-day warnings are now gone. Finally, the very last compile warning
  which was visible during a kernel build is now fixed too (in the vDSO
  code).

  The majority of the patches are tagged for stable series and in
  summary this patchset is quite small and drops more code than it adds:

Fixes:
   - Fix potential null-ptr-deref in start_task()
   - Fix kgdb console on serial port
   - Add missing FORCE prerequisites in Makefile
   - Drop PMD_SHIFT from calculation in pgtable.h

  Enhancements:
   - Implement a wrapper to align madvise() MADV_* constants with other
     architectures
   - If machine supports running MPE/XL, show the MPE model string

  Cleanups:
   - Drop duplicate kgdb console code
   - Indenting fixes in setup_cmdline()"

* tag 'parisc-for-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Show MPE/iX model string at bootup
  parisc: Add missing FORCE prerequisites in Makefile
  parisc: Move pdc_result struct to firmware.c
  parisc: Drop locking in pdc console code
  parisc: Drop duplicate kgdb_pdc console
  parisc: Fix locking in pdc_iodc_print() firmware call
  parisc: Drop PMD_SHIFT from calculation in pgtable.h
  parisc: Align parisc MADV_XXX constants with all other architectures
  parisc: led: Fix potential null-ptr-deref in start_task()
  parisc: Fix inconsistent indenting in setup_cmdline()
parents 70b07bec 4934fbfb

arch/parisc/include/asm/pdc.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int pdc_system_map_find_mods(struct pdc_system_map_mod_info *pdc_mod_info, 
int pdc_system_map_find_addrs(struct pdc_system_map_addr_info *pdc_addr_info,

			      long mod_index, long addr_index);

int pdc_model_info(struct pdc_model *model);

int pdc_model_sysmodel(char *name);

int pdc_model_sysmodel(unsigned int os_id, char *name);

int pdc_model_cpuid(unsigned long *cpu_id);

int pdc_model_versions(unsigned long *versions, int id);

int pdc_model_capabilities(unsigned long *capabilities);

arch/parisc/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ extern void __update_cache(pte_t pte); 


/* This calculates the number of initial pages we need for the initial

 * page tables */

#if (KERNEL_INITIAL_ORDER) >= (PMD_SHIFT)

# define PT_INITIAL	(1 << (KERNEL_INITIAL_ORDER - PMD_SHIFT))

#if (KERNEL_INITIAL_ORDER) >= (PLD_SHIFT + BITS_PER_PTE)

# define PT_INITIAL	(1 << (KERNEL_INITIAL_ORDER - PLD_SHIFT - BITS_PER_PTE))

#else

# define PT_INITIAL	(1)  /* all initial PTEs fit into one page */

#endif

arch/parisc/include/uapi/asm/mman.h

+14 −15
Original line number Diff line number Diff line
@@ -49,6 +49,19 @@ 
#define MADV_DONTFORK	10		/* don't inherit across fork */

#define MADV_DOFORK	11		/* do inherit across fork */



#define MADV_MERGEABLE   12		/* KSM may merge identical pages */

#define MADV_UNMERGEABLE 13		/* KSM may not merge identical pages */



#define MADV_HUGEPAGE	14		/* Worth backing with hugepages */

#define MADV_NOHUGEPAGE 15		/* Not worth backing with hugepages */



#define MADV_DONTDUMP   16		/* Explicity exclude from the core dump,

					   overrides the coredump filter bits */

#define MADV_DODUMP	17		/* Clear the MADV_NODUMP flag */



#define MADV_WIPEONFORK 18		/* Zero memory on fork, child only */

#define MADV_KEEPONFORK 19		/* Undo MADV_WIPEONFORK */



#define MADV_COLD	20		/* deactivate these pages */

#define MADV_PAGEOUT	21		/* reclaim these pages */
@@ -57,27 +70,13 @@ 


#define MADV_DONTNEED_LOCKED	24	/* like DONTNEED, but drop locked pages too */



#define MADV_MERGEABLE   65		/* KSM may merge identical pages */

#define MADV_UNMERGEABLE 66		/* KSM may not merge identical pages */



#define MADV_HUGEPAGE	67		/* Worth backing with hugepages */

#define MADV_NOHUGEPAGE	68		/* Not worth backing with hugepages */



#define MADV_DONTDUMP   69		/* Explicity exclude from the core dump,

					   overrides the coredump filter bits */

#define MADV_DODUMP	70		/* Clear the MADV_NODUMP flag */



#define MADV_WIPEONFORK 71		/* Zero memory on fork, child only */

#define MADV_KEEPONFORK 72		/* Undo MADV_WIPEONFORK */



#define MADV_COLLAPSE	73		/* Synchronous hugepage collapse */

#define MADV_COLLAPSE	25		/* Synchronous hugepage collapse */



#define MADV_HWPOISON     100		/* poison a page for testing */

#define MADV_SOFT_OFFLINE 101		/* soft offline page for testing */



/* compatibility flags */

#define MAP_FILE	0

#define MAP_VARIABLE	0



#define PKEY_DISABLE_ACCESS	0x1

#define PKEY_DISABLE_WRITE	0x2

arch/parisc/kernel/firmware.c

+17 −15
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 
static DEFINE_SPINLOCK(pdc_lock);

#endif



extern unsigned long pdc_result[NUM_PDC_RESULT];

extern unsigned long pdc_result2[NUM_PDC_RESULT];

unsigned long pdc_result[NUM_PDC_RESULT]  __aligned(8);

unsigned long pdc_result2[NUM_PDC_RESULT] __aligned(8);



#ifdef CONFIG_64BIT

#define WIDE_FIRMWARE 0x1
@@ -527,14 +527,14 @@ int pdc_model_info(struct pdc_model *model) 
 * Using OS_ID_HPUX will return the equivalent of the 'modelname' command

 * on HP/UX.

 */

int pdc_model_sysmodel(char *name)

int pdc_model_sysmodel(unsigned int os_id, char *name)

{

        int retval;

	unsigned long flags;



        spin_lock_irqsave(&pdc_lock, flags);

        retval = mem_pdc_call(PDC_MODEL, PDC_MODEL_SYSMODEL, __pa(pdc_result),

                              OS_ID_HPUX, __pa(name));

                              os_id, __pa(name));

        convert_to_wide(pdc_result);



        if (retval == PDC_OK) {
@@ -1288,9 +1288,8 @@ void pdc_io_reset_devices(void) 


#endif /* defined(BOOTLOADER) */



/* locked by pdc_console_lock */

static int __attribute__((aligned(8)))   iodc_retbuf[32];

static char __attribute__((aligned(64))) iodc_dbuf[4096];

/* locked by pdc_lock */

static char iodc_dbuf[4096] __page_aligned_bss;



/**

 * pdc_iodc_print - Console print using IODC.
@@ -1307,6 +1306,9 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
	unsigned int i;

	unsigned long flags;



	count = min_t(unsigned int, count, sizeof(iodc_dbuf));



	spin_lock_irqsave(&pdc_lock, flags);

	for (i = 0; i < count;) {

		switch(str[i]) {

		case '\n':
@@ -1322,11 +1324,10 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
	}



print:

        spin_lock_irqsave(&pdc_lock, flags);

	real32_call(PAGE0->mem_cons.iodc_io,

		(unsigned long)PAGE0->mem_cons.hpa, ENTRY_IO_COUT,

		PAGE0->mem_cons.spa, __pa(PAGE0->mem_cons.dp.layers),

                    __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0);

		__pa(pdc_result), 0, __pa(iodc_dbuf), i, 0);

	spin_unlock_irqrestore(&pdc_lock, flags);



	return i;
@@ -1354,10 +1355,11 @@ int pdc_iodc_getc(void) 
	real32_call(PAGE0->mem_kbd.iodc_io,

		    (unsigned long)PAGE0->mem_kbd.hpa, ENTRY_IO_CIN,

		    PAGE0->mem_kbd.spa, __pa(PAGE0->mem_kbd.dp.layers), 

		    __pa(iodc_retbuf), 0, __pa(iodc_dbuf), 1, 0);

		    __pa(pdc_result), 0, __pa(iodc_dbuf), 1, 0);



	ch = *iodc_dbuf;

	status = *iodc_retbuf;

	/* like convert_to_wide() but for first return value only: */

	status = *(int *)&pdc_result;

	spin_unlock_irqrestore(&pdc_lock, flags);



	if (status == 0)

arch/parisc/kernel/kgdb.c

+0 −20
Original line number Diff line number Diff line
@@ -208,23 +208,3 @@ int kgdb_arch_handle_exception(int trap, int signo, 
	}

	return -1;

}
 


/* KGDB console driver which uses PDC to read chars from keyboard */



static void kgdb_pdc_write_char(u8 chr)

{

	/* no need to print char. kgdb will do it. */

}



static struct kgdb_io kgdb_pdc_io_ops = {

	.name		= "kgdb_pdc",

	.read_char	= pdc_iodc_getc,

	.write_char	= kgdb_pdc_write_char,

};



static int __init kgdb_pdc_init(void)

{

	kgdb_register_io_module(&kgdb_pdc_io_ops);

	return 0;

}

early_initcall(kgdb_pdc_init);