From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.224.45 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795046991; b=vP1SPPvcyXPfB+/PfKF3CfHm/qaJz+L2K3grFtZLgUwFF3P7iatVMxtnH+sKUx5HetMe RrGACC567uiSODd24RbHz8+em2JTBjcL7QzaGDDJ1cZ3r+fNb6iIMAmUq7yJVo0vOm57m m3SgIQ/1vp14GKN2NZo/E+AIrkBKlRy3VE0O8eYYm9sDE97iw37P7n9ch2WycVNZ/Tfos m6cJ1nzm9HNWqX8i+YsROBBND8Z3djcWssdX8JumanaijFL3wDFIitLfwCa9/rkxRDsYI gWdZpTZ7NeH+Atu9N1xWw7DNA5XK5/UcUrPfy8+K675WHRlv4FC3HujS/wnVhTwG72A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795046991; 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=BLPr2V+6P1cgyjq9tEYgPW0BrtnD8fux3EBJ1CeFpho=; b=gRN8WkVJ6ATh17dPfgQTTq9C8a1BtRekxr3b3sW3NF7XwBbO5KL8MbQTL7ae9tWwjD3C P2TX/YkaJCxmuMfNe85uWkeIlpW86uYLdFi2FC+GSJwHxgW3gjK01XtWr9cH3lFYPZP/F FS8p+L9PQiwV9sJZkMF9DX37xeUJqarCHCeg8zezICKbWwf4W4LnZ3cWOws4snVKJgpmZ 0IEYRhiiqWe5zlLydhF+hHoWRmQjBS7vTJBD75LPK3M64bKAfyXSIqaDvtwmGyU3ntnwc 8gUovcjhSJOCKag9BhalgMFbqh0fzUjOzfNMt9JCyxsgb4aZ9VF4pnaUvrY26jeTj5g== 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=uGoKxSaH; arc=none smtp.remote-ip=74.125.224.45 Received: from mail-yx1-f45.google.com (mail-yx1-f45.google.com [74.125.224.45]) (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 38ADF606A32F for ; Thu, 19 Nov 2026 00:09:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 38ADF606A32F 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=uGoKxSaH Received: by mail-yx1-f45.google.com with SMTP id 956f58d0204a3-67db3a48dc6so1989602d50.3 for ; Wed, 18 Nov 2026 16:09:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795046990; x=1795651790; 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=BLPr2V+6P1cgyjq9tEYgPW0BrtnD8fux3EBJ1CeFpho=; b=uGoKxSaH3y4gXNtIiczsKy6HTq2nDiXYwDcnV1fEoypwq+KRC0N0raigV6+l8adxyQ 9cPkpNV5SSAWgQOT7JMbgBXIWqoX4qL7qDDGPv1sssvEgIG8z0Jx5P7lDLZiHbGg5knh /+f2DSL2HabRj6entLgqGfQDZLS8Tn6V4OcygMR7TciHgA245eJaLvxeWB+ktP3saEUF AwhqoLxLgt8JiLGBnSTL6zNFBRM/kx55SU1uLjdHttYGjNX6ROFayf0nmMnvwVN+w4mA 8u9a/zfqIDCKG7EfHTzll9d6r4FkkJKxDbIoRWs0SvCklmRL2GJrdT0fMs0hll+D/gr8 g70w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795046990; x=1795651790; 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=BLPr2V+6P1cgyjq9tEYgPW0BrtnD8fux3EBJ1CeFpho=; b=zoYLlXZEdBJ1rg6SLWED5NN87UdFk15gzHEGitzBLDQDWIQUsKw+1hBtweNyfAP6jP sQ5MpCOTauTs+8EBUjGY7muz4piMp5hfiG0oWkX1dHorzUvs7FIH4Mbymff/PFsc9Wn7 HpUChzX6JmzkLtO1r1AuZg7wTMrITcX/23SApNZ9SAKJ8fmTVAMxjXYzxkptFZoeSwLy vKzELKDH3AdIRVHDl0NIiH/lUjnsbpODP3NSGydV56OLkCOQY2qa/GBQDYrXM/+iOHmH 5/BtOY7LvAw2mHqM7Ig79HlPB0rpgGtTo2lYQoLNFTzoZU++vUaaH9AJuslPLSmRHMTP dSMQ== X-Forwarded-Encrypted: i=1; AL+hErESmfs0BLAGmAfJcBC03ZnXwozLcSJFQufy3cKi12ZGJtW2ib/8X/7QH/svSPOZPUJUAhgnJmDqR24=@vger.kernel.org X-Gm-Message-State: APuU4Z9J0L1BDHjyhOdkeRTYKMees65AoDvSo5ogVJZpVKem75UizUoa QjhswgvzEeJbo5gKxyAqw5wsaROw3T4Jhd2IPi+4+rdZMJ2WJ72gQbi5 X-Gm-Gg: AZFdTZfUPqWynorhlCqWE6tfoyqpCLQKf+BsxcMqPRkOIOb0BZqYOcPNZzXpfo86C24 UrxiApZgOpJyT3THaYXMjkfmCxT+nOJ1YXAisxhANVE0zlZKPMPR8UpP3ymfwKsFViDLt5SDxSk MfsccFK16uVpkdK1KPxf4T9ooM8KXOteZExQ7UzQu9hFHPS09EW3hHfdrriG+Zzenpj2MWWh0Y0 Y4Lj75XoTYOK4Kg3AVVgt+1onSklNoDVxZ4tCMm6VD1MdijSbCUP9xxI1xVOCt/LATrg375++HA ossGwDTAG0HF+MEEcwUWhoSSiWtce6dOpzGisRyNAMZgJlyKgw1vPfcT4wc2kBvW8BKB0aRkO61 LdEyRs/M+XmdH5fO+60ZL/kApa+PL+NSRU0Qr+eKvpt4ey75G7sRq/xWoGNxyUgCq3k6TVjk0jX t6cW4PupwjDZaivmGET5euxkw1xDLXqYyjZImGc/7EqxhqgRrC0FLYRAz8KtB8NsykPi7/gmS0i H0EgN5ybCMmt0URMdC/THOqgypgnYP6NinbttJyXGjhB+aWtP7ZXS7Mv7ne8tXunL/d78bPawQH KYIV+XQXEhUvDmSRsGonvVEdxSo2ySifpjCkZrjGe5qEWknlpBoFls2I+9BpxFgB9gZkzx1iTaj 8JmfE4OWn/P39BxGkW9Ui0o7UdqN/ZHdpPbEX+CbYyuQkQaUYAW27m+ZOnEbWCqsAeaEh13f5jn axYxvYzK9WEki+WRb3aw== X-Received: by 2002:a05:690e:d49:b0:67d:b3d9:4d7d with SMTP id 956f58d0204a3-67dd3fc167dmr1357561d50.119.1795046990082; Wed, 18 Nov 2026 16:09:50 -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-8b508a8fffasm11811227b3.38.2026.11.18.16.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 16:09:49 -0800 (PST) From: Matt Turner Date: Wed, 18 Nov 2026 19:09:46 -0500 Subject: [PATCH v4 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: <20261118-marvel-env-v4-1-200317e496c2@gmail.com> References: <20261118-marvel-env-v4-0-200317e496c2@gmail.com> In-Reply-To: <20261118-marvel-env-v4-0-200317e496c2@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=3408; i=mattst88@gmail.com; h=from:subject:message-id; bh=2pCcGSD8Q2U2vRKlcElv/Q3go4/cqt+mECXmZN/jfjU=; b=owGbwMvMwCW25rVmCc8sv+mMp9WSGLL+2Xl5hixtDixsn173razO+uLUkHUCJy8FHXbqkBGPc n+36P/Tjo8sDGJcDDPFFFni1iuyzGrbsdTntPQvmDmsTCBDpEUaGICAhYEvNzGv1EjHSM9U21DP EMjQMYqHyOkxaGQWF5emFummFRQ55OWXJJZk5ucV6+UXpOYVpBfopWWmlWRk5BcVpwKN0MtLLTF 1dXQzMjQwsXS0MHOycDQ1cXZ2MnRyc3R0dnUysjQ3MXC2dDRxtTRn4OIUgLnm4mNGhgXLzL+IM6 7L3iVcz+ClEMb042Lw4sXHSlLMPjMzd+1vkGNkuO/llGBX3FkrZNt70W1jx4038kIbltq5c4Skq +4WYY1hAwA= 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. Reviewed-by: Magnus Lindholm 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