From nobody Thu May 16 23:40:21 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693531850; cv=none; d=zohomail.com; s=zohoarc; b=A3EelKYU+RiVnzOqpQHVi3aUc46Sgk87RcluVStEa1KfkcRBTekMwCUlL/x7zA9SrlBdZcD+neAMJN+p3xuH8m7jckA5WhpUp1gecQwTkt/0gEzUn9raYRwBH1LQ3vD07JoXWkJM8dWPjuYaExkmz1yv/RO1XceWCOtMLEaDX58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693531850; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RQlDC7xQKtcr8MKPJQclDMnhMXYknCWURW4x9XXFigw=; b=FyIsPLczzBsNiT7Dr1DyZkXByFphWflHBO2sQoMNH8owvSaamD/ABXnRbaLNeOWSO0rYrdJjKMdQczBxL93+BcMcRPprT7nwGzpd1/oe7hFg+nYDrTwrnF1Upi0vgIwEU7lI01WLbovjhESFCc56i80RNvDQ/v5HEk1wjSnFU28= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693531850955762.4511467325773; Thu, 31 Aug 2023 18:30:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbsyU-0002qe-Fr; Thu, 31 Aug 2023 21:29:26 -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 1qbsyT-0002qN-C8 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:25 -0400 Received: from mail-yw1-x1142.google.com ([2607:f8b0:4864:20::1142]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbsyQ-0007WB-VA for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:25 -0400 Received: by mail-yw1-x1142.google.com with SMTP id 00721157ae682-58ca499456dso15517947b3.1 for ; Thu, 31 Aug 2023 18:29:22 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id g186-20020a0df6c3000000b00559fb950d9fsm810447ywf.45.2023.08.31.18.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 18:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693531762; x=1694136562; darn=nongnu.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=RQlDC7xQKtcr8MKPJQclDMnhMXYknCWURW4x9XXFigw=; b=fuyvoTBIWGgfYah8MAlVuMAgkvBXrnKtH15izYVwM9poFPecsHhIKxKTur9kdQ04Of tOe2Xyd90ILbAZBle6hfigGbnLs6SBK0IM9aiRStVgwbhMQxVPKYECWI31XhgfofiPea rdoc4zyJJhhQZf9+k0JT+HzuPgcNqrxdFec3cbyXi0FHmNAguwlUvY0ZfdzoWdCgENO4 2kMNfYDy6gwbWjwvN32hTDu5ycD3bZqn7TIL321vGV5TCt24bFMJ/laukbhy3d5dTbPt Cvz742cyunL8bWGqIrP4QDaH5r0OuioGhuvK90nlhTJHSIcxNqlUGHDbYtRN0U8DJLgE xukg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693531762; x=1694136562; 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=RQlDC7xQKtcr8MKPJQclDMnhMXYknCWURW4x9XXFigw=; b=lZdQssQ0KMkOfF3gzJYAq/+1v1X73IfE3Yg16lav9HzIujq+lAB0cgguN31TTNfJ3o 6sAaMQUaDP5W8e8EZpS7+pz1fzHPCIXHTJqEaCKsyIL3aR39tIjqBfl11ZR5+smjcdY7 miCY1h1U7IFzmMSfoRo9j/C68A8UEcbPpYSNifQ8xVdT471TWF03/5sfox0nkU+65zWj 77YF+HBbcnIQuWAKZQV1/oFNMWvYPXQUzN8+5Y/kXYbb31ifyLqxnmVeriSMRl5q+qBA S9l/GdyQOQvZgNNh63ugEh5ZmCusJ38CZVdwc8x2To6P2LVH39BQNY/wq0sFvn1vJXju b+Gg== X-Gm-Message-State: AOJu0YzmG34vqkBsKSDWtN58/t5mbFJWzujAdiipMhmGgmMK3mHgaDed VnSUNbfA8QtOfcjTOrczZyM3t1A6XnYo X-Google-Smtp-Source: AGHT+IFO/m2eBPCDxfBuNLMQImuzehkXXmKU9hip/MJQ3qzbmUlRdW+ymMcEB46b1P3qt6og0eitXw== X-Received: by 2002:a0d:c341:0:b0:591:fb31:3edd with SMTP id f62-20020a0dc341000000b00591fb313eddmr1319929ywd.30.1693531761739; Thu, 31 Aug 2023 18:29:21 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: qemu-devel@nongnu.org Cc: jonathan.cameron@huawei.com, linux-cxl@vger.kernel.org, junhee.ryu@sk.com, kwangjin.ko@sk.com, Gregory Price Subject: [PATCH 1/5] cxl/mailbox: move mailbox effect definitions to a header Date: Thu, 31 Aug 2023 21:29:10 -0400 Message-Id: <20230901012914.226527-2-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230901012914.226527-1-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1142; envelope-from=gourry.memverge@gmail.com; helo=mail-yw1-x1142.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1693531853201100003 Content-Type: text/plain; charset="utf-8" Preparation for allowing devices to define their own CCI commands Signed-off-by: Gregory Price Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/cxl/cxl-mailbox-utils.c | 35 +++++++++++++++++++---------------- include/hw/cxl/cxl_mailbox.h | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 include/hw/cxl/cxl_mailbox.h diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 4e8651ebe2..edf39a3efb 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -12,6 +12,7 @@ #include "hw/pci/msix.h" #include "hw/cxl/cxl.h" #include "hw/cxl/cxl_events.h" +#include "hw/cxl/cxl_mailbox.h" #include "hw/pci/pci.h" #include "hw/pci-bridge/cxl_upstream_port.h" #include "qemu/cutils.h" @@ -1561,28 +1562,28 @@ static CXLRetCode cmd_dcd_release_dyn_cap(const str= uct cxl_cmd *cmd, return CXL_MBOX_SUCCESS; } =20 -#define IMMEDIATE_CONFIG_CHANGE (1 << 1) -#define IMMEDIATE_DATA_CHANGE (1 << 2) -#define IMMEDIATE_POLICY_CHANGE (1 << 3) -#define IMMEDIATE_LOG_CHANGE (1 << 4) -#define SECURITY_STATE_CHANGE (1 << 5) -#define BACKGROUND_OPERATION (1 << 6) +#define CXL_MBOX_IMMEDIATE_CONFIG_CHANGE (1 << 1) +#define CXL_MBOX_IMMEDIATE_DATA_CHANGE (1 << 2) +#define CXL_MBOX_IMMEDIATE_POLICY_CHANGE (1 << 3) +#define CXL_MBOX_IMMEDIATE_LOG_CHANGE (1 << 4) +#define CXL_MBOX_SECURITY_STATE_CHANGE (1 << 5) +#define CXL_MBOX_BACKGROUND_OPERATION (1 << 6) =20 static const struct cxl_cmd cxl_cmd_set[256][256] =3D { [EVENTS][GET_RECORDS] =3D { "EVENTS_GET_RECORDS", cmd_events_get_records, 1, 0 }, [EVENTS][CLEAR_RECORDS] =3D { "EVENTS_CLEAR_RECORDS", - cmd_events_clear_records, ~0, IMMEDIATE_LOG_CHANGE }, + cmd_events_clear_records, ~0, CXL_MBOX_IMMEDIATE_LOG_CHANGE }, [EVENTS][GET_INTERRUPT_POLICY] =3D { "EVENTS_GET_INTERRUPT_POLICY", cmd_events_get_interrupt_policy, 0, = 0 }, [EVENTS][SET_INTERRUPT_POLICY] =3D { "EVENTS_SET_INTERRUPT_POLICY", cmd_events_set_interrupt_policy, - ~0, IMMEDIATE_CONFIG_CHANGE }, + ~0, CXL_MBOX_IMMEDIATE_CONFIG_CHANGE= }, [FIRMWARE_UPDATE][GET_INFO] =3D { "FIRMWARE_UPDATE_GET_INFO", cmd_firmware_update_get_info, 0, 0 }, [TIMESTAMP][GET] =3D { "TIMESTAMP_GET", cmd_timestamp_get, 0, 0 }, [TIMESTAMP][SET] =3D { "TIMESTAMP_SET", cmd_timestamp_set, 8, - IMMEDIATE_POLICY_CHANGE }, + CXL_MBOX_IMMEDIATE_POLICY_CHANGE }, [LOGS][GET_SUPPORTED] =3D { "LOGS_GET_SUPPORTED", cmd_logs_get_support= ed, 0, 0 }, [LOGS][GET_LOG] =3D { "LOGS_GET_LOG", cmd_logs_get_log, 0x18, 0 }, [IDENTIFY][MEMORY_DEVICE] =3D { "IDENTIFY_MEMORY_DEVICE", @@ -1591,9 +1592,11 @@ static const struct cxl_cmd cxl_cmd_set[256][256] = =3D { cmd_ccls_get_partition_info, 0, 0 }, [CCLS][GET_LSA] =3D { "CCLS_GET_LSA", cmd_ccls_get_lsa, 8, 0 }, [CCLS][SET_LSA] =3D { "CCLS_SET_LSA", cmd_ccls_set_lsa, - ~0, IMMEDIATE_CONFIG_CHANGE | IMMEDIATE_DATA_CHANGE }, + ~0, CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | CXL_MBOX_IMMEDIATE_DATA_CHA= NGE }, [SANITIZE][OVERWRITE] =3D { "SANITIZE_OVERWRITE", cmd_sanitize_overwri= te, 0, - IMMEDIATE_DATA_CHANGE | SECURITY_STATE_CHANGE | BACKGROUND_OPERATI= ON }, + (CXL_MBOX_IMMEDIATE_DATA_CHANGE | + CXL_MBOX_SECURITY_STATE_CHANGE | + CXL_MBOX_BACKGROUND_OPERATION)}, [PERSISTENT_MEM][GET_SECURITY_STATE] =3D { "GET_SECURITY_STATE", cmd_get_security_state, 0, 0 }, [MEDIA_AND_POISON][GET_POISON_LIST] =3D { "MEDIA_AND_POISON_GET_POISON= _LIST", @@ -1612,10 +1615,10 @@ static const struct cxl_cmd cxl_cmd_set_dcd[256][25= 6] =3D { 8, 0 }, [DCD_CONFIG][ADD_DYN_CAP_RSP] =3D { "ADD_DCD_DYNAMIC_CAPACITY_RESPONSE", cmd_dcd_add_dyn_cap_rsp, - ~0, IMMEDIATE_DATA_CHANGE }, + ~0, CXL_MBOX_IMMEDIATE_DATA_CHANGE }, [DCD_CONFIG][RELEASE_DYN_CAP] =3D { "RELEASE_DCD_DYNAMIC_CAPACITY", cmd_dcd_release_dyn_cap, - ~0, IMMEDIATE_DATA_CHANGE }, + ~0, CXL_MBOX_IMMEDIATE_DATA_CHANGE }, }; =20 static const struct cxl_cmd cxl_cmd_set_sw[256][256] =3D { @@ -1628,7 +1631,7 @@ static const struct cxl_cmd cxl_cmd_set_sw[256][256] = =3D { */ [TIMESTAMP][GET] =3D { "TIMESTAMP_GET", cmd_timestamp_get, 0, 0 }, [TIMESTAMP][SET] =3D { "TIMESTAMP_SET", cmd_timestamp_set, 8, - IMMEDIATE_POLICY_CHANGE }, + CXL_MBOX_IMMEDIATE_POLICY_CHANGE }, [LOGS][GET_SUPPORTED] =3D { "LOGS_GET_SUPPORTED", cmd_logs_get_support= ed, 0, 0 }, [LOGS][GET_LOG] =3D { "LOGS_GET_LOG", cmd_logs_get_log, 0x18, 0 }, @@ -1670,7 +1673,7 @@ int cxl_process_cci_message(CXLCCI *cci, uint8_t set,= uint8_t cmd, } =20 /* Only one bg command at a time */ - if ((cxl_cmd->effect & BACKGROUND_OPERATION) && + if ((cxl_cmd->effect & CXL_MBOX_BACKGROUND_OPERATION) && cci->bg.runtime > 0) { return CXL_MBOX_BUSY; } @@ -1691,7 +1694,7 @@ int cxl_process_cci_message(CXLCCI *cci, uint8_t set,= uint8_t cmd, } =20 ret =3D (*h)(cxl_cmd, pl_in, len_in, pl_out, len_out, cci); - if ((cxl_cmd->effect & BACKGROUND_OPERATION) && + if ((cxl_cmd->effect & CXL_MBOX_BACKGROUND_OPERATION) && ret =3D=3D CXL_MBOX_BG_STARTED) { *bg_started =3D true; } else { diff --git a/include/hw/cxl/cxl_mailbox.h b/include/hw/cxl/cxl_mailbox.h new file mode 100644 index 0000000000..beb048052e --- /dev/null +++ b/include/hw/cxl/cxl_mailbox.h @@ -0,0 +1,18 @@ +/* + * QEMU CXL Mailbox + * + * This work is licensed under the terms of the GNU GPL, version 2. See the + * COPYING file in the top-level directory. + */ + +#ifndef CXL_MAILBOX_H +#define CXL_MAILBOX_H + +#define CXL_MBOX_IMMEDIATE_CONFIG_CHANGE (1 << 1) +#define CXL_MBOX_IMMEDIATE_DATA_CHANGE (1 << 2) +#define CXL_MBOX_IMMEDIATE_POLICY_CHANGE (1 << 3) +#define CXL_MBOX_IMMEDIATE_LOG_CHANGE (1 << 4) +#define CXL_MBOX_SECURITY_STATE_CHANGE (1 << 5) +#define CXL_MBOX_BACKGROUND_OPERATION (1 << 6) + +#endif --=20 2.39.1 From nobody Thu May 16 23:40:21 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693531813; cv=none; d=zohomail.com; s=zohoarc; b=fUJm+XA1TZepAyU3Y1twP6M4DfLWTGscfBDNBGPSs+mO7Tb1UsAW3ypbH/40XOqhCW0SjRm5s9BHIASSw3lJTRszUizV1WBKC1tlmA3ms9xLHcZsZINgme8wDtAiLRdfyCfhTiAheCm5PcC4SJvzB9iv+pJFAvXSsrSbOJEXmJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693531813; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6pq4K1DRMCsdduEbuGuJ200122U1I+V8+TOdtq9hf9Q=; b=S+7IHK+HdwRRSrlkSoYB/huOWpw9unY7LssqUiH9pD4LIx/oc712AtSblv0uw89nfsTFFWtq7T50hZh4i7tWMVMWZp3FF5sNE68BLJ9UpLaMuHwHamrO8+fxCVnkBiJ8gHlZaPpgV+BvRdcDYzt1ayu/fD0gKrKQk7lJY5Ew3Co= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693531813689491.38565779462533; Thu, 31 Aug 2023 18:30:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbsyY-0002to-7A; Thu, 31 Aug 2023 21:29:31 -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 1qbsyV-0002qq-UG for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:27 -0400 Received: from mail-yw1-x1144.google.com ([2607:f8b0:4864:20::1144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbsyS-0007WW-Oq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:27 -0400 Received: by mail-yw1-x1144.google.com with SMTP id 00721157ae682-59234aaca15so16504687b3.3 for ; Thu, 31 Aug 2023 18:29:24 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id g186-20020a0df6c3000000b00559fb950d9fsm810447ywf.45.2023.08.31.18.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 18:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693531763; x=1694136563; darn=nongnu.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=6pq4K1DRMCsdduEbuGuJ200122U1I+V8+TOdtq9hf9Q=; b=f91O3TNaW208+8uAJJuN4045Wj7XbKrpC4GBuiwdGWeLdXuZrqn/jMhBce2XblWb0Z ugCk4Q9dlZgnYcN8iOWByRg1D7Qa8VGCRiq06anz1D7q5BP6zAkIhGcfaC2Cfci244Kx Nsn7l5ejqu0Fzcj2Wd8JTLg1jF1rTfq18l6tk/obPRPLP2iTlZu0o4v7n4o7pR1Vcm4Z ei4RQKowGQYhcGXF7Q1Ux4caXih9ymaS3gyKPxeBgzOvYwWMjFEWR5fPF7+KyJEi5+Yd QEWn5xkiukIP2C+1+/Rz/ZVaH49+oD3p5QypsDzKZ2CvcBhwcRM9lIVJDdEylg3X8LCE HHZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693531763; x=1694136563; 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=6pq4K1DRMCsdduEbuGuJ200122U1I+V8+TOdtq9hf9Q=; b=SXvk2bhbF4juhRsZ3aXSinmfKV6Cdzv+UrVbzV8+9Y0bcqqYVpOAE9d2rSRLSiNxzm jQtg8TCe3Mi8e4Ec8CxinYlOoa/TO5zMyNWdCcKii/bP+xpOcFE3VdM59VQucsJ2T3Jj uczOoGixzYDflxJCLOjlY9VpLNKro5RmZ8meCPKX8ZCvI33mujrqW5DYmVE4Vfni4qmz 9Jj5uPSNuJIX15axpJdlO+RqwMf/UQ2mTnhHY+pFNKnjxmtcqxQp9uUnU3iZd/ronOKv aurBw/9UBi+GPa5+INschj4vjSzPQXnkO1utUwIbvz++TZXmY2oftxcaW9gSQeHjIoyE z0Fw== X-Gm-Message-State: AOJu0YzwxWK6Jtajx/d0zOJErasKFCqQq1lFNf/CZi60GMz5Byf9mrhN 88jymd/BjnC/Z9iT1qcXRivXprvZFLrn X-Google-Smtp-Source: AGHT+IEJPgTPHVRYS7i4yrvWXex07bwZ3MY3D94Tlo3IEKDVY/laIV/4Ngd3nqRkijMM4+JN86bGYg== X-Received: by 2002:a81:9141:0:b0:586:6a71:b018 with SMTP id i62-20020a819141000000b005866a71b018mr1181617ywg.20.1693531763637; Thu, 31 Aug 2023 18:29:23 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: qemu-devel@nongnu.org Cc: jonathan.cameron@huawei.com, linux-cxl@vger.kernel.org, junhee.ryu@sk.com, kwangjin.ko@sk.com, Gregory Price Subject: [PATCH 2/5] cxl/type3: Cleanup multiple CXL_TYPE3() calls in read/write functions Date: Thu, 31 Aug 2023 21:29:11 -0400 Message-Id: <20230901012914.226527-3-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230901012914.226527-1-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1144; envelope-from=gourry.memverge@gmail.com; helo=mail-yw1-x1144.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1693531815721100005 Content-Type: text/plain; charset="utf-8" Call CXL_TYPE3 once at top of function to avoid multiple invocations. Signed-off-by: Gregory Price Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/mem/cxl_type3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index fd9d134d46..80d596ee10 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1248,17 +1248,18 @@ static int cxl_type3_hpa_to_as_and_dpa(CXLType3Dev = *ct3d, MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data, unsigned size, MemTxAttrs attrs) { + CXLType3Dev *ct3d =3D CXL_TYPE3(d); uint64_t dpa_offset =3D 0; AddressSpace *as =3D NULL; int res; =20 - res =3D cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, + res =3D cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size, &as, &dpa_offset); if (res) { return MEMTX_ERROR; } =20 - if (sanitize_running(&CXL_TYPE3(d)->cci)) { + if (sanitize_running(&ct3d->cci)) { qemu_guest_getrandom_nofail(data, size); return MEMTX_OK; } @@ -1268,16 +1269,17 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr hos= t_addr, uint64_t *data, MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data, unsigned size, MemTxAttrs attrs) { + CXLType3Dev *ct3d =3D CXL_TYPE3(d); uint64_t dpa_offset =3D 0; AddressSpace *as =3D NULL; int res; =20 - res =3D cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, + res =3D cxl_type3_hpa_to_as_and_dpa(ct3d, host_addr, size, &as, &dpa_offset); if (res) { return MEMTX_ERROR; } - if (sanitize_running(&CXL_TYPE3(d)->cci)) { + if (sanitize_running(&ct3d->cci)) { return MEMTX_OK; } return address_space_write(as, dpa_offset, attrs, &data, size); --=20 2.39.1 From nobody Thu May 16 23:40:21 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693531859; cv=none; d=zohomail.com; s=zohoarc; b=HrfHJ6fxfkwFjRAVNaI7QG7m0unsb/WiO1fGoKt3sro8xI8/Dy8r079ouUKN+cK/g/dif0mXT3EWJVehVPAH6vUmv32TO0wZIv5hDY+BD2LlccQ/3JLYJWiDY5A3O95gTTRTIN8lB7jihjLlgV9et47DSJ4ChioeTFKzGMfUf/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693531859; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SK7n0aiJMN0SWoP8B2n02PHYDXpt98FoPoro/RkTgS8=; b=mm6QPyd1FDm49xS0nStzeQz8GefJLVlj/oTWsyevvBtdOq6qCE0LBKUqUT0mefaLiCcbUodKgjMKm5zE1r9vX6wciNIHAUVwU0CaDoFWm/6bcoQcfdjeL50NOAbpiB4aXcFYRyWvxqE85ZDQShuzfrY5FDjAPmiYzX9smxWI/fU= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693531859093534.8431437278991; Thu, 31 Aug 2023 18:30:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbsya-00031L-H1; Thu, 31 Aug 2023 21:29:33 -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 1qbsyW-0002qs-1R for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:28 -0400 Received: from mail-yw1-x1143.google.com ([2607:f8b0:4864:20::1143]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbsyT-0007Wv-RZ for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:27 -0400 Received: by mail-yw1-x1143.google.com with SMTP id 00721157ae682-58ca499456dso15518177b3.1 for ; Thu, 31 Aug 2023 18:29:25 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id g186-20020a0df6c3000000b00559fb950d9fsm810447ywf.45.2023.08.31.18.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 18:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693531765; x=1694136565; darn=nongnu.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=SK7n0aiJMN0SWoP8B2n02PHYDXpt98FoPoro/RkTgS8=; b=PJiMP9FomkJZuoenhx9N0lHUcoN2Safbi2QXlxDtJ+GjIS0KJiLvyQAizmcD8DwZK8 TRQ2oROfBreZ7EfKI2HK+WJKI1/yvVMhuWU7iIFxR2MvFgZHu4K22HrQWpefqtfYbPPb fyJ5pSnfwbyYisTuC5wpuB8V6ltW/lQRIWRgmuoWYWGsGaVlRQw67mev4DHtQS8QwncD OXOxCSe1JiiHoQS3ddDBUgyKOscQSBnhbBMTjjX1llcNzCqoMeMYyrOdRsk3cxDz4uFU +7voBF1EPWxQnoZlxNvC2kd/6W8pm0Fa0Ym98DxarcUNalMqMBgyf8t1oSOKtZOvsCkM K7qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693531765; x=1694136565; 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=SK7n0aiJMN0SWoP8B2n02PHYDXpt98FoPoro/RkTgS8=; b=F/FO8MvrCMBRJsxlIjHb5zoQxUCjKsYbk8LbqsoiE+DAGxQ9wt5lpRmzH6fejN9ZNB kChXKKqfYBgSXO4W247rWJLPuW8meYtrcXJkpf3pMkIqqIXJXnsdBjtS8JmqzC4502Db c4bWLBuGSEsoyWDRjHo4RGI4T00eg8UmZBaChTfF0Aohw9Lrq7zInnXVAti7dg9bnY3s zX8Z5W4bZl/b6/PQjx3tO2PLpzfb8plh6gr8FV64vTN77S4HlFx7dkt0t3Lt9G/DWm7H 8S0IZ2UxXaHJwysPdFmtxt8oNsU6Upzbp+RSqdVK1GaYmzeKriEkGwKqg8MrELARGrWJ FRlg== X-Gm-Message-State: AOJu0Yw+UBqY1KnCvkwWPxfIpXpc1FSxZsp/jTkInGn69VINg5CyEoRb aHFTSEg6hF44YDqY0/CDdWTczF1XPb6M X-Google-Smtp-Source: AGHT+IHopUFq0B9kgHdCiPSfXi9p4iJvI2XcsVjcI25l4AGICoAvGmt9VwQA2GIRpLzeMRkcsz5gYA== X-Received: by 2002:a0d:e5c2:0:b0:595:b30:1dd8 with SMTP id o185-20020a0de5c2000000b005950b301dd8mr1394663ywe.18.1693531764903; Thu, 31 Aug 2023 18:29:24 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: qemu-devel@nongnu.org Cc: jonathan.cameron@huawei.com, linux-cxl@vger.kernel.org, junhee.ryu@sk.com, kwangjin.ko@sk.com, Gregory Price Subject: [PATCH 3/5] cxl/type3: Expose ct3 functions so that inheriters can call them Date: Thu, 31 Aug 2023 21:29:12 -0400 Message-Id: <20230901012914.226527-4-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230901012914.226527-1-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1143; envelope-from=gourry.memverge@gmail.com; helo=mail-yw1-x1143.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1693531859741100001 Content-Type: text/plain; charset="utf-8" For devices built on top of ct3, we need the init, realize, and exit functions exposed to correctly start up and tear down. Signed-off-by: Gregory Price --- hw/mem/cxl_type3.c | 8 ++++---- include/hw/cxl/cxl_device.h | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 80d596ee10..a8d4a12f3e 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -950,7 +950,7 @@ static DOEProtocol doe_spdm_prot[] =3D { { } }; =20 -static void ct3_realize(PCIDevice *pci_dev, Error **errp) +void ct3_realize(PCIDevice *pci_dev, Error **errp) { CXLType3Dev *ct3d =3D CXL_TYPE3(pci_dev); CXLComponentState *cxl_cstate =3D &ct3d->cxl_cstate; @@ -1054,7 +1054,7 @@ err_address_space_free: return; } =20 -static void ct3_exit(PCIDevice *pci_dev) +void ct3_exit(PCIDevice *pci_dev) { CXLType3Dev *ct3d =3D CXL_TYPE3(pci_dev); CXLComponentState *cxl_cstate =3D &ct3d->cxl_cstate; @@ -1285,7 +1285,7 @@ MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host= _addr, uint64_t data, return address_space_write(as, dpa_offset, attrs, &data, size); } =20 -static void ct3d_reset(DeviceState *dev) +void ct3d_reset(DeviceState *dev) { CXLType3Dev *ct3d =3D CXL_TYPE3(dev); uint32_t *reg_state =3D ct3d->cxl_cstate.crb.cache_mem_registers; @@ -2081,7 +2081,7 @@ void qmp_cxl_release_dynamic_capacity(const char *pat= h, errp); } =20 -static void ct3_class_init(ObjectClass *oc, void *data) +void ct3_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PCIDeviceClass *pc =3D PCI_DEVICE_CLASS(oc); diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index e824c5ade8..4ad38b689c 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -524,6 +524,11 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_a= ddr, uint64_t *data, MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data, unsigned size, MemTxAttrs attrs); =20 +void ct3_realize(PCIDevice *pci_dev, Error **errp); +void ct3_exit(PCIDevice *pci_dev); +void ct3d_reset(DeviceState *d); +void ct3_class_init(ObjectClass *oc, void *data); + uint64_t cxl_device_get_timestamp(CXLDeviceState *cxlds); =20 void cxl_event_init(CXLDeviceState *cxlds, int start_msg_num); --=20 2.39.1 From nobody Thu May 16 23:40:21 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693531817; cv=none; d=zohomail.com; s=zohoarc; b=m7lbYTdNGduDH4/CmIItm9z+qdXwcQCqgQXwLO32PbHuGjq7heDZ7UdgGeKOXnYN5DKDXHJg/7yUFw6Ij4jzGpUpd/elcHn970GX5lrJhqFYY9gs9kVc5ICN8WUf3gT2XKROQgzNtToo6vCG0Su5W8K8hUfyNBqMPGb043o5uVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693531817; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lGyDOe9YH+wHWF5Vb+pQ1xAEsSvo14grLJWUVd5BMeE=; b=jmsF4Kz49hHS/bHfR8Lmt8+rwMyvVIK/uaXGGFlL3tIR9PqcGwsaMSiFgH/5U6p1iWnJHE2hout8r9vqYmp258h3xr6/3+sM9rvcA3D4Xy1/GhWshpVNsZY9OUpKhYgsOgGCesHfm805QLq/qVnzOeJlaree71CjasmbF4D62sA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693531817204671.4799662459436; Thu, 31 Aug 2023 18:30:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbsyq-0003EZ-TW; Thu, 31 Aug 2023 21:29:49 -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 1qbsyh-00038V-Fa for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:42 -0400 Received: from mail-yw1-x1143.google.com ([2607:f8b0:4864:20::1143]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbsyW-0007X3-7y for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:30 -0400 Received: by mail-yw1-x1143.google.com with SMTP id 00721157ae682-5924093a9b2so15715057b3.2 for ; Thu, 31 Aug 2023 18:29:27 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id g186-20020a0df6c3000000b00559fb950d9fsm810447ywf.45.2023.08.31.18.29.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 18:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693531766; x=1694136566; darn=nongnu.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=lGyDOe9YH+wHWF5Vb+pQ1xAEsSvo14grLJWUVd5BMeE=; b=KTjidGUzJnkqdhklCU2V/Ect10NdLfNxxx22cfGmiPVtfZ4OOc5DGi46D0H8fN2xcq VVc1hBnYyKHLyHPV8Q0LY20Saz0w6O1pHkl+WygvZEUnyzCbfCFc6QSqR1PB+GOn9ecn 0qAP59q7I6X3+KdP0BiatSGjdRmHOWTv7itNe9bCBrnNPOSDyQNJKdjMaVCifAZo09np ZE3EyfQ2cWFHYANACnfSmIjL0AsiTibkySMCNb7iGPOF6V11YACsS5TZpglTaJ5ih/+K EB/w41XwC8CdE2S7JzlsWZrIAXVkANvq+nN9tIFPmkd+xJRFKhyIX+Gasq99RctLrXi0 msYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693531766; x=1694136566; 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=lGyDOe9YH+wHWF5Vb+pQ1xAEsSvo14grLJWUVd5BMeE=; b=Qji6CmZRuUhfKkF5Zm0JbCpoBOs0hizJrd0OUuDjYVXeeMf0e/x4GzFMVlmCdrEk0L 4TJDVTvgSV+OQQsEpXUbv5i5piuaEiGoS1Gor4LDTeDZx7Zyvo62NFOSE+pPWg/oTLcR Q2RuuttnszZ7prURnCEsSBtwUZtRSHc0EkNyD5yXjgau19TvCrA3AjSONnG9PrqD0jfY 3gNOhUGiqsaP+Cth0aRB/2r2VYfL9N62DHI/shdlJ73yDmkhdaqand0IsKU15ufD4EeS Uw5LiI6cJ76hQGN4uokbfCoqfNxP3JUInEDfwir59e5zjTnE5jtE+b07aq2Te9npZzMD jKOg== X-Gm-Message-State: AOJu0YztmZKTqje9+b+JF+WmXxQe+HWITDnvlHoIJBc/kYPbnPs/9b8u 10nO+2XCEd/44hm32yff5/f1mSnS9BgJ X-Google-Smtp-Source: AGHT+IGo027K8zC4uZckAITLYpghGqKZwYmeHjA3c7jEoHtENn765YTn1e3HAVQXEB0XQRm9OWKS3Q== X-Received: by 2002:a81:72c3:0:b0:595:9770:6910 with SMTP id n186-20020a8172c3000000b0059597706910mr965799ywc.52.1693531766304; Thu, 31 Aug 2023 18:29:26 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: qemu-devel@nongnu.org Cc: jonathan.cameron@huawei.com, linux-cxl@vger.kernel.org, junhee.ryu@sk.com, kwangjin.ko@sk.com, Gregory Price Subject: [PATCH 4/5] cxl/type3: add an optional mhd validation function for memory accesses Date: Thu, 31 Aug 2023 21:29:13 -0400 Message-Id: <20230901012914.226527-5-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230901012914.226527-1-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1143; envelope-from=gourry.memverge@gmail.com; helo=mail-yw1-x1143.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1693531817584100009 Content-Type: text/plain; charset="utf-8" When memory accesses are made, some MHSLD's would validate the address is within the scope of allocated sections. To do this, the base device must call an optional function set by inherited devices. Signed-off-by: Gregory Price --- hw/mem/cxl_type3.c | 15 +++++++++++++++ include/hw/cxl/cxl_device.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index a8d4a12f3e..8e1565f2fc 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -1034,6 +1034,10 @@ void ct3_realize(PCIDevice *pci_dev, Error **errp) goto err_release_cdat; } } + + /* Devices which inherit ct3d should initialize these after ct3_realiz= e */ + ct3d->mhd_access_valid =3D NULL; + return; =20 err_release_cdat: @@ -1259,6 +1263,11 @@ MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host= _addr, uint64_t *data, return MEMTX_ERROR; } =20 + if (ct3d->mhd_access_valid && + !ct3d->mhd_access_valid(d, dpa_offset, size)) { + return MEMTX_ERROR; + } + if (sanitize_running(&ct3d->cci)) { qemu_guest_getrandom_nofail(data, size); return MEMTX_OK; @@ -1279,6 +1288,12 @@ MemTxResult cxl_type3_write(PCIDevice *d, hwaddr hos= t_addr, uint64_t data, if (res) { return MEMTX_ERROR; } + + if (ct3d->mhd_access_valid && + !ct3d->mhd_access_valid(d, dpa_offset, size)) { + return MEMTX_ERROR; + } + if (sanitize_running(&ct3d->cci)) { return MEMTX_OK; } diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index 4ad38b689c..b1b39a9aa0 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -489,6 +489,9 @@ struct CXLType3Dev { uint8_t num_regions; /* 0-8 regions */ CXLDCDRegion regions[DCD_MAX_REGION_NUM]; } dc; + + /* Multi-headed Device */ + bool (*mhd_access_valid)(PCIDevice *d, uint64_t addr, unsigned int siz= e); }; =20 #define TYPE_CXL_TYPE3 "cxl-type3" --=20 2.39.1 From nobody Thu May 16 23:40:21 2024 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693531823; cv=none; d=zohomail.com; s=zohoarc; b=lRfLofZJ3/ZHqg6+MRx3L5XW2l6Jx/0XBF02oZqt9ABgQCejG12Acqo8DV87xxkPpM52R6CbYYS89CdUmkDh3TpLX26Ae0HcZUUStgGRKhSns4rQ2M4o3VTGhiNygr27SFi/k40162KzujMynY23H6LW8j7grfV30DsXoQOgZhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693531823; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lK5oCagi08FeMUCQGqHJSgI0tQXilWJNHtFPW2LWiQk=; b=D6+xyfaYzqs1TOk9+TX/5olmmg43ktgFSEQEd6hn5rKk0R1y0LMNEzZ7m7lRB64nOAvIu6/Axw7tPQGvcovSLgv1cxEiVrcXkd6vXADh5dA5SiGxPRYPM8AyvKQ0p0gixoE52qMkW7Ty958uHgNFDwajp4mB1n2/gFD83KxgR+I= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693531823347518.3399547222906; Thu, 31 Aug 2023 18:30:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbsyq-0003FI-Su; Thu, 31 Aug 2023 21:29:48 -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 1qbsyk-0003B7-Pw for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:42 -0400 Received: from mail-yw1-x1144.google.com ([2607:f8b0:4864:20::1144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbsya-0007XR-IJ for qemu-devel@nongnu.org; Thu, 31 Aug 2023 21:29:42 -0400 Received: by mail-yw1-x1144.google.com with SMTP id 00721157ae682-58d40c2debeso16482787b3.2 for ; Thu, 31 Aug 2023 18:29:29 -0700 (PDT) Received: from fedora.mshome.net (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id g186-20020a0df6c3000000b00559fb950d9fsm810447ywf.45.2023.08.31.18.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 18:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693531769; x=1694136569; darn=nongnu.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=lK5oCagi08FeMUCQGqHJSgI0tQXilWJNHtFPW2LWiQk=; b=GZkxnFmpzsuPwk8hymsrCh+p6I0OfkKUvbYYy/sSCrXIDgXcS8gm7RoIfzOswhRHkO jg95NAi+9gB9fVQDkb1NdNTR7Y2dfzZVYnI9XyDT9R9tTK22BJlP+8XJpSlbd9S7F+RU RCoBLrEEkjv5LHpNacxczvBTifaj1iiM4PzJiyaGvP2hCAvLOVEscoJwqH/y+5Zil1ME JihTGv9K/ao9n8s2OLKOo+H8zBjuShqYkZ5p/ee2Kvrx8/NmJ4iDQtg8oxzKQWHob+Ci aX+8jfEXDnhR3eKbj2txVgRqdaJ3Lm7cmp/4Nky23k5yOy4fz8Ki8Khawh2yihbDukSg Mh2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693531769; x=1694136569; 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=lK5oCagi08FeMUCQGqHJSgI0tQXilWJNHtFPW2LWiQk=; b=XD/jbHVY1qg+Qy+igjRr37ymENiID4sSvH51WOSzUlQgx77W71UI5yJtMFbBWGFOZM SYNY0uZExXIEeEv+EMhB0V5OvYIkWVDRoR2HggNJioj/wug3DDWYWlmMQBjPCvzK5Y+q AgL90kiAakAHH3fMCVIJzVaxjxDws5Bb/R2o1MHGhRtaPD2Lq7Gg8tKV3CcMuqLydQBy A3EF1LutghMSZKjbVNLtvLFhOBvApT7qpovvES/MhNn1LhS4wJ/+tFl7U79ZA6+f+rIO 4KrAJFI7wx+R3Nc6tZ8yb/7XjnHeghAaiM8hjvStFTC96L41Opg5VsX3QKKVEP8udtgg /xHQ== X-Gm-Message-State: AOJu0YzFUh1cy+CNxqP898h6RqM7LPXfIHYQ8MqAIBKJ0jBqVdRZenWM Wa6V+QPIXCYwKi1duDKv6xgjC2Ei8U/U X-Google-Smtp-Source: AGHT+IFd14c2McmsazKq09dhOXm8Jz7l2aXJZNBHBtp257E18bLPdySiF2Ep/P0lolSJg1FbBCX1bg== X-Received: by 2002:a0d:f342:0:b0:58c:4e9f:4ed4 with SMTP id c63-20020a0df342000000b0058c4e9f4ed4mr1086176ywf.42.1693531768598; Thu, 31 Aug 2023 18:29:28 -0700 (PDT) From: Gregory Price X-Google-Original-From: Gregory Price To: qemu-devel@nongnu.org Cc: jonathan.cameron@huawei.com, linux-cxl@vger.kernel.org, junhee.ryu@sk.com, kwangjin.ko@sk.com, Gregory Price Subject: [PATCH 5/5] cxl/vendor: SK hynix Niagara Multi-Headed SLD Device Date: Thu, 31 Aug 2023 21:29:14 -0400 Message-Id: <20230901012914.226527-6-gregory.price@memverge.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230901012914.226527-1-gregory.price@memverge.com> References: <20230901012914.226527-1-gregory.price@memverge.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::1144; envelope-from=gourry.memverge@gmail.com; helo=mail-yw1-x1144.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1693531824012100001 Content-Type: text/plain; charset="utf-8" Create a new device to emulate the SK hynix Niagara MHSLD platform. This device has custom CCI commands that allow for applying isolation to each memory block between hosts. This enables an early form of dynamic capacity, whereby the NUMA node maps the entire region, but the host is responsible for asking the device which memory blocks are allocated to it, and therefore may be onlined. To instantiate: -device cxl-skh-niagara,cxl-type3,bus=3Drp0,volatile-memdev=3Dmem0,id=3Dcxl= -mem0,sn=3D66666,mhd-head=3D0,mhd-shmid=3D0 The linux kernel will require raw CXL commands enabled to allow for passing through of Niagara CXL commands via the CCI mailbox. The Niagara MH-SLD has a shared memory region that must be initialized using the 'init_niagara' tool located in the vendor subdirectory usage: init_niagara heads : number of heads on the device sections : number of sections section_size : size of a section in 128mb increments shmid : shmid produced by ipcmk Example: $shmid1=3Dipcmk -M 131072 ./init_niagara 4 32 1 $shmid1 Signed-off-by: Gregory Price Signed-off-by: Junhee Ryu Signed-off-by: Kwangjin Ko --- hw/cxl/Kconfig | 4 + hw/cxl/meson.build | 2 + hw/cxl/vendor/meson.build | 1 + hw/cxl/vendor/skhynix/.gitignore | 1 + hw/cxl/vendor/skhynix/init_niagara.c | 99 +++++ hw/cxl/vendor/skhynix/meson.build | 1 + hw/cxl/vendor/skhynix/skhynix_niagara.c | 516 ++++++++++++++++++++++++ hw/cxl/vendor/skhynix/skhynix_niagara.h | 169 ++++++++ 8 files changed, 793 insertions(+) create mode 100644 hw/cxl/vendor/meson.build create mode 100644 hw/cxl/vendor/skhynix/.gitignore create mode 100644 hw/cxl/vendor/skhynix/init_niagara.c create mode 100644 hw/cxl/vendor/skhynix/meson.build create mode 100644 hw/cxl/vendor/skhynix/skhynix_niagara.c create mode 100644 hw/cxl/vendor/skhynix/skhynix_niagara.h diff --git a/hw/cxl/Kconfig b/hw/cxl/Kconfig index c9b2e46bac..dd6c54b54d 100644 --- a/hw/cxl/Kconfig +++ b/hw/cxl/Kconfig @@ -2,5 +2,9 @@ config CXL bool default y if PCI_EXPRESS =20 +config CXL_VENDOR + bool + default y + config I2C_MCTP_CXL bool diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build index 1393821fc4..e8c8c1355a 100644 --- a/hw/cxl/meson.build +++ b/hw/cxl/meson.build @@ -15,3 +15,5 @@ system_ss.add(when: 'CONFIG_CXL', system_ss.add(when: 'CONFIG_I2C_MCTP_CXL', if_true: files('i2c_mctp_cxl.c'= )) =20 system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c')) + +subdir('vendor') diff --git a/hw/cxl/vendor/meson.build b/hw/cxl/vendor/meson.build new file mode 100644 index 0000000000..12db8991f1 --- /dev/null +++ b/hw/cxl/vendor/meson.build @@ -0,0 +1 @@ +subdir('skhynix') diff --git a/hw/cxl/vendor/skhynix/.gitignore b/hw/cxl/vendor/skhynix/.giti= gnore new file mode 100644 index 0000000000..6d96de38ea --- /dev/null +++ b/hw/cxl/vendor/skhynix/.gitignore @@ -0,0 +1 @@ +init_niagara diff --git a/hw/cxl/vendor/skhynix/init_niagara.c b/hw/cxl/vendor/skhynix/i= nit_niagara.c new file mode 100644 index 0000000000..2c189dc33c --- /dev/null +++ b/hw/cxl/vendor/skhynix/init_niagara.c @@ -0,0 +1,99 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Copyright (c) 2023 MemVerge Inc. + * Copyright (c) 2023 SK hynix Inc. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct niagara_state { + uint8_t nr_heads; + uint8_t nr_lds; + uint8_t ldmap[65536]; + uint32_t total_sections; + uint32_t free_sections; + uint32_t section_size; + uint32_t sections[]; +}; + +int main(int argc, char *argv[]) +{ + int shmid =3D 0; + uint32_t sections =3D 0; + uint32_t section_size =3D 0; + uint32_t heads =3D 0; + struct niagara_state *niagara_state =3D NULL; + size_t state_size; + uint8_t i; + + if (argc !=3D 5) { + printf("usage: init_niagara \n" + "\theads : number of heads on the device\n" + "\tsections : number of sections\n" + "\tsection_size : size of a section in 128mb increments\n" + "\tshmid : /tmp/mytoken.tmp\n\n" + "It is recommended your shared memory region is at least 1= 28kb\n"); + return -1; + } + + /* must have at least 1 head */ + heads =3D (uint32_t)atoi(argv[1]); + if (heads =3D=3D 0 || heads > 32) { + printf("bad heads argument (1-32)\n"); + return -1; + } + + /* Get number of sections */ + sections =3D (uint32_t)atoi(argv[2]); + if (sections =3D=3D 0) { + printf("bad sections argument\n"); + return -1; + } + + section_size =3D (uint32_t)atoi(argv[3]); + if (sections =3D=3D 0) { + printf("bad section size argument\n"); + return -1; + } + + shmid =3D (uint32_t)atoi(argv[4]); + if (shmid =3D=3D 0) { + printf("bad shmid argument\n"); + return -1; + } + + niagara_state =3D shmat(shmid, NULL, 0); + if (niagara_state =3D=3D (void *)-1) { + printf("Unable to attach to shared memory\n"); + return -1; + } + + /* Initialize the niagara_state */ + state_size =3D sizeof(struct niagara_state) + (sizeof(uint32_t) * sect= ions); + memset(niagara_state, 0, state_size); + niagara_state->nr_heads =3D heads; + niagara_state->nr_lds =3D heads; + niagara_state->total_sections =3D sections; + niagara_state->free_sections =3D sections; + niagara_state->section_size =3D section_size; + + memset(&niagara_state->ldmap, '\xff', sizeof(niagara_state->ldmap)); + for (i =3D 0; i < heads; i++) { + niagara_state->ldmap[i] =3D i; + } + + printf("niagara initialized\n"); + shmdt(niagara_state); + return 0; +} diff --git a/hw/cxl/vendor/skhynix/meson.build b/hw/cxl/vendor/skhynix/meso= n.build new file mode 100644 index 0000000000..4e57db65f1 --- /dev/null +++ b/hw/cxl/vendor/skhynix/meson.build @@ -0,0 +1 @@ +system_ss.add(when: 'CONFIG_CXL_VENDOR', if_true: files('skhynix_niagara.c= ',)) diff --git a/hw/cxl/vendor/skhynix/skhynix_niagara.c b/hw/cxl/vendor/skhyni= x/skhynix_niagara.c new file mode 100644 index 0000000000..88e53cc6cc --- /dev/null +++ b/hw/cxl/vendor/skhynix/skhynix_niagara.c @@ -0,0 +1,516 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Copyright (c) 2023 MemVerge Inc. + * Copyright (c) 2023 SK hynix Inc. + */ + +#include +#include "qemu/osdep.h" +#include "hw/irq.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_mailbox.h" +#include "hw/cxl/cxl_device.h" +#include "hw/pci/pcie.h" +#include "hw/pci/pcie_port.h" +#include "hw/qdev-properties.h" +#include "skhynix_niagara.h" + +#define TYPE_CXL_NIAGARA "cxl-skh-niagara" +OBJECT_DECLARE_TYPE(CXLNiagaraState, CXLNiagaraClass, CXL_NIAGARA) + +/* + * CXL r3.0 section 7.6.7.5.1 - Get Multi-Headed Info (Opcode 5500h) + * + * This command retrieves the number of heads, number of supported LDs, + * and Head-to-LD mapping of a Multi-Headed device. + */ +static CXLRetCode cmd_mhd_get_info(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI * cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraMHDGetInfoInput *input =3D (void *)payload_in; + NiagaraMHDGetInfoOutput *output =3D (void *)payload_out; + + uint8_t start_ld =3D input->start_ld; + uint8_t ldmap_len =3D input->ldmap_len; + uint8_t i; + + if (start_ld >=3D s->mhd_state->nr_lds) { + return CXL_MBOX_INVALID_INPUT; + } + + output->nr_lds =3D s->mhd_state->nr_lds; + output->nr_heads =3D s->mhd_state->nr_heads; + output->resv1 =3D 0; + output->start_ld =3D start_ld; + output->resv2 =3D 0; + + for (i =3D 0; i < ldmap_len && (start_ld + i) < output->nr_lds; i++) { + output->ldmap[i] =3D s->mhd_state->ldmap[start_ld + i]; + } + output->ldmap_len =3D i; + + *len_out =3D sizeof(*output) + output->ldmap_len; + return CXL_MBOX_SUCCESS; +} + +static CXLRetCode cmd_niagara_get_section_status(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraSharedState *nss =3D (NiagaraSharedState *)s->mhd_state; + NiagaraGetSectionStatusOutput *output =3D (void *)payload_out; + + output->total_section_count =3D nss->total_sections; + output->free_section_count =3D nss->free_sections; + + *len_out =3D sizeof(*output); + + return CXL_MBOX_SUCCESS; +} + +static bool niagara_claim_section(CXLNiagaraState *s, + uint32_t *sections, + uint32_t section_idx) +{ + uint32_t *section =3D §ions[section_idx]; + uint32_t old_value =3D __sync_fetch_and_or(section, (1 << s->mhd_head)= ); + + /* if we already owned the section, we haven't claimed it */ + if (old_value & (1 << s->mhd_head)) { + return false; + } + + /* if the old value wasn't 0, this section was already claimed */ + if (old_value !=3D 0) { + __sync_fetch_and_and(section, ~(1 << s->mhd_head)); + return false; + } + return true; +} + +static void niagara_release_sections(CXLNiagaraState *s, + uint32_t *section_ids, + uint32_t count) +{ + NiagaraSharedState *nss =3D s->mhd_state; + uint32_t *sections =3D &nss->sections[0]; + uint32_t section; + uint32_t old_val; + uint32_t i; + + /* free any successfully allocated sections */ + for (i =3D 0; i < count; i++) { + section =3D section_ids[i]; + old_val =3D __sync_fetch_and_and(§ions[section], ~(1 << s->mhd= _head)); + + if (old_val & (1 << s->mhd_head)) { + __sync_fetch_and_add(&nss->free_sections, 1); + } + } +} + +static void niagara_alloc_build_output(NiagaraAllocOutput *output, + size_t *len_out, + uint32_t *section_ids, + uint32_t section_count) +{ + uint32_t extents; + uint32_t previous; + uint32_t i; + + /* Build the output */ + output->section_count =3D section_count; + extents =3D 0; + previous =3D 0; + for (i =3D 0; i < section_count; i++) { + if (i =3D=3D 0) { + /* start the first extent */ + output->extents[extents].start_section_id =3D section_ids[i]; + output->extents[extents].section_count =3D 1; + extents++; + } else if (section_ids[i] =3D=3D (previous + 1)) { + /* increment the current extent */ + output->extents[extents - 1].section_count++; + } else { + /* start a new extent */ + output->extents[extents].start_section_id =3D section_ids[i]; + output->extents[extents].section_count =3D 1; + extents++; + } + previous =3D section_ids[i]; + } + output->extent_count =3D extents; + *len_out =3D (8 + (16 * extents)); + return; +} + +static CXLRetCode niagara_alloc_manual(CXLNiagaraState *s, + NiagaraAllocInput *input, + NiagaraAllocOutput *output, + size_t *len_out) +{ + NiagaraSharedState *nss =3D s->mhd_state; + uint32_t cur_extent =3D 0; + g_autofree uint32_t *section_ids =3D NULL; + uint32_t *sections; + uint32_t allocated; + uint32_t i =3D 0; + uint32_t ttl_sec =3D 0; + + /* input validation: iterate extents, count total sectios */ + for (i =3D 0; i < input->extent_count; i++) { + uint32_t start =3D input->extents[i].start_section_id; + uint32_t end =3D start + input->extents[i].section_count; + + if ((start >=3D nss->total_sections) || + (end > nss->total_sections)) { + return CXL_MBOX_INVALID_INPUT; + } + ttl_sec +=3D input->extents[i].section_count; + } + + if (ttl_sec !=3D input->section_count) { + return CXL_MBOX_INVALID_INPUT; + } + + section_ids =3D malloc(input->section_count * sizeof(uint32_t)); + sections =3D &nss->sections[0]; + allocated =3D 0; + + /* for each section requested in the input, try to allocate that secti= on */ + for (cur_extent =3D 0; cur_extent < input->extent_count; cur_extent++)= { + uint32_t start_section =3D input->extents[cur_extent].start_sectio= n_id; + uint32_t section_count =3D input->extents[cur_extent].section_coun= t; + uint32_t cur_section; + + for (cur_section =3D input->extents[cur_extent].start_section_id; + cur_section < start_section + section_count; + cur_section++) { + if (niagara_claim_section(s, sections, cur_section)) { + __sync_fetch_and_sub(&nss->free_sections, 1); + section_ids[allocated++] =3D cur_section; + } + } + } + + if ((input->policy & NIAGARA_SECTION_ALLOC_POLICY_ALL_OR_NOTHING) && + (allocated !=3D input->section_count)) { + niagara_release_sections(s, section_ids, allocated); + return CXL_MBOX_INTERNAL_ERROR; + } + + niagara_alloc_build_output(output, len_out, section_ids, allocated); + return CXL_MBOX_SUCCESS; +} + +static CXLRetCode niagara_alloc_auto(CXLNiagaraState *s, + NiagaraAllocInput *input, + NiagaraAllocOutput *output, + size_t *len_out) +{ + NiagaraSharedState *nss =3D s->mhd_state; + g_autofree uint32_t *section_ids =3D NULL; + uint32_t section_count =3D input->section_count; + uint32_t total_sections =3D nss->total_sections; + uint32_t *sections =3D &nss->sections[0]; + uint32_t allocated =3D 0; + uint32_t cur_section; + + section_ids =3D malloc(section_count * sizeof(uint32_t)); + + /* Iterate the the section list and allocate free sections */ + for (cur_section =3D 0; + (cur_section < total_sections) && (allocated !=3D section_count); + cur_section++) { + if (niagara_claim_section(s, sections, cur_section)) { + __sync_fetch_and_sub(&nss->free_sections, 1); + section_ids[allocated++] =3D cur_section; + } + } + + if ((input->policy & NIAGARA_SECTION_ALLOC_POLICY_ALL_OR_NOTHING) && + (allocated !=3D input->section_count)) { + niagara_release_sections(s, section_ids, allocated); + return CXL_MBOX_INTERNAL_ERROR; + } + + niagara_alloc_build_output(output, len_out, section_ids, allocated); + return CXL_MBOX_SUCCESS; +} + +static CXLRetCode cmd_niagara_set_section_alloc(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraAllocInput *input =3D (void *)payload_in; + NiagaraAllocOutput *output =3D (void *)payload_out; + + if (input->section_count =3D=3D 0 || + input->section_count > s->mhd_state->total_sections) { + return CXL_MBOX_INVALID_INPUT; + } + + if (input->policy & NIAGARA_SECTION_ALLOC_POLICY_MANUAL) { + return niagara_alloc_manual(s, input, output, len_out); + } + + return niagara_alloc_auto(s, input, output, len_out); +} + +static CXLRetCode cmd_niagara_set_section_release(const struct cxl_cmd *cm= d, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraSharedState *nss =3D s->mhd_state; + NiagaraReleaseInput *input =3D (void *)payload_in; + uint32_t i, j; + uint32_t *sections =3D &nss->sections[0]; + + for (i =3D 0; i < input->extent_count; i++) { + uint32_t start =3D input->extents[i].start_section_id; + + for (j =3D 0; j < input->extents[i].section_count; j++) { + uint32_t *cur_section =3D §ions[start + j]; + uint32_t hbit =3D 1 << s->mhd_head; + uint32_t old_val =3D __sync_fetch_and_and(cur_section, ~hbit); + + if (old_val & hbit) { + __sync_fetch_and_add(&nss->free_sections, 1); + } + } + } + return CXL_MBOX_SUCCESS; +} + +static CXLRetCode cmd_niagara_set_section_size(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraSharedState *nss =3D s->mhd_state; + NiagaraSetSectionSizeInput *input =3D (void *)payload_in; + NiagaraSetSectionSizeOutput *output =3D (void *)payload_out; + uint32_t prev_size =3D nss->section_size; + uint32_t prev_ttl =3D nss->total_sections; + + /* Only allow size change if all sections are free */ + if (nss->free_sections !=3D nss->total_sections) { + return CXL_MBOX_INTERNAL_ERROR; + } + + if (nss->section_size !=3D (1 << (input->section_unit - 1))) { + nss->section_size =3D (1 << (input->section_unit - 1)); + nss->total_sections =3D (prev_size * prev_ttl) / nss->section_size; + nss->free_sections =3D nss->total_sections; + } + + output->section_unit =3D input->section_unit; + return CXL_MBOX_SUCCESS; +} + +static CXLRetCode cmd_niagara_get_section_map(const struct cxl_cmd *cmd, + uint8_t *payload_in, + size_t len_in, + uint8_t *payload_out, + size_t *len_out, + CXLCCI *cci) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(cci->d); + NiagaraSharedState *nss =3D s->mhd_state; + NiagaraGetSectionMapInput *input =3D (void *)payload_in; + NiagaraGetSectionMapOutput *output =3D (void *)payload_out; + uint32_t *sections =3D &nss->sections[0]; + uint8_t query_type =3D input->query_type; + uint32_t i; + uint32_t bytes; + + if ((query_type !=3D NIAGARA_GSM_QUERY_FREE) && + (query_type !=3D NIAGARA_GSM_QUERY_ALLOCATED)) { + return CXL_MBOX_INVALID_INPUT; + } + + output->ttl_section_count =3D nss->total_sections; + output->qry_section_count =3D 0; + bytes =3D (output->ttl_section_count / 8); + if (output->ttl_section_count % 8) { + bytes +=3D 1; + } + + for (i =3D 0; i < bytes; i++) { + output->bitset[i] =3D 0x0; + } + + /* Iterate the the section list and check the bits */ + for (i =3D 0; (i < nss->total_sections); i++) { + uint32_t section =3D sections[i]; + + if (((query_type =3D=3D NIAGARA_GSM_QUERY_FREE) && (!section)) || + ((query_type =3D=3D NIAGARA_GSM_QUERY_ALLOCATED) && + (section & (1 << s->mhd_head)))) { + uint32_t byte =3D i / 8; + uint8_t bit =3D (1 << (i % 8)); + + output->bitset[byte] |=3D bit; + output->qry_section_count++; + } + } + + *len_out =3D (8 + bytes); + return CXL_MBOX_SUCCESS; +} + +static bool mhdsld_access_valid(PCIDevice *d, + uint64_t dpa_offset, + unsigned int size) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(d); + NiagaraSharedState *nss =3D s->mhd_state; + uint32_t section =3D (dpa_offset / NIAGARA_MIN_MEMBLK); + + if (!(nss->sections[section] & (1 << s->mhd_head))) { + return false; + } + return true; +} + +static const struct cxl_cmd cxl_cmd_set_niagara[256][256] =3D { + [NIAGARA_MHD][GET_MHD_INFO] =3D {"GET_MULTI_HEADED_INFO", + cmd_mhd_get_info, 2, 0}, + [NIAGARA_CMD][GET_SECTION_STATUS] =3D { "GET_SECTION_STATUS", + cmd_niagara_get_section_status, 0, 0 }, + [NIAGARA_CMD][SET_SECTION_ALLOC] =3D { "SET_SECTION_ALLOC", + cmd_niagara_set_section_alloc, ~0, + (CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | CXL_MBOX_IMMEDIATE_DATA_CHANGE= | + CXL_MBOX_IMMEDIATE_POLICY_CHANGE | CXL_MBOX_IMMEDIATE_LOG_CHANGE) + }, + [NIAGARA_CMD][SET_SECTION_RELEASE] =3D { "SET_SECTION_RELEASE", + cmd_niagara_set_section_release, ~0, + (CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | CXL_MBOX_IMMEDIATE_DATA_CHANGE= | + CXL_MBOX_IMMEDIATE_POLICY_CHANGE | CXL_MBOX_IMMEDIATE_LOG_CHANGE) + }, + [NIAGARA_CMD][SET_SECTION_SIZE] =3D { "SET_SECTION_SIZE", + cmd_niagara_set_section_size, 8, + (CXL_MBOX_IMMEDIATE_CONFIG_CHANGE | CXL_MBOX_IMMEDIATE_DATA_CHANGE= | + CXL_MBOX_IMMEDIATE_POLICY_CHANGE | CXL_MBOX_IMMEDIATE_LOG_CHANGE) + }, + [NIAGARA_CMD][GET_SECTION_MAP] =3D { "GET_SECTION_MAP", + cmd_niagara_get_section_map, 8 , CXL_MBOX_IMMEDIATE_DATA_CHANGE }, +}; + +static Property cxl_niagara_props[] =3D { + DEFINE_PROP_UINT32("mhd-head", CXLNiagaraState, mhd_head, ~(0)), + DEFINE_PROP_UINT32("mhd-shmid", CXLNiagaraState, mhd_shmid, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void cxl_niagara_realize(PCIDevice *pci_dev, Error **errp) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(pci_dev); + + ct3_realize(pci_dev, errp); + + if (!s->mhd_shmid || s->mhd_head =3D=3D ~(0)) { + error_setg(errp, "is_mhd requires mhd_shmid and mhd_head settings"= ); + return; + } + + if (s->mhd_head >=3D 32) { + error_setg(errp, "MHD Head ID must be between 0-31"); + return; + } + + s->mhd_state =3D shmat(s->mhd_shmid, NULL, 0); + if (s->mhd_state =3D=3D (void *)-1) { + s->mhd_state =3D NULL; + error_setg(errp, "Unable to attach MHD State. Check ipcs is valid"= ); + return; + } + + /* For now, limit the number of LDs to the number of heads (SLD) */ + if (s->mhd_head >=3D s->mhd_state->nr_heads) { + error_setg(errp, "Invalid head ID for multiheaded device."); + return; + } + + if (s->mhd_state->nr_lds <=3D s->mhd_head) { + error_setg(errp, "MHD Shared state does not have sufficient lds."); + return; + } + + s->mhd_state->ldmap[s->mhd_head] =3D s->mhd_head; + s->ct3d.mhd_access_valid =3D mhdsld_access_valid; + return; +} + +static void cxl_niagara_exit(PCIDevice *pci_dev) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(pci_dev); + + ct3_exit(pci_dev); + + if (s->mhd_state) { + shmdt(s->mhd_state); + } +} + +static void cxl_niagara_reset(DeviceState *d) +{ + CXLNiagaraState *s =3D CXL_NIAGARA(d); + + ct3d_reset(d); + cxl_add_cci_commands(&s->ct3d.cci, cxl_cmd_set_niagara, 512); +} + +static void cxl_niagara_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *pc =3D PCI_DEVICE_CLASS(klass); + + pc->realize =3D cxl_niagara_realize; + pc->exit =3D cxl_niagara_exit; + dc->reset =3D cxl_niagara_reset; + device_class_set_props(dc, cxl_niagara_props); +} + +static const TypeInfo cxl_niagara_info =3D { + .name =3D TYPE_CXL_NIAGARA, + .parent =3D TYPE_CXL_TYPE3, + .class_size =3D sizeof(struct CXLNiagaraClass), + .class_init =3D cxl_niagara_class_init, + .instance_size =3D sizeof(CXLNiagaraState), + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CXL_DEVICE }, + { INTERFACE_PCIE_DEVICE }, + {} + }, +}; + +static void cxl_niagara_register_types(void) +{ + type_register_static(&cxl_niagara_info); +} + +type_init(cxl_niagara_register_types) diff --git a/hw/cxl/vendor/skhynix/skhynix_niagara.h b/hw/cxl/vendor/skhyni= x/skhynix_niagara.h new file mode 100644 index 0000000000..0489102f38 --- /dev/null +++ b/hw/cxl/vendor/skhynix/skhynix_niagara.h @@ -0,0 +1,169 @@ +/* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * Copyright (c) 2023 MemVerge Inc. + * Copyright (c) 2023 SK hynix Inc. + */ + +#ifndef CXL_SKH_NIAGARA_H +#define CXL_SKH_NIAGARA_H +#include +#include "hw/cxl/cxl.h" +#include "hw/cxl/cxl_mailbox.h" +#include "hw/cxl/cxl_device.h" + +#define NIAGARA_MIN_MEMBLK (1024 * 1024 * 128) + +/* + * The shared state cannot have 2 variable sized regions + * so we have to max out the ldmap. + */ +typedef struct NiagaraSharedState { + uint8_t nr_heads; + uint8_t nr_lds; + uint8_t ldmap[65536]; + uint32_t total_sections; + uint32_t free_sections; + uint32_t section_size; + uint32_t sections[]; +} NiagaraSharedState; + +struct CXLNiagaraState { + CXLType3Dev ct3d; + uint32_t mhd_head; + uint32_t mhd_shmid; + NiagaraSharedState *mhd_state; +}; + +struct CXLNiagaraClass { + CXLType3Class parent_class; +}; + +enum { + NIAGARA_MHD =3D 0x55, + #define GET_MHD_INFO 0x0 + NIAGARA_CMD =3D 0xC0 + #define GET_SECTION_STATUS 0x0 + #define SET_SECTION_ALLOC 0x1 + #define SET_SECTION_RELEASE 0x2 + #define SET_SECTION_SIZE 0x3 + /* Future: MOVE_DATA 0x4 */ + #define GET_SECTION_MAP 0x5 + /* Future: CLEAR_SECTION 0x99 */ +}; + +typedef struct NiagaraExtent { + uint32_t start_section_id; + uint32_t section_count; + uint8_t reserved[8]; +} QEMU_PACKED NiagaraExtent; + +/* + * MHD Get Info Command + * Returns information the LD's associated with this head + */ +typedef struct NiagaraMHDGetInfoInput { + uint8_t start_ld; + uint8_t ldmap_len; +} QEMU_PACKED NiagaraMHDGetInfoInput; + +typedef struct NiagaraMHDGetInfoOutput { + uint8_t nr_lds; + uint8_t nr_heads; + uint16_t resv1; + uint8_t start_ld; + uint8_t ldmap_len; + uint16_t resv2; + uint8_t ldmap[]; +} QEMU_PACKED NiagaraMHDGetInfoOutput; + +/* + * Niagara Section Status Command + * + * Returns the total sections and number of free sections + */ +typedef struct NiagaraGetSectionStatusOutput { + uint32_t total_section_count; + uint32_t free_section_count; +} QEMU_PACKED NiagaraGetSectionStatusOutput; + +/* + * Niagara Set Section Alloc Command + * + * Policies: + * All or nothing - if fail to allocate any section, nothing is allocat= ed + * Best effort - Allocate as many as possible + * Manual - allocate the provided set of extents + * + * Policies can be combined. + * + * Returns: The allocated sections in extents + */ +#define NIAGARA_SECTION_ALLOC_POLICY_ALL_OR_NOTHING 0 +#define NIAGARA_SECTION_ALLOC_POLICY_BEST_EFFORT 1 +#define NIAGARA_SECTION_ALLOC_POLICY_MANUAL 2 + +typedef struct NiagaraAllocInput { + uint8_t policy; + uint8_t reserved1[3]; + uint32_t section_count; + uint8_t reserved2[4]; + uint32_t extent_count; + NiagaraExtent extents[]; +} QEMU_PACKED NiagaraAllocInput; + +typedef struct NiagaraAllocOutput { + uint32_t section_count; + uint32_t extent_count; + NiagaraExtent extents[]; +} QEMU_PACKED NiagaraAllocOutput; + +/* + * Niagara Set Section Release Command + * + * Releases the provided extents + */ +typedef struct NiagaraReleaseInput { + uint32_t extent_count; + uint8_t policy; + uint8_t reserved[3]; + NiagaraExtent extents[]; +} QEMU_PACKED NiagaraReleaseInput; + +/* + * Niagara Set Section Size + * + * Changes the section size to 128 * (1 << section_unit) + */ +typedef struct NiagaraSetSectionSizeInput { + uint8_t section_unit; + uint8_t reserved[7]; +} QEMU_PACKED NiagaraSetSectionSizeInput; + +typedef struct { + uint8_t section_unit; + uint8_t reserved[7]; +} QEMU_PACKED NiagaraSetSectionSizeOutput; + +/* + * Niagara Get Section Map Command + * query type: + * Free - Map of free sections + * Allocted - What sections are allocated for this head + * Returns a map of the requested type of sections + */ +#define NIAGARA_GSM_QUERY_FREE 0 +#define NIAGARA_GSM_QUERY_ALLOCATED 1 + +typedef struct NiagaraGetSectionMapInput { + uint8_t query_type; + uint8_t reserved[7]; +} QEMU_PACKED NiagaraGetSectionMapInput; + +typedef struct NiagaraGetSectionMapOutput { + uint32_t ttl_section_count; + uint32_t qry_section_count; + uint8_t bitset[]; +} QEMU_PACKED NiagaraGetSectionMapOutput; + +#endif --=20 2.39.1