From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3AA8EC5AD49 for ; Fri, 30 May 2025 14:08:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uL0Ot-0005NZ-Gn; Fri, 30 May 2025 10:08:00 -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 1uL0Oq-0005ND-Dg for qemu-devel@nongnu.org; Fri, 30 May 2025 10:07:56 -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 1uL0On-0002sZ-3L for qemu-devel@nongnu.org; Fri, 30 May 2025 10:07:56 -0400 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4b84j55tCcz6L5ZN; Fri, 30 May 2025 22:03:53 +0800 (CST) Received: from frapeml500008.china.huawei.com (unknown [7.182.85.71]) by mail.maildlp.com (Postfix) with ESMTPS id D48A81402FC; Fri, 30 May 2025 22:07:33 +0800 (CST) Received: from localhost (10.203.177.66) by frapeml500008.china.huawei.com (7.182.85.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 30 May 2025 16:07:33 +0200 Date: Fri, 30 May 2025 15:07:32 +0100 To: CC: , , , , Anisa Su Subject: Re: [PATCH v2 02/10] cxl-mailbox-utils: 0x5600 - FMAPI Get DCD Info Message-ID: <20250530150732.00007220@huawei.com> In-Reply-To: <20250508001754.122180-3-anisa.su887@gmail.com> References: <20250508001754.122180-1-anisa.su887@gmail.com> <20250508001754.122180-3-anisa.su887@gmail.com> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.42; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.177.66] X-ClientProxiedBy: lhrpeml100011.china.huawei.com (7.191.174.247) To frapeml500008.china.huawei.com (7.182.85.71) X-Host-Lookup-Failed: Reverse DNS lookup failed for 185.176.79.56 (deferred) Received-SPF: pass client-ip=185.176.79.56; envelope-from=jonathan.cameron@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: Jonathan Cameron From: Jonathan Cameron via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, 8 May 2025 00:00:58 +0000 anisa.su887@gmail.com wrote: > From: Anisa Su > > FM DCD Management command 0x5600 implemented per CXL 3.2 Spec Section 7.6.7.6.1. > > Signed-off-by: Anisa Su Looks like a missing include - though probably due to some indirect include going away. > --- > hw/cxl/cxl-mailbox-utils.c | 56 ++++++++++++++++++++++++++++++++++++ > hw/cxl/i2c_mctp_cxl.c | 6 ++-- > hw/mem/cxl_type3.c | 4 +++ > include/hw/cxl/cxl_device.h | 1 + > include/hw/cxl/cxl_opcodes.h | 3 ++ > 5 files changed, 68 insertions(+), 2 deletions(-) > > diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c > index ed3294530f..d3c69233b8 100644 > --- a/hw/cxl/cxl-mailbox-utils.c > +++ b/hw/cxl/cxl-mailbox-utils.c > @@ -3280,6 +3280,52 @@ static CXLRetCode cmd_dcd_release_dyn_cap(const struct cxl_cmd *cmd, > return CXL_MBOX_SUCCESS; > } > > +/* CXL r3.2 section 7.6.7.6.1: Get DCD Info (Opcode 5600h) */ > +static CXLRetCode cmd_fm_get_dcd_info(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 num_hosts; > + uint8_t num_regions_supported; > + uint8_t rsvd1[2]; > + uint16_t add_select_policy_bitmask; > + uint8_t rsvd2[2]; > + uint16_t release_select_policy_bitmask; > + uint8_t sanitize_on_release_bitmask; > + uint8_t rsvd3; > + uint64_t total_dynamic_capacity; > + uint64_t region_blk_size_bitmasks[8]; > + } QEMU_PACKED *out = (void *)payload_out; > + CXLType3Dev *ct3d = CXL_TYPE3(cci->d); > + CXLDCRegion *region; > + int i; > + > + out->num_hosts = 1; > + out->num_regions_supported = ct3d->dc.num_regions; > + stw_le_p(&out->add_select_policy_bitmask, > + BIT(CXL_EXTENT_SELECTION_POLICY_PRESCRIPTIVE)); Something seems to have changed upstream so this now needs #include to get these enum values. > + stw_le_p(&out->release_select_policy_bitmask, > + BIT(CXL_EXTENT_REMOVAL_POLICY_PRESCRIPTIVE)); > + out->sanitize_on_release_bitmask = 0; > + > + stq_le_p(&out->total_dynamic_capacity, > + ct3d->dc.total_capacity / CXL_CAPACITY_MULTIPLIER); > + > + for (i = 0; i < ct3d->dc.num_regions; i++) { > + region = &ct3d->dc.regions[i]; > + memcpy(&out->region_blk_size_bitmasks[i], > + ®ion->supported_blk_size_bitmask, > + sizeof(out->region_blk_size_bitmasks[i])); > + } > + > + *len_out = sizeof(*out); > + 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 }, > @@ -3401,6 +3447,11 @@ static const struct cxl_cmd cxl_cmd_set_sw[256][256] = { > cmd_tunnel_management_cmd, ~0, 0 }, > }; > > +static const struct cxl_cmd cxl_cmd_set_fm_dcd[256][256] = { > + [FMAPI_DCD_MGMT][GET_DCD_INFO] = { "GET_DCD_INFO", > + cmd_fm_get_dcd_info, 0, 0 }, > +}; > + > /* > * While the command is executing in the background, the device should > * update the percentage complete in the Background Command Status Register > @@ -3703,7 +3754,12 @@ void cxl_initialize_t3_fm_owned_ld_mctpcci(CXLCCI *cci, DeviceState *d, > DeviceState *intf, > size_t payload_max) > { > + CXLType3Dev *ct3d = CXL_TYPE3(d); > + > cxl_copy_cci_commands(cci, cxl_cmd_set_t3_fm_owned_ld_mctp); > + if (ct3d->dc.num_regions) { > + cxl_copy_cci_commands(cci, cxl_cmd_set_fm_dcd); > + } > cci->d = d; > cci->intf = intf; > cxl_init_cci(cci, payload_max); > diff --git a/hw/cxl/i2c_mctp_cxl.c b/hw/cxl/i2c_mctp_cxl.c > index 7d2cbc3b75..dd5fc4f393 100644 > --- a/hw/cxl/i2c_mctp_cxl.c > +++ b/hw/cxl/i2c_mctp_cxl.c > @@ -29,6 +29,7 @@ > #include "hw/pci/pcie_port.h" > #include "hw/qdev-properties.h" > #include "hw/registerfields.h" > +#include "hw/cxl/cxl_opcodes.h" > > #define TYPE_I2C_MCTP_CXL "i2c_mctp_cxl" > > @@ -198,9 +199,10 @@ static void i2c_mctp_cxl_handle_message(MCTPI2CEndpoint *mctp) > */ > > if (!(msg->message_type == MCTP_MT_CXL_TYPE3 && > - msg->command_set < 0x51) && > + msg->command_set < PHYSICAL_SWITCH) && > !(msg->message_type == MCTP_MT_CXL_FMAPI && > - msg->command_set >= 0x51 && msg->command_set < 0x56)) { > + msg->command_set >= PHYSICAL_SWITCH && > + msg->command_set < GLOBAL_MEMORY_ACCESS_EP_MGMT)) { > buf->rc = CXL_MBOX_UNSUPPORTED; > st24_le_p(buf->pl_length, len_out); > s->len = s->pos; > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index 11c38a9292..7129da0940 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -8,6 +8,7 @@ > * > * SPDX-License-Identifier: GPL-v2-only > */ > +#include > > #include "qemu/osdep.h" > #include "qemu/units.h" > @@ -766,6 +767,8 @@ static bool cxl_create_dc_regions(CXLType3Dev *ct3d, Error **errp) > uint64_t region_len; > uint64_t decode_len; > uint64_t blk_size = 2 * MiB; > + /* Only 1 block size is supported for now. */ > + uint64_t supported_blk_size_bitmask = BIT((int) log2(blk_size)); > CXLDCRegion *region; > MemoryRegion *mr; > uint64_t dc_size; > @@ -811,6 +814,7 @@ static bool cxl_create_dc_regions(CXLType3Dev *ct3d, Error **errp) > .block_size = blk_size, > /* dsmad_handle set when creating CDAT table entries */ > .flags = 0, > + .supported_blk_size_bitmask = supported_blk_size_bitmask, > }; > ct3d->dc.total_capacity += region->len; > region->blk_bitmap = bitmap_new(region->len / region->block_size); > diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h > index ca515cab13..bebed04085 100644 > --- a/include/hw/cxl/cxl_device.h > +++ b/include/hw/cxl/cxl_device.h > @@ -608,6 +608,7 @@ typedef struct CXLDCRegion { > uint32_t dsmadhandle; > uint8_t flags; > unsigned long *blk_bitmap; > + uint64_t supported_blk_size_bitmask; > } CXLDCRegion; > > typedef struct CXLSetFeatureInfo { > diff --git a/include/hw/cxl/cxl_opcodes.h b/include/hw/cxl/cxl_opcodes.h > index 26d3a99e8a..c4c233665e 100644 > --- a/include/hw/cxl/cxl_opcodes.h > +++ b/include/hw/cxl/cxl_opcodes.h > @@ -61,4 +61,7 @@ enum { > #define MANAGEMENT_COMMAND 0x0 > MHD = 0x55, > #define GET_MHD_INFO 0x0 > + FMAPI_DCD_MGMT = 0x56, > + #define GET_DCD_INFO 0x0 > + GLOBAL_MEMORY_ACCESS_EP_MGMT = 0X59 > };