From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.176 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794939213; b=MibVoHwVmIHOgPb0ZL+p89v8Jp4uueV4DoBnc4g9EwFBUnvnDuz8Yw/RXPEwPNmfpAMh aoYMWBU+UddBdBRJTk0IaJ8nvLEXUgS5KBfEYZ8GXhQA2IEKZPR49id0Ya6Nws7Qsto0Q WpmIFsmPX2nlJh+pcJed1qg67UjJNJVNwYN6MZx6exuM78dfF/pzZvS092DA+S5u98mqN uJ6w63+BAguiew5ae+W0k8VeSpHaxwct7g8Qt776i5lwFMNKDskFMXcAKcePS2NSUKN57 /ePmZhFNcE5VFyAvDhizQrXDBQdRXwydBLqDNN9Azas/OQ2r19eR84YCGtmItmh0aVA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794939213; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer: X-Developer-Signature:X-Developer-Key; bh=STiFEihDPW2sKfJimv5gbHnLP49I+Hzh07ArF0xI4yU=; b=wE4ZAbo6NGDwmJTmmaCJCyeQOZfrVAEePEyseMyI2x6KiDMsG0k35FDuCYJ9xt0i5o14 a9w3vWHUuD8Qttfww8sj9a56bN+1U/P8MZIYoaj0GGoFBQ58RYApm71sg7YPbI7v0ENcO qbrSS19yPsTPfadVr8Img8Yr6iM3IsJbSOirt3vgkUj5m+9+iznnaWANtwt4GCp+MgzLp sqz2QnpX7PdtcACW9T4TU7KsFFsFJf/jNwwUz5Glf8J/uo+oQisywQMdhCaFewKzJ0fXH ayebY32YsPRIIBmqNEdfiwCM5cXeqG6wn81YvPD3EDnTQEukKD7X8UyUPN9ERM4CPHQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=DelVo3Fu; arc=none smtp.remote-ip=209.85.128.176 Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74928606A339 for ; Tue, 17 Nov 2026 18:13:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 74928606A339 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=DelVo3Fu Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-8b4fb5d96b3so8224447b3.1 for ; Tue, 17 Nov 2026 10:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794939212; x=1795544012; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=STiFEihDPW2sKfJimv5gbHnLP49I+Hzh07ArF0xI4yU=; b=DelVo3FuA+QfaL/XLitEf3BPpzMVALmV/qxtrP+9gsFgUKO86iq6UTpET93XzHbNg2 N8OWzHTmC4W0rvZc9D+1kp1jMpB1PQgymdOaN1u0Ej2WUCVDvNotVKQGowoNmBE2yN4H d2BcSpn2gGMzHYLEdUtZ9Pv2j7NTWn04lqm8gBxGDNPjcAHDLvO5HInmsAiiVxwGDWyt ElXPE4XMywan6YS7Hi+MErci2nI1vlgYoi6ADjD2fC1fIGJ7e9ydeqgkbMpkMUkOGL+7 QNLrGp00LiUMkcXJ+c97/XnNsEtueT37z1Y7EQVeDZE+0lJWoOEuJM/kE0ob4N7R0Dwu cqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794939212; x=1795544012; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=STiFEihDPW2sKfJimv5gbHnLP49I+Hzh07ArF0xI4yU=; b=CTQOTEoBxS/2HIotmvth7sUrUvGB9NhRo2ONNoa5shHXHygn3reOlKekYmmbemJq0U SU4qTRQNN8hGTtkA8aryaW4ndfmVE0ai1W4sL/SL1HvdJmp1aGqUx/tiWaPJ08qFdPPg rtEyJ8S74aNx1N3f8hzNFPV5+8vEy8JMlBpM3qcxJ/cXSj0eFcbyEPX51T6+uykqzD2B IVzI3ldkVMkb99OCZWH4QuYbhkuFwXDvK3jbgX91ZGhNLrjJJE9L83vH0Fjc5mSojZCr OQHxhompjTp3/tX4eDz1G3L6mTAUI55aSZgAecnPQN0pLUqDZMgt86SrnPeeX/USUqem nNhA== X-Forwarded-Encrypted: i=1; AL+hErG6voo2XD6fE00iMuiJ/O4jMnNPFcBPquI6yT170YvAnuFH3quuCmmbDAp+HT0eRWjbqSaok3ZHUaA=@vger.kernel.org X-Gm-Message-State: APuU4Z9CrqbdlAEASBtXuyNCtVAmvV6rDcYnYjriRmYXiF2N2dRGn3+D LMjjFbKdXO7nvLY8L6EekeGnhTO3vj6IltufSAdujaNkQzuzt9bY9bByQiD1Oi3z210= X-Gm-Gg: AZFdTZecf9Lamn35ZhPbk7Xyf2r5emHQ0F42pVJN6XWTDU7DavTguFePwwYb1DkN1k8 EhEXqMu/47luqcHIAgbrzzm14YfaclV+B/SU44pjef9ZHLMftHywhJxOtrk5kw4xjOwZX+1g5mO LReJn9ZZ3zIDKvfK5jZLpf6KdrfnQTif6jrxSaZ4sFCIHquZNEKUtf4+O5WkUvPl11xDUMUAmvy HU8v081GmA4LV2yAmsDO6l4izGts4SxDsf6TpJ2Q09c7NiSM0UWetWmFL8P9HuAgxahNhHxkHsH Iy2sZMpIh8wea54d5ajqIRoeXXLlCBdROqJmqfUXnYgJpC86uvnzH2shyD6p45qZqfiCwgOhY1/ PFSxPTe/MZrB3vVUabwG/735AoVlsno4cJw12TP/yC4qi7Mkl+ySOh3ldbadWbKzOsLO25o7Bo0 yT8ETd9FcX5gZsWnICPfPhAWc07FiiqLi/zPFOtQ6KN+CVS5TaZVBLVIFxN6g5Rfs19BAi74WoK QPnsihAnj1/lesXnae20GnfTT6cbEqMTZoSlkB5KKUNTPfLjPo/UVjMeeiHI+lcEKjbZbkvZU51 2sMmZRp3DibL+k4QJSBWo+CkcAlwSPoblHRE9/7pJv2z7F41wd5mfvJTxbmGuaCLr7leQL8nElh KNvwh/hFqxRR/yjRFk2jti/QjRUZdhoPvUBvlf5JZURqSUJ/euGMIWmiP7NZ0iG9494dTL95+a8 TYrpl2qLMrW4gEoG4pM2uI0G5ZHJrtalc//kppKnQ= X-Received: by 2002:a05:690c:60c3:b0:8b3:4dd:5fb5 with SMTP id 00721157ae682-8b4ee348741mr19729657b3.27.1794939212219; Tue, 17 Nov 2026 10:13:32 -0800 (PST) Received: from localhost (107-220-129-194.lightspeed.chrlnc.sbcglobal.net. [107.220.129.194]) by smtp.gmail.com with ESMTPSA id 00721157ae682-8b4fe03097bsm2800817b3.7.2026.11.17.10.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 10:13:31 -0800 (PST) From: Matt Turner Date: Tue, 17 Nov 2026 13:13:28 -0500 Subject: [PATCH v3 1/7] alpha: marvel: fix the environmental subpacket layout X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261117-marvel-env-v3-1-0edc370fdca9@gmail.com> References: <20261117-marvel-env-v3-0-0edc370fdca9@gmail.com> In-Reply-To: <20261117-marvel-env-v3-0-0edc370fdca9@gmail.com> To: Richard Henderson , Magnus Lindholm , Guenter Roeck Cc: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org, Matt Turner X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3358; i=mattst88@gmail.com; h=from:subject:message-id; bh=qw1DEcLCwtEfM12rcDqEVnYxZDGqgYJLaZJKpeMvQrc=; b=owGbwMvMwCW25rVmCc8sv+mMp9WSGLL+zPTg3bWfrd3qY8Xbif5P9XZVBCvFPjP5xeD1xie+M IJbaKpmx0cWBjEuhpliiixx6xVZZrXtWOpzWvoXzBxWJpAh0iINDEDAwsCXm5hXaqRjpGeqbahn CGToGMVD5PQYNDKLi0tTi3TTCooc8vJLEksy8/OK9fILUvMK0gv00jLTSjIy8ouKU4FG6OWllpi 6OroZGRqYWDpamDlZOJqaODs7GTq5OTo6uzoZWZqbGDhbOpq4WpozcHEKwFzjq8LwT18rUTQF6K xv9fet5q7ykoySi/ia7f3S5vd10ez3L35qMPxTc/p2Y+6z9x94vhivc3dccCNLIUlat6o5dQXPz IVvvjgzAQA= X-Developer-Key: i=mattst88@gmail.com; a=openpgp; fpr=3BB639E56F861FA2E86505690FDD682D974CA72A 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 --- 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