add TOC support
v3 cover add TOC support
This adds support for the TOC switches found on most PA-RISC machines. I tested this on my c8000 and a HP 16702A, which is basically a B160L with some logic analyzer hardware.
Changes in v3:
- add config option
- move toc code to its own c & .S file
- use early_initcall for setup
- split out struct declarations
- use sizeof(*ret) instead of sizeof(struct x)
- move virt_map to assembly.h so it can be used from other files
Changes in v2:
- fix stack allocation
- align toc_lock on 16 byte boundary
- move toc_lock declaration to processor.c
Sven Schnelle (4):
parisc: move virt_map macro to assembly.h
parisc: add PIM TOC data structures parisc/firmware: add functions to retrieve TOC data
parisc: add support for TOC (transfer of control)
arch/parisc/Kconfig | 14 ++++ arch/parisc/include/asm/assembly.h | 25 +++++++ arch/parisc/include/asm/pdc.h | 2 + arch/parisc/include/asm/processor.h | 4 + arch/parisc/include/uapi/asm/pdc.h | 28 ++++++- arch/parisc/kernel/Makefile | 1 + arch/parisc/kernel/entry.S | 24 ------ arch/parisc/kernel/firmware.c | 32 ++++++++ arch/parisc/kernel/toc.c | 111 ++++++++++++++++++++++++++++ arch/parisc/kernel/toc_asm.S | 88 ++++++++++++++++++++++ 10 files changed, 303 insertions(+), 26 deletions(-) create mode 100644 arch/parisc/kernel/toc.c create mode 100644 arch/parisc/kernel/toc_asm.S
Signature · 1 line
2.33.0
PATCH v3 1/4 parisc: move virt_map macro to assembly.h
This macro will also be used by the TOC code, so move it into asm/assembly.h to avoid duplication.
--- arch/parisc/include/asm/assembly.h | 25 +++++++++++++++++++++++++ arch/parisc/kernel/entry.S | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-)
arch/parisc/include/asm/assembly.h +25 -0
@@ -71,6 +71,7 @@#include <asm/types.h> #include <asm/asmregs.h> +#include <asm/psw.h> sp = 30 gp =27
@@ -497,6 +498,30 @@ nop/* 7 */ .endm +/* Switch to virtual mapping, trashing only %r1 */ + .macro virt_map +/* pcxt_ssm_bug */ + rsm PSW_SM_I, %r0 /* barrier for "Relied upon Translation */ + mtsp %r0, %sr4 + mtsp %r0, %sr5 + mtsp %r0, %sr6 + tovirt_r1 %r29 + load32 KERNEL_PSW, %r1 + + rsm PSW_SM_QUIET,%r0 /* second "heavy weight" ctl op */ + mtctl %r0, %cr17 /* Clear IIASQ tail */ + mtctl %r0, %cr17 /* Clear IIASQ head */ + mtctl %r1, %ipsw + load32 4f, %r1 + mtctl %r1, %cr18 /* Set IIAOQ tail */ + ldo 4(%r1), %r1 + mtctl %r1, %cr18 /* Set IIAOQ head */ + rfir + nop +4: + .endm + +/* * ASM_EXCEPTIONTABLE_ENTRY *
arch/parisc/kernel/entry.S +0 -24
@@ -51,30 +51,6 @@ extrd,u \spc,(64 - (SPACEID_SHIFT)),32,\prot .endm #endif - - /* Switch to virtual mapping, trashing only %r1 */ - .macro virt_map - /* pcxt_ssm_bug */ - rsm PSW_SM_I, %r0 /* barrier for "Relied upon Translation */ - mtsp %r0, %sr4 - mtsp %r0, %sr5 - mtsp %r0, %sr6 - tovirt_r1 %r29 - load32 KERNEL_PSW, %r1 - - rsm PSW_SM_QUIET,%r0 /* second "heavy weight" ctl op */ - mtctl %r0, %cr17 /* Clear IIASQ tail */ - mtctl %r0, %cr17 /* Clear IIASQ head */ - mtctl %r1, %ipsw - load32 4f, %r1 - mtctl %r1, %cr18 /* Set IIAOQ tail */ - ldo 4(%r1), %r1 - mtctl %r1, %cr18 /* Set IIAOQ head */ - rfir - nop -4: - .endm - /* * The "get_stack" macros are responsible for determining the * kernel stack value.
Signature · 1 line
2.33.0
PATCH v3 2/4 parisc: add PIM TOC data structures
In reply to Sven SchnelleThese data structures describe the TOC data we get from firmware when issuing a PDC_PIM_TOC request.
--- arch/parisc/include/uapi/asm/pdc.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/parisc/include/uapi/asm/pdc.h +22 -0
@@ -689,6 +689,28 @@ struct pdc_hpmc_pim_20 { /* PDC_PIM */unsigned long long fr[32 ]; }; +struct pdc_toc_pim_11 { +unsigned int gr[32 ]; +unsigned int cr[32 ]; +unsigned int sr[8 ]; +unsigned int iasq_back; +unsigned int iaoq_back; +unsigned int check_type; +unsigned int hversion; +unsigned int cpu_state; +}; + +struct pdc_toc_pim_20 { +unsigned long long gr[32 ]; +unsigned long long cr[32 ]; +unsigned long long sr[8 ]; +unsigned long long iasq_back; +unsigned long long iaoq_back; +unsigned int check_type; +unsigned int hversion; +unsigned int cpu_state; +}; +#endif /* !defined(__ASSEMBLY__) */ #endif /* _UAPI_PARISC_PDC_H */
Signature · 1 line
2.33.0
PATCH v3 3/4 parisc/firmware: add functions to retrieve TOC data
In reply to Sven SchnelleAdd functions to retrieve TOC data from firmware both for 1.1 and 2.0 PDC.
--- arch/parisc/include/asm/pdc.h | 2 ++ arch/parisc/kernel/firmware.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
arch/parisc/include/asm/pdc.h +2 -0
@@ -51,6 +51,8 @@ int pdc_spaceid_bits(unsigned long *space_bits);int pdc_btlb_info (struct pdc_btlb_info *btlb);int pdc_mem_map_hpa (struct pdc_memory_map *r_addr,struct pdc_module_path *mod_path);#endif /* !CONFIG_PA20 */ +int pdc_pim_toc11 (struct pdc_toc_pim_11 *ret); +int pdc_pim_toc20 (struct pdc_toc_pim_20 *ret);int pdc_lan_station_id (char *lan_addr,unsigned long net_hpa);int pdc_stable_read (unsigned long staddr,void *memaddr,unsigned long count);
arch/parisc/kernel/firmware.c +32 -0
@@ -1061,6 +1061,38 @@ int pdc_mem_pdt_read_entries(struct pdc_mem_read_pdt *pret,return retval; } +/** +* pdc_pim_toc11 - Fetch TOC PIM 1.1 data from firmware. +* @ret: pointer to return buffer +*/ +int pdc_pim_toc11 (struct pdc_toc_pim_11 *ret) +{ +int retval; +unsigned long flags; + +spin_lock_irqsave (&pdc_lock, flags); + retval =mem_pdc_call (PDC_PIM ,PDC_PIM_TOC ,__pa (pdc_result), +__pa (ret),sizeof (*ret)); +spin_unlock_irqrestore (&pdc_lock, flags); +return retval; +} + +/** +* pdc_pim_toc20 - Fetch TOC PIM 2.0 data from firmware. +* @ret: pointer to return buffer +*/ +int pdc_pim_toc20 (struct pdc_toc_pim_20 *ret) +{ +int retval; +unsigned long flags; + +spin_lock_irqsave (&pdc_lock, flags); + retval =mem_pdc_call (PDC_PIM ,PDC_PIM_TOC ,__pa (pdc_result), +__pa (ret),sizeof (*ret)); +spin_unlock_irqrestore (&pdc_lock, flags); +return retval; +} +/** * pdc_tod_set - Set the Time-Of-Day clock. * @sec: The number of seconds since epoch.
Signature · 1 line
2.33.0
PATCH v3 4/4 parisc: add support for TOC (transfer of control)
In reply to Sven SchnelleAlmost all PA-RISC machines have either a button that is labeled with 'TOC' or a BMC function to trigger a TOC. TOC is a non-maskable interrupt that is sent to the processor. This can be used for diagnostic purposes like obtaining a stack trace/register dump or to enter KDB/KGDB.
As an example, on my c8000, TOC can be used with:
CONFIG_KGDB=yCONFIG_KGDB_KDB=y
and the 'kgdboc=ttyS0,115200' appended to the command line.
Press ^[( on serial console, which will enter the BMC command line, and enter 'TOC s':
root@(none):/# ( cli>TOC s Sending TOC/INIT. <Cpu3> 2800035d03e00000 0000000040c21ac8 CC_ERR_CHECK_TOC <Cpu0> 2800035d00e00000 0000000040c21ad0 CC_ERR_CHECK_TOC <Cpu2> 2800035d02e00000 0000000040c21ac8 CC_ERR_CHECK_TOC <Cpu1> 2800035d01e00000 0000000040c21ad0 CC_ERR_CHECK_TOC <Cpu3> 37000f7303e00000 2000000000000000 CC_ERR_CPU_CHECK_SUMMARY <Cpu0> 37000f7300e00000 2000000000000000 CC_ERR_CPU_CHECK_SUMMARY <Cpu2> 37000f7302e00000 2000000000000000 CC_ERR_CPU_CHECK_SUMMARY <Cpu1> 37000f7301e00000 2000000000000000 CC_ERR_CPU_CHECK_SUMMARY <Cpu3> 4300100803e00000 c0000000001d26cc CC_MC_BR_TO_OS_TOC <Cpu0> 4300100800e00000 c0000000001d26cc CC_MC_BR_TO_OS_TOC <Cpu2> 4300100802e00000 c0000000001d26cc CC_MC_BR_TO_OS_TOC <Cpu1> 4300100801e00000 c0000000001d26cc CC_MC_BR_TO_OS_TOC
Entering kdb (current=0x00000000411cef80, pid 0) on processor 0 due to NonMaskable Interrupt @ 0x40c21ad0 [0]kdb>
--- arch/parisc/Kconfig | 14 ++++ arch/parisc/include/asm/processor.h | 4 + arch/parisc/include/uapi/asm/pdc.h | 6 +- arch/parisc/kernel/Makefile | 1 + arch/parisc/kernel/toc.c | 111 ++++++++++++++++++++++++++++ arch/parisc/kernel/toc_asm.S | 88 ++++++++++++++++++++++ 6 files changed, 222 insertions(+), 2 deletions(-) create mode 100644 arch/parisc/kernel/toc.c create mode 100644 arch/parisc/kernel/toc_asm.S
arch/parisc/Kconfig +14 -0
@@ -288,6 +288,20 @@ config SMP If you don't know what to do here, say N. +config TOC + bool "Support TOC switch" + default y if 64BIT || !SMP + help + Most PA-RISC machines have either a switch at the back of the machine + or a command in BMC to trigger a TOC interrupt. If you say Y here a + handler will be installed which will either show a backtrace on all + CPUs, or enter a possible configured debugger like kgdb/kdb. + + Note that with this option enabled, the kernel will use an additional 16KB + per possible CPU as a special stack for the TOC handler. + + If you don't want to debug the Kernel, so N. + config PARISC_CPU_TOPOLOGY bool "Support cpu topology definition" depends on SMP
arch/parisc/include/asm/processor.h +4 -0
@@ -294,6 +294,10 @@ extern int _parisc_requires_coherency;extern int running_on_qemu; +extern void toc_handler (void ); +extern unsigned int toc_handler_size; +extern unsigned int toc_handler_csum; +#endif /* __ASSEMBLY__ */ #endif /* __ASM_PARISC_PROCESSOR_H */
arch/parisc/include/uapi/asm/pdc.h +4 -2
@@ -398,8 +398,10 @@ struct zeropage {/* int (*vec_rendz)(void); */ unsigned int vec_rendz;int vec_pow_fail_flen; -int vec_pad[10 ]; - +int vec_pad0[3 ]; +unsigned int vec_toc_hi; +int vec_pad1[6 ]; +/* [0x040] reserved processor dependent */ int pad0[112 ];
arch/parisc/kernel/Makefile +1 -0
@@ -39,3 +39,4 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_KEXEC_CORE) += kexec.o relocate_kernel.o obj-$(CONFIG_KEXEC_FILE) += kexec_file.o +obj-$(CONFIG_TOC) += toc.o toc_asm.o
arch/parisc/kernel/toc.c new file +111 -0
111 lines not on this page · raw message
arch/parisc/kernel/toc_asm.S new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
2.33.0
Re: [PATCH v3 4/4] parisc: add support for TOC (transfer of control)
arch/parisc/Kconfig config SMP · line 295
Quoted 13 lines · Sven Schnelle
arch/parisc/Kconfig +5
-0@@ -288,6 +288,20 @@ config SMP If you don't know what to do here, say N. +config TOC + bool "Support TOC switch" + default y if 64BIT || !SMP + help + Most PA-RISC machines have either a switch at the back of the
machine
arch/parisc/Kconfig config SMP · line 296
Quoted 1 line
arch/parisc/Kconfig +1
-0+ or a command in BMC to trigger a TOC interrupt. If you say Y here
a
arch/parisc/Kconfig config SMP · line 297
Quoted 1 line
arch/parisc/Kconfig +1
-0+ handler will be installed which will either show a backtrace on
all
arch/parisc/Kconfig config SMP
Quoted 3 lines
arch/parisc/Kconfig +3
-0+ CPUs, or enter a possible configured debugger like kgdb/kdb. + + Note that with this option enabled, the kernel will use an
additional
arch/parisc/Kconfig
Quoted 3 lines
16KB + per possible CPU as a special stack for the TOC handler.
arch/parisc/Kconfig +2
-0+ + If you don't want to debug the Kernel, so N.
so -> say?
Quoted 6 lines
arch/parisc/Kconfig +6
-0+void notrace __noreturn __cold toc_intr(struct pt_regs *regs) +{ + struct pdc_toc_pim_20 pim_data20; + struct pdc_toc_pim_11 pim_data11; + + nmi_enter();
arch/parisc/Kconfig
Quoted 10 lines
arch/parisc/Kconfig +10
-0+ + if (boot_cpu_data.cpu_type >= pcxu) { + if (pdc_pim_toc20(&pim_data20)) + panic("Failed to get PIM data"); + toc20_to_pt_regs(regs, &pim_data20); + } else { + if (pdc_pim_toc11(&pim_data11)) + panic("Failed to get PIM data"); + toc11_to_pt_regs(regs, &pim_data11); + }
As I said elsewhere because I had missed v3: move the variables in the if branches.
Eike
Helge Deller
maintainerRe: [PATCH v3 4/4] parisc: add support for TOC (transfer of control)
Quoted 24 lines · Rolf Eike Beer
arch/parisc/Kconfig config SMP · line 295
Quoted 13 lines · Sven Schnelle
arch/parisc/Kconfig +5
-0@@ -288,6 +288,20 @@ config SMP If you don't know what to do here, say N. +config TOC + bool "Support TOC switch" + default y if 64BIT || !SMP + help + Most PA-RISC machines have either a switch at the back of themachine
arch/parisc/Kconfig config SMP · line 296
Quoted 1 line
arch/parisc/Kconfig +1
-0+ or a command in BMC to trigger a TOC interrupt. If you say Y herea
arch/parisc/Kconfig config SMP · line 297
Quoted 1 line
arch/parisc/Kconfig +1
-0+ handler will be installed which will either show a backtrace onall
arch/parisc/Kconfig config SMP
Quoted 3 lines
arch/parisc/Kconfig +3
-0+ CPUs, or enter a possible configured debugger like kgdb/kdb. + + Note that with this option enabled, the kernel will use anadditional
Quoted 5 lines
arch/parisc/Kconfig
Quoted 3 lines
16KB + per possible CPU as a special stack for the TOC handler.
arch/parisc/Kconfig +2
-0+ + If you don't want to debug the Kernel, so N.so -> say?
Yes, I fixed that before I applied to my tree.
Quoted 11 lines
Quoted 11 lines
arch/parisc/Kconfig +11
-0+void notrace __noreturn __cold toc_intr(struct pt_regs *regs) +{ + struct pdc_toc_pim_20 pim_data20; + struct pdc_toc_pim_11 pim_data11; + + nmi_enter(); + + if (boot_cpu_data.cpu_type >= pcxu) { + if (pdc_pim_toc20(&pim_data20)) + panic("Failed to get PIM data"); + toc20_to_pt_regs(regs, &pim_data20);
Quoted 8 lines
arch/parisc/Kconfig
Quoted 5 lines
arch/parisc/Kconfig +5
-0+ } else { + if (pdc_pim_toc11(&pim_data11)) + panic("Failed to get PIM data"); + toc11_to_pt_regs(regs, &pim_data11); + }As I said elsewhere because I had missed v3: move the variables in the if branches.
It won't change anything, the compiler is clever enough to optimize it. Another option would be to completely move the pdc_pim_toc* functions into the toc*_to_pt_regs functions, maybe then renaming them to get_tocXX_pt_regs(regs);
Helge
Helge Deller
maintainerQuoted 23 lines · Sven Schnelle
This adds support for the TOC switches found on most PA-RISC machines. I tested this on my c8000 and a HP 16702A, which is basically a B160L with some logic analyzer hardware.
Changes in v3:
- add config option
- move toc code to its own c & .S file
- useearly_initcallfor setup
- split out struct declarations
- usesizeof(*ret)instead of sizeof(struct x)
- movevirt_maptoassembly.hso it can be used from other filesChanges in v2:
- fix stack allocation
- aligntoc_lockon 16 byte boundary
- movetoc_lockdeclaration toprocessor.cSven Schnelle (4):
parisc: movevirt_mapmacro toassembly.h
parisc: add PIM TOC data structures parisc/firmware: add functions to retrieve TOC data
parisc: add support for TOC (transfer of control)
Quoted 13 lines
arch/parisc/Kconfig | 14 ++++ arch/parisc/include/asm/assembly.h | 25 +++++++ arch/parisc/include/asm/pdc.h | 2 + arch/parisc/include/asm/processor.h | 4 + arch/parisc/include/uapi/asm/pdc.h | 28 ++++++- arch/parisc/kernel/Makefile | 1 + arch/parisc/kernel/entry.S | 24 ------ arch/parisc/kernel/firmware.c | 32 ++++++++ arch/parisc/kernel/toc.c | 111 ++++++++++++++++++++++++++++ arch/parisc/kernel/toc_asm.S | 88 ++++++++++++++++++++++ 10 files changed, 303 insertions(+), 26 deletions(-) create mode 100644 arch/parisc/kernel/toc.c create mode 100644 arch/parisc/kernel/toc_asm.S
I've just merged into the for-next-v5.15 git tree.
Thanks!
Helge