Commit 7286d2a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull parisc updates from Helge Deller:

 - Added fw_cfg support for parisc on qemu

 - Added font support in sti text console driver for byte- and word-mode
   ROMs

 - Switch to more fine grained lws locks and improve spinlock handling

 - Add ioread64_hi_lo() and iowrite64_hi_lo() to avoid 0-day linking
   errors

 - Mark pointers volatile in __xchg8(), __xchg32() and __xchg64() to
   help compiler

 - Header file cleanups, mostly removal of unused HP-UX compat defines

 - Drop one bit from our O_NONBLOCK define to become now 000200000

 - Add MAP_UNINITIALIZED define to avoid userspace compile errors

 - Drop CONFIG_IDE from defconfigs

 - Speed up synchronize_caches() on UP machines

 - Rewrite tlb flush threshold calculation

 - Comment fixes and cleanups

* 'parisc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc/sticon: Add user font support
  parisc/sticon: Always register sticon console driver
  parisc: Add MAP_UNINITIALIZED define
  parisc: Improve spinlock handling
  parisc: Install vmlinuz instead of zImage file
  parisc: Rewrite tlb flush threshold calculation
  parisc: Switch to more fine grained lws locks
  parisc: Mark pointers volatile in __xchg8(), __xchg32() and __xchg64()
  parisc: Fix comments and enable interrupts later
  parisc: Add alternative patching to synchronize_caches define
  parisc: Add ioread64_hi_lo() and iowrite64_hi_lo()
  parisc: disable CONFIG_IDE in defconfigs
  parisc: Drop useless comments in uapi/asm/signal.h
  parisc: Define O_NONBLOCK to become 000200000
  parisc: Drop HP-UX specific fcntl and signal flags
  parisc: Avoid external interrupts when IPI finishes
  parisc: Add qemu fw_cfg interface
  fw_cfg: Add support for parisc architecture
parents 578a7155 7ff3f14d

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -375,5 +375,6 @@ config KEXEC_FILE 


endmenu



source "drivers/firmware/Kconfig"



source "drivers/parisc/Kconfig"

arch/parisc/configs/generic-32bit_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=6144

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_GENERIC=y

CONFIG_BLK_DEV_NS87415=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_ST=y

CONFIG_BLK_DEV_SR=y
@@ -65,6 +61,8 @@ CONFIG_SCSI_SYM53C8XX_2=y 
CONFIG_SCSI_ZALON=y

CONFIG_SCSI_DH=y

CONFIG_ATA=y

CONFIG_ATA_GENERIC=y

CONFIG_PATA_NS87415=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

CONFIG_MD_LINEAR=m

arch/parisc/configs/generic-64bit_defconfig

+1 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ CONFIG_PCI_IOV=y 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_IDE=y

CONFIG_IDE_GD=m

CONFIG_IDE_GD_ATAPI=y

CONFIG_BLK_DEV_IDECD=m

CONFIG_BLK_DEV_NS87415=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y
@@ -76,6 +71,7 @@ CONFIG_SCSI_ZALON=y 
CONFIG_SCSI_QLA_ISCSI=m

CONFIG_SCSI_DH=y

CONFIG_ATA=y

CONFIG_PATA_NS87415=y

CONFIG_PATA_SIL680=y

CONFIG_ATA_GENERIC=y

CONFIG_MD=y

arch/parisc/include/asm/barrier.h

+5 −1
Original line number Diff line number Diff line
@@ -2,11 +2,15 @@ 
#ifndef __ASM_BARRIER_H

#define __ASM_BARRIER_H



#include <asm/alternative.h>



#ifndef __ASSEMBLY__



/* The synchronize caches instruction executes as a nop on systems in

   which all memory references are performed in order. */

#define synchronize_caches() __asm__ __volatile__ ("sync" : : : "memory")

#define synchronize_caches() asm volatile("sync" \

	ALTERNATIVE(ALT_COND_NO_SMP, INSN_NOP) \

	: : : "memory")



#if defined(CONFIG_SMP)

#define mb()		do { synchronize_caches(); } while (0)

arch/parisc/include/asm/cmpxchg.h

+7 −7
Original line number Diff line number Diff line
@@ -14,22 +14,22 @@ 
extern void __xchg_called_with_bad_pointer(void);



/* __xchg32/64 defined in arch/parisc/lib/bitops.c */

extern unsigned long __xchg8(char, char *);

extern unsigned long __xchg32(int, int *);

extern unsigned long __xchg8(char, volatile char *);

extern unsigned long __xchg32(int, volatile int *);

#ifdef CONFIG_64BIT

extern unsigned long __xchg64(unsigned long, unsigned long *);

extern unsigned long __xchg64(unsigned long, volatile unsigned long *);

#endif



/* optimizer better get rid of switch since size is a constant */

static inline unsigned long

__xchg(unsigned long x, __volatile__ void *ptr, int size)

__xchg(unsigned long x, volatile void *ptr, int size)

{

	switch (size) {

#ifdef CONFIG_64BIT

	case 8: return __xchg64(x, (unsigned long *) ptr);

	case 8: return __xchg64(x, (volatile unsigned long *) ptr);

#endif

	case 4: return __xchg32((int) x, (int *) ptr);

	case 1: return __xchg8((char) x, (char *) ptr);

	case 4: return __xchg32((int) x, (volatile int *) ptr);

	case 1: return __xchg8((char) x, (volatile char *) ptr);

	}

	__xchg_called_with_bad_pointer();

	return x;

CRA Git | Maintained and supported by SUSTech CRA and CCSE