From: Emmanuel Blot <[email protected]> Verify the ADC128D818 on the Anacapa R-PDB (i2c8 mux channel 0): two channels are driven with distinct voltages and each is checked to be reported back independently through the kernel hwmon interface, and the channel 0 limit registers are validated.
Signed-off-by: Emmanuel Blot <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] [ clg: - adjusted on upstream - added /machine/labels support ] Signed-off-by: Cédric Le Goater <[email protected]> --- hw/arm/aspeed_ast2600_anacapa.c | 11 +++-- tests/functional/arm/test_aspeed_anacapa.py | 50 +++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/hw/arm/aspeed_ast2600_anacapa.c b/hw/arm/aspeed_ast2600_anacapa.c index 65d6b0faa2de..0b8d9cc822ca 100644 --- a/hw/arm/aspeed_ast2600_anacapa.c +++ b/hw/arm/aspeed_ast2600_anacapa.c @@ -221,14 +221,15 @@ static const uint8_t hpm_brd_id_eeprom[] = { }; static const size_t hpm_brd_id_eeprom_len = sizeof(hpm_brd_id_eeprom); -static void anacapa_add_adc128d818(I2CBus *bus, uint8_t addr, +static void anacapa_add_adc128d818(AspeedMachineState *bmc, + I2CBus *bus, uint8_t addr, const char *description) { DeviceState *dev = DEVICE(i2c_slave_new(TYPE_ADC128D818, addr)); g_autofree char *childname = g_strdup_printf("0x%02x", addr); qdev_prop_set_string(dev, "description", description); - object_property_add_child(OBJECT(bus), childname, OBJECT(dev)); + aspeed_machine_add_label(bmc, description, OBJECT(dev)); i2c_slave_realize_and_unref(I2C_SLAVE(dev), bus, &error_fatal); } @@ -271,7 +272,8 @@ static void anacapa_bmc_i2c_init(AspeedMachineState *bmc) /* i2c8mux ch0 */ /* adc128d818@1f - R-PDB ADC (mode 1: 8 voltage channels) */ - anacapa_add_adc128d818(pca954x_i2c_get_bus(i2c_mux, 0), 0x1f, "i2c8:0:1f"); + anacapa_add_adc128d818(bmc, pca954x_i2c_get_bus(i2c_mux, 0), + 0x1f, "i2c8:0:1f"); /* pca9555@22 */ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 0), TYPE_PCA9552, 0x22); @@ -333,7 +335,8 @@ static void anacapa_bmc_i2c_init(AspeedMachineState *bmc) /* i2c13mux ch3 */ /* adc128d818@1f - MB ADC (mode 1: 8 voltage channels) */ - anacapa_add_adc128d818(pca954x_i2c_get_bus(i2c_mux, 3), 0x1f, "i2c13:3:1f"); + anacapa_add_adc128d818(bmc, pca954x_i2c_get_bus(i2c_mux, 3), + 0x1f, "i2c13:3:1f"); /* i2c13mux ch4 */ /* eeprom@51 */ diff --git a/tests/functional/arm/test_aspeed_anacapa.py b/tests/functional/arm/test_aspeed_anacapa.py index 363b4c2a1d09..0aa00c6f8c86 100644 --- a/tests/functional/arm/test_aspeed_anacapa.py +++ b/tests/functional/arm/test_aspeed_anacapa.py @@ -2,10 +2,16 @@ # # Functional test that boots the ASPEED machines # +# Copyright (c) 2026 Meta Platforms, Inc. and affiliates. +# # SPDX-License-Identifier: GPL-2.0-or-later +import re +import time + from qemu_test import Asset from aspeed import AspeedTest +from qemu_test import exec_command_and_wait_for_pattern class AnacapaMachine(AspeedTest): @@ -14,6 +20,10 @@ class AnacapaMachine(AspeedTest): 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/master/images/anacapa-bmc/openbmc-20260616025349/obmc-phosphor-image-anacapa-20260616025349.static.mtd.xz', 'de3841fb6ed3085aec6424358ee6efc4b8ee85688361e5aa1987fd1acb7d3fb4') + ADC128D818_QOM_PATH = "/machine/labels/i2c8:0:1f" + ADC128D818_MUX_CHANNEL = "/sys/bus/i2c/devices/8-0072/channel-0" + PROMPT = "root@anacapa:~#" + def test_arm_ast2600_anacapa_openbmc(self): image_path = self.uncompress(self.ASSET_ANACAPA_FLASH) @@ -21,5 +31,45 @@ def test_arm_ast2600_anacapa_openbmc(self): uboot='2019.04', cpu_id='0xf00', soc='AST2600 rev A3') + exec_command_and_wait_for_pattern(self, "root", "Password:") + exec_command_and_wait_for_pattern(self, "0penBmc", "#") + + self.adc_hwmon = self.resolve_adc128d818_hwmon() + self.assertIn(b"adc128d818", self.read_adc128d818("name")) + + adc = self.ADC128D818_QOM_PATH + for ch0_mv, ch1_mv in ((108, 2000), (1280, 500)): + self.vm.cmd("qom-set", path=adc, property="ain0", value=ch0_mv) + self.vm.cmd("qom-set", path=adc, property="ain1", value=ch1_mv) + self.wait_adc128d818_value("in0_input", ch0_mv) + self.wait_adc128d818_value("in1_input", ch1_mv) + + self.assertIn(b"2551", self.read_adc128d818("in0_max")) + self.assertRegex(self.read_adc128d818("in0_min"), rb"(?m)^0\r*$") + + def resolve_adc128d818_hwmon(self): + out = self.read_adc128d818_console( + f"basename $(readlink {self.ADC128D818_MUX_CHANNEL})" + ) + match = re.search(rb"i2c-(\d+)", out) + self.assertIsNotNone(match, "could not resolve ADC128D818 i2c bus") + bus = int(match.group(1)) + return f"/sys/bus/i2c/devices/{bus}-001f/hwmon/hwmon*" + + def read_adc128d818_console(self, command): + return exec_command_and_wait_for_pattern(self, command, self.PROMPT) + + def read_adc128d818(self, attr): + return self.read_adc128d818_console(f"cat {self.adc_hwmon}/{attr}") + + def wait_adc128d818_value(self, attr, expected): + needle = str(expected).encode() + if needle in self.read_adc128d818(attr): + return + time.sleep(2) + if needle not in self.read_adc128d818(attr): + self.fail(f"{attr} did not reach {expected}") + + if __name__ == '__main__': AspeedTest.main() -- 2.55.0
