From patchwork Wed Sep 25 19:04:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hal Martin X-Patchwork-Id: 1989517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LWaFn+6j; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XDR6H60GCz1xt0 for ; Thu, 26 Sep 2024 05:06:31 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stXKR-00035W-E2; Wed, 25 Sep 2024 15:05:35 -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 1stXKP-00034Q-4q for qemu-devel@nongnu.org; Wed, 25 Sep 2024 15:05:33 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stXKN-0005ne-7A for qemu-devel@nongnu.org; Wed, 25 Sep 2024 15:05:32 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-535694d67eeso237424e87.0 for ; Wed, 25 Sep 2024 12:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727291128; x=1727895928; 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=6UcRTZcKey+l4g54CJLxGmkuebFnwMhES2SY5pkGUHM=; b=LWaFn+6jPlp2n0rHzDlPsBdeQ+DCZvAsDxBxNiUfgYf1wknBBwZuEwvM+rMwWD31EY AnFVKfE1rkVWhAzuu6avfwE4vNezSZltelWgFUd8jHfY3gXhvzX5e4Rv52NlqDb6IOd4 4h1N4fCx8QOl8L1wHQj+EomgmN4x+QZXGVctmoK2ysw2bbhGeo3bkLxMrv109eysRHSx q2FuDXeTTjDKtSFBwkxEkR4bwxy8DcEHMo0c1WcmIIiE8J3eQcRvf3OIb3pWKd0Z8vnI VB/rRQiVudU00fIhiz7x5lFAYT3Jgc0IPSxgM5j3iNNIWew5WV/IR4pwa9ri5EpuyqDZ Q9KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727291128; x=1727895928; 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=6UcRTZcKey+l4g54CJLxGmkuebFnwMhES2SY5pkGUHM=; b=aGNZgzDIshxuQ15wepC8xt+1Jm/kDmXg8058AwY+k06e5//x1T2O2rlvYemTXa9sC0 Nu/hY5KZej+Etp6iZO3EIRrPRgX1zBVOer1CIfQZzZKtg2UUzx8cs+RP8dcRko3rL+qn 6yHuS9tM3xFoq64Q5SVXS5PgequLi8WQ9k4+BLF4N02rpCP3wJ3HTUw9jrxQ7+N8SrDK H0yzLUo2rcZQm/YypmKku10Y+Lk795L52fkOFkURDM+ikKC/kAEdqvKfhjY9GQXzQLAF +w3rZcVMDMYYwFQcz1eUd8UzhiAelqwKZ5AF942VVxsvUK7ZFZDJOItRS3WoN8PjZvZD 2edg== X-Forwarded-Encrypted: i=1; AJvYcCW22YeNRIQYU1Z+R/ucw6qD+OEO6JOJzaQ5xkECnK+BBjfx+QQ0ggsw5skZAam5bWwUcco0At8oWZQy@nongnu.org X-Gm-Message-State: AOJu0Yyqt9P19FMiIwkoU6n3b8ZRgPGwcd1r64USUMP4W1+3s+saO3C9 7QUlNie6hEFs6J3bpkj+/9XPsMbSkIczf1/c9E4rjHmgN4wJo5CP X-Google-Smtp-Source: AGHT+IGWZm6dzyKfOwfneyi01xYmldIx5ikczAsNb7VhjhLU8VFI/7qOowxZKPeRtpPc5MxdGEe27A== X-Received: by 2002:a05:6512:1255:b0:533:4784:6aec with SMTP id 2adb3069b0e04-53896bfc46bmr221463e87.27.1727291128172; Wed, 25 Sep 2024 12:05:28 -0700 (PDT) Received: from fitlet2.primaryno.de ([185.154.111.57]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-537a86489c7sm602736e87.195.2024.09.25.12.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 12:05:27 -0700 (PDT) From: Hal Martin To: mst@redhat.com Cc: Hal Martin , qemu-devel@nongnu.org, imammedo@redhat.com, anisinha@redhat.com Subject: [PATCH v3] hw/smbios: support for type 7 (cache information) Date: Wed, 25 Sep 2024 19:04:45 +0000 Message-Id: <20240925190445.20700-1-hal.martin@gmail.com> X-Mailer: git-send-email 2.38.5 In-Reply-To: <20240924162918.3be98058@imammedo.users.ipa.redhat.com> References: <20240924162918.3be98058@imammedo.users.ipa.redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=hal.martin@gmail.com; helo=mail-lf1-x12e.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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds support for SMBIOS type 7 (Cache Information) to qemu. level: cache level (1-8) size: cache size in bytes Example usage: -smbios type=7,level=1,size=0x8000 Signed-off-by: Hal Martin --- hw/smbios/smbios.c | 65 ++++++++++++++++++++++++++++++++++++ include/hw/firmware/smbios.h | 18 ++++++++++ qemu-options.hx | 2 ++ 3 files changed, 85 insertions(+) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index a394514264..c8c62d8064 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -83,6 +83,12 @@ static struct { .processor_family = 0x01, /* Other */ }; +struct type7_instance { + uint16_t level, size; + QTAILQ_ENTRY(type7_instance) next; +}; +static QTAILQ_HEAD(, type7_instance) type7 = QTAILQ_HEAD_INITIALIZER(type7); + struct type8_instance { const char *internal_reference, *external_reference; uint8_t connector_type, port_type; @@ -330,6 +336,23 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = { { /* end of list */ } }; +static const QemuOptDesc qemu_smbios_type7_opts[] = { + { + .name = "type", + .type = QEMU_OPT_NUMBER, + .help = "SMBIOS element type", + },{ + .name = "level", + .type = QEMU_OPT_NUMBER, + .help = "cache level", + },{ + .name = "size", + .type = QEMU_OPT_NUMBER, + .help = "cache size", + }, + { /* end of list */ } +}; + static const QemuOptDesc qemu_smbios_type8_opts[] = { { .name = "type", @@ -733,6 +756,34 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance, smbios_type4_count++; } +static void smbios_build_type_7_table(void) +{ + unsigned instance = 0; + struct type7_instance *t7; + char designation[20]; + + QTAILQ_FOREACH(t7, &type7, next) { + SMBIOS_BUILD_TABLE_PRE(7, T0_BASE + instance, true); + sprintf(designation, "CPU Internal L%d", t7->level); + SMBIOS_TABLE_SET_STR(7, socket_designation, designation); + /* cache not socketed, enabled, write back */ + t->cache_configuration = cpu_to_le16(0x180 | ((t7->level) - 1)); + t->installed_size = cpu_to_le16(t7->size); + /* set max size to installed size */ + t->maximum_cache_size = cpu_to_le16(t7->size); + t->supported_sram_type = cpu_to_le16(0x10); /* pipeline burst */ + t->current_sram_type = cpu_to_le16(0x10); /* pipeline burst */ + t->cache_speed = 0x1; /* 1 ns */ + t->error_correction_type = 0x6; /* Multi-bit ECC */ + t->system_cache_type = 0x05; /* Unified */ + t->associativity = 0x6; /* Fully Associative */ + t->maximum_cache_size2 = cpu_to_le32(t7->size); + t->installed_cache_size2 = cpu_to_le32(t7->size); + SMBIOS_BUILD_TABLE_POST; + instance++; + } +} + static void smbios_build_type_8_table(void) { unsigned instance = 0; @@ -1120,6 +1171,7 @@ static bool smbios_get_tables_ep(MachineState *ms, } } + smbios_build_type_7_table(); smbios_build_type_8_table(); smbios_build_type_9_table(errp); smbios_build_type_11_table(); @@ -1478,6 +1530,19 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) UINT16_MAX); } return; + case 7: + if (!qemu_opts_validate(opts, qemu_smbios_type7_opts, errp)) { + return; + } + struct type7_instance *t7_i; + t7_i = g_new0(struct type7_instance, 1); + t7_i->level = qemu_opt_get_number(opts, "level", 0x0); + t7_i->size = qemu_opt_get_number(opts, "size", 0x0200); + /* Only cache levels 1-8 are permitted */ + if (t7_i->level > 0 && t7_i->level < 9) { + QTAILQ_INSERT_TAIL(&type7, t7_i, next); + } + return; case 8: if (!qemu_opts_validate(opts, qemu_smbios_type8_opts, errp)) { return; diff --git a/include/hw/firmware/smbios.h b/include/hw/firmware/smbios.h index f066ab7262..1ea1506b46 100644 --- a/include/hw/firmware/smbios.h +++ b/include/hw/firmware/smbios.h @@ -220,6 +220,24 @@ typedef enum smbios_type_4_len_ver { SMBIOS_TYPE_4_LEN_V30 = offsetofend(struct smbios_type_4, thread_count2), } smbios_type_4_len_ver; +/* SMBIOS type 7 - Cache Information (v2.0+) */ +struct smbios_type_7 { + struct smbios_structure_header header; + uint8_t socket_designation; + uint16_t cache_configuration; + uint16_t maximum_cache_size; + uint16_t installed_size; + uint16_t supported_sram_type; + uint16_t current_sram_type; + uint8_t cache_speed; + uint8_t error_correction_type; + uint8_t system_cache_type; + uint8_t associativity; + uint32_t maximum_cache_size2; + uint32_t installed_cache_size2; + /* contained elements follow */ +} QEMU_PACKED; + /* SMBIOS type 8 - Port Connector Information */ struct smbios_type_8 { struct smbios_structure_header header; diff --git a/qemu-options.hx b/qemu-options.hx index d94e2cbbae..21c05821d5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2706,6 +2706,8 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, " [,asset=str][,part=str][,max-speed=%d][,current-speed=%d]\n" " [,processor-family=%d][,processor-id=%d]\n" " specify SMBIOS type 4 fields\n" + "-smbios type=7[,level=%d][,size=%d]\n" + " specify SMBIOS type 7 fields\n" "-smbios type=8[,external_reference=str][,internal_reference=str][,connector_type=%d][,port_type=%d]\n" " specify SMBIOS type 8 fields\n" "-smbios type=11[,value=str][,path=filename]\n"