From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.175 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794939214; b=TsEO0IvteVRFJBzCAON0X1UJasHbvVs5KcPAto1oQWdJhbpV8J4oTvxRp4emdxYdId0X Qcs10ejVHRQt1HJRTy4ED+9Q+fR/nPLdG94HSbMEnrDimKQTq8RMn6BY2JJOX5Kqp3bCH E4HkgCS5W6p6Ot0vJiIFdJAMjRxjqiJqkwX760Oj5+nZLpVV0B4Hi7dKeIp4qQHDX9u57 tTHEm4sOXEO3fPtZby7DTMx9ktqN6q1Fppp4XcFCogbYMyegxlsj68FzuSkRJn816rQLN P+mLS0jKjQN8KZ9CxMpYJoQbyWBANteeSzofUq33T3do65rbUA5krfNE6B7ZK6sDI6Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794939214; 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=mLjZXzEc3r6jcZfESf2nW/89jPke3UlC7QY43Dr4RqLx37gi/611odhqeb4aNDx/5ch8 gdbnjn2hP6ASuTxTGZ+Ge3bPGX16DQKI9N1+dOlPR3MoOvxLq29Hx61CWUwtvdoZk0LBq ZX/JPrcNSNneJJ/qiERZHxf9M/pgUQnn6tv5bp8l4uY4nNKePIt3MZEl3KooOyRwtpzt5 JWJTHiy5qdX8RqO4lnbGXaZlvO9b00M+6OXtU606xoly/CQenJzetVYpaFF/LgQ00nR1l 9gNMvUlAZ1r/LdhRG5T6qeCcilJAiWdsytDcAIpZG9/q/ddYr7v3hwMG6LZa8obHH8w== 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.175 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 7A4F3606A33D for ; Tue, 17 Nov 2026 18:13:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 7A4F3606A33D 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-f175.google.com with SMTP id 00721157ae682-8b32daac9d7so10910777b3.0 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=wfeoaKnVs3le67i9i8jVNDsMnc8L8o1mkcoDDrohUW2FE4SjxE+mH2UxFiWXG5pBTe 3aFy/Py1qVBqolRHUL69HFYqhHp02erQnXVbAyIS3Jy5OYag2mcwI1NkMJ/4Ob/8yz8F UAZVhTbh5DSSW/KBsQml9A0XYTx6xwHxKJUJhxDhuWbiPLVGLBJtwbjqnZWP+tAYfM5v ek6rTS1DQ4YAnlmGzmvjMudOnkeFnm/4NalrAzZw7mxpdJTMCTArPPo0pCTE96F2Mf4L 9HqOQXpjw17MEY9AH4SPw/SgSfWDZoQ/lh3mFDBB1moirtB+tdZ3m25cpvFcMF4b20ah dxVQ== X-Forwarded-Encrypted: i=1; AL+hErGUTwXWrnK6kVSvhcIv07xwpMYGIyFXa2ZAoujc0YRVrfNKKkSgtDk9tASSLqOniFINdrgkS8s0SWrnxw==@vger.kernel.org X-Gm-Message-State: APuU4Z/Jhx2IyVO5GHg5zGFBJmmTp3GYRoUEvGLNtZKChmqcgV7BcCcR rq/+ZpsXCss4wFJGm5Nk81Y0EktsN7PjcxBiDOgqWartNviXzvc+ZVXD X-Gm-Gg: AZFdTZfJ5kYFzqSXQk0jf+4L+kzx+rnqgO8xBjg2k+doEZUYOb+rQMJusBLSJUhEwlI HPNEqjEZLayQR929eCEHeLg6M9ZGHV61N9q2oNAiibf3ESkg89Y/fG1PJGDkqBchaMFUUNupDWi 2jeywQWQeFXeQhaqiGPA/dn8el81j81XDGgyAjKiUAQzPlG2t31C2B7jEZZnSom5lChhgT7waFv nG6GbgC7bj8xTzJ29tTSmzHHTqueBSWOaVl7lcv21pr2Ie0IIKax4Hi3R3APAU6QehfS51MHUck V8NviV7JRpmkqbK2gbPFemnFQhORofNcet/aRYltMeysKaMKe7lmGh44TfSrMZSWaDy6nMTYDNs eMxWwt5eswHT5d3hnODHDCviNg9pl80ua9uioDwGzdNVy6LST7dP0DSNdEbb/WsniLWUoBTiE4T ZbxsJTu4rbbIX2iSN5nVpQneV5BGBgcfEBoe38nlH9qRgui9ioOoGb7my8HSqeRVcXLehXOBvHl pQJCQLySeMHI8VYUPOIit6pDjO8yPuAkL+RDNkbM+CWfPIxNM622ynF1SW5a78iKwjD7kKi8dM0 lMOCsMkXx8Y9oL8XNVIcPxW2IEib5WtmZsrirUxUatpqAUg+GlDwJ/FiosS2hO3kAyTckTmi4yO uxoo/cQ5cW1RgrgqblwkcFEPGdJ88Q+sL6UVILROg0b3G+RwgdsX/iGpFeLZMuWi6QZl+DA8uBc jXhErhRk/02W9qumqaDjZJpTY1VRaiOTLg42MnuWY= 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-hwmon@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