From: Titus Rwantare <tit...@google.com>
Signed-off-by: Titus Rwantare <tit...@google.com>
Reviewed-by: Hao Wu <wuhao...@google.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Acked-by: Corey Minyard <cminy...@mvista.com>
Message-Id: <20220307200605.4001451-10-tit...@google.com>
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
hw/sensor/isl_pmbus_vr.c | 50 ++++++++++++++++++++++
include/hw/sensor/isl_pmbus_vr.h | 1 +
tests/qtest/isl_pmbus_vr-test.c | 72 ++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/hw/sensor/isl_pmbus_vr.c b/hw/sensor/isl_pmbus_vr.c
index 53187d619a..e11e028884 100644
--- a/hw/sensor/isl_pmbus_vr.c
+++ b/hw/sensor/isl_pmbus_vr.c
@@ -89,6 +89,24 @@ static void isl_pmbus_vr_exit_reset(Object *obj)
}
}
+/* The raa228000 uses different direct mode coefficents from most isl devices
*/
+static void raa228000_exit_reset(Object *obj)
+{
+ PMBusDevice *pmdev = PMBUS_DEVICE(obj);
+
+ isl_pmbus_vr_exit_reset(obj);
+
+ pmdev->pages[0].read_iout = 0;
+ pmdev->pages[0].read_pout = 0;
+ pmdev->pages[0].read_vout = 0;
+ pmdev->pages[0].read_vin = 0;
+ pmdev->pages[0].read_iin = 0;
+ pmdev->pages[0].read_pin = 0;
+ pmdev->pages[0].read_temperature_1 = 0;
+ pmdev->pages[0].read_temperature_2 = 0;
+ pmdev->pages[0].read_temperature_3 = 0;
+}
+
static void isl_pmbus_vr_add_props(Object *obj, uint64_t *flags, uint8_t pages)
{
PMBusDevice *pmdev = PMBUS_DEVICE(obj);
@@ -177,6 +195,20 @@ static void raa22xx_init(Object *obj)
isl_pmbus_vr_add_props(obj, flags, ARRAY_SIZE(flags));
}
+static void raa228000_init(Object *obj)
+{
+ PMBusDevice *pmdev = PMBUS_DEVICE(obj);
+ uint64_t flags[1];
+
+ flags[0] = PB_HAS_VIN | PB_HAS_VOUT | PB_HAS_VOUT_MODE |
+ PB_HAS_VOUT_RATING | PB_HAS_VOUT_MARGIN | PB_HAS_IIN |
+ PB_HAS_IOUT | PB_HAS_PIN | PB_HAS_POUT | PB_HAS_TEMPERATURE |
+ PB_HAS_TEMP2 | PB_HAS_TEMP3 | PB_HAS_STATUS_MFR_SPECIFIC;
+
+ pmbus_page_config(pmdev, 0, flags[0]);
+ isl_pmbus_vr_add_props(obj, flags, 1);
+}
+
static void isl_pmbus_vr_class_init(ObjectClass *klass, void *data,
uint8_t pages)
{
@@ -195,6 +227,15 @@ static void isl69260_class_init(ObjectClass *klass, void
*data)
isl_pmbus_vr_class_init(klass, data, 2);
}
+static void raa228000_class_init(ObjectClass *klass, void *data)
+{
+ ResettableClass *rc = RESETTABLE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ dc->desc = "Renesas 228000 Digital Multiphase Voltage Regulator";
+ rc->phases.exit = raa228000_exit_reset;
+ isl_pmbus_vr_class_init(klass, data, 1);
+}
+
static void raa229004_class_init(ObjectClass *klass, void *data)
{
ResettableClass *rc = RESETTABLE_CLASS(klass);
@@ -220,9 +261,18 @@ static const TypeInfo raa229004_info = {
.class_init = raa229004_class_init,
};
+static const TypeInfo raa228000_info = {
+ .name = TYPE_RAA228000,
+ .parent = TYPE_PMBUS_DEVICE,
+ .instance_size = sizeof(ISLState),
+ .instance_init = raa228000_init,
+ .class_init = raa228000_class_init,
+};
+
static void isl_pmbus_vr_register_types(void)
{
type_register_static(&isl69260_info);
+ type_register_static(&raa228000_info);
type_register_static(&raa229004_info);
}
diff --git a/include/hw/sensor/isl_pmbus_vr.h b/include/hw/sensor/isl_pmbus_vr.h
index 233916f70a..3e47ff7e48 100644
--- a/include/hw/sensor/isl_pmbus_vr.h
+++ b/include/hw/sensor/isl_pmbus_vr.h
@@ -13,6 +13,7 @@
#include "qom/object.h"
#define TYPE_ISL69260 "isl69260"
+#define TYPE_RAA228000 "raa228000"
#define TYPE_RAA229004 "raa229004"
struct ISLState {
diff --git a/tests/qtest/isl_pmbus_vr-test.c b/tests/qtest/isl_pmbus_vr-test.c
index dc0ccae2aa..5553ea410a 100644
--- a/tests/qtest/isl_pmbus_vr-test.c
+++ b/tests/qtest/isl_pmbus_vr-test.c
@@ -150,6 +150,70 @@ static void test_defaults(void *obj, void *data,
QGuestAllocator *alloc)
g_assert_cmphex(i2c_value, ==, ISL_REVISION_DEFAULT);
}
+static void raa228000_test_defaults(void *obj, void *data,
+ QGuestAllocator *alloc)
+{
+ uint16_t value, i2c_value;
+ QI2CDevice *i2cdev = (QI2CDevice *)obj;
+
+ value = qmp_isl_pmbus_vr_get(TEST_ID, "vout[0]");
+ g_assert_cmpuint(value, ==, 0);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_READ_IOUT);
+ g_assert_cmpuint(i2c_value, ==, 0);
+
+ value = qmp_isl_pmbus_vr_get(TEST_ID, "pout[0]");
+ g_assert_cmpuint(value, ==, 0);
+
+ i2c_value = i2c_get8(i2cdev, PMBUS_CAPABILITY);
+ g_assert_cmphex(i2c_value, ==, ISL_CAPABILITY_DEFAULT);
+
+ i2c_value = i2c_get8(i2cdev, PMBUS_OPERATION);
+ g_assert_cmphex(i2c_value, ==, ISL_OPERATION_DEFAULT);
+
+ i2c_value = i2c_get8(i2cdev, PMBUS_ON_OFF_CONFIG);
+ g_assert_cmphex(i2c_value, ==, ISL_ON_OFF_CONFIG_DEFAULT);
+
+ i2c_value = i2c_get8(i2cdev, PMBUS_VOUT_MODE);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_MODE_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_COMMAND);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_COMMAND_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_MAX);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_MAX_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_HIGH);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_MARGIN_HIGH_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_MARGIN_LOW);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_MARGIN_LOW_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_TRANSITION_RATE);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_TRANSITION_RATE_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VOUT_OV_FAULT_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_VOUT_OV_FAULT_LIMIT_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_OT_FAULT_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_OT_FAULT_LIMIT_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_OT_WARN_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_OT_WARN_LIMIT_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VIN_OV_WARN_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_VIN_OV_WARN_LIMIT_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_VIN_UV_WARN_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_VIN_UV_WARN_LIMIT_DEFAULT);
+
+ i2c_value = isl_pmbus_vr_i2c_get16(i2cdev, PMBUS_IIN_OC_FAULT_LIMIT);
+ g_assert_cmphex(i2c_value, ==, ISL_IIN_OC_FAULT_LIMIT_DEFAULT);
+
+ i2c_value = i2c_get8(i2cdev, PMBUS_REVISION);
+ g_assert_cmphex(i2c_value, ==, ISL_REVISION_DEFAULT);
+}
+
/* test qmp access */
static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc)
{
@@ -398,5 +462,13 @@ static void isl_pmbus_vr_register_nodes(void)
qos_add_test("test_rw_regs", "raa229004", test_rw_regs, NULL);
qos_add_test("test_pages_rw", "raa229004", test_pages_rw, NULL);
qos_add_test("test_ov_faults", "raa229004", test_voltage_faults, NULL);
+
+ qos_node_create_driver("raa228000", i2c_device_create);
+ qos_node_consumes("raa228000", "i2c-bus", &opts);
+
+ qos_add_test("test_defaults", "raa228000", raa228000_test_defaults, NULL);
+ qos_add_test("test_tx_rx", "raa228000", test_tx_rx, NULL);
+ qos_add_test("test_rw_regs", "raa228000", test_rw_regs, NULL);
+ qos_add_test("test_ov_faults", "raa228000", test_voltage_faults, NULL);
}
libqos_init(isl_pmbus_vr_register_nodes);
--
2.34.1
