Re: [PATCH v3 1/7] alpha: marvel: fix the environmental subpacket layout

From: Magnus Lindholm

Date: Tue Nov 17 2026 - 15:11:19 EST


Hi Matt,

On Tue, Nov 17, 2026 at 7:13 PM Matt Turner <mattst88@xxxxxxxxx> wrote:
>
> struct ev7_pal_environmental_subpacket does not match what the MBM and
> CMM firmware (V2.7) put in system event frames, which is:
>
> +0 cabinet
> +2 drawer
> +8 PE (the power and environment node holding the sensor)
> +10 sensor index
> +14 state: 0 ok, 1 warning, 2 fault, 0xfffe unknown, 0xffff removed
>
> So the byte printed as "Condition" was half of the sensor index, and the
> state was never printed. Use the firmware's layout and print the state
> along with the sensor's key. This matches the frames in the error log of
> an ES47.
>
> Signed-off-by: Matt Turner <mattst88@xxxxxxxxx>
> ---
> arch/alpha/include/asm/err_ev7.h | 16 ++++++++++++----
> arch/alpha/kernel/err_marvel.c | 30 +++++++++++++++++++-----------
> 2 files changed, 31 insertions(+), 15 deletions(-)
>
> diff --git a/arch/alpha/include/asm/err_ev7.h b/arch/alpha/include/asm/err_ev7.h
> index ab17e6333764..5d30af0221fb 100644
> --- a/arch/alpha/include/asm/err_ev7.h
> +++ b/arch/alpha/include/asm/err_ev7.h
> @@ -147,17 +147,25 @@ struct ev7_pal_io_subpacket {
> * class PAL (14), type POWER_SUPPLY (14)
> * class PAL (14), type LAN (15)
> * class PAL (14), type HOT_PLUG (16)
> + *
> + * Cabinet, drawer, PE and sensor are the keys of the sensor's GCT packet.
> */
> struct ev7_pal_environmental_subpacket {
> u16 cabinet;
> u16 drawer;
> u16 reserved1[2];
> - u8 module_type;
> - u8 unit_id; /* unit reporting condition */
> - u8 reserved2;
> - u8 condition; /* condition reported */
> + u16 pe;
> + u16 sensor;
> + u16 reserved2;
> + u16 state; /* EV7_ENV_STATE_* */
> };
>
> +#define EV7_ENV_STATE_OK 0
> +#define EV7_ENV_STATE_WARNING 1
> +#define EV7_ENV_STATE_FAULT 2
> +#define EV7_ENV_STATE_UNKNOWN 0xfffe
> +#define EV7_ENV_STATE_REMOVED 0xffff
> +
> /*
> * Convert environmental type to index
> */
> diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
> index c0c0ccefc467..9304ae74877d 100644
> --- a/arch/alpha/kernel/err_marvel.c
> +++ b/arch/alpha/kernel/err_marvel.c
> @@ -21,6 +21,21 @@
> #include "err_impl.h"
> #include "proto.h"
>
> +#ifdef CONFIG_VERBOSE_MCHECK
> +static const char *
> +marvel_env_state(u16 state)
> +{
> + switch (state) {
> + case EV7_ENV_STATE_OK: return "ok";
> + case EV7_ENV_STATE_WARNING: return "warning";
> + case EV7_ENV_STATE_FAULT: return "fault";
> + case EV7_ENV_STATE_UNKNOWN: return "unknown";
> + case EV7_ENV_STATE_REMOVED: return "removed";
> + default: return "unrecognized";
> + }
> +}
> +#endif /* CONFIG_VERBOSE_MCHECK */
> +
> static void
> marvel_print_680_frame(struct ev7_lf_subpackets *lf_subpackets)
> {
> @@ -50,17 +65,10 @@ marvel_print_680_frame(struct ev7_lf_subpackets *lf_subpackets)
> if (!env)
> continue;
>
> - printk("%s**%s event (cabinet %d, drawer %d)\n",
> - err_print_prefix,
> - ev_packets[i].name,
> - env->cabinet,
> - env->drawer);
> - printk("%s Module Type: 0x%x - Unit ID 0x%x - "
> - "Condition 0x%x\n",
> - err_print_prefix,
> - env->module_type,
> - env->unit_id,
> - env->condition);
> + printk("%s**%s %s (cabinet %u, drawer %u, PE %u, sensor %u, state %#x)\n",
> + err_print_prefix, ev_packets[i].name,
> + marvel_env_state(env->state), env->cabinet,
> + env->drawer, env->pe, env->sensor, env->state);
> }
> #endif /* CONFIG_VERBOSE_MCHECK */
> }
>
> --
> 2.56.1
>

Thanks, this builds on its own now with VERBOSE_MCHECK=n.

Reviewed-by: Magnus Lindholm <linmag7@xxxxxxxxx>