From: "Cédric Le Goater" <clg@kaod.org>
To: Nicholas Piggin <npiggin@gmail.com>, qemu-ppc@nongnu.org
Cc: qemu-devel@nongnu.org,
Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Subject: Re: [PATCH 4/4] target/ppc: Implement core timebase state machine and TFMR
Date: Wed, 14 Jun 2023 10:55:49 +0200 [thread overview]
Message-ID: <ddf471e7-4662-eff9-0f67-022468db2ec1@kaod.org> (raw)
In-Reply-To: <20230603233612.125879-5-npiggin@gmail.com>
On 6/4/23 01:36, Nicholas Piggin wrote:
> This implements the core timebase state machine, which is the core side
> of the time-of-day system in POWER processors. This facility is operated
> by control fields in the TFMR register, which also contains status
> fields.
>
> The core timebase interacts with the chiptod hardware, primarily to
> receive TOD updates, to synchronise timebase with other cores. This
> model does not actually update TB values with TOD or updates received
> from the chiptod, as timebases are always synchronised. It does step
> through the states required to perform the update.
>
> There are several asynchronous state transitions. These are modelled
> using using mfTFMR to drive state changes, because it is expected that
> firmware poll the register to wait for those states. This is good enough
> to test basic firmware behaviour without adding real timers. The values
> chosen are arbitrary.
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Looks correct,
Acked-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> target/ppc/cpu.h | 34 ++++++++
> target/ppc/timebase_helper.c | 147 ++++++++++++++++++++++++++++++++++-
> 2 files changed, 179 insertions(+), 2 deletions(-)
>
> diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> index d73cce8474..b1520ea4db 100644
> --- a/target/ppc/cpu.h
> +++ b/target/ppc/cpu.h
> @@ -1177,6 +1177,13 @@ struct CPUArchState {
> /* PowerNV chiptod / timebase facility state. */
> int tb_ready_for_tod; /* core TB ready to receive TOD from chiptod */
> int tod_sent_to_tb; /* chiptod sent TOD to the core TB */
> +
> + /*
> + * Timers for async events are simulated by mfTFAC because TFAC is to be
> + * polled for event.
> + */
> + int tb_state_timer;
> + int tb_sync_pulse_timer;
> #endif
> #endif
>
> @@ -2527,6 +2534,33 @@ enum {
> HMER_XSCOM_STATUS_MASK = PPC_BITMASK(21, 23),
> };
>
> +/* TFMR */
> +enum {
> + TFMR_CONTROL_MASK = PPC_BITMASK(0, 24),
> + TFMR_MASK_HMI = PPC_BIT(10),
> + TFMR_TB_ECLIPZ = PPC_BIT(14),
> + TFMR_LOAD_TOD_MOD = PPC_BIT(16),
> + TFMR_MOVE_CHIP_TOD_TO_TB = PPC_BIT(18),
> + TFMR_CLEAR_TB_ERRORS = PPC_BIT(24),
> + TFMR_STATUS_MASK = PPC_BITMASK(25, 63),
> + TFMR_TBST_ENCODED = PPC_BITMASK(28, 31), /* TBST = TB State */
> + TFMR_TBST_LAST = PPC_BITMASK(32, 35), /* Previous TBST */
> + TFMR_TB_ENABLED = PPC_BIT(40),
> + TFMR_TB_VALID = PPC_BIT(41),
> + TFMR_TB_SYNC_OCCURED = PPC_BIT(42),
> +};
> +
> +/* TFMR TBST */
> +enum {
> + TBST_RESET = 0x0,
> + TBST_SEND_TOD_MOD = 0x1,
> + TBST_NOT_SET = 0x2,
> + TBST_SYNC_WAIT = 0x6,
> + TBST_GET_TOD = 0x7,
> + TBST_TB_RUNNING = 0x8,
> + TBST_TB_ERROR = 0x9,
> +};
> +
> /*****************************************************************************/
>
> #define is_isa300(ctx) (!!(ctx->insns_flags2 & PPC2_ISA300))
> diff --git a/target/ppc/timebase_helper.c b/target/ppc/timebase_helper.c
> index 34b1d5ad05..11a06fafe6 100644
> --- a/target/ppc/timebase_helper.c
> +++ b/target/ppc/timebase_helper.c
> @@ -272,14 +272,157 @@ void helper_store_booke_tsr(CPUPPCState *env, target_ulong val)
>
> #if defined(TARGET_PPC64)
> /* POWER processor Timebase Facility */
> +static unsigned int tfmr_get_tb_state(uint64_t tfmr)
> +{
> + return (tfmr & TFMR_TBST_ENCODED) >> (63 - 31);
> +}
> +
> +static uint64_t tfmr_new_tb_state(uint64_t tfmr, unsigned int tbst)
> +{
> + tfmr &= ~TFMR_TBST_LAST;
> + tfmr |= (tfmr & TFMR_TBST_ENCODED) >> 4; /* move state to last state */
> + tfmr &= ~TFMR_TBST_ENCODED;
> + tfmr |= (uint64_t)tbst << (63 - 31); /* move new state to state */
> +
> + if (tbst == TBST_TB_RUNNING) {
> + tfmr |= TFMR_TB_VALID;
> + } else {
> + tfmr &= ~TFMR_TB_VALID;
> + }
> +
> + return tfmr;
> +}
> +
> +static void tb_state_machine_step(CPUPPCState *env)
> +{
> + uint64_t tfmr = env->spr[SPR_TFMR];
> + unsigned int tbst = tfmr_get_tb_state(tfmr);
> +
> + if (!(tfmr & TFMR_TB_ECLIPZ) || tbst == TBST_TB_ERROR) {
> + return;
> + }
> +
> + if (env->tb_sync_pulse_timer) {
> + env->tb_sync_pulse_timer--;
> + } else {
> + tfmr |= TFMR_TB_SYNC_OCCURED;
> + env->spr[SPR_TFMR] = tfmr;
> + }
> +
> + if (env->tb_state_timer) {
> + env->tb_state_timer--;
> + return;
> + }
> +
> + if (tfmr & TFMR_LOAD_TOD_MOD) {
> + tfmr &= ~TFMR_LOAD_TOD_MOD;
> + if (tbst == TBST_GET_TOD) {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_TB_ERROR);
> + } else {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_SEND_TOD_MOD);
> + /* State seems to transition immediately */
> + tfmr = tfmr_new_tb_state(tfmr, TBST_NOT_SET);
> + }
> + } else if (tfmr & TFMR_MOVE_CHIP_TOD_TO_TB) {
> + if (tbst == TBST_SYNC_WAIT) {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_GET_TOD);
> + env->tb_state_timer = 3;
> + } else if (tbst == TBST_GET_TOD) {
> + if (env->tod_sent_to_tb) {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_TB_RUNNING);
> + tfmr &= ~TFMR_MOVE_CHIP_TOD_TO_TB;
> + env->tb_ready_for_tod = 0;
> + env->tod_sent_to_tb = 0;
> + }
> + } else {
> + qemu_log_mask(LOG_GUEST_ERROR, "TFMR error: MOVE_CHIP_TOD_TO_TB "
> + "state machine in invalid state 0x%x\n", tbst);
> + tfmr = tfmr_new_tb_state(tfmr, TBST_TB_ERROR);
> + env->tb_ready_for_tod = 0;
> + }
> + }
> +
> + env->spr[SPR_TFMR] = tfmr;
> +}
> +
> target_ulong helper_load_tfmr(CPUPPCState *env)
> {
> - return env->spr[SPR_TFMR];
> + tb_state_machine_step(env);
> +
> + return env->spr[SPR_TFMR] | TFMR_TB_ECLIPZ;
> }
>
> void helper_store_tfmr(CPUPPCState *env, target_ulong val)
> {
> - env->spr[SPR_TFMR] = val;
> + uint64_t tfmr = env->spr[SPR_TFMR];
> + unsigned int tbst = tfmr_get_tb_state(tfmr);
> +
> + if (!(val & TFMR_TB_ECLIPZ)) {
> + qemu_log_mask(LOG_UNIMP, "TFMR non-ECLIPZ mode not implemented\n");
> + tfmr &= ~TFMR_TBST_ENCODED;
> + tfmr &= ~TFMR_TBST_LAST;
> + goto out;
> + }
> +
> + /* Update control bits */
> + tfmr = (tfmr & ~TFMR_CONTROL_MASK) | (val & TFMR_CONTROL_MASK);
> +
> + /* mtspr always clears this */
> + tfmr &= ~TFMR_TB_SYNC_OCCURED;
> + env->tb_sync_pulse_timer = 1;
> +
> + /*
> + * We don't implement any of the error status bits that can be
> + * cleared by writing 1 to them. TB error injection / simulation
> + * would have to implement some.
> + *
> + * Also don't implement mfTB failing when the TB state machine is
> + * not running.
> + */
> +
> + if (((tfmr | val) & (TFMR_LOAD_TOD_MOD | TFMR_MOVE_CHIP_TOD_TO_TB)) ==
> + (TFMR_LOAD_TOD_MOD | TFMR_MOVE_CHIP_TOD_TO_TB)) {
> + qemu_log_mask(LOG_GUEST_ERROR, "TFMR error: LOAD_TOD_MOD and "
> + "MOVE_CHIP_TOD_TO_TB both set\n");
> + tfmr = tfmr_new_tb_state(tfmr, TBST_TB_ERROR);
> + env->tb_ready_for_tod = 0;
> + goto out;
> + }
> +
> + if (tfmr & TFMR_CLEAR_TB_ERRORS) {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_RESET);
> + tfmr &= ~TFMR_CLEAR_TB_ERRORS;
> + tfmr &= ~TFMR_LOAD_TOD_MOD;
> + tfmr &= ~TFMR_MOVE_CHIP_TOD_TO_TB;
> + env->tb_ready_for_tod = 0;
> + env->tod_sent_to_tb = 0;
> + goto out;
> + }
> +
> + if (tbst == TBST_TB_ERROR) {
> + qemu_log_mask(LOG_GUEST_ERROR, "TFMR error: mtspr TFMR in TB_ERROR"
> + " state\n");
> + return;
> + }
> +
> + if (tfmr & TFMR_LOAD_TOD_MOD) {
> + env->tb_state_timer = 3;
> + } else if (tfmr & TFMR_MOVE_CHIP_TOD_TO_TB) {
> + if (tbst == TBST_NOT_SET) {
> + tfmr = tfmr_new_tb_state(tfmr, TBST_SYNC_WAIT);
> + env->tb_ready_for_tod = 1;
> + env->tb_state_timer = 3;
> + } else {
> + qemu_log_mask(LOG_GUEST_ERROR, "TFMR error: MOVE_CHIP_TOD_TO_TB "
> + "not in TB not set state 0x%x\n",
> + tbst);
> + tfmr = tfmr_new_tb_state(tfmr, TBST_TB_ERROR);
> + env->tb_ready_for_tod = 0;
> + }
> + }
> +
> +out:
> + env->spr[SPR_TFMR] = tfmr;
> }
> #endif
>
next prev parent reply other threads:[~2023-06-14 8:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-03 23:36 [PATCH 0/4] ppc/pnv: Add chiptod and core timebase state machine models Nicholas Piggin
2023-06-03 23:36 ` [PATCH 1/4] pnv/chiptod: Add POWER9/10 chiptod model Nicholas Piggin
2023-06-05 14:57 ` Cédric Le Goater
2023-06-14 5:30 ` Nicholas Piggin
2023-06-14 7:01 ` Cédric Le Goater
2023-06-03 23:36 ` [PATCH 2/4] target/ppc: Tidy POWER book4 SPR registration Nicholas Piggin
2023-06-05 14:58 ` Cédric Le Goater
2023-06-03 23:36 ` [PATCH 3/4] target/ppc: add TFMR SPR implementation with read and write helpers Nicholas Piggin
2023-06-14 8:38 ` Cédric Le Goater
2023-06-03 23:36 ` [PATCH 4/4] target/ppc: Implement core timebase state machine and TFMR Nicholas Piggin
2023-06-14 8:55 ` Cédric Le Goater [this message]
2023-06-06 13:59 ` [PATCH 0/4] ppc/pnv: Add chiptod and core timebase state machine models Cédric Le Goater
2023-06-14 5:14 ` Nicholas Piggin
2023-06-14 8:54 ` Cédric Le Goater
2023-06-15 2:18 ` Nicholas Piggin
2023-06-15 9:45 ` Cédric Le Goater
2023-06-22 7:30 ` Cédric Le Goater
2023-06-22 9:54 ` Nicholas Piggin
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=ddf471e7-4662-eff9-0f67-022468db2ec1@kaod.org \
--to=clg@kaod.org \
--cc=dbarboza@ventanamicro.com \
--cc=npiggin@gmail.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).