From: David Gibson <david@gibson.dropbear.id.au>
To: Fabiano Rosas <farosas@linux.ibm.com>
Cc: danielhb413@gmail.com, qemu-ppc@nongnu.org,
qemu-devel@nongnu.org, clg@kaod.org
Subject: Re: [PATCH 25/27] target/ppc: cpu_init: Move SPR registration macros to a header
Date: Wed, 16 Feb 2022 14:01:44 +1100 [thread overview]
Message-ID: <YgxpGLXmM3HH9RC0@yekko> (raw)
In-Reply-To: <20220215214148.1848266-26-farosas@linux.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 8106 bytes --]
On Tue, Feb 15, 2022 at 06:41:46PM -0300, Fabiano Rosas wrote:
> Put the SPR registration macros in a header that is accessible outside
> of cpu_init.c. The following patches will move CPU-specific code to
> separate files and will need to access it.
>
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> The spr_tcg.h header has always been used for both TCG and KVM, due to
> its usage in cpu_init.c, but maybe we should change it to spr_common.h
> to avoid confusion?
That's probably a good idea.
> ---
> target/ppc/cpu_init.c | 65 ++++++-------------------------------------
> target/ppc/spr_tcg.h | 56 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 65 insertions(+), 56 deletions(-)
>
> diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> index 74e26f60dd..3327ea15fd 100644
> --- a/target/ppc/cpu_init.c
> +++ b/target/ppc/cpu_init.c
> @@ -67,35 +67,15 @@ static inline void vscr_init(CPUPPCState *env, uint32_t val)
> * may be compiled out, and the system kvm header may not be available
> * for supplying the ID numbers. This is ugly, but the best we can do.
> */
> -
> -#ifdef CONFIG_TCG
> -# define USR_ARG(X) X,
> -# ifdef CONFIG_USER_ONLY
> -# define SYS_ARG(X)
> -# else
> -# define SYS_ARG(X) X,
> -# endif
> -#else
> -# define USR_ARG(X)
> -# define SYS_ARG(X)
> -#endif
> -#ifdef CONFIG_KVM
> -# define KVM_ARG(X) X,
> -#else
> -# define KVM_ARG(X)
> -#endif
> -
> -typedef void spr_callback(DisasContext *, int, int);
> -
> -static void _spr_register(CPUPPCState *env, int num, const char *name,
> - USR_ARG(spr_callback *uea_read)
> - USR_ARG(spr_callback *uea_write)
> - SYS_ARG(spr_callback *oea_read)
> - SYS_ARG(spr_callback *oea_write)
> - SYS_ARG(spr_callback *hea_read)
> - SYS_ARG(spr_callback *hea_write)
> - KVM_ARG(uint64_t one_reg_id)
> - target_ulong initial_value)
> +void _spr_register(CPUPPCState *env, int num, const char *name,
> + USR_ARG(spr_callback *uea_read)
> + USR_ARG(spr_callback *uea_write)
> + SYS_ARG(spr_callback *oea_read)
> + SYS_ARG(spr_callback *oea_write)
> + SYS_ARG(spr_callback *hea_read)
> + SYS_ARG(spr_callback *hea_write)
> + KVM_ARG(uint64_t one_reg_id)
> + target_ulong initial_value)
> {
> ppc_spr_t *spr = &env->spr_cb[num];
>
> @@ -122,33 +102,6 @@ static void _spr_register(CPUPPCState *env, int num, const char *name,
> #endif
> }
>
> -/* spr_register_kvm_hv passes all required arguments. */
> -#define spr_register_kvm_hv(env, num, name, uea_read, uea_write, \
> - oea_read, oea_write, hea_read, hea_write, \
> - one_reg_id, initial_value) \
> - _spr_register(env, num, name, \
> - USR_ARG(uea_read) USR_ARG(uea_write) \
> - SYS_ARG(oea_read) SYS_ARG(oea_write) \
> - SYS_ARG(hea_read) SYS_ARG(hea_write) \
> - KVM_ARG(one_reg_id) initial_value)
> -
> -/* spr_register_kvm duplicates the oea callbacks to the hea callbacks. */
> -#define spr_register_kvm(env, num, name, uea_read, uea_write, \
> - oea_read, oea_write, one_reg_id, ival) \
> - spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read, \
> - oea_write, oea_read, oea_write, one_reg_id, ival)
> -
> -/* spr_register_hv and spr_register are similar, except there is no kvm id. */
> -#define spr_register_hv(env, num, name, uea_read, uea_write, \
> - oea_read, oea_write, hea_read, hea_write, ival) \
> - spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read, \
> - oea_write, hea_read, hea_write, 0, ival)
> -
> -#define spr_register(env, num, name, uea_read, uea_write, \
> - oea_read, oea_write, ival) \
> - spr_register_kvm(env, num, name, uea_read, uea_write, \
> - oea_read, oea_write, 0, ival)
> -
> /* Generic PowerPC SPRs */
> static void register_generic_sprs(PowerPCCPU *cpu)
> {
> diff --git a/target/ppc/spr_tcg.h b/target/ppc/spr_tcg.h
> index a4f912faa4..786cdca80d 100644
> --- a/target/ppc/spr_tcg.h
> +++ b/target/ppc/spr_tcg.h
> @@ -21,6 +21,62 @@
>
> #define SPR_NOACCESS (&spr_noaccess)
>
> +#ifdef CONFIG_TCG
> +# define USR_ARG(X) X,
> +# ifdef CONFIG_USER_ONLY
> +# define SYS_ARG(X)
> +# else
> +# define SYS_ARG(X) X,
> +# endif
> +#else
> +# define USR_ARG(X)
> +# define SYS_ARG(X)
> +#endif
> +#ifdef CONFIG_KVM
> +# define KVM_ARG(X) X,
> +#else
> +# define KVM_ARG(X)
> +#endif
> +
> +typedef void spr_callback(DisasContext *, int, int);
> +
> +void _spr_register(CPUPPCState *env, int num, const char *name,
> + USR_ARG(spr_callback *uea_read)
> + USR_ARG(spr_callback *uea_write)
> + SYS_ARG(spr_callback *oea_read)
> + SYS_ARG(spr_callback *oea_write)
> + SYS_ARG(spr_callback *hea_read)
> + SYS_ARG(spr_callback *hea_write)
> + KVM_ARG(uint64_t one_reg_id)
> + target_ulong initial_value);
> +
> +/* spr_register_kvm_hv passes all required arguments. */
> +#define spr_register_kvm_hv(env, num, name, uea_read, uea_write, \
> + oea_read, oea_write, hea_read, hea_write, \
> + one_reg_id, initial_value) \
> + _spr_register(env, num, name, \
> + USR_ARG(uea_read) USR_ARG(uea_write) \
> + SYS_ARG(oea_read) SYS_ARG(oea_write) \
> + SYS_ARG(hea_read) SYS_ARG(hea_write) \
> + KVM_ARG(one_reg_id) initial_value)
> +
> +/* spr_register_kvm duplicates the oea callbacks to the hea callbacks. */
> +#define spr_register_kvm(env, num, name, uea_read, uea_write, \
> + oea_read, oea_write, one_reg_id, ival) \
> + spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read, \
> + oea_write, oea_read, oea_write, one_reg_id, ival)
> +
> +/* spr_register_hv and spr_register are similar, except there is no kvm id. */
> +#define spr_register_hv(env, num, name, uea_read, uea_write, \
> + oea_read, oea_write, hea_read, hea_write, ival) \
> + spr_register_kvm_hv(env, num, name, uea_read, uea_write, oea_read, \
> + oea_write, hea_read, hea_write, 0, ival)
> +
> +#define spr_register(env, num, name, uea_read, uea_write, \
> + oea_read, oea_write, ival) \
> + spr_register_kvm(env, num, name, uea_read, uea_write, \
> + oea_read, oea_write, 0, ival)
> +
> /* prototypes for readers and writers for SPRs */
> void spr_noaccess(DisasContext *ctx, int gprn, int sprn);
> void spr_read_generic(DisasContext *ctx, int gprn, int sprn);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-02-16 5:18 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 21:41 [PATCH 00/27] target/ppc: SPR registration cleanups Fabiano Rosas
2022-02-15 21:41 ` [PATCH 01/27] target/ppc: cpu_init: Remove not implemented comments Fabiano Rosas
2022-02-16 2:05 ` David Gibson
2022-02-15 21:41 ` [PATCH 02/27] target/ppc: cpu_init: Remove G2LE init code Fabiano Rosas
2022-02-16 2:07 ` David Gibson
2022-02-15 21:41 ` [PATCH 03/27] target/ppc: cpu_init: Group registration of generic SPRs Fabiano Rosas
2022-02-16 2:10 ` David Gibson
2022-02-15 21:41 ` [PATCH 04/27] target/ppc: cpu_init: Move Timebase registration into the common function Fabiano Rosas
2022-02-16 2:11 ` David Gibson
2022-02-15 21:41 ` [PATCH 05/27] target/ppc: cpu_init: Avoid nested SPR register functions Fabiano Rosas
2022-02-16 2:12 ` David Gibson
2022-02-15 21:41 ` [PATCH 06/27] target/ppc: cpu_init: Move 405 SPRs into register_405_sprs Fabiano Rosas
2022-02-16 2:13 ` David Gibson
2022-02-15 21:41 ` [PATCH 07/27] target/ppc: cpu_init: Move G2 SPRs into register_G2_sprs Fabiano Rosas
2022-02-16 2:14 ` David Gibson
2022-02-15 21:41 ` [PATCH 08/27] target/ppc: cpu_init: Decouple G2 SPR registration from 755 Fabiano Rosas
2022-02-16 2:15 ` David Gibson
2022-02-15 21:41 ` [PATCH 09/27] target/ppc: cpu_init: Decouple 74xx SPR registration from 7xx Fabiano Rosas
2022-02-16 2:16 ` David Gibson
2022-02-15 21:41 ` [PATCH 10/27] target/ppc: cpu_init: Deduplicate 440 SPR registration Fabiano Rosas
2022-02-16 2:18 ` David Gibson
2022-02-15 21:41 ` [PATCH 11/27] target/ppc: cpu_init: Deduplicate 603 " Fabiano Rosas
2022-02-16 2:19 ` David Gibson
2022-02-15 21:41 ` [PATCH 12/27] target/ppc: cpu_init: Deduplicate 604 " Fabiano Rosas
2022-02-16 2:19 ` David Gibson
2022-02-15 21:41 ` [PATCH 13/27] target/ppc: cpu_init: Deduplicate 7xx " Fabiano Rosas
2022-02-16 2:23 ` David Gibson
2022-02-15 21:41 ` [PATCH 14/27] target/ppc: cpu_init: Deduplicate 755 " Fabiano Rosas
2022-02-16 2:23 ` David Gibson
2022-02-15 21:41 ` [PATCH 15/27] target/ppc: cpu_init: Move 755 L2 cache SPRs into a function Fabiano Rosas
2022-02-16 2:24 ` David Gibson
2022-02-16 2:52 ` David Gibson
2022-02-15 21:41 ` [PATCH 16/27] target/ppc: cpu_init: Move e300 SPR registration " Fabiano Rosas
2022-02-16 2:26 ` David Gibson
2022-02-15 21:41 ` [PATCH 17/27] target/ppc: cpu_init: Move 604e " Fabiano Rosas
2022-02-16 2:50 ` David Gibson
2022-02-15 21:41 ` [PATCH 18/27] target/ppc: cpu_init: Reuse init_proc_603 for the e300 Fabiano Rosas
2022-02-16 2:27 ` David Gibson
2022-02-15 21:41 ` [PATCH 19/27] target/ppc: cpu_init: Reuse init_proc_604 for the 604e Fabiano Rosas
2022-02-16 2:50 ` David Gibson
2022-02-15 21:41 ` [PATCH 20/27] target/ppc: cpu_init: Reuse init_proc_745 for the 755 Fabiano Rosas
2022-02-16 2:54 ` David Gibson
2022-02-15 21:41 ` [PATCH 21/27] target/ppc: cpu_init: Rename software TLB function Fabiano Rosas
2022-02-16 2:56 ` David Gibson
2022-02-15 21:41 ` [PATCH 22/27] target/ppc: cpu_init: Rename register_ne_601_sprs Fabiano Rosas
2022-02-16 2:59 ` David Gibson
2022-02-16 13:19 ` Fabiano Rosas
2022-02-16 23:41 ` David Gibson
2022-02-15 21:41 ` [PATCH 23/27] target/ppc: cpu_init: Remove register_usprg3_sprs Fabiano Rosas
2022-02-16 2:59 ` David Gibson
2022-02-15 21:41 ` [PATCH 24/27] target/ppc: cpu_init: Expose some SPR registration helpers Fabiano Rosas
2022-02-16 3:00 ` David Gibson
2022-02-15 21:41 ` [PATCH 25/27] target/ppc: cpu_init: Move SPR registration macros to a header Fabiano Rosas
2022-02-16 3:01 ` David Gibson [this message]
2022-02-15 21:41 ` [PATCH 26/27] target/ppc: cpu_init: Move check_pow and QOM " Fabiano Rosas
2022-02-16 3:04 ` David Gibson
2022-02-16 13:06 ` Fabiano Rosas
2022-02-16 23:32 ` David Gibson
2022-02-15 21:41 ` [PATCH 27/27] target/ppc: Move common SPR functions out of cpu_init Fabiano Rosas
2022-02-16 3:05 ` David Gibson
2022-02-16 3:06 ` [PATCH 00/27] target/ppc: SPR registration cleanups David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YgxpGLXmM3HH9RC0@yekko \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=farosas@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).