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

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

Pull parisc updates from Helge Deller:

 - Add missing cacheflush() syscall

 - Fix STI console on 64-bit-only machines

 - Move kernel debug options to Kconfig.debug

 - Lots of warning fixes in arch/parisc/ and drivers/parisc/ when
   compiled with W=1

 - Enable some more graphics drivers in refreshed defconfigs

* tag 'parisc-for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: (29 commits)
  parisc: Refresh defconfigs
  parisc: irq: Add irq-related function declarations
  parisc: Move init function declarations into header file
  parisc: dino: Make dino_init() returning void
  parisc: lba_pci: Mark two variables __maybe_unused
  parisc: unaligned: Include header file to avoid missing prototype warnings
  parisc: signal: Mark do_notify_resume() and sys_rt_sigreturn() asmlinkage
  parisc: unwind: Mark start and stop variables __maybe_unused
  parisc: init: Drop unused variable end_paddr
  parisc: traps: Mark functions static
  parisc: processor: Fix kdoc for init_cpu_profiler()
  parisc: sys_parisc: parisc_personality() is called from asm code
  parisc: ccio-dma: Fix kdoc and compiler warnings
  parisc: pdc_stable: Fix kdoc and compiler warnings
  parisc: pci-dma: Make pcxl_alloc_range() static
  parisc: Mark image_size __maybe_unused in perf_write()
  parisc: module: Mark symindex __maybe_unused
  parisc: pdc_chassis: Fix kdoc warnings
  parisc: firmware: Fix kdoc warnings
  parisc: drivers: Fix kdoc warnings
  ...
parents 995b406c 4ad1218b

arch/parisc/Kconfig

+1 −11
Original line number Diff line number Diff line
@@ -304,16 +304,6 @@ config IRQSTACKS 
	  for handling hard and soft interrupts.  This can help avoid

	  overflowing the process kernel stacks.



config TLB_PTLOCK

	bool "Use page table locks in TLB fault handler"

	depends on SMP

	default n

	help

	  Select this option to enable page table locking in the TLB

	  fault handler. This ensures that page table entries are

	  updated consistently on SMP machines at the expense of some

	  loss in performance.



config HOTPLUG_CPU

	bool

	default y if SMP
@@ -346,7 +336,7 @@ config NR_CPUS 
	int "Maximum number of CPUs (2-32)"

	range 2 32

	depends on SMP

	default "4" if 64BIT

	default "8" if 64BIT

	default "16"



config KEXEC

arch/parisc/Kconfig.debug

+11 −0
Original line number Diff line number Diff line
@@ -10,3 +10,14 @@ config LIGHTWEIGHT_SPINLOCK_CHECK 
	  spinlock debugging you should choose the DEBUG_SPINLOCK option

	  which will detect unitialized spinlocks too.

	  If unsure say Y here.



config TLB_PTLOCK

	bool "Use page table locks in TLB fault handler"

	depends on SMP

	default n

	help

	  Select this option to enable page table locking in the TLB

	  fault handler. This ensures that page table entries are

	  updated consistently on SMP machines at the expense of some

	  loss in performance.

arch/parisc/configs/generic-32bit_defconfig

+45 −9
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ CONFIG_TUN=m 
# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

CONFIG_NET_TULIP=y
@@ -97,6 +96,7 @@ CONFIG_LASI_82596=y 
# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -129,17 +129,53 @@ CONFIG_PRINTER=m 
CONFIG_PPDEV=m

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_HWMON is not set

CONFIG_HWMON=m

CONFIG_DRM=m

CONFIG_DRM_DP_CEC=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_RADEON=m

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set

CONFIG_DRM_VGEM=m

CONFIG_DRM_UDL=m

CONFIG_DRM_MGAG200=m

CONFIG_FB=y

CONFIG_FB_FOREIGN_ENDIAN=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_PM2=m

CONFIG_FB_PM2_FIFO_DISCONNECT=y

CONFIG_FB_NVIDIA=m

CONFIG_FB_NVIDIA_I2C=y

# CONFIG_FB_NVIDIA_BACKLIGHT is not set

CONFIG_FB_RIVA=m

CONFIG_FB_RIVA_I2C=y

# CONFIG_FB_RIVA_BACKLIGHT is not set

CONFIG_FB_MATROX=m

CONFIG_FB_MATROX_MILLENIUM=y

CONFIG_FB_MATROX_MYSTIQUE=y

CONFIG_FB_MATROX_G=y

CONFIG_FB_MATROX_I2C=m

CONFIG_FB_MATROX_MAVEN=m

CONFIG_FB_ATY128=m

# CONFIG_FB_ATY128_BACKLIGHT is not set

CONFIG_FB_ATY=m

CONFIG_FB_ATY_CT=y

CONFIG_FB_ATY_GX=y

# CONFIG_FB_ATY_BACKLIGHT is not set

CONFIG_FB_S3=m

CONFIG_FB_SAVAGE=m

CONFIG_FB_SAVAGE_I2C=y

CONFIG_FB_SAVAGE_ACCEL=y

