From nobody Wed Nov 27 18:51:24 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697966892; cv=none; d=zohomail.com; s=zohoarc; b=hpNGiKVqrzR7vDJDJ2LB187BuhlCakbB9O/s9uDRG18n8rm0yZ1abA5vQ1XxzodRaYLPz71vERDDSj1M/rYaMLOkgSQ5zFp7rJclUqcHcaSAlBs57gmIijjnSSPVuxr0LiGIL8m657OAfDnmts/CXhSw/0YbwPlI8pxCLbaj3/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697966892; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yRc5fadVObBzSTIUVVUCoFqEpnBFobcqZOmUrCHqKqM=; b=hQee0u004VZfH3HWBkvDE+s7p9EyxOg7gf/bXtAKs5yfZLWMuXdVzrEhggK8sYwQMMYrDJWqzUIeHALNAg0acMp/W0pFtKJQmVfdPsBUFs3u/Jg1iIFEAPCg1TJaZLVV2MmoaDjnPmq7h3vvNNbPUsRjlV0hO5qJxNSEGJOUiTQ= 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 1697966892419184.37805941736792; Sun, 22 Oct 2023 02:28:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quUkH-0002ao-0D; Sun, 22 Oct 2023 05:27:42 -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 1quUjM-0001Ms-SD for qemu-devel@nongnu.org; Sun, 22 Oct 2023 05:26:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quUjK-00012n-UN for qemu-devel@nongnu.org; Sun, 22 Oct 2023 05:26:44 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-1F4PC9zAMTyjlXD_co5kHg-1; Sun, 22 Oct 2023 05:26:40 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-32dee12c5b4so336968f8f.2 for ; Sun, 22 Oct 2023 02:26:39 -0700 (PDT) Received: from redhat.com ([2.52.1.53]) by smtp.gmail.com with ESMTPSA id u14-20020a5d468e000000b00323330edbc7sm5301258wrq.20.2023.10.22.02.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 02:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697966802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yRc5fadVObBzSTIUVVUCoFqEpnBFobcqZOmUrCHqKqM=; b=Gy1uNPqAX5kvrUoxM6ehK3vnpRP9Crsj7q6DU2yCrvWPOAx3nUZ685Xy84QbP5boo2sfXT ZbKJjCSeZZMRfZ/1L2N3hTCAtD9FD5DKoNNEUDOcACKvL7VIfjFQkBzEUasIYIcbHi4+MN 5MJllsYCkARQikfr4Dc/FqdSbQfAszE= X-MC-Unique: 1F4PC9zAMTyjlXD_co5kHg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697966798; x=1698571598; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yRc5fadVObBzSTIUVVUCoFqEpnBFobcqZOmUrCHqKqM=; b=qqUGRblIYzUEQkOXoG53Fhdi7CsiYhOpajsU7OVqpuFuBNMWyDTpZ6uWr/qF7YUHnY ztSv7s4Judpf7ZNJy2JQbSwmkEP+q8rXc/aMAYYxBmde6lcV1iKuIoJ3RDFsDcNtBXxt GzhiqC6xwxrMb+iJ22ZRWhq3kQKWy7yqJun/oHxdrxEZNQ7YuPbhuKMygHV0LMhhfxtc iXInpPttAaGRE8I3DqZ0CyoY1siLmfo8d+ExpgUz+ZiVjbgI/EJARbLap13Qol/TK+hW O2Sx3T0nYFgbTWTKC8Le8LXwMdZ3sAMoFlbjWHmrkWeuc+KCNeVQvXaYLvw7e2NGGGuj L9Mw== X-Gm-Message-State: AOJu0Yxnb7YkB6Oa1thPzM17ArgWoRfLnYjYgUTG/tL+lPtHRB54F6Tk 2baWmehXvpNo+VqUXlIHnZhbdYbPzm4BRAy97WwlUzKDyfqRTRgAhWB9KJgdN4VBMRtyT7PeQF8 KgxRpJCBh30BBjwuMKhJfn5qgLPCldqnMUa01nue9PH4AsMdCi9g5H/0H2veYpRCxkf+W X-Received: by 2002:adf:f891:0:b0:32d:b2dd:ee1c with SMTP id u17-20020adff891000000b0032db2ddee1cmr4469644wrp.5.1697966798644; Sun, 22 Oct 2023 02:26:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGR2yfemPItI3a1TC/MHokgMIVTtRZirLpVt25Qr5IV8xgTcdAuaMj7zm/61MDLTqbn6+19jQ== X-Received: by 2002:adf:f891:0:b0:32d:b2dd:ee1c with SMTP id u17-20020adff891000000b0032db2ddee1cmr4469627wrp.5.1697966798204; Sun, 22 Oct 2023 02:26:38 -0700 (PDT) Date: Sun, 22 Oct 2023 05:26:34 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Dave Jiang , Jonathan Cameron , Igor Mammedov , Ani Sinha , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PULL v3 58/62] hw/cxl: Add QTG _DSM support for ACPI0017 device Message-ID: <6cdd46f66ff91a9c13c5dc4d018ae53d2f28d74a.1697966402.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 @redhat.com) X-ZM-MESSAGEID: 1697966893368100009 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dave Jiang Add a simple _DSM call support for the ACPI0017 device to return fake QTG ID values of 0 and 1 in all cases. This for _DSM plumbing testing from the = OS. Following edited for readability Device (CXLM) { Name (_HID, "ACPI0017") // _HID: Hardware ID ... Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method { If ((Arg0 =3D=3D ToUUID ("f365f9a6-a7de-4071-a66a-b40c0b4f8e52"))) { If ((Arg2 =3D=3D Zero)) { Return (Buffer (One) { 0x01 }) } If ((Arg2 =3D=3D One)) { Return (Package (0x02) { One, Package (0x02) { Zero, One } }) } } } Signed-off-by: Dave Jiang Signed-off-by: Jonathan Cameron Message-Id: <20231012125623.21101-3-Jonathan.Cameron@huawei.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/cxl.h | 1 + hw/acpi/cxl.c | 69 +++++++++++++++++++++++++++++++++++++++++++ hw/i386/acpi-build.c | 1 + 3 files changed, 71 insertions(+) diff --git a/include/hw/acpi/cxl.h b/include/hw/acpi/cxl.h index acf4418886..8f22c71530 100644 --- a/include/hw/acpi/cxl.h +++ b/include/hw/acpi/cxl.h @@ -25,5 +25,6 @@ void cxl_build_cedt(GArray *table_offsets, GArray *table_= data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id, CXLState *cxl_state); void build_cxl_osc_method(Aml *dev); +void build_cxl_dsm_method(Aml *dev); =20 #endif diff --git a/hw/acpi/cxl.c b/hw/acpi/cxl.c index 92b46bc932..9cd7905ea2 100644 --- a/hw/acpi/cxl.c +++ b/hw/acpi/cxl.c @@ -30,6 +30,75 @@ #include "qapi/error.h" #include "qemu/uuid.h" =20 +void build_cxl_dsm_method(Aml *dev) +{ + Aml *method, *ifctx, *ifctx2; + + method =3D aml_method("_DSM", 4, AML_SERIALIZED); + { + Aml *function, *uuid; + + uuid =3D aml_arg(0); + function =3D aml_arg(2); + /* CXL spec v3.0 9.17.3.1 _DSM Function for Retrieving QTG ID */ + ifctx =3D aml_if(aml_equal( + uuid, aml_touuid("F365F9A6-A7DE-4071-A66A-B40C0B4F8E52"))); + + /* Function 0, standard DSM query function */ + ifctx2 =3D aml_if(aml_equal(function, aml_int(0))); + { + uint8_t byte_list[1] =3D { 0x01 }; /* function 1 only */ + + aml_append(ifctx2, + aml_return(aml_buffer(sizeof(byte_list), byte_list)= )); + } + aml_append(ifctx, ifctx2); + + /* + * Function 1 + * Creating a package with static values. The max supported QTG ID= will + * be 1 and recommended QTG IDs are 0 and then 1. + * The values here are statically created to simplify emulation. V= alues + * from a real BIOS would be determined by the performance of all = the + * present CXL memory and then assigned. + */ + ifctx2 =3D aml_if(aml_equal(function, aml_int(1))); + { + Aml *pak, *pak1; + + /* + * Return: A package containing two elements - a WORD that ret= urns + * the maximum throttling group that the platform supports, an= d a + * package containing the QTG ID(s) that the platform recommen= ds. + * Package { + * Max Supported QTG ID + * Package {QTG Recommendations} + * } + * + * While the SPEC specified WORD that hints at the value being + * 16bit, the ACPI dump of BIOS DSDT table showed that the val= ues + * are integers with no specific size specification. aml_int()= will + * be used for the values. + */ + pak1 =3D aml_package(2); + /* Set QTG ID of 0 */ + aml_append(pak1, aml_int(0)); + /* Set QTG ID of 1 */ + aml_append(pak1, aml_int(1)); + + pak =3D aml_package(2); + /* Set Max QTG 1 */ + aml_append(pak, aml_int(1)); + aml_append(pak, pak1); + + aml_append(ifctx2, aml_return(pak)); + } + aml_append(ifctx, ifctx2); + } + aml_append(method, ifctx); + aml_append(dev, method); +} + static void cedt_build_chbs(GArray *table_data, PXBCXLDev *cxl) { PXBDev *pxb =3D PXB_DEV(cxl); diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b0e1f074f1..80db183b78 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1417,6 +1417,7 @@ static void build_acpi0017(Aml *table) method =3D aml_method("_STA", 0, AML_NOTSERIALIZED); aml_append(method, aml_return(aml_int(0x01))); aml_append(dev, method); + build_cxl_dsm_method(dev); =20 aml_append(scope, dev); aml_append(table, scope); --=20 MST