From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B16C218E96 for ; Thu, 5 Jun 2025 23:42:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749166964; cv=none; b=ShUwIXwrXyUpeS/KtlXhdn4jBOy2rz5y4/ip45lGdhzyJ7FfeymhruzWAchwApNB7B9vWOz3meRm2HN7rlptXTnBkTSefFb+EaTx9UfX2lNF0d0xf8+3UgTHCZOUvhTZWStgfz3gwS9BpZm7nMR3dp55skdWlI9NzXxa6Tr8sSY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749166964; c=relaxed/simple; bh=yFzyskKtumsHDsLAzOPWxk/1HdmbQ7Vo4g04cANKcoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=f0NcF6K5Wq4LCaUTrUfmq1v7Zd2E7uoyCvw7tcgoE1CUY3VsLnAZPG7vGU6rrQsekD3XsjJx+q30Xs8ULUy00r2Jx2zFAfNtSpI2Wcjz+CCxiOhOKvxLtC1y65rsgUewHUDTlUOYfX7WHLf4Y9skp2LRpUnALx8QF6Snc4uKSho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RjruqleM; arc=none smtp.client-ip=209.85.210.172 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.b="RjruqleM" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso1808687b3a.2 for ; Thu, 05 Jun 2025 16:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749166962; x=1749771762; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GH9hNFPpMz8Q6rMqsaXZiZgLCZEo74kBRzCVEOjXJY0=; b=RjruqleM1NKpZIfzlhBmxGPL9f9BKZqvrilxID9RAmbjKCGFyj01eUDO5F/XJpzxty 2BzTH9GAHNYFhcfAbqeUzx7Rjp5wioa2yv+d023WiybBthZfgi3+fyom6ENgsn42EN5E zRx3zXyu8UGI+HTVGq54GW/DQ8T2Q8kajr41OjAN867g4oq+76ROou9ojuRSMhwnhukK W3pgtg0S1q8ov/499a5owD17SfCWvF9KsC3PyQJIE7ycY3UOyBzl8+n0mnn4RNRgSDOP 1t2lfMsbdXlVgf3wrUnWMyJn8eu9ObOWz8zy21wnqIR/C/SGBXDKoiyTzLOKJ7gtzd6V qDfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749166962; x=1749771762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GH9hNFPpMz8Q6rMqsaXZiZgLCZEo74kBRzCVEOjXJY0=; b=buZuqFSv/O+4fKM/xKBE46DTuxJJB1DdPsm7ttR/opwM/9CQnaqXDZNP+Glnt7Ba9E SLEQCD2GcIRum4ErLmrzFIDJlKA4CKZ3hjNYVxrGdFQkjDRmxP65xViOU5a5ghAtOlZ+ TiiNc+yEuFWy6ApaLSm0w45Bfuqn3qC4xHX52i3vO4i5M7kEenrNmE8tDhomFYWC0ufi SGcB3okOY8JGk35iSGHfZtmLntTEh8ac0mllVvCdpmrmomSOi7kBJOQsTwt0lgnXS/d/ UsanPDXT9DeZ7r7YHQPsPfDNXZadXHD3lhsAA14a1NenstyfSqSGo9zNuyGk5C4un5wE HbPA== X-Forwarded-Encrypted: i=1; AJvYcCUJ9OrgqasEll1nG/SflzrnTkuqE4O292CB9FI3sPPCxxeLJmQ3dDeTyHd6j4IgVbU4f1qplzYzdDM=@vger.kernel.org X-Gm-Message-State: AOJu0YxL6PQmmoD34z2naQleyOf/cabHAaQNx/e0g/oiyzFK1j3V48E7 34S84ZB/H/lTDT7p4Hh/fvsXhqU59/8Apbj2D5D3AJ40iUqRMdLQoW2T X-Gm-Gg: ASbGncuYuvP8SWgxsM4iow5lYn7UrVRXSBaBiAnA0PJrUzYJ9wyySiRZf8CGw/enrHS pouDZRfEIBvTXrTeyVZbNuAWCL+6xZAWgaVyRbRLK0RSpWtE0Gyl8TyxbPk0VFxaBYGP2z0U3pW xMjihPlEhlK/95Zgy2/q8sUbUw/j7iIFyJYt5yr2HNIPJy0B5jbJLDTr5yrCBn8Sez4rgVcqxAD m/o7KFFUg3O1DGk4c+KSrRkfDc3oEEmC26YmV9paLfXTBwYBbThBpdjB0xRW1v7GwiTmMFaFflS RRcnk7jfHQO8XvMAogYNc9Trv63/8LBqLxQrZbQz2VMUPSJBhEI2OrbjWeCSSGmDQP6gtUws X-Google-Smtp-Source: AGHT+IFGm1WYLbicboBkF812GUAYFtoQQHmVrtviWtRvmyBHsKQY87ZlIgFsAq30K931StEVij+YjA== X-Received: by 2002:a05:6a20:9149:b0:201:b65:81ab with SMTP id adf61e73a8af0-21ee68cc39fmr1260367637.23.1749166962231; Thu, 05 Jun 2025 16:42:42 -0700 (PDT) Received: from deb-101020-bm01.dtc.local ([149.97.161.244]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0847b9sm213916b3a.104.2025.06.05.16.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jun 2025 16:42:41 -0700 (PDT) From: anisa.su887@gmail.com To: qemu-devel@nongnu.org Cc: Jonathan.Cameron@huawei.com, nifan.cxl@gmail.com, dave@stgolabs.net, linux-cxl@vger.kernel.org, Anisa Su Subject: [QEMU PATCH v3 6/9] cxl-mailbox-utils: 0x5602 - FMAPI Set DC Region Config Date: Thu, 5 Jun 2025 23:42:20 +0000 Message-ID: <20250605234227.970187-7-anisa.su887@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250605234227.970187-1-anisa.su887@gmail.com> References: <20250605234227.970187-1-anisa.su887@gmail.com> Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anisa Su FM DCD Management command 0x5602 implemented per CXL r3.2 Spec Section 7.6.7.6.3 Signed-off-by: Anisa Su --- hw/cxl/cxl-mailbox-utils.c | 86 ++++++++++++++++++++++++++++++++++++ hw/mem/cxl_type3.c | 6 +-- include/hw/cxl/cxl_device.h | 3 ++ include/hw/cxl/cxl_mailbox.h | 6 +++ 4 files changed, 98 insertions(+), 3 deletions(-) diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 1b5c7216f9..47b1509a0e 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -121,6 +121,7 @@ enum { FMAPI_DCD_MGMT = 0x56, #define GET_DCD_INFO 0x0 #define GET_HOST_DC_REGION_CONFIG 0x1 + #define SET_DC_REGION_CONFIG 0x2 }; /* CCI Message Format CXL r3.1 Figure 7-19 */ @@ -3387,6 +3388,84 @@ static CXLRetCode cmd_fm_get_host_dc_region_config(const struct cxl_cmd *cmd, return CXL_MBOX_SUCCESS; } +/* CXL r3.2 section 7.6.7.6.3: Set Host DC Region Configuration (Opcode 5602) */ +static CXLRetCode cmd_fm_set_dc_region_config(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + struct { + uint8_t reg_id; + uint8_t rsvd[3]; + uint64_t block_sz; + uint8_t flags; + uint8_t rsvd2[3]; + } QEMU_PACKED *in = (void *)payload_in; + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); + CXLEventDynamicCapacity dcEvent = {}; + CXLDCRegion *region = &ct3d->dc.regions[in->reg_id]; + + /* + * CXL r3.2 7.6.7.6.3: Set DC Region Configuration + * This command shall fail with Unsupported when the Sanitize on Release + * field does not match the region’s configuration... and the device + * does not support reconfiguration of the Sanitize on Release setting. + * + * Currently not reconfigurable, so always fail if sanitize bit (bit 0) + * doesn't match. + */ + if ((in->flags & 0x1) != (region->flags & 0x1)) { + return CXL_MBOX_UNSUPPORTED; + } + + if (in->reg_id >= DCD_MAX_NUM_REGION) { + return CXL_MBOX_UNSUPPORTED; + } + + /* Return success if new block size == current block size */ + if (in->block_sz == region->block_size) { + return CXL_MBOX_SUCCESS; + } + + /* Check that no extents are in the region being reconfigured */ + if (!bitmap_empty(region->blk_bitmap, region->len / region->block_size)) { + return CXL_MBOX_UNSUPPORTED; + } + + /* Check that new block size is supported */ + if (!test_bit(BIT((int) log2(in->block_sz)), + ®ion->supported_blk_size_bitmask)) { + return CXL_MBOX_INVALID_INPUT; + } + + /* Free bitmap and create new one for new block size. */ + qemu_mutex_lock(®ion->bitmap_lock); + g_free(region->blk_bitmap); + region->blk_bitmap = bitmap_new(region->len / in->block_sz); + qemu_mutex_unlock(®ion->bitmap_lock); + region->block_size = in->block_sz; + + /* Create event record and insert into event log */ + cxl_assign_event_header(&dcEvent.hdr, + &dynamic_capacity_uuid, + (1 << CXL_EVENT_TYPE_INFO), + sizeof(dcEvent), + cxl_device_get_timestamp(&ct3d->cxl_dstate)); + dcEvent.type = DC_EVENT_REGION_CONFIG_UPDATED; + dcEvent.validity_flags = 1; + dcEvent.host_id = 0; + dcEvent.updated_region_id = in->reg_id; + + if (cxl_event_insert(&ct3d->cxl_dstate, + CXL_EVENT_TYPE_DYNAMIC_CAP, + (CXLEventRecordRaw *)&dcEvent)) { + cxl_event_irq_assert(ct3d); + } + return CXL_MBOX_SUCCESS; +} + static const struct cxl_cmd cxl_cmd_set[256][256] = { [INFOSTAT][BACKGROUND_OPERATION_ABORT] = { "BACKGROUND_OPERATION_ABORT", cmd_infostat_bg_op_abort, 0, 0 }, @@ -3505,6 +3584,13 @@ static const struct cxl_cmd cxl_cmd_set_fm_dcd[256][256] = { cmd_fm_get_dcd_info, 0, 0 }, [FMAPI_DCD_MGMT][GET_HOST_DC_REGION_CONFIG] = { "GET_HOST_DC_REGION_CONFIG", cmd_fm_get_host_dc_region_config, 4, 0 }, + [FMAPI_DCD_MGMT][SET_DC_REGION_CONFIG] = { "SET_DC_REGION_CONFIG", + cmd_fm_set_dc_region_config, 16, + (CXL_MBOX_CONFIG_CHANGE_COLD_RESET | + CXL_MBOX_CONFIG_CHANGE_CONV_RESET | + CXL_MBOX_CONFIG_CHANGE_CXL_RESET | + CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | + CXL_MBOX_IMMEDIATE_DATA_CHANGE) }, }; /* diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index b872a26173..ee554a77be 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1590,9 +1590,9 @@ void qmp_cxl_inject_correctable_error(const char *path, CxlCorErrorType type, pcie_aer_inject_error(PCI_DEVICE(obj), &err); } -static void cxl_assign_event_header(CXLEventRecordHdr *hdr, - const QemuUUID *uuid, uint32_t flags, - uint8_t length, uint64_t timestamp) +void cxl_assign_event_header(CXLEventRecordHdr *hdr, + const QemuUUID *uuid, uint32_t flags, + uint8_t length, uint64_t timestamp) { st24_le_p(&hdr->flags, flags); hdr->length = length; diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 96ef9be444..76af75d2d0 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -721,4 +721,7 @@ void ct3_clear_region_block_backed(CXLType3Dev *ct3d, uint64_t dpa, uint64_t len); bool ct3_test_region_block_backed(CXLType3Dev *ct3d, uint64_t dpa, uint64_t len); +void cxl_assign_event_header(CXLEventRecordHdr *hdr, + const QemuUUID *uuid, uint32_t flags, + uint8_t length, uint64_t timestamp); #endif diff --git a/include/hw/cxl/cxl_mailbox.h b/include/hw/cxl/cxl_mailbox.h index 9008402d1c..a05d7cb5b7 100644 --- a/include/hw/cxl/cxl_mailbox.h +++ b/include/hw/cxl/cxl_mailbox.h @@ -8,6 +8,7 @@ #ifndef CXL_MAILBOX_H #define CXL_MAILBOX_H +#define CXL_MBOX_CONFIG_CHANGE_COLD_RESET (1) #define CXL_MBOX_IMMEDIATE_CONFIG_CHANGE (1 << 1) #define CXL_MBOX_IMMEDIATE_DATA_CHANGE (1 << 2) #define CXL_MBOX_IMMEDIATE_POLICY_CHANGE (1 << 3) @@ -15,5 +16,10 @@ #define CXL_MBOX_SECURITY_STATE_CHANGE (1 << 5) #define CXL_MBOX_BACKGROUND_OPERATION (1 << 6) #define CXL_MBOX_BACKGROUND_OPERATION_ABORT (1 << 7) +#define CXL_MBOX_SECONDARY_MBOX_SUPPORTED (1 << 8) +#define CXL_MBOX_REQUEST_ABORT_BACKGROUND_OP_SUPPORTED (1 << 9) +#define CXL_MBOX_CEL_10_TO_11_VALID (1 << 10) +#define CXL_MBOX_CONFIG_CHANGE_CONV_RESET (1 << 11) +#define CXL_MBOX_CONFIG_CHANGE_CXL_RESET (1 << 12) #endif -- 2.47.2