CONFIG_FB_SIS=m

CONFIG_FB_SIS_300=y

CONFIG_FB_SIS_315=y

CONFIG_FB_VOODOO1=m

CONFIG_FB_TRIDENT=m

CONFIG_FB_SMSCUFX=m

CONFIG_FB_UDL=m

CONFIG_DUMMY_CONSOLE_COLUMNS=128

CONFIG_DUMMY_CONSOLE_ROWS=48

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -216,17 +252,17 @@ CONFIG_CIFS_XATTR=y 
CONFIG_CIFS_POSIX=y

# CONFIG_CIFS_DEBUG is not set

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=y

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRC_CCITT=m

CONFIG_CRC_T10DIF=y

arch/parisc/configs/generic-64bit_defconfig

+38 −9
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ CONFIG_USER_NS=y 
CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PA8X00=y

CONFIG_64BIT=y

CONFIG_SMP=y

CONFIG_HPPB=y

CONFIG_IOMMU_CCIO=y
@@ -37,6 +34,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_BINFMT_MISC=m

# CONFIG_COMPAT_BRK is not set

# CONFIG_COMPACTION is not set

CONFIG_MEMORY_FAILURE=y

CONFIG_NET=y
@@ -103,7 +101,6 @@ CONFIG_TUN=y 
# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

CONFIG_NET_TULIP=y
@@ -121,6 +118,7 @@ CONFIG_E1000=y 
# CONFIG_NET_VENDOR_OKI is not set

CONFIG_QLA3XXX=m

CONFIG_QLCNIC=m

# CONFIG_NET_VENDOR_BROCADE is not set

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_SEEQ is not set
@@ -186,7 +184,6 @@ CONFIG_WATCHDOG=y 
CONFIG_SOFT_WATCHDOG=m

CONFIG_SSB=m

CONFIG_SSB_DRIVER_PCICORE=y

CONFIG_HTC_PASIC3=m

CONFIG_LPC_SCH=m

CONFIG_MFD_SM501=m

CONFIG_REGULATOR=y
@@ -196,14 +193,46 @@ CONFIG_MEDIA_SUPPORT=m 
CONFIG_AGP=y

CONFIG_AGP_PARISC=y

CONFIG_DRM=y

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_RADEON=y

CONFIG_DRM_NOUVEAU=m

# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set

CONFIG_DRM_MGAG200=m

CONFIG_FB=y

CONFIG_FB_MATROX=y

CONFIG_FB_PM2=m

CONFIG_FB_PM2_FIFO_DISCONNECT=y

CONFIG_FB_NVIDIA=m

CONFIG_FB_NVIDIA_I2C=y

# CONFIG_FB_NVIDIA_BACKLIGHT is not set

CONFIG_FB_RIVA=m

CONFIG_FB_RIVA_I2C=y

# CONFIG_FB_RIVA_BACKLIGHT is not set

CONFIG_FB_MATROX=m

CONFIG_FB_MATROX_MILLENIUM=y

CONFIG_FB_MATROX_MYSTIQUE=y

CONFIG_FB_MATROX_G=y

CONFIG_FB_MATROX_I2C=y

CONFIG_FB_MATROX_MAVEN=y

CONFIG_FB_MATROX_I2C=m

CONFIG_FB_MATROX_MAVEN=m

CONFIG_FB_RADEON=y

# CONFIG_FB_RADEON_BACKLIGHT is not set

CONFIG_FB_ATY128=m

# CONFIG_FB_ATY128_BACKLIGHT is not set

CONFIG_FB_ATY=m

CONFIG_FB_ATY_CT=y

CONFIG_FB_ATY_GX=y

# CONFIG_FB_ATY_BACKLIGHT is not set

CONFIG_FB_S3=m

CONFIG_FB_SAVAGE=m

CONFIG_FB_SAVAGE_I2C=y

CONFIG_FB_SAVAGE_ACCEL=y

CONFIG_FB_SIS=m

CONFIG_FB_SIS_300=y

CONFIG_FB_SIS_315=y

CONFIG_FB_VOODOO1=m

CONFIG_FB_TRIDENT=m

CONFIG_FB_SMSCUFX=m

CONFIG_FB_UDL=m

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_HIDRAW=y
@@ -257,12 +286,12 @@ CONFIG_NLS_ISO8859_1=m 
CONFIG_NLS_ISO8859_2=m

CONFIG_NLS_UTF8=m

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_DEFLATE=m

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_CCITT=m

arch/parisc/include/asm/irqflags.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ static inline unsigned long arch_local_irq_save(void) 


static inline void arch_local_irq_restore(unsigned long flags)

{

	/* warn if IRQs are on although they should be off */

	if (IS_ENABLED(CONFIG_LIGHTWEIGHT_SPINLOCK_CHECK))

		if (arch_local_save_flags() & PSW_I)

			asm volatile("break 6,6\n"); /*  SPINLOCK_BREAK_INSN */



	asm volatile("mtsm %0" : : "r" (flags) : "memory");

}