From nobody Sat Nov 15 16:38:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1750346248; cv=none; d=zohomail.com; s=zohoarc; b=UV68M7RuAD0EXYvMnFhYtqTN0aooZidBKRmzxzeA+iS6CObrSl5XHwTXRo8npOlo7sPvG1sFzlZKlAN2msefMoSmC5cujS5RPOwWq5I24t1rUW6ATcI4mvZRkLdUF2aPHNBXRW+/C7eM7413TY5YRkEQ7krjj1r8AqLRiHYyz8A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750346248; h=Content-Type:Content-Transfer-Encoding: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:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=st9CXBpkKiPvPoVyu/sYhUoRkaWmZZo+pQU2RVCDuE8=; b=LPZUZlerxYQZki2Ezpq2oeRGUkbloZW7kD/aybE/1oMvPy8/o7TBzBQyNDhUeRXreX+sVbT7FZFwv29997sNkgye3mjLZxoUH+IeroKLRQ84lqdXKDjGOCOrlp6h9qIOwMkWWbpJWQKj2xw7ze5kDV1wOkyXtk9jxVdTcqNGOuw= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750346248254593.0996696389395; Thu, 19 Jun 2025 08:17:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uSH0f-0002pf-42; Thu, 19 Jun 2025 11:17:01 -0400 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 1uSH0d-0002nF-3b for qemu-devel@nongnu.org; Thu, 19 Jun 2025 11:16:59 -0400 Received: from [185.176.79.56] (helo=frasgout.his.huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uSH0a-00020h-6D for qemu-devel@nongnu.org; Thu, 19 Jun 2025 11:16:58 -0400 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4bNPGQ6QLlz6L6DB; Thu, 19 Jun 2025 23:11:58 +0800 (CST) Received: from frapeml500007.china.huawei.com (unknown [7.182.85.172]) by mail.maildlp.com (Postfix) with ESMTPS id 8743614033C; Thu, 19 Jun 2025 23:16:42 +0800 (CST) Received: from P_UKIT01-A7bmah.china.huawei.com (10.195.246.81) by frapeml500007.china.huawei.com (7.182.85.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 19 Jun 2025 17:16:41 +0200 To: , , CC: , , , Subject: [PATCH v2 2/7] hw/cxl/events: Updates for rev3.2 general media event record Date: Thu, 19 Jun 2025 16:16:14 +0100 Message-ID: <20250619151619.1695-3-shiju.jose@huawei.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20250619151619.1695-1-shiju.jose@huawei.com> References: <20250619151619.1695-1-shiju.jose@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.195.246.81] X-ClientProxiedBy: lhrpeml500006.china.huawei.com (7.191.161.198) To frapeml500007.china.huawei.com (7.182.85.172) X-Host-Lookup-Failed: Reverse DNS lookup failed for 185.176.79.56 (deferred) 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=185.176.79.56; envelope-from=shiju.jose@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: From: shiju.jose--- via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1750346249652116600 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 Add updates for the above spec changes in the CXL general media event reporting and QMP command to inject general media event. Signed-off-by: Shiju Jose --- hw/mem/cxl_type3.c | 9 +++++++++ hw/mem/cxl_type3_stubs.c | 3 +++ include/hw/cxl/cxl_events.h | 7 +++++-- qapi/cxl.json | 14 +++++++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 0787a9bfca..410ff445d0 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1813,6 +1813,7 @@ 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) =20 static int ct3d_qmp_cxl_event_log_enc(CxlEventLog log) { @@ -1840,6 +1841,9 @@ void qmp_cxl_inject_general_media_event(const char *p= ath, CxlEventLog log, bool has_rank, uint8_t rank, bool has_device, uint32_t device, const char *component_id, + uint8_t cme_ev_flags, + uint32_t cme_count, + uint8_t sub_type, Error **errp) { Object *obj =3D object_resolve_path(path, NULL); @@ -1898,10 +1902,15 @@ 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; + valid_flags |=3D CXL_GMER_VALID_COMPONENT_ID_FORMAT; } =20 stw_le_p(&gem.validity_flags, valid_flags); =20 + gem.cme_ev_flags =3D cme_ev_flags; + st24_le_p(gem.cme_count, cme_count); + 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 263d8b4609..b2a11bded8 100644 --- a/hw/mem/cxl_type3_stubs.c +++ b/hw/mem/cxl_type3_stubs.c @@ -23,6 +23,9 @@ 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, + uint8_t cme_ev_flags, + uint32_t cme_count, + uint8_t sub_type, Error **errp) {} =20 void qmp_cxl_inject_dram_event(const char *path, CxlEventLog log, uint32_t= flags, diff --git a/include/hw/cxl/cxl_events.h b/include/hw/cxl/cxl_events.h index 4d9cfdb621..352f9891bd 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 c38585d3c8..dd01d50c25 100644 --- a/qapi/cxl.json +++ b/qapi/cxl.json @@ -82,6 +82,16 @@ # @component-id: Device specific component identifier for the event. # May describe a field replaceable sub-component of the device. # +# @cme-ev-flags: Advanced programmable corrected memory error +# threshold event flags. +# See CXL r3.2 Table 8-57 General Media Event Record. +# +# @cme-count: Corrected memory error count at event. +# See CXL r3.2 Table 8-57 General Media Event Record. +# +# @sub-type: Memory event sub-type. +# See CXL r3.2 Table 8-57 General Media Event Record. +# # Since: 8.1 ## { 'command': 'cxl-inject-general-media-event', @@ -91,7 +101,9 @@ 'dpa': 'uint64', 'descriptor': 'uint8', 'type': 'uint8', 'transaction-type': 'uint8', '*channel': 'uint8', '*rank': 'uint8', - '*device': 'uint32', '*component-id': 'str' } } + '*device': 'uint32', '*component-id': 'str', + 'cme-ev-flags':'uint8', 'cme-count':'uint32', + 'sub-type':'uint8' } } =20 ## # @cxl-inject-dram-event: --=20 2.43.0