From nobody Mon Feb 9 00:29:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770231844; cv=none; d=zohomail.com; s=zohoarc; b=lVGZzQJv+XBF6IguK8NNN0mgdippFQupxNjSvgjvaLtpLM1CW2w/d9ENnzWN9DdZ3v4Vb1sMB6t/qG8Fd7ezJoXlv1YPofpbyBY4VM95/zwk7NuQUZ5Ok//nFU1WPNp1D0AbZEas+5S2qs016J/u0Q90ukqvSG/KqVp/kZEpaws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770231844; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RVtC1wf0FBZ9jTZJuqaS0e+wWBhP4Y6BUbTgsT8PmAg=; b=PgF5+ga40OkvtI/k89SwYeDcSX389xTQ/P6KSS9V6Ox2FqaXJNQZQtmjTdEx6pz29SrxYi5YsPcd7uSmneRDBOJmq9GsqgHOUUadpBR7yW0N2oYKUyeHHEGLFf9yjEYijBOn/3gT1cGP1h7BP94qxdChuiTzNBYh8T64R6yqDx8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770231844008183.7335702937346; Wed, 4 Feb 2026 11:04:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vni9r-0006DB-VZ; Wed, 04 Feb 2026 14:03:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vni9h-00061n-QH for qemu-devel@nongnu.org; Wed, 04 Feb 2026 14:03:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vni9g-0007jI-2Q for qemu-devel@nongnu.org; Wed, 04 Feb 2026 14:03:13 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-cOFnvIhENfK5SMe3e1TDrQ-1; Wed, 04 Feb 2026 14:03:09 -0500 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-47edfdc6c1aso802525e9.3 for ; Wed, 04 Feb 2026 11:03:08 -0800 (PST) Received: from redhat.com (IGLD-80-230-34-155.inter.net.il. [80.230.34.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4830ffc9f3asm26041975e9.19.2026.02.04.11.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 11:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770231790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=RVtC1wf0FBZ9jTZJuqaS0e+wWBhP4Y6BUbTgsT8PmAg=; b=NsbJ3k12NbwxlFCYDQapIY1IY6qoHKuPGeOYpuXiXq69qTtu2lym8pNUAuzjhR8Blpv/li ma0Wv89gASRhmDxrMdAtUnTgMPR0WdRcz0rZD9rw8iLi7Zh4/a3uZFPPcCjUf/UDGa/2iA ku18F+EnccpVCf/eZ4ecKXBC9ND+ZCo= X-MC-Unique: cOFnvIhENfK5SMe3e1TDrQ-1 X-Mimecast-MFC-AGG-ID: cOFnvIhENfK5SMe3e1TDrQ_1770231788 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770231787; x=1770836587; darn=nongnu.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RVtC1wf0FBZ9jTZJuqaS0e+wWBhP4Y6BUbTgsT8PmAg=; b=EPrAJHJM4ks2VmUqgXWJ89XkBuC1FqC1qlYnTW4K+fly9hiqlWAnOC6/0/nrcmCMZ5 EJYSGKCOM3vaRDrwTeVMJk2lIuJkjpBMzzkG2Ld+iIoQ8sWLxeI5aQNWxX+J5sSvUfjR 84iaHXGgiGlb9XoDrSyYtPHa+CzLyN7Vf9thjav3QiLG/mLPUSR39GYH9yMO5Zm+3Zq1 zA0B0jfmzi2Zu7u/KbHxAz6W0sjbHzo4a2LT2Lzs06aTH/uFDN3/CT5nsZ6NSxSXE6ag sqyrpt9qWOznTA4nEF82b1E3au874QY0CBvzAwEgfEBcmKpBE6DKHQwGvp+oAckH2osZ mpXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770231787; x=1770836587; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RVtC1wf0FBZ9jTZJuqaS0e+wWBhP4Y6BUbTgsT8PmAg=; b=xAqZ8LFg1O90Mwrnli7Ot0QFX4NHIIfDVB3d/O2I8rX74F9l3Tvhkw46OxlNRu+DrM 6Ny9rjJ+sKHjAsup26a22TckCKol+cZEc8DHtyFUReZ5RsnLxdrMSk1mEZu6N19k2wZO jYn/ZPN0AfSOoUcW4n0yk+UlovjNmB2XjckuCRGV6jYHDkeNvH0oEzPeerRuSXjb/sC+ IGYwQgQhljR1bXp2B68hdp6EmaZXk0UnOzz72tWLzjv0z6rFmQ2CzrL9CAO11VjTYf2F q4Utw3hKkKkqBGV4i74mvcJudxkd4VLbUuUY0tM22aejKLdayQaTUsf2cmlaWWtG8YGe InIw== X-Gm-Message-State: AOJu0Yw7prxO+LwhxtEpSbLJ9ezUN7wz3rMpaYx81/ec+b+lak40qfGI qz11I+TUOF5H9Cz1Zsu6mCOpoiKqN9RhJaYSyLZkvdcr0vwx9f02I+z26DC4LiVNZym8huoj+qC wEVX2QDQefX1ZaQ2SWRf610hj7kw+0uenFXFbbcdXK8r+2Z3Im18Y7TA9rlspOFGolOv8gE5fI1 z4xro4zhT2F5ZHSuyGVhFTZFLiZu9VBuS4lg== X-Gm-Gg: AZuq6aJ40Qn5MRUSdspiBaNAWM1oecuuc5e15rgsnZg41Qb557n4qpSBJFGpsoV41yq EvWC4SlFrOJlzgdtxpcO/cgBpAqAMgXf1HzVFPU0BCYw02FNQP3D1iBATbT8YK9Jz5VV45bontq cL7JGHJoV0OPButrA1ilT3gvBX+HOhqxp512t6vGrXvwer4JsQ5Sxqpp6aFHb2VxmiC0UJgfit3 opi9F+TYhpjhGKqV2effusmh4sQUBJGRtlpJv7m3yiT1PWrru/P5ABgKAMkbfJCplYB3MynRZ83 FzC0JM8eGo9KwFjpKaEV8VoCn+MKCo9JBmJNdQe5e8AjoXKj+x+bWJEvD1gX7idt+Npg455rm66 jbHCWXKzczN7h+yvJh3qAxvKxuY4H5M1GUw== X-Received: by 2002:a05:600c:1c02:b0:475:dd89:acb with SMTP id 5b1f17b1804b1-4830e96fb19mr59629135e9.22.1770231787415; Wed, 04 Feb 2026 11:03:07 -0800 (PST) X-Received: by 2002:a05:600c:1c02:b0:475:dd89:acb with SMTP id 5b1f17b1804b1-4830e96fb19mr59628545e9.22.1770231786946; Wed, 04 Feb 2026 11:03:06 -0800 (PST) Date: Wed, 4 Feb 2026 14:03:04 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Shiju Jose , Jonathan Cameron , Fan Ni , Eric Blake , Markus Armbruster Subject: [PULL 07/51] hw/cxl/events: Updates for rev3.2 general media event record Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770231846016154100 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Shiju Jose CXL spec rev3.2 section 8.2.10.2.1.1 Table 8-57, general media event table has updated with following new fields. 1. Advanced Programmable Corrected Memory Error Threshold Event Flags 2. Corrected Memory Error Count at Event 3. Memory Event Sub-Type 4. Support for component ID in the PLDM format. Add updates for the above spec changes in the CXL general media event reporting and QMP command to inject general media event. In order to have one consistent source of references, update all to references for this command to CXL r3.2. Signed-off-by: Shiju Jose Signed-off-by: Jonathan Cameron Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Message-Id: <20260114142713.617806-4-Jonathan.Cameron@huawei.com> --- hw/mem/cxl_type3.c | 29 +++++++++++++++++++++++++++++ hw/mem/cxl_type3_stubs.c | 6 ++++++ include/hw/cxl/cxl_events.h | 7 +++++-- qapi/cxl.json | 25 +++++++++++++++++++------ 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index e5248ba4b6..73fd85daa7 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1716,6 +1716,11 @@ static const QemuUUID memory_module_uuid =3D { #define CXL_GMER_VALID_RANK BIT(1) #define CXL_GMER_VALID_DEVICE BIT(2) #define CXL_GMER_VALID_COMPONENT BIT(3) +#define CXL_GMER_VALID_COMPONENT_ID_FORMAT BIT(4) + +#define CXL_GMER_EV_DESC_UCE BIT(0) +#define CXL_GMER_EV_DESC_THRESHOLD_EVENT BIT(1) +#define CXL_GMER_EV_DESC_POISON_LIST_OVERFLOW_EVENT BIT(2) =20 static int ct3d_qmp_cxl_event_log_enc(CxlEventLog log) { @@ -1816,6 +1821,12 @@ void qmp_cxl_inject_general_media_event(const char *= path, CxlEventLog log, bool has_rank, uint8_t rank, bool has_device, uint32_t device, const char *component_id, + bool has_comp_id_pldm, + bool is_comp_id_pldm, + bool has_cme_ev_flags, + uint8_t cme_ev_flags, + bool has_cme_count, uint32_t cme_c= ount, + uint8_t sub_type, Error **errp) { Object *obj =3D object_resolve_path(path, NULL); @@ -1881,10 +1892,28 @@ void qmp_cxl_inject_general_media_event(const char = *path, CxlEventLog log, strncpy((char *)gem.component_id, component_id, sizeof(gem.component_id) - 1); valid_flags |=3D CXL_GMER_VALID_COMPONENT; + if (has_comp_id_pldm && is_comp_id_pldm) { + valid_flags |=3D CXL_GMER_VALID_COMPONENT_ID_FORMAT; + } } =20 stw_le_p(&gem.validity_flags, valid_flags); =20 + if (has_cme_ev_flags) { + gem.cme_ev_flags =3D cme_ev_flags; + } else { + gem.cme_ev_flags =3D 0; + } + + if (has_cme_count) { + descriptor |=3D CXL_GMER_EV_DESC_THRESHOLD_EVENT; + st24_le_p(gem.cme_count, cme_count); + } else { + st24_le_p(gem.cme_count, 0); + } + + gem.sub_type =3D sub_type; + if (cxl_event_insert(cxlds, enc_log, (CXLEventRecordRaw *)&gem)) { cxl_event_irq_assert(ct3d); } diff --git a/hw/mem/cxl_type3_stubs.c b/hw/mem/cxl_type3_stubs.c index 91b1478114..2047e97846 100644 --- a/hw/mem/cxl_type3_stubs.c +++ b/hw/mem/cxl_type3_stubs.c @@ -27,6 +27,12 @@ void qmp_cxl_inject_general_media_event(const char *path= , CxlEventLog log, bool has_rank, uint8_t rank, bool has_device, uint32_t device, const char *component_id, + bool has_comp_id_pldm, + bool is_comp_id_pldm, + bool has_cme_ev_flags, + uint8_t cme_ev_flags, + bool has_cme_count, uint32_t cme_c= ount, + uint8_t sub_type, Error **errp) {} =20 void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log, diff --git a/include/hw/cxl/cxl_events.h b/include/hw/cxl/cxl_events.h index a88fbab751..a3f69b99a4 100644 --- a/include/hw/cxl/cxl_events.h +++ b/include/hw/cxl/cxl_events.h @@ -115,10 +115,10 @@ typedef struct CXLEventInterruptPolicy { =20 /* * General Media Event Record - * CXL r3.1 Section 8.2.9.2.1.1; Table 8-45 + * CXL r3.2 Section 8.2.10.2.1.1; Table 8-57 */ #define CXL_EVENT_GEN_MED_COMP_ID_SIZE 0x10 -#define CXL_EVENT_GEN_MED_RES_SIZE 0x2e +#define CXL_EVENT_GEN_MED_RES_SIZE 0x29 typedef struct CXLEventGenMedia { CXLEventRecordHdr hdr; uint64_t phys_addr; @@ -130,6 +130,9 @@ typedef struct CXLEventGenMedia { uint8_t rank; uint8_t device[3]; uint8_t component_id[CXL_EVENT_GEN_MED_COMP_ID_SIZE]; + uint8_t cme_ev_flags; + uint8_t cme_count[3]; + uint8_t sub_type; uint8_t reserved[CXL_EVENT_GEN_MED_RES_SIZE]; } QEMU_PACKED CXLEventGenMedia; =20 diff --git a/qapi/cxl.json b/qapi/cxl.json index 82001c0591..c159687f84 100644 --- a/qapi/cxl.json +++ b/qapi/cxl.json @@ -64,22 +64,22 @@ ## # @CXLGeneralMediaEvent: # -# Event record for a General Media Event (CXL r3.0 8.2.9.2.1.1). +# Event record for a General Media Event (CXL r3.2 8.2.10.2.1.1). # # @dpa: Device Physical Address (relative to @path device). Note -# lower bits include some flags. See CXL r3.0 Table 8-43 General +# lower bits include some flags. See CXL r3.2 Table 8-57 General # Media Event Record, Physical Address. # # @descriptor: Memory Event Descriptor with additional memory event -# information. See CXL r3.0 Table 8-43 General Media Event +# information. See CXL r3.2 Table 8-57 General Media Event # Record, Memory Event Descriptor for bit definitions. # -# @type: Type of memory event that occurred. See CXL r3.0 Table 8-43 +# @type: Type of memory event that occurred. See CXL r3.2 Table 8-57 # General Media Event Record, Memory Event Type for possible # values. # # @transaction-type: Type of first transaction that caused the event -# to occur. See CXL r3.0 Table 8-43 General Media Event Record, +# to occur. See CXL r3-2 Table 8-57 General Media Event Record, # Transaction Type for possible values. # # @channel: The channel of the memory event location. A channel is an @@ -94,6 +94,16 @@ # @component-id: Device specific component identifier for the event. # May describe a field replaceable sub-component of the device. # +# @is-comp-id-pldm: This flag specifies whether the device-specific +# component identifier format follows PLDM. +# +# @cme-ev-flags: Advanced programmable corrected memory error +# threshold event flags. +# +# @cme-count: Corrected memory error count at event. +# +# @sub-type: Memory event sub-type. +# # Since: 8.1 ## { 'struct': 'CXLGeneralMediaEvent', @@ -101,7 +111,10 @@ 'data': { 'dpa': 'uint64', 'descriptor': 'uint8', 'type': 'uint8', 'transaction-type': 'uint8', '*channel': 'uint8', '*rank': 'uint8', - '*device': 'uint32', '*component-id': 'str' } } + '*device': 'uint32', '*component-id': 'str', + '*is-comp-id-pldm':'bool', + '*cme-ev-flags':'uint8', '*cme-count':'uint32', + 'sub-type':'uint8' } } =20 ## # @cxl-inject-general-media-event: --=20 MST