From nobody Wed Nov 27 19:43: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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697645264; cv=none; d=zohomail.com; s=zohoarc; b=AHjyd9CjDhbotmh5eo8bq8N+ZVKQM3bHeBYJs0yKv39N1Jp/0bFoiLK0jAwZlsQ2/ICFrJxh5QvjN7TnX9OYmHnHyn2US0OTrrdN4u6ZPrBFG7vomPzelMLnjoMn9oO4MaZN9r1OqHT7n6jUnRh6f8tmpxakOTwMiGnSw6WvRwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697645264; 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=foz0D5lmOzvOPO4BlvktoDH1EeV7OUliKwH9KE2N6B2L3YAAJre9Np1hQlXteBZFyX/dr85vWyitSHpmVwnrECxB53W8jqx6Xl3VqPZRlckfIeRUNrG9ddpyY3uyILXtPE1chNQNuCn3UjMkHpWS4/akYOBvXnN+XRNg/sJfi+c= 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 16976452646801012.5559645523792; Wed, 18 Oct 2023 09:07:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt8xk-0003Gz-Rp; Wed, 18 Oct 2023 12:00: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 1qt8xX-0002Xz-4J for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:59:51 -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 1qt8xU-0007mt-Qh for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:59:46 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-523-P2-W9NOzPJ-t6T_-pZupeg-1; Wed, 18 Oct 2023 11:59:42 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-406de77fb85so44722525e9.0 for ; Wed, 18 Oct 2023 08:59:42 -0700 (PDT) Received: from redhat.com ([2a02:14f:1f2:2037:f34:d61b:7da0:a7be]) by smtp.gmail.com with ESMTPSA id bs30-20020a056000071e00b0032d9a1f2ec3sm2466007wrb.27.2023.10.18.08.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 08:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697644783; 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=Lr7/OwsyEfvC+/ZxvMrnAzt3pOGdnYHP/FTfRftvQ+WPbsd4WKJUS4jJ37msvSrP3ri36k zHOg1+e8dQs9LyyIa67YVBdcHM77kH2r5lCoWANFoBnCm7fZwoQZhOPC3LPhl740dpA6RB lx1jXviMtILAwl+M4RwMFj0unGbhn44= X-MC-Unique: P2-W9NOzPJ-t6T_-pZupeg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697644781; x=1698249581; 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=qhLoSLt7UYpjlgKFlOprmN4/EXkFewGir71qOkUrHlqiVnaNwQumdF13E0Pqc3Jb5N YWRCnW5oApLIoOjd7igxnlRogfE1JI8mCyRyEVLcVTWr30lswILEO7a29louKGo/dbLr kL8XjOyMbJ5QKU5wSA5SOG8BoXxzYO/ZBPwrJL1HgnED5cxiAmOu9oDRdPrmg1d/mUEe zIAkGMfdeVauxQTYz1zoGEcp1LrwbhxDlF3Qzf+NsugSPfZpfKJsau+vEy6Vs69xvXEp 7V07KyXkq8vp5wZo+eIK/WpIMAkZzJ8f9aN3q2oKhmLU+E41o5jpoAiTtgIQ3D5dLW8g 2iLg== X-Gm-Message-State: AOJu0YycRcDf8q8hLifQ4VN/lndNe2ARGxMfnjFnOcyHY2spqpnC2+h3 fJDwvySGlUbkjqzi4i/fkEvA4OvbrqcXjhWt5suyf6fCpKi3dzXXf6AShCgd0mUNWNoFHyPUj4a KsMeYdvleEdpislVmsDbtzYMJzMp+Ob15wsN4vTe+8QyAGl7e2iPbWSX7Lk93qhxryJDNPjo= X-Received: by 2002:a05:6000:c4:b0:32d:9b3c:9c05 with SMTP id q4-20020a05600000c400b0032d9b3c9c05mr4240575wrx.55.1697644780849; Wed, 18 Oct 2023 08:59:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8F+zv6MWjKKYcUkHZ4MIK0LBtKcbZJdUYEuNuKSnz4e7Y3EFiSR5HQSpAVC+X8ksmh3RZtQ== X-Received: by 2002:a05:6000:c4:b0:32d:9b3c:9c05 with SMTP id q4-20020a05600000c400b0032d9b3c9c05mr4240551wrx.55.1697644780373; Wed, 18 Oct 2023 08:59:40 -0700 (PDT) Date: Wed, 18 Oct 2023 11:59: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 79/83] hw/cxl: Add QTG _DSM support for ACPI0017 device Message-ID: 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: 1697645267106100003 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