Subject: parisc: Fix pdc_toc_pim_11 and pdc_toc_pim_20 structs
Helge Deller
maintainerPATCH 1/2 Subject: parisc: Fix pdc_toc_pim_11 and pdc_toc_pim_20 structs
The definitions for pdc_toc_pim_11 and pdc_toc_pim_20 structs are wrong since they include an entry for a hversion version field which isn't in the specification.
Fix this and clean up some whitespaces so that the whole file will be in sync with it's copy in the SeaBIOS-hppa sources.
--- arch/parisc/include/uapi/asm/pdc.h | 32 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
arch/parisc/include/uapi/asm/pdc.h +23 -9
@@ -4,7 +4,7 @@/* * PDC return values ... -* All PDC calls return a subset of these errors. +* All PDC calls return a subset of these errors. */ #define PDC_WARN 3/* Call completed with a warning */
@@ -165,7 +165,7 @@#define PDC_PSW_GET_DEFAULTS 1/* Return defaults */ #define PDC_PSW_SET_DEFAULTS 2/* Set default */ #define PDC_PSW_ENDIAN_BIT 1/* set for big endian */ -#define PDC_PSW_WIDE_BIT 2/* set for wide mode */ +#define PDC_PSW_WIDE_BIT 2/* set for wide mode */ #define PDC_SYSTEM_MAP 22/* find system modules */ #define PDC_FIND_MODULE 0
@@ -274,7 +274,7 @@#define PDC_PCI_PCI_INT_ROUTE_SIZE 13#define PDC_PCI_GET_INT_TBL_SIZE PDC_PCI_PCI_INT_ROUTE_SIZE#define PDC_PCI_PCI_INT_ROUTE 14 -#define PDC_PCI_GET_INT_TBL PDC_PCI_PCI_INT_ROUTE +#define PDC_PCI_GET_INT_TBL PDC_PCI_PCI_INT_ROUTE#define PDC_PCI_READ_MON_TYPE 15#define PDC_PCI_WRITE_MON_TYPE 16
@@ -345,7 +345,7 @@/* constants for PDC_CHASSIS */ #define OSTAT_OFF 0 -#define OSTAT_FLT 1 +#define OSTAT_FLT 1#define OSTAT_TEST 2#define OSTAT_INIT 3#define OSTAT_SHUT 4
@@ -403,7 +403,7 @@ struct zeropage {int vec_pad1[6 ];/* [0x040] reserved processor dependent */ -int pad0[112 ]; +int pad0[112 ];/* in QEMU pad0[0] holds "SeaBIOS\0" */ /* [0x200] reserved */ int pad1[84 ];
@@ -691,6 +691,22 @@ struct pdc_hpmc_pim_20 { /* PDC_PIM */unsigned long long fr[32 ]; }; +struct pim_cpu_state_cf { +union { +unsigned int + iqv :1 ,/* IIA queue Valid */ + iqf :1 ,/* IIA queue Failure */ + ipv :1 ,/* IPRs Valid */ + grv :1 ,/* GRs Valid */ + crv :1 ,/* CRs Valid */ + srv :1 ,/* SRs Valid */ + trv :1 ,/* CR24 through CR31 valid */ + pad :24 ,/* reserved */ + td :1 ;/* TOC did not cause any damage to the system state */ +unsigned int val; + }; +}; +struct pdc_toc_pim_11 {unsigned int gr[32 ];unsigned int cr[32 ];
@@ -698,8 +714,7 @@ struct pdc_toc_pim_11 {unsigned int iasq_back;unsigned int iaoq_back;unsigned int check_type; -unsigned int hversion; -unsigned int cpu_state; +struct pim_cpu_state_cf cpu_state; };struct pdc_toc_pim_20 {
@@ -709,8 +724,7 @@ struct pdc_toc_pim_20 {unsigned long long iasq_back;unsigned long long iaoq_back;unsigned int check_type; -unsigned int hversion; - unsigned int cpu_state; + struct pim_cpu_state_cf cpu_state; };#endif /* !defined(__ASSEMBLY__) */
--
2.31.1
Helge Deller
maintainerPATCH 2/2 parisc: Provide a trivial PDC-based io_module for kgdb
Add a simple keyboard driver for usage of PDC I/O functions with kgdb. This driver makes it possible to use KGDB with QEMU.
--- arch/parisc/kernel/toc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
arch/parisc/kernel/toc.c +27 -0
@@ -109,3 +109,30 @@ static __init int setup_toc(void)return 0 ; }early_initcall (setup_toc); + + +#ifdef CONFIG_KGDB_KDB +/* read a character, return -1 if no char can be polled. */ +static int kgdbpdc_read_char (void ) +{ +return pdc_iodc_getc (); +} + +static void kgdbpdc_write_char (u8 chr) +{ +/* no need to print char. kdb will do it. */ +} + +static struct kgdb_io kgdbpdc_io_ops = { + .name ="kgdb_pdc" , + .read_char = kgdbpdc_read_char, + .write_char = kgdbpdc_write_char, +}; + +static int __init kgdbpdc_init (void ) +{ +kgdb_register_io_module (&kgdbpdc_io_ops); +return 0 ; +} +early_initcall (kgdbpdc_init); +#endif
--
2.31.1
Re: [PATCH 2/2] parisc: Provide a trivial PDC-based io_module for kgdb
Am Mittwoch, 5. Januar 2022, 22:45:52 CET schrieb Helge Deller:
Quoted 13 lines
Add a simple keyboard driver for usage of PDC I/O functions with kgdb. This driver makes it possible to use KGDB with QEMU.
Signed-off-by Helge Deller <[email protected]>--- arch/parisc/kernel/toc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)arch/parisc/kernel/toc.c +0
-0
arch/parisc/kernel/toc.c static __init int setup_toc(void) · line 113
Quoted 5 lines
arch/parisc/kernel/toc.c +2
-0@@ -109,3 +109,30 @@ static __init int setup_toc(void)return 0 ; }early_initcall (setup_toc); + +
double newline
arch/parisc/kernel/toc.c static __init int setup_toc(void) · line 123
Quoted 10 lines
arch/parisc/kernel/toc.c +10
-0+#ifdef CONFIG_KGDB_KDB +/* read a character, return -1 if no char can be polled. */ +static int kgdbpdc_read_char (void ) +{ +return pdc_iodc_getc (); +} + +static void kgdbpdc_write_char (u8 chr) +{ +/* no need to print char. kdb will do it. */
kgdb?
Eike
Helge Deller
maintainerRe: [PATCH 2/2] parisc: Provide a trivial PDC-based io_module for kgdb
Quoted 22 lines · Rolf Eike Beer
Am Mittwoch, 5. Januar 2022, 22:45:52 CET schrieb Helge Deller:
Quoted 13 lines
Add a simple keyboard driver for usage of PDC I/O functions with kgdb. This driver makes it possible to use KGDB with QEMU.
Signed-off-by Helge Deller <[email protected]>--- arch/parisc/kernel/toc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)arch/parisc/kernel/toc.c +0
-0arch/parisc/kernel/toc.c static __init int setup_toc(void) · line 113
Quoted 5 lines
arch/parisc/kernel/toc.c +2
-0@@ -109,3 +109,30 @@ static __init int setup_toc(void)return 0 ; }early_initcall (setup_toc); + +double newline
Quoted 12 lines
arch/parisc/kernel/toc.c static __init int setup_toc(void) · line 123
Quoted 10 lines
arch/parisc/kernel/toc.c +10
-0+#ifdef CONFIG_KGDB_KDB +/* read a character, return -1 if no char can be polled. */ +static int kgdbpdc_read_char (void ) +{ +return pdc_iodc_getc (); +} + +static void kgdbpdc_write_char (u8 chr) +{ +/* no need to print char. kdb will do it. */ kgdb?
Thanks, I fixed this and moved the driver to kgdb.c...
Helge