Commit 8a2fbffc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sparc-for-6.9-tag1' of... 

Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson:

 - Fix missing prototype warnings in various places, including switching
   to using generic cmpdi2/ucmpdi2 and parport.h and stop selecting
   unneeded GENERIC_ISA_DMA.

 - Reduce duplicate code by using shared font data, with dependency
   fixup in separate commit touching lib/fonts.

 - Convert sbus drives to use remove callbacks returning void

 - Fix return values of __setup handlers

 - Section mismatch fix for grpci pci drivers

 - Make the vio bus type constant

 - Kconfig cleanups and fixes

 - Typo fixes

* tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
  lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console
  sbus: uctrl: Convert to platform remove callback returning void
  sbus: flash: Convert to platform remove callback returning void
  sbus: envctrl: Convert to platform remove callback returning void
  sbus: display7seg: Convert to platform remove callback returning void
  sbus: bbc_i2c: Convert to platform remove callback returning void
  sbus: Add prototype for bbc_envctrl_init and bbc_envctrl_cleanup to header
  sparc32: Fix section mismatch in leon_pci_grpci
  sparc32: Fix parport build with sparc32
  sparc32: Do not select GENERIC_ISA_DMA
  mtd: maps: sun_uflash: Declare uflash_devinit static
  sparc32: Fix build with trapbase
  sparc32: Use generic cmpdi2/ucmpdi2 variants
  sparc: select FRAME_POINTER instead of redefining it
  sparc: vDSO: fix return value of __setup handler
  sparc64: NMI watchdog: fix return value of __setup handler
  sparc: vio: make vio_bus_type const
  sparc: Fix typos
  sparc: Use shared font data
  sparc: remove obsolete config ARCH_ATU
parents 54f42d2c 84b76d05

arch/sparc/Kconfig

+4 −8
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ config SPARC32 
	select CLZ_TAB

	select DMA_DIRECT_REMAP

	select GENERIC_ATOMIC64

	select GENERIC_LIB_CMPDI2

	select GENERIC_LIB_UCMPDI2

	select HAVE_UID16

	select HAVE_PAGE_SIZE_4KB

	select LOCK_MM_AND_FIND_VMA
@@ -115,10 +117,6 @@ config ARCH_PROC_KCORE_TEXT 
config CPU_BIG_ENDIAN

	def_bool y



config ARCH_ATU

	bool

	default y if SPARC64



config STACKTRACE_SUPPORT

	bool

	default y if SPARC64
@@ -143,10 +141,6 @@ config HIGHMEM 
	default y if SPARC32

	select KMAP_LOCAL



config GENERIC_ISA_DMA

	bool

	default y if SPARC32



config PGTABLE_LEVELS

	default 4 if 64BIT

	default 3
@@ -222,6 +216,8 @@ config EARLYFB 
	bool "Support for early boot text console"

	default y

	depends on SPARC64

	select FONT_SUN8x16

	select FONT_SUPPORT

	help

	  Say Y here to enable a faster early framebuffer boot console.

arch/sparc/Kconfig.debug

+2 −5
Original line number Diff line number Diff line
@@ -8,11 +8,8 @@ config MCOUNT 
	bool

	depends on SPARC64

	depends on FUNCTION_TRACER

	default y



config FRAME_POINTER

	bool

	depends on MCOUNT

	select ARCH_WANT_FRAME_POINTERS

	select FRAME_POINTER

	default y



config HAVE_HARDLOCKUP_DETECTOR_SPARC64

arch/sparc/include/asm/hypervisor.h

+3 −3
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count, 
 * ERRORS:	No errors defined.

 *

 * Return the hypervisor ID handle for the current CPU.  Use by a

 * virtual CPU to discover it's own identity.

 * virtual CPU to discover its own identity.

 */

#define HV_FAST_CPU_MYID		0x16
@@ -1221,7 +1221,7 @@ unsigned long sun4v_con_write(unsigned long buffer, 
 *		EBADALIGNED	software state description is not correctly

 *				aligned

 *

 * This allows the guest to report it's soft state to the hypervisor.  There

 * This allows the guest to report its soft state to the hypervisor.  There

 * are two primary components to this state.  The first part states whether

 * the guest software is running or not.  The second containts optional

 * details specific to the software.
@@ -1502,7 +1502,7 @@ struct hv_trap_trace_entry { 
 * configuration error of some sort.

 *

 * The dump services provide an opaque buffer into which the

 * hypervisor can place it's internal state in order to assist in

 * hypervisor can place its internal state in order to assist in

 * debugging such situations.  The contents are opaque and extremely

 * platform and hypervisor implementation specific.  The guest, during

 * a core dump, requests that the hypervisor update any information in

arch/sparc/include/asm/ldc.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ void ldom_power_off(void); 
 * or data becomes available on the receive side.

 *

 * For non-RAW links, if the LDC_EVENT_RESET event arrives the

 * driver should reset all of it's internal state and reinvoke

 * driver should reset all of its internal state and reinvoke

 * ldc_connect() to try and bring the link up again.

 *

 * For RAW links, ldc_connect() is not used.  Instead the driver

arch/sparc/include/asm/mmu_context_64.h

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str 


	/* We have to be extremely careful here or else we will miss

	 * a TSB grow if we switch back and forth between a kernel

	 * thread and an address space which has it's TSB size increased

	 * thread and an address space which has its TSB size increased

	 * on another processor.

	 *

	 * It is possible to play some games in order to optimize the
@@ -118,7 +118,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str 
	 *

	 * At that point cpu0 continues to use a stale TSB, the one from

	 * before the TSB grow performed on cpu1.  cpu1 did not cross-call

	 * cpu0 to update it's TSB because at that point the cpu_vm_mask

	 * cpu0 to update its TSB because at that point the cpu_vm_mask

	 * only had cpu1 set in it.

	 */

	tsb_context_switch_ctx(mm, CTX_HWBITS(mm->context));