From nobody Wed Jun 24 02:13:21 2026 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=quarantine dis=none) header.from=9elements.com ARC-Seal: i=1; a=rsa-sha256; t=1781094225; cv=none; d=zohomail.com; s=zohoarc; b=QY/8QvW6zDXAjA7aFqFovS9OjrL4jPDZ0QFguDsOLumJWGQBLeYhkUwdJECIDuHfLx8UwiIkl1ht89xHp36H48Oj65KXbPytb2PRRVYEizdVQ4tfMVwl4SpADlTDiOqwp9MK3a347fz8KSFeKQjJ+vJH+0x6xKvOaYB5551clH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781094225; h=Content-Type:Content-Transfer-Encoding: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=Gx97R6nvlqLPdKU6XWZOgI4w8DtmWAcFkT1SFlCm7Mc=; b=DYskZf9o4Onhqn71ZNstIxjKHjqzjk7C0SW2rWgdSdLDCW8M4wgcqDQO3Cu17bfQt9a9tvz51EtfC2FCIBFGeY6u0qbHY+mXLQlPGUE9nyDijNf+4FztPOLt7BMpxSSpvaSykjv1uJLVF7xlHQcZbirtIHLwZ3BU8raMO3z2Was= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781094225073590.8598461063901; Wed, 10 Jun 2026 05:23:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXHxu-0006y9-1l; Wed, 10 Jun 2026 08:23:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXHxh-0006rn-TH for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:13 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXHxe-0005rJ-6l for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:12 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-45f3cf907ceso3439028f8f.2 for ; Wed, 10 Jun 2026 05:23:09 -0700 (PDT) Received: from alexanderarchlinux ([188.111.3.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm70995963f8f.0.2026.06.10.05.23.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 05:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1781094189; x=1781698989; 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=Gx97R6nvlqLPdKU6XWZOgI4w8DtmWAcFkT1SFlCm7Mc=; b=JfFTFMbzZgGmMs0sdK+lx1fW3xvDCqQqT8smc82OKKQ7K8Rew/1mTjuYg9+Ubpon/C SXxAkQVcZKPU37iBQ5o6PhOo4dVs+t1XfzzaeKzsP84cqjOFeVlYG5aY9qBjG134t6xU kSfEwevPkbi1053jKsezY/fXfdYscrbAOcqkL7cMKdUtiOR3kcMIWgktO4cDGad0OwkZ wWyuxmpfzwHfNtwiNKXdiDku68FUN1WxoNc5cwpYXvSUUzo3IYnB32hqYB1Zsn0ltpXT ercFOci/MkHp3PmYoFEhZY0sht//5HYvq/tFLfhdTPD89oX9YYekzWc9g6lyOula5FBJ mNEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781094189; x=1781698989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Gx97R6nvlqLPdKU6XWZOgI4w8DtmWAcFkT1SFlCm7Mc=; b=mH7xoq0AoIcXjTFEFq2UpKf6xbYSHy49Nack70N9pIRt4n0YG/mBCLSojjYYrHV1lv /uEZGvfwjk6wCGZqgAN1OV9ojG3zv59vOHbC6OcM9klOQP2xFM3CyDRMsusPWHrcP74w YaDKZSPMcQ5I0p6HHoW4bc/tb/IhD9i7s5AmkimzYUT4wuDQZByyiTNF1pjzf6aYNQ3T OUggBY29EMWZBAgk+U+6POXoHTofKbWMXPOpB3XvXFi1jxrJFsEPAZ01lJcL3vWKfvnZ SuRobFAz3gKGm0kdQLyrfzsX+sY2/+roKPkl/tUgHyIJkFw9bO5PzgYiAuGdiX5bWZhA SdcQ== X-Gm-Message-State: AOJu0Yym9/sssf8YnnnbvnElPeS3tpfqAXe9zJgb4Zc5gV4K1OHTUpEu V/0HUW85puu907wTZ7RECB+w39pHeB6rftH4vb+CdX8zf8NpQ2Li2q/r6En1DB0AVHAk/yUz2Vm iEY+Faro= X-Gm-Gg: Acq92OGGRvDKEuJ3y9l4AIIe9KPkT3HtRm/OrRSC/4HRfRL5yLIgGCFlyUBAOJeytHS 11S65qGj+SEaLwgypV42WChhfbjU8WWBnE6GFpNik7mK2QKQE/VEzXCUYwQnEPJeIol3+R6LNFO 3TDANcDqRULCb4XN4pi1+Zk0cMrEMibYe9RAP48rYmifTLCLD72xK9Mwdq8i9Q+Ea/8h35BR4yM 92JQz6X5Lp+OX3a561UW0shXsQNVFtkrr1QBfI4DEWIB+ADC0HO2efWzF5Yt5rbg40jsLdQFEWY hIQbXm9VpRe5HHH/DxwjaUNbHbGElUoAvys0IJ98oCJeaX0F2A59edrUFmzTdItZitaaB6ArxCx wYBSg/iCADHuzhZy3Rw2LtcmgBYuQXvpdNjKc5V0idUhrJ5S1VJQxz6++d7PRr0PWuVOWopA97P dnVE2c72tT/SNhEESBc+56iAUiddDNFuz/AoLcxflovCqEZjRs/fpQ3+Q= X-Received: by 2002:a5d:5a4c:0:b0:452:273:5cd6 with SMTP id ffacd0b85a97d-460302e3749mr28797122f8f.1.1781094188435; Wed, 10 Jun 2026 05:23:08 -0700 (PDT) From: Alexander Hansen To: qemu-devel@nongnu.org Cc: Alexander Hansen , Titus Rwantare , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Pierrick Bouvier Subject: [PATCH v6 1/5] ast2600: yosemite4 initial support Date: Wed, 10 Jun 2026 14:20:58 +0200 Message-ID: <20260610122252.349321-2-alexander.hansen@9elements.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610122252.349321-1-alexander.hansen@9elements.com> References: <20260610122252.349321-1-alexander.hansen@9elements.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alexander.hansen@9elements.com; helo=mail-wr1-x42f.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, 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: qemu development 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 @9elements.com) X-ZM-MESSAGEID: 1781094226826154100 Initial patch based on [1] to support yosemite v4 bmc emulation. The goal of this machine support is to support OpenBMC development. Reference linux devicetree from openbmc linux is [2]. Status: - Enclosure FRU: showing up - Management Board FRU: showing up - Blade Board FRU: showing up - Blade Board sensors: not implemented - Blade Chassis FRU: showing up - Fan Board FRU: both showing up - Fan Board sensors: supported Overall the emulation is incomplete but already helpful in development and testing. The focus of this initial support is on the FRU eeproms and fanboard sensors. Tested: booted an OpenBMC image for yosemite4 target. References: [1] https://github.com/9elements/qemu/commit/32139f913c2bd0ebe4bd26c4676586= 1f6f9f2d49 [2] arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts [3] https://github.com/legoater/qemu-aspeed-boot/pull/5 Cc: Titus Rwantare Cc: "C=C3=A9dric Le Goater" (maintainer:ASPEED BMCs) Cc: Peter Maydell (maintainer:ASPEED BMCs) Cc: Steven Lee (reviewer:ASPEED BMCs) Cc: Troy Lee (reviewer:ASPEED BMCs) Cc: Jamin Lin (reviewer:ASPEED BMCs) Cc: Kane Chen (reviewer:ASPEED BMCs) Cc: Andrew Jeffery (reviewer:ASPEED BMCs) Cc: Joel Stanley (reviewer:ASPEED BMCs) Cc: qemu-arm@nongnu.org (open list:ASPEED BMCs) Cc: qemu-devel@nongnu.org (open list:All patches CC here) Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Alexander Hansen --- docs/system/arm/aspeed.rst | 3 +- hw/arm/aspeed_ast2600_fby4.c | 260 +++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + 3 files changed, 263 insertions(+), 1 deletion(-) create mode 100644 hw/arm/aspeed_ast2600_fby4.c diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst index 2d51ceeb84..9e0d6f06b5 100644 --- a/docs/system/arm/aspeed.rst +++ b/docs/system/arm/aspeed.rst @@ -1,4 +1,4 @@ -Aspeed family boards (``anacapa-bmc``, ``ast2500-evb``, ``ast2600-evb``, `= `bletchley-bmc``, ``fuji-bmc``, ``gb200nvl-bmc``, ``fby35-bmc``, ``g220a-bm= c``, ``palmetto-bmc``, ``quanta-q71l-bmc``, ``rainier-bmc``, ``romulus-bmc`= `, ``supermicrox11-bmc``, ``supermicrox11spi-bmc``, ``tiogapass-bmc``, ``wi= therspoon-bmc``, ``yosemitev2-bmc``) +Aspeed family boards (``anacapa-bmc``, ``ast2500-evb``, ``ast2600-evb``, `= `bletchley-bmc``, ``fuji-bmc``, ``gb200nvl-bmc``, ``fby35-bmc``, ``fby4-bmc= ``, ``g220a-bmc``, ``palmetto-bmc``, ``quanta-q71l-bmc``, ``rainier-bmc``, = ``romulus-bmc``, ``supermicrox11-bmc``, ``supermicrox11spi-bmc``, ``tiogapa= ss-bmc``, ``witherspoon-bmc``, ``yosemitev2-bmc``) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The QEMU Aspeed machines model BMCs of various OpenPOWER systems and @@ -33,6 +33,7 @@ AST2600 SoC based machines : - ``fuji-bmc`` Facebook Fuji BMC - ``bletchley-bmc`` Facebook Bletchley BMC - ``fby35-bmc`` Facebook fby35 BMC +- ``fby4-bmc`` Facebook fby4 BMC - ``anacapa-bmc`` Facebook Anacapa BMC - ``gb200nvl-bmc`` Nvidia GB200nvl BMC =20 diff --git a/hw/arm/aspeed_ast2600_fby4.c b/hw/arm/aspeed_ast2600_fby4.c new file mode 100644 index 0000000000..03f54d4393 --- /dev/null +++ b/hw/arm/aspeed_ast2600_fby4.c @@ -0,0 +1,260 @@ +/* + * Facebook Yosemite V4 + * + * Copyright 2026 9elements. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/arm/machines-qom.h" +#include "hw/arm/aspeed.h" +#include "hw/arm/aspeed_soc.h" +#include "hw/nvram/eeprom_at24c.h" +#include "hw/i2c/i2c_mux_pca954x.h" +#include "hw/gpio/pca9552.h" + +#define FBY4_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB) + +/* START OF EEPROM CONTENTS */ + +/* + *./frugen -s board.mfg=3D"Wiwynn" \ + * --set board.pname=3D"Fan Board FSC-MAX ADC-TI LED-NXP EFUSE-MAX" \ + * --set text:board.pn=3D"BRD-PN-345" \ + * --board-date "10/1/2017 12:58:00" \ + * --set board.serial=3D"123456" \ + * --set product.pname=3D"Yosemite V4" \ + * --set product.mfg=3D"Wiwynn" \ + * --set product.ver=3D"v1.1" \ + * --set product.serial=3D"123456" \ + * --set product.atag=3D"PLACEHOLDER" \ + * --set product.custom=3D"Fanboard Custom1" \ + * --set product.custom.1=3D"Fanboard Custom2" \ + * --set text:product.pn=3D"PN-345" \ + * fru-yv4-fanboard.bin + */ +/* EM Config: yosemite4_fanboard_fsc_max_adc_ti_led_nxp_ons_efuse_max.json= */ +/* Yosemite4 fan board */ +static const uint8_t fru_yv4_fanboard_bin[] =3D { + 0x01, 0x00, 0x00, 0x01, 0x0b, 0x00, 0x00, 0xf3, 0x01, 0x0a, 0x19, 0xce, + 0xc2, 0xa8, 0xc6, 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xea, 0x46, 0x61, + 0x6e, 0x20, 0x42, 0x6f, 0x61, 0x72, 0x64, 0x20, 0x46, 0x53, 0x43, 0x2d, + 0x4d, 0x41, 0x58, 0x20, 0x41, 0x44, 0x43, 0x2d, 0x54, 0x49, 0x20, 0x4c, + 0x45, 0x44, 0x2d, 0x4e, 0x58, 0x50, 0x20, 0x45, 0x46, 0x55, 0x53, 0x45, + 0x2d, 0x4d, 0x41, 0x58, 0x85, 0x91, 0x34, 0x51, 0x95, 0x05, 0xca, 0x42, + 0x52, 0x44, 0x2d, 0x50, 0x4e, 0x2d, 0x33, 0x34, 0x35, 0xc0, 0xc1, 0x00, + 0x00, 0x00, 0x00, 0xdb, 0x01, 0x09, 0x19, 0xc6, 0x57, 0x69, 0x77, 0x79, + 0x6e, 0x6e, 0xcb, 0x59, 0x6f, 0x73, 0x65, 0x6d, 0x69, 0x74, 0x65, 0x20, + 0x56, 0x34, 0xc6, 0x50, 0x4e, 0x2d, 0x33, 0x34, 0x35, 0xc4, 0x76, 0x31, + 0x2e, 0x31, 0x85, 0x91, 0x34, 0x51, 0x95, 0x05, 0x89, 0x30, 0x1b, 0x8e, + 0x25, 0xfa, 0xb2, 0x64, 0x29, 0x03, 0xc0, 0xd0, 0x46, 0x61, 0x6e, 0x62, + 0x6f, 0x61, 0x72, 0x64, 0x20, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x32, + 0xc1, 0x00, 0x00, 0x9d +}; +static const size_t fru_yv4_fanboard_bin_len =3D sizeof(fru_yv4_fanboard_b= in); + +/* + *./frugen -s board.mfg=3D"Wiwynn" \ + * --set board.pname=3D"Sentinel Dome without Retimer" \ + * --set text:board.pn=3D"BRD-PN-345" \ + * --board-date "10/1/2017 12:58:00" \ + * --set board.serial=3D"123456" \ + * --set product.pname=3D"Yosemite V4" \ + * --set product.mfg=3D"Wiwynn" \ + * --set product.ver=3D"v1.1" \ + * --set product.serial=3D"123456" \ + * --set product.atag=3D"PLACEHOLDER" \ + * --set product.custom=3D"Yosemite V4 T1" \ + * --set product.custom.1=3D"Yosemite V4 T1" \ + * --set text:product.pn=3D"PN-345" \ + * fru-yv4-sentineldome-board.bin + */ +/* product.cust maps to PRODUCT_INFO_AM2 */ +/* EM Config: yosemite4_sentineldome_t1.json */ +/* Yosemite4 Sentinel Dome without Retimer Boards */ +static const uint8_t fru_yv4_sentineldome_board_bin[] =3D { + 0x01, 0x00, 0x00, 0x01, 0x09, 0x00, 0x00, 0xf5, 0x01, 0x08, 0x19, 0xce, + 0xc2, 0xa8, 0xc6, 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xdd, 0x53, 0x65, + 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x20, 0x44, 0x6f, 0x6d, 0x65, 0x20, + 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, 0x52, 0x65, 0x74, 0x69, + 0x6d, 0x65, 0x72, 0x85, 0x91, 0x34, 0x51, 0x95, 0x05, 0xca, 0x42, 0x52, + 0x44, 0x2d, 0x50, 0x4e, 0x2d, 0x33, 0x34, 0x35, 0xc0, 0xc1, 0x00, 0x78, + 0x01, 0x09, 0x19, 0xc6, 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xcb, 0x59, + 0x6f, 0x73, 0x65, 0x6d, 0x69, 0x74, 0x65, 0x20, 0x56, 0x34, 0xc6, 0x50, + 0x4e, 0x2d, 0x33, 0x34, 0x35, 0xc4, 0x76, 0x31, 0x2e, 0x31, 0x85, 0x91, + 0x34, 0x51, 0x95, 0x05, 0x89, 0x30, 0x1b, 0x8e, 0x25, 0xfa, 0xb2, 0x64, + 0x29, 0x03, 0xc0, 0xce, 0x59, 0x6f, 0x73, 0x65, 0x6d, 0x69, 0x74, 0x65, + 0x20, 0x56, 0x34, 0x20, 0x54, 0x31, 0xc1, 0x00, 0x00, 0x00, 0x00, 0xeb +}; +static const size_t fru_yv4_sentineldome_board_bin_len =3D + sizeof(fru_yv4_sentineldome_board_bin); + +/* + *./frugen -s board.mfg=3D"Wiwynn" \ + * --set board.pname=3D"Sentinel Dome" \ + * --set text:board.pn=3D"BRD-PN-345" \ + * --board-date "10/1/2017 12:58:00" \ + * --set board.serial=3D"123456" \ + * --set product.pname=3D"Yosemite V4" \ + * --set product.mfg=3D"Wiwynn" \ + * --set product.ver=3D"v1.1" \ + * --set product.serial=3D"123456" \ + * --set product.atag=3D"PLACEHOLDER" \ + * --set text:product.pn=3D"PN-345" \ + * fru-yv4-sentineldome-chassis.bin + */ +/* EM Config: yosemite4_sentineldome_chassis.json */ +/* Yosemite 4 Sentinel Dome Chassis FRU */ +static const uint8_t fru_yv4_sentineldome_chassis_bin[] =3D { + 0x01, 0x00, 0x00, 0x01, 0x07, 0x00, 0x00, 0xf7, 0x01, 0x06, 0x19, 0xce, + 0xc2, 0xa8, 0xc6, 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xcd, 0x53, 0x65, + 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x20, 0x44, 0x6f, 0x6d, 0x65, 0x85, + 0x91, 0x34, 0x51, 0x95, 0x05, 0xca, 0x42, 0x52, 0x44, 0x2d, 0x50, 0x4e, + 0x2d, 0x33, 0x34, 0x35, 0xc0, 0xc1, 0x00, 0xb6, 0x01, 0x07, 0x19, 0xc6, + 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xcb, 0x59, 0x6f, 0x73, 0x65, 0x6d, + 0x69, 0x74, 0x65, 0x20, 0x56, 0x34, 0xc6, 0x50, 0x4e, 0x2d, 0x33, 0x34, + 0x35, 0xc4, 0x76, 0x31, 0x2e, 0x31, 0x85, 0x91, 0x34, 0x51, 0x95, 0x05, + 0x89, 0x30, 0x1b, 0x8e, 0x25, 0xfa, 0xb2, 0x64, 0x29, 0x03, 0xc0, 0xc1, + 0x00, 0x00, 0x00, 0x59 +}; +static const size_t fru_yv4_sentineldome_chassis_bin_len =3D + sizeof(fru_yv4_sentineldome_chassis_bin); + +/* + *./frugen -s board.mfg=3D"Wiwynn" \ + * --set board.pname=3D"Management Board wBMC" \ + * --set text:board.pn=3D"BRD-PN-345" \ + * --board-date "10/1/2017 12:58:00" \ + * --set board.serial=3D"123456" \ + * --set product.pname=3D"Yosemite V4" \ + * --set product.mfg=3D"Wiwynn" \ + * --set product.ver=3D"v1.1" \ + * --set product.serial=3D"123456" \ + * --set product.atag=3D"PLACEHOLDER" \ + * --set text:product.pn=3D"PN-345" \ + * fru-yv4-eclosure.bin + */ +/* EM Config: yosemite4_chassis.json, yosemite4.json */ +/* Yosemite 4 Sentinel Dome Enclosure FRU */ +static const uint8_t fru_yv4_eclosure_bin[] =3D { + 0x01, 0x00, 0x00, 0x01, 0x08, 0x00, 0x00, 0xf6, 0x01, 0x07, 0x19, 0xce, + 0xc2, 0xa8, 0xc6, 0x57, 0x69, 0x77, 0x79, 0x6e, 0x6e, 0xd5, 0x4d, 0x61, + 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x42, 0x6f, 0x61, + 0x72, 0x64, 0x20, 0x77, 0x42, 0x4d, 0x43, 0x85, 0x91, 0x34, 0x51, 0x95, + 0x05, 0xca, 0x42, 0x52, 0x44, 0x2d, 0x50, 0x4e, 0x2d, 0x33, 0x34, 0x35, + 0xc0, 0xc1, 0x00, 0x26, 0x01, 0x07, 0x19, 0xc6, 0x57, 0x69, 0x77, 0x79, + 0x6e, 0x6e, 0xcb, 0x59, 0x6f, 0x73, 0x65, 0x6d, 0x69, 0x74, 0x65, 0x20, + 0x56, 0x34, 0xc6, 0x50, 0x4e, 0x2d, 0x33, 0x34, 0x35, 0xc4, 0x76, 0x31, + 0x2e, 0x31, 0x85, 0x91, 0x34, 0x51, 0x95, 0x05, 0x89, 0x30, 0x1b, 0x8e, + 0x25, 0xfa, 0xb2, 0x64, 0x29, 0x03, 0xc0, 0xc1, 0x00, 0x00, 0x00, 0x59 +}; +static const size_t fru_yv4_eclosure_bin_len =3D sizeof(fru_yv4_eclosure_b= in); + +/* END OF EEPROM CONTENTS */ + +static void fby4_i2c_init_fanboard(I2CSlave *fan_mux, size_t eepromSize) +{ + /* 2 fan boards */ + for (int i =3D 0; i <=3D 1; i++) { + /* downstream bus */ + I2CBus *bus =3D pca954x_i2c_get_bus(fan_mux, i); + + /* ti,adc128d818 @ 0x1f (adc) */ + /* TODO */ + + /* maxim,max31790 @ 0x20 (pwm) */ + /* TODO */ + + /* + * ti,tca6424 @ 0x22 (gpio) + * linux handles tca6424 with PCA953X_TYPE, same as pca9535 + * { "pca9535", 16 | PCA953X_TYPE | PCA_INT, }, + * { "tca6424", 24 | PCA953X_TYPE | PCA_INT, }, + * so we _could_ be fine here unless more than 16 gpios are used + */ + i2c_slave_create_simple(bus, TYPE_PCA9535, 0x22); + + /* + * NOTE: above works and could use for gpio presence: + * $ gpioget gpiochip2 2 + * 1 + */ + + /* maxim,max31790 @ 0x2f (pwm) */ + /* TODO */ + + /* maxim,max11615 @ 0x33 (adc) */ + /* TODO */ + + at24c_eeprom_init_rom( + bus, 0x52, eepromSize, + fru_yv4_fanboard_bin, + fru_yv4_fanboard_bin_len); + + /* LED blink driver / gpio expander */ + /* nxp,pca9552 @ 0x61 (gpio) */ + i2c_slave_create_simple(bus, TYPE_PCA9552, 0x61); + } +} + +static void fby4_i2c_init_blade_chassis(I2CBus *bus, size_t eepromSize) +{ + /* Sentinel Dome Blade EEPROMS */ + + /* Board */ + at24c_eeprom_init_rom(bus, 0x54, eepromSize, + fru_yv4_sentineldome_board_bin, fru_yv4_sentineldome_board_bin_len= ); + + /* Chassis */ + at24c_eeprom_init_rom(bus, 0x55, eepromSize, + fru_yv4_sentineldome_chassis_bin, fru_yv4_sentineldome_chassis_bin_= len); +} + +static void fby4_i2c_init(AspeedMachineState *bmc) +{ + AspeedSoCState *soc =3D bmc->soc; + I2CBus *i2c[16]; + + for (int i =3D 0; i < 16; i++) { + i2c[i] =3D aspeed_i2c_get_bus(&soc->i2c, i); + } + + /* Enclosure (EM Config: yosemite4_chassis.json, yosemite4.json) */ + at24c_eeprom_init_rom(i2c[1], 0x51, 128 * KiB, + fru_yv4_eclosure_bin, fru_yv4_eclosure_bin_len); + + /* there is 8 blade chassis, but we only emulate 2 for performance rea= son */ + fby4_i2c_init_blade_chassis(i2c[1], 128 * KiB); + fby4_i2c_init_blade_chassis(i2c[2], 128 * KiB); + + /* Yv4 fanboard connection */ + I2CSlave *fan_mux =3D i2c_slave_create_simple(i2c[14], TYPE_PCA9546, 0= x74); + + fby4_i2c_init_fanboard(fan_mux, 128 * KiB); +} + +static void aspeed_machine_fby4_class_init(ObjectClass *oc, const void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + AspeedMachineClass *amc =3D ASPEED_MACHINE_CLASS(oc); + + mc->desc =3D "Facebook fby4 BMC (Cortex-A7)"; + amc->fmc_model =3D "mx66l1g45g"; + amc->num_cs =3D 2; + amc->macs_mask =3D ASPEED_MAC3_ON; + amc->i2c_init =3D fby4_i2c_init; + mc->default_ram_size =3D FBY4_BMC_RAM_SIZE; + aspeed_machine_class_init_cpus_defaults(mc); +} + +static const TypeInfo aspeed_ast2600_fby4_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("fby4-bmc"), + .parent =3D MACHINE_TYPE_NAME("ast2600-evb"), + .class_init =3D aspeed_machine_fby4_class_init, + .interfaces =3D arm_machine_interfaces, + } +}; + +DEFINE_TYPES(aspeed_ast2600_fby4_types) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 8f66a80e10..87d0de5ebc 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -62,6 +62,7 @@ arm_common_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: fil= es( 'aspeed_ast2600_catalina.c', 'aspeed_ast2600_evb.c', 'aspeed_ast2600_fby35.c', + 'aspeed_ast2600_fby4.c', 'aspeed_ast2600_fuji.c', 'aspeed_ast2600_gb200nvl.c', 'aspeed_ast2600_rainier.c', --=20 2.54.0 From nobody Wed Jun 24 02:13:21 2026 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=quarantine dis=none) header.from=9elements.com ARC-Seal: i=1; a=rsa-sha256; t=1781094270; cv=none; d=zohomail.com; s=zohoarc; b=iPLJf/6e51apSDiSs3tTWNF4wqHQu6ytRsS0I03tmahdecBm1DkspRmjIftMXEQwHP/F0p3vge8uJKGuYQdXCZh6Uim9prLKR7m4AyjzJwKJ6zbBksialsAZ0/MI14WfPQXkBvvU4FGXt/aM0FT88nBoSxbmtyO2UbURIrXBjOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781094270; h=Content-Type:Content-Transfer-Encoding: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=ZhogzhFO7uDRTLBEbud3mZouqlv1sTkvv/Oi6WwVzrM=; b=Gr0BnhGIUONQzgaAeGIwu082ZzRv1ZaXQSlkB3Qz71/6s08+CqivA+ZEKF7Fvw3tJBDO0rBHOaFIYr7zohFeJ/J1G6LCBTKM/L3jDxA8vWN0vFFEZeAjdTplK4b6OKfX7keKRdGDQ4vCmGyRtOt2L7drnHJisNfWgj02VrNGXsA= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781094270382536.0272612721598; Wed, 10 Jun 2026 05:24:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXHxx-00074K-99; Wed, 10 Jun 2026 08:23:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXHxj-0006sg-Ls for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:15 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXHxh-0005ri-Ky for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:15 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-45efb698ef2so3281234f8f.3 for ; Wed, 10 Jun 2026 05:23:12 -0700 (PDT) Received: from alexanderarchlinux ([188.111.3.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm70995963f8f.0.2026.06.10.05.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 05:23:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1781094191; x=1781698991; 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=ZhogzhFO7uDRTLBEbud3mZouqlv1sTkvv/Oi6WwVzrM=; b=WWyzemEy2tZOXtUQmJPHnO32mgshJLGz7UPmztZTfL8njFQlZjTUOlF4Js33AWuOoH vIj75IBRTR0HwJelw8qcDOShV/JmC0wOHRKGnM81ex0RpM3DYWrZZXcyMxC6ult8nt3M 8LZvFh6PEE0heXhkqkeR5GL33KaWbKDkYpm8wWjoyv5nGY0AsuDXxm1PhU/MuYbpa4Ws l/b9btqWVCDLYpIFEU7rue/Bh3whKDqnwn4+IZr/yz/8ouI3U5jDhUwCuFl6Pc/hnpoX +hxkb+VbAUJaKMcLEf9zIyF1SwJxItrH7grwc68Fnyy3afW5X2U8cMJ00RrRNFqkCk00 RWXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781094191; x=1781698991; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZhogzhFO7uDRTLBEbud3mZouqlv1sTkvv/Oi6WwVzrM=; b=YHxnS9aYNjE9061nIhW1m1AOUXqg5BLwHHnvzMjwjYv8wQwHm/XsRJebpNpt14yINH 0fwGFJivkLqjnjCul6Eppf8x1A055+pPHIfmRdubU/jW8T3VmrAI8j+gV1xDG6z8Nqjv ggt1mEgmViHl+AxcLp2nmqOiNLL0qWcFFuQ1PDUGONoowFzCMw6ryPJQO4eOGEudzWpt aPgnzYK4R41dSpQ16cgiLU3L34s7R4SA7MYNSxVX7sP7sSmAckFVzLd5D8trncNKGzCj hOAy2JPh5iKtBzElsm65ue/YIMooLkvok5d9xVQOoERvjFWocKjS5Ljedm/FIjd7Phj1 MgSg== X-Gm-Message-State: AOJu0Yy5vswprTJTKENx9EbHvTJmyhvXfbei3HjWWf7x0Si57eZlhXIQ pyZqskjYiNtzdDnt2ZKvWgIMS1xsBaMkUO4IBRpduSlWWV4Et+rAol50aoxNlTvxMTEbPdTUrIE fwluKW+M= X-Gm-Gg: Acq92OGla1krdjctodwJ1TiBkQ5ruu5zrrWcaFRBmhViOXQcqh26lswmP4p5v/pi9pp egABedvIn1xxz/UdSWVCchTTJ9XbRXckZ3wrp6SCwFHZjtcADnAc0isSu+lTxp8dJTWLUj/9Vgd 36RSuA3enPevxgr6TKCgGnOT7MsNUAuCraXJAuNCOrz8pE3kcy7TT+SMQ75Cns8JdDvCwscKRX/ +io2mmlyKjD2KBlVFY2iU5lxlALrso+4etPkTTmSej0fJyi0LWLHHaERROX50b8RYJJavnnP7AH ZYCgowlseVitBJD/RKknq2mKCpOuHowejlFpuGcr17VxGZQMvY0awzNia0GGlIkfErgayixcbcU HuhCsAU7ksOWK+Obf886k+Ejcc8vG2TndFeYJc6zl1f0NdpHwam2X1quEJFpuzucQnf0zUi+qLG LL84yAB4obfVyp+1mjXMP3i/U0wUqYlO4ayWj7mmuGEAMlG9noH+3lRgg= X-Received: by 2002:a5d:4574:0:b0:43d:733f:aee6 with SMTP id ffacd0b85a97d-460302ec8dbmr29296978f8f.10.1781094191044; Wed, 10 Jun 2026 05:23:11 -0700 (PDT) From: Alexander Hansen To: qemu-devel@nongnu.org Cc: Alexander Hansen , Titus Rwantare , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , qemu-arm@nongnu.org Subject: [PATCH v6 2/5] ast2600: yosemite4 functional test Date: Wed, 10 Jun 2026 14:20:59 +0200 Message-ID: <20260610122252.349321-3-alexander.hansen@9elements.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610122252.349321-1-alexander.hansen@9elements.com> References: <20260610122252.349321-1-alexander.hansen@9elements.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alexander.hansen@9elements.com; helo=mail-wr1-x431.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @9elements.com) X-ZM-MESSAGEID: 1781094271508154100 Add a functional test for the Yosemite V4 (fby4-bmc) machine that validates: - U-Boot initialization and kernel boot sequence The test uses an OpenBMC image built for the yosemite4 board and validates console output through the boot process. Cc: Titus Rwantare Cc: "C=C3=A9dric Le Goater" (maintainer:ASPEED BMCs) Cc: Peter Maydell (maintainer:ASPEED BMCs) Cc: Steven Lee (reviewer:ASPEED BMCs) Cc: Troy Lee (reviewer:ASPEED BMCs) Cc: Jamin Lin (reviewer:ASPEED BMCs) Cc: Kane Chen (reviewer:ASPEED BMCs) Cc: Andrew Jeffery (reviewer:ASPEED BMCs) Cc: Joel Stanley (reviewer:ASPEED BMCs) Cc: qemu-arm@nongnu.org (open list:ASPEED BMCs) Cc: qemu-devel@nongnu.org (open list:All patches CC here) Signed-off-by: Alexander Hansen Reviewed-by: C=C3=A9dric Le Goater --- tests/functional/arm/meson.build | 2 ++ tests/functional/arm/test_aspeed_fby4.py | 45 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100755 tests/functional/arm/test_aspeed_fby4.py diff --git a/tests/functional/arm/meson.build b/tests/functional/arm/meson.= build index 61b00932db..19331b3f16 100644 --- a/tests/functional/arm/meson.build +++ b/tests/functional/arm/meson.build @@ -15,6 +15,7 @@ test_arm_timeouts =3D { 'aspeed_anacapa' : 480, 'aspeed_bletchley' : 480, 'aspeed_catalina' : 480, + 'aspeed_fby4': 480, 'aspeed_gb200nvl_bmc' : 480, 'aspeed_rainier' : 480, 'bpim2u' : 500, @@ -50,6 +51,7 @@ tests_arm_system_thorough =3D [ 'aspeed_anacapa', 'aspeed_bletchley', 'aspeed_catalina', + 'aspeed_fby4', 'aspeed_gb200nvl_bmc', 'aspeed_rainier', 'bpim2u', diff --git a/tests/functional/arm/test_aspeed_fby4.py b/tests/functional/ar= m/test_aspeed_fby4.py new file mode 100755 index 0000000000..a521834f79 --- /dev/null +++ b/tests/functional/arm/test_aspeed_fby4.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python3 +# +# Functional test that boots the ASPEED machines +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from qemu_test import wait_for_console_pattern +from aspeed import AspeedTest + + +class YosemiteV4Machine(AspeedTest): + + ASSET_YOSEMITE_V4_FLASH =3D Asset( + 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/maste= r/images/yosemite4-bmc/openbmc-20260505132843/obmc-phosphor-image-yosemite4= -20260505132843.static.mtd.xz', + 'dff6946363b41f952b15cfc3156482b89fcfc1b0ecfc3ec8b3ed496a5f001ef9') + + def do_test_arm_aspeed_openbmc_no_network(self, machine, image, uboot, + cpu_id, soc): + + self.set_machine(machine) + self.vm.set_console() + self.vm.add_args('-drive', f'file=3D{image},if=3Dmtd,format=3Draw', + '-snapshot') + self.vm.launch() + + self.wait_for_console_pattern(f'U-Boot {uboot}') + self.wait_for_console_pattern('## Loading kernel from FIT Image') + self.wait_for_console_pattern('Starting kernel ...') + self.wait_for_console_pattern(f'Booting Linux on physical CPU {cpu= _id}') + self.wait_for_console_pattern(f'ASPEED {soc}') + self.wait_for_console_pattern('/init as init process') + # yosemite v4 does not emit the hostname log which is + # different from the other machines. + self.wait_for_console_pattern('yosemite4 login:') + + def test_arm_ast2600_yosemitev4_openbmc(self): + image_path =3D self.uncompress(self.ASSET_YOSEMITE_V4_FLASH) + + self.do_test_arm_aspeed_openbmc_no_network('fby4-bmc', image=3Dima= ge_path, + uboot=3D'2019.04', cpu_id=3D'0xf00= ', + soc=3D'AST2600 rev A3') + +if __name__ =3D=3D '__main__': + AspeedTest.main() --=20 2.54.0 From nobody Wed Jun 24 02:13:21 2026 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=quarantine dis=none) header.from=9elements.com ARC-Seal: i=1; a=rsa-sha256; t=1781094233; cv=none; d=zohomail.com; s=zohoarc; b=cGQt132P5tl99Sab09OoVPnZt5SSvnSOpIaVJ6wPcjfOaDGLdt2FbVrfYVi4fHXJ31gkXGEgu0NMJ4pcPNP30Zy8ZetrLd6biqSwRCdzNeztj+H2ELp3q9wHAq1XdT/V6TX7p8at8+d5sXlQ/Pfuf+oNbXQ3v0iNh6bAdG+Y9IY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781094233; h=Content-Type:Content-Transfer-Encoding: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=21djvla/n2U71qv1ibtkQtrN5kG/sfJggpKDdqIcxSQ=; b=BdogIwYQFNuYTwj9YidFe1srKf373mxd8eHjmkCiZlXBnCna6MCfkqPucs/XBFekVk5P3/rSfeKsNROjzFPAYsjdM+CiNQu0teRA5SeCbSMd9F7ldWru8eWwUVjrL6KpDmIgrg/HVJHTO0Lw7W+Hv4kCnyNdvYHXEWKCVilahJI= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781094233760118.40733041039425; Wed, 10 Jun 2026 05:23:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXHxu-0006yO-16; Wed, 10 Jun 2026 08:23:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXHxn-0006vE-4W for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:19 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXHxj-0005sL-Dr for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-45e9f4a3510so3320976f8f.1 for ; Wed, 10 Jun 2026 05:23:15 -0700 (PDT) Received: from alexanderarchlinux ([188.111.3.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm70995963f8f.0.2026.06.10.05.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 05:23:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1781094194; x=1781698994; 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=21djvla/n2U71qv1ibtkQtrN5kG/sfJggpKDdqIcxSQ=; b=HOaUfn4bQt6aVLc0B2KKkC5aD2LmZ7mYqI+2HzBJOsqzD2ksRFE7eF+wKOFyAHHFfD ZPF70vkgc2zr8ze2YJxpkqdejOGYbDQknvPGakazAQ2MqqOYRx8Mi4ejNvqGolvrP/F1 ES+R2hWUxpW8GmaDI4iFhRsqLdi2BywigF8N5k5X7EwL0sGWLJPlQTI2k7dZeSP60IXJ 5Za0V8wx2t+gtoJTi1XQf887OhPaE1hA5j0Sq3VV4G8NOUyAF8KXU2K1b47c/TRiIcJa OSDv91iuY1x4OmGnE3iDbVBeFpWNEHMtHNkuTmgd/e+0JdTlX1vFvnZeFUVlwuzFUhxz KBlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781094194; x=1781698994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=21djvla/n2U71qv1ibtkQtrN5kG/sfJggpKDdqIcxSQ=; b=E48MnokOIz7rK0MXDe2GBMOwNifjAWt8VNpaPkWVowf+zcXDdl1/SYmBpzXcq4zxen JhWKitAm5d9eE+t5fHVxWsxB/p5rpwc8DFc46wX8tZD9WiFaHMXMDn42jHSJ9JLrEBWQ XU8ztAO+aOoJ2VrUV+nyVQOvxdUzR1xnxNrD1AlpJp534PkwX2qOCc3QhhAWtx17e8Bd a089oFAAQP4BALDibLlItNL74zCPWt4ZBjhhi6bPBZXWeiv38sfrUXcQYN9Ytq7ykSba GIXc63H6ZA0AtC0C+Lqcf8ZDG7Lp1LG7lwIn99kBGXtXyrluSAJrK/BNl2Dd0zIFCN3w 27jg== X-Gm-Message-State: AOJu0YzrfqqVFSKEKP/6ZrRxCrvim6CHMeEHWzWu8LNun8rl1Kf6ql+d hNT7ID4zXUp3awLGCOTWI5f+nNCKumpsxE1gW1+a4vS3Y95kAOrW5m7Gs1OGKyd5gT7FtYvNZfc ijU/iOVo= X-Gm-Gg: Acq92OHX+IzaNgsEY4B4nt23/oStipd7e2bIl4+T43LWTcFC9GyIfXorTcOsDuBnBfq vHxa1Ap27CcmtK5sI1ikbm9wm2Xv2coDSs9tDbKvE8tG3uUCRZBXOXfaIflKu9kJX1CCEsmKxZF XpCEAEKrAQp3/CQyiS0mfzAg66H0UiFeU/6syab/4lLD+4rPfg8cKYIT0uyv5lo46UgFMtjZ+1T QqZZ5BhGkTVnzE0y0Xh48bIJT3Lpv2RJdKOWWDWVJCxvH/ioLVQ1NnNLM/ayeSXHDwM09OD8GjX qpSAJ5eQZ+hdPxP3+nTgJtea3xAE9LbIrrH/+p9bigcVl65EPTl0tlgTHytRulHpMOLjJAWiflc 2qtTLRFmdTetOvxjxBZtMBjkoFcL9vK0yOPTl5adTjk5SpPcR3t4djlaQeYyN+IdecyJ1oqajh8 WwTkpus+F5v5svkKmB0BbrYa05p4wbuOSkrvHBJoB43B9PD59VrA2fl+c= X-Received: by 2002:a5d:5906:0:b0:441:1fa5:457c with SMTP id ffacd0b85a97d-460302e3ef4mr27492407f8f.5.1781094193659; Wed, 10 Jun 2026 05:23:13 -0700 (PDT) From: Alexander Hansen To: qemu-devel@nongnu.org Cc: Alexander Hansen , Titus Rwantare , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jonathan Cameron , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 3/5] hw/sensor: MAX31790 support Date: Wed, 10 Jun 2026 14:21:00 +0200 Message-ID: <20260610122252.349321-4-alexander.hansen@9elements.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610122252.349321-1-alexander.hansen@9elements.com> References: <20260610122252.349321-1-alexander.hansen@9elements.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alexander.hansen@9elements.com; helo=mail-wr1-x42e.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, 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: qemu development 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 @9elements.com) X-ZM-MESSAGEID: 1781094235042154100 Product: [1] Datasheet: [2] MAX31790 Support: - fan inputs are reading - tach reading propertional to pwm setting from linux driver - fans do not show any fault - 6 PWM registers influence 6 TACH registers There is intentional stub behavior in some places and various functions of the device are currently unsupported. MAX31790 currently unsupported: - slave address restriction - fan dynamics - spin-up configuration - fault state / failure possibility - rate-of-change control - tach mode - mixed layouts where number of fans !=3D number of tachs - see Figure 5.9 in [2] for example of mixed layout Anyone could expand it in the future for more accurate emulation. The reason for adding this device is to support Yosemite V4 emulation. Tested: on yosemite 4 qemu root@yosemite4:~# ls /sys/class/hwmon/hwmon2/ device fan2_fault fan3_target fan5_fault fan6_target pwm2 pw= m5 fan1_enable fan2_input fan4_enable fan5_input name pwm2_enable pwm5_= enable fan1_fault fan2_target fan4_fault fan5_target of_node pwm3 pwm6 fan1_input fan3_enable fan4_input fan6_enable power pwm3_enable pwm6= _enable fan1_target fan3_fault fan4_target fan6_fault pwm1 pwm4 subsystem fan2_enable fan3_input fan5_enable fan6_input pwm1_enable pwm4_enabl= e uevent root@yosemite4:~# cat /sys/class/hwmon/hwmon2/fan1_input 4551 root@yosemite4:~# cat /sys/class/hwmon/hwmon2/fan1_enable 1 root@yosemite4:~# cat /sys/class/hwmon/hwmon2/fan1_fault 0 root@yosemite4:~# cat /sys/class/hwmon/hwmon2/fan1_target 2048 root@yosemite4:~# cat /sys/class/hwmon/hwmon2/pwm1 178 root@yosemite4:~# cat /sys/class/hwmon/hwmon2/name max31790 Trace output: max31790_realize i2c_addr: 0x20 max31790_realize i2c_addr: 0x2f max31790_realize i2c_addr: 0x20 max31790_realize i2c_addr: 0x2f max31790_event i2c_addr: 0x20, event: 0x01 max31790_send i2c_addr: 0x20, data: 0x02 max31790_event i2c_addr: 0x20, event: 0x00 max31790_recv i2c_addr: 0x20, reg_addr: 0x02 max31790_recv_return i2c_addr: 0x20, returns: 0x08 ... References: [1] https://www.analog.com/en/products/MAX31790.html [2] https://www.analog.com/media/en/technical-documentation/data-sheets/MAX= 31790.pdf Cc: Titus Rwantare Cc: "C=C3=A9dric Le Goater" (maintainer:ASPEED BMCs) Cc: Jonathan Cameron Cc: Paolo Bonzini Cc: Peter Maydell Cc: "Philippe Mathieu-Daud=C3=A9" Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org Signed-off-by: Alexander Hansen --- MAINTAINERS | 1 + hw/arm/aspeed_ast2600_fby4.c | 4 +- hw/sensor/max31790.c | 556 +++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/sensor/Kconfig | 4 + hw/sensor/meson.build | 1 + hw/sensor/trace-events | 13 + tests/functional/arm/test_aspeed_fby4.py | 48 +- 8 files changed, 625 insertions(+), 3 deletions(-) create mode 100644 hw/sensor/max31790.c diff --git a/MAINTAINERS b/MAINTAINERS index 748ec77beb..5538475fb0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3992,6 +3992,7 @@ S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c F: hw/sensor/isl_pmbus_vr.c +F: hw/sensor/max31790.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h F: include/hw/sensor/isl_pmbus_vr.h diff --git a/hw/arm/aspeed_ast2600_fby4.c b/hw/arm/aspeed_ast2600_fby4.c index 03f54d4393..8feb31bc44 100644 --- a/hw/arm/aspeed_ast2600_fby4.c +++ b/hw/arm/aspeed_ast2600_fby4.c @@ -164,7 +164,7 @@ static void fby4_i2c_init_fanboard(I2CSlave *fan_mux, s= ize_t eepromSize) /* TODO */ =20 /* maxim,max31790 @ 0x20 (pwm) */ - /* TODO */ + i2c_slave_create_simple(bus, "max31790", 0x20); =20 /* * ti,tca6424 @ 0x22 (gpio) @@ -182,7 +182,7 @@ static void fby4_i2c_init_fanboard(I2CSlave *fan_mux, s= ize_t eepromSize) */ =20 /* maxim,max31790 @ 0x2f (pwm) */ - /* TODO */ + i2c_slave_create_simple(bus, "max31790", 0x2f); =20 /* maxim,max11615 @ 0x33 (adc) */ /* TODO */ diff --git a/hw/sensor/max31790.c b/hw/sensor/max31790.c new file mode 100644 index 0000000000..f0aaff84b5 --- /dev/null +++ b/hw/sensor/max31790.c @@ -0,0 +1,556 @@ +/* + * Maxim MAX31790 PMBus 6-Channel Fan Controller + * + * Datasheet: + * https://www.analog.com/media/en/technical-documentation/data-sheets/MAX= 31790.pdf + * + * Copyright 2026 9elements + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "hw/i2c/i2c.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "migration/vmstate.h" +#include "qemu/module.h" +#include "qom/object.h" +#include "trace.h" + +#define TYPE_MAX31790 "max31790" + +#define MAX31790_NUM_FANS 6 +#define MAX31790_NUM_TACHS 12 + +#define MAX31790_REG_GLOBAL_CONFIG 0x00 +#define MAX31790_REG_PWM_FREQ 0x01 + +/* 0x02 to 0x07: N =3D 0 .. 5 */ +#define MAX31790_REG_FAN_CONFIG(N) (0x02 + N) + +/* 0x08 to 0x0d: N =3D 0 .. 5 */ +#define MAX31790_REG_FAN_DYNAMICS(N) (0x08 + N) + +#define MAX31790_REG_FAN_FAULT_STATUS_2 0x10 +#define MAX31790_REG_FAN_FAULT_STATUS_1 0x11 +#define MAX31790_REG_FAN_FAULT_MASK_2 0x12 +#define MAX31790_REG_FAN_FAULT_MASK_1 0x13 +#define MAX31790_REG_FAILED_FAN_OPT 0x14 + +/* 0x18 to 0x2f: N =3D 0 .. 11 */ +#define MAX31790_REG_TACH_COUNT_MSB(N) (0x18 + 2 * N) +#define MAX31790_REG_TACH_COUNT_LSB(N) (0x19 + 2 * N) + +/* 0x30 to 0x3b: N =3D 0 .. 5 */ +#define MAX31790_REG_PWM_DUTY_CYCLE_MSB(N) (0x30 + 2 * N) +#define MAX31790_REG_PWM_DUTY_CYCLE_LSB(N) (0x31 + 2 * N) + +/* .. reserved registers ... */ + +/* 0x40 to 0x4b: N =3D 0 .. 5 */ +#define MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(N) (0x40 + 2 * N) +#define MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(N) (0x41 + 2 * N) + +/* ... 'User Byte' registers ... */ + +/* 0x50 to 0x5b: N =3D 0 .. 5 */ +#define MAX31790_REG_TACH_TARGET_COUNT_MSB(N) (0x50 + 2 * N) +#define MAX31790_REG_TACH_TARGET_COUNT_LSB(N) (0x51 + 2 * N) + +struct MAX31790State { + I2CSlave i2c; + + uint8_t fan_config[MAX31790_NUM_FANS]; + uint8_t fan_dynamics[MAX31790_NUM_FANS]; + + uint16_t pwm[MAX31790_NUM_FANS]; + uint16_t tach_target[MAX31790_NUM_FANS]; + + /* + * Fan speed is measured by counting the number of internal 8192Hz + * (fTOSC/4) clock cycles that take place during a select- + * able number of tachometer periods. The number of clock + * cycles counted (11-bit value) is stored in the associated + * TACH Count registers and the desired number of cycles + * is stored in the TACH Target Count registers. + */ + uint16_t tach_count[MAX31790_NUM_TACHS]; + + /* command buffer */ + uint8_t len; + uint8_t buf[2]; + + /* output buffer */ + uint8_t outlen; + uint8_t outbuf[2]; + + /* selected register for read/write operation */ + uint8_t pointer; +}; + +struct MAX31790Class { + I2CSlaveClass parent_class; +}; + +OBJECT_DECLARE_TYPE(MAX31790State, MAX31790Class, MAX31790) + +static void max31790_read(MAX31790State *s) +{ + size_t index =3D 0; + uint8_t out0 =3D 0; + uint8_t out1 =3D 0; + + switch (s->pointer) { + case MAX31790_REG_FAN_CONFIG(0): + case MAX31790_REG_FAN_CONFIG(1): + case MAX31790_REG_FAN_CONFIG(2): + case MAX31790_REG_FAN_CONFIG(3): + case MAX31790_REG_FAN_CONFIG(4): + case MAX31790_REG_FAN_CONFIG(5): + index =3D s->pointer - MAX31790_REG_FAN_CONFIG(0); + out0 =3D s->fan_config[index]; + trace_max31790_fan_config_read(s->i2c.address, index, out0); + break; + case MAX31790_REG_FAN_DYNAMICS(0): + case MAX31790_REG_FAN_DYNAMICS(1): + case MAX31790_REG_FAN_DYNAMICS(2): + case MAX31790_REG_FAN_DYNAMICS(3): + case MAX31790_REG_FAN_DYNAMICS(4): + case MAX31790_REG_FAN_DYNAMICS(5): + index =3D s->pointer - MAX31790_REG_FAN_DYNAMICS(0); + out0 =3D s->fan_dynamics[index]; + trace_max31790_fan_dynamics_read(s->i2c.address, index, out0); + break; + case MAX31790_REG_FAN_FAULT_STATUS_1: + case MAX31790_REG_FAN_FAULT_STATUS_2: + /* we do not have any fan fault */ + out0 =3D 0x00; + out1 =3D 0x00; + break; + case MAX31790_REG_TACH_COUNT_MSB(0): + case MAX31790_REG_TACH_COUNT_MSB(1): + case MAX31790_REG_TACH_COUNT_MSB(2): + case MAX31790_REG_TACH_COUNT_MSB(3): + case MAX31790_REG_TACH_COUNT_MSB(4): + case MAX31790_REG_TACH_COUNT_MSB(5): + case MAX31790_REG_TACH_COUNT_MSB(6): + case MAX31790_REG_TACH_COUNT_MSB(7): + case MAX31790_REG_TACH_COUNT_MSB(8): + case MAX31790_REG_TACH_COUNT_MSB(9): + case MAX31790_REG_TACH_COUNT_MSB(10): + case MAX31790_REG_TACH_COUNT_MSB(11): + index =3D (s->pointer - MAX31790_REG_TACH_COUNT_MSB(0)) / 2; + out0 =3D (s->tach_count[index] >> 8) & 0xff; + out1 =3D s->tach_count[index] & 0xff; + break; + + case MAX31790_REG_TACH_COUNT_LSB(0): + case MAX31790_REG_TACH_COUNT_LSB(1): + case MAX31790_REG_TACH_COUNT_LSB(2): + case MAX31790_REG_TACH_COUNT_LSB(3): + case MAX31790_REG_TACH_COUNT_LSB(4): + case MAX31790_REG_TACH_COUNT_LSB(5): + case MAX31790_REG_TACH_COUNT_LSB(6): + case MAX31790_REG_TACH_COUNT_LSB(7): + case MAX31790_REG_TACH_COUNT_LSB(8): + case MAX31790_REG_TACH_COUNT_LSB(9): + case MAX31790_REG_TACH_COUNT_LSB(10): + case MAX31790_REG_TACH_COUNT_LSB(11): + index =3D (s->pointer - MAX31790_REG_TACH_COUNT_LSB(0)) / 2; + out0 =3D s->tach_count[index] & 0xff; + break; + + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(0): + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(1): + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(2): + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(3): + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(4): + case MAX31790_REG_PWM_DUTY_CYCLE_MSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_DUTY_CYCLE_MSB(0)) / 2; + out0 =3D (s->pwm[index] >> 8) & 0xff; + out1 =3D s->pwm[index] & 0xff; + break; + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(0): + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(1): + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(2): + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(3): + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(4): + case MAX31790_REG_PWM_DUTY_CYCLE_LSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_DUTY_CYCLE_LSB(0)) / 2; + out0 =3D s->pwm[index] & 0xff; + break; + + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(1): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(2): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(3): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(4): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0))= / 2; + out0 =3D (s->pwm[index] >> 8) & 0xff; + out1 =3D s->pwm[index] & 0xff; + break; + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(0): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(1): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(2): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(3): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(4): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(0))= / 2; + out0 =3D s->pwm[index] & 0xff; + break; + case MAX31790_REG_TACH_TARGET_COUNT_MSB(0): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(1): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(2): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(3): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(4): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(5): + index =3D (s->pointer - MAX31790_REG_TACH_TARGET_COUNT_MSB(0)) / 2; + out0 =3D (s->tach_target[index] >> 8) & 0xff; + out1 =3D s->tach_target[index] & 0xff; + break; + case MAX31790_REG_TACH_TARGET_COUNT_LSB(0): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(1): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(2): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(3): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(4): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(5): + index =3D (s->pointer - MAX31790_REG_TACH_TARGET_COUNT_LSB(0)) / 2; + out0 =3D s->tach_target[index] & 0xff; + break; + default: + qemu_log_mask(LOG_UNIMP, "%s: read of register %d\n", __func__, + s->pointer); + break; + } + + s->outbuf[0] =3D out0; + s->outbuf[1] =3D out1; +} + +static uint8_t max31790_get_speed_range(MAX31790State *s, size_t index) +{ + const uint16_t value =3D (s->fan_dynamics[index] >> 5); + return (value > 5) ? 32 : 1 << value; +} + +static void max31790_set_rpm(MAX31790State *s, size_t index, uint16_t rpm) +{ + trace_max31790_rpm_write(s->i2c.address, index, rpm); + + /* + * (see page 11) NP =3D number of tachometer pulses per revolution. + * Most general-purpose brushless DC fans produce two tachometer + * pulses per revolution. + */ + const uint64_t sr =3D max31790_get_speed_range(s, index); + + /* page 11: tach_count =3D 60 * SR * 8192 / (NP * RPM) */ + + /* prevent division by 0 */ + rpm =3D (rpm =3D=3D 0) ? 1 : rpm; + + /* simplified, assuming NP =3D 2 */ + uint64_t tach_count =3D (245760ULL * sr) / (uint64_t)rpm; + + /* in case of overflow, clamp to the maximum value */ + if (tach_count > 0x7ff) { + tach_count =3D 0x7ff; + } + + /* datasheet: lowest 5 bits are 0 */ + s->tach_count[index] =3D (uint16_t)(tach_count << 5); + + trace_max31790_tach_count_reg(s->i2c.address, index, s->tach_count[ind= ex]); +} + +static void max31790_pwm_write(MAX31790State *s, size_t index, uint16_t va= lue) +{ + trace_max31790_pwm_write(s->i2c.address, index, value); + + s->pwm[index] =3D value; + + /* last 7 bits in register are 0 , 9 bits remaining */ + const uint16_t pwm_real =3D s->pwm[index] >> 7; + + /* maximum value will be 511 */ + + /* + * This formula has magic values which model the relationship + * of PWM input to a fan. Not derived from datasheet. + */ + max31790_set_rpm(s, index, 100 + pwm_real * 20); +} + +static void max31790_write_2_byte(MAX31790State *s) +{ + size_t index =3D 0; + const uint8_t value0 =3D s->buf[0]; + const uint8_t value1 =3D s->buf[1]; + + switch (s->pointer) { + case MAX31790_REG_FAN_CONFIG(0): + case MAX31790_REG_FAN_CONFIG(1): + case MAX31790_REG_FAN_CONFIG(2): + case MAX31790_REG_FAN_CONFIG(3): + case MAX31790_REG_FAN_CONFIG(4): + case MAX31790_REG_FAN_CONFIG(5): + break; /* handled by one byte write */ + case MAX31790_REG_FAN_DYNAMICS(0): + case MAX31790_REG_FAN_DYNAMICS(1): + case MAX31790_REG_FAN_DYNAMICS(2): + case MAX31790_REG_FAN_DYNAMICS(3): + case MAX31790_REG_FAN_DYNAMICS(4): + case MAX31790_REG_FAN_DYNAMICS(5): + break; /* handled by one byte write */ + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(1): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(2): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(3): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(4): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0))= / 2; + max31790_pwm_write(s, index, value0 << 8 | value1); + break; + case MAX31790_REG_TACH_TARGET_COUNT_MSB(0): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(1): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(2): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(3): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(4): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(5): + index =3D (s->pointer - MAX31790_REG_TACH_TARGET_COUNT_MSB(0)) / 2; + s->tach_target[index] =3D (value0 << 8) | value1; + break; + default: + qemu_log_mask(LOG_UNIMP, "%s: write to register %d\n", __func__, + s->pointer); + break; + } +} + +static void max31790_write_1_byte(MAX31790State *s) +{ + size_t index =3D 0; + uint16_t pwm =3D 0; + const uint8_t value =3D s->buf[0]; + + switch (s->pointer) { + case MAX31790_REG_FAN_CONFIG(0): + case MAX31790_REG_FAN_CONFIG(1): + case MAX31790_REG_FAN_CONFIG(2): + case MAX31790_REG_FAN_CONFIG(3): + case MAX31790_REG_FAN_CONFIG(4): + case MAX31790_REG_FAN_CONFIG(5): + index =3D s->pointer - MAX31790_REG_FAN_CONFIG(0); + s->fan_config[index] =3D value; + trace_max31790_fan_config_write(s->i2c.address, index, value); + break; + case MAX31790_REG_FAN_DYNAMICS(0): + case MAX31790_REG_FAN_DYNAMICS(1): + case MAX31790_REG_FAN_DYNAMICS(2): + case MAX31790_REG_FAN_DYNAMICS(3): + case MAX31790_REG_FAN_DYNAMICS(4): + case MAX31790_REG_FAN_DYNAMICS(5): + index =3D s->pointer - MAX31790_REG_FAN_DYNAMICS(0); + s->fan_dynamics[index] =3D value; + trace_max31790_fan_dynamics_write(s->i2c.address, index, value); + break; + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(1): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(2): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(3): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(4): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_TARGET_DUTY_CYCLE_MSB(0))= / 2; + pwm =3D (value << 8) | (s->pwm[index] & 0x00ff); + max31790_pwm_write(s, index, pwm); + break; + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(0): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(1): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(2): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(3): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(4): + case MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(5): + index =3D (s->pointer - MAX31790_REG_PWM_TARGET_DUTY_CYCLE_LSB(0))= / 2; + pwm =3D (s->pwm[index] & 0xff00) | (value & 0x00ff); + max31790_pwm_write(s, index, pwm); + break; + case MAX31790_REG_TACH_TARGET_COUNT_MSB(0): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(1): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(2): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(3): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(4): + case MAX31790_REG_TACH_TARGET_COUNT_MSB(5): + index =3D (s->pointer - MAX31790_REG_TACH_TARGET_COUNT_MSB(0)) / 2; + s->tach_target[index] =3D (s->tach_target[index] & 0x00ff) | (valu= e << 8); + break; + case MAX31790_REG_TACH_TARGET_COUNT_LSB(0): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(1): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(2): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(3): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(4): + case MAX31790_REG_TACH_TARGET_COUNT_LSB(5): + index =3D (s->pointer - MAX31790_REG_TACH_TARGET_COUNT_LSB(0)) / 2; + s->tach_target[index] =3D (s->tach_target[index] & 0xff00) | value; + break; + default: + qemu_log_mask(LOG_UNIMP, "%s: write to register %d\n", __func__, + s->pointer); + break; + } +} + +static int max31790_send(I2CSlave *i2c, uint8_t data) +{ + MAX31790State *s =3D MAX31790(i2c); + + trace_max31790_send(s->i2c.address, data); + + if (s->len =3D=3D 0) { + /* first byte is the register pointer for a read / write operation= */ + s->pointer =3D data; + s->len++; + return 0; + } + + if (s->len > 2) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: write too many bytes\n", __fun= c__); + return 1; /* NAK */ + } + + /* second / third byte is the data to write */ + s->buf[s->len - 1] =3D data; + s->len++; + + if (s->len =3D=3D 2) { + max31790_write_1_byte(s); + } else if (s->len =3D=3D 3) { + max31790_write_2_byte(s); + } + + return 0; +} + +static uint8_t max31790_recv(I2CSlave *i2c) +{ + MAX31790State *s =3D MAX31790(i2c); + + max31790_read(s); + s->len =3D 0; + + if (s->outlen >=3D 2) { + /* error */ + qemu_log_mask(LOG_GUEST_ERROR, "%s: guest over read\n", __func__); + s->outlen =3D 0; + } + + const uint8_t data =3D s->outbuf[s->outlen++]; + + trace_max31790_recv_return(s->i2c.address, s->pointer, data); + return data; +} + +static int max31790_event(I2CSlave *i2c, enum i2c_event event) +{ + MAX31790State *s =3D MAX31790(i2c); + + switch (event) { + case I2C_START_RECV: + s->outlen =3D 0; + break; + case I2C_START_SEND: + s->len =3D 0; + break; + default: + break; + } + + return 0; +} + +static const VMStateDescription vmstate_max31790 =3D { + .name =3D TYPE_MAX31790, + .version_id =3D 0, + .minimum_version_id =3D 0, + .fields =3D + (const VMStateField[]){ + VMSTATE_UINT8(len, MAX31790State), + VMSTATE_UINT8_ARRAY(fan_config, MAX31790State, MAX31790_NUM_FA= NS), + VMSTATE_UINT8_ARRAY(fan_dynamics, MAX31790State, MAX31790_NUM_= FANS), + VMSTATE_UINT16_ARRAY(pwm, MAX31790State, MAX31790_NUM_FANS), + VMSTATE_UINT16_ARRAY(tach_target, MAX31790State, MAX31790_NUM_= FANS), + VMSTATE_UINT16_ARRAY(tach_count, MAX31790State, MAX31790_NUM_T= ACHS), + VMSTATE_UINT8_ARRAY(buf, MAX31790State, 2), + VMSTATE_UINT8(outlen, MAX31790State), + VMSTATE_UINT8_ARRAY(outbuf, MAX31790State, 2), + VMSTATE_UINT8(pointer, MAX31790State), + VMSTATE_I2C_SLAVE(i2c, MAX31790State), VMSTATE_END_OF_LIST() } +}; + +static void max31790_reset_enter(MAX31790State *s) +{ + trace_max31790_reset(s->i2c.address); + + for (int i =3D 0; i < MAX31790_NUM_FANS; i++) { + /* POR-State 0b 0XX0 0000 */ + s->fan_config[i] =3D 0b00000000; + + /* same as POR-State */ + s->tach_target[i] =3D 0b0011110000000000; + + /* same as POR-State */ + s->fan_dynamics[i] =3D 0b01001100; + } + + /* this will set both pwm and tach count */ + for (int i =3D 0; i < MAX31790_NUM_FANS; i++) { + max31790_pwm_write(s, i, 0x4444); + } +} + +static void max31790_reset(DeviceState *dev) +{ + MAX31790State *s =3D MAX31790(dev); + + max31790_reset_enter(s); +} + +static void max31790_realize(DeviceState *dev, Error **errp) +{ + MAX31790State *s =3D MAX31790(dev); + + trace_max31790_realize(s->i2c.address); + + max31790_reset_enter(s); +} + +static void max31790_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); + + dc->realize =3D max31790_realize; + dc->desc =3D "Maxim MAX31790 6-Channel Fan Controller"; + dc->vmsd =3D &vmstate_max31790; + dc->legacy_reset =3D max31790_reset; + k->event =3D max31790_event; + k->recv =3D max31790_recv; + k->send =3D max31790_send; +} + +static const TypeInfo max31790_info =3D { + .name =3D TYPE_MAX31790, + .parent =3D TYPE_I2C_SLAVE, + .instance_size =3D sizeof(MAX31790State), + .class_size =3D sizeof(MAX31790Class), + .class_init =3D max31790_class_init, +}; + +static void max31790_register_types(void) +{ + type_register_static(&max31790_info); +} + +type_init(max31790_register_types) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index fb798ccbee..bce3a86fd7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -553,6 +553,7 @@ config ASPEED_SOC select LED select PMBUS select MAX31785 + select MAX31790 select FSI_APB2OPB_ASPEED select AT24C select PCI_EXPRESS diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig index bc6331b4ab..767f198e92 100644 --- a/hw/sensor/Kconfig +++ b/hw/sensor/Kconfig @@ -43,3 +43,7 @@ config ISL_PMBUS_VR config MAX31785 bool depends on PMBUS + +config MAX31790 + bool + depends on I2C diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build index 420fdc3359..4987c3b253 100644 --- a/hw/sensor/meson.build +++ b/hw/sensor/meson.build @@ -8,3 +8,4 @@ system_ss.add(when: 'CONFIG_MAX34451', if_true: files('max3= 4451.c')) system_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_ma= g.c')) system_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'= )) system_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c')) +system_ss.add(when: 'CONFIG_MAX31790', if_true: files('max31790.c')) diff --git a/hw/sensor/trace-events b/hw/sensor/trace-events index a3fe54fa6d..10237620fb 100644 --- a/hw/sensor/trace-events +++ b/hw/sensor/trace-events @@ -4,3 +4,16 @@ tmp105_read(uint8_t dev, uint8_t addr) "device: 0x%02x, addr: 0x%02x" tmp105_write(uint8_t dev, uint8_t addr) "device: 0x%02x, addr 0x%02x" tmp105_write_shutdown(uint8_t dev) "device: 0x%02x" + +# max31790.c +max31790_send(uint8_t i2c_addr, uint8_t send) "i2c_addr: 0x%02x, data: 0x%= 02x" +max31790_recv_return(uint8_t i2c_addr, uint8_t reg_addr, uint8_t data) "i2= c_addr: 0x%02x, reg_addr: 0x%02x, returns: 0x%02x" +max31790_realize(uint8_t i2c_addr) "i2c_addr: 0x%02x" +max31790_reset(uint8_t i2c_addr) "i2c_addr: 0x%02x" +max31790_pwm_write(uint8_t i2c_addr, size_t index, uint16_t value) "i2c_ad= dr: 0x%02x, index: %zu, value: 0x%04x" +max31790_rpm_write(uint8_t i2c_addr, size_t index, uint16_t value) "i2c_ad= dr: 0x%02x, index: %zu, value: 0x%04x" +max31790_tach_count_reg(uint8_t i2c_addr, size_t index, uint16_t value) "i= 2c_addr: 0x%02x, index: %zu, value: 0x%04x" +max31790_fan_dynamics_read(uint8_t i2c_addr, size_t channel, uint8_t value= ) "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" +max31790_fan_dynamics_write(uint8_t i2c_addr, size_t channel, uint8_t valu= e) "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" +max31790_fan_config_read(uint8_t i2c_addr, size_t channel, uint8_t value) = "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" +max31790_fan_config_write(uint8_t i2c_addr, size_t channel, uint8_t value)= "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" diff --git a/tests/functional/arm/test_aspeed_fby4.py b/tests/functional/ar= m/test_aspeed_fby4.py index a521834f79..8599160784 100755 --- a/tests/functional/arm/test_aspeed_fby4.py +++ b/tests/functional/arm/test_aspeed_fby4.py @@ -7,7 +7,7 @@ from qemu_test import Asset from qemu_test import wait_for_console_pattern from aspeed import AspeedTest - +from qemu_test import exec_command_and_wait_for_pattern =20 class YosemiteV4Machine(AspeedTest): =20 @@ -34,6 +34,52 @@ def do_test_arm_aspeed_openbmc_no_network(self, machine,= image, uboot, # different from the other machines. self.wait_for_console_pattern('yosemite4 login:') =20 + # perform login + exec_command_and_wait_for_pattern(self, + "root", "Password:"); + + exec_command_and_wait_for_pattern(self, "0penBmc", "#"); + + # MAX31790 test + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/name", "max31790"); + + # this initial fan reading value is caused by services + # inside the image writing the pwm + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_input", "7281"); + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_enable", "1"); + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_fault", "0"); + + exec_command_and_wait_for_pattern(self, + "echo 1 > /sys/class/hwmon/hwmon2/pwm1", "root@yosemite4"); + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_input", "0"); + + # linux driver pwm write: + # >>> hex(int((11 * 511) / 255) << 7) + # '0xb00' + exec_command_and_wait_for_pattern(self, + "echo 11 > /sys/class/hwmon/hwmon2/pwm1", "root@yosemite4"); + # device emulation logic: + # >>> hex(100 + (0xb00 >> 7) * 20) + # '0x21c' + # register reading value: + # >>> hex(int((245760 * 4) / 0x21c) << 5) + # '0xe380' + # linux driver calculation: + # >>> int((60 * 4 * 8192) / (0xe380 >> 4)) + # 540 + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_input", "540"); + + exec_command_and_wait_for_pattern(self, + "echo 255 > /sys/class/hwmon/hwmon2/pwm1", "root@yosemite4"); + exec_command_and_wait_for_pattern(self, + "cat /sys/class/hwmon/hwmon2/fan1_input", "10347"); + def test_arm_ast2600_yosemitev4_openbmc(self): image_path =3D self.uncompress(self.ASSET_YOSEMITE_V4_FLASH) =20 --=20 2.54.0 From nobody Wed Jun 24 02:13:21 2026 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=quarantine dis=none) header.from=9elements.com ARC-Seal: i=1; a=rsa-sha256; t=1781094219; cv=none; d=zohomail.com; s=zohoarc; b=IHkUWfA2jrDuX1qyFxqCEp7ut/0SNN2NxvXv4q7GFPW6N3/CJGxHQUve95sMar0U35AT2ZoD6kyVVtXPLNIUVBAFqCeR7uuJxXuRe+VgRgTbgCr0GB7zrQTGy+5DkT+ULXI56TOgFF5HPtd//l/+eQv8Rp8MUL62+M8IkpjR0qY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781094219; h=Content-Type:Content-Transfer-Encoding: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=TIKkT012ohVBWP3JPsDOQuIOqL5Cilmh8NufTTnKpsQ=; b=oKKA2NQ2ZfaFsBvomXoHXf1jX+9ypKE4lGUOTYKOGkfEwozkAfDcdG/andpe1w6twrYRFqCWFJQI6hpB4Sbq/DVVnJCEc3JAY0h4rcQ1vRETcgQr5jiCLt/q8pXhJZLtZDGD9zsZuV7pSvtCHZJXrXRIm3LwAaY9N04tx9M1CXI= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781094219868545.5165812687674; Wed, 10 Jun 2026 05:23:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXHxy-00076h-4X; Wed, 10 Jun 2026 08:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXHxp-0006vy-JK for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:22 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXHxl-0005u4-VG for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:21 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-490ac357c55so71373865e9.1 for ; Wed, 10 Jun 2026 05:23:17 -0700 (PDT) Received: from alexanderarchlinux ([188.111.3.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm70995963f8f.0.2026.06.10.05.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 05:23:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1781094196; x=1781698996; 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=TIKkT012ohVBWP3JPsDOQuIOqL5Cilmh8NufTTnKpsQ=; b=ef5qJEsdzEoQ30jGkmQdYgkig+Zgv6J/BzSnBrKQxLMMDXokwz6juwnyQXVla3LDvy XS/zP5qRfj3Kez7AIyOWmFFYAu3woymIb7biqAboxl9R3bWUhMLdOzb4sL4FT0MqGbJW l+FO6E05VCQDKnBElZ3Iac2nQAbMG+9o5hG0z5Ad3st1yckgDCxZPKcRM51Jo1JdEH/F vp9BhLAWdXlFQCboJvMAqHAksHubUrOT3fl3yW04Df/yX7irvFfj9Wmxg3UQ9TKmqFJd 7Rkk9UeNEE0w35+gi0zIGZ5fJa7+s3qpBuGMh1tUYGSJDxC44OqNoyPnRggqIlye43Mx 5xRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781094196; x=1781698996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TIKkT012ohVBWP3JPsDOQuIOqL5Cilmh8NufTTnKpsQ=; b=kHDM+QDxiLD/P2D6sKEycp97l0lJTBMGZaiI4Sb7KYTd1LRkDMHqTX7rq9R6di/qH8 5gGJJbKuLlOEo0toePmLh58z54sCamoxdGPZOXlb5fQKxagvnU06oRdapkK3B2J8e91m rTo9xIuBm7LejEKzTGuY+sM13T43HazBERr0WjXPry+Vh6l0BWpk4rwFcupMy6xqQx4W +vnkBqofRty9Qas9Dewec/o1tCKrrkUItEGmKhTmuTjsXFnOaxGhm+hn8j3QAzEfrNnj Jcc091Y4D/bLQJFDIbrHnWWwAU6XJsMlQ1IUGjWAVJW5IY+iWvUnOMOxrfCcUxQiikRv PqLQ== X-Gm-Message-State: AOJu0Yz1uAAIkXWox3cOZz0ncZfknu8AROOZrgL+p68coIT8UxrQZMqR fo6zJSYGQiKxeA6yyAmqAe44KfGng7CKGD66mD1ic6C5OBSV21Ly4y/QWgoSSGXWuBZR8O79AnS nNwUW568= X-Gm-Gg: Acq92OHjrnUiIHkGNkpi1dGqXzFxfFwumIwkskfUz8vKL0cOdi6CnU1WEbA5+80tTyx l4prwht58B/iaDuZx3qpQKVFMu8PtWateDPmHaCHBWSIbBfW5BUneZOCASVf/L7GqjHASeCBsd3 Sy5l1biH5Brgc/cfdo6RYBqUdXFhT5fEQYvdj+lVj/nBd2uSPDXIdrXT0IC3CbWmkj79+sWA1yO Q0byqg5UEo+v2LnUDeeW8vr5xQI1TP3J/bxWhv7HerJtesVl3vmcATD68hzatdUC+b8Zb5veTZk +q/2kF4lmw5fGFasLTVRCARXEiWpTJ6J82Ju86KKTiNW7gNMcYd+nzbwm8//4Qtj7PFxQOU6pJG f5xo9daInA/LC5auXAdD0hQAek8/NguhnRCiY+6LfVcTO2krhbNJfhomq0+kpMNSSo6R23kkm7E HCtJdmsghHMk5Xji3/FxMRO73jpNkxccOmOi1zEebS8OhWOAbZ4rqFYqUbBAvYNL0GwA== X-Received: by 2002:a05:600c:5246:b0:489:c57:7836 with SMTP id 5b1f17b1804b1-490c25ff39amr394218845e9.27.1781094195988; Wed, 10 Jun 2026 05:23:15 -0700 (PDT) From: Alexander Hansen To: qemu-devel@nongnu.org Cc: Alexander Hansen , Titus Rwantare , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jonathan Cameron , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 4/5] hw/sensor: support MAX11615 Date: Wed, 10 Jun 2026 14:21:01 +0200 Message-ID: <20260610122252.349321-5-alexander.hansen@9elements.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610122252.349321-1-alexander.hansen@9elements.com> References: <20260610122252.349321-1-alexander.hansen@9elements.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alexander.hansen@9elements.com; helo=mail-wm1-x330.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @9elements.com) X-ZM-MESSAGEID: 1781094221772158500 Product: [1] Datasheet: [2] Sensor readings can be provided upon creation of the device. In case no readings are provided the ADC reads a pre-defined arbitrary value. root@yosemite4:~# cat /sys/bus/iio/devices/iio:device2/name max11615 root@yosemite4:~# cat /sys/bus/iio/devices/iio:device2/in_voltage0_raw 1922 root@yosemite4:~# cat /sys/bus/iio/devices/iio:device2/in_voltage_scale 0.500000000 trace: less /tmp/qemu-trace.log | grep -i max116 max11615_realize i2c_addr: 0x33 max11615_realize i2c_addr: 0x33 max11615_event i2c_addr: 0x33, event: 0x01 max11615_write_setup i2c_addr: 0x33, data: 0xd2 max11615_write_config i2c_addr: 0x33, data: 0x0f max11615_event i2c_addr: 0x33, event: 0x03 max11615_event i2c_addr: 0x33, event: 0x01 max11615_write_setup i2c_addr: 0x33, data: 0xd2 max11615_write_config i2c_addr: 0x33, data: 0x0f max11615_event i2c_addr: 0x33, event: 0x03 max11615_event i2c_addr: 0x33, event: 0x01 max11615_write_setup i2c_addr: 0x33, data: 0xd2 max11615_write_config i2c_addr: 0x33, data: 0x61 max11615_event i2c_addr: 0x33, event: 0x03 max11615_event i2c_addr: 0x33, event: 0x00 max11615_recv i2c_addr: 0x33, reg_addr: 0x00 max11615_recv_return i2c_addr: 0x33, returns: 0xfa max11615_recv i2c_addr: 0x33, reg_addr: 0x00 max11615_recv_return i2c_addr: 0x33, returns: 0xd2 max11615_event i2c_addr: 0x33, event: 0x04 max11615_event i2c_addr: 0x33, event: 0x03 References: [1] https://www.analog.com/en/products/MAX11615.html [2] https://www.analog.com/media/en/technical-documentation/data-sheets/MAX= 11612-MAX11617.pdf Cc: Titus Rwantare Cc: "C=C3=A9dric Le Goater" (maintainer:ASPEED BMCs) Cc: Jonathan Cameron Cc: "Philippe Mathieu-Daud=C3=A9" (odd fixer:Overall se= nsors) Cc: Paolo Bonzini (maintainer:Kconfig) Cc: Peter Maydell (supporter:ARM TCG CPUs) Cc: qemu-devel@nongnu.org (open list:All patches CC here) Cc: qemu-arm@nongnu.org (open list:ARM TCG CPUs) Signed-off-by: Alexander Hansen --- MAINTAINERS | 1 + include/hw/sensor/max11615.h | 19 ++ hw/arm/aspeed_ast2600_fby4.c | 8 +- hw/sensor/max11615.c | 322 +++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/sensor/Kconfig | 4 + hw/sensor/meson.build | 1 + hw/sensor/trace-events | 9 + tests/functional/arm/test_aspeed_fby4.py | 9 + 9 files changed, 373 insertions(+), 1 deletion(-) create mode 100644 include/hw/sensor/max11615.h create mode 100644 hw/sensor/max11615.c diff --git a/MAINTAINERS b/MAINTAINERS index 5538475fb0..8638e9c7db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3992,6 +3992,7 @@ S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c F: hw/sensor/isl_pmbus_vr.c +F: hw/sensor/max11615.c F: hw/sensor/max31790.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h diff --git a/include/hw/sensor/max11615.h b/include/hw/sensor/max11615.h new file mode 100644 index 0000000000..647ef62ef1 --- /dev/null +++ b/include/hw/sensor/max11615.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef QEMU_MAX11615_H +#define QEMU_MAX11615_H + +#include "hw/i2c/i2c.h" + +#define TYPE_MAX11615 "max11615" + +/* + * Create and realize a MAX11615 ADC with constant caller-supplied readings + * @bus: I2C bus to put it on + * @address: I2C address + * @init_values: array of readings for each ADC channel + * @init_values_size: Size of @init_values, can be less than the number of= channels + */ +I2CSlave *max11615_init_with_values(I2CBus *bus, uint8_t address, + const uint16_t *init_values, uint32_t = init_values_size); + +#endif diff --git a/hw/arm/aspeed_ast2600_fby4.c b/hw/arm/aspeed_ast2600_fby4.c index 8feb31bc44..dd84839c65 100644 --- a/hw/arm/aspeed_ast2600_fby4.c +++ b/hw/arm/aspeed_ast2600_fby4.c @@ -11,6 +11,7 @@ #include "hw/arm/aspeed.h" #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" +#include "hw/sensor/max11615.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/gpio/pca9552.h" =20 @@ -185,7 +186,12 @@ static void fby4_i2c_init_fanboard(I2CSlave *fan_mux, = size_t eepromSize) i2c_slave_create_simple(bus, "max31790", 0x2f); =20 /* maxim,max11615 @ 0x33 (adc) */ - /* TODO */ + static const uint16_t adc_values[8] =3D { + 1922, 1000, + 1922, 1000, + 1922, 1000, + 1922, 1000}; + max11615_init_with_values(bus, 0x33, adc_values, 8); =20 at24c_eeprom_init_rom( bus, 0x52, eepromSize, diff --git a/hw/sensor/max11615.c b/hw/sensor/max11615.c new file mode 100644 index 0000000000..fb96671b13 --- /dev/null +++ b/hw/sensor/max11615.c @@ -0,0 +1,322 @@ +/* + * Maxim MAX11615 Low-Power 12 bit ADC + * Models MAX11612,MAX11613,MAX11614,MAX11615,MAX11616,MAX11617 + * + * Datasheet: + * https://www.analog.com/media/en/technical-documentation/data-sheets/MAX= 11612-MAX11617.pdf + * + * Copyright 2026 9elements + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/sensor/max11615.h" +#include "hw/i2c/i2c.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "trace.h" + +#define MAX11615_NUM_CHANNELS 8 + +struct MAX11615State { + I2CSlave i2c; + + /* true: single-ended mode, false: differential mode */ + bool single_ended; + + /* + * Output data coding for the MAX11612=E2=80=93MAX11617 is + * binary in unipolar mode and two=E2=80=99s complement in bipolar mode + */ + bool bipolar; + + /* The MAX11613/MAX11615/MAX11617 feature a 2.048V internal reference = */ + uint16_t vref; + + uint16_t channels[MAX11615_NUM_CHANNELS]; + + /* output buffer */ + uint8_t outlen; + uint8_t outbuf[2]; + + /* selected channel for read/write operation */ + uint8_t pointer; +}; + +struct MAX11615Class { + I2CSlaveClass parent_class; +}; + +OBJECT_DECLARE_TYPE(MAX11615State, MAX11615Class, MAX11615) + +static void max11615_set_outbuf(MAX11615State *s, uint16_t value) +{ + uint8_t msb =3D value >> 8; + uint8_t lsb =3D value & 0xff; + s->outbuf[0] =3D 0b11110000 | (msb & 0b00001111); + s->outbuf[1] =3D lsb; +} + +static void max11615_read_single_ended(MAX11615State *s) +{ + /* Table 3. Channel Selection in Single-Ended Mode */ + /* read an ADC channel, first 4 bits must be high */ + uint16_t value =3D s->channels[s->pointer]; + /* + * In single-ended mode, the MAX11612=E2=80=93MAX11617 always + * operates in unipolar mode irrespective of BIP/UNI. + */ + if (value > s->vref) { + value =3D 0xfff; + } + max11615_set_outbuf(s, value); +} + +static int16_t max11615_differential_value(MAX11615State *s) +{ + /* Table 4. Channel Selection in Differential Mode */ + size_t i1 =3D s->pointer; + size_t i2 =3D (s->pointer % 2 =3D=3D 0) ? s->pointer + 1 : s->pointer = - 1; + + const int16_t ch1 =3D s->channels[i1]; + const int16_t ch2 =3D s->channels[i2]; + return ch1 - ch2; +} + +static void max11615_read_differential(MAX11615State *s) +{ + const int16_t value =3D max11615_differential_value(s); + uint16_t vu =3D value; + + /* full-scale transition: Figure 12, Figure 13 */ + if (s->bipolar) { + const uint16_t fs =3D s->vref / 2; + if (value < -fs) { + vu =3D 0b100000000000; + } + if (value > fs) { + vu =3D 0b011111111111; + } + } else { + /* + * A negative differential analog input in unipolar mode causes the + * digital output code to be zero + */ + if (value < 0) { + vu =3D 0; + } + } + + max11615_set_outbuf(s, vu); +} + +static void max11615_read(MAX11615State *s) +{ + if (s->single_ended) { + max11615_read_single_ended(s); + } else { + max11615_read_differential(s); + } +} + +static void max11615_write_config_byte(MAX11615State *s, uint8_t data) +{ + trace_max11615_write_config(s->i2c.address, data); + + uint8_t scan_select =3D (data >> 5) & 0b11; + + if (scan_select !=3D 0b11) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented scan select\n", __func= __); + } + + uint8_t channel_select =3D (data >> 1) & 0b1111; + + /* Table 3. Channel Selection */ + if (channel_select >=3D MAX11615_NUM_CHANNELS) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid channel select\n", + __func__); + channel_select =3D MAX11615_NUM_CHANNELS - 1; + } + s->pointer =3D channel_select; + s->single_ended =3D data & 0x1; +} + +static void max11615_write_setup_byte(MAX11615State *s, uint8_t data) +{ + trace_max11615_write_setup(s->i2c.address, data); + /* we ignore the setup byte, not implemented */ + + /* 1 =3D no action, 0 =3D resets the configuration register to default= */ + const bool rst =3D ((data >> 1) & 0b1) =3D=3D 0b0; + + if (rst) { + s->single_ended =3D true; + s->pointer =3D 0; + } + + s->bipolar =3D ((data >> 2) & 0b1) =3D=3D 0b1; + + /* Table 6. Reference Voltage */ + const uint8_t sel =3D (data >> 4) & 0b111; + + if (sel =3D=3D 0b10 || sel =3D=3D 0b11) { + qemu_log_mask(LOG_UNIMP, "%s: unsupported: external vref\n", __fun= c__); + } +} + +static int max11615_send(I2CSlave *i2c, uint8_t data) +{ + MAX11615State *s =3D MAX11615(i2c); + const uint8_t msb =3D (data >> 7) & 0b1; + + if (msb) { + max11615_write_setup_byte(s, data); + } else { + max11615_write_config_byte(s, data); + } + + s->outlen =3D 0; + return 0; +} + +static uint8_t max11615_recv(I2CSlave *i2c) +{ + MAX11615State *s =3D MAX11615(i2c); + trace_max11615_recv(s->i2c.address, s->pointer); + + if (s->outlen >=3D 2) { + /* MAX11615 supports multichannel scan with wraparound */ + /* see datasheet page 17 */ + + s->outlen =3D 0; + + s->pointer++; + if (s->pointer >=3D MAX11615_NUM_CHANNELS) { + s->pointer =3D 0; + } + } + + max11615_read(s); + + const uint8_t data =3D s->outbuf[s->outlen++]; + + trace_max11615_recv_return(s->i2c.address, data); + return data; +} + +static int max11615_event(I2CSlave *i2c, enum i2c_event event) +{ + MAX11615State *s =3D MAX11615(i2c); + + trace_max11615_event(s->i2c.address, event); + + switch (event) { + case I2C_START_RECV: + s->outlen =3D 0; + break; + default: + break; + } + + return 0; +} + +static const VMStateDescription vmstate_max11615 =3D { + .name =3D TYPE_MAX11615, + .version_id =3D 0, + .minimum_version_id =3D 0, + .fields =3D + (const VMStateField[]){ VMSTATE_BOOL(single_ended, MAX11615State), + VMSTATE_BOOL(bipolar, MAX11615State), + VMSTATE_UINT16(vref, MAX11615State), + VMSTATE_UINT16_ARRAY(channels, MAX11615Sta= te, + MAX11615_NUM_CHANNELS= ), + VMSTATE_UINT8(outlen, MAX11615State), + VMSTATE_UINT8_ARRAY(outbuf, MAX11615State,= 2), + VMSTATE_UINT8(pointer, MAX11615State), + VMSTATE_I2C_SLAVE(i2c, MAX11615State), + VMSTATE_END_OF_LIST() } +}; + +I2CSlave *max11615_init_with_values(I2CBus *bus, uint8_t address, + const uint16_t *init_values, + uint32_t init_values_size) +{ + MAX11615State *s; + + s =3D MAX11615(i2c_slave_new(TYPE_MAX11615, address)); + + i2c_slave_realize_and_unref(I2C_SLAVE(s), bus, &error_abort); + + for (int i =3D 0; i < MAX11615_NUM_CHANNELS; i++) { + /* arbitrary value if there is no data*/ + s->channels[i] =3D + i < init_values_size ? init_values[i] : 0b1011010010; + } + + return I2C_SLAVE(s); +} + +static void max11615_reset_enter(MAX11615State *s) +{ + trace_max11615_reset_enter(s->i2c.address); + + s->single_ended =3D true; + s->bipolar =3D false; + s->vref =3D 2048; + s->pointer =3D 0; + s->outlen =3D 0; + + for (int i =3D 0; i < MAX11615_NUM_CHANNELS; i++) { + s->channels[i] =3D 0b1011010010; + } +} + +static void max11615_reset(DeviceState *dev) +{ + MAX11615State *s =3D MAX11615(dev); + + max11615_reset_enter(s); +} + +static void max11615_realize(DeviceState *dev, Error **errp) +{ + MAX11615State *s =3D MAX11615(dev); + + max11615_reset_enter(s); + + trace_max11615_realize(s->i2c.address); +} + +static void max11615_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); + + dc->realize =3D max11615_realize; + dc->desc =3D "Maxim MAX11615 12-bit ADC"; + dc->vmsd =3D &vmstate_max11615; + dc->legacy_reset =3D max11615_reset; + k->event =3D max11615_event; + k->recv =3D max11615_recv; + k->send =3D max11615_send; +} + +static const TypeInfo max11615_info =3D { + .name =3D TYPE_MAX11615, + .parent =3D TYPE_I2C_SLAVE, + .instance_size =3D sizeof(MAX11615State), + .class_size =3D sizeof(MAX11615Class), + .class_init =3D max11615_class_init, +}; + +static void max11615_register_types(void) +{ + type_register_static(&max11615_info); +} + +type_init(max11615_register_types) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index bce3a86fd7..c90b8da8c2 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -554,6 +554,7 @@ config ASPEED_SOC select PMBUS select MAX31785 select MAX31790 + select MAX11615 select FSI_APB2OPB_ASPEED select AT24C select PCI_EXPRESS diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig index 767f198e92..441bee7604 100644 --- a/hw/sensor/Kconfig +++ b/hw/sensor/Kconfig @@ -47,3 +47,7 @@ config MAX31785 config MAX31790 bool depends on I2C + +config MAX11615 + bool + depends on I2C diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build index 4987c3b253..a1e26604fa 100644 --- a/hw/sensor/meson.build +++ b/hw/sensor/meson.build @@ -9,3 +9,4 @@ system_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files= ('lsm303dlhc_mag.c')) system_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'= )) system_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c')) system_ss.add(when: 'CONFIG_MAX31790', if_true: files('max31790.c')) +system_ss.add(when: 'CONFIG_MAX11615', if_true: files('max11615.c')) diff --git a/hw/sensor/trace-events b/hw/sensor/trace-events index 10237620fb..e115f05dd6 100644 --- a/hw/sensor/trace-events +++ b/hw/sensor/trace-events @@ -17,3 +17,12 @@ max31790_fan_dynamics_read(uint8_t i2c_addr, size_t chan= nel, uint8_t value) "i2c max31790_fan_dynamics_write(uint8_t i2c_addr, size_t channel, uint8_t valu= e) "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" max31790_fan_config_read(uint8_t i2c_addr, size_t channel, uint8_t value) = "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" max31790_fan_config_write(uint8_t i2c_addr, size_t channel, uint8_t value)= "i2c_addr: 0x%02x, channel: %zu, value: 0x%04x" + +# max11615.c +max11615_write_setup(uint8_t i2c_addr, uint8_t send) "i2c_addr: 0x%02x, da= ta: 0x%02x" +max11615_write_config(uint8_t i2c_addr, uint8_t send) "i2c_addr: 0x%02x, d= ata: 0x%02x" +max11615_recv(uint8_t i2c_addr, uint8_t reg_addr) "i2c_addr: 0x%02x, reg_a= ddr: 0x%02x" +max11615_recv_return(uint8_t i2c_addr, uint8_t data) "i2c_addr: 0x%02x, re= turns: 0x%02x" +max11615_event(uint8_t i2c_addr, uint8_t event) "i2c_addr: 0x%02x, event: = 0x%02x" +max11615_realize(uint8_t i2c_addr) "i2c_addr: 0x%02x" +max11615_reset_enter(uint8_t i2c_addr) "i2c_addr: 0x%02x" diff --git a/tests/functional/arm/test_aspeed_fby4.py b/tests/functional/ar= m/test_aspeed_fby4.py index 8599160784..b711bc8e73 100755 --- a/tests/functional/arm/test_aspeed_fby4.py +++ b/tests/functional/arm/test_aspeed_fby4.py @@ -80,6 +80,15 @@ def do_test_arm_aspeed_openbmc_no_network(self, machine,= image, uboot, exec_command_and_wait_for_pattern(self, "cat /sys/class/hwmon/hwmon2/fan1_input", "10347"); =20 + # MAX11615 test + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-0033/iio:device*/name", "max11615= "); + # read the value configured in the machine emulation + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-0033/iio:device*/in_voltage0_raw"= , "1922"); + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-0033/iio:device*/in_voltage_scale= ", "0.500000000"); + def test_arm_ast2600_yosemitev4_openbmc(self): image_path =3D self.uncompress(self.ASSET_YOSEMITE_V4_FLASH) =20 --=20 2.54.0 From nobody Wed Jun 24 02:13:21 2026 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=quarantine dis=none) header.from=9elements.com ARC-Seal: i=1; a=rsa-sha256; t=1781094235; cv=none; d=zohomail.com; s=zohoarc; b=Ul6IXYoVR6SkzqsPawp0PM8oaNshCLPe73253GmP2ZQPd3W0L54H26MBwhlKF9skqlYxo6aUtnpKcnD5/zr3h9YezgNdftirsc3qz4i/xs0Iw+lirKjyj+ZMAIGwzO0SS2Ade4MjT9TPSmGBf0HSWk2iCOh5vNt8AEmtzgcKFFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781094235; h=Content-Type:Content-Transfer-Encoding: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=SN3mI+oJ7hKWYQ39tpHPjlftXGaXBUrWyFAGfjqKx+M=; b=DiLGbLtC30vKPD8/2ItyLSYQvsnZKw9TdJDFpDiCeGE//uIKwNSBGdm58w6uA5Vwh5tYgWHmso5L084UQuk96ofUVDtJjIPH5w3Mg7Dt/55E47f9CXB7p/enmLP4fVEJ60F9DX9VfgLUrUEiqCa6HKo9TxiQ8m4rbbQ8Ol19zeo= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1781094235546202.660439474873; Wed, 10 Jun 2026 05:23:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wXHxy-00077h-Kc; Wed, 10 Jun 2026 08:23:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wXHxs-0006yM-Hw for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:25 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wXHxp-0005xF-BS for qemu-devel@nongnu.org; Wed, 10 Jun 2026 08:23:24 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-490b12270b3so40101795e9.1 for ; Wed, 10 Jun 2026 05:23:20 -0700 (PDT) Received: from alexanderarchlinux ([188.111.3.154]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f0a43e9sm70995963f8f.0.2026.06.10.05.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 05:23:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1781094200; x=1781699000; 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=SN3mI+oJ7hKWYQ39tpHPjlftXGaXBUrWyFAGfjqKx+M=; b=X+KtWdDwrVoIwAEv9zMefeWcYA9fmrHWAkhc6Eyvmqv/Vlt7VsKUN5Kk5RcrLCNRc/ kybGP9NI0eeMC9AQZOTnQSiGH1L1gZY2+X7GLSKSRM9hNELAc2t6q0yJFot9k6JrAm1z KvcYy7zkyfe7BObsKBQ/17sEIOpUZZ/AafLpLLt9q+xZtas0tmabEc+5mwS6jhlrkAwL V7ijr81EFe6ypkyvsNH4qITCVTrLj1Xjo5bGTtNBffCfhRjwXpZgfI9e5XJpMAhnQhd5 n3bshzByMVrgP+A0oxlLYYlTkezMTHYn3CruQ6hszBwnqeFe3iBdnY9VmXAJ+4ZLVALG ulzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781094200; x=1781699000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=SN3mI+oJ7hKWYQ39tpHPjlftXGaXBUrWyFAGfjqKx+M=; b=bNQI6FMM/f+MPo8kiwHn0Cv84zVVKPafvBG1pMcnggdZyU9aM4iAm79KdKilyMjkck GqE7q0pwAp2Nz64mhMuoj/UqchLpDO2txyGCrd8NbuIQCqoyqv84dEunWtWdZZXB9oKR ZCET1Z2mXRYfu+jSg63+oYy8VqYtaar0HU3gYUzeK3pvY2GFMsSo3u6OlJI158WuN7Zy UCBTha31OMMP2pqkpX5Oi4pD0+ZW4AAPFPO2KDPCerxeL3D5E33QS7kRHeSFb/eId5H5 h+x+2Q8/HbZYMrWdxZ7+SAzeNb4AQUdtMqNHc+zrrgsDqh1HgZ1vpualJaP9bvX7hkXv +zew== X-Gm-Message-State: AOJu0Yyt9391yxQiIO+ZGmLMheIc9akfuOC8eBSBr8d4C82HQb67xsdD hLBCKEdoWCPVBftCQtL6COCPhd6xQmwtIfxP4E4Puuak/EUSQKvVjOmBgU/GapvvPHvlpj9T3SS yVOwvo+E= X-Gm-Gg: Acq92OF2mgNHkqrg8ySUzB9qVc/aaVO+ryagEGqO5nebJGKmmlZ7v500ecEEC+JZcLT j0L4kCRIqd2XKEbQaGXVGV61YbMMk6XCRm/TqfVEYqnPdvslgACH4A5OaR6ES+BSuGZYti+B8PA FYZiKjvcYd5ELft4JDqhaioriG1hjHENIznq4QvbE40QKXEobqKfIlDt8E65RiLAlScDUzPu8hu VPv8NhR6QGIWcgflZxWaydmBD6FuadiMDvIXZbPfNq+uKelAy2NCG1MMGk20JckdRygzeqkJVFd vNXzEjF4CqVErxeCf7DHKcjMR30XeaB2gND3JZVThGG4HH3b33uJayEAssj+gL7/1nNLMh5Nc3l 5x4o9Ty7nIIvn0QZhCrowgBOnqkUCueMau3RY6W0e/WW8VULMAFR+ewSiOisQXGAnRaRqokdr8P U9Xc1+xqRZErwN2kABHoZDiJhkAZHnk65c4wvgKhoLdCWd4PZmeLtGVM47zn3ngUBRUg== X-Received: by 2002:a05:600c:c4a7:b0:490:b58a:dcc1 with SMTP id 5b1f17b1804b1-490c262183cmr376717965e9.29.1781094199604; Wed, 10 Jun 2026 05:23:19 -0700 (PDT) From: Alexander Hansen To: qemu-devel@nongnu.org Cc: Alexander Hansen , Titus Rwantare , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jonathan Cameron , Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Steven Lee , Troy Lee , Jamin Lin , Kane Chen , Andrew Jeffery , Joel Stanley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 5/5] hw/sensor: support Texas Instruments ADC128D818 Date: Wed, 10 Jun 2026 14:21:02 +0200 Message-ID: <20260610122252.349321-6-alexander.hansen@9elements.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610122252.349321-1-alexander.hansen@9elements.com> References: <20260610122252.349321-1-alexander.hansen@9elements.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alexander.hansen@9elements.com; helo=mail-wm1-x32c.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, 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: qemu development 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 @9elements.com) X-ZM-MESSAGEID: 1781094236997154100 Product: [1] Datasheet: [2] ADC128D818 Support: - channel readings from pre-set values - driver can read and write most configuration registers ADC128D818 currently unsupported: - slave address restriction - startup sequence and realistic busy register emulation - external VREF - conversion rate - interrupts - deep shutdown mode - individual channel shutdown - selection between Mode 0,1,2,3 - pseudo-differential input Anyone could expand it in the future for more accurate emulation. The reason for adding this device is to support Yosemite V4 emulation. Tested: on yosemite v4 qemu initialize the device: // ti,adc128d818 @ 0x1f (adc) // the driver will throw away the last 4 bits, set them 0 uint16_t adc_values1[8] =3D { 0b011110000000, 0b010100010000, 0b001000110000, 0b100000100000, 0b011110000000, 0b010100010000, 0b001000110000, 0b100000100000}; adc128d818_init_with_values(bus, 0x1f, adc_values1, 8); Trace outputs directly after initialization: adc128d818_realize i2c_addr: 0x1f adc128d818_realize i2c_addr: 0x1f adc128d818_event i2c_addr: 0x1f, event: 0x01 adc128d818_send i2c_addr: 0x1f, data: 0x00 adc128d818_send i2c_addr: 0x1f, data: 0x80 adc128d818_write i2c_addr: 0x1f, reg: 0x00 data: 0x80 adc128d818_event i2c_addr: 0x1f, event: 0x03 adc128d818_event i2c_addr: 0x1f, event: 0x01 ... read the values root@yosemite4:/sys/bus/i2c/devices/30-001f# cat hwmon/hwmon0/in0_min 0 root@yosemite4:/sys/bus/i2c/devices/30-001f# cat hwmon/hwmon0/in0_max 0 root@yosemite4:/sys/bus/i2c/devices/30-001f# cat hwmon/hwmon0/in0_input 75 root@yosemite4:/sys/bus/i2c/devices/30-001f# cat hwmon/hwmon0/name adc128d818 We initially configured 0b011110000000 for the first channel. The driver throws away the last 4 bits and does calculation similar to below: val =3D DIV_ROUND_CLOSEST(data->in[index][nr] * data->vref, 4095); We can check that the calculation is as expected given our configured value. ((0b011110000000 >> 4) * 2560) / 4095 75.01831501831502 References: [1] https://www.ti.com/product/ADC128D818 [2] https://www.ti.com/lit/gpn/adc128d818 Cc: Titus Rwantare Cc: "C=C3=A9dric Le Goater" (maintainer:ASPEED BMCs) Cc: Jonathan Cameron Cc: Paolo Bonzini (maintainer:Kconfig) Cc: Peter Maydell (supporter:ARM TCG CPUs) Cc: "Philippe Mathieu-Daud=C3=A9" (odd fixer:Overall se= nsors) Cc: qemu-arm@nongnu.org (open list:ARM TCG CPUs) Cc: qemu-devel@nongnu.org (open list:All patches CC here) Signed-off-by: Alexander Hansen --- MAINTAINERS | 1 + include/hw/sensor/adc128d818.h | 23 ++ hw/arm/aspeed_ast2600_fby4.c | 9 +- hw/sensor/adc128d818.c | 433 +++++++++++++++++++++++ hw/arm/Kconfig | 1 + hw/sensor/Kconfig | 4 + hw/sensor/meson.build | 1 + hw/sensor/trace-events | 8 + tests/functional/arm/test_aspeed_fby4.py | 10 + 9 files changed, 489 insertions(+), 1 deletion(-) create mode 100644 include/hw/sensor/adc128d818.h create mode 100644 hw/sensor/adc128d818.c diff --git a/MAINTAINERS b/MAINTAINERS index 8638e9c7db..ada9978bac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3990,6 +3990,7 @@ PMBus M: Titus Rwantare S: Maintained F: hw/i2c/pmbus_device.c +F: hw/sensor/adc128d818.c F: hw/sensor/adm1272.c F: hw/sensor/isl_pmbus_vr.c F: hw/sensor/max11615.c diff --git a/include/hw/sensor/adc128d818.h b/include/hw/sensor/adc128d818.h new file mode 100644 index 0000000000..02d75ca3e1 --- /dev/null +++ b/include/hw/sensor/adc128d818.h @@ -0,0 +1,23 @@ +/* Copyright 2026 9elements */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef QEMU_ADC128D818_H +#define QEMU_ADC128D818_H + +#include "qemu/osdep.h" +#include "hw/i2c/i2c.h" + +#define TYPE_ADC128D818 "adc128d818" + +/* + * Create and realize a adc128d818 ADC with constant caller-supplied readi= ngs + * @bus: I2C bus to put it on + * @address: I2C address + * @init_values: array of readings for each ADC channel + * @init_values_size: Size of @init_values, can be less than the number of + * channels + */ +I2CSlave *adc128d818_init_with_values(I2CBus *bus, uint8_t address, + const uint16_t *init_values, + uint32_t init_values_size); + +#endif diff --git a/hw/arm/aspeed_ast2600_fby4.c b/hw/arm/aspeed_ast2600_fby4.c index dd84839c65..b27c3e09ea 100644 --- a/hw/arm/aspeed_ast2600_fby4.c +++ b/hw/arm/aspeed_ast2600_fby4.c @@ -12,6 +12,7 @@ #include "hw/arm/aspeed_soc.h" #include "hw/nvram/eeprom_at24c.h" #include "hw/sensor/max11615.h" +#include "hw/sensor/adc128d818.h" #include "hw/i2c/i2c_mux_pca954x.h" #include "hw/gpio/pca9552.h" =20 @@ -162,7 +163,13 @@ static void fby4_i2c_init_fanboard(I2CSlave *fan_mux, = size_t eepromSize) I2CBus *bus =3D pca954x_i2c_get_bus(fan_mux, i); =20 /* ti,adc128d818 @ 0x1f (adc) */ - /* TODO */ + /* the driver will throw away the last 4 bits, set them 0 */ + static const uint16_t adc_values1[8] =3D { + 0b011110000000, 0b010100010000, + 0b001000110000, 0b100000100000, + 0b011110000000, 0b010100010000, + 0b001000110000, 0b100000100000}; + adc128d818_init_with_values(bus, 0x1f, adc_values1, 8); =20 /* maxim,max31790 @ 0x20 (pwm) */ i2c_slave_create_simple(bus, "max31790", 0x20); diff --git a/hw/sensor/adc128d818.c b/hw/sensor/adc128d818.c new file mode 100644 index 0000000000..7ad7c935fc --- /dev/null +++ b/hw/sensor/adc128d818.c @@ -0,0 +1,433 @@ +/* + * Texas Instruments ADC128D818 12 bit ADC with temperature sensor + * Models ADC128D818 + * + * Product: https://www.ti.com/product/ADC128D818 + * Datasheet: https://www.ti.com/lit/gpn/adc128d818 + * + * Copyright 2026 9elements + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "hw/sensor/adc128d818.h" +#include "hw/i2c/i2c.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/osdep.h" +#include "trace.h" + +/* 8 bit, r/w */ +#define REG_CONFIG 0x00 + +/* 8 bit, readonly */ +#define REG_INTERRUPT_STATUS 0x01 + +/* 8 bit, r/w */ +#define REG_INTERRUPT_MASK 0x03 + +/* 8 bit, r/w */ +#define REG_CONVERSION_RATE 0x07 + +/* 8 bit, r/w */ +#define REG_CHANNEL_DISABLE 0x08 + +/* 8 bit, write-only */ +#define REG_ONE_SHOT 0x09 + +/* 8 bit, r/w */ +#define REG_DEEP_SHUTDOWN 0x0a + +/* 8 bit, r/w */ +#define REG_ADVANCED_CONFIG 0x0b + +/* 8 bit, readonly */ +#define REG_BUSY_STATUS 0x0c + +/* 16 bit registers, N =3D 0..7, readonly */ +#define REG_CHANNEL_READING(N) (0x20 + N) + +/* 8 bit registers N =3D 0..15, r/w */ +#define REG_LIMIT(N) (0x2a + N) + +/* 8 bit register, readonly */ +#define REG_MANUFACTURER_ID 0x3e + +/* 8 bit register, readonly */ +#define REG_REVISION_ID 0x3f + +#define ADC128D818_NUM_CHANNELS 8 + +struct ADC128D818State { + I2CSlave i2c; + + uint8_t config; + uint8_t interrupt_status; + uint8_t interrupt_mask; + uint8_t conversion_rate; + uint8_t channel_disable; + bool deep_shutdown; + uint8_t advanced_config; + + /* channel reading registers, 2 bytes each */ + uint16_t channels[ADC128D818_NUM_CHANNELS]; + + /* high and low limit registers 0x2a - 0x39, one byte each */ + uint8_t limit[ADC128D818_NUM_CHANNELS * 2]; + + /* input buffer */ + uint8_t len; + uint8_t buf[2]; + + /* output buffer */ + uint8_t outlen; + uint8_t outbuf[2]; + + /* selected channel for read/write operation */ + uint8_t pointer; +}; + +struct ADC128D818Class { + I2CSlaveClass parent_class; +}; + +OBJECT_DECLARE_TYPE(ADC128D818State, ADC128D818Class, ADC128D818) + +static void adc128d818_read(ADC128D818State *s) +{ + uint8_t ch_num =3D 0; + switch (s->pointer) { + case REG_CONFIG: + s->outbuf[0] =3D s->config; + break; + case REG_INTERRUPT_STATUS: + s->outbuf[0] =3D s->interrupt_status; + break; + case REG_INTERRUPT_MASK: + s->outbuf[0] =3D s->interrupt_mask; + break; + case REG_CONVERSION_RATE: + s->outbuf[0] =3D s->conversion_rate; + break; + case REG_CHANNEL_DISABLE: + s->outbuf[0] =3D s->channel_disable; + break; + case REG_ONE_SHOT: + /* not marked as readable */ + qemu_log_mask(LOG_GUEST_ERROR, "%s: read of register 0x%02x\n", + __func__, s->pointer); + s->outbuf[0] =3D 0x0; + break; + case REG_DEEP_SHUTDOWN: + s->outbuf[0] =3D s->deep_shutdown ? 0x1 : 0x0; + break; + case REG_ADVANCED_CONFIG: + s->outbuf[0] =3D s->advanced_config & 0b111; + break; + case REG_BUSY_STATUS: + /* not implemented */ + s->outbuf[0] =3D 0b00000010; /* POR State */ + break; + case REG_CHANNEL_READING(0): + case REG_CHANNEL_READING(1): + case REG_CHANNEL_READING(2): + case REG_CHANNEL_READING(3): + case REG_CHANNEL_READING(4): + case REG_CHANNEL_READING(5): + case REG_CHANNEL_READING(6): + case REG_CHANNEL_READING(7): + ch_num =3D s->pointer - REG_CHANNEL_READING(0); + /* high byte comes first, driver reads swapped */ + s->outbuf[0] =3D (s->channels[ch_num] >> 8) & 0xff; + s->outbuf[1] =3D s->channels[ch_num] & 0xff; + break; + case REG_LIMIT(0): + case REG_LIMIT(1): + case REG_LIMIT(2): + case REG_LIMIT(3): + case REG_LIMIT(4): + case REG_LIMIT(5): + case REG_LIMIT(6): + case REG_LIMIT(7): + case REG_LIMIT(8): + case REG_LIMIT(9): + case REG_LIMIT(10): + case REG_LIMIT(11): + case REG_LIMIT(12): + case REG_LIMIT(13): + case REG_LIMIT(14): + case REG_LIMIT(15): + s->outbuf[0] =3D s->limit[s->pointer - REG_LIMIT(0)]; + break; + case REG_MANUFACTURER_ID: + s->outbuf[0] =3D 0x1; /* readonly */ + break; + case REG_REVISION_ID: + s->outbuf[0] =3D 0b00001001; /* readonly */ + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: read of register 0x%02x\n", + __func__, s->pointer); + break; + } +} + +static void adc128d818_write_advanced_config(ADC128D818State *s, uint8_t d= ata) +{ + /* + * Note: Whenever the Advanced Configuration Register is programmed, + * all of the values in the Channel Reading Registers and + * Interrupt Status Registers will return to their default values. + */ + + s->advanced_config =3D (data & 0b111); + + s->interrupt_status =3D 0x0; + + /* + * The channel reading registers do not have a default value. + * See 8.6.1 ADC128D818 Internal Registers + * To do something sane, just reset the channels to an arbitrary value + */ + + /* reset channels to a defined state */ + for (int i =3D 0; i < ADC128D818_NUM_CHANNELS; i++) { + + /* arbitrary value */ + s->channels[i] =3D 0b0000101011010010; + } +} + +static void adc128d818_write(ADC128D818State *s, uint8_t data) +{ + trace_adc128d818_write(s->i2c.address, s->pointer, data); + + /* which bits in config register are writable */ + const uint8_t config_w_mask =3D 0b10001011; + const uint8_t config_ro_mask =3D (uint8_t)~config_w_mask; + + switch (s->pointer) { + case REG_CONFIG: + s->config =3D (s->config & config_ro_mask) | (data & config_w_mask= ); + break; + case REG_INTERRUPT_MASK: + s->interrupt_mask =3D data; + break; + case REG_CONVERSION_RATE: + s->conversion_rate =3D data; + break; + case REG_CHANNEL_DISABLE: + s->channel_disable =3D data; + break; + case REG_ONE_SHOT: + /* + * Initiate a single conversion and comparison cycle when + * the device is in shutdown mode or deep shutdown mode, after + * which the device returns to the respective mode that it was in + * + */ + break; + case REG_DEEP_SHUTDOWN: + s->deep_shutdown =3D (data & 0x1) !=3D 0; + break; + case REG_ADVANCED_CONFIG: + adc128d818_write_advanced_config(s, data); + break; + case REG_LIMIT(0): + case REG_LIMIT(1): + case REG_LIMIT(2): + case REG_LIMIT(3): + case REG_LIMIT(4): + case REG_LIMIT(5): + case REG_LIMIT(6): + case REG_LIMIT(7): + case REG_LIMIT(8): + case REG_LIMIT(9): + case REG_LIMIT(10): + case REG_LIMIT(11): + case REG_LIMIT(12): + case REG_LIMIT(13): + case REG_LIMIT(14): + case REG_LIMIT(15): + s->limit[s->pointer - REG_LIMIT(0)] =3D data; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, "%s: write of register 0x%02x\n", + __func__, s->pointer); + break; + } +} + +static int adc128d818_send(I2CSlave *i2c, uint8_t data) +{ + ADC128D818State *s =3D ADC128D818(i2c); + trace_adc128d818_send(s->i2c.address, data); + + s->outlen =3D 0; + + if (s->len >=3D 2) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: wrote too many bytes\n", __fun= c__); + return 1; + } + + s->buf[s->len] =3D data; + + if (s->len =3D=3D 0) { + s->pointer =3D data; + } else if (s->len =3D=3D 1) { + adc128d818_write(s, data); + } + + s->len++; + return 0; +} + +static uint8_t adc128d818_recv(I2CSlave *i2c) +{ + ADC128D818State *s =3D ADC128D818(i2c); + trace_adc128d818_recv(s->i2c.address, s->pointer); + + adc128d818_read(s); + + if (s->outlen >=3D 2) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: too many bytes read\n", __func= __); + s->outlen =3D 0; + } + + const uint8_t data =3D s->outbuf[s->outlen++]; + + trace_adc128d818_recv_return(s->i2c.address, data); + return data; +} + +static int adc128d818_event(I2CSlave *i2c, enum i2c_event event) +{ + ADC128D818State *s =3D ADC128D818(i2c); + + trace_adc128d818_event(s->i2c.address, event); + + switch (event) { + case I2C_START_RECV: + s->outlen =3D 0; + break; + case I2C_START_SEND: + s->len =3D 0; + break; + default: + break; + } + + return 0; +} + +static const VMStateDescription vmstate_adc128d818 =3D { + .name =3D TYPE_ADC128D818, + .version_id =3D 0, + .minimum_version_id =3D 0, + .fields =3D + (const VMStateField[]){ + VMSTATE_UINT8(config, ADC128D818State), + VMSTATE_UINT8(interrupt_mask, ADC128D818State), + VMSTATE_UINT8(conversion_rate, ADC128D818State), + VMSTATE_UINT8(channel_disable, ADC128D818State), + VMSTATE_BOOL(deep_shutdown, ADC128D818State), + VMSTATE_UINT8(advanced_config, ADC128D818State), + VMSTATE_UINT16_ARRAY(channels, ADC128D818State, + ADC128D818_NUM_CHANNELS), + VMSTATE_UINT8_ARRAY(limit, ADC128D818State, + ADC128D818_NUM_CHANNELS * 2), + VMSTATE_UINT8(len, ADC128D818State), + VMSTATE_UINT8_ARRAY(buf, ADC128D818State, 2), + VMSTATE_UINT8(outlen, ADC128D818State), + VMSTATE_UINT8_ARRAY(outbuf, ADC128D818State, 2), + VMSTATE_UINT8(pointer, ADC128D818State), + VMSTATE_I2C_SLAVE(i2c, ADC128D818State), VMSTATE_END_OF_LIST()= } +}; + +I2CSlave *adc128d818_init_with_values(I2CBus *bus, uint8_t address, + const uint16_t *init_values, + uint32_t init_values_size) +{ + ADC128D818State *s; + + s =3D ADC128D818(i2c_slave_new(TYPE_ADC128D818, address)); + + for (int i =3D 0; i < ADC128D818_NUM_CHANNELS; i++) { + + /* arbitrary value */ + s->channels[i] =3D + i < init_values_size ? init_values[i] : 0b0000101011010010; + } + + i2c_slave_realize_and_unref(I2C_SLAVE(s), bus, &error_abort); + + return I2C_SLAVE(s); +} + +static void adc128d818_reset(DeviceState *dev) +{ + ADC128D818State *s =3D ADC128D818(dev); + + s->pointer =3D 0; + s->outlen =3D 0; + + /* POR-State */ + s->config =3D 0b00001000; + s->interrupt_status =3D 0x0; + s->interrupt_mask =3D 0; + s->conversion_rate =3D 0; + s->channel_disable =3D 0; + s->deep_shutdown =3D 0; + s->advanced_config =3D 0; + + /* No POR-State defined in datasheet */ + for (int i =3D 0; i < ADC128D818_NUM_CHANNELS * 2; i++) { + s->limit[i] =3D 0; + } + + /* reset channels to a defined state */ + for (int i =3D 0; i < ADC128D818_NUM_CHANNELS; i++) { + + /* arbitrary value */ + s->channels[i] =3D 0b0000101011010010; + } +} + +static void adc128d818_realize(DeviceState *dev, Error **errp) +{ + ADC128D818State *s =3D ADC128D818(dev); + + trace_adc128d818_realize(s->i2c.address); +} + +static void adc128d818_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); + + dc->realize =3D adc128d818_realize; + dc->desc =3D "Texas Instruments ADC128D818 12-bit ADC with temp sensor= "; + dc->vmsd =3D &vmstate_adc128d818; + dc->legacy_reset =3D adc128d818_reset; + k->event =3D adc128d818_event; + k->recv =3D adc128d818_recv; + k->send =3D adc128d818_send; +} + +static const TypeInfo adc128d818_info =3D { + .name =3D TYPE_ADC128D818, + .parent =3D TYPE_I2C_SLAVE, + .instance_size =3D sizeof(ADC128D818State), + .class_size =3D sizeof(ADC128D818Class), + .class_init =3D adc128d818_class_init, +}; + +static void adc128d818_register_types(void) +{ + type_register_static(&adc128d818_info); +} + +type_init(adc128d818_register_types) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c90b8da8c2..aba6dc64db 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -555,6 +555,7 @@ config ASPEED_SOC select MAX31785 select MAX31790 select MAX11615 + select ADC128D818 select FSI_APB2OPB_ASPEED select AT24C select PCI_EXPRESS diff --git a/hw/sensor/Kconfig b/hw/sensor/Kconfig index 441bee7604..a640958257 100644 --- a/hw/sensor/Kconfig +++ b/hw/sensor/Kconfig @@ -51,3 +51,7 @@ config MAX31790 config MAX11615 bool depends on I2C + +config ADC128D818 + bool + depends on I2C diff --git a/hw/sensor/meson.build b/hw/sensor/meson.build index a1e26604fa..defd7647e7 100644 --- a/hw/sensor/meson.build +++ b/hw/sensor/meson.build @@ -10,3 +10,4 @@ system_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files= ('isl_pmbus_vr.c')) system_ss.add(when: 'CONFIG_MAX31785', if_true: files('max31785.c')) system_ss.add(when: 'CONFIG_MAX31790', if_true: files('max31790.c')) system_ss.add(when: 'CONFIG_MAX11615', if_true: files('max11615.c')) +system_ss.add(when: 'CONFIG_ADC128D818', if_true: files('adc128d818.c')) diff --git a/hw/sensor/trace-events b/hw/sensor/trace-events index e115f05dd6..1dac20fe87 100644 --- a/hw/sensor/trace-events +++ b/hw/sensor/trace-events @@ -26,3 +26,11 @@ max11615_recv_return(uint8_t i2c_addr, uint8_t data) "i2= c_addr: 0x%02x, returns: max11615_event(uint8_t i2c_addr, uint8_t event) "i2c_addr: 0x%02x, event: = 0x%02x" max11615_realize(uint8_t i2c_addr) "i2c_addr: 0x%02x" max11615_reset_enter(uint8_t i2c_addr) "i2c_addr: 0x%02x" + +# adc128d818.c +adc128d818_send(uint8_t i2c_addr, uint8_t data) "i2c_addr: 0x%02x, data: 0= x%02x" +adc128d818_write(uint8_t i2c_addr, uint8_t reg, uint8_t data) "i2c_addr: 0= x%02x, reg: 0x%02x data: 0x%02x" +adc128d818_recv(uint8_t i2c_addr, uint8_t reg) "i2c_addr: 0x%02x, reg: 0x%= 02x" +adc128d818_recv_return(uint8_t i2c_addr, uint8_t data) "i2c_addr: 0x%02x, = returns: 0x%02x" +adc128d818_event(uint8_t i2c_addr, uint8_t event) "i2c_addr: 0x%02x, event= : 0x%02x" +adc128d818_realize(uint8_t i2c_addr) "i2c_addr: 0x%02x" diff --git a/tests/functional/arm/test_aspeed_fby4.py b/tests/functional/ar= m/test_aspeed_fby4.py index b711bc8e73..6bf3dc6a37 100755 --- a/tests/functional/arm/test_aspeed_fby4.py +++ b/tests/functional/arm/test_aspeed_fby4.py @@ -89,6 +89,16 @@ def do_test_arm_aspeed_openbmc_no_network(self, machine,= image, uboot, exec_command_and_wait_for_pattern(self, "cat /sys/bus/i2c/devices/30-0033/iio:device*/in_voltage_scale= ", "0.500000000"); =20 + # ADC128D818 test + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-001f/hwmon/hwmon0/name", "adc128d= 818"); + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-001f/hwmon/hwmon0/in0_input", "10= 8"); + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-001f/hwmon/hwmon0/in0_min", "0"); + exec_command_and_wait_for_pattern(self, + "cat /sys/bus/i2c/devices/30-001f/hwmon/hwmon0/in0_max", "0"); + def test_arm_ast2600_yosemitev4_openbmc(self): image_path =3D self.uncompress(self.ASSET_YOSEMITE_V4_FLASH) =20 --=20 2.54.0