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

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

Pull more parisc architecture updates from Helge Deller:

 - Revert a patch to the invalidate/flush vmap routines which broke
   kernel patching functions on older PA-RISC machines.

 - Fix the kernel patching code wrt locking and flushing. Works now on
   B160L machine as well.

 - Fix CPU IRQ affinity for LASI, WAX and Dino chips

 - Add CPU hotplug support

 - Detect the hppa-suse-linux-gcc compiler when cross-compiling

* tag 'for-5.18/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix patch code locking and flushing
  parisc: Find a new timesync master if current CPU is removed
  parisc: Move common_stext into .text section when CONFIG_HOTPLUG_CPU=y
  parisc: Rewrite arch_cpu_idle_dead() for CPU hotplugging
  parisc: Implement __cpu_die() and __cpu_disable() for CPU hotplugging
  parisc: Add PDC locking functions for rendezvous code
  parisc: Move disable_sr_hashing_asm() into .text section
  parisc: Move CPU startup-related functions into .text section
  parisc: Move store_cpu_topology() into text section
  parisc: Switch from GENERIC_CPU_DEVICES to GENERIC_ARCH_TOPOLOGY
  parisc: Ensure set_firmware_width() is called only once
  parisc: Add constants for control registers and clean up mfctl()
  parisc: Detect hppa-suse-linux-gcc compiler for cross-building
  parisc: Clean up cpu_check_affinity() and drop cpu_set_affinity_irq()
  parisc: Fix CPU affinity for Lasi, WAX and Dino chips
  Revert "parisc: Fix invalidate/flush vmap routines"
parents 57c06b6e a9fe7fa7

arch/parisc/Kconfig

+3 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ config PARISC 
	select GENERIC_PCI_IOMAP

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_CPU_DEVICES

	select GENERIC_ARCH_TOPOLOGY if SMP

	select GENERIC_LIB_DEVMEM_IS_ALLOWED

	select SYSCTL_ARCH_UNALIGN_ALLOW

	select SYSCTL_EXCEPTION_TRACE
@@ -56,6 +56,7 @@ config PARISC 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_REGS_AND_STACK_ACCESS_API

	select GENERIC_SCHED_CLOCK

	select GENERIC_IRQ_MIGRATION if SMP

	select HAVE_UNSTABLE_SCHED_CLOCK if SMP

	select LEGACY_TIMER_TICK

	select CPU_NO_EFFICIENT_FFS
@@ -279,16 +280,9 @@ config SMP 


	  If you don't know what to do here, say N.



config PARISC_CPU_TOPOLOGY

	bool "Support cpu topology definition"

	depends on SMP

	default y

	help

	  Support PARISC cpu topology definition.



config SCHED_MC

	bool "Multi-core scheduler support"

	depends on PARISC_CPU_TOPOLOGY && PA8X00

	depends on GENERIC_ARCH_TOPOLOGY && PA8X00

	help

	  Multi-core scheduler support improves the CPU scheduler's decision

	  making when dealing with multi-core CPU chips at a cost of slightly

arch/parisc/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ export LD_BFD 


# Set default 32 bits cross compilers for vdso

CC_ARCHES_32 = hppa hppa2.0 hppa1.1

CC_SUFFIXES  = linux linux-gnu unknown-linux-gnu

CC_SUFFIXES  = linux linux-gnu unknown-linux-gnu suse-linux

CROSS32_COMPILE := $(call cc-cross-prefix, \

	$(foreach a,$(CC_ARCHES_32), \

	$(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))
@@ -52,7 +52,7 @@ export CROSS32CC 
# Set default cross compiler for kernel build

ifdef cross_compiling

	ifeq ($(CROSS_COMPILE),)

		CC_SUFFIXES = linux linux-gnu unknown-linux-gnu

		CC_SUFFIXES = linux linux-gnu unknown-linux-gnu suse-linux

		CROSS_COMPILE := $(call cc-cross-prefix, \

			$(foreach a,$(CC_ARCHES), \

			$(foreach s,$(CC_SUFFIXES),$(a)-$(s)-)))

arch/parisc/include/asm/pdc.h

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ int pdc_sti_call(unsigned long func, unsigned long flags, 
                 unsigned long glob_cfg);



int __pdc_cpu_rendezvous(void);

void pdc_cpu_rendezvous_lock(void);

void pdc_cpu_rendezvous_unlock(void);



static inline char * os_id_to_string(u16 os_id) {

	switch(os_id) {

	case OS_ID_NONE:	return "No OS";

arch/parisc/include/asm/pdcpat.h

+2 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define PDC_PAT_CPU_RENDEZVOUS      	6L /* Rendezvous CPU */

#define PDC_PAT_CPU_GET_CLOCK_INFO  	7L /* Return CPU Clock info */

#define PDC_PAT_CPU_GET_RENDEZVOUS_STATE 8L /* Return Rendezvous State */

#define PDC_PAT_CPU_GET_PDC_ENTRYPOINT	11L /* Return PDC Entry point */

#define PDC_PAT_CPU_PLUNGE_FABRIC 	128L /* Plunge Fabric */

#define PDC_PAT_CPU_UPDATE_CACHE_CLEANSING 129L /* Manipulate Cache 

                                                 * Cleansing Mode */
@@ -356,7 +357,7 @@ struct pdc_pat_cell_mod_maddr_block { /* PDC_PAT_CELL_MODULE */ 


typedef struct pdc_pat_cell_mod_maddr_block pdc_pat_cell_mod_maddr_block_t;





extern int pdc_pat_get_PDC_entrypoint(unsigned long *pdc_entry);

extern int pdc_pat_chassis_send_log(unsigned long status, unsigned long data);

extern int pdc_pat_cell_get_number(struct pdc_pat_cell_num *cell_info);

extern int pdc_pat_cell_info(struct pdc_pat_cell_info_rtn_block *info,

arch/parisc/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct cpuinfo_parisc { 


extern struct system_cpuinfo_parisc boot_cpu_data;

DECLARE_PER_CPU(struct cpuinfo_parisc, cpu_data);

extern int time_keeper_id;		/* CPU used for timekeeping */



#define CPU_HVERSION ((boot_cpu_data.hversion >> 4) & 0x0FFF